diff options
Diffstat (limited to 'scripts/Route25.asm')
| -rw-r--r-- | scripts/Route25.asm | 192 |
1 files changed, 97 insertions, 95 deletions
diff --git a/scripts/Route25.asm b/scripts/Route25.asm index cc90a7d8..501592f9 100644 --- a/scripts/Route25.asm +++ b/scripts/Route25.asm @@ -5,10 +5,10 @@ Route25_Script: ld a, [wRoute25CurScript] call ExecuteCurMapScriptInTable ld [wRoute25CurScript], a - call Route25Script_515e1 + call Route25ShowHideBillScript ret -Route25Script_515e1: +Route25ShowHideBillScript: ld hl, wd492 res 2, [hl] res 3, [hl] @@ -23,15 +23,15 @@ Route25Script_515e1: CheckEventHL EVENT_LEFT_BILLS_HOUSE_AFTER_HELPING ret nz CheckEventReuseHL EVENT_MET_BILL_2 - jr nz, .asm_51638 + jr nz, .met_bill ResetEventReuseHL EVENT_BILL_SAID_USE_CELL_SEPARATOR ld a, HS_BILL_POKEMON ld [wMissableObjectIndex], a predef ShowObject - jr .asm_5165c -.asm_51638 + jr .done +.met_bill CheckEventAfterBranchReuseHL EVENT_GOT_SS_TICKET, EVENT_MET_BILL_2 - jr z, .asm_5165c + jr z, .done SetEventReuseHL EVENT_LEFT_BILLS_HOUSE_AFTER_HELPING ld a, HS_NUGGET_BRIDGE_GUY ld [wMissableObjectIndex], a @@ -42,211 +42,213 @@ Route25Script_515e1: ld a, HS_BILL_2 ld [wMissableObjectIndex], a predef ShowObject -.asm_5165c +.done ret Route25_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_ROUTE25_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_ROUTE25_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_ROUTE25_END_BATTLE Route25_TextPointers: - dw Route25Text1 - dw Route25Text2 - dw Route25Text3 - dw Route25Text4 - dw Route25Text5 - dw Route25Text6 - dw Route25Text7 - dw Route25Text8 - dw Route25Text9 - dw PickUpItemText - dw Route25Text11 + def_text_pointers + dw_const Route25Youngster1Text, TEXT_ROUTE25_YOUNGSTER1 + dw_const Route25Youngster2Text, TEXT_ROUTE25_YOUNGSTER2 + dw_const Route25CooltrainerMText, TEXT_ROUTE25_COOLTRAINER_M + dw_const Route25CooltrainerF1Text, TEXT_ROUTE25_COOLTRAINER_F1 + dw_const Route25Youngster3Text, TEXT_ROUTE25_YOUNGSTER3 + dw_const Route25CooltrainerF2Text, TEXT_ROUTE25_COOLTRAINER_F2 + dw_const Route25Hiker1Text, TEXT_ROUTE25_HIKER1 + dw_const Route25Hiker2Text, TEXT_ROUTE25_HIKER2 + dw_const Route25Hiker3Text, TEXT_ROUTE25_HIKER3 + dw_const PickUpItemText, TEXT_ROUTE25_TM_SEISMIC_TOSS + dw_const Route25BillSignText, TEXT_ROUTE25_BILL_SIGN Route25TrainerHeaders: def_trainers Route25TrainerHeader0: - trainer EVENT_BEAT_ROUTE_25_TRAINER_0, 2, Route25BattleText1, Route25EndBattleText1, Route25AfterBattleText1 + trainer EVENT_BEAT_ROUTE_25_TRAINER_0, 2, Route25Youngster1BattleText, Route25Youngster1EndBattleText, Route25Youngster1AfterBattleText Route25TrainerHeader1: - trainer EVENT_BEAT_ROUTE_25_TRAINER_1, 3, Route25BattleText2, Route25EndBattleText2, Route25AfterBattleText2 + trainer EVENT_BEAT_ROUTE_25_TRAINER_1, 3, Route25Youngster2BattleText, Route25Youngster2EndBattleText, Route25Youngster2AfterBattleText Route25TrainerHeader2: - trainer EVENT_BEAT_ROUTE_25_TRAINER_2, 3, Route25BattleText3, Route25EndBattleText3, Route25AfterBattleText3 + trainer EVENT_BEAT_ROUTE_25_TRAINER_2, 3, Route25CooltrainerMBattleText, Route25CooltrainerMEndBattleText, Route25CooltrainerMAfterBattleText Route25TrainerHeader3: - trainer EVENT_BEAT_ROUTE_25_TRAINER_3, 2, Route25BattleText4, Route25EndBattleText4, Route25AfterBattleText4 + trainer EVENT_BEAT_ROUTE_25_TRAINER_3, 2, Route25CooltrainerF1BattleText, Route25CooltrainerF1EndBattleText, Route25CooltrainerF1AfterBattleText Route25TrainerHeader4: - trainer EVENT_BEAT_ROUTE_25_TRAINER_4, 4, Route25BattleText5, Route25EndBattleText5, Route25AfterBattleText5 + trainer EVENT_BEAT_ROUTE_25_TRAINER_4, 4, Route25Youngster3BattleText, Route25Youngster3EndBattleText, Route25Youngster3AfterBattleText Route25TrainerHeader5: - trainer EVENT_BEAT_ROUTE_25_TRAINER_5, 4, Route25BattleText6, Route25EndBattleText6, Route25AfterBattleText6 + trainer EVENT_BEAT_ROUTE_25_TRAINER_5, 4, Route25CooltrainerF2BattleText, Route25CooltrainerF2EndBattleText, Route25CooltrainerF2AfterBattleText Route25TrainerHeader6: - trainer EVENT_BEAT_ROUTE_25_TRAINER_6, 3, Route25BattleText7, Route25EndBattleText7, Route25AfterBattleText7 + trainer EVENT_BEAT_ROUTE_25_TRAINER_6, 3, Route25Hiker1BattleText, Route25Hiker1EndBattleText, Route25Hiker1AfterBattleText Route25TrainerHeader7: - trainer EVENT_BEAT_ROUTE_25_TRAINER_7, 2, Route25BattleText8, Route25EndBattleText8, Route25AfterBattleText8 + trainer EVENT_BEAT_ROUTE_25_TRAINER_7, 2, Route25Hiker2BattleText, Route25Hiker2EndBattleText, Route25Hiker2AfterBattleText Route25TrainerHeader8: - trainer EVENT_BEAT_ROUTE_25_TRAINER_8, 2, Route25BattleText9, Route25EndBattleText9, Route25AfterBattleText9 + trainer EVENT_BEAT_ROUTE_25_TRAINER_8, 2, Route25Hiker3BattleText, Route25Hiker3EndBattleText, Route25Hiker3AfterBattleText db -1 ; end -Route25Text1: +Route25Youngster1Text: text_asm ld hl, Route25TrainerHeader0 call TalkToTrainer jp TextScriptEnd -Route25Text2: +Route25Youngster2Text: text_asm ld hl, Route25TrainerHeader1 call TalkToTrainer jp TextScriptEnd -Route25Text3: +Route25CooltrainerMText: text_asm ld hl, Route25TrainerHeader2 call TalkToTrainer jp TextScriptEnd -Route25Text4: +Route25CooltrainerF1Text: text_asm ld hl, Route25TrainerHeader3 call TalkToTrainer jp TextScriptEnd -Route25Text5: +Route25Youngster3Text: text_asm ld hl, Route25TrainerHeader4 call TalkToTrainer jp TextScriptEnd -Route25Text6: +Route25CooltrainerF2Text: text_asm ld hl, Route25TrainerHeader5 call TalkToTrainer jp TextScriptEnd -Route25Text7: +Route25Hiker1Text: text_asm ld hl, Route25TrainerHeader6 call TalkToTrainer jp TextScriptEnd -Route25Text8: +Route25Hiker2Text: text_asm ld hl, Route25TrainerHeader7 call TalkToTrainer jp TextScriptEnd -Route25Text9: +Route25Hiker3Text: text_asm ld hl, Route25TrainerHeader8 call TalkToTrainer jp TextScriptEnd -Route25BattleText1: - text_far _Route25BattleText1 +Route25Youngster1BattleText: + text_far _Route25Youngster1BattleText text_end -Route25EndBattleText1: - text_far _Route25EndBattleText1 +Route25Youngster1EndBattleText: + text_far _Route25Youngster1EndBattleText text_end -Route25AfterBattleText1: - text_far _Route25AfterBattleText1 +Route25Youngster1AfterBattleText: + text_far _Route25Youngster1AfterBattleText text_end -Route25BattleText2: - text_far _Route25BattleText2 +Route25Youngster2BattleText: + text_far _Route25Youngster2BattleText text_end -Route25EndBattleText2: - text_far _Route25EndBattleText2 +Route25Youngster2EndBattleText: + text_far _Route25Youngster2EndBattleText text_end -Route25AfterBattleText2: - text_far _Route25AfterBattleText2 +Route25Youngster2AfterBattleText: + text_far _Route25Youngster2AfterBattleText text_end -Route25BattleText3: - text_far _Route25BattleText3 +Route25CooltrainerMBattleText: + text_far _Route25CooltrainerMBattleText text_end -Route25EndBattleText3: - text_far _Route25EndBattleText3 +Route25CooltrainerMEndBattleText: + text_far _Route25CooltrainerMEndBattleText text_end -Route25AfterBattleText3: - text_far _Route25AfterBattleText3 +Route25CooltrainerMAfterBattleText: + text_far _Route25CooltrainerMAfterBattleText text_end -Route25BattleText4: - text_far _Route25BattleText4 +Route25CooltrainerF1BattleText: + text_far _Route25CooltrainerF1BattleText text_end -Route25EndBattleText4: - text_far _Route25EndBattleText4 +Route25CooltrainerF1EndBattleText: + text_far _Route25CooltrainerF1EndBattleText text_end -Route25AfterBattleText4: - text_far _Route25AfterBattleText4 +Route25CooltrainerF1AfterBattleText: + text_far _Route25CooltrainerF1AfterBattleText text_end -Route25BattleText5: - text_far _Route25BattleText5 +Route25Youngster3BattleText: + text_far _Route25Youngster3BattleText text_end -Route25EndBattleText5: - text_far _Route25EndBattleText5 +Route25Youngster3EndBattleText: + text_far _Route25Youngster3EndBattleText text_end -Route25AfterBattleText5: - text_far _Route25AfterBattleText5 +Route25Youngster3AfterBattleText: + text_far _Route25Youngster3AfterBattleText text_end -Route25BattleText6: - text_far _Route25BattleText6 +Route25CooltrainerF2BattleText: + text_far _Route25CooltrainerF2BattleText text_end -Route25EndBattleText6: - text_far _Route25EndBattleText6 +Route25CooltrainerF2EndBattleText: + text_far _Route25CooltrainerF2EndBattleText text_end -Route25AfterBattleText6: - text_far _Route25AfterBattleText6 +Route25CooltrainerF2AfterBattleText: + text_far _Route25CooltrainerF2AfterBattleText text_end -Route25BattleText7: - text_far _Route25BattleText7 +Route25Hiker1BattleText: + text_far _Route25Hiker1BattleText text_end -Route25EndBattleText7: - text_far _Route25EndBattleText7 +Route25Hiker1EndBattleText: + text_far _Route25Hiker1EndBattleText text_end -Route25AfterBattleText7: - text_far _Route25AfterBattleText7 +Route25Hiker1AfterBattleText: + text_far _Route25Hiker1AfterBattleText text_end -Route25BattleText8: - text_far _Route25BattleText8 +Route25Hiker2BattleText: + text_far _Route25Hiker2BattleText text_end -Route25EndBattleText8: - text_far _Route25EndBattleText8 +Route25Hiker2EndBattleText: + text_far _Route25Hiker2EndBattleText text_end -Route25AfterBattleText8: - text_far _Route25AfterBattleText8 +Route25Hiker2AfterBattleText: + text_far _Route25Hiker2AfterBattleText text_end -Route25BattleText9: - text_far _Route25BattleText9 +Route25Hiker3BattleText: + text_far _Route25Hiker3BattleText text_end -Route25EndBattleText9: - text_far _Route25EndBattleText9 +Route25Hiker3EndBattleText: + text_far _Route25Hiker3EndBattleText text_end -Route25AfterBattleText9: - text_far _Route25AfterBattleText9 +Route25Hiker3AfterBattleText: + text_far _Route25Hiker3AfterBattleText text_end -Route25Text11: - text_far _Route25Text11 +Route25BillSignText: + text_far _Route25BillSignText text_end |