1 files changed, 29 insertions, 47 deletions
diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc
index 83b258c7e..515754f8c 100644
--- a/data/maps/LilycoveCity/scripts.inc
+++ b/data/maps/LilycoveCity/scripts.inc
@@ -7,14 +7,12 @@ LilycoveCity_MapScript1_1E2B47: @ 81E2B47
 	setflag FLAG_VISITED_LILYCOVE_CITY
 	setvar VAR_0x4086, 0
 	setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER
-	checkflag FLAG_SYS_WEATHER_CTRL
-	call_if 1, LilycoveCity_EventScript_27207A
+	call_if_set FLAG_SYS_WEATHER_CTRL, LilycoveCity_EventScript_27207A
 	call LilycoveCity_EventScript_271ED7
 	end
 
 LilycoveCity_MapScript1_1E2B61: @ 81E2B61
-	checkflag FLAG_0x070
-	call_if 0, LilycoveCity_EventScript_1E2B6B
+	call_if_unset FLAG_0x070, LilycoveCity_EventScript_1E2B6B
 	end
 
 LilycoveCity_EventScript_1E2B6B:: @ 81E2B6B
@@ -36,14 +34,13 @@ LilycoveCity_EventScript_1E2BD8:: @ 81E2BD8
 	lock
 	faceplayer
 	dodailyevents
-	checkflag FLAG_0x92F
-	goto_eq LilycoveCity_EventScript_1E2C18
+	goto_if_set FLAG_0x92F, LilycoveCity_EventScript_1E2C18
 	msgbox LilycoveCity_Text_2A7244, MSGBOX_DEFAULT
 	random 10
 	addvar VAR_RESULT, 133
 	giveitem_std VAR_RESULT
 	compare VAR_RESULT, 0
-	goto_eq LilycoveCity_EventScript_272054
+	goto_if_eq LilycoveCity_EventScript_272054
 	setflag FLAG_0x92F
 	msgbox LilycoveCity_Text_2A72E3, MSGBOX_DEFAULT
 	release
@@ -61,8 +58,7 @@ LilycoveCity_EventScript_1E2C22:: @ 81E2C22
 LilycoveCity_EventScript_1E2C2B:: @ 81E2C2B
 	lock
 	faceplayer
-	checkflag FLAG_BADGE07_GET
-	goto_eq LilycoveCity_EventScript_1E2C40
+	goto_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_1E2C40
 	msgbox LilycoveCity_Text_1E3E3C, MSGBOX_DEFAULT
 	release
 	end
@@ -79,8 +75,7 @@ LilycoveCity_EventScript_1E2C4A:: @ 81E2C4A
 LilycoveCity_EventScript_1E2C53:: @ 81E2C53
 	lock
 	faceplayer
-	checkflag FLAG_0x070
-	goto_eq LilycoveCity_EventScript_1E2C68
+	goto_if_set FLAG_0x070, LilycoveCity_EventScript_1E2C68
 	msgbox LilycoveCity_Text_1E3FAB, MSGBOX_DEFAULT
 	release
 	end
@@ -93,8 +88,7 @@ LilycoveCity_EventScript_1E2C68:: @ 81E2C68
 LilycoveCity_EventScript_1E2C72:: @ 81E2C72
 	lock
 	faceplayer
-	checkflag FLAG_0x070
-	goto_eq LilycoveCity_EventScript_1E2C87
+	goto_if_set FLAG_0x070, LilycoveCity_EventScript_1E2C87
 	msgbox LilycoveCity_Text_1E40AD, MSGBOX_DEFAULT
 	release
 	end
@@ -119,8 +113,7 @@ LilycoveCity_EventScript_1E2CA3:: @ 81E2CA3
 LilycoveCity_EventScript_1E2CAC:: @ 81E2CAC
 	lock
 	faceplayer
-	checkflag FLAG_BADGE07_GET
-	goto_eq LilycoveCity_EventScript_1E2CC1
+	goto_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_1E2CC1
 	msgbox LilycoveCity_Text_1E42FC, MSGBOX_DEFAULT
 	release
 	end
@@ -178,8 +171,7 @@ LilycoveCity_EventScript_1E2D3A:: @ 81E2D3A
 
 LilycoveCity_EventScript_1E2D44:: @ 81E2D44
 	lockall
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_eq LilycoveCity_EventScript_1E2D58
+	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_1E2D58
 	msgbox LilycoveCity_Text_1E45A7, MSGBOX_DEFAULT
 	releaseall
 	end
@@ -203,8 +195,7 @@ LilycoveCity_EventScript_1E2D74:: @ 81E2D74
 
 LilycoveCity_EventScript_1E2D7D:: @ 81E2D7D
 	lockall
-	checkflag FLAG_0x0DA
-	goto_eq LilycoveCity_EventScript_1E2DB0
+	goto_if_set FLAG_0x0DA, LilycoveCity_EventScript_1E2DB0
 	msgbox LilycoveCity_Text_1E3D1F, MSGBOX_DEFAULT
 	applymovement VAR_LAST_TALKED, LilycoveCity_Movement_27259E
 	waitmovement 0
@@ -241,19 +232,17 @@ LilycoveCity_EventScript_1E2DDE:: @ 81E2DDE
 	faceplayer
 	checkplayergender
 	compare VAR_RESULT, 0
-	goto_eq LilycoveCity_EventScript_1E2DF8
+	goto_if_eq LilycoveCity_EventScript_1E2DF8
 	compare VAR_RESULT, 1
-	goto_eq LilycoveCity_EventScript_1E2E6B
+	goto_if_eq LilycoveCity_EventScript_1E2E6B
 	end
 
 LilycoveCity_EventScript_1E2DF8:: @ 81E2DF8
 	playbgm MUS_GIRL_SUP, 1
-	checkflag FLAG_0x11E
-	call_if 1, LilycoveCity_EventScript_1E2E48
-	checkflag FLAG_0x11E
-	call_if 0, LilycoveCity_EventScript_1E2E51
+	call_if_set FLAG_0x11E, LilycoveCity_EventScript_1E2E48
+	call_if_unset FLAG_0x11E, LilycoveCity_EventScript_1E2E51
 	compare VAR_RESULT, 0
-	goto_eq LilycoveCity_EventScript_1E2E5A
+	goto_if_eq LilycoveCity_EventScript_1E2E5A
 	msgbox LilycoveCity_Text_1E3234, MSGBOX_DEFAULT
 	switch VAR_STARTER_MON
 	case 0, LilycoveCity_EventScript_1E2EDE
@@ -279,12 +268,10 @@ LilycoveCity_EventScript_1E2E5A:: @ 81E2E5A
 
 LilycoveCity_EventScript_1E2E6B:: @ 81E2E6B
 	playbgm MUS_BOY_SUP, 1
-	checkflag FLAG_0x11E
-	call_if 1, LilycoveCity_EventScript_1E2EBB
-	checkflag FLAG_0x11E
-	call_if 0, LilycoveCity_EventScript_1E2EC4
+	call_if_set FLAG_0x11E, LilycoveCity_EventScript_1E2EBB
+	call_if_unset FLAG_0x11E, LilycoveCity_EventScript_1E2EC4
 	compare VAR_RESULT, 0
-	goto_eq LilycoveCity_EventScript_1E2ECD
+	goto_if_eq LilycoveCity_EventScript_1E2ECD
 	msgbox LilycoveCity_Text_1E373C, MSGBOX_DEFAULT
 	switch VAR_STARTER_MON
 	case 0, LilycoveCity_EventScript_1E2F0E
@@ -341,20 +328,18 @@ LilycoveCity_EventScript_1E2F2E:: @ 81E2F2E
 LilycoveCity_EventScript_1E2F3E:: @ 81E2F3E
 	msgbox LilycoveCity_Text_1E32FB, MSGBOX_DEFAULT
 	setvar VAR_RESULT, 0
-	checkflag FLAG_BADGE06_GET
-	call_if 1, LilycoveCity_EventScript_1E2F76
+	call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_1E2F76
 	compare VAR_RESULT, 0
-	call_if 1, LilycoveCity_EventScript_1E2F86
+	call_if_eq LilycoveCity_EventScript_1E2F86
 	compare VAR_RESULT, 1
-	call_if 1, LilycoveCity_EventScript_1E2F8F
+	call_if_eq LilycoveCity_EventScript_1E2F8F
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_PICHU_DOLL
 	goto LilycoveCity_EventScript_1E3006
 	end
 
 LilycoveCity_EventScript_1E2F76:: @ 81E2F76
-	checkflag FLAG_BADGE08_GET
-	goto_eq LilycoveCity_EventScript_1E2F80
+	goto_if_set FLAG_BADGE08_GET, LilycoveCity_EventScript_1E2F80
 	return
 
 LilycoveCity_EventScript_1E2F80:: @ 81E2F80
@@ -366,8 +351,7 @@ LilycoveCity_EventScript_1E2F86:: @ 81E2F86
 	return
 
 LilycoveCity_EventScript_1E2F8F:: @ 81E2F8F
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_eq LilycoveCity_EventScript_1E2FA1
+	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_1E2FA1
 	msgbox LilycoveCity_Text_1E346D, MSGBOX_DEFAULT
 	return
 
@@ -378,12 +362,11 @@ LilycoveCity_EventScript_1E2FA1:: @ 81E2FA1
 LilycoveCity_EventScript_1E2FAA:: @ 81E2FAA
 	msgbox LilycoveCity_Text_1E37D7, MSGBOX_DEFAULT
 	setvar VAR_RESULT, 0
-	checkflag FLAG_BADGE06_GET
-	call_if 1, LilycoveCity_EventScript_1E2F76
+	call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_1E2F76
 	compare VAR_RESULT, 0
-	call_if 1, LilycoveCity_EventScript_1E2FE2
+	call_if_eq LilycoveCity_EventScript_1E2FE2
 	compare VAR_RESULT, 1
-	call_if 1, LilycoveCity_EventScript_1E2FEB
+	call_if_eq LilycoveCity_EventScript_1E2FEB
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL
 	goto LilycoveCity_EventScript_1E3006
@@ -394,8 +377,7 @@ LilycoveCity_EventScript_1E2FE2:: @ 81E2FE2
 	return
 
 LilycoveCity_EventScript_1E2FEB:: @ 81E2FEB
-	checkflag FLAG_SYS_GAME_CLEAR
-	goto_eq LilycoveCity_EventScript_1E2FFD
+	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_1E2FFD
 	msgbox LilycoveCity_Text_1E390C, MSGBOX_DEFAULT
 	return
 
@@ -424,9 +406,9 @@ LilycoveCity_EventScript_1E302D:: @ 81E302D
 	faceplayer
 	msgbox LilycoveCity_Text_1E4774, MSGBOX_YESNO
 	compare VAR_RESULT, 1
-	call_if 1, LilycoveCity_EventScript_1E304F
+	call_if_eq LilycoveCity_EventScript_1E304F
 	compare VAR_RESULT, 0
-	call_if 1, LilycoveCity_EventScript_1E3058
+	call_if_eq LilycoveCity_EventScript_1E3058
 	release
 	end