Add constants for BANK[] statements

This will help people move them around, if need be. This should be removed as soon as rgbds supports this.
pret · Apr 28, 2019 · 9801e3c · 9801e3c
1 parent 6b3fbdb
commit 9801e3c
Show file tree

Hide file tree

Showing 60 changed files with 143 additions and 150 deletions.
diff --git a/audio/music/aftertherivalfight.asm b/audio/music/aftertherivalfight.asm
@@ -1,5 +1,4 @@
-; FLOAT: Must be in the same bank as "Music_LookRival"
-SECTION "Music_AfterTheRivalFight", ROMX, BANK[$3d]
+SECTION "Music_AfterTheRivalFight", ROMX, BANK[BANK_MUSIC_RIVAL_ENCOUNTER]
 
 Music_AfterTheRivalFight:
 	musicheader 4, 1, Music_AfterTheRivalFight_Ch1

diff --git a/audio/music/johtowildbattle.asm b/audio/music/johtowildbattle.asm
@@ -1,5 +1,4 @@
-; FLOAT: Referred to by "Music_JohtoWildBattleNight"
-SECTION "Music_JohtoWildBattle", ROMX, BANK[$3d]
+SECTION "Music_JohtoWildBattle", ROMX, BANK[BANK_MUSIC_JOHTO_WILD_BATTLE]
 
 Music_JohtoWildBattle:
 	musicheader 3, 1, Music_JohtoWildBattle_Ch1

diff --git a/audio/music/johtowildbattlenight.asm b/audio/music/johtowildbattlenight.asm
@@ -1,5 +1,4 @@
-; FLOAT: Must be in the same bank as "Music_JohtoWildBattle"
-SECTION "Music_JohtoWildBattleNight", ROMX, BANK[$3d]
+SECTION "Music_JohtoWildBattleNight", ROMX, BANK[BANK_MUSIC_JOHTO_WILD_BATTLE]
 
 Music_JohtoWildBattleNight:
 	musicheader 3, 1, Music_JohtoWildBattleNight_Ch1

diff --git a/audio/music/lookrival.asm b/audio/music/lookrival.asm
@@ -1,5 +1,4 @@
-; FLOAT: Referred to by "Music_AfterTheRivalFight"
-SECTION "Music_LookRival", ROMX, BANK[$3d]
+SECTION "Music_LookRival", ROMX, BANK[BANK_MUSIC_RIVAL_ENCOUNTER]
 
 Music_LookRival:
 	musicheader 4, 1, Music_LookRival_Ch1

diff --git a/audio/music/lookrocket.asm b/audio/music/lookrocket.asm
@@ -1,5 +1,4 @@
-; FLOAT: Referred to by "Music_RocketTheme"
-SECTION "Music_LookRocket", ROMX, BANK[$3d]
+SECTION "Music_LookRocket", ROMX, BANK[BANK_MUSIC_ROCKET_ENCOUNTER]
 
 Music_LookRocket:
 	musicheader 4, 1, Music_LookRocket_Ch1

diff --git a/audio/music/rockettheme.asm b/audio/music/rockettheme.asm
@@ -1,5 +1,4 @@
-; FLOAT: Must be in the same bank as "Music_LookRocket"
-SECTION "Music_RocketTheme", ROMX, BANK[$3d]
+SECTION "Music_RocketTheme", ROMX, BANK[BANK_MUSIC_ROCKET_ENCOUNTER]
 
 Music_RocketTheme:
 	musicheader 4, 1, Music_RocketTheme_Ch1

diff --git a/audio/music/successfulcapture.asm b/audio/music/successfulcapture.asm
@@ -1,5 +1,4 @@
-; FLOAT: Must be in the same bank as "Music_WildPokemonVictory"
-SECTION "Music_SuccessfulCapture", ROMX, BANK[$3d]
+SECTION "Music_SuccessfulCapture", ROMX, BANK[BANK_MUSIC_WILD_VICTORY]
 
 Music_SuccessfulCapture:
 	musicheader 3, 1, Music_SuccessfulCapture_Ch1

diff --git a/audio/music/wildpokemonvictory.asm b/audio/music/wildpokemonvictory.asm
@@ -1,5 +1,4 @@
-; FLOAT: Referred to by "Music_SuccessfulCapture"
-SECTION "Music_WildPokemonVictory", ROMX, BANK[$3d]
+SECTION "Music_WildPokemonVictory", ROMX, BANK[BANK_MUSIC_WILD_VICTORY]
 
 Music_WildPokemonVictory:
 	musicheader 3, 1, Music_WildPokemonVictory_Ch1

diff --git a/constants.asm b/constants.asm
@@ -2,6 +2,7 @@ INCLUDE "charmap.asm"
 
 INCLUDE "macros.asm"
 
+INCLUDE "constants/floating_constants.asm"
 INCLUDE "constants/hardware_constants.asm"
 INCLUDE "constants/deco_constants.asm"
 INCLUDE "constants/wram_constants.asm"

diff --git a/constants/floating_constants.asm b/constants/floating_constants.asm
@@ -0,0 +1,47 @@
+; This file is a stop-gap solution until the assembler supports BANK[] with section/label names.
+; Floating-related caveats that aren't listed in this file, are commented with the FLOAT keyword.
+; These constants shouldn't *ever* be used as a replacement for BANK()!
+
+; See gfx/pics.asm
+BANK_PICS EQU $48
+
+; See gfx/sprites.asm
+BANK_SPRITES EQU $30
+
+; These functions are expected to be in the same bank by Init
+BANK_GAME_INIT EQU $01 ; {WriteOAMDMACodeToHram, GameInit}
+
+; ASCII Hacks
+; Sections using these are split for the sole purpose of using a different charmap
+BANK_MOBILE_40 EQU $40
+BANK_MOBILE_46 EQU $46
+
+; Tracks with alternate versions
+BANK_MUSIC_WILD_VICTORY      EQU $3d
+BANK_MUSIC_RIVAL_ENCOUNTER   EQU $3d
+BANK_MUSIC_JOHTO_WILD_BATTLE EQU $3d
+BANK_MUSIC_ROCKET_ENCOUNTER  EQU $3d
+
+; Maps
+BANK_MAP_RUINS_OF_ALPH_RESEARCH_CENTER EQU $16 ; RuinsOfAlphKabutoChamberScientistScript -> RuinsOfAlphResearchCenterScientist1Text_GotAllUnown
+BANK_MAP_ROUTE_35_NATIONAL_PARK_GATE   EQU $1a ; Route36NationalParkGate_MapEvents -> BugCatchingContestExplanationSign
+BANK_MAP_CELADON_DEPT_STORE_1F         EQU $1c ; CeladonDeptStore6F_MapEvents -> CeladonDeptSotre1FElevatorButton
+BANK_MAP_BATTLE_TOWER                  EQU $27
+BANK_MAP_COLOSSEUM                     EQU $64 ; TradeCenter_MapEvents -> CableClubFriendScript
+
+; Code
+BANK_HAPPINESS           EQU $01 ; {GetFirstPokemonHappiness, CheckFirstMonIsEgg} -> CopyPokemonName_Buffer1_Buffer3; HaircutOrGrooming -> ChangeHappiness
+BANK_MAP_OBJECTS         EQU $01 ; MapObjectMovementPattern -> CanObjectMoveInDirection; ReanchorBGMap_NoOAMUpdate -> ApplyBGMapAnchorToObjects
+BANK_ANIMATE_HP_BAR      EQU $03 ; AnimateHPBar -> _AnimateHPBar; {_AnimateHPBar, LongAnim_UpdateVariables, LongHPBarAnim_Updatetiles} -> ComputeHPBarPixels
+BANK_MOVE_MON            EQU $03 ; RetrieveMonFromDayCareMan -> GetBreedMon1LevelGrowth; RetrieveMonFromDayCareLady -> GetBreedMon2LevelGrowth; BugContest_SetCaughtContestMon -> GeneratePartyMonStats
+BANK_BUG_CONTEST_JUDGING EQU $04 ; ComputeAIContestantScores -> CheckBugContestContestantFlag
+BANK_PACK                EQU $04 ; GiveItem -> TryGiveItemToPartymon
+BANK_BUY_SELL_TOSS       EQU $09 ; Kurt_SelectQuantity_InterpretJoypad -> BuySellToss_InterpretJoypad
+BANK_TRAINER_ATTRIBUTES  EQU $0e ; {AI_SwitchOrTryItem, AI_TryItem} -> TrainerClassAttributes
+BANK_PARTY_MENU          EQU $14 ; PlacePartyMonGender -> GetGender; PlacePartyMonStatus -> PlaceStatusString
+BANK_MOBILE_22           EQU $22
+BANK_BATTLE_TRANSITION   EQU $23 ; {DoBattleTransition, StartTrainerBattle_LoadPokeBallGraphics} -> BattleStart_CopyTilemapAtOnce
+BANK_PHONE_CALL          EQU $24 ; PokegearPhone_MakePhoneCall -> Function90199; PokegearPhone_UpdateDisplayList -> Function90380
+BANK_BUG_CONTEST_RESULTS EQU $2f ; BugContestResultsWarpScript -> Movement_ContestResults_WalkAfterWarp
+BANK_PHONE_TIFFANY       EQU $2f ; TiffanysFamilyMemebers -> {GrandmaString, GrandpaString, MomString, DadString, SisterString, BrotherString}
+BANK_DUMMY_GAME          EQU $38 ; _DummyGame -> {Unknown_e00ed, ret_e00ed}
diff --git a/engine/battle/ai/items.asm b/engine/battle/ai/items.asm
@@ -1,5 +1,4 @@
-; FLOAT: Must be in the same bank as TrainerClassAttributes
-SECTION "AI_SwitchOrTryItem - TextJump_EnemyUsedOn", ROMX, BANK[$0e]
+SECTION "AI_SwitchOrTryItem - TextJump_EnemyUsedOn", ROMX, BANK[BANK_TRAINER_ATTRIBUTES]
 
 AI_SwitchOrTryItem:
 	and a

diff --git a/engine/battle/anim_hp_bar.asm b/engine/battle/anim_hp_bar.asm
@@ -1,5 +1,4 @@
-; FLOAT: Must be in the same bank as ComputeHPBarPixels
-SECTION "_AnimateHPBar - ShortHPBar_CalcPixelFrame", ROMX, BANK[$03]
+SECTION "_AnimateHPBar - ShortHPBar_CalcPixelFrame", ROMX, BANK[BANK_ANIMATE_HP_BAR]
 
 _AnimateHPBar:
 	call .IsMaximumMoreThan48Pixels

diff --git a/engine/battle/battle_transition.asm b/engine/battle/battle_transition.asm
@@ -9,8 +9,7 @@ BATTLETRANSITION_END              EQU $80
 BATTLETRANSITION_SQUARE EQU "8" ; $fe
 
 
-; FLOAT: Must be in the same bank as BattleStart_CopyTilemapAtOnce
-SECTION "DoBattleTransition - StartTrainerBattle_ZoomToBlack", ROMX, BANK[$23]
+SECTION "DoBattleTransition - StartTrainerBattle_ZoomToBlack", ROMX, BANK[BANK_BATTLE_TRANSITION]
 
 DoBattleTransition:
 	call .InitGFX

diff --git a/engine/battle/battlestart_copytilemapatonce.asm b/engine/battle/battlestart_copytilemapatonce.asm
@@ -1,5 +1,4 @@
-; FLOAT: Referred to by DoBattleTransition and StartTrainerBattle_LoadPokeBallGraphics
-SECTION "BattleStart_CopyTilemapAtOnce", ROMX, BANK[$23]
+SECTION "BattleStart_CopyTilemapAtOnce", ROMX, BANK[BANK_BATTLE_TRANSITION]
 
 BattleStart_CopyTilemapAtOnce:
 	call CGBOnly_CopyTilemapAtOnce

diff --git a/engine/battle/read_trainer_attributes.asm b/engine/battle/read_trainer_attributes.asm
@@ -1,5 +1,4 @@
-; FLOAT: Referred to by "AI_SwitchOrTryItem - TextJump_EnemyUsedOn"
-SECTION "GetTrainerClassName - TrainerClassAttributes", ROMX, BANK[$0e]
+SECTION "GetTrainerClassName - TrainerClassAttributes", ROMX, BANK[BANK_TRAINER_ATTRIBUTES]
 
 GetTrainerClassName:
 	ld hl, wRivalName

diff --git a/engine/events/bug_contest/caught_mon.asm b/engine/events/bug_contest/caught_mon.asm
@@ -1,5 +1,4 @@
-; FLOAT: Must be in the same bank as GeneratePartyMonStats
-SECTION "BugContest_SetCaughtContestMon", ROMX, BANK[$03]
+SECTION "BugContest_SetCaughtContestMon", ROMX, BANK[BANK_MOVE_MON]
 
 BugContest_SetCaughtContestMon:
 	ld a, [wContestMon]

diff --git a/engine/events/bug_contest/contest_2.asm b/engine/events/bug_contest/contest_2.asm
@@ -1,5 +1,4 @@
-; FLOAT: Referred to by ComputeAIContestantScores
-SECTION "SelectRandomBugContestContestants - BugCatchingContestantEventFlagTable", ROMX, BANK[$04]
+SECTION "SelectRandomBugContestContestants - BugCatchingContestantEventFlagTable", ROMX, BANK[BANK_BUG_CONTEST_JUDGING]
 
 SelectRandomBugContestContestants:
 ; Select five random people to participate in the current contest.

diff --git a/engine/events/bug_contest/judging.asm b/engine/events/bug_contest/judging.asm
@@ -1,5 +1,4 @@
-; FLOAT: Must be in the same bank as CheckBugContestContestantFlag
-SECTION "_BugContestJudging - ContestScore", ROMX, BANK[$04]
+SECTION "_BugContestJudging - ContestScore", ROMX, BANK[BANK_BUG_CONTEST_JUDGING]
 
 _BugContestJudging:
 	call ContestScore

diff --git a/engine/events/haircut.asm b/engine/events/haircut.asm
@@ -1,5 +1,4 @@
-; FLOAT: Must be in the same bank as "GetFirstPokemonHappiness - HappinessChanges"
-SECTION "BillsGrandfather - CopyPokemonName_Buffer1_Buffer3", ROMX, BANK[$01]
+SECTION "BillsGrandfather - CopyPokemonName_Buffer1_Buffer3", ROMX, BANK[BANK_HAPPINESS]
 
 BillsGrandfather:
 	farcall SelectMonFromParty

diff --git a/engine/events/happiness_egg.asm b/engine/events/happiness_egg.asm
@@ -1,5 +1,4 @@
-; FLOAT: Must be in the same bank as "BillsGrandfather - CopyPokemonName_Buffer1_Buffer3"
-SECTION "GetFirstPokemonHappiness - HappinessChanges", ROMX, BANK[$01]
+SECTION "GetFirstPokemonHappiness - HappinessChanges", ROMX, BANK[BANK_HAPPINESS]
 
 GetFirstPokemonHappiness:
 	ld hl, wPartyMon1Happiness

diff --git a/engine/events/kurt_selectquantity_interpretjoypad.asm b/engine/events/kurt_selectquantity_interpretjoypad.asm
@@ -1,5 +1,4 @@
-; FLOAT: Must be in the same bank as BuySellToss_InterpretJoypad
-SECTION "Kurt_SelectQuantity_InterpretJoypad", ROMX, BANK[$09]
+SECTION "Kurt_SelectQuantity_InterpretJoypad", ROMX, BANK[BANK_BUY_SELL_TOSS]
 
 Kurt_SelectQuantity_InterpretJoypad:
 	call BuySellToss_InterpretJoypad

diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm
@@ -373,8 +373,7 @@ RadioTowerRocketsScript:
 	end
 
 
-; FLOAT: Must be in the same bank as Movement_ContestResults_WalkAfterWarp
-SECTION "BugContestResultsWarpScript - BugContestResults_CopyContestantsToResults", ROMX, BANK[$2f]
+SECTION "BugContestResultsWarpScript - BugContestResults_CopyContestantsToResults", ROMX, BANK[BANK_BUG_CONTEST_RESULTS]
 
 BugContestResultsWarpScript:
 	special ClearBGPalettes
@@ -2043,8 +2042,7 @@ HappinessCheckScript:
 	end
 
 
-; FLOAT: Referred to by BugContestResultsWarpScript
-SECTION "Movement_ContestResults_WalkAfterWarp", ROMX, BANK[$2f]
+SECTION "Movement_ContestResults_WalkAfterWarp", ROMX, BANK[BANK_BUG_CONTEST_RESULTS]
 
 Movement_ContestResults_WalkAfterWarp:
 	step RIGHT

diff --git a/engine/games/card_flip.asm b/engine/games/card_flip.asm
@@ -4,8 +4,7 @@ CARDFLIP_LIGHT_ON  EQU "♀" ; $f5
 CARDFLIP_DECK_SIZE EQU 4 * 6
 
 
-; FLOAT: Referred to by _DummyGame
-SECTION "Unknown_e00ed", ROMX, BANK[$38]
+SECTION "Unknown_e00ed", ROMX, BANK[BANK_DUMMY_GAME]
 
 ; two labels below called from inside ./dummy_game.asm
 Unknown_e00ed:

diff --git a/engine/games/dummy_game.asm b/engine/games/dummy_game.asm
@@ -1,5 +1,4 @@
-; FLOAT: Must be in the same bank as ret_e00ed
-SECTION "_DummyGame - LZ_e2221", ROMX, BANK[$38]
+SECTION "_DummyGame - LZ_e2221", ROMX, BANK[BANK_DUMMY_GAME]
 
 _DummyGame:
 	call .LoadGFXAndPals

diff --git a/engine/gfx/load_push_oam.asm b/engine/gfx/load_push_oam.asm
@@ -1,5 +1,4 @@
-; FLOAT: Must be in the same bank as GameInit
-SECTION "WriteOAMDMACodeToHRAM", ROMX, BANK[$01]
+SECTION "WriteOAMDMACodeToHRAM", ROMX, BANK[BANK_GAME_INIT]
 
 WriteOAMDMACodeToHRAM::
 	ld c, LOW(hTransferVirtualOAM)

diff --git a/engine/items/buy_sell_toss.asm b/engine/items/buy_sell_toss.asm
@@ -1,5 +1,4 @@
-; FLOAT: Referred to by Kurt_SelectQuantity_InterpretJoypad
-SECTION "SelectQuantityToToss - SellItem_MenuHeader", ROMX, BANK[$09]
+SECTION "SelectQuantityToToss - SellItem_MenuHeader", ROMX, BANK[BANK_BUY_SELL_TOSS]
 
 SelectQuantityToToss:
 	ld hl, TossItem_MenuHeader

diff --git a/engine/items/pack.asm b/engine/items/pack.asm
@@ -13,8 +13,7 @@
 	const PACKSTATE_QUITRUNSCRIPT      ; 10
 
 
-; FLOAT: Must be in the same bank as TryGiveItemToPartymon
-SECTION "Pack - PackGFX", ROMX, BANK[$04]
+SECTION "Pack - PackGFX", ROMX, BANK[BANK_PACK]
 
 Pack:
 	ld hl, wOptions

diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm
@@ -1,5 +1,4 @@
-; FLOAT: Must be in the same bank as WriteOAMDMACodeToHRAM
-SECTION "_MainMenu - GameInit", ROMX, BANK[$01]
+SECTION "_MainMenu - GameInit", ROMX, BANK[BANK_GAME_INIT]
 
 _MainMenu:
 	ld de, MUSIC_NONE

diff --git a/engine/menus/start_menu.asm b/engine/menus/start_menu.asm
@@ -10,8 +10,7 @@
 	const STARTMENUITEM_POKEGEAR ; 7
 	const STARTMENUITEM_QUIT     ; 8
 
-; FLOAT: Referred to by GiveItem
-SECTION "StartMenu - UseRegisteredItem", ROMX, BANK[$04]
+SECTION "StartMenu - UseRegisteredItem", ROMX, BANK[BANK_PACK]
 
 StartMenu::
 	call ClearWindowData

diff --git a/engine/overworld/init_map.asm b/engine/overworld/init_map.asm
@@ -1,5 +1,4 @@
-; FLOAT: Must be in the same bank as ApplyBGMapAnchorToObjects
-SECTION "ReanchorBGMap_NoOAMUpdate - HDMATransfer_FillBGMap0WithBlack", ROMX, BANK[$01]
+SECTION "ReanchorBGMap_NoOAMUpdate - HDMATransfer_FillBGMap0WithBlack", ROMX, BANK[BANK_MAP_OBJECTS]
 
 ReanchorBGMap_NoOAMUpdate::
 	call DelayFrame

diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm
@@ -1,6 +1,4 @@
-; FLOAT: Referred to by ReanchorBGMap_NoOAMUpdate
-; FLOAT: Must be in the same bank as CanObjectMoveInDirection
-SECTION "Facings - InitSprites", ROMX, BANK[$01]
+SECTION "Facings - InitSprites", ROMX, BANK[BANK_MAP_OBJECTS]
 
 INCLUDE "data/sprites/facings.asm"
 

diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm
@@ -1,5 +1,4 @@
-; FLOAT: Referred to by MapObjectMovementPattern
-SECTION "CanObjectMoveInDirection - Function7171", ROMX, BANK[$01]
+SECTION "CanObjectMoveInDirection - Function7171", ROMX, BANK[BANK_MAP_OBJECTS]
 
 CanObjectMoveInDirection:
 	ld hl, OBJECT_PALETTE

diff --git a/engine/phone/phone.asm b/engine/phone/phone.asm
@@ -96,8 +96,7 @@ GetRemainingSpaceInPhoneList:
 INCLUDE "data/phone/permanent_numbers.asm"
 
 
-; FLOAT: Referred to by PokegearPhone_MakePhoneCall and PokegearPhone_UpdateDisplayList
-SECTION "FarPlaceString - UnknownText_0x9066d", ROMX, BANK[$24]
+SECTION "FarPlaceString - UnknownText_0x9066d", ROMX, BANK[BANK_PHONE_CALL]
 
 FarPlaceString:
 	ldh a, [hROMBank]

diff --git a/engine/phone/scripts/generic_callee.asm b/engine/phone/scripts/generic_callee.asm
@@ -1258,8 +1258,7 @@ PhoneScript_MonFlavorText:
 	farsjump PhoneScript_HangupText_Male
 
 
-; FLOAT: Referred to by TiffanysFamilyMembers
-SECTION "GrandmaString - BrotherString", ROMX, BANK[$2f]
+SECTION "GrandmaString - BrotherString", ROMX, BANK[BANK_PHONE_TIFFANY]
 
 GrandmaString: db "Grandma@"
 GrandpaString: db "Grandpa@"

diff --git a/engine/phone/scripts/tiffany.asm b/engine/phone/scripts/tiffany.asm
@@ -1,5 +1,4 @@
-; FLOAT: Must be in the same bank as "GrandmaString - BrotherString"
-SECTION "TiffanyPhoneCalleeScript - TiffanyHasPinkBow", ROMX, BANK[$2f]
+SECTION "TiffanyPhoneCalleeScript - TiffanyHasPinkBow", ROMX, BANK[BANK_PHONE_TIFFANY]
 
 TiffanyPhoneCalleeScript:
 	gettrainername STRING_BUFFER_3, PICNICKER, TIFFANY3

diff --git a/engine/pokegear/pokegear.asm b/engine/pokegear/pokegear.asm
@@ -23,8 +23,7 @@ NUM_POKEGEAR_CARDS EQU const_value
 	const POKEGEARSTATE_RADIOJOYPAD     ; c
 
 
-; FLOAT: Must be in the same bank as Function90199 and Function90380
-SECTION "PokeGear - PlayRadio", ROMX, BANK[$24]
+SECTION "PokeGear - PlayRadio", ROMX, BANK[BANK_PHONE_CALL]
 
 PokeGear:
 	ld hl, wOptions

diff --git a/engine/pokemon/breedmon_level_growth.asm b/engine/pokemon/breedmon_level_growth.asm
@@ -1,5 +1,4 @@
-; FLOAT: Referred to by RetrieveMonFromDayCareMan and RetrieveMonFromDayCareLady
-SECTION "GetBreedMon1LevelGrowth - GetBreedMon2LevelGrowth", ROMX, BANK[$03]
+SECTION "GetBreedMon1LevelGrowth - GetBreedMon2LevelGrowth", ROMX, BANK[BANK_MOVE_MON]
 
 GetBreedMon1LevelGrowth:
 	ld hl, wBreedMon1Stats

diff --git a/engine/pokemon/health.asm b/engine/pokemon/health.asm
@@ -55,8 +55,7 @@ HealPartyMon:
 	ret
 
 
-; FLOAT: Must be in the same bank as _AnimateHPBar
-SECTION "ComputeHPBarPixels - AnimateHPBar", ROMX, BANK[$03]
+SECTION "ComputeHPBarPixels - AnimateHPBar", ROMX, BANK[BANK_ANIMATE_HP_BAR]
 
 ComputeHPBarPixels:
 ; e = bc * (6 * 8) / de

diff --git a/engine/pokemon/mon_stats.asm b/engine/pokemon/mon_stats.asm
@@ -127,8 +127,7 @@ PrintTempMonStats:
 	next "@"
 
 
-; FLOAT: Referred to by PlacePartyMonGender
-SECTION "GetGender", ROMX, BANK[$14]
+SECTION "GetGender", ROMX, BANK[BANK_PARTY_MENU]
 
 GetGender:
 ; Return the gender of a given monster (wCurPartyMon/wCurOTMon/wCurWildMon).
@@ -383,8 +382,7 @@ Unused_PlaceEnemyHPLevel:
 	ret
 
 
-; FLOAT: Referred to by PlacePartyMonStatus
-SECTION "PlaceStatusString - ParString", ROMX, BANK[$14]
+SECTION "PlaceStatusString - ParString", ROMX, BANK[BANK_PARTY_MENU]
 
 PlaceStatusString:
 	push de

diff --git a/engine/pokemon/move_mon.asm b/engine/pokemon/move_mon.asm
@@ -1,9 +1,7 @@
 RANDY_OT_ID EQU 01001
 
 
-; FLOAT: Must be in the same bank as GetBreedMon1LevelGrowth and GetBreedMon2LevelGrowth
-;        Referred to by BugContest_SetCaughtContestMon.
-SECTION "TryAddMonToParty - InitNickname", ROMX, BANK[$03]
+SECTION "TryAddMonToParty - InitNickname", ROMX, BANK[BANK_MOVE_MON]
 
 TryAddMonToParty:
 ; Check if to copy wild mon or generate a new one

diff --git a/engine/pokemon/party_menu.asm b/engine/pokemon/party_menu.asm
@@ -1,5 +1,4 @@
-; FLOAT: Must be in the same bank as GetGender and PlaceStatusString
-SECTION "SelectMonFromParty - YouHaveNoPKMNString", ROMX, BANK[$14]
+SECTION "SelectMonFromParty - YouHaveNoPKMNString", ROMX, BANK[BANK_PARTY_MENU]
 
 SelectMonFromParty:
 	call DisableSpriteUpdates