diff options
| author | Melody <melody@pallet.town> | 2018-12-02 13:54:48 -0500 |
|---|---|---|
| committer | Melody <melody@pallet.town> | 2018-12-02 15:08:19 -0500 |
| commit | 10725def8e356a6ea9346b1ea3170e1429314db3 (patch) | |
| tree | 3b3b5c280f7e2768d7ee5377725a80328cd43435 /data/maps/Route104 | |
| parent | bad5323642a0db0875ca6213370b1947c1fc105a (diff) | |
trainerbattle_normal → trainerbattle_single
* trainerbattle_normal → trainerbattle_single
* TRAINER_BATTLE_NORMAL → TRAINER_BATTLE_SINGLE
* improves the macro documentation a little
Diffstat (limited to 'data/maps/Route104')
| -rw-r--r-- | data/maps/Route104/scripts.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index f46482eb5..fcef181eb 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -871,17 +871,17 @@ Route104_Movement_1ED35C: @ 81ED35C step_end Route104_EventScript_1ED35F:: @ 81ED35F - trainerbattle_normal TRAINER_IVAN, Route104_Text_2954BD, Route104_Text_295509 + trainerbattle_single TRAINER_IVAN, Route104_Text_2954BD, Route104_Text_295509 msgbox Route104_Text_29554E, MSGBOX_AUTOCLOSE end Route104_EventScript_1ED376:: @ 81ED376 - trainerbattle_normal TRAINER_BILLY, Route104_Text_29558A, Route104_Text_2955B4 + trainerbattle_single TRAINER_BILLY, Route104_Text_29558A, Route104_Text_2955B4 msgbox Route104_Text_2955E8, MSGBOX_AUTOCLOSE end Route104_EventScript_1ED38D:: @ 81ED38D - trainerbattle_normal TRAINER_HALEY_1, Route104_Text_29563A, Route104_Text_29566F, Route104_EventScript_1ED3CE + trainerbattle_single TRAINER_HALEY_1, Route104_Text_29563A, Route104_Text_29566F, Route104_EventScript_1ED3CE specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route104_EventScript_1ED424 @@ -926,7 +926,7 @@ Route104_EventScript_1ED424:: @ 81ED424 end Route104_EventScript_1ED43B:: @ 81ED43B - trainerbattle_normal TRAINER_WINSTON_1, Route104_Text_295870, Route104_Text_2958AD, Route104_EventScript_1ED47C + trainerbattle_single TRAINER_WINSTON_1, Route104_Text_295870, Route104_Text_2958AD, Route104_EventScript_1ED47C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route104_EventScript_1ED4D2 @@ -971,7 +971,7 @@ Route104_EventScript_1ED4D2:: @ 81ED4D2 end Route104_EventScript_1ED4E9:: @ 81ED4E9 - trainerbattle_normal TRAINER_CINDY_1, Route104_Text_295A7E, Route104_Text_295ABB, Route104_EventScript_1ED52A + trainerbattle_single TRAINER_CINDY_1, Route104_Text_295A7E, Route104_Text_295ABB, Route104_EventScript_1ED52A specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_eq Route104_EventScript_1ED580 @@ -1030,7 +1030,7 @@ Route104_EventScript_1ED5B6:: @ 81ED5B6 end Route104_EventScript_1ED5D5:: @ 81ED5D5 - trainerbattle_normal TRAINER_DARIAN, Route104_Text_295C5D, Route104_Text_295CC9 + trainerbattle_single TRAINER_DARIAN, Route104_Text_295C5D, Route104_Text_295CC9 msgbox Route104_Text_295CD3, MSGBOX_AUTOCLOSE end |