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/VictoryRoad1F.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/VictoryRoad1F.asm')
| -rw-r--r-- | scripts/VictoryRoad1F.asm | 60 |
1 files changed, 31 insertions, 29 deletions
diff --git a/scripts/VictoryRoad1F.asm b/scripts/VictoryRoad1F.asm index e07e549e..e80e17d5 100644 --- a/scripts/VictoryRoad1F.asm +++ b/scripts/VictoryRoad1F.asm @@ -19,14 +19,15 @@ VictoryRoad1F_Script: predef_jump ReplaceTileBlock VictoryRoad1F_ScriptPointers: - dw VictoryRoad1Script0 - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const VictoryRoad1FDefaultScript, SCRIPT_VICTORYROAD1F_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_VICTORYROAD1F_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_VICTORYROAD1F_END_BATTLE -VictoryRoad1Script0: +VictoryRoad1FDefaultScript: CheckEvent EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH jp nz, CheckFightingMapTrainers - ld hl, CoordsData_5da5c + ld hl, .SwitchCoords call CheckBoulderCoords jp nc, CheckFightingMapTrainers ld hl, wCurrentMapScriptFlags @@ -34,59 +35,60 @@ VictoryRoad1Script0: SetEvent EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH ret -CoordsData_5da5c: +.SwitchCoords: dbmapcoord 17, 13 db -1 ; end VictoryRoad1F_TextPointers: - dw VictoryRoad1Text1 - dw VictoryRoad1Text2 - dw PickUpItemText - dw PickUpItemText - dw BoulderText - dw BoulderText - dw BoulderText + def_text_pointers + dw_const VictoryRoad1FCooltrainerFText, TEXT_VICTORYROAD1F_COOLTRAINER_F + dw_const VictoryRoad1FCooltrainerMText, TEXT_VICTORYROAD1F_COOLTRAINER_M + dw_const PickUpItemText, TEXT_VICTORYROAD1F_TM_SKY_ATTACK + dw_const PickUpItemText, TEXT_VICTORYROAD1F_RARE_CANDY + dw_const BoulderText, TEXT_VICTORYROAD1F_BOULDER1 + dw_const BoulderText, TEXT_VICTORYROAD1F_BOULDER2 + dw_const BoulderText, TEXT_VICTORYROAD1F_BOULDER3 VictoryRoad1TrainerHeaders: def_trainers VictoryRoad1TrainerHeader0: - trainer EVENT_BEAT_VICTORY_ROAD_1_TRAINER_0, 2, VictoryRoad1BattleText1, VictoryRoad1EndBattleText1, VictoryRoad1AfterBattleText1 + trainer EVENT_BEAT_VICTORY_ROAD_1_TRAINER_0, 2, VictoryRoad1FCooltrainerFBattleText, VictoryRoad1FCooltrainerFEndBattleText, VictoryRoad1FCooltrainerFAfterBattleText VictoryRoad1TrainerHeader1: - trainer EVENT_BEAT_VICTORY_ROAD_1_TRAINER_1, 2, VictoryRoad1BattleText2, VictoryRoad1EndBattleText2, VictoryRoad1AfterBattleText2 + trainer EVENT_BEAT_VICTORY_ROAD_1_TRAINER_1, 2, VictoryRoad1FCooltrainerMBattleText, VictoryRoad1FCooltrainerMEndBattleText, VictoryRoad1FCooltrainerMAfterBattleText db -1 ; end -VictoryRoad1Text1: +VictoryRoad1FCooltrainerFText: text_asm ld hl, VictoryRoad1TrainerHeader0 call TalkToTrainer jp TextScriptEnd -VictoryRoad1Text2: +VictoryRoad1FCooltrainerMText: text_asm ld hl, VictoryRoad1TrainerHeader1 call TalkToTrainer jp TextScriptEnd -VictoryRoad1BattleText1: - text_far _VictoryRoad1BattleText1 +VictoryRoad1FCooltrainerFBattleText: + text_far _VictoryRoad1FCooltrainerFBattleText text_end -VictoryRoad1EndBattleText1: - text_far _VictoryRoad1EndBattleText1 +VictoryRoad1FCooltrainerFEndBattleText: + text_far _VictoryRoad1FCooltrainerFEndBattleText text_end -VictoryRoad1AfterBattleText1: - text_far _VictoryRoad1AfterBattleText1 +VictoryRoad1FCooltrainerFAfterBattleText: + text_far _VictoryRoad1FCooltrainerFAfterBattleText text_end -VictoryRoad1BattleText2: - text_far _VictoryRoad1BattleText2 +VictoryRoad1FCooltrainerMBattleText: + text_far _VictoryRoad1FCooltrainerMBattleText text_end -VictoryRoad1EndBattleText2: - text_far _VictoryRoad1EndBattleText2 +VictoryRoad1FCooltrainerMEndBattleText: + text_far _VictoryRoad1FCooltrainerMEndBattleText text_end -VictoryRoad1AfterBattleText2: - text_far _VictoryRoad1AfterBattleText2 +VictoryRoad1FCooltrainerMAfterBattleText: + text_far _VictoryRoad1FCooltrainerMAfterBattleText text_end |