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/ViridianForest.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/ViridianForest.asm')
| -rw-r--r-- | scripts/ViridianForest.asm | 116 |
1 files changed, 59 insertions, 57 deletions
diff --git a/scripts/ViridianForest.asm b/scripts/ViridianForest.asm index 14081694..4eeb9226 100644 --- a/scripts/ViridianForest.asm +++ b/scripts/ViridianForest.asm @@ -8,118 +8,120 @@ ViridianForest_Script: ret ViridianForest_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_VIRIDIANFOREST_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_VIRIDIANFOREST_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_VIRIDIANFOREST_END_BATTLE ViridianForest_TextPointers: - dw ViridianForestText1 - dw ViridianForestText2 - dw ViridianForestText3 - dw ViridianForestText4 - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw ViridianForestText8 - dw ViridianForestText9 - dw ViridianForestText10 - dw ViridianForestText11 - dw ViridianForestText12 - dw ViridianForestText13 - dw ViridianForestText14 + def_text_pointers + dw_const ViridianForestYoungster1Text, TEXT_VIRIDIANFOREST_YOUNGSTER1 + dw_const ViridianForestYoungster2Text, TEXT_VIRIDIANFOREST_YOUNGSTER2 + dw_const ViridianForestYoungster3Text, TEXT_VIRIDIANFOREST_YOUNGSTER3 + dw_const ViridianForestYoungster4Text, TEXT_VIRIDIANFOREST_YOUNGSTER4 + dw_const PickUpItemText, TEXT_VIRIDIANFOREST_ANTIDOTE + dw_const PickUpItemText, TEXT_VIRIDIANFOREST_POTION + dw_const PickUpItemText, TEXT_VIRIDIANFOREST_POKE_BALL + dw_const ViridianForestYoungster5Text, TEXT_VIRIDIANFOREST_YOUNGSTER5 + dw_const ViridianForestTrainerTips1Text, TEXT_VIRIDIANFOREST_TRAINER_TIPS1 + dw_const ViridianForestUseAntidoteSignText, TEXT_VIRIDIANFOREST_USE_ANTIDOTE_SIGN + dw_const ViridianForestTrainerTips2Text, TEXT_VIRIDIANFOREST_TRAINER_TIPS2 + dw_const ViridianForestTrainerTips3Text, TEXT_VIRIDIANFOREST_TRAINER_TIPS3 + dw_const ViridianForestTrainerTips4Text, TEXT_VIRIDIANFOREST_TRAINER_TIPS4 + dw_const ViridianForestLeavingSignText, TEXT_VIRIDIANFOREST_LEAVING_SIGN ViridianForestTrainerHeaders: def_trainers 2 ViridianForestTrainerHeader0: - trainer EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_0, 4, ViridianForestBattleText1, ViridianForestEndBattleText1, ViridianForestAfterBattleText1 + trainer EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_0, 4, ViridianForestYoungster2BattleText, ViridianForestYoungster2EndBattleText, ViridianForestYoungster2AfterBattleText ViridianForestTrainerHeader1: - trainer EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_1, 4, ViridianForestBattleText2, ViridianForestEndBattleText2, ViridianForestAfterBattleText2 + trainer EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_1, 4, ViridianForestYoungster3BattleText, ViridianForestYoungster3EndBattleText, ViridianForestYoungster3AfterBattleText ViridianForestTrainerHeader2: - trainer EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_2, 1, ViridianForestBattleText3, ViridianForestEndBattleText3, ViridianForestAfterBattleText3 + trainer EVENT_BEAT_VIRIDIAN_FOREST_TRAINER_2, 1, ViridianForestYoungster4BattleText, ViridianForestYoungster4EndBattleText, ViridianForestYoungster4AfterBattleText db -1 ; end -ViridianForestText1: - text_far _ViridianForestText1 +ViridianForestYoungster1Text: + text_far _ViridianForestYoungster1Text text_end -ViridianForestText2: +ViridianForestYoungster2Text: text_asm ld hl, ViridianForestTrainerHeader0 call TalkToTrainer jp TextScriptEnd -ViridianForestText3: +ViridianForestYoungster3Text: text_asm ld hl, ViridianForestTrainerHeader1 call TalkToTrainer jp TextScriptEnd -ViridianForestText4: +ViridianForestYoungster4Text: text_asm ld hl, ViridianForestTrainerHeader2 call TalkToTrainer jp TextScriptEnd -ViridianForestBattleText1: - text_far _ViridianForestBattleText1 +ViridianForestYoungster2BattleText: + text_far _ViridianForestYoungster2BattleText text_end -ViridianForestEndBattleText1: - text_far _ViridianForestEndBattleText1 +ViridianForestYoungster2EndBattleText: + text_far _ViridianForestYoungster2EndBattleText text_end -ViridianForestAfterBattleText1: - text_far _ViridianFrstAfterBattleText1 +ViridianForestYoungster2AfterBattleText: + text_far _ViridianForestYoungster2AfterBattleText text_end -ViridianForestBattleText2: - text_far _ViridianForestBattleText2 +ViridianForestYoungster3BattleText: + text_far _ViridianForestYoungster3BattleText text_end -ViridianForestEndBattleText2: - text_far _ViridianForestEndBattleText2 +ViridianForestYoungster3EndBattleText: + text_far _ViridianForestYoungster3EndBattleText text_end -ViridianForestAfterBattleText2: - text_far _ViridianFrstAfterBattleText2 +ViridianForestYoungster3AfterBattleText: + text_far _ViridianForestYoungster3AfterBattleText text_end -ViridianForestBattleText3: - text_far _ViridianForestBattleText3 +ViridianForestYoungster4BattleText: + text_far _ViridianForestYoungster4BattleText text_end -ViridianForestEndBattleText3: - text_far _ViridianForestEndBattleText3 +ViridianForestYoungster4EndBattleText: + text_far _ViridianForestYoungster4EndBattleText text_end -ViridianForestAfterBattleText3: - text_far _ViridianFrstAfterBattleText3 +ViridianForestYoungster4AfterBattleText: + text_far _ViridianForestYoungster4AfterBattleText text_end -ViridianForestText8: - text_far _ViridianForestText8 +ViridianForestYoungster5Text: + text_far _ViridianForestYoungster5Text text_end -ViridianForestText9: - text_far _ViridianForestText9 +ViridianForestTrainerTips1Text: + text_far _ViridianForestTrainerTips1Text text_end -ViridianForestText10: - text_far _ViridianForestText10 +ViridianForestUseAntidoteSignText: + text_far _ViridianForestUseAntidoteSignText text_end -ViridianForestText11: - text_far _ViridianForestText11 +ViridianForestTrainerTips2Text: + text_far _ViridianForestTrainerTips2Text text_end -ViridianForestText12: - text_far _ViridianForestText12 +ViridianForestTrainerTips3Text: + text_far _ViridianForestTrainerTips3Text text_end -ViridianForestText13: - text_far _ViridianForestText13 +ViridianForestTrainerTips4Text: + text_far _ViridianForestTrainerTips4Text text_end -ViridianForestText14: - text_far _ViridianForestText14 +ViridianForestLeavingSignText: + text_far _ViridianForestLeavingSignText text_end |
