Sync event macros

data/maps/PewterCity_Gym/scripts.inc

@@ -3,9 +3,8 @@ PewterCity_Gym_MapScripts:: @ 816A592
 
 PewterCity_Gym_EventScript_16A593:: @ 816A593
 	famechecker FAMECHECKER_BROCK, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
-	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC, TRAINER_LEADER_BROCK, 0, Text_190CD4, Text_190E4F, EventScript_16A5C5
-	checkflag FLAG_GOT_TM39_FROM_BROCK
-	goto_if FALSE, EventScript_16A5F3
+	trainerbattle_single TRAINER_LEADER_BROCK, Text_190CD4, Text_190E4F, EventScript_16A5C5, NO_MUSIC
+	goto_if_unset FLAG_GOT_TM39_FROM_BROCK, EventScript_16A5F3
 	msgbox gUnknown_819110F
 	release
 	end
@@ -25,9 +24,8 @@ EventScript_16A5F3:: @ 816A5F3
 	msgbox gUnknown_8190FC1
 	checkitemspace ITEM_TM39, 1
 	compare VAR_RESULT, 0
-	goto_if eq, EventScript_16A634
-	additem ITEM_TM39, 1
-	giveitemfanfaremsg gUnknown_8190FDB, ITEM_TM39
+	goto_if_eq EventScript_16A634
+	giveitem_msg gUnknown_8190FDB, ITEM_TM39
 	setflag FLAG_GOT_TM39_FROM_BROCK
 	msgbox gUnknown_8190FF8
 	release
@@ -39,20 +37,19 @@ EventScript_16A634:: @ 816A634
 	end
 
 PewterCity_Gym_EventScript_16A63E:: @ 816A63E
-	trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_CAMPER_LIAM, 0, Text_1911EC, Text_191237
+	trainerbattle_single TRAINER_CAMPER_LIAM, Text_1911EC, Text_191237
 	msgbox gUnknown_819126B, 6
 	end
 
 PewterCity_Gym_EventScript_16A655:: @ 816A655
 	lock
 	faceplayer
-	checkflag FLAG_DEFEATED_BROCK
-	goto_if TRUE, EventScript_16A67F
+	goto_if_set FLAG_DEFEATED_BROCK, EventScript_16A67F
 	msgbox gUnknown_8191298, MSGBOX_YESNO
 	compare VAR_RESULT, 1
-	goto_if eq, EventScript_16A689
+	goto_if_eq EventScript_16A689
 	compare VAR_RESULT, 0
-	goto_if eq, EventScript_16A697
+	goto_if_eq EventScript_16A697
 	end
 
 EventScript_16A67F:: @ 816A67F
@@ -77,8 +74,7 @@ EventScript_16A6A5:: @ 816A6A5
 
 PewterCity_Gym_EventScript_16A6AF:: @ 816A6AF
 	lockall
-	checkflag FLAG_BADGE01_GET
-	goto_if TRUE, EventScript_16A6C3
+	goto_if_set FLAG_BADGE01_GET, EventScript_16A6C3
 	msgbox gUnknown_819146E
 	releaseall
 	end