Story flags through mystic ticket

27 files changed, 67 insertions, 67 deletions

diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc
index fcf5f53b6..3946144d9 100644
--- a/data/maps/BirthIsland_Exterior/scripts.inc
+++ b/data/maps/BirthIsland_Exterior/scripts.inc
@@ -13,9 +13,9 @@ BirthIsland_Exterior_MapScript1_165217:: @ 8165217
 	setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_DEOXYS_N
 	setvar VAR_0x4026, 0
 	setvar VAR_0x403E, 0
-	checkflag FLAG_0x2E4
+	checkflag FLAG_FOUGHT_DEOXYS
 	call_if TRUE, EventScript_16523C
-	checkflag FLAG_0x2E4
+	checkflag FLAG_FOUGHT_DEOXYS
 	call_if FALSE, EventScript_165243
 	end
 
@@ -102,7 +102,7 @@ EventScript_1652C0:: @ 81652C0
 	goto_if eq, EventScript_165348
 	compare_var_to_value VAR_RESULT, 5
 	goto_if eq, EventScript_165348
-	setflag FLAG_0x2E4
+	setflag FLAG_FOUGHT_DEOXYS
 	release
 	end
 
diff --git a/data/maps/CeladonCity_Condominiums_1F/scripts.inc b/data/maps/CeladonCity_Condominiums_1F/scripts.inc
index 7a9ef328d..4708f70e8 100644
--- a/data/maps/CeladonCity_Condominiums_1F/scripts.inc
+++ b/data/maps/CeladonCity_Condominiums_1F/scripts.inc
@@ -8,10 +8,10 @@ CeladonCity_Condominiums_1F_EventScript_16C321:: @ 816C321
 	goto_if TRUE, EventScript_16C36A
 	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if TRUE, EventScript_16C374
-	checkflag FLAG_0x2A6
+	checkflag FLAG_GOT_TEA
 	goto_if TRUE, EventScript_16C36A
 	msgbox gUnknown_81960C9
-	setflag FLAG_0x2A6
+	setflag FLAG_GOT_TEA
 	giveitem ITEM_TEA
 	compare_var_to_value VAR_RESULT, 0
 	goto_if eq, EventScript_1A6BF9
diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc
index d4c066afe..805775505 100644
--- a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc
+++ b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc
@@ -121,7 +121,7 @@ EventScript_16BED7:: @ 816BED7
 EventScript_16BF19:: @ 816BF19
 	setvar VAR_0x8008, ITEM_FRESH_WATER
 	setvar VAR_0x8009, ITEM_TM16
-	checkflag FLAG_0x296
+	checkflag FLAG_GOT_TM16_FROM_THIRSTY_GIRL
 	goto_if TRUE, EventScript_16C018
 	msgbox gUnknown_8195D75
 	goto EventScript_16BF7C
@@ -130,7 +130,7 @@ EventScript_16BF19:: @ 816BF19
 EventScript_16BF3A:: @ 816BF3A
 	setvar VAR_0x8008, ITEM_SODA_POP
 	setvar VAR_0x8009, ITEM_TM20
-	checkflag FLAG_0x295
+	checkflag FLAG_GOT_TM20_FROM_THIRSTY_GIRL
 	goto_if TRUE, EventScript_16C018
 	msgbox gUnknown_8195E33
 	goto EventScript_16BF7C
@@ -139,7 +139,7 @@ EventScript_16BF3A:: @ 816BF3A
 EventScript_16BF5B:: @ 816BF5B
 	setvar VAR_0x8008, ITEM_LEMONADE
 	setvar VAR_0x8009, ITEM_TM33
-	checkflag FLAG_0x294
+	checkflag FLAG_GOT_TM33_FROM_THIRSTY_GIRL
 	goto_if TRUE, EventScript_16C018
 	msgbox gUnknown_8195EBF
 	goto EventScript_16BF7C
@@ -170,17 +170,17 @@ EventScript_16BF7C:: @ 816BF7C
 	end
 
 EventScript_16BFDE:: @ 816BFDE
-	setflag FLAG_0x296
+	setflag FLAG_GOT_TM16_FROM_THIRSTY_GIRL
 	msgbox gUnknown_8195DD4
 	return
 
 EventScript_16BFEA:: @ 816BFEA
-	setflag FLAG_0x295
+	setflag FLAG_GOT_TM20_FROM_THIRSTY_GIRL
 	msgbox gUnknown_8195E68
 	return
 
 EventScript_16BFF6:: @ 816BFF6
-	setflag FLAG_0x294
+	setflag FLAG_GOT_TM33_FROM_THIRSTY_GIRL
 	msgbox gUnknown_8195EF4
 	return
 
diff --git a/data/maps/CeladonCity_Gym/scripts.inc b/data/maps/CeladonCity_Gym/scripts.inc
index 8f85316d5..e0c5c4306 100644
--- a/data/maps/CeladonCity_Gym/scripts.inc
+++ b/data/maps/CeladonCity_Gym/scripts.inc
@@ -4,7 +4,7 @@ CeladonCity_Gym_MapScripts:: @ 816D060
 CeladonCity_Gym_EventScript_16D061:: @ 816D061
 	famechecker FAMECHECKER_ERIKA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
 	trainerbattle 1, TRAINER_LEADER_ERIKA, 0, Text_197114, Text_197260, EventScript_16D0A0
-	checkflag FLAG_0x293
+	checkflag FLAG_GOT_TM19_FROM_ERIKA
 	goto_if FALSE, EventScript_16D0C6
 	famechecker FAMECHECKER_ERIKA, 4
 	msgbox gUnknown_81972B8
@@ -27,7 +27,7 @@ EventScript_16D0C6:: @ 816D0C6
 	goto_if eq, EventScript_16D107
 	additem ITEM_TM19, 1
 	giveitemfanfaremsg gUnknown_81973BA, ITEM_TM19
-	setflag FLAG_0x293
+	setflag FLAG_GOT_TM19_FROM_ERIKA
 	msgbox gUnknown_81973D7
 	release
 	end
diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc
index 6c486906f..370f73917 100644
--- a/data/maps/CeruleanCity/scripts.inc
+++ b/data/maps/CeruleanCity/scripts.inc
@@ -61,7 +61,7 @@ EventScript_1664CC:: @ 81664CC
 	call_if eq, EventScript_1665B5
 	msgbox gUnknown_817ECD4
 	setvar VAR_MAP_SCENE_CERULEAN_CITY_RIVAL, 1
-	setflag FLAG_0x29B
+	setflag FLAG_GOT_FAME_CHECKER
 	giveitem ITEM_FAME_CHECKER
 	msgbox gUnknown_817ED5D
 	closemessage
diff --git a/data/maps/CeruleanCity_Gym/scripts.inc b/data/maps/CeruleanCity_Gym/scripts.inc
index 3f614ad86..c53c9718b 100644
--- a/data/maps/CeruleanCity_Gym/scripts.inc
+++ b/data/maps/CeruleanCity_Gym/scripts.inc
@@ -4,7 +4,7 @@ CeruleanCity_Gym_MapScripts:: @ 816AAA0
 CeruleanCity_Gym_EventScript_16AAA1:: @ 816AAA1
 	famechecker FAMECHECKER_MISTY, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
 	trainerbattle 1, TRAINER_LEADER_MISTY, 0, Text_1921EF, Text_19242D, EventScript_16AAD3
-	checkflag FLAG_0x297
+	checkflag FLAG_GOT_TM03_FROM_MISTY
 	goto_if FALSE, EventScript_16AAF9
 	msgbox gUnknown_81922BF
 	release
@@ -26,7 +26,7 @@ EventScript_16AAF9:: @ 816AAF9
 	goto_if eq, EventScript_16AB3A
 	additem ITEM_TM03, 1
 	giveitemfanfaremsg gUnknown_81923F1, ITEM_TM03
-	setflag FLAG_0x297
+	setflag FLAG_GOT_TM03_FROM_MISTY
 	msgbox gUnknown_81922BF
 	release
 	end
diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc
index de75b32f8..f5f042316 100644
--- a/data/maps/NavelRock_Base/scripts.inc
+++ b/data/maps/NavelRock_Base/scripts.inc
@@ -4,9 +4,9 @@ NavelRock_Base_MapScripts:: @ 81650E7
 	.byte 0
 
 NavelRock_Base_MapScript1_1650F2:: @ 81650F2
-	checkflag FLAG_0x2F2
+	checkflag FLAG_FOUGHT_LUGIA
 	call_if TRUE, EventScript_165105
-	checkflag FLAG_0x2F2
+	checkflag FLAG_FOUGHT_LUGIA
 	call_if FALSE, EventScript_165109
 	end
 
@@ -75,7 +75,7 @@ NavelRock_Base_EventScript_165134:: @ 8165134
 	goto_if eq, EventScript_1651E7
 	compare_var_to_value VAR_RESULT, 5
 	goto_if eq, EventScript_1651E7
-	setflag FLAG_0x2F2
+	setflag FLAG_FOUGHT_LUGIA
 	release
 	end
 
diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc
index d86d5f2f1..17cd88532 100644
--- a/data/maps/NavelRock_Summit/scripts.inc
+++ b/data/maps/NavelRock_Summit/scripts.inc
@@ -4,9 +4,9 @@ NavelRock_Summit_MapScripts:: @ 8164F9F
 	.byte 0
 
 NavelRock_Summit_MapScript1_164FAA:: @ 8164FAA
-	checkflag FLAG_0x2F3
+	checkflag FLAG_FOUGHT_HO_OH
 	call_if TRUE, EventScript_164FBD
-	checkflag FLAG_0x2F3
+	checkflag FLAG_FOUGHT_HO_OH
 	call_if FALSE, EventScript_164FC6
 	end
 
@@ -80,7 +80,7 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB
 	goto_if eq, EventScript_1650C2
 	compare_var_to_value VAR_RESULT, 5
 	goto_if eq, EventScript_1650C2
-	setflag FLAG_0x2F3
+	setflag FLAG_FOUGHT_HO_OH
 	releaseall
 	end
 
diff --git a/data/maps/OneIsland/scripts.inc b/data/maps/OneIsland/scripts.inc
index 5e1dcb9ec..02a47a913 100644
--- a/data/maps/OneIsland/scripts.inc
+++ b/data/maps/OneIsland/scripts.inc
@@ -85,7 +85,7 @@ OneIsland_EventScript_167517:: @ 8167517
 	faceplayer
 	checkflag FLAG_0x844
 	goto_if TRUE, EventScript_16753F
-	checkflag FLAG_0x2A1
+	checkflag FLAG_SEVII_DETOUR_FINISHED
 	goto_if TRUE, EventScript_167535
 	msgbox gUnknown_818174E
 	release
diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc
index 8e01f86e3..ac6ebcff8 100644
--- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc
+++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc
@@ -116,14 +116,14 @@ EventScript_170CB1:: @ 8170CB1
 	call_if ge, EventScript_170E46
 	compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2
 	call_if lt, EventScript_170E58
-	setflag FLAG_0x845
+	setflag FLAG_SYS_SEVII_MAP_123
 	msgbox gUnknown_81A1230
 	closemessage
 	applymovement 2, Movement_1A75E9
 	waitmovement 0
 	applymovement 3, Movement_1A75E9
 	waitmovement 0
-	setflag FLAG_0x841
+	setflag FLAG_SYS_PC_STORAGE_DISABLED
 	setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 1
 	releaseall
 	end
@@ -192,7 +192,7 @@ OneIsland_PokemonCenter_1F_EventScript_170E94:: @ 8170E94
 
 OneIsland_PokemonCenter_1F_EventScript_170E9D:: @ 8170E9D
 	lock
-	checkflag FLAG_0x2A1
+	checkflag FLAG_SEVII_DETOUR_FINISHED
 	goto_if TRUE, EventScript_170EB1
 	msgbox gUnknown_81A1266
 	release
@@ -419,7 +419,7 @@ OneIsland_PokemonCenter_1F_EventScript_171179:: @ 8171179
 	lockall
 	checkflag FLAG_0x844
 	goto_if TRUE, EventScript_1711A0
-	checkflag FLAG_0x2A1
+	checkflag FLAG_SEVII_DETOUR_FINISHED
 	goto_if TRUE, EventScript_171196
 	msgbox gUnknown_81A223F
 	releaseall
diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc
index e04a0aa59..d4e6c0cf3 100644
--- a/data/maps/PalletTown/scripts.inc
+++ b/data/maps/PalletTown/scripts.inc
@@ -5,7 +5,7 @@ PalletTown_MapScripts:: @ 816545A
 
 PalletTown_MapScript1_165465:: @ 8165465
 	setworldmapflag FLAG_WORLD_MAP_PALLET_TOWN
-	checkflag FLAG_0x291
+	checkflag FLAG_PALLET_LADY_NOT_BLOCKING_SIGN
 	call_if TRUE, EventScript_165488
 	compare_var_to_value VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 0
 	call_if eq, EventScript_1654A8
@@ -26,7 +26,7 @@ EventScript_1654A2:: @ 81654A2
 	return
 
 EventScript_1654A8:: @ 81654A8
-	checkflag FLAG_0x291
+	checkflag FLAG_PALLET_LADY_NOT_BLOCKING_SIGN
 	goto_if TRUE, EventScript_1654BD
 	setobjectxyperm 1, 5, 15
 	setobjectmovementtype 1, 7
diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
index 2d35fa445..e43700092 100644
--- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
@@ -1209,7 +1209,7 @@ EventScript_ThisPokeIsRealyEnergetic:: @ 8169C74
 	msgbox gUnknown_818E2E5
 	call EventScript_1A6675
 	setflag FLAG_SYS_POKEMON_GET
-	setflag FLAG_0x291
+	setflag FLAG_PALLET_LADY_NOT_BLOCKING_SIGN
 	givemon VAR_OAKSLAB_PLAYER_STARTER_SPECIES, 5, ITEM_NONE, 0, 0, 0
 	copyvar VAR_STARTER_MON, VAR_OAKSLAB_PLAYER_STARTER_NO
 	getspeciesname 0, VAR_OAKSLAB_PLAYER_STARTER_SPECIES
diff --git a/data/maps/RocketHideout_B4F/scripts.inc b/data/maps/RocketHideout_B4F/scripts.inc
index 4fa71c383..655ef389a 100644
--- a/data/maps/RocketHideout_B4F/scripts.inc
+++ b/data/maps/RocketHideout_B4F/scripts.inc
@@ -63,7 +63,7 @@ EventScript_16139D:: @ 816139D
 RocketHideout_B4F_EventScript_1613AD:: @ 81613AD
 	lock
 	faceplayer
-	setflag FLAG_0x2A5
+	setflag FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT
 	removeobject 4
 	giveitem ITEM_LIFT_KEY
 	compare_var_to_value VAR_RESULT, 0
diff --git a/data/maps/RocketHideout_Elevator/scripts.inc b/data/maps/RocketHideout_Elevator/scripts.inc
index 040cf4a82..1b42f6345 100644
--- a/data/maps/RocketHideout_Elevator/scripts.inc
+++ b/data/maps/RocketHideout_Elevator/scripts.inc
@@ -3,7 +3,7 @@ RocketHideout_Elevator_MapScripts:: @ 81614D8
 
 RocketHideout_Elevator_EventScript_1614D9:: @ 81614D9
 	lockall
-	checkflag FLAG_0x2A5
+	checkflag FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT
 	goto_if FALSE, EventScript_16161B
 	setvar VAR_0x8004, 2
 	checkflag FLAG_TEMP_2
diff --git a/data/maps/Route12_FishingHouse/scripts.inc b/data/maps/Route12_FishingHouse/scripts.inc
index 497a7302d..0b425495a 100644
--- a/data/maps/Route12_FishingHouse/scripts.inc
+++ b/data/maps/Route12_FishingHouse/scripts.inc
@@ -73,21 +73,21 @@ EventScript_170001:: @ 8170001
 	end
 
 EventScript_17000B:: @ 817000B
-	checkflag FLAG_0x29C
+	checkflag FLAG_GOT_RECORD_SETTING_MAGIKARP
 	goto_if FALSE, EventScript_170031
 	msgbox gUnknown_819F40A
 	release
 	end
 
 EventScript_17001E:: @ 817001E
-	checkflag FLAG_0x29C
+	checkflag FLAG_GOT_RECORD_SETTING_MAGIKARP
 	goto_if FALSE, EventScript_170031
 	msgbox gUnknown_819F3CB
 	release
 	end
 
 EventScript_170031:: @ 8170031
-	setflag FLAG_0x29C
+	setflag FLAG_GOT_RECORD_SETTING_MAGIKARP
 	msgbox gUnknown_819F31B
 	giveitem ITEM_NET_BALL
 	compare_var_to_value VAR_RESULT, 0
@@ -103,7 +103,7 @@ EventScript_17005D:: @ 817005D
 
 Route12_FishingHouse_EventScript_170067:: @ 8170067
 	lockall
-	checkflag FLAG_0x29C
+	checkflag FLAG_GOT_RECORD_SETTING_MAGIKARP
 	goto_if TRUE, EventScript_17007B
 	msgbox gUnknown_819F50C
 	releaseall
diff --git a/data/maps/Route5_SouthEntrance/scripts.inc b/data/maps/Route5_SouthEntrance/scripts.inc
index eafff1c29..fd8a5f6fc 100644
--- a/data/maps/Route5_SouthEntrance/scripts.inc
+++ b/data/maps/Route5_SouthEntrance/scripts.inc
@@ -27,7 +27,7 @@ EventScript_16F92E:: @ 816F92E
 	textcolor 0
 	applymovement 255, Movement_1A75E7
 	waitmovement 0
-	checkflag FLAG_0x2A6
+	checkflag FLAG_GOT_TEA
 	goto_if TRUE, EventScript_16F958
 	msgbox gUnknown_819E04B
 	closemessage
diff --git a/data/maps/Route6_NorthEntrance/scripts.inc b/data/maps/Route6_NorthEntrance/scripts.inc
index c04a2d28f..6edd20f21 100644
--- a/data/maps/Route6_NorthEntrance/scripts.inc
+++ b/data/maps/Route6_NorthEntrance/scripts.inc
@@ -27,7 +27,7 @@ EventScript_16F9F4:: @ 816F9F4
 	textcolor 0
 	applymovement 255, Movement_1A75EB
 	waitmovement 0
-	checkflag FLAG_0x2A6
+	checkflag FLAG_GOT_TEA
 	goto_if TRUE, EventScript_16FA1E
 	msgbox gUnknown_819E181
 	closemessage
diff --git a/data/maps/Route7_EastEntrance/scripts.inc b/data/maps/Route7_EastEntrance/scripts.inc
index fa9101aa4..f8885b53d 100644
--- a/data/maps/Route7_EastEntrance/scripts.inc
+++ b/data/maps/Route7_EastEntrance/scripts.inc
@@ -27,7 +27,7 @@ EventScript_16FABB:: @ 816FABB
 	textcolor 0
 	applymovement 255, Movement_1A75E9
 	waitmovement 0
-	checkflag FLAG_0x2A6
+	checkflag FLAG_GOT_TEA
 	goto_if TRUE, EventScript_16FAE5
 	msgbox gUnknown_819E2B7
 	closemessage
diff --git a/data/maps/Route8_WestEntrance/scripts.inc b/data/maps/Route8_WestEntrance/scripts.inc
index 391bc0c8b..dfdb0b7ae 100644
--- a/data/maps/Route8_WestEntrance/scripts.inc
+++ b/data/maps/Route8_WestEntrance/scripts.inc
@@ -27,7 +27,7 @@ EventScript_16FB81:: @ 816FB81
 	textcolor 0
 	applymovement 255, Movement_1A75E9
 	waitmovement 0
-	checkflag FLAG_0x2A6
+	checkflag FLAG_GOT_TEA
 	goto_if TRUE, EventScript_16FBAB
 	msgbox gUnknown_819E3ED
 	closemessage
diff --git a/data/maps/SaffronCity_Gym/scripts.inc b/data/maps/SaffronCity_Gym/scripts.inc
index 1e0fcf882..ebfc595c7 100644
--- a/data/maps/SaffronCity_Gym/scripts.inc
+++ b/data/maps/SaffronCity_Gym/scripts.inc
@@ -4,7 +4,7 @@ SaffronCity_Gym_MapScripts:: @ 816EDD7
 SaffronCity_Gym_EventScript_16EDD8:: @ 816EDD8
 	famechecker FAMECHECKER_SABRINA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
 	trainerbattle 1, TRAINER_LEADER_SABRINA, 0, Text_19B53C, Text_19B602, EventScript_16EE0A
-	checkflag FLAG_0x29A
+	checkflag FLAG_GOT_TM04_FROM_SABRINA
 	goto_if FALSE, EventScript_16EE3D
 	msgbox gUnknown_819B7F2
 	release
@@ -27,7 +27,7 @@ EventScript_16EE3D:: @ 816EE3D
 	goto_if eq, EventScript_16EE7E
 	additem ITEM_TM04, 1
 	giveitemfanfaremsg gUnknown_819B7D3, ITEM_TM04
-	setflag FLAG_0x29A
+	setflag FLAG_GOT_TM04_FROM_SABRINA
 	msgbox gUnknown_819B685
 	release
 	end
diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc
index 8d2bd1b6e..ed7fc4d5e 100644
--- a/data/maps/ThreeIsland/scripts.inc
+++ b/data/maps/ThreeIsland/scripts.inc
@@ -4,7 +4,7 @@ ThreeIsland_MapScripts:: @ 81677AD
 
 ThreeIsland_MapScript1_1677B3:: @ 81677B3
 	setworldmapflag FLAG_WORLD_MAP_THREE_ISLAND
-	checkflag FLAG_0x2A3
+	checkflag FLAG_RESCUED_LOSTELLE
 	call_if TRUE, EventScript_1677CB
 	compare_var_to_value VAR_MAP_SCENE_THREE_ISLAND, 4
 	call_if eq, EventScript_1677CF
diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc
index d1ba3bb4d..739b926b0 100644
--- a/data/maps/ThreeIsland_BerryForest/scripts.inc
+++ b/data/maps/ThreeIsland_BerryForest/scripts.inc
@@ -35,7 +35,7 @@ ThreeIsland_BerryForest_EventScript_163C83:: @ 8163C83
 	special sub_80CA6DC
 	msgbox gUnknown_817AF3B
 	closemessage
-	setflag FLAG_0x2A3
+	setflag FLAG_RESCUED_LOSTELLE
 	setflag FLAG_HIDE_LOSTELLE_IN_BERRY_FOREST
 	setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2
 	clearflag FLAG_HIDE_TWO_ISLAND_GAME_CORNER_LOSTELLE
diff --git a/data/maps/ThreeIsland_House5/scripts.inc b/data/maps/ThreeIsland_House5/scripts.inc
index 1924fb74b..3dee5e153 100644
--- a/data/maps/ThreeIsland_House5/scripts.inc
+++ b/data/maps/ThreeIsland_House5/scripts.inc
@@ -4,7 +4,7 @@ ThreeIsland_House5_MapScripts:: @ 817191F
 ThreeIsland_House5_EventScript_171920:: @ 8171920
 	lock
 	faceplayer
-	checkflag FLAG_0x2A3
+	checkflag FLAG_RESCUED_LOSTELLE
 	goto_if TRUE, EventScript_171935
 	msgbox gUnknown_81A3469
 	release
diff --git a/data/maps/ThreeIsland_Port/scripts.inc b/data/maps/ThreeIsland_Port/scripts.inc
index b101c5ead..1aff12731 100644
--- a/data/maps/ThreeIsland_Port/scripts.inc
+++ b/data/maps/ThreeIsland_Port/scripts.inc
@@ -3,8 +3,8 @@ ThreeIsland_Port_MapScripts:: @ 8168789
 	.byte 0
 
 ThreeIsland_Port_MapScript1_16878F:: @ 816878F
-	clearflag FLAG_0x841
-	setflag FLAG_0x2A1
+	clearflag FLAG_SYS_PC_STORAGE_DISABLED
+	setflag FLAG_SEVII_DETOUR_FINISHED
 	end
 
 ThreeIsland_Port_EventScript_168796:: @ 8168796
diff --git a/data/maps/TwoIsland/scripts.inc b/data/maps/TwoIsland/scripts.inc
index 409f477d6..1b4f2383a 100644
--- a/data/maps/TwoIsland/scripts.inc
+++ b/data/maps/TwoIsland/scripts.inc
@@ -4,7 +4,7 @@ TwoIsland_MapScripts:: @ 8167564
 
 TwoIsland_MapScript1_16756A:: @ 816756A
 	setworldmapflag FLAG_WORLD_MAP_TWO_ISLAND
-	setflag FLAG_0x2A2
+	setflag FLAG_VISITED_TWO_ISLAND
 	call EventScript_167576
 	end
 
@@ -13,33 +13,33 @@ EventScript_167576:: @ 8167576
 	goto_if TRUE, EventScript_167597
 	checkflag FLAG_SYS_GAME_CLEAR
 	goto_if TRUE, EventScript_1675B8
-	checkflag FLAG_0x2A3
+	checkflag FLAG_RESCUED_LOSTELLE
 	goto_if TRUE, EventScript_1675D9
 	goto EventScript_1675E8
 	end
 
 EventScript_167597:: @ 8167597
-	checkflag FLAG_0x29D
+	checkflag FLAG_TWO_ISLAND_SHOP_INTRODUCED
 	goto_if FALSE, EventScript_1675EE
-	checkflag FLAG_0x29E
+	checkflag FLAG_TWO_ISLAND_SHOP_EXPANDED_1
 	goto_if FALSE, EventScript_1675F4
-	checkflag FLAG_0x29F
+	checkflag FLAG_TWO_ISLAND_SHOP_EXPANDED_2
 	goto_if FALSE, EventScript_1675FD
 	goto EventScript_167606
 	end
 
 EventScript_1675B8:: @ 81675B8
-	checkflag FLAG_0x29D
+	checkflag FLAG_TWO_ISLAND_SHOP_INTRODUCED
 	goto_if FALSE, EventScript_1675EE
-	checkflag FLAG_0x2A3
+	checkflag FLAG_RESCUED_LOSTELLE
 	goto_if FALSE, EventScript_1675EE
-	checkflag FLAG_0x29E
+	checkflag FLAG_TWO_ISLAND_SHOP_EXPANDED_1
 	goto_if FALSE, EventScript_1675F4
 	goto EventScript_1675FD
 	end
 
 EventScript_1675D9:: @ 81675D9
-	checkflag FLAG_0x29D
+	checkflag FLAG_TWO_ISLAND_SHOP_INTRODUCED
 	goto_if FALSE, EventScript_1675EE
 	goto EventScript_1675F4
 	end
@@ -83,36 +83,36 @@ TwoIsland_EventScript_16760F:: @ 816760F
 	end
 
 EventScript_167646:: @ 8167646
-	checkflag FLAG_0x2A0
+	checkflag FLAG_TWO_ISLAND_SHOP_EXPANDED_3
 	goto_if TRUE, EventScript_1676A6
-	setflag FLAG_0x2A0
+	setflag FLAG_TWO_ISLAND_SHOP_EXPANDED_3
 	message Text_181CAE
 	waitmessage
 	goto EventScript_167728
 	end
 
 EventScript_16765E:: @ 816765E
-	checkflag FLAG_0x29F
+	checkflag FLAG_TWO_ISLAND_SHOP_EXPANDED_2
 	goto_if TRUE, EventScript_1676A6
-	setflag FLAG_0x29F
+	setflag FLAG_TWO_ISLAND_SHOP_EXPANDED_2
 	message Text_181C77
 	waitmessage
 	goto EventScript_167708
 	end
 
 EventScript_167676:: @ 8167676
-	checkflag FLAG_0x29E
+	checkflag FLAG_TWO_ISLAND_SHOP_EXPANDED_1
 	goto_if TRUE, EventScript_1676A6
-	setflag FLAG_0x29E
+	setflag FLAG_TWO_ISLAND_SHOP_EXPANDED_1
 	message Text_181B7C
 	waitmessage
 	goto EventScript_1676EC
 	end
 
 EventScript_16768E:: @ 816768E
-	checkflag FLAG_0x29D
+	checkflag FLAG_TWO_ISLAND_SHOP_INTRODUCED
 	goto_if TRUE, EventScript_1676A6
-	setflag FLAG_0x29D
+	setflag FLAG_TWO_ISLAND_SHOP_INTRODUCED
 	message Text_181AFE
 	waitmessage
 	goto EventScript_1676D3
diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc
index 747d6d6b7..84d0350cd 100644
--- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc
+++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc
@@ -127,7 +127,7 @@ TwoIsland_JoyfulGameCorner_EventScript_171535:: @ 8171535
 	faceplayer
 	compare_var_to_value VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4
 	goto_if eq, EventScript_1BC060
-	checkflag FLAG_0x2A3
+	checkflag FLAG_RESCUED_LOSTELLE
 	goto_if TRUE, EventScript_171555
 	msgbox gUnknown_81A285C
 	release
diff --git a/data/maps/ViridianCity_Gym/scripts.inc b/data/maps/ViridianCity_Gym/scripts.inc
index d759f39f9..197a38b74 100644
--- a/data/maps/ViridianCity_Gym/scripts.inc
+++ b/data/maps/ViridianCity_Gym/scripts.inc
@@ -4,7 +4,7 @@ ViridianCity_Gym_MapScripts:: @ 8169EC9
 ViridianCity_Gym_EventScript_169ECA:: @ 8169ECA
 	famechecker FAMECHECKER_GIOVANNI, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
 	trainerbattle 1, TRAINER_LEADER_GIOVANNI, 0, Text_18F352, Text_18F43F, EventScript_169F04
-	checkflag FLAG_0x298
+	checkflag FLAG_GOT_TM26_FROM_GIOVANNI
 	goto_if FALSE, EventScript_169F2F
 	msgbox gUnknown_818F4A2
 	closemessage
@@ -31,7 +31,7 @@ EventScript_169F2F:: @ 8169F2F
 	goto_if eq, EventScript_169F70
 	additem ITEM_TM26, 1
 	giveitemfanfaremsg gUnknown_818F675, ITEM_TM26
-	setflag FLAG_0x298
+	setflag FLAG_GOT_TM26_FROM_GIOVANNI
 	msgbox gUnknown_818F695
 	release
 	end