Label flags up to flag 99.

18 files changed, 56 insertions, 42 deletions

diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s
index 922b01ec9..5fe619194 100644
--- a/data-de/event_scripts.s
+++ b/data-de/event_scripts.s
@@ -1161,7 +1161,7 @@ Event_ResetBerryTrees: @ 19F940
 	return
 
 gUnknown_0819FA81:: @ 819FA81
-	setflag 86
+	setflag FLAG_LINK_CONTEST_ROOM_POKEBALL
 	setflag 769
 	setflag 770
 	setflag 771
@@ -3768,7 +3768,7 @@ SecretBase_RedCave1_EventScript_1A2DDE:: @ 81A2DDE
 
 SecretBase_RedCave1_EventScript_1A2E08:: @ 81A2E08
 	closemessage
-	setflag 96
+	setflag FLAG_RECEIVED_SECRET_POWER
 	special sub_80BBC78
 	waitstate
 	end
diff --git a/data/event_scripts.s b/data/event_scripts.s
index ccbb767f5..dfc251980 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -1155,7 +1155,7 @@ Event_ResetBerryTrees: @ 19F940
 	return
 
 gUnknown_0819FA81:: @ 819FA81
-	setflag 86
+	setflag FLAG_LINK_CONTEST_ROOM_POKEBALL
 	setflag 769
 	setflag 770
 	setflag 771
@@ -3747,7 +3747,7 @@ SecretBase_RedCave1_EventScript_1A2DDE:: @ 81A2DDE
 
 SecretBase_RedCave1_EventScript_1A2E08:: @ 81A2E08
 	closemessage
-	setflag 96
+	setflag FLAG_RECEIVED_SECRET_POWER
 	special sub_80BBC78
 	waitstate
 	end
diff --git a/data/maps/events/LinkContestRoom1.inc b/data/maps/events/LinkContestRoom1.inc
index 6c1e09430..18d1dcd74 100644
--- a/data/maps/events/LinkContestRoom1.inc
+++ b/data/maps/events/LinkContestRoom1.inc
@@ -11,7 +11,7 @@ LinkContestRoom1_MapObjects:: @ 839149C
 	object_event 10, 249, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
 	object_event 11, 250, 0, 12, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
 	object_event 12, 245, 0, 2, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 86, 0, 0
+	object_event 13, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_LINK_CONTEST_ROOM_POKEBALL, 0, 0
 	object_event 14, 243, 0, 10, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
 	object_event 15, MAP_OBJ_GFX_ARTIST, 0, 12, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
 
diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc
index 3027e1f77..7ce49b0cb 100644
--- a/data/scripts/maps/LittlerootTown.inc
+++ b/data/scripts/maps/LittlerootTown.inc
@@ -7,7 +7,7 @@ LittlerootTown_MapScript1_14D514:: @ 814D514
 	setflag 2063
 	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
@@ -189,7 +189,7 @@ LittlerootTown_EventScript_14D6DF:: @ 814D6DF
 	faceplayer
 	checkflag 116
 	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
diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc
index d3694bd22..a478270b0 100644
--- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc
+++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc
@@ -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_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc
index a4d6f2403..100787ccf 100644
--- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc
+++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc
@@ -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
diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc
index e7ccd73f6..dc7d48ea1 100644
--- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc
+++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc
@@ -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
 
diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc
index 5c93aa252..8123c5f41 100644
--- a/data/scripts/maps/MauvilleCity.inc
+++ b/data/scripts/maps/MauvilleCity.inc
@@ -6,7 +6,7 @@ MauvilleCity_MapScript1_14C038:: @ 814C038
 	setflag 2072
 	clearflag 961
 	setflag 2098
-	clearflag 99
+	clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE
 	setvar 0x4093, 0
 	checkflag 209
 	call_if 1, MauvilleCity_EventScript_14C053
@@ -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
 
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_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc
index 5221add7a..1088c0802 100644
--- a/data/scripts/maps/MauvilleCity_Gym.inc
+++ b/data/scripts/maps/MauvilleCity_Gym.inc
@@ -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
 
@@ -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
 
diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc
index 747b56197..86c22fa40 100644
--- a/data/scripts/maps/Route101.inc
+++ b/data/scripts/maps/Route101.inc
@@ -218,7 +218,7 @@ Route101_EventScript_14EA7F:: @ 814EA7F
 	lock
 	faceplayer
 	setflag 2048
-	setflag 82
+	setflag FLAG_RESCUED_BIRCH
 	fadescreen 1
 	removeobject 4
 	setobjectxy 255, 6, 13
diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc
index 34cc8e85d..904d39f05 100644
--- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc
+++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc
@@ -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
 
diff --git a/data/scripts/maps/Route130.inc b/data/scripts/maps/Route130.inc
index 897047edc..b0381969d 100644
--- a/data/scripts/maps/Route130.inc
+++ b/data/scripts/maps/Route130.inc
@@ -21,7 +21,7 @@ Route130_MapScript1_1523C8:: @ 81523C8
 	setflag FLAG_TEMP_1D
 	setflag FLAG_TEMP_1E
 	setflag FLAG_TEMP_1F
-	setflag 32
+	setflag FLAG_TEMP_20
 	setmaplayoutindex 264
 	end
 
diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc
index 600cfc959..129b6c447 100644
--- a/data/scripts/maps/SlateportCity.inc
+++ b/data/scripts/maps/SlateportCity.inc
@@ -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
@@ -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
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/players_house.inc b/data/scripts/players_house.inc
index 69a4dc3e9..0bf59d0b9 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -59,13 +59,13 @@ 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 FLAG_SET_WALL_CLOCK
 	setflag 754
 	setflag 755
 	checkplayergender
@@ -258,7 +258,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6BE9:: @ 81B6BE9
 	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C33
 	checkflag 2059
 	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
diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc
index f3c03a853..743308b43 100644
--- a/data/scripts/secret_power_tm.inc
+++ b/data/scripts/secret_power_tm.inc
@@ -14,7 +14,7 @@ Route111_EventScript_1A3877:: @ 81A3877
 	goto_if_eq Route111_EventScript_1A38D9
 	msgbox Route111_Text_1A35C5, 4
 	closemessage
-	setflag 96
+	setflag FLAG_RECEIVED_SECRET_POWER
 	clearflag 948
 	compare FACING, 3
 	call_if 1, Route111_EventScript_1A38C3
diff --git a/include/constants/flags.h b/include/constants/flags.h
index b9c1f8611..05f1541d2 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -1,7 +1,6 @@
 #ifndef GUARD_CONSTANTS_FLAGS_H
 #define GUARD_CONSTANTS_FLAGS_H
 
-
 // temporary flags
 // These temporary are are cleared every time a map is loaded. They are used for
 // things like shortening an NPCs introduction text if the player already spoke
@@ -37,13 +36,28 @@
 #define FLAG_TEMP_1D  0x1D
 #define FLAG_TEMP_1E  0x1E
 #define FLAG_TEMP_1F  0x1F
-
-// This flag was supposed to be used as a temporary flag (see above), but there
-// was either an oversight or off-by-one error. Therefore, this one rock-smashable
-// rock disappears forever after the player breaks it.
-#define FLAG_VICTORY_ROAD_ROCK  0x20
+// FLAG_TEMP_20 was supposed to be used as a temporary flag (see above), but there
+// was either an oversight or off-by-one error.
+#define FLAG_TEMP_20  0x20
+#define FLAG_VICTORY_ROAD_ROCK FLAG_TEMP_20
 
 // scripts
+#define FLAG_SET_WALL_CLOCK              0x51
+#define FLAG_RESCUED_BIRCH               0x52
+
+#define FLAG_LINK_CONTEST_ROOM_POKEBALL  0x56
+#define FLAG_MET_RIVAL_MOM               0x57
+#define FLAG_BIRCH_AIDE_MET              0x58
+#define FLAG_DECLINED_BIKE               0x59
+#define FLAG_RECEIVED_BIKE               0x5A
+
+#define FLAG_RECEIVED_WAILMER_PAIL       0x5E
+#define FLAG_RECEIVED_POKEBLOCK_CASE     0x5F
+#define FLAG_RECEIVED_SECRET_POWER       0x60
+
+#define FLAG_TV_EXPLAINED                0x62
+#define FLAG_MAUVILLE_GYM_BARRIERS_STATE 0x63
+
 #define FLAG_PENDING_DAYCARE_EGG 0x86
 
 #define TRAINER_FLAG_START 0x500