Sync event macros

1 files changed, 14 insertions, 14 deletions

diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc
index ec9ae2420..a5c0ae0c4 100644
--- a/data/maps/Route103/scripts.inc
+++ b/data/maps/Route103/scripts.inc
@@ -49,32 +49,32 @@ Route103_EventScript_14EC04:: @ 814EC04
 	end
 
 Route103_EventScript_14EC5D:: @ 814EC5D
-	trainerbattle 3, TRAINER_MAY_4, 0, Route103_Text_16D65B
+	trainerbattle_no_intro TRAINER_MAY_4, Route103_Text_16D65B
 	goto Route103_EventScript_14ECBD
 	end
 
 Route103_EventScript_14EC6D:: @ 814EC6D
-	trainerbattle 3, TRAINER_MAY_7, 0, Route103_Text_16D65B
+	trainerbattle_no_intro TRAINER_MAY_7, Route103_Text_16D65B
 	goto Route103_EventScript_14ECBD
 	end
 
 Route103_EventScript_14EC7D:: @ 814EC7D
-	trainerbattle 3, TRAINER_MAY_1, 0, Route103_Text_16D65B
+	trainerbattle_no_intro TRAINER_MAY_1, Route103_Text_16D65B
 	goto Route103_EventScript_14ECBD
 	end
 
 Route103_EventScript_14EC8D:: @ 814EC8D
-	trainerbattle 3, TRAINER_BRENDAN_4, 0, Route103_Text_16D836
+	trainerbattle_no_intro TRAINER_BRENDAN_4, Route103_Text_16D836
 	goto Route103_EventScript_14ECCB
 	end
 
 Route103_EventScript_14EC9D:: @ 814EC9D
-	trainerbattle 3, TRAINER_BRENDAN_7, 0, Route103_Text_16D836
+	trainerbattle_no_intro TRAINER_BRENDAN_7, Route103_Text_16D836
 	goto Route103_EventScript_14ECCB
 	end
 
 Route103_EventScript_14ECAD:: @ 814ECAD
-	trainerbattle 3, TRAINER_BRENDAN_1, 0, Route103_Text_16D836
+	trainerbattle_no_intro TRAINER_BRENDAN_1, Route103_Text_16D836
 	goto Route103_EventScript_14ECCB
 	end
 
@@ -167,12 +167,12 @@ Route103_EventScript_14ED8B:: @ 814ED8B
 	end
 
 Route103_EventScript_14ED94:: @ 814ED94
-	trainerbattle 0, TRAINER_DAISY, 0, Route103_Text_1B7D55, Route103_Text_1B7D8B
+	trainerbattle_single TRAINER_DAISY, Route103_Text_1B7D55, Route103_Text_1B7D8B
 	msgbox Route103_Text_1B7DB2, 6
 	end
 
 Route103_EventScript_14EDAB:: @ 814EDAB
-	trainerbattle 4, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_1B7DF7, Route103_Text_1B7E3B, Route103_Text_1B7EAC
+	trainerbattle_double TRAINER_AMY_AND_LIV_1, Route103_Text_1B7DF7, Route103_Text_1B7E3B, Route103_Text_1B7EAC
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route103_EventScript_14EDD6
@@ -180,12 +180,12 @@ Route103_EventScript_14EDAB:: @ 814EDAB
 	end
 
 Route103_EventScript_14EDD6:: @ 814EDD6
-	trainerbattle 7, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_1B7FE7, Route103_Text_1B802B, Route103_Text_1B80AF
+	trainerbattle_rematch_double TRAINER_AMY_AND_LIV_1, Route103_Text_1B7FE7, Route103_Text_1B802B, Route103_Text_1B80AF
 	msgbox Route103_Text_1B8053, 6
 	end
 
 Route103_EventScript_14EDF1:: @ 814EDF1
-	trainerbattle 4, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_1B7EFB, Route103_Text_1B7F20, Route103_Text_1B7F8E
+	trainerbattle_double TRAINER_AMY_AND_LIV_1, Route103_Text_1B7EFB, Route103_Text_1B7F20, Route103_Text_1B7F8E
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route103_EventScript_14EE1C
@@ -193,17 +193,17 @@ Route103_EventScript_14EDF1:: @ 814EDF1
 	end
 
 Route103_EventScript_14EE1C:: @ 814EE1C
-	trainerbattle 7, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_1B80FE, Route103_Text_1B8123, Route103_Text_1B81A1
+	trainerbattle_rematch_double TRAINER_AMY_AND_LIV_1, Route103_Text_1B80FE, Route103_Text_1B8123, Route103_Text_1B81A1
 	msgbox Route103_Text_1B814D, 6
 	end
 
 Route103_EventScript_14EE37:: @ 814EE37
-	trainerbattle 0, TRAINER_ANDREW, 0, Route103_Text_1B81FA, Route103_Text_1B8258
+	trainerbattle_single TRAINER_ANDREW, Route103_Text_1B81FA, Route103_Text_1B8258
 	msgbox Route103_Text_1B8281, 6
 	end
 
 Route103_EventScript_14EE4E:: @ 814EE4E
-	trainerbattle 0, TRAINER_MIGUEL_1, 0, Route103_Text_1B82A9, Route103_Text_1B82EC
+	trainerbattle_single TRAINER_MIGUEL_1, Route103_Text_1B82A9, Route103_Text_1B82EC
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route103_EventScript_14EE75
@@ -211,6 +211,6 @@ Route103_EventScript_14EE4E:: @ 814EE4E
 	end
 
 Route103_EventScript_14EE75:: @ 814EE75
-	trainerbattle 5, TRAINER_MIGUEL_1, 0, Route103_Text_1B8349, Route103_Text_1B838C
+	trainerbattle_rematch TRAINER_MIGUEL_1, Route103_Text_1B8349, Route103_Text_1B838C
 	msgbox Route103_Text_1B83A4, 6
 	end