diff options
| author | Adelaide Walter <adelaidekwalter@gmail.com> | 2018-01-02 16:46:40 -0500 |
|---|---|---|
| committer | Adelaide Walter <adelaidekwalter@gmail.com> | 2018-01-02 16:46:40 -0500 |
| commit | 0caea0f8202bf4cedb967a844a96cee04386b8df (patch) | |
| tree | 8a53e1b8ac791ffe46cea22b4bda9dfecb0d5537 | |
| parent | f27f79488a460f0a89670f3611e1e9e175baf5d6 (diff) | |
Use BANK for all hardcoded banks with BANK in comments.
| -rw-r--r-- | engine/battle/battle_transition.asm | 6 | ||||
| -rw-r--r-- | engine/battle/core.asm | 2 | ||||
| -rwxr-xr-x | engine/battle_anims/getpokeballwobble.asm | 2 | ||||
| -rw-r--r-- | engine/title.asm | 2 | ||||
| -rwxr-xr-x | mobile/mobile_46.asm | 2 | ||||
| -rw-r--r-- | mobile/mobile_5f.asm | 2 | ||||
| -rw-r--r-- | mobile/print_opp_message.asm | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/engine/battle/battle_transition.asm b/engine/battle/battle_transition.asm index 85ba44072..2b9ebe091 100644 --- a/engine/battle/battle_transition.asm +++ b/engine/battle/battle_transition.asm @@ -298,7 +298,7 @@ StartTrainerBattle_Flash: ; 8c3ab (23:43ab) StartTrainerBattle_SetUpForWavyOutro: ; 8c3e8 (23:43e8) farcall Function5602 - ld a, $5 ; BANK(LYOverrides) + ld a, BANK(LYOverrides) ld [rSVBK], a call StartTrainerBattle_NextScene @@ -356,7 +356,7 @@ StartTrainerBattle_SineWave: ; 8c408 (23:4408) StartTrainerBattle_SetUpForSpinOutro: ; 8c43d (23:443d) farcall Function5602 - ld a, $5 ; BANK(LYOverrides) + ld a, BANK(LYOverrides) ld [rSVBK], a call StartTrainerBattle_NextScene xor a @@ -498,7 +498,7 @@ ENDM StartTrainerBattle_SetUpForRandomScatterOutro: ; 8c578 (23:4578) farcall Function5602 - ld a, $5 ; BANK(LYOverrides) + ld a, BANK(LYOverrides) ld [rSVBK], a call StartTrainerBattle_NextScene ld a, $10 diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 08021fc8b..48be08bf0 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -8440,7 +8440,7 @@ InitEnemy: ; 3f55e BackUpBGMap2: ; 3f568 ld a, [rSVBK] push af - ld a, $6 ; BANK(wDecompressScratch) + ld a, BANK(wDecompressScratch) ld [rSVBK], a ld hl, wDecompressScratch ld bc, $40 tiles ; vBGMap3 - vBGMap2 diff --git a/engine/battle_anims/getpokeballwobble.asm b/engine/battle_anims/getpokeballwobble.asm index 7fb4d3e38..2bc53d798 100755 --- a/engine/battle_anims/getpokeballwobble.asm +++ b/engine/battle_anims/getpokeballwobble.asm @@ -8,7 +8,7 @@ GetPokeBallWobble: ; f971 (3:7971) ld d, a push de - ld a, 1 ; BANK(Buffer2) + ld a, BANK(Buffer2) ld [rSVBK], a ld a, [Buffer2] diff --git a/engine/title.asm b/engine/title.asm index 2380cfedf..2b43c811a 100644 --- a/engine/title.asm +++ b/engine/title.asm @@ -162,7 +162,7 @@ _TitleScreen: ; 10ed67 ld a, [rSVBK] push af - ld a, 5 ; BANK(LYOverrides) + ld a, BANK(LYOverrides) ld [rSVBK], a ; Make alternating lines come in from opposite sides diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm index 10a97e426..28231daea 100755 --- a/mobile/mobile_46.asm +++ b/mobile/mobile_46.asm @@ -7223,7 +7223,7 @@ Function11b483: ; 11b483 jr .loop8 .okay4 - ld a, $0 ; BANK(sPartyMail) + ld a, BANK(sPartyMail) call GetSRAMBank ld a, MAIL_STRUCT_LENGTH .loop9 diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm index 5731f01fc..b905d0336 100644 --- a/mobile/mobile_5f.asm +++ b/mobile/mobile_5f.asm @@ -44,7 +44,7 @@ Function17c000: ; 17c000 ld a, [rSVBK] push af - ld a, 5 ; BANK(wBGPals1) + ld a, BANK(wBGPals1) ld [rSVBK], a ld hl, HaveWantPals diff --git a/mobile/print_opp_message.asm b/mobile/print_opp_message.asm index 612a1b78d..987ad4b9a 100644 --- a/mobile/print_opp_message.asm +++ b/mobile/print_opp_message.asm @@ -10,7 +10,7 @@ Mobile_PrintOpponentBattleMessage: ; 4ea0a call AddNTimes ld de, wMobileOpponentBattleMessage ld bc, $c - ld a, $5 ; BANK(w5_MobileOpponentBattleMessages) + ld a, BANK(w5_MobileOpponentBattleMessages) call FarCopyWRAM ld a, [rSVBK] |