summaryrefslogtreecommitdiff
path: root/home.asm
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2014-02-05 00:16:48 -0800
committerBryan Bishop <kanzure@gmail.com>2014-02-05 00:16:48 -0800
commitff6306400b2272a863fb55edbc00c6a22f24230f (patch)
tree3f67f455cd500e7a3c1956ee15ed6ffedfaa2edb /home.asm
parent1202e68d2f695d4b91d184bd43139dbe10cb8131 (diff)
parent30218eb3d6c0b523a302ac38601b4630c564aeb1 (diff)
Merge pull request #229 from yenatch/nuke-globals
Use globals to implicitly define labels before passing them into BANK().
Diffstat (limited to 'home.asm')
-rw-r--r--home.asm6
1 files changed, 6 insertions, 0 deletions
diff --git a/home.asm b/home.asm
index 5b15709c1..a2ff9878c 100644
--- a/home.asm
+++ b/home.asm
@@ -2395,6 +2395,8 @@ BattleTextBox:: ; 3ac3
StdBattleTextBox:: ; 3ad5
; Open a textbox and print battle text at 20:hl.
+GLOBAL BattleText
+
ld a, [hROMBank]
push af
@@ -2411,6 +2413,9 @@ StdBattleTextBox:: ; 3ad5
Function3ae1:: ; 3ae1
+GLOBAL BattleAnimations
+GLOBAL BattleAnimCommands
+
ld a, BANK(BattleAnimations)
rst Bankswitch
@@ -2566,6 +2571,7 @@ UpdateSound:: ; 3b6a
_LoadMusicByte:: ; 3b86
; CurMusicByte = [a:de]
+GLOBAL LoadMusicByte
ld [hROMBank], a
ld [MBC3RomBank], a