summaryrefslogtreecommitdiff
path: root/data/maps/MtPyre_2F
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/MtPyre_2F
parent2912ec0e37360ede1bae882f0ea2457ec336f16f (diff)
parenta2a99bde115e183267db6bb4b5c1dc73d57284fc (diff)
Merge pull request #419 from melthelesbian/trainerbattle_macro_cleanup
cleans up trainer battle scripts
Diffstat (limited to 'data/maps/MtPyre_2F')
-rw-r--r--data/maps/MtPyre_2F/scripts.inc10
1 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/MtPyre_2F/scripts.inc b/data/maps/MtPyre_2F/scripts.inc
index 752c17fcc..830ed5cf7 100644
--- a/data/maps/MtPyre_2F/scripts.inc
+++ b/data/maps/MtPyre_2F/scripts.inc
@@ -18,27 +18,27 @@ MtPyre_2F_EventScript_23111F:: @ 823111F
end
MtPyre_2F_EventScript_231128:: @ 8231128
- trainerbattle 0, TRAINER_MARK, 0, MtPyre_2F_Text_231258, MtPyre_2F_Text_2312A2
+ trainerbattle_single TRAINER_MARK, MtPyre_2F_Text_231258, MtPyre_2F_Text_2312A2
msgbox MtPyre_2F_Text_2312CB, MSGBOX_AUTOCLOSE
end
MtPyre_2F_EventScript_23113F:: @ 823113F
- trainerbattle 4, TRAINER_DEZ_AND_LUKE, 0, MtPyre_2F_Text_23130F, MtPyre_2F_Text_2313A1, MtPyre_2F_Text_231414
+ trainerbattle_double TRAINER_DEZ_AND_LUKE, MtPyre_2F_Text_23130F, MtPyre_2F_Text_2313A1, MtPyre_2F_Text_231414
msgbox MtPyre_2F_Text_2313B1, MSGBOX_AUTOCLOSE
end
MtPyre_2F_EventScript_23115A:: @ 823115A
- trainerbattle 4, TRAINER_DEZ_AND_LUKE, 0, MtPyre_2F_Text_231492, MtPyre_2F_Text_231534, MtPyre_2F_Text_231582
+ trainerbattle_double TRAINER_DEZ_AND_LUKE, MtPyre_2F_Text_231492, MtPyre_2F_Text_231534, MtPyre_2F_Text_231582
msgbox MtPyre_2F_Text_23154D, MSGBOX_AUTOCLOSE
end
MtPyre_2F_EventScript_231175:: @ 8231175
- trainerbattle 0, TRAINER_LEAH, 0, MtPyre_2F_Text_231604, MtPyre_2F_Text_231645
+ trainerbattle_single TRAINER_LEAH, MtPyre_2F_Text_231604, MtPyre_2F_Text_231645
msgbox MtPyre_2F_Text_23165A, MSGBOX_AUTOCLOSE
end
MtPyre_2F_EventScript_23118C:: @ 823118C
- trainerbattle 0, TRAINER_ZANDER, 0, MtPyre_2F_Text_2316C7, MtPyre_2F_Text_2316E1
+ trainerbattle_single TRAINER_ZANDER, MtPyre_2F_Text_2316C7, MtPyre_2F_Text_2316E1
msgbox MtPyre_2F_Text_2316FB, MSGBOX_AUTOCLOSE
end