ref: ff6306400b2272a863fb55edbc00c6a22f24230f
parent: 1202e68d2f695d4b91d184bd43139dbe10cb8131
parent: 30218eb3d6c0b523a302ac38601b4630c564aeb1
author: Bryan Bishop <[email protected]>
date: Tue Feb 4 19:16:48 EST 2014
Merge pull request #229 from yenatch/nuke-globals Use globals to implicitly define labels before passing them into BANK().
--- a/home.asm
+++ b/home.asm
@@ -2395,6 +2395,8 @@
StdBattleTextBox:: ; 3ad5
; Open a textbox and print battle text at 20:hl.
+GLOBAL BattleText
+
ld a, [hROMBank]
push af
@@ -2411,6 +2413,9 @@
Function3ae1:: ; 3ae1
+GLOBAL BattleAnimations
+GLOBAL BattleAnimCommands
+
ld a, BANK(BattleAnimations)
rst Bankswitch
@@ -2566,6 +2571,7 @@
_LoadMusicByte:: ; 3b86
; CurMusicByte = [a:de]
+GLOBAL LoadMusicByte
ld [hROMBank], a
ld [MBC3RomBank], a
--- a/items/item_effects.asm
+++ b/items/item_effects.asm
@@ -770,6 +770,12 @@
ret
.PokedexEntryBanks
+
+GLOBAL PokedexEntries1
+GLOBAL PokedexEntries2
+GLOBAL PokedexEntries3
+GLOBAL PokedexEntries4
+
db BANK(PokedexEntries1)
db BANK(PokedexEntries2)
db BANK(PokedexEntries3)
@@ -895,6 +901,10 @@
Function_0xecdd: ; ecdd
+
+GLOBAL EvosAttacks
+GLOBAL EvosAttacksPointers
+
push bc
ld a, [TempEnemyMonSpecies]
dec a
--- a/main.asm
+++ b/main.asm
@@ -41638,6 +41638,12 @@
; 44351
PokedexEntryBanks: ; 44351
+
+GLOBAL PokedexEntries1
+GLOBAL PokedexEntries2
+GLOBAL PokedexEntries3
+GLOBAL PokedexEntries4
+
db BANK(PokedexEntries1)
db BANK(PokedexEntries2)
db BANK(PokedexEntries3)