diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-12-02 14:31:19 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-02 14:31:19 -0600 |
| commit | 7914220acd9a39e08bc09b70eaef6433a6ba9cd6 (patch) | |
| tree | b5955a26de58feb834007ee84ba036308992e422 /data/maps/Route102 | |
| parent | 2912ec0e37360ede1bae882f0ea2457ec336f16f (diff) | |
| parent | a2a99bde115e183267db6bb4b5c1dc73d57284fc (diff) | |
Merge pull request #419 from melthelesbian/trainerbattle_macro_cleanup
cleans up trainer battle scripts
Diffstat (limited to 'data/maps/Route102')
| -rw-r--r-- | data/maps/Route102/scripts.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/Route102/scripts.inc b/data/maps/Route102/scripts.inc index ca6de7d9c..6eb35c32f 100644 --- a/data/maps/Route102/scripts.inc +++ b/data/maps/Route102/scripts.inc @@ -18,7 +18,7 @@ Route102_EventScript_1EC0FC:: @ 81EC0FC end Route102_EventScript_1EC105:: @ 81EC105 - trainerbattle 2, TRAINER_CALVIN_1, 0, Route102_Text_294513, Route102_Text_29457C, Route102_EventScript_1EC146 + trainerbattle_single TRAINER_CALVIN_1, Route102_Text_294513, Route102_Text_29457C, Route102_EventScript_1EC146 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route102_EventScript_1EC19C @@ -58,22 +58,22 @@ Route102_EventScript_1EC183:: @ 81EC183 end Route102_EventScript_1EC19C:: @ 81EC19C - trainerbattle 5, TRAINER_CALVIN_1, 0, Route102_Text_2946AE, Route102_Text_29470C + trainerbattle_rematch TRAINER_CALVIN_1, Route102_Text_2946AE, Route102_Text_29470C msgbox Route102_Text_29473C, MSGBOX_AUTOCLOSE end Route102_EventScript_1EC1B3:: @ 81EC1B3 - trainerbattle 0, TRAINER_RICK, 0, Route102_Text_29480C, Route102_Text_294847 + trainerbattle_single TRAINER_RICK, Route102_Text_29480C, Route102_Text_294847 msgbox Route102_Text_294859, MSGBOX_AUTOCLOSE end Route102_EventScript_1EC1CA:: @ 81EC1CA - trainerbattle 0, TRAINER_TIANA, 0, Route102_Text_29489E, Route102_Text_2948F3 + trainerbattle_single TRAINER_TIANA, Route102_Text_29489E, Route102_Text_2948F3 msgbox Route102_Text_294916, MSGBOX_AUTOCLOSE end Route102_EventScript_1EC1E1:: @ 81EC1E1 - trainerbattle 0, TRAINER_ALLEN, 0, Route102_Text_294775, Route102_Text_2947AA + trainerbattle_single TRAINER_ALLEN, Route102_Text_294775, Route102_Text_2947AA msgbox Route102_Text_2947DB, MSGBOX_AUTOCLOSE end |