ref: 0caea0f8202bf4cedb967a844a96cee04386b8df
parent: f27f79488a460f0a89670f3611e1e9e175baf5d6
author: Adelaide Walter <adelaidekwalter@gmail.com>
date: Tue Jan 2 11:46:40 EST 2018
Use BANK for all hardcoded banks with BANK in comments.
--- a/engine/battle/battle_transition.asm
+++ b/engine/battle/battle_transition.asm
@@ -298,7 +298,7 @@
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_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 @@
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
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -8440,7 +8440,7 @@
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
--- a/engine/battle_anims/getpokeballwobble.asm
+++ b/engine/battle_anims/getpokeballwobble.asm
@@ -8,7 +8,7 @@
ld d, a
push de
- ld a, 1 ; BANK(Buffer2)
+ ld a, BANK(Buffer2)
ld [rSVBK], a
ld a, [Buffer2]
--- a/engine/title.asm
+++ b/engine/title.asm
@@ -162,7 +162,7 @@
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
--- a/mobile/mobile_46.asm
+++ b/mobile/mobile_46.asm
@@ -7223,7 +7223,7 @@
jr .loop8
.okay4
- ld a, $0 ; BANK(sPartyMail)
+ ld a, BANK(sPartyMail)
call GetSRAMBank
ld a, MAIL_STRUCT_LENGTH
.loop9
--- a/mobile/mobile_5f.asm
+++ b/mobile/mobile_5f.asm
@@ -44,7 +44,7 @@
ld a, [rSVBK]
push af
- ld a, 5 ; BANK(wBGPals1)
+ ld a, BANK(wBGPals1)
ld [rSVBK], a
ld hl, HaveWantPals
--- a/mobile/print_opp_message.asm
+++ b/mobile/print_opp_message.asm
@@ -10,7 +10,7 @@
call AddNTimes
ld de, wMobileOpponentBattleMessage
ld bc, $c
- ld a, $5 ; BANK(w5_MobileOpponentBattleMessages)
+ ld a, BANK(w5_MobileOpponentBattleMessages)
call FarCopyWRAM
ld a, [rSVBK]
--
⑨