summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
Diffstat (limited to 'engine')
-rw-r--r--engine/battle/ai/scoring.asm2
-rw-r--r--engine/battle/core.asm2
-rw-r--r--engine/battle/effect_commands.asm4
-rw-r--r--engine/battle_anims/anim_commands.asm2
-rw-r--r--engine/events/catch_tutorial_input.asm2
-rw-r--r--engine/items/item_effects.asm12
-rw-r--r--engine/movie/credits.asm2
-rw-r--r--engine/pokedex/pokedex_2.asm8
-rw-r--r--engine/pokegear/radio.asm8
-rw-r--r--engine/pokemon/breeding.asm8
-rw-r--r--engine/pokemon/party_menu.asm2
-rw-r--r--engine/printer/print_party.asm2
12 files changed, 27 insertions, 27 deletions
diff --git a/engine/battle/ai/scoring.asm b/engine/battle/ai/scoring.asm
index 567737c1f..d000fab5f 100644
--- a/engine/battle/ai/scoring.asm
+++ b/engine/battle/ai/scoring.asm
@@ -1,4 +1,4 @@
-AIScoring: ; 38591
+AIScoring: ; used only for BANK(AIScoring)
AI_Basic: ; 38591
; Don't do anything redundant:
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 3055f4e90..f7e461c80 100644
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -1,5 +1,5 @@
; Core components of the battle engine.
-BattleCore:
+
DoBattle: ; 3c000
xor a
ld [wBattleParticipantsNotFainted], a
diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm
index 2723bba6b..ff114d870 100644
--- a/engine/battle/effect_commands.asm
+++ b/engine/battle/effect_commands.asm
@@ -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
diff --git a/engine/battle_anims/anim_commands.asm b/engine/battle_anims/anim_commands.asm
index 1f4da606d..449febf5f 100644
--- a/engine/battle_anims/anim_commands.asm
+++ b/engine/battle_anims/anim_commands.asm
@@ -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
diff --git a/engine/events/catch_tutorial_input.asm b/engine/events/catch_tutorial_input.asm
index 9d2a03db2..70f4f0ef7 100644
--- a/engine/events/catch_tutorial_input.asm
+++ b/engine/events/catch_tutorial_input.asm
@@ -15,7 +15,7 @@ _DudeAutoInput: ; 1de299
call StartAutoInput
ret
-DudeAutoInputs:
+DudeAutoInputs: ; used only for BANK(DudeAutoInputs)
DudeAutoInput_A: ; 1de29f
db NO_INPUT, $50
diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm
index a32ce0ef7..db0ee1be1 100644
--- a/engine/items/item_effects.asm
+++ b/engine/items/item_effects.asm
@@ -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
diff --git a/engine/movie/credits.asm b/engine/movie/credits.asm
index 1aaecf64a..87ebfb14f 100644
--- a/engine/movie/credits.asm
+++ b/engine/movie/credits.asm
@@ -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"
diff --git a/engine/pokedex/pokedex_2.asm b/engine/pokedex/pokedex_2.asm
index b17832216..cca246ec7 100644
--- a/engine/pokedex/pokedex_2.asm
+++ b/engine/pokedex/pokedex_2.asm
@@ -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
diff --git a/engine/pokegear/radio.asm b/engine/pokegear/radio.asm
index ffaef80f0..a4eb345d4 100644
--- a/engine/pokegear/radio.asm
+++ b/engine/pokegear/radio.asm
@@ -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
diff --git a/engine/pokemon/breeding.asm b/engine/pokemon/breeding.asm
index e32d1a3a6..cc32122a7 100644
--- a/engine/pokemon/breeding.asm
+++ b/engine/pokemon/breeding.asm
@@ -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]
diff --git a/engine/pokemon/party_menu.asm b/engine/pokemon/party_menu.asm
index 11edc0412..da9ae7e10 100644
--- a/engine/pokemon/party_menu.asm
+++ b/engine/pokemon/party_menu.asm
@@ -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
diff --git a/engine/printer/print_party.asm b/engine/printer/print_party.asm
index 1095ce584..fa225a2a9 100644
--- a/engine/printer/print_party.asm
+++ b/engine/printer/print_party.asm
@@ -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...@"