Finish off labelling flags

7 files changed, 26 insertions, 26 deletions

diff --git a/data/scripts/apprentice.inc b/data/scripts/apprentice.inc
index 034732db2..ac4bd1979 100644
--- a/data/scripts/apprentice.inc
+++ b/data/scripts/apprentice.inc
@@ -33,7 +33,7 @@ EventScript_Apprentice:: @ 82B688D
 	special CallApprenticeFunction
 	compare VAR_0x8004, 0
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B68BE
-	goto_if_set FLAG_0x934, Script_Apprentice_ReleaseAndEnd
+	goto_if_set FLAG_DAILY_APPRENTICE_LEAVES, Script_Apprentice_ReleaseAndEnd
 
 BattleFrontier_BattleTowerLobby_EventScript_2B68BE:
 	setvar VAR_0x8004, 11
@@ -289,7 +289,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6DD4:
 
 Script_Apprentice_SetLeavingFlags:
 	setflag FLAG_HIDE_APPRENTICE
-	setflag FLAG_0x934
+	setflag FLAG_DAILY_APPRENTICE_LEAVES
 	return
 
 Script_Apprentice_LeaveGoRight:
diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc
index 927d61439..f85ebd3d2 100644
--- a/data/scripts/contest_hall.inc
+++ b/data/scripts/contest_hall.inc
@@ -3,8 +3,8 @@ LilycoveCity_ContestLobby_EventScript_279CC5:: @ 8279CC5
 	faceplayer
 	compare VAR_0x408A, 0
 	goto_if_ne LilycoveCity_ContestLobby_EventScript_279D13
-	call_if_set FLAG_0x05F, LilycoveCity_ContestLobby_EventScript_279CEA
-	call_if_unset FLAG_0x05F, LilycoveCity_ContestLobby_EventScript_279CF3
+	call_if_set FLAG_RECEIVED_POKEBLOCK_CASE, LilycoveCity_ContestLobby_EventScript_279CEA
+	call_if_unset FLAG_RECEIVED_POKEBLOCK_CASE, LilycoveCity_ContestLobby_EventScript_279CF3
 	goto LilycoveCity_ContestLobby_EventScript_279D5A
 	end
 
@@ -15,7 +15,7 @@ LilycoveCity_ContestLobby_EventScript_279CEA:: @ 8279CEA
 LilycoveCity_ContestLobby_EventScript_279CF3:: @ 8279CF3
 	msgbox LilycoveCity_ContestLobby_Text_27ADA7, MSGBOX_DEFAULT
 	giveitem_std ITEM_POKEBLOCK_CASE
-	setflag FLAG_0x05F
+	setflag FLAG_RECEIVED_POKEBLOCK_CASE
 	msgbox LilycoveCity_ContestLobby_Text_27AE47, MSGBOX_DEFAULT
 	return
 
@@ -1131,7 +1131,7 @@ LinkContestRoom1_EventScript_27ABCD:: @ 827ABCD
 	return
 
 LinkContestRoom1_EventScript_27ABCE:: @ 827ABCE
-	setflag FLAG_0x10E
+	setflag FLAG_CONTEST_SKETCH_CREATED
 	return
 
 LinkContestRoom1_EventScript_27ABD2:: @ 827ABD2
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index f9c6cf24e..a198b0774 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -59,12 +59,12 @@ LittlerootTown_MaysHouse_2F_EventScript_29278D:: @ 829278D
 
 LittlerootTown_BrendansHouse_2F_EventScript_292799:: @ 8292799
 LittlerootTown_MaysHouse_2F_EventScript_292799:: @ 8292799
-	goto_if_set FLAG_0x051, LittlerootTown_BrendansHouse_2F_EventScript_29283F
+	goto_if_set FLAG_SET_WALL_CLOCK, LittlerootTown_BrendansHouse_2F_EventScript_29283F
 	msgbox LittlerootTown_BrendansHouse_2F_Text_1F8668, MSGBOX_DEFAULT
 	call LittlerootTown_BrendansHouse_2F_EventScript_292849
 	delay 30
 	setvar VAR_0x4092, 6
-	setflag FLAG_0x051
+	setflag FLAG_SET_WALL_CLOCK
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2
 	checkplayergender
@@ -318,7 +318,7 @@ LittlerootTown_MaysHouse_1F_EventScript_2929C5:: @ 82929C5
 	compare VAR_0x408C, 4
 	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292A0F
 	goto_if_set FLAG_HAS_MATCH_CALL, LittlerootTown_BrendansHouse_1F_EventScript_292A19
-	goto_if_set FLAG_0x052, LittlerootTown_BrendansHouse_1F_EventScript_292A86
+	goto_if_set FLAG_RESCUED_BIRCH, LittlerootTown_BrendansHouse_1F_EventScript_292A86
 	compare VAR_TEMP_1, 1
 	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292A94
 	compare VAR_0x4092, 7
@@ -333,7 +333,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_292A0F:: @ 8292A0F
 	end
 
 LittlerootTown_BrendansHouse_1F_EventScript_292A19:: @ 8292A19
-	goto_if_set FLAG_0x0D8, LittlerootTown_BrendansHouse_1F_EventScript_292A43
+	goto_if_set FLAG_ENABLE_MOM_MATCH_CALL, LittlerootTown_BrendansHouse_1F_EventScript_292A43
 	msgbox LittlerootTown_BrendansHouse_1F_Text_1F7E0E, MSGBOX_DEFAULT
 	closemessage
 	delay 30
@@ -342,7 +342,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_292A19:: @ 8292A19
 	waitfanfare
 	closemessage
 	delay 30
-	setflag FLAG_0x0D8
+	setflag FLAG_ENABLE_MOM_MATCH_CALL
 	release
 	end
 
@@ -351,13 +351,13 @@ LittlerootTown_BrendansHouse_1F_EventScript_292A43:: @ 8292A43
 	goto LittlerootTown_BrendansHouse_1F_EventScript_292A86
 
 LittlerootTown_BrendansHouse_1F_EventScript_292A51:: @ 8292A51
-	goto_if_set FLAG_0x085, LittlerootTown_BrendansHouse_1F_EventScript_292A86
+	goto_if_set FLAG_MOM_SAYS_GOODBYE, LittlerootTown_BrendansHouse_1F_EventScript_292A86
 	msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D73, MSGBOX_DEFAULT
 	giveitem_std ITEM_AMULET_COIN
 	compare VAR_RESULT, 0
 	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_272054
 	msgbox LittlerootTown_BrendansHouse_1F_Text_1F7DBE, MSGBOX_DEFAULT
-	setflag FLAG_0x085
+	setflag FLAG_MOM_SAYS_GOODBYE
 	release
 	end
 
@@ -475,7 +475,7 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2
 	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292CEF
 	playse SE_DOOR
 	removeobject VAR_0x8009
-	setflag FLAG_0x123
+	setflag FLAG_RECEIVED_SS_TICKET
 	delay 30
 	compare VAR_0x8008, 0
 	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D48
@@ -484,7 +484,7 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2
 	delay 20
 	msgbox LittlerootTown_BrendansHouse_1F_Text_1F81B9, MSGBOX_DEFAULT
 	closemessage
-	setflag FLAG_SYS_TV_LATI
+	setflag FLAG_SYS_TV_LATIAS_LATIOS
 	special TurnOnTVScreen
 	delay 60
 	compare VAR_0x8008, 0
@@ -499,8 +499,8 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2
 	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D33
 	msgbox LittlerootTown_BrendansHouse_1F_Text_1F826F, MSGBOX_DEFAULT
 	closemessage
-	clearflag FLAG_SYS_TV_LATI
-	setflag FLAG_0x0FF
+	clearflag FLAG_SYS_TV_LATIAS_LATIOS
+	setflag FLAG_LATIOS_OR_LATIAS_ROAMING
 	special TurnOffTVScreen
 	compare VAR_0x8008, 0
 	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D88
@@ -519,7 +519,7 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2
 	end
 
 LittlerootTown_BrendansHouse_1F_EventScript_292C72:: @ 8292C72
-	setflag FLAG_SYS_TV_LATI
+	setflag FLAG_SYS_TV_LATIAS_LATIOS
 	return
 
 LittlerootTown_BrendansHouse_1F_EventScript_292C76:: @ 8292C76
diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc
index 834fc38a2..63e828703 100644
--- a/data/scripts/pokeblocks.inc
+++ b/data/scripts/pokeblocks.inc
@@ -265,7 +265,7 @@ EventScript_Pblock1_No: @ 8293C70
 EventScript_Pblock1_NoBerries: @ 8293C7A
 	msgbox Text_Pblock1_NoBerries, MSGBOX_DEFAULT
 	dodailyevents
-	goto_if_set FLAG_0x921, LilycoveCity_ContestLobby_EventScript_293C92
+	goto_if_set FLAG_DAILY_CONTEST_LOBBY_RECIEVED_BERRY, LilycoveCity_ContestLobby_EventScript_293C92
 	goto LilycoveCity_ContestLobby_EventScript_293C9C
 	end
 
@@ -277,7 +277,7 @@ LilycoveCity_ContestLobby_EventScript_293C92: @ 8293C92
 LilycoveCity_ContestLobby_EventScript_293C9C: @ 8293C9C
 	msgbox LilycoveCity_ContestLobby_Text_292FD1, MSGBOX_DEFAULT
 	giveitem_std ITEM_PECHA_BERRY
-	setflag FLAG_0x921
+	setflag FLAG_DAILY_CONTEST_LOBBY_RECIEVED_BERRY
 	goto EventScript_Pblock1_KnowHow
 	end
 
@@ -552,7 +552,7 @@ LilycoveCity_ContestLobby_EventScript_293FF8: @ 8293FF8
 	compare VAR_RESULT, 65535
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_294028
 	dodailyevents
-	goto_if_set FLAG_0x921, LilycoveCity_ContestLobby_EventScript_294028
+	goto_if_set FLAG_DAILY_CONTEST_LOBBY_RECIEVED_BERRY, LilycoveCity_ContestLobby_EventScript_294028
 	goto LilycoveCity_ContestLobby_EventScript_294032
 	end
 
@@ -564,7 +564,7 @@ LilycoveCity_ContestLobby_EventScript_294028: @ 8294028
 LilycoveCity_ContestLobby_EventScript_294032: @ 8294032
 	msgbox LilycoveCity_ContestLobby_Text_293AF0, MSGBOX_DEFAULT
 	giveitem_std ITEM_PECHA_BERRY
-	setflag FLAG_0x921
+	setflag FLAG_DAILY_CONTEST_LOBBY_RECIEVED_BERRY
 	msgbox LilycoveCity_ContestLobby_Text_293B76, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc
index ff5e53a06..db8aece85 100644
--- a/data/scripts/secret_base.inc
+++ b/data/scripts/secret_base.inc
@@ -455,7 +455,7 @@ SecretBase_RedCave1_EventScript_275B81:: @ 8275B81
 
 SecretBase_RedCave1_EventScript_275BAB:: @ 8275BAB
 	closemessage
-	setflag FLAG_0x060
+	setflag FLAG_RECEIVED_SECRET_POWER
 	special sub_80E91F8
 	waitstate
 	end
diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc
index 072d154f0..ed7216357 100644
--- a/data/scripts/secret_power_tm.inc
+++ b/data/scripts/secret_power_tm.inc
@@ -49,7 +49,7 @@ Route111_EventScript_27661E:: @ 827661E
 	goto_if_eq Route111_EventScript_276680
 	msgbox Route111_Text_27636E, MSGBOX_DEFAULT
 	closemessage
-	setflag FLAG_0x060
+	setflag FLAG_RECEIVED_SECRET_POWER
 	clearflag FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN
 	compare VAR_FACING, 3
 	call_if_eq Route111_EventScript_27666A
diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc
index 0b1224503..acc75f76a 100644
--- a/data/scripts/tv.inc
+++ b/data/scripts/tv.inc
@@ -43,8 +43,8 @@ EventScript_27EE9A:: @ 827EE9A
 EventScript_27EEA4:: @ 827EEA4
 	msgbox LittlerootTown_BrendansHouse_1F_Text_1F826F, MSGBOX_DEFAULT
 	special InitRoamer
-	clearflag FLAG_SYS_TV_LATI
-	setflag FLAG_0x0FF
+	clearflag FLAG_SYS_TV_LATIAS_LATIOS
+	setflag FLAG_LATIOS_OR_LATIAS_ROAMING
 	special TurnOffTVScreen
 	releaseall
 	end