Start using constants for hide-show flags

19 files changed, 68 insertions, 49 deletions

diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s
index 2d831179e..62a2e5d43 100644
--- a/data-de/event_scripts.s
+++ b/data-de/event_scripts.s
@@ -1165,12 +1165,12 @@ gUnknown_0819FA81:: @ 819FA81
 	setflag 769
 	setflag 770
 	setflag 771
-	setflag 721
+	setflag FLAG_HIDE_BIRCH_IN_LAB
 	setflag 889
-	setflag 726
+	setflag FLAG_HIDE_WALLY_PETALBURG
 	setflag 867
-	setflag 731
-	setflag 732
+	setflag FLAG_HIDE_GRUNT_RUSTBORO
+	setflag FLAG_HIDE_DEVON_RUSTBORO
 	setflag 814
 	setflag 868
 	setflag 739
@@ -1181,7 +1181,7 @@ gUnknown_0819FA81:: @ 819FA81
 	setflag 743
 	setflag 744
 	setflag 906
-	setflag 737
+	setflag FLAG_UNKNOWN_2E1
 	setflag 747
 	setflag 748
 	setflag 749
@@ -1196,7 +1196,7 @@ gUnknown_0819FA81:: @ 819FA81
 	setflag 781
 	setflag 782
 	setflag 783
-	setflag 734
+	setflag FLAG_HIDE_NORMAN_LITTLEROOT
 	setflag 849
 	setflag 789
 	setflag 790
@@ -1289,7 +1289,7 @@ gUnknown_0819FA81:: @ 819FA81
 	setflag 950
 	setflag 968
 	setflag 1133
-	setflag 727
+	setflag FLAG_HIDE_STEVENS_LETTER
 	setflag 979
 	setflag 751
 	setflag 991
@@ -1301,7 +1301,7 @@ EverGrandeCity_HallOfFame_EventScript_19FC13:: @ 819FC13
 	call EverGrandeCity_HallOfFame_EventScript_19FD09
 	setflag 869
 	clearflag 950
-	clearflag 727
+	clearflag FLAG_HIDE_STEVENS_LETTER
 	setvar 0x40c6, 1
 	clearflag 751
 	clearflag 860
@@ -1328,7 +1328,7 @@ EverGrandeCity_HallOfFame_EventScript_19FC5E:: @ 819FC5E
 EverGrandeCity_HallOfFame_EventScript_19FC62:: @ 819FC62
 	setvar 0x4082, 3
 	setvar 0x408c, 3
-	clearflag 734
+	clearflag FLAG_HIDE_NORMAN_LITTLEROOT
 	return
 
 EverGrandeCity_HallOfFame_EventScript_19FC70:: @ 819FC70
@@ -2173,7 +2173,7 @@ Route103_EventScript_1A02F4:: @ 81A02F4
 	return
 
 Route101_EventScript_1A0358:: @ 81A0358
-	clearflag 721
+	clearflag FLAG_HIDE_BIRCH_IN_LAB
 	clearflag 896
 	setflag 897
 	setflag 898
@@ -2181,7 +2181,7 @@ Route101_EventScript_1A0358:: @ 81A0358
 
 Route101_EventScript_1A0365:: @ 81A0365
 	clearflag 897
-	setflag 721
+	setflag FLAG_HIDE_BIRCH_IN_LAB
 	setflag 896
 	setflag 898
 	return
@@ -2189,7 +2189,7 @@ Route101_EventScript_1A0365:: @ 81A0365
 Route101_EventScript_1A0372:: @ 81A0372
 	clearflag 898
 	setflag 897
-	setflag 721
+	setflag FLAG_HIDE_BIRCH_IN_LAB
 	setflag 896
 	return
 
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 5b01fd85f..59e7fef09 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -1159,12 +1159,12 @@ gUnknown_0819FA81:: @ 819FA81
 	setflag 769
 	setflag 770
 	setflag 771
-	setflag 721
+	setflag FLAG_HIDE_BIRCH_IN_LAB
 	setflag 889
-	setflag 726
+	setflag FLAG_HIDE_WALLY_PETALBURG
 	setflag 867
-	setflag 731
-	setflag 732
+	setflag FLAG_HIDE_GRUNT_RUSTBORO
+	setflag FLAG_HIDE_DEVON_RUSTBORO
 	setflag 814
 	setflag 868
 	setflag 739
@@ -1175,7 +1175,7 @@ gUnknown_0819FA81:: @ 819FA81
 	setflag 743
 	setflag 744
 	setflag 906
-	setflag 737
+	setflag FLAG_UNKNOWN_2E1
 	setflag 747
 	setflag 748
 	setflag 749
@@ -1190,7 +1190,7 @@ gUnknown_0819FA81:: @ 819FA81
 	setflag 781
 	setflag 782
 	setflag 783
-	setflag 734
+	setflag FLAG_HIDE_NORMAN_LITTLEROOT
 	setflag 849
 	setflag 789
 	setflag 790
@@ -1283,7 +1283,7 @@ gUnknown_0819FA81:: @ 819FA81
 	setflag 950
 	setflag 968
 	setflag 1133
-	setflag 727
+	setflag FLAG_HIDE_STEVENS_LETTER
 	setflag 979
 	setflag 751
 	setflag 991
@@ -1295,7 +1295,7 @@ EverGrandeCity_HallOfFame_EventScript_19FC13:: @ 819FC13
 	call EverGrandeCity_HallOfFame_EventScript_19FD09
 	setflag 869
 	clearflag 950
-	clearflag 727
+	clearflag FLAG_HIDE_STEVENS_LETTER
 	setvar 0x40c6, 1
 	clearflag 751
 	clearflag 860
@@ -1322,7 +1322,7 @@ EverGrandeCity_HallOfFame_EventScript_19FC5E:: @ 819FC5E
 EverGrandeCity_HallOfFame_EventScript_19FC62:: @ 819FC62
 	setvar 0x4082, 3
 	setvar 0x408c, 3
-	clearflag 734
+	clearflag FLAG_HIDE_NORMAN_LITTLEROOT
 	return
 
 EverGrandeCity_HallOfFame_EventScript_19FC70:: @ 819FC70
@@ -2167,7 +2167,7 @@ Route103_EventScript_1A02F4:: @ 81A02F4
 	return
 
 Route101_EventScript_1A0358:: @ 81A0358
-	clearflag 721
+	clearflag FLAG_HIDE_BIRCH_IN_LAB
 	clearflag 896
 	setflag 897
 	setflag 898
@@ -2175,7 +2175,7 @@ Route101_EventScript_1A0358:: @ 81A0358
 
 Route101_EventScript_1A0365:: @ 81A0365
 	clearflag 897
-	setflag 721
+	setflag FLAG_HIDE_BIRCH_IN_LAB
 	setflag 896
 	setflag 898
 	return
@@ -2183,7 +2183,7 @@ Route101_EventScript_1A0365:: @ 81A0365
 Route101_EventScript_1A0372:: @ 81A0372
 	clearflag 898
 	setflag 897
-	setflag 721
+	setflag FLAG_HIDE_BIRCH_IN_LAB
 	setflag 896
 	return
 
diff --git a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc
index cf0d27876..8f6ab7059 100644
--- a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc
+++ b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc
@@ -3,7 +3,7 @@ LittlerootTown_BrendansHouse_1F_MapObjects:: @ 8385674
 	object_event 2, MAP_OBJ_GFX_MACHOKE_CARRYING_BOX, 0, 1, 0, 3, 0, 3, 28, 3, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6CB9, 755, 0, 0
 	object_event 3, MAP_OBJ_GFX_MACHOKE_FACING_AWAY, 0, 4, 0, 5, 0, 3, 65, 0, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6CA6, 754, 0, 0
 	object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 2, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1529EB, 784, 0, 0
-	object_event 5, MAP_OBJ_GFX_NORMAN, 0, 5, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, 734, 0, 0
+	object_event 5, MAP_OBJ_GFX_NORMAN, 0, 5, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_NORMAN_LITTLEROOT, 0, 0
 
 LittlerootTown_BrendansHouse_1F_MapWarps:: @ 83856EC
 	warp_def 9, 8, 0, 1, MAP_LITTLEROOT_TOWN
diff --git a/data/maps/events/LittlerootTown_MaysHouse_1F.inc b/data/maps/events/LittlerootTown_MaysHouse_1F.inc
index 875022b3b..700885519 100644
--- a/data/maps/events/LittlerootTown_MaysHouse_1F.inc
+++ b/data/maps/events/LittlerootTown_MaysHouse_1F.inc
@@ -3,7 +3,7 @@ LittlerootTown_MaysHouse_1F_MapObjects:: @ 83858C4
 	object_event 2, MAP_OBJ_GFX_MACHOKE_FACING_AWAY, 0, 6, 0, 5, 0, 3, 65, 0, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6CA6, 754, 0, 0
 	object_event 3, MAP_OBJ_GFX_MACHOKE_CARRYING_BOX, 0, 9, 0, 3, 0, 3, 27, 3, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6CB9, 755, 0, 0
 	object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 8, 0, 7, 0, 3, 9, 0, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1529EB, 785, 0, 0
-	object_event 5, MAP_OBJ_GFX_NORMAN, 0, 5, 0, 6, 0, 3, 10, 17, 0, 0, 0, 0, 0, 0x0, 734, 0, 0
+	object_event 5, MAP_OBJ_GFX_NORMAN, 0, 5, 0, 6, 0, 3, 10, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_NORMAN_LITTLEROOT, 0, 0
 
 LittlerootTown_MaysHouse_1F_MapWarps:: @ 838593C
 	warp_def 1, 8, 0, 0, MAP_LITTLEROOT_TOWN
diff --git a/data/maps/events/LittlerootTown_MaysHouse_2F.inc b/data/maps/events/LittlerootTown_MaysHouse_2F.inc
index ee4f6e1ec..e620bdb8f 100644
--- a/data/maps/events/LittlerootTown_MaysHouse_2F.inc
+++ b/data/maps/events/LittlerootTown_MaysHouse_2F.inc
@@ -1,5 +1,5 @@
 LittlerootTown_MaysHouse_2F_MapObjects:: @ 8385978
-	object_event 1, MAP_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 8, 0, 2, 0, 3, 7, 1, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152A9D, 722, 0, 0
+	object_event 1, MAP_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 8, 0, 2, 0, 3, 7, 1, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152A9D, FLAG_HIDE_MAY_UPSTAIRS, 0, 0
 	object_event 2, 240, 0, 0, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
 	object_event 3, 241, 0, 1, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
 	object_event 4, 242, 0, 2, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
diff --git a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc b/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc
index 9a69cfafd..024d1fb3f 100644
--- a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc
+++ b/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc
@@ -1,6 +1,6 @@
 LittlerootTown_ProfessorBirchsLab_MapObjects:: @ 8385B2C
 	object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 9, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152D63, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_PROF_BIRCH, 0, 6, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152D9A, 721, 0, 0
+	object_event 2, MAP_OBJ_GFX_PROF_BIRCH, 0, 6, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152D9A, FLAG_HIDE_BIRCH_IN_LAB, 0, 0
 	object_event 3, 240, 0, 7, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152EA3, 889, 0, 0
 
 LittlerootTown_ProfessorBirchsLab_MapWarps:: @ 8385B74
diff --git a/data/maps/events/MossdeepCity_StevensHouse.inc b/data/maps/events/MossdeepCity_StevensHouse.inc
index 0aef37766..bab321ff7 100644
--- a/data/maps/events/MossdeepCity_StevensHouse.inc
+++ b/data/maps/events/MossdeepCity_StevensHouse.inc
@@ -2,7 +2,7 @@ MossdeepCity_StevensHouse_MapObjects:: @ 838AA44
 	object_event 1, MAP_OBJ_GFX_STEVEN, 0, 9, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF9, 967, 0, 0
 	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AA7C, 968, 0, 0
 	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AB20, 1133, 0, 0
-	object_event 4, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 6, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AB02, 727, 0, 0
+	object_event 4, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 6, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AB02, FLAG_HIDE_STEVENS_LETTER, 0, 0
 
 MossdeepCity_StevensHouse_MapWarps:: @ 838AAA4
 	warp_def 3, 7, 0, 6, MAP_MOSSDEEP_CITY
diff --git a/data/maps/events/PetalburgCity.inc b/data/maps/events/PetalburgCity.inc
index 3b6329587..2732bc93c 100644
--- a/data/maps/events/PetalburgCity.inc
+++ b/data/maps/events/PetalburgCity.inc
@@ -1,6 +1,6 @@
 PetalburgCity_MapObjects:: @ 837F5F0
-	object_event 1, MAP_OBJ_GFX_WOMAN_5, 0, 16, 0, 18, 0, 3, 2, 17, 0, 0, 0, 0, 0, PetalburgCity_EventScript_14B7C3, 728, 0, 0
-	object_event 2, MAP_OBJ_GFX_WALLY, 0, 15, 0, 10, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 726, 0, 0
+	object_event 1, MAP_OBJ_GFX_WOMAN_5, 0, 16, 0, 18, 0, 3, 2, 17, 0, 0, 0, 0, 0, PetalburgCity_EventScript_14B7C3, FLAG_HIDE_WALLY_MOM_PETALBURG_1, 0, 0
+	object_event 2, MAP_OBJ_GFX_WALLY, 0, 15, 0, 10, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_PETALBURG, 0, 0
 	object_event 3, MAP_OBJ_GFX_BOY_1, 0, 8, 0, 22, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_EventScript_14B7AC, 0, 0, 0
 	object_event 4, MAP_OBJ_GFX_GENTLEMAN, 0, 20, 0, 10, 0, 3, 3, 16, 0, 0, 0, 0, 0, PetalburgCity_EventScript_14B824, 0, 0, 0
 	object_event 5, MAP_OBJ_GFX_MAN_1, 0, 15, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 811, 0, 0
diff --git a/data/maps/events/PetalburgWoods.inc b/data/maps/events/PetalburgWoods.inc
index be298246d..5a2885be5 100644
--- a/data/maps/events/PetalburgWoods.inc
+++ b/data/maps/events/PetalburgWoods.inc
@@ -1,8 +1,8 @@
 PetalburgWoods_MapObjects:: @ 838C14C
 	object_event 1, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0
 	object_event 2, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0
-	object_event 3, 241, 0, 26, 0, 17, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 725, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_2, 0, 26, 0, 20, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 724, 0, 0
+	object_event 3, 241, 0, 26, 0, 17, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_PETALBURG_WOODS, 0, 0
+	object_event 4, MAP_OBJ_GFX_MAN_2, 0, 26, 0, 20, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_DEVON_PETALBURG_WOODS, 0, 0
 	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 45, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B175F, 1056, 0, 0
 	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 35, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B1752, 1055, 0, 0
 	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B176C, 1058, 0, 0
diff --git a/data/maps/events/Route101.inc b/data/maps/events/Route101.inc
index bad4e3ba9..f44f105b6 100644
--- a/data/maps/events/Route101.inc
+++ b/data/maps/events/Route101.inc
@@ -1,7 +1,7 @@
 Route101_MapObjects:: @ 83810BC
 	object_event 1, MAP_OBJ_GFX_YOUNGSTER, 0, 16, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route101_EventScript_14EA64, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_PROF_BIRCH, 0, 9, 0, 13, 0, 0, 71, 0, 0, 0, 0, 0, 0, 0x0, 720, 0, 0
-	object_event 3, MAP_OBJ_GFX_BIRCHS_BAG, 0, 7, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route101_EventScript_14EA7F, 700, 0, 0
+	object_event 2, MAP_OBJ_GFX_PROF_BIRCH, 0, 9, 0, 13, 0, 0, 71, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_BIRCH_BATTLE_POOCHYENA, 0, 0
+	object_event 3, MAP_OBJ_GFX_BIRCHS_BAG, 0, 7, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route101_EventScript_14EA7F, FLAG_HIDE_BIRCH_STARTERS_BAG, 0, 0
 	object_event 4, MAP_OBJ_GFX_POOCHYENA, 0, 10, 0, 13, 0, 0, 70, 0, 0, 0, 0, 0, 0, 0x0, 750, 0, 0
 	object_event 5, MAP_OBJ_GFX_PROF_BIRCH, 0, 5, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route101_EventScript_1A037F, 897, 0, 0
 	object_event 6, MAP_OBJ_GFX_BOY_2, 0, 2, 0, 13, 0, 3, 5, 17, 0, 0, 0, 0, 0, Route101_EventScript_14EA6D, 991, 0, 0
diff --git a/data/maps/events/Route103.inc b/data/maps/events/Route103.inc
index d108c2d46..0ecfedf38 100644
--- a/data/maps/events/Route103.inc
+++ b/data/maps/events/Route103.inc
@@ -1,6 +1,6 @@
 Route103_MapObjects:: @ 8381300
 	object_event 1, MAP_OBJ_GFX_MAN_4, 0, 49, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route103_EventScript_14ED82, 0, 0, 0
-	object_event 2, 240, 0, 10, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route103_EventScript_14EB92, 723, 0, 0
+	object_event 2, 240, 0, 10, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route103_EventScript_14EB92, FLAG_HIDE_RIVAL_ROUTE103, 0, 0
 	object_event 3, MAP_OBJ_GFX_WOMAN_3, 0, 71, 0, 10, 0, 3, 18, 0, 0, 1, 0, 3, 0, Route103_EventScript_14ED94, 0, 0, 0
 	object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 65, 0, 11, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route103_EventScript_14EDF1, 0, 0, 0
 	object_event 5, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 64, 0, 11, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route103_EventScript_14EDAB, 0, 0, 0
diff --git a/data/maps/events/RustboroCity.inc b/data/maps/events/RustboroCity.inc
index f42fd059c..6daf6bcf6 100644
--- a/data/maps/events/RustboroCity.inc
+++ b/data/maps/events/RustboroCity.inc
@@ -7,8 +7,8 @@ RustboroCity_MapObjects:: @ 837FD14
 	object_event 6, MAP_OBJ_GFX_MAN_4, 0, 26, 0, 23, 0, 3, 1, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C3BA, 0, 0, 0
 	object_event 7, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 24, 0, 51, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C449, 0, 0, 0
 	object_event 8, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 25, 0, 51, 0, 3, 9, 0, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C45F, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_MAN_2, 0, 30, 0, 10, 0, 3, 10, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C5FF, 732, 0, 0
-	object_event 10, 241, 0, 13, 0, 21, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 731, 0, 0
+	object_event 9, MAP_OBJ_GFX_MAN_2, 0, 30, 0, 10, 0, 3, 10, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C5FF, FLAG_HIDE_DEVON_RUSTBORO, 0, 0
+	object_event 10, 241, 0, 13, 0, 21, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_RUSTBORO, 0, 0
 	object_event 11, MAP_OBJ_GFX_MAN_7, 0, 13, 0, 34, 0, 3, 2, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C3A5, 0, 0, 0
 	object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 36, 0, 51, 0, 3, 1, 0, 0, 0, 0, 0, 0, RustboroCity_EventScript_1B172B, 1041, 0, 0
 	object_event 13, MAP_OBJ_GFX_MAN_5, 0, 19, 0, 27, 0, 3, 8, 16, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C475, 0, 0, 0
diff --git a/data/maps/events/SeafloorCavern_Room9.inc b/data/maps/events/SeafloorCavern_Room9.inc
index 414ab7e07..a6d3ed424 100644
--- a/data/maps/events/SeafloorCavern_Room9.inc
+++ b/data/maps/events/SeafloorCavern_Room9.inc
@@ -5,7 +5,7 @@ SeafloorCavern_Room9_MapObjects:: @ 838D620
 	object_event 4, 244, 0, 8, 0, 41, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 831, 0, 0
 	object_event 5, 245, 0, 8, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 831, 0, 0
 	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, SeafloorCavern_Room9_EventScript_1B1A37, 1090, 0, 0
-	object_event 7, 249, 0, 17, 0, 38, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 733, 0, 0
+	object_event 7, 249, 0, 17, 0, 38, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LEGENDARY_MON_SEAFLOOR_CAVERN, 0, 0
 
 SeafloorCavern_Room9_MapWarps:: @ 838D6C8
 	warp_def 5, 4, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM8
diff --git a/data/scripts/maps/InsideOfTruck.inc b/data/scripts/maps/InsideOfTruck.inc
index 737bacf71..036523bf1 100644
--- a/data/scripts/maps/InsideOfTruck.inc
+++ b/data/scripts/maps/InsideOfTruck.inc
@@ -41,7 +41,7 @@ InsideOfTruck_EventScript_15FC68:: @ 815FC68
 	setflag 758
 	setflag 761
 	setflag 785
-	setflag 722
+	setflag FLAG_HIDE_MAY_UPSTAIRS
 	setvar 0x4082, 1
 	setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 12, 10
 	releaseall
diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc
index 7ffffad78..b8c6b26f5 100644
--- a/data/scripts/maps/LilycoveCity.inc
+++ b/data/scripts/maps/LilycoveCity.inc
@@ -355,7 +355,7 @@ LilycoveCity_EventScript_14CEA6:: @ 814CEA6
 	call_if 1, LilycoveCity_EventScript_14CEEE
 	compare RESULT, 1
 	call_if 1, LilycoveCity_EventScript_14CEF7
-	clearflag 722
+	clearflag FLAG_HIDE_MAY_UPSTAIRS
 	clearflag 849
 	goto LilycoveCity_EventScript_14CF6B
 	end
diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc
index 19addd4b4..47601a964 100644
--- a/data/scripts/maps/PetalburgCity_Gym.inc
+++ b/data/scripts/maps/PetalburgCity_Gym.inc
@@ -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,10 +205,10 @@ 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 FLAG_HIDE_WALLY_PETALBURG
 	clearflag 866
 	setflag 889
 	special InitBirchState
diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc
index 122e723a1..c9a364c80 100644
--- a/data/scripts/maps/Route101.inc
+++ b/data/scripts/maps/Route101.inc
@@ -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/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc
index 8708bde71..358a946a6 100644
--- a/data/scripts/maps/RustboroCity.inc
+++ b/data/scripts/maps/RustboroCity.inc
@@ -178,7 +178,7 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4
 	waitmovement 0
 	removeobject 9
 	setobjectxyperm 9, 30, 10
-	clearflag 732
+	clearflag FLAG_HIDE_DEVON_RUSTBORO
 	setflag FLAG_DEVON_GOODS_STOLEN
 	setvar 0x405a, 2
 	setvar 0x409a, 2
@@ -474,7 +474,7 @@ RustboroCity_EventScript_14C77D:: @ 814C77D
 	msgbox RustboroCity_Text_16707F, 4
 	closemessage
 	setflag FLAG_RETURNED_DEVON_GOODS
-	setflag 732
+	setflag FLAG_HIDE_DEVON_RUSTBORO
 	setvar 0x405a, 5
 	delay 30
 	warp MAP_RUSTBORO_CITY_DEVON_CORP_3F, 255, 2, 2
diff --git a/include/constants/flags.h b/include/constants/flags.h
index f9c2b5264..a07372527 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -255,6 +255,25 @@
 #define FLAG_RIVAL_LEFT_FOR_ROUTE103        0x12D
 #define FLAG_OMIT_DIVE_FROM_STEVEN_LETTER   0x12E
 
+#define FLAG_HIDE_BIRCH_STARTERS_BAG        0x2BC
+
+#define FLAG_HIDE_BIRCH_BATTLE_POOCHYENA    0x2D0
+#define FLAG_HIDE_BIRCH_IN_LAB              0x2D1
+#define FLAG_HIDE_MAY_UPSTAIRS              0x2D2
+#define FLAG_HIDE_RIVAL_ROUTE103            0x2D3
+#define FLAG_HIDE_DEVON_PETALBURG_WOODS     0x2D4
+#define FLAG_HIDE_EVIL_TEAM_PETALBURG_WOODS 0x2D5
+#define FLAG_HIDE_WALLY_PETALBURG           0x2D6
+#define FLAG_HIDE_STEVENS_LETTER            0x2D7
+#define FLAG_HIDE_WALLY_MOM_PETALBURG_1     0x2D8
+
+#define FLAG_HIDE_GRUNT_RUSTBORO            0x2DB
+#define FLAG_HIDE_DEVON_RUSTBORO            0x2DC
+#define FLAG_HIDE_LEGENDARY_MON_SEAFLOOR_CAVERN 0x2DD
+#define FLAG_HIDE_NORMAN_LITTLEROOT         0x2DE
+
+#define FLAG_UNKNOWN_2E1                    0x2E1
+
 #define TRAINER_FLAG_START 0x500
 
 // SYSTEM FLAGS