diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-10-07 16:10:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-07 16:10:35 -0400 |
| commit | a2655ba9ab82646a54f60abc6078df372179f8d4 (patch) | |
| tree | 95b074a1a4d77d6cd77e413e1d6e72eb55b595b0 /data/maps/Route107 | |
| parent | e86d3410a1719fcbf62754bfda93a295aa7e0d57 (diff) | |
| parent | 001a25e49cd6acdac89a62f4230aef80422e78f2 (diff) | |
Merge branch 'master' into doc-union
Diffstat (limited to 'data/maps/Route107')
| -rw-r--r-- | data/maps/Route107/scripts.inc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/data/maps/Route107/scripts.inc b/data/maps/Route107/scripts.inc index 0642c457f..cffeafb08 100644 --- a/data/maps/Route107/scripts.inc +++ b/data/maps/Route107/scripts.inc @@ -1,12 +1,12 @@ -Route107_MapScripts:: @ 81EE594 +Route107_MapScripts:: .byte 0 -Route107_EventScript_Darrin:: @ 81EE595 +Route107_EventScript_Darrin:: trainerbattle_single TRAINER_DARRIN, Route107_Text_DarrinIntro, Route107_Text_DarrinDefeated msgbox Route107_Text_DarrinPostBattle, MSGBOX_AUTOCLOSE end -Route107_EventScript_Tony:: @ 81EE5AC +Route107_EventScript_Tony:: trainerbattle_single TRAINER_TONY_1, Route107_Text_TonyIntro, Route107_Text_TonyDefeated, Route107_EventScript_TonyRegisterMatchCallAfterBattle specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -15,7 +15,7 @@ Route107_EventScript_Tony:: @ 81EE5AC release end -Route107_EventScript_TonyRegisterMatchCallAfterBattle:: @ 81EE5D8 +Route107_EventScript_TonyRegisterMatchCallAfterBattle:: special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route107_Text_TonyRegister, MSGBOX_DEFAULT @@ -23,32 +23,32 @@ Route107_EventScript_TonyRegisterMatchCallAfterBattle:: @ 81EE5D8 release end -Route107_EventScript_TonyRematch:: @ 81EE5F7 +Route107_EventScript_TonyRematch:: trainerbattle_rematch TRAINER_TONY_1, Route107_Text_TonyRematchIntro, Route107_Text_TonyRematchDefeated msgbox Route107_Text_TonyRematchPostBattle, MSGBOX_AUTOCLOSE end -Route107_EventScript_Denise:: @ 81EE60E +Route107_EventScript_Denise:: trainerbattle_single TRAINER_DENISE, Route107_Text_DeniseIntro, Route107_Text_DeniseDefeated msgbox Route107_Text_DenisePostBattle, MSGBOX_AUTOCLOSE end -Route107_EventScript_Beth:: @ 81EE625 +Route107_EventScript_Beth:: trainerbattle_single TRAINER_BETH, Route107_Text_BethIntro, Route107_Text_BethDefeated msgbox Route107_Text_BethPostBattle, MSGBOX_AUTOCLOSE end -Route107_EventScript_Lisa:: @ 81EE63C +Route107_EventScript_Lisa:: trainerbattle_double TRAINER_LISA_AND_RAY, Route107_Text_LisaIntro, Route107_Text_LisaDefeated, Route107_Text_LisaNotEnoughPokemon msgbox Route107_Text_LisaPostBattle, MSGBOX_AUTOCLOSE end -Route107_EventScript_Ray:: @ 81EE657 +Route107_EventScript_Ray:: trainerbattle_double TRAINER_LISA_AND_RAY, Route107_Text_RayIntro, Route107_Text_RayDefeated, Route107_Text_RayNotEnoughPokemon msgbox Route107_Text_RayPostBattle, MSGBOX_AUTOCLOSE end -Route107_EventScript_Camron:: @ 81EE672 +Route107_EventScript_Camron:: trainerbattle_single TRAINER_CAMRON, Route107_Text_CamronIntro, Route107_Text_CamronDefeated msgbox Route107_Text_CamronPostBattle, MSGBOX_AUTOCLOSE end |