summaryrefslogtreecommitdiff
path: root/data/maps/MtPyre_Summit
diff options
context:
space:
mode:
authorMelody <melody@pallet.town>2018-12-02 07:17:54 -0500
committerMelody <melody@pallet.town>2018-12-02 15:08:19 -0500
commitbad5323642a0db0875ca6213370b1947c1fc105a (patch)
treef1d7db2b43a2a8229094fc21d2917c93a05d1fe5 /data/maps/MtPyre_Summit
parent2912ec0e37360ede1bae882f0ea2457ec336f16f (diff)
cleans up trainer battle scripts
* adds battle type macros * adds `trainerbattle_normal` macro * adds `trainerbattle_double` macro * adds rematch macros * adds no intro macro
Diffstat (limited to 'data/maps/MtPyre_Summit')
-rw-r--r--data/maps/MtPyre_Summit/scripts.inc8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc
index d0c9fcc6a..cfff1c354 100644
--- a/data/maps/MtPyre_Summit/scripts.inc
+++ b/data/maps/MtPyre_Summit/scripts.inc
@@ -425,22 +425,22 @@ MtPyre_Summit_Movement_2323F8: @ 82323F8
step_end
MtPyre_Summit_EventScript_2323FD:: @ 82323FD
- trainerbattle 0, TRAINER_GRUNT_17, 0, MtPyre_Summit_Text_232459, MtPyre_Summit_Text_2324A0
+ trainerbattle_normal TRAINER_GRUNT_17, MtPyre_Summit_Text_232459, MtPyre_Summit_Text_2324A0
msgbox MtPyre_Summit_Text_2324E0, MSGBOX_AUTOCLOSE
end
MtPyre_Summit_EventScript_232414:: @ 8232414
- trainerbattle 0, TRAINER_GRUNT_18, 0, MtPyre_Summit_Text_232513, MtPyre_Summit_Text_2325B0
+ trainerbattle_normal TRAINER_GRUNT_18, MtPyre_Summit_Text_232513, MtPyre_Summit_Text_2325B0
msgbox MtPyre_Summit_Text_2325E4, MSGBOX_AUTOCLOSE
end
MtPyre_Summit_EventScript_23242B:: @ 823242B
- trainerbattle 0, TRAINER_GRUNT_19, 0, MtPyre_Summit_Text_23261D, MtPyre_Summit_Text_232678
+ trainerbattle_normal TRAINER_GRUNT_19, MtPyre_Summit_Text_23261D, MtPyre_Summit_Text_232678
msgbox MtPyre_Summit_Text_2326B3, MSGBOX_AUTOCLOSE
end
MtPyre_Summit_EventScript_232442:: @ 8232442
- trainerbattle 0, TRAINER_GRUNT_29, 0, MtPyre_Summit_Text_23271B, MtPyre_Summit_Text_23279A
+ trainerbattle_normal TRAINER_GRUNT_29, MtPyre_Summit_Text_23271B, MtPyre_Summit_Text_23279A
msgbox MtPyre_Summit_Text_2327D8, MSGBOX_AUTOCLOSE
end