diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-07-31 13:30:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-31 13:30:40 -0400 |
| commit | 3e60a7840653e50845abf10bb02cd1b519dcd80f (patch) | |
| tree | cb4a0d227a238ebdeb3b6cb9fdb92781bcc4f5e7 /data/maps/Route108 | |
| parent | 602855ea99d8015ef5b7709f6fb1e9fd167239e2 (diff) | |
| parent | d391486247cc9f29d85787d6711f7cb993cf6585 (diff) | |
Merge branch 'master' into doc-frontierpass2
Diffstat (limited to 'data/maps/Route108')
| -rw-r--r-- | data/maps/Route108/scripts.inc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/Route108/scripts.inc b/data/maps/Route108/scripts.inc index 57f353bd1..866391554 100644 --- a/data/maps/Route108/scripts.inc +++ b/data/maps/Route108/scripts.inc @@ -1,32 +1,32 @@ -Route108_MapScripts:: @ 81EE689 +Route108_MapScripts:: .byte 0 -Route108_EventScript_Jerome:: @ 81EE68A +Route108_EventScript_Jerome:: trainerbattle_single TRAINER_JEROME, Route108_Text_JeromeIntro, Route108_Text_JeromeDefeated msgbox Route108_Text_JeromePostBattle, MSGBOX_AUTOCLOSE end -Route108_EventScript_Matthew:: @ 81EE6A1 +Route108_EventScript_Matthew:: trainerbattle_single TRAINER_MATTHEW, Route108_Text_MatthewIntro, Route108_Text_MatthewDefeated msgbox Route108_Text_MatthewPostBattle, MSGBOX_AUTOCLOSE end -Route108_EventScript_Tara:: @ 81EE6B8 +Route108_EventScript_Tara:: trainerbattle_single TRAINER_TARA, Route108_Text_TaraIntro, Route108_Text_TaraDefeated msgbox Route108_Text_TaraPostBattle, MSGBOX_AUTOCLOSE end -Route108_EventScript_Missy:: @ 81EE6CF +Route108_EventScript_Missy:: trainerbattle_single TRAINER_MISSY, Route108_Text_MissyIntro, Route108_Text_MissyDefeated msgbox Route108_Text_MissyPostBattle, MSGBOX_AUTOCLOSE end -Route108_EventScript_Carolina:: @ 81EE6E6 +Route108_EventScript_Carolina:: trainerbattle_single TRAINER_CAROLINA, Route108_Text_CarolinaIntro, Route108_Text_CarolinaDefeated msgbox Route108_Text_CarolinaPostBattle, MSGBOX_AUTOCLOSE end -Route108_EventScript_Cory:: @ 81EE6FD +Route108_EventScript_Cory:: trainerbattle_single TRAINER_CORY_1, Route108_Text_CoryIntro, Route108_Text_CoryDefeated, Route108_EventScript_CoryRegisterMatchCallAfterBattle specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -35,7 +35,7 @@ Route108_EventScript_Cory:: @ 81EE6FD release end -Route108_EventScript_CoryRegisterMatchCallAfterBattle:: @ 81EE729 +Route108_EventScript_CoryRegisterMatchCallAfterBattle:: special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route108_Text_CoryRegister, MSGBOX_DEFAULT @@ -43,7 +43,7 @@ Route108_EventScript_CoryRegisterMatchCallAfterBattle:: @ 81EE729 release end -Route108_EventScript_CoryRematch:: @ 81EE748 +Route108_EventScript_CoryRematch:: trainerbattle_rematch TRAINER_CORY_1, Route108_Text_CoryRematchIntro, Route108_Text_CoryRematchDefeated msgbox Route108_Text_CoryRematchPostBattle, MSGBOX_AUTOCLOSE end |
