Story flags through mystic ticket

data/event_scripts.s

@@ -1915,7 +1915,7 @@ gUnknown_81A6955:: @ 81A6955
 	compare_var_to_value VAR_RESULT, 2
 	goto_if eq, EventScript_1A7AE0
 	lockall
-	checkflag FLAG_0x841
+	checkflag FLAG_SYS_PC_STORAGE_DISABLED
 	goto_if TRUE, EventScript_1A698E
 	setvar VAR_0x8004, 27
 	special Special_SetSomeVariable
@@ -3999,11 +3999,11 @@ ViridianCity_PokemonCenter_2F_EventScript_1A8D02:: @ 81A8D02
 VermilionCity_PokemonCenter_1F_EventScript_1A8D08:: @ 81A8D08
 	lock
 	faceplayer
-	checkflag FLAG_0x292
+	checkflag FLAG_GOT_VS_SEEKER
 	goto_if TRUE, EventScript_1A8D3F
 	msgbox Text_194234
-	setflag FLAG_0x292
+	setflag FLAG_GOT_VS_SEEKER
-	giveitem 362
+	giveitem ITEM_VS_SEEKER
 	compare_var_to_value VAR_RESULT, 0
 	goto_if eq, EventScript_1A6BF9
 	msgbox Text_19430F
@@ -7941,14 +7941,14 @@ EventScript_1B292B:: @ 81B292B
 FourIsland_House2_EventScript_1B2938:: @ 81B2938
 	lock
 	specialvar VAR_0x8008, sub_80CC3CC
-	checkflag FLAG_0x290
+	checkflag FLAG_MET_STICKER_LADY
 	goto_if FALSE, EventScript_1B2951
-	checkflag FLAG_0x290
+	checkflag FLAG_MET_STICKER_LADY
 	goto_if TRUE, EventScript_1B2994
 	end
 
 EventScript_1B2951:: @ 81B2951
-	setflag FLAG_0x290
+	setflag FLAG_MET_STICKER_LADY
 	msgbox gUnknown_81B1EB3
 	applymovement 1, Movement_1A75E1
 	waitmovement 0
@@ -8076,9 +8076,9 @@ EventScript_1B2B98:: @ 81B2B98
 	end
 
 EventScript_1B2BC5:: @ 81B2BC5
-	compare_var_to_value VAR_BIRCH_STATE, 1
+	compare_var_to_value VAR_HOF_BRAG_STATE, 1
 	goto_if eq, EventScript_1B2C3D
-	setvar VAR_BIRCH_STATE, 1
+	setvar VAR_HOF_BRAG_STATE, 1
 	msgbox gUnknown_81B206E
 	goto EventScript_1B2C51
 
@@ -8086,9 +8086,9 @@ EventScript_1B2BE2:: @ 81B2BE2
 	end
 
 EventScript_1B2BE3:: @ 81B2BE3
-	compare_var_to_value VAR_BIRCH_STATE, 2
+	compare_var_to_value VAR_HOF_BRAG_STATE, 2
 	goto_if eq, EventScript_1B2C3D
-	setvar VAR_BIRCH_STATE, 2
+	setvar VAR_HOF_BRAG_STATE, 2
 	msgbox gUnknown_81B20CF
 	goto EventScript_1B2C51
 
@@ -8096,9 +8096,9 @@ EventScript_1B2C00:: @ 81B2C00
 	end
 
 EventScript_1B2C01:: @ 81B2C01
-	compare_var_to_value VAR_BIRCH_STATE, 3
+	compare_var_to_value VAR_HOF_BRAG_STATE, 3
 	goto_if eq, EventScript_1B2C3D
-	setvar VAR_BIRCH_STATE, 3
+	setvar VAR_HOF_BRAG_STATE, 3
 	msgbox gUnknown_81B2133
 	goto EventScript_1B2C51
 
@@ -8106,9 +8106,9 @@ EventScript_1B2C1E:: @ 81B2C1E
 	end
 
 EventScript_1B2C1F:: @ 81B2C1F
-	compare_var_to_value VAR_BIRCH_STATE, 4
+	compare_var_to_value VAR_HOF_BRAG_STATE, 4
 	goto_if eq, EventScript_1B2C47
-	setvar VAR_BIRCH_STATE, 4
+	setvar VAR_HOF_BRAG_STATE, 4
 	msgbox gUnknown_81B21C4
 	goto EventScript_1B2C51
 
@@ -8147,9 +8147,9 @@ EventScript_1B2C62:: @ 81B2C62
 	end
 
 EventScript_1B2C8F:: @ 81B2C8F
-	compare_var_to_value VAR_CRUISE_STEP_COUNT, 1
+	compare_var_to_value VAR_EGG_BRAG_STATE, 1
 	goto_if eq, EventScript_1B2D07
-	setvar VAR_CRUISE_STEP_COUNT, 1
+	setvar VAR_EGG_BRAG_STATE, 1
 	msgbox gUnknown_81B2308
 	goto EventScript_1B2D1B
 
@@ -8157,9 +8157,9 @@ EventScript_1B2CAC:: @ 81B2CAC
 	end
 
 EventScript_1B2CAD:: @ 81B2CAD
-	compare_var_to_value VAR_CRUISE_STEP_COUNT, 2
+	compare_var_to_value VAR_EGG_BRAG_STATE, 2
 	goto_if eq, EventScript_1B2D07
-	setvar VAR_CRUISE_STEP_COUNT, 2
+	setvar VAR_EGG_BRAG_STATE, 2
 	msgbox gUnknown_81B2372
 	goto EventScript_1B2D1B
 
@@ -8167,9 +8167,9 @@ EventScript_1B2CCA:: @ 81B2CCA
 	end
 
 EventScript_1B2CCB:: @ 81B2CCB
-	compare_var_to_value VAR_CRUISE_STEP_COUNT, 3
+	compare_var_to_value VAR_EGG_BRAG_STATE, 3
 	goto_if eq, EventScript_1B2D07
-	setvar VAR_CRUISE_STEP_COUNT, 3
+	setvar VAR_EGG_BRAG_STATE, 3
 	msgbox gUnknown_81B23E0
 	goto EventScript_1B2D1B
 
@@ -8177,9 +8177,9 @@ EventScript_1B2CE8:: @ 81B2CE8
 	end
 
 EventScript_1B2CE9:: @ 81B2CE9
-	compare_var_to_value VAR_CRUISE_STEP_COUNT, 4
+	compare_var_to_value VAR_EGG_BRAG_STATE, 4
 	goto_if eq, EventScript_1B2D11
-	setvar VAR_CRUISE_STEP_COUNT, 4
+	setvar VAR_EGG_BRAG_STATE, 4
 	msgbox gUnknown_81B2448
 	goto EventScript_1B2D1B
 
@@ -8218,9 +8218,9 @@ EventScript_1B2D2C:: @ 81B2D2C
 	end
 
 EventScript_1B2D59:: @ 81B2D59
-	compare_var_to_value VAR_POKELOT_RND1, 1
+	compare_var_to_value VAR_LINK_WIN_BRAG_STATE, 1
 	goto_if eq, EventScript_1B2DD1
-	setvar VAR_POKELOT_RND1, 1
+	setvar VAR_LINK_WIN_BRAG_STATE, 1
 	msgbox gUnknown_81B25A7
 	goto EventScript_1B2DE5
 
@@ -8228,9 +8228,9 @@ EventScript_1B2D76:: @ 81B2D76
 	end
 
 EventScript_1B2D77:: @ 81B2D77
-	compare_var_to_value VAR_POKELOT_RND1, 2
+	compare_var_to_value VAR_LINK_WIN_BRAG_STATE, 2
 	goto_if eq, EventScript_1B2DD1
-	setvar VAR_POKELOT_RND1, 2
+	setvar VAR_LINK_WIN_BRAG_STATE, 2
 	msgbox gUnknown_81B2609
 	goto EventScript_1B2DE5
 
@@ -8238,9 +8238,9 @@ EventScript_1B2D94:: @ 81B2D94
 	end
 
 EventScript_1B2D95:: @ 81B2D95
-	compare_var_to_value VAR_POKELOT_RND1, 3
+	compare_var_to_value VAR_LINK_WIN_BRAG_STATE, 3
 	goto_if eq, EventScript_1B2DD1
-	setvar VAR_POKELOT_RND1, 3
+	setvar VAR_LINK_WIN_BRAG_STATE, 3
 	msgbox gUnknown_81B267B
 	goto EventScript_1B2DE5
 
@@ -8248,9 +8248,9 @@ EventScript_1B2DB2:: @ 81B2DB2
 	end
 
 EventScript_1B2DB3:: @ 81B2DB3
-	compare_var_to_value VAR_POKELOT_RND1, 4
+	compare_var_to_value VAR_LINK_WIN_BRAG_STATE, 4
 	goto_if eq, EventScript_1B2DDB
-	setvar VAR_POKELOT_RND1, 4
+	setvar VAR_LINK_WIN_BRAG_STATE, 4
 	msgbox gUnknown_81B26F6
 	goto EventScript_1B2DE5
 

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
 

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

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
 

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

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

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

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
 

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
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

data/maps/ThreeIsland_Port/scripts.inc

@@ -3,8 +3,8 @@ ThreeIsland_Port_MapScripts:: @ 8168789
 	.byte 0
 
 ThreeIsland_Port_MapScript1_16878F:: @ 816878F
-	clearflag FLAG_0x841
+	clearflag FLAG_SYS_PC_STORAGE_DISABLED
-	setflag FLAG_0x2A1
+	setflag FLAG_SEVII_DETOUR_FINISHED
 	end
 
 ThreeIsland_Port_EventScript_168796:: @ 8168796

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

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

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

data/mystery_event_msg.s

@@ -36,13 +36,13 @@ sText_MysteryGiftStampCard: @ 8488E55
 MysteryEventScript_SurfPichu:: @ 8488EB5
 	setvaddress MysteryEventScript_SurfPichu
 	checkflag FLAG_MYSTERY_EVENT_DONE
-	vgoto_if 0, SurfPichu_GiveIfPossible
+	vgoto_if FALSE, SurfPichu_GiveIfPossible
 	gotoram
 
 SurfPichu_GiveIfPossible: @ 8488EC4
 	specialvar VAR_EVENT_PICHU_SLOT, CalculatePlayerPartyCount
 	compare_var_to_value VAR_EVENT_PICHU_SLOT, 6
-	vgoto_if 1, SurfPichu_FullParty
+	vgoto_if TRUE, SurfPichu_FullParty
 	setflag FLAG_MYSTERY_EVENT_DONE
 	vcall SurfPichu_GiveEgg
 	lock
@@ -69,15 +69,15 @@ SurfPichu_GiveEgg: @ 8488EF6
 	setmonobedient VAR_EVENT_PICHU_SLOT
 	setmonmetlocation VAR_EVENT_PICHU_SLOT, 0xff
 	compare_var_to_value VAR_EVENT_PICHU_SLOT, 1
-	vgoto_if 1, SurfPichu_Slot1
+	vgoto_if TRUE, SurfPichu_Slot1
 	compare_var_to_value VAR_EVENT_PICHU_SLOT, 2
-	vgoto_if 1, SurfPichu_Slot2
+	vgoto_if TRUE, SurfPichu_Slot2
 	compare_var_to_value VAR_EVENT_PICHU_SLOT, 3
-	vgoto_if 1, SurfPichu_Slot3
+	vgoto_if TRUE, SurfPichu_Slot3
 	compare_var_to_value VAR_EVENT_PICHU_SLOT, 4
-	vgoto_if 1, SurfPichu_Slot4
+	vgoto_if TRUE, SurfPichu_Slot4
 	compare_var_to_value VAR_EVENT_PICHU_SLOT, 5
-	vgoto_if 1, SurfPichu_Slot5
+	vgoto_if TRUE, SurfPichu_Slot5
 	return
 
 SurfPichu_Slot1: @ 8488F38
@@ -117,7 +117,7 @@ MysteryEventScript_VisitingTrainer:: @ 848903A
 	setvaddress MysteryEventScript_VisitingTrainer
 	special ValidateEReaderTrainer
 	compare_var_to_value VAR_RESULT, 0
-	vgoto_if 1, MysteryEventScript_VisitingTrainerArrived
+	vgoto_if TRUE, MysteryEventScript_VisitingTrainerArrived
 	lock
 	faceplayer
 	vmessage sText_MysteryGiftVisitingTrainer
@@ -166,11 +166,11 @@ sText_MysteryGiftVisitingTrainer_2: @ 84891B0
 MysteryEventScript_BattleCard:: @ 84892B9
 	setvaddress MysteryEventScript_BattleCard
 	checkflag FLAG_MYSTERY_EVENT_DONE
-	vgoto_if 1, MysteryEventScript_BattleCardInfo
+	vgoto_if TRUE, MysteryEventScript_BattleCardInfo
 	setorcopyvar VAR_RESULT, 2
 	specialvar VAR_0x8008, Special_BattleCardAction
 	compare_var_to_value VAR_0x8008, 3
-	vgoto_if 0, MysteryEventScript_BattleCardInfo
+	vgoto_if FALSE, MysteryEventScript_BattleCardInfo
 	lock
 	faceplayer
 	vmessage sText_MysteryGiftBattleCountCard_2
@@ -215,22 +215,22 @@ MysteryEventScript_AuroraTicket:: @ 84894B9
 	setvaddress MysteryEventScript_AuroraTicket
 	lock
 	faceplayer
-	checkflag FLAG_0x2A7
+	checkflag FLAG_GOT_AURORA_TICKET
-	vgoto_if 1, AuroraTicket_Obtained
+	vgoto_if TRUE, AuroraTicket_Obtained
-	checkflag FLAG_0x2E4
+	checkflag FLAG_FOUGHT_DEOXYS
-	vgoto_if 1, AuroraTicket_Obtained
+	vgoto_if TRUE, AuroraTicket_Obtained
 	checkitem ITEM_AURORA_TICKET, 1
 	compare_var_to_value VAR_RESULT, 1
-	vgoto_if 1, AuroraTicket_Obtained
+	vgoto_if TRUE, AuroraTicket_Obtained
 	vmessage sText_AuroraTicket1
 	waitmessage
 	waitbuttonpress
 	checkitemspace ITEM_AURORA_TICKET, 1
 	compare_var_to_value VAR_RESULT, 0
-	vgoto_if 1, AuroraTicket_NoBagSpace
+	vgoto_if TRUE, AuroraTicket_NoBagSpace
 	giveitem ITEM_AURORA_TICKET
 	setflag FLAG_0x84B
-	setflag FLAG_0x2A7
+	setflag FLAG_GOT_AURORA_TICKET
 	vmessage sText_AuroraTicket2
 	waitmessage
 	waitbuttonpress
@@ -277,24 +277,24 @@ MysteryEventScript_MysticTicket:: @ 8489689
 	setvaddress MysteryEventScript_MysticTicket
 	lock
 	faceplayer
-	checkflag FLAG_0x2A8
+	checkflag FLAG_GOT_MYSTIC_TICKET
-	vgoto_if 1, MysticTicket_Obtained
+	vgoto_if TRUE, MysticTicket_Obtained
-	checkflag FLAG_0x2F2
+	checkflag FLAG_FOUGHT_LUGIA
-	vgoto_if 1, MysticTicket_Obtained
+	vgoto_if TRUE, MysticTicket_Obtained
-	checkflag FLAG_0x2F3
+	checkflag FLAG_FOUGHT_HO_OH
-	vgoto_if 1, MysticTicket_Obtained
+	vgoto_if TRUE, MysticTicket_Obtained
 	checkitem ITEM_MYSTIC_TICKET, 1
 	compare_var_to_value VAR_RESULT, 1
-	vgoto_if 1, MysticTicket_Obtained
+	vgoto_if TRUE, MysticTicket_Obtained
 	vmessage sText_MysticTicket2
 	waitmessage
 	waitbuttonpress
 	checkitemspace ITEM_MYSTIC_TICKET, 1
 	compare_var_to_value VAR_RESULT, 0
-	vgoto_if 1, MysticTicket_NoBagSpace
+	vgoto_if TRUE, MysticTicket_NoBagSpace
 	giveitem ITEM_MYSTIC_TICKET
 	setflag FLAG_0x84A
-	setflag FLAG_0x2A8
+	setflag FLAG_GOT_MYSTIC_TICKET
 	vmessage sText_MysticTicket1
 	waitmessage
 	waitbuttonpress
@@ -341,7 +341,7 @@ MysteryEventScript_AlteringCave:: @ 8489862
 	setvaddress MysteryEventScript_AlteringCave
 	addvar VAR_ALTERING_CAVE_WILD_SET, 1
 	compare_var_to_value VAR_ALTERING_CAVE_WILD_SET, 10
-	vgoto_if 0, MysteryEventScript_AlteringCave_
+	vgoto_if FALSE, MysteryEventScript_AlteringCave_
 	setvar VAR_ALTERING_CAVE_WILD_SET, 0
 MysteryEventScript_AlteringCave_: @ 848987C
 	lock

include/constants/flags.h

@@ -669,31 +669,31 @@
 #define FLAG_SILPH_11F_DOOR                        0x28D
 #define FLAG_0x28E                                 0x28E
 #define FLAG_0x28F                                 0x28F
-#define FLAG_0x290               0x290
+#define FLAG_MET_STICKER_LADY                      0x290
-#define FLAG_0x291               0x291
+#define FLAG_PALLET_LADY_NOT_BLOCKING_SIGN         0x291
-#define FLAG_0x292               0x292
+#define FLAG_GOT_VS_SEEKER                         0x292
-#define FLAG_0x293               0x293
+#define FLAG_GOT_TM19_FROM_ERIKA                   0x293
-#define FLAG_0x294               0x294
+#define FLAG_GOT_TM33_FROM_THIRSTY_GIRL            0x294
-#define FLAG_0x295               0x295
+#define FLAG_GOT_TM20_FROM_THIRSTY_GIRL            0x295
-#define FLAG_0x296               0x296
+#define FLAG_GOT_TM16_FROM_THIRSTY_GIRL            0x296
-#define FLAG_0x297               0x297
+#define FLAG_GOT_TM03_FROM_MISTY                   0x297
-#define FLAG_0x298               0x298
+#define FLAG_GOT_TM26_FROM_GIOVANNI                0x298
-#define FLAG_0x299               0x299
+#define FLAG_0x299                                 0x299
-#define FLAG_0x29A               0x29A
+#define FLAG_GOT_TM04_FROM_SABRINA                 0x29A
-#define FLAG_0x29B               0x29B
+#define FLAG_GOT_FAME_CHECKER                      0x29B
-#define FLAG_0x29C               0x29C
+#define FLAG_GOT_RECORD_SETTING_MAGIKARP           0x29C
-#define FLAG_0x29D               0x29D
+#define FLAG_TWO_ISLAND_SHOP_INTRODUCED            0x29D
-#define FLAG_0x29E               0x29E
+#define FLAG_TWO_ISLAND_SHOP_EXPANDED_1            0x29E
-#define FLAG_0x29F               0x29F
+#define FLAG_TWO_ISLAND_SHOP_EXPANDED_2            0x29F
-#define FLAG_0x2A0               0x2A0
+#define FLAG_TWO_ISLAND_SHOP_EXPANDED_3            0x2A0
-#define FLAG_0x2A1               0x2A1
+#define FLAG_SEVII_DETOUR_FINISHED                 0x2A1
-#define FLAG_0x2A2               0x2A2
+#define FLAG_VISITED_TWO_ISLAND                    0x2A2
-#define FLAG_0x2A3               0x2A3
+#define FLAG_RESCUED_LOSTELLE                      0x2A3
-#define FLAG_0x2A4               0x2A4
+#define FLAG_0x2A4                                 0x2A4
-#define FLAG_0x2A5               0x2A5
+#define FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT           0x2A5
-#define FLAG_0x2A6               0x2A6
+#define FLAG_GOT_TEA                               0x2A6
-#define FLAG_0x2A7               0x2A7
+#define FLAG_GOT_AURORA_TICKET                     0x2A7
-#define FLAG_0x2A8               0x2A8
+#define FLAG_GOT_MYSTIC_TICKET                     0x2A8
 #define FLAG_0x2A9               0x2A9
 #define FLAG_0x2AA               0x2AA
 #define FLAG_0x2AB               0x2AB
@@ -753,7 +753,7 @@
 #define FLAG_0x2E1               0x2E1
 #define FLAG_0x2E2               0x2E2
 #define FLAG_0x2E3               0x2E3
-#define FLAG_0x2E4               0x2E4
+#define FLAG_FOUGHT_DEOXYS               0x2E4
 #define FLAG_0x2E5               0x2E5
 #define FLAG_0x2E6               0x2E6
 #define FLAG_0x2E7               0x2E7
@@ -767,8 +767,8 @@
 #define FLAG_0x2EF               0x2EF
 #define FLAG_0x2F0               0x2F0
 #define FLAG_0x2F1               0x2F1
-#define FLAG_0x2F2               0x2F2
+#define FLAG_FOUGHT_LUGIA               0x2F2
-#define FLAG_0x2F3               0x2F3
+#define FLAG_FOUGHT_HO_OH               0x2F3
 #define FLAG_0x2F4               0x2F4
 #define FLAG_0x2F5               0x2F5
 #define FLAG_0x2F6               0x2F6
@@ -1343,11 +1343,11 @@
 #define FLAG_0x83C (SYS_FLAGS + 0x3C)
 #define FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN (SYS_FLAGS + 0x3E)
 #define FLAG_SYS_NATIONAL_DEX (SYS_FLAGS + 0x40)
-#define FLAG_0x841 (SYS_FLAGS + 0x41)
+#define FLAG_SYS_PC_STORAGE_DISABLED (SYS_FLAGS + 0x41)
 #define FLAG_0x842 (SYS_FLAGS + 0x42)
 #define FLAG_0x843 (SYS_FLAGS + 0x43)
 #define FLAG_0x844 (SYS_FLAGS + 0x44)
-#define FLAG_0x845 (SYS_FLAGS + 0x45)
+#define FLAG_SYS_SEVII_MAP_123 (SYS_FLAGS + 0x45)
 #define FLAG_0x846 (SYS_FLAGS + 0x46)
 #define FLAG_0x847 (SYS_FLAGS + 0x47)
 #define FLAG_0x848 (SYS_FLAGS + 0x48)

include/constants/vars.h

@@ -79,9 +79,9 @@
 #define VAR_NATIONAL_DEX           0x4046
 #define VAR_SEEDOT_SIZE_RECORD     0x4047
 #define VAR_ASH_GATHER_COUNT       0x4048
-#define VAR_BIRCH_STATE            0x4049
+#define VAR_HOF_BRAG_STATE            0x4049
-#define VAR_CRUISE_STEP_COUNT      0x404A
+#define VAR_EGG_BRAG_STATE      0x404A
-#define VAR_POKELOT_RND1           0x404B
+#define VAR_LINK_WIN_BRAG_STATE           0x404B
 #define VAR_POKELOT_RND2           0x404C
 #define VAR_0x404D                 0x404D
 #define VAR_0x404E                 0x404E

src/help_system_812B1E0.c

@@ -1190,7 +1190,7 @@ static bool8 sub_812B780(u8 id)
         case 40:
             return sub_812BB10();
         case 39:
-            return FlagGet(FLAG_0x29B);
+            return FlagGet(FLAG_GOT_FAME_CHECKER);
         case 44:
             return FlagGet(FLAG_WORLD_MAP_PEWTER_CITY);
         }

src/vs_seeker.c

@@ -1254,7 +1254,7 @@ static void TryGetRematchTrainerIdGivenGameState(const u16 * a0, u8 * a1)
         case 0:
             break;
         case 1:
-            if (!FlagGet(FLAG_0x292))
+            if (!FlagGet(FLAG_GOT_VS_SEEKER))
                 *a1 = GetRematchTrainerIdGivenGameState(a0, *a1);
             break;
         case 2: