diff options
Diffstat (limited to 'scripts/Route16.asm')
| -rw-r--r-- | scripts/Route16.asm | 168 |
1 files changed, 85 insertions, 83 deletions
diff --git a/scripts/Route16.asm b/scripts/Route16.asm index b77bbf61..f51bd00e 100644 --- a/scripts/Route16.asm +++ b/scripts/Route16.asm @@ -7,26 +7,27 @@ Route16_Script: ld [wRoute16CurScript], a ret -Route16Script_59946: - xor a +Route16ResetScripts: + xor a ; SCRIPT_ROUTE16_DEFAULT ld [wJoyIgnore], a ld [wRoute16CurScript], a ld [wCurMapScript], a ret Route16_ScriptPointers: - dw Route16Script0 - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle - dw Route16Script3 + def_script_pointers + dw_const Route16DefaultScript, SCRIPT_ROUTE16_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_ROUTE16_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_ROUTE16_END_BATTLE + dw_const Route16SnorlaxPostBattleScript, SCRIPT_ROUTE16_SNORLAX_POST_BATTLE -Route16Script0: +Route16DefaultScript: CheckEventHL EVENT_BEAT_ROUTE16_SNORLAX jp nz, CheckFightingMapTrainers CheckEventReuseHL EVENT_FIGHT_ROUTE16_SNORLAX ResetEventReuseHL EVENT_FIGHT_ROUTE16_SNORLAX jp z, CheckFightingMapTrainers - ld a, $a + ld a, TEXT_ROUTE16_SNORLAX_WOKE_UP ldh [hSpriteIndexOrTextID], a call DisplayTextID ld a, SNORLAX @@ -37,183 +38,184 @@ Route16Script0: ld [wMissableObjectIndex], a predef HideObject call UpdateSprites - ld a, $3 + ld a, SCRIPT_ROUTE16_SNORLAX_POST_BATTLE ld [wRoute16CurScript], a ld [wCurMapScript], a ret -Route16Script3: +Route16SnorlaxPostBattleScript: ld a, [wIsInBattle] cp $ff - jp z, Route16Script_59946 + jp z, Route16ResetScripts call UpdateSprites ld a, [wBattleResult] cp $2 - jr z, .asm_599a8 - ld a, $b + jr z, .caught + ld a, TEXT_ROUTE16_SNORLAX_RETURNED_TO_MOUNTAINS ldh [hSpriteIndexOrTextID], a call DisplayTextID -.asm_599a8 +.caught SetEvent EVENT_BEAT_ROUTE16_SNORLAX call Delay3 - ld a, $0 + ld a, SCRIPT_ROUTE16_DEFAULT ld [wRoute16CurScript], a ld [wCurMapScript], a ret Route16_TextPointers: - dw Route16Text1 - dw Route16Text2 - dw Route16Text3 - dw Route16Text4 - dw Route16Text5 - dw Route16Text6 - dw Route16Text7 - dw Route16Text8 - dw Route16Text9 - dw Route16Text10 - dw Route16Text11 + def_text_pointers + dw_const Route16Biker1Text, TEXT_ROUTE16_BIKER1 + dw_const Route16Biker2Text, TEXT_ROUTE16_BIKER2 + dw_const Route16Biker3Text, TEXT_ROUTE16_BIKER3 + dw_const Route16Biker4Text, TEXT_ROUTE16_BIKER4 + dw_const Route16Biker5Text, TEXT_ROUTE16_BIKER5 + dw_const Route16Biker6Text, TEXT_ROUTE16_BIKER6 + dw_const Route16SnorlaxText, TEXT_ROUTE16_SNORLAX + dw_const Route16CyclingRoadSignText, TEXT_ROUTE16_CYCLING_ROAD_SIGN + dw_const Route16SignText, TEXT_ROUTE16_SIGN + dw_const Route16SnorlaxWokeUpText, TEXT_ROUTE16_SNORLAX_WOKE_UP + dw_const Route16SnorlaxReturnedToMountainsText, TEXT_ROUTE16_SNORLAX_RETURNED_TO_MOUNTAINS Route16TrainerHeaders: def_trainers Route16TrainerHeader0: - trainer EVENT_BEAT_ROUTE_16_TRAINER_0, 3, Route16BattleText1, Route16EndBattleText1, Route16AfterBattleText1 + trainer EVENT_BEAT_ROUTE_16_TRAINER_0, 3, Route16Biker1BattleText, Route16Biker1EndBattleText, Route16Biker1AfterBattleText Route16TrainerHeader1: - trainer EVENT_BEAT_ROUTE_16_TRAINER_1, 2, Route16BattleText2, Route16EndBattleText2, Route16AfterBattleText2 + trainer EVENT_BEAT_ROUTE_16_TRAINER_1, 2, Route16Biker2BattleText, Route16Biker2EndBattleText, Route16Biker2AfterBattleText Route16TrainerHeader2: - trainer EVENT_BEAT_ROUTE_16_TRAINER_2, 2, Route16BattleText3, Route16EndBattleText3, Route16AfterBattleText3 + trainer EVENT_BEAT_ROUTE_16_TRAINER_2, 2, Route16Biker3BattleText, Route16Biker3EndBattleText, Route16Biker3AfterBattleText Route16TrainerHeader3: - trainer EVENT_BEAT_ROUTE_16_TRAINER_3, 2, Route16BattleText4, Route16EndBattleText4, Route16AfterBattleText4 + trainer EVENT_BEAT_ROUTE_16_TRAINER_3, 2, Route16biker4BattleText, Route16Biker4EndBattleText, Route16Biker4AfterBattleText Route16TrainerHeader4: - trainer EVENT_BEAT_ROUTE_16_TRAINER_4, 2, Route16BattleText5, Route16EndBattleText5, Route16AfterBattleText5 + trainer EVENT_BEAT_ROUTE_16_TRAINER_4, 2, Route16Biker5BattleText, Route16Biker5EndBattleText, Route16Biker5AfterBattleText Route16TrainerHeader5: - trainer EVENT_BEAT_ROUTE_16_TRAINER_5, 4, Route16BattleText6, Route16EndBattleText6, Route16AfterBattleText6 + trainer EVENT_BEAT_ROUTE_16_TRAINER_5, 4, Route16Biker6BattleText, Route16Biker6EndBattleText, Route16Biker6AfterBattleText db -1 ; end -Route16Text1: +Route16Biker1Text: text_asm ld hl, Route16TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Route16BattleText1: - text_far _Route16BattleText1 +Route16Biker1BattleText: + text_far _Route16Biker1BattleText text_end -Route16EndBattleText1: - text_far _Route16EndBattleText1 +Route16Biker1EndBattleText: + text_far _Route16Biker1EndBattleText text_end -Route16AfterBattleText1: - text_far _Route16AfterBattleText1 +Route16Biker1AfterBattleText: + text_far _Route16Biker1AfterBattleText text_end -Route16Text2: +Route16Biker2Text: text_asm ld hl, Route16TrainerHeader1 call TalkToTrainer jp TextScriptEnd -Route16BattleText2: - text_far _Route16BattleText2 +Route16Biker2BattleText: + text_far _Route16Biker2BattleText text_end -Route16EndBattleText2: - text_far _Route16EndBattleText2 +Route16Biker2EndBattleText: + text_far _Route16Biker2EndBattleText text_end -Route16AfterBattleText2: - text_far _Route16AfterBattleText2 +Route16Biker2AfterBattleText: + text_far _Route16Biker2AfterBattleText text_end -Route16Text3: +Route16Biker3Text: text_asm ld hl, Route16TrainerHeader2 call TalkToTrainer jp TextScriptEnd -Route16BattleText3: - text_far _Route16BattleText3 +Route16Biker3BattleText: + text_far _Route16Biker3BattleText text_end -Route16EndBattleText3: - text_far _Route16EndBattleText3 +Route16Biker3EndBattleText: + text_far _Route16Biker3EndBattleText text_end -Route16AfterBattleText3: - text_far _Route16AfterBattleText3 +Route16Biker3AfterBattleText: + text_far _Route16Biker3AfterBattleText text_end -Route16Text4: +Route16Biker4Text: text_asm ld hl, Route16TrainerHeader3 call TalkToTrainer jp TextScriptEnd -Route16BattleText4: - text_far _Route16BattleText4 +Route16biker4BattleText: + text_far _Route16biker4BattleText text_end -Route16EndBattleText4: - text_far _Route16EndBattleText4 +Route16Biker4EndBattleText: + text_far _Route16Biker4EndBattleText text_end -Route16AfterBattleText4: - text_far _Route16AfterBattleText4 +Route16Biker4AfterBattleText: + text_far _Route16Biker4AfterBattleText text_end -Route16Text5: +Route16Biker5Text: text_asm ld hl, Route16TrainerHeader4 call TalkToTrainer jp TextScriptEnd -Route16BattleText5: - text_far _Route16BattleText5 +Route16Biker5BattleText: + text_far _Route16Biker5BattleText text_end -Route16EndBattleText5: - text_far _Route16EndBattleText5 +Route16Biker5EndBattleText: + text_far _Route16Biker5EndBattleText text_end -Route16AfterBattleText5: - text_far _Route16AfterBattleText5 +Route16Biker5AfterBattleText: + text_far _Route16Biker5AfterBattleText text_end -Route16Text6: +Route16Biker6Text: text_asm ld hl, Route16TrainerHeader5 call TalkToTrainer jp TextScriptEnd -Route16BattleText6: - text_far _Route16BattleText6 +Route16Biker6BattleText: + text_far _Route16Biker6BattleText text_end -Route16EndBattleText6: - text_far _Route16EndBattleText6 +Route16Biker6EndBattleText: + text_far _Route16Biker6EndBattleText text_end -Route16AfterBattleText6: - text_far _Route16AfterBattleText6 +Route16Biker6AfterBattleText: + text_far _Route16Biker6AfterBattleText text_end -Route16Text7: +Route16SnorlaxText: text_far _Route16Text7 text_end -Route16Text10: - text_far _Route16Text10 +Route16SnorlaxWokeUpText: + text_far _Route16SnorlaxWokeUpText text_end -Route16Text11: - text_far _Route16Text11 +Route16SnorlaxReturnedToMountainsText: + text_far _Route16SnorlaxReturnedToMountainsText text_end -Route16Text8: - text_far _Route16Text8 +Route16CyclingRoadSignText: + text_far _Route16CyclingRoadSignText text_end -Route16Text9: - text_far _Route16Text9 +Route16SignText: + text_far _Route16SignText text_end |