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/PokemonTower3F.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/PokemonTower3F.asm')
| -rw-r--r-- | scripts/PokemonTower3F.asm | 64 |
1 files changed, 33 insertions, 31 deletions
diff --git a/scripts/PokemonTower3F.asm b/scripts/PokemonTower3F.asm index 158bc9d7..d7c81583 100644 --- a/scripts/PokemonTower3F.asm +++ b/scripts/PokemonTower3F.asm @@ -8,76 +8,78 @@ PokemonTower3F_Script: ret PokemonTower3F_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_POKEMONTOWER3F_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_POKEMONTOWER3F_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_POKEMONTOWER3F_END_BATTLE PokemonTower3F_TextPointers: - dw PokemonTower3Text1 - dw PokemonTower3Text2 - dw PokemonTower3Text3 - dw PickUpItemText + def_text_pointers + dw_const PokemonTower3FChanneler1Text, TEXT_POKEMONTOWER3F_CHANNELER1 + dw_const PokemonTower3FChanneler2Text, TEXT_POKEMONTOWER3F_CHANNELER2 + dw_const PokemonTower3FChanneler3Text, TEXT_POKEMONTOWER3F_CHANNELER3 + dw_const PickUpItemText, TEXT_POKEMONTOWER3F_ESCAPE_ROPE PokemonTower3TrainerHeaders: def_trainers PokemonTower3TrainerHeader0: - trainer EVENT_BEAT_POKEMONTOWER_3_TRAINER_0, 2, PokemonTower3BattleText1, PokemonTower3EndBattleText1, PokemonTower3AfterBattleText1 + trainer EVENT_BEAT_POKEMONTOWER_3_TRAINER_0, 2, PokemonTower3FChanneler1BattleText, PokemonTower3FChanneler1EndBattleText, PokemonTower3FChanneler1AfterBattleText PokemonTower3TrainerHeader1: - trainer EVENT_BEAT_POKEMONTOWER_3_TRAINER_1, 3, PokemonTower3BattleText2, PokemonTower3EndBattleText2, PokemonTower3AfterBattleText2 + trainer EVENT_BEAT_POKEMONTOWER_3_TRAINER_1, 3, PokemonTower3FChanneler2BattleText, PokemonTower3FChanneler2EndBattleText, PokemonTower3FChanneler2AfterBattleText PokemonTower3TrainerHeader2: - trainer EVENT_BEAT_POKEMONTOWER_3_TRAINER_2, 2, PokemonTower3BattleText3, PokemonTower3EndBattleText3, PokemonTower3AfterBattleText3 + trainer EVENT_BEAT_POKEMONTOWER_3_TRAINER_2, 2, PokemonTower3FChanneler3BattleText, PokemonTower3FChanneler3EndBattleText, PokemonTower3FChanneler3AfterBattleText db -1 ; end -PokemonTower3Text1: +PokemonTower3FChanneler1Text: text_asm ld hl, PokemonTower3TrainerHeader0 call TalkToTrainer jp TextScriptEnd -PokemonTower3Text2: +PokemonTower3FChanneler2Text: text_asm ld hl, PokemonTower3TrainerHeader1 call TalkToTrainer jp TextScriptEnd -PokemonTower3Text3: +PokemonTower3FChanneler3Text: text_asm ld hl, PokemonTower3TrainerHeader2 call TalkToTrainer jp TextScriptEnd -PokemonTower3BattleText1: - text_far _PokemonTower3BattleText1 +PokemonTower3FChanneler1BattleText: + text_far _PokemonTower3FChanneler1BattleText text_end -PokemonTower3EndBattleText1: - text_far _PokemonTower3EndBattleText1 +PokemonTower3FChanneler1EndBattleText: + text_far _PokemonTower3FChanneler1EndBattleText text_end -PokemonTower3AfterBattleText1: - text_far _PokemonTower3AfterBattleText1 +PokemonTower3FChanneler1AfterBattleText: + text_far _PokemonTower3FChanneler1AfterBattleText text_end -PokemonTower3BattleText2: - text_far _PokemonTower3BattleText2 +PokemonTower3FChanneler2BattleText: + text_far _PokemonTower3FChanneler2BattleText text_end -PokemonTower3EndBattleText2: - text_far _PokemonTower3EndBattleText2 +PokemonTower3FChanneler2EndBattleText: + text_far _PokemonTower3FChanneler2EndBattleText text_end -PokemonTower3AfterBattleText2: - text_far _PokemonTower3AfterBattleText2 +PokemonTower3FChanneler2AfterBattleText: + text_far _PokemonTower3FChanneler2AfterBattleText text_end -PokemonTower3BattleText3: - text_far _PokemonTower3BattleText3 +PokemonTower3FChanneler3BattleText: + text_far _PokemonTower3FChanneler3BattleText text_end -PokemonTower3EndBattleText3: - text_far _PokemonTower3EndBattleText3 +PokemonTower3FChanneler3EndBattleText: + text_far _PokemonTower3FChanneler3EndBattleText text_end -PokemonTower3AfterBattleText3: - text_far _PokemonTower3AfterBattleText3 +PokemonTower3FChanneler3AfterBattleText: + text_far _PokemonTower3FChanneler3AfterBattleText text_end |