summaryrefslogtreecommitdiff
path: root/data/maps/Route126
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/Route126
parent2912ec0e37360ede1bae882f0ea2457ec336f16f (diff)
parenta2a99bde115e183267db6bb4b5c1dc73d57284fc (diff)
Merge pull request #419 from melthelesbian/trainerbattle_macro_cleanup
cleans up trainer battle scripts
Diffstat (limited to 'data/maps/Route126')
-rw-r--r--data/maps/Route126/scripts.inc18
1 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/Route126/scripts.inc b/data/maps/Route126/scripts.inc
index a773feb2b..0be11144a 100644
--- a/data/maps/Route126/scripts.inc
+++ b/data/maps/Route126/scripts.inc
@@ -8,42 +8,42 @@ Route126_MapScript1_1F68CC: @ 81F68CC
end
Route126_EventScript_1F68D6:: @ 81F68D6
- trainerbattle 0, TRAINER_BARRY, 0, Route126_Text_2A1C95, Route126_Text_2A1CC8
+ trainerbattle_single TRAINER_BARRY, Route126_Text_2A1C95, Route126_Text_2A1CC8
msgbox Route126_Text_2A1CDD, MSGBOX_AUTOCLOSE
end
Route126_EventScript_1F68ED:: @ 81F68ED
- trainerbattle 0, TRAINER_DEAN, 0, Route126_Text_2A1D2A, Route126_Text_2A1D63
+ trainerbattle_single TRAINER_DEAN, Route126_Text_2A1D2A, Route126_Text_2A1D63
msgbox Route126_Text_2A1D72, MSGBOX_AUTOCLOSE
end
Route126_EventScript_1F6904:: @ 81F6904
- trainerbattle 0, TRAINER_NIKKI, 0, Route126_Text_2A1DAE, Route126_Text_2A1DC8
+ trainerbattle_single TRAINER_NIKKI, Route126_Text_2A1DAE, Route126_Text_2A1DC8
msgbox Route126_Text_2A1E03, MSGBOX_AUTOCLOSE
end
Route126_EventScript_1F691B:: @ 81F691B
- trainerbattle 0, TRAINER_BRENDA, 0, Route126_Text_2A1E3E, Route126_Text_2A1E63
+ trainerbattle_single TRAINER_BRENDA, Route126_Text_2A1E3E, Route126_Text_2A1E63
msgbox Route126_Text_2A1E70, MSGBOX_AUTOCLOSE
end
Route126_EventScript_1F6932:: @ 81F6932
- trainerbattle 0, TRAINER_LEONARDO, 0, Route126_Text_2A2063, Route126_Text_2A20C6
+ trainerbattle_single TRAINER_LEONARDO, Route126_Text_2A2063, Route126_Text_2A20C6
msgbox Route126_Text_2A20F7, MSGBOX_AUTOCLOSE
end
Route126_EventScript_1F6949:: @ 81F6949
- trainerbattle 0, TRAINER_ISOBEL, 0, Route126_Text_2A216A, Route126_Text_2A21A3
+ trainerbattle_single TRAINER_ISOBEL, Route126_Text_2A216A, Route126_Text_2A21A3
msgbox Route126_Text_2A21B8, MSGBOX_AUTOCLOSE
end
Route126_EventScript_1F6960:: @ 81F6960
- trainerbattle 0, TRAINER_SIENNA, 0, Route126_Text_2A21EF, Route126_Text_2A2216
+ trainerbattle_single TRAINER_SIENNA, Route126_Text_2A21EF, Route126_Text_2A2216
msgbox Route126_Text_2A222A, MSGBOX_AUTOCLOSE
end
Route126_EventScript_1F6977:: @ 81F6977
- trainerbattle 2, TRAINER_PABLO_1, 0, Route126_Text_2A1EA5, Route126_Text_2A1EE3, Route126_EventScript_1F69A3
+ trainerbattle_single TRAINER_PABLO_1, Route126_Text_2A1EA5, Route126_Text_2A1EE3, Route126_EventScript_1F69A3
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route126_EventScript_1F69C2
@@ -60,7 +60,7 @@ Route126_EventScript_1F69A3:: @ 81F69A3
end
Route126_EventScript_1F69C2:: @ 81F69C2
- trainerbattle 5, TRAINER_PABLO_1, 0, Route126_Text_2A1F98, Route126_Text_2A1FD8
+ trainerbattle_rematch TRAINER_PABLO_1, Route126_Text_2A1F98, Route126_Text_2A1FD8
msgbox Route126_Text_2A200C, MSGBOX_AUTOCLOSE
end