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/PokemonTower4F.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/PokemonTower4F.asm')
| -rw-r--r-- | scripts/PokemonTower4F.asm | 68 |
1 files changed, 35 insertions, 33 deletions
diff --git a/scripts/PokemonTower4F.asm b/scripts/PokemonTower4F.asm index 9bd291d2..066ee277 100644 --- a/scripts/PokemonTower4F.asm +++ b/scripts/PokemonTower4F.asm @@ -8,78 +8,80 @@ PokemonTower4F_Script: ret PokemonTower4F_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_POKEMONTOWER4F_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_POKEMONTOWER4F_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_POKEMONTOWER4F_END_BATTLE PokemonTower4F_TextPointers: - dw PokemonTower4Text1 - dw PokemonTower4Text2 - dw PokemonTower4Text3 - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText + def_text_pointers + dw_const PokemonTower4FChanneler1Text, TEXT_POKEMONTOWER4F_CHANNELER1 + dw_const PokemonTower4FChanneler2Text, TEXT_POKEMONTOWER4F_CHANNELER2 + dw_const PokemonTower4FChanneler3Text, TEXT_POKEMONTOWER4F_CHANNELER3 + dw_const PickUpItemText, TEXT_POKEMONTOWER4F_ELIXER + dw_const PickUpItemText, TEXT_POKEMONTOWER4F_AWAKENING + dw_const PickUpItemText, TEXT_POKEMONTOWER4F_HP_UP PokemonTower4TrainerHeaders: def_trainers PokemonTower4TrainerHeader0: - trainer EVENT_BEAT_POKEMONTOWER_4_TRAINER_0, 2, PokemonTower4BattleText1, PokemonTower4EndBattleText1, PokemonTower4AfterBattleText1 + trainer EVENT_BEAT_POKEMONTOWER_4_TRAINER_0, 2, PokemonTower4FChanneler1BattleText, PokemonTower4FChanneler1EndBattleText, PokemonTower4FChanneler1AfterBattleText PokemonTower4TrainerHeader1: - trainer EVENT_BEAT_POKEMONTOWER_4_TRAINER_1, 2, PokemonTower4BattleText2, PokemonTower4EndBattleText2, PokemonTower4AfterBattleText2 + trainer EVENT_BEAT_POKEMONTOWER_4_TRAINER_1, 2, PokemonTower4FChanneler2BattleText, PokemonTower4FChanneler2EndBattleText, PokemonTower4FChanneler2AfterBattleText PokemonTower4TrainerHeader2: - trainer EVENT_BEAT_POKEMONTOWER_4_TRAINER_2, 2, PokemonTower4BattleText3, PokemonTower4EndBattleText3, PokemonTower4AfterBattleText3 + trainer EVENT_BEAT_POKEMONTOWER_4_TRAINER_2, 2, PokemonTower4FChanneler3BattleText, PokemonTower4FChanneler3EndBattleText, PokemonTower4FChanneler3AfterBattleText db -1 ; end -PokemonTower4Text1: +PokemonTower4FChanneler1Text: text_asm ld hl, PokemonTower4TrainerHeader0 call TalkToTrainer jp TextScriptEnd -PokemonTower4Text2: +PokemonTower4FChanneler2Text: text_asm ld hl, PokemonTower4TrainerHeader1 call TalkToTrainer jp TextScriptEnd -PokemonTower4Text3: +PokemonTower4FChanneler3Text: text_asm ld hl, PokemonTower4TrainerHeader2 call TalkToTrainer jp TextScriptEnd -PokemonTower4BattleText1: - text_far _PokemonTower4BattleText1 +PokemonTower4FChanneler1BattleText: + text_far _PokemonTower4FChanneler1BattleText text_end -PokemonTower4EndBattleText1: - text_far _PokemonTower4EndBattleText1 +PokemonTower4FChanneler1EndBattleText: + text_far _PokemonTower4FChanneler1EndBattleText text_end -PokemonTower4AfterBattleText1: - text_far _PokemonTower4AfterBattleText1 +PokemonTower4FChanneler1AfterBattleText: + text_far _PokemonTower4FChanneler1AfterBattleText text_end -PokemonTower4BattleText2: - text_far _PokemonTower4BattleText2 +PokemonTower4FChanneler2BattleText: + text_far _PokemonTower4FChanneler2BattleText text_end -PokemonTower4EndBattleText2: - text_far _PokemonTower4EndBattleText2 +PokemonTower4FChanneler2EndBattleText: + text_far _PokemonTower4FChanneler2EndBattleText text_end -PokemonTower4AfterBattleText2: - text_far _PokemonTower4AfterBattleText2 +PokemonTower4FChanneler2AfterBattleText: + text_far _PokemonTower4FChanneler2AfterBattleText text_end -PokemonTower4BattleText3: - text_far _PokemonTower4BattleText3 +PokemonTower4FChanneler3BattleText: + text_far _PokemonTower4FChanneler3BattleText text_end -PokemonTower4EndBattleText3: - text_far _PokemonTower4EndBattleText3 +PokemonTower4FChanneler3EndBattleText: + text_far _PokemonTower4FChanneler3EndBattleText text_end -PokemonTower4AfterBattleText3: - text_far _PokemonTower4AfterBattleText3 +PokemonTower4FChanneler3AfterBattleText: + text_far _PokemonTower4FChanneler3AfterBattleText text_end |