summaryrefslogtreecommitdiff
path: root/data/maps/Route106
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-04-23 17:20:34 -0400
committerGriffinR <griffin.g.richards@gmail.com>2020-04-23 17:59:25 -0400
commit71094356313801bf20191f3db1efa0decd3c3dcb (patch)
tree18c501d04a21f88c5f4d59f764883e326710ca39 /data/maps/Route106
parent3bd2094141da60be175f237fa34889469f77f187 (diff)
Sync event macros
Diffstat (limited to 'data/maps/Route106')
-rw-r--r--data/maps/Route106/scripts.inc10
1 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/Route106/scripts.inc b/data/maps/Route106/scripts.inc
index 1fe49235b..dba3041d6 100644
--- a/data/maps/Route106/scripts.inc
+++ b/data/maps/Route106/scripts.inc
@@ -6,17 +6,17 @@ Route106_EventScript_14F32F:: @ 814F32F
end
Route106_EventScript_14F338:: @ 814F338
- trainerbattle 0, TRAINER_DOUGLAS, 0, Route106_Text_1B913D, Route106_Text_1B917F
+ trainerbattle_single TRAINER_DOUGLAS, Route106_Text_1B913D, Route106_Text_1B917F
msgbox Route106_Text_1B918A, 6
end
Route106_EventScript_14F34F:: @ 814F34F
- trainerbattle 0, TRAINER_NICOLE, 0, Route106_Text_1B91AC, Route106_Text_1B91F8
+ trainerbattle_single TRAINER_NICOLE, Route106_Text_1B91AC, Route106_Text_1B91F8
msgbox Route106_Text_1B9222, 6
end
Route106_EventScript_14F366:: @ 814F366
- trainerbattle 0, TRAINER_ELLIOT_1, 0, Route106_Text_1B8EF0, Route106_Text_1B8F25
+ trainerbattle_single TRAINER_ELLIOT_1, Route106_Text_1B8EF0, Route106_Text_1B8F25
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_if_eq Route106_EventScript_14F38D
@@ -24,11 +24,11 @@ Route106_EventScript_14F366:: @ 814F366
end
Route106_EventScript_14F38D:: @ 814F38D
- trainerbattle 5, TRAINER_ELLIOT_1, 0, Route106_Text_1B8FAC, Route106_Text_1B8FF5
+ trainerbattle_rematch TRAINER_ELLIOT_1, Route106_Text_1B8FAC, Route106_Text_1B8FF5
msgbox Route106_Text_1B9011, 6
end
Route106_EventScript_14F3A4:: @ 814F3A4
- trainerbattle 0, TRAINER_NED, 0, Route106_Text_1B9052, Route106_Text_1B90D3
+ trainerbattle_single TRAINER_NED, Route106_Text_1B9052, Route106_Text_1B90D3
msgbox Route106_Text_1B910A, 6
end