summaryrefslogtreecommitdiff
path: root/data/maps/Route129/scripts.inc
diff options
context:
space:
mode:
authorDiegoisawesome <Diegoisawesome@users.noreply.github.com>2018-12-02 14:31:19 -0600
committerGitHub <noreply@github.com>2018-12-02 14:31:19 -0600
commit7914220acd9a39e08bc09b70eaef6433a6ba9cd6 (patch)
treeb5955a26de58feb834007ee84ba036308992e422 /data/maps/Route129/scripts.inc
parent2912ec0e37360ede1bae882f0ea2457ec336f16f (diff)
parenta2a99bde115e183267db6bb4b5c1dc73d57284fc (diff)
Merge pull request #419 from melthelesbian/trainerbattle_macro_cleanup
cleans up trainer battle scripts
Diffstat (limited to 'data/maps/Route129/scripts.inc')
-rw-r--r--data/maps/Route129/scripts.inc10
1 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/Route129/scripts.inc b/data/maps/Route129/scripts.inc
index c9cb8a305..b58e9ddd4 100644
--- a/data/maps/Route129/scripts.inc
+++ b/data/maps/Route129/scripts.inc
@@ -32,27 +32,27 @@ Route129_MapScript2_1F72E2: @ 81F72E2
.2byte 0
Route129_EventScript_1F72EC:: @ 81F72EC
- trainerbattle 0, TRAINER_CHASE, 0, Route129_Text_2A2F66, Route129_Text_2A2F9D
+ trainerbattle_single TRAINER_CHASE, Route129_Text_2A2F66, Route129_Text_2A2F9D
msgbox Route129_Text_2A2FB9, MSGBOX_AUTOCLOSE
end
Route129_EventScript_1F7303:: @ 81F7303
- trainerbattle 0, TRAINER_ALLISON, 0, Route129_Text_2A2FF2, Route129_Text_2A3034
+ trainerbattle_single TRAINER_ALLISON, Route129_Text_2A2FF2, Route129_Text_2A3034
msgbox Route129_Text_2A3048, MSGBOX_AUTOCLOSE
end
Route129_EventScript_1F731A:: @ 81F731A
- trainerbattle 0, TRAINER_REED, 0, Route129_Text_2A30CD, Route129_Text_2A30F1
+ trainerbattle_single TRAINER_REED, Route129_Text_2A30CD, Route129_Text_2A30F1
msgbox Route129_Text_2A3114, MSGBOX_AUTOCLOSE
end
Route129_EventScript_1F7331:: @ 81F7331
- trainerbattle 0, TRAINER_TISHA, 0, Route129_Text_2A314E, Route129_Text_2A317D
+ trainerbattle_single TRAINER_TISHA, Route129_Text_2A314E, Route129_Text_2A317D
msgbox Route129_Text_2A31A6, MSGBOX_AUTOCLOSE
end
Route129_EventScript_1F7348:: @ 81F7348
- trainerbattle 0, TRAINER_CLARENCE, 0, Route129_Text_2A3204, Route129_Text_2A3239
+ trainerbattle_single TRAINER_CLARENCE, Route129_Text_2A3204, Route129_Text_2A3239
msgbox Route129_Text_2A3252, MSGBOX_AUTOCLOSE
end