Merge branch 'master' into decompile_data

author: scnorton <scnorton@biociphers.org> 2017-12-18 15:00:57 -0500
committer: scnorton <scnorton@biociphers.org> 2017-12-18 15:00:57 -0500
commit: 89c0d40ee6c7fa2ad9f7f44e3a51ea50264e9280 (patch)
tree: f5387471637b5e9e62fa5b6a0614a935b2921118 /data/scripts
parent: 408f3cf295e76b61f2c1a442c80d1036bbaa9d28 (diff)
parent: 3c5f725de49371aced1788a21f5e53df5b498b5f (diff)
187 files changed, 1072 insertions, 1072 deletions
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index 279fa0451..60ce36e43 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -174,7 +174,7 @@ RustboroCity_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6
 SlateportCity_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6
 SootopolisCity_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6
 VerdanturfTown_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6
-	checkflag 2049
+	checkflag FLAG_SYS_POKEDEX_GET
 	goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A4342
 	copyvar 0x8007, LAST_TALKED
 	lock
@@ -346,7 +346,7 @@ RustboroCity_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC
 SlateportCity_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC
 SootopolisCity_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC
 VerdanturfTown_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC
-	checkflag 2049
+	checkflag FLAG_SYS_POKEDEX_GET
 	goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A4339
 	copyvar 0x8007, LAST_TALKED
 	lock
@@ -443,7 +443,7 @@ RustboroCity_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB
 SlateportCity_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB
 SootopolisCity_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB
 VerdanturfTown_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB
-	checkflag 2072
+	checkflag FLAG_VISITED_MAUVILLE_CITY
 	goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A434B
 	copyvar 0x8007, LAST_TALKED
 	lock
diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc
index 1b5c29fee..bc87b9a4e 100644
--- a/data/scripts/contest_hall.inc
+++ b/data/scripts/contest_hall.inc
@@ -9,19 +9,19 @@ VerdanturfTown_ContestLobby_EventScript_1A4E92:: @ 81A4E92
 	call_if 1, FallarborTown_ContestLobby_EventScript_1A4EDD
 	compare 0x408a, 0
 	goto_if 5, FallarborTown_ContestLobby_EventScript_1A4F4E
-	checkflag 1
+	checkflag FLAG_TEMP_1
 	goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F8F
 	getstdstring 0, 0x800b
 	msgbox FallarborTown_ContestLobby_Text_1A5DFC, 4
 	checkitem ITEM_CONTEST_PASS, 1
 	compare RESULT, 0
 	goto_if_eq FallarborTown_ContestLobby_EventScript_1A4EE1
-	setflag 1
+	setflag FLAG_TEMP_1
 	goto FallarborTown_ContestLobby_EventScript_1A4F8F
 	end
 
 FallarborTown_ContestLobby_EventScript_1A4EDD:: @ 81A4EDD
-	clearflag 1
+	clearflag FLAG_TEMP_1
 	return
 
 FallarborTown_ContestLobby_EventScript_1A4EE1:: @ 81A4EE1
@@ -40,12 +40,12 @@ FallarborTown_ContestLobby_EventScript_1A4EF6:: @ 81A4EF6
 	end
 
 FallarborTown_ContestLobby_EventScript_1A4F13:: @ 81A4F13
-	checkflag 150
+	checkflag FLAG_RECEIVED_CONTEST_PASS
 	goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F44
 	msgbox FallarborTown_ContestLobby_Text_1A6583, 4
 	giveitem ITEM_CONTEST_PASS
-	setflag 150
-	setflag 1
+	setflag FLAG_RECEIVED_CONTEST_PASS
+	setflag FLAG_TEMP_1
 	msgbox FallarborTown_ContestLobby_Text_1A5E98, 4
 	goto FallarborTown_ContestLobby_EventScript_1A4F8F
 	end
@@ -996,7 +996,7 @@ LinkContestRoom1_EventScript_1A5BAB:: @ 81A5BAB
 	compare 0x4088, 5
 	goto_if_eq LinkContestRoom1_EventScript_1A5C4C
 	call LinkContestRoom1_EventScript_1A5C12
-	checkflag 2
+	checkflag FLAG_TEMP_2
 	goto_if_eq LinkContestRoom1_EventScript_1A5BF6
 	msgbox LinkContestRoom1_Text_1A6DC5, 3
 	waitmessage
@@ -1035,14 +1035,14 @@ LinkContestRoom1_EventScript_1A5C23:: @ 81A5C23
 LinkContestRoom1_EventScript_1A5C32:: @ 81A5C32
 	compare CONTEST_RANK, 3
 	goto_if_eq LinkContestRoom1_EventScript_1A5C41
-	setflag 2
+	setflag FLAG_TEMP_2
 	return
 
 LinkContestRoom1_EventScript_1A5C41:: @ 81A5C41
 	return
 
 LinkContestRoom1_EventScript_1A5C42:: @ 81A5C42
-	setflag 270
+	setflag FLAG_CONTEST_SKETCH_CREATED
 	return
 
 LinkContestRoom1_EventScript_1A5C46:: @ 81A5C46
@@ -1143,7 +1143,7 @@ LinkContestRoom1_EventScript_1A5D3B:: @ 81A5D3B
 LinkContestRoom1_EventScript_1A5D5B:: @ 81A5D5B
 	special sub_80C44C0
 	incrementgamestat GAME_STAT_RECEIVED_RIBBONS
-	setflag 2107
+	setflag FLAG_SYS_RIBBON_GET
 	lockall
 	msgbox LinkContestRoom1_Text_1A6D6A, 4
 	playfanfare 370
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc
index 22d99f2a4..a09e47810 100644
--- a/data/scripts/day_care.inc
+++ b/data/scripts/day_care.inc
@@ -21,7 +21,7 @@ Route117_EventScript_1B2262:: @ 81B2262
 	compare RESULT, 1
 	goto_if_eq Route117_EventScript_1B2298
 	msgbox Route117_Text_1B2745, 4
-	clearflag 134
+	clearflag FLAG_PENDING_DAYCARE_EGG
 	special RejectEggFromDayCare
 	release
 	end
@@ -42,7 +42,7 @@ Route117_EventScript_1B22B2:: @ 81B22B2
 	waitbutton
 	msgbox Route117_Text_1B27CD, 4
 	special GiveEggFromDaycare
-	clearflag 134
+	clearflag FLAG_PENDING_DAYCARE_EGG
 	release
 	end
 
diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc
index 214c61142..a3d79d09e 100644
--- a/data/scripts/gabby_and_ty.inc
+++ b/data/scripts/gabby_and_ty.inc
@@ -60,67 +60,67 @@ Route111_EventScript_1AE3D7:: @ 81AE3D7
 	return
 
 Route111_EventScript_1AE3E2:: @ 81AE3E2
-	setflag 796
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_1
 	return
 
 Route111_EventScript_1AE3E6:: @ 81AE3E6
-	clearflag 796
+	clearflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_1
 	return
 
 Route111_EventScript_1AE3EA:: @ 81AE3EA
-	setflag 797
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_1
 	return
 
 Route111_EventScript_1AE3EE:: @ 81AE3EE
-	clearflag 797
+	clearflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_1
 	return
 
 Route111_EventScript_1AE3F2:: @ 81AE3F2
-	setflag 798
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE120_1
 	return
 
 Route111_EventScript_1AE3F6:: @ 81AE3F6
-	clearflag 798
+	clearflag FLAG_HIDE_GABBY_AND_TY_ROUTE120_1
 	return
 
 Route111_EventScript_1AE3FA:: @ 81AE3FA
-	setflag 799
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_2
 	return
 
 Route111_EventScript_1AE3FE:: @ 81AE3FE
-	clearflag 799
+	clearflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_2
 	return
 
 Route111_EventScript_1AE402:: @ 81AE402
-	setflag 901
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_2
 	return
 
 Route111_EventScript_1AE406:: @ 81AE406
-	clearflag 901
+	clearflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_2
 	return
 
 Route111_EventScript_1AE40A:: @ 81AE40A
-	setflag 902
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE120_2
 	return
 
 Route111_EventScript_1AE40E:: @ 81AE40E
-	clearflag 902
+	clearflag FLAG_HIDE_GABBY_AND_TY_ROUTE120_2
 	return
 
 Route111_EventScript_1AE412:: @ 81AE412
-	setflag 903
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_3
 	return
 
 Route111_EventScript_1AE416:: @ 81AE416
-	clearflag 903
+	clearflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_3
 	return
 
 Route111_EventScript_1AE41A:: @ 81AE41A
-	setflag 904
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_3
 	return
 
 Route111_EventScript_1AE41E:: @ 81AE41E
-	clearflag 904
+	clearflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_3
 	return
 
 Route111_EventScript_1AE422:: @ 81AE422
@@ -208,7 +208,7 @@ Route111_EventScript_1AE5A2:: @ 81AE5A2
 	call_if 1, Route111_EventScript_1AE5EB
 	compare FACING, 4
 	call_if 1, Route111_EventScript_1AE5FD
-	checkflag 1
+	checkflag FLAG_TEMP_1
 	goto_if_eq Route111_EventScript_1AE73A
 	msgbox Route111_Text_1AC015, 5
 	goto Route111_EventScript_1AE6F3
@@ -242,7 +242,7 @@ Route120_EventScript_1AE60F:: @ 81AE60F
 	call_if 1, Route111_EventScript_1AE5EB
 	compare FACING, 4
 	call_if 1, Route111_EventScript_1AE5FD
-	checkflag 1
+	checkflag FLAG_TEMP_1
 	goto_if_eq Route111_EventScript_1AE73A
 	specialvar RESULT, GabbyAndTyGetLastQuote
 	compare RESULT, 0
@@ -311,13 +311,13 @@ Route111_EventScript_1AE6F3:: @ 81AE6F3
 	goto_if_eq Route111_EventScript_1AE72D
 	msgbox Route111_Text_1AC487, 4
 	special sub_80BDC14
-	setflag 1
+	setflag FLAG_TEMP_1
 	release
 	end
 
 Route111_EventScript_1AE72D:: @ 81AE72D
 	msgbox Route111_Text_1AC553, 4
-	setflag 1
+	setflag FLAG_TEMP_1
 	release
 	end
 
diff --git a/data/scripts/magma_chimney.inc b/data/scripts/magma_chimney.inc
index f13b319f4..d104b52d4 100644
--- a/data/scripts/magma_chimney.inc
+++ b/data/scripts/magma_chimney.inc
@@ -1,14 +1,14 @@
 MtChimney_EventScript_1B2C95:: @ 81B2C95
 	lock
 	faceplayer
-	checkflag 219
+	checkflag FLAG_EVIL_LEADER_PLEASE_STOP
 	call_if 0, MtChimney_EventScript_1B2CB9
-	checkflag 219
+	checkflag FLAG_EVIL_LEADER_PLEASE_STOP
 	call_if 1, MtChimney_EventScript_1B2CC2
 	closemessage
 	applymovement 1, MtChimney_Movement_1A083D
 	waitmovement 0
-	setflag 219
+	setflag FLAG_EVIL_LEADER_PLEASE_STOP
 	release
 	end
 
@@ -63,7 +63,7 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB
 	removeobject 2
 	removeobject 3
 	removeobject 22
-	setflag 926
+	setflag FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY
 	fadescreen 0
 	setobjectxyperm 1, 10, 12
 	addobject 1
@@ -84,10 +84,10 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB
 	compare FACING, 2
 	call_if 1, MtChimney_EventScript_1B2D9E
 	removeobject 1
-	setflag 927
-	setflag 139
-	clearflag 928
-	setflag 942
+	setflag FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY
+	setflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY
+	clearflag FLAG_HIDE_PROF_COSMO_FALLARBOR
+	setflag FLAG_HIDE_PROF_COSMO_METEOR_FALLS
 	releaseall
 	end
 
diff --git a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc b/data/scripts/maps/AbandonedShip_CaptainsOffice.inc
index eb912028a..2430ba4af 100644
--- a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc
+++ b/data/scripts/maps/AbandonedShip_CaptainsOffice.inc
@@ -4,12 +4,12 @@ AbandonedShip_CaptainsOffice_MapScripts:: @ 815EAF4
 AbandonedShip_CaptainsOffice_EventScript_15EAF5:: @ 815EAF5
 	lock
 	faceplayer
-	checkflag 294
+	checkflag FLAG_EXCHANGED_SCANNER
 	goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB2D
 	checkitem ITEM_SCANNER, 1
 	compare RESULT, 1
 	goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB23
-	checkflag 1078
+	checkflag FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2
 	goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB2D
 	msgbox AbandonedShip_CaptainsOffice_Text_198C85, 4
 	release
diff --git a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc
index de3ba5442..1bc38a099 100644
--- a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc
+++ b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc
@@ -8,9 +8,9 @@ AbandonedShip_Corridors_B1F_MapScript1_15E99A:: @ 815E99A
 	end
 
 AbandonedShip_Corridors_B1F_MapScript1_15E9A3:: @ 815E9A3
-	checkflag 239
+	checkflag FLAG_USED_STORAGE_KEY
 	call_if 0, AbandonedShip_Corridors_B1F_EventScript_15E9B6
-	checkflag 239
+	checkflag FLAG_USED_STORAGE_KEY
 	call_if 1, AbandonedShip_Corridors_B1F_EventScript_15E9C0
 	end
 
@@ -28,7 +28,7 @@ AbandonedShip_Corridors_B1F_EventScript_15E9CA:: @ 815E9CA
 
 AbandonedShip_Corridors_B1F_EventScript_15E9D3:: @ 815E9D3
 	lockall
-	checkflag 239
+	checkflag FLAG_USED_STORAGE_KEY
 	goto_if_eq AbandonedShip_Corridors_B1F_EventScript_15EA14
 	checkitem ITEM_STORAGE_KEY, 1
 	compare RESULT, 0
@@ -36,7 +36,7 @@ AbandonedShip_Corridors_B1F_EventScript_15E9D3:: @ 815E9D3
 	msgbox AbandonedShip_Corridors_B1F_Text_198692, 4
 	playse 21
 	removeitem ITEM_STORAGE_KEY, 1
-	setflag 239
+	setflag FLAG_USED_STORAGE_KEY
 	call AbandonedShip_Corridors_B1F_EventScript_15E9C0
 	special DrawWholeMapView
 	releaseall
diff --git a/data/scripts/maps/AbandonedShip_Deck.inc b/data/scripts/maps/AbandonedShip_Deck.inc
index 49f837744..68d872f01 100644
--- a/data/scripts/maps/AbandonedShip_Deck.inc
+++ b/data/scripts/maps/AbandonedShip_Deck.inc
@@ -3,5 +3,5 @@ AbandonedShip_Deck_MapScripts:: @ 815E95A
 	.byte 0
 
 AbandonedShip_Deck_MapScript1_15E960:: @ 815E960
-	setflag 2110
+	setflag FLAG_LANDMARK_ABANDONED_SHIP
 	end
diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc
index e6c143091..b09a6e5f1 100644
--- a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc
+++ b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc
@@ -8,21 +8,21 @@ AbandonedShip_HiddenFloorCorridors_MapScript1_15EB51:: @ 815EB51
 	end
 
 AbandonedShip_HiddenFloorCorridors_MapScript1_15EB5A:: @ 815EB5A
-	checkflag 240
+	checkflag FLAG_USED_ROOM_1_KEY
 	call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBCB
-	checkflag 241
+	checkflag FLAG_USED_ROOM_2_KEY
 	call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBD5
-	checkflag 242
+	checkflag FLAG_USED_ROOM_4_KEY
 	call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBDF
-	checkflag 243
+	checkflag FLAG_USED_ROOM_6_KEY
 	call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBE9
-	checkflag 240
+	checkflag FLAG_USED_ROOM_1_KEY
 	call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3
-	checkflag 241
+	checkflag FLAG_USED_ROOM_2_KEY
 	call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD
-	checkflag 242
+	checkflag FLAG_USED_ROOM_4_KEY
 	call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7
-	checkflag 243
+	checkflag FLAG_USED_ROOM_6_KEY
 	call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1
 	end
 
@@ -60,7 +60,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EBE9:: @ 815EBE9
 
 AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3
 	lockall
-	checkflag 240
+	checkflag FLAG_USED_ROOM_1_KEY
 	goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7
 	checkitem ITEM_ROOM_1_KEY, 1
 	compare RESULT, 0
@@ -68,7 +68,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3
 	msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4
 	playse 21
 	removeitem ITEM_ROOM_1_KEY, 1
-	setflag 240
+	setflag FLAG_USED_ROOM_1_KEY
 	call AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3
 	special DrawWholeMapView
 	releaseall
@@ -76,7 +76,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3
 
 AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A:: @ 815EC2A
 	lockall
-	checkflag 241
+	checkflag FLAG_USED_ROOM_2_KEY
 	goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7
 	checkitem ITEM_ROOM_2_KEY, 1
 	compare RESULT, 0
@@ -84,7 +84,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A:: @ 815EC2A
 	msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4
 	playse 21
 	removeitem ITEM_ROOM_2_KEY, 1
-	setflag 241
+	setflag FLAG_USED_ROOM_2_KEY
 	call AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD
 	special DrawWholeMapView
 	releaseall
@@ -92,7 +92,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A:: @ 815EC2A
 
 AbandonedShip_HiddenFloorCorridors_EventScript_15EC61:: @ 815EC61
 	lockall
-	checkflag 242
+	checkflag FLAG_USED_ROOM_4_KEY
 	goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7
 	checkitem ITEM_ROOM_4_KEY, 1
 	compare RESULT, 0
@@ -100,7 +100,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC61:: @ 815EC61
 	msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4
 	playse 21
 	removeitem ITEM_ROOM_4_KEY, 1
-	setflag 242
+	setflag FLAG_USED_ROOM_4_KEY
 	call AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7
 	special DrawWholeMapView
 	releaseall
@@ -108,7 +108,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC61:: @ 815EC61
 
 AbandonedShip_HiddenFloorCorridors_EventScript_15EC98:: @ 815EC98
 	lockall
-	checkflag 243
+	checkflag FLAG_USED_ROOM_6_KEY
 	goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7
 	checkitem ITEM_ROOM_6_KEY, 1
 	compare RESULT, 0
@@ -116,7 +116,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC98:: @ 815EC98
 	msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4
 	playse 21
 	removeitem ITEM_ROOM_6_KEY, 1
-	setflag 243
+	setflag FLAG_USED_ROOM_6_KEY
 	call AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1
 	special DrawWholeMapView
 	releaseall
diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc
index 188691e73..268563660 100644
--- a/data/scripts/maps/AncientTomb.inc
+++ b/data/scripts/maps/AncientTomb.inc
@@ -5,7 +5,7 @@ AncientTomb_MapScripts:: @ 815EFBE
 	.byte 0
 
 AncientTomb_MapScript1_15EFCE:: @ 815EFCE
-	checkflag 2145
+	checkflag FLAG_SYS_CTRL_OBJ_DELETE
 	call_if 1, AncientTomb_EventScript_15EFD8
 	end
 
@@ -14,11 +14,11 @@ AncientTomb_EventScript_15EFD8:: @ 815EFD8
 	return
 
 AncientTomb_MapScript1_15EFDC:: @ 815EFDC
-	setflag 2137
+	setflag FLAG_LANDMARK_ANCIENT_TOMB
 	end
 
 AncientTomb_MapScript1_15EFE0:: @ 815EFE0
-	checkflag 2130
+	checkflag FLAG_SYS_BRAILLE_FLY
 	call_if 0, AncientTomb_EventScript_15EFEA
 	end
 
@@ -33,7 +33,7 @@ AncientTomb_EventScript_15EFEA:: @ 815EFEA
 
 AncientTomb_EventScript_15F021:: @ 815F021
 	lockall
-	checkflag 2130
+	checkflag FLAG_SYS_BRAILLE_FLY
 	goto_if_eq AncientTomb_EventScript_15F038
 	braillemessage AncientTomb_Braille_1C552E
 	waitbutton
@@ -62,10 +62,10 @@ AncientTomb_EventScript_15F050:: @ 815F050
 	delay 40
 	waitpokecry
 	setwildbattle SPECIES_REGISTEEL, 40, ITEM_NONE
-	setflag 937
-	setflag 2145
+	setflag FLAG_HIDE_REGISTEEL
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	special ScrSpecial_StartRegiBattle
 	waitstate
-	clearflag 2145
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	release
 	end
diff --git a/data/scripts/maps/AquaHideout_1F.inc b/data/scripts/maps/AquaHideout_1F.inc
index 2eb2ae7e9..028a0ee7b 100644
--- a/data/scripts/maps/AquaHideout_1F.inc
+++ b/data/scripts/maps/AquaHideout_1F.inc
@@ -10,7 +10,7 @@ AquaHideout_1F_EventScript_15D7CE:: @ 815D7CE
 MagmaHideout_1F_EventScript_15D7CE:: @ 815D7CE
 	lock
 	faceplayer
-	checkflag 111
+	checkflag FLAG_MT_PYRE_ORB_STOLEN
 	goto_if_eq AquaHideout_1F_EventScript_15D7E3
 	msgbox AquaHideout_1F_Text_196AFD, 4
 	release
@@ -25,7 +25,7 @@ AquaHideout_1F_EventScript_15D7ED:: @ 815D7ED
 MagmaHideout_1F_EventScript_15D7ED:: @ 815D7ED
 	lock
 	faceplayer
-	checkflag 111
+	checkflag FLAG_MT_PYRE_ORB_STOLEN
 	goto_if_eq AquaHideout_1F_EventScript_15D802
 	msgbox AquaHideout_1F_Text_196C83, 4
 	release
diff --git a/data/scripts/maps/AquaHideout_B1F.inc b/data/scripts/maps/AquaHideout_B1F.inc
index 0001d7574..82d0c10c5 100644
--- a/data/scripts/maps/AquaHideout_B1F.inc
+++ b/data/scripts/maps/AquaHideout_B1F.inc
@@ -4,7 +4,7 @@ AquaHideout_B1F_MapScripts:: @ 815D831
 	.byte 0
 
 AquaHideout_B1F_MapScript1_15D83C:: @ 815D83C
-	checkflag 2145
+	checkflag FLAG_SYS_CTRL_OBJ_DELETE
 	call_if 1, AquaHideout_B1F_EventScript_15D846
 	end
 
diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/scripts/maps/AquaHideout_B2F.inc
index 230d0e2db..a587fcc92 100644
--- a/data/scripts/maps/AquaHideout_B2F.inc
+++ b/data/scripts/maps/AquaHideout_B2F.inc
@@ -64,8 +64,8 @@ AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD
 	applymovement 0x8008, AquaHideout_B2F_Movement_1A0839
 	waitmovement 0
 	msgbox AquaHideout_B2F_Text_1971AE, 4
-	setflag 112
-	setflag 852
+	setflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE
+	setflag FLAG_HIDE_GRUNTS_LILYCOVE
 	release
 	end
 
diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc
index 5a0e6105c..2186c8534 100644
--- a/data/scripts/maps/BattleTower_Lobby.inc
+++ b/data/scripts/maps/BattleTower_Lobby.inc
@@ -13,14 +13,14 @@ BattleTower_Lobby_MapScript1_160293:: @ 8160293
 BattleTower_Lobby_EventScript_16029C:: @ 816029C
 	setvar 0x8004, 10
 	special sub_8135668
-	checkflag 238
+	checkflag FLAG_RECEIVED_GOLD_SHIELD
 	goto_if_eq BattleTower_Lobby_EventScript_1602E4
-	checkflag 237
+	checkflag FLAG_RECEIVED_SILVER_SHIELD
 	goto_if_eq BattleTower_Lobby_EventScript_1602CD
 	specialvar 0x8007, sub_810F404
 	compare 0x8007, 50
 	goto_if 0, BattleTower_Lobby_EventScript_1602E4
-	clearflag 941
+	clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER
 	special sub_810F8FC
 	return
 
@@ -28,12 +28,12 @@ BattleTower_Lobby_EventScript_1602CD:: @ 81602CD
 	specialvar 0x8007, sub_810F404
 	compare 0x8007, 100
 	goto_if 0, BattleTower_Lobby_EventScript_1602E4
-	clearflag 941
+	clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER
 	special sub_810F8FC
 	return
 
 BattleTower_Lobby_EventScript_1602E4:: @ 81602E4
-	setflag 941
+	setflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER
 	return
 
 BattleTower_Lobby_MapScript1_1602E8:: @ 81602E8
@@ -387,16 +387,16 @@ BattleTower_Lobby_EventScript_160727:: @ 8160727
 BattleTower_Lobby_EventScript_160733:: @ 8160733
 	lock
 	faceplayer
-	checkflag 238
+	checkflag FLAG_RECEIVED_GOLD_SHIELD
 	goto_if_eq BattleTower_Lobby_EventScript_1607C5
-	checkflag 237
+	checkflag FLAG_RECEIVED_SILVER_SHIELD
 	goto_if_eq BattleTower_Lobby_EventScript_160773
 	msgbox BattleTower_Lobby_Text_19A9EE, 4
-	setvar 0x8008, 42
-	givedecoration 42
+	setvar 0x8008, DECOR_SILVER_SHIELD
+	givedecoration DECOR_SILVER_SHIELD
 	compare RESULT, 0
 	goto_if_eq BattleTower_Lobby_EventScript_1607AF
-	setflag 237
+	setflag FLAG_RECEIVED_SILVER_SHIELD
 	msgbox BattleTower_Lobby_Text_19ABAA, 4
 	release
 	end
@@ -406,11 +406,11 @@ BattleTower_Lobby_EventScript_160773:: @ 8160773
 	compare RESULT, 100
 	goto_if 0, BattleTower_Lobby_EventScript_1607C5
 	msgbox BattleTower_Lobby_Text_19AAC4, 4
-	setvar 0x8008, 43
-	givedecoration 43
+	setvar 0x8008, DECOR_GOLD_SHIELD
+	givedecoration DECOR_GOLD_SHIELD
 	compare RESULT, 0
 	goto_if_eq BattleTower_Lobby_EventScript_1607AF
-	setflag 238
+	setflag FLAG_RECEIVED_GOLD_SHIELD
 	msgbox BattleTower_Lobby_Text_19ABAA, 4
 	release
 	end
diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc
index a37310d16..1a254f7df 100644
--- a/data/scripts/maps/BattleTower_Outside.inc
+++ b/data/scripts/maps/BattleTower_Outside.inc
@@ -3,9 +3,9 @@ BattleTower_Outside_MapScripts:: @ 8160156
 	.byte 0
 
 BattleTower_Outside_MapScript1_16015C:: @ 816015C
-	setflag 2120
+	setflag FLAG_LANDMARK_BATTLE_TOWER
 	setvar 0x40bc, 0
-	setflag 918
+	setflag FLAG_HIDE_REPORTER_BATTLE_TOWER
 	end
 
 BattleTower_Outside_EventScript_160168:: @ 8160168
diff --git a/data/scripts/maps/CaveOfOrigin_1F.inc b/data/scripts/maps/CaveOfOrigin_1F.inc
index 3ad36cc18..6411aad49 100644
--- a/data/scripts/maps/CaveOfOrigin_1F.inc
+++ b/data/scripts/maps/CaveOfOrigin_1F.inc
@@ -3,6 +3,6 @@ CaveOfOrigin_1F_MapScripts:: @ 815DD6C
 	.byte 0
 
 CaveOfOrigin_1F_MapScript1_15DD72:: @ 815DD72
-	checkflag 113
+	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
 	call_if 1, CaveOfOrigin_1F_EventScript_1A04E3
 	end
diff --git a/data/scripts/maps/CaveOfOrigin_B1F.inc b/data/scripts/maps/CaveOfOrigin_B1F.inc
index c3bbdd45f..b8d4149b6 100644
--- a/data/scripts/maps/CaveOfOrigin_B1F.inc
+++ b/data/scripts/maps/CaveOfOrigin_B1F.inc
@@ -3,6 +3,6 @@ CaveOfOrigin_B1F_MapScripts:: @ 815DD7C
 	.byte 0
 
 CaveOfOrigin_B1F_MapScript1_15DD82:: @ 815DD82
-	checkflag 113
+	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
 	call_if 1, CaveOfOrigin_B1F_EventScript_1A04E3
 	end
diff --git a/data/scripts/maps/CaveOfOrigin_B2F.inc b/data/scripts/maps/CaveOfOrigin_B2F.inc
index fb65de171..9b014d0e9 100644
--- a/data/scripts/maps/CaveOfOrigin_B2F.inc
+++ b/data/scripts/maps/CaveOfOrigin_B2F.inc
@@ -3,6 +3,6 @@ CaveOfOrigin_B2F_MapScripts:: @ 815DD8C
 	.byte 0
 
 CaveOfOrigin_B2F_MapScript1_15DD92:: @ 815DD92
-	checkflag 113
+	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
 	call_if 1, CaveOfOrigin_B2F_EventScript_1A04E3
 	end
diff --git a/data/scripts/maps/CaveOfOrigin_B3F.inc b/data/scripts/maps/CaveOfOrigin_B3F.inc
index c21b04e91..d6f7bdaf1 100644
--- a/data/scripts/maps/CaveOfOrigin_B3F.inc
+++ b/data/scripts/maps/CaveOfOrigin_B3F.inc
@@ -3,6 +3,6 @@ CaveOfOrigin_B3F_MapScripts:: @ 815DD9C
 	.byte 0
 
 CaveOfOrigin_B3F_MapScript1_15DDA2:: @ 815DDA2
-	checkflag 113
+	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
 	call_if 1, CaveOfOrigin_B3F_EventScript_1A04E3
 	end
diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc
index c6c3cd45e..a2067fe60 100644
--- a/data/scripts/maps/CaveOfOrigin_B4F.inc
+++ b/data/scripts/maps/CaveOfOrigin_B4F.inc
@@ -4,7 +4,7 @@ CaveOfOrigin_B4F_MapScripts:: @ 815DDAC
 	.byte 0
 
 CaveOfOrigin_B4F_MapScript1_15DDB7:: @ 815DDB7
-	checkflag 2145
+	checkflag FLAG_SYS_CTRL_OBJ_DELETE
 	call_if 1, CaveOfOrigin_B4F_EventScript_15DDC1
 	end
 
@@ -19,7 +19,7 @@ CaveOfOrigin_B4F_MapScript1_15DDC5:: @ 815DDC5
 	setmaplayoutindex 313
 	.endif
 	call CaveOfOrigin_B4F_EventScript_1A01B5
-	checkflag 113
+	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
 	call_if 1, CaveOfOrigin_B4F_EventScript_1A04E3
 	end
 
@@ -61,23 +61,23 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7
 	playpokecry SPECIES_GROUDON_OR_KYOGRE, 2
 	delay 40
 	waitpokecry
-	setflag 2145
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	special ScrSpecial_StartGroudonKyogreBattle
 	waitstate
-	clearflag 2145
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	specialvar RESULT, sub_810E300
 	compare RESULT, 1
 	call_if 1, CaveOfOrigin_B4F_EventScript_15DE73
-	setflag 816
-	setflag 855
-	setflag 856
-	clearflag 815
+	setflag FLAG_HIDE_WALLACE_SOOTOPOLIS
+	setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1
+	setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2
+	clearflag FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM
 	setvar 0x409b, 1
-	setflag 113
-	clearflag 854
-	clearflag 2090
+	setflag FLAG_LEGENDARY_BATTLE_COMPLETED
+	clearflag FLAG_HIDE_SOOTOPOLIS_RESIDENTS
+	clearflag FLAG_SYS_WEATHER_CTRL
 	setvar 0x40b9, 2
-	clearflag 916
+	clearflag FLAG_HIDE_LEADER_MT_PYRE_SUMMIT
 	releaseall
 	end
 
diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc
index 9f6f7b388..c767dd7e7 100644
--- a/data/scripts/maps/DesertRuins.inc
+++ b/data/scripts/maps/DesertRuins.inc
@@ -5,7 +5,7 @@ DesertRuins_MapScripts:: @ 815CAF3
 	.byte 0
 
 DesertRuins_MapScript1_15CB03:: @ 815CB03
-	checkflag 2145
+	checkflag FLAG_SYS_CTRL_OBJ_DELETE
 	call_if 1, DesertRuins_EventScript_15CB0D
 	end
 
@@ -14,7 +14,7 @@ DesertRuins_EventScript_15CB0D:: @ 815CB0D
 	return
 
 DesertRuins_MapScript1_15CB11:: @ 815CB11
-	checkflag 2128
+	checkflag FLAG_SYS_BRAILLE_STRENGTH
 	call_if 0, DesertRuins_EventScript_15CB1B
 	end
 
@@ -28,12 +28,12 @@ DesertRuins_EventScript_15CB1B:: @ 815CB1B
 	return
 
 DesertRuins_MapScript1_15CB52:: @ 815CB52
-	setflag 2134
+	setflag FLAG_LANDMARK_DESERT_RUINS
 	end
 
 DesertRuins_EventScript_15CB56:: @ 815CB56
 	lockall
-	checkflag 2128
+	checkflag FLAG_SYS_BRAILLE_STRENGTH
 	goto_if_eq DesertRuins_EventScript_15CB6D
 	braillemessage DesertRuins_Braille_1C54C8
 	waitbutton
@@ -62,10 +62,10 @@ DesertRuins_EventScript_15CB85:: @ 815CB85
 	delay 40
 	waitpokecry
 	setwildbattle SPECIES_REGIROCK, 40, ITEM_NONE
-	setflag 935
-	setflag 2145
+	setflag FLAG_HIDE_REGIROCK
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	special ScrSpecial_StartRegiBattle
 	waitstate
-	clearflag 2145
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	release
 	end
diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc
index 7f8fe6fef..3d3240e81 100644
--- a/data/scripts/maps/DewfordTown.inc
+++ b/data/scripts/maps/DewfordTown.inc
@@ -3,13 +3,13 @@ DewfordTown_MapScripts:: @ 814DFF8
 	.byte 0
 
 DewfordTown_MapScript1_14DFFE:: @ 814DFFE
-	setflag 2065
+	setflag FLAG_VISITED_DEWFORD_TOWN
 	end
 
 DewfordTown_EventScript_14E002:: @ 814E002
 	lock
 	faceplayer
-	checkflag 189
+	checkflag FLAG_DELIVERED_STEVEN_LETTER
 	goto_if 0, DewfordTown_EventScript_14E076
 	message DewfordTown_Text_16B522
 	waitmessage
@@ -74,7 +74,7 @@ DewfordTown_EventScript_14E0BD:: @ 814E0BD
 DewfordTown_EventScript_14E0C6:: @ 814E0C6
 	lock
 	faceplayer
-	checkflag 257
+	checkflag FLAG_RECEIVED_OLD_ROD
 	goto_if_eq DewfordTown_EventScript_14E11B
 	msgbox DewfordTown_Text_16B665, 5
 	compare RESULT, 1
@@ -86,7 +86,7 @@ DewfordTown_EventScript_14E0C6:: @ 814E0C6
 DewfordTown_EventScript_14E0F0:: @ 814E0F0
 	msgbox DewfordTown_Text_16B6A8, 4
 	giveitem ITEM_OLD_ROD
-	setflag 257
+	setflag FLAG_RECEIVED_OLD_ROD
 	msgbox DewfordTown_Text_16B6F9, 4
 	release
 	end
@@ -135,10 +135,10 @@ DewfordTown_EventScript_14E151:: @ 814E151
 	applymovement 255, DewfordTown_Movement_14E405
 	waitmovement 0
 	showobject 255, 0, 19
-	clearflag 739
-	clearflag 881
-	clearflag 742
-	setflag 743
+	clearflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE
+	clearflag FLAG_HIDE_PEEKO_BRINEY_HOUSE
+	clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD
 	hideobject 4, 0, 11
 	setvar 0x408e, 2
 	resetobjectpriority 255, 0, 11
@@ -171,14 +171,14 @@ DewfordTown_EventScript_14E1D8:: @ 814E1D8
 	setobjectpriority 2, 0, 24, 0
 	applymovement 2, DewfordTown_Movement_14E410
 	waitmovement 0
-	clearflag 741
+	clearflag FLAG_HIDE_MR_BRINEY_ROUTE109
 	addobject 1
-	clearflag 744
-	setflag 743
+	clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD
 	hideobject 4, 0, 11
-	checkflag 149
+	checkflag FLAG_DELIVERED_DEVON_GOODS
 	call_if 0, DewfordTown_EventScript_14E281
-	checkflag 149
+	checkflag FLAG_DELIVERED_DEVON_GOODS
 	call_if 1, DewfordTown_EventScript_14E28A
 	closemessage
 	copyvar 0x4096, 0x8008
diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc
index 92776afb1..cbcb4d5eb 100644
--- a/data/scripts/maps/DewfordTown_Gym.inc
+++ b/data/scripts/maps/DewfordTown_Gym.inc
@@ -100,7 +100,7 @@ DewfordTown_Gym_EventScript_153151:: @ 8153151
 
 DewfordTown_Gym_EventScript_153152:: @ 8153152
 	trainerbattle 1, OPPONENT_BRAWLY, 0, DewfordTown_Gym_Text_175182, DewfordTown_Gym_Text_175246, DewfordTown_Gym_EventScript_153177
-	checkflag 166
+	checkflag FLAG_RECEIVED_TM08
 	goto_if 0, DewfordTown_Gym_EventScript_1531B5
 	msgbox DewfordTown_Gym_Text_175412, 4
 	release
@@ -112,8 +112,8 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177
 	waitmessage
 	call DewfordTown_Gym_EventScript_1A02C5
 	msgbox DewfordTown_Gym_Text_1752E6, 4
-	setflag 1204
-	setflag 2056
+	setflag FLAG_DEFEATED_DEWFORD_GYM
+	setflag FLAG_BADGE02_GET
 	addvar 0x4085, 1
 	compare 0x4085, 6
 	call_if 1, DewfordTown_Gym_EventScript_1A00FB
@@ -127,7 +127,7 @@ DewfordTown_Gym_EventScript_1531B5:: @ 81531B5
 	compare RESULT, 0
 	goto_if_eq DewfordTown_Gym_EventScript_1A029B
 	msgbox DewfordTown_Gym_Text_1753BF, 4
-	setflag 166
+	setflag FLAG_RECEIVED_TM08
 	release
 	end
 
@@ -164,7 +164,7 @@ DewfordTown_Gym_EventScript_153238:: @ 8153238
 DewfordTown_Gym_EventScript_15323F:: @ 815323F
 	lock
 	faceplayer
-	checkflag 1204
+	checkflag FLAG_DEFEATED_DEWFORD_GYM
 	goto_if_eq DewfordTown_Gym_EventScript_153254
 	msgbox DewfordTown_Gym_Text_174D98, 4
 	release
@@ -177,14 +177,14 @@ DewfordTown_Gym_EventScript_153254:: @ 8153254
 
 DewfordTown_Gym_EventScript_15325E:: @ 815325E
 	lockall
-	checkflag 2056
+	checkflag FLAG_BADGE02_GET
 	goto_if_eq DewfordTown_Gym_EventScript_15327E
 	goto DewfordTown_Gym_EventScript_153288
 	end
 
 DewfordTown_Gym_EventScript_15326E:: @ 815326E
 	lockall
-	checkflag 2056
+	checkflag FLAG_BADGE02_GET
 	goto_if_eq DewfordTown_Gym_EventScript_15327E
 	goto DewfordTown_Gym_EventScript_153288
 	end
diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc
index ea4016147..3c0565678 100644
--- a/data/scripts/maps/DewfordTown_Hall.inc
+++ b/data/scripts/maps/DewfordTown_Hall.inc
@@ -252,13 +252,13 @@ DewfordTown_Hall_EventScript_15359D:: @ 815359D
 	lock
 	faceplayer
 	call DewfordTown_Hall_EventScript_1A0102
-	checkflag 230
+	checkflag FLAG_RECEIVED_TM36
 	goto_if_eq DewfordTown_Hall_EventScript_1535D1
 	msgbox DewfordTown_Hall_Text_175E13, 4
 	giveitem ITEM_TM36
 	compare RESULT, 0
 	goto_if_eq DewfordTown_Hall_EventScript_1A029B
-	setflag 230
+	setflag FLAG_RECEIVED_TM36
 	release
 	end
 
diff --git a/data/scripts/maps/DewfordTown_House2.inc b/data/scripts/maps/DewfordTown_House2.inc
index befe47404..29ae58a22 100644
--- a/data/scripts/maps/DewfordTown_House2.inc
+++ b/data/scripts/maps/DewfordTown_House2.inc
@@ -4,13 +4,13 @@ DewfordTown_House2_MapScripts:: @ 81535DB
 DewfordTown_House2_EventScript_1535DC:: @ 81535DC
 	lock
 	faceplayer
-	checkflag 289
+	checkflag FLAG_RECEIVED_SILK_SCARF
 	goto_if_eq DewfordTown_House2_EventScript_153615
 	msgbox DewfordTown_House2_Text_175EFE, 4
 	giveitem ITEM_SILK_SCARF
 	compare RESULT, 0
 	goto_if_eq DewfordTown_House2_EventScript_15360B
-	setflag 289
+	setflag FLAG_RECEIVED_SILK_SCARF
 	release
 	end
 
diff --git a/data/scripts/maps/EverGrandeCity.inc b/data/scripts/maps/EverGrandeCity.inc
index c9768d006..b4fa64cae 100644
--- a/data/scripts/maps/EverGrandeCity.inc
+++ b/data/scripts/maps/EverGrandeCity.inc
@@ -3,7 +3,7 @@ EverGrandeCity_MapScripts:: @ 814D4D5
 	.byte 0
 
 EverGrandeCity_MapScript1_14D4DB:: @ 814D4DB
-	checkflag 2090
+	checkflag FLAG_SYS_WEATHER_CTRL
 	call_if 1, EverGrandeCity_EventScript_1A02C1
 	end
 
@@ -20,6 +20,6 @@ EverGrandeCity_EventScript_14D4F7:: @ 814D4F7
 	end
 
 EverGrandeCity_EventScript_14D500:: @ 814D500
-	setflag 2078
+	setflag FLAG_VISITED_EVER_GRANDE_CITY
 	setvar 0x4001, 1
 	end
diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc
index b13c930cf..ae3cbd4ad 100644
--- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc
+++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc
@@ -136,7 +136,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0
 	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_15B9FF
 	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B9E0
 	waitmovement 0
-	setflag 781
+	setflag FLAG_HIDE_PETALBURG_GYM_GUIDE
 	warp MAP_EVER_GRANDE_CITY_HALL_OF_FAME, 255, 7, 16
 	waitstate
 	releaseall
diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc
index 3d3d56ff9..f7088e821 100644
--- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc
+++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc
@@ -24,7 +24,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B736:: @ 815B736
 	end
 
 EverGrandeCity_DrakesRoom_MapScript1_15B743:: @ 815B743
-	checkflag 1248
+	checkflag FLAG_DEFEATED_ELITE_4_DRAKE
 	call_if 1, EverGrandeCity_DrakesRoom_EventScript_15B758
 	compare 0x409c, 4
 	call_if 1, EverGrandeCity_DrakesRoom_EventScript_15B75E
@@ -41,7 +41,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B75E:: @ 815B75E
 EverGrandeCity_DrakesRoom_EventScript_15B764:: @ 815B764
 	lock
 	faceplayer
-	checkflag 1248
+	checkflag FLAG_DEFEATED_ELITE_4_DRAKE
 	goto_if_eq EverGrandeCity_DrakesRoom_EventScript_15B78B
 	playbgm 450, 0
 	msgbox EverGrandeCity_DrakesRoom_Text_190CEB, 4
@@ -57,7 +57,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B78B:: @ 815B78B
 EverGrandeCity_DrakesRoom_EventScript_15B795:: @ 815B795
 	setvar 0x8004, 0
 	special sub_810FF60
-	setflag 1248
+	setflag FLAG_DEFEATED_ELITE_4_DRAKE
 	call EverGrandeCity_DrakesRoom_EventScript_1A0693
 	msgbox EverGrandeCity_DrakesRoom_Text_190E5D, 4
 	release
diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc
index 07f6e8877..be9e7a897 100644
--- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc
+++ b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc
@@ -24,7 +24,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B69C:: @ 815B69C
 	end
 
 EverGrandeCity_GlaciasRoom_MapScript1_15B6A9:: @ 815B6A9
-	checkflag 1247
+	checkflag FLAG_DEFEATED_ELITE_4_GLACIA
 	call_if 1, EverGrandeCity_GlaciasRoom_EventScript_15B6BE
 	compare 0x409c, 3
 	call_if 1, EverGrandeCity_GlaciasRoom_EventScript_15B6C4
@@ -41,7 +41,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B6C4:: @ 815B6C4
 EverGrandeCity_GlaciasRoom_EventScript_15B6CA:: @ 815B6CA
 	lock
 	faceplayer
-	checkflag 1247
+	checkflag FLAG_DEFEATED_ELITE_4_GLACIA
 	goto_if_eq EverGrandeCity_GlaciasRoom_EventScript_15B6F1
 	playbgm 450, 0
 	msgbox EverGrandeCity_GlaciasRoom_Text_190AF9, 4
@@ -55,7 +55,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B6F1:: @ 815B6F1
 	end
 
 EverGrandeCity_GlaciasRoom_EventScript_15B6FB:: @ 815B6FB
-	setflag 1247
+	setflag FLAG_DEFEATED_ELITE_4_GLACIA
 	call EverGrandeCity_GlaciasRoom_EventScript_1A0693
 	msgbox EverGrandeCity_GlaciasRoom_Text_190C8F, 4
 	release
diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc
index b7c1618ba..5ffa16d37 100644
--- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc
+++ b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc
@@ -24,7 +24,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B602:: @ 815B602
 	end
 
 EverGrandeCity_PhoebesRoom_MapScript1_15B60F:: @ 815B60F
-	checkflag 1246
+	checkflag FLAG_DEFEATED_ELITE_4_PHOEBE
 	call_if 1, EverGrandeCity_PhoebesRoom_EventScript_15B624
 	compare 0x409c, 2
 	call_if 1, EverGrandeCity_PhoebesRoom_EventScript_15B62A
@@ -41,7 +41,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B62A:: @ 815B62A
 EverGrandeCity_PhoebesRoom_EventScript_15B630:: @ 815B630
 	lock
 	faceplayer
-	checkflag 1246
+	checkflag FLAG_DEFEATED_ELITE_4_PHOEBE
 	goto_if_eq EverGrandeCity_PhoebesRoom_EventScript_15B657
 	playbgm 450, 0
 	msgbox EverGrandeCity_PhoebesRoom_Text_1908F5, 4
@@ -55,7 +55,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B657:: @ 815B657
 	end
 
 EverGrandeCity_PhoebesRoom_EventScript_15B661:: @ 815B661
-	setflag 1246
+	setflag FLAG_DEFEATED_ELITE_4_PHOEBE
 	call EverGrandeCity_PhoebesRoom_EventScript_1A0693
 	msgbox EverGrandeCity_PhoebesRoom_Text_190A2A, 4
 	release
diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc
index acbdac899..a78338808 100644
--- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc
+++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc
@@ -4,8 +4,8 @@ EverGrandeCity_PokemonLeague_MapScripts:: @ 815BA75
 
 EverGrandeCity_PokemonLeague_MapScript1_15BA7B:: @ 815BA7B
 	sethealplace 20
-	setflag 2132
-	checkflag 263
+	setflag FLAG_SYS_POKEMON_LEAGUE_FLY
+	checkflag FLAG_ENTERED_ELITE_FOUR
 	call_if 0, EverGrandeCity_PokemonLeague_EventScript_15BA8B
 	end
 
@@ -47,7 +47,7 @@ EverGrandeCity_PokemonLeague_Items:: @ 815BAC0
 
 EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2
 	lockall
-	checkflag 263
+	checkflag FLAG_ENTERED_ELITE_FOUR
 	goto_if_eq EverGrandeCity_PokemonLeague_EventScript_15BB57
 	getplayerxy 0x4000, 0x4001
 	compare 0x4000, 11
@@ -57,7 +57,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2
 	message EverGrandeCity_PokemonLeague_Text_1916FD
 	waitmessage
 	delay 75
-	checkflag 2060
+	checkflag FLAG_BADGE06_GET
 	goto_if 0, EverGrandeCity_PokemonLeague_EventScript_15BB4A
 	closemessage
 	applymovement 3, EverGrandeCity_PokemonLeague_Movement_15BB7E
@@ -71,7 +71,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2
 	closemessage
 	moveobjectoffscreen 3
 	moveobjectoffscreen 4
-	setflag 263
+	setflag FLAG_ENTERED_ELITE_FOUR
 	releaseall
 	end
 
diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc
index daca98176..6e958aeed 100644
--- a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc
+++ b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc
@@ -5,7 +5,7 @@ EverGrandeCity_SidneysRoom_MapScripts:: @ 815B53F
 	.byte 0
 
 EverGrandeCity_SidneysRoom_MapScript1_15B54F:: @ 815B54F
-	checkflag 1245
+	checkflag FLAG_DEFEATED_ELITE_4_SYDNEY
 	call_if 1, EverGrandeCity_SidneysRoom_EventScript_15B564
 	compare 0x409c, 1
 	call_if 1, EverGrandeCity_SidneysRoom_EventScript_15B56A
@@ -42,7 +42,7 @@ EverGrandeCity_SidneysRoom_EventScript_15B589:: @ 815B589
 EverGrandeCity_SidneysRoom_EventScript_15B596:: @ 815B596
 	lock
 	faceplayer
-	checkflag 1245
+	checkflag FLAG_DEFEATED_ELITE_4_SYDNEY
 	goto_if_eq EverGrandeCity_SidneysRoom_EventScript_15B5BD
 	playbgm 450, 0
 	msgbox EverGrandeCity_SidneysRoom_Text_190728, 4
@@ -56,7 +56,7 @@ EverGrandeCity_SidneysRoom_EventScript_15B5BD:: @ 815B5BD
 	end
 
 EverGrandeCity_SidneysRoom_EventScript_15B5C7:: @ 815B5C7
-	setflag 1245
+	setflag FLAG_DEFEATED_ELITE_4_SYDNEY
 	call EverGrandeCity_SidneysRoom_EventScript_1A0693
 	msgbox EverGrandeCity_SidneysRoom_Text_19086D, 4
 	release
diff --git a/data/scripts/maps/FallarborTown.inc b/data/scripts/maps/FallarborTown.inc
index 13c8a9f2e..70f3cbc3b 100644
--- a/data/scripts/maps/FallarborTown.inc
+++ b/data/scripts/maps/FallarborTown.inc
@@ -3,16 +3,16 @@ FallarborTown_MapScripts:: @ 814E7E0
 	.byte 0
 
 FallarborTown_MapScript1_14E7E6:: @ 814E7E6
-	setflag 2067
+	setflag FLAG_VISITED_FALLARBOR_TOWN
 	setvar 0x4086, 0
-	setflag 800
-	clearflag 270
+	setflag FLAG_HIDE_CONTEST_REPORTER_FALLARBOR
+	clearflag FLAG_CONTEST_SKETCH_CREATED
 	end
 
 FallarborTown_EventScript_14E7F5:: @ 814E7F5
 	lock
 	faceplayer
-	checkflag 139
+	checkflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY
 	goto_if_eq FallarborTown_EventScript_14E80A
 	msgbox FallarborTown_Text_16C7FF, 4
 	release
diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/scripts/maps/FallarborTown_ContestLobby.inc
index da19b96a7..b483b0259 100644
--- a/data/scripts/maps/FallarborTown_ContestLobby.inc
+++ b/data/scripts/maps/FallarborTown_ContestLobby.inc
@@ -92,7 +92,7 @@ FallarborTown_ContestLobby_EventScript_153A8E:: @ 8153A8E
 	end
 
 FallarborTown_ContestLobby_EventScript_153A97:: @ 8153A97
-	checkflag 270
+	checkflag FLAG_CONTEST_SKETCH_CREATED
 	goto_if_eq FallarborTown_ContestLobby_EventScript_153AA9
 	msgbox FallarborTown_ContestLobby_Text_177246, 2
 	end
diff --git a/data/scripts/maps/FallarborTown_House1.inc b/data/scripts/maps/FallarborTown_House1.inc
index 0228fe25d..6c7509508 100644
--- a/data/scripts/maps/FallarborTown_House1.inc
+++ b/data/scripts/maps/FallarborTown_House1.inc
@@ -8,7 +8,7 @@ FallarborTown_House1_MapScript1_153BB4:: @ 8153BB4
 FallarborTown_House1_EventScript_153BB5:: @ 8153BB5
 	lock
 	faceplayer
-	checkflag 229
+	checkflag FLAG_RECEIVED_TM27
 	goto_if_eq FallarborTown_House1_EventScript_153C54
 	checkitem ITEM_METEORITE, 1
 	compare RESULT, 1
@@ -18,9 +18,9 @@ FallarborTown_House1_EventScript_153BB5:: @ 8153BB5
 	end
 
 FallarborTown_House1_EventScript_153BDA:: @ 8153BDA
-	checkflag 2
+	checkflag FLAG_TEMP_2
 	call_if 0, FallarborTown_House1_EventScript_153C2D
-	checkflag 2
+	checkflag FLAG_TEMP_2
 	call_if 1, FallarborTown_House1_EventScript_153C3E
 	compare RESULT, 0
 	goto_if_eq FallarborTown_House1_EventScript_153C47
@@ -30,7 +30,7 @@ FallarborTown_House1_EventScript_153BDA:: @ 8153BDA
 	goto_if_eq FallarborTown_House1_EventScript_1A029B
 	setvar 0x8004, 280
 	call FallarborTown_House1_EventScript_1A067F
-	setflag 229
+	setflag FLAG_RECEIVED_TM27
 	msgbox FallarborTown_House1_Text_177910, 4
 	release
 	end
@@ -45,7 +45,7 @@ FallarborTown_House1_EventScript_153C3E:: @ 8153C3E
 	return
 
 FallarborTown_House1_EventScript_153C47:: @ 8153C47
-	setflag 2
+	setflag FLAG_TEMP_2
 	msgbox FallarborTown_House1_Text_17797D, 4
 	release
 	end
@@ -58,9 +58,9 @@ FallarborTown_House1_EventScript_153C54:: @ 8153C54
 FallarborTown_House1_EventScript_153C5E:: @ 8153C5E
 	lock
 	faceplayer
-	checkflag 229
+	checkflag FLAG_RECEIVED_TM27
 	goto_if_eq FallarborTown_House1_EventScript_153C86
-	checkflag 139
+	checkflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY
 	goto_if_eq FallarborTown_House1_EventScript_153C7C
 	msgbox FallarborTown_House1_Text_177A2B, 4
 	release
diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/scripts/maps/FallarborTown_House2.inc
index 3b215a697..c827eea7b 100644
--- a/data/scripts/maps/FallarborTown_House2.inc
+++ b/data/scripts/maps/FallarborTown_House2.inc
@@ -5,10 +5,10 @@ FallarborTown_House2_EventScript_153C91:: @ 8153C91
 	lockall
 	applymovement 1, FallarborTown_House2_Movement_1A0839
 	waitmovement 0
-	checkflag 1
+	checkflag FLAG_TEMP_1
 	goto_if_eq FallarborTown_House2_EventScript_153CB6
 	msgbox FallarborTown_House2_Text_177AF4, 4
-	setflag 1
+	setflag FLAG_TEMP_1
 	goto FallarborTown_House2_EventScript_153CB6
 	end
 
diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc
index 5b1f1c948..1e50c2fd6 100644
--- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc
+++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc
@@ -48,7 +48,7 @@ FallarborTown_PokemonCenter_1F_EventScript_153B59:: @ 8153B59
 FallarborTown_PokemonCenter_1F_EventScript_153B69:: @ 8153B69
 	playse 18
 	removeobject 4
-	clearflag 870
+	clearflag FLAG_HIDE_LANETTE
 	release
 	end
 
diff --git a/data/scripts/maps/FieryPath.inc b/data/scripts/maps/FieryPath.inc
index bd984ad20..f0bd22071 100644
--- a/data/scripts/maps/FieryPath.inc
+++ b/data/scripts/maps/FieryPath.inc
@@ -3,5 +3,5 @@ FieryPath_MapScripts:: @ 815D318
 	.byte 0
 
 FieryPath_MapScript1_15D31E:: @ 815D31E
-	setflag 2122
+	setflag FLAG_LANDMARK_FIERY_PATH
 	end
diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc
index 6ea89dcb7..dd947d0e5 100644
--- a/data/scripts/maps/FortreeCity.inc
+++ b/data/scripts/maps/FortreeCity.inc
@@ -4,7 +4,7 @@ FortreeCity_MapScripts:: @ 814C943
 	.byte 0
 
 FortreeCity_MapScript1_14C94E:: @ 814C94E
-	setflag 2074
+	setflag FLAG_VISITED_FORTREE_CITY
 	end
 
 FortreeCity_MapScript1_14C952:: @ 814C952
@@ -18,7 +18,7 @@ FortreeCity_EventScript_14C955:: @ 814C955
 FortreeCity_EventScript_14C95E:: @ 814C95E
 	lock
 	faceplayer
-	checkflag 295
+	checkflag FLAG_KECLEON_FLED_FORTREE
 	goto_if_eq FortreeCity_EventScript_14C973
 	msgbox FortreeCity_Text_1675C2, 4
 	release
@@ -82,7 +82,7 @@ FortreeCity_EventScript_14C9E4:: @ 814C9E4
 	applymovement LAST_TALKED, FortreeCity_Movement_14CA13
 	waitmovement 0
 	removeobject LAST_TALKED
-	setflag 295
+	setflag FLAG_KECLEON_FLED_FORTREE
 	release
 	end
 
diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc
index 7309be0bb..d3f7be155 100644
--- a/data/scripts/maps/FortreeCity_Gym.inc
+++ b/data/scripts/maps/FortreeCity_Gym.inc
@@ -17,7 +17,7 @@ FortreeCity_Gym_EventScript_157EEC:: @ 8157EEC
 
 FortreeCity_Gym_EventScript_157EF0:: @ 8157EF0
 	trainerbattle 1, OPPONENT_WINONA, 0, FortreeCity_Gym_Text_185CCB, FortreeCity_Gym_Text_185DBA, FortreeCity_Gym_EventScript_157F15
-	checkflag 170
+	checkflag FLAG_RECEIVED_TM40
 	goto_if 0, FortreeCity_Gym_EventScript_157F3E
 	msgbox FortreeCity_Gym_Text_185F98, 4
 	release
@@ -28,8 +28,8 @@ FortreeCity_Gym_EventScript_157F15:: @ 8157F15
 	waitmessage
 	call FortreeCity_Gym_EventScript_1A02C5
 	msgbox FortreeCity_Gym_Text_185E73, 4
-	setflag 1225
-	setflag 2060
+	setflag FLAG_DEFEATED_FORTREE_GYM
+	setflag FLAG_BADGE06_GET
 	setvar 0x8008, 6
 	call FortreeCity_Gym_EventScript_1A01C0
 	goto FortreeCity_Gym_EventScript_157F3E
@@ -40,7 +40,7 @@ FortreeCity_Gym_EventScript_157F3E:: @ 8157F3E
 	compare RESULT, 0
 	goto_if_eq FortreeCity_Gym_EventScript_1A029B
 	msgbox FortreeCity_Gym_Text_185F4A, 4
-	setflag 170
+	setflag FLAG_RECEIVED_TM40
 	release
 	end
 
@@ -67,7 +67,7 @@ FortreeCity_Gym_EventScript_157FA7:: @ 8157FA7
 FortreeCity_Gym_EventScript_157FBE:: @ 8157FBE
 	lock
 	faceplayer
-	checkflag 1225
+	checkflag FLAG_DEFEATED_FORTREE_GYM
 	goto_if_eq FortreeCity_Gym_EventScript_157FD3
 	msgbox FortreeCity_Gym_Text_18589C, 4
 	release
@@ -80,14 +80,14 @@ FortreeCity_Gym_EventScript_157FD3:: @ 8157FD3
 
 FortreeCity_Gym_EventScript_157FDD:: @ 8157FDD
 	lockall
-	checkflag 2060
+	checkflag FLAG_BADGE06_GET
 	goto_if_eq FortreeCity_Gym_EventScript_157FFD
 	goto FortreeCity_Gym_EventScript_158007
 	end
 
 FortreeCity_Gym_EventScript_157FED:: @ 8157FED
 	lockall
-	checkflag 2060
+	checkflag FLAG_BADGE06_GET
 	goto_if_eq FortreeCity_Gym_EventScript_157FFD
 	goto FortreeCity_Gym_EventScript_158007
 	end
diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/scripts/maps/FortreeCity_House1.inc
index 7b7ef0b2e..9ce96effe 100644
--- a/data/scripts/maps/FortreeCity_House1.inc
+++ b/data/scripts/maps/FortreeCity_House1.inc
@@ -4,7 +4,7 @@ FortreeCity_House1_MapScripts:: @ 8157E12
 FortreeCity_House1_EventScript_157E13:: @ 8157E13
 	lock
 	faceplayer
-	checkflag 155
+	checkflag FLAG_FORTREE_NPC_TRADE_COMPLETED
 	goto_if_eq FortreeCity_House1_EventScript_157EAD
 	setvar 0x8008, 1
 	copyvar 0x8004, 0x8008
@@ -30,7 +30,7 @@ FortreeCity_House1_EventScript_157E13:: @ 8157E13
 	waitstate
 	getspeciesname 0, 0x8009
 	msgbox FortreeCity_House1_Text_1856F7, 4
-	setflag 155
+	setflag FLAG_FORTREE_NPC_TRADE_COMPLETED
 	release
 	end
 
diff --git a/data/scripts/maps/FortreeCity_House2.inc b/data/scripts/maps/FortreeCity_House2.inc
index f210dd3ac..4d935e841 100644
--- a/data/scripts/maps/FortreeCity_House2.inc
+++ b/data/scripts/maps/FortreeCity_House2.inc
@@ -4,9 +4,9 @@ FortreeCity_House2_MapScripts:: @ 81580B3
 FortreeCity_House2_EventScript_1580B4:: @ 81580B4
 	lock
 	faceplayer
-	checkflag 264
+	checkflag FLAG_RECEIVED_TM10
 	goto_if_eq FortreeCity_House2_EventScript_158157
-	checkflag 118
+	checkflag FLAG_MET_HIDDEN_POWER_GIVER
 	call_if 0, FortreeCity_House2_EventScript_15814B
 	msgbox FortreeCity_House2_Text_186360, 4
 	multichoice 21, 8, 54, 1
@@ -24,14 +24,14 @@ FortreeCity_House2_EventScript_1580B4:: @ 81580B4
 	giveitem ITEM_TM10
 	compare RESULT, 0
 	goto_if_eq FortreeCity_House2_EventScript_1A029B
-	setflag 264
+	setflag FLAG_RECEIVED_TM10
 	msgbox FortreeCity_House2_Text_18652F, 4
 	release
 	end
 
 FortreeCity_House2_EventScript_15814B:: @ 815814B
 	msgbox FortreeCity_House2_Text_186306, 4
-	setflag 118
+	setflag FLAG_MET_HIDDEN_POWER_GIVER
 	return
 
 FortreeCity_House2_EventScript_158157:: @ 8158157
diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/scripts/maps/FortreeCity_House4.inc
index b261e14fb..23a96af51 100644
--- a/data/scripts/maps/FortreeCity_House4.inc
+++ b/data/scripts/maps/FortreeCity_House4.inc
@@ -7,16 +7,16 @@ FortreeCity_House4_EventScript_15817F:: @ 815817F
 
 FortreeCity_House4_EventScript_158188:: @ 8158188
 	lockall
-	checkflag 223
+	checkflag FLAG_RECEIVED_MENTAL_HERB
 	goto_if_eq FortreeCity_House4_EventScript_158204
-	checkflag 224
+	checkflag FLAG_WINGULL_DELIVERED_MAIL
 	goto_if_eq FortreeCity_House4_EventScript_1581D6
-	checkflag 222
+	checkflag FLAG_WINGULL_SENT_ON_ERRAND
 	goto_if_eq FortreeCity_House4_EventScript_1581C2
 	msgbox FortreeCity_House4_Text_186835, 4
 	closemessage
-	setflag 222
-	clearflag 934
+	setflag FLAG_WINGULL_SENT_ON_ERRAND
+	clearflag FLAG_HIDE_WINGULL_MOSSDEEP_HOUSE
 	applymovement 3, FortreeCity_House4_Movement_158218
 	waitmovement 0
 	removeobject 3
@@ -37,7 +37,7 @@ FortreeCity_House4_EventScript_1581D6:: @ 81581D6
 	giveitem ITEM_MENTAL_HERB
 	compare RESULT, 0
 	goto_if_eq FortreeCity_House4_EventScript_1A029B
-	setflag 223
+	setflag FLAG_RECEIVED_MENTAL_HERB
 	releaseall
 	end
 
diff --git a/data/scripts/maps/GraniteCave_1F.inc b/data/scripts/maps/GraniteCave_1F.inc
index f389a774e..1932940c4 100644
--- a/data/scripts/maps/GraniteCave_1F.inc
+++ b/data/scripts/maps/GraniteCave_1F.inc
@@ -4,11 +4,11 @@ GraniteCave_1F_MapScripts:: @ 815CBA6
 GraniteCave_1F_EventScript_15CBA7:: @ 815CBA7
 	lock
 	faceplayer
-	checkflag 109
+	checkflag FLAG_RECEIVED_HM05
 	goto_if_eq GraniteCave_1F_EventScript_15CBD3
 	msgbox GraniteCave_1F_Text_194917, 4
 	giveitem ITEM_HM05
-	setflag 109
+	setflag FLAG_RECEIVED_HM05
 	msgbox GraniteCave_1F_Text_194A3E, 4
 	release
 	end
diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc
index 070276e58..dc61a77bf 100644
--- a/data/scripts/maps/GraniteCave_StevensRoom.inc
+++ b/data/scripts/maps/GraniteCave_StevensRoom.inc
@@ -5,9 +5,9 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA
 	lock
 	faceplayer
 	msgbox GraniteCave_StevensRoom_Text_194AE5, 4
-	setvar 0x8004, 274
+	setvar 0x8004, ITEM_LETTER
 	call GraniteCave_StevensRoom_EventScript_1A067F
-	setflag 189
+	setflag FLAG_DELIVERED_STEVEN_LETTER
 	msgbox GraniteCave_StevensRoom_Text_194BDD, 4
 	giveitem ITEM_TM47
 	compare RESULT, 0
diff --git a/data/scripts/maps/InsideOfTruck.inc b/data/scripts/maps/InsideOfTruck.inc
index 737bacf71..6cf2d630b 100644
--- a/data/scripts/maps/InsideOfTruck.inc
+++ b/data/scripts/maps/InsideOfTruck.inc
@@ -26,10 +26,10 @@ InsideOfTruck_EventScript_15FC29:: @ 815FC29
 InsideOfTruck_EventScript_15FC45:: @ 815FC45
 	sethealplace 1
 	setvar 0x4092, 1
-	setflag 759
-	setflag 762
-	setflag 784
-	setflag 760
+	setflag FLAG_HIDE_MAY_MOM_DOWNSTAIRS
+	setflag FLAG_HIDE_MOVING_TRUCK_MAY
+	setflag FLAG_HIDE_BRENDAN_MOM
+	setflag FLAG_HIDE_BRENDAN_UPSTAIRS
 	setvar 0x408c, 1
 	setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 3, 10
 	releaseall
@@ -38,10 +38,10 @@ InsideOfTruck_EventScript_15FC45:: @ 815FC45
 InsideOfTruck_EventScript_15FC68:: @ 815FC68
 	sethealplace 2
 	setvar 0x4092, 2
-	setflag 758
-	setflag 761
-	setflag 785
-	setflag 722
+	setflag FLAG_HIDE_BRENDAN_MOM_DOWNSTAIRS
+	setflag FLAG_HIDE_MOVING_TRUCK_BRENDAN
+	setflag FLAG_HIDE_MAY_MOM
+	setflag FLAG_HIDE_MAY_UPSTAIRS
 	setvar 0x4082, 1
 	setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 12, 10
 	releaseall
diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc
index 75399bde8..e8489eb8a 100644
--- a/data/scripts/maps/IslandCave.inc
+++ b/data/scripts/maps/IslandCave.inc
@@ -5,7 +5,7 @@ IslandCave_MapScripts:: @ 815EEB6
 	.byte 0
 
 IslandCave_MapScript1_15EEC6:: @ 815EEC6
-	checkflag 2145
+	checkflag FLAG_SYS_CTRL_OBJ_DELETE
 	call_if 1, IslandCave_EventScript_15EED0
 	end
 
@@ -14,7 +14,7 @@ IslandCave_EventScript_15EED0:: @ 815EED0
 	return
 
 IslandCave_MapScript1_15EED4:: @ 815EED4
-	checkflag 2129
+	checkflag FLAG_SYS_BRAILLE_WAIT
 	call_if 0, IslandCave_EventScript_15EEDE
 	end
 
@@ -28,7 +28,7 @@ IslandCave_EventScript_15EEDE:: @ 815EEDE
 	return
 
 IslandCave_MapScript1_15EF15:: @ 815EF15
-	setflag 2133
+	setflag FLAG_LANDMARK_ISLAND_CAVE
 	end
 
 S_OpenRegiceChamber:: @ 815EF19
@@ -40,12 +40,12 @@ S_OpenRegiceChamber:: @ 815EF19
 	setmaptile 9, 20, 564, 1
 	special DrawWholeMapView
 	playse SE_BAN
-	setflag 2129
+	setflag FLAG_SYS_BRAILLE_WAIT
 	end
 
 IslandCave_EventScript_15EF59:: @ 815EF59
 	lockall
-	checkflag 2129
+	checkflag FLAG_SYS_BRAILLE_WAIT
 	goto_if_eq IslandCave_EventScript_15EF72
 	braillemessage IslandCave_Braille_1C54FC
 	special DoBrailleWait
@@ -61,7 +61,7 @@ IslandCave_EventScript_15EF72:: @ 815EF72
 IslandCave_EventScript_15EF7C:: @ 815EF7C
 	lockall
 	braillemessage IslandCave_Braille_1C54FC
-	checkflag 2129
+	checkflag FLAG_SYS_BRAILLE_WAIT
 	goto_if_eq IslandCave_EventScript_15EF95
 	special DoBrailleWait
 	waitstate
@@ -82,10 +82,10 @@ IslandCave_EventScript_15EF9D:: @ 815EF9D
 	delay 40
 	waitpokecry
 	setwildbattle SPECIES_REGICE, 40, ITEM_NONE
-	setflag 936
-	setflag 2145
+	setflag FLAG_HIDE_REGICE
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	special ScrSpecial_StartRegiBattle
 	waitstate
-	clearflag 2145
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	release
 	end
diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc
index 5192176a7..29b5ef2b9 100644
--- a/data/scripts/maps/LavaridgeTown.inc
+++ b/data/scripts/maps/LavaridgeTown.inc
@@ -4,8 +4,8 @@ LavaridgeTown_MapScripts:: @ 814E4A3
 	.byte 0
 
 LavaridgeTown_MapScript1_14E4AE:: @ 814E4AE
-	setflag 2066
-	checkflag 139
+	setflag FLAG_VISITED_LAVARIDGE_TOWN
+	checkflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY
 	call_if 1, LavaridgeTown_EventScript_14E4DF
 	call LavaridgeTown_EventScript_1A014E
 	call LavaridgeTown_EventScript_1A0172
@@ -19,7 +19,7 @@ LavaridgeTown_EventScript_14E4D0:: @ 814E4D0
 	return
 
 LavaridgeTown_EventScript_14E4DF:: @ 814E4DF
-	clearflag 877
+	clearflag FLAG_HIDE_MT_CHIMNEY_PEOPLE
 	return
 
 LavaridgeTown_MapScript2_14E4E3:: @ 814E4E3
@@ -84,7 +84,7 @@ LavaridgeTown_EventScript_14E575:: @ 814E575
 LavaridgeTown_EventScript_14E5AB:: @ 814E5AB
 	msgbox LavaridgeTown_Text_16BDA4, 4
 	giveitem ITEM_GO_GOGGLES
-	setflag 221
+	setflag FLAG_RECEIVED_GO_GOGGLES
 	msgbox LavaridgeTown_Text_16BE7D, 4
 	goto LavaridgeTown_EventScript_14E5F5
 	end
@@ -92,7 +92,7 @@ LavaridgeTown_EventScript_14E5AB:: @ 814E5AB
 LavaridgeTown_EventScript_14E5D0:: @ 814E5D0
 	msgbox LavaridgeTown_Text_16BF92, 4
 	giveitem ITEM_GO_GOGGLES
-	setflag 221
+	setflag FLAG_RECEIVED_GO_GOGGLES
 	msgbox LavaridgeTown_Text_16C020, 4
 	goto LavaridgeTown_EventScript_14E5F5
 	end
@@ -272,7 +272,7 @@ LavaridgeTown_EventScript_14E751:: @ 814E751
 LavaridgeTown_EventScript_14E75A:: @ 814E75A
 	lock
 	faceplayer
-	checkflag 266
+	checkflag FLAG_RECEIVED_LAVARIDGE_EGG
 	goto_if_eq LavaridgeTown_EventScript_14E79E
 	msgbox LavaridgeTown_Text_16C174, 5
 	compare RESULT, 0
@@ -281,7 +281,7 @@ LavaridgeTown_EventScript_14E75A:: @ 814E75A
 	compare RESULT, 6
 	goto_if_eq LavaridgeTown_EventScript_14E7A8
 	msgbox LavaridgeTown_Text_16C2B6, 4
-	setflag 266
+	setflag FLAG_RECEIVED_LAVARIDGE_EGG
 	playfanfare 370
 	message LavaridgeTown_Text_16C2EA
 	waitfanfare
diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc
index 2edffe9f0..a44368925 100644
--- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc
+++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc
@@ -70,7 +70,7 @@ LavaridgeTown_Gym_1F_EventScript_153740:: @ 8153740
 
 LavaridgeTown_Gym_1F_EventScript_153741:: @ 8153741
 	trainerbattle 1, OPPONENT_FLANNERY, 0, LavaridgeTown_Gym_1F_Text_176801, LavaridgeTown_Gym_1F_Text_176960, LavaridgeTown_Gym_1F_EventScript_153766
-	checkflag 168
+	checkflag FLAG_RECEIVED_TM50
 	goto_if 0, LavaridgeTown_Gym_1F_EventScript_1537A7
 	msgbox LavaridgeTown_Gym_1F_Text_176C4A, 4
 	release
@@ -81,14 +81,14 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766
 	waitmessage
 	call LavaridgeTown_Gym_1F_EventScript_1A02C5
 	msgbox LavaridgeTown_Gym_1F_Text_176A8C, 4
-	setflag 1213
-	setflag 2058
+	setflag FLAG_DEFEATED_LAVARIDGE_GYM
+	setflag FLAG_BADGE04_GET
 	addvar 0x4085, 1
 	compare 0x4085, 6
 	call_if 1, LavaridgeTown_Gym_1F_EventScript_1A00FB
 	setvar 0x8008, 4
 	call LavaridgeTown_Gym_1F_EventScript_1A01C0
-	setflag 806
+	setflag FLAG_HIDE_WALLY_WANDAS_HOUSE
 	setvar 0x4053, 1
 	goto LavaridgeTown_Gym_1F_EventScript_1537A7
 	end
@@ -98,7 +98,7 @@ LavaridgeTown_Gym_1F_EventScript_1537A7:: @ 81537A7
 	compare RESULT, 0
 	goto_if_eq LavaridgeTown_Gym_1F_EventScript_1A029B
 	msgbox LavaridgeTown_Gym_1F_Text_176B8F, 4
-	setflag 168
+	setflag FLAG_RECEIVED_TM50
 	release
 	end
 
@@ -135,7 +135,7 @@ LavaridgeTown_Gym_1F_EventScript_15383E:: @ 815383E
 LavaridgeTown_Gym_1F_EventScript_153859:: @ 8153859
 	lock
 	faceplayer
-	checkflag 1213
+	checkflag FLAG_DEFEATED_LAVARIDGE_GYM
 	goto_if_eq LavaridgeTown_Gym_1F_EventScript_15386E
 	msgbox LavaridgeTown_Gym_1F_Text_176312, 4
 	release
@@ -148,14 +148,14 @@ LavaridgeTown_Gym_1F_EventScript_15386E:: @ 815386E
 
 LavaridgeTown_Gym_1F_EventScript_153878:: @ 8153878
 	lockall
-	checkflag 2058
+	checkflag FLAG_BADGE04_GET
 	goto_if_eq LavaridgeTown_Gym_1F_EventScript_153898
 	goto LavaridgeTown_Gym_1F_EventScript_1538A2
 	end
 
 LavaridgeTown_Gym_1F_EventScript_153888:: @ 8153888
 	lockall
-	checkflag 2058
+	checkflag FLAG_BADGE04_GET
 	goto_if_eq LavaridgeTown_Gym_1F_EventScript_153898
 	goto LavaridgeTown_Gym_1F_EventScript_1538A2
 	end
diff --git a/data/scripts/maps/LavaridgeTown_HerbShop.inc b/data/scripts/maps/LavaridgeTown_HerbShop.inc
index 5ec6731d4..c5e033422 100644
--- a/data/scripts/maps/LavaridgeTown_HerbShop.inc
+++ b/data/scripts/maps/LavaridgeTown_HerbShop.inc
@@ -28,13 +28,13 @@ LavaridgeTown_HerbShop_EventScript_15364C:: @ 815364C
 LavaridgeTown_HerbShop_EventScript_153655:: @ 8153655
 	lock
 	faceplayer
-	checkflag 254
+	checkflag FLAG_RECEIVED_CHARCOAL
 	goto_if_eq LavaridgeTown_HerbShop_EventScript_153684
 	msgbox LavaridgeTown_HerbShop_Text_1761A2, 4
 	giveitem ITEM_CHARCOAL
 	compare RESULT, 0
 	goto_if_eq LavaridgeTown_HerbShop_EventScript_1A029B
-	setflag 254
+	setflag FLAG_RECEIVED_CHARCOAL
 	release
 	end
 
diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc
index cf8e2e07d..30f0ff36e 100644
--- a/data/scripts/maps/LilycoveCity.inc
+++ b/data/scripts/maps/LilycoveCity.inc
@@ -4,10 +4,10 @@ LilycoveCity_MapScripts:: @ 814CA15
 	.byte 0
 
 LilycoveCity_MapScript1_14CA20:: @ 814CA20
-	setflag 2075
+	setflag FLAG_VISITED_LILYCOVE_CITY
 	setvar 0x4086, 0
-	setflag 802
-	checkflag 2090
+	setflag FLAG_HIDE_CONTEST_REPORTER_LILYCOVE
+	checkflag FLAG_SYS_WEATHER_CTRL
 	call_if 1, LilycoveCity_EventScript_1A02C1
 	call LilycoveCity_EventScript_1A0196
 	call LilycoveCity_EventScript_1A014E
@@ -28,9 +28,9 @@ LilycoveCity_MapScript1_14CA3F:: @ 814CA3F
 	setmaptile 71, 6, 368, 0
 	setmaptile 72, 6, 445, 0
 	.endif
-	checkflag 112
+	checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE
 	call_if 0, LilycoveCity_EventScript_14CABE
-	checkflag 2061
+	checkflag FLAG_BADGE07_GET
 	call_if 1, LilycoveCity_EventScript_14CB2B
 	end
 
@@ -64,15 +64,15 @@ LilycoveCity_EventScript_14CB74:: @ 814CB74
 	lock
 	faceplayer
 	dodailyevents
-	checkflag 2255
+	checkflag FLAG_DAILY_RECEIVED_BERRY_LILYCOVE
 	goto_if_eq LilycoveCity_EventScript_14CBB4
 	msgbox LilycoveCity_Text_1C5A7A, 4
 	random 10
-	addvar RESULT, 133
+	addvar RESULT, ITEM_CHERI_BERRY
 	giveitem RESULT
 	compare RESULT, 0
 	goto_if_eq LilycoveCity_EventScript_1A029B
-	setflag 2255
+	setflag FLAG_DAILY_RECEIVED_BERRY_LILYCOVE
 	msgbox LilycoveCity_Text_1C5B1D, 4
 	release
 	end
@@ -89,7 +89,7 @@ LilycoveCity_EventScript_14CBBE:: @ 814CBBE
 LilycoveCity_EventScript_14CBC7:: @ 814CBC7
 	lock
 	faceplayer
-	checkflag 2061
+	checkflag FLAG_BADGE07_GET
 	goto_if_eq LilycoveCity_EventScript_14CBDC
 	msgbox LilycoveCity_Text_168750, 4
 	release
@@ -107,7 +107,7 @@ LilycoveCity_EventScript_14CBE6:: @ 814CBE6
 LilycoveCity_EventScript_14CBEF:: @ 814CBEF
 	lock
 	faceplayer
-	checkflag 112
+	checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE
 	goto_if_eq LilycoveCity_EventScript_14CC04
 	msgbox LilycoveCity_Text_1688C1, 4
 	release
@@ -121,7 +121,7 @@ LilycoveCity_EventScript_14CC04:: @ 814CC04
 LilycoveCity_EventScript_14CC0E:: @ 814CC0E
 	lock
 	faceplayer
-	checkflag 112
+	checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE
 	goto_if_eq LilycoveCity_EventScript_14CC23
 	msgbox LilycoveCity_Text_1689BF, 4
 	release
@@ -147,7 +147,7 @@ LilycoveCity_EventScript_14CC3F:: @ 814CC3F
 LilycoveCity_EventScript_14CC48:: @ 814CC48
 	lock
 	faceplayer
-	checkflag 2061
+	checkflag FLAG_BADGE07_GET
 	goto_if_eq LilycoveCity_EventScript_14CC5D
 	msgbox LilycoveCity_Text_168C16, 4
 	release
@@ -186,7 +186,7 @@ LilycoveCity_EventScript_14CCA2:: @ 814CCA2
 
 LilycoveCity_EventScript_14CCAC:: @ 814CCAC
 	lockall
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if_eq LilycoveCity_EventScript_14CCC0
 	msgbox LilycoveCity_Text_168EDA, 4
 	releaseall
@@ -211,7 +211,7 @@ LilycoveCity_EventScript_14CCDC:: @ 814CCDC
 
 LilycoveCity_EventScript_14CCE5:: @ 814CCE5
 	lockall
-	checkflag 218
+	checkflag FLAG_MET_WAILMER_TRAINER
 	goto_if_eq LilycoveCity_EventScript_14CD18
 	msgbox LilycoveCity_Text_16864A, 4
 	applymovement LAST_TALKED, LilycoveCity_Movement_1A0839
@@ -219,7 +219,7 @@ LilycoveCity_EventScript_14CCE5:: @ 814CCE5
 	msgbox LilycoveCity_Text_168675, 4
 	applymovement LAST_TALKED, LilycoveCity_Movement_1A083D
 	waitmovement 0
-	setflag 218
+	setflag FLAG_MET_WAILMER_TRAINER
 	releaseall
 	end
 
@@ -256,9 +256,9 @@ LilycoveCity_EventScript_14CD46:: @ 814CD46
 
 LilycoveCity_EventScript_14CD60:: @ 814CD60
 	playbgm 415, 1
-	checkflag 286
+	checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE
 	call_if 1, LilycoveCity_EventScript_14CDB0
-	checkflag 286
+	checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE
 	call_if 0, LilycoveCity_EventScript_14CDB9
 	compare RESULT, 0
 	goto_if_eq LilycoveCity_EventScript_14CDC2
@@ -278,7 +278,7 @@ LilycoveCity_EventScript_14CDB9:: @ 814CDB9
 	return
 
 LilycoveCity_EventScript_14CDC2:: @ 814CDC2
-	setflag 286
+	setflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE
 	msgbox LilycoveCity_Text_167AEB, 4
 	savebgm 0
 	fadedefaultbgm
@@ -287,9 +287,9 @@ LilycoveCity_EventScript_14CDC2:: @ 814CDC2
 
 LilycoveCity_EventScript_14CDD3:: @ 814CDD3
 	playbgm 421, 1
-	checkflag 286
+	checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE
 	call_if 1, LilycoveCity_EventScript_14CE23
-	checkflag 286
+	checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE
 	call_if 0, LilycoveCity_EventScript_14CE2C
 	compare RESULT, 0
 	goto_if_eq LilycoveCity_EventScript_14CE35
@@ -309,7 +309,7 @@ LilycoveCity_EventScript_14CE2C:: @ 814CE2C
 	return
 
 LilycoveCity_EventScript_14CE35:: @ 814CE35
-	setflag 286
+	setflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE
 	msgbox LilycoveCity_Text_16802C, 4
 	savebgm 0
 	fadedefaultbgm
@@ -349,19 +349,19 @@ LilycoveCity_EventScript_14CE96:: @ 814CE96
 LilycoveCity_EventScript_14CEA6:: @ 814CEA6
 	msgbox LilycoveCity_Text_167C6B, 4
 	setvar RESULT, 0
-	checkflag 2060
+	checkflag FLAG_BADGE06_GET
 	call_if 1, LilycoveCity_EventScript_14CEDE
 	compare RESULT, 0
 	call_if 1, LilycoveCity_EventScript_14CEEE
 	compare RESULT, 1
 	call_if 1, LilycoveCity_EventScript_14CEF7
-	clearflag 722
-	clearflag 849
+	clearflag FLAG_HIDE_MAY_UPSTAIRS
+	clearflag FLAG_HIDE_MAY_PICHU_DOLL
 	goto LilycoveCity_EventScript_14CF6B
 	end
 
 LilycoveCity_EventScript_14CEDE:: @ 814CEDE
-	checkflag 2062
+	checkflag FLAG_BADGE08_GET
 	goto_if_eq LilycoveCity_EventScript_14CEE8
 	return
 
@@ -374,7 +374,7 @@ LilycoveCity_EventScript_14CEEE:: @ 814CEEE
 	return
 
 LilycoveCity_EventScript_14CEF7:: @ 814CEF7
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if_eq LilycoveCity_EventScript_14CF09
 	msgbox LilycoveCity_Text_167DDD, 4
 	return
@@ -386,13 +386,13 @@ LilycoveCity_EventScript_14CF09:: @ 814CF09
 LilycoveCity_EventScript_14CF12:: @ 814CF12
 	msgbox LilycoveCity_Text_168149, 4
 	setvar RESULT, 0
-	checkflag 2060
+	checkflag FLAG_BADGE06_GET
 	call_if 1, LilycoveCity_EventScript_14CEDE
 	compare RESULT, 0
 	call_if 1, LilycoveCity_EventScript_14CF47
 	compare RESULT, 1
 	call_if 1, LilycoveCity_EventScript_14CF50
-	clearflag 760
+	clearflag FLAG_HIDE_BRENDAN_UPSTAIRS
 	goto LilycoveCity_EventScript_14CF6B
 	end
 
@@ -401,7 +401,7 @@ LilycoveCity_EventScript_14CF47:: @ 814CF47
 	return
 
 LilycoveCity_EventScript_14CF50:: @ 814CF50
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if_eq LilycoveCity_EventScript_14CF62
 	msgbox LilycoveCity_Text_168282, 4
 	return
@@ -422,6 +422,6 @@ LilycoveCity_EventScript_14CF6B:: @ 814CF6B
 	waitfieldeffect 30
 	savebgm 0
 	fadedefaultbgm
-	setflag 292
+	setflag FLAG_MET_RIVAL_LILYCOVE
 	release
 	end
diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc
index 656516fd6..6a1bc09e8 100644
--- a/data/scripts/maps/LilycoveCity_ContestLobby.inc
+++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc
@@ -13,7 +13,7 @@ LilycoveCity_ContestLobby_MapScript2_158877:: @ 8158877
 	.2byte 0
 
 LilycoveCity_ContestLobby_EventScript_158889:: @ 8158889
-	checkflag 775
+	checkflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_158898
 	setvar 0x4099, 0
 	end
@@ -97,23 +97,23 @@ LilycoveCity_ContestLobby_EventScript_158994:: @ 8158994
 	return
 
 LilycoveCity_ContestLobby_EventScript_1589D6:: @ 81589D6
-	clearflag 776
+	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY
 	return
 
 LilycoveCity_ContestLobby_EventScript_1589DA:: @ 81589DA
-	clearflag 777
+	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL
 	return
 
 LilycoveCity_ContestLobby_EventScript_1589DE:: @ 81589DE
-	clearflag 778
+	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN
 	return
 
 LilycoveCity_ContestLobby_EventScript_1589E2:: @ 81589E2
-	clearflag 779
+	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER
 	return
 
 LilycoveCity_ContestLobby_EventScript_1589E6:: @ 81589E6
-	clearflag 780
+	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS
 	return
 
 LilycoveCity_ContestLobby_EventScript_1589EA:: @ 81589EA
@@ -126,23 +126,23 @@ LilycoveCity_ContestLobby_EventScript_1589EA:: @ 81589EA
 	return
 
 LilycoveCity_ContestLobby_EventScript_158A27:: @ 8158A27
-	setflag 160
+	setflag FLAG_COOL_PAINTING_MADE
 	return
 
 LilycoveCity_ContestLobby_EventScript_158A2B:: @ 8158A2B
-	setflag 161
+	setflag FLAG_BEAUTY_PAINTING_MADE
 	return
 
 LilycoveCity_ContestLobby_EventScript_158A2F:: @ 8158A2F
-	setflag 162
+	setflag FLAG_CUTE_PAINTING_MADE
 	return
 
 LilycoveCity_ContestLobby_EventScript_158A33:: @ 8158A33
-	setflag 163
+	setflag FLAG_SMART_PAINTING_MADE
 	return
 
 LilycoveCity_ContestLobby_EventScript_158A37:: @ 8158A37
-	setflag 164
+	setflag FLAG_TOUGH_PAINTING_MADE
 	return
 
 LilycoveCity_ContestLobby_Movement_158A3B:: @ 8158A3B
@@ -188,7 +188,7 @@ LilycoveCity_ContestLobby_Movement_158A52:: @ 8158A52
 	step_end
 
 LilycoveCity_ContestLobby_EventScript_158A5B:: @ 8158A5B
-	checkflag 775
+	checkflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_158A6A
 	setvar 0x4099, 0
 	end
@@ -307,11 +307,11 @@ LilycoveCity_ContestLobby_EventScript_158B85:: @ 8158B85
 	checkitem ITEM_CONTEST_PASS, 1
 	compare RESULT, 0
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_158BBA
-	checkflag 2
+	checkflag FLAG_TEMP_2
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_158BAE
 	message LilycoveCity_ContestLobby_Text_18848C
 	waitmessage
-	setflag 2
+	setflag FLAG_TEMP_2
 	goto LilycoveCity_ContestLobby_EventScript_158BF0
 	end
 
@@ -334,7 +334,7 @@ LilycoveCity_ContestLobby_EventScript_158BC4:: @ 8158BC4
 	erasebox 0, 0, 15, 9
 	compare RESULT, 0
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_158C35
-	setflag 3
+	setflag FLAG_TEMP_3
 	return
 
 LilycoveCity_ContestLobby_EventScript_158BF0:: @ 8158BF0
@@ -354,7 +354,7 @@ LilycoveCity_ContestLobby_EventScript_158C27:: @ 8158C27
 LilycoveCity_ContestLobby_EventScript_158C35:: @ 8158C35
 	msgbox LilycoveCity_ContestLobby_Text_188559, 4
 	releaseall
-	clearflag 3
+	clearflag FLAG_TEMP_3
 	end
 
 LilycoveCity_ContestLobby_EventScript_158C42:: @ 8158C42
@@ -402,7 +402,7 @@ LilycoveCity_ContestLobby_EventScript_158CC0:: @ 8158CC0
 	end
 
 LilycoveCity_ContestLobby_EventScript_158CEA:: @ 8158CEA
-	checkflag 3
+	checkflag FLAG_TEMP_3
 	call_if 0, LilycoveCity_ContestLobby_EventScript_158BC4
 	message LilycoveCity_ContestLobby_Text_1886DC
 	waitmessage
@@ -445,7 +445,7 @@ LilycoveCity_ContestLobby_EventScript_158D90:: @ 8158D90
 	msgbox LilycoveCity_ContestLobby_Text_18878D, 4
 	closemessage
 	releaseall
-	clearflag 3
+	clearflag FLAG_TEMP_3
 	end
 
 LilycoveCity_ContestLobby_EventScript_158DA1:: @ 8158DA1
@@ -453,7 +453,7 @@ LilycoveCity_ContestLobby_EventScript_158DA1:: @ 8158DA1
 	msgbox LilycoveCity_ContestLobby_Text_1887F4, 4
 	closemessage
 	releaseall
-	clearflag 3
+	clearflag FLAG_TEMP_3
 	end
 
 LilycoveCity_ContestLobby_EventScript_158DB2:: @ 8158DB2
@@ -461,7 +461,7 @@ LilycoveCity_ContestLobby_EventScript_158DB2:: @ 8158DB2
 	msgbox LilycoveCity_ContestLobby_Text_18881F, 4
 	closemessage
 	releaseall
-	clearflag 3
+	clearflag FLAG_TEMP_3
 	end
 
 LilycoveCity_ContestLobby_EventScript_158DC3:: @ 8158DC3
@@ -583,13 +583,13 @@ LilycoveCity_ContestLobby_EventScript_158EB0:: @ 8158EB0
 	end
 
 LilycoveCity_ContestLobby_EventScript_158EE8:: @ 8158EE8
-	setflag 775
+	setflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR
 	copyvar 0x4094, 0x1
 	additem ITEM_CONTEST_PASS, 1
 	setvar 0x800b, 8
 	setvar CONTEST_RANK, 3
 	setvar 0x4099, 1
-	setflag 2107
+	setflag FLAG_SYS_RIBBON_GET
 	end
 
 LilycoveCity_ContestLobby_EventScript_158F08:: @ 8158F08
@@ -707,7 +707,7 @@ LilycoveCity_ContestLobby_EventScript_15901E:: @ 815901E
 	end
 
 LilycoveCity_ContestLobby_EventScript_159027:: @ 8159027
-	checkflag 150
+	checkflag FLAG_RECEIVED_CONTEST_PASS
 	goto_if 0, LilycoveCity_ContestLobby_EventScript_159039
 	msgbox LilycoveCity_ContestLobby_Text_188DDA, 2
 	end
diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc
index 7b602b2c7..3e4caf100 100644
--- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc
+++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc
@@ -3,9 +3,9 @@ LilycoveCity_CoveLilyMotel_1F_MapScripts:: @ 81582C4
 
 LilycoveCity_CoveLilyMotel_1F_EventScript_1582C5:: @ 81582C5
 	lockall
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if_eq LilycoveCity_CoveLilyMotel_1F_EventScript_158326
-	checkflag 2061
+	checkflag FLAG_BADGE07_GET
 	goto_if_eq LilycoveCity_CoveLilyMotel_1F_EventScript_1582FF
 	msgbox LilycoveCity_CoveLilyMotel_1F_Text_186B71, 4
 	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839
diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc
index fd9ea8a58..00a10b655 100644
--- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc
+++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc
@@ -4,9 +4,9 @@ LilycoveCity_CoveLilyMotel_2F_MapScripts:: @ 81583A0
 LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1:: @ 81583A1
 	lock
 	faceplayer
-	checkflag 2
+	checkflag FLAG_TEMP_2
 	call_if 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7
-	checkflag 2
+	checkflag FLAG_TEMP_2
 	call_if 1, LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD
 	specialvar RESULT, sub_8090FC0
 	compare RESULT, 1
@@ -19,7 +19,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7:: @ 81583C7
 	return
 
 LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0:: @ 81583D0
-	setflag 2
+	setflag FLAG_TEMP_2
 	playfanfare 370
 	waitfanfare
 	goto LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc
index 0e6bdc140..ca60bbc89 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc
+++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc
@@ -4,7 +4,7 @@ LilycoveCity_DepartmentStoreElevator_MapScripts:: @ 815A39B
 LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C
 	lock
 	faceplayer
-	checkflag 2
+	checkflag FLAG_TEMP_2
 	call_if 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF
 	copyvar 0x8005, 0x4043
 	special sub_810E944
@@ -76,7 +76,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8:: @ 815A4B8
 	waitmovement 0
 	special sub_810EBEC
 	waitstate
-	setflag 2
+	setflag FLAG_TEMP_2
 	return
 
 LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF:: @ 815A4CF
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc
index 29914a9b5..7078a83ca 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc
+++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc
@@ -11,11 +11,11 @@ LilycoveCity_DepartmentStoreRooftop_MapScript1_15A145:: @ 815A145
 	end
 
 LilycoveCity_DepartmentStoreRooftop_EventScript_15A15F:: @ 815A15F
-	clearflag 962
+	clearflag FLAG_HIDE_ROOFTOP_LADY_LILYCOVE_MART
 	return
 
 LilycoveCity_DepartmentStoreRooftop_EventScript_15A163:: @ 815A163
-	setflag 962
+	setflag FLAG_HIDE_ROOFTOP_LADY_LILYCOVE_MART
 	return
 
 LilycoveCity_DepartmentStoreRooftop_EventScript_15A167:: @ 815A167
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc
index 7acd29523..cfcca25fb 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc
+++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc
@@ -11,12 +11,12 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E
 	dodailyevents
 	compare 0x4045, 0
 	goto_if 5, LilycoveCity_DepartmentStore_1F_EventScript_159EB1
-	checkflag 2250
+	checkflag FLAG_DAILY_PICKED_LOTTO_TICKET
 	goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E4C
 	msgbox LilycoveCity_DepartmentStore_1F_Text_1C4B5E, 5
 	compare RESULT, 0
 	goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E56
-	setflag 2250
+	setflag FLAG_DAILY_PICKED_LOTTO_TICKET
 	message LilycoveCity_DepartmentStore_1F_Text_1C4CC6
 	waitmessage
 	special RetrieveLotteryNumber
diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc
index 4dcc1ba71..7385f8c72 100644
--- a/data/scripts/maps/LilycoveCity_Harbor.inc
+++ b/data/scripts/maps/LilycoveCity_Harbor.inc
@@ -16,7 +16,7 @@ LilycoveCity_Harbor_EventScript_1598A2:: @ 81598A2
 	end
 
 LilycoveCity_Harbor_EventScript_1598BA:: @ 81598BA
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if_eq LilycoveCity_Harbor_EventScript_1598CD
 	msgbox LilycoveCity_Harbor_Text_18B306, 4
 	release
@@ -106,11 +106,11 @@ LilycoveCity_Harbor_EventScript_1599E4:: @ 81599E4
 	end
 
 LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if 0, LilycoveCity_Harbor_EventScript_1598BA
-	checkflag 206
+	checkflag FLAG_ECOUNTERED_LATIAS_OR_LATIOS
 	goto_if_eq LilycoveCity_Harbor_EventScript_1598BA
-	checkflag 2131
+	checkflag FLAG_SYS_HAS_EON_TICKET
 	goto_if 0, LilycoveCity_Harbor_EventScript_1598BA
 	msgbox LilycoveCity_Harbor_Text_1C50F2, 4
 	closemessage
@@ -159,7 +159,7 @@ LilycoveCity_Harbor_Movement_159A89:: @ 8159A89
 LilycoveCity_Harbor_EventScript_159A8D:: @ 8159A8D
 	lock
 	faceplayer
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if_eq LilycoveCity_Harbor_EventScript_159AA2
 	msgbox LilycoveCity_Harbor_Text_18B504, 4
 	release
diff --git a/data/scripts/maps/LilycoveCity_House2.inc b/data/scripts/maps/LilycoveCity_House2.inc
index d3399f5ac..bbca8aa6d 100644
--- a/data/scripts/maps/LilycoveCity_House2.inc
+++ b/data/scripts/maps/LilycoveCity_House2.inc
@@ -4,13 +4,13 @@ LilycoveCity_House2_MapScripts:: @ 8159BA2
 LilycoveCity_House2_EventScript_159BA3:: @ 8159BA3
 	lock
 	faceplayer
-	checkflag 234
+	checkflag FLAG_RECEIVED_TM44
 	goto_if_eq LilycoveCity_House2_EventScript_159BDA
 	msgbox LilycoveCity_House2_Text_18B83C, 4
 	giveitem ITEM_TM44
 	compare RESULT, 0
 	goto_if_eq LilycoveCity_House2_EventScript_1A029B
-	setflag 234
+	setflag FLAG_RECEIVED_TM44
 	msgbox LilycoveCity_House2_Text_18B883, 4
 	release
 	end
diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc
index a4599f14a..db9855211 100644
--- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc
+++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc
@@ -4,31 +4,31 @@ LilycoveCity_LilycoveMuseum_2F_MapScripts:: @ 81585AC
 	.byte 0
 
 LilycoveCity_LilycoveMuseum_2F_MapScript1_1585B7:: @ 81585B7
-	checkflag 160
+	checkflag FLAG_COOL_PAINTING_MADE
 	goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_1585FD
 	goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6:: @ 81585C6
-	checkflag 161
+	checkflag FLAG_BEAUTY_PAINTING_MADE
 	goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158615
 	goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5:: @ 81585D5
-	checkflag 162
+	checkflag FLAG_CUTE_PAINTING_MADE
 	goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15862D
 	goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4:: @ 81585E4
-	checkflag 163
+	checkflag FLAG_SMART_PAINTING_MADE
 	goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158645
 	goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3:: @ 81585F3
-	checkflag 164
+	checkflag FLAG_TOUGH_PAINTING_MADE
 	goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15865D
 	end
 
@@ -96,7 +96,7 @@ LilycoveCity_LilycoveMuseum_2F_Movement_1586D5:: @ 81586D5
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8:: @ 81586D8
 	lockall
-	checkflag 236
+	checkflag FLAG_RECEIVED_GLASS_ORNAMENT
 	goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158793
 	specialvar 0x8004, sub_80C4D50
 	switch 0x8004
@@ -124,10 +124,10 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_158735:: @ 8158735
 LilycoveCity_LilycoveMuseum_2F_EventScript_15875C:: @ 815875C
 	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_188120, 4
-	givedecoration 44
+	givedecoration DECOR_GLASS_ORNAMENT
 	compare RESULT, 0
 	goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158783
-	setflag 236
+	setflag FLAG_RECEIVED_GLASS_ORNAMENT
 	closemessage
 	releaseall
 	end
@@ -146,35 +146,35 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_158793:: @ 8158793
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_15879D:: @ 815879D
 	lockall
-	checkflag 162
+	checkflag FLAG_CUTE_PAINTING_MADE
 	goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15883C
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_188219, 3
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_1587B0:: @ 81587B0
 	lockall
-	checkflag 164
+	checkflag FLAG_TOUGH_PAINTING_MADE
 	goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158858
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_18824C, 3
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_1587C3:: @ 81587C3
 	lockall
-	checkflag 160
+	checkflag FLAG_COOL_PAINTING_MADE
 	goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158820
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_1882B4, 3
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_1587D6:: @ 81587D6
 	lockall
-	checkflag 161
+	checkflag FLAG_BEAUTY_PAINTING_MADE
 	goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15882E
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_188281, 3
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_1587E9:: @ 81587E9
 	lockall
-	checkflag 163
+	checkflag FLAG_SMART_PAINTING_MADE
 	goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15884A
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_1882E6, 3
 	end
diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc
index 20b5c5f13..d1be7b704 100644
--- a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc
+++ b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc
@@ -21,7 +21,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_15933F:: @ 815933F
 LilycoveCity_PokemonCenter_1F_EventScript_159348:: @ 8159348
 	lock
 	faceplayer
-	checkflag 2061
+	checkflag FLAG_BADGE07_GET
 	goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_15935D
 	msgbox LilycoveCity_PokemonCenter_1F_Text_18A048, 4
 	release
diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc
index 3027e1f77..52c52b798 100644
--- a/data/scripts/maps/LittlerootTown.inc
+++ b/data/scripts/maps/LittlerootTown.inc
@@ -4,10 +4,10 @@ LittlerootTown_MapScripts:: @ 814D509
 	.byte 0
 
 LittlerootTown_MapScript1_14D514:: @ 814D514
-	setflag 2063
+	setflag FLAG_VISITED_LITTLEROOT_TOWN
 	compare 0x4092, 2
 	call_if 1, LittlerootTown_EventScript_14D57B
-	checkflag 82
+	checkflag FLAG_RESCUED_BIRCH
 	call_if 0, LittlerootTown_EventScript_14D583
 	compare 0x4050, 3
 	call_if 1, LittlerootTown_EventScript_14D5A6
@@ -22,12 +22,12 @@ LittlerootTown_MapScript1_14D514:: @ 814D514
 	end
 
 LittlerootTown_EventScript_14D563:: @ 814D563
-	setflag 301
+	setflag FLAG_RIVAL_LEFT_FOR_ROUTE103
 	return
 
 LittlerootTown_EventScript_14D567:: @ 814D567
 	setvar 0x40c7, 2
-	setflag 979
+	setflag FLAG_HIDE_RIVAL_OLDALE_TOWN
 	return
 
 LittlerootTown_EventScript_14D570:: @ 814D570
@@ -52,7 +52,7 @@ LittlerootTown_EventScript_14D59A:: @ 814D59A
 	return
 
 LittlerootTown_EventScript_14D5A6:: @ 814D5A6
-	clearflag 752
+	clearflag FLAG_HIDE_MOM_LITTLEROOT
 	setobjectmovementtype 4, 8
 	checkplayergender
 	compare RESULT, 0
@@ -80,7 +80,7 @@ LittlerootTown_EventScript_14D5EF:: @ 814D5EF
 	setvar 0x8004, 5
 	setvar 0x8005, 8
 	call LittlerootTown_EventScript_14D62B
-	setflag 761
+	setflag FLAG_HIDE_MOVING_TRUCK_BRENDAN
 	warpsilent MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F, 255, 8, 8
 	waitstate
 	releaseall
@@ -91,7 +91,7 @@ LittlerootTown_EventScript_14D60D:: @ 814D60D
 	setvar 0x8004, 14
 	setvar 0x8005, 8
 	call LittlerootTown_EventScript_14D62B
-	setflag 762
+	setflag FLAG_HIDE_MOVING_TRUCK_MAY
 	warpsilent MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F, 255, 2, 8
 	waitstate
 	releaseall
@@ -122,12 +122,12 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B
 	applymovement 4, LittlerootTown_Movement_14D6B5
 	applymovement 255, LittlerootTown_Movement_14D6BD
 	waitmovement 0
-	setflag 752
+	setflag FLAG_HIDE_MOM_LITTLEROOT
 	setvar 0x4092, 3
 	hideobject 255, 0, 0
 	closedoor 0x8004, 0x8005
 	waitdooranim
-	clearflag 868
+	clearflag FLAG_HIDE_FAT_MAN_LITTLEROOT
 	clearflag 0x4000
 	return
 
@@ -187,9 +187,9 @@ LittlerootTown_EventScript_14D6D6:: @ 814D6D6
 LittlerootTown_EventScript_14D6DF:: @ 814D6DF
 	lock
 	faceplayer
-	checkflag 116
+	checkflag FLAG_ADVENTURE_STARTED
 	goto_if_eq LittlerootTown_EventScript_14D72F
-	checkflag 82
+	checkflag FLAG_RESCUED_BIRCH
 	goto_if_eq LittlerootTown_EventScript_14D722
 	compare 0x4050, 0
 	goto_if 5, LittlerootTown_EventScript_14D708
@@ -861,7 +861,7 @@ LittlerootTown_EventScript_14DCE2:: @ 814DCE2
 
 LittlerootTown_EventScript_14DD2B:: @ 814DD2B
 	removeobject 4
-	setflag 2144
+	setflag FLAG_SYS_B_DASH
 	setvar 0x4050, 4
 	release
 	end
@@ -872,7 +872,7 @@ LittlerootTown_EventScript_14DD38:: @ 814DD38
 	message LittlerootTown_Text_16AA32
 	waitfanfare
 	waitmessage
-	setflag 274
+	setflag FLAG_RECEIVED_RUNNING_SHOES
 	msgbox LittlerootTown_Text_16AA5C, 4
 	msgbox LittlerootTown_Text_16AB10, 4
 	closemessage
diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc
index d3694bd22..731e6fb5f 100644
--- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc
+++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc
@@ -7,7 +7,7 @@ LittlerootTown_BrendansHouse_1F_MapScripts:: @ 815263B
 LittlerootTown_BrendansHouse_1F_MapScript1_15264B:: @ 815264B
 	compare 0x4092, 6
 	call_if 0, LittlerootTown_BrendansHouse_1F_EventScript_152660
-	checkflag 274
+	checkflag FLAG_RECEIVED_RUNNING_SHOES
 	call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_152673
 	end
 
@@ -100,7 +100,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_152744:: @ 8152744
 	waitmovement 0
 	special GetRivalSonDaughterString
 	msgbox LittlerootTown_BrendansHouse_1F_Text_1730C2, 4
-	setflag 87
+	setflag FLAG_MET_RIVAL_MOM
 	setvar 0x4082, 2
 	releaseall
 	end
diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc
index 8ff7f8b81..8f3b07312 100644
--- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc
+++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc
@@ -4,7 +4,7 @@ LittlerootTown_BrendansHouse_2F_MapScripts:: @ 81527A4
 	.byte 0
 
 LittlerootTown_BrendansHouse_2F_MapScript1_1527AF:: @ 81527AF
-	checkflag 130
+	checkflag FLAG_DEFEATED_RIVAL_ROUTE103
 	call_if 0, LittlerootTown_BrendansHouse_2F_EventScript_1527CE
 	compare 0x4092, 4
 	call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6950
diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc
index a4d6f2403..d65e943fd 100644
--- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc
+++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc
@@ -7,7 +7,7 @@ LittlerootTown_MaysHouse_1F_MapScripts:: @ 8152879
 LittlerootTown_MaysHouse_1F_MapScript1_152889:: @ 8152889
 	compare 0x4092, 6
 	call_if 0, LittlerootTown_MaysHouse_1F_EventScript_15289E
-	checkflag 274
+	checkflag FLAG_RECEIVED_RUNNING_SHOES
 	call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1528B1
 	end
 
@@ -100,7 +100,7 @@ LittlerootTown_MaysHouse_1F_EventScript_152982:: @ 8152982
 	waitmovement 0
 	special GetRivalSonDaughterString
 	msgbox LittlerootTown_MaysHouse_1F_Text_1730C2, 4
-	setflag 87
+	setflag FLAG_MET_RIVAL_MOM
 	setvar 0x408c, 2
 	releaseall
 	end
@@ -135,9 +135,9 @@ LittlerootTown_BrendansHouse_1F_EventScript_1529EB:: @ 81529EB
 LittlerootTown_MaysHouse_1F_EventScript_1529EB:: @ 81529EB
 	lock
 	faceplayer
-	checkflag 130
+	checkflag FLAG_DEFEATED_RIVAL_ROUTE103
 	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A21
-	checkflag 301
+	checkflag FLAG_RIVAL_LEFT_FOR_ROUTE103
 	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A17
 	compare 0x408d, 3
 	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A2B
diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc
index 68bdf0fcb..020c39eac 100644
--- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc
+++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc
@@ -4,7 +4,7 @@ LittlerootTown_MaysHouse_2F_MapScripts:: @ 8152A50
 	.byte 0
 
 LittlerootTown_MaysHouse_2F_MapScript1_152A5B:: @ 8152A5B
-	checkflag 130
+	checkflag FLAG_DEFEATED_RIVAL_ROUTE103
 	call_if 0, LittlerootTown_MaysHouse_2F_EventScript_152A7A
 	compare 0x4092, 4
 	call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1B6950
@@ -30,7 +30,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152A90:: @ 8152A90
 LittlerootTown_BrendansHouse_2F_EventScript_152A9D:: @ 8152A9D
 LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D
 	lockall
-	checkflag 292
+	checkflag FLAG_MET_RIVAL_LILYCOVE
 	goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BB5
 	checkplayergender
 	compare RESULT, 0
@@ -117,18 +117,18 @@ LittlerootTown_BrendansHouse_2F_EventScript_152BB5:: @ 8152BB5
 	call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BDB
 	compare RESULT, 1
 	call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BED
-	setflag 293
+	setflag FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE
 	releaseall
 	end
 
 LittlerootTown_BrendansHouse_2F_EventScript_152BDB:: @ 8152BDB
-	checkflag 293
+	checkflag FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE
 	goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BFF
 	msgbox LittlerootTown_BrendansHouse_2F_Text_1737AE, 4
 	return
 
 LittlerootTown_BrendansHouse_2F_EventScript_152BED:: @ 8152BED
-	checkflag 293
+	checkflag FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE
 	goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152C08
 	msgbox LittlerootTown_BrendansHouse_2F_Text_1738F2, 4
 	return
diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc
index e7ccd73f6..f78d30ec2 100644
--- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc
+++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc
@@ -52,7 +52,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CFA:: @ 8152CFA
 
 LittlerootTown_ProfessorBirchsLab_EventScript_152D19:: @ 8152D19
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_174015, 4
-	clearflag 991
+	clearflag FLAG_HIDE_BOY_ROUTE101
 	setvar 0x4084, 3
 	releaseall
 	end
@@ -87,10 +87,10 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D63:: @ 8152D63
 	faceplayer
 	compare 0x4084, 3
 	goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_152D90
-	checkflag 88
+	checkflag FLAG_BIRCH_AIDE_MET
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D86
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_173B29, 4
-	setflag 88
+	setflag FLAG_BIRCH_AIDE_MET
 	release
 	end
 
@@ -107,7 +107,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D90:: @ 8152D90
 LittlerootTown_ProfessorBirchsLab_EventScript_152D9A:: @ 8152D9A
 	lock
 	faceplayer
-	checkflag 896
+	checkflag FLAG_UNKNOWN_BIRCH_380
 	goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_1A037F
 	compare 0x4084, 5
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E7B
@@ -129,7 +129,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA
 	compare RESULT, 1
 	call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E40
 	setvar 0x4084, 5
-	setflag 116
+	setflag FLAG_ADVENTURE_STARTED
 	setvar 0x4051, 1
 	setvar 0x408d, 4
 	setvar 0x4050, 3
@@ -159,7 +159,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E6D:: @ 8152E6D
 	message LittlerootTown_ProfessorBirchsLab_Text_17422F
 	waitfanfare
 	waitmessage
-	setflag 2049
+	setflag FLAG_SYS_POKEDEX_GET
 	return
 
 LittlerootTown_ProfessorBirchsLab_EventScript_152E7B:: @ 8152E7B
diff --git a/data/scripts/maps/MagmaHideout_B1F.inc b/data/scripts/maps/MagmaHideout_B1F.inc
index 780eea4f5..6dbdc0461 100644
--- a/data/scripts/maps/MagmaHideout_B1F.inc
+++ b/data/scripts/maps/MagmaHideout_B1F.inc
@@ -3,7 +3,7 @@ MagmaHideout_B1F_MapScripts:: @ 815F2A8
 	.byte 0
 
 MagmaHideout_B1F_MapScript1_15F2AE:: @ 815F2AE
-	checkflag 2145
+	checkflag FLAG_SYS_CTRL_OBJ_DELETE
 	call_if 1, MagmaHideout_B1F_EventScript_15F2B8
 	end
 
diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc
index 5c93aa252..ae00ca369 100644
--- a/data/scripts/maps/MauvilleCity.inc
+++ b/data/scripts/maps/MauvilleCity.inc
@@ -3,18 +3,18 @@ MauvilleCity_MapScripts:: @ 814C032
 	.byte 0
 
 MauvilleCity_MapScript1_14C038:: @ 814C038
-	setflag 2072
-	clearflag 961
-	setflag 2098
-	clearflag 99
+	setflag FLAG_VISITED_MAUVILLE_CITY
+	clearflag FLAG_HIDE_OCEANIC_MUSEUM_VISITORS
+	setflag FLAG_SYS_TV_START
+	clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE
 	setvar 0x4093, 0
-	checkflag 209
+	checkflag FLAG_RECEIVED_TM24
 	call_if 1, MauvilleCity_EventScript_14C053
 	end
 
 MauvilleCity_EventScript_14C053:: @ 814C053
-	clearflag 913
-	setflag 912
+	clearflag FLAG_HIDE_WATTSON_MAUVILLE_GYM
+	setflag FLAG_HIDE_WATTSON_MAUVILLE
 	return
 
 MauvilleCity_EventScript_14C05A:: @ 814C05A
@@ -52,10 +52,10 @@ MauvilleCity_EventScript_14C099:: @ 814C099
 MauvilleCity_EventScript_14C0A2:: @ 814C0A2
 	lock
 	faceplayer
-	checkflag 98
+	checkflag FLAG_TV_EXPLAINED
 	goto_if_eq MauvilleCity_EventScript_14C0BA
 	msgbox MauvilleCity_Text_16674A, 4
-	setflag 98
+	setflag FLAG_TV_EXPLAINED
 	release
 	end
 
@@ -67,7 +67,7 @@ MauvilleCity_EventScript_14C0BA:: @ 814C0BA
 MauvilleCity_EventScript_14C0C4:: @ 814C0C4
 	lock
 	faceplayer
-	checkflag 284
+	checkflag FLAG_DECLINED_WALLY_BATTLE_MAUVILLE
 	goto_if_eq MauvilleCity_EventScript_14C0E4
 	msgbox MauvilleCity_Text_165B76, 4
 	closemessage
@@ -86,7 +86,7 @@ MauvilleCity_EventScript_14C0E4:: @ 814C0E4
 
 MauvilleCity_EventScript_14C0F9:: @ 814C0F9
 	lockall
-	checkflag 284
+	checkflag FLAG_DECLINED_WALLY_BATTLE_MAUVILLE
 	goto_if_eq MauvilleCity_EventScript_14C292
 	applymovement 6, MauvilleCity_Movement_1A0843
 	waitmovement 0
@@ -156,9 +156,9 @@ MauvilleCity_EventScript_14C1D9:: @ 814C1D9
 MauvilleCity_EventScript_14C22B:: @ 814C22B
 	removeobject 6
 	removeobject 7
-	clearflag 806
-	clearflag 809
-	setflag 190
+	clearflag FLAG_HIDE_WALLY_WANDAS_HOUSE
+	clearflag FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE
+	setflag FLAG_DEFEATED_WALLY_MAUVILLE
 	releaseall
 	end
 
@@ -177,7 +177,7 @@ MauvilleCity_EventScript_14C23C:: @ 814C23C
 	return
 
 MauvilleCity_EventScript_14C285:: @ 814C285
-	setflag 284
+	setflag FLAG_DECLINED_WALLY_BATTLE_MAUVILLE
 	msgbox MauvilleCity_Text_165DE8, 4
 	release
 	end
@@ -284,15 +284,15 @@ MauvilleCity_Movement_14C2E8:: @ 814C2E8
 MauvilleCity_EventScript_14C2F2:: @ 814C2F2
 	lock
 	faceplayer
-	checkflag 209
+	checkflag FLAG_RECEIVED_TM24
 	goto_if_eq MauvilleCity_EventScript_14C368
 	compare 0x40ba, 2
 	goto_if_eq MauvilleCity_EventScript_14C33C
-	checkflag 208
+	checkflag FLAG_RECEIVED_BASEMENT_KEY
 	goto_if_eq MauvilleCity_EventScript_14C332
 	msgbox MauvilleCity_Text_1661C1, 4
 	giveitem ITEM_BASEMENT_KEY
-	setflag 208
+	setflag FLAG_RECEIVED_BASEMENT_KEY
 	msgbox MauvilleCity_Text_166331, 4
 	release
 	end
@@ -307,7 +307,7 @@ MauvilleCity_EventScript_14C33C:: @ 814C33C
 	giveitem ITEM_TM24
 	compare RESULT, 0
 	goto_if_eq MauvilleCity_EventScript_1A029B
-	setflag 209
+	setflag FLAG_RECEIVED_TM24
 	msgbox MauvilleCity_Text_166488, 4
 	release
 	end
diff --git a/data/scripts/maps/MauvilleCity_BikeShop.inc b/data/scripts/maps/MauvilleCity_BikeShop.inc
index a93ff5170..ef44a20bb 100644
--- a/data/scripts/maps/MauvilleCity_BikeShop.inc
+++ b/data/scripts/maps/MauvilleCity_BikeShop.inc
@@ -4,9 +4,9 @@ MauvilleCity_BikeShop_MapScripts:: @ 8156795
 MauvilleCity_BikeShop_EventScript_156796:: @ 8156796
 	lock
 	faceplayer
-	checkflag 90
+	checkflag FLAG_RECEIVED_BIKE
 	goto_if_eq MauvilleCity_BikeShop_EventScript_15686E
-	checkflag 89
+	checkflag FLAG_DECLINED_BIKE
 	goto_if_eq MauvilleCity_BikeShop_EventScript_1567D1
 	msgbox MauvilleCity_BikeShop_Text_180F9F, 4
 	msgbox MauvilleCity_BikeShop_Text_181016, 5
@@ -34,13 +34,13 @@ MauvilleCity_BikeShop_EventScript_1567F0:: @ 81567F0
 	end
 
 MauvilleCity_BikeShop_EventScript_156817:: @ 8156817
-	setflag 89
+	setflag FLAG_DECLINED_BIKE
 	msgbox MauvilleCity_BikeShop_Text_181067, 4
 	release
 	end
 
 MauvilleCity_BikeShop_EventScript_156824:: @ 8156824
-	setflag 90
+	setflag FLAG_RECEIVED_BIKE
 	goto MauvilleCity_BikeShop_EventScript_1567F0
 	end
 
diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc
index 2e0231287..646546dc7 100644
--- a/data/scripts/maps/MauvilleCity_GameCorner.inc
+++ b/data/scripts/maps/MauvilleCity_GameCorner.inc
@@ -389,7 +389,7 @@ MauvilleCity_GameCorner_EventScript_156F8D:: @ 8156F8D
 MauvilleCity_GameCorner_EventScript_156F96:: @ 8156F96
 	lock
 	faceplayer
-	checkflag 226
+	checkflag FLAG_RECEIVED_STARTER_DOLL
 	goto_if_eq MauvilleCity_GameCorner_EventScript_157072
 	msgbox MauvilleCity_GameCorner_Text_181F3D, 5
 	compare RESULT, 0
@@ -401,35 +401,35 @@ MauvilleCity_GameCorner_EventScript_156F96:: @ 8156F96
 	end
 
 MauvilleCity_GameCorner_EventScript_156FDB:: @ 8156FDB
-	getdecorname 1, 88
-	checkdecor 88
+	getdecorname 1, DECOR_TREECKO_DOLL
+	checkdecor DECOR_TREECKO_DOLL
 	compare RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_157059
 	msgbox MauvilleCity_GameCorner_Text_181F89, 4
-	givedecoration 88
-	setflag 226
+	givedecoration DECOR_TREECKO_DOLL
+	setflag FLAG_RECEIVED_STARTER_DOLL
 	goto MauvilleCity_GameCorner_EventScript_157072
 	end
 
 MauvilleCity_GameCorner_EventScript_157005:: @ 8157005
-	getdecorname 1, 89
-	checkdecor 89
+	getdecorname 1, DECOR_TORCHIC_DOLL
+	checkdecor DECOR_TORCHIC_DOLL
 	compare RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_157059
 	msgbox MauvilleCity_GameCorner_Text_181F89, 4
-	givedecoration 89
-	setflag 226
+	givedecoration DECOR_TORCHIC_DOLL
+	setflag FLAG_RECEIVED_STARTER_DOLL
 	goto MauvilleCity_GameCorner_EventScript_157072
 	end
 
 MauvilleCity_GameCorner_EventScript_15702F:: @ 815702F
-	getdecorname 1, 90
-	checkdecor 90
+	getdecorname 1, DECOR_MUDKIP_DOLL
+	checkdecor DECOR_MUDKIP_DOLL
 	compare RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_157059
 	msgbox MauvilleCity_GameCorner_Text_181F89, 4
-	givedecoration 90
-	setflag 226
+	givedecoration DECOR_MUDKIP_DOLL
+	setflag FLAG_RECEIVED_STARTER_DOLL
 	goto MauvilleCity_GameCorner_EventScript_157072
 	end
 
@@ -460,12 +460,12 @@ MauvilleCity_GameCorner_EventScript_15707C:: @ 815707C
 	end
 
 MauvilleCity_GameCorner_EventScript_15709C:: @ 815709C
-	checkflag 225
+	checkflag FLAG_RECEIVED_20_COINS
 	goto_if_eq MauvilleCity_GameCorner_EventScript_1570CA
 	checkcoins 16385
 	compare 0x4001, 1
 	goto_if 4, MauvilleCity_GameCorner_EventScript_1570CA
-	setflag 225
+	setflag FLAG_RECEIVED_20_COINS
 	givecoins 20
 	msgbox MauvilleCity_GameCorner_Text_18208E, 4
 	playse 95
diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc
index 5221add7a..d94436973 100644
--- a/data/scripts/maps/MauvilleCity_Gym.inc
+++ b/data/scripts/maps/MauvilleCity_Gym.inc
@@ -3,7 +3,7 @@ MauvilleCity_Gym_MapScripts:: @ 8156450
 	.byte 0
 
 MauvilleCity_Gym_MapScript1_156456:: @ 8156456
-	checkflag 1208
+	checkflag FLAG_DEFEATED_MAUVILLE_GYM
 	goto_if_eq MauvilleCity_Gym_EventScript_1565A7
 	switch 0x4093
 	case 0, MauvilleCity_Gym_EventScript_156491
@@ -13,7 +13,7 @@ MauvilleCity_Gym_MapScript1_156456:: @ 8156456
 	end
 
 MauvilleCity_Gym_EventScript_156491:: @ 8156491
-	checkflag 99
+	checkflag FLAG_MAUVILLE_GYM_BARRIERS_STATE
 	goto_if_eq MauvilleCity_Gym_EventScript_15649B
 	end
 
@@ -69,7 +69,7 @@ MauvilleCity_Gym_EventScript_1565A7:: @ 81565A7
 
 MauvilleCity_Gym_EventScript_1565AB:: @ 81565AB
 	trainerbattle 1, OPPONENT_WATTSON, 0, MauvilleCity_Gym_Text_180C32, MauvilleCity_Gym_Text_180D64, MauvilleCity_Gym_EventScript_1565DB
-	checkflag 167
+	checkflag FLAG_RECEIVED_TM34
 	goto_if 0, MauvilleCity_Gym_EventScript_15661D
 	compare 0x40ba, 2
 	goto_if_eq MauvilleCity_Gym_EventScript_156641
@@ -82,8 +82,8 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB
 	waitmessage
 	call MauvilleCity_Gym_EventScript_1A02C5
 	msgbox MauvilleCity_Gym_Text_180DDA, 4
-	setflag 1208
-	setflag 2057
+	setflag FLAG_DEFEATED_MAUVILLE_GYM
+	setflag FLAG_BADGE03_GET
 	addvar 0x4085, 1
 	compare 0x4085, 6
 	call_if 1, MauvilleCity_Gym_EventScript_1A00FB
@@ -100,7 +100,7 @@ MauvilleCity_Gym_EventScript_15661D:: @ 815661D
 	compare RESULT, 0
 	goto_if_eq MauvilleCity_Gym_EventScript_1A029B
 	msgbox MauvilleCity_Gym_Text_180E76, 4
-	setflag 167
+	setflag FLAG_RECEIVED_TM34
 	release
 	end
 
@@ -111,7 +111,7 @@ MauvilleCity_Gym_EventScript_156641:: @ 8156641
 
 MauvilleCity_Gym_EventScript_15664B:: @ 815664B
 	lockall
-	checkflag 1208
+	checkflag FLAG_DEFEATED_MAUVILLE_GYM
 	goto_if_eq MauvilleCity_Gym_EventScript_1566DA
 	compare 0x4093, 1
 	goto_if_eq MauvilleCity_Gym_EventScript_1566DA
@@ -122,7 +122,7 @@ MauvilleCity_Gym_EventScript_15664B:: @ 815664B
 
 MauvilleCity_Gym_EventScript_156670:: @ 8156670
 	lockall
-	checkflag 1208
+	checkflag FLAG_DEFEATED_MAUVILLE_GYM
 	goto_if_eq MauvilleCity_Gym_EventScript_1566DA
 	compare 0x4093, 2
 	goto_if_eq MauvilleCity_Gym_EventScript_1566DA
@@ -133,7 +133,7 @@ MauvilleCity_Gym_EventScript_156670:: @ 8156670
 
 MauvilleCity_Gym_EventScript_156695:: @ 8156695
 	lockall
-	checkflag 1208
+	checkflag FLAG_DEFEATED_MAUVILLE_GYM
 	goto_if_eq MauvilleCity_Gym_EventScript_1566DA
 	compare 0x4093, 3
 	goto_if_eq MauvilleCity_Gym_EventScript_1566DA
@@ -147,9 +147,9 @@ MauvilleCity_Gym_EventScript_1566BA:: @ 81566BA
 	special MauvilleGymSpecial1
 	special DrawWholeMapView
 	playse 44
-	checkflag 99
+	checkflag FLAG_MAUVILLE_GYM_BARRIERS_STATE
 	goto_if_eq MauvilleCity_Gym_EventScript_1566E1
-	checkflag 99
+	checkflag FLAG_MAUVILLE_GYM_BARRIERS_STATE
 	goto_if 0, MauvilleCity_Gym_EventScript_1566DC
 	releaseall
 	end
@@ -159,12 +159,12 @@ MauvilleCity_Gym_EventScript_1566DA:: @ 81566DA
 	end
 
 MauvilleCity_Gym_EventScript_1566DC:: @ 81566DC
-	setflag 99
+	setflag FLAG_MAUVILLE_GYM_BARRIERS_STATE
 	releaseall
 	end
 
 MauvilleCity_Gym_EventScript_1566E1:: @ 81566E1
-	clearflag 99
+	clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE
 	releaseall
 	end
 
@@ -191,7 +191,7 @@ MauvilleCity_Gym_EventScript_15672B:: @ 815672B
 MauvilleCity_Gym_EventScript_156742:: @ 8156742
 	lock
 	faceplayer
-	checkflag 1208
+	checkflag FLAG_DEFEATED_MAUVILLE_GYM
 	goto_if_eq MauvilleCity_Gym_EventScript_156757
 	msgbox MauvilleCity_Gym_Text_180815, 4
 	release
@@ -204,14 +204,14 @@ MauvilleCity_Gym_EventScript_156757:: @ 8156757
 
 MauvilleCity_Gym_EventScript_156761:: @ 8156761
 	lockall
-	checkflag 2057
+	checkflag FLAG_BADGE03_GET
 	goto_if_eq MauvilleCity_Gym_EventScript_156781
 	goto MauvilleCity_Gym_EventScript_15678B
 	end
 
 MauvilleCity_Gym_EventScript_156771:: @ 8156771
 	lockall
-	checkflag 2057
+	checkflag FLAG_BADGE03_GET
 	goto_if_eq MauvilleCity_Gym_EventScript_156781
 	goto MauvilleCity_Gym_EventScript_15678B
 	end
diff --git a/data/scripts/maps/MauvilleCity_House1.inc b/data/scripts/maps/MauvilleCity_House1.inc
index e76564847..acb9f39fa 100644
--- a/data/scripts/maps/MauvilleCity_House1.inc
+++ b/data/scripts/maps/MauvilleCity_House1.inc
@@ -4,11 +4,11 @@ MauvilleCity_House1_MapScripts:: @ 81569FC
 MauvilleCity_House1_EventScript_1569FD:: @ 81569FD
 	lock
 	faceplayer
-	checkflag 107
+	checkflag FLAG_RECEIVED_HM06
 	goto_if_eq MauvilleCity_House1_EventScript_156A29
 	msgbox MauvilleCity_House1_Text_181B1A, 4
 	giveitem ITEM_HM06
-	setflag 107
+	setflag FLAG_RECEIVED_HM06
 	msgbox MauvilleCity_House1_Text_181B64, 4
 	release
 	end
diff --git a/data/scripts/maps/MauvilleCity_House2.inc b/data/scripts/maps/MauvilleCity_House2.inc
index a500a246e..7104ebee7 100644
--- a/data/scripts/maps/MauvilleCity_House2.inc
+++ b/data/scripts/maps/MauvilleCity_House2.inc
@@ -4,7 +4,7 @@ MauvilleCity_House2_MapScripts:: @ 81572BF
 MauvilleCity_House2_EventScript_1572C0:: @ 81572C0
 	lock
 	faceplayer
-	checkflag 258
+	checkflag FLAG_RECEIVED_COIN_CASE
 	goto_if_eq MauvilleCity_House2_EventScript_15733D
 	msgbox MauvilleCity_House2_Text_18244E, 4
 	checkitem ITEM_HARBOR_MAIL, 1
@@ -30,7 +30,7 @@ MauvilleCity_House2_EventScript_15731B:: @ 815731B
 	msgbox MauvilleCity_House2_Text_182515, 4
 	removeitem ITEM_HARBOR_MAIL, 1
 	giveitem ITEM_COIN_CASE
-	setflag 258
+	setflag FLAG_RECEIVED_COIN_CASE
 	goto MauvilleCity_House2_EventScript_15733D
 	end
 
diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/scripts/maps/MeteorFalls_1F_1R.inc
index 06abbc8f6..7ce6e3704 100644
--- a/data/scripts/maps/MeteorFalls_1F_1R.inc
+++ b/data/scripts/maps/MeteorFalls_1F_1R.inc
@@ -77,7 +77,7 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C
 	removeobject 7
 	removeobject 8
 	removeobject 9
-	setflag 819
+	setflag FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR
 	setvar 0x40bf, 1
 	releaseall
 	end
@@ -215,9 +215,9 @@ MeteorFalls_1F_1R_Movement_15C64F:: @ 815C64F
 MeteorFalls_1F_1R_EventScript_15C656:: @ 815C656
 	lock
 	faceplayer
-	checkflag 244
+	checkflag FLAG_MET_PROF_COSMO
 	goto_if_eq MeteorFalls_1F_1R_EventScript_15C66E
-	setflag 244
+	setflag FLAG_MET_PROF_COSMO
 	msgbox MeteorFalls_1F_1R_Text_1937EB, 4
 	release
 	end
diff --git a/data/scripts/maps/MossdeepCity.inc b/data/scripts/maps/MossdeepCity.inc
index 44deb9d63..31ed83b2a 100644
--- a/data/scripts/maps/MossdeepCity.inc
+++ b/data/scripts/maps/MossdeepCity.inc
@@ -3,11 +3,11 @@ MossdeepCity_MapScripts:: @ 814CF92
 	.byte 0
 
 MossdeepCity_MapScript1_14CF98:: @ 814CF98
-	clearflag 100
-	clearflag 101
-	clearflag 102
-	clearflag 103
-	checkflag 2090
+	clearflag FLAG_MOSSDEEP_GYM_SWITCH_1
+	clearflag FLAG_MOSSDEEP_GYM_SWITCH_2
+	clearflag FLAG_MOSSDEEP_GYM_SWITCH_3
+	clearflag FLAG_MOSSDEEP_GYM_SWITCH_4
+	checkflag FLAG_SYS_WEATHER_CTRL
 	call_if 1, MossdeepCity_EventScript_1A02C1
 	end
 
@@ -52,7 +52,7 @@ MossdeepCity_EventScript_14CFFF:: @ 814CFFF
 	end
 
 MossdeepCity_EventScript_14D008:: @ 814D008
-	setflag 2076
+	setflag FLAG_VISITED_MOSSDEEP_CITY
 	setvar 0x4001, 1
 	end
 
@@ -68,7 +68,7 @@ MossdeepCity_EventScript_14D011:: @ 814D011
 MossdeepCity_EventScript_14D027:: @ 814D027
 	lock
 	faceplayer
-	checkflag 276
+	checkflag FLAG_RECEIVED_KINGS_ROCK
 	goto_if_eq MossdeepCity_EventScript_14D069
 	msgbox MossdeepCity_Text_1690A9, 5
 	compare RESULT, 0
@@ -77,7 +77,7 @@ MossdeepCity_EventScript_14D027:: @ 814D027
 	giveitem ITEM_KINGS_ROCK
 	compare RESULT, 0
 	goto_if_eq MossdeepCity_EventScript_1A029B
-	setflag 276
+	setflag FLAG_RECEIVED_KINGS_ROCK
 	release
 	end
 
diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc
index 19b3c5045..0c27c28f7 100644
--- a/data/scripts/maps/MossdeepCity_Gym.inc
+++ b/data/scripts/maps/MossdeepCity_Gym.inc
@@ -3,25 +3,25 @@ MossdeepCity_Gym_MapScripts:: @ 815A4D3
 	.byte 0
 
 MossdeepCity_Gym_MapScript1_15A4D9:: @ 815A4D9
-	checkflag 100
+	checkflag FLAG_MOSSDEEP_GYM_SWITCH_1
 	goto_if_eq MossdeepCity_Gym_EventScript_15A510
 	goto MossdeepCity_Gym_EventScript_15A4E8
 	end
 
 MossdeepCity_Gym_EventScript_15A4E8:: @ 815A4E8
-	checkflag 101
+	checkflag FLAG_MOSSDEEP_GYM_SWITCH_2
 	goto_if_eq MossdeepCity_Gym_EventScript_15A528
 	goto MossdeepCity_Gym_EventScript_15A4F7
 	end
 
 MossdeepCity_Gym_EventScript_15A4F7:: @ 815A4F7
-	checkflag 102
+	checkflag FLAG_MOSSDEEP_GYM_SWITCH_3
 	goto_if_eq MossdeepCity_Gym_EventScript_15A540
 	goto MossdeepCity_Gym_EventScript_15A506
 	end
 
 MossdeepCity_Gym_EventScript_15A506:: @ 815A506
-	checkflag 103
+	checkflag FLAG_MOSSDEEP_GYM_SWITCH_4
 	goto_if_eq MossdeepCity_Gym_EventScript_15A558
 	end
 
@@ -50,7 +50,7 @@ MossdeepCity_Gym_EventScript_15A558:: @ 815A558
 
 MossdeepCity_Gym_EventScript_15A56B:: @ 815A56B
 	trainerbattle 8, OPPONENT_TATE_AND_LIZA, 0, MossdeepCity_Gym_Text_18CF02, MossdeepCity_Gym_Text_18D077, MossdeepCity_Gym_Text_18D324, MossdeepCity_Gym_EventScript_15A594
-	checkflag 171
+	checkflag FLAG_RECEIVED_TM04
 	goto_if 0, MossdeepCity_Gym_EventScript_15A5C6
 	msgbox MossdeepCity_Gym_Text_18D273, 4
 	release
@@ -61,13 +61,13 @@ MossdeepCity_Gym_EventScript_15A594:: @ 815A594
 	waitmessage
 	call MossdeepCity_Gym_EventScript_1A02C5
 	msgbox MossdeepCity_Gym_Text_18D128, 4
-	setflag 1229
-	setflag 2061
-	clearflag 869
-	clearflag 915
+	setflag FLAG_DEFEATED_MOSSDEEP_GYM
+	setflag FLAG_BADGE07_GET
+	clearflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD
+	clearflag FLAG_UNKNOWN_393
 	setvar 0x8008, 7
 	call MossdeepCity_Gym_EventScript_1A01C0
-	clearflag 905
+	clearflag FLAG_HIDE_WORKERS_SLATEPORT_HARBOR
 	goto MossdeepCity_Gym_EventScript_15A5C6
 	end
 
@@ -76,15 +76,15 @@ MossdeepCity_Gym_EventScript_15A5C6:: @ 815A5C6
 	compare RESULT, 0
 	goto_if_eq MossdeepCity_Gym_EventScript_1A029B
 	msgbox MossdeepCity_Gym_Text_18D1CF, 4
-	setflag 171
+	setflag FLAG_RECEIVED_TM04
 	release
 	end
 
 MossdeepCity_Gym_EventScript_15A5EA:: @ 815A5EA
 	lockall
-	checkflag 100
+	checkflag FLAG_MOSSDEEP_GYM_SWITCH_1
 	goto_if_eq MossdeepCity_Gym_EventScript_15A621
-	setflag 100
+	setflag FLAG_MOSSDEEP_GYM_SWITCH_1
 	applymovement 255, MossdeepCity_Gym_Movement_15A7F7
 	waitmovement 0
 	setmaptile 5, 5, 516, 0
@@ -99,7 +99,7 @@ MossdeepCity_Gym_EventScript_15A619:: @ 815A619
 	end
 
 MossdeepCity_Gym_EventScript_15A621:: @ 815A621
-	clearflag 100
+	clearflag FLAG_MOSSDEEP_GYM_SWITCH_1
 	applymovement 255, MossdeepCity_Gym_Movement_15A7F7
 	waitmovement 0
 	setmaptile 5, 5, 524, 0
@@ -109,9 +109,9 @@ MossdeepCity_Gym_EventScript_15A621:: @ 815A621
 
 MossdeepCity_Gym_EventScript_15A646:: @ 815A646
 	lockall
-	checkflag 101
+	checkflag FLAG_MOSSDEEP_GYM_SWITCH_2
 	goto_if_eq MossdeepCity_Gym_EventScript_15A675
-	setflag 101
+	setflag FLAG_MOSSDEEP_GYM_SWITCH_2
 	applymovement 255, MossdeepCity_Gym_Movement_15A7F7
 	waitmovement 0
 	setmaptile 8, 14, 516, 0
@@ -120,7 +120,7 @@ MossdeepCity_Gym_EventScript_15A646:: @ 815A646
 	end
 
 MossdeepCity_Gym_EventScript_15A675:: @ 815A675
-	clearflag 101
+	clearflag FLAG_MOSSDEEP_GYM_SWITCH_2
 	applymovement 255, MossdeepCity_Gym_Movement_15A7F7
 	waitmovement 0
 	setmaptile 8, 14, 517, 0
@@ -130,9 +130,9 @@ MossdeepCity_Gym_EventScript_15A675:: @ 815A675
 
 MossdeepCity_Gym_EventScript_15A69A:: @ 815A69A
 	lockall
-	checkflag 102
+	checkflag FLAG_MOSSDEEP_GYM_SWITCH_3
 	goto_if_eq MossdeepCity_Gym_EventScript_15A6C9
-	setflag 102
+	setflag FLAG_MOSSDEEP_GYM_SWITCH_3
 	applymovement 255, MossdeepCity_Gym_Movement_15A7F7
 	waitmovement 0
 	setmaptile 15, 17, 524, 0
@@ -141,7 +141,7 @@ MossdeepCity_Gym_EventScript_15A69A:: @ 815A69A
 	end
 
 MossdeepCity_Gym_EventScript_15A6C9:: @ 815A6C9
-	clearflag 102
+	clearflag FLAG_MOSSDEEP_GYM_SWITCH_3
 	applymovement 255, MossdeepCity_Gym_Movement_15A7F7
 	waitmovement 0
 	setmaptile 15, 17, 516, 0
@@ -151,9 +151,9 @@ MossdeepCity_Gym_EventScript_15A6C9:: @ 815A6C9
 
 MossdeepCity_Gym_EventScript_15A6EE:: @ 815A6EE
 	lockall
-	checkflag 103
+	checkflag FLAG_MOSSDEEP_GYM_SWITCH_4
 	goto_if_eq MossdeepCity_Gym_EventScript_15A71D
-	setflag 103
+	setflag FLAG_MOSSDEEP_GYM_SWITCH_4
 	applymovement 255, MossdeepCity_Gym_Movement_15A7F7
 	waitmovement 0
 	setmaptile 1, 23, 525, 0
@@ -162,7 +162,7 @@ MossdeepCity_Gym_EventScript_15A6EE:: @ 815A6EE
 	end
 
 MossdeepCity_Gym_EventScript_15A71D:: @ 815A71D
-	clearflag 103
+	clearflag FLAG_MOSSDEEP_GYM_SWITCH_4
 	applymovement 255, MossdeepCity_Gym_Movement_15A7F7
 	waitmovement 0
 	setmaptile 1, 23, 516, 0
@@ -210,7 +210,7 @@ MossdeepCity_Gym_EventScript_15A7C1:: @ 815A7C1
 MossdeepCity_Gym_EventScript_15A7D8:: @ 815A7D8
 	lock
 	faceplayer
-	checkflag 1229
+	checkflag FLAG_DEFEATED_MOSSDEEP_GYM
 	goto_if_eq MossdeepCity_Gym_EventScript_15A7ED
 	msgbox MossdeepCity_Gym_Text_18C7E3, 4
 	release
@@ -228,14 +228,14 @@ MossdeepCity_Gym_Movement_15A7F7:: @ 815A7F7
 
 MossdeepCity_Gym_EventScript_15A7FA:: @ 815A7FA
 	lockall
-	checkflag 2061
+	checkflag FLAG_BADGE07_GET
 	goto_if_eq MossdeepCity_Gym_EventScript_15A81A
 	goto MossdeepCity_Gym_EventScript_15A824
 	end
 
 MossdeepCity_Gym_EventScript_15A80A:: @ 815A80A
 	lockall
-	checkflag 2061
+	checkflag FLAG_BADGE07_GET
 	goto_if_eq MossdeepCity_Gym_EventScript_15A81A
 	goto MossdeepCity_Gym_EventScript_15A824
 	end
diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/scripts/maps/MossdeepCity_House2.inc
index f7f66b843..f90fc9350 100644
--- a/data/scripts/maps/MossdeepCity_House2.inc
+++ b/data/scripts/maps/MossdeepCity_House2.inc
@@ -17,8 +17,8 @@ MossdeepCity_House2_EventScript_15A87B:: @ 815A87B
 	msgbox MossdeepCity_House2_Text_18D61E, 4
 	waitpokecry
 	closemessage
-	setflag 224
-	clearflag 933
+	setflag FLAG_WINGULL_DELIVERED_MAIL
+	clearflag FLAG_HIDE_WINGULL_FORTREE_HOUSE
 	compare FACING, 2
 	call_if 1, MossdeepCity_House2_EventScript_15A8AE
 	compare FACING, 3
diff --git a/data/scripts/maps/MossdeepCity_House3.inc b/data/scripts/maps/MossdeepCity_House3.inc
index 8f9bf4dc5..63054a60c 100644
--- a/data/scripts/maps/MossdeepCity_House3.inc
+++ b/data/scripts/maps/MossdeepCity_House3.inc
@@ -4,14 +4,14 @@ MossdeepCity_House3_MapScripts:: @ 815A971
 MossdeepCity_House3_EventScript_15A972:: @ 815A972
 	lock
 	faceplayer
-	checkflag 152
+	checkflag FLAG_RECEIVED_SUPER_ROD
 	goto_if_eq MossdeepCity_House3_EventScript_15A9B1
 	msgbox MossdeepCity_House3_Text_18D909, 5
 	compare RESULT, 0
 	goto_if_eq MossdeepCity_House3_EventScript_15A9BB
 	msgbox MossdeepCity_House3_Text_18D9A9, 4
 	giveitem ITEM_SUPER_ROD
-	setflag 152
+	setflag FLAG_RECEIVED_SUPER_ROD
 	msgbox MossdeepCity_House3_Text_18D9E3, 4
 	release
 	end
diff --git a/data/scripts/maps/MossdeepCity_House4.inc b/data/scripts/maps/MossdeepCity_House4.inc
index fd173899d..fd400ad16 100644
--- a/data/scripts/maps/MossdeepCity_House4.inc
+++ b/data/scripts/maps/MossdeepCity_House4.inc
@@ -4,7 +4,7 @@ MossdeepCity_House4_MapScripts:: @ 815AB30
 MossdeepCity_House4_EventScript_15AB31:: @ 815AB31
 	lock
 	faceplayer
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if_eq MossdeepCity_House4_EventScript_15AB46
 	msgbox MossdeepCity_House4_Text_18E0E3, 4
 	release
diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc
index 260cb4b6e..165742145 100644
--- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc
+++ b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc
@@ -32,13 +32,13 @@ MossdeepCity_SpaceCenter_1F_EventScript_15ABCC:: @ 815ABCC
 MossdeepCity_SpaceCenter_1F_EventScript_15ABD5:: @ 815ABD5
 	lock
 	faceplayer
-	checkflag 192
+	checkflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP
 	goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_15AC0C
 	msgbox MossdeepCity_SpaceCenter_1F_Text_18E335, 4
 	giveitem ITEM_SUN_STONE
 	compare RESULT, 0
 	goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_1A029B
-	setflag 192
+	setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP
 	msgbox MossdeepCity_SpaceCenter_1F_Text_18E39B, 4
 	release
 	end
diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc
index 8bf899780..55ee9ebac 100644
--- a/data/scripts/maps/MossdeepCity_StevensHouse.inc
+++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc
@@ -5,7 +5,7 @@ MossdeepCity_StevensHouse_MapScripts:: @ 815A9C5
 	.byte 0
 
 MossdeepCity_StevensHouse_MapScript1_15A9D5:: @ 815A9D5
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	call_if 0, MossdeepCity_StevensHouse_EventScript_15A9DF
 	end
 
@@ -40,8 +40,8 @@ MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B
 	waitmovement 0
 	msgbox MossdeepCity_StevensHouse_Text_18DA77, 4
 	giveitem ITEM_HM08
-	setflag 123
-	setflag 302
+	setflag FLAG_RECEIVED_HM08
+	setflag FLAG_OMIT_DIVE_FROM_STEVEN_LETTER
 	msgbox MossdeepCity_StevensHouse_Text_18DB22, 4
 	closemessage
 	delay 20
@@ -88,8 +88,8 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C
 	msgbox MossdeepCity_StevensHouse_Text_1A1102, 5
 	compare RESULT, 1
 	call_if 1, MossdeepCity_StevensHouse_EventScript_1A0678
-	setflag 968
-	setflag 298
+	setflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE
+	setflag FLAG_RECEIVED_BELDUM
 	releaseall
 	end
 
@@ -113,7 +113,7 @@ MossdeepCity_StevensHouse_EventScript_15AAF9:: @ 815AAF9
 
 MossdeepCity_StevensHouse_EventScript_15AB02:: @ 815AB02
 	lockall
-	checkflag 302
+	checkflag FLAG_OMIT_DIVE_FROM_STEVEN_LETTER
 	goto_if_eq MossdeepCity_StevensHouse_EventScript_15AB16
 	msgbox MossdeepCity_StevensHouse_Text_18DF1A, 4
 	releaseall
@@ -126,5 +126,5 @@ MossdeepCity_StevensHouse_EventScript_15AB16:: @ 815AB16
 
 MossdeepCity_StevensHouse_EventScript_15AB20:: @ 815AB20
 	giveitem ITEM_HM08, 1, 1
-	setflag 123
+	setflag FLAG_RECEIVED_HM08
 	end
diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc
index a8eec9a32..0a3570d6d 100644
--- a/data/scripts/maps/MtChimney.inc
+++ b/data/scripts/maps/MtChimney.inc
@@ -406,16 +406,16 @@ MtChimney_EventScript_15D174:: @ 815D174
 
 MtChimney_EventScript_15D17D:: @ 815D17D
 	lockall
-	checkflag 139
+	checkflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY
 	goto_if 0, MtChimney_EventScript_15D1D0
-	checkflag 115
+	checkflag FLAG_RECEIVED_METEORITE
 	goto_if_eq MtChimney_EventScript_15D1C6
 	msgbox MtChimney_Text_195870, 5
 	compare RESULT, 0
 	goto_if_eq MtChimney_EventScript_15D1BC
 	msgbox MtChimney_Text_1958C6, 4
 	giveitem ITEM_METEORITE
-	setflag 115
+	setflag FLAG_RECEIVED_METEORITE
 	releaseall
 	end
 
diff --git a/data/scripts/maps/MtPyre_1F.inc b/data/scripts/maps/MtPyre_1F.inc
index 026d54bfe..5d6e42874 100644
--- a/data/scripts/maps/MtPyre_1F.inc
+++ b/data/scripts/maps/MtPyre_1F.inc
@@ -4,13 +4,13 @@ MtPyre_1F_MapScripts:: @ 815D322
 MtPyre_1F_EventScript_15D323:: @ 815D323
 	lock
 	faceplayer
-	checkflag 282
+	checkflag FLAG_RECEIVED_CLEANSE_TAG
 	goto_if_eq MtPyre_1F_EventScript_15D352
 	msgbox MtPyre_1F_Text_196151, 4
 	giveitem ITEM_CLEANSE_TAG
 	compare RESULT, 0
 	goto_if_eq MtPyre_1F_EventScript_1A029B
-	setflag 282
+	setflag FLAG_RECEIVED_CLEANSE_TAG
 	release
 	end
 
diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc
index 533fb6e90..47a842b56 100644
--- a/data/scripts/maps/MtPyre_Summit.inc
+++ b/data/scripts/maps/MtPyre_Summit.inc
@@ -47,8 +47,8 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1
 	removeobject 4
 	removeobject 5
 	removeobject 6
-	setflag 916
-	setflag 917
+	setflag FLAG_HIDE_LEADER_MT_PYRE_SUMMIT
+	setflag FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT
 	fadescreen 0
 	delay 20
 	call MtPyre_Summit_EventScript_15D57A
@@ -64,15 +64,15 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1
 	msgbox MtPyre_Summit_Text_1B5FE6, 4
 	.endif
 	giveitem ITEM_RED_OR_BLUE_ORB
-	setflag 212
+	setflag FLAG_RECEIVED_RED_OR_BLUE_ORB
 	releaseall
 	end
 
 MtPyre_Summit_EventScript_15D57A:: @ 815D57A
-	setflag 111
+	setflag FLAG_MT_PYRE_ORB_STOLEN
 	setvar 0x4058, 1
-	clearflag 840
-	clearflag 835
+	clearflag FLAG_HIDE_STERN_SLATEPORT
+	clearflag FLAG_HIDE_GABBY_AND_TY_SLATEPORT
 	setvar 0x40a0, 1
 	setvar 0x40b9, 1
 	return
@@ -169,11 +169,11 @@ MtPyre_Summit_EventScript_15D61A:: @ 815D61A
 MtPyre_Summit_EventScript_15D623:: @ 815D623
 	lock
 	faceplayer
-	checkflag 259
+	checkflag FLAG_RETURNED_RED_OR_BLUE_ORB
 	goto_if_eq MtPyre_Summit_EventScript_15D6C4
-	checkflag 113
+	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
 	goto_if_eq MtPyre_Summit_EventScript_15D64A
-	checkflag 129
+	checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN
 	goto_if_eq MtPyre_Summit_EventScript_15D6BA
 	.ifdef SAPPHIRE
 	msgbox UnknownString_81B54BE, 4
@@ -210,7 +210,7 @@ MtPyre_Summit_EventScript_15D669:: @ 815D669
 	.else
 	msgbox MtPyre_Summit_Text_1B639C, 4
 	.endif
-	setflag 259
+	setflag FLAG_RETURNED_RED_OR_BLUE_ORB
 	release
 	end
 
diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/scripts/maps/NewMauville_Entrance.inc
index 6429ff2f9..1234f5653 100644
--- a/data/scripts/maps/NewMauville_Entrance.inc
+++ b/data/scripts/maps/NewMauville_Entrance.inc
@@ -18,7 +18,7 @@ NewMauville_Entrance_EventScript_15E4A1:: @ 815E4A1
 	return
 
 NewMauville_Entrance_MapScript1_15E4D8:: @ 815E4D8
-	setflag 2112
+	setflag FLAG_LANDMARK_NEW_MAUVILLE
 	end
 
 NewMauville_Entrance_EventScript_15E4DC:: @ 815E4DC
diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc
index 2d2a46ab4..aa6cf6310 100644
--- a/data/scripts/maps/NewMauville_Inside.inc
+++ b/data/scripts/maps/NewMauville_Inside.inc
@@ -9,7 +9,7 @@ NewMauville_Inside_MapScript1_15E56F:: @ 815E56F
 	call_if 1, NewMauville_Inside_EventScript_15E5DA
 	compare 0x4002, 1
 	call_if 1, NewMauville_Inside_EventScript_15E728
-	checkflag 2145
+	checkflag FLAG_SYS_CTRL_OBJ_DELETE
 	call_if 1, NewMauville_Inside_EventScript_15E58F
 	end
 
@@ -169,10 +169,10 @@ NewMauville_Inside_EventScript_15E900:: @ 815E900
 	playpokecry SPECIES_VOLTORB, 2
 	delay 40
 	waitpokecry
-	setflag 974
-	setflag 2145
+	setflag FLAG_HIDE_VOLTORB_1_NEW_MAUVILLE
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	dowildbattle
-	clearflag 2145
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	release
 	end
 
@@ -184,10 +184,10 @@ NewMauville_Inside_EventScript_15E91E:: @ 815E91E
 	playpokecry SPECIES_VOLTORB, 2
 	delay 40
 	waitpokecry
-	setflag 975
-	setflag 2145
+	setflag FLAG_HIDE_VOLTORB_2_NEW_MAUVILLE
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	dowildbattle
-	clearflag 2145
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	release
 	end
 
@@ -199,9 +199,9 @@ NewMauville_Inside_EventScript_15E93C:: @ 815E93C
 	playpokecry SPECIES_VOLTORB, 2
 	delay 40
 	waitpokecry
-	setflag 976
-	setflag 2145
+	setflag FLAG_HIDE_VOLTORB_3_NEW_MAUVILLE
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	dowildbattle
-	clearflag 2145
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	release
 	end
diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc
index e80df2cd2..64928f840 100644
--- a/data/scripts/maps/OldaleTown.inc
+++ b/data/scripts/maps/OldaleTown.inc
@@ -4,12 +4,12 @@ OldaleTown_MapScripts:: @ 814DD62
 
 OldaleTown_MapScript1_14DD68:: @ 814DD68
 	call OldaleTown_EventScript_1A014E
-	setflag 2064
-	checkflag 116
+	setflag FLAG_VISITED_OLDALE_TOWN
+	checkflag FLAG_ADVENTURE_STARTED
 	call_if 0, OldaleTown_EventScript_14DD92
-	checkflag 132
+	checkflag FLAG_RECEIVED_POTION_OLDALE
 	call_if 0, OldaleTown_EventScript_14DD9E
-	checkflag 116
+	checkflag FLAG_ADVENTURE_STARTED
 	call_if 1, OldaleTown_EventScript_14DD8C
 	end
 
@@ -38,11 +38,11 @@ OldaleTown_EventScript_14DDB3:: @ 814DDB3
 OldaleTown_EventScript_14DDBC:: @ 814DDBC
 	lock
 	faceplayer
-	checkflag 132
+	checkflag FLAG_RECEIVED_POTION_OLDALE
 	goto_if_eq OldaleTown_EventScript_14DE79
-	checkflag 1
+	checkflag FLAG_TEMP_1
 	goto_if_eq OldaleTown_EventScript_14DE79
-	setflag 1
+	setflag FLAG_TEMP_1
 	playbgm 420, 0
 	msgbox OldaleTown_Text_16AEF2, 4
 	closemessage
@@ -79,7 +79,7 @@ OldaleTown_EventScript_14DE4C:: @ 814DE4C
 	compare RESULT, 0
 	goto_if_eq OldaleTown_EventScript_14DE83
 	msgbox OldaleTown_Text_16AFE1, 4
-	setflag 132
+	setflag FLAG_RECEIVED_POTION_OLDALE
 	fadedefaultbgm
 	release
 	end
@@ -195,7 +195,7 @@ OldaleTown_Movement_14DECB:: @ 814DECB
 OldaleTown_EventScript_14DEDF:: @ 814DEDF
 	lock
 	faceplayer
-	checkflag 116
+	checkflag FLAG_ADVENTURE_STARTED
 	goto_if_eq OldaleTown_EventScript_14DF26
 	msgbox OldaleTown_Text_16B0CC, 4
 	closemessage
@@ -279,7 +279,7 @@ OldaleTown_EventScript_14DFC6:: @ 814DFC6
 	waitmovement 0
 	removeobject 4
 	setvar 0x40c7, 2
-	setflag 979
+	setflag FLAG_HIDE_RIVAL_OLDALE_TOWN
 	releaseall
 	end
 
diff --git a/data/scripts/maps/OldaleTown_Mart.inc b/data/scripts/maps/OldaleTown_Mart.inc
index b9698b58f..f90c787c2 100644
--- a/data/scripts/maps/OldaleTown_Mart.inc
+++ b/data/scripts/maps/OldaleTown_Mart.inc
@@ -6,7 +6,7 @@ OldaleTown_Mart_EventScript_152F79:: @ 8152F79
 	faceplayer
 	message OldaleTown_Mart_Text_1A0BE4
 	waitmessage
-	checkflag 116
+	checkflag FLAG_ADVENTURE_STARTED
 	goto_if_eq OldaleTown_Mart_EventScript_152FA8
 	pokemart OldaleTown_Mart_Items1
 	msgbox OldaleTown_Mart_Text_1A0C02, 4
@@ -43,7 +43,7 @@ OldaleTown_Mart_Items2:: @ 8152FB8
 OldaleTown_Mart_EventScript_152FC6:: @ 8152FC6
 	lock
 	faceplayer
-	checkflag 116
+	checkflag FLAG_ADVENTURE_STARTED
 	goto_if_eq OldaleTown_Mart_EventScript_152FDB
 	msgbox OldaleTown_Mart_Text_174A8A, 4
 	release
diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc
index 494f109fe..69503908a 100644
--- a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc
+++ b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc
@@ -26,7 +26,7 @@ OldaleTown_PokemonCenter_1F_EventScript_152F2E:: @ 8152F2E
 OldaleTown_PokemonCenter_1F_EventScript_152F37:: @ 8152F37
 	lock
 	faceplayer
-	checkflag 2049
+	checkflag FLAG_SYS_POKEDEX_GET
 	goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_152F4C
 	msgbox OldaleTown_PokemonCenter_1F_Text_1749C0, 4
 	release
diff --git a/data/scripts/maps/PacifidlogTown.inc b/data/scripts/maps/PacifidlogTown.inc
index c7cfb08df..085d083d8 100644
--- a/data/scripts/maps/PacifidlogTown.inc
+++ b/data/scripts/maps/PacifidlogTown.inc
@@ -4,7 +4,7 @@ PacifidlogTown_MapScripts:: @ 814E8EE
 	.byte 0
 
 PacifidlogTown_MapScript1_14E8F9:: @ 814E8F9
-	setflag 2069
+	setflag FLAG_VISITED_PACIFIDLOG_TOWN
 	end
 
 PacifidlogTown_MapScript1_14E8FD:: @ 814E8FD
diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/scripts/maps/PacifidlogTown_House2.inc
index e04a8caae..942f5626b 100644
--- a/data/scripts/maps/PacifidlogTown_House2.inc
+++ b/data/scripts/maps/PacifidlogTown_House2.inc
@@ -6,13 +6,13 @@ PacifidlogTown_House2_EventScript_154168:: @ 8154168
 	faceplayer
 	dodailyevents
 	call PacifidlogTown_House2_EventScript_1541B4
-	checkflag 299
+	checkflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK
 	goto_if_eq PacifidlogTown_House2_EventScript_154254
-	checkflag 300
+	checkflag FLAG_MET_FANCLUB_YOUNGER_BROTHER
 	call_if 1, PacifidlogTown_House2_EventScript_1541CE
-	checkflag 300
+	checkflag FLAG_MET_FANCLUB_YOUNGER_BROTHER
 	call_if 0, PacifidlogTown_House2_EventScript_1541D7
-	setflag 300
+	setflag FLAG_MET_FANCLUB_YOUNGER_BROTHER
 	specialvar RESULT, GetLeadMonFriendshipScore
 	compare RESULT, 4
 	goto_if 4, PacifidlogTown_House2_EventScript_1541EC
@@ -23,7 +23,7 @@ PacifidlogTown_House2_EventScript_154168:: @ 8154168
 	end
 
 PacifidlogTown_House2_EventScript_1541B4:: @ 81541B4
-	checkflag 299
+	checkflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK
 	goto_if 0, PacifidlogTown_House2_EventScript_1A14DC
 	specialvar RESULT, sub_810F908
 	compare RESULT, 0
@@ -40,7 +40,7 @@ PacifidlogTown_House2_EventScript_1541D7:: @ 81541D7
 	return
 
 PacifidlogTown_House2_EventScript_1541E8:: @ 81541E8
-	clearflag 299
+	clearflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK
 	return
 
 PacifidlogTown_House2_EventScript_1541EC:: @ 81541EC
@@ -48,7 +48,7 @@ PacifidlogTown_House2_EventScript_1541EC:: @ 81541EC
 	giveitem ITEM_TM27
 	compare RESULT, 0
 	goto_if_eq PacifidlogTown_House2_EventScript_1A029B
-	setflag 299
+	setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK
 	special sub_810F950
 	msgbox PacifidlogTown_House2_Text_179283, 4
 	release
@@ -64,7 +64,7 @@ PacifidlogTown_House2_EventScript_154225:: @ 8154225
 	giveitem ITEM_TM21
 	compare RESULT, 0
 	goto_if_eq PacifidlogTown_House2_EventScript_1A029B
-	setflag 299
+	setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK
 	special sub_810F950
 	msgbox PacifidlogTown_House2_Text_179283, 4
 	release
diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/scripts/maps/PacifidlogTown_House3.inc
index 28b9dbd80..a2e033a24 100644
--- a/data/scripts/maps/PacifidlogTown_House3.inc
+++ b/data/scripts/maps/PacifidlogTown_House3.inc
@@ -4,7 +4,7 @@ PacifidlogTown_House3_MapScripts:: @ 815429D
 PacifidlogTown_House3_EventScript_15429E:: @ 815429E
 	lock
 	faceplayer
-	checkflag 154
+	checkflag FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED
 	goto_if_eq PacifidlogTown_House3_EventScript_154338
 	setvar 0x8008, 2
 	copyvar 0x8004, 0x8008
@@ -30,7 +30,7 @@ PacifidlogTown_House3_EventScript_15429E:: @ 815429E
 	waitstate
 	getspeciesname 0, 0x8009
 	msgbox PacifidlogTown_House3_Text_1794C4, 4
-	setflag 154
+	setflag FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED
 	release
 	end
 
diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc
index b4548ddce..45cdce991 100644
--- a/data/scripts/maps/PetalburgCity.inc
+++ b/data/scripts/maps/PetalburgCity.inc
@@ -4,7 +4,7 @@ PetalburgCity_MapScripts:: @ 814B70C
 	.byte 0
 
 PetalburgCity_MapScript1_14B717:: @ 814B717
-	setflag 2070
+	setflag FLAG_VISITED_PETALBURG_CITY
 	compare 0x4057, 0
 	call_if 1, PetalburgCity_EventScript_14B731
 	compare 0x4057, 2
diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc
index 6c92316d6..e2967169f 100644
--- a/data/scripts/maps/PetalburgCity_Gym.inc
+++ b/data/scripts/maps/PetalburgCity_Gym.inc
@@ -48,7 +48,7 @@ PetalburgCity_Gym_MapScript1_15451B:: @ 815451B
 	call_if 1, PetalburgCity_Gym_EventScript_15453B
 	compare 0x4085, 6
 	call_if 0, PetalburgCity_Gym_EventScript_154543
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	call_if 1, PetalburgCity_Gym_EventScript_15454B
 	end
 
@@ -86,7 +86,7 @@ PetalburgCity_Gym_EventScript_15456C:: @ 815456C
 	waitmovement 0
 	playse 9
 	removeobject 10
-	setflag 726
+	setflag FLAG_HIDE_WALLY_PETALBURG
 	delay 30
 	applymovement 255, PetalburgCity_Gym_Movement_1A0841
 	waitmovement 0
@@ -205,12 +205,12 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669
 	compare 0x8008, 3
 	call_if 1, PetalburgCity_Gym_EventScript_154872
 	removeobject 10
-	setflag 728
+	setflag FLAG_HIDE_WALLY_MOM_PETALBURG_1
 	setvar 0x4085, 1
 	setvar 0x4057, 2
-	clearflag 726
-	clearflag 866
-	setflag 889
+	clearflag FLAG_HIDE_WALLY_PETALBURG
+	clearflag FLAG_HIDE_WALLY_PETALBURG_GYM
+	setflag FLAG_HIDE_RIVAL_BIRCH_LAB
 	special InitBirchState
 	warp MAP_PETALBURG_CITY, 255, 15, 8
 	waitstate
@@ -354,9 +354,9 @@ PetalburgCity_Gym_EventScript_15493D:: @ 815493D
 	call PetalburgCity_Gym_EventScript_154969
 	compare RESULT, 1
 	goto_if_eq PetalburgCity_Gym_EventScript_1549B8
-	checkflag 169
+	checkflag FLAG_RECEIVED_TM42
 	goto_if 0, PetalburgCity_Gym_EventScript_154A2C
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if_eq PetalburgCity_Gym_EventScript_154B69
 	msgbox PetalburgCity_Gym_Text_17AA6B, 4
 	release
@@ -397,15 +397,15 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6
 	waitmessage
 	call PetalburgCity_Gym_EventScript_1A02C5
 	msgbox PetalburgCity_Gym_Text_17A805, 4
-	setflag 1217
+	setflag FLAG_DEFEATED_PETALBURG_GYM
 	setvar 0x4085, 7
-	setflag 2059
+	setflag FLAG_BADGE05_GET
 	call PetalburgCity_Gym_EventScript_1A0424
-	setflag 913
-	clearflag 912
+	setflag FLAG_HIDE_WATTSON_MAUVILLE_GYM
+	clearflag FLAG_HIDE_WATTSON_MAUVILLE
 	setvar 0x8008, 5
 	call PetalburgCity_Gym_EventScript_1A01C0
-	clearflag 940
+	clearflag FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL
 	call PetalburgCity_Gym_EventScript_1544ED
 	special DrawWholeMapView
 	goto PetalburgCity_Gym_EventScript_154A2C
@@ -415,7 +415,7 @@ PetalburgCity_Gym_EventScript_154A2C:: @ 8154A2C
 	giveitem ITEM_TM42
 	compare RESULT, 0
 	goto_if_eq PetalburgCity_Gym_EventScript_1A029B
-	setflag 169
+	setflag FLAG_RECEIVED_TM42
 	msgbox PetalburgCity_Gym_Text_17A8CF, 4
 	msgbox PetalburgCity_Gym_Text_17A976, 4
 	closemessage
@@ -765,7 +765,7 @@ PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3
 
 PetalburgCity_Gym_EventScript_154DF6:: @ 8154DF6
 	trainerbattle 2, OPPONENT_RANDALL, 0, PetalburgCity_Gym_Text_17ADA5, PetalburgCity_Gym_Text_17AE11, PetalburgCity_Gym_EventScript_154E1A
-	checkflag 1217
+	checkflag FLAG_DEFEATED_PETALBURG_GYM
 	goto_if_eq PetalburgCity_Gym_EventScript_154E29
 	msgbox PetalburgCity_Gym_Text_17AE30, 6
 	end
@@ -783,7 +783,7 @@ PetalburgCity_Gym_EventScript_154E29:: @ 8154E29
 
 PetalburgCity_Gym_EventScript_154E32:: @ 8154E32
 	trainerbattle 2, OPPONENT_PARKER, 0, PetalburgCity_Gym_Text_17AF5A, PetalburgCity_Gym_Text_17AF98, PetalburgCity_Gym_EventScript_154E56
-	checkflag 1217
+	checkflag FLAG_DEFEATED_PETALBURG_GYM
 	goto_if_eq PetalburgCity_Gym_EventScript_154E65
 	msgbox PetalburgCity_Gym_Text_17AFD3, 6
 	end
@@ -801,7 +801,7 @@ PetalburgCity_Gym_EventScript_154E65:: @ 8154E65
 
 PetalburgCity_Gym_EventScript_154E6E:: @ 8154E6E
 	trainerbattle 2, OPPONENT_GEORGE, 0, PetalburgCity_Gym_Text_17B058, PetalburgCity_Gym_Text_17B0F7, PetalburgCity_Gym_EventScript_154E92
-	checkflag 1217
+	checkflag FLAG_DEFEATED_PETALBURG_GYM
 	goto_if_eq PetalburgCity_Gym_EventScript_154EA1
 	msgbox PetalburgCity_Gym_Text_17B12C, 6
 	end
@@ -819,7 +819,7 @@ PetalburgCity_Gym_EventScript_154EA1:: @ 8154EA1
 
 PetalburgCity_Gym_EventScript_154EAA:: @ 8154EAA
 	trainerbattle 2, OPPONENT_BERKE, 0, PetalburgCity_Gym_Text_17B237, PetalburgCity_Gym_Text_17B2C0, PetalburgCity_Gym_EventScript_154ECE
-	checkflag 1217
+	checkflag FLAG_DEFEATED_PETALBURG_GYM
 	goto_if_eq PetalburgCity_Gym_EventScript_154EDD
 	msgbox PetalburgCity_Gym_Text_17B2E4, 6
 	end
@@ -837,7 +837,7 @@ PetalburgCity_Gym_EventScript_154EDD:: @ 8154EDD
 
 PetalburgCity_Gym_EventScript_154EE6:: @ 8154EE6
 	trainerbattle 2, OPPONENT_MARY, 0, PetalburgCity_Gym_Text_17B3F7, PetalburgCity_Gym_Text_17B454, PetalburgCity_Gym_EventScript_154F0A
-	checkflag 1217
+	checkflag FLAG_DEFEATED_PETALBURG_GYM
 	goto_if_eq PetalburgCity_Gym_EventScript_154F19
 	msgbox PetalburgCity_Gym_Text_17B46F, 6
 	end
@@ -855,7 +855,7 @@ PetalburgCity_Gym_EventScript_154F19:: @ 8154F19
 
 PetalburgCity_Gym_EventScript_154F22:: @ 8154F22
 	trainerbattle 2, OPPONENT_LORI, 0, PetalburgCity_Gym_Text_17B58D, PetalburgCity_Gym_Text_17B5CB, PetalburgCity_Gym_EventScript_154F46
-	checkflag 1217
+	checkflag FLAG_DEFEATED_PETALBURG_GYM
 	goto_if_eq PetalburgCity_Gym_EventScript_154F55
 	msgbox PetalburgCity_Gym_Text_17B5EA, 6
 	end
@@ -873,7 +873,7 @@ PetalburgCity_Gym_EventScript_154F55:: @ 8154F55
 
 PetalburgCity_Gym_EventScript_154F5E:: @ 8154F5E
 	trainerbattle 2, OPPONENT_JODY, 0, PetalburgCity_Gym_Text_17B6D4, PetalburgCity_Gym_Text_17B732, PetalburgCity_Gym_EventScript_154F82
-	checkflag 1217
+	checkflag FLAG_DEFEATED_PETALBURG_GYM
 	goto_if_eq PetalburgCity_Gym_EventScript_154F91
 	msgbox PetalburgCity_Gym_Text_17B749, 6
 	end
@@ -1021,7 +1021,7 @@ PetalburgCity_Gym_EventScript_155187:: @ 8155187
 PetalburgCity_Gym_EventScript_15518B:: @ 815518B
 	lock
 	faceplayer
-	checkflag 1217
+	checkflag FLAG_DEFEATED_PETALBURG_GYM
 	goto_if_eq PetalburgCity_Gym_EventScript_1551A0
 	msgbox PetalburgCity_Gym_Text_17AB96, 4
 	release
@@ -1034,14 +1034,14 @@ PetalburgCity_Gym_EventScript_1551A0:: @ 81551A0
 
 PetalburgCity_Gym_EventScript_1551AA:: @ 81551AA
 	lockall
-	checkflag 2059
+	checkflag FLAG_BADGE05_GET
 	goto_if_eq PetalburgCity_Gym_EventScript_1551CA
 	goto PetalburgCity_Gym_EventScript_1551D4
 	end
 
 PetalburgCity_Gym_EventScript_1551BA:: @ 81551BA
 	lockall
-	checkflag 2059
+	checkflag FLAG_BADGE05_GET
 	goto_if_eq PetalburgCity_Gym_EventScript_1551CA
 	goto PetalburgCity_Gym_EventScript_1551D4
 	end
diff --git a/data/scripts/maps/PetalburgCity_Mart.inc b/data/scripts/maps/PetalburgCity_Mart.inc
index e4186eaae..66e247323 100644
--- a/data/scripts/maps/PetalburgCity_Mart.inc
+++ b/data/scripts/maps/PetalburgCity_Mart.inc
@@ -6,7 +6,7 @@ PetalburgCity_Mart_EventScript_1552B0:: @ 81552B0
 	faceplayer
 	message PetalburgCity_Mart_Text_1A0BE4
 	waitmessage
-	checkflag 296
+	checkflag FLAG_PETALBURG_MART_EXPANDED_ITEMS
 	goto_if_eq PetalburgCity_Mart_EventScript_1552EA
 	pokemart PetalburgCity_Mart_Items1
 	msgbox PetalburgCity_Mart_Text_1A0C02, 4
diff --git a/data/scripts/maps/PetalburgCity_WallysHouse.inc b/data/scripts/maps/PetalburgCity_WallysHouse.inc
index d8e95d8c6..110b798b7 100644
--- a/data/scripts/maps/PetalburgCity_WallysHouse.inc
+++ b/data/scripts/maps/PetalburgCity_WallysHouse.inc
@@ -4,21 +4,21 @@ PetalburgCity_WallysHouse_MapScripts:: @ 81543C3
 PetalburgCity_WallysHouse_EventScript_1543C4:: @ 81543C4
 	lock
 	faceplayer
-	checkflag 126
+	checkflag FLAG_DEFEATED_WALLY_VICTORY_ROAD
 	goto_if_eq PetalburgCity_WallysHouse_EventScript_1543F7
-	checkflag 122
+	checkflag FLAG_RECEIVED_HM03
 	goto_if_eq PetalburgCity_WallysHouse_EventScript_154427
-	checkflag 1217
+	checkflag FLAG_DEFEATED_PETALBURG_GYM
 	goto_if_eq PetalburgCity_WallysHouse_EventScript_154406
-	checkflag 135
+	checkflag FLAG_THANKED_FOR_PLAYING_WITH_WALLY
 	goto_if_eq PetalburgCity_WallysHouse_EventScript_15443B
 	msgbox PetalburgCity_WallysHouse_Text_179805, 4
-	setflag 135
+	setflag FLAG_THANKED_FOR_PLAYING_WITH_WALLY
 	release
 	end
 
 PetalburgCity_WallysHouse_EventScript_1543F7:: @ 81543F7
-	checkflag 122
+	checkflag FLAG_RECEIVED_HM03
 	goto_if_eq PetalburgCity_WallysHouse_EventScript_154431
 	goto PetalburgCity_WallysHouse_EventScript_154406
 	end
@@ -26,7 +26,7 @@ PetalburgCity_WallysHouse_EventScript_1543F7:: @ 81543F7
 PetalburgCity_WallysHouse_EventScript_154406:: @ 8154406
 	msgbox PetalburgCity_WallysHouse_Text_179996, 4
 	giveitem ITEM_HM03
-	setflag 122
+	setflag FLAG_RECEIVED_HM03
 	msgbox PetalburgCity_WallysHouse_Text_179B14, 4
 	release
 	end
@@ -49,9 +49,9 @@ PetalburgCity_WallysHouse_EventScript_15443B:: @ 815443B
 PetalburgCity_WallysHouse_EventScript_154445:: @ 8154445
 	lock
 	faceplayer
-	checkflag 122
+	checkflag FLAG_RECEIVED_HM03
 	goto_if_eq PetalburgCity_WallysHouse_EventScript_15446D
-	checkflag 1217
+	checkflag FLAG_DEFEATED_PETALBURG_GYM
 	goto_if_eq PetalburgCity_WallysHouse_EventScript_154463
 	msgbox PetalburgCity_WallysHouse_Text_179C2C, 4
 	release
diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc
index 0b0c72f70..c38d4d559 100644
--- a/data/scripts/maps/PetalburgWoods.inc
+++ b/data/scripts/maps/PetalburgWoods.inc
@@ -241,13 +241,13 @@ PetalburgWoods_EventScript_15CED3:: @ 815CED3
 PetalburgWoods_EventScript_15CEDC:: @ 815CEDC
 	lock
 	faceplayer
-	checkflag 297
+	checkflag FLAG_RECEIVED_MIRACLE_SEED
 	goto_if_eq PetalburgWoods_EventScript_15CF0B
 	msgbox PetalburgWoods_Text_19549E, 4
 	giveitem ITEM_MIRACLE_SEED
 	compare RESULT, 0
 	goto_if_eq PetalburgWoods_EventScript_1A029B
-	setflag 297
+	setflag FLAG_RECEIVED_MIRACLE_SEED
 	release
 	end
 
diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc
index 747b56197..1810a6495 100644
--- a/data/scripts/maps/Route101.inc
+++ b/data/scripts/maps/Route101.inc
@@ -217,8 +217,8 @@ Route101_EventScript_14EA76:: @ 814EA76
 Route101_EventScript_14EA7F:: @ 814EA7F
 	lock
 	faceplayer
-	setflag 2048
-	setflag 82
+	setflag FLAG_SYS_POKEMON_GET
+	setflag FLAG_RESCUED_BIRCH
 	fadescreen 1
 	removeobject 4
 	setobjectxy 255, 6, 13
@@ -230,9 +230,9 @@ Route101_EventScript_14EA7F:: @ 814EA7F
 	waitmovement 0
 	msgbox Route101_Text_16D191, 4
 	special ScrSpecial_HealPlayerParty
-	setflag 720
-	clearflag 721
-	setflag 700
+	setflag FLAG_HIDE_BIRCH_BATTLE_POOCHYENA
+	clearflag FLAG_HIDE_BIRCH_IN_LAB
+	setflag FLAG_HIDE_BIRCH_STARTERS_BAG
 	setvar 0x4084, 2
 	setvar 0x4060, 3
 	clearflag 0x4000
diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc
index ff0ccce30..ee9decedc 100644
--- a/data/scripts/maps/Route103.inc
+++ b/data/scripts/maps/Route103.inc
@@ -119,10 +119,10 @@ Route103_EventScript_14ED46:: @ 814ED46
 	removeobject 2
 	setvar 0x4062, 1
 	setvar 0x4084, 4
-	clearflag 889
-	setflag 130
+	clearflag FLAG_HIDE_RIVAL_BIRCH_LAB
+	setflag FLAG_DEFEATED_RIVAL_ROUTE103
 	setvar 0x40c7, 1
-	clearflag 979
+	clearflag FLAG_HIDE_RIVAL_OLDALE_TOWN
 	savebgm 0
 	fadedefaultbgm
 	releaseall
diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc
index 651f2afb4..92f5d5593 100644
--- a/data/scripts/maps/Route104.inc
+++ b/data/scripts/maps/Route104.inc
@@ -17,27 +17,27 @@ Route104_MapScript1_14EEA8:: @ 814EEA8
 	end
 
 Route104_EventScript_14EEAE:: @ 814EEAE
-	checkflag 127
+	checkflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER
 	goto_if 0, Route104_EventScript_14EEC4
-	checkflag 2057
+	checkflag FLAG_BADGE03_GET
 	goto_if 0, Route104_EventScript_14EEC4
-	clearflag 906
+	clearflag FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE
 	return
 
 Route104_EventScript_14EEC4:: @ 814EEC4
-	setflag 906
+	setflag FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE
 	return
 
 Route104_EventScript_14EEC8:: @ 814EEC8
 	lock
 	faceplayer
-	checkflag 246
+	checkflag FLAG_RECEIVED_CHESTO_BERRY_ROUTE104
 	goto_if_eq Route104_EventScript_14EEFF
 	msgbox Route104_Text_1C55B9, 4
 	giveitem ITEM_CHESTO_BERRY
 	compare RESULT, 0
 	goto_if_eq Route104_EventScript_1A029B
-	setflag 246
+	setflag FLAG_RECEIVED_CHESTO_BERRY_ROUTE104
 	msgbox Route104_Text_1C5665, 4
 	release
 	end
@@ -50,13 +50,13 @@ Route104_EventScript_14EEFF:: @ 814EEFF
 Route104_EventScript_14EF09:: @ 814EF09
 	lock
 	faceplayer
-	checkflag 279
+	checkflag FLAG_RECEIVED_WHITE_HERB
 	goto_if_eq Route104_EventScript_14EF38
 	msgbox Route104_Text_16DD91, 4
 	giveitem ITEM_WHITE_HERB
 	compare RESULT, 0
 	goto_if_eq Route104_EventScript_1A029B
-	setflag 279
+	setflag FLAG_RECEIVED_WHITE_HERB
 	release
 	end
 
@@ -104,13 +104,13 @@ Route104_EventScript_14EF8A:: @ 814EF8A
 Route104_EventScript_14EF93:: @ 814EF93
 	lock
 	faceplayer
-	checkflag 262
+	checkflag FLAG_RECEIVED_TM09
 	goto_if_eq Route104_EventScript_14EFC2
 	msgbox Route104_Text_16DC5F, 4
 	giveitem ITEM_TM09
 	compare RESULT, 0
 	goto_if_eq Route104_EventScript_1A029B
-	setflag 262
+	setflag FLAG_RECEIVED_TM09
 	release
 	end
 
@@ -145,22 +145,22 @@ Route104_EventScript_14EFD5:: @ 814EFD5
 	setobjectxyperm 2, 12, 8
 	addobject 2
 	setobjectpriority 2, 0, 11, 0
-	clearflag 740
+	clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
 	applymovement 2, Route104_Movement_14F16F
 	waitmovement 0
 	addobject 4
-	clearflag 743
+	clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD
 	call Route104_EventScript_1A02EF
-	setflag 742
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104
 	hideobject 7, 0, 19
 	copyvar 0x4096, 0x8008
 	resetobjectpriority 255, 0, 19
 	resetobjectpriority 2, 0, 11
 	moveobjectoffscreen 2
 	setvar 0x408e, 0
-	checkflag 189
+	checkflag FLAG_DELIVERED_STEVEN_LETTER
 	goto_if 0, Route104_EventScript_14F08B
-	checkflag 189
+	checkflag FLAG_DELIVERED_STEVEN_LETTER
 	goto_if_eq Route104_EventScript_14F095
 	end
 
diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc
index a4c360bc0..9369f7573 100644
--- a/data/scripts/maps/Route104_MrBrineysHouse.inc
+++ b/data/scripts/maps/Route104_MrBrineysHouse.inc
@@ -3,15 +3,15 @@ Route104_MrBrineysHouse_MapScripts:: @ 815BCB2
 	.byte 0
 
 Route104_MrBrineysHouse_MapScript1_15BCB8:: @ 815BCB8
-	setflag 2109
+	setflag FLAG_LANDMARK_MR_BRINEY_HOUSE
 	compare 0x4090, 1
 	call_if 1, Route104_MrBrineysHouse_EventScript_15BCD4
-	checkflag 188
+	checkflag FLAG_RECEIVED_POKENAV
 	call_if 1, Route104_MrBrineysHouse_EventScript_15BCD0
 	end
 
 Route104_MrBrineysHouse_EventScript_15BCD0:: @ 815BCD0
-	setflag 814
+	setflag FLAG_HIDE_RIVAL_RUSTBORO
 	return
 
 Route104_MrBrineysHouse_EventScript_15BCD4:: @ 815BCD4
@@ -24,17 +24,17 @@ Route104_MrBrineysHouse_EventScript_15BCD4:: @ 815BCD4
 Route104_MrBrineysHouse_EventScript_15BCEB:: @ 815BCEB
 	lock
 	faceplayer
-	checkflag 147
+	checkflag FLAG_MR_BRINEY_SAILING_INTRO
 	call_if 0, Route104_MrBrineysHouse_EventScript_15BD0E
-	checkflag 189
+	checkflag FLAG_DELIVERED_STEVEN_LETTER
 	goto_if 0, Route104_MrBrineysHouse_EventScript_15BD65
-	checkflag 149
+	checkflag FLAG_DELIVERED_DEVON_GOODS
 	goto_if 0, Route104_MrBrineysHouse_EventScript_15BD7E
 	goto Route104_MrBrineysHouse_EventScript_15BD32
 	end
 
 Route104_MrBrineysHouse_EventScript_15BD0E:: @ 815BD0E
-	setflag 147
+	setflag FLAG_MR_BRINEY_SAILING_INTRO
 	msgbox Route104_MrBrineysHouse_Text_191A82, 4
 	msgbox Route104_MrBrineysHouse_Text_191AAD, 5
 	compare RESULT, 0
@@ -80,9 +80,9 @@ Route104_MrBrineysHouse_EventScript_15BDAB:: @ 815BDAB
 	msgbox Route104_MrBrineysHouse_Text_191BFD, 4
 	call Route104_MrBrineysHouse_EventScript_1A010C
 	setvar 0x408e, 1
-	clearflag 738
-	setflag 739
-	setflag 881
+	clearflag FLAG_HIDE_MR_BRINEY_ROUTE104
+	setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE
+	setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE
 	warp MAP_ROUTE104, 255, 13, 51
 	waitstate
 	releaseall
diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc
index 4c5becf88..07abd21bc 100644
--- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc
+++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc
@@ -3,12 +3,12 @@ Route104_PrettyPetalFlowerShop_MapScripts:: @ 815BDE4
 	.byte 0
 
 Route104_PrettyPetalFlowerShop_MapScript1_15BDEA:: @ 815BDEA
-	setflag 2108
-	checkflag 127
+	setflag FLAG_LANDMARK_FLOWER_SHOP
+	checkflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER
 	goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03
-	checkflag 2057
+	checkflag FLAG_BADGE03_GET
 	goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03
-	setflag 1
+	setflag FLAG_TEMP_1
 	end
 
 Route104_PrettyPetalFlowerShop_EventScript_15BE03:: @ 815BE03
@@ -18,12 +18,12 @@ Route104_PrettyPetalFlowerShop_EventScript_15BE03:: @ 815BE03
 Route104_PrettyPetalFlowerShop_EventScript_15BE0B:: @ 815BE0B
 	lock
 	faceplayer
-	checkflag 1
+	checkflag FLAG_TEMP_1
 	goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE7C
 	msgbox Route104_PrettyPetalFlowerShop_Text_1C5EC6, 4
-	checkflag 127
+	checkflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER
 	goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE4A
-	setflag 127
+	setflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER
 	msgbox Route104_PrettyPetalFlowerShop_Text_1C5F48, 5
 	compare RESULT, 1
 	call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE6A
@@ -72,7 +72,7 @@ Route104_PrettyPetalFlowerShop_Items:: @ 815BE94
 Route104_PrettyPetalFlowerShop_EventScript_15BEA4:: @ 815BEA4
 	lock
 	faceplayer
-	checkflag 94
+	checkflag FLAG_RECEIVED_WAILMER_PAIL
 	goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BEB9
 	msgbox Route104_PrettyPetalFlowerShop_Text_1C61E8, 4
 	release
@@ -82,7 +82,7 @@ Route104_PrettyPetalFlowerShop_EventScript_15BEB9:: @ 815BEB9
 	msgbox Route104_PrettyPetalFlowerShop_Text_1C6158, 4
 	giveitem ITEM_WAILMER_PAIL
 	msgbox Route104_PrettyPetalFlowerShop_Text_1C61E8, 4
-	setflag 94
+	setflag FLAG_RECEIVED_WAILMER_PAIL
 	release
 	end
 
@@ -90,15 +90,15 @@ Route104_PrettyPetalFlowerShop_EventScript_15BEDA:: @ 815BEDA
 	lock
 	faceplayer
 	dodailyevents
-	checkflag 2256
+	checkflag FLAG_DAILY_RECEIVED_BERRY_FLOWER_SHOP
 	goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BF1A
 	msgbox Route104_PrettyPetalFlowerShop_Text_1C62DA, 4
 	random 8
-	addvar RESULT, 133
+	addvar RESULT, ITEM_CHERI_BERRY
 	giveitem RESULT
 	compare RESULT, 0
 	goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_1A029B
-	setflag 2256
+	setflag FLAG_DAILY_RECEIVED_BERRY_FLOWER_SHOP
 	msgbox Route104_PrettyPetalFlowerShop_Text_1C6335, 4
 	release
 	end
diff --git a/data/scripts/maps/Route104_Prototype.inc b/data/scripts/maps/Route104_Prototype.inc
index 3c218747a..b3b256d79 100644
--- a/data/scripts/maps/Route104_Prototype.inc
+++ b/data/scripts/maps/Route104_Prototype.inc
@@ -16,9 +16,9 @@ Route104_Prototype_EventScript_160C4B:: @ 8160C4B
 	goto_if 0, Route104_Prototype_EventScript_160C99
 	checktrainerflag OPPONENT_MIKE_1
 	goto_if 0, Route104_Prototype_EventScript_160C99
-	setflag 215
+	setflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_1
 	msgbox Route104_Prototype_Text_19B267, 4
-	checkflag 216
+	checkflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_2
 	goto_if_eq Route104_Prototype_EventScript_160CFB
 	release
 	end
@@ -43,9 +43,9 @@ Route104_Prototype_EventScript_160CA3:: @ 8160CA3
 	goto_if 0, Route104_Prototype_EventScript_160CF1
 	checktrainerflag OPPONENT_MIKE_1
 	goto_if 0, Route104_Prototype_EventScript_160CF1
-	setflag 216
+	setflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_2
 	msgbox Route104_Prototype_Text_19B2E9, 4
-	checkflag 215
+	checkflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_1
 	goto_if_eq Route104_Prototype_EventScript_160CFB
 	release
 	end
diff --git a/data/scripts/maps/Route105.inc b/data/scripts/maps/Route105.inc
index 1182dae7e..de7188aae 100644
--- a/data/scripts/maps/Route105.inc
+++ b/data/scripts/maps/Route105.inc
@@ -3,7 +3,7 @@ Route105_MapScripts:: @ 814F298
 	.byte 0
 
 Route105_MapScript1_14F29E:: @ 814F29E
-	checkflag 228
+	checkflag FLAG_REGI_DOORS_OPENED
 	call_if 0, Route105_EventScript_14F2A8
 	end
 
diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc
index 9f0ef8c8d..1277168e0 100644
--- a/data/scripts/maps/Route109.inc
+++ b/data/scripts/maps/Route109.inc
@@ -43,14 +43,14 @@ Route109_EventScript_14F548:: @ 814F548
 	applymovement 255, Route109_Movement_14F670
 	waitmovement 0
 	addobject 4
-	clearflag 743
+	clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD
 	setobjectxyperm 2, 12, 8
 	addobject 2
 	setobjectpriority 2, 0, 11, 0
 	applymovement 2, Route109_Movement_14F67D
 	waitmovement 0
-	clearflag 740
-	setflag 744
+	clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109
 	hideobject 1, 0, 24
 	msgbox Route109_Text_16B4B5, 4
 	closemessage
@@ -271,7 +271,7 @@ Route109_Movement_14F67D:: @ 814F67D
 Route109_EventScript_14F680:: @ 814F680
 	lock
 	faceplayer
-	checkflag 149
+	checkflag FLAG_DELIVERED_DEVON_GOODS
 	goto_if 0, Route109_EventScript_14F691
 	goto Route109_EventScript_14F6AF
 	end
@@ -328,7 +328,7 @@ Route109_EventScript_14F725:: @ 814F725
 	lock
 	faceplayer
 	special GetPlayerBigGuyGirlString
-	checkflag 280
+	checkflag FLAG_RECEIVED_SOFT_SAND
 	goto_if_eq Route109_EventScript_14F762
 	msgbox Route109_Text_16E433, 4
 	giveitem ITEM_SOFT_SAND
@@ -337,7 +337,7 @@ Route109_EventScript_14F725:: @ 814F725
 	closemessage
 	applymovement LAST_TALKED, Route109_Movement_1A083D
 	waitmovement 0
-	setflag 280
+	setflag FLAG_RECEIVED_SOFT_SAND
 	release
 	end
 
diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/scripts/maps/Route109_SeashoreHouse.inc
index 4d8d363aa..f60413d81 100644
--- a/data/scripts/maps/Route109_SeashoreHouse.inc
+++ b/data/scripts/maps/Route109_SeashoreHouse.inc
@@ -3,20 +3,20 @@ Route109_SeashoreHouse_MapScripts:: @ 8160DCA
 	.byte 0
 
 Route109_SeashoreHouse_MapScript1_160DD0:: @ 8160DD0
-	setflag 2111
+	setflag FLAG_LANDMARK_SEASHORE_HOUSE
 	end
 
 Route109_SeashoreHouse_EventScript_160DD4:: @ 8160DD4
 	lock
 	faceplayer
-	checkflag 140
+	checkflag FLAG_RECEIVED_6_SODA_POP
 	goto_if_eq Route109_SeashoreHouse_EventScript_160E36
-	checkflag 141
+	checkflag FLAG_DEFEATED_SEASHORE_HOUSE_TRAINERS
 	goto_if_eq Route109_SeashoreHouse_EventScript_160E08
-	checkflag 2
+	checkflag FLAG_TEMP_2
 	goto_if_eq Route109_SeashoreHouse_EventScript_160DFE
 	msgbox Route109_SeashoreHouse_Text_19B4D9, 4
-	setflag 2
+	setflag FLAG_TEMP_2
 	release
 	end
 
@@ -30,7 +30,7 @@ Route109_SeashoreHouse_EventScript_160E08:: @ 8160E08
 	giveitem ITEM_SODA_POP, 6
 	compare RESULT, 0
 	goto_if_eq Route109_SeashoreHouse_EventScript_160E2C
-	setflag 140
+	setflag FLAG_RECEIVED_6_SODA_POP
 	release
 	end
 
@@ -100,7 +100,7 @@ Route109_SeashoreHouse_EventScript_160F09:: @ 8160F09
 	goto_if 0, Route109_SeashoreHouse_EventScript_160F29
 	checktrainerflag OPPONENT_SIMON
 	goto_if 0, Route109_SeashoreHouse_EventScript_160F29
-	setflag 141
+	setflag FLAG_DEFEATED_SEASHORE_HOUSE_TRAINERS
 	release
 	end
 
diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc
index c60bc366e..8e33517ca 100644
--- a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc
+++ b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc
@@ -28,7 +28,7 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7:: @ 81634F7
 	call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_16351D
 	compare RESULT, 0
 	goto_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523
-	setflag 2091
+	setflag FLAG_SYS_CYCLING_ROAD
 	setvar 0x4001, 1
 	releaseall
 	end
@@ -55,7 +55,7 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_16353A:: @ 816353A
 @ Coord event directly in front of the gatesman heading right to left
 	lockall
 	setvar 0x40a9, 0
-	clearflag 2091
+	clearflag FLAG_SYS_CYCLING_ROAD
 	setvar 0x4001, 0
 	releaseall
 	end
diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc
index cf18a8e36..51cab5ddd 100644
--- a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc
+++ b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc
@@ -13,7 +13,7 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B:: @ 816348B
 	specialvar RESULT, GetPlayerAvatarBike
 	compare RESULT, 0
 	goto_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634A6
-	setflag 2091
+	setflag FLAG_SYS_CYCLING_ROAD
 	setvar 0x4001, 1
 	releaseall
 	end
@@ -32,7 +32,7 @@ Route110_SeasideCyclingRoadSouthEntrance_Movement_1634BB:: @ 81634BB
 
 Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634BD:: @ 81634BD
 	lockall
-	clearflag 2091
+	clearflag FLAG_SYS_CYCLING_ROAD
 	setvar 0x4001, 0
 	releaseall
 	end
diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc
index 7d2c77645..bf0c36ff3 100644
--- a/data/scripts/maps/Route110_TrickHouseEntrance.inc
+++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc
@@ -5,7 +5,7 @@ Route110_TrickHouseEntrance_MapScripts:: @ 8160F2B
 	.byte 0
 
 Route110_TrickHouseEntrance_MapScript1_160F3B:: @ 8160F3B
-	setflag 2114
+	setflag FLAG_LANDMARK_TRICK_HOUSE
 	compare 0x40b5, 1
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_160FCE
 	compare 0x40c1, 1
@@ -63,37 +63,37 @@ Route110_TrickHouseEntrance_EventScript_160FDE:: @ 8160FDE
 	return
 
 Route110_TrickHouseEntrance_EventScript_16103C:: @ 816103C
-	checkflag 2057
+	checkflag FLAG_BADGE03_GET
 	call_if 0, Route110_TrickHouseEntrance_EventScript_161088
 	return
 
 Route110_TrickHouseEntrance_EventScript_161046:: @ 8161046
-	checkflag 2058
+	checkflag FLAG_BADGE04_GET
 	call_if 0, Route110_TrickHouseEntrance_EventScript_161088
 	return
 
 Route110_TrickHouseEntrance_EventScript_161050:: @ 8161050
-	checkflag 2059
+	checkflag FLAG_BADGE05_GET
 	call_if 0, Route110_TrickHouseEntrance_EventScript_161088
 	return
 
 Route110_TrickHouseEntrance_EventScript_16105A:: @ 816105A
-	checkflag 2060
+	checkflag FLAG_BADGE06_GET
 	call_if 0, Route110_TrickHouseEntrance_EventScript_161088
 	return
 
 Route110_TrickHouseEntrance_EventScript_161064:: @ 8161064
-	checkflag 2061
+	checkflag FLAG_BADGE07_GET
 	call_if 0, Route110_TrickHouseEntrance_EventScript_161088
 	return
 
 Route110_TrickHouseEntrance_EventScript_16106E:: @ 816106E
-	checkflag 2062
+	checkflag FLAG_BADGE08_GET
 	call_if 0, Route110_TrickHouseEntrance_EventScript_161088
 	return
 
 Route110_TrickHouseEntrance_EventScript_161078:: @ 8161078
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	call_if 0, Route110_TrickHouseEntrance_EventScript_161088
 	return
 
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/scripts/maps/Route110_TrickHousePuzzle7.inc
index 1841b025f..6756cd055 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle7.inc
+++ b/data/scripts/maps/Route110_TrickHousePuzzle7.inc
@@ -10,15 +10,15 @@ Route110_TrickHousePuzzle7_MapScript1_163161:: @ 8163161
 	end
 
 Route110_TrickHousePuzzle7_EventScript_163167:: @ 8163167
-	checkflag 194
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1
 	call_if 1, Route110_TrickHousePuzzle7_EventScript_163195
-	checkflag 195
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2
 	call_if 1, Route110_TrickHousePuzzle7_EventScript_1631A8
-	checkflag 196
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3
 	call_if 1, Route110_TrickHousePuzzle7_EventScript_1631BB
-	checkflag 197
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4
 	call_if 1, Route110_TrickHousePuzzle7_EventScript_1631CE
-	checkflag 198
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5
 	call_if 1, Route110_TrickHousePuzzle7_EventScript_1631E1
 	return
 
@@ -75,11 +75,11 @@ Route110_TrickHousePuzzle7_EventScript_163240:: @ 8163240
 Route110_TrickHousePuzzle7_MapScript1_163253:: @ 8163253
 	compare 0x40b6, 1
 	goto_if_eq Route110_TrickHousePuzzle7_EventScript_16326E
-	clearflag 194
-	clearflag 195
-	clearflag 196
-	clearflag 197
-	clearflag 198
+	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1
+	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2
+	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3
+	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4
+	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5
 	end
 
 Route110_TrickHousePuzzle7_EventScript_16326E:: @ 816326E
@@ -121,125 +121,125 @@ Route110_TrickHousePuzzle7_EventScript_1632A8:: @ 81632A8
 Route110_TrickHousePuzzle7_EventScript_1632B9:: @ 81632B9
 	lockall
 	delay 32
-	checkflag 194
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1
 	call_if 0, Route110_TrickHousePuzzle7_EventScript_163195
-	checkflag 194
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1
 	call_if 1, Route110_TrickHousePuzzle7_EventScript_1631F4
 	special DrawWholeMapView
 	playse 36
-	checkflag 194
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1
 	goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633A4
-	checkflag 194
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1
 	goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633A9
 	end
 
 Route110_TrickHousePuzzle7_EventScript_1632E8:: @ 81632E8
 	lockall
 	delay 32
-	checkflag 195
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2
 	call_if 0, Route110_TrickHousePuzzle7_EventScript_1631A8
-	checkflag 195
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2
 	call_if 1, Route110_TrickHousePuzzle7_EventScript_163207
 	special DrawWholeMapView
 	playse 36
-	checkflag 195
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2
 	goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633AE
-	checkflag 195
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2
 	goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633B3
 	end
 
 Route110_TrickHousePuzzle7_EventScript_163317:: @ 8163317
 	lockall
 	delay 32
-	checkflag 196
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3
 	call_if 0, Route110_TrickHousePuzzle7_EventScript_1631BB
-	checkflag 196
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3
 	call_if 1, Route110_TrickHousePuzzle7_EventScript_16321A
 	special DrawWholeMapView
 	playse 36
-	checkflag 196
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3
 	goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633B8
-	checkflag 196
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3
 	goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633BD
 	end
 
 Route110_TrickHousePuzzle7_EventScript_163346:: @ 8163346
 	lockall
 	delay 32
-	checkflag 197
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4
 	call_if 0, Route110_TrickHousePuzzle7_EventScript_1631CE
-	checkflag 197
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4
 	call_if 1, Route110_TrickHousePuzzle7_EventScript_16322D
 	special DrawWholeMapView
 	playse 36
-	checkflag 197
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4
 	goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633C2
-	checkflag 197
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4
 	goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633C7
 	end
 
 Route110_TrickHousePuzzle7_EventScript_163375:: @ 8163375
 	lockall
 	delay 32
-	checkflag 198
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5
 	call_if 0, Route110_TrickHousePuzzle7_EventScript_1631E1
-	checkflag 198
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5
 	call_if 1, Route110_TrickHousePuzzle7_EventScript_163240
 	special DrawWholeMapView
 	playse 36
-	checkflag 198
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5
 	goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633CC
-	checkflag 198
+	checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5
 	goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633D1
 	end
 
 Route110_TrickHousePuzzle7_EventScript_1633A4:: @ 81633A4
-	setflag 194
+	setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1
 	releaseall
 	end
 
 Route110_TrickHousePuzzle7_EventScript_1633A9:: @ 81633A9
-	clearflag 194
+	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1
 	releaseall
 	end
 
 Route110_TrickHousePuzzle7_EventScript_1633AE:: @ 81633AE
-	setflag 195
+	setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2
 	releaseall
 	end
 
 Route110_TrickHousePuzzle7_EventScript_1633B3:: @ 81633B3
-	clearflag 195
+	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2
 	releaseall
 	end
 
 Route110_TrickHousePuzzle7_EventScript_1633B8:: @ 81633B8
-	setflag 196
+	setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3
 	releaseall
 	end
 
 Route110_TrickHousePuzzle7_EventScript_1633BD:: @ 81633BD
-	clearflag 196
+	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3
 	releaseall
 	end
 
 Route110_TrickHousePuzzle7_EventScript_1633C2:: @ 81633C2
-	setflag 197
+	setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4
 	releaseall
 	end
 
 Route110_TrickHousePuzzle7_EventScript_1633C7:: @ 81633C7
-	clearflag 197
+	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4
 	releaseall
 	end
 
 Route110_TrickHousePuzzle7_EventScript_1633CC:: @ 81633CC
-	setflag 198
+	setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5
 	releaseall
 	end
 
 Route110_TrickHousePuzzle7_EventScript_1633D1:: @ 81633D1
-	clearflag 198
+	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5
 	releaseall
 	end
 
diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc
index 545e62921..3e089e354 100644
--- a/data/scripts/maps/Route111.inc
+++ b/data/scripts/maps/Route111.inc
@@ -4,7 +4,7 @@ Route111_MapScripts:: @ 814FF91
 	.byte 0
 
 Route111_MapScript1_14FF9C:: @ 814FF9C
-	checkflag 228
+	checkflag FLAG_REGI_DOORS_OPENED
 	call_if 0, Route111_EventScript_14FFA6
 	end
 
@@ -40,10 +40,10 @@ Route111_EventScript_15000C:: @ 815000C
 	return
 
 Route111_EventScript_15000D:: @ 815000D
-	clearflag 768
-	setflag 769
-	setflag 770
-	setflag 771
+	clearflag FLAG_HIDE_VICTOR_WINSTRATE
+	setflag FLAG_HIDE_VICTORIA_WINSTRATE
+	setflag FLAG_HIDE_VIVI_WINSTRATE
+	setflag FLAG_HIDE_VICKI_WINSTRATE
 	cleartrainerflag OPPONENT_VICTOR
 	cleartrainerflag OPPONENT_VICTORIA
 	cleartrainerflag OPPONENT_VIVI
@@ -56,8 +56,8 @@ Route111_EventScript_150023:: @ 8150023
 	goto_if_eq Route111_EventScript_15005F
 	giveitem ITEM_ROOT_FOSSIL
 	closemessage
-	setflag 963
-	setflag 964
+	setflag FLAG_HIDE_ROOT_FOSSIL
+	setflag FLAG_HIDE_CLAW_FOSSIL
 	removeobject 34
 	delay 30
 	applymovement 35, Route111_Movement_1500AF
@@ -78,8 +78,8 @@ Route111_EventScript_150069:: @ 8150069
 	goto_if_eq Route111_EventScript_1500A5
 	giveitem ITEM_CLAW_FOSSIL
 	closemessage
-	setflag 964
-	setflag 963
+	setflag FLAG_HIDE_CLAW_FOSSIL
+	setflag FLAG_HIDE_ROOT_FOSSIL
 	removeobject 35
 	delay 30
 	applymovement 34, Route111_Movement_1500AF
@@ -121,13 +121,13 @@ Route111_EventScript_1500C5:: @ 81500C5
 	lock
 	faceplayer
 	dodailyevents
-	checkflag 2252
+	checkflag FLAG_DAILY_RECEIVED_BERRY_ROUTE111
 	goto_if_eq Route111_EventScript_150100
 	msgbox Route111_Text_1C56F0, 4
 	giveitem ITEM_RAZZ_BERRY
 	compare RESULT, 0
 	goto_if_eq Route111_EventScript_1A029B
-	setflag 2252
+	setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE111
 	special GetPlayerBigGuyGirlString
 	msgbox Route111_Text_1C5781, 4
 	release
@@ -236,7 +236,7 @@ Route111_EventScript_1501C9:: @ 81501C9
 Route111_EventScript_1501D1:: @ 81501D1
 	lock
 	faceplayer
-	setflag 2115
+	setflag FLAG_LANDMARK_WINSTRATE_FAMILY
 	msgbox Route111_Text_16F705, 5
 	compare RESULT, 1
 	goto_if_eq Route111_EventScript_1501F3
diff --git a/data/scripts/maps/Route111_OldLadysRestStop.inc b/data/scripts/maps/Route111_OldLadysRestStop.inc
index 5576a44ff..c0fb6f489 100644
--- a/data/scripts/maps/Route111_OldLadysRestStop.inc
+++ b/data/scripts/maps/Route111_OldLadysRestStop.inc
@@ -3,7 +3,7 @@ Route111_OldLadysRestStop_MapScripts:: @ 815BFD1
 	.byte 0
 
 Route111_OldLadysRestStop_MapScript1_15BFD7:: @ 815BFD7
-	setflag 2113
+	setflag FLAG_LANDMARK_OLD_LADY_REST_SHOP
 	end
 
 Route111_OldLadysRestStop_EventScript_15BFDB:: @ 815BFDB
diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc
index d9a94ce75..9896af5ae 100644
--- a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc
+++ b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc
@@ -13,13 +13,13 @@ Route111_WinstrateFamilysHouse_EventScript_15BF3A:: @ 815BF3A
 	lock
 	faceplayer
 	setvar 0x8008, 3
-	checkflag 277
+	checkflag FLAG_RECEIVED_MACHO_BRACE
 	goto_if_eq Route111_WinstrateFamilysHouse_EventScript_15BF72
 	msgbox Route111_WinstrateFamilysHouse_Text_19208A, 4
 	giveitem ITEM_MACHO_BRACE
 	compare RESULT, 0
 	goto_if_eq Route111_WinstrateFamilysHouse_EventScript_1A029B
-	setflag 277
+	setflag FLAG_RECEIVED_MACHO_BRACE
 	goto Route111_WinstrateFamilysHouse_EventScript_15BFC4
 	end
 
@@ -40,10 +40,10 @@ Route111_WinstrateFamilysHouse_EventScript_15BF95:: @ 815BF95
 	lock
 	faceplayer
 	setvar 0x8008, 4
-	checkflag 4
+	checkflag FLAG_TEMP_4
 	goto_if_eq Route111_WinstrateFamilysHouse_EventScript_15BFB6
 	msgbox Route111_WinstrateFamilysHouse_Text_192219, 4
-	setflag 4
+	setflag FLAG_TEMP_4
 	goto Route111_WinstrateFamilysHouse_EventScript_15BFC4
 	end
 
diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc
index d0b608339..078ac1006 100644
--- a/data/scripts/maps/Route113_GlassWorkshop.inc
+++ b/data/scripts/maps/Route113_GlassWorkshop.inc
@@ -3,7 +3,7 @@ Route113_GlassWorkshop_MapScripts:: @ 816354A
 	.byte 0
 
 Route113_GlassWorkshop_MapScript1_163550:: @ 8163550
-	setflag 2116
+	setflag FLAG_LANDMARK_GLASS_WORKSHOP
 	compare 0x40be, 1
 	call_if 1, Route113_GlassWorkshop_EventScript_16355F
 	end
diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc
index 0730db23a..3d1da2014 100644
--- a/data/scripts/maps/Route114.inc
+++ b/data/scripts/maps/Route114.inc
@@ -5,7 +5,7 @@ Route114_EventScript_150733:: @ 8150733
 	lock
 	faceplayer
 	dodailyevents
-	checkflag 2251
+	checkflag FLAG_DAILY_RECEIVED_BERRY_ROUTE114
 	goto_if_eq Route114_EventScript_150778
 	msgbox Route114_Text_1C5803, 4
 	random 5
@@ -14,7 +14,7 @@ Route114_EventScript_150733:: @ 8150733
 	giveitem RESULT
 	compare RESULT, 0
 	goto_if_eq Route114_EventScript_1A029B
-	setflag 2251
+	setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE114
 	msgbox Route114_Text_1C5861, 4
 	release
 	end
@@ -27,13 +27,13 @@ Route114_EventScript_150778:: @ 8150778
 Route114_EventScript_150782:: @ 8150782
 	lock
 	faceplayer
-	checkflag 231
+	checkflag FLAG_RECEIVED_TM05
 	goto_if_eq Route114_EventScript_1507B9
 	msgbox Route114_Text_170154, 4
 	giveitem ITEM_TM05
 	compare RESULT, 0
 	goto_if_eq Route114_EventScript_1A029B
-	setflag 231
+	setflag FLAG_RECEIVED_TM05
 	msgbox Route114_Text_1701C5, 4
 	release
 	end
diff --git a/data/scripts/maps/Route114_FossilManiacsHouse.inc b/data/scripts/maps/Route114_FossilManiacsHouse.inc
index b217f24c4..abf9ac883 100644
--- a/data/scripts/maps/Route114_FossilManiacsHouse.inc
+++ b/data/scripts/maps/Route114_FossilManiacsHouse.inc
@@ -3,19 +3,19 @@ Route114_FossilManiacsHouse_MapScripts:: @ 815C1B9
 	.byte 0
 
 Route114_FossilManiacsHouse_MapScript1_15C1BF:: @ 815C1BF
-	setflag 2135
+	setflag FLAG_LANDMARK_FOSSIL_MANIACS_HOUSE
 	end
 
 Route114_FossilManiacsHouse_EventScript_15C1C3:: @ 815C1C3
 	lock
 	faceplayer
-	checkflag 261
+	checkflag FLAG_RECEIVED_TM28
 	goto_if_eq Route114_FossilManiacsHouse_EventScript_15C1F2
 	msgbox Route114_FossilManiacsHouse_Text_1925E1, 4
 	giveitem ITEM_TM28
 	compare RESULT, 0
 	goto_if_eq Route114_FossilManiacsHouse_EventScript_1A029B
-	setflag 261
+	setflag FLAG_RECEIVED_TM28
 	release
 	end
 
diff --git a/data/scripts/maps/Route114_FossilManiacsTunnel.inc b/data/scripts/maps/Route114_FossilManiacsTunnel.inc
index 13843f758..2ce9c1bfa 100644
--- a/data/scripts/maps/Route114_FossilManiacsTunnel.inc
+++ b/data/scripts/maps/Route114_FossilManiacsTunnel.inc
@@ -4,7 +4,7 @@ Route114_FossilManiacsTunnel_MapScripts:: @ 815C20E
 Route114_FossilManiacsTunnel_EventScript_15C20F:: @ 815C20F
 	lock
 	faceplayer
-	checkflag 267
+	checkflag FLAG_RECEIVED_FOSSIL_MON
 	goto_if_eq Route114_FossilManiacsTunnel_EventScript_15C24E
 	checkitem ITEM_ROOT_FOSSIL, 1
 	compare RESULT, 1
diff --git a/data/scripts/maps/Route114_LanettesHouse.inc b/data/scripts/maps/Route114_LanettesHouse.inc
index e4334647c..87b0f2cd6 100644
--- a/data/scripts/maps/Route114_LanettesHouse.inc
+++ b/data/scripts/maps/Route114_LanettesHouse.inc
@@ -3,24 +3,24 @@ Route114_LanettesHouse_MapScripts:: @ 815C258
 	.byte 0
 
 Route114_LanettesHouse_MapScript1_15C25E:: @ 815C25E
-	setflag 2117
+	setflag FLAG_LANDMARK_LANETTES_HOUSE
 	end
 
 Route114_LanettesHouse_EventScript_15C262:: @ 815C262
 	lock
 	faceplayer
-	checkflag 131
+	checkflag FLAG_RECEIVED_DOLL_LANETTE
 	goto_if_eq Route114_LanettesHouse_EventScript_15C28F
-	setflag 2123
+	setflag FLAG_SYS_PC_LANETTE
 	msgbox Route114_LanettesHouse_Text_192A0D, 4
 	.ifdef SAPPHIRE
-	givedecoration 99
+	givedecoration DECOR_LOTAD_DOLL
 	.else
-	givedecoration 100
+	givedecoration DECOR_SEEDOT_DOLL
 	.endif
 	compare RESULT, 0
 	goto_if_eq Route114_LanettesHouse_EventScript_1A02AE
-	setflag 131
+	setflag FLAG_RECEIVED_DOLL_LANETTE
 	release
 	end
 
diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc
index beb01e083..34c685196 100644
--- a/data/scripts/maps/Route116.inc
+++ b/data/scripts/maps/Route116.inc
@@ -3,7 +3,7 @@ Route116_MapScripts:: @ 8150A31
 	.byte 0
 
 Route116_MapScript1_150A37:: @ 8150A37
-	checkflag 143
+	checkflag FLAG_RECOVERED_DEVON_GOODS
 	call_if 1, Route116_EventScript_150A41
 	end
 
@@ -14,9 +14,9 @@ Route116_EventScript_150A41:: @ 8150A41
 Route116_EventScript_150A49:: @ 8150A49
 	lock
 	faceplayer
-	checkflag 143
+	checkflag FLAG_RECOVERED_DEVON_GOODS
 	goto_if_eq Route116_EventScript_150A67
-	checkflag 142
+	checkflag FLAG_DEVON_GOODS_STOLEN
 	goto_if_eq Route116_EventScript_150A71
 	msgbox Route116_Text_1703CF, 4
 	release
@@ -35,14 +35,14 @@ Route116_EventScript_150A71:: @ 8150A71
 Route116_EventScript_150A7B:: @ 8150A7B
 	lock
 	faceplayer
-	checkflag 287
+	checkflag FLAG_MET_DEVON_EMPLOYEE
 	goto_if_eq Route116_EventScript_150B04
 	msgbox Route116_Text_1705AE, 4
 	goto Route116_EventScript_150A94
 	end
 
 Route116_EventScript_150A94:: @ 8150A94
-	setflag 287
+	setflag FLAG_MET_DEVON_EMPLOYEE
 	giveitem ITEM_REPEAT_BALL
 	compare RESULT, 0
 	goto_if_eq Route116_EventScript_150B12
@@ -57,8 +57,8 @@ Route116_EventScript_150A94:: @ 8150A94
 	compare FACING, 4
 	call_if 1, Route116_EventScript_150AF9
 	removeobject LAST_TALKED
-	clearflag 949
-	setflag 256
+	clearflag FLAG_HIDE_EMPLOYEE_DEVON_CORP_3F
+	setflag FLAG_RECEIVED_REPEAT_BALL
 	release
 	end
 
diff --git a/data/scripts/maps/Route116_TunnelersRestHouse.inc b/data/scripts/maps/Route116_TunnelersRestHouse.inc
index 10991c38c..24091c4ac 100644
--- a/data/scripts/maps/Route116_TunnelersRestHouse.inc
+++ b/data/scripts/maps/Route116_TunnelersRestHouse.inc
@@ -3,7 +3,7 @@ Route116_TunnelersRestHouse_MapScripts:: @ 815C2DE
 	.byte 0
 
 Route116_TunnelersRestHouse_MapScript1_15C2E4:: @ 815C2E4
-	setflag 2138
+	setflag FLAG_LANDMARK_TUNNELERS_REST_HOUSE
 	end
 
 Route116_TunnelersRestHouse_EventScript_15C2E8:: @ 815C2E8
@@ -17,7 +17,7 @@ Route116_TunnelersRestHouse_EventScript_15C2F1:: @ 815C2F1
 Route116_TunnelersRestHouse_EventScript_15C2FA:: @ 815C2FA
 	lock
 	faceplayer
-	checkflag 199
+	checkflag FLAG_RUSTURF_TUNNEL_OPENED
 	goto_if_eq Route116_TunnelersRestHouse_EventScript_15C30F
 	msgbox Route116_TunnelersRestHouse_Text_193135, 4
 	release
diff --git a/data/scripts/maps/Route117.inc b/data/scripts/maps/Route117.inc
index 40affd3fd..44c4c156c 100644
--- a/data/scripts/maps/Route117.inc
+++ b/data/scripts/maps/Route117.inc
@@ -7,7 +7,7 @@ Route117_MapScript1_150D40:: @ 8150D40
 	end
 
 Route117_EventScript_150D46:: @ 8150D46
-	checkflag 134
+	checkflag FLAG_PENDING_DAYCARE_EGG
 	goto_if 0, Route117_EventScript_150D56
 	setobjectxyperm 3, 47, 6
 
diff --git a/data/scripts/maps/Route117_PokemonDayCare.inc b/data/scripts/maps/Route117_PokemonDayCare.inc
index 2a3ee79e1..9ad740b4e 100644
--- a/data/scripts/maps/Route117_PokemonDayCare.inc
+++ b/data/scripts/maps/Route117_PokemonDayCare.inc
@@ -3,5 +3,5 @@ Route117_PokemonDayCare_MapScripts:: @ 815C319
 	.byte 0
 
 Route117_PokemonDayCare_MapScript1_15C31F:: @ 815C31F
-	setflag 2118
+	setflag FLAG_LANDMARK_POKEMON_DAYCARE
 	end
diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc
index b96346f15..bf34b5426 100644
--- a/data/scripts/maps/Route118.inc
+++ b/data/scripts/maps/Route118.inc
@@ -9,7 +9,7 @@ Route118_MapScript1_150F2E:: @ 8150F2E
 Route118_EventScript_150F34:: @ 8150F34
 	lock
 	faceplayer
-	checkflag 227
+	checkflag FLAG_RECEIVED_GOOD_ROD
 	goto_if_eq Route118_EventScript_150F89
 	msgbox Route118_Text_170F12, 5
 	compare RESULT, 1
@@ -21,7 +21,7 @@ Route118_EventScript_150F34:: @ 8150F34
 Route118_EventScript_150F5E:: @ 8150F5E
 	msgbox Route118_Text_170F46, 4
 	giveitem ITEM_GOOD_ROD
-	setflag 227
+	setflag FLAG_RECEIVED_GOOD_ROD
 	msgbox Route118_Text_170F7E, 4
 	release
 	end
diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc
index 2179a7e18..fb3d75660 100644
--- a/data/scripts/maps/Route119.inc
+++ b/data/scripts/maps/Route119.inc
@@ -4,7 +4,7 @@ Route119_MapScripts:: @ 8151167
 	.byte 0
 
 Route119_MapScript1_151172:: @ 8151172
-	checkflag 2145
+	checkflag FLAG_SYS_CTRL_OBJ_DELETE
 	call_if 1, Route119_EventScript_15117C
 	end
 
@@ -33,8 +33,8 @@ Route119_MapScript1_15119B:: @ 815119B
 	end
 
 Route119_EventScript_1511B9:: @ 81511B9
-	setflag 893
-	clearflag 892
+	setflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F
+	clearflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F
 	setvar 0x40b3, 2
 	return
 
@@ -149,7 +149,7 @@ Route119_EventScript_151337:: @ 8151337
 
 Route119_EventScript_151352:: @ 8151352
 	giveitem ITEM_HM02
-	setflag 110
+	setflag FLAG_RECEIVED_HM02
 	return
 
 Route119_EventScript_151362:: @ 8151362
diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc
index ac64904a2..4ee12fe93 100644
--- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc
+++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc
@@ -39,10 +39,10 @@ Route119_WeatherInstitute_2F_EventScript_163D45:: @ 8163D45
 	msgbox Route119_WeatherInstitute_2F_Text_19F11B, 4
 	closemessage
 	setvar 0x40b3, 1
-	clearflag 893
+	clearflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F
 	fadedefaultbgm
 	fadescreen 1
-	setflag 890
+	setflag FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE
 	removeobject 1
 	removeobject 2
 	removeobject 3
@@ -63,7 +63,7 @@ Route119_WeatherInstitute_2F_EventScript_163D7A:: @ 8163D7A
 	waitfanfare
 	waitmessage
 	givepoke SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER, 0x0, 0x0, 0
-	setflag 151
+	setflag FLAG_RECEIVED_CASTFORM
 	msgbox Route119_WeatherInstitute_2F_Text_19F27D, 4
 	release
 	end
@@ -87,7 +87,7 @@ Route119_WeatherInstitute_2F_Movement_163DC8:: @ 8163DC8
 Route119_WeatherInstitute_2F_EventScript_163DCC:: @ 8163DCC
 	lock
 	faceplayer
-	checkflag 151
+	checkflag FLAG_RECEIVED_CASTFORM
 	goto_if_eq Route119_WeatherInstitute_2F_EventScript_163DBE
 	goto Route119_WeatherInstitute_2F_EventScript_163D7A
 	end
diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc
index 868d00324..209291a3a 100644
--- a/data/scripts/maps/Route120.inc
+++ b/data/scripts/maps/Route120.inc
@@ -5,7 +5,7 @@ Route120_MapScripts:: @ 815160E
 	.byte 0
 
 Route120_MapScript1_15161E:: @ 815161E
-	checkflag 2145
+	checkflag FLAG_SYS_CTRL_OBJ_DELETE
 	call_if 1, Route120_EventScript_151628
 	end
 
@@ -50,11 +50,11 @@ Route120_EventScript_151682:: @ 8151682
 	return
 
 Route120_MapScript1_151686:: @ 8151686
-	checkflag 228
+	checkflag FLAG_REGI_DOORS_OPENED
 	call_if 0, Route120_EventScript_1516A2
-	checkflag 285
+	checkflag FLAG_RECEIVED_DEVON_SCOPE
 	call_if 1, Route120_EventScript_1516B5
-	checkflag 285
+	checkflag FLAG_RECEIVED_DEVON_SCOPE
 	call_if 0, Route120_EventScript_1516DA
 	end
 
@@ -113,7 +113,7 @@ Route120_EventScript_151739:: @ 8151739
 	lock
 	faceplayer
 	dodailyevents
-	checkflag 2254
+	checkflag FLAG_DAILY_RECEIVED_BERRY_ROUTE120
 	goto_if_eq Route120_EventScript_151837
 	msgbox Route120_Text_1C58F1, 5
 	compare RESULT, 1
@@ -135,27 +135,27 @@ Route120_EventScript_151739:: @ 8151739
 	end
 
 Route120_EventScript_1517DC:: @ 81517DC
-	setvar 0x8004, 143
+	setvar 0x8004, ITEM_FIGY_BERRY
 	goto Route120_EventScript_151813
 	end
 
 Route120_EventScript_1517E7:: @ 81517E7
-	setvar 0x8004, 144
+	setvar 0x8004, ITEM_WIKI_BERRY
 	goto Route120_EventScript_151813
 	end
 
 Route120_EventScript_1517F2:: @ 81517F2
-	setvar 0x8004, 145
+	setvar 0x8004, ITEM_MAGO_BERRY
 	goto Route120_EventScript_151813
 	end
 
 Route120_EventScript_1517FD:: @ 81517FD
-	setvar 0x8004, 146
+	setvar 0x8004, ITEM_AGUAV_BERRY
 	goto Route120_EventScript_151813
 	end
 
 Route120_EventScript_151808:: @ 8151808
-	setvar 0x8004, 147
+	setvar 0x8004, ITEM_IAPAPA_BERRY
 	goto Route120_EventScript_151813
 	end
 
@@ -163,7 +163,7 @@ Route120_EventScript_151813:: @ 8151813
 	giveitem 0x8004
 	compare RESULT, 0
 	goto_if_eq Route120_EventScript_1A029B
-	setflag 2254
+	setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE120
 	msgbox Route120_Text_1C5A0B, 4
 	release
 	end
@@ -184,7 +184,7 @@ Route120_EventScript_15184A:: @ 815184A
 Route120_EventScript_151853:: @ 8151853
 	lock
 	faceplayer
-	checkflag 290
+	checkflag FLAG_NOT_READY_FOR_BATTLE_ROUTE120
 	goto_if_eq Route120_EventScript_151884
 	msgbox Route120_Text_171827, 5
 	compare RESULT, 0
@@ -194,7 +194,7 @@ Route120_EventScript_151853:: @ 8151853
 
 Route120_EventScript_151877:: @ 8151877
 	msgbox Route120_Text_17193D, 4
-	setflag 290
+	setflag FLAG_NOT_READY_FOR_BATTLE_ROUTE120
 	release
 	end
 
@@ -227,9 +227,9 @@ Route120_EventScript_15189D:: @ 815189D
 	waitpokecry
 	setwildbattle SPECIES_KECLEON, 30, ITEM_NONE
 	setvar 0x8004, 0
-	setflag 2145
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	dowildbattle
-	clearflag 2145
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	goto Route120_EventScript_151908
 	end
 
@@ -239,7 +239,7 @@ Route120_EventScript_151908:: @ 8151908
 	waitmovement 0
 	msgbox Route120_Text_171A40, 4
 	giveitem ITEM_DEVON_SCOPE
-	setflag 285
+	setflag FLAG_RECEIVED_DEVON_SCOPE
 	msgbox Route120_Text_171B0E, 4
 	closemessage
 	applymovement 31, Route120_Movement_1A0845
diff --git a/data/scripts/maps/Route123.inc b/data/scripts/maps/Route123.inc
index 14c5a2dba..9ad0220bd 100644
--- a/data/scripts/maps/Route123.inc
+++ b/data/scripts/maps/Route123.inc
@@ -9,7 +9,7 @@ Route123_MapScript1_151C59:: @ 8151C59
 Route123_EventScript_151C5D:: @ 8151C5D
 	lock
 	faceplayer
-	checkflag 232
+	checkflag FLAG_RECEIVED_TM19
 	goto_if_eq Route123_EventScript_151CAC
 	msgbox Route123_Text_171D83, 4
 	special IsGrassTypeInParty
@@ -19,7 +19,7 @@ Route123_EventScript_151C5D:: @ 8151C5D
 	giveitem ITEM_TM19
 	compare RESULT, 0
 	goto_if_eq Route123_EventScript_1A029B
-	setflag 232
+	setflag FLAG_RECEIVED_TM19
 	msgbox Route123_Text_171E34, 4
 	release
 	end
diff --git a/data/scripts/maps/Route123_BerryMastersHouse.inc b/data/scripts/maps/Route123_BerryMastersHouse.inc
index 64888759d..dab303345 100644
--- a/data/scripts/maps/Route123_BerryMastersHouse.inc
+++ b/data/scripts/maps/Route123_BerryMastersHouse.inc
@@ -3,14 +3,14 @@ Route123_BerryMastersHouse_MapScripts:: @ 81639DF
 	.byte 0
 
 Route123_BerryMastersHouse_MapScript1_1639E5:: @ 81639E5
-	setflag 2147
+	setflag FLAG_LANDMARK_BERRY_MASTERS_HOUSE
 	end
 
 Route123_BerryMastersHouse_EventScript_1639E9:: @ 81639E9
 	lock
 	faceplayer
 	dodailyevents
-	checkflag 2253
+	checkflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER
 	goto_if_eq Route123_BerryMastersHouse_EventScript_163A5A
 	msgbox Route123_BerryMastersHouse_Text_1C5BC4, 4
 	random 10
@@ -19,7 +19,7 @@ Route123_BerryMastersHouse_EventScript_1639E9:: @ 81639E9
 	giveitem RESULT
 	compare RESULT, 0
 	goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B
-	setflag 2253
+	setflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER
 	msgbox Route123_BerryMastersHouse_Text_1C5C66, 4
 	random 10
 	addvar RESULT, 20
@@ -40,7 +40,7 @@ Route123_BerryMastersHouse_EventScript_163A64:: @ 8163A64
 	lock
 	faceplayer
 	dodailyevents
-	checkflag 2257
+	checkflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER_WIFE
 	goto_if_eq Route123_BerryMastersHouse_EventScript_163C13
 	msgbox Route123_BerryMastersHouse_Text_1C5D24, 4
 	setvar 0x8004, 13
@@ -77,7 +77,7 @@ Route123_BerryMastersHouse_EventScript_163AAD:: @ 8163AAD
 Route123_BerryMastersHouse_EventScript_163AF0:: @ 8163AF0
 	msgbox Route123_BerryMastersHouse_Text_1C5E0E, 4
 	random 10
-	addvar RESULT, 133
+	addvar RESULT, ITEM_CHERI_BERRY
 	giveitem RESULT
 	compare RESULT, 0
 	goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B
@@ -86,57 +86,57 @@ Route123_BerryMastersHouse_EventScript_163AF0:: @ 8163AF0
 	end
 
 Route123_BerryMastersHouse_EventScript_163B1E:: @ 8163B1E
-	checkflag 248
+	checkflag FLAG_RECEIVED_SPELON_BERRY
 	goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0
 	msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4
 	giveitem ITEM_SPELON_BERRY
 	compare RESULT, 0
 	goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B
-	setflag 248
+	setflag FLAG_RECEIVED_SPELON_BERRY
 	goto Route123_BerryMastersHouse_EventScript_163C1D
 	end
 
 Route123_BerryMastersHouse_EventScript_163B4F:: @ 8163B4F
-	checkflag 249
+	checkflag FLAG_RECEIVED_PAMTRE_BERRY
 	goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0
 	msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4
 	giveitem ITEM_PAMTRE_BERRY
 	compare RESULT, 0
 	goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B
-	setflag 249
+	setflag FLAG_RECEIVED_PAMTRE_BERRY
 	goto Route123_BerryMastersHouse_EventScript_163C1D
 	end
 
 Route123_BerryMastersHouse_EventScript_163B80:: @ 8163B80
-	checkflag 250
+	checkflag FLAG_RECEIVED_WATMEL_BERRY
 	goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0
 	msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4
 	giveitem ITEM_WATMEL_BERRY
 	compare RESULT, 0
 	goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B
-	setflag 250
+	setflag FLAG_RECEIVED_WATMEL_BERRY
 	goto Route123_BerryMastersHouse_EventScript_163C1D
 	end
 
 Route123_BerryMastersHouse_EventScript_163BB1:: @ 8163BB1
-	checkflag 251
+	checkflag FLAG_RECEIVED_DURIN_BERRY
 	goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0
 	msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4
 	giveitem ITEM_DURIN_BERRY
 	compare RESULT, 0
 	goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B
-	setflag 251
+	setflag FLAG_RECEIVED_DURIN_BERRY
 	goto Route123_BerryMastersHouse_EventScript_163C1D
 	end
 
 Route123_BerryMastersHouse_EventScript_163BE2:: @ 8163BE2
-	checkflag 252
+	checkflag FLAG_RECEIVED_BELUE_BERRY
 	goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0
 	msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4
 	giveitem ITEM_BELUE_BERRY
 	compare RESULT, 0
 	goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B
-	setflag 252
+	setflag FLAG_RECEIVED_BELUE_BERRY
 	goto Route123_BerryMastersHouse_EventScript_163C1D
 	end
 
@@ -146,7 +146,7 @@ Route123_BerryMastersHouse_EventScript_163C13:: @ 8163C13
 	end
 
 Route123_BerryMastersHouse_EventScript_163C1D:: @ 8163C1D
-	setflag 2257
+	setflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER_WIFE
 	msgbox Route123_BerryMastersHouse_Text_1C5E59, 4
 	release
 	end
diff --git a/data/scripts/maps/Route124.inc b/data/scripts/maps/Route124.inc
index ffe4cef97..3e062bfdc 100644
--- a/data/scripts/maps/Route124.inc
+++ b/data/scripts/maps/Route124.inc
@@ -3,7 +3,7 @@ Route124_MapScripts:: @ 8151DDF
 	.byte 0
 
 Route124_MapScript1_151DE5:: @ 8151DE5
-	checkflag 2090
+	checkflag FLAG_SYS_WEATHER_CTRL
 	call_if 1, Route124_EventScript_1A02C1
 	end
 
diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc
index 7421e94e0..55f3141fd 100644
--- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc
+++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc
@@ -3,16 +3,16 @@ Route124_DivingTreasureHuntersHouse_MapScripts:: @ 8163DFA
 	.byte 0
 
 Route124_DivingTreasureHuntersHouse_MapScript1_163E00:: @ 8163E00
-	setflag 2139
+	setflag FLAG_LANDMARK_HUNTERS_HOUSE
 	end
 
 Route124_DivingTreasureHuntersHouse_EventScript_163E04:: @ 8163E04
 	lock
 	faceplayer
-	checkflag 217
+	checkflag FLAG_MET_DIVING_TREASURE_HUNTER
 	goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_163E20
 	msgbox Route124_DivingTreasureHuntersHouse_Text_19F416, 4
-	setflag 217
+	setflag FLAG_MET_DIVING_TREASURE_HUNTER
 	goto Route124_DivingTreasureHuntersHouse_EventScript_163E2E
 	end
 
diff --git a/data/scripts/maps/Route125.inc b/data/scripts/maps/Route125.inc
index 489a7314b..ea24434e2 100644
--- a/data/scripts/maps/Route125.inc
+++ b/data/scripts/maps/Route125.inc
@@ -3,7 +3,7 @@ Route125_MapScripts:: @ 8151F1E
 	.byte 0
 
 Route125_MapScript1_151F24:: @ 8151F24
-	checkflag 2090
+	checkflag FLAG_SYS_WEATHER_CTRL
 	call_if 1, Route125_EventScript_1A02C1
 	end
 
diff --git a/data/scripts/maps/Route126.inc b/data/scripts/maps/Route126.inc
index 729922681..a89087994 100644
--- a/data/scripts/maps/Route126.inc
+++ b/data/scripts/maps/Route126.inc
@@ -3,7 +3,7 @@ Route126_MapScripts:: @ 8151FFE
 	.byte 0
 
 Route126_MapScript1_152004:: @ 8152004
-	checkflag 2090
+	checkflag FLAG_SYS_WEATHER_CTRL
 	call_if 1, Route126_EventScript_1A02C1
 	end
 
diff --git a/data/scripts/maps/Route127.inc b/data/scripts/maps/Route127.inc
index 284d1fbd4..5fb122821 100644
--- a/data/scripts/maps/Route127.inc
+++ b/data/scripts/maps/Route127.inc
@@ -3,7 +3,7 @@ Route127_MapScripts:: @ 815206A
 	.byte 0
 
 Route127_MapScript1_152070:: @ 8152070
-	checkflag 2090
+	checkflag FLAG_SYS_WEATHER_CTRL
 	call_if 1, Route127_EventScript_1A02C1
 	end
 
diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc
index 615662fc1..b0e295db6 100644
--- a/data/scripts/maps/Route128.inc
+++ b/data/scripts/maps/Route128.inc
@@ -4,7 +4,7 @@ Route128_MapScripts:: @ 815211B
 	.byte 0
 
 Route128_MapScript1_152126:: @ 8152126
-	checkflag 2090
+	checkflag FLAG_SYS_WEATHER_CTRL
 	call_if 1, Route128_EventScript_1A02C1
 	call Route128_EventScript_1A0196
 	end
diff --git a/data/scripts/maps/Route130.inc b/data/scripts/maps/Route130.inc
index 69da29471..b0381969d 100644
--- a/data/scripts/maps/Route130.inc
+++ b/data/scripts/maps/Route130.inc
@@ -6,22 +6,22 @@ Route130_MapScript1_1523C8:: @ 81523C8
 	specialvar RESULT, IsMirageIslandPresent
 	compare RESULT, 1
 	goto_if_eq Route130_EventScript_15240C
-	setflag 17
-	setflag 18
-	setflag 19
-	setflag 20
-	setflag 21
-	setflag 22
-	setflag 23
-	setflag 24
-	setflag 25
-	setflag 26
-	setflag 27
-	setflag 28
-	setflag 29
-	setflag 30
-	setflag 31
-	setflag 32
+	setflag FLAG_TEMP_11
+	setflag FLAG_TEMP_12
+	setflag FLAG_TEMP_13
+	setflag FLAG_TEMP_14
+	setflag FLAG_TEMP_15
+	setflag FLAG_TEMP_16
+	setflag FLAG_TEMP_17
+	setflag FLAG_TEMP_18
+	setflag FLAG_TEMP_19
+	setflag FLAG_TEMP_1A
+	setflag FLAG_TEMP_1B
+	setflag FLAG_TEMP_1C
+	setflag FLAG_TEMP_1D
+	setflag FLAG_TEMP_1E
+	setflag FLAG_TEMP_1F
+	setflag FLAG_TEMP_20
 	setmaplayoutindex 264
 	end
 
diff --git a/data/scripts/maps/Route131.inc b/data/scripts/maps/Route131.inc
index 50ad4222b..efa26ecd2 100644
--- a/data/scripts/maps/Route131.inc
+++ b/data/scripts/maps/Route131.inc
@@ -3,7 +3,7 @@ Route131_MapScripts:: @ 815243E
 	.byte 0
 
 Route131_MapScript1_152444:: @ 8152444
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	call_if 1, Route131_EventScript_15244E
 	end
 
diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc
index 3be6be562..7e3a0e191 100644
--- a/data/scripts/maps/RustboroCity.inc
+++ b/data/scripts/maps/RustboroCity.inc
@@ -3,7 +3,7 @@ RustboroCity_MapScripts:: @ 814C372
 	.byte 0
 
 RustboroCity_MapScript1_14C378:: @ 814C378
-	setflag 2073
+	setflag FLAG_VISITED_RUSTBORO_CITY
 	call RustboroCity_EventScript_1A0196
 	call RustboroCity_EventScript_1A014E
 	end
@@ -11,7 +11,7 @@ RustboroCity_MapScript1_14C378:: @ 814C378
 RustboroCity_EventScript_14C386:: @ 814C386
 	lock
 	faceplayer
-	checkflag 142
+	checkflag FLAG_DEVON_GOODS_STOLEN
 	goto_if_eq RustboroCity_EventScript_14C39B
 	msgbox RustboroCity_Text_16689D, 4
 	release
@@ -36,7 +36,7 @@ RustboroCity_EventScript_14C3B1:: @ 814C3B1
 RustboroCity_EventScript_14C3BA:: @ 814C3BA
 	lock
 	faceplayer
-	checkflag 2055
+	checkflag FLAG_BADGE01_GET
 	goto_if_eq RustboroCity_EventScript_14C3CF
 	msgbox RustboroCity_Text_16696D, 4
 	release
@@ -50,7 +50,7 @@ RustboroCity_EventScript_14C3CF:: @ 814C3CF
 RustboroCity_EventScript_14C3D9:: @ 814C3D9
 	lock
 	faceplayer
-	checkflag 188
+	checkflag FLAG_RECEIVED_POKENAV
 	goto_if_eq RustboroCity_EventScript_14C3EE
 	msgbox RustboroCity_Text_166B86, 4
 	release
@@ -178,16 +178,16 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4
 	waitmovement 0
 	removeobject 9
 	setobjectxyperm 9, 30, 10
-	clearflag 732
-	setflag 142
+	clearflag FLAG_HIDE_DEVON_RUSTBORO
+	setflag FLAG_DEVON_GOODS_STOLEN
 	setvar 0x405a, 2
 	setvar 0x409a, 2
 	setvar 0x406f, 1
-	clearflag 891
-	clearflag 880
-	clearflag 878
-	setflag 739
-	setflag 881
+	clearflag FLAG_HIDE_BRINEY_ROUTE116
+	clearflag FLAG_HIDE_PEEKO_RUSTURF_TUNNEL
+	clearflag FLAG_HIDE_GRUNT_RUSTURF_TUNNEL
+	setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE
+	setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE
 	releaseall
 	end
 
@@ -326,7 +326,7 @@ RustboroCity_Movement_14C5F7:: @ 814C5F7
 RustboroCity_EventScript_14C5FF:: @ 814C5FF
 	lock
 	faceplayer
-	checkflag 143
+	checkflag FLAG_RECOVERED_DEVON_GOODS
 	goto_if_eq RustboroCity_EventScript_14C614
 	msgbox RustboroCity_Text_166F6B, 4
 	release
@@ -371,7 +371,7 @@ RustboroCity_EventScript_14C650:: @ 814C650
 	call_if 1, RustboroCity_EventScript_14C6E9
 	compare 0x4001, 3
 	call_if 1, RustboroCity_EventScript_14C715
-	setflag 159
+	setflag FLAG_UNKNOWN_9F
 	setvar 0x405a, 3
 	moveobjectoffscreen 9
 	msgbox RustboroCity_Text_166EA5, 4
@@ -473,8 +473,8 @@ RustboroCity_EventScript_14C77D:: @ 814C77D
 	call_if 1, RustboroCity_EventScript_14C7F5
 	msgbox RustboroCity_Text_16707F, 4
 	closemessage
-	setflag 144
-	setflag 732
+	setflag FLAG_RETURNED_DEVON_GOODS
+	setflag FLAG_HIDE_DEVON_RUSTBORO
 	setvar 0x405a, 5
 	delay 30
 	warp MAP_RUSTBORO_CITY_DEVON_CORP_3F, 255, 2, 2
@@ -549,7 +549,7 @@ RustboroCity_EventScript_14C8B8:: @ 814C8B8
 RustboroCity_EventScript_14C8DA:: @ 814C8DA
 	lock
 	faceplayer
-	checkflag 288
+	checkflag FLAG_MET_RIVAL_RUSTBORO
 	goto_if_eq RustboroCity_EventScript_14C917
 	checkplayergender
 	compare RESULT, 0
@@ -559,13 +559,13 @@ RustboroCity_EventScript_14C8DA:: @ 814C8DA
 	end
 
 RustboroCity_EventScript_14C8FD:: @ 814C8FD
-	setflag 288
+	setflag FLAG_MET_RIVAL_RUSTBORO
 	msgbox RustboroCity_Text_1670A7, 4
 	release
 	end
 
 RustboroCity_EventScript_14C90A:: @ 814C90A
-	setflag 288
+	setflag FLAG_MET_RIVAL_RUSTBORO
 	msgbox RustboroCity_Text_167213, 4
 	release
 	end
diff --git a/data/scripts/maps/RustboroCity_CuttersHouse.inc b/data/scripts/maps/RustboroCity_CuttersHouse.inc
index 3e98746f3..77f2ee0a4 100644
--- a/data/scripts/maps/RustboroCity_CuttersHouse.inc
+++ b/data/scripts/maps/RustboroCity_CuttersHouse.inc
@@ -4,11 +4,11 @@ RustboroCity_CuttersHouse_MapScripts:: @ 8157D26
 RustboroCity_CuttersHouse_EventScript_157D27:: @ 8157D27
 	lock
 	faceplayer
-	checkflag 137
+	checkflag FLAG_RECEIVED_HM01
 	goto_if_eq RustboroCity_CuttersHouse_EventScript_157D53
 	msgbox RustboroCity_CuttersHouse_Text_18509C, 4
 	giveitem ITEM_HM01
-	setflag 137
+	setflag FLAG_RECEIVED_HM01
 	msgbox RustboroCity_CuttersHouse_Text_1851C9, 4
 	release
 	end
diff --git a/data/scripts/maps/RustboroCity_DevonCorp_1F.inc b/data/scripts/maps/RustboroCity_DevonCorp_1F.inc
index 48d8aaf9f..f9e902763 100644
--- a/data/scripts/maps/RustboroCity_DevonCorp_1F.inc
+++ b/data/scripts/maps/RustboroCity_DevonCorp_1F.inc
@@ -3,7 +3,7 @@ RustboroCity_DevonCorp_1F_MapScripts:: @ 8157406
 	.byte 0
 
 RustboroCity_DevonCorp_1F_MapScript1_15740C:: @ 815740C
-	checkflag 144
+	checkflag FLAG_RETURNED_DEVON_GOODS
 	call_if 0, RustboroCity_DevonCorp_1F_EventScript_157416
 	end
 
@@ -15,9 +15,9 @@ RustboroCity_DevonCorp_1F_EventScript_157416:: @ 8157416
 RustboroCity_DevonCorp_1F_EventScript_157422:: @ 8157422
 	lock
 	faceplayer
-	checkflag 144
+	checkflag FLAG_RETURNED_DEVON_GOODS
 	goto_if_eq RustboroCity_DevonCorp_1F_EventScript_15744A
-	checkflag 142
+	checkflag FLAG_DEVON_GOODS_STOLEN
 	goto_if_eq RustboroCity_DevonCorp_1F_EventScript_157440
 	msgbox RustboroCity_DevonCorp_1F_Text_1829A4, 4
 	release
@@ -36,11 +36,11 @@ RustboroCity_DevonCorp_1F_EventScript_15744A:: @ 815744A
 RustboroCity_DevonCorp_1F_EventScript_157454:: @ 8157454
 	lock
 	faceplayer
-	checkflag 144
+	checkflag FLAG_RETURNED_DEVON_GOODS
 	goto_if_eq RustboroCity_DevonCorp_1F_EventScript_15747B
-	checkflag 143
+	checkflag FLAG_RECOVERED_DEVON_GOODS
 	goto_if_eq RustboroCity_DevonCorp_1F_EventScript_157485
-	checkflag 142
+	checkflag FLAG_DEVON_GOODS_STOLEN
 	goto_if_eq RustboroCity_DevonCorp_1F_EventScript_157485
 	msgbox RustboroCity_DevonCorp_1F_Text_182AF0, 4
 	release
@@ -59,11 +59,11 @@ RustboroCity_DevonCorp_1F_EventScript_157485:: @ 8157485
 RustboroCity_DevonCorp_1F_EventScript_15748F:: @ 815748F
 	lock
 	faceplayer
-	checkflag 144
+	checkflag FLAG_RETURNED_DEVON_GOODS
 	goto_if_eq RustboroCity_DevonCorp_1F_EventScript_1574B6
-	checkflag 143
+	checkflag FLAG_RECOVERED_DEVON_GOODS
 	goto_if_eq RustboroCity_DevonCorp_1F_EventScript_1574C0
-	checkflag 142
+	checkflag FLAG_DEVON_GOODS_STOLEN
 	goto_if_eq RustboroCity_DevonCorp_1F_EventScript_1574C0
 	msgbox RustboroCity_DevonCorp_1F_Text_1828EE, 4
 	release
diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc
index f40c1b87b..097fee3fb 100644
--- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc
+++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc
@@ -25,7 +25,7 @@ RustboroCity_DevonCorp_2F_EventScript_1574F9:: @ 81574F9
 	faceplayer
 	compare 0x40c4, 1
 	call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC
-	checkflag 287
+	checkflag FLAG_MET_DEVON_EMPLOYEE
 	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157519
 	msgbox RustboroCity_DevonCorp_2F_Text_182BD8, 4
 	release
@@ -41,7 +41,7 @@ RustboroCity_DevonCorp_2F_EventScript_157523:: @ 8157523
 	faceplayer
 	compare 0x40c4, 1
 	call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC
-	checkflag 188
+	checkflag FLAG_RECEIVED_POKENAV
 	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157543
 	msgbox RustboroCity_DevonCorp_2F_Text_182D2A, 4
 	release
@@ -139,7 +139,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661
 	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707
 	copyvar 0x8004, RESULT
 	setvar 0x40c4, 0
-	setflag 267
+	setflag FLAG_RECEIVED_FOSSIL_MON
 	playfanfare 370
 	message RustboroCity_DevonCorp_2F_Text_18319E
 	waitfanfare
@@ -159,7 +159,7 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4
 	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707
 	copyvar 0x8004, RESULT
 	setvar 0x40c4, 0
-	setflag 267
+	setflag FLAG_RECEIVED_FOSSIL_MON
 	playfanfare 370
 	message RustboroCity_DevonCorp_2F_Text_18319E
 	waitfanfare
diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc
index 6f0152e60..0e9786760 100644
--- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc
+++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc
@@ -54,16 +54,16 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752
 	message RustboroCity_DevonCorp_3F_Text_183422
 	waitfanfare
 	waitmessage
-	setflag 2050
-	setflag 188
+	setflag FLAG_SYS_POKENAV_GET
+	setflag FLAG_RECEIVED_POKENAV
 	msgbox RustboroCity_DevonCorp_3F_Text_183439, 4
-	setflag 894
-	clearflag 807
-	clearflag 983
-	clearflag 739
-	clearflag 881
+	setflag FLAG_HIDE_TUNNER_DIGGER_ROUTE116
+	clearflag FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL
+	clearflag FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL
+	clearflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE
+	clearflag FLAG_HIDE_PEEKO_BRINEY_HOUSE
 	setvar 0x4096, 1
-	clearflag 814
+	clearflag FLAG_HIDE_RIVAL_RUSTBORO
 	setvar 0x408f, 1
 	releaseall
 	end
@@ -146,9 +146,9 @@ RustboroCity_DevonCorp_3F_Movement_157835:: @ 8157835
 RustboroCity_DevonCorp_3F_EventScript_15783B:: @ 815783B
 	lock
 	faceplayer
-	checkflag 272
+	checkflag FLAG_RECEIVED_EXP_SHARE
 	goto_if_eq RustboroCity_DevonCorp_3F_EventScript_15789B
-	checkflag 189
+	checkflag FLAG_DELIVERED_STEVEN_LETTER
 	goto_if_eq RustboroCity_DevonCorp_3F_EventScript_157864
 	msgbox RustboroCity_DevonCorp_3F_Text_18351E, 4
 	closemessage
@@ -162,7 +162,7 @@ RustboroCity_DevonCorp_3F_EventScript_157864:: @ 8157864
 	giveitem ITEM_EXP_SHARE
 	compare RESULT, 0
 	goto_if_eq RustboroCity_DevonCorp_3F_EventScript_1A029B
-	setflag 272
+	setflag FLAG_RECEIVED_EXP_SHARE
 	msgbox RustboroCity_DevonCorp_3F_Text_1835B3, 4
 	closemessage
 	applymovement LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D
@@ -181,7 +181,7 @@ RustboroCity_DevonCorp_3F_EventScript_15789B:: @ 815789B
 RustboroCity_DevonCorp_3F_EventScript_1578B0:: @ 81578B0
 	lock
 	faceplayer
-	checkflag 256
+	checkflag FLAG_RECEIVED_REPEAT_BALL
 	goto_if_eq RustboroCity_DevonCorp_3F_EventScript_1578C5
 	msgbox RustboroCity_DevonCorp_3F_Text_18395C, 4
 	release
diff --git a/data/scripts/maps/RustboroCity_Flat2_2F.inc b/data/scripts/maps/RustboroCity_Flat2_2F.inc
index 0dfec5cfa..5be59b14e 100644
--- a/data/scripts/maps/RustboroCity_Flat2_2F.inc
+++ b/data/scripts/maps/RustboroCity_Flat2_2F.inc
@@ -8,13 +8,13 @@ RustboroCity_Flat2_2F_EventScript_157D97:: @ 8157D97
 RustboroCity_Flat2_2F_EventScript_157DA0:: @ 8157DA0
 	lock
 	faceplayer
-	checkflag 213
+	checkflag FLAG_RECEIVED_PREMIER_BALL_RUSTBORO
 	goto_if_eq RustboroCity_Flat2_2F_EventScript_157DCF
 	msgbox RustboroCity_Flat2_2F_Text_185461, 4
 	giveitem ITEM_PREMIER_BALL
 	compare RESULT, 0
 	goto_if_eq RustboroCity_Flat2_2F_EventScript_1A029B
-	setflag 213
+	setflag FLAG_RECEIVED_PREMIER_BALL_RUSTBORO
 	release
 	end
 
diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc
index b1bbfb8d8..427be433d 100644
--- a/data/scripts/maps/RustboroCity_Gym.inc
+++ b/data/scripts/maps/RustboroCity_Gym.inc
@@ -3,7 +3,7 @@ RustboroCity_Gym_MapScripts:: @ 81578D8
 
 RustboroCity_Gym_EventScript_1578D9:: @ 81578D9
 	trainerbattle 1, OPPONENT_ROXANNE, 0, RustboroCity_Gym_Text_183EE5, RustboroCity_Gym_Text_183FC4, RustboroCity_Gym_EventScript_1578FE
-	checkflag 165
+	checkflag FLAG_RECEIVED_TM39
 	goto_if 0, RustboroCity_Gym_EventScript_15793C
 	msgbox RustboroCity_Gym_Text_184252, 4
 	release
@@ -14,8 +14,8 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE
 	waitmessage
 	call RustboroCity_Gym_EventScript_1A02C5
 	msgbox RustboroCity_Gym_Text_1840D5, 4
-	setflag 1201
-	setflag 2055
+	setflag FLAG_DEFEATED_RUSTBORO_GYM
+	setflag FLAG_BADGE01_GET
 	setvar 0x405a, 1
 	addvar 0x4085, 1
 	setvar 0x8008, 1
@@ -29,7 +29,7 @@ RustboroCity_Gym_EventScript_15793C:: @ 815793C
 	giveitem ITEM_TM39
 	compare RESULT, 0
 	goto_if_eq RustboroCity_Gym_EventScript_1A029B
-	setflag 165
+	setflag FLAG_RECEIVED_TM39
 	msgbox RustboroCity_Gym_Text_184170, 4
 	release
 	end
@@ -47,7 +47,7 @@ RustboroCity_Gym_EventScript_157977:: @ 8157977
 RustboroCity_Gym_EventScript_15798E:: @ 815798E
 	lock
 	faceplayer
-	checkflag 1201
+	checkflag FLAG_DEFEATED_RUSTBORO_GYM
 	goto_if_eq RustboroCity_Gym_EventScript_1579A3
 	msgbox RustboroCity_Gym_Text_183A4B, 4
 	release
@@ -60,14 +60,14 @@ RustboroCity_Gym_EventScript_1579A3:: @ 81579A3
 
 RustboroCity_Gym_EventScript_1579AD:: @ 81579AD
 	lockall
-	checkflag 2055
+	checkflag FLAG_BADGE01_GET
 	goto_if_eq RustboroCity_Gym_EventScript_1579CD
 	goto RustboroCity_Gym_EventScript_1579D7
 	end
 
 RustboroCity_Gym_EventScript_1579BD:: @ 81579BD
 	lockall
-	checkflag 2055
+	checkflag FLAG_BADGE01_GET
 	goto_if_eq RustboroCity_Gym_EventScript_1579CD
 	goto RustboroCity_Gym_EventScript_1579D7
 	end
diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/scripts/maps/RustboroCity_House1.inc
index b983617e0..53a845648 100644
--- a/data/scripts/maps/RustboroCity_House1.inc
+++ b/data/scripts/maps/RustboroCity_House1.inc
@@ -4,7 +4,7 @@ RustboroCity_House1_MapScripts:: @ 8157C7C
 RustboroCity_House1_EventScript_157C7D:: @ 8157C7D
 	lock
 	faceplayer
-	checkflag 153
+	checkflag FLAG_RUSTBORO_NPC_TRADE_COMPLETED
 	goto_if_eq RustboroCity_House1_EventScript_157D13
 	setvar 0x8008, 0
 	copyvar 0x8004, 0x8008
@@ -29,7 +29,7 @@ RustboroCity_House1_EventScript_157C7D:: @ 8157C7D
 	special sub_804E174
 	waitstate
 	msgbox RustboroCity_House1_Text_184F6B, 4
-	setflag 153
+	setflag FLAG_RUSTBORO_NPC_TRADE_COMPLETED
 	release
 	end
 
diff --git a/data/scripts/maps/RustboroCity_Mart.inc b/data/scripts/maps/RustboroCity_Mart.inc
index cb722a6af..69f977e79 100644
--- a/data/scripts/maps/RustboroCity_Mart.inc
+++ b/data/scripts/maps/RustboroCity_Mart.inc
@@ -6,9 +6,9 @@ RustboroCity_Mart_EventScript_157BD4:: @ 8157BD4
 	faceplayer
 	message RustboroCity_Mart_Text_1A0BE4
 	waitmessage
-	checkflag 287
+	checkflag FLAG_MET_DEVON_EMPLOYEE
 	goto_if 0, RustboroCity_Mart_EventScript_157BEF
-	checkflag 287
+	checkflag FLAG_MET_DEVON_EMPLOYEE
 	goto_if_eq RustboroCity_Mart_EventScript_157C18
 	end
 
diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.inc b/data/scripts/maps/RustboroCity_PokemonSchool.inc
index 73b364f5e..9fd77bd6b 100644
--- a/data/scripts/maps/RustboroCity_PokemonSchool.inc
+++ b/data/scripts/maps/RustboroCity_PokemonSchool.inc
@@ -77,7 +77,7 @@ RustboroCity_PokemonSchool_EventScript_157AC5:: @ 8157AC5
 RustboroCity_PokemonSchool_EventScript_157ACE:: @ 8157ACE
 	lock
 	faceplayer
-	checkflag 275
+	checkflag FLAG_RECEIVED_QUICK_CLAW
 	goto_if_eq RustboroCity_PokemonSchool_EventScript_157B34
 	compare FACING, 4
 	call_if 1, RustboroCity_PokemonSchool_EventScript_157B1E
@@ -90,7 +90,7 @@ RustboroCity_PokemonSchool_EventScript_157ACE:: @ 8157ACE
 	closemessage
 	applymovement LAST_TALKED, RustboroCity_PokemonSchool_Movement_1A0845
 	waitmovement 0
-	setflag 275
+	setflag FLAG_RECEIVED_QUICK_CLAW
 	release
 	end
 
diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc
index 28f6f0ad4..04364b661 100644
--- a/data/scripts/maps/RusturfTunnel.inc
+++ b/data/scripts/maps/RusturfTunnel.inc
@@ -32,9 +32,9 @@ RusturfTunnel_EventScript_15C782:: @ 815C782
 RusturfTunnel_EventScript_15C799:: @ 815C799
 	lock
 	faceplayer
-	checkflag 1
+	checkflag FLAG_TEMP_1
 	goto_if_eq RusturfTunnel_EventScript_15C7BC
-	setflag 1
+	setflag FLAG_TEMP_1
 	msgbox RusturfTunnel_Text_1944C5, 4
 	closemessage
 	applymovement LAST_TALKED, RusturfTunnel_Movement_1A083D
@@ -65,7 +65,7 @@ RusturfTunnel_EventScript_15C7D1:: @ 815C7D1
 	compare 0x4001, 3
 	call_if 1, RusturfTunnel_EventScript_15C8EB
 	giveitem ITEM_HM04
-	setflag 106
+	setflag FLAG_RECEIVED_HM04
 	msgbox RusturfTunnel_Text_194693, 4
 	closemessage
 	compare 0x4001, 1
@@ -341,11 +341,11 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA
 	waitmovement 0
 	removeobject 5
 	removeobject 7
-	clearflag 142
-	setflag 143
+	clearflag FLAG_DEVON_GOODS_STOLEN
+	setflag FLAG_RECOVERED_DEVON_GOODS
 	setvar 0x405a, 4
 	setvar 0x4090, 1
-	setflag 891
+	setflag FLAG_HIDE_BRINEY_ROUTE116
 	release
 	end
 
diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc
index 59ab89112..18cff8320 100644
--- a/data/scripts/maps/SSTidalCorridor.inc
+++ b/data/scripts/maps/SSTidalCorridor.inc
@@ -124,7 +124,7 @@ SSTidalCorridor_EventScript_15FDD6:: @ 815FDD6
 SSTidalCorridor_EventScript_15FDF8:: @ 815FDF8
 	sethealplace 8
 	msgbox SSTidalCorridor_Text_1991F4, 4
-	checkflag 260
+	checkflag FLAG_RECEIVED_TM49
 	call_if 1, SSTidalCorridor_EventScript_15FE36
 	warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11
 	waitstate
@@ -134,7 +134,7 @@ SSTidalCorridor_EventScript_15FDF8:: @ 815FDF8
 SSTidalCorridor_EventScript_15FE17:: @ 815FE17
 	sethealplace 4
 	msgbox SSTidalCorridor_Text_1991F4, 4
-	checkflag 260
+	checkflag FLAG_RECEIVED_TM49
 	call_if 1, SSTidalCorridor_EventScript_15FE36
 	warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11
 	waitstate
@@ -142,7 +142,7 @@ SSTidalCorridor_EventScript_15FE17:: @ 815FE17
 	end
 
 SSTidalCorridor_EventScript_15FE36:: @ 815FE36
-	setflag 951
+	setflag FLAG_HIDE_TM_49_GIVER_SS_TIDAL
 	return
 
 SSTidalCorridor_EventScript_15FE3A:: @ 815FE3A
@@ -163,7 +163,7 @@ SSTidalCorridor_EventScript_15FE5B:: @ 815FE5B
 SSTidalCorridor_EventScript_15FE60:: @ 815FE60
 	lock
 	faceplayer
-	checkflag 247
+	checkflag FLAG_DEFEATED_SS_TIDAL_TRAINERS
 	goto_if_eq SSTidalCorridor_EventScript_15FE7A
 	call SSTidalCorridor_EventScript_15FE84
 	msgbox SSTidalCorridor_Text_199203, 4
@@ -192,7 +192,7 @@ SSTidalCorridor_EventScript_15FE84:: @ 815FE84
 	goto_if 0, SSTidalCorridor_EventScript_15FED5
 	checktrainerflag OPPONENT_ANETTE
 	goto_if 0, SSTidalCorridor_EventScript_15FED5
-	setflag 247
+	setflag FLAG_DEFEATED_SS_TIDAL_TRAINERS
 	goto SSTidalCorridor_EventScript_15FE7A
 	return
 
diff --git a/data/scripts/maps/SSTidalRooms.inc b/data/scripts/maps/SSTidalRooms.inc
index c7cd4447d..0a48ae453 100644
--- a/data/scripts/maps/SSTidalRooms.inc
+++ b/data/scripts/maps/SSTidalRooms.inc
@@ -4,13 +4,13 @@ SSTidalRooms_MapScripts:: @ 815FF05
 SSTidalRooms_EventScript_15FF06:: @ 815FF06
 	lock
 	faceplayer
-	checkflag 260
+	checkflag FLAG_RECEIVED_TM49
 	goto_if_eq SSTidalRooms_EventScript_15FF3D
 	msgbox SSTidalRooms_Text_199B65, 4
 	giveitem ITEM_TM49
 	compare RESULT, 0
 	goto_if_eq SSTidalRooms_EventScript_1A029B
-	setflag 260
+	setflag FLAG_RECEIVED_TM49
 	msgbox SSTidalRooms_Text_199C1A, 4
 	release
 	end
diff --git a/data/scripts/maps/ScorchedSlab.inc b/data/scripts/maps/ScorchedSlab.inc
index 112289083..f0ed9c005 100644
--- a/data/scripts/maps/ScorchedSlab.inc
+++ b/data/scripts/maps/ScorchedSlab.inc
@@ -3,5 +3,5 @@ ScorchedSlab_MapScripts:: @ 815F29D
 	.byte 0
 
 ScorchedSlab_MapScript1_15F2A3:: @ 815F2A3
-	setflag 2136
+	setflag FLAG_LANDMARK_SCORCHED_SLAB
 	end
diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc
index 26cb2321a..6a4d9af02 100644
--- a/data/scripts/maps/SeafloorCavern_Room9.inc
+++ b/data/scripts/maps/SeafloorCavern_Room9.inc
@@ -192,24 +192,24 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA
 	msgbox SeafloorCavern_Room9_Text_1B4ECA, 4
 	.endif
 	setvar 0x407b, 1
-	clearflag 855
-	clearflag 856
-	clearflag 816
-	clearflag 973
+	clearflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1
+	clearflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2
+	clearflag FLAG_HIDE_WALLACE_SOOTOPOLIS
+	clearflag FLAG_HIDE_STEVEN_SOOTOPOLIS
 	setvar 0x405e, 1
-	clearflag 944
-	clearflag 945
-	setflag 2090
-	setflag 854
-	setflag 129
-	setflag 967
+	clearflag FLAG_HIDE_EVIL_LEADER_ROUTE128
+	clearflag FLAG_HIDE_OTHER_LEADER_ROUTE128
+	setflag FLAG_SYS_WEATHER_CTRL
+	setflag FLAG_HIDE_SOOTOPOLIS_RESIDENTS
+	setflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN
+	setflag FLAG_HIDE_STEVEN_STEVENS_HOUSE
 	setvar 0x40c6, 1
 	setvar 0x40a2, 1
-	setflag 828
-	setflag 829
-	setflag 831
-	setflag 859
-	setflag 946
+	setflag FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN
+	setflag FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN
+	setflag FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN
+	setflag FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN
+	setflag FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN
 	warp MAP_ROUTE128, 255, 38, 22
 	waitstate
 	releaseall
diff --git a/data/scripts/maps/SealedChamber_InnerRoom.inc b/data/scripts/maps/SealedChamber_InnerRoom.inc
index 526ada367..a0c6314cc 100644
--- a/data/scripts/maps/SealedChamber_InnerRoom.inc
+++ b/data/scripts/maps/SealedChamber_InnerRoom.inc
@@ -6,7 +6,7 @@ SealedChamber_InnerRoom_EventScript_15F1E8:: @ 815F1E8
 	braillemessage SealedChamber_InnerRoom_Braille_1C53C1
 	waitbutton
 	erasebox 0, 0, 29, 19
-	checkflag 228
+	checkflag FLAG_REGI_DOORS_OPENED
 	goto_if_eq SealedChamber_InnerRoom_EventScript_15F247
 	specialvar RESULT, CheckRelicanthWailord
 	compare RESULT, 0
@@ -31,7 +31,7 @@ SealedChamber_InnerRoom_EventScript_15F1E8:: @ 815F1E8
 	msgbox SealedChamber_InnerRoom_Text_1A138B, 4
 	closemessage
 	fadeinbgm 0
-	setflag 228
+	setflag FLAG_REGI_DOORS_OPENED
 	releaseall
 	end
 
diff --git a/data/scripts/maps/SealedChamber_OuterRoom.inc b/data/scripts/maps/SealedChamber_OuterRoom.inc
index 5ff94be19..7add1e6f3 100644
--- a/data/scripts/maps/SealedChamber_OuterRoom.inc
+++ b/data/scripts/maps/SealedChamber_OuterRoom.inc
@@ -10,11 +10,11 @@ SealedChamber_OuterRoom_MapScript1_15F0D6:: @ 815F0D6
 	end
 
 SealedChamber_OuterRoom_MapScript1_15F0E7:: @ 815F0E7
-	setflag 2140
+	setflag FLAG_LANDMARK_SEALED_CHAMBER
 	end
 
 SealedChamber_OuterRoom_MapScript1_15F0EB:: @ 815F0EB
-	checkflag 2127
+	checkflag FLAG_SYS_BRAILLE_DIG
 	call_if 0, SealedChamber_OuterRoom_EventScript_15F0F5
 	end
 
@@ -109,7 +109,7 @@ SealedChamber_OuterRoom_EventScript_15F1AA:: @ 815F1AA
 
 SealedChamber_OuterRoom_EventScript_15F1B8:: @ 815F1B8
 	lockall
-	checkflag 2127
+	checkflag FLAG_SYS_BRAILLE_DIG
 	goto_if_eq SealedChamber_OuterRoom_EventScript_15F1CF
 	braillemessage SealedChamber_OuterRoom_Braille_1C53B1
 	waitbutton
diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc
index 52d430db5..fcff20944 100644
--- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc
+++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc
@@ -4,7 +4,7 @@ ShoalCave_LowTideEntranceRoom_MapScripts:: @ 815E057
 
 ShoalCave_LowTideEntranceRoom_MapScript1_15E05D:: @ 815E05D
 	special UpdateShoalTideFlag
-	checkflag 2106
+	checkflag FLAG_SYS_SHOAL_TIDE
 	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E06E
 	goto ShoalCave_LowTideEntranceRoom_EventScript_15E072
 
@@ -20,7 +20,7 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076
 	lock
 	faceplayer
 	dodailyevents
-	checkflag 2143
+	checkflag FLAG_SYS_SHOAL_ITEM
 	call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_15E176
 	checkitem ITEM_SHOAL_SALT, 4
 	compare RESULT, 0
@@ -43,7 +43,7 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076
 	compare RESULT, 0
 	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_1A029B
 	msgbox ShoalCave_LowTideEntranceRoom_Text_1C688E, 4
-	setflag 2
+	setflag FLAG_TEMP_2
 	release
 	end
 
@@ -90,13 +90,13 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E16C:: @ 815E16C
 	end
 
 ShoalCave_LowTideEntranceRoom_EventScript_15E176:: @ 815E176
-	clearflag 952
-	clearflag 953
-	clearflag 954
-	clearflag 955
-	clearflag 956
-	clearflag 957
-	clearflag 958
-	clearflag 959
-	clearflag 2143
+	clearflag FLAG_HIDE_TOOK_SHOAL_SALT_1
+	clearflag FLAG_HIDE_TOOK_SHOAL_SALT_2
+	clearflag FLAG_HIDE_TOOK_SHOAL_SALT_3
+	clearflag FLAG_HIDE_TOOK_SHOAL_SALT_4
+	clearflag FLAG_HIDE_TOOK_SHOAL_SHELL_1
+	clearflag FLAG_HIDE_TOOK_SHOAL_SHELL_2
+	clearflag FLAG_HIDE_TOOK_SHOAL_SHELL_3
+	clearflag FLAG_HIDE_TOOK_SHOAL_SHELL_4
+	clearflag FLAG_SYS_SHOAL_ITEM
 	return
diff --git a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc
index ada997023..43dfa8afa 100644
--- a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc
+++ b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc
@@ -4,7 +4,7 @@ ShoalCave_LowTideInnerRoom_MapScripts:: @ 815E192
 	.byte 0
 
 ShoalCave_LowTideInnerRoom_MapScript1_15E19D:: @ 815E19D
-	checkflag 2106
+	checkflag FLAG_SYS_SHOAL_TIDE
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1AB
 	goto ShoalCave_LowTideInnerRoom_EventScript_15E1AF
 
@@ -21,46 +21,46 @@ ShoalCave_LowTideInnerRoom_MapScript1_15E1B3:: @ 815E1B3
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_15E1B9:: @ 815E1B9
-	checkflag 952
+	checkflag FLAG_HIDE_TOOK_SHOAL_SALT_1
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1DA
-	checkflag 2106
+	checkflag FLAG_SYS_SHOAL_TIDE
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1DA
 	setmaptile 31, 8, 856, 1
 	goto ShoalCave_LowTideInnerRoom_EventScript_15E1DA
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_15E1DA:: @ 815E1DA
-	checkflag 953
+	checkflag FLAG_HIDE_TOOK_SHOAL_SALT_2
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1FB
-	checkflag 2106
+	checkflag FLAG_SYS_SHOAL_TIDE
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1FB
 	setmaptile 14, 26, 856, 1
 	goto ShoalCave_LowTideInnerRoom_EventScript_15E1FB
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_15E1FB:: @ 815E1FB
-	checkflag 956
+	checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_1
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E213
 	setmaptile 41, 20, 857, 1
 	goto ShoalCave_LowTideInnerRoom_EventScript_15E213
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_15E213:: @ 815E213
-	checkflag 957
+	checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_2
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E22B
 	setmaptile 41, 10, 857, 1
 	goto ShoalCave_LowTideInnerRoom_EventScript_15E22B
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_15E22B:: @ 815E22B
-	checkflag 958
+	checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_3
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E243
 	setmaptile 6, 9, 857, 1
 	goto ShoalCave_LowTideInnerRoom_EventScript_15E243
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_15E243:: @ 815E243
-	checkflag 959
+	checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_4
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E256
 	setmaptile 16, 13, 857, 1
 	return
@@ -70,14 +70,14 @@ ShoalCave_LowTideInnerRoom_EventScript_15E256:: @ 815E256
 
 ShoalCave_LowTideInnerRoom_EventScript_15E257:: @ 815E257
 	lockall
-	checkflag 956
+	checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_1
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289
 	giveitem ITEM_SHOAL_SHELL
 	compare RESULT, 0
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B
 	setmaptile 41, 20, 859, 0
 	special DrawWholeMapView
-	setflag 956
+	setflag FLAG_HIDE_TOOK_SHOAL_SHELL_1
 	releaseall
 	end
 
@@ -88,53 +88,53 @@ ShoalCave_LowTideInnerRoom_EventScript_15E289:: @ 815E289
 
 ShoalCave_LowTideInnerRoom_EventScript_15E293:: @ 815E293
 	lockall
-	checkflag 957
+	checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_2
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289
 	giveitem ITEM_SHOAL_SHELL
 	compare RESULT, 0
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B
 	setmaptile 41, 10, 859, 0
 	special DrawWholeMapView
-	setflag 957
+	setflag FLAG_HIDE_TOOK_SHOAL_SHELL_2
 	releaseall
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_15E2C5:: @ 815E2C5
 	lockall
-	checkflag 958
+	checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_3
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289
 	giveitem ITEM_SHOAL_SHELL
 	compare RESULT, 0
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B
 	setmaptile 6, 9, 859, 0
 	special DrawWholeMapView
-	setflag 958
+	setflag FLAG_HIDE_TOOK_SHOAL_SHELL_3
 	releaseall
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_15E2F7:: @ 815E2F7
 	lockall
-	checkflag 959
+	checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_4
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289
 	giveitem ITEM_SHOAL_SHELL
 	compare RESULT, 0
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B
 	setmaptile 16, 13, 859, 0
 	special DrawWholeMapView
-	setflag 959
+	setflag FLAG_HIDE_TOOK_SHOAL_SHELL_4
 	releaseall
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_15E329:: @ 815E329
 	lockall
-	checkflag 952
+	checkflag FLAG_HIDE_TOOK_SHOAL_SALT_1
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E35B
 	giveitem ITEM_SHOAL_SALT
 	compare RESULT, 0
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B
 	setmaptile 31, 8, 858, 0
 	special DrawWholeMapView
-	setflag 952
+	setflag FLAG_HIDE_TOOK_SHOAL_SALT_1
 	releaseall
 	end
 
@@ -145,13 +145,13 @@ ShoalCave_LowTideInnerRoom_EventScript_15E35B:: @ 815E35B
 
 ShoalCave_LowTideInnerRoom_EventScript_15E365:: @ 815E365
 	lockall
-	checkflag 953
+	checkflag FLAG_HIDE_TOOK_SHOAL_SALT_2
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E35B
 	giveitem ITEM_SHOAL_SALT
 	compare RESULT, 0
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B
 	setmaptile 14, 26, 858, 0
 	special DrawWholeMapView
-	setflag 953
+	setflag FLAG_HIDE_TOOK_SHOAL_SALT_2
 	releaseall
 	end
diff --git a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc
index db5779efe..adf7d5d9e 100644
--- a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc
+++ b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc
@@ -7,7 +7,7 @@ ShoalCave_LowTideLowerRoom_MapScript1_15E3F9:: @ 815E3F9
 	end
 
 ShoalCave_LowTideLowerRoom_EventScript_15E3FF:: @ 815E3FF
-	checkflag 955
+	checkflag FLAG_HIDE_TOOK_SHOAL_SALT_4
 	goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E412
 	setmaptile 18, 2, 856, 1
 	return
@@ -17,14 +17,14 @@ ShoalCave_LowTideLowerRoom_EventScript_15E412:: @ 815E412
 
 ShoalCave_LowTideLowerRoom_EventScript_15E413:: @ 815E413
 	lockall
-	checkflag 955
+	checkflag FLAG_HIDE_TOOK_SHOAL_SALT_4
 	goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E445
 	giveitem ITEM_SHOAL_SALT
 	compare RESULT, 0
 	goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_1A029B
 	setmaptile 18, 2, 858, 0
 	special DrawWholeMapView
-	setflag 955
+	setflag FLAG_HIDE_TOOK_SHOAL_SALT_4
 	releaseall
 	end
 
@@ -36,13 +36,13 @@ ShoalCave_LowTideLowerRoom_EventScript_15E445:: @ 815E445
 ShoalCave_LowTideLowerRoom_EventScript_15E44F:: @ 815E44F
 	lock
 	faceplayer
-	checkflag 283
+	checkflag FLAG_RECEIVED_FOCUS_BAND
 	goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E47E
 	msgbox ShoalCave_LowTideLowerRoom_Text_198200, 4
 	giveitem ITEM_FOCUS_BAND
 	compare RESULT, 0
 	goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_1A029B
-	setflag 283
+	setflag FLAG_RECEIVED_FOCUS_BAND
 	release
 	end
 
diff --git a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc
index bffb7bd49..d6858bc15 100644
--- a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc
+++ b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc
@@ -7,7 +7,7 @@ ShoalCave_LowTideStairsRoom_MapScript1_15E39D:: @ 815E39D
 	end
 
 ShoalCave_LowTideStairsRoom_EventScript_15E3A3:: @ 815E3A3
-	checkflag 954
+	checkflag FLAG_HIDE_TOOK_SHOAL_SALT_3
 	goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_15E3B6
 	setmaptile 11, 11, 856, 1
 	return
@@ -17,14 +17,14 @@ ShoalCave_LowTideStairsRoom_EventScript_15E3B6:: @ 815E3B6
 
 ShoalCave_LowTideStairsRoom_EventScript_15E3B7:: @ 815E3B7
 	lockall
-	checkflag 954
+	checkflag FLAG_HIDE_TOOK_SHOAL_SALT_3
 	goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_15E3E9
 	giveitem ITEM_SHOAL_SALT
 	compare RESULT, 0
 	goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_1A029B
 	setmaptile 11, 11, 858, 0
 	special DrawWholeMapView
-	setflag 954
+	setflag FLAG_HIDE_TOOK_SHOAL_SALT_3
 	releaseall
 	end
 
diff --git a/data/scripts/maps/SkyPillar_Entrance.inc b/data/scripts/maps/SkyPillar_Entrance.inc
index 7a3927332..ab991d845 100644
--- a/data/scripts/maps/SkyPillar_Entrance.inc
+++ b/data/scripts/maps/SkyPillar_Entrance.inc
@@ -3,5 +3,5 @@ SkyPillar_Entrance_MapScripts:: @ 815F2BD
 	.byte 0
 
 SkyPillar_Entrance_MapScript1_15F2C3:: @ 815F2C3
-	setflag 2142
+	setflag FLAG_LANDMARK_SKY_PILLAR
 	end
diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc
index 1dee6e9c4..37da10220 100644
--- a/data/scripts/maps/SkyPillar_Top.inc
+++ b/data/scripts/maps/SkyPillar_Top.inc
@@ -3,7 +3,7 @@ SkyPillar_Top_MapScripts:: @ 815F302
 	.byte 0
 
 SkyPillar_Top_MapScript1_15F308:: @ 815F308
-	checkflag 2145
+	checkflag FLAG_SYS_CTRL_OBJ_DELETE
 	call_if 1, SkyPillar_Top_EventScript_15F312
 	end
 
@@ -19,10 +19,10 @@ SkyPillar_Top_EventScript_15F316:: @ 815F316
 	playpokecry SPECIES_RAYQUAZA, 2
 	delay 40
 	waitpokecry
-	setflag 773
-	setflag 2145
+	setflag FLAG_HIDE_RAYQUAZA
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	special ScrSpecial_StartRayquazaBattle
 	waitstate
-	clearflag 2145
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	release
 	end
diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc
index 600cfc959..c163685b2 100644
--- a/data/scripts/maps/SlateportCity.inc
+++ b/data/scripts/maps/SlateportCity.inc
@@ -17,9 +17,9 @@ SlateportCity_MapScript1_14BA3C:: @ 814BA3C
 	end
 
 SlateportCity_EventScript_14BA5C:: @ 814BA5C
-	setflag 2071
+	setflag FLAG_VISITED_SLATEPORT_CITY
 	setvar 0x4086, 0
-	setflag 803
+	setflag FLAG_HIDE_CONTEST_REPORTER_SLATEPORT
 	return
 
 SlateportCity_EventScript_14BA68:: @ 814BA68
@@ -125,7 +125,7 @@ SlateportCity_EventScript_14BB81:: @ 814BB81
 	faceplayer
 	compare 0x4058, 1
 	call_if 1, SlateportCity_EventScript_14BBA1
-	checkflag 96
+	checkflag FLAG_RECEIVED_SECRET_POWER
 	goto_if_eq SlateportCity_EventScript_14BBAB
 	msgbox SlateportCity_Text_164937, 4
 	release
@@ -182,7 +182,7 @@ SlateportCity_EventScript_14BC0A:: @ 814BC0A
 SlateportCity_EventScript_14BC14:: @ 814BC14
 	lock
 	faceplayer
-	checkflag 148
+	checkflag FLAG_DOCK_REJECTED_DEVON_GOODS
 	goto_if_eq SlateportCity_EventScript_14BC29
 	msgbox SlateportCity_Text_164BBF, 4
 	release
@@ -199,9 +199,9 @@ SlateportCity_EventScript_14BC33:: @ 814BC33
 
 SlateportCity_EventScript_14BC3C:: @ 814BC3C
 	lockall
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if_eq SlateportCity_EventScript_14BC63
-	checkflag 2061
+	checkflag FLAG_BADGE07_GET
 	goto_if_eq SlateportCity_EventScript_14BC59
 	msgbox SlateportCity_Text_1658A0, 4
 	releaseall
@@ -235,7 +235,7 @@ SlateportCity_EventScript_14BC88:: @ 814BC88
 
 SlateportCity_EventScript_14BC91:: @ 814BC91
 	lockall
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if_eq SlateportCity_EventScript_14BCA5
 	msgbox SlateportCity_Text_165A8B, 4
 	releaseall
@@ -410,7 +410,7 @@ SlateportCity_EventScript_14BE16:: @ 814BE16
 SlateportCity_EventScript_14BE20:: @ 814BE20
 	lock
 	faceplayer
-	checkflag 96
+	checkflag FLAG_RECEIVED_SECRET_POWER
 	goto_if 0, SlateportCity_EventScript_14BE16
 	message SlateportCity_Text_1A0BE4
 	waitmessage
@@ -442,7 +442,7 @@ SlateportCity_Decorations2:: @ 814BE40
 @ 814BE60
 	lock
 	faceplayer
-	checkflag 96
+	checkflag FLAG_RECEIVED_SECRET_POWER
 	goto_if 0, SlateportCity_EventScript_14BE16
 	message SlateportCity_Text_1A0BE4
 	waitmessage
@@ -533,10 +533,10 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC
 	applymovement 255, SlateportCity_Movement_14C008
 	waitmovement 0
 	removeobject 11
-	clearflag 841
-	clearflag 848
-	clearflag 845
-	clearflag 846
+	clearflag FLAG_HIDE_STERN_SLATEPORT_HARBOR
+	clearflag FLAG_HIDE_SUBMARINE_SHADOW_SLATEPORT_HARBOR
+	clearflag FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR
+	clearflag FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR
 	setvar 0x4058, 2
 	warp MAP_SLATEPORT_CITY_HARBOR, 255, 11, 14
 	waitstate
diff --git a/data/scripts/maps/SlateportCity_ContestHall.inc b/data/scripts/maps/SlateportCity_ContestHall.inc
index f8070f1a1..220ca3374 100644
--- a/data/scripts/maps/SlateportCity_ContestHall.inc
+++ b/data/scripts/maps/SlateportCity_ContestHall.inc
@@ -12,13 +12,13 @@ SlateportCity_ContestHall_EventScript_155555:: @ 8155555
 SlateportCity_ContestHall_EventScript_15555E:: @ 815555E
 	lock
 	faceplayer
-	checkflag 265
+	checkflag FLAG_RECEIVED_TM41
 	goto_if_eq SlateportCity_ContestHall_EventScript_155595
 	msgbox SlateportCity_ContestHall_Text_17CCE2, 4
 	giveitem ITEM_TM41
 	compare RESULT, 0
 	goto_if_eq SlateportCity_ContestHall_EventScript_1A029B
-	setflag 265
+	setflag FLAG_RECEIVED_TM41
 	msgbox SlateportCity_ContestHall_Text_17CE28, 4
 	release
 	end
diff --git a/data/scripts/maps/SlateportCity_ContestLobby.inc b/data/scripts/maps/SlateportCity_ContestLobby.inc
index 85a8fe40e..5a00f4830 100644
--- a/data/scripts/maps/SlateportCity_ContestLobby.inc
+++ b/data/scripts/maps/SlateportCity_ContestLobby.inc
@@ -101,13 +101,13 @@ SlateportCity_ContestLobby_EventScript_1554F0:: @ 81554F0
 
 SlateportCity_ContestLobby_EventScript_1554F9:: @ 81554F9
 	lockall
-	checkflag 95
+	checkflag FLAG_RECEIVED_POKEBLOCK_CASE
 	goto_if_eq SlateportCity_ContestLobby_EventScript_155526
 	applymovement 7, SlateportCity_ContestLobby_Movement_1A0839
 	waitmovement 0
 	msgbox SlateportCity_ContestLobby_Text_17CA67, 4
 	giveitem ITEM_POKEBLOCK_CASE
-	setflag 95
+	setflag FLAG_RECEIVED_POKEBLOCK_CASE
 	releaseall
 	end
 
diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc
index 34d927753..ae19d0326 100644
--- a/data/scripts/maps/SlateportCity_Harbor.inc
+++ b/data/scripts/maps/SlateportCity_Harbor.inc
@@ -7,19 +7,19 @@ SlateportCity_Harbor_MapScript1_155F63:: @ 8155F63
 	setvar 0x4001, 0
 	compare 0x40a0, 1
 	call_if 1, SlateportCity_Harbor_EventScript_155F89
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	call_if 1, SlateportCity_Harbor_EventScript_155F85
 	end
 
 SlateportCity_Harbor_EventScript_155F85:: @ 8155F85
-	clearflag 860
+	clearflag FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR
 	return
 
 SlateportCity_Harbor_EventScript_155F89:: @ 8155F89
 	savebgm BGM_EVIL_TEAM
 	setobjectxyperm 4, 12, 13
 	setobjectmovementtype 4, 9
-	setflag 905
+	setflag FLAG_HIDE_WORKERS_SLATEPORT_HARBOR
 	return
 
 SlateportCity_Harbor_EventScript_155F9B:: @ 8155F9B
@@ -73,8 +73,8 @@ SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5
 	call_if 1, SlateportCity_Harbor_EventScript_156086
 	msgbox SlateportCity_Harbor_Text_17FE60, 4
 	closemessage
-	setflag 821
-	setflag 822
+	setflag FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT
+	setflag FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT
 	moveobjectoffscreen 4
 	setobjectmovementtype 4, 10
 	releaseall
@@ -159,7 +159,7 @@ SlateportCity_Harbor_Movement_1560C2:: @ 81560C2
 SlateportCity_Harbor_EventScript_1560C4:: @ 81560C4
 	lock
 	faceplayer
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if_eq SlateportCity_Harbor_EventScript_1560D9
 	msgbox SlateportCity_Harbor_Text_17FA0A, 4
 	release
@@ -268,11 +268,11 @@ SlateportCity_Harbor_EventScript_156208:: @ 8156208
 SlateportCity_Harbor_EventScript_156211:: @ 8156211
 	lock
 	faceplayer
-	checkflag 2061
+	checkflag FLAG_BADGE07_GET
 	goto_if_eq SlateportCity_Harbor_EventScript_15626F
-	checkflag 271
+	checkflag FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE
 	goto_if_eq SlateportCity_Harbor_EventScript_156265
-	checkflag 112
+	checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE
 	goto_if_eq SlateportCity_Harbor_EventScript_156258
 	compare 0x40a0, 2
 	goto_if_eq SlateportCity_Harbor_EventScript_15624E
@@ -289,7 +289,7 @@ SlateportCity_Harbor_EventScript_15624E:: @ 815624E
 	end
 
 SlateportCity_Harbor_EventScript_156258:: @ 8156258
-	setflag 271
+	setflag FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE
 	msgbox SlateportCity_Harbor_Text_17FF35, 4
 	release
 	end
@@ -305,7 +305,7 @@ SlateportCity_Harbor_EventScript_15626F:: @ 815626F
 	checkitem ITEM_SCANNER, 1
 	compare RESULT, 1
 	goto_if_eq SlateportCity_Harbor_EventScript_1562A7
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if_eq SlateportCity_Harbor_EventScript_15629D
 	msgbox SlateportCity_Harbor_Text_18017B, 4
 	release
@@ -340,7 +340,7 @@ SlateportCity_Harbor_EventScript_1562EA:: @ 81562EA
 	goto_if_eq SlateportCity_Harbor_EventScript_1A029B
 	removeitem ITEM_SCANNER, 1
 	msgbox SlateportCity_Harbor_Text_18046B, 4
-	setflag 294
+	setflag FLAG_EXCHANGED_SCANNER
 	goto SlateportCity_Harbor_EventScript_156380
 	end
 
@@ -353,7 +353,7 @@ SlateportCity_Harbor_EventScript_15632A:: @ 815632A
 	goto_if_eq SlateportCity_Harbor_EventScript_1A029B
 	removeitem ITEM_SCANNER, 1
 	msgbox SlateportCity_Harbor_Text_18046B, 4
-	setflag 294
+	setflag FLAG_EXCHANGED_SCANNER
 	goto SlateportCity_Harbor_EventScript_156380
 	end
 
diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc
index 1ee8ff39b..0cb7b397e 100644
--- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc
+++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc
@@ -57,7 +57,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B2D:: @ 8155B2D
 	end
 
 SlateportCity_OceanicMuseum_1F_EventScript_155B5A:: @ 8155B5A
-	checkflag 149
+	checkflag FLAG_DELIVERED_DEVON_GOODS
 	goto_if 0, SlateportCity_OceanicMuseum_1F_EventScript_155B7B
 	msgbox SlateportCity_OceanicMuseum_1F_Text_17E1F5, 4
 	closemessage
@@ -167,7 +167,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A
 	giveitem ITEM_TM46
 	compare RESULT, 0
 	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155CC2
-	setflag 269
+	setflag FLAG_RECEIVED_TM46
 	msgbox SlateportCity_OceanicMuseum_1F_Text_17E606, 4
 	closemessage
 	compare FACING, 2
@@ -179,7 +179,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A
 SlateportCity_OceanicMuseum_1F_EventScript_155C98:: @ 8155C98
 	applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_155CD3
 	waitmovement 0
-	setflag 965
+	setflag FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM
 	playse 9
 	removeobject 13
 	release
@@ -188,7 +188,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C98:: @ 8155C98
 SlateportCity_OceanicMuseum_1F_EventScript_155CAD:: @ 8155CAD
 	applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_155CCC
 	waitmovement 0
-	setflag 965
+	setflag FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM
 	playse 9
 	removeobject 13
 	release
diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc
index e379c633d..7fcd0fff1 100644
--- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc
+++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc
@@ -74,7 +74,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6
 	removeobject 4
 	fadescreen 0
 	delay 30
-	setflag 883
+	setflag FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM
 	applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_1A0843
 	waitmovement 0
 	msgbox SlateportCity_OceanicMuseum_2F_Text_17F352, 4
@@ -86,10 +86,10 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6
 	waitmovement 0
 	playse 9
 	removeobject 1
-	setflag 900
-	setflag 149
-	clearflag 947
-	setflag 949
+	setflag FLAG_HIDE_EVIL_TEAM_ROUTE110
+	setflag FLAG_DELIVERED_DEVON_GOODS
+	clearflag FLAG_HIDE_DEVON_EMPLOYEE_ROUTE116
+	setflag FLAG_HIDE_EMPLOYEE_DEVON_CORP_3F
 	release
 	end
 
diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc
index 4195ad43a..7f3c331bd 100644
--- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc
+++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc
@@ -23,15 +23,15 @@ SlateportCity_PokemonFanClub_EventScript_155795:: @ 8155795
 
 SlateportCity_PokemonFanClub_EventScript_1557A8:: @ 81557A8
 	setvar 0x4002, 0
-	checkflag 204
+	checkflag FLAG_RECEIVED_YELLOW_SCARF
 	call_if 1, SlateportCity_PokemonFanClub_EventScript_155893
-	checkflag 203
+	checkflag FLAG_RECEIVED_GREEN_SCARF
 	call_if 1, SlateportCity_PokemonFanClub_EventScript_155893
-	checkflag 202
+	checkflag FLAG_RECEIVED_PINK_SCARF
 	call_if 1, SlateportCity_PokemonFanClub_EventScript_155893
-	checkflag 201
+	checkflag FLAG_RECEIVED_BLUE_SCARF
 	call_if 1, SlateportCity_PokemonFanClub_EventScript_155893
-	checkflag 200
+	checkflag FLAG_RECEIVED_RED_SCARF
 	call_if 1, SlateportCity_PokemonFanClub_EventScript_155893
 	compare 0x4002, 5
 	call_if 1, SlateportCity_PokemonFanClub_EventScript_15588D
@@ -49,15 +49,15 @@ SlateportCity_PokemonFanClub_EventScript_1557FE:: @ 81557FE
 SlateportCity_PokemonFanClub_EventScript_155808:: @ 8155808
 	msgbox SlateportCity_PokemonFanClub_Text_17DA49, 4
 	setvar 0x4001, 0
-	checkflag 204
+	checkflag FLAG_RECEIVED_YELLOW_SCARF
 	call_if 0, SlateportCity_PokemonFanClub_EventScript_1559FE
-	checkflag 203
+	checkflag FLAG_RECEIVED_GREEN_SCARF
 	call_if 0, SlateportCity_PokemonFanClub_EventScript_1559E7
-	checkflag 202
+	checkflag FLAG_RECEIVED_PINK_SCARF
 	call_if 0, SlateportCity_PokemonFanClub_EventScript_1559D0
-	checkflag 201
+	checkflag FLAG_RECEIVED_BLUE_SCARF
 	call_if 0, SlateportCity_PokemonFanClub_EventScript_1559B9
-	checkflag 200
+	checkflag FLAG_RECEIVED_RED_SCARF
 	call_if 0, SlateportCity_PokemonFanClub_EventScript_1559A2
 	getfirstpartypokename 0
 	switch 0x4001
@@ -88,7 +88,7 @@ SlateportCity_PokemonFanClub_EventScript_1558A3:: @ 81558A3
 	compare RESULT, 0
 	goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998
 	msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4
-	setflag 200
+	setflag FLAG_RECEIVED_RED_SCARF
 	giveitem ITEM_RED_SCARF
 	msgbox SlateportCity_PokemonFanClub_Text_17DC1B, 4
 	release
@@ -99,7 +99,7 @@ SlateportCity_PokemonFanClub_EventScript_1558D4:: @ 81558D4
 	compare RESULT, 0
 	goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998
 	msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4
-	setflag 201
+	setflag FLAG_RECEIVED_BLUE_SCARF
 	giveitem ITEM_BLUE_SCARF
 	msgbox SlateportCity_PokemonFanClub_Text_17DC74, 4
 	release
@@ -110,7 +110,7 @@ SlateportCity_PokemonFanClub_EventScript_155905:: @ 8155905
 	compare RESULT, 0
 	goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998
 	msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4
-	setflag 202
+	setflag FLAG_RECEIVED_PINK_SCARF
 	giveitem ITEM_PINK_SCARF
 	msgbox SlateportCity_PokemonFanClub_Text_17DCCB, 4
 	release
@@ -121,7 +121,7 @@ SlateportCity_PokemonFanClub_EventScript_155936:: @ 8155936
 	compare RESULT, 0
 	goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998
 	msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4
-	setflag 203
+	setflag FLAG_RECEIVED_GREEN_SCARF
 	giveitem ITEM_GREEN_SCARF
 	msgbox SlateportCity_PokemonFanClub_Text_17DD27, 4
 	release
@@ -132,7 +132,7 @@ SlateportCity_PokemonFanClub_EventScript_155967:: @ 8155967
 	compare RESULT, 0
 	goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998
 	msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4
-	setflag 204
+	setflag FLAG_RECEIVED_YELLOW_SCARF
 	giveitem ITEM_YELLOW_SCARF
 	msgbox SlateportCity_PokemonFanClub_Text_17DD78, 4
 	release
@@ -196,7 +196,7 @@ SlateportCity_PokemonFanClub_EventScript_155A0F:: @ 8155A0F
 SlateportCity_PokemonFanClub_EventScript_155A15:: @ 8155A15
 	lock
 	faceplayer
-	checkflag 278
+	checkflag FLAG_RECEIVED_SOOTHE_BELL
 	goto_if_eq SlateportCity_PokemonFanClub_EventScript_155A75
 	msgbox SlateportCity_PokemonFanClub_Text_17DE6B, 4
 	specialvar RESULT, GetLeadMonFriendshipScore
@@ -215,7 +215,7 @@ SlateportCity_PokemonFanClub_EventScript_155A3A:: @ 8155A3A
 	giveitem ITEM_SOOTHE_BELL
 	compare RESULT, 0
 	goto_if_eq SlateportCity_PokemonFanClub_EventScript_1A029B
-	setflag 278
+	setflag FLAG_RECEIVED_SOOTHE_BELL
 	release
 	end
 
diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc
index 9fe7f1f1a..46dc8419c 100644
--- a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc
+++ b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc
@@ -3,13 +3,13 @@ SlateportCity_SternsShipyard_1F_MapScripts:: @ 8155335
 
 SlateportCity_SternsShipyard_1F_EventScript_155336:: @ 8155336
 	lockall
-	checkflag 2052
+	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_155388
-	checkflag 2061
+	checkflag FLAG_BADGE07_GET
 	goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_15539C
-	checkflag 149
+	checkflag FLAG_DELIVERED_DEVON_GOODS
 	goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_1553CF
-	checkflag 148
+	checkflag FLAG_DOCK_REJECTED_DEVON_GOODS
 	goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_1553B0
 	msgbox SlateportCity_SternsShipyard_1F_Text_17C14B, 4
 	applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A0839
@@ -18,8 +18,8 @@ SlateportCity_SternsShipyard_1F_EventScript_155336:: @ 8155336
 	closemessage
 	applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A083D
 	waitmovement 0
-	setflag 148
-	setflag 882
+	setflag FLAG_DOCK_REJECTED_DEVON_GOODS
+	setflag FLAG_HIDE_EVIL_TEAM_SLATEPORT
 	releaseall
 	end
 
diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc
index 994e33197..748dbe898 100644
--- a/data/scripts/maps/SootopolisCity.inc
+++ b/data/scripts/maps/SootopolisCity.inc
@@ -5,9 +5,9 @@ SootopolisCity_MapScripts:: @ 814D07D
 	.byte 0
 
 SootopolisCity_MapScript1_14D08D:: @ 814D08D
-	checkflag 129
+	checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN
 	call_if 0, SootopolisCity_EventScript_14D0A0
-	checkflag 129
+	checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN
 	call_if 1, SootopolisCity_EventScript_14D0B1
 	end
 
@@ -17,7 +17,7 @@ SootopolisCity_EventScript_14D0A0:: @ 814D0A0
 	return
 
 SootopolisCity_EventScript_14D0B1:: @ 814D0B1
-	checkflag 113
+	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
 	call_if 0, SootopolisCity_EventScript_14D0BB
 	return
 
@@ -34,10 +34,10 @@ SootopolisCity_EventScript_14D0BB:: @ 814D0BB
 	return
 
 SootopolisCity_MapScript1_14D10D:: @ 814D10D
-	setflag 2077
-	checkflag 113
+	setflag FLAG_VISITED_SOOTOPOLIS_CITY
+	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
 	call_if 1, SootopolisCity_EventScript_14D159
-	checkflag 2090
+	checkflag FLAG_SYS_WEATHER_CTRL
 	call_if 1, SootopolisCity_EventScript_14D123
 	end
 
@@ -68,7 +68,7 @@ SootopolisCity_MapScript1_14D165:: @ 814D165
 SootopolisCity_EventScript_14D16E:: @ 814D16E
 	lock
 	faceplayer
-	checkflag 113
+	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
 	goto_if_eq SootopolisCity_EventScript_14D183
 	msgbox SootopolisCity_Text_1696A4, 4
 	release
@@ -92,16 +92,16 @@ SootopolisCity_EventScript_14D19F:: @ 814D19F
 	faceplayer
 	dodailyevents
 	special GetPlayerBigGuyGirlString
-	checkflag 2258
+	checkflag FLAG_DAILY_RECEIVED_BERRY_SOOTOPOLIS
 	goto_if_eq SootopolisCity_EventScript_14D241
 	msgbox SootopolisCity_Text_1C63F2, 4
 	random 10
 	addvar RESULT, 20
-	addvar RESULT, 133
+	addvar RESULT, ITEM_CHERI_BERRY
 	giveitem RESULT
 	compare RESULT, 0
 	goto_if_eq SootopolisCity_EventScript_1A029B
-	setflag 2258
+	setflag FLAG_DAILY_RECEIVED_BERRY_SOOTOPOLIS
 	msgbox SootopolisCity_Text_1C64D0, 4
 	random 2
 	compare RESULT, 0
@@ -142,7 +142,7 @@ SootopolisCity_EventScript_14D25E:: @ 814D25E
 SootopolisCity_EventScript_14D268:: @ 814D268
 	lock
 	faceplayer
-	checkflag 1236
+	checkflag FLAG_DEFEATED_SOOTOPOLIS_GYM
 	goto_if_eq SootopolisCity_EventScript_14D27D
 	msgbox SootopolisCity_Text_16A4D6, 4
 	release
@@ -156,7 +156,7 @@ SootopolisCity_EventScript_14D27D:: @ 814D27D
 SootopolisCity_EventScript_14D287:: @ 814D287
 	lock
 	faceplayer
-	checkflag 113
+	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
 	goto_if_eq SootopolisCity_EventScript_14D29C
 	msgbox SootopolisCity_Text_169813, 4
 	release
@@ -170,7 +170,7 @@ SootopolisCity_EventScript_14D29C:: @ 814D29C
 SootopolisCity_EventScript_14D2A6:: @ 814D2A6
 	lock
 	faceplayer
-	checkflag 113
+	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
 	goto_if_eq SootopolisCity_EventScript_14D2BB
 	msgbox SootopolisCity_Text_1698A0, 4
 	release
@@ -184,7 +184,7 @@ SootopolisCity_EventScript_14D2BB:: @ 814D2BB
 SootopolisCity_EventScript_14D2C5:: @ 814D2C5
 	lock
 	faceplayer
-	checkflag 113
+	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
 	goto_if_eq SootopolisCity_EventScript_14D2DA
 	msgbox SootopolisCity_Text_1697A7, 4
 	release
@@ -445,7 +445,7 @@ SootopolisCity_EventScript_14D48F:: @ 814D48F
 SootopolisCity_EventScript_14D498:: @ 814D498
 	lock
 	faceplayer
-	checkflag 113
+	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
 	goto_if_eq SootopolisCity_EventScript_14D4AD
 	.ifdef SAPPHIRE
 	msgbox SootopolisCity_Text_169DA6, 4
diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc
index 29b62402f..6f99ba8a5 100644
--- a/data/scripts/maps/SootopolisCity_Gym_1F.inc
+++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc
@@ -87,9 +87,9 @@ SootopolisCity_Gym_1F_Movement_15AFFD:: @ 815AFFD
 
 SootopolisCity_Gym_1F_EventScript_15AFFF:: @ 815AFFF
 	trainerbattle 1, OPPONENT_WALLACE, 0, SootopolisCity_Gym_1F_Text_18F0CA, SootopolisCity_Gym_1F_Text_18F282, SootopolisCity_Gym_1F_EventScript_15B02D
-	checkflag 172
+	checkflag FLAG_RECEIVED_TM03
 	goto_if 0, SootopolisCity_Gym_1F_EventScript_15B056
-	checkflag 2060
+	checkflag FLAG_BADGE06_GET
 	goto_if 0, SootopolisCity_Gym_1F_EventScript_15B07A
 	msgbox SootopolisCity_Gym_1F_Text_18F4D7, 4
 	release
@@ -100,8 +100,8 @@ SootopolisCity_Gym_1F_EventScript_15B02D:: @ 815B02D
 	waitmessage
 	call SootopolisCity_Gym_1F_EventScript_1A02C5
 	msgbox SootopolisCity_Gym_1F_Text_18F36B, 4
-	setflag 1236
-	setflag 2062
+	setflag FLAG_DEFEATED_SOOTOPOLIS_GYM
+	setflag FLAG_BADGE08_GET
 	setvar 0x8008, 8
 	call SootopolisCity_Gym_1F_EventScript_1A01C0
 	goto SootopolisCity_Gym_1F_EventScript_15B056
@@ -112,7 +112,7 @@ SootopolisCity_Gym_1F_EventScript_15B056:: @ 815B056
 	compare RESULT, 0
 	goto_if_eq SootopolisCity_Gym_1F_EventScript_1A029B
 	msgbox SootopolisCity_Gym_1F_Text_18F466, 4
-	setflag 172
+	setflag FLAG_RECEIVED_TM03
 	release
 	end
 
@@ -124,7 +124,7 @@ SootopolisCity_Gym_1F_EventScript_15B07A:: @ 815B07A
 SootopolisCity_Gym_1F_EventScript_15B084:: @ 815B084
 	lock
 	faceplayer
-	checkflag 1236
+	checkflag FLAG_DEFEATED_SOOTOPOLIS_GYM
 	goto_if_eq SootopolisCity_Gym_1F_EventScript_15B099
 	msgbox SootopolisCity_Gym_1F_Text_18E8A5, 4
 	release
@@ -137,14 +137,14 @@ SootopolisCity_Gym_1F_EventScript_15B099:: @ 815B099
 
 SootopolisCity_Gym_1F_EventScript_15B0A3:: @ 815B0A3
 	lockall
-	checkflag 2062
+	checkflag FLAG_BADGE08_GET
 	goto_if_eq SootopolisCity_Gym_1F_EventScript_15B0C3
 	goto SootopolisCity_Gym_1F_EventScript_15B0CD
 	end
 
 SootopolisCity_Gym_1F_EventScript_15B0B3:: @ 815B0B3
 	lockall
-	checkflag 2062
+	checkflag FLAG_BADGE08_GET
 	goto_if_eq SootopolisCity_Gym_1F_EventScript_15B0C3
 	goto SootopolisCity_Gym_1F_EventScript_15B0CD
 	end
diff --git a/data/scripts/maps/SootopolisCity_House1.inc b/data/scripts/maps/SootopolisCity_House1.inc
index 4877d6d6e..9a7b63c82 100644
--- a/data/scripts/maps/SootopolisCity_House1.inc
+++ b/data/scripts/maps/SootopolisCity_House1.inc
@@ -4,11 +4,11 @@ SootopolisCity_House1_MapScripts:: @ 815B29A
 SootopolisCity_House1_EventScript_15B29B:: @ 815B29B
 	lock
 	faceplayer
-	checkflag 121
+	checkflag FLAG_RECEIVED_TM31
 	goto_if_eq SootopolisCity_House1_EventScript_15B2C7
 	msgbox SootopolisCity_House1_Text_18F991, 4
 	giveitem ITEM_TM31
-	setflag 121
+	setflag FLAG_RECEIVED_TM31
 	msgbox SootopolisCity_House1_Text_18FA03, 4
 	release
 	end
diff --git a/data/scripts/maps/SootopolisCity_House6.inc b/data/scripts/maps/SootopolisCity_House6.inc
index a0fdc5ca4..1adf05991 100644
--- a/data/scripts/maps/SootopolisCity_House6.inc
+++ b/data/scripts/maps/SootopolisCity_House6.inc
@@ -4,16 +4,16 @@ SootopolisCity_House6_MapScripts:: @ 815B385
 SootopolisCity_House6_EventScript_15B386:: @ 815B386
 	lock
 	faceplayer
-	checkflag 245
+	checkflag FLAG_RECEIVED_WAILMER_DOLL
 	goto_if_eq SootopolisCity_House6_EventScript_15B3CD
 	msgbox SootopolisCity_House6_Text_18FEA1, 5
 	compare RESULT, 0
 	call_if 1, SootopolisCity_House6_EventScript_15B3C3
 	msgbox SootopolisCity_House6_Text_18FF12, 4
-	givedecoration 117
+	givedecoration DECOR_WAILMER_DOLL
 	compare RESULT, 0
 	goto_if_eq SootopolisCity_House6_EventScript_15B3D7
-	setflag 245
+	setflag FLAG_RECEIVED_WAILMER_DOLL
 	release
 	end
 
@@ -28,7 +28,7 @@ SootopolisCity_House6_EventScript_15B3CD:: @ 815B3CD
 	end
 
 SootopolisCity_House6_EventScript_15B3D7:: @ 815B3D7
-	getdecorname 1, 117
+	getdecorname 1, DECOR_WAILMER_DOLL
 	msgbox SootopolisCity_House6_Text_1A0CEF, 4
 	msgbox SootopolisCity_House6_Text_18FF28, 4
 	release
diff --git a/data/scripts/maps/SootopolisCity_Mart.inc b/data/scripts/maps/SootopolisCity_Mart.inc
index b88347002..115ed0453 100644
--- a/data/scripts/maps/SootopolisCity_Mart.inc
+++ b/data/scripts/maps/SootopolisCity_Mart.inc
@@ -29,9 +29,9 @@ SootopolisCity_Mart_Items:: @ 815B234
 SootopolisCity_Mart_EventScript_15B24A:: @ 815B24A
 	lock
 	faceplayer
-	checkflag 113
+	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
 	goto_if_eq SootopolisCity_Mart_EventScript_15B268
-	checkflag 129
+	checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN
 	goto_if 0, SootopolisCity_Mart_EventScript_15B268
 	msgbox SootopolisCity_Mart_Text_18F8D7, 4
 	release
@@ -45,9 +45,9 @@ SootopolisCity_Mart_EventScript_15B268:: @ 815B268
 SootopolisCity_Mart_EventScript_15B272:: @ 815B272
 	lock
 	faceplayer
-	checkflag 113
+	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
 	goto_if_eq SootopolisCity_Mart_EventScript_15B290
-	checkflag 129
+	checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN
 	goto_if 0, SootopolisCity_Mart_EventScript_15B290
 	msgbox SootopolisCity_Mart_Text_18F96B, 4
 	release
diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc
index cb09d8856..8bbb06575 100644
--- a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc
+++ b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc
@@ -17,9 +17,9 @@ SootopolisCity_PokemonCenter_1F_MapScript1_15B196:: @ 815B196
 SootopolisCity_PokemonCenter_1F_EventScript_15B1A8:: @ 815B1A8
 	lock
 	faceplayer
-	checkflag 113
+	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
 	goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_15B1C6
-	checkflag 129
+	checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN
 	goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1C6
 	msgbox SootopolisCity_PokemonCenter_1F_Text_18F770, 4
 	release
@@ -33,9 +33,9 @@ SootopolisCity_PokemonCenter_1F_EventScript_15B1C6:: @ 815B1C6
 SootopolisCity_PokemonCenter_1F_EventScript_15B1D0:: @ 815B1D0
 	lock
 	faceplayer
-	checkflag 113
+	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
 	goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_15B1EE
-	checkflag 129
+	checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN
 	goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1EE
 	msgbox SootopolisCity_PokemonCenter_1F_Text_18F860, 4
 	release
diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc
index 4ee0d0ec3..81c50559e 100644
--- a/data/scripts/maps/SouthernIsland_Exterior.inc
+++ b/data/scripts/maps/SouthernIsland_Exterior.inc
@@ -3,7 +3,7 @@ SouthernIsland_Exterior_MapScripts:: @ 8160AD6
 	.byte 0
 
 SouthernIsland_Exterior_MapScript1_160ADC:: @ 8160ADC
-	setflag 2121
+	setflag FLAG_LANDMARK_SOUTHERN_ISLAND
 	end
 
 SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0
diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc
index bcb316f96..0a9ca6b89 100644
--- a/data/scripts/maps/SouthernIsland_Interior.inc
+++ b/data/scripts/maps/SouthernIsland_Interior.inc
@@ -4,7 +4,7 @@ SouthernIsland_Interior_MapScripts:: @ 8160B53
 	.byte 0
 
 SouthernIsland_Interior_MapScript1_160B5E:: @ 8160B5E
-	checkflag 2145
+	checkflag FLAG_SYS_CTRL_OBJ_DELETE
 	call_if 1, SouthernIsland_Interior_EventScript_160B68
 	end
 
@@ -44,11 +44,11 @@ SouthernIsland_Interior_EventScript_160B9B:: @ 8160B9B
 	end
 
 SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7
-	checkflag 206
+	checkflag FLAG_ECOUNTERED_LATIAS_OR_LATIOS
 	goto_if_eq SouthernIsland_Interior_EventScript_160C08
-	checkflag 2131
+	checkflag FLAG_SYS_HAS_EON_TICKET
 	goto_if 0, SouthernIsland_Interior_EventScript_160C08
-	setflag 206
+	setflag FLAG_ECOUNTERED_LATIAS_OR_LATIOS
 	special SpawnCameraDummy
 	applymovement 127, SouthernIsland_Interior_Movement_160C12
 	waitmovement 0
@@ -65,11 +65,11 @@ SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7
 	delay 50
 	special RemoveCameraDummy
 	setwildbattle SPECIES_LATIAS_OR_LATIOS, 50, ITEM_SOUL_DEW
-	setflag 911
-	setflag 2145
+	setflag FLAG_HIDE_LATIOS_OR_LATIAS_STATIONARY
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
 	special ScrSpecial_StartSouthernIslandBattle
 	waitstate
-	clearflag 2145
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	releaseall
 	end
 
diff --git a/data/scripts/maps/Underwater_SeafloorCavern.inc b/data/scripts/maps/Underwater_SeafloorCavern.inc
index ce2de5124..665cbf4af 100644
--- a/data/scripts/maps/Underwater_SeafloorCavern.inc
+++ b/data/scripts/maps/Underwater_SeafloorCavern.inc
@@ -5,17 +5,17 @@ Underwater_SeafloorCavern_MapScripts:: @ 815D99E
 	.byte 0
 
 Underwater_SeafloorCavern_MapScript1_15D9AE:: @ 815D9AE
-	setflag 2119
-	checkflag 129
+	setflag FLAG_LANDMARK_SEAFLOOR_CAVERN
+	checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN
 	goto_if_eq Underwater_SeafloorCavern_EventScript_15D9BB
 	end
 
 Underwater_SeafloorCavern_EventScript_15D9BB:: @ 815D9BB
-	setflag 980
+	setflag FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION
 	end
 
 Underwater_SeafloorCavern_MapScript1_15D9BF:: @ 815D9BF
-	checkflag 129
+	checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN
 	call_if 1, Underwater_SeafloorCavern_EventScript_15D9C9
 	end
 
diff --git a/data/scripts/maps/VerdanturfTown.inc b/data/scripts/maps/VerdanturfTown.inc
index 3e8f02302..b9e9b85a5 100644
--- a/data/scripts/maps/VerdanturfTown.inc
+++ b/data/scripts/maps/VerdanturfTown.inc
@@ -3,15 +3,15 @@ VerdanturfTown_MapScripts:: @ 814E854
 	.byte 0
 
 VerdanturfTown_MapScript1_14E85A:: @ 814E85A
-	setflag 2068
+	setflag FLAG_VISITED_VERDANTURF_TOWN
 	setvar 0x4086, 0
-	setflag 801
+	setflag FLAG_HIDE_CONTEST_REPORTER_VERDANTURF
 	end
 
 VerdanturfTown_EventScript_14E866:: @ 814E866
 	lock
 	faceplayer
-	checkflag 199
+	checkflag FLAG_RUSTURF_TUNNEL_OPENED
 	goto_if_eq VerdanturfTown_EventScript_14E885
 	msgbox VerdanturfTown_Text_16CAEB, 4
 	applymovement 2, VerdanturfTown_Movement_1A083D
@@ -37,7 +37,7 @@ VerdanturfTown_EventScript_14E8A2:: @ 814E8A2
 VerdanturfTown_EventScript_14E8AB:: @ 814E8AB
 	lock
 	faceplayer
-	checkflag 199
+	checkflag FLAG_RUSTURF_TUNNEL_OPENED
 	goto_if_eq VerdanturfTown_EventScript_14E8C0
 	msgbox VerdanturfTown_Text_16CD4D, 4
 	release
diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc
index 67554d26b..9726038d4 100644
--- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc
+++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc
@@ -101,13 +101,13 @@ VerdanturfTown_ContestLobby_EventScript_153E3E:: @ 8153E3E
 VerdanturfTown_ContestLobby_EventScript_153E47:: @ 8153E47
 	lock
 	faceplayer
-	checkflag 235
+	checkflag FLAG_RECEIVED_TM45
 	goto_if_eq VerdanturfTown_ContestLobby_EventScript_153E76
 	msgbox VerdanturfTown_ContestLobby_Text_177DEC, 4
 	giveitem ITEM_TM45
 	compare RESULT, 0
 	goto_if_eq VerdanturfTown_ContestLobby_EventScript_1A029B
-	setflag 235
+	setflag FLAG_RECEIVED_TM45
 	release
 	end
 
diff --git a/data/scripts/maps/VerdanturfTown_WandasHouse.inc b/data/scripts/maps/VerdanturfTown_WandasHouse.inc
index fad64292b..205a4315c 100644
--- a/data/scripts/maps/VerdanturfTown_WandasHouse.inc
+++ b/data/scripts/maps/VerdanturfTown_WandasHouse.inc
@@ -4,10 +4,10 @@ VerdanturfTown_WandasHouse_MapScripts:: @ 8153F5A
 VerdanturfTown_WandasHouse_EventScript_153F5B:: @ 8153F5B
 	lock
 	faceplayer
-	checkflag 193
+	checkflag FLAG_WALLY_SPEECH
 	goto_if_eq VerdanturfTown_WandasHouse_EventScript_153F73
 	msgbox VerdanturfTown_WandasHouse_Text_1783F6, 4
-	setflag 193
+	setflag FLAG_WALLY_SPEECH
 	release
 	end
 
@@ -19,9 +19,9 @@ VerdanturfTown_WandasHouse_EventScript_153F73:: @ 8153F73
 VerdanturfTown_WandasHouse_EventScript_153F7D:: @ 8153F7D
 	lock
 	faceplayer
-	checkflag 126
+	checkflag FLAG_DEFEATED_WALLY_VICTORY_ROAD
 	goto_if_eq VerdanturfTown_WandasHouse_EventScript_153FA5
-	checkflag 1213
+	checkflag FLAG_DEFEATED_LAVARIDGE_GYM
 	goto_if_eq VerdanturfTown_WandasHouse_EventScript_153F9B
 	msgbox VerdanturfTown_WandasHouse_Text_17859A, 4
 	release
@@ -44,9 +44,9 @@ VerdanturfTown_WandasHouse_EventScript_153FAF:: @ 8153FAF
 VerdanturfTown_WandasHouse_EventScript_153FB8:: @ 8153FB8
 	lock
 	faceplayer
-	checkflag 1213
+	checkflag FLAG_DEFEATED_LAVARIDGE_GYM
 	goto_if_eq VerdanturfTown_WandasHouse_EventScript_153FE0
-	checkflag 190
+	checkflag FLAG_DEFEATED_WALLY_MAUVILLE
 	goto_if_eq VerdanturfTown_WandasHouse_EventScript_153FD6
 	msgbox VerdanturfTown_WandasHouse_Text_1787FB, 4
 	release
@@ -65,11 +65,11 @@ VerdanturfTown_WandasHouse_EventScript_153FE0:: @ 8153FE0
 VerdanturfTown_WandasHouse_EventScript_153FEA:: @ 8153FEA
 	lock
 	faceplayer
-	checkflag 126
+	checkflag FLAG_DEFEATED_WALLY_VICTORY_ROAD
 	goto_if_eq VerdanturfTown_WandasHouse_EventScript_154025
-	checkflag 1213
+	checkflag FLAG_DEFEATED_LAVARIDGE_GYM
 	goto_if_eq VerdanturfTown_WandasHouse_EventScript_15401B
-	checkflag 199
+	checkflag FLAG_RUSTURF_TUNNEL_OPENED
 	goto_if_eq VerdanturfTown_WandasHouse_EventScript_154011
 	msgbox VerdanturfTown_WandasHouse_Text_1788B1, 4
 	release
diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc
index fe775d793..7e48d3d90 100644
--- a/data/scripts/maps/VictoryRoad_1F.inc
+++ b/data/scripts/maps/VictoryRoad_1F.inc
@@ -3,12 +3,12 @@ VictoryRoad_1F_MapScripts:: @ 815DE83
 	.byte 0
 
 VictoryRoad_1F_MapScript1_15DE89:: @ 815DE89
-	checkflag 126
+	checkflag FLAG_DEFEATED_WALLY_VICTORY_ROAD
 	call_if 1, VictoryRoad_1F_EventScript_15DE93
 	end
 
 VictoryRoad_1F_EventScript_15DE93:: @ 815DE93
-	setflag 858
+	setflag FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD
 	return
 
 VictoryRoad_1F_EventScript_15DE97:: @ 815DE97
@@ -41,9 +41,9 @@ VictoryRoad_1F_EventScript_15DED3:: @ 815DED3
 	msgbox VictoryRoad_1F_Text_19782B, 4
 	trainerbattle 3, OPPONENT_WALLY_1, 0, VictoryRoad_1F_Text_197943
 	msgbox VictoryRoad_1F_Text_197967, 4
-	clearflag 858
+	clearflag FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD
 	moveobjectoffscreen 4
-	setflag 126
+	setflag FLAG_DEFEATED_WALLY_VICTORY_ROAD
 	setvar 0x40c3, 1
 	releaseall
 	end
diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc
index 465c61d1a..933de6769 100644
--- a/data/scripts/mauville_man.inc
+++ b/data/scripts/mauville_man.inc
@@ -84,7 +84,7 @@ dont_write_lyrics:
 SpeakToHipster:
 	lock
 	faceplayer
-	setflag 2054
+	setflag FLAG_SYS_HIPSTER_MEET
 	msgbox gTextHipster_TheyCallMeTheHipster, 4
 	special ScrSpecial_GetHipsterSpokenFlag
 	compare RESULT, FALSE
diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc
index df097fc19..d8f628709 100644
--- a/data/scripts/mystery_event_club.inc
+++ b/data/scripts/mystery_event_club.inc
@@ -1,7 +1,7 @@
 PetalburgCity_PokemonCenter_1F_EventScript_1B1B14:: @ 81B1B14
 	lock
 	faceplayer
-	checkflag 2053
+	checkflag FLAG_SYS_CHAT_USED
 	goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1BDB
 	msgbox PetalburgCity_PokemonCenter_1F_Text_1B1C97, 4
 	goto PetalburgCity_PokemonCenter_1F_EventScript_1B1B2D
@@ -97,11 +97,11 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1C6D:: @ 81B1C6D
 	end
 
 PetalburgCity_PokemonCenter_1F_EventScript_1B1C77:: @ 81B1C77
-	checkflag 2059
+	checkflag FLAG_BADGE05_GET
 	goto_if 0, PetalburgCity_PokemonCenter_1F_EventScript_1B1C96
-	checkflag 2124
+	checkflag FLAG_SYS_EXDATA_ENABLE
 	goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1C96
-	setflag 2124
+	setflag FLAG_SYS_EXDATA_ENABLE
 	msgbox PetalburgCity_PokemonCenter_1F_Text_1B21CC, 3
 	release
 	end
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index 69a4dc3e9..a553ae379 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -59,15 +59,15 @@ LittlerootTown_MaysHouse_2F_EventScript_1B69DF:: @ 81B69DF
 
 LittlerootTown_BrendansHouse_2F_EventScript_1B69EB:: @ 81B69EB
 LittlerootTown_MaysHouse_2F_EventScript_1B69EB:: @ 81B69EB
-	checkflag 81
+	checkflag FLAG_SET_WALL_CLOCK
 	goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1B6A91
 	msgbox LittlerootTown_BrendansHouse_2F_Text_172E18, 4
 	call LittlerootTown_BrendansHouse_2F_EventScript_1B6A9B
 	delay 30
 	setvar 0x4092, 6
-	setflag 81
-	setflag 754
-	setflag 755
+	setflag FLAG_SET_WALL_CLOCK
+	setflag FLAG_HIDE_MACHOKE_MOVER_1
+	setflag FLAG_HIDE_MACHOKE_MOVER_2
 	checkplayergender
 	compare RESULT, 0
 	call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6A31
@@ -222,7 +222,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6BBE:: @ 81B6BBE
 	msgbox LittlerootTown_BrendansHouse_1F_Text_172841, 4
 	fadedefaultbgm
 	special TurnOffTVScreen
-	setflag 2096
+	setflag FLAG_SYS_TV_HOME
 	delay 35
 	return
 
@@ -256,9 +256,9 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6BE9:: @ 81B6BE9
 	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C33
 	compare 0x408c, 4
 	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C33
-	checkflag 2059
+	checkflag FLAG_BADGE05_GET
 	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D
-	checkflag 82
+	checkflag FLAG_RESCUED_BIRCH
 	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C72
 	compare 0x4001, 1
 	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C80
@@ -274,14 +274,14 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6C33:: @ 81B6C33
 	end
 
 LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D:: @ 81B6C3D
-	checkflag 133
+	checkflag FLAG_RECEIVED_AMULET_COIN
 	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C72
 	msgbox LittlerootTown_BrendansHouse_1F_Text_172782, 4
 	giveitem ITEM_AMULET_COIN
 	compare RESULT, 0
 	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1A029B
 	msgbox LittlerootTown_BrendansHouse_1F_Text_1727CD, 4
-	setflag 133
+	setflag FLAG_RECEIVED_AMULET_COIN
 	release
 	end
 
@@ -398,7 +398,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE
 	call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6E0B
 	playse 8
 	removeobject 0x8009
-	setflag 291
+	setflag FLAG_RECEIVED_SS_TICKET
 	setvar 0x4082, 4
 	setvar 0x408c, 4
 	releaseall
diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc
index 6fe754097..6934ffe57 100644
--- a/data/scripts/pokeblocks.inc
+++ b/data/scripts/pokeblocks.inc
@@ -76,7 +76,7 @@ FallarborTown_ContestLobby_EventScript_1B76EF:: @ 81B76EF
 FallarborTown_ContestLobby_EventScript_1B770E:: @ 81B770E
 	msgbox FallarborTown_ContestLobby_Text_1B6FF0, 4
 	dodailyevents
-	checkflag 2241
+	checkflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR
 	goto_if_eq FallarborTown_ContestLobby_EventScript_1B774F
 	goto FallarborTown_ContestLobby_EventScript_1B7759
 	end
@@ -107,7 +107,7 @@ FallarborTown_ContestLobby_EventScript_1B774F:: @ 81B774F
 FallarborTown_ContestLobby_EventScript_1B7759:: @ 81B7759
 	msgbox FallarborTown_ContestLobby_Text_1B704A, 4
 	giveitem ITEM_PECHA_BERRY
-	setflag 2241
+	setflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR
 	goto FallarborTown_ContestLobby_EventScript_1B76EF
 	end
 
@@ -162,7 +162,7 @@ FallarborTown_ContestLobby_EventScript_1B77DC:: @ 81B77DC
 
 FallarborTown_ContestLobby_EventScript_1B77E6:: @ 81B77E6
 	dodailyevents
-	checkflag 2241
+	checkflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR
 	goto_if_eq FallarborTown_ContestLobby_EventScript_1B77F6
 	goto FallarborTown_ContestLobby_EventScript_1B7800
 	end
@@ -175,7 +175,7 @@ FallarborTown_ContestLobby_EventScript_1B77F6:: @ 81B77F6
 FallarborTown_ContestLobby_EventScript_1B7800:: @ 81B7800
 	msgbox FallarborTown_ContestLobby_Text_1B74B4, 4
 	giveitem ITEM_PECHA_BERRY
-	setflag 2241
+	setflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR
 	msgbox FallarborTown_ContestLobby_Text_1B753A, 4
 	release
 	end
diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc
index f3c03a853..f5506bfec 100644
--- a/data/scripts/secret_power_tm.inc
+++ b/data/scripts/secret_power_tm.inc
@@ -14,8 +14,8 @@ Route111_EventScript_1A3877:: @ 81A3877
 	goto_if_eq Route111_EventScript_1A38D9
 	msgbox Route111_Text_1A35C5, 4
 	closemessage
-	setflag 96
-	clearflag 948
+	setflag FLAG_RECEIVED_SECRET_POWER
+	clearflag FLAG_HIDE_TM_SALESMAN_SLATEPORT
 	compare FACING, 3
 	call_if 1, Route111_EventScript_1A38C3
 	compare FACING, 4
diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc
index 425f42a85..a74eba551 100644
--- a/data/scripts/tv.inc
+++ b/data/scripts/tv.inc
@@ -7,9 +7,9 @@ Event_TV:: @ 81A6E72
 	goto_if_eq EventScript_1A6F01
 	compare RESULT, 1
 	goto_if_eq EventScript_1A6F0B
-	checkflag 2098
+	checkflag FLAG_SYS_TV_START
 	goto_if 0, EventScript_1A6EF1
-	checkflag 2097
+	checkflag FLAG_SYS_TV_WATCH
 	goto_if_eq EventScript_1A6EF1
 	specialvar RESULT, IsTVShowInSearchOfTrainersAiring
 	compare RESULT, 1
@@ -49,8 +49,8 @@ EventScript_1A6F0B:
 	msgbox UnknownString_8172C50, 4
 	.endif
 	special InitRoamer
-	clearflag 2141
-	setflag 255
+	clearflag FLAG_SYS_TV_LATI
+	setflag FLAG_LATIOS_OR_LATIAS_ROAMING
 	special TurnOffTVScreen
 	releaseall
 	end
@@ -66,7 +66,7 @@ EventScript_1A6F21:
 
 EventScript_1A6F37:
 	special TurnOffTVScreen
-	setflag 2097
+	setflag FLAG_SYS_TV_WATCH
 	releaseall
 	end
author	scnorton <scnorton@biociphers.org>	2017-12-18 15:00:57 -0500
committer	scnorton <scnorton@biociphers.org>	2017-12-18 15:00:57 -0500
commit	89c0d40ee6c7fa2ad9f7f44e3a51ea50264e9280 (patch)
tree	f5387471637b5e9e62fa5b6a0614a935b2921118 /data/scripts
parent	408f3cf295e76b61f2c1a442c80d1036bbaa9d28 (diff)
parent	3c5f725de49371aced1788a21f5e53df5b498b5f (diff)