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/Route20.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/Route20.asm')
| -rw-r--r-- | scripts/Route20.asm | 229 |
1 files changed, 115 insertions, 114 deletions
diff --git a/scripts/Route20.asm b/scripts/Route20.asm index fd20f722..5230858e 100644 --- a/scripts/Route20.asm +++ b/scripts/Route20.asm @@ -1,6 +1,6 @@ Route20_Script: CheckAndResetEvent EVENT_IN_SEAFOAM_ISLANDS - call nz, Route20Script_50cc6 + call nz, Route20BoulderScript call EnableAutoTextBoxDrawing ld hl, Route20TrainerHeaders ld de, Route20_ScriptPointers @@ -9,22 +9,22 @@ Route20_Script: ld [wRoute20CurScript], a ret -Route20Script_50cc6: +Route20BoulderScript: CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE - jr z, .asm_50cef + jr z, .next_boulder_check ld a, HS_SEAFOAM_ISLANDS_1F_BOULDER_1 - call Route20Script_50d0c + call Route20ShowObjectScript ld a, HS_SEAFOAM_ISLANDS_1F_BOULDER_2 - call Route20Script_50d0c + call Route20ShowObjectScript ld hl, .MissableObjectIDs -.asm_50cdc +.hide_missable_objects ld a, [hli] cp $ff - jr z, .asm_50cef + jr z, .next_boulder_check push hl - call Route20Script_50d14 + call Route20HideObjectScript pop hl - jr .asm_50cdc + jr .hide_missable_objects .MissableObjectIDs: db HS_SEAFOAM_ISLANDS_B1F_BOULDER_1 @@ -35,251 +35,252 @@ Route20Script_50cc6: db HS_SEAFOAM_ISLANDS_B3F_BOULDER_4 db -1 ; end -.asm_50cef +.next_boulder_check CheckBothEventsSet EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM4_BOULDER2_DOWN_HOLE ret z ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_1 - call Route20Script_50d0c + call Route20ShowObjectScript ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_2 - call Route20Script_50d0c + call Route20ShowObjectScript ld a, HS_SEAFOAM_ISLANDS_B4F_BOULDER_1 - call Route20Script_50d14 + call Route20HideObjectScript ld a, HS_SEAFOAM_ISLANDS_B4F_BOULDER_2 - call Route20Script_50d14 + call Route20HideObjectScript ret -Route20Script_50d0c: +Route20ShowObjectScript: ld [wMissableObjectIndex], a predef_jump ShowObject -Route20Script_50d14: +Route20HideObjectScript: ld [wMissableObjectIndex], a predef_jump HideObject Route20_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_ROUTE20_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_ROUTE20_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_ROUTE20_END_BATTLE Route20_TextPointers: - dw Route20Text1 - dw Route20Text2 - dw Route20Text3 - dw Route20Text4 - dw Route20Text5 - dw Route20Text6 - dw Route20Text7 - dw Route20Text8 - dw Route20Text9 - dw Route20Text10 - dw Route20Text11 - dw Route20Text12 + def_text_pointers + dw_const Route20Swimmer1Text, TEXT_ROUTE20_SWIMMER1 + dw_const Route20Swimmer2Text, TEXT_ROUTE20_SWIMMER2 + dw_const Route20Swimmer3Text, TEXT_ROUTE20_SWIMMER3 + dw_const Route20Swimmer4Text, TEXT_ROUTE20_SWIMMER4 + dw_const Route20Swimmer5Text, TEXT_ROUTE20_SWIMMER5 + dw_const Route20Swimmer6Text, TEXT_ROUTE20_SWIMMER6 + dw_const Route20CooltrainerMText, TEXT_ROUTE20_COOLTRAINER_M + dw_const Route20Swimmer7Text, TEXT_ROUTE20_SWIMMER7 + dw_const Route20Swimmer8Text, TEXT_ROUTE20_SWIMMER8 + dw_const Route20Swimmer9Text, TEXT_ROUTE20_SWIMMER9 + dw_const Route20SeafoamIslandsSignText, TEXT_ROUTE20_SEAFOAM_ISLANDS_WEST_SIGN + dw_const Route20SeafoamIslandsSignText, TEXT_ROUTE20_SEAFOAM_ISLANDS_EAST_SIGN Route20TrainerHeaders: def_trainers Route20TrainerHeader0: - trainer EVENT_BEAT_ROUTE_20_TRAINER_0, 4, Route20BattleText1, Route20EndBattleText1, Route20AfterBattleText1 + trainer EVENT_BEAT_ROUTE_20_TRAINER_0, 4, Route20Swimmer1BattleText, Route20Swimmer1EndBattleText, Route20Swimmer1AfterBattleText Route20TrainerHeader1: - trainer EVENT_BEAT_ROUTE_20_TRAINER_1, 4, Route20BattleText2, Route20EndBattleText2, Route20AfterBattleText2 + trainer EVENT_BEAT_ROUTE_20_TRAINER_1, 4, Route20Swimmer2BattleText, Route20Swimmer2EndBattleText, Route20Swimmer2AfterBattleText Route20TrainerHeader2: - trainer EVENT_BEAT_ROUTE_20_TRAINER_2, 2, Route20BattleText3, Route20EndBattleText3, Route20AfterBattleText3 + trainer EVENT_BEAT_ROUTE_20_TRAINER_2, 2, Route20Swimmer3BattleText, Route20Swimmer3EndBattleText, Route20Swimmer3AfterBattleText Route20TrainerHeader3: - trainer EVENT_BEAT_ROUTE_20_TRAINER_3, 4, Route20BattleText4, Route20EndBattleText4, Route20AfterBattleText4 + trainer EVENT_BEAT_ROUTE_20_TRAINER_3, 4, Route20Swimmer4BattleText, Route20Swimmer4EndBattleText, Route20Swimmer4AfterBattleText Route20TrainerHeader4: - trainer EVENT_BEAT_ROUTE_20_TRAINER_4, 3, Route20BattleText5, Route20EndBattleText5, Route20AfterBattleText5 + trainer EVENT_BEAT_ROUTE_20_TRAINER_4, 3, Route20Swimmer5BattleText, Route20Swimmer5EndBattleText, Route20Swimmer5AfterBattleText Route20TrainerHeader5: - trainer EVENT_BEAT_ROUTE_20_TRAINER_5, 4, Route20BattleText6, Route20EndBattleText6, Route20AfterBattleText6 + trainer EVENT_BEAT_ROUTE_20_TRAINER_5, 4, Route20Swimmer6BattleText, Route20Swimmer6EndBattleText, Route20Swimmer6AfterBattleText Route20TrainerHeader6: - trainer EVENT_BEAT_ROUTE_20_TRAINER_6, 2, Route20BattleText7, Route20EndBattleText7, Route20AfterBattleText7 + trainer EVENT_BEAT_ROUTE_20_TRAINER_6, 2, Route20CooltrainerMBattleText, Route20CooltrainerMEndBattleText, Route20CooltrainerMAfterBattleText Route20TrainerHeader7: - trainer EVENT_BEAT_ROUTE_20_TRAINER_7, 4, Route20BattleText8, Route20EndBattleText8, Route20AfterBattleText8 + trainer EVENT_BEAT_ROUTE_20_TRAINER_7, 4, Route20Swimmer7BattleText, Route20Swimmer7EndBattleText, Route20Swimmer7AfterBattleText Route20TrainerHeader8: - trainer EVENT_BEAT_ROUTE_20_TRAINER_8, 3, Route20BattleText9, Route20EndBattleText9, Route20AfterBattleText9 + trainer EVENT_BEAT_ROUTE_20_TRAINER_8, 3, Route20Swimmer8BattleText, Route20Swimmer8EndBattleText, Route20Swimmer8AfterBattleText Route20TrainerHeader9: - trainer EVENT_BEAT_ROUTE_20_TRAINER_9, 4, Route20BattleText10, Route20EndBattleText10, Route20AfterBattleText10 + trainer EVENT_BEAT_ROUTE_20_TRAINER_9, 4, Route20Swimmer9BattleText, Route20Swimmer9EndBattleText, Route20Swimmer9AfterBattleText db -1 ; end -Route20Text1: +Route20Swimmer1Text: text_asm ld hl, Route20TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Route20Text2: +Route20Swimmer2Text: text_asm ld hl, Route20TrainerHeader1 call TalkToTrainer jp TextScriptEnd -Route20Text3: +Route20Swimmer3Text: text_asm ld hl, Route20TrainerHeader2 call TalkToTrainer jp TextScriptEnd -Route20Text4: +Route20Swimmer4Text: text_asm ld hl, Route20TrainerHeader3 call TalkToTrainer jp TextScriptEnd -Route20Text5: +Route20Swimmer5Text: text_asm ld hl, Route20TrainerHeader4 call TalkToTrainer jp TextScriptEnd -Route20Text6: +Route20Swimmer6Text: text_asm ld hl, Route20TrainerHeader5 call TalkToTrainer jp TextScriptEnd -Route20Text7: +Route20CooltrainerMText: text_asm ld hl, Route20TrainerHeader6 call TalkToTrainer jp TextScriptEnd -Route20Text8: +Route20Swimmer7Text: text_asm ld hl, Route20TrainerHeader7 call TalkToTrainer jp TextScriptEnd -Route20Text9: +Route20Swimmer8Text: text_asm ld hl, Route20TrainerHeader8 call TalkToTrainer jp TextScriptEnd -Route20Text10: +Route20Swimmer9Text: text_asm ld hl, Route20TrainerHeader9 call TalkToTrainer jp TextScriptEnd -Route20BattleText1: - text_far _Route20BattleText1 +Route20Swimmer1BattleText: + text_far _Route20Swimmer1BattleText text_end -Route20EndBattleText1: - text_far _Route20EndBattleText1 +Route20Swimmer1EndBattleText: + text_far _Route20Swimmer1EndBattleText text_end -Route20AfterBattleText1: - text_far _Route20AfterBattleText1 +Route20Swimmer1AfterBattleText: + text_far _Route20Swimmer1AfterBattleText text_end -Route20BattleText2: - text_far _Route20BattleText2 +Route20Swimmer2BattleText: + text_far _Route20Swimmer2BattleText text_end -Route20EndBattleText2: - text_far _Route20EndBattleText2 +Route20Swimmer2EndBattleText: + text_far _Route20Swimmer2EndBattleText text_end -Route20AfterBattleText2: - text_far _Route20AfterBattleText2 +Route20Swimmer2AfterBattleText: + text_far _Route20Swimmer2AfterBattleText text_end -Route20BattleText3: - text_far _Route20BattleText3 +Route20Swimmer3BattleText: + text_far _Route20Swimmer3BattleText text_end -Route20EndBattleText3: - text_far _Route20EndBattleText3 +Route20Swimmer3EndBattleText: + text_far _Route20Swimmer3EndBattleText text_end -Route20AfterBattleText3: - text_far _Route20AfterBattleText3 +Route20Swimmer3AfterBattleText: + text_far _Route20Swimmer3AfterBattleText text_end -Route20BattleText4: - text_far _Route20BattleText4 +Route20Swimmer4BattleText: + text_far _Route20Swimmer4BattleText text_end -Route20EndBattleText4: - text_far _Route20EndBattleText4 +Route20Swimmer4EndBattleText: + text_far _Route20Swimmer4EndBattleText text_end -Route20AfterBattleText4: - text_far _Route20AfterBattleText4 +Route20Swimmer4AfterBattleText: + text_far _Route20Swimmer4AfterBattleText text_end -Route20BattleText5: - text_far _Route20BattleText5 +Route20Swimmer5BattleText: + text_far _Route20Swimmer5BattleText text_end -Route20EndBattleText5: - text_far _Route20EndBattleText5 +Route20Swimmer5EndBattleText: + text_far _Route20Swimmer5EndBattleText text_end -Route20AfterBattleText5: - text_far _Route20AfterBattleText5 +Route20Swimmer5AfterBattleText: + text_far _Route20Swimmer5AfterBattleText text_end -Route20BattleText6: - text_far _Route20BattleText6 +Route20Swimmer6BattleText: + text_far _Route20Swimmer6BattleText text_end -Route20EndBattleText6: - text_far _Route20EndBattleText6 +Route20Swimmer6EndBattleText: + text_far _Route20Swimmer6EndBattleText text_end -Route20AfterBattleText6: - text_far _Route20AfterBattleText6 +Route20Swimmer6AfterBattleText: + text_far _Route20Swimmer6AfterBattleText text_end -Route20BattleText7: - text_far _Route20BattleText7 +Route20CooltrainerMBattleText: + text_far _Route20CooltrainerMBattleText text_end -Route20EndBattleText7: - text_far _Route20EndBattleText7 +Route20CooltrainerMEndBattleText: + text_far _Route20CooltrainerMEndBattleText text_end -Route20AfterBattleText7: - text_far _Route20AfterBattleText7 +Route20CooltrainerMAfterBattleText: + text_far _Route20CooltrainerMAfterBattleText text_end -Route20BattleText8: - text_far _Route20BattleText8 +Route20Swimmer7BattleText: + text_far _Route20Swimmer7BattleText text_end -Route20EndBattleText8: - text_far _Route20EndBattleText8 +Route20Swimmer7EndBattleText: + text_far _Route20Swimmer7EndBattleText text_end -Route20AfterBattleText8: - text_far _Route20AfterBattleText8 +Route20Swimmer7AfterBattleText: + text_far _Route20Swimmer7AfterBattleText text_end -Route20BattleText9: - text_far _Route20BattleText9 +Route20Swimmer8BattleText: + text_far _Route20Swimmer8BattleText text_end -Route20EndBattleText9: - text_far _Route20EndBattleText9 +Route20Swimmer8EndBattleText: + text_far _Route20Swimmer8EndBattleText text_end -Route20AfterBattleText9: - text_far _Route20AfterBattleText9 +Route20Swimmer8AfterBattleText: + text_far _Route20Swimmer8AfterBattleText text_end -Route20BattleText10: - text_far _Route20BattleText10 +Route20Swimmer9BattleText: + text_far _Route20Swimmer9BattleText text_end -Route20EndBattleText10: - text_far _Route20EndBattleText10 +Route20Swimmer9EndBattleText: + text_far _Route20Swimmer9EndBattleText text_end -Route20AfterBattleText10: - text_far _Route20AfterBattleText10 +Route20Swimmer9AfterBattleText: + text_far _Route20Swimmer9AfterBattleText text_end -Route20Text12: -Route20Text11: - text_far _Route20Text11 +Route20SeafoamIslandsSignText: + text_far _Route20SeafoamIslandsSignText text_end |
