summaryrefslogtreecommitdiff
path: root/data/maps/Route118
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/Route118
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/Route118')
-rw-r--r--data/maps/Route118/scripts.inc14
1 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc
index f892b64aa..f88e0e9c3 100644
--- a/data/maps/Route118/scripts.inc
+++ b/data/maps/Route118/scripts.inc
@@ -187,7 +187,7 @@ Route118_Movement_1F3F7E: @ 81F3F7E
step_end
Route118_EventScript_1F3F87:: @ 81F3F87
- trainerbattle_normal TRAINER_ROSE_1, Route118_Text_29D290, Route118_Text_29D2D8, Route118_EventScript_1F3FB3
+ trainerbattle_single TRAINER_ROSE_1, Route118_Text_29D290, Route118_Text_29D2D8, Route118_EventScript_1F3FB3
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route118_EventScript_1F3FD2
@@ -209,17 +209,17 @@ Route118_EventScript_1F3FD2:: @ 81F3FD2
end
Route118_EventScript_1F3FE9:: @ 81F3FE9
- trainerbattle_normal TRAINER_BARNY, Route118_Text_29D515, Route118_Text_29D55C
+ trainerbattle_single TRAINER_BARNY, Route118_Text_29D515, Route118_Text_29D55C
msgbox Route118_Text_29D587, MSGBOX_AUTOCLOSE
end
Route118_EventScript_1F4000:: @ 81F4000
- trainerbattle_normal TRAINER_WADE, Route118_Text_29D5DF, Route118_Text_29D64C
+ trainerbattle_single TRAINER_WADE, Route118_Text_29D5DF, Route118_Text_29D64C
msgbox Route118_Text_29D663, MSGBOX_AUTOCLOSE
end
Route118_EventScript_1F4017:: @ 81F4017
- trainerbattle_normal TRAINER_DALTON_1, Route118_Text_29D6AF, Route118_Text_29D6CD, Route118_EventScript_1F4043
+ trainerbattle_single TRAINER_DALTON_1, Route118_Text_29D6AF, Route118_Text_29D6CD, Route118_EventScript_1F4043
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_eq Route118_EventScript_1F4062
@@ -241,17 +241,17 @@ Route118_EventScript_1F4062:: @ 81F4062
end
Route118_EventScript_1F4079:: @ 81F4079
- trainerbattle_normal TRAINER_PERRY, Route118_Text_29D41D, Route118_Text_29D45B
+ trainerbattle_single TRAINER_PERRY, Route118_Text_29D41D, Route118_Text_29D45B
msgbox Route118_Text_29D46C, MSGBOX_AUTOCLOSE
end
Route118_EventScript_1F4090:: @ 81F4090
- trainerbattle_normal TRAINER_CHESTER, Route118_Text_29D4A6, Route118_Text_29D4C4
+ trainerbattle_single TRAINER_CHESTER, Route118_Text_29D4A6, Route118_Text_29D4C4
msgbox Route118_Text_29D4DA, MSGBOX_AUTOCLOSE
end
Route118_EventScript_1F40A7:: @ 81F40A7
- trainerbattle_normal TRAINER_DEANDRE, Route118_Text_29D81B, Route118_Text_29D83C
+ trainerbattle_single TRAINER_DEANDRE, Route118_Text_29D81B, Route118_Text_29D83C
msgbox Route118_Text_29D872, MSGBOX_AUTOCLOSE
end