Note which labels are only needed for locating banks (relevant to issue #485)

This commit is contained in:
Rangi
2018-06-12 23:29:15 -04:00
parent 6130fc5cd6
commit fbe82a7fe0
27 changed files with 62 additions and 67 deletions

View File

@@ -1,4 +1,4 @@
AIScoring: ; 38591
AIScoring: ; used only for BANK(AIScoring)
AI_Basic: ; 38591
; Don't do anything redundant:

View File

@@ -1,5 +1,5 @@
; Core components of the battle engine.
BattleCore:
DoBattle: ; 3c000
xor a
ld [wBattleParticipantsNotFainted], a

View File

@@ -7394,7 +7394,7 @@ PlayOpponentBattleAnim: ; 37e54
CallBattleCore: ; 37e73
ld a, BANK(BattleCore)
ld a, BANK("Battle Core")
rst FarCall
ret
@@ -7467,7 +7467,7 @@ GetMoveData: ; 37ead
ld hl, Moves
ld bc, MOVE_LENGTH
call AddNTimes
ld a, Bank(Moves)
ld a, BANK(Moves)
jp FarCopyBytes
; 37ebb

View File

@@ -977,7 +977,7 @@ BattleAnimCmd_RaiseSub: ; cc640 (33:4640)
xor a ; sScratch
call GetSRAMBank
GetSubstitutePic: ; cc64c
GetSubstitutePic: ; used only for BANK(GetSubstitutePic)
ld hl, sScratch
ld bc, (7 * 7) tiles

View File

@@ -15,7 +15,7 @@ _DudeAutoInput: ; 1de299
call StartAutoInput
ret
DudeAutoInputs:
DudeAutoInputs: ; used only for BANK(DudeAutoInputs)
DudeAutoInput_A: ; 1de29f
db NO_INPUT, $50

View File

@@ -767,10 +767,10 @@ GetPokedexEntryBank:
ret
.PokedexEntryBanks:
db BANK(PokedexEntries1)
db BANK(PokedexEntries2)
db BANK(PokedexEntries3)
db BANK(PokedexEntries4)
db BANK("Pokedex Entries 001-064")
db BANK("Pokedex Entries 065-128")
db BANK("Pokedex Entries 129-192")
db BANK("Pokedex Entries 193-251")
HeavyBallMultiplier:
; subtract 20 from catch rate if weight < 102.4 kg
@@ -907,7 +907,7 @@ MoonBallMultiplier:
pop bc
push bc
ld a, BANK(EvosAttacks)
ld a, BANK("Evolutions and Attacks")
call GetFarByte
cp EVOLVE_ITEM
pop bc
@@ -921,7 +921,7 @@ MoonBallMultiplier:
; No Pokémon evolve with Burn Heal,
; so Moon Balls always have a catch rate of 1×.
push bc
ld a, BANK(EvosAttacks)
ld a, BANK("Evolutions and Attacks")
call GetFarByte
cp MOON_STONE_RED ; BURN_HEAL
pop bc

View File

@@ -611,7 +611,7 @@ Credits_TheEnd: ; 109c11 (42:5c11)
CreditsBorderGFX: INCBIN "gfx/credits/border.2bpp"
CreditsMonsGFX:
CreditsMonsGFX: ; used only for BANK(CreditsMonsGFX)
CreditsPichuGFX: INCBIN "gfx/credits/pichu.2bpp"
CreditsSmoochumGFX: INCBIN "gfx/credits/smoochum.2bpp"
CreditsDittoGFX: INCBIN "gfx/credits/ditto.2bpp"

View File

@@ -242,10 +242,10 @@ GetDexEntryPointer: ; 44333
ret
.PokedexEntryBanks:
db BANK(PokedexEntries1)
db BANK(PokedexEntries2)
db BANK(PokedexEntries3)
db BANK(PokedexEntries4)
db BANK("Pokedex Entries 001-064")
db BANK("Pokedex Entries 065-128")
db BANK("Pokedex Entries 129-192")
db BANK("Pokedex Entries 193-251")
GetDexEntryPagePointer: ; 44355
call GetDexEntryPointer ; b:de

View File

@@ -703,10 +703,10 @@ PokedexShow_GetDexEntryBank:
ret
.PokedexEntryBanks:
db BANK(PokedexEntries1)
db BANK(PokedexEntries2)
db BANK(PokedexEntries3)
db BANK(PokedexEntries4)
db BANK("Pokedex Entries 001-064")
db BANK("Pokedex Entries 065-128")
db BANK("Pokedex Entries 129-192")
db BANK("Pokedex Entries 193-251")
PokedexShow1:
call StartRadioStation

View File

@@ -445,7 +445,7 @@ GetEggMove: ; 170e4
ld a, BANK(EggMovePointers)
call GetFarHalfword
.loop
ld a, BANK(EggMoves)
ld a, BANK("Egg Moves")
call GetFarByte
cp -1
jr z, .reached_end
@@ -479,18 +479,18 @@ GetEggMove: ; 170e4
ld a, BANK(EvosAttacksPointers)
call GetFarHalfword
.loop3
ld a, BANK(EvosAttacks)
ld a, BANK("Evolutions and Attacks")
call GetFarByte
inc hl
and a
jr nz, .loop3
.loop4
ld a, BANK(EvosAttacks)
ld a, BANK("Evolutions and Attacks")
call GetFarByte
and a
jr z, .inherit_tmhm
inc hl
ld a, BANK(EvosAttacks)
ld a, BANK("Evolutions and Attacks")
call GetFarByte
ld b, a
ld a, [de]

View File

@@ -416,7 +416,7 @@ PlacePartyMonEvoStoneCompatibility: ; 5022f
ld h, [hl]
ld l, a
ld de, wStringBuffer1
ld a, BANK(EvosAttacks)
ld a, BANK("Evolutions and Attacks")
ld bc, 10
call FarCopyBytes
ld hl, wStringBuffer1

View File

@@ -103,7 +103,7 @@ PrintPage2: ; 1dc213
ret
; 1dc275
GBPrinterStrings:
GBPrinterStrings: ; used only for BANK(GBPrinterStrings)
GBPrinterString_Null: db "@"
GBPrinterString_CheckingLink: next " CHECKING LINK...@"
GBPrinterString_Transmitting: next " TRANSMITTING...@"