diff options
| author | vulcandth <vulcandth@gmail.com> | 2023-07-13 20:27:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-13 21:27:56 -0400 |
| commit | d001ced41b53271373753de835a9c3b3413dc318 (patch) | |
| tree | ff2db7f403bddfcdeb12e50def8411cafedcdd5e /scripts/Route8.asm | |
| parent | Make wCurrentBoxNum a byte instead of word (#414) (diff) | |
| download | pokeyellow-d001ced41b53271373753de835a9c3b3413dc318.tar.gz pokeyellow-d001ced41b53271373753de835a9c3b3413dc318.tar.xz pokeyellow-d001ced41b53271373753de835a9c3b3413dc318.zip | |
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.
Diffstat (limited to 'scripts/Route8.asm')
| -rw-r--r-- | scripts/Route8.asm | 176 |
1 files changed, 89 insertions, 87 deletions
diff --git a/scripts/Route8.asm b/scripts/Route8.asm index 7ecdbe09..657d5c83 100644 --- a/scripts/Route8.asm +++ b/scripts/Route8.asm @@ -8,206 +8,208 @@ Route8_Script: ret Route8_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_ROUTE8_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_ROUTE8_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_ROUTE8_END_BATTLE Route8_TextPointers: - dw Route8Text1 - dw Route8Text2 - dw Route8Text3 - dw Route8Text4 - dw Route8Text5 - dw Route8Text6 - dw Route8Text7 - dw Route8Text8 - dw Route8Text9 - dw Route8Text10 + def_text_pointers + dw_const Route8SuperNerd1Text, TEXT_ROUTE8_SUPER_NERD1 + dw_const Route8Gambler1Text, TEXT_ROUTE8_GAMBLER1 + dw_const Route8SuperNerd2Text, TEXT_ROUTE8_SUPER_NERD2 + dw_const Route8CooltrainerF1Text, TEXT_ROUTE8_COOLTRAINER_F1 + dw_const Route8SuperNerd3Text, TEXT_ROUTE8_SUPER_NERD3 + dw_const Route8CooltrainerF2Text, TEXT_ROUTE8_COOLTRAINER_F2 + dw_const Route8CooltrainerF3Text, TEXT_ROUTE8_COOLTRAINER_F3 + dw_const Route8Gambler2Text, TEXT_ROUTE8_GAMBLER2 + dw_const Route8CooltrainerF4Text, TEXT_ROUTE8_COOLTRAINER_F4 + dw_const Route8UndergroundSignText, TEXT_ROUTE8_UNDERGROUND_SIGN Route8TrainerHeaders: def_trainers Route8TrainerHeader0: - trainer EVENT_BEAT_ROUTE_8_TRAINER_0, 4, Route8BattleText1, Route8EndBattleText1, Route8AfterBattleText1 + trainer EVENT_BEAT_ROUTE_8_TRAINER_0, 4, Route8SuperNerd1BattleText, Route8SuperNerd1EndBattleText, Route8SuperNerd1AfterBattleText Route8TrainerHeader1: - trainer EVENT_BEAT_ROUTE_8_TRAINER_1, 4, Route8BattleText2, Route8EndBattleText2, Route8AfterBattleText2 + trainer EVENT_BEAT_ROUTE_8_TRAINER_1, 4, Route8Gambler1BattleText, Route8Gambler1EndBattleText, Route8Gambler1AfterBattleText Route8TrainerHeader2: - trainer EVENT_BEAT_ROUTE_8_TRAINER_2, 4, Route8BattleText3, Route8EndBattleText3, Route8AfterBattleText3 + trainer EVENT_BEAT_ROUTE_8_TRAINER_2, 4, Route8SuperNerd2BattleText, Route8SuperNerd2EndBattleText, Route8SuperNerd2AfterBattleText Route8TrainerHeader3: - trainer EVENT_BEAT_ROUTE_8_TRAINER_3, 2, Route8BattleText4, Route8EndBattleText4, Route8AfterBattleText4 + trainer EVENT_BEAT_ROUTE_8_TRAINER_3, 2, Route8CooltrainerF1BattleText, Route8CooltrainerF21EndBattleText, Route8CooltrainerF1AfterBattleText Route8TrainerHeader4: - trainer EVENT_BEAT_ROUTE_8_TRAINER_4, 3, Route8BattleText5, Route8EndBattleText5, Route8AfterBattleText5 + trainer EVENT_BEAT_ROUTE_8_TRAINER_4, 3, Route8SuperNerd3BattleText, Route8SuperNerd3EndBattleText, Route8SuperNerd3AfterBattleText Route8TrainerHeader5: - trainer EVENT_BEAT_ROUTE_8_TRAINER_5, 3, Route8BattleText6, Route8EndBattleText6, Route8AfterBattleText6 + trainer EVENT_BEAT_ROUTE_8_TRAINER_5, 3, Route8CooltrainerF2BattleText, Route8CooltrainerF2EndBattleText, Route8CooltrainerF2AfterBattleText Route8TrainerHeader6: - trainer EVENT_BEAT_ROUTE_8_TRAINER_6, 2, Route8BattleText7, Route8EndBattleText7, Route8AfterBattleText7 + trainer EVENT_BEAT_ROUTE_8_TRAINER_6, 2, Route8CooltrainerF3BattleText, Route8CooltrainerF3EndBattleText, Route8CooltrainerF3AfterBattleText Route8TrainerHeader7: - trainer EVENT_BEAT_ROUTE_8_TRAINER_7, 2, Route8BattleText8, Route8EndBattleText8, Route8AfterBattleText8 + trainer EVENT_BEAT_ROUTE_8_TRAINER_7, 2, Route8Gambler2BattleText, Route8Gambler2EndBattleText, Route8Gambler2AfterBattleText Route8TrainerHeader8: - trainer EVENT_BEAT_ROUTE_8_TRAINER_8, 4, Route8BattleText9, Route8EndBattleText9, Route8AfterBattleText9 + trainer EVENT_BEAT_ROUTE_8_TRAINER_8, 4, Route8CooltrainerF4BattleText, Route8CooltrainerF4EndBattleText, Route8CooltrainerF4AfterBattleText db -1 ; end -Route8Text1: +Route8SuperNerd1Text: text_asm ld hl, Route8TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Route8BattleText1: - text_far _Route8BattleText1 +Route8SuperNerd1BattleText: + text_far _Route8SuperNerd1BattleText text_end -Route8EndBattleText1: - text_far _Route8EndBattleText1 +Route8SuperNerd1EndBattleText: + text_far _Route8SuperNerd1EndBattleText text_end -Route8AfterBattleText1: - text_far _Route8AfterBattleText1 +Route8SuperNerd1AfterBattleText: + text_far _Route8SuperNerd1AfterBattleText text_end -Route8Text2: +Route8Gambler1Text: text_asm ld hl, Route8TrainerHeader1 call TalkToTrainer jp TextScriptEnd -Route8BattleText2: - text_far _Route8BattleText2 +Route8Gambler1BattleText: + text_far _Route8Gambler1BattleText text_end -Route8EndBattleText2: - text_far _Route8EndBattleText2 +Route8Gambler1EndBattleText: + text_far _Route8Gambler1EndBattleText text_end -Route8AfterBattleText2: - text_far _Route8AfterBattleText2 +Route8Gambler1AfterBattleText: + text_far _Route8Gambler1AfterBattleText text_end -Route8Text3: +Route8SuperNerd2Text: text_asm ld hl, Route8TrainerHeader2 call TalkToTrainer jp TextScriptEnd -Route8BattleText3: - text_far _Route8BattleText3 +Route8SuperNerd2BattleText: + text_far _Route8SuperNerd2BattleText text_end -Route8EndBattleText3: - text_far _Route8EndBattleText3 +Route8SuperNerd2EndBattleText: + text_far _Route8SuperNerd2EndBattleText text_end -Route8AfterBattleText3: - text_far _Route8AfterBattleText3 +Route8SuperNerd2AfterBattleText: + text_far _Route8SuperNerd2AfterBattleText text_end -Route8Text4: +Route8CooltrainerF1Text: text_asm ld hl, Route8TrainerHeader3 call TalkToTrainer jp TextScriptEnd -Route8BattleText4: - text_far _Route8BattleText4 +Route8CooltrainerF1BattleText: + text_far _Route8CooltrainerF1BattleText text_end -Route8EndBattleText4: - text_far _Route8EndBattleText4 +Route8CooltrainerF21EndBattleText: + text_far _Route8CooltrainerF21EndBattleText text_end -Route8AfterBattleText4: - text_far _Route8AfterBattleText4 +Route8CooltrainerF1AfterBattleText: + text_far _Route8CooltrainerF1AfterBattleText text_end -Route8Text5: +Route8SuperNerd3Text: text_asm ld hl, Route8TrainerHeader4 call TalkToTrainer jp TextScriptEnd -Route8BattleText5: - text_far _Route8BattleText5 +Route8SuperNerd3BattleText: + text_far _Route8SuperNerd3BattleText text_end -Route8EndBattleText5: - text_far _Route8EndBattleText5 +Route8SuperNerd3EndBattleText: + text_far _Route8SuperNerd3EndBattleText text_end -Route8AfterBattleText5: - text_far _Route8AfterBattleText5 +Route8SuperNerd3AfterBattleText: + text_far _Route8SuperNerd3AfterBattleText text_end -Route8Text6: +Route8CooltrainerF2Text: text_asm ld hl, Route8TrainerHeader5 call TalkToTrainer jp TextScriptEnd -Route8BattleText6: - text_far _Route8BattleText6 +Route8CooltrainerF2BattleText: + text_far _Route8CooltrainerF2BattleText text_end -Route8EndBattleText6: - text_far _Route8EndBattleText6 +Route8CooltrainerF2EndBattleText: + text_far _Route8CooltrainerF2EndBattleText text_end -Route8AfterBattleText6: - text_far _Route8AfterBattleText6 +Route8CooltrainerF2AfterBattleText: + text_far _Route8CooltrainerF2AfterBattleText text_end -Route8Text7: +Route8CooltrainerF3Text: text_asm ld hl, Route8TrainerHeader6 call TalkToTrainer jp TextScriptEnd -Route8BattleText7: - text_far _Route8BattleText7 +Route8CooltrainerF3BattleText: + text_far _Route8CooltrainerF3BattleText text_end -Route8EndBattleText7: - text_far _Route8EndBattleText7 +Route8CooltrainerF3EndBattleText: + text_far _Route8CooltrainerF3EndBattleText text_end -Route8AfterBattleText7: - text_far _Route8AfterBattleText7 +Route8CooltrainerF3AfterBattleText: + text_far _Route8CooltrainerF3AfterBattleText text_end -Route8Text8: +Route8Gambler2Text: text_asm ld hl, Route8TrainerHeader7 call TalkToTrainer jp TextScriptEnd -Route8BattleText8: - text_far _Route8BattleText8 +Route8Gambler2BattleText: + text_far _Route8Gambler2BattleText text_end -Route8EndBattleText8: - text_far _Route8EndBattleText8 +Route8Gambler2EndBattleText: + text_far _Route8Gambler2EndBattleText text_end -Route8AfterBattleText8: - text_far _Route8AfterBattleText8 +Route8Gambler2AfterBattleText: + text_far _Route8Gambler2AfterBattleText text_end -Route8Text9: +Route8CooltrainerF4Text: text_asm ld hl, Route8TrainerHeader8 call TalkToTrainer jp TextScriptEnd -Route8BattleText9: - text_far _Route8BattleText9 +Route8CooltrainerF4BattleText: + text_far _Route8CooltrainerF4BattleText text_end -Route8EndBattleText9: - text_far _Route8EndBattleText9 +Route8CooltrainerF4EndBattleText: + text_far _Route8CooltrainerF4EndBattleText text_end -Route8AfterBattleText9: - text_far _Route8AfterBattleText9 +Route8CooltrainerF4AfterBattleText: + text_far _Route8CooltrainerF4AfterBattleText text_end -Route8Text10: - text_far _Route8Text10 +Route8UndergroundSignText: + text_far _Route8UndergroundSignText text_end |
