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/Route112/scripts.inc | |
| 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/Route112/scripts.inc')
| -rw-r--r-- | data/maps/Route112/scripts.inc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc index ec18e56da..cb6a48dce 100644 --- a/data/maps/Route112/scripts.inc +++ b/data/maps/Route112/scripts.inc @@ -61,12 +61,12 @@ Route112_EventScript_1F1E61:: @ 81F1E61 end Route112_EventScript_1F1E6A:: @ 81F1E6A - trainerbattle 0, TRAINER_BRICE, 0, Route112_Text_29978E, Route112_Text_2997CA + trainerbattle_single TRAINER_BRICE, Route112_Text_29978E, Route112_Text_2997CA msgbox Route112_Text_2997DC, MSGBOX_AUTOCLOSE end Route112_EventScript_1F1E81:: @ 81F1E81 - trainerbattle 2, TRAINER_TRENT_1, 0, Route112_Text_299815, Route112_Text_29987C, Route112_EventScript_1F1EAD + trainerbattle_single TRAINER_TRENT_1, Route112_Text_299815, Route112_Text_29987C, Route112_EventScript_1F1EAD specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route112_EventScript_1F1ECC @@ -83,27 +83,27 @@ Route112_EventScript_1F1EAD:: @ 81F1EAD end Route112_EventScript_1F1ECC:: @ 81F1ECC - trainerbattle 5, TRAINER_TRENT_1, 0, Route112_Text_2999BD, Route112_Text_2999F7 + trainerbattle_rematch TRAINER_TRENT_1, Route112_Text_2999BD, Route112_Text_2999F7 msgbox Route112_Text_299A0F, MSGBOX_AUTOCLOSE end Route112_EventScript_1F1EE3:: @ 81F1EE3 - trainerbattle 0, TRAINER_LARRY, 0, Route112_Text_299A89, Route112_Text_299AAC + trainerbattle_single TRAINER_LARRY, Route112_Text_299A89, Route112_Text_299AAC msgbox Route112_Text_299AB4, MSGBOX_AUTOCLOSE end Route112_EventScript_1F1EFA:: @ 81F1EFA - trainerbattle 0, TRAINER_CAROL, 0, Route112_Text_299AE4, Route112_Text_299B36 + trainerbattle_single TRAINER_CAROL, Route112_Text_299AE4, Route112_Text_299B36 msgbox Route112_Text_299B4C, MSGBOX_AUTOCLOSE end Route112_EventScript_1F1F11:: @ 81F1F11 - trainerbattle 0, TRAINER_BRYANT, 0, Route112_Text_299BAE, Route112_Text_299BDF + trainerbattle_single TRAINER_BRYANT, Route112_Text_299BAE, Route112_Text_299BDF msgbox Route112_Text_299BFB, MSGBOX_AUTOCLOSE end Route112_EventScript_1F1F28:: @ 81F1F28 - trainerbattle 0, TRAINER_SHAYLA, 0, Route112_Text_299C34, Route112_Text_299C8F + trainerbattle_single TRAINER_SHAYLA, Route112_Text_299C34, Route112_Text_299C8F msgbox Route112_Text_299CC6, MSGBOX_AUTOCLOSE end |