Merge pull request #584 from mid-kid/master

Fix comments around BANK() statements
This commit is contained in:
Rangi 2018-12-30 11:07:50 -05:00 committed by GitHub
commit 378667d9ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 9 additions and 8 deletions

View File

@ -4154,7 +4154,7 @@ PursuitSwitch:
ld a, [wLastPlayerMon]
ld [wCurBattleMon], a
.do_turn
ld a, BANK(DoPlayerTurn)
ld a, BANK(DoPlayerTurn) ; and BANK(DoEnemyTurn)
rst FarCall
ld a, BATTLE_VARS_MOVE
@ -4404,7 +4404,7 @@ UseHeldStatusHealingItem:
.got_pointer
call SwitchTurnCore
ld a, BANK(CalcEnemyStats)
ld a, BANK(CalcPlayerStats) ; and BANK(CalcEnemyStats)
rst FarCall
call SwitchTurnCore
call ItemRecoveryAnim

View File

@ -59,7 +59,7 @@ BattleCommand_Present:
jr z, .got_hp_fn_pointer
ld hl, AICheckEnemyMaxHP
.got_hp_fn_pointer
ld a, BANK(AICheckPlayerMaxHP)
ld a, BANK(AICheckPlayerMaxHP) ; and BANK(AICheckEnemyMaxHP)
rst FarCall
jr c, .already_fully_healed

View File

@ -1340,7 +1340,7 @@ BattleAnimAssignPals:
call DmgToCgbObjPals
ret
ClearBattleAnims:
ClearBattleAnims::
; Clear animation block
ld hl, wLYOverrides
ld bc, wBattleAnimEnd - wLYOverrides

View File

@ -19,7 +19,7 @@ _UnownPrinter:
ld de, UnownDexATile
ld hl, vTiles0 tile UNOWNSTAMP_BOLD_A
lb bc, BANK(UnownDexBTile), 1
lb bc, BANK(UnownDexATile), 1
call Request1bpp
ld de, UnownDexBTile

View File

@ -190,7 +190,8 @@ GetBattleAnimPointer::
ld a, [hl]
ld [wBattleAnimAddress + 1], a
ld a, BANK(BattleAnimCommands)
; ClearBattleAnims is the only function that calls this...
ld a, BANK(ClearBattleAnims)
rst Bankswitch
ret

View File

@ -97,7 +97,7 @@ Init::
call ClearSprites
call ClearsScratch
ld a, BANK(WriteOAMDMACodeToHRAM)
ld a, BANK(GameInit) ; and BANK(WriteOAMDMACodeToHRAM)
rst Bankswitch
call WriteOAMDMACodeToHRAM

View File

@ -3,7 +3,7 @@ ScrollingMenu::
ldh a, [hROMBank]
push af
ld a, BANK(_ScrollingMenu)
ld a, BANK(_ScrollingMenu) ; and BANK(_InitScrollingMenu)
rst Bankswitch
call _InitScrollingMenu