Label flags up to 973

30 files changed, 86 insertions, 86 deletions

diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc
index 1e335cdfa..a3d79d09e 100644
--- a/data/scripts/gabby_and_ty.inc
+++ b/data/scripts/gabby_and_ty.inc
@@ -76,11 +76,11 @@ Route111_EventScript_1AE3EE:: @ 81AE3EE
 	return
 
 Route111_EventScript_1AE3F2:: @ 81AE3F2
-	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE120
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE120_1
 	return
 
 Route111_EventScript_1AE3F6:: @ 81AE3F6
-	clearflag FLAG_HIDE_GABBY_AND_TY_ROUTE120
+	clearflag FLAG_HIDE_GABBY_AND_TY_ROUTE120_1
 	return
 
 Route111_EventScript_1AE3FA:: @ 81AE3FA
@@ -100,27 +100,27 @@ Route111_EventScript_1AE406:: @ 81AE406
 	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
diff --git a/data/scripts/magma_chimney.inc b/data/scripts/magma_chimney.inc
index adc865e73..d104b52d4 100644
--- a/data/scripts/magma_chimney.inc
+++ b/data/scripts/magma_chimney.inc
@@ -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 FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY
 	setflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY
-	clearflag 928
-	setflag 942
+	clearflag FLAG_HIDE_PROF_COSMO_FALLARBOR
+	setflag FLAG_HIDE_PROF_COSMO_METEOR_FALLS
 	releaseall
 	end
 
diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc
index 36df2cb3f..7d2003598 100644
--- a/data/scripts/maps/AncientTomb.inc
+++ b/data/scripts/maps/AncientTomb.inc
@@ -62,7 +62,7 @@ AncientTomb_EventScript_15F050:: @ 815F050
 	delay 40
 	waitpokecry
 	setwildbattle SPECIES_REGISTEEL, 40, ITEM_NONE
-	setflag 937
+	setflag FLAG_HIDE_REGISTEEL
 	setflag SYS_CTRL_OBJ_DELETE
 	special ScrSpecial_StartRegiBattle
 	waitstate
diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc
index 59f698c5f..2186c8534 100644
--- a/data/scripts/maps/BattleTower_Lobby.inc
+++ b/data/scripts/maps/BattleTower_Lobby.inc
@@ -20,7 +20,7 @@ BattleTower_Lobby_EventScript_16029C:: @ 816029C
 	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
diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc
index 1f3c0f105..608b0d892 100644
--- a/data/scripts/maps/BattleTower_Outside.inc
+++ b/data/scripts/maps/BattleTower_Outside.inc
@@ -5,7 +5,7 @@ BattleTower_Outside_MapScripts:: @ 8160156
 BattleTower_Outside_MapScript1_16015C:: @ 816015C
 	setflag FLAG_UNLOCK_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_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc
index d0d19e4b9..b7711b1ad 100644
--- a/data/scripts/maps/CaveOfOrigin_B4F.inc
+++ b/data/scripts/maps/CaveOfOrigin_B4F.inc
@@ -77,7 +77,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7
 	clearflag FLAG_HIDE_SOOTOPOLIS_RESIDENTS
 	clearflag 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 3ca08a6de..29f48b95c 100644
--- a/data/scripts/maps/DesertRuins.inc
+++ b/data/scripts/maps/DesertRuins.inc
@@ -62,7 +62,7 @@ DesertRuins_EventScript_15CB85:: @ 815CB85
 	delay 40
 	waitpokecry
 	setwildbattle SPECIES_REGIROCK, 40, ITEM_NONE
-	setflag 935
+	setflag FLAG_HIDE_REGIROCK
 	setflag SYS_CTRL_OBJ_DELETE
 	special ScrSpecial_StartRegiBattle
 	waitstate
diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/scripts/maps/FortreeCity_House4.inc
index efccf20fc..23a96af51 100644
--- a/data/scripts/maps/FortreeCity_House4.inc
+++ b/data/scripts/maps/FortreeCity_House4.inc
@@ -16,7 +16,7 @@ FortreeCity_House4_EventScript_158188:: @ 8158188
 	msgbox FortreeCity_House4_Text_186835, 4
 	closemessage
 	setflag FLAG_WINGULL_SENT_ON_ERRAND
-	clearflag 934
+	clearflag FLAG_HIDE_WINGULL_MOSSDEEP_HOUSE
 	applymovement 3, FortreeCity_House4_Movement_158218
 	waitmovement 0
 	removeobject 3
diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc
index 4b72b166c..7d6ecae1b 100644
--- a/data/scripts/maps/IslandCave.inc
+++ b/data/scripts/maps/IslandCave.inc
@@ -82,7 +82,7 @@ IslandCave_EventScript_15EF9D:: @ 815EF9D
 	delay 40
 	waitpokecry
 	setwildbattle SPECIES_REGICE, 40, ITEM_NONE
-	setflag 936
+	setflag FLAG_HIDE_REGICE
 	setflag SYS_CTRL_OBJ_DELETE
 	special ScrSpecial_StartRegiBattle
 	waitstate
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/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc
index 451219edb..1109acc81 100644
--- a/data/scripts/maps/MauvilleCity.inc
+++ b/data/scripts/maps/MauvilleCity.inc
@@ -4,7 +4,7 @@ MauvilleCity_MapScripts:: @ 814C032
 
 MauvilleCity_MapScript1_14C038:: @ 814C038
 	setflag FLAG_VISITED_MAUVILLE_CITY
-	clearflag 961
+	clearflag FLAG_HIDE_OCEANIC_MUSEUM_VISITORS
 	setflag SYS_TV_START
 	clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE
 	setvar 0x4093, 0
@@ -13,8 +13,8 @@ MauvilleCity_MapScript1_14C038:: @ 814C038
 	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
diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc
index 231865942..de83fcb96 100644
--- a/data/scripts/maps/MossdeepCity_Gym.inc
+++ b/data/scripts/maps/MossdeepCity_Gym.inc
@@ -64,10 +64,10 @@ MossdeepCity_Gym_EventScript_15A594:: @ 815A594
 	setflag 1229
 	setflag BADGE07_GET
 	clearflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD
-	clearflag 915
+	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
 
diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/scripts/maps/MossdeepCity_House2.inc
index f66f7e6f1..f90fc9350 100644
--- a/data/scripts/maps/MossdeepCity_House2.inc
+++ b/data/scripts/maps/MossdeepCity_House2.inc
@@ -18,7 +18,7 @@ MossdeepCity_House2_EventScript_15A87B:: @ 815A87B
 	waitpokecry
 	closemessage
 	setflag FLAG_WINGULL_DELIVERED_MAIL
-	clearflag 933
+	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_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc
index 5b2f281da..345e75fa1 100644
--- a/data/scripts/maps/MossdeepCity_StevensHouse.inc
+++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc
@@ -88,7 +88,7 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C
 	msgbox MossdeepCity_StevensHouse_Text_1A1102, 5
 	compare RESULT, 1
 	call_if 1, MossdeepCity_StevensHouse_EventScript_1A0678
-	setflag 968
+	setflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE
 	setflag FLAG_RECEIVED_BELDUM
 	releaseall
 	end
diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc
index fd90210ca..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
diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc
index 61476b085..543c82135 100644
--- a/data/scripts/maps/PetalburgCity_Gym.inc
+++ b/data/scripts/maps/PetalburgCity_Gym.inc
@@ -401,11 +401,11 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6
 	setvar 0x4085, 7
 	setflag 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
diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc
index ac8a48353..9595d00ab 100644
--- a/data/scripts/maps/Route104.inc
+++ b/data/scripts/maps/Route104.inc
@@ -21,11 +21,11 @@ Route104_EventScript_14EEAE:: @ 814EEAE
 	goto_if 0, Route104_EventScript_14EEC4
 	checkflag 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
diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc
index 7d9c8aaaa..6f310881a 100644
--- a/data/scripts/maps/Route111.inc
+++ b/data/scripts/maps/Route111.inc
@@ -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
diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc
index c9e33288b..34c685196 100644
--- a/data/scripts/maps/Route116.inc
+++ b/data/scripts/maps/Route116.inc
@@ -57,7 +57,7 @@ Route116_EventScript_150A94:: @ 8150A94
 	compare FACING, 4
 	call_if 1, Route116_EventScript_150AF9
 	removeobject LAST_TALKED
-	clearflag 949
+	clearflag FLAG_HIDE_EMPLOYEE_DEVON_CORP_3F
 	setflag FLAG_RECEIVED_REPEAT_BALL
 	release
 	end
diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc
index 18018316a..18cff8320 100644
--- a/data/scripts/maps/SSTidalCorridor.inc
+++ b/data/scripts/maps/SSTidalCorridor.inc
@@ -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
diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc
index 9131dcdb3..fa19ee504 100644
--- a/data/scripts/maps/SeafloorCavern_Room9.inc
+++ b/data/scripts/maps/SeafloorCavern_Room9.inc
@@ -197,19 +197,19 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA
 	clearflag FLAG_HIDE_WALLACE_SOOTOPOLIS
 	clearflag 973
 	setvar 0x405e, 1
-	clearflag 944
-	clearflag 945
+	clearflag FLAG_HIDE_EVIL_LEADER_ROUTE128
+	clearflag FLAG_HIDE_OTHER_LEADER_ROUTE128
 	setflag SYS_WEATHER_CTRL
 	setflag FLAG_HIDE_SOOTOPOLIS_RESIDENTS
 	setflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN
-	setflag 967
+	setflag FLAG_HIDE_STEVEN_STEVENS_HOUSE
 	setvar 0x40c6, 1
 	setvar 0x40a2, 1
 	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 946
+	setflag FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN
 	warp MAP_ROUTE128, 255, 38, 22
 	waitstate
 	releaseall
diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc
index 1d852f41a..4bf77de75 100644
--- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc
+++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc
@@ -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 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 SYS_SHOAL_ITEM
 	return
diff --git a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc
index d10f958fd..0be4b106c 100644
--- a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc
+++ b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc
@@ -21,7 +21,7 @@ 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 SYS_SHOAL_TIDE
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1DA
@@ -30,7 +30,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E1B9:: @ 815E1B9
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_15E1DA:: @ 815E1DA
-	checkflag 953
+	checkflag FLAG_HIDE_TOOK_SHOAL_SALT_2
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1FB
 	checkflag SYS_SHOAL_TIDE
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1FB
@@ -39,28 +39,28 @@ ShoalCave_LowTideInnerRoom_EventScript_15E1DA:: @ 815E1DA
 	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 9f4908cf6..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
 
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/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc
index 2e042b1e5..7f642c611 100644
--- a/data/scripts/maps/SlateportCity_Harbor.inc
+++ b/data/scripts/maps/SlateportCity_Harbor.inc
@@ -19,7 +19,7 @@ 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
diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc
index be5f5a8ff..0cb7b397e 100644
--- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc
+++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc
@@ -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 db65a51db..7fcd0fff1 100644
--- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc
+++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc
@@ -88,8 +88,8 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6
 	removeobject 1
 	setflag FLAG_HIDE_EVIL_TEAM_ROUTE110
 	setflag FLAG_DELIVERED_DEVON_GOODS
-	clearflag 947
-	setflag 949
+	clearflag FLAG_HIDE_DEVON_EMPLOYEE_ROUTE116
+	setflag FLAG_HIDE_EMPLOYEE_DEVON_CORP_3F
 	release
 	end
 
diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc
index 0ff474138..8a978cc7d 100644
--- a/data/scripts/maps/SouthernIsland_Interior.inc
+++ b/data/scripts/maps/SouthernIsland_Interior.inc
@@ -65,7 +65,7 @@ SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7
 	delay 50
 	special RemoveCameraDummy
 	setwildbattle SPECIES_LATIAS_OR_LATIOS, 50, ITEM_SOUL_DEW
-	setflag 911
+	setflag FLAG_HIDE_LATIOS_OR_LATIAS_STATIONARY
 	setflag SYS_CTRL_OBJ_DELETE
 	special ScrSpecial_StartSouthernIslandBattle
 	waitstate
diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc
index 743308b43..f5506bfec 100644
--- a/data/scripts/secret_power_tm.inc
+++ b/data/scripts/secret_power_tm.inc
@@ -15,7 +15,7 @@ Route111_EventScript_1A3877:: @ 81A3877
 	msgbox Route111_Text_1A35C5, 4
 	closemessage
 	setflag FLAG_RECEIVED_SECRET_POWER
-	clearflag 948
+	clearflag FLAG_HIDE_TM_SALESMAN_SLATEPORT
 	compare FACING, 3
 	call_if 1, Route111_EventScript_1A38C3
 	compare FACING, 4