Label landmark and daily flags.

47 files changed, 117 insertions, 117 deletions

diff --git a/data/event_scripts.s b/data/event_scripts.s
index df79de3d1..0a250d570 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -1338,7 +1338,7 @@ S_WhiteOut:: @ 819FC74
 EventScript_19FC84:
 	checkflag FLAG_RECEIVED_GO_GOGGLES
 	goto_if_eq Route101_EventScript_1A14DC
-	checkflag 1213
+	checkflag FLAG_DEFEATED_LAVARIDGE_GYM
 	goto_if 0, Route101_EventScript_1A14DC
 	clearflag FLAG_HIDE_RIVAL_LAVARIDGE_1
 	setvar 0x4053, 2
@@ -1386,10 +1386,10 @@ EventScript_19FCF0:
 	end
 
 EverGrandeCity_HallOfFame_EventScript_19FD09:: @ 819FD09
-	clearflag 1245
-	clearflag 1246
-	clearflag 1247
-	clearflag 1248
+	clearflag FLAG_DEFEATED_ELITE_4_SYDNEY
+	clearflag FLAG_DEFEATED_ELITE_4_PHOEBE
+	clearflag FLAG_DEFEATED_ELITE_4_GLACIA
+	clearflag FLAG_DEFEATED_ELITE_4_DRAKE
 	setvar 0x409c, 0
 	return
 
@@ -1404,7 +1404,7 @@ SlateportCity_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B
 VerdanturfTown_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B
 	checkflag FLAG_RECEIVED_POKENAV
 	goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_1A14DC
-	checkflag 1217
+	checkflag FLAG_DEFEATED_PETALBURG_GYM
 	goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_1A14DC
 	checkflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104
 	goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FD49
@@ -1717,9 +1717,9 @@ EventScript_1A0070:
 
 EventScript_1A0085:
 	playse 2
-	checkflag 2123
+	checkflag SYS_PC_LANETTE
 	call_if 0, EventScript_1A00AC
-	checkflag 2123
+	checkflag SYS_PC_LANETTE
 	call_if 1, EventScript_1A00B5
 	msgbox UnknownString_81A0A35, 4
 	special ShowPokemonStorageSystem
@@ -2360,9 +2360,9 @@ MagmaHideout_B1F_EventScript_1A04FD:: @ 81A04FD
 	delay 40
 	waitpokecry
 	setflag FLAG_HIDE_ELECTRODE_1_HIDEOUT
-	setflag 2145
+	setflag SYS_CTRL_OBJ_DELETE
 	dowildbattle
-	clearflag 2145
+	clearflag SYS_CTRL_OBJ_DELETE
 	release
 	end
 
@@ -2376,9 +2376,9 @@ MagmaHideout_B1F_EventScript_1A051B:: @ 81A051B
 	delay 40
 	waitpokecry
 	setflag FLAG_HIDE_ELECTRODE_2_HIDEOUT
-	setflag 2145
+	setflag SYS_CTRL_OBJ_DELETE
 	dowildbattle
-	clearflag 2145
+	clearflag SYS_CTRL_OBJ_DELETE
 	release
 	end
 
@@ -2473,9 +2473,9 @@ Route119_EventScript_1A05C3:: @ 81A05C3
 	call_if 1, Route119_EventScript_1A065A
 	compare 0x8004, 7
 	call_if 1, Route119_EventScript_1A065E
-	setflag 2145
+	setflag SYS_CTRL_OBJ_DELETE
 	dowildbattle
-	clearflag 2145
+	clearflag SYS_CTRL_OBJ_DELETE
 	release
 	end
 
diff --git a/data/pokedex_area_screen.s b/data/pokedex_area_screen.s
index 0734a44d7..0d15169d0 100644
--- a/data/pokedex_area_screen.s
+++ b/data/pokedex_area_screen.s
@@ -20,8 +20,8 @@ gUnknown_083F856E:: @ 83F856E
 
 	.align 1
 gUnknown_083F857A:: @ 83F857A
-	.2byte 85, 2142
-	.2byte 68, 2119
+	.2byte 85, 2142 @ FLAG_LANDMARK_SKY_PILLAR
+	.2byte 68, 2119 @ FLAG_LANDMARK_SEAFLOOR_CAVERN
 	.2byte 88,    0
 
 @ XXX: what is this?
diff --git a/data/scripts/maps/AbandonedShip_Deck.inc b/data/scripts/maps/AbandonedShip_Deck.inc
index 49f837744..68d872f01 100644
--- a/data/scripts/maps/AbandonedShip_Deck.inc
+++ b/data/scripts/maps/AbandonedShip_Deck.inc
@@ -3,5 +3,5 @@ AbandonedShip_Deck_MapScripts:: @ 815E95A
 	.byte 0
 
 AbandonedShip_Deck_MapScript1_15E960:: @ 815E960
-	setflag 2110
+	setflag FLAG_LANDMARK_ABANDONED_SHIP
 	end
diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc
index 7d2003598..d28ce7fcc 100644
--- a/data/scripts/maps/AncientTomb.inc
+++ b/data/scripts/maps/AncientTomb.inc
@@ -14,7 +14,7 @@ AncientTomb_EventScript_15EFD8:: @ 815EFD8
 	return
 
 AncientTomb_MapScript1_15EFDC:: @ 815EFDC
-	setflag 2137
+	setflag FLAG_LANDMARK_ANCIENT_TOMB
 	end
 
 AncientTomb_MapScript1_15EFE0:: @ 815EFE0
diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc
index 608b0d892..1a254f7df 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 FLAG_UNLOCK_BATTLE_TOWER
+	setflag FLAG_LANDMARK_BATTLE_TOWER
 	setvar 0x40bc, 0
 	setflag FLAG_HIDE_REPORTER_BATTLE_TOWER
 	end
diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc
index 29f48b95c..228ca21ac 100644
--- a/data/scripts/maps/DesertRuins.inc
+++ b/data/scripts/maps/DesertRuins.inc
@@ -28,7 +28,7 @@ DesertRuins_EventScript_15CB1B:: @ 815CB1B
 	return
 
 DesertRuins_MapScript1_15CB52:: @ 815CB52
-	setflag 2134
+	setflag FLAG_LANDMARK_DESERT_RUINS
 	end
 
 DesertRuins_EventScript_15CB56:: @ 815CB56
diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc
index 83dd7e78e..5a4e56857 100644
--- a/data/scripts/maps/DewfordTown_Gym.inc
+++ b/data/scripts/maps/DewfordTown_Gym.inc
@@ -112,7 +112,7 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177
 	waitmessage
 	call DewfordTown_Gym_EventScript_1A02C5
 	msgbox DewfordTown_Gym_Text_1752E6, 4
-	setflag 1204
+	setflag FLAG_DEFEATED_DEWFORD_GYM
 	setflag BADGE02_GET
 	addvar 0x4085, 1
 	compare 0x4085, 6
@@ -164,7 +164,7 @@ DewfordTown_Gym_EventScript_153238:: @ 8153238
 DewfordTown_Gym_EventScript_15323F:: @ 815323F
 	lock
 	faceplayer
-	checkflag 1204
+	checkflag FLAG_DEFEATED_DEWFORD_GYM
 	goto_if_eq DewfordTown_Gym_EventScript_153254
 	msgbox DewfordTown_Gym_Text_174D98, 4
 	release
diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc
index 3d3d56ff9..f7088e821 100644
--- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc
+++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc
@@ -24,7 +24,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B736:: @ 815B736
 	end
 
 EverGrandeCity_DrakesRoom_MapScript1_15B743:: @ 815B743
-	checkflag 1248
+	checkflag FLAG_DEFEATED_ELITE_4_DRAKE
 	call_if 1, EverGrandeCity_DrakesRoom_EventScript_15B758
 	compare 0x409c, 4
 	call_if 1, EverGrandeCity_DrakesRoom_EventScript_15B75E
@@ -41,7 +41,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B75E:: @ 815B75E
 EverGrandeCity_DrakesRoom_EventScript_15B764:: @ 815B764
 	lock
 	faceplayer
-	checkflag 1248
+	checkflag FLAG_DEFEATED_ELITE_4_DRAKE
 	goto_if_eq EverGrandeCity_DrakesRoom_EventScript_15B78B
 	playbgm 450, 0
 	msgbox EverGrandeCity_DrakesRoom_Text_190CEB, 4
@@ -57,7 +57,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B78B:: @ 815B78B
 EverGrandeCity_DrakesRoom_EventScript_15B795:: @ 815B795
 	setvar 0x8004, 0
 	special sub_810FF60
-	setflag 1248
+	setflag FLAG_DEFEATED_ELITE_4_DRAKE
 	call EverGrandeCity_DrakesRoom_EventScript_1A0693
 	msgbox EverGrandeCity_DrakesRoom_Text_190E5D, 4
 	release
diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc
index 07f6e8877..be9e7a897 100644
--- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc
+++ b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc
@@ -24,7 +24,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B69C:: @ 815B69C
 	end
 
 EverGrandeCity_GlaciasRoom_MapScript1_15B6A9:: @ 815B6A9
-	checkflag 1247
+	checkflag FLAG_DEFEATED_ELITE_4_GLACIA
 	call_if 1, EverGrandeCity_GlaciasRoom_EventScript_15B6BE
 	compare 0x409c, 3
 	call_if 1, EverGrandeCity_GlaciasRoom_EventScript_15B6C4
@@ -41,7 +41,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B6C4:: @ 815B6C4
 EverGrandeCity_GlaciasRoom_EventScript_15B6CA:: @ 815B6CA
 	lock
 	faceplayer
-	checkflag 1247
+	checkflag FLAG_DEFEATED_ELITE_4_GLACIA
 	goto_if_eq EverGrandeCity_GlaciasRoom_EventScript_15B6F1
 	playbgm 450, 0
 	msgbox EverGrandeCity_GlaciasRoom_Text_190AF9, 4
@@ -55,7 +55,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B6F1:: @ 815B6F1
 	end
 
 EverGrandeCity_GlaciasRoom_EventScript_15B6FB:: @ 815B6FB
-	setflag 1247
+	setflag FLAG_DEFEATED_ELITE_4_GLACIA
 	call EverGrandeCity_GlaciasRoom_EventScript_1A0693
 	msgbox EverGrandeCity_GlaciasRoom_Text_190C8F, 4
 	release
diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc
index b7c1618ba..5ffa16d37 100644
--- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc
+++ b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc
@@ -24,7 +24,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B602:: @ 815B602
 	end
 
 EverGrandeCity_PhoebesRoom_MapScript1_15B60F:: @ 815B60F
-	checkflag 1246
+	checkflag FLAG_DEFEATED_ELITE_4_PHOEBE
 	call_if 1, EverGrandeCity_PhoebesRoom_EventScript_15B624
 	compare 0x409c, 2
 	call_if 1, EverGrandeCity_PhoebesRoom_EventScript_15B62A
@@ -41,7 +41,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B62A:: @ 815B62A
 EverGrandeCity_PhoebesRoom_EventScript_15B630:: @ 815B630
 	lock
 	faceplayer
-	checkflag 1246
+	checkflag FLAG_DEFEATED_ELITE_4_PHOEBE
 	goto_if_eq EverGrandeCity_PhoebesRoom_EventScript_15B657
 	playbgm 450, 0
 	msgbox EverGrandeCity_PhoebesRoom_Text_1908F5, 4
@@ -55,7 +55,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B657:: @ 815B657
 	end
 
 EverGrandeCity_PhoebesRoom_EventScript_15B661:: @ 815B661
-	setflag 1246
+	setflag FLAG_DEFEATED_ELITE_4_PHOEBE
 	call EverGrandeCity_PhoebesRoom_EventScript_1A0693
 	msgbox EverGrandeCity_PhoebesRoom_Text_190A2A, 4
 	release
diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc
index daca98176..6e958aeed 100644
--- a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc
+++ b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc
@@ -5,7 +5,7 @@ EverGrandeCity_SidneysRoom_MapScripts:: @ 815B53F
 	.byte 0
 
 EverGrandeCity_SidneysRoom_MapScript1_15B54F:: @ 815B54F
-	checkflag 1245
+	checkflag FLAG_DEFEATED_ELITE_4_SYDNEY
 	call_if 1, EverGrandeCity_SidneysRoom_EventScript_15B564
 	compare 0x409c, 1
 	call_if 1, EverGrandeCity_SidneysRoom_EventScript_15B56A
@@ -42,7 +42,7 @@ EverGrandeCity_SidneysRoom_EventScript_15B589:: @ 815B589
 EverGrandeCity_SidneysRoom_EventScript_15B596:: @ 815B596
 	lock
 	faceplayer
-	checkflag 1245
+	checkflag FLAG_DEFEATED_ELITE_4_SYDNEY
 	goto_if_eq EverGrandeCity_SidneysRoom_EventScript_15B5BD
 	playbgm 450, 0
 	msgbox EverGrandeCity_SidneysRoom_Text_190728, 4
@@ -56,7 +56,7 @@ EverGrandeCity_SidneysRoom_EventScript_15B5BD:: @ 815B5BD
 	end
 
 EverGrandeCity_SidneysRoom_EventScript_15B5C7:: @ 815B5C7
-	setflag 1245
+	setflag FLAG_DEFEATED_ELITE_4_SYDNEY
 	call EverGrandeCity_SidneysRoom_EventScript_1A0693
 	msgbox EverGrandeCity_SidneysRoom_Text_19086D, 4
 	release
diff --git a/data/scripts/maps/FieryPath.inc b/data/scripts/maps/FieryPath.inc
index bd984ad20..f0bd22071 100644
--- a/data/scripts/maps/FieryPath.inc
+++ b/data/scripts/maps/FieryPath.inc
@@ -3,5 +3,5 @@ FieryPath_MapScripts:: @ 815D318
 	.byte 0
 
 FieryPath_MapScript1_15D31E:: @ 815D31E
-	setflag 2122
+	setflag FLAG_LANDMARK_FIERY_PATH
 	end
diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc
index abcb20c25..883274f29 100644
--- a/data/scripts/maps/FortreeCity_Gym.inc
+++ b/data/scripts/maps/FortreeCity_Gym.inc
@@ -28,7 +28,7 @@ FortreeCity_Gym_EventScript_157F15:: @ 8157F15
 	waitmessage
 	call FortreeCity_Gym_EventScript_1A02C5
 	msgbox FortreeCity_Gym_Text_185E73, 4
-	setflag 1225
+	setflag FLAG_DEFEATED_FORTREE_GYM
 	setflag BADGE06_GET
 	setvar 0x8008, 6
 	call FortreeCity_Gym_EventScript_1A01C0
@@ -67,7 +67,7 @@ FortreeCity_Gym_EventScript_157FA7:: @ 8157FA7
 FortreeCity_Gym_EventScript_157FBE:: @ 8157FBE
 	lock
 	faceplayer
-	checkflag 1225
+	checkflag FLAG_DEFEATED_FORTREE_GYM
 	goto_if_eq FortreeCity_Gym_EventScript_157FD3
 	msgbox FortreeCity_Gym_Text_18589C, 4
 	release
diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc
index 7d6ecae1b..fe8934fbd 100644
--- a/data/scripts/maps/IslandCave.inc
+++ b/data/scripts/maps/IslandCave.inc
@@ -28,7 +28,7 @@ IslandCave_EventScript_15EEDE:: @ 815EEDE
 	return
 
 IslandCave_MapScript1_15EF15:: @ 815EF15
-	setflag 2133
+	setflag FLAG_LANDMARK_ISLAND_CAVE
 	end
 
 S_OpenRegiceChamber:: @ 815EF19
diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc
index f6c34484e..01b1dd08e 100644
--- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc
+++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc
@@ -81,7 +81,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766
 	waitmessage
 	call LavaridgeTown_Gym_1F_EventScript_1A02C5
 	msgbox LavaridgeTown_Gym_1F_Text_176A8C, 4
-	setflag 1213
+	setflag FLAG_DEFEATED_LAVARIDGE_GYM
 	setflag BADGE04_GET
 	addvar 0x4085, 1
 	compare 0x4085, 6
@@ -135,7 +135,7 @@ LavaridgeTown_Gym_1F_EventScript_15383E:: @ 815383E
 LavaridgeTown_Gym_1F_EventScript_153859:: @ 8153859
 	lock
 	faceplayer
-	checkflag 1213
+	checkflag FLAG_DEFEATED_LAVARIDGE_GYM
 	goto_if_eq LavaridgeTown_Gym_1F_EventScript_15386E
 	msgbox LavaridgeTown_Gym_1F_Text_176312, 4
 	release
diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc
index 29a8497ed..4ae27e827 100644
--- a/data/scripts/maps/LilycoveCity.inc
+++ b/data/scripts/maps/LilycoveCity.inc
@@ -64,15 +64,15 @@ LilycoveCity_EventScript_14CB74:: @ 814CB74
 	lock
 	faceplayer
 	dodailyevents
-	checkflag 2255
+	checkflag FLAG_DAILY_RECEIVED_BERRY_LILYCOVE
 	goto_if_eq LilycoveCity_EventScript_14CBB4
 	msgbox LilycoveCity_Text_1C5A7A, 4
 	random 10
-	addvar RESULT, 133
+	addvar RESULT, ITEM_CHERI_BERRY
 	giveitem RESULT
 	compare RESULT, 0
 	goto_if_eq LilycoveCity_EventScript_1A029B
-	setflag 2255
+	setflag FLAG_DAILY_RECEIVED_BERRY_LILYCOVE
 	msgbox LilycoveCity_Text_1C5B1D, 4
 	release
 	end
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc
index 7acd29523..cfcca25fb 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc
+++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc
@@ -11,12 +11,12 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E
 	dodailyevents
 	compare 0x4045, 0
 	goto_if 5, LilycoveCity_DepartmentStore_1F_EventScript_159EB1
-	checkflag 2250
+	checkflag FLAG_DAILY_PICKED_LOTTO_TICKET
 	goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E4C
 	msgbox LilycoveCity_DepartmentStore_1F_Text_1C4B5E, 5
 	compare RESULT, 0
 	goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E56
-	setflag 2250
+	setflag FLAG_DAILY_PICKED_LOTTO_TICKET
 	message LilycoveCity_DepartmentStore_1F_Text_1C4CC6
 	waitmessage
 	special RetrieveLotteryNumber
diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc
index 9b47bf493..142477ed5 100644
--- a/data/scripts/maps/MauvilleCity_Gym.inc
+++ b/data/scripts/maps/MauvilleCity_Gym.inc
@@ -3,7 +3,7 @@ MauvilleCity_Gym_MapScripts:: @ 8156450
 	.byte 0
 
 MauvilleCity_Gym_MapScript1_156456:: @ 8156456
-	checkflag 1208
+	checkflag FLAG_DEFEATED_MAUVILLE_GYM
 	goto_if_eq MauvilleCity_Gym_EventScript_1565A7
 	switch 0x4093
 	case 0, MauvilleCity_Gym_EventScript_156491
@@ -82,7 +82,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB
 	waitmessage
 	call MauvilleCity_Gym_EventScript_1A02C5
 	msgbox MauvilleCity_Gym_Text_180DDA, 4
-	setflag 1208
+	setflag FLAG_DEFEATED_MAUVILLE_GYM
 	setflag BADGE03_GET
 	addvar 0x4085, 1
 	compare 0x4085, 6
@@ -111,7 +111,7 @@ MauvilleCity_Gym_EventScript_156641:: @ 8156641
 
 MauvilleCity_Gym_EventScript_15664B:: @ 815664B
 	lockall
-	checkflag 1208
+	checkflag FLAG_DEFEATED_MAUVILLE_GYM
 	goto_if_eq MauvilleCity_Gym_EventScript_1566DA
 	compare 0x4093, 1
 	goto_if_eq MauvilleCity_Gym_EventScript_1566DA
@@ -122,7 +122,7 @@ MauvilleCity_Gym_EventScript_15664B:: @ 815664B
 
 MauvilleCity_Gym_EventScript_156670:: @ 8156670
 	lockall
-	checkflag 1208
+	checkflag FLAG_DEFEATED_MAUVILLE_GYM
 	goto_if_eq MauvilleCity_Gym_EventScript_1566DA
 	compare 0x4093, 2
 	goto_if_eq MauvilleCity_Gym_EventScript_1566DA
@@ -133,7 +133,7 @@ MauvilleCity_Gym_EventScript_156670:: @ 8156670
 
 MauvilleCity_Gym_EventScript_156695:: @ 8156695
 	lockall
-	checkflag 1208
+	checkflag FLAG_DEFEATED_MAUVILLE_GYM
 	goto_if_eq MauvilleCity_Gym_EventScript_1566DA
 	compare 0x4093, 3
 	goto_if_eq MauvilleCity_Gym_EventScript_1566DA
@@ -191,7 +191,7 @@ MauvilleCity_Gym_EventScript_15672B:: @ 815672B
 MauvilleCity_Gym_EventScript_156742:: @ 8156742
 	lock
 	faceplayer
-	checkflag 1208
+	checkflag FLAG_DEFEATED_MAUVILLE_GYM
 	goto_if_eq MauvilleCity_Gym_EventScript_156757
 	msgbox MauvilleCity_Gym_Text_180815, 4
 	release
diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc
index de83fcb96..66ff840ed 100644
--- a/data/scripts/maps/MossdeepCity_Gym.inc
+++ b/data/scripts/maps/MossdeepCity_Gym.inc
@@ -61,7 +61,7 @@ MossdeepCity_Gym_EventScript_15A594:: @ 815A594
 	waitmessage
 	call MossdeepCity_Gym_EventScript_1A02C5
 	msgbox MossdeepCity_Gym_Text_18D128, 4
-	setflag 1229
+	setflag FLAG_DEFEATED_MOSSDEEP_GYM
 	setflag BADGE07_GET
 	clearflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD
 	clearflag FLAG_UNKNOWN_393
@@ -210,7 +210,7 @@ MossdeepCity_Gym_EventScript_15A7C1:: @ 815A7C1
 MossdeepCity_Gym_EventScript_15A7D8:: @ 815A7D8
 	lock
 	faceplayer
-	checkflag 1229
+	checkflag FLAG_DEFEATED_MOSSDEEP_GYM
 	goto_if_eq MossdeepCity_Gym_EventScript_15A7ED
 	msgbox MossdeepCity_Gym_Text_18C7E3, 4
 	release
diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/scripts/maps/NewMauville_Entrance.inc
index 6429ff2f9..1234f5653 100644
--- a/data/scripts/maps/NewMauville_Entrance.inc
+++ b/data/scripts/maps/NewMauville_Entrance.inc
@@ -18,7 +18,7 @@ NewMauville_Entrance_EventScript_15E4A1:: @ 815E4A1
 	return
 
 NewMauville_Entrance_MapScript1_15E4D8:: @ 815E4D8
-	setflag 2112
+	setflag FLAG_LANDMARK_NEW_MAUVILLE
 	end
 
 NewMauville_Entrance_EventScript_15E4DC:: @ 815E4DC
diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc
index 543c82135..07c6f8026 100644
--- a/data/scripts/maps/PetalburgCity_Gym.inc
+++ b/data/scripts/maps/PetalburgCity_Gym.inc
@@ -397,7 +397,7 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6
 	waitmessage
 	call PetalburgCity_Gym_EventScript_1A02C5
 	msgbox PetalburgCity_Gym_Text_17A805, 4
-	setflag 1217
+	setflag FLAG_DEFEATED_PETALBURG_GYM
 	setvar 0x4085, 7
 	setflag BADGE05_GET
 	call PetalburgCity_Gym_EventScript_1A0424
@@ -765,7 +765,7 @@ PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3
 
 PetalburgCity_Gym_EventScript_154DF6:: @ 8154DF6
 	trainerbattle 2, OPPONENT_RANDALL, 0, PetalburgCity_Gym_Text_17ADA5, PetalburgCity_Gym_Text_17AE11, PetalburgCity_Gym_EventScript_154E1A
-	checkflag 1217
+	checkflag FLAG_DEFEATED_PETALBURG_GYM
 	goto_if_eq PetalburgCity_Gym_EventScript_154E29
 	msgbox PetalburgCity_Gym_Text_17AE30, 6
 	end
@@ -783,7 +783,7 @@ PetalburgCity_Gym_EventScript_154E29:: @ 8154E29
 
 PetalburgCity_Gym_EventScript_154E32:: @ 8154E32
 	trainerbattle 2, OPPONENT_PARKER, 0, PetalburgCity_Gym_Text_17AF5A, PetalburgCity_Gym_Text_17AF98, PetalburgCity_Gym_EventScript_154E56
-	checkflag 1217
+	checkflag FLAG_DEFEATED_PETALBURG_GYM
 	goto_if_eq PetalburgCity_Gym_EventScript_154E65
 	msgbox PetalburgCity_Gym_Text_17AFD3, 6
 	end
@@ -801,7 +801,7 @@ PetalburgCity_Gym_EventScript_154E65:: @ 8154E65
 
 PetalburgCity_Gym_EventScript_154E6E:: @ 8154E6E
 	trainerbattle 2, OPPONENT_GEORGE, 0, PetalburgCity_Gym_Text_17B058, PetalburgCity_Gym_Text_17B0F7, PetalburgCity_Gym_EventScript_154E92
-	checkflag 1217
+	checkflag FLAG_DEFEATED_PETALBURG_GYM
 	goto_if_eq PetalburgCity_Gym_EventScript_154EA1
 	msgbox PetalburgCity_Gym_Text_17B12C, 6
 	end
@@ -819,7 +819,7 @@ PetalburgCity_Gym_EventScript_154EA1:: @ 8154EA1
 
 PetalburgCity_Gym_EventScript_154EAA:: @ 8154EAA
 	trainerbattle 2, OPPONENT_BERKE, 0, PetalburgCity_Gym_Text_17B237, PetalburgCity_Gym_Text_17B2C0, PetalburgCity_Gym_EventScript_154ECE
-	checkflag 1217
+	checkflag FLAG_DEFEATED_PETALBURG_GYM
 	goto_if_eq PetalburgCity_Gym_EventScript_154EDD
 	msgbox PetalburgCity_Gym_Text_17B2E4, 6
 	end
@@ -837,7 +837,7 @@ PetalburgCity_Gym_EventScript_154EDD:: @ 8154EDD
 
 PetalburgCity_Gym_EventScript_154EE6:: @ 8154EE6
 	trainerbattle 2, OPPONENT_MARY, 0, PetalburgCity_Gym_Text_17B3F7, PetalburgCity_Gym_Text_17B454, PetalburgCity_Gym_EventScript_154F0A
-	checkflag 1217
+	checkflag FLAG_DEFEATED_PETALBURG_GYM
 	goto_if_eq PetalburgCity_Gym_EventScript_154F19
 	msgbox PetalburgCity_Gym_Text_17B46F, 6
 	end
@@ -855,7 +855,7 @@ PetalburgCity_Gym_EventScript_154F19:: @ 8154F19
 
 PetalburgCity_Gym_EventScript_154F22:: @ 8154F22
 	trainerbattle 2, OPPONENT_LORI, 0, PetalburgCity_Gym_Text_17B58D, PetalburgCity_Gym_Text_17B5CB, PetalburgCity_Gym_EventScript_154F46
-	checkflag 1217
+	checkflag FLAG_DEFEATED_PETALBURG_GYM
 	goto_if_eq PetalburgCity_Gym_EventScript_154F55
 	msgbox PetalburgCity_Gym_Text_17B5EA, 6
 	end
@@ -873,7 +873,7 @@ PetalburgCity_Gym_EventScript_154F55:: @ 8154F55
 
 PetalburgCity_Gym_EventScript_154F5E:: @ 8154F5E
 	trainerbattle 2, OPPONENT_JODY, 0, PetalburgCity_Gym_Text_17B6D4, PetalburgCity_Gym_Text_17B732, PetalburgCity_Gym_EventScript_154F82
-	checkflag 1217
+	checkflag FLAG_DEFEATED_PETALBURG_GYM
 	goto_if_eq PetalburgCity_Gym_EventScript_154F91
 	msgbox PetalburgCity_Gym_Text_17B749, 6
 	end
@@ -1021,7 +1021,7 @@ PetalburgCity_Gym_EventScript_155187:: @ 8155187
 PetalburgCity_Gym_EventScript_15518B:: @ 815518B
 	lock
 	faceplayer
-	checkflag 1217
+	checkflag FLAG_DEFEATED_PETALBURG_GYM
 	goto_if_eq PetalburgCity_Gym_EventScript_1551A0
 	msgbox PetalburgCity_Gym_Text_17AB96, 4
 	release
diff --git a/data/scripts/maps/PetalburgCity_WallysHouse.inc b/data/scripts/maps/PetalburgCity_WallysHouse.inc
index 282e064de..110b798b7 100644
--- a/data/scripts/maps/PetalburgCity_WallysHouse.inc
+++ b/data/scripts/maps/PetalburgCity_WallysHouse.inc
@@ -8,7 +8,7 @@ PetalburgCity_WallysHouse_EventScript_1543C4:: @ 81543C4
 	goto_if_eq PetalburgCity_WallysHouse_EventScript_1543F7
 	checkflag FLAG_RECEIVED_HM03
 	goto_if_eq PetalburgCity_WallysHouse_EventScript_154427
-	checkflag 1217
+	checkflag FLAG_DEFEATED_PETALBURG_GYM
 	goto_if_eq PetalburgCity_WallysHouse_EventScript_154406
 	checkflag FLAG_THANKED_FOR_PLAYING_WITH_WALLY
 	goto_if_eq PetalburgCity_WallysHouse_EventScript_15443B
@@ -51,7 +51,7 @@ PetalburgCity_WallysHouse_EventScript_154445:: @ 8154445
 	faceplayer
 	checkflag FLAG_RECEIVED_HM03
 	goto_if_eq PetalburgCity_WallysHouse_EventScript_15446D
-	checkflag 1217
+	checkflag FLAG_DEFEATED_PETALBURG_GYM
 	goto_if_eq PetalburgCity_WallysHouse_EventScript_154463
 	msgbox PetalburgCity_WallysHouse_Text_179C2C, 4
 	release
diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc
index 3d775ccfe..9369f7573 100644
--- a/data/scripts/maps/Route104_MrBrineysHouse.inc
+++ b/data/scripts/maps/Route104_MrBrineysHouse.inc
@@ -3,7 +3,7 @@ Route104_MrBrineysHouse_MapScripts:: @ 815BCB2
 	.byte 0
 
 Route104_MrBrineysHouse_MapScript1_15BCB8:: @ 815BCB8
-	setflag 2109
+	setflag FLAG_LANDMARK_MR_BRINEY_HOUSE
 	compare 0x4090, 1
 	call_if 1, Route104_MrBrineysHouse_EventScript_15BCD4
 	checkflag FLAG_RECEIVED_POKENAV
diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc
index 66173b0cc..bce884555 100644
--- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc
+++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc
@@ -3,7 +3,7 @@ Route104_PrettyPetalFlowerShop_MapScripts:: @ 815BDE4
 	.byte 0
 
 Route104_PrettyPetalFlowerShop_MapScript1_15BDEA:: @ 815BDEA
-	setflag 2108
+	setflag FLAG_LANDMARK_FLOWER_SHOP
 	checkflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER
 	goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03
 	checkflag BADGE03_GET
@@ -90,15 +90,15 @@ Route104_PrettyPetalFlowerShop_EventScript_15BEDA:: @ 815BEDA
 	lock
 	faceplayer
 	dodailyevents
-	checkflag 2256
+	checkflag FLAG_DAILY_RECEIVED_BERRY_FLOWER_SHOP
 	goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BF1A
 	msgbox Route104_PrettyPetalFlowerShop_Text_1C62DA, 4
 	random 8
-	addvar RESULT, 133
+	addvar RESULT, ITEM_CHERI_BERRY
 	giveitem RESULT
 	compare RESULT, 0
 	goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_1A029B
-	setflag 2256
+	setflag FLAG_DAILY_RECEIVED_BERRY_FLOWER_SHOP
 	msgbox Route104_PrettyPetalFlowerShop_Text_1C6335, 4
 	release
 	end
diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/scripts/maps/Route109_SeashoreHouse.inc
index d365fa925..f60413d81 100644
--- a/data/scripts/maps/Route109_SeashoreHouse.inc
+++ b/data/scripts/maps/Route109_SeashoreHouse.inc
@@ -3,7 +3,7 @@ Route109_SeashoreHouse_MapScripts:: @ 8160DCA
 	.byte 0
 
 Route109_SeashoreHouse_MapScript1_160DD0:: @ 8160DD0
-	setflag 2111
+	setflag FLAG_LANDMARK_SEASHORE_HOUSE
 	end
 
 Route109_SeashoreHouse_EventScript_160DD4:: @ 8160DD4
diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc
index bd4867c60..6424aff45 100644
--- a/data/scripts/maps/Route110_TrickHouseEntrance.inc
+++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc
@@ -5,7 +5,7 @@ Route110_TrickHouseEntrance_MapScripts:: @ 8160F2B
 	.byte 0
 
 Route110_TrickHouseEntrance_MapScript1_160F3B:: @ 8160F3B
-	setflag 2114
+	setflag FLAG_LANDMARK_TRICK_HOUSE
 	compare 0x40b5, 1
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_160FCE
 	compare 0x40c1, 1
diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc
index 6f310881a..3e089e354 100644
--- a/data/scripts/maps/Route111.inc
+++ b/data/scripts/maps/Route111.inc
@@ -121,13 +121,13 @@ Route111_EventScript_1500C5:: @ 81500C5
 	lock
 	faceplayer
 	dodailyevents
-	checkflag 2252
+	checkflag FLAG_DAILY_RECEIVED_BERRY_ROUTE111
 	goto_if_eq Route111_EventScript_150100
 	msgbox Route111_Text_1C56F0, 4
 	giveitem ITEM_RAZZ_BERRY
 	compare RESULT, 0
 	goto_if_eq Route111_EventScript_1A029B
-	setflag 2252
+	setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE111
 	special GetPlayerBigGuyGirlString
 	msgbox Route111_Text_1C5781, 4
 	release
@@ -236,7 +236,7 @@ Route111_EventScript_1501C9:: @ 81501C9
 Route111_EventScript_1501D1:: @ 81501D1
 	lock
 	faceplayer
-	setflag 2115
+	setflag FLAG_LANDMARK_WINSTRATE_FAMILY
 	msgbox Route111_Text_16F705, 5
 	compare RESULT, 1
 	goto_if_eq Route111_EventScript_1501F3
diff --git a/data/scripts/maps/Route111_OldLadysRestStop.inc b/data/scripts/maps/Route111_OldLadysRestStop.inc
index 5576a44ff..c0fb6f489 100644
--- a/data/scripts/maps/Route111_OldLadysRestStop.inc
+++ b/data/scripts/maps/Route111_OldLadysRestStop.inc
@@ -3,7 +3,7 @@ Route111_OldLadysRestStop_MapScripts:: @ 815BFD1
 	.byte 0
 
 Route111_OldLadysRestStop_MapScript1_15BFD7:: @ 815BFD7
-	setflag 2113
+	setflag FLAG_LANDMARK_OLD_LADY_REST_SHOP
 	end
 
 Route111_OldLadysRestStop_EventScript_15BFDB:: @ 815BFDB
diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc
index d0b608339..078ac1006 100644
--- a/data/scripts/maps/Route113_GlassWorkshop.inc
+++ b/data/scripts/maps/Route113_GlassWorkshop.inc
@@ -3,7 +3,7 @@ Route113_GlassWorkshop_MapScripts:: @ 816354A
 	.byte 0
 
 Route113_GlassWorkshop_MapScript1_163550:: @ 8163550
-	setflag 2116
+	setflag FLAG_LANDMARK_GLASS_WORKSHOP
 	compare 0x40be, 1
 	call_if 1, Route113_GlassWorkshop_EventScript_16355F
 	end
diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc
index a3056c8ff..3d1da2014 100644
--- a/data/scripts/maps/Route114.inc
+++ b/data/scripts/maps/Route114.inc
@@ -5,7 +5,7 @@ Route114_EventScript_150733:: @ 8150733
 	lock
 	faceplayer
 	dodailyevents
-	checkflag 2251
+	checkflag FLAG_DAILY_RECEIVED_BERRY_ROUTE114
 	goto_if_eq Route114_EventScript_150778
 	msgbox Route114_Text_1C5803, 4
 	random 5
@@ -14,7 +14,7 @@ Route114_EventScript_150733:: @ 8150733
 	giveitem RESULT
 	compare RESULT, 0
 	goto_if_eq Route114_EventScript_1A029B
-	setflag 2251
+	setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE114
 	msgbox Route114_Text_1C5861, 4
 	release
 	end
diff --git a/data/scripts/maps/Route114_FossilManiacsHouse.inc b/data/scripts/maps/Route114_FossilManiacsHouse.inc
index 3cdd40d51..abf9ac883 100644
--- a/data/scripts/maps/Route114_FossilManiacsHouse.inc
+++ b/data/scripts/maps/Route114_FossilManiacsHouse.inc
@@ -3,7 +3,7 @@ Route114_FossilManiacsHouse_MapScripts:: @ 815C1B9
 	.byte 0
 
 Route114_FossilManiacsHouse_MapScript1_15C1BF:: @ 815C1BF
-	setflag 2135
+	setflag FLAG_LANDMARK_FOSSIL_MANIACS_HOUSE
 	end
 
 Route114_FossilManiacsHouse_EventScript_15C1C3:: @ 815C1C3
diff --git a/data/scripts/maps/Route114_LanettesHouse.inc b/data/scripts/maps/Route114_LanettesHouse.inc
index 3f5bbd909..b24cc9da2 100644
--- a/data/scripts/maps/Route114_LanettesHouse.inc
+++ b/data/scripts/maps/Route114_LanettesHouse.inc
@@ -3,7 +3,7 @@ Route114_LanettesHouse_MapScripts:: @ 815C258
 	.byte 0
 
 Route114_LanettesHouse_MapScript1_15C25E:: @ 815C25E
-	setflag 2117
+	setflag FLAG_LANDMARK_LANETTES_HOUSE
 	end
 
 Route114_LanettesHouse_EventScript_15C262:: @ 815C262
diff --git a/data/scripts/maps/Route116_TunnelersRestHouse.inc b/data/scripts/maps/Route116_TunnelersRestHouse.inc
index 16f35b1f2..24091c4ac 100644
--- a/data/scripts/maps/Route116_TunnelersRestHouse.inc
+++ b/data/scripts/maps/Route116_TunnelersRestHouse.inc
@@ -3,7 +3,7 @@ Route116_TunnelersRestHouse_MapScripts:: @ 815C2DE
 	.byte 0
 
 Route116_TunnelersRestHouse_MapScript1_15C2E4:: @ 815C2E4
-	setflag 2138
+	setflag FLAG_LANDMARK_TUNNELERS_REST_HOUSE
 	end
 
 Route116_TunnelersRestHouse_EventScript_15C2E8:: @ 815C2E8
diff --git a/data/scripts/maps/Route117_PokemonDayCare.inc b/data/scripts/maps/Route117_PokemonDayCare.inc
index 2a3ee79e1..9ad740b4e 100644
--- a/data/scripts/maps/Route117_PokemonDayCare.inc
+++ b/data/scripts/maps/Route117_PokemonDayCare.inc
@@ -3,5 +3,5 @@ Route117_PokemonDayCare_MapScripts:: @ 815C319
 	.byte 0
 
 Route117_PokemonDayCare_MapScript1_15C31F:: @ 815C31F
-	setflag 2118
+	setflag FLAG_LANDMARK_POKEMON_DAYCARE
 	end
diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc
index 54f2d98a8..045fcbb43 100644
--- a/data/scripts/maps/Route120.inc
+++ b/data/scripts/maps/Route120.inc
@@ -113,7 +113,7 @@ Route120_EventScript_151739:: @ 8151739
 	lock
 	faceplayer
 	dodailyevents
-	checkflag 2254
+	checkflag FLAG_DAILY_RECEIVED_BERRY_ROUTE120
 	goto_if_eq Route120_EventScript_151837
 	msgbox Route120_Text_1C58F1, 5
 	compare RESULT, 1
@@ -135,27 +135,27 @@ Route120_EventScript_151739:: @ 8151739
 	end
 
 Route120_EventScript_1517DC:: @ 81517DC
-	setvar 0x8004, 143
+	setvar 0x8004, ITEM_FIGY_BERRY
 	goto Route120_EventScript_151813
 	end
 
 Route120_EventScript_1517E7:: @ 81517E7
-	setvar 0x8004, 144
+	setvar 0x8004, ITEM_WIKI_BERRY
 	goto Route120_EventScript_151813
 	end
 
 Route120_EventScript_1517F2:: @ 81517F2
-	setvar 0x8004, 145
+	setvar 0x8004, ITEM_MAGO_BERRY
 	goto Route120_EventScript_151813
 	end
 
 Route120_EventScript_1517FD:: @ 81517FD
-	setvar 0x8004, 146
+	setvar 0x8004, ITEM_AGUAV_BERRY
 	goto Route120_EventScript_151813
 	end
 
 Route120_EventScript_151808:: @ 8151808
-	setvar 0x8004, 147
+	setvar 0x8004, ITEM_IAPAPA_BERRY
 	goto Route120_EventScript_151813
 	end
 
@@ -163,7 +163,7 @@ Route120_EventScript_151813:: @ 8151813
 	giveitem 0x8004
 	compare RESULT, 0
 	goto_if_eq Route120_EventScript_1A029B
-	setflag 2254
+	setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE120
 	msgbox Route120_Text_1C5A0B, 4
 	release
 	end
diff --git a/data/scripts/maps/Route123_BerryMastersHouse.inc b/data/scripts/maps/Route123_BerryMastersHouse.inc
index f9544d62e..dab303345 100644
--- a/data/scripts/maps/Route123_BerryMastersHouse.inc
+++ b/data/scripts/maps/Route123_BerryMastersHouse.inc
@@ -3,14 +3,14 @@ Route123_BerryMastersHouse_MapScripts:: @ 81639DF
 	.byte 0
 
 Route123_BerryMastersHouse_MapScript1_1639E5:: @ 81639E5
-	setflag 2147
+	setflag FLAG_LANDMARK_BERRY_MASTERS_HOUSE
 	end
 
 Route123_BerryMastersHouse_EventScript_1639E9:: @ 81639E9
 	lock
 	faceplayer
 	dodailyevents
-	checkflag 2253
+	checkflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER
 	goto_if_eq Route123_BerryMastersHouse_EventScript_163A5A
 	msgbox Route123_BerryMastersHouse_Text_1C5BC4, 4
 	random 10
@@ -19,7 +19,7 @@ Route123_BerryMastersHouse_EventScript_1639E9:: @ 81639E9
 	giveitem RESULT
 	compare RESULT, 0
 	goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B
-	setflag 2253
+	setflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER
 	msgbox Route123_BerryMastersHouse_Text_1C5C66, 4
 	random 10
 	addvar RESULT, 20
@@ -40,7 +40,7 @@ Route123_BerryMastersHouse_EventScript_163A64:: @ 8163A64
 	lock
 	faceplayer
 	dodailyevents
-	checkflag 2257
+	checkflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER_WIFE
 	goto_if_eq Route123_BerryMastersHouse_EventScript_163C13
 	msgbox Route123_BerryMastersHouse_Text_1C5D24, 4
 	setvar 0x8004, 13
@@ -77,7 +77,7 @@ Route123_BerryMastersHouse_EventScript_163AAD:: @ 8163AAD
 Route123_BerryMastersHouse_EventScript_163AF0:: @ 8163AF0
 	msgbox Route123_BerryMastersHouse_Text_1C5E0E, 4
 	random 10
-	addvar RESULT, 133
+	addvar RESULT, ITEM_CHERI_BERRY
 	giveitem RESULT
 	compare RESULT, 0
 	goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B
@@ -146,7 +146,7 @@ Route123_BerryMastersHouse_EventScript_163C13:: @ 8163C13
 	end
 
 Route123_BerryMastersHouse_EventScript_163C1D:: @ 8163C1D
-	setflag 2257
+	setflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER_WIFE
 	msgbox Route123_BerryMastersHouse_Text_1C5E59, 4
 	release
 	end
diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc
index 2f6f1b1e1..55f3141fd 100644
--- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc
+++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc
@@ -3,7 +3,7 @@ Route124_DivingTreasureHuntersHouse_MapScripts:: @ 8163DFA
 	.byte 0
 
 Route124_DivingTreasureHuntersHouse_MapScript1_163E00:: @ 8163E00
-	setflag 2139
+	setflag FLAG_LANDMARK_HUNTERS_HOUSE
 	end
 
 Route124_DivingTreasureHuntersHouse_EventScript_163E04:: @ 8163E04
diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc
index 816098829..e384014eb 100644
--- a/data/scripts/maps/RustboroCity_Gym.inc
+++ b/data/scripts/maps/RustboroCity_Gym.inc
@@ -14,7 +14,7 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE
 	waitmessage
 	call RustboroCity_Gym_EventScript_1A02C5
 	msgbox RustboroCity_Gym_Text_1840D5, 4
-	setflag 1201
+	setflag FLAG_DEFEATED_RUSTBORO_GYM
 	setflag BADGE01_GET
 	setvar 0x405a, 1
 	addvar 0x4085, 1
@@ -47,7 +47,7 @@ RustboroCity_Gym_EventScript_157977:: @ 8157977
 RustboroCity_Gym_EventScript_15798E:: @ 815798E
 	lock
 	faceplayer
-	checkflag 1201
+	checkflag FLAG_DEFEATED_RUSTBORO_GYM
 	goto_if_eq RustboroCity_Gym_EventScript_1579A3
 	msgbox RustboroCity_Gym_Text_183A4B, 4
 	release
diff --git a/data/scripts/maps/ScorchedSlab.inc b/data/scripts/maps/ScorchedSlab.inc
index 112289083..f0ed9c005 100644
--- a/data/scripts/maps/ScorchedSlab.inc
+++ b/data/scripts/maps/ScorchedSlab.inc
@@ -3,5 +3,5 @@ ScorchedSlab_MapScripts:: @ 815F29D
 	.byte 0
 
 ScorchedSlab_MapScript1_15F2A3:: @ 815F2A3
-	setflag 2136
+	setflag FLAG_LANDMARK_SCORCHED_SLAB
 	end
diff --git a/data/scripts/maps/SealedChamber_OuterRoom.inc b/data/scripts/maps/SealedChamber_OuterRoom.inc
index 27d44cad1..f9f081a8b 100644
--- a/data/scripts/maps/SealedChamber_OuterRoom.inc
+++ b/data/scripts/maps/SealedChamber_OuterRoom.inc
@@ -10,7 +10,7 @@ SealedChamber_OuterRoom_MapScript1_15F0D6:: @ 815F0D6
 	end
 
 SealedChamber_OuterRoom_MapScript1_15F0E7:: @ 815F0E7
-	setflag 2140
+	setflag FLAG_LANDMARK_SEALED_CHAMBER
 	end
 
 SealedChamber_OuterRoom_MapScript1_15F0EB:: @ 815F0EB
diff --git a/data/scripts/maps/SkyPillar_Entrance.inc b/data/scripts/maps/SkyPillar_Entrance.inc
index 7a3927332..ab991d845 100644
--- a/data/scripts/maps/SkyPillar_Entrance.inc
+++ b/data/scripts/maps/SkyPillar_Entrance.inc
@@ -3,5 +3,5 @@ SkyPillar_Entrance_MapScripts:: @ 815F2BD
 	.byte 0
 
 SkyPillar_Entrance_MapScript1_15F2C3:: @ 815F2C3
-	setflag 2142
+	setflag FLAG_LANDMARK_SKY_PILLAR
 	end
diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc
index c0229dc9c..ea64e9d29 100644
--- a/data/scripts/maps/SootopolisCity.inc
+++ b/data/scripts/maps/SootopolisCity.inc
@@ -92,16 +92,16 @@ SootopolisCity_EventScript_14D19F:: @ 814D19F
 	faceplayer
 	dodailyevents
 	special GetPlayerBigGuyGirlString
-	checkflag 2258
+	checkflag FLAG_DAILY_RECEIVED_BERRY_SOOTOPOLIS
 	goto_if_eq SootopolisCity_EventScript_14D241
 	msgbox SootopolisCity_Text_1C63F2, 4
 	random 10
 	addvar RESULT, 20
-	addvar RESULT, 133
+	addvar RESULT, ITEM_CHERI_BERRY
 	giveitem RESULT
 	compare RESULT, 0
 	goto_if_eq SootopolisCity_EventScript_1A029B
-	setflag 2258
+	setflag FLAG_DAILY_RECEIVED_BERRY_SOOTOPOLIS
 	msgbox SootopolisCity_Text_1C64D0, 4
 	random 2
 	compare RESULT, 0
@@ -142,7 +142,7 @@ SootopolisCity_EventScript_14D25E:: @ 814D25E
 SootopolisCity_EventScript_14D268:: @ 814D268
 	lock
 	faceplayer
-	checkflag 1236
+	checkflag FLAG_DEFEATED_SOOTOPOLIS_GYM
 	goto_if_eq SootopolisCity_EventScript_14D27D
 	msgbox SootopolisCity_Text_16A4D6, 4
 	release
diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc
index 24c333bee..f3daa8c7f 100644
--- a/data/scripts/maps/SootopolisCity_Gym_1F.inc
+++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc
@@ -100,7 +100,7 @@ SootopolisCity_Gym_1F_EventScript_15B02D:: @ 815B02D
 	waitmessage
 	call SootopolisCity_Gym_1F_EventScript_1A02C5
 	msgbox SootopolisCity_Gym_1F_Text_18F36B, 4
-	setflag 1236
+	setflag FLAG_DEFEATED_SOOTOPOLIS_GYM
 	setflag BADGE08_GET
 	setvar 0x8008, 8
 	call SootopolisCity_Gym_1F_EventScript_1A01C0
@@ -124,7 +124,7 @@ SootopolisCity_Gym_1F_EventScript_15B07A:: @ 815B07A
 SootopolisCity_Gym_1F_EventScript_15B084:: @ 815B084
 	lock
 	faceplayer
-	checkflag 1236
+	checkflag FLAG_DEFEATED_SOOTOPOLIS_GYM
 	goto_if_eq SootopolisCity_Gym_1F_EventScript_15B099
 	msgbox SootopolisCity_Gym_1F_Text_18E8A5, 4
 	release
diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc
index da0fcf2cd..81c50559e 100644
--- a/data/scripts/maps/SouthernIsland_Exterior.inc
+++ b/data/scripts/maps/SouthernIsland_Exterior.inc
@@ -3,7 +3,7 @@ SouthernIsland_Exterior_MapScripts:: @ 8160AD6
 	.byte 0
 
 SouthernIsland_Exterior_MapScript1_160ADC:: @ 8160ADC
-	setflag FLAG_UNLOCK_SOUTHERN_ISLAND
+	setflag FLAG_LANDMARK_SOUTHERN_ISLAND
 	end
 
 SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0
diff --git a/data/scripts/maps/Underwater_SeafloorCavern.inc b/data/scripts/maps/Underwater_SeafloorCavern.inc
index e2b60f22e..665cbf4af 100644
--- a/data/scripts/maps/Underwater_SeafloorCavern.inc
+++ b/data/scripts/maps/Underwater_SeafloorCavern.inc
@@ -5,7 +5,7 @@ Underwater_SeafloorCavern_MapScripts:: @ 815D99E
 	.byte 0
 
 Underwater_SeafloorCavern_MapScript1_15D9AE:: @ 815D9AE
-	setflag 2119
+	setflag FLAG_LANDMARK_SEAFLOOR_CAVERN
 	checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN
 	goto_if_eq Underwater_SeafloorCavern_EventScript_15D9BB
 	end
diff --git a/data/scripts/maps/VerdanturfTown_WandasHouse.inc b/data/scripts/maps/VerdanturfTown_WandasHouse.inc
index 0dd9aed7c..205a4315c 100644
--- a/data/scripts/maps/VerdanturfTown_WandasHouse.inc
+++ b/data/scripts/maps/VerdanturfTown_WandasHouse.inc
@@ -21,7 +21,7 @@ VerdanturfTown_WandasHouse_EventScript_153F7D:: @ 8153F7D
 	faceplayer
 	checkflag FLAG_DEFEATED_WALLY_VICTORY_ROAD
 	goto_if_eq VerdanturfTown_WandasHouse_EventScript_153FA5
-	checkflag 1213
+	checkflag FLAG_DEFEATED_LAVARIDGE_GYM
 	goto_if_eq VerdanturfTown_WandasHouse_EventScript_153F9B
 	msgbox VerdanturfTown_WandasHouse_Text_17859A, 4
 	release
@@ -44,7 +44,7 @@ VerdanturfTown_WandasHouse_EventScript_153FAF:: @ 8153FAF
 VerdanturfTown_WandasHouse_EventScript_153FB8:: @ 8153FB8
 	lock
 	faceplayer
-	checkflag 1213
+	checkflag FLAG_DEFEATED_LAVARIDGE_GYM
 	goto_if_eq VerdanturfTown_WandasHouse_EventScript_153FE0
 	checkflag FLAG_DEFEATED_WALLY_MAUVILLE
 	goto_if_eq VerdanturfTown_WandasHouse_EventScript_153FD6
@@ -67,7 +67,7 @@ VerdanturfTown_WandasHouse_EventScript_153FEA:: @ 8153FEA
 	faceplayer
 	checkflag FLAG_DEFEATED_WALLY_VICTORY_ROAD
 	goto_if_eq VerdanturfTown_WandasHouse_EventScript_154025
-	checkflag 1213
+	checkflag FLAG_DEFEATED_LAVARIDGE_GYM
 	goto_if_eq VerdanturfTown_WandasHouse_EventScript_15401B
 	checkflag FLAG_RUSTURF_TUNNEL_OPENED
 	goto_if_eq VerdanturfTown_WandasHouse_EventScript_154011
diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc
index 6fe754097..6934ffe57 100644
--- a/data/scripts/pokeblocks.inc
+++ b/data/scripts/pokeblocks.inc
@@ -76,7 +76,7 @@ FallarborTown_ContestLobby_EventScript_1B76EF:: @ 81B76EF
 FallarborTown_ContestLobby_EventScript_1B770E:: @ 81B770E
 	msgbox FallarborTown_ContestLobby_Text_1B6FF0, 4
 	dodailyevents
-	checkflag 2241
+	checkflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR
 	goto_if_eq FallarborTown_ContestLobby_EventScript_1B774F
 	goto FallarborTown_ContestLobby_EventScript_1B7759
 	end
@@ -107,7 +107,7 @@ FallarborTown_ContestLobby_EventScript_1B774F:: @ 81B774F
 FallarborTown_ContestLobby_EventScript_1B7759:: @ 81B7759
 	msgbox FallarborTown_ContestLobby_Text_1B704A, 4
 	giveitem ITEM_PECHA_BERRY
-	setflag 2241
+	setflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR
 	goto FallarborTown_ContestLobby_EventScript_1B76EF
 	end
 
@@ -162,7 +162,7 @@ FallarborTown_ContestLobby_EventScript_1B77DC:: @ 81B77DC
 
 FallarborTown_ContestLobby_EventScript_1B77E6:: @ 81B77E6
 	dodailyevents
-	checkflag 2241
+	checkflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR
 	goto_if_eq FallarborTown_ContestLobby_EventScript_1B77F6
 	goto FallarborTown_ContestLobby_EventScript_1B7800
 	end
@@ -175,7 +175,7 @@ FallarborTown_ContestLobby_EventScript_1B77F6:: @ 81B77F6
 FallarborTown_ContestLobby_EventScript_1B7800:: @ 81B7800
 	msgbox FallarborTown_ContestLobby_Text_1B74B4, 4
 	giveitem ITEM_PECHA_BERRY
-	setflag 2241
+	setflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR
 	msgbox FallarborTown_ContestLobby_Text_1B753A, 4
 	release
 	end