summaryrefslogtreecommitdiff
path: root/data/maps/Route113
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/Route113
parent3bd2094141da60be175f237fa34889469f77f187 (diff)
Sync event macros
Diffstat (limited to 'data/maps/Route113')
-rw-r--r--data/maps/Route113/scripts.inc18
1 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc
index 58c769273..c7435bf3d 100644
--- a/data/maps/Route113/scripts.inc
+++ b/data/maps/Route113/scripts.inc
@@ -49,17 +49,17 @@ Route113_EventScript_150632:: @ 8150632
end
Route113_EventScript_15063B:: @ 815063B
- trainerbattle 0, TRAINER_NEAL, 0, Route113_Text_1BB9BA, Route113_Text_1BB9E6
+ trainerbattle_single TRAINER_NEAL, Route113_Text_1BB9BA, Route113_Text_1BB9E6
msgbox Route113_Text_1BB9FB, 6
end
Route113_EventScript_150652:: @ 8150652
- trainerbattle 0, TRAINER_DILLON, 0, Route113_Text_1BBA62, Route113_Text_1BBA9B
+ trainerbattle_single TRAINER_DILLON, Route113_Text_1BBA62, Route113_Text_1BBA9B
msgbox Route113_Text_1BBAB7, 6
end
Route113_EventScript_150669:: @ 8150669
- trainerbattle 0, TRAINER_MADELINE_1, 0, Route113_Text_1BBB27, Route113_Text_1BBB7A
+ trainerbattle_single TRAINER_MADELINE_1, Route113_Text_1BBB27, Route113_Text_1BBB7A
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_if_eq Route113_EventScript_150690
@@ -67,12 +67,12 @@ Route113_EventScript_150669:: @ 8150669
end
Route113_EventScript_150690:: @ 8150690
- trainerbattle 5, TRAINER_MADELINE_1, 0, Route113_Text_1BBBCE, Route113_Text_1BBC0D
+ trainerbattle_rematch TRAINER_MADELINE_1, Route113_Text_1BBBCE, Route113_Text_1BBC0D
msgbox Route113_Text_1BBC1C, 6
end
Route113_EventScript_1506A7:: @ 81506A7
- trainerbattle 0, TRAINER_LAO_1, 0, Route113_Text_1BBC59, Route113_Text_1BBC90
+ trainerbattle_single TRAINER_LAO_1, Route113_Text_1BBC59, Route113_Text_1BBC90
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_if_eq Route113_EventScript_1506CE
@@ -80,21 +80,21 @@ Route113_EventScript_1506A7:: @ 81506A7
end
Route113_EventScript_1506CE:: @ 81506CE
- trainerbattle 5, TRAINER_LAO_1, 0, Route113_Text_1BBCE6, Route113_Text_1BBD1D
+ trainerbattle_rematch TRAINER_LAO_1, Route113_Text_1BBCE6, Route113_Text_1BBD1D
msgbox Route113_Text_1BBD38, 6
end
Route113_EventScript_1506E5:: @ 81506E5
- trainerbattle 0, TRAINER_LUNG, 0, Route113_Text_1BBD92, Route113_Text_1BBDC6
+ trainerbattle_single TRAINER_LUNG, Route113_Text_1BBD92, Route113_Text_1BBDC6
msgbox Route113_Text_1BBE1D, 6
end
Route113_EventScript_1506FC:: @ 81506FC
- trainerbattle 4, TRAINER_TORI_AND_TIA, 0, Route113_Text_1BBE65, Route113_Text_1BBEA1, Route113_Text_1BBF25
+ trainerbattle_double TRAINER_TORI_AND_TIA, Route113_Text_1BBE65, Route113_Text_1BBEA1, Route113_Text_1BBF25
msgbox Route113_Text_1BBEE4, 6
end
Route113_EventScript_150717:: @ 8150717
- trainerbattle 4, TRAINER_TORI_AND_TIA, 0, Route113_Text_1BBF62, Route113_Text_1BBF9D, Route113_Text_1BC021
+ trainerbattle_double TRAINER_TORI_AND_TIA, Route113_Text_1BBF62, Route113_Text_1BBF9D, Route113_Text_1BC021
msgbox Route113_Text_1BBFE2, 6
end