Sync event macros

1 files changed, 22 insertions, 22 deletions

diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc
index 0092d793d..5c7f361cc 100644
--- a/data/maps/Route111/scripts.inc
+++ b/data/maps/Route111/scripts.inc
@@ -15,7 +15,7 @@ Route111_EventScript_14FFA6:: @ 814FFA6
 Route111_MapScript1_14FFB9:: @ 814FFB9
 	call Route111_EventScript_14FFCD
 	call Route111_EventScript_1AE313
-	goto_if_trainer_not_defeated TRAINER_VICKY, Route111_EventScript_15000D
+	goto_if_not_defeated TRAINER_VICKY, Route111_EventScript_15000D
 	end
 
 Route111_EventScript_14FFCD:: @ 814FFCD
@@ -52,7 +52,7 @@ Route111_EventScript_150023:: @ 8150023
 	msgbox Route111_Text_16FA54, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq Route111_EventScript_15005F
-	giveitem_std ITEM_ROOT_FOSSIL
+	giveitem ITEM_ROOT_FOSSIL
 	closemessage
 	setflag FLAG_HIDE_ROOT_FOSSIL
 	setflag FLAG_HIDE_CLAW_FOSSIL
@@ -74,7 +74,7 @@ Route111_EventScript_150069:: @ 8150069
 	msgbox Route111_Text_16FAED, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq Route111_EventScript_1500A5
-	giveitem_std ITEM_CLAW_FOSSIL
+	giveitem ITEM_CLAW_FOSSIL
 	closemessage
 	setflag FLAG_HIDE_CLAW_FOSSIL
 	setflag FLAG_HIDE_ROOT_FOSSIL
@@ -118,10 +118,10 @@ Route111_Movement_1500AF:: @ 81500AF
 Route111_EventScript_1500C5:: @ 81500C5
 	lock
 	faceplayer
-	dodailyevents
+	dotimebasedevents
 	goto_if_set FLAG_DAILY_RECEIVED_BERRY_ROUTE111, Route111_EventScript_150100
 	msgbox Route111_Text_1C56F0, 4
-	giveitem_std ITEM_RAZZ_BERRY
+	giveitem ITEM_RAZZ_BERRY
 	compare VAR_RESULT, 0
 	goto_if_eq Route111_EventScript_1A029B
 	setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE111
@@ -243,7 +243,7 @@ Route111_EventScript_1501D1:: @ 81501D1
 
 Route111_EventScript_1501F3:: @ 81501F3
 	msgbox Route111_Text_16F7B3, 4
-	trainerbattle 3, TRAINER_VICTOR, 0, Route111_Text_16F7D2
+	trainerbattle_no_intro TRAINER_VICTOR, Route111_Text_16F7D2
 	applymovement 1, Route111_Movement_1A0841
 	waitmovement 0
 	call Route111_EventScript_150348
@@ -261,7 +261,7 @@ Route111_EventScript_1501F3:: @ 81501F3
 	waitmovement 0
 	call Route111_EventScript_15034F
 	msgbox Route111_Text_16F82D, 4
-	trainerbattle 3, TRAINER_VICTORIA, 0, Route111_Text_16F8A6
+	trainerbattle_no_intro TRAINER_VICTORIA, Route111_Text_16F8A6
 	applymovement 2, Route111_Movement_1A0841
 	waitmovement 0
 	call Route111_EventScript_150348
@@ -279,7 +279,7 @@ Route111_EventScript_1501F3:: @ 81501F3
 	waitmovement 0
 	call Route111_EventScript_15034F
 	msgbox Route111_Text_16F90E, 4
-	trainerbattle 3, TRAINER_VIVI, 0, Route111_Text_16F956
+	trainerbattle_no_intro TRAINER_VIVI, Route111_Text_16F956
 	applymovement 3, Route111_Movement_1A0841
 	waitmovement 0
 	call Route111_EventScript_150348
@@ -297,7 +297,7 @@ Route111_EventScript_1501F3:: @ 81501F3
 	waitmovement 0
 	call Route111_EventScript_15034F
 	msgbox Route111_Text_16F991, 4
-	trainerbattle 3, TRAINER_VICKY, 0, Route111_Text_16F9EC
+	trainerbattle_no_intro TRAINER_VICKY, Route111_Text_16F9EC
 	msgbox Route111_Text_16FA22, 4
 	closemessage
 	applymovement 4, Route111_Movement_1A0841
@@ -368,27 +368,27 @@ Route111_EventScript_15039E:: @ 815039E
 	end
 
 Route111_EventScript_1503A7:: @ 81503A7
-	trainerbattle 0, TRAINER_DREW, 0, Route111_Text_1BAB4B, Route111_Text_1BABC7
+	trainerbattle_single TRAINER_DREW, Route111_Text_1BAB4B, Route111_Text_1BABC7
 	msgbox Route111_Text_1BAC10, 6
 	end
 
 Route111_EventScript_1503BE:: @ 81503BE
-	trainerbattle 0, TRAINER_HEIDI, 0, Route111_Text_1BAC60, Route111_Text_1BACC5
+	trainerbattle_single TRAINER_HEIDI, Route111_Text_1BAC60, Route111_Text_1BACC5
 	msgbox Route111_Text_1BACD8, 6
 	end
 
 Route111_EventScript_1503D5:: @ 81503D5
-	trainerbattle 0, TRAINER_CLIFF, 0, Route111_Text_1BAD4B, Route111_Text_1BADA3
+	trainerbattle_single TRAINER_CLIFF, Route111_Text_1BAD4B, Route111_Text_1BADA3
 	msgbox Route111_Text_1BADC2, 6
 	end
 
 Route111_EventScript_1503EC:: @ 81503EC
-	trainerbattle 0, TRAINER_BECKY, 0, Route111_Text_1BAE24, Route111_Text_1BAE6E
+	trainerbattle_single TRAINER_BECKY, Route111_Text_1BAE24, Route111_Text_1BAE6E
 	msgbox Route111_Text_1BAE81, 6
 	end
 
 Route111_EventScript_150403:: @ 8150403
-	trainerbattle 0, TRAINER_DUSTY_1, 0, Route111_Text_1BAEC9, Route111_Text_1BAF14
+	trainerbattle_single TRAINER_DUSTY_1, Route111_Text_1BAEC9, Route111_Text_1BAF14
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route111_EventScript_15042A
@@ -396,27 +396,27 @@ Route111_EventScript_150403:: @ 8150403
 	end
 
 Route111_EventScript_15042A:: @ 815042A
-	trainerbattle 5, TRAINER_DUSTY_1, 0, Route111_Text_1BAFC1, Route111_Text_1BB034
+	trainerbattle_rematch TRAINER_DUSTY_1, Route111_Text_1BAFC1, Route111_Text_1BB034
 	msgbox Route111_Text_1BB070, 6
 	end
 
 Route111_EventScript_150441:: @ 8150441
-	trainerbattle 0, TRAINER_TRAVIS, 0, Route111_Text_1BB111, Route111_Text_1BB140
+	trainerbattle_single TRAINER_TRAVIS, Route111_Text_1BB111, Route111_Text_1BB140
 	msgbox Route111_Text_1BB15B, 6
 	end
 
 Route111_EventScript_150458:: @ 8150458
-	trainerbattle 0, TRAINER_IRENE, 0, Route111_Text_1BB199, Route111_Text_1BB1D8
+	trainerbattle_single TRAINER_IRENE, Route111_Text_1BB199, Route111_Text_1BB1D8
 	msgbox Route111_Text_1BB1F6, 6
 	end
 
 Route111_EventScript_15046F:: @ 815046F
-	trainerbattle 0, TRAINER_DAISUKE, 0, Route111_Text_1BB250, Route111_Text_1BB27E
+	trainerbattle_single TRAINER_DAISUKE, Route111_Text_1BB250, Route111_Text_1BB27E
 	msgbox Route111_Text_1BB290, 6
 	end
 
 Route111_EventScript_150486:: @ 8150486
-	trainerbattle 0, TRAINER_WILTON_1, 0, Route111_Text_1BB2E3, Route111_Text_1BB313
+	trainerbattle_single TRAINER_WILTON_1, Route111_Text_1BB2E3, Route111_Text_1BB313
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route111_EventScript_1504AD
@@ -424,12 +424,12 @@ Route111_EventScript_150486:: @ 8150486
 	end
 
 Route111_EventScript_1504AD:: @ 81504AD
-	trainerbattle 5, TRAINER_WILTON_1, 0, Route111_Text_1BB3A7, Route111_Text_1BB3FA
+	trainerbattle_rematch TRAINER_WILTON_1, Route111_Text_1BB3A7, Route111_Text_1BB3FA
 	msgbox Route111_Text_1BB40E, 6
 	end
 
 Route111_EventScript_1504C4:: @ 81504C4
-	trainerbattle 0, TRAINER_BROOKE_1, 0, Route111_Text_1BB44F, Route111_Text_1BB49F
+	trainerbattle_single TRAINER_BROOKE_1, Route111_Text_1BB44F, Route111_Text_1BB49F
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route111_EventScript_1504EB
@@ -437,6 +437,6 @@ Route111_EventScript_1504C4:: @ 81504C4
 	end
 
 Route111_EventScript_1504EB:: @ 81504EB
-	trainerbattle 5, TRAINER_BROOKE_1, 0, Route111_Text_1BB529, Route111_Text_1BB5A2
+	trainerbattle_rematch TRAINER_BROOKE_1, Route111_Text_1BB529, Route111_Text_1BB5A2
 	msgbox Route111_Text_1BB5C1, 6
 	end