dbw BANK, addr replaced with dba

2025-09-08 08:13:02 -07:00 · 2015-11-03 19:43:47 -05:00
parent 10beeb3c06
commit c5527a02ae
19 changed files with 593 additions and 589 deletions
--- a/engine/map_setup.asm
+++ b/engine/map_setup.asm
@@ -243,52 +243,52 @@ endr
 ; 15440

 MapSetupCommands: ; 15440
-	dbw BANK(EnableLCD), EnableLCD ; 00
-	dbw BANK(DisableLCD), DisableLCD ; 01
-	dbw BANK(SoundRestart), SoundRestart ; 02
-	dbw BANK(PlayMapMusic), PlayMapMusic ; 03
-	dbw BANK(RestartMapMusic), RestartMapMusic ; 04
-	dbw BANK(FadeToMapMusic), FadeToMapMusic ; 05
-	dbw BANK(FadeOutMapAndMusic), FadeOutMapAndMusic ; 06
-	dbw BANK(EnterMapMusic), EnterMapMusic ; 07
-	dbw BANK(ForceMapMusic), ForceMapMusic ; 08
-	dbw BANK(CrankUpTheVolume), CrankUpTheVolume ; 09
-	dbw BANK(LoadBlockData), LoadBlockData ; 0a
-	dbw BANK(LoadNeighboringBlockData), LoadNeighboringBlockData ; 0b
-	dbw BANK(SaveScreen), SaveScreen ; 0c
-	dbw BANK(BufferScreen), BufferScreen ; 0d
-	dbw BANK(LoadGraphics), LoadGraphics ; 0e
-	dbw BANK(LoadTilesetHeader), LoadTilesetHeader ; 0f
-	dbw BANK(LoadMapTimeOfDay), LoadMapTimeOfDay ; 10
-	dbw BANK(LoadMapPalettes), LoadMapPalettes ; 11
-	dbw BANK(LoadWildMonData), LoadWildMonData ; 12
-	dbw BANK(RefreshMapSprites), RefreshMapSprites ; 13
-	dbw BANK(RunCallback_05_03), RunCallback_05_03 ; 14
-	dbw BANK(RunCallback_03), RunCallback_03 ; 15
-	dbw BANK(LoadObjectsRunCallback_02), LoadObjectsRunCallback_02 ; 16
-	dbw BANK(LoadSpawnPoint), LoadSpawnPoint ; 17
-	dbw BANK(EnterMapConnection), EnterMapConnection ; 18
-	dbw BANK(LoadWarpData), LoadWarpData ; 19
-	dbw BANK(LoadMapAttributes), LoadMapAttributes ; 1a
-	dbw BANK(LoadMapAttributes_IgnoreHidden), LoadMapAttributes_IgnoreHidden ; 1b
-	dbw BANK(WhiteBGMap), WhiteBGMap ; 1c
-	dbw BANK(FadeBlackBGMap), FadeBlackBGMap ; 1d
-	dbw BANK(FadeInBGMap), FadeInBGMap ; 1e
-	dbw BANK(GetCoordOfUpperLeftCorner), GetCoordOfUpperLeftCorner ; 1f
-	dbw BANK(RestoreFacingAfterWarp), RestoreFacingAfterWarp ; 20
-	dbw BANK(SpawnInFacingDown), SpawnInFacingDown ; 21
-	dbw BANK(GetSpawnCoord), GetSpawnCoord ; 22
-	dbw BANK(RefreshPlayerCoords), RefreshPlayerCoords ; 23
-	dbw BANK(DelayClearingOldSprites), DelayClearingOldSprites ; 24
-	dbw BANK(DelayLoadingNewSprites), DelayLoadingNewSprites ; 25
-	dbw BANK(UpdateRoamMons), UpdateRoamMons ; 26
-	dbw BANK(JumpRoamMons), JumpRoamMons ; 27
-	dbw BANK(FadeOldMapMusic), FadeOldMapMusic ; 28
-	dbw BANK(ActivateMapAnims), ActivateMapAnims ; 29
-	dbw BANK(SuspendMapAnims), SuspendMapAnims ; 2a
-	dbw BANK(RetainOldPalettes), RetainOldPalettes ; 2b
-	dbw BANK(DontScrollText), DontScrollText ; 2c
-	dbw BANK(ReturnFromMapSetupScript), ReturnFromMapSetupScript ; 2d
+	dba EnableLCD ; 00
+	dba DisableLCD ; 01
+	dba SoundRestart ; 02
+	dba PlayMapMusic ; 03
+	dba RestartMapMusic ; 04
+	dba FadeToMapMusic ; 05
+	dba FadeOutMapAndMusic ; 06
+	dba EnterMapMusic ; 07
+	dba ForceMapMusic ; 08
+	dba CrankUpTheVolume ; 09
+	dba LoadBlockData ; 0a
+	dba LoadNeighboringBlockData ; 0b
+	dba SaveScreen ; 0c
+	dba BufferScreen ; 0d
+	dba LoadGraphics ; 0e
+	dba LoadTilesetHeader ; 0f
+	dba LoadMapTimeOfDay ; 10
+	dba LoadMapPalettes ; 11
+	dba LoadWildMonData ; 12
+	dba RefreshMapSprites ; 13
+	dba RunCallback_05_03 ; 14
+	dba RunCallback_03 ; 15
+	dba LoadObjectsRunCallback_02 ; 16
+	dba LoadSpawnPoint ; 17
+	dba EnterMapConnection ; 18
+	dba LoadWarpData ; 19
+	dba LoadMapAttributes ; 1a
+	dba LoadMapAttributes_IgnoreHidden ; 1b
+	dba WhiteBGMap ; 1c
+	dba FadeBlackBGMap ; 1d
+	dba FadeInBGMap ; 1e
+	dba GetCoordOfUpperLeftCorner ; 1f
+	dba RestoreFacingAfterWarp ; 20
+	dba SpawnInFacingDown ; 21
+	dba GetSpawnCoord ; 22
+	dba RefreshPlayerCoords ; 23
+	dba DelayClearingOldSprites ; 24
+	dba DelayLoadingNewSprites ; 25
+	dba UpdateRoamMons ; 26
+	dba JumpRoamMons ; 27
+	dba FadeOldMapMusic ; 28
+	dba ActivateMapAnims ; 29
+	dba SuspendMapAnims ; 2a
+	dba RetainOldPalettes ; 2b
+	dba DontScrollText ; 2c
+	dba ReturnFromMapSetupScript ; 2d
 ; 154ca


--- a/engine/pack.asm
+++ b/engine/pack.asm
@@ -1170,9 +1170,9 @@ MenuData2_0x107f7: ; 0x107f7
 	db 5, 8 ; rows, columns
 	db 2 ; horizontal spacing
 	dbw 0, OTPartyMons
-	dbw BANK(PlaceMenuItemName), PlaceMenuItemName
-	dbw BANK(PlaceMenuItemQuantity), PlaceMenuItemQuantity
-	dbw BANK(Function244c3), Function244c3
+	dba PlaceMenuItemName
+	dba PlaceMenuItemQuantity
+	dba Function244c3
 ; 10807

 Function10807: ; 10807 (4:4807)
@@ -1194,9 +1194,9 @@ MenuData2_0x10816: ; 0x10816
 	db 5, 8 ; rows, columns
 	db 1 ; horizontal spacing
 	dbw 0, OTPartyMon1Exp + 2
-	dbw BANK(PlaceMenuItemName), PlaceMenuItemName
-	dbw BANK(PlaceMenuItemQuantity), PlaceMenuItemQuantity
-	dbw BANK(Function244c3), Function244c3
+	dba PlaceMenuItemName
+	dba PlaceMenuItemQuantity
+	dba Function244c3
 ; 10826

 Function10826: ; 10826 (4:4826)
@@ -1227,9 +1227,9 @@ MenuData2_0x1084a: ; 0x1084a
 	db 5, 8 ; rows, columns
 	db 2 ; horizontal spacing
 	dbw 0, OTPartyMon1CaughtGender
-	dbw BANK(PlaceMenuItemName), PlaceMenuItemName
-	dbw BANK(PlaceMenuItemQuantity), PlaceMenuItemQuantity
-	dbw BANK(Function244c3), Function244c3
+	dba PlaceMenuItemName
+	dba PlaceMenuItemQuantity
+	dba Function244c3
 ; 1085a

 Function1085a: ; 1085a (4:485a)
@@ -1538,9 +1538,9 @@ MenuData2_0x10a57: ; 0x10a57
 	db 5, 8 ; rows, columns
 	db 2 ; horizontal spacing
 	dbw 0, NumItems
-	dbw BANK(PlaceMenuItemName), PlaceMenuItemName
-	dbw BANK(PlaceMenuItemQuantity), PlaceMenuItemQuantity
-	dbw BANK(Function244c3), Function244c3
+	dba PlaceMenuItemName
+	dba PlaceMenuItemQuantity
+	dba Function244c3
 ; 10a67

 MenuDataHeader_0x10a67: ; 0x10a67
@@ -1556,9 +1556,9 @@ MenuData2_0x10a6f: ; 0x10a6f
 	db 5, 8 ; rows, columns
 	db 2 ; horizontal spacing
 	dbw 0, NumItems
-	dbw BANK(PlaceMenuItemName), PlaceMenuItemName
-	dbw BANK(PlaceMenuItemQuantity), PlaceMenuItemQuantity
-	dbw BANK(Function244c3), Function244c3
+	dba PlaceMenuItemName
+	dba PlaceMenuItemQuantity
+	dba Function244c3
 ; 10a7f

 MenuDataHeader_0x10a7f: ; 0x10a7f
@@ -1574,9 +1574,9 @@ MenuData2_0x10a87: ; 0x10a87
 	db 5, 8 ; rows, columns
 	db 1 ; horizontal spacing
 	dbw 0, NumKeyItems
-	dbw BANK(PlaceMenuItemName), PlaceMenuItemName
-	dbw BANK(PlaceMenuItemQuantity), PlaceMenuItemQuantity
-	dbw BANK(Function244c3), Function244c3
+	dba PlaceMenuItemName
+	dba PlaceMenuItemQuantity
+	dba Function244c3
 ; 10a97

 MenuDataHeader_0x10a97: ; 0x10a97
@@ -1592,9 +1592,9 @@ MenuData2_0x10a9f: ; 0x10a9f
 	db 5, 8 ; rows, columns
 	db 1 ; horizontal spacing
 	dbw 0, NumKeyItems
-	dbw BANK(PlaceMenuItemName), PlaceMenuItemName
-	dbw BANK(PlaceMenuItemQuantity), PlaceMenuItemQuantity
-	dbw BANK(Function244c3), Function244c3
+	dba PlaceMenuItemName
+	dba PlaceMenuItemQuantity
+	dba Function244c3
 ; 10aaf

 MenuDataHeader_0x10aaf: ; 0x10aaf
@@ -1610,9 +1610,9 @@ MenuData2_0x10ab7: ; 0x10ab7
 	db 5, 8 ; rows, columns
 	db 2 ; horizontal spacing
 	dbw 0, NumBalls
-	dbw BANK(PlaceMenuItemName), PlaceMenuItemName
-	dbw BANK(PlaceMenuItemQuantity), PlaceMenuItemQuantity
-	dbw BANK(Function244c3), Function244c3
+	dba PlaceMenuItemName
+	dba PlaceMenuItemQuantity
+	dba Function244c3
 ; 10ac7

 MenuDataHeader_0x10ac7: ; 0x10ac7
@@ -1628,9 +1628,9 @@ MenuData2_0x10acf: ; 0x10acf
 	db 5, 8 ; rows, columns
 	db 2 ; horizontal spacing
 	dbw 0, NumBalls
-	dbw BANK(PlaceMenuItemName), PlaceMenuItemName
-	dbw BANK(PlaceMenuItemQuantity), PlaceMenuItemQuantity
-	dbw BANK(Function244c3), Function244c3
+	dba PlaceMenuItemName
+	dba PlaceMenuItemQuantity
+	dba Function244c3
 ; 10adf

 UnknownText_0x10adf: ; 0x10adf
--- a/engine/std_scripts.asm
+++ b/engine/std_scripts.asm
@@ -1,56 +1,56 @@
 StdScripts::
-	dbw BANK(PokeCenterNurseScript), PokeCenterNurseScript
-	dbw BANK(DifficultBookshelfScript), DifficultBookshelfScript
-	dbw BANK(PictureBookshelfScript), PictureBookshelfScript
-	dbw BANK(MagazineBookshelfScript), MagazineBookshelfScript
-	dbw BANK(TeamRocketOathScript), TeamRocketOathScript
-	dbw BANK(IncenseBurnerScript), IncenseBurnerScript
-	dbw BANK(MerchandiseShelfScript), MerchandiseShelfScript
-	dbw BANK(TownMapScript), TownMapScript
-	dbw BANK(WindowScript), WindowScript
-	dbw BANK(TVScript), TVScript
-	dbw BANK(HomepageScript), HomepageScript
-	dbw BANK(Radio1Script), Radio1Script
-	dbw BANK(Radio2Script), Radio2Script
-	dbw BANK(TrashCanScript), TrashCanScript
-	dbw BANK(StrengthBoulderScript), StrengthBoulderScript
-	dbw BANK(SmashRockScript), SmashRockScript
-	dbw BANK(PokeCenterSignScript), PokeCenterSignScript
-	dbw BANK(MartSignScript), MartSignScript
-	dbw BANK(GoldenrodRocketsScript), GoldenrodRocketsScript
-	dbw BANK(RadioTowerRocketsScript), RadioTowerRocketsScript
-	dbw BANK(ElevatorButtonScript), ElevatorButtonScript
-	dbw BANK(DayToTextScript), DayToTextScript
-	dbw BANK(BugContestResultsWarpScript), BugContestResultsWarpScript
-	dbw BANK(BugContestResultsScript), BugContestResultsScript
-	dbw BANK(InitializeEventsScript), InitializeEventsScript
-	dbw BANK(AskNumber1MScript), AskNumber1MScript
-	dbw BANK(AskNumber2MScript), AskNumber2MScript
-	dbw BANK(RegisteredNumberMScript), RegisteredNumberMScript
-	dbw BANK(NumberAcceptedMScript), NumberAcceptedMScript
-	dbw BANK(NumberDeclinedMScript), NumberDeclinedMScript
-	dbw BANK(PhoneFullMScript), PhoneFullMScript
-	dbw BANK(RematchMScript), RematchMScript
-	dbw BANK(GiftMScript), GiftMScript
-	dbw BANK(PackFullMScript), PackFullMScript
-	dbw BANK(RematchGiftMScript), RematchGiftMScript
-	dbw BANK(AskNumber1FScript), AskNumber1FScript
-	dbw BANK(AskNumber2FScript), AskNumber2FScript
-	dbw BANK(RegisteredNumberFScript), RegisteredNumberFScript
-	dbw BANK(NumberAcceptedFScript), NumberAcceptedFScript
-	dbw BANK(NumberDeclinedFScript), NumberDeclinedFScript
-	dbw BANK(PhoneFullFScript), PhoneFullFScript
-	dbw BANK(RematchFScript), RematchFScript
-	dbw BANK(GiftFScript), GiftFScript
-	dbw BANK(PackFullFScript), PackFullFScript
-	dbw BANK(RematchGiftFScript), RematchGiftFScript
-	dbw BANK(GymStatue1Script), GymStatue1Script
-	dbw BANK(GymStatue2Script), GymStatue2Script
-	dbw BANK(ReceiveItemScript), ReceiveItemScript
-	dbw BANK(ReceiveTogepiEggScript), ReceiveTogepiEggScript
-	dbw BANK(PCScript), PCScript
-	dbw BANK(GameCornerCoinVendorScript), GameCornerCoinVendorScript
-	dbw BANK(HappinessCheckScript), HappinessCheckScript
+	dba PokeCenterNurseScript
+	dba DifficultBookshelfScript
+	dba PictureBookshelfScript
+	dba MagazineBookshelfScript
+	dba TeamRocketOathScript
+	dba IncenseBurnerScript
+	dba MerchandiseShelfScript
+	dba TownMapScript
+	dba WindowScript
+	dba TVScript
+	dba HomepageScript
+	dba Radio1Script
+	dba Radio2Script
+	dba TrashCanScript
+	dba StrengthBoulderScript
+	dba SmashRockScript
+	dba PokeCenterSignScript
+	dba MartSignScript
+	dba GoldenrodRocketsScript
+	dba RadioTowerRocketsScript
+	dba ElevatorButtonScript
+	dba DayToTextScript
+	dba BugContestResultsWarpScript
+	dba BugContestResultsScript
+	dba InitializeEventsScript
+	dba AskNumber1MScript
+	dba AskNumber2MScript
+	dba RegisteredNumberMScript
+	dba NumberAcceptedMScript
+	dba NumberDeclinedMScript
+	dba PhoneFullMScript
+	dba RematchMScript
+	dba GiftMScript
+	dba PackFullMScript
+	dba RematchGiftMScript
+	dba AskNumber1FScript
+	dba AskNumber2FScript
+	dba RegisteredNumberFScript
+	dba NumberAcceptedFScript
+	dba NumberDeclinedFScript
+	dba PhoneFullFScript
+	dba RematchFScript
+	dba GiftFScript
+	dba PackFullFScript
+	dba RematchGiftFScript
+	dba GymStatue1Script
+	dba GymStatue2Script
+	dba ReceiveItemScript
+	dba ReceiveTogepiEggScript
+	dba PCScript
+	dba GameCornerCoinVendorScript
+	dba HappinessCheckScript

 PokeCenterNurseScript:
 ; EVENT_WELCOMED_TO_POKECOM_CENTER is never set