Use constants for all SYS flags

75 files changed, 202 insertions, 202 deletions

diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s
index dc9260511..21f999721 100644
--- a/data-de/event_scripts.s
+++ b/data-de/event_scripts.s
@@ -1749,7 +1749,7 @@ EventScript_1A00BE:
 	end
 
 EventScript_1A00CB:
-	checkflag 2052
+	checkflag SYS_GAME_CLEAR
 	goto_if 0, EventScript_1A00BE
 	playse 2
 	special AccessHallOfFamePC
@@ -3964,7 +3964,7 @@ SecretBase_YellowCave4_EventScript_1A2FC0:: @ 81A2FC0
 	end
 
 SecretBase_RedCave1_EventScript_1A3032:: @ 81A3032
-	checkflag 2052
+	checkflag SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A3086
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A30A5
@@ -3999,7 +3999,7 @@ SecretBase_RedCave1_EventScript_1A30A5:: @ 81A30A5
 	end
 
 SecretBase_RedCave1_EventScript_1A30AE:: @ 81A30AE
-	checkflag 2052
+	checkflag SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A3102
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3121
@@ -4034,7 +4034,7 @@ SecretBase_RedCave1_EventScript_1A3121:: @ 81A3121
 	end
 
 SecretBase_RedCave1_EventScript_1A312A:: @ 81A312A
-	checkflag 2052
+	checkflag SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A317E
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A319D
@@ -4069,7 +4069,7 @@ SecretBase_RedCave1_EventScript_1A319D:: @ 81A319D
 	end
 
 SecretBase_RedCave1_EventScript_1A31A6:: @ 81A31A6
-	checkflag 2052
+	checkflag SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A31FA
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3219
@@ -4104,7 +4104,7 @@ SecretBase_RedCave1_EventScript_1A3219:: @ 81A3219
 	end
 
 SecretBase_RedCave1_EventScript_1A3222:: @ 81A3222
-	checkflag 2052
+	checkflag SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A3276
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3295
@@ -4139,7 +4139,7 @@ SecretBase_RedCave1_EventScript_1A3295:: @ 81A3295
 	end
 
 SecretBase_RedCave1_EventScript_1A329E:: @ 81A329E
-	checkflag 2052
+	checkflag SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A32F2
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3311
@@ -4174,7 +4174,7 @@ SecretBase_RedCave1_EventScript_1A3311:: @ 81A3311
 	end
 
 SecretBase_RedCave1_EventScript_1A331A:: @ 81A331A
-	checkflag 2052
+	checkflag SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A336E
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A338D
@@ -4209,7 +4209,7 @@ SecretBase_RedCave1_EventScript_1A338D:: @ 81A338D
 	end
 
 SecretBase_RedCave1_EventScript_1A3396:: @ 81A3396
-	checkflag 2052
+	checkflag SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A33EA
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3409
@@ -4244,7 +4244,7 @@ SecretBase_RedCave1_EventScript_1A3409:: @ 81A3409
 	end
 
 SecretBase_RedCave1_EventScript_1A3412:: @ 81A3412
-	checkflag 2052
+	checkflag SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A3466
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3485
@@ -4279,7 +4279,7 @@ SecretBase_RedCave1_EventScript_1A3485:: @ 81A3485
 	end
 
 SecretBase_RedCave1_EventScript_1A348E:: @ 81A348E
-	checkflag 2052
+	checkflag SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A34E2
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3501
diff --git a/data-de/field_move_scripts.inc b/data-de/field_move_scripts.inc
index 497408299..b33765564 100644
--- a/data-de/field_move_scripts.inc
+++ b/data-de/field_move_scripts.inc
@@ -1,6 +1,6 @@
 S_CuttableTree:: @ 81B0DCC
 	lockall
-	checkflag 2055
+	checkflag BADGE01_GET
 	goto_if 0, CannotUseCut
 	checkpokemove MOVE_CUT
 	compare RESULT, 6
@@ -61,7 +61,7 @@ CannotUseCutText: @ 81B0E8E
 
 S_BreakableRock:: @ 81B0EB7
 	lockall
-	checkflag 2057
+	checkflag BADGE03_GET
 	goto_if 0, CannotUseRockSmash
 	checkpokemove MOVE_ROCK_SMASH
 	compare RESULT, 6
@@ -128,9 +128,9 @@ CannotUseRockSmashText: @ 81B0F90
 
 S_PushableBoulder:: @ 81B0FCB
 	lockall
-	checkflag 2058
+	checkflag BADGE04_GET
 	goto_if 0, CannotUseStrength
-	checkflag 2089
+	checkflag SYS_USE_STRENGTH
 	goto_if_eq AlreadyUsedStrength
 	checkpokemove 70
 	compare RESULT, 6
@@ -153,7 +153,7 @@ S_UseStrength:: @ 81B100E
 	end
 
 UsedStrength: @ 81B1019
-	setflag 2089
+	setflag SYS_USE_STRENGTH
 	msgbox UsedStrengthText, 3
 	releaseall
 	end
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 2a4fdebd8..97a7d3533 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -1743,7 +1743,7 @@ EventScript_1A00BE:
 	end
 
 EventScript_1A00CB:
-	checkflag 2052
+	checkflag SYS_GAME_CLEAR
 	goto_if 0, EventScript_1A00BE
 	playse 2
 	special AccessHallOfFamePC
@@ -3943,7 +3943,7 @@ SecretBase_YellowCave4_EventScript_1A2FC0:: @ 81A2FC0
 	end
 
 SecretBase_RedCave1_EventScript_1A3032:: @ 81A3032
-	checkflag 2052
+	checkflag SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A3086
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A30A5
@@ -3978,7 +3978,7 @@ SecretBase_RedCave1_EventScript_1A30A5:: @ 81A30A5
 	end
 
 SecretBase_RedCave1_EventScript_1A30AE:: @ 81A30AE
-	checkflag 2052
+	checkflag SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A3102
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3121
@@ -4013,7 +4013,7 @@ SecretBase_RedCave1_EventScript_1A3121:: @ 81A3121
 	end
 
 SecretBase_RedCave1_EventScript_1A312A:: @ 81A312A
-	checkflag 2052
+	checkflag SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A317E
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A319D
@@ -4048,7 +4048,7 @@ SecretBase_RedCave1_EventScript_1A319D:: @ 81A319D
 	end
 
 SecretBase_RedCave1_EventScript_1A31A6:: @ 81A31A6
-	checkflag 2052
+	checkflag SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A31FA
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3219
@@ -4083,7 +4083,7 @@ SecretBase_RedCave1_EventScript_1A3219:: @ 81A3219
 	end
 
 SecretBase_RedCave1_EventScript_1A3222:: @ 81A3222
-	checkflag 2052
+	checkflag SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A3276
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3295
@@ -4118,7 +4118,7 @@ SecretBase_RedCave1_EventScript_1A3295:: @ 81A3295
 	end
 
 SecretBase_RedCave1_EventScript_1A329E:: @ 81A329E
-	checkflag 2052
+	checkflag SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A32F2
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3311
@@ -4153,7 +4153,7 @@ SecretBase_RedCave1_EventScript_1A3311:: @ 81A3311
 	end
 
 SecretBase_RedCave1_EventScript_1A331A:: @ 81A331A
-	checkflag 2052
+	checkflag SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A336E
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A338D
@@ -4188,7 +4188,7 @@ SecretBase_RedCave1_EventScript_1A338D:: @ 81A338D
 	end
 
 SecretBase_RedCave1_EventScript_1A3396:: @ 81A3396
-	checkflag 2052
+	checkflag SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A33EA
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3409
@@ -4223,7 +4223,7 @@ SecretBase_RedCave1_EventScript_1A3409:: @ 81A3409
 	end
 
 SecretBase_RedCave1_EventScript_1A3412:: @ 81A3412
-	checkflag 2052
+	checkflag SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A3466
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3485
@@ -4258,7 +4258,7 @@ SecretBase_RedCave1_EventScript_1A3485:: @ 81A3485
 	end
 
 SecretBase_RedCave1_EventScript_1A348E:: @ 81A348E
-	checkflag 2052
+	checkflag SYS_GAME_CLEAR
 	goto_if 0, SecretBase_RedCave1_EventScript_1A34E2
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3501
diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc
index c36f95460..8fcf91616 100644
--- a/data/field_move_scripts.inc
+++ b/data/field_move_scripts.inc
@@ -1,6 +1,6 @@
 S_CuttableTree:: @ 81B0DCC
 	lockall
-	checkflag 2055
+	checkflag BADGE01_GET
 	goto_if 0, CannotUseCut
 	checkpokemove MOVE_CUT
 	compare RESULT, 6
@@ -58,7 +58,7 @@ CannotUseCutText: @ 81B0E8E
 
 S_BreakableRock:: @ 81B0EB7
 	lockall
-	checkflag 2057
+	checkflag BADGE03_GET
 	goto_if 0, CannotUseRockSmash
 	checkpokemove MOVE_ROCK_SMASH
 	compare RESULT, 6
@@ -125,9 +125,9 @@ CannotUseRockSmashText: @ 81B0F90
 
 S_PushableBoulder:: @ 81B0FCB
 	lockall
-	checkflag 2058
+	checkflag BADGE04_GET
 	goto_if 0, CannotUseStrength
-	checkflag 2089
+	checkflag SYS_USE_STRENGTH
 	goto_if_eq AlreadyUsedStrength
 	checkpokemove 70
 	compare RESULT, 6
@@ -150,7 +150,7 @@ S_UseStrength:: @ 81B100E
 	end
 
 UsedStrength: @ 81B1019
-	setflag 2089
+	setflag SYS_USE_STRENGTH
 	msgbox UsedStrengthText, 3
 	releaseall
 	end
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index 279fa0451..e3efba4e7 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 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 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 ab57e9bf4..68fd92ac0 100644
--- a/data/scripts/contest_hall.inc
+++ b/data/scripts/contest_hall.inc
@@ -1143,7 +1143,7 @@ LinkContestRoom1_EventScript_1A5D3B:: @ 81A5D3B
 LinkContestRoom1_EventScript_1A5D5B:: @ 81A5D5B
 	special sub_80C44C0
 	incrementgamestat GAME_STAT_RECEIVED_RIBBONS
-	setflag 2107
+	setflag SYS_RIBBON_GET
 	lockall
 	msgbox LinkContestRoom1_Text_1A6D6A, 4
 	playfanfare 370
diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc
index 188691e73..36df2cb3f 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 SYS_CTRL_OBJ_DELETE
 	call_if 1, AncientTomb_EventScript_15EFD8
 	end
 
@@ -18,7 +18,7 @@ AncientTomb_MapScript1_15EFDC:: @ 815EFDC
 	end
 
 AncientTomb_MapScript1_15EFE0:: @ 815EFE0
-	checkflag 2130
+	checkflag 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 SYS_BRAILLE_FLY
 	goto_if_eq AncientTomb_EventScript_15F038
 	braillemessage AncientTomb_Braille_1C552E
 	waitbutton
@@ -63,9 +63,9 @@ AncientTomb_EventScript_15F050:: @ 815F050
 	waitpokecry
 	setwildbattle SPECIES_REGISTEEL, 40, ITEM_NONE
 	setflag 937
-	setflag 2145
+	setflag SYS_CTRL_OBJ_DELETE
 	special ScrSpecial_StartRegiBattle
 	waitstate
-	clearflag 2145
+	clearflag SYS_CTRL_OBJ_DELETE
 	release
 	end
diff --git a/data/scripts/maps/AquaHideout_B1F.inc b/data/scripts/maps/AquaHideout_B1F.inc
index 0001d7574..9498864c3 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 SYS_CTRL_OBJ_DELETE
 	call_if 1, AquaHideout_B1F_EventScript_15D846
 	end
 
diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc
index a37310d16..1f3c0f105 100644
--- a/data/scripts/maps/BattleTower_Outside.inc
+++ b/data/scripts/maps/BattleTower_Outside.inc
@@ -3,7 +3,7 @@ BattleTower_Outside_MapScripts:: @ 8160156
 	.byte 0
 
 BattleTower_Outside_MapScript1_16015C:: @ 816015C
-	setflag 2120
+	setflag FLAG_UNLOCK_BATTLE_TOWER
 	setvar 0x40bc, 0
 	setflag 918
 	end
diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc
index c9f7b5964..c0a88a880 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 SYS_CTRL_OBJ_DELETE
 	call_if 1, CaveOfOrigin_B4F_EventScript_15DDC1
 	end
 
@@ -61,10 +61,10 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7
 	playpokecry SPECIES_GROUDON_OR_KYOGRE, 2
 	delay 40
 	waitpokecry
-	setflag 2145
+	setflag SYS_CTRL_OBJ_DELETE
 	special ScrSpecial_StartGroudonKyogreBattle
 	waitstate
-	clearflag 2145
+	clearflag SYS_CTRL_OBJ_DELETE
 	specialvar RESULT, sub_810E300
 	compare RESULT, 1
 	call_if 1, CaveOfOrigin_B4F_EventScript_15DE73
@@ -75,7 +75,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7
 	setvar 0x409b, 1
 	setflag FLAG_LEGENDARY_BATTLE_COMPLETED
 	clearflag 854
-	clearflag 2090
+	clearflag SYS_WEATHER_CTRL
 	setvar 0x40b9, 2
 	clearflag 916
 	releaseall
diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc
index 9f6f7b388..3ca08a6de 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 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 SYS_BRAILLE_STRENGTH
 	call_if 0, DesertRuins_EventScript_15CB1B
 	end
 
@@ -33,7 +33,7 @@ DesertRuins_MapScript1_15CB52:: @ 815CB52
 
 DesertRuins_EventScript_15CB56:: @ 815CB56
 	lockall
-	checkflag 2128
+	checkflag SYS_BRAILLE_STRENGTH
 	goto_if_eq DesertRuins_EventScript_15CB6D
 	braillemessage DesertRuins_Braille_1C54C8
 	waitbutton
@@ -63,9 +63,9 @@ DesertRuins_EventScript_15CB85:: @ 815CB85
 	waitpokecry
 	setwildbattle SPECIES_REGIROCK, 40, ITEM_NONE
 	setflag 935
-	setflag 2145
+	setflag SYS_CTRL_OBJ_DELETE
 	special ScrSpecial_StartRegiBattle
 	waitstate
-	clearflag 2145
+	clearflag SYS_CTRL_OBJ_DELETE
 	release
 	end
diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc
index 7f8fe6fef..bea4fc475 100644
--- a/data/scripts/maps/DewfordTown.inc
+++ b/data/scripts/maps/DewfordTown.inc
@@ -3,7 +3,7 @@ DewfordTown_MapScripts:: @ 814DFF8
 	.byte 0
 
 DewfordTown_MapScript1_14DFFE:: @ 814DFFE
-	setflag 2065
+	setflag FLAG_VISITED_DEWFORD_TOWN
 	end
 
 DewfordTown_EventScript_14E002:: @ 814E002
diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc
index 92776afb1..17b000711 100644
--- a/data/scripts/maps/DewfordTown_Gym.inc
+++ b/data/scripts/maps/DewfordTown_Gym.inc
@@ -113,7 +113,7 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177
 	call DewfordTown_Gym_EventScript_1A02C5
 	msgbox DewfordTown_Gym_Text_1752E6, 4
 	setflag 1204
-	setflag 2056
+	setflag BADGE02_GET
 	addvar 0x4085, 1
 	compare 0x4085, 6
 	call_if 1, DewfordTown_Gym_EventScript_1A00FB
@@ -177,14 +177,14 @@ DewfordTown_Gym_EventScript_153254:: @ 8153254
 
 DewfordTown_Gym_EventScript_15325E:: @ 815325E
 	lockall
-	checkflag 2056
+	checkflag BADGE02_GET
 	goto_if_eq DewfordTown_Gym_EventScript_15327E
 	goto DewfordTown_Gym_EventScript_153288
 	end
 
 DewfordTown_Gym_EventScript_15326E:: @ 815326E
 	lockall
-	checkflag 2056
+	checkflag BADGE02_GET
 	goto_if_eq DewfordTown_Gym_EventScript_15327E
 	goto DewfordTown_Gym_EventScript_153288
 	end
diff --git a/data/scripts/maps/EverGrandeCity.inc b/data/scripts/maps/EverGrandeCity.inc
index c9768d006..c4f9ad315 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 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_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc
index acbdac899..7e26476fa 100644
--- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc
+++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc
@@ -4,7 +4,7 @@ EverGrandeCity_PokemonLeague_MapScripts:: @ 815BA75
 
 EverGrandeCity_PokemonLeague_MapScript1_15BA7B:: @ 815BA7B
 	sethealplace 20
-	setflag 2132
+	setflag SYS_POKEMON_LEAGUE_FLY
 	checkflag 263
 	call_if 0, EverGrandeCity_PokemonLeague_EventScript_15BA8B
 	end
@@ -57,7 +57,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2
 	message EverGrandeCity_PokemonLeague_Text_1916FD
 	waitmessage
 	delay 75
-	checkflag 2060
+	checkflag BADGE06_GET
 	goto_if 0, EverGrandeCity_PokemonLeague_EventScript_15BB4A
 	closemessage
 	applymovement 3, EverGrandeCity_PokemonLeague_Movement_15BB7E
diff --git a/data/scripts/maps/FallarborTown.inc b/data/scripts/maps/FallarborTown.inc
index 13c8a9f2e..286f01a93 100644
--- a/data/scripts/maps/FallarborTown.inc
+++ b/data/scripts/maps/FallarborTown.inc
@@ -3,7 +3,7 @@ FallarborTown_MapScripts:: @ 814E7E0
 	.byte 0
 
 FallarborTown_MapScript1_14E7E6:: @ 814E7E6
-	setflag 2067
+	setflag FLAG_VISITED_FALLARBOR_TOWN
 	setvar 0x4086, 0
 	setflag 800
 	clearflag 270
diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc
index 6ea89dcb7..ae0f53f5e 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
diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc
index 7309be0bb..1e2d3c4f3 100644
--- a/data/scripts/maps/FortreeCity_Gym.inc
+++ b/data/scripts/maps/FortreeCity_Gym.inc
@@ -29,7 +29,7 @@ FortreeCity_Gym_EventScript_157F15:: @ 8157F15
 	call FortreeCity_Gym_EventScript_1A02C5
 	msgbox FortreeCity_Gym_Text_185E73, 4
 	setflag 1225
-	setflag 2060
+	setflag BADGE06_GET
 	setvar 0x8008, 6
 	call FortreeCity_Gym_EventScript_1A01C0
 	goto FortreeCity_Gym_EventScript_157F3E
@@ -80,14 +80,14 @@ FortreeCity_Gym_EventScript_157FD3:: @ 8157FD3
 
 FortreeCity_Gym_EventScript_157FDD:: @ 8157FDD
 	lockall
-	checkflag 2060
+	checkflag BADGE06_GET
 	goto_if_eq FortreeCity_Gym_EventScript_157FFD
 	goto FortreeCity_Gym_EventScript_158007
 	end
 
 FortreeCity_Gym_EventScript_157FED:: @ 8157FED
 	lockall
-	checkflag 2060
+	checkflag BADGE06_GET
 	goto_if_eq FortreeCity_Gym_EventScript_157FFD
 	goto FortreeCity_Gym_EventScript_158007
 	end
diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc
index 75399bde8..4b72b166c 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 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 SYS_BRAILLE_WAIT
 	call_if 0, IslandCave_EventScript_15EEDE
 	end
 
@@ -40,12 +40,12 @@ S_OpenRegiceChamber:: @ 815EF19
 	setmaptile 9, 20, 564, 1
 	special DrawWholeMapView
 	playse SE_BAN
-	setflag 2129
+	setflag SYS_BRAILLE_WAIT
 	end
 
 IslandCave_EventScript_15EF59:: @ 815EF59
 	lockall
-	checkflag 2129
+	checkflag 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 SYS_BRAILLE_WAIT
 	goto_if_eq IslandCave_EventScript_15EF95
 	special DoBrailleWait
 	waitstate
@@ -83,9 +83,9 @@ IslandCave_EventScript_15EF9D:: @ 815EF9D
 	waitpokecry
 	setwildbattle SPECIES_REGICE, 40, ITEM_NONE
 	setflag 936
-	setflag 2145
+	setflag SYS_CTRL_OBJ_DELETE
 	special ScrSpecial_StartRegiBattle
 	waitstate
-	clearflag 2145
+	clearflag SYS_CTRL_OBJ_DELETE
 	release
 	end
diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc
index 5192176a7..6af7731e1 100644
--- a/data/scripts/maps/LavaridgeTown.inc
+++ b/data/scripts/maps/LavaridgeTown.inc
@@ -4,7 +4,7 @@ LavaridgeTown_MapScripts:: @ 814E4A3
 	.byte 0
 
 LavaridgeTown_MapScript1_14E4AE:: @ 814E4AE
-	setflag 2066
+	setflag FLAG_VISITED_LAVARIDGE_TOWN
 	checkflag 139
 	call_if 1, LavaridgeTown_EventScript_14E4DF
 	call LavaridgeTown_EventScript_1A014E
diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc
index 2edffe9f0..06cf57265 100644
--- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc
+++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc
@@ -82,7 +82,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766
 	call LavaridgeTown_Gym_1F_EventScript_1A02C5
 	msgbox LavaridgeTown_Gym_1F_Text_176A8C, 4
 	setflag 1213
-	setflag 2058
+	setflag BADGE04_GET
 	addvar 0x4085, 1
 	compare 0x4085, 6
 	call_if 1, LavaridgeTown_Gym_1F_EventScript_1A00FB
@@ -148,14 +148,14 @@ LavaridgeTown_Gym_1F_EventScript_15386E:: @ 815386E
 
 LavaridgeTown_Gym_1F_EventScript_153878:: @ 8153878
 	lockall
-	checkflag 2058
+	checkflag 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 BADGE04_GET
 	goto_if_eq LavaridgeTown_Gym_1F_EventScript_153898
 	goto LavaridgeTown_Gym_1F_EventScript_1538A2
 	end
diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc
index 9195cc9ec..ed07b2171 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
+	checkflag SYS_WEATHER_CTRL
 	call_if 1, LilycoveCity_EventScript_1A02C1
 	call LilycoveCity_EventScript_1A0196
 	call LilycoveCity_EventScript_1A014E
@@ -30,7 +30,7 @@ LilycoveCity_MapScript1_14CA3F:: @ 814CA3F
 	.endif
 	checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE
 	call_if 0, LilycoveCity_EventScript_14CABE
-	checkflag 2061
+	checkflag BADGE07_GET
 	call_if 1, LilycoveCity_EventScript_14CB2B
 	end
 
@@ -89,7 +89,7 @@ LilycoveCity_EventScript_14CBBE:: @ 814CBBE
 LilycoveCity_EventScript_14CBC7:: @ 814CBC7
 	lock
 	faceplayer
-	checkflag 2061
+	checkflag BADGE07_GET
 	goto_if_eq LilycoveCity_EventScript_14CBDC
 	msgbox LilycoveCity_Text_168750, 4
 	release
@@ -147,7 +147,7 @@ LilycoveCity_EventScript_14CC3F:: @ 814CC3F
 LilycoveCity_EventScript_14CC48:: @ 814CC48
 	lock
 	faceplayer
-	checkflag 2061
+	checkflag 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 SYS_GAME_CLEAR
 	goto_if_eq LilycoveCity_EventScript_14CCC0
 	msgbox LilycoveCity_Text_168EDA, 4
 	releaseall
@@ -349,7 +349,7 @@ LilycoveCity_EventScript_14CE96:: @ 814CE96
 LilycoveCity_EventScript_14CEA6:: @ 814CEA6
 	msgbox LilycoveCity_Text_167C6B, 4
 	setvar RESULT, 0
-	checkflag 2060
+	checkflag BADGE06_GET
 	call_if 1, LilycoveCity_EventScript_14CEDE
 	compare RESULT, 0
 	call_if 1, LilycoveCity_EventScript_14CEEE
@@ -361,7 +361,7 @@ LilycoveCity_EventScript_14CEA6:: @ 814CEA6
 	end
 
 LilycoveCity_EventScript_14CEDE:: @ 814CEDE
-	checkflag 2062
+	checkflag 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 SYS_GAME_CLEAR
 	goto_if_eq LilycoveCity_EventScript_14CF09
 	msgbox LilycoveCity_Text_167DDD, 4
 	return
@@ -386,7 +386,7 @@ LilycoveCity_EventScript_14CF09:: @ 814CF09
 LilycoveCity_EventScript_14CF12:: @ 814CF12
 	msgbox LilycoveCity_Text_168149, 4
 	setvar RESULT, 0
-	checkflag 2060
+	checkflag BADGE06_GET
 	call_if 1, LilycoveCity_EventScript_14CEDE
 	compare RESULT, 0
 	call_if 1, LilycoveCity_EventScript_14CF47
@@ -401,7 +401,7 @@ LilycoveCity_EventScript_14CF47:: @ 814CF47
 	return
 
 LilycoveCity_EventScript_14CF50:: @ 814CF50
-	checkflag 2052
+	checkflag SYS_GAME_CLEAR
 	goto_if_eq LilycoveCity_EventScript_14CF62
 	msgbox LilycoveCity_Text_168282, 4
 	return
diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc
index 470af3871..f2769ce3e 100644
--- a/data/scripts/maps/LilycoveCity_ContestLobby.inc
+++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc
@@ -589,7 +589,7 @@ LilycoveCity_ContestLobby_EventScript_158EE8:: @ 8158EE8
 	setvar 0x800b, 8
 	setvar CONTEST_RANK, 3
 	setvar 0x4099, 1
-	setflag 2107
+	setflag SYS_RIBBON_GET
 	end
 
 LilycoveCity_ContestLobby_EventScript_158F08:: @ 8158F08
diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc
index 7b602b2c7..62d35662d 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 SYS_GAME_CLEAR
 	goto_if_eq LilycoveCity_CoveLilyMotel_1F_EventScript_158326
-	checkflag 2061
+	checkflag 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_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc
index 4dcc1ba71..ae62caea7 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 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 SYS_GAME_CLEAR
 	goto_if 0, LilycoveCity_Harbor_EventScript_1598BA
 	checkflag 206
 	goto_if_eq LilycoveCity_Harbor_EventScript_1598BA
-	checkflag 2131
+	checkflag 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 SYS_GAME_CLEAR
 	goto_if_eq LilycoveCity_Harbor_EventScript_159AA2
 	msgbox LilycoveCity_Harbor_Text_18B504, 4
 	release
diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc
index 20b5c5f13..4b9de4d15 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 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 fbec4f7a2..7d604d7f5 100644
--- a/data/scripts/maps/LittlerootTown.inc
+++ b/data/scripts/maps/LittlerootTown.inc
@@ -4,7 +4,7 @@ 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 FLAG_RESCUED_BIRCH
@@ -861,7 +861,7 @@ LittlerootTown_EventScript_14DCE2:: @ 814DCE2
 
 LittlerootTown_EventScript_14DD2B:: @ 814DD2B
 	removeobject 4
-	setflag 2144
+	setflag SYS_B_DASH
 	setvar 0x4050, 4
 	release
 	end
diff --git a/data/scripts/maps/MagmaHideout_B1F.inc b/data/scripts/maps/MagmaHideout_B1F.inc
index 780eea4f5..3042d75dc 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 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 8123c5f41..f778b1eff 100644
--- a/data/scripts/maps/MauvilleCity.inc
+++ b/data/scripts/maps/MauvilleCity.inc
@@ -3,9 +3,9 @@ MauvilleCity_MapScripts:: @ 814C032
 	.byte 0
 
 MauvilleCity_MapScript1_14C038:: @ 814C038
-	setflag 2072
+	setflag FLAG_VISITED_MAUVILLE_CITY
 	clearflag 961
-	setflag 2098
+	setflag SYS_TV_START
 	clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE
 	setvar 0x4093, 0
 	checkflag 209
diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc
index 1088c0802..43c60dc31 100644
--- a/data/scripts/maps/MauvilleCity_Gym.inc
+++ b/data/scripts/maps/MauvilleCity_Gym.inc
@@ -83,7 +83,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB
 	call MauvilleCity_Gym_EventScript_1A02C5
 	msgbox MauvilleCity_Gym_Text_180DDA, 4
 	setflag 1208
-	setflag 2057
+	setflag BADGE03_GET
 	addvar 0x4085, 1
 	compare 0x4085, 6
 	call_if 1, MauvilleCity_Gym_EventScript_1A00FB
@@ -204,14 +204,14 @@ MauvilleCity_Gym_EventScript_156757:: @ 8156757
 
 MauvilleCity_Gym_EventScript_156761:: @ 8156761
 	lockall
-	checkflag 2057
+	checkflag BADGE03_GET
 	goto_if_eq MauvilleCity_Gym_EventScript_156781
 	goto MauvilleCity_Gym_EventScript_15678B
 	end
 
 MauvilleCity_Gym_EventScript_156771:: @ 8156771
 	lockall
-	checkflag 2057
+	checkflag BADGE03_GET
 	goto_if_eq MauvilleCity_Gym_EventScript_156781
 	goto MauvilleCity_Gym_EventScript_15678B
 	end
diff --git a/data/scripts/maps/MossdeepCity.inc b/data/scripts/maps/MossdeepCity.inc
index aad1c6e16..998b850aa 100644
--- a/data/scripts/maps/MossdeepCity.inc
+++ b/data/scripts/maps/MossdeepCity.inc
@@ -7,7 +7,7 @@ MossdeepCity_MapScript1_14CF98:: @ 814CF98
 	clearflag FLAG_MOSSDEEP_GYM_SWITCH_2
 	clearflag FLAG_MOSSDEEP_GYM_SWITCH_3
 	clearflag FLAG_MOSSDEEP_GYM_SWITCH_4
-	checkflag 2090
+	checkflag 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
 
diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc
index dbd48c7d2..ea79a03c3 100644
--- a/data/scripts/maps/MossdeepCity_Gym.inc
+++ b/data/scripts/maps/MossdeepCity_Gym.inc
@@ -62,7 +62,7 @@ MossdeepCity_Gym_EventScript_15A594:: @ 815A594
 	call MossdeepCity_Gym_EventScript_1A02C5
 	msgbox MossdeepCity_Gym_Text_18D128, 4
 	setflag 1229
-	setflag 2061
+	setflag BADGE07_GET
 	clearflag 869
 	clearflag 915
 	setvar 0x8008, 7
@@ -228,14 +228,14 @@ MossdeepCity_Gym_Movement_15A7F7:: @ 815A7F7
 
 MossdeepCity_Gym_EventScript_15A7FA:: @ 815A7FA
 	lockall
-	checkflag 2061
+	checkflag BADGE07_GET
 	goto_if_eq MossdeepCity_Gym_EventScript_15A81A
 	goto MossdeepCity_Gym_EventScript_15A824
 	end
 
 MossdeepCity_Gym_EventScript_15A80A:: @ 815A80A
 	lockall
-	checkflag 2061
+	checkflag BADGE07_GET
 	goto_if_eq MossdeepCity_Gym_EventScript_15A81A
 	goto MossdeepCity_Gym_EventScript_15A824
 	end
diff --git a/data/scripts/maps/MossdeepCity_House4.inc b/data/scripts/maps/MossdeepCity_House4.inc
index fd173899d..77953a959 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 SYS_GAME_CLEAR
 	goto_if_eq MossdeepCity_House4_EventScript_15AB46
 	msgbox MossdeepCity_House4_Text_18E0E3, 4
 	release
diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc
index 8bf899780..e0d6aa69f 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 SYS_GAME_CLEAR
 	call_if 0, MossdeepCity_StevensHouse_EventScript_15A9DF
 	end
 
diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc
index 2d2a46ab4..62b8f4d59 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 SYS_CTRL_OBJ_DELETE
 	call_if 1, NewMauville_Inside_EventScript_15E58F
 	end
 
@@ -170,9 +170,9 @@ NewMauville_Inside_EventScript_15E900:: @ 815E900
 	delay 40
 	waitpokecry
 	setflag 974
-	setflag 2145
+	setflag SYS_CTRL_OBJ_DELETE
 	dowildbattle
-	clearflag 2145
+	clearflag SYS_CTRL_OBJ_DELETE
 	release
 	end
 
@@ -185,9 +185,9 @@ NewMauville_Inside_EventScript_15E91E:: @ 815E91E
 	delay 40
 	waitpokecry
 	setflag 975
-	setflag 2145
+	setflag SYS_CTRL_OBJ_DELETE
 	dowildbattle
-	clearflag 2145
+	clearflag SYS_CTRL_OBJ_DELETE
 	release
 	end
 
@@ -200,8 +200,8 @@ NewMauville_Inside_EventScript_15E93C:: @ 815E93C
 	delay 40
 	waitpokecry
 	setflag 976
-	setflag 2145
+	setflag SYS_CTRL_OBJ_DELETE
 	dowildbattle
-	clearflag 2145
+	clearflag SYS_CTRL_OBJ_DELETE
 	release
 	end
diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc
index ae4a2fb6e..b9b712937 100644
--- a/data/scripts/maps/OldaleTown.inc
+++ b/data/scripts/maps/OldaleTown.inc
@@ -4,7 +4,7 @@ OldaleTown_MapScripts:: @ 814DD62
 
 OldaleTown_MapScript1_14DD68:: @ 814DD68
 	call OldaleTown_EventScript_1A014E
-	setflag 2064
+	setflag FLAG_VISITED_OLDALE_TOWN
 	checkflag FLAG_ADVENTURE_STARTED
 	call_if 0, OldaleTown_EventScript_14DD92
 	checkflag 132
diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc
index 494f109fe..d46831902 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 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/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..f5a6fcc3f 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 SYS_GAME_CLEAR
 	call_if 1, PetalburgCity_Gym_EventScript_15454B
 	end
 
@@ -356,7 +356,7 @@ PetalburgCity_Gym_EventScript_15493D:: @ 815493D
 	goto_if_eq PetalburgCity_Gym_EventScript_1549B8
 	checkflag 169
 	goto_if 0, PetalburgCity_Gym_EventScript_154A2C
-	checkflag 2052
+	checkflag SYS_GAME_CLEAR
 	goto_if_eq PetalburgCity_Gym_EventScript_154B69
 	msgbox PetalburgCity_Gym_Text_17AA6B, 4
 	release
@@ -399,7 +399,7 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6
 	msgbox PetalburgCity_Gym_Text_17A805, 4
 	setflag 1217
 	setvar 0x4085, 7
-	setflag 2059
+	setflag BADGE05_GET
 	call PetalburgCity_Gym_EventScript_1A0424
 	setflag 913
 	clearflag 912
@@ -1034,14 +1034,14 @@ PetalburgCity_Gym_EventScript_1551A0:: @ 81551A0
 
 PetalburgCity_Gym_EventScript_1551AA:: @ 81551AA
 	lockall
-	checkflag 2059
+	checkflag BADGE05_GET
 	goto_if_eq PetalburgCity_Gym_EventScript_1551CA
 	goto PetalburgCity_Gym_EventScript_1551D4
 	end
 
 PetalburgCity_Gym_EventScript_1551BA:: @ 81551BA
 	lockall
-	checkflag 2059
+	checkflag BADGE05_GET
 	goto_if_eq PetalburgCity_Gym_EventScript_1551CA
 	goto PetalburgCity_Gym_EventScript_1551D4
 	end
diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc
index 86c22fa40..122e723a1 100644
--- a/data/scripts/maps/Route101.inc
+++ b/data/scripts/maps/Route101.inc
@@ -217,7 +217,7 @@ Route101_EventScript_14EA76:: @ 814EA76
 Route101_EventScript_14EA7F:: @ 814EA7F
 	lock
 	faceplayer
-	setflag 2048
+	setflag SYS_POKEMON_GET
 	setflag FLAG_RESCUED_BIRCH
 	fadescreen 1
 	removeobject 4
diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc
index 651f2afb4..6e151447e 100644
--- a/data/scripts/maps/Route104.inc
+++ b/data/scripts/maps/Route104.inc
@@ -19,7 +19,7 @@ Route104_MapScript1_14EEA8:: @ 814EEA8
 Route104_EventScript_14EEAE:: @ 814EEAE
 	checkflag 127
 	goto_if 0, Route104_EventScript_14EEC4
-	checkflag 2057
+	checkflag BADGE03_GET
 	goto_if 0, Route104_EventScript_14EEC4
 	clearflag 906
 	return
diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc
index 904d39f05..8ef2ee8bc 100644
--- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc
+++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc
@@ -6,7 +6,7 @@ Route104_PrettyPetalFlowerShop_MapScript1_15BDEA:: @ 815BDEA
 	setflag 2108
 	checkflag 127
 	goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03
-	checkflag 2057
+	checkflag BADGE03_GET
 	goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03
 	setflag FLAG_TEMP_1
 	end
diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc
index c60bc366e..8fd9d3ea5 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 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 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..1ca98817c 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 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 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..bd4867c60 100644
--- a/data/scripts/maps/Route110_TrickHouseEntrance.inc
+++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc
@@ -63,37 +63,37 @@ Route110_TrickHouseEntrance_EventScript_160FDE:: @ 8160FDE
 	return
 
 Route110_TrickHouseEntrance_EventScript_16103C:: @ 816103C
-	checkflag 2057
+	checkflag BADGE03_GET
 	call_if 0, Route110_TrickHouseEntrance_EventScript_161088
 	return
 
 Route110_TrickHouseEntrance_EventScript_161046:: @ 8161046
-	checkflag 2058
+	checkflag BADGE04_GET
 	call_if 0, Route110_TrickHouseEntrance_EventScript_161088
 	return
 
 Route110_TrickHouseEntrance_EventScript_161050:: @ 8161050
-	checkflag 2059
+	checkflag BADGE05_GET
 	call_if 0, Route110_TrickHouseEntrance_EventScript_161088
 	return
 
 Route110_TrickHouseEntrance_EventScript_16105A:: @ 816105A
-	checkflag 2060
+	checkflag BADGE06_GET
 	call_if 0, Route110_TrickHouseEntrance_EventScript_161088
 	return
 
 Route110_TrickHouseEntrance_EventScript_161064:: @ 8161064
-	checkflag 2061
+	checkflag BADGE07_GET
 	call_if 0, Route110_TrickHouseEntrance_EventScript_161088
 	return
 
 Route110_TrickHouseEntrance_EventScript_16106E:: @ 816106E
-	checkflag 2062
+	checkflag BADGE08_GET
 	call_if 0, Route110_TrickHouseEntrance_EventScript_161088
 	return
 
 Route110_TrickHouseEntrance_EventScript_161078:: @ 8161078
-	checkflag 2052
+	checkflag SYS_GAME_CLEAR
 	call_if 0, Route110_TrickHouseEntrance_EventScript_161088
 	return
 
diff --git a/data/scripts/maps/Route114_LanettesHouse.inc b/data/scripts/maps/Route114_LanettesHouse.inc
index e4334647c..9be44af5a 100644
--- a/data/scripts/maps/Route114_LanettesHouse.inc
+++ b/data/scripts/maps/Route114_LanettesHouse.inc
@@ -11,7 +11,7 @@ Route114_LanettesHouse_EventScript_15C262:: @ 815C262
 	faceplayer
 	checkflag 131
 	goto_if_eq Route114_LanettesHouse_EventScript_15C28F
-	setflag 2123
+	setflag SYS_PC_LANETTE
 	msgbox Route114_LanettesHouse_Text_192A0D, 4
 	.ifdef SAPPHIRE
 	givedecoration 99
diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc
index 08853ed32..ec47cbd79 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 SYS_CTRL_OBJ_DELETE
 	call_if 1, Route119_EventScript_15117C
 	end
 
diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc
index 868d00324..b2765e977 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 SYS_CTRL_OBJ_DELETE
 	call_if 1, Route120_EventScript_151628
 	end
 
@@ -227,9 +227,9 @@ Route120_EventScript_15189D:: @ 815189D
 	waitpokecry
 	setwildbattle SPECIES_KECLEON, 30, ITEM_NONE
 	setvar 0x8004, 0
-	setflag 2145
+	setflag SYS_CTRL_OBJ_DELETE
 	dowildbattle
-	clearflag 2145
+	clearflag SYS_CTRL_OBJ_DELETE
 	goto Route120_EventScript_151908
 	end
 
diff --git a/data/scripts/maps/Route124.inc b/data/scripts/maps/Route124.inc
index ffe4cef97..71f58bb57 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 SYS_WEATHER_CTRL
 	call_if 1, Route124_EventScript_1A02C1
 	end
 
diff --git a/data/scripts/maps/Route125.inc b/data/scripts/maps/Route125.inc
index 489a7314b..7c4754f4f 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 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..d480512f8 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 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..e7c6f602f 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 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..5b8ec42e0 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 SYS_WEATHER_CTRL
 	call_if 1, Route128_EventScript_1A02C1
 	call Route128_EventScript_1A0196
 	end
diff --git a/data/scripts/maps/Route131.inc b/data/scripts/maps/Route131.inc
index 50ad4222b..09f555997 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 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..6e649de68 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
@@ -36,7 +36,7 @@ RustboroCity_EventScript_14C3B1:: @ 814C3B1
 RustboroCity_EventScript_14C3BA:: @ 814C3BA
 	lock
 	faceplayer
-	checkflag 2055
+	checkflag BADGE01_GET
 	goto_if_eq RustboroCity_EventScript_14C3CF
 	msgbox RustboroCity_Text_16696D, 4
 	release
diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc
index 6f0152e60..563e8b7a6 100644
--- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc
+++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc
@@ -54,7 +54,7 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752
 	message RustboroCity_DevonCorp_3F_Text_183422
 	waitfanfare
 	waitmessage
-	setflag 2050
+	setflag SYS_POKENAV_GET
 	setflag 188
 	msgbox RustboroCity_DevonCorp_3F_Text_183439, 4
 	setflag 894
diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc
index b1bbfb8d8..3a92491f7 100644
--- a/data/scripts/maps/RustboroCity_Gym.inc
+++ b/data/scripts/maps/RustboroCity_Gym.inc
@@ -15,7 +15,7 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE
 	call RustboroCity_Gym_EventScript_1A02C5
 	msgbox RustboroCity_Gym_Text_1840D5, 4
 	setflag 1201
-	setflag 2055
+	setflag BADGE01_GET
 	setvar 0x405a, 1
 	addvar 0x4085, 1
 	setvar 0x8008, 1
@@ -60,14 +60,14 @@ RustboroCity_Gym_EventScript_1579A3:: @ 81579A3
 
 RustboroCity_Gym_EventScript_1579AD:: @ 81579AD
 	lockall
-	checkflag 2055
+	checkflag BADGE01_GET
 	goto_if_eq RustboroCity_Gym_EventScript_1579CD
 	goto RustboroCity_Gym_EventScript_1579D7
 	end
 
 RustboroCity_Gym_EventScript_1579BD:: @ 81579BD
 	lockall
-	checkflag 2055
+	checkflag BADGE01_GET
 	goto_if_eq RustboroCity_Gym_EventScript_1579CD
 	goto RustboroCity_Gym_EventScript_1579D7
 	end
diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc
index 26cb2321a..1c580202d 100644
--- a/data/scripts/maps/SeafloorCavern_Room9.inc
+++ b/data/scripts/maps/SeafloorCavern_Room9.inc
@@ -199,7 +199,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA
 	setvar 0x405e, 1
 	clearflag 944
 	clearflag 945
-	setflag 2090
+	setflag SYS_WEATHER_CTRL
 	setflag 854
 	setflag 129
 	setflag 967
diff --git a/data/scripts/maps/SealedChamber_OuterRoom.inc b/data/scripts/maps/SealedChamber_OuterRoom.inc
index 5ff94be19..27d44cad1 100644
--- a/data/scripts/maps/SealedChamber_OuterRoom.inc
+++ b/data/scripts/maps/SealedChamber_OuterRoom.inc
@@ -14,7 +14,7 @@ SealedChamber_OuterRoom_MapScript1_15F0E7:: @ 815F0E7
 	end
 
 SealedChamber_OuterRoom_MapScript1_15F0EB:: @ 815F0EB
-	checkflag 2127
+	checkflag 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 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 ab1e1ad7b..1d852f41a 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 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 SYS_SHOAL_ITEM
 	call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_15E176
 	checkitem ITEM_SHOAL_SALT, 4
 	compare RESULT, 0
@@ -98,5 +98,5 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E176:: @ 815E176
 	clearflag 957
 	clearflag 958
 	clearflag 959
-	clearflag 2143
+	clearflag SYS_SHOAL_ITEM
 	return
diff --git a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc
index ada997023..d10f958fd 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 SYS_SHOAL_TIDE
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1AB
 	goto ShoalCave_LowTideInnerRoom_EventScript_15E1AF
 
@@ -23,7 +23,7 @@ ShoalCave_LowTideInnerRoom_MapScript1_15E1B3:: @ 815E1B3
 ShoalCave_LowTideInnerRoom_EventScript_15E1B9:: @ 815E1B9
 	checkflag 952
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1DA
-	checkflag 2106
+	checkflag SYS_SHOAL_TIDE
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1DA
 	setmaptile 31, 8, 856, 1
 	goto ShoalCave_LowTideInnerRoom_EventScript_15E1DA
@@ -32,7 +32,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E1B9:: @ 815E1B9
 ShoalCave_LowTideInnerRoom_EventScript_15E1DA:: @ 815E1DA
 	checkflag 953
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1FB
-	checkflag 2106
+	checkflag SYS_SHOAL_TIDE
 	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1FB
 	setmaptile 14, 26, 856, 1
 	goto ShoalCave_LowTideInnerRoom_EventScript_15E1FB
diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc
index 1dee6e9c4..f22055bc4 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 SYS_CTRL_OBJ_DELETE
 	call_if 1, SkyPillar_Top_EventScript_15F312
 	end
 
@@ -20,9 +20,9 @@ SkyPillar_Top_EventScript_15F316:: @ 815F316
 	delay 40
 	waitpokecry
 	setflag 773
-	setflag 2145
+	setflag SYS_CTRL_OBJ_DELETE
 	special ScrSpecial_StartRayquazaBattle
 	waitstate
-	clearflag 2145
+	clearflag SYS_CTRL_OBJ_DELETE
 	release
 	end
diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc
index 129b6c447..63f7eca53 100644
--- a/data/scripts/maps/SlateportCity.inc
+++ b/data/scripts/maps/SlateportCity.inc
@@ -17,7 +17,7 @@ SlateportCity_MapScript1_14BA3C:: @ 814BA3C
 	end
 
 SlateportCity_EventScript_14BA5C:: @ 814BA5C
-	setflag 2071
+	setflag FLAG_VISITED_SLATEPORT_CITY
 	setvar 0x4086, 0
 	setflag 803
 	return
@@ -199,9 +199,9 @@ SlateportCity_EventScript_14BC33:: @ 814BC33
 
 SlateportCity_EventScript_14BC3C:: @ 814BC3C
 	lockall
-	checkflag 2052
+	checkflag SYS_GAME_CLEAR
 	goto_if_eq SlateportCity_EventScript_14BC63
-	checkflag 2061
+	checkflag 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 SYS_GAME_CLEAR
 	goto_if_eq SlateportCity_EventScript_14BCA5
 	msgbox SlateportCity_Text_165A8B, 4
 	releaseall
diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc
index 7270aa5d4..ab71c9728 100644
--- a/data/scripts/maps/SlateportCity_Harbor.inc
+++ b/data/scripts/maps/SlateportCity_Harbor.inc
@@ -7,7 +7,7 @@ SlateportCity_Harbor_MapScript1_155F63:: @ 8155F63
 	setvar 0x4001, 0
 	compare 0x40a0, 1
 	call_if 1, SlateportCity_Harbor_EventScript_155F89
-	checkflag 2052
+	checkflag SYS_GAME_CLEAR
 	call_if 1, SlateportCity_Harbor_EventScript_155F85
 	end
 
@@ -159,7 +159,7 @@ SlateportCity_Harbor_Movement_1560C2:: @ 81560C2
 SlateportCity_Harbor_EventScript_1560C4:: @ 81560C4
 	lock
 	faceplayer
-	checkflag 2052
+	checkflag SYS_GAME_CLEAR
 	goto_if_eq SlateportCity_Harbor_EventScript_1560D9
 	msgbox SlateportCity_Harbor_Text_17FA0A, 4
 	release
@@ -268,7 +268,7 @@ SlateportCity_Harbor_EventScript_156208:: @ 8156208
 SlateportCity_Harbor_EventScript_156211:: @ 8156211
 	lock
 	faceplayer
-	checkflag 2061
+	checkflag BADGE07_GET
 	goto_if_eq SlateportCity_Harbor_EventScript_15626F
 	checkflag 271
 	goto_if_eq SlateportCity_Harbor_EventScript_156265
@@ -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 SYS_GAME_CLEAR
 	goto_if_eq SlateportCity_Harbor_EventScript_15629D
 	msgbox SlateportCity_Harbor_Text_18017B, 4
 	release
diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc
index 9fe7f1f1a..2e43128de 100644
--- a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc
+++ b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc
@@ -3,9 +3,9 @@ SlateportCity_SternsShipyard_1F_MapScripts:: @ 8155335
 
 SlateportCity_SternsShipyard_1F_EventScript_155336:: @ 8155336
 	lockall
-	checkflag 2052
+	checkflag SYS_GAME_CLEAR
 	goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_155388
-	checkflag 2061
+	checkflag BADGE07_GET
 	goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_15539C
 	checkflag 149
 	goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_1553CF
diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc
index b907e7da3..de86ce969 100644
--- a/data/scripts/maps/SootopolisCity.inc
+++ b/data/scripts/maps/SootopolisCity.inc
@@ -34,10 +34,10 @@ SootopolisCity_EventScript_14D0BB:: @ 814D0BB
 	return
 
 SootopolisCity_MapScript1_14D10D:: @ 814D10D
-	setflag 2077
+	setflag FLAG_VISITED_SOOTOPOLIS_CITY
 	checkflag FLAG_LEGENDARY_BATTLE_COMPLETED
 	call_if 1, SootopolisCity_EventScript_14D159
-	checkflag 2090
+	checkflag SYS_WEATHER_CTRL
 	call_if 1, SootopolisCity_EventScript_14D123
 	end
 
diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc
index 29b62402f..44a8684ab 100644
--- a/data/scripts/maps/SootopolisCity_Gym_1F.inc
+++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc
@@ -89,7 +89,7 @@ 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
 	goto_if 0, SootopolisCity_Gym_1F_EventScript_15B056
-	checkflag 2060
+	checkflag BADGE06_GET
 	goto_if 0, SootopolisCity_Gym_1F_EventScript_15B07A
 	msgbox SootopolisCity_Gym_1F_Text_18F4D7, 4
 	release
@@ -101,7 +101,7 @@ SootopolisCity_Gym_1F_EventScript_15B02D:: @ 815B02D
 	call SootopolisCity_Gym_1F_EventScript_1A02C5
 	msgbox SootopolisCity_Gym_1F_Text_18F36B, 4
 	setflag 1236
-	setflag 2062
+	setflag BADGE08_GET
 	setvar 0x8008, 8
 	call SootopolisCity_Gym_1F_EventScript_1A01C0
 	goto SootopolisCity_Gym_1F_EventScript_15B056
@@ -137,14 +137,14 @@ SootopolisCity_Gym_1F_EventScript_15B099:: @ 815B099
 
 SootopolisCity_Gym_1F_EventScript_15B0A3:: @ 815B0A3
 	lockall
-	checkflag 2062
+	checkflag 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 BADGE08_GET
 	goto_if_eq SootopolisCity_Gym_1F_EventScript_15B0C3
 	goto SootopolisCity_Gym_1F_EventScript_15B0CD
 	end
diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc
index 4ee0d0ec3..da0fcf2cd 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_UNLOCK_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..8d6ed8ddc 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 SYS_CTRL_OBJ_DELETE
 	call_if 1, SouthernIsland_Interior_EventScript_160B68
 	end
 
@@ -46,7 +46,7 @@ SouthernIsland_Interior_EventScript_160B9B:: @ 8160B9B
 SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7
 	checkflag 206
 	goto_if_eq SouthernIsland_Interior_EventScript_160C08
-	checkflag 2131
+	checkflag SYS_HAS_EON_TICKET
 	goto_if 0, SouthernIsland_Interior_EventScript_160C08
 	setflag 206
 	special SpawnCameraDummy
@@ -66,10 +66,10 @@ SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7
 	special RemoveCameraDummy
 	setwildbattle SPECIES_LATIAS_OR_LATIOS, 50, ITEM_SOUL_DEW
 	setflag 911
-	setflag 2145
+	setflag SYS_CTRL_OBJ_DELETE
 	special ScrSpecial_StartSouthernIslandBattle
 	waitstate
-	clearflag 2145
+	clearflag SYS_CTRL_OBJ_DELETE
 	releaseall
 	end
 
diff --git a/data/scripts/maps/VerdanturfTown.inc b/data/scripts/maps/VerdanturfTown.inc
index 3e8f02302..d2f0251f7 100644
--- a/data/scripts/maps/VerdanturfTown.inc
+++ b/data/scripts/maps/VerdanturfTown.inc
@@ -3,7 +3,7 @@ VerdanturfTown_MapScripts:: @ 814E854
 	.byte 0
 
 VerdanturfTown_MapScript1_14E85A:: @ 814E85A
-	setflag 2068
+	setflag FLAG_VISITED_VERDANTURF_TOWN
 	setvar 0x4086, 0
 	setflag 801
 	end
diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc
index 465c61d1a..b174e67f3 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 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..f94d3cf9d 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 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 BADGE05_GET
 	goto_if 0, PetalburgCity_PokemonCenter_1F_EventScript_1B1C96
-	checkflag 2124
+	checkflag SYS_EXDATA_ENABLE
 	goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1C96
-	setflag 2124
+	setflag 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 0bf59d0b9..c8cc4cd21 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -222,7 +222,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6BBE:: @ 81B6BBE
 	msgbox LittlerootTown_BrendansHouse_1F_Text_172841, 4
 	fadedefaultbgm
 	special TurnOffTVScreen
-	setflag 2096
+	setflag SYS_TV_HOME
 	delay 35
 	return
 
@@ -256,7 +256,7 @@ 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 BADGE05_GET
 	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D
 	checkflag FLAG_RESCUED_BIRCH
 	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C72
diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc
index 425f42a85..28932e02a 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 SYS_TV_START
 	goto_if 0, EventScript_1A6EF1
-	checkflag 2097
+	checkflag SYS_TV_WATCH
 	goto_if_eq EventScript_1A6EF1
 	specialvar RESULT, IsTVShowInSearchOfTrainersAiring
 	compare RESULT, 1
@@ -49,7 +49,7 @@ EventScript_1A6F0B:
 	msgbox UnknownString_8172C50, 4
 	.endif
 	special InitRoamer
-	clearflag 2141
+	clearflag SYS_TV_LATI
 	setflag 255
 	special TurnOffTVScreen
 	releaseall
@@ -66,7 +66,7 @@ EventScript_1A6F21:
 
 EventScript_1A6F37:
 	special TurnOffTVScreen
-	setflag 2097
+	setflag SYS_TV_WATCH
 	releaseall
 	end