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/Route107 | |
| parent | 3bd2094141da60be175f237fa34889469f77f187 (diff) | |
Sync event macros
Diffstat (limited to 'data/maps/Route107')
| -rw-r--r-- | data/maps/Route107/scripts.inc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/Route107/scripts.inc b/data/maps/Route107/scripts.inc index 5ad30f9f4..657811fc6 100644 --- a/data/maps/Route107/scripts.inc +++ b/data/maps/Route107/scripts.inc @@ -2,12 +2,12 @@ Route107_MapScripts:: @ 814F3BB .byte 0 Route107_EventScript_14F3BC:: @ 814F3BC - trainerbattle 0, TRAINER_DARRIN, 0, Route107_Text_1B926B, Route107_Text_1B92B7 + trainerbattle_single TRAINER_DARRIN, Route107_Text_1B926B, Route107_Text_1B92B7 msgbox Route107_Text_1B92E7, 6 end Route107_EventScript_14F3D3:: @ 814F3D3 - trainerbattle 0, TRAINER_TONY_1, 0, Route107_Text_1B933A, Route107_Text_1B9365 + trainerbattle_single TRAINER_TONY_1, Route107_Text_1B933A, Route107_Text_1B9365 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route107_EventScript_14F3FA @@ -15,26 +15,26 @@ Route107_EventScript_14F3D3:: @ 814F3D3 end Route107_EventScript_14F3FA:: @ 814F3FA - trainerbattle 5, TRAINER_TONY_1, 0, Route107_Text_1B93EB, Route107_Text_1B9429 + trainerbattle_rematch TRAINER_TONY_1, Route107_Text_1B93EB, Route107_Text_1B9429 msgbox Route107_Text_1B9477, 6 end Route107_EventScript_14F411:: @ 814F411 - trainerbattle 0, TRAINER_DENISE, 0, Route107_Text_1B94C8, Route107_Text_1B94F2 + trainerbattle_single TRAINER_DENISE, Route107_Text_1B94C8, Route107_Text_1B94F2 msgbox Route107_Text_1B94FF, 6 end Route107_EventScript_14F428:: @ 814F428 - trainerbattle 0, TRAINER_BETH, 0, Route107_Text_1B9538, Route107_Text_1B956B + trainerbattle_single TRAINER_BETH, Route107_Text_1B9538, Route107_Text_1B956B msgbox Route107_Text_1B9589, 6 end Route107_EventScript_14F43F:: @ 814F43F - trainerbattle 4, TRAINER_LISA_AND_RAY, 0, Route107_Text_1B95CB, Route107_Text_1B95FB, Route107_Text_1B9672 + trainerbattle_double TRAINER_LISA_AND_RAY, Route107_Text_1B95CB, Route107_Text_1B95FB, Route107_Text_1B9672 msgbox Route107_Text_1B9630, 6 end Route107_EventScript_14F45A:: @ 814F45A - trainerbattle 4, TRAINER_LISA_AND_RAY, 0, Route107_Text_1B96AB, Route107_Text_1B9707, Route107_Text_1B9788 + trainerbattle_double TRAINER_LISA_AND_RAY, Route107_Text_1B96AB, Route107_Text_1B9707, Route107_Text_1B9788 msgbox Route107_Text_1B9735, 6 end |