Sync event macros

1 files changed, 115 insertions, 127 deletions

diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
index 858b12d8c..8e20d3cab 100644
--- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
@@ -7,13 +7,12 @@ PalletTown_ProfessorOaksLab_MapScripts:: @ 8168F7E
 PalletTown_ProfessorOaksLab_OnTransition:: @ 8168F8E
 	setflag FLAG_VISITED_OAKS_LAB
 	compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1
-	call_if eq, EventScript_168FC6
+	call_if_eq EventScript_168FC6
 	compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 7
-	call_if eq, EventScript_168FD5
+	call_if_eq EventScript_168FD5
 	compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8
-	call_if eq, EventScript_168FC0
-	checkflag FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL
-	call_if TRUE, EventScript_168FBC
+	call_if_eq EventScript_168FC0
+	call_if_set FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL, EventScript_168FBC
 	end
 
 EventScript_168FBC:: @ 8168FBC
@@ -67,32 +66,32 @@ EventScript_169035:: @ 8169035
 	msgbox gUnknown_818EE60
 	closemessage
 	compare VAR_FACING, DIR_NORTH
-	call_if eq, EventScript_169174
+	call_if_eq EventScript_169174
 	compare VAR_FACING, DIR_SOUTH
-	call_if eq, EventScript_1691BB
+	call_if_eq EventScript_1691BB
 	compare VAR_FACING, DIR_EAST
-	call_if eq, EventScript_169194
+	call_if_eq EventScript_169194
 	compare VAR_FACING, DIR_WEST
-	call_if eq, EventScript_169194
+	call_if_eq EventScript_169194
 	msgbox gUnknown_818EF59
 	fadedefaultbgm
 	msgbox gUnknown_818F004
 	compare VAR_FACING, DIR_NORTH
-	call_if eq, EventScript_1691DB
+	call_if_eq EventScript_1691DB
 	compare VAR_FACING, DIR_WEST
-	call_if eq, EventScript_1691E6
+	call_if_eq EventScript_1691E6
 	textcolor 3
 	msgbox gUnknown_818F062
 	closemessage
 	call EventScript_1A6675
 	compare VAR_FACING, DIR_NORTH
-	call_if eq, EventScript_1691F1
+	call_if_eq EventScript_1691F1
 	compare VAR_FACING, DIR_SOUTH
-	call_if eq, EventScript_1691FC
+	call_if_eq EventScript_1691FC
 	compare VAR_FACING, DIR_EAST
-	call_if eq, EventScript_169215
+	call_if_eq EventScript_169215
 	compare VAR_FACING, DIR_WEST
-	call_if eq, EventScript_169227
+	call_if_eq EventScript_169227
 	addobject 9
 	addobject 10
 	delay 30
@@ -102,13 +101,13 @@ EventScript_169035:: @ 8169035
 	removeobject 10
 	delay 30
 	compare VAR_FACING, DIR_NORTH
-	call_if eq, EventScript_169845
+	call_if_eq EventScript_169845
 	compare VAR_FACING, DIR_SOUTH
-	call_if eq, EventScript_169850
+	call_if_eq EventScript_169850
 	compare VAR_FACING, DIR_EAST
-	call_if eq, EventScript_16985B
+	call_if_eq EventScript_16985B
 	compare VAR_FACING, DIR_WEST
-	call_if eq, EventScript_16986D
+	call_if_eq EventScript_16986D
 	textcolor 3
 	playfanfare MUS_FAN5
 	message Text_18F0E8
@@ -121,13 +120,13 @@ EventScript_169035:: @ 8169035
 	closemessage
 	playbgm MUS_RIVAL2, 0
 	compare VAR_FACING, DIR_NORTH
-	call_if eq, EventScript_169B69
+	call_if_eq EventScript_169B69
 	compare VAR_FACING, DIR_SOUTH
-	call_if eq, EventScript_169B7B
+	call_if_eq EventScript_169B7B
 	compare VAR_FACING, DIR_EAST
-	call_if eq, EventScript_169B7B
+	call_if_eq EventScript_169B7B
 	compare VAR_FACING, DIR_WEST
-	call_if eq, EventScript_169B7B
+	call_if_eq EventScript_169B7B
 	removeobject 8
 	fadedefaultbgm
 	setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8
@@ -312,20 +311,20 @@ EventScript_16930B:: @ 816930B
 	applymovement 4, Movement_FaceDown
 	waitmovement 0
 	compare VAR_STARTER_MON, 0
-	goto_if eq, EventScript_1693D2
+	goto_if_eq EventScript_1693D2
 	compare VAR_STARTER_MON, 1
-	goto_if eq, EventScript_16944D
+	goto_if_eq EventScript_16944D
 	compare VAR_STARTER_MON, 2
-	goto_if eq, EventScript_16935A
+	goto_if_eq EventScript_16935A
 	end
 
 EventScript_16935A:: @ 816935A
 	compare VAR_TEMP_2, 1
-	goto_if eq, EventScript_16937C
+	goto_if_eq EventScript_16937C
 	compare VAR_TEMP_2, 2
-	goto_if eq, EventScript_16938C
+	goto_if_eq EventScript_16938C
 	compare VAR_TEMP_2, 3
-	goto_if eq, EventScript_16939C
+	goto_if_eq EventScript_16939C
 	end
 
 EventScript_16937C:: @ 816937C
@@ -347,7 +346,7 @@ EventScript_16939C:: @ 816939C
 	end
 
 EventScript_1693AC:: @ 81693AC
-	trainerbattle TRAINER_BATTLE_TUTORIAL, TRAINER_RIVAL_OAKS_LAB_SQUIRTLE, 3, Text_18DDEA, Text_18DE1A
+	trainerbattle_tutorial TRAINER_RIVAL_OAKS_LAB_SQUIRTLE, 3, Text_18DDEA, Text_18DE1A
 	goto EventScript_1694C2
 	end
 
@@ -377,11 +376,11 @@ Movement_1693CD:: @ 81693CD
 
 EventScript_1693D2:: @ 81693D2
 	compare VAR_TEMP_2, 1
-	goto_if eq, EventScript_1693F4
+	goto_if_eq EventScript_1693F4
 	compare VAR_TEMP_2, 2
-	goto_if eq, EventScript_169404
+	goto_if_eq EventScript_169404
 	compare VAR_TEMP_2, 3
-	goto_if eq, EventScript_169414
+	goto_if_eq EventScript_169414
 	end
 
 EventScript_1693F4:: @ 81693F4
@@ -403,7 +402,7 @@ EventScript_169414:: @ 8169414
 	end
 
 EventScript_169424:: @ 8169424
-	trainerbattle TRAINER_BATTLE_TUTORIAL, TRAINER_RIVAL_OAKS_LAB_CHARMANDER, 3, Text_18DDEA, Text_18DE1A
+	trainerbattle_tutorial TRAINER_RIVAL_OAKS_LAB_CHARMANDER, 3, Text_18DDEA, Text_18DE1A
 	goto EventScript_1694C2
 	end
 
@@ -436,11 +435,11 @@ Movement_169447:: @ 8169447
 
 EventScript_16944D:: @ 816944D
 	compare VAR_TEMP_2, 1
-	goto_if eq, EventScript_16946F
+	goto_if_eq EventScript_16946F
 	compare VAR_TEMP_2, 2
-	goto_if eq, EventScript_16947F
+	goto_if_eq EventScript_16947F
 	compare VAR_TEMP_2, 3
-	goto_if eq, EventScript_16948F
+	goto_if_eq EventScript_16948F
 	end
 
 EventScript_16946F:: @ 816946F
@@ -462,7 +461,7 @@ EventScript_16948F:: @ 816948F
 	end
 
 EventScript_16949F:: @ 816949F
-	trainerbattle TRAINER_BATTLE_TUTORIAL, TRAINER_RIVAL_OAKS_LAB_BULBASAUR, 3, Text_18DDEA, Text_18DE1A
+	trainerbattle_tutorial TRAINER_RIVAL_OAKS_LAB_BULBASAUR, 3, Text_18DDEA, Text_18DE1A
 	goto EventScript_1694C2
 	end
 
@@ -493,11 +492,11 @@ EventScript_1694C2:: @ 81694C2
 	closemessage
 	playbgm MUS_RIVAL2, 0
 	compare VAR_TEMP_2, 1
-	call_if eq, EventScript_169504
+	call_if_eq EventScript_169504
 	compare VAR_TEMP_2, 2
-	call_if eq, EventScript_169516
+	call_if_eq EventScript_169516
 	compare VAR_TEMP_2, 3
-	call_if eq, EventScript_169528
+	call_if_eq EventScript_169528
 	removeobject 8
 	playse SE_KAIDAN
 	fadedefaultbgm
@@ -575,9 +574,9 @@ PalletTown_ProfessorOaksLab_EventScript_16955F:: @ 816955F
 	lock
 	faceplayer
 	compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3
-	goto_if eq, EventScript_16958B
+	goto_if_eq EventScript_16958B
 	compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2
-	goto_if eq, EventScript_169581
+	goto_if_eq EventScript_169581
 	msgbox gUnknown_818DC67
 	release
 	end
@@ -595,24 +594,22 @@ EventScript_16958B:: @ 816958B
 PalletTown_ProfessorOaksLab_EventScript_169595:: @ 8169595
 	lock
 	faceplayer
-	checkflag FLAG_TEMP_2
-	goto_if TRUE, EventScript_169600
+	goto_if_set FLAG_TEMP_2, EventScript_169600
 	compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 9
-	goto_if eq, EventScript_169903
+	goto_if_eq EventScript_169903
 	compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 8
-	goto_if eq, EventScript_169A6E
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_if TRUE, EventScript_1699CE
+	goto_if_eq EventScript_169A6E
+	goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_1699CE
 	compare VAR_MAP_SCENE_CERULEAN_CITY_RIVAL, 1
-	goto_if eq, EventScript_169903
+	goto_if_eq EventScript_169903
 	compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6
-	goto_if eq, EventScript_1698D6
+	goto_if_eq EventScript_1698D6
 	compare VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1
-	goto_if ge, EventScript_16961E
+	goto_if_ge EventScript_16961E
 	compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 4
-	goto_if eq, EventScript_169614
+	goto_if_eq EventScript_169614
 	compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3
-	goto_if eq, EventScript_16960A
+	goto_if_eq EventScript_16960A
 	msgbox gUnknown_818E116
 	release
 	end
@@ -646,13 +643,13 @@ EventScript_16961E:: @ 816961E
 	msgbox gUnknown_818DE8D
 	closemessage
 	compare VAR_FACING, DIR_NORTH
-	call_if eq, EventScript_169A82
+	call_if_eq EventScript_169A82
 	compare VAR_FACING, DIR_SOUTH
-	call_if eq, EventScript_169AC1
+	call_if_eq EventScript_169AC1
 	compare VAR_FACING, DIR_EAST
-	call_if eq, EventScript_169A9E
+	call_if_eq EventScript_169A9E
 	compare VAR_FACING, DIR_WEST
-	call_if eq, EventScript_169A9E
+	call_if_eq EventScript_169A9E
 	fadedefaultbgm
 	msgbox gUnknown_818DE99
 	closemessage
@@ -663,23 +660,23 @@ EventScript_16961E:: @ 816961E
 	applymovement 4, Movement_Delay48
 	waitmovement 0
 	compare VAR_FACING, DIR_SOUTH
-	call_if eq, EventScript_169ADD
+	call_if_eq EventScript_169ADD
 	compare VAR_FACING, DIR_EAST
-	call_if eq, EventScript_169B14
+	call_if_eq EventScript_169B14
 	compare VAR_FACING, DIR_WEST
-	call_if eq, EventScript_169AF5
+	call_if_eq EventScript_169AF5
 	compare VAR_FACING, DIR_NORTH
-	call_if eq, EventScript_169B86
+	call_if_eq EventScript_169B86
 	msgbox gUnknown_818E508
 	closemessage
 	compare VAR_FACING, DIR_NORTH
-	call_if eq, EventScript_169882
+	call_if_eq EventScript_169882
 	compare VAR_FACING, DIR_SOUTH
-	call_if eq, EventScript_16988D
+	call_if_eq EventScript_16988D
 	compare VAR_FACING, DIR_EAST
-	call_if eq, EventScript_1698A6
+	call_if_eq EventScript_1698A6
 	compare VAR_FACING, DIR_WEST
-	call_if eq, EventScript_1698B8
+	call_if_eq EventScript_1698B8
 	msgbox gUnknown_818E536
 	closemessage
 	delay 40
@@ -692,13 +689,13 @@ EventScript_16961E:: @ 816961E
 	removeobject 10
 	delay 25
 	compare VAR_FACING, DIR_NORTH
-	call_if eq, EventScript_169845
+	call_if_eq EventScript_169845
 	compare VAR_FACING, DIR_SOUTH
-	call_if eq, EventScript_169850
+	call_if_eq EventScript_169850
 	compare VAR_FACING, DIR_EAST
-	call_if eq, EventScript_16985B
+	call_if_eq EventScript_16985B
 	compare VAR_FACING, DIR_WEST
-	call_if eq, EventScript_16986D
+	call_if_eq EventScript_16986D
 	delay 10
 	textcolor 3
 	playfanfare MUS_FAN5
@@ -710,31 +707,30 @@ EventScript_16961E:: @ 816961E
 	special sub_810B810
 	setvar VAR_MAP_SCENE_POKEMON_CENTER_TEALA, 1
 	msgbox gUnknown_818E612
-	additem ITEM_POKE_BALL, 5
-	giveitemfanfaremsg gUnknown_818E6B3, ITEM_POKE_BALL, 5
+	giveitem_msg gUnknown_818E6B3, ITEM_POKE_BALL, 5
 	msgbox gUnknown_818E6D0
 	famechecker FAMECHECKER_OAK, 1
 	msgbox gUnknown_818E784
 	msgbox gUnknown_818DEC8
 	compare VAR_FACING, DIR_NORTH
-	call_if eq, EventScript_169B33
+	call_if_eq EventScript_169B33
 	compare VAR_FACING, DIR_SOUTH
-	call_if eq, EventScript_169B45
+	call_if_eq EventScript_169B45
 	compare VAR_FACING, DIR_EAST
-	call_if eq, EventScript_169B57
+	call_if_eq EventScript_169B57
 	compare VAR_FACING, DIR_WEST
-	call_if eq, EventScript_169B57
+	call_if_eq EventScript_169B57
 	msgbox gUnknown_818DEF3
 	closemessage
 	playbgm MUS_RIVAL2, 0
 	compare VAR_FACING, DIR_NORTH
-	call_if eq, EventScript_169B69
+	call_if_eq EventScript_169B69
 	compare VAR_FACING, DIR_SOUTH
-	call_if eq, EventScript_169B7B
+	call_if_eq EventScript_169B7B
 	compare VAR_FACING, DIR_EAST
-	call_if eq, EventScript_169B7B
+	call_if_eq EventScript_169B7B
 	compare VAR_FACING, DIR_WEST
-	call_if eq, EventScript_169B7B
+	call_if_eq EventScript_169B7B
 	removeobject 8
 	fadedefaultbgm
 	setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6
@@ -840,14 +836,13 @@ EventScript_1698D6:: @ 81698D6
 	getnumberstring 0, VAR_0x8008
 	getnumberstring 1, VAR_0x8009
 	compare VAR_0x8009, 1
-	goto_if eq, EventScript_1699FB
+	goto_if_eq EventScript_1699FB
 	goto EventScript_169903
 	end
 
 EventScript_169903:: @ 8169903
 	call EventScript_1A737B
-	checkflag FLAG_OAK_SAW_DEX_COMPLETION
-	goto_if TRUE, EventScript_169913
+	goto_if_set FLAG_OAK_SAW_DEX_COMPLETION, EventScript_169913
 	release
 	end
 
@@ -857,13 +852,13 @@ EventScript_169913:: @ 8169913
 	message Text_1A7291
 	waitmessage
 	compare VAR_FACING, DIR_NORTH
-	call_if eq, EventScript_169964
+	call_if_eq EventScript_169964
 	compare VAR_FACING, DIR_SOUTH
-	call_if eq, EventScript_16996F
+	call_if_eq EventScript_16996F
 	compare VAR_FACING, DIR_EAST
-	call_if eq, EventScript_16997A
+	call_if_eq EventScript_16997A
 	compare VAR_FACING, DIR_WEST
-	call_if eq, EventScript_169985
+	call_if_eq EventScript_169985
 	applymovement 4, Movement_FacePlayer
 	waitmovement 0
 	closemessage
@@ -971,9 +966,8 @@ EventScript_1699CE:: @ 81699CE
 	call EventScript_1A737B
 	closemessage
 	compare VAR_0x8009, 60
-	goto_if lt, EventScript_1699F9
-	checkflag FLAG_WORLD_MAP_ONE_ISLAND
-	goto_if FALSE, EventScript_1699F9
+	goto_if_lt EventScript_1699F9
+	goto_if_unset FLAG_WORLD_MAP_ONE_ISLAND, EventScript_1699F9
 	delay 30
 	msgbox gUnknown_818EDF5
 	goto EventScript_169035
@@ -986,28 +980,25 @@ EventScript_1699F9:: @ 81699F9
 EventScript_1699FB:: @ 81699FB
 	special sub_8110AB4
 	compare VAR_RESULT, 2
-	goto_if eq, EventScript_1A7AE0
+	goto_if_eq EventScript_1A7AE0
 	special sub_8112364
-	checkflag FLAG_OAK_SKIP_22_RIVAL_CHECK
-	goto_if TRUE, EventScript_169A6E
-	checkflag FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL
-	goto_if TRUE, EventScript_169A78
+	goto_if_set FLAG_OAK_SKIP_22_RIVAL_CHECK, EventScript_169A6E
+	goto_if_set FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL, EventScript_169A78
 	checkitem ITEM_POKE_BALL, 1
 	compare VAR_RESULT, 0
-	goto_if eq, EventScript_169A34
+	goto_if_eq EventScript_169A34
 	goto EventScript_169A6E
 	end
 
 EventScript_169A34:: @ 8169A34
 	compare VAR_MAP_SCENE_ROUTE22, 2
-	goto_if ge, EventScript_169A45
+	goto_if_ge EventScript_169A45
 	goto EventScript_169A6E
 	end
 
 EventScript_169A45:: @ 8169A45
 	msgbox gUnknown_818E89C
-	additem ITEM_POKE_BALL, 5
-	giveitemfanfaremsg gUnknown_818E6B3, ITEM_POKE_BALL, 5
+	giveitem_msg gUnknown_818E6B3, ITEM_POKE_BALL, 5
 	setflag FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL
 	release
 	end
@@ -1154,9 +1145,9 @@ PalletTown_ProfessorOaksLab_EventScript_169BAB:: @ 8169BAB
 	setvar VAR_OAKSLAB_RIVAL_STARTER_SPECIES, SPECIES_CHARMANDER
 	setvar VAR_OAKSLAB_RIVAL_STARTER_OBJID, 7
 	compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3
-	goto_if ge, EventScript_169DE4
+	goto_if_ge EventScript_169DE4
 	compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2
-	goto_if eq, EventScript_169BE1
+	goto_if_eq EventScript_169BE1
 	msgbox gUnknown_818EA19
 	release
 	end
@@ -1167,35 +1158,35 @@ EventScript_169BE1:: @ 8169BE1
 	drawmonpic VAR_OAKSLAB_PLAYER_STARTER_SPECIES, 10, 3
 	textcolor 0
 	compare VAR_OAKSLAB_PLAYER_STARTER_NO, 0
-	goto_if eq, EventScript_OakDescribesBulbasaur
+	goto_if_eq EventScript_OakDescribesBulbasaur
 	compare VAR_OAKSLAB_PLAYER_STARTER_NO, 1
-	goto_if eq, EventScript_OakDescribesCharmander
+	goto_if_eq EventScript_OakDescribesCharmander
 	compare VAR_OAKSLAB_PLAYER_STARTER_NO, 2
-	goto_if eq, EventScript_OakDescribesSquirtle
+	goto_if_eq EventScript_OakDescribesSquirtle
 	end
 
 EventScript_OakDescribesBulbasaur:: @ 8169C14
 	msgbox gUnknown_818E272, MSGBOX_YESNO
 	compare VAR_RESULT, 1
-	goto_if eq, EventScript_ThisPokeIsRealyEnergetic
+	goto_if_eq EventScript_ThisPokeIsRealyEnergetic
 	compare VAR_RESULT, 0
-	goto_if eq, EventScript_DeclinedStarter
+	goto_if_eq EventScript_DeclinedStarter
 	end
 
 EventScript_OakDescribesCharmander:: @ 8169C33
 	msgbox gUnknown_818E207, MSGBOX_YESNO
 	compare VAR_RESULT, 1
-	goto_if eq, EventScript_ThisPokeIsRealyEnergetic
+	goto_if_eq EventScript_ThisPokeIsRealyEnergetic
 	compare VAR_RESULT, 0
-	goto_if eq, EventScript_DeclinedStarter
+	goto_if_eq EventScript_DeclinedStarter
 	end
 
 EventScript_OakDescribesSquirtle:: @ 8169C52
 	msgbox gUnknown_818E194, MSGBOX_YESNO
 	compare VAR_RESULT, 1
-	goto_if eq, EventScript_ThisPokeIsRealyEnergetic
+	goto_if_eq EventScript_ThisPokeIsRealyEnergetic
 	compare VAR_RESULT, 0
-	goto_if eq, EventScript_DeclinedStarter
+	goto_if_eq EventScript_DeclinedStarter
 	end
 
 EventScript_DeclinedStarter:: @ 8169C71
@@ -1210,7 +1201,7 @@ EventScript_ThisPokeIsRealyEnergetic:: @ 8169C74
 	call EventScript_1A6675
 	setflag FLAG_SYS_POKEMON_GET
 	setflag FLAG_PALLET_LADY_NOT_BLOCKING_SIGN
-	givemon VAR_OAKSLAB_PLAYER_STARTER_SPECIES, 5, ITEM_NONE, 0, 0, 0
+	givemon VAR_OAKSLAB_PLAYER_STARTER_SPECIES, 5, ITEM_NONE
 	copyvar VAR_STARTER_MON, VAR_OAKSLAB_PLAYER_STARTER_NO
 	getspeciesname 0, VAR_OAKSLAB_PLAYER_STARTER_SPECIES
 	message Text_18E30D
@@ -1219,9 +1210,9 @@ EventScript_ThisPokeIsRealyEnergetic:: @ 8169C74
 	waitfanfare
 	msgbox gUnknown_81A56A7, MSGBOX_YESNO
 	compare VAR_RESULT, 1
-	goto_if eq, EventScript_GiveNicknameToStarter
+	goto_if_eq EventScript_GiveNicknameToStarter
 	compare VAR_RESULT, 0
-	goto_if eq, EventScript_SkipGiveNicknameToStarter
+	goto_if_eq EventScript_SkipGiveNicknameToStarter
 	end
 
 EventScript_GiveNicknameToStarter:: @ 8169CCC
@@ -1233,11 +1224,11 @@ EventScript_GiveNicknameToStarter:: @ 8169CCC
 EventScript_SkipGiveNicknameToStarter:: @ 8169CDC
 	closemessage
 	compare VAR_OAKSLAB_PLAYER_STARTER_NO, 0
-	goto_if eq, EventScript_RivalWalksToCharmander
+	goto_if_eq EventScript_RivalWalksToCharmander
 	compare VAR_OAKSLAB_PLAYER_STARTER_NO, 1
-	goto_if eq, EventScript_RivalWalksToSquirtle
+	goto_if_eq EventScript_RivalWalksToSquirtle
 	compare VAR_OAKSLAB_PLAYER_STARTER_NO, 2
-	goto_if eq, EventScript_RivalWalksToBulbasaur
+	goto_if_eq EventScript_RivalWalksToBulbasaur
 	end
 
 EventScript_RivalWalksToCharmander:: @ 8169CFF
@@ -1269,8 +1260,7 @@ Movement_RivalTakesHisStarter:: @ 8169D2F
 	playfanfare MUS_FAN5
 	waitfanfare
 	setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3
-	checkflag FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN
-	call_if TRUE, EventScript_169D5C
+	call_if_set FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN, EventScript_169D5C
 	release
 	end
 
@@ -1314,9 +1304,9 @@ PalletTown_ProfessorOaksLab_EventScript_169D78:: @ 8169D78
 	setvar VAR_OAKSLAB_RIVAL_STARTER_SPECIES, SPECIES_BULBASAUR
 	setvar VAR_OAKSLAB_RIVAL_STARTER_OBJID, 5
 	compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3
-	goto_if ge, EventScript_169DE4
+	goto_if_ge EventScript_169DE4
 	compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2
-	goto_if eq, EventScript_169BE1
+	goto_if_eq EventScript_169BE1
 	msgbox gUnknown_818EA19
 	release
 	end
@@ -1329,9 +1319,9 @@ PalletTown_ProfessorOaksLab_EventScript_169DAE:: @ 8169DAE
 	setvar VAR_OAKSLAB_RIVAL_STARTER_SPECIES, SPECIES_SQUIRTLE
 	setvar VAR_OAKSLAB_RIVAL_STARTER_OBJID, 6
 	compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3
-	goto_if ge, EventScript_169DE4
+	goto_if_ge EventScript_169DE4
 	compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 2
-	goto_if eq, EventScript_169BE1
+	goto_if_eq EventScript_169BE1
 	msgbox gUnknown_818EA19
 	release
 	end
@@ -1344,8 +1334,7 @@ EventScript_169DE4:: @ 8169DE4
 PalletTown_ProfessorOaksLab_EventScript_169DEE:: @ 8169DEE
 	lock
 	faceplayer
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_if TRUE, EventScript_169E03
+	goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_169E03
 	msgbox gUnknown_818EBE6
 	release
 	end
@@ -1359,8 +1348,7 @@ EventScript_169E03:: @ 8169E03
 PalletTown_ProfessorOaksLab_EventScript_169E1A:: @ 8169E1A
 	lock
 	faceplayer
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_if TRUE, EventScript_169E2F
+	goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_169E2F
 	msgbox gUnknown_818EBE6
 	release
 	end
@@ -1394,7 +1382,7 @@ PalletTown_ProfessorOaksLab_EventScript_169E71:: @ 8169E71
 PalletTown_ProfessorOaksLab_EventScript_169E7A:: @ 8169E7A
 	lockall
 	compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6
-	goto_if ge, EventScript_169E90
+	goto_if_ge EventScript_169E90
 	msgbox gUnknown_818EA84
 	releaseall
 	end