Finish off labelling flags

10 files changed, 122 insertions, 122 deletions

diff --git a/src/battle_setup.c b/src/battle_setup.c
index 55ee331cd..4994acac2 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -1557,7 +1557,7 @@ static bool32 sub_80B1D94(s32 rematchTableId)
     if (rematchTableId >= REMATCH_ELITE_FOUR_ENTRIES)
         return TRUE;
     else if (rematchTableId == REMATCH_WALLY_ENTRY)
-        return (FlagGet(FLAG_0x07E) == FALSE);
+        return (FlagGet(FLAG_DEFEATED_WALLY_VICTORY_ROAD) == FALSE);
     else
         return FALSE;
 }
diff --git a/src/battle_tower.c b/src/battle_tower.c
index 12fde44f7..34efac72b 100644
--- a/src/battle_tower.c
+++ b/src/battle_tower.c
@@ -3158,10 +3158,10 @@ void sub_81653CC(void)
 {
     if (gSaveBlock2Ptr->frontier.field_CA8 == 1)
         sub_80F01B8();
-    if (FlagGet(FLAG_0x077) == TRUE)
+    if (FlagGet(FLAG_CANCEL_BATTLE_ROOM_CHALLENGE) == TRUE)
     {
         sub_80F01B8();
-        FlagClear(FLAG_0x077);
+        FlagClear(FLAG_CANCEL_BATTLE_ROOM_CHALLENGE);
     }
 }
 
diff --git a/src/event_data.c b/src/event_data.c
index f6a1cde78..df289c538 100644
--- a/src/event_data.c
+++ b/src/event_data.c
@@ -45,7 +45,7 @@ void ClearTempFieldEventData(void)
     FlagClear(FLAG_SYS_ENC_DOWN_ITEM);
     FlagClear(FLAG_SYS_USE_STRENGTH);
     FlagClear(FLAG_SYS_CTRL_OBJ_DELETE);
-    FlagClear(FLAG_0x880);
+    FlagClear(FLAG_NURSE_UNION_ROOM_REMINDER);
 }
 
 // Probably had different flag splits at one point.
@@ -114,21 +114,21 @@ bool32 IsMysteryGiftEnabled(void)
 void sub_809D4D8(void)
 {
     FlagClear(FLAG_MYSTERY_EVENT_DONE);
-    FlagClear(FLAG_0x1E5);
-    FlagClear(FLAG_0x1E6);
-    FlagClear(FLAG_0x1E7);
-    FlagClear(FLAG_0x1E8);
-    FlagClear(FLAG_0x1E9);
-    FlagClear(FLAG_0x1EA);
-    FlagClear(FLAG_0x1EB);
-    FlagClear(FLAG_0x1EC);
-    FlagClear(FLAG_0x1ED);
-    FlagClear(FLAG_0x1EE);
-    FlagClear(FLAG_0x1EF);
-    FlagClear(FLAG_0x1F0);
-    FlagClear(FLAG_0x1F1);
-    FlagClear(FLAG_0x1F2);
-    FlagClear(FLAG_0x1F3);
+    FlagClear(FLAG_MYSTERY_EVENT_1);
+    FlagClear(FLAG_MYSTERY_EVENT_2);
+    FlagClear(FLAG_MYSTERY_EVENT_3);
+    FlagClear(FLAG_MYSTERY_EVENT_4);
+    FlagClear(FLAG_MYSTERY_EVENT_5);
+    FlagClear(FLAG_MYSTERY_EVENT_6);
+    FlagClear(FLAG_MYSTERY_EVENT_7);
+    FlagClear(FLAG_MYSTERY_EVENT_8);
+    FlagClear(FLAG_MYSTERY_EVENT_9);
+    FlagClear(FLAG_MYSTERY_EVENT_10);
+    FlagClear(FLAG_MYSTERY_EVENT_11);
+    FlagClear(FLAG_MYSTERY_EVENT_12);
+    FlagClear(FLAG_MYSTERY_EVENT_13);
+    FlagClear(FLAG_MYSTERY_EVENT_14);
+    FlagClear(FLAG_MYSTERY_EVENT_15);
 }
 
 void sub_809D570(void)
diff --git a/src/field_specials.c b/src/field_specials.c
index 5e1c86dfe..e77a5e883 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -360,7 +360,7 @@ u8 GetSSTidalLocation(s8 *mapGroup, s8 *mapNum, s16 *x, s16 *y)
 
 bool32 is_tile_that_overrides_player_control(void)
 {
-    if (FlagGet(FLAG_0x088))
+    if (FlagGet(FLAG_ENABLE_FIRST_WALLY_POKENAV_CALL))
     {
         switch (gMapHeader.mapType)
         {
@@ -387,7 +387,7 @@ bool32 is_tile_that_overrides_player_control(void)
 
 bool32 sub_8138120(void)
 {
-    if (FlagGet(FLAG_0x08A))
+    if (FlagGet(FLAG_REGISTER_WINONA_POKENAV))
     {
         switch (gMapHeader.mapType)
         {
@@ -414,7 +414,7 @@ bool32 sub_8138120(void)
 
 bool32 sub_8138168(void)
 {
-    if (FlagGet(FLAG_0x072))
+    if (FlagGet(FLAG_SCOTT_CALL_NATIONAL_DEX))
     {
         switch (gMapHeader.mapType)
         {
@@ -441,7 +441,7 @@ bool32 sub_8138168(void)
 
 bool32 sub_81381B0(void)
 {
-    if (FlagGet(FLAG_0x080))
+    if (FlagGet(FLAG_ENABLE_ROXANNE_FIRST_CALL))
     {
         switch (gMapHeader.mapType)
         {
@@ -468,7 +468,7 @@ bool32 sub_81381B0(void)
 
 bool32 sub_81381F8(void)
 {
-    if (FlagGet(FLAG_0x075))
+    if (FlagGet(FLAG_DEFEATED_MAGMA_SPACE_CENTER))
     {
         switch (gMapHeader.mapType)
         {
@@ -1200,7 +1200,7 @@ void EndLotteryCornerComputerEffect(void)
 void SetTrickHouseEndRoomFlag(void)
 {
     u16 *specVar = &gSpecialVar_0x8004;
-    u16 flag = FLAG_0x1F5;
+    u16 flag = FLAG_TRICK_HOUSE_END_ROOM;
     *specVar = flag;
     FlagSet(flag);
 }
@@ -1208,7 +1208,7 @@ void SetTrickHouseEndRoomFlag(void)
 void ResetTrickHouseEndRoomFlag(void)
 {
     u16 *specVar = &gSpecialVar_0x8004;
-    u16 flag = FLAG_0x1F5;
+    u16 flag = FLAG_TRICK_HOUSE_END_ROOM;
     *specVar = flag;
     FlagClear(flag);
 }
@@ -2110,7 +2110,7 @@ void sub_813A080(void)
     u16 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE);
     u8 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
 
-    if (battleMode == FRONTIER_MODE_MULTIS && !FlagGet(FLAG_0x152))
+    if (battleMode == FRONTIER_MODE_MULTIS && !FlagGet(FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER))
     {
         gSpecialVar_0x8005 = 5;
         gSpecialVar_0x8006 = 4;
@@ -3432,11 +3432,11 @@ void sub_813B2E4(void)
     u16 randomValue = Random();
     VarSet(VAR_0x4038, 0);
 
-    if (FlagGet(FLAG_0x1BE) == TRUE)
+    if (FlagGet(FLAG_DEFEATED_KYOGRE) == TRUE)
     {
         VarSet(VAR_0x4037, (randomValue & 7) + 1);
     }
-    else if (FlagGet(FLAG_0x1BF) == TRUE)
+    else if (FlagGet(FLAG_DEFEATED_GROUDON) == TRUE)
     {
         VarSet(VAR_0x4037, (randomValue & 7) + 9);
     }
diff --git a/src/link.c b/src/link.c
index 79df699ef..1128ea436 100644
--- a/src/link.c
+++ b/src/link.c
@@ -317,7 +317,7 @@ static void InitLocalLinkPlayer(void)
     gLocalLinkPlayer.version = gGameVersion + 0x4000;
     gLocalLinkPlayer.lp_field_2 = 0x8000;
     gLocalLinkPlayer.name[8] = IsNationalPokedexEnabled();
-    if (FlagGet(FLAG_0x87F))
+    if (FlagGet(FLAG_IS_CHAMPION))
     {
         gLocalLinkPlayer.name[8] |= 0x10;
     }
diff --git a/src/link_rfu.c b/src/link_rfu.c
index 5f4beadee..f67e11792 100644
--- a/src/link_rfu.c
+++ b/src/link_rfu.c
@@ -2140,7 +2140,7 @@ void sub_800DD94(struct UnkLinkRfuStruct_02022B14 *data, u8 r9, bool32 r2, s32 r
     data->unk_00.unk_00_4 = 0;
     data->unk_00.unk_00_5 = 0;
     data->unk_00.unk_00_6 = 0;
-    data->unk_00.unk_00_7 = FlagGet(FLAG_0x87F);
+    data->unk_00.unk_00_7 = FlagGet(FLAG_IS_CHAMPION);
     data->unk_00.unk_01_0 = IsNationalPokedexEnabled();
     data->unk_00.unk_01_1 = FlagGet(FLAG_SYS_GAME_CLEAR);
 }
diff --git a/src/match_call.c b/src/match_call.c
index a15700070..53f9f0548 100644
--- a/src/match_call.c
+++ b/src/match_call.c
@@ -316,16 +316,16 @@ extern const u8 gMatchCall_MaySelfIntroductionText_Line2[];
 // .rodata
 
 static const match_call_text_data_t sMrStoneTextScripts[] = {
-    { gText_MrStone_Pokenav_2B60C0, 0xFFFF,              FLAG_0x158 },
-    { gText_MrStone_Pokenav_2B61E6, FLAG_0x158,          0xFFFF },
-    { gText_MrStone_Pokenav_2B6302, FLAG_0x0BD,          0xFFFF },
-    { gText_MrStone_Pokenav_2B63A0, FLAG_0x110,          0xFFFF },
-    { gText_MrStone_Pokenav_2B64A2, FLAG_0x06A,          0xFFFF },
-    { gText_MrStone_Pokenav_2B6526, FLAG_0x4F4,          0xFFFF },
-    { gText_MrStone_Pokenav_2B65BB, FLAG_0x097,          0xFFFF },
-    { gText_MrStone_Pokenav_2B6664, FLAG_0x06F,          0xFFFF },
-    { gText_MrStone_Pokenav_2B66B1, FLAG_0x070,          0xFFFF },
-    { gText_MrStone_Pokenav_2B6703, FLAG_0x4F7,          0xFFFF },
+    { gText_MrStone_Pokenav_2B60C0, 0xFFFF,              FLAG_ENABLE_MR_STONE_POKENAV },
+    { gText_MrStone_Pokenav_2B61E6, FLAG_ENABLE_MR_STONE_POKENAV,          0xFFFF },
+    { gText_MrStone_Pokenav_2B6302, FLAG_DELIVERED_STEVEN_LETTER,          0xFFFF },
+    { gText_MrStone_Pokenav_2B63A0, FLAG_RECEIVED_EXP_SHARE,          0xFFFF },
+    { gText_MrStone_Pokenav_2B64A2, FLAG_RECEIVED_HM04,          0xFFFF },
+    { gText_MrStone_Pokenav_2B6526, FLAG_DEFEATED_PETALBURG_GYM,          0xFFFF },
+    { gText_MrStone_Pokenav_2B65BB, FLAG_RECEIVED_CASTFORM,          0xFFFF },
+    { gText_MrStone_Pokenav_2B6664, FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT,          0xFFFF },
+    { gText_MrStone_Pokenav_2B66B1, FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE,          0xFFFF },
+    { gText_MrStone_Pokenav_2B6703, FLAG_DEFEATED_SOOTOPOLIS_GYM,          0xFFFF },
     { gText_MrStone_Pokenav_2B67ED, FLAG_SYS_GAME_CLEAR, 0xFFFF },
     { NULL,                         0xFFFF,              0xFFFF }
 };
@@ -333,11 +333,11 @@ static const match_call_text_data_t sMrStoneTextScripts[] = {
 MATCHCALLDEF(sMrStoneMatchCallHeader, 0, 10, 0xffff, gMrStoneMatchCallDesc, gMrStoneMatchCallName, sMrStoneTextScripts);
 
 static const match_call_text_data_t sNormanTextScripts[] = {
-    { gText_Norman_Pokenav_2B5719, FLAG_0x132,           0xFFFF },
-    { gText_Norman_Pokenav_2B5795, FLAG_0x4F1,           0xFFFF },
-    { gText_Norman_Pokenav_2B584D, FLAG_0x4F3,           0xFFFF },
-    { gText_Norman_Pokenav_2B58E3, FLAG_0x4F4,           0xFFFF },
-    { gText_Norman_Pokenav_2B5979, FLAG_0x0D4,           0xFFFF },
+    { gText_Norman_Pokenav_2B5719, FLAG_ENABLE_NORMAN_MATCH_CALL,           0xFFFF },
+    { gText_Norman_Pokenav_2B5795, FLAG_DEFEATED_DEWFORD_GYM,           0xFFFF },
+    { gText_Norman_Pokenav_2B584D, FLAG_DEFEATED_LAVARIDGE_GYM,           0xFFFF },
+    { gText_Norman_Pokenav_2B58E3, FLAG_DEFEATED_PETALBURG_GYM,           0xFFFF },
+    { gText_Norman_Pokenav_2B5979, FLAG_RECEIVED_RED_OR_BLUE_ORB,           0xFFFF },
     { gText_Norman_Pokenav_2B5A07, 0xFFFE,               0xFFFF },
     { gText_Norman_Pokenav_2B5A69, FLAG_SYS_GAME_CLEAR,  0xFFFF },
     { gText_Norman_Pokenav_2B5ACF, FLAG_SYS_GAME_CLEAR,  0xFFFF },
@@ -345,107 +345,107 @@ static const match_call_text_data_t sNormanTextScripts[] = {
     { NULL,                        0xFFFF,               0xFFFF }
 };
 
-MATCHCALLDEF(sNormanMatchCallHeader, 5, 7, FLAG_0x132, 0x45, gNormanMatchCallDesc, gNormanMatchCallName, sNormanTextScripts);
+MATCHCALLDEF(sNormanMatchCallHeader, 5, 7, FLAG_ENABLE_NORMAN_MATCH_CALL, 0x45, gNormanMatchCallDesc, gNormanMatchCallName, sNormanTextScripts);
 
-MATCHCALLDEF(sProfBirchMatchCallHeader, 3, 0, FLAG_0x119, gProfBirchMatchCallDesc, gProfBirchMatchCallName)
+MATCHCALLDEF(sProfBirchMatchCallHeader, 3, 0, FLAG_ENABLE_PROF_BIRCH_MATCH_CALL, gProfBirchMatchCallDesc, gProfBirchMatchCallName)
 
 static const match_call_text_data_t sMomTextScripts[] = {
     { gText_Mom_Pokenav_2B227B, 0xffff,              0xffff },
-    { gText_Mom_Pokenav_2B2310, FLAG_0x4F4,          0xffff },
+    { gText_Mom_Pokenav_2B2310, FLAG_DEFEATED_PETALBURG_GYM,          0xffff },
     { gText_Mom_Pokenav_2B23F3, FLAG_SYS_GAME_CLEAR, 0xffff },
     { NULL,                     0xffff,              0xffff }
 };
 
-MATCHCALLDEF(sMomMatchCallHeader, 0, 0, FLAG_0x0D8, gMomMatchCallDesc, gMomMatchCallName, sMomTextScripts);
+MATCHCALLDEF(sMomMatchCallHeader, 0, 0, FLAG_ENABLE_MOM_MATCH_CALL, gMomMatchCallDesc, gMomMatchCallName, sMomTextScripts);
 
 static const match_call_text_data_t sStevenTextScripts[] = {
     { gText_Steven_Pokenav_2B5B95, 0xffff,              0xffff },
     { gText_Steven_Pokenav_2B5C53, FLAG_RUSTURF_TUNNEL_OPENED,          0xffff },
-    { gText_Steven_Pokenav_2B5CC9, FLAG_0x0D4,          0xffff },
-    { gText_Steven_Pokenav_2B5DB4, FLAG_0x070,          0xffff },
-    { gText_Steven_Pokenav_2B5E26, FLAG_0x4F6,          0xffff },
-    { gText_Steven_Pokenav_2B5EA2, FLAG_0x081,          0xffff },
+    { gText_Steven_Pokenav_2B5CC9, FLAG_RECEIVED_RED_OR_BLUE_ORB,          0xffff },
+    { gText_Steven_Pokenav_2B5DB4, FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE,          0xffff },
+    { gText_Steven_Pokenav_2B5E26, FLAG_DEFEATED_MOSSDEEP_GYM,          0xffff },
+    { gText_Steven_Pokenav_2B5EA2, FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN,          0xffff },
     { gText_Steven_Pokenav_2B5ED9, FLAG_SYS_GAME_CLEAR, 0xffff },
     { NULL,                        0xffff,              0xffff },
 };
 
-MATCHCALLDEF(sStevenMatchCallHeader, 0, 0xd5, FLAG_0x131, gStevenMatchCallDesc, gStevenMatchCallName, sStevenTextScripts);
+MATCHCALLDEF(sStevenMatchCallHeader, 0, 0xd5, FLAG_REGISTERED_STEVEN_POKENAV, gStevenMatchCallDesc, gStevenMatchCallName, sStevenTextScripts);
 
 static const match_call_text_data_t sMayTextScripts[] = {
     { gText_May_Pokenav_2B3AB3, 0xFFFF,              0xFFFF },
-    { gText_May_Pokenav_2B3B3F, FLAG_0x4F1,          0xFFFF },
-    { gText_May_Pokenav_2B3C13, FLAG_0x095,          0xFFFF },
+    { gText_May_Pokenav_2B3B3F, FLAG_DEFEATED_DEWFORD_GYM,          0xFFFF },
+    { gText_May_Pokenav_2B3C13, FLAG_DELIVERED_DEVON_GOODS,          0xFFFF },
     { gText_May_Pokenav_2B3CF3, FLAG_HIDE_MAUVILLE_CITY_WALLY,          0xFFFF },
-    { gText_May_Pokenav_2B3D4B, FLAG_0x06A,          0xFFFF },
-    { gText_May_Pokenav_2B3DD1, FLAG_0x4F3,          0xFFFF },
-    { gText_May_Pokenav_2B3E69, FLAG_0x4F4,          0xFFFF },
-    { gText_May_Pokenav_2B3ECD, FLAG_0x097,          0xFFFF },
-    { gText_May_Pokenav_2B3F2B, FLAG_0x0D4,          0xFFFF },
-    { gText_May_Pokenav_2B3FFB, FLAG_0x06F,          0xFFFF },
-    { gText_May_Pokenav_2B402B, FLAG_0x061,          0xFFFF },
-    { gText_May_Pokenav_2B414B, FLAG_0x070,          0xFFFF },
-    { gText_May_Pokenav_2B4228, FLAG_0x081,          0xFFFF },
-    { gText_May_Pokenav_2B42E0, FLAG_0x4F7,          0xFFFF },
+    { gText_May_Pokenav_2B3D4B, FLAG_RECEIVED_HM04,          0xFFFF },
+    { gText_May_Pokenav_2B3DD1, FLAG_DEFEATED_LAVARIDGE_GYM,          0xFFFF },
+    { gText_May_Pokenav_2B3E69, FLAG_DEFEATED_PETALBURG_GYM,          0xFFFF },
+    { gText_May_Pokenav_2B3ECD, FLAG_RECEIVED_CASTFORM,          0xFFFF },
+    { gText_May_Pokenav_2B3F2B, FLAG_RECEIVED_RED_OR_BLUE_ORB,          0xFFFF },
+    { gText_May_Pokenav_2B3FFB, FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT,          0xFFFF },
+    { gText_May_Pokenav_2B402B, FLAG_MET_TEAM_AQUA_HARBOR,          0xFFFF },
+    { gText_May_Pokenav_2B414B, FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE,          0xFFFF },
+    { gText_May_Pokenav_2B4228, FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN,          0xFFFF },
+    { gText_May_Pokenav_2B42E0, FLAG_DEFEATED_SOOTOPOLIS_GYM,          0xFFFF },
     { gText_May_Pokenav_2B4350, FLAG_SYS_GAME_CLEAR, 0xFFFF },
     { NULL,                     0xFFFF,              0xFFFF }
 };
 
-MATCHCALLDEF(sMayMatchCallHeader, 4, MALE, FLAG_0x0FD, gMayBrendanMatchCallDesc, gExpandedPlaceholder_May, sMayTextScripts);
+MATCHCALLDEF(sMayMatchCallHeader, 4, MALE, FLAG_ENABLE_RIVAL_MATCH_CALL, gMayBrendanMatchCallDesc, gExpandedPlaceholder_May, sMayTextScripts);
 
 static const match_call_text_data_t sBrendanTextScripts[] = {
     { gText_Brendan_Pokenav_2B43EF, 0xFFFF,              0xFFFF },
-    { gText_Brendan_Pokenav_2B4486, FLAG_0x4F1,          0xFFFF },
-    { gText_Brendan_Pokenav_2B4560, FLAG_0x095,          0xFFFF },
+    { gText_Brendan_Pokenav_2B4486, FLAG_DEFEATED_DEWFORD_GYM,          0xFFFF },
+    { gText_Brendan_Pokenav_2B4560, FLAG_DELIVERED_DEVON_GOODS,          0xFFFF },
     { gText_Brendan_Pokenav_2B463F, FLAG_HIDE_MAUVILLE_CITY_WALLY,          0xFFFF },
-    { gText_Brendan_Pokenav_2B46B7, FLAG_0x06A,          0xFFFF },
-    { gText_Brendan_Pokenav_2B4761, FLAG_0x4F3,          0xFFFF },
-    { gText_Brendan_Pokenav_2B47F4, FLAG_0x4F4,          0xFFFF },
-    { gText_Brendan_Pokenav_2B4882, FLAG_0x097,          0xFFFF },
-    { gText_Brendan_Pokenav_2B4909, FLAG_0x0D4,          0xFFFF },
-    { gText_Brendan_Pokenav_2B49C4, FLAG_0x06F,          0xFFFF },
-    { gText_Brendan_Pokenav_2B4A44, FLAG_0x061,          0xFFFF },
-    { gText_Brendan_Pokenav_2B4B28, FLAG_0x070,          0xFFFF },
-    { gText_Brendan_Pokenav_2B4C15, FLAG_0x081,          0xFFFF },
-    { gText_Brendan_Pokenav_2B4CD8, FLAG_0x4F7,          0xFFFF },
+    { gText_Brendan_Pokenav_2B46B7, FLAG_RECEIVED_HM04,          0xFFFF },
+    { gText_Brendan_Pokenav_2B4761, FLAG_DEFEATED_LAVARIDGE_GYM,          0xFFFF },
+    { gText_Brendan_Pokenav_2B47F4, FLAG_DEFEATED_PETALBURG_GYM,          0xFFFF },
+    { gText_Brendan_Pokenav_2B4882, FLAG_RECEIVED_CASTFORM,          0xFFFF },
+    { gText_Brendan_Pokenav_2B4909, FLAG_RECEIVED_RED_OR_BLUE_ORB,          0xFFFF },
+    { gText_Brendan_Pokenav_2B49C4, FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT,          0xFFFF },
+    { gText_Brendan_Pokenav_2B4A44, FLAG_MET_TEAM_AQUA_HARBOR,          0xFFFF },
+    { gText_Brendan_Pokenav_2B4B28, FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE,          0xFFFF },
+    { gText_Brendan_Pokenav_2B4C15, FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN,          0xFFFF },
+    { gText_Brendan_Pokenav_2B4CD8, FLAG_DEFEATED_SOOTOPOLIS_GYM,          0xFFFF },
     { gText_Brendan_Pokenav_2B4D46, FLAG_SYS_GAME_CLEAR, 0xFFFF },
     { NULL,                         0xFFFF,              0xFFFF }
 };
 
-MATCHCALLDEF(sBrendanMatchCallHeader, 4, FEMALE, FLAG_0x0FD, gMayBrendanMatchCallDesc, gExpandedPlaceholder_Brendan, sBrendanTextScripts);
+MATCHCALLDEF(sBrendanMatchCallHeader, 4, FEMALE, FLAG_ENABLE_RIVAL_MATCH_CALL, gMayBrendanMatchCallDesc, gExpandedPlaceholder_Brendan, sBrendanTextScripts);
 
 static const match_call_text_data_t sWallyTextScripts[] = {
     { gText_Wally_Pokenav_2B4DE2, 0xFFFF,     0xFFFF },
     { gText_Wally_Pokenav_2B4E57, FLAG_RUSTURF_TUNNEL_OPENED, 0xFFFF },
-    { gText_Wally_Pokenav_2B4EA5, FLAG_0x4F3, 0xFFFF },
-    { gText_Wally_Pokenav_2B4F41, FLAG_0x097, 0xFFFF },
-    { gText_Wally_Pokenav_2B4FF3, FLAG_0x06F, 0xFFFF },
-    { gText_Wally_Pokenav_2B50B1, FLAG_0x081, 0xFFFF },
-    { gText_Wally_Pokenav_2B5100, FLAG_0x07E, 0xFFFF },
+    { gText_Wally_Pokenav_2B4EA5, FLAG_DEFEATED_LAVARIDGE_GYM, 0xFFFF },
+    { gText_Wally_Pokenav_2B4F41, FLAG_RECEIVED_CASTFORM, 0xFFFF },
+    { gText_Wally_Pokenav_2B4FF3, FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT, 0xFFFF },
+    { gText_Wally_Pokenav_2B50B1, FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, 0xFFFF },
+    { gText_Wally_Pokenav_2B5100, FLAG_DEFEATED_WALLY_VICTORY_ROAD, 0xFFFF },
     { NULL,                       0xFFFF,     0xFFFF }
 };
 
 const struct MatchCallSubstruct2 sWallyAdditionalData[] = {
     { FLAG_HIDE_MAUVILLE_CITY_WALLY, 0x05 },
-    { FLAG_0x06F, 0xD5 },
+    { FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT, 0xD5 },
     { FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY, 0x46 },
     { 0xFFFF,     0xD5 }
 };
 
-MATCHCALLDEF(sWallyMatchCallHeader, 2, 0, FLAG_0x0D6, REMATCH_WALLY_3, gWallyMatchCallDesc, sWallyTextScripts, sWallyAdditionalData);
+MATCHCALLDEF(sWallyMatchCallHeader, 2, 0, FLAG_ENABLE_WALLY_MATCH_CALL, REMATCH_WALLY_3, gWallyMatchCallDesc, sWallyTextScripts, sWallyAdditionalData);
 
 static const match_call_text_data_t sScottTextScripts[] = {
     { gText_Scott_Pokenav_2B5184, 0xFFFF,              0xFFFF },
-    { gText_Scott_Pokenav_2B5275, FLAG_0x08B,          0xFFFF },
-    { gText_Scott_Pokenav_2B5323, FLAG_0x097,          0xFFFF },
-    { gText_Scott_Pokenav_2B53DB, FLAG_0x0D4,          0xFFFF },
-    { gText_Scott_Pokenav_2B54A5, FLAG_0x070,          0xFFFF },
-    { gText_Scott_Pokenav_2B5541, FLAG_0x4F7,          0xFFFF },
+    { gText_Scott_Pokenav_2B5275, FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY,          0xFFFF },
+    { gText_Scott_Pokenav_2B5323, FLAG_RECEIVED_CASTFORM,          0xFFFF },
+    { gText_Scott_Pokenav_2B53DB, FLAG_RECEIVED_RED_OR_BLUE_ORB,          0xFFFF },
+    { gText_Scott_Pokenav_2B54A5, FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE,          0xFFFF },
+    { gText_Scott_Pokenav_2B5541, FLAG_DEFEATED_SOOTOPOLIS_GYM,          0xFFFF },
     { gText_Scott_Pokenav_2B56CA, FLAG_SYS_GAME_CLEAR, 0xFFFF },
     { NULL,                       0xFFFF,              0xFFFF }
 };
 
 
-MATCHCALLDEF(sScottMatchCallHeader, 0, 0xD5, FLAG_0x0D7, gScottMatchCallDesc, gScottMatchCallName, sScottTextScripts);
+MATCHCALLDEF(sScottMatchCallHeader, 0, 0xD5, FLAG_ENABLE_SCOTT_MATCH_CALL, gScottMatchCallDesc, gScottMatchCallName, sScottTextScripts);
 
 static const match_call_text_data_t sRoxanneTextScripts[] = {
     { gText_Roxanne_Pokenav_2B2456, 0xFFFE,              0xFFFF },
@@ -455,7 +455,7 @@ static const match_call_text_data_t sRoxanneTextScripts[] = {
     { NULL,                         0xFFFF,              0xFFFF }
 };
 
-MATCHCALLDEF(sRoxanneMatchCallHeader, 5, 10, FLAG_0x1D3, 0x41, gRoxanneMatchCallDesc, NULL, sRoxanneTextScripts);
+MATCHCALLDEF(sRoxanneMatchCallHeader, 5, 10, FLAG_ENABLE_ROXANNE_MATCH_CALL, 0x41, gRoxanneMatchCallDesc, NULL, sRoxanneTextScripts);
 
 static const match_call_text_data_t sBrawlyTextScripts[] = {
     { gText_Brawly_Pokenav_2B2659, 0xFFFE,              0xFFFF },
@@ -465,7 +465,7 @@ static const match_call_text_data_t sBrawlyTextScripts[] = {
     { NULL,                        0xFFFF,              0xFFFF }
 };
 
-MATCHCALLDEF(sBrawlyMatchCallHeader, 5, 2, FLAG_0x1D4, 0x42, gBrawlyMatchCallDesc, NULL, sBrawlyTextScripts);
+MATCHCALLDEF(sBrawlyMatchCallHeader, 5, 2, FLAG_ENABLE_BRAWLY_MATCH_CALL, 0x42, gBrawlyMatchCallDesc, NULL, sBrawlyTextScripts);
 
 static const match_call_text_data_t sWattsonTextScripts[] = {
     { gText_Wattson_Pokenav_2B2912, 0xFFFE,              0xFFFF },
@@ -475,7 +475,7 @@ static const match_call_text_data_t sWattsonTextScripts[] = {
     { NULL,                         0xFFFF,              0xFFFF }
 };
 
-MATCHCALLDEF(sWattsonMatchCallHeader, 5, 9, FLAG_0x1D5, 0x43, gWattsonMatchCallDesc, NULL, sWattsonTextScripts);
+MATCHCALLDEF(sWattsonMatchCallHeader, 5, 9, FLAG_ENABLE_WATTSON_MATCH_CALL, 0x43, gWattsonMatchCallDesc, NULL, sWattsonTextScripts);
 
 static const match_call_text_data_t sFlanneryTextScripts[] = {
     { gText_Flannery_Pokenav_2B2B4D, 0xFFFE,              0xFFFF },
@@ -485,7 +485,7 @@ static const match_call_text_data_t sFlanneryTextScripts[] = {
     { NULL,                          0xFFFF,              0xFFFF }
 };
 
-MATCHCALLDEF(sFlanneryMatchCallHeader, 5, 3, FLAG_0x1D6, 0x44, gFlanneryMatchCallDesc, NULL, sFlanneryTextScripts);
+MATCHCALLDEF(sFlanneryMatchCallHeader, 5, 3, FLAG_ENABLE_FLANNERY_MATCH_CALL, 0x44, gFlanneryMatchCallDesc, NULL, sFlanneryTextScripts);
 
 static const match_call_text_data_t sWinonaTextScripts[] = {
     { gText_Winona_Pokenav_2B2DA4, 0xFFFE,              0xFFFF },
@@ -495,7 +495,7 @@ static const match_call_text_data_t sWinonaTextScripts[] = {
     { NULL,                        0xFFFF,              0xFFFF }
 };
 
-MATCHCALLDEF(sWinonaMatchCallHeader, 5, 11, FLAG_0x1D7, 0x46, gWinonaMatchCallDesc, NULL, sWinonaTextScripts);
+MATCHCALLDEF(sWinonaMatchCallHeader, 5, 11, FLAG_ENABLE_WINONA_MATCH_CALL, 0x46, gWinonaMatchCallDesc, NULL, sWinonaTextScripts);
 
 static const match_call_text_data_t sTateLizaTextScripts[] = {
     { gText_TateLiza_Pokenav_2B2F97, 0xFFFE,              0xFFFF },
@@ -505,7 +505,7 @@ static const match_call_text_data_t sTateLizaTextScripts[] = {
     { NULL,                          0xFFFF,              0xFFFF }
 };
 
-MATCHCALLDEF(sTateLizaMatchCallHeader, 5, 13, FLAG_0x1D8, 0x47, gTateLizaMatchCallDesc, NULL, sTateLizaTextScripts);
+MATCHCALLDEF(sTateLizaMatchCallHeader, 5, 13, FLAG_ENABLE_TATE_AND_LIZA_MATCH_CALL, 0x47, gTateLizaMatchCallDesc, NULL, sTateLizaTextScripts);
 
 static const match_call_text_data_t sJuanTextScripts[] = {
     { gText_Juan_Pokenav_2B3249, 0xFFFE,              0xFFFF },
@@ -515,42 +515,42 @@ static const match_call_text_data_t sJuanTextScripts[] = {
     { NULL,                      0xFFFF,              0xFFFF }
 };
 
-MATCHCALLDEF(sJuanMatchCallHeader, 5, 14, FLAG_0x1D9, 0x48, gJuanMatchCallDesc, NULL, sJuanTextScripts);
+MATCHCALLDEF(sJuanMatchCallHeader, 5, 14, FLAG_ENABLE_JUAN_MATCH_CALL, 0x48, gJuanMatchCallDesc, NULL, sJuanTextScripts);
 
 static const match_call_text_data_t sSidneyTextScripts[] = {
     { gText_Sidney_Pokenav_2B34CC, 0xFFFF, 0xFFFF },
     { NULL,                        0xFFFF, 0xFFFF }
 };
 
-MATCHCALLDEF(sSidneyMatchCallHeader, 5, 15, FLAG_0x1A5, 0x49, gEliteFourMatchCallDesc, NULL, sSidneyTextScripts);
+MATCHCALLDEF(sSidneyMatchCallHeader, 5, 15, FLAG_REMATCH_JUAN, 0x49, gEliteFourMatchCallDesc, NULL, sSidneyTextScripts);
 
 static const match_call_text_data_t sPhoebeTextScripts[] = {
     { gText_Phoebe_Pokenav_2B3561, 0xFFFF, 0xFFFF },
     { NULL,                        0xFFFF, 0xFFFF }
 };
 
-MATCHCALLDEF(sPhoebeMatchCallHeader, 5, 15, FLAG_0x1A6, 0x4A, gEliteFourMatchCallDesc, NULL, sPhoebeTextScripts);
+MATCHCALLDEF(sPhoebeMatchCallHeader, 5, 15, FLAG_REMATCH_SIDNEY, 0x4A, gEliteFourMatchCallDesc, NULL, sPhoebeTextScripts);
 
 static const match_call_text_data_t sGlaciaTextScripts[] = {
     { gText_Glacia_Pokenav_2B35E4, 0xFFFF, 0xFFFF },
     { NULL,                        0xFFFF, 0xFFFF }
 };
 
-MATCHCALLDEF(sGlaciaMatchCallHeader, 5, 15, FLAG_0x1A7, 0x4B, gEliteFourMatchCallDesc, NULL, sGlaciaTextScripts);
+MATCHCALLDEF(sGlaciaMatchCallHeader, 5, 15, FLAG_REMATCH_PHOEBE, 0x4B, gEliteFourMatchCallDesc, NULL, sGlaciaTextScripts);
 
 static const match_call_text_data_t sDrakeTextScripts[] = {
     { gText_Drake_Pokenav_2B368B, 0xFFFF, 0xFFFF },
     { NULL,                       0xFFFF, 0xFFFF }
 };
 
-MATCHCALLDEF(sDrakeMatchCallHeader, 5, 15, FLAG_0x1A8, 0x4C, gEliteFourMatchCallDesc, NULL, sDrakeTextScripts);
+MATCHCALLDEF(sDrakeMatchCallHeader, 5, 15, FLAG_REMATCH_GLACIA, 0x4C, gEliteFourMatchCallDesc, NULL, sDrakeTextScripts);
 
 static const match_call_text_data_t sWallaceTextScripts[] = {
     { gText_Wallace_Pokenav_2B3790, 0xFFFF, 0xFFFF },
     { NULL,                         0xFFFF, 0xFFFF }
 };
 
-MATCHCALLDEF(sWallaceMatchCallHeader, 5, 15, FLAG_0x1A9, 0x4D, gChampionMatchCallDesc, NULL, sWallaceTextScripts);
+MATCHCALLDEF(sWallaceMatchCallHeader, 5, 15, FLAG_REMATCH_DRAKE, 0x4D, gChampionMatchCallDesc, NULL, sWallaceTextScripts);
 
 static const match_call_t sMatchCallHeaders[] = {
     {.type0 = &sMrStoneMatchCallHeader},
@@ -634,7 +634,7 @@ static void (*const sMatchCall_GetNameAndDescFunctions[])(match_call_t, const u8
 
 static const struct UnkStruct_08625388 sMatchCallCheckPageOverrides[] = {
     { 7, 0x4B, 0xffff, { gMatchCallStevenStrategyText, gMatchCall_StevenTrainersPokemonText, gMatchCall_StevenSelfIntroductionText_Line1_BeforeMeteorFallsBattle, gMatchCall_StevenSelfIntroductionText_Line2_BeforeMeteorFallsBattle } }, // STEVEN
-    { 7, 0x4B, FLAG_0x4F6, { gMatchCallStevenStrategyText, gMatchCall_StevenTrainersPokemonText, gMatchCall_StevenSelfIntroductionText_Line1_AfterMeteorFallsBattle, gMatchCall_StevenSelfIntroductionText_Line2_AfterMeteorFallsBattle } }, // STEVEN
+    { 7, 0x4B, FLAG_DEFEATED_MOSSDEEP_GYM, { gMatchCallStevenStrategyText, gMatchCall_StevenTrainersPokemonText, gMatchCall_StevenSelfIntroductionText_Line1_AfterMeteorFallsBattle, gMatchCall_StevenSelfIntroductionText_Line2_AfterMeteorFallsBattle } }, // STEVEN
     { 2, 0x3c, 0xffff, { gMatchCall_BrendanStrategyText, gMatchCall_BrendanTrainersPokemonText, gMatchCall_BrendanSelfIntroductionText_Line1, gMatchCall_BrendanSelfIntroductionText_Line2 } }, // Brendan
     { 3, 0x3f, 0xffff, { gMatchCall_MayStrategyText, gMatchCall_MayTrainersPokemonText, gMatchCall_MaySelfIntroductionText_Line1, gMatchCall_MaySelfIntroductionText_Line2 } } // May
 };
diff --git a/src/pokedex_area_screen.c b/src/pokedex_area_screen.c
index 30a127c71..ca5b79a5e 100755
--- a/src/pokedex_area_screen.c
+++ b/src/pokedex_area_screen.c
@@ -96,7 +96,7 @@ static const u16 sLandmarkData[][2] = {
     {MAPSEC_ALTERING_CAVE_2,  FLAG_LANDMARK_ALTERING_CAVE},
     {MAPSEC_MIRAGE_TOWER,     FLAG_LANDMARK_MIRAGE_TOWER},
     {MAPSEC_DESERT_UNDERPASS, FLAG_LANDMARK_DESERT_UNDERPASS},
-    {MAPSEC_ARTISAN_CAVE,     FLAG_0x8DF},
+    {MAPSEC_ARTISAN_CAVE,     FLAG_LANDMARK_ARTISAN_CAVE},
     {MAPSEC_NONE}
 };
 
diff --git a/src/script_menu.c b/src/script_menu.c
index 6f16b1a8a..d415d65a9 100644
--- a/src/script_menu.c
+++ b/src/script_menu.c
@@ -1416,7 +1416,7 @@ static void sub_80E2578(void)
     {
         gUnknown_03001124[temp] = 0;
         temp++;
-        if (FlagGet(FLAG_0x1D0) == TRUE)
+        if (FlagGet(FLAG_MET_SCOTT_ON_SS_TIDAL) == TRUE)
         {
             gUnknown_03001124[temp] = 1;
             temp++;
@@ -1431,15 +1431,15 @@ static void sub_80E2578(void)
             temp++;
         }
 
-        if (gSpecialVar_0x8004 == 1 && FlagGet(FLAG_0x1AE) == FALSE)
+        if (gSpecialVar_0x8004 == 1 && FlagGet(FLAG_HAS_EON_TICKET) == FALSE)
         {
             gUnknown_03001124[temp] = 2;
             temp++;
-            FlagSet(FLAG_0x1AE);
+            FlagSet(FLAG_HAS_EON_TICKET);
         }
     }
 
-    if (CheckBagHasItem(ITEM_MYSTIC_TICKET, 1) == TRUE && FlagGet(FLAG_0x8E0) == TRUE)
+    if (CheckBagHasItem(ITEM_MYSTIC_TICKET, 1) == TRUE && FlagGet(FLAG_ENABLE_SHIP_NAVEL_ROCK) == TRUE)
     {
         if (gSpecialVar_0x8004 == 0)
         {
@@ -1447,15 +1447,15 @@ static void sub_80E2578(void)
             temp++;
         }
 
-        if (gSpecialVar_0x8004 == 1 && FlagGet(FLAG_0x1DB) == FALSE)
+        if (gSpecialVar_0x8004 == 1 && FlagGet(FLAG_HAS_MYSTIC_TICKET) == FALSE)
         {
             gUnknown_03001124[temp] = 3;
             temp++;
-            FlagSet(FLAG_0x1DB);
+            FlagSet(FLAG_HAS_MYSTIC_TICKET);
         }
     }
 
-    if (CheckBagHasItem(ITEM_AURORA_TICKET, 1) == TRUE && FlagGet(FLAG_0x8D5) == TRUE)
+    if (CheckBagHasItem(ITEM_AURORA_TICKET, 1) == TRUE && FlagGet(FLAG_ENABLE_SHIP_BIRTH_ISLAND) == TRUE)
     {
         if (gSpecialVar_0x8004 == 0)
         {
@@ -1463,15 +1463,15 @@ static void sub_80E2578(void)
             temp++;
         }
 
-        if (gSpecialVar_0x8004 == 1 && FlagGet(FLAG_0x1AF) == FALSE)
+        if (gSpecialVar_0x8004 == 1 && FlagGet(FLAG_HAS_AURORA_TICKET) == FALSE)
         {
             gUnknown_03001124[temp] = 4;
             temp++;
-            FlagSet(FLAG_0x1AF);
+            FlagSet(FLAG_HAS_AURORA_TICKET);
         }
     }
 
-    if (CheckBagHasItem(ITEM_OLD_SEA_MAP, 1) == TRUE && FlagGet(FLAG_0x8D6) == TRUE)
+    if (CheckBagHasItem(ITEM_OLD_SEA_MAP, 1) == TRUE && FlagGet(FLAG_ENABLE_SHIP_FARAWAY_ISLAND) == TRUE)
     {
         if (gSpecialVar_0x8004 == 0)
         {
@@ -1479,18 +1479,18 @@ static void sub_80E2578(void)
             temp++;
         }
 
-        if (gSpecialVar_0x8004 == 1 && FlagGet(FLAG_0x1B0) == FALSE)
+        if (gSpecialVar_0x8004 == 1 && FlagGet(FLAG_HAS_OLD_SEA_MAP) == FALSE)
         {
             gUnknown_03001124[temp] = 5;
             temp++;
-            FlagSet(FLAG_0x1B0);
+            FlagSet(FLAG_HAS_OLD_SEA_MAP);
         }
     }
 
     gUnknown_03001124[temp] = 6;
     temp++;
 
-    if (gSpecialVar_0x8004 == 0 && FlagGet(FLAG_0x1D0) == TRUE)
+    if (gSpecialVar_0x8004 == 0 && FlagGet(FLAG_MET_SCOTT_ON_SS_TIDAL) == TRUE)
     {
         count = temp;
     }
diff --git a/src/tv.c b/src/tv.c
index 3d2a25bdc..b2a0ab0d8 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -3538,7 +3538,7 @@ u8 CheckForBigMovieOrEmergencyNewsOnTV(void)
             return 0;
         }
     }
-    if (FlagGet(FLAG_SYS_TV_LATI) == TRUE)
+    if (FlagGet(FLAG_SYS_TV_LATIAS_LATIOS) == TRUE)
     {
         return 1;
     }