summaryrefslogtreecommitdiff
path: root/data/maps/Route128
diff options
context:
space:
mode:
authorMelody <melody@pallet.town>2018-12-02 13:54:48 -0500
committerMelody <melody@pallet.town>2018-12-02 15:08:19 -0500
commit10725def8e356a6ea9346b1ea3170e1429314db3 (patch)
tree3b3b5c280f7e2768d7ee5377725a80328cd43435 /data/maps/Route128
parentbad5323642a0db0875ca6213370b1947c1fc105a (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/Route128')
-rw-r--r--data/maps/Route128/scripts.inc14
1 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc
index 72fc41e03..ec47bf39c 100644
--- a/data/maps/Route128/scripts.inc
+++ b/data/maps/Route128/scripts.inc
@@ -176,7 +176,7 @@ Route128_Movement_1F6CBB: @ 81F6CBB
step_end
Route128_EventScript_1F6CBE:: @ 81F6CBE
- trainerbattle_normal TRAINER_ISAIAH_1, Route128_Text_2A287F, Route128_Text_2A28AB, Route128_EventScript_1F6CEA
+ trainerbattle_single TRAINER_ISAIAH_1, Route128_Text_2A287F, Route128_Text_2A28AB, Route128_EventScript_1F6CEA
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route128_EventScript_1F6D09
@@ -198,7 +198,7 @@ Route128_EventScript_1F6D09:: @ 81F6D09
end
Route128_EventScript_1F6D20:: @ 81F6D20
- trainerbattle_normal TRAINER_KATELYN_1, Route128_Text_2A2A1F, Route128_Text_2A2A94, Route128_EventScript_1F6D4C
+ trainerbattle_single TRAINER_KATELYN_1, Route128_Text_2A2A1F, Route128_Text_2A2A94, Route128_EventScript_1F6D4C
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route128_EventScript_1F6D6B
@@ -220,27 +220,27 @@ Route128_EventScript_1F6D6B:: @ 81F6D6B
end
Route128_EventScript_1F6D82:: @ 81F6D82
- trainerbattle_normal TRAINER_ALEXA, Route128_Text_2A2C1C, Route128_Text_2A2C79
+ trainerbattle_single TRAINER_ALEXA, Route128_Text_2A2C1C, Route128_Text_2A2C79
msgbox Route128_Text_2A2C95, MSGBOX_AUTOCLOSE
end
Route128_EventScript_1F6D99:: @ 81F6D99
- trainerbattle_normal TRAINER_RUBEN, Route128_Text_2A2CD9, Route128_Text_2A2CFE
+ trainerbattle_single TRAINER_RUBEN, Route128_Text_2A2CD9, Route128_Text_2A2CFE
msgbox Route128_Text_2A2D0D, MSGBOX_AUTOCLOSE
end
Route128_EventScript_1F6DB0:: @ 81F6DB0
- trainerbattle_normal TRAINER_WAYNE, Route128_Text_2A2D3D, Route128_Text_2A2DA9
+ trainerbattle_single TRAINER_WAYNE, Route128_Text_2A2D3D, Route128_Text_2A2DA9
msgbox Route128_Text_2A2DBA, MSGBOX_AUTOCLOSE
end
Route128_EventScript_1F6DC7:: @ 81F6DC7
- trainerbattle_normal TRAINER_HARRISON, Route128_Text_2A2E0F, Route128_Text_2A2E44
+ trainerbattle_single TRAINER_HARRISON, Route128_Text_2A2E0F, Route128_Text_2A2E44
msgbox Route128_Text_2A2E6C, MSGBOX_AUTOCLOSE
end
Route128_EventScript_1F6DDE:: @ 81F6DDE
- trainerbattle_normal TRAINER_CARLEE, Route128_Text_2A2EC8, Route128_Text_2A2EFA
+ trainerbattle_single TRAINER_CARLEE, Route128_Text_2A2EC8, Route128_Text_2A2EFA
msgbox Route128_Text_2A2F2F, MSGBOX_AUTOCLOSE
end