From d001ced41b53271373753de835a9c3b3413dc318 Mon Sep 17 00:00:00 2001 From: vulcandth Date: Thu, 13 Jul 2023 20:27:56 -0500 Subject: Add macros, constants, and labels for map scripts and text (#367) This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified. --- scripts/Route9.asm | 178 +++++++++++++++++++++++++++-------------------------- 1 file changed, 90 insertions(+), 88 deletions(-) (limited to 'scripts/Route9.asm') diff --git a/scripts/Route9.asm b/scripts/Route9.asm index 72c43a5c..0aa91229 100644 --- a/scripts/Route9.asm +++ b/scripts/Route9.asm @@ -8,200 +8,202 @@ Route9_Script: ret Route9_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_ROUTE9_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_ROUTE9_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_ROUTE9_END_BATTLE Route9_TextPointers: - dw Route9Text1 - dw Route9Text2 - dw Route9Text3 - dw Route9Text4 - dw Route9Text5 - dw Route9Text6 - dw Route9Text7 - dw Route9Text8 - dw Route9Text9 - dw PickUpItemText - dw Route9Text11 + def_text_pointers + dw_const Route9CooltrainerF1Text, TEXT_ROUTE9_COOLTRAINER_F1 + dw_const Route9CooltrainerM1Text, TEXT_ROUTE9_COOLTRAINER_M1 + dw_const Route9CooltrainerM2Text, TEXT_ROUTE9_COOLTRAINER_M2 + dw_const Route9CooltrainerF2Text, TEXT_ROUTE9_COOLTRAINER_F2 + dw_const Route9Hiker1Text, TEXT_ROUTE9_HIKER_1 + dw_const Route9Hiker2Text, TEXT_ROUTE9_HIKER_2 + dw_const Route9Youngster1Text, TEXT_ROUTE9_YOUNGSTER_1 + dw_const Route9Hiker3Text, TEXT_ROUTE9_HIKER_3 + dw_const Route9Youngster2Text, TEXT_ROUTE9_YOUNGSTER_2 + dw_const PickUpItemText, TEXT_ROUTE9_TM_TELEPORT + dw_const Route9SignText, TEXT_ROUTE9_SIGN Route9TrainerHeaders: def_trainers Route9TrainerHeader0: - trainer EVENT_BEAT_ROUTE_9_TRAINER_0, 3, Route9BattleText1, Route9EndBattleText1, Route9AfterBattleText1 + trainer EVENT_BEAT_ROUTE_9_TRAINER_0, 3, Route9CooltrainerF1BattleText, Route9CooltrainerF1EndBattleText, Route9CooltrainerF1AfterBattleText Route9TrainerHeader1: - trainer EVENT_BEAT_ROUTE_9_TRAINER_1, 2, Route9BattleText2, Route9EndBattleText2, Route9AfterBattleText2 + trainer EVENT_BEAT_ROUTE_9_TRAINER_1, 2, Route9CooltrainerM1BattleText, Route9CooltrainerM1EndBattleText, Route9CooltrainerM1AfterBattleText Route9TrainerHeader2: - trainer EVENT_BEAT_ROUTE_9_TRAINER_2, 4, Route9BattleText3, Route9EndBattleText3, Route9AfterBattleText3 + trainer EVENT_BEAT_ROUTE_9_TRAINER_2, 4, Route9CooltrainerM2BattleText, Route9CooltrainerM2EndBattleText, Route9CooltrainerM2AfterBattleText Route9TrainerHeader3: - trainer EVENT_BEAT_ROUTE_9_TRAINER_3, 2, Route9BattleText4, Route9EndBattleText4, Route9AfterBattleText4 + trainer EVENT_BEAT_ROUTE_9_TRAINER_3, 2, Route9CooltrainerF2BattleText, Route9CooltrainerF2EndBattleText, Route9CooltrainerF2AfterBattleText Route9TrainerHeader4: - trainer EVENT_BEAT_ROUTE_9_TRAINER_4, 2, Route9BattleText5, Route9EndBattleText5, Route9AfterBattleText5 + trainer EVENT_BEAT_ROUTE_9_TRAINER_4, 2, Route9Hiker1BattleText, Route9Hiker1EndBattleText, Route9Hiker1AfterBattleText Route9TrainerHeader5: - trainer EVENT_BEAT_ROUTE_9_TRAINER_5, 3, Route9BattleText6, Route9EndBattleText6, Route9AfterBattleText6 + trainer EVENT_BEAT_ROUTE_9_TRAINER_5, 3, Route9Hiker2BattleText, Route9Hiker2EndBattleText, Route9Hiker2AfterBattleText Route9TrainerHeader6: - trainer EVENT_BEAT_ROUTE_9_TRAINER_6, 4, Route9BattleText7, Route9EndBattleText7, Route9AfterBattleText7 + trainer EVENT_BEAT_ROUTE_9_TRAINER_6, 4, Route9Youngster1BattleText, Route9Youngster1EndBattleText, Route9Youngster1AfterBattleText Route9TrainerHeader7: - trainer EVENT_BEAT_ROUTE_9_TRAINER_7, 2, Route9BattleText8, Route9EndBattleText8, Route9AfterBattleText8 + trainer EVENT_BEAT_ROUTE_9_TRAINER_7, 2, Route9Hiker3BattleText, Route9Hiker3EndBattleText, Route9Hiker3AfterBattleText Route9TrainerHeader8: - trainer EVENT_BEAT_ROUTE_9_TRAINER_8, 2, Route9BattleText9, Route9EndBattleText9, Route9AfterBattleText9 + trainer EVENT_BEAT_ROUTE_9_TRAINER_8, 2, Route9Youngster2BattleText, Route9Youngster2EndBattleText, Route9Youngster2AfterBattleText db -1 ; end -Route9Text1: +Route9CooltrainerF1Text: text_asm ld hl, Route9TrainerHeader0 jr Route9TalkToTrainer -Route9Text2: +Route9CooltrainerM1Text: text_asm ld hl, Route9TrainerHeader1 jr Route9TalkToTrainer -Route9Text3: +Route9CooltrainerM2Text: text_asm ld hl, Route9TrainerHeader2 jr Route9TalkToTrainer -Route9Text4: +Route9CooltrainerF2Text: text_asm ld hl, Route9TrainerHeader3 jr Route9TalkToTrainer -Route9Text5: +Route9Hiker1Text: text_asm ld hl, Route9TrainerHeader4 jr Route9TalkToTrainer -Route9Text6: +Route9Hiker2Text: text_asm ld hl, Route9TrainerHeader5 jr Route9TalkToTrainer -Route9Text7: +Route9Youngster1Text: text_asm ld hl, Route9TrainerHeader6 jr Route9TalkToTrainer -Route9Text8: +Route9Hiker3Text: text_asm ld hl, Route9TrainerHeader7 jr Route9TalkToTrainer -Route9Text9: +Route9Youngster2Text: text_asm ld hl, Route9TrainerHeader8 Route9TalkToTrainer: call TalkToTrainer jp TextScriptEnd -Route9BattleText1: - text_far _Route9BattleText1 +Route9CooltrainerF1BattleText: + text_far _Route9CooltrainerF1BattleText text_end -Route9EndBattleText1: - text_far _Route9EndBattleText1 +Route9CooltrainerF1EndBattleText: + text_far _Route9CooltrainerF1EndBattleText text_end -Route9AfterBattleText1: - text_far _Route9AfterBattleText1 +Route9CooltrainerF1AfterBattleText: + text_far _Route9CooltrainerF1AfterBattleText text_end -Route9BattleText2: - text_far _Route9BattleText2 +Route9CooltrainerM1BattleText: + text_far _Route9CooltrainerM1BattleText text_end -Route9EndBattleText2: - text_far _Route9EndBattleText2 +Route9CooltrainerM1EndBattleText: + text_far _Route9CooltrainerM1EndBattleText text_end -Route9AfterBattleText2: - text_far _Route9AfterBattleText2 +Route9CooltrainerM1AfterBattleText: + text_far _Route9CooltrainerM1AfterBattleText text_end -Route9BattleText3: - text_far _Route9BattleText3 +Route9CooltrainerM2BattleText: + text_far _Route9CooltrainerM2BattleText text_end -Route9EndBattleText3: - text_far _Route9EndBattleText3 +Route9CooltrainerM2EndBattleText: + text_far _Route9CooltrainerM2EndBattleText text_end -Route9AfterBattleText3: - text_far _Route9AfterBattleText3 +Route9CooltrainerM2AfterBattleText: + text_far _Route9CooltrainerM2AfterBattleText text_end -Route9BattleText4: - text_far _Route9BattleText4 +Route9CooltrainerF2BattleText: + text_far _Route9CooltrainerF2BattleText text_end -Route9EndBattleText4: - text_far _Route9EndBattleText4 +Route9CooltrainerF2EndBattleText: + text_far _Route9CooltrainerF2EndBattleText text_end -Route9AfterBattleText4: - text_far _Route9AfterBattleText4 +Route9CooltrainerF2AfterBattleText: + text_far _Route9CooltrainerF2AfterBattleText text_end -Route9BattleText5: - text_far _Route9BattleText5 +Route9Hiker1BattleText: + text_far _Route9Hiker1BattleText text_end -Route9EndBattleText5: - text_far _Route9EndBattleText5 +Route9Hiker1EndBattleText: + text_far _Route9Hiker1EndBattleText text_end -Route9AfterBattleText5: - text_far _Route9AfterBattleText5 +Route9Hiker1AfterBattleText: + text_far _Route9Hiker1AfterBattleText text_end -Route9BattleText6: - text_far _Route9BattleText6 +Route9Hiker2BattleText: + text_far _Route9Hiker2BattleText text_end -Route9EndBattleText6: - text_far _Route9EndBattleText6 +Route9Hiker2EndBattleText: + text_far _Route9Hiker2EndBattleText text_end -Route9AfterBattleText6: - text_far _Route9AfterBattleText6 +Route9Hiker2AfterBattleText: + text_far _Route9Hiker2AfterBattleText text_end -Route9BattleText7: - text_far _Route9BattleText7 +Route9Youngster1BattleText: + text_far _Route9Youngster1BattleText text_end -Route9EndBattleText7: - text_far _Route9EndBattleText7 +Route9Youngster1EndBattleText: + text_far _Route9Youngster1EndBattleText text_end -Route9AfterBattleText7: - text_far _Route9AfterBattleText7 +Route9Youngster1AfterBattleText: + text_far _Route9Youngster1AfterBattleText text_end -Route9BattleText8: - text_far _Route9BattleText8 +Route9Hiker3BattleText: + text_far _Route9Hiker3BattleText text_end -Route9EndBattleText8: - text_far _Route9EndBattleText8 +Route9Hiker3EndBattleText: + text_far _Route9Hiker3EndBattleText text_end -Route9AfterBattleText8: - text_far _Route9AfterBattleText8 +Route9Hiker3AfterBattleText: + text_far _Route9Hiker3AfterBattleText text_end -Route9BattleText9: - text_far _Route9BattleText9 +Route9Youngster2BattleText: + text_far _Route9Youngster2BattleText text_end -Route9EndBattleText9: - text_far _Route9EndBattleText9 +Route9Youngster2EndBattleText: + text_far _Route9Youngster2EndBattleText text_end -Route9AfterBattleText9: - text_far _Route9AfterBattleText9 +Route9Youngster2AfterBattleText: + text_far _Route9Youngster2AfterBattleText text_end -Route9Text11: - text_far _Route9Text11 +Route9SignText: + text_far _Route9SignText text_end -- cgit v1.3.1-sl0p From e7f94cc52005142315878bb3a8f0bc96a9eda6fc Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sun, 19 Nov 2023 16:03:49 -0600 Subject: Fix inconsistent object const names --- data/maps/objects/Route24.asm | 8 ++++---- data/maps/objects/Route6.asm | 8 ++++---- data/maps/objects/Route9.asm | 20 ++++++++++---------- scripts/Route24.asm | 4 ++-- scripts/Route6.asm | 4 ++-- scripts/Route9.asm | 10 +++++----- 6 files changed, 27 insertions(+), 27 deletions(-) (limited to 'scripts/Route9.asm') diff --git a/data/maps/objects/Route24.asm b/data/maps/objects/Route24.asm index f23eb7f8..780bedd2 100644 --- a/data/maps/objects/Route24.asm +++ b/data/maps/objects/Route24.asm @@ -3,9 +3,9 @@ const_export ROUTE24_COOLTRAINER_M2 const_export ROUTE24_COOLTRAINER_M3 const_export ROUTE24_COOLTRAINER_F1 - const_export ROUTE24_YOUNGSTER_1 + const_export ROUTE24_YOUNGSTER1 const_export ROUTE24_COOLTRAINER_F2 - const_export ROUTE24_YOUNGSTER_2 + const_export ROUTE24_YOUNGSTER2 const_export ROUTE24_TM_THUNDER_WAVE Route24_Object: @@ -20,9 +20,9 @@ Route24_Object: object_event 5, 20, SPRITE_COOLTRAINER_M, STAY, UP, TEXT_ROUTE24_COOLTRAINER_M2, OPP_JR_TRAINER_M, 2 object_event 11, 19, SPRITE_COOLTRAINER_M, STAY, LEFT, TEXT_ROUTE24_COOLTRAINER_M3, OPP_JR_TRAINER_M, 3 object_event 10, 22, SPRITE_COOLTRAINER_F, STAY, RIGHT, TEXT_ROUTE24_COOLTRAINER_F1, OPP_LASS, 7 - object_event 11, 25, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_ROUTE24_YOUNGSTER_1, OPP_YOUNGSTER, 4 + object_event 11, 25, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_ROUTE24_YOUNGSTER1, OPP_YOUNGSTER, 4 object_event 10, 28, SPRITE_COOLTRAINER_F, STAY, RIGHT, TEXT_ROUTE24_COOLTRAINER_F2, OPP_LASS, 8 - object_event 11, 31, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_ROUTE24_YOUNGSTER_2, OPP_BUG_CATCHER, 9 + object_event 11, 31, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_ROUTE24_YOUNGSTER2, OPP_BUG_CATCHER, 9 object_event 10, 5, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROUTE24_TM_THUNDER_WAVE, TM_THUNDER_WAVE def_warps_to ROUTE_24 diff --git a/data/maps/objects/Route6.asm b/data/maps/objects/Route6.asm index cd666768..155cbfb6 100644 --- a/data/maps/objects/Route6.asm +++ b/data/maps/objects/Route6.asm @@ -1,10 +1,10 @@ object_const_def const_export ROUTE6_COOLTRAINER_M1 const_export ROUTE6_COOLTRAINER_F1 - const_export ROUTE6_YOUNGSTER_1 + const_export ROUTE6_YOUNGSTER1 const_export ROUTE6_COOLTRAINER_M2 const_export ROUTE6_COOLTRAINER_F2 - const_export ROUTE6_YOUNGSTER_2 + const_export ROUTE6_YOUNGSTER2 Route6_Object: db $f ; border block @@ -21,9 +21,9 @@ Route6_Object: def_object_events object_event 10, 21, SPRITE_COOLTRAINER_M, STAY, RIGHT, TEXT_ROUTE6_COOLTRAINER_M1, OPP_JR_TRAINER_M, 4 object_event 11, 21, SPRITE_COOLTRAINER_F, STAY, LEFT, TEXT_ROUTE6_COOLTRAINER_F1, OPP_JR_TRAINER_F, 2 - object_event 0, 15, SPRITE_YOUNGSTER, STAY, RIGHT, TEXT_ROUTE6_YOUNGSTER_1, OPP_BUG_CATCHER, 10 + object_event 0, 15, SPRITE_YOUNGSTER, STAY, RIGHT, TEXT_ROUTE6_YOUNGSTER1, OPP_BUG_CATCHER, 10 object_event 11, 31, SPRITE_COOLTRAINER_M, STAY, LEFT, TEXT_ROUTE6_COOLTRAINER_M2, OPP_JR_TRAINER_M, 5 object_event 11, 30, SPRITE_COOLTRAINER_F, STAY, LEFT, TEXT_ROUTE6_COOLTRAINER_F2, OPP_JR_TRAINER_F, 3 - object_event 19, 26, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_ROUTE6_YOUNGSTER_2, OPP_BUG_CATCHER, 11 + object_event 19, 26, SPRITE_YOUNGSTER, STAY, LEFT, TEXT_ROUTE6_YOUNGSTER2, OPP_BUG_CATCHER, 11 def_warps_to ROUTE_6 diff --git a/data/maps/objects/Route9.asm b/data/maps/objects/Route9.asm index a5c29bef..5d5a66cb 100644 --- a/data/maps/objects/Route9.asm +++ b/data/maps/objects/Route9.asm @@ -3,11 +3,11 @@ const_export ROUTE9_COOLTRAINER_M1 const_export ROUTE9_COOLTRAINER_M2 const_export ROUTE9_COOLTRAINER_F2 - const_export ROUTE9_HIKER_1 - const_export ROUTE9_HIKER_2 - const_export ROUTE9_YOUNGSTER_1 - const_export ROUTE9_HIKER_3 - const_export ROUTE9_YOUNGSTER_2 + const_export ROUTE9_HIKER1 + const_export ROUTE9_HIKER2 + const_export ROUTE9_YOUNGSTER1 + const_export ROUTE9_HIKER3 + const_export ROUTE9_YOUNGSTER2 const_export ROUTE9_TM_TELEPORT Route9_Object: @@ -23,11 +23,11 @@ Route9_Object: object_event 24, 7, SPRITE_COOLTRAINER_M, STAY, LEFT, TEXT_ROUTE9_COOLTRAINER_M1, OPP_JR_TRAINER_M, 7 object_event 31, 7, SPRITE_COOLTRAINER_M, STAY, RIGHT, TEXT_ROUTE9_COOLTRAINER_M2, OPP_JR_TRAINER_M, 8 object_event 48, 8, SPRITE_COOLTRAINER_F, STAY, RIGHT, TEXT_ROUTE9_COOLTRAINER_F2, OPP_JR_TRAINER_F, 6 - object_event 16, 15, SPRITE_HIKER, STAY, LEFT, TEXT_ROUTE9_HIKER_1, OPP_HIKER, 11 - object_event 43, 3, SPRITE_HIKER, STAY, LEFT, TEXT_ROUTE9_HIKER_2, OPP_HIKER, 6 - object_event 22, 2, SPRITE_YOUNGSTER, STAY, DOWN, TEXT_ROUTE9_YOUNGSTER_1, OPP_BUG_CATCHER, 13 - object_event 45, 15, SPRITE_HIKER, STAY, RIGHT, TEXT_ROUTE9_HIKER_3, OPP_HIKER, 5 - object_event 40, 8, SPRITE_YOUNGSTER, STAY, RIGHT, TEXT_ROUTE9_YOUNGSTER_2, OPP_BUG_CATCHER, 14 + object_event 16, 15, SPRITE_HIKER, STAY, LEFT, TEXT_ROUTE9_HIKER1, OPP_HIKER, 11 + object_event 43, 3, SPRITE_HIKER, STAY, LEFT, TEXT_ROUTE9_HIKER2, OPP_HIKER, 6 + object_event 22, 2, SPRITE_YOUNGSTER, STAY, DOWN, TEXT_ROUTE9_YOUNGSTER1, OPP_BUG_CATCHER, 13 + object_event 45, 15, SPRITE_HIKER, STAY, RIGHT, TEXT_ROUTE9_HIKER3, OPP_HIKER, 5 + object_event 40, 8, SPRITE_YOUNGSTER, STAY, RIGHT, TEXT_ROUTE9_YOUNGSTER2, OPP_BUG_CATCHER, 14 object_event 10, 15, SPRITE_POKE_BALL, STAY, NONE, TEXT_ROUTE9_TM_TELEPORT, TM_TELEPORT def_warps_to ROUTE_9 diff --git a/scripts/Route24.asm b/scripts/Route24.asm index 8fa9dd20..47d6eb9f 100644 --- a/scripts/Route24.asm +++ b/scripts/Route24.asm @@ -83,9 +83,9 @@ Route24_TextPointers: dw_const Route24CooltrainerM2Text, TEXT_ROUTE24_COOLTRAINER_M2 dw_const Route24CooltrainerM3Text, TEXT_ROUTE24_COOLTRAINER_M3 dw_const Route24CooltrainerF1Text, TEXT_ROUTE24_COOLTRAINER_F1 - dw_const Route24Youngster1Text, TEXT_ROUTE24_YOUNGSTER_1 + dw_const Route24Youngster1Text, TEXT_ROUTE24_YOUNGSTER1 dw_const Route24CooltrainerF2Text, TEXT_ROUTE24_COOLTRAINER_F2 - dw_const Route24Youngster2Text, TEXT_ROUTE24_YOUNGSTER_2 + dw_const Route24Youngster2Text, TEXT_ROUTE24_YOUNGSTER2 dw_const PickUpItemText, TEXT_ROUTE24_TM_THUNDER_WAVE Route24TrainerHeaders: diff --git a/scripts/Route6.asm b/scripts/Route6.asm index b7b8c1ce..0151c924 100644 --- a/scripts/Route6.asm +++ b/scripts/Route6.asm @@ -17,10 +17,10 @@ Route6_TextPointers: def_text_pointers dw_const Route6CooltrainerM1Text, TEXT_ROUTE6_COOLTRAINER_M1 dw_const Route6CooltrainerF1Text, TEXT_ROUTE6_COOLTRAINER_F1 - dw_const Route6Youngster1Text, TEXT_ROUTE6_YOUNGSTER_1 + dw_const Route6Youngster1Text, TEXT_ROUTE6_YOUNGSTER1 dw_const Route6CooltrainerM2Text, TEXT_ROUTE6_COOLTRAINER_M2 dw_const Route6CooltrainerF2Text, TEXT_ROUTE6_COOLTRAINER_F2 - dw_const Route6Youngster2Text, TEXT_ROUTE6_YOUNGSTER_2 + dw_const Route6Youngster2Text, TEXT_ROUTE6_YOUNGSTER2 dw_const Route6UndergroundPathSignText, TEXT_ROUTE6_UNDERGROUND_PATH_SIGN Route6TrainerHeaders: diff --git a/scripts/Route9.asm b/scripts/Route9.asm index 0aa91229..a2bb6abb 100644 --- a/scripts/Route9.asm +++ b/scripts/Route9.asm @@ -19,11 +19,11 @@ Route9_TextPointers: dw_const Route9CooltrainerM1Text, TEXT_ROUTE9_COOLTRAINER_M1 dw_const Route9CooltrainerM2Text, TEXT_ROUTE9_COOLTRAINER_M2 dw_const Route9CooltrainerF2Text, TEXT_ROUTE9_COOLTRAINER_F2 - dw_const Route9Hiker1Text, TEXT_ROUTE9_HIKER_1 - dw_const Route9Hiker2Text, TEXT_ROUTE9_HIKER_2 - dw_const Route9Youngster1Text, TEXT_ROUTE9_YOUNGSTER_1 - dw_const Route9Hiker3Text, TEXT_ROUTE9_HIKER_3 - dw_const Route9Youngster2Text, TEXT_ROUTE9_YOUNGSTER_2 + dw_const Route9Hiker1Text, TEXT_ROUTE9_HIKER1 + dw_const Route9Hiker2Text, TEXT_ROUTE9_HIKER2 + dw_const Route9Youngster1Text, TEXT_ROUTE9_YOUNGSTER1 + dw_const Route9Hiker3Text, TEXT_ROUTE9_HIKER3 + dw_const Route9Youngster2Text, TEXT_ROUTE9_YOUNGSTER2 dw_const PickUpItemText, TEXT_ROUTE9_TM_TELEPORT dw_const Route9SignText, TEXT_ROUTE9_SIGN -- cgit v1.3.1-sl0p