diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-04-23 17:20:34 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-04-23 17:59:25 -0400 |
| commit | 71094356313801bf20191f3db1efa0decd3c3dcb (patch) | |
| tree | 18c501d04a21f88c5f4d59f764883e326710ca39 /data/maps/Route125 | |
| parent | 3bd2094141da60be175f237fa34889469f77f187 (diff) | |
Sync event macros
Diffstat (limited to 'data/maps/Route125')
| -rw-r--r-- | data/maps/Route125/scripts.inc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc index 3e1febd5d..5abebc1ed 100644 --- a/data/maps/Route125/scripts.inc +++ b/data/maps/Route125/scripts.inc @@ -7,27 +7,27 @@ Route125_MapScript1_151F24:: @ 8151F24 end Route125_EventScript_151F2E:: @ 8151F2E - trainerbattle 0, TRAINER_CODY, 0, Route125_Text_1C0FCF, Route125_Text_1C1002 + trainerbattle_single TRAINER_CODY, Route125_Text_1C0FCF, Route125_Text_1C1002 msgbox Route125_Text_1C1013, 6 end Route125_EventScript_151F45:: @ 8151F45 - trainerbattle 0, TRAINER_STAN, 0, Route125_Text_1C104B, Route125_Text_1C1073 + trainerbattle_single TRAINER_STAN, Route125_Text_1C104B, Route125_Text_1C1073 msgbox Route125_Text_1C1083, 6 end Route125_EventScript_151F5C:: @ 8151F5C - trainerbattle 0, TRAINER_TANYA, 0, Route125_Text_1C10C3, Route125_Text_1C10FB + trainerbattle_single TRAINER_TANYA, Route125_Text_1C10C3, Route125_Text_1C10FB msgbox Route125_Text_1C110C, 6 end Route125_EventScript_151F73:: @ 8151F73 - trainerbattle 0, TRAINER_SHARON, 0, Route125_Text_1C1136, Route125_Text_1C1175 + trainerbattle_single TRAINER_SHARON, Route125_Text_1C1136, Route125_Text_1C1175 msgbox Route125_Text_1C117F, 6 end Route125_EventScript_151F8A:: @ 8151F8A - trainerbattle 0, TRAINER_ERNEST_1, 0, Route125_Text_1C11AF, Route125_Text_1C11ED + trainerbattle_single TRAINER_ERNEST_1, Route125_Text_1C11AF, Route125_Text_1C11ED specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route125_EventScript_151FB1 @@ -35,16 +35,16 @@ Route125_EventScript_151F8A:: @ 8151F8A end Route125_EventScript_151FB1:: @ 8151FB1 - trainerbattle 5, TRAINER_ERNEST_1, 0, Route125_Text_1C1282, Route125_Text_1C12C5 + trainerbattle_rematch TRAINER_ERNEST_1, Route125_Text_1C1282, Route125_Text_1C12C5 msgbox Route125_Text_1C12EE, 6 end Route125_EventScript_151FC8:: @ 8151FC8 - trainerbattle 4, TRAINER_KIM_AND_IRIS, 0, Route125_Text_1C13A1, Route125_Text_1C13FF, Route125_Text_1C146E + trainerbattle_double TRAINER_KIM_AND_IRIS, Route125_Text_1C13A1, Route125_Text_1C13FF, Route125_Text_1C146E msgbox Route125_Text_1C141C, 6 end Route125_EventScript_151FE3:: @ 8151FE3 - trainerbattle 4, TRAINER_KIM_AND_IRIS, 0, Route125_Text_1C14AB, Route125_Text_1C14E7, Route125_Text_1C154F + trainerbattle_double TRAINER_KIM_AND_IRIS, Route125_Text_1C14AB, Route125_Text_1C14E7, Route125_Text_1C154F msgbox Route125_Text_1C1508, 6 end |