sys flags

7 files changed, 18 insertions, 18 deletions

diff --git a/src/help_system_812B1E0.c b/src/help_system_812B1E0.c
index 91818f425..1f3acdb2d 100644
--- a/src/help_system_812B1E0.c
+++ b/src/help_system_812B1E0.c
@@ -950,7 +950,7 @@ static bool8 IsInDungeonMap(void)
             if (
                    sDungeonMaps[i][0] == gSaveBlock1Ptr->location.mapGroup
                 && sDungeonMaps[i][1] + j == gSaveBlock1Ptr->location.mapNum
-                && (i != 15 /* TANOBY */ || FlagGet(FLAG_0x849) == TRUE)
+                && (i != 15 /* TANOBY */ || FlagGet(FLAG_SYS_UNLOCKED_TANOBY_RUINS) == TRUE)
             )
                 return TRUE;
         }
@@ -990,10 +990,10 @@ bool8 sub_812B40C(void)
     if (gUnknown_203B0EE == 1)
         return FALSE;
 
-    if (gSaveFileStatus != SAVE_STATUS_EMPTY && gSaveFileStatus != SAVE_STATUS_INVALID && FlagGet(FLAG_0x83C))
+    if (gSaveFileStatus != SAVE_STATUS_EMPTY && gSaveFileStatus != SAVE_STATUS_INVALID && FlagGet(FLAG_SYS_SAW_HELP_SYSTEM_INTRO))
         return FALSE;
 
-    FlagSet(FLAG_0x83C);
+    FlagSet(FLAG_SYS_SAW_HELP_SYSTEM_INTRO);
     gUnknown_203B0EE = 1;
     return TRUE;
 }
diff --git a/src/item.c b/src/item.c
index 42dfd334e..e76cb10d3 100644
--- a/src/item.c
+++ b/src/item.c
@@ -245,11 +245,11 @@ bool8 AddBagItem(u16 itemId, u16 count)
             return FALSE;
         gBagPockets[POCKET_KEY_ITEMS - 1].itemSlots[idx].itemId = ITEM_BERRY_POUCH;
         SetBagItemQuantity(&gBagPockets[POCKET_KEY_ITEMS - 1].itemSlots[idx].quantity, 1);
-        FlagSet(FLAG_0x847);
+        FlagSet(FLAG_SYS_GOT_BERRY_POUCH);
     }
 
     if (itemId == ITEM_BERRY_POUCH)
-        FlagSet(FLAG_0x847);
+        FlagSet(FLAG_SYS_GOT_BERRY_POUCH);
 
     idx = BagPocketGetFirstEmptySlot(pocket);
     if (idx == -1)
diff --git a/src/item_use.c b/src/item_use.c
index 98817f2d7..fd247acbb 100644
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -202,7 +202,7 @@ void FieldUseFunc_MachBike(u8 taskId)
     PlayerGetDestCoords(&x, &y);
     behavior = MapGridGetMetatileBehaviorAt(x, y);
 
-    if (FlagGet(FLAG_0x830) == TRUE
+    if (FlagGet(FLAG_SYS_ON_CYCLING_ROAD) == TRUE
      || MetatileBehavior_ReturnFalse_17(behavior) == TRUE
      || MetatileBehavior_ReturnFalse_18(behavior) == TRUE
      || MetatileBehavior_ReturnFalse_15(behavior) == TRUE
@@ -529,8 +529,8 @@ void FieldUseFunc_BlackFlute(u8 taskId)
     ItemUse_SetQuestLogEvent(4, NULL, gSpecialVar_ItemId, 0xFFFF);
     if (gSpecialVar_ItemId == ITEM_WHITE_FLUTE)
     {
-        FlagSet(FLAG_WHITE_FLUTE_ACTIVE);
-        FlagClear(FLAG_BLACK_FLUTE_ACTIVE);
+        FlagSet(FLAG_SYS_WHITE_FLUTE_ACTIVE);
+        FlagClear(FLAG_SYS_BLACK_FLUTE_ACTIVE);
         CopyItemName(gSpecialVar_ItemId, gStringVar2);
         StringExpandPlaceholders(gStringVar4, gUnknown_84165D2);
         gTasks[taskId].func = sub_80A1B48;
@@ -538,8 +538,8 @@ void FieldUseFunc_BlackFlute(u8 taskId)
     }
     else if (gSpecialVar_ItemId == ITEM_BLACK_FLUTE)
     {
-        FlagSet(FLAG_BLACK_FLUTE_ACTIVE);
-        FlagClear(FLAG_WHITE_FLUTE_ACTIVE);
+        FlagSet(FLAG_SYS_BLACK_FLUTE_ACTIVE);
+        FlagClear(FLAG_SYS_WHITE_FLUTE_ACTIVE);
         CopyItemName(gSpecialVar_ItemId, gStringVar2);
         StringExpandPlaceholders(gStringVar4, gUnknown_8416600);
         gTasks[taskId].func = sub_80A1B48;
diff --git a/src/link.c b/src/link.c
index 52f5aeddb..c8c7932df 100644
--- a/src/link.c
+++ b/src/link.c
@@ -329,7 +329,7 @@ static void InitLocalLinkPlayer(void)
     gLocalLinkPlayer.version = gGameVersion + 0x4000;
     gLocalLinkPlayer.lp_field_2 = 0x8000;
     gLocalLinkPlayer.name[8] = IsNationalPokedexEnabled();
-    if (FlagGet(FLAG_0x844))
+    if (FlagGet(FLAG_SYS_CAN_LINK_WITH_RS))
     {
         gLocalLinkPlayer.name[8] |= 0x10;
     }
diff --git a/src/pokemon.c b/src/pokemon.c
index 9060e9ff1..f9fe72007 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -3634,7 +3634,7 @@ static u8 SendMonToPC(struct Pokemon* mon)
                 gSpecialVar_MonBoxId = boxNo;
                 gSpecialVar_MonBoxPos = boxPos;
                 if (get_unknown_box_id() != boxNo)
-                    FlagClear(FLAG_0x843);
+                    FlagClear(FLAG_SYS_CHANGED_BOX_TO_STORE_MON);
                 VarSet(VAR_0x4037, boxNo);
                 return MON_GIVEN_TO_PC;
             }
diff --git a/src/quest_log.c b/src/quest_log.c
index 1ff5a1de5..11d57341b 100644
--- a/src/quest_log.c
+++ b/src/quest_log.c
@@ -3131,7 +3131,7 @@ static bool8 sub_8113778(u16 a0, u16 * a1)
             return TRUE;
     }
 
-    if (!FlagGet(FLAG_0x844))
+    if (!FlagGet(FLAG_SYS_CAN_LINK_WITH_RS))
     {
         if (a0 == 4 || a0 == 5 || a0 == 6 || a0 == 7 || a0 == 8 || a0 == 9 || a0 == 10 || a0 == 22 || a0 == 25 || a0 == 26)
             return TRUE;
diff --git a/src/vs_seeker.c b/src/vs_seeker.c
index db2ec9bee..784878a2c 100644
--- a/src/vs_seeker.c
+++ b/src/vs_seeker.c
@@ -641,7 +641,7 @@ bool8 sub_810C4EC(void)
             gSaveBlock1Ptr->trainerRematchStepCounter++;
     }
 
-    if (FlagGet(FLAG_0x801) == TRUE)
+    if (FlagGet(FLAG_SYS_VS_SEEKER_CHARGING) == TRUE)
     {
         u16 x;
         do {
@@ -657,7 +657,7 @@ bool8 sub_810C4EC(void)
         } while (0);
         if (x == 100)
         {
-            FlagClear(FLAG_0x801);
+            FlagClear(FLAG_SYS_VS_SEEKER_CHARGING);
             sub_810C640();
             sub_810D0D0();
             return TRUE;
@@ -743,7 +743,7 @@ bool8 sub_810C4EC(void)
 
 void sub_810C578(void)
 {
-    FlagClear(FLAG_0x801);
+    FlagClear(FLAG_SYS_VS_SEEKER_CHARGING);
     sub_810C640();
     sub_810D0D0();
     sub_810C594();
@@ -972,7 +972,7 @@ static u8 GetVsSeekerResponseInArea(const VsSeekerData * a0)
     if (sVsSeeker->trainerWantsRematch)
     {
         PlaySE(SE_PIN);
-        FlagSet(FLAG_0x801);
+        FlagSet(FLAG_SYS_VS_SEEKER_CHARGING);
         sub_810C640();
         return 2;
     }
@@ -1270,7 +1270,7 @@ static void TryGetRematchTrainerIdGivenGameState(const u16 * a0, u8 * a1)
                 *a1 = GetRematchTrainerIdGivenGameState(a0, *a1);
             break;
         case 5:
-            if (!FlagGet(FLAG_0x844))
+            if (!FlagGet(FLAG_SYS_CAN_LINK_WITH_RS))
                 *a1 = GetRematchTrainerIdGivenGameState(a0, *a1);
             break;
     }