6 files changed, 14 insertions, 14 deletions
diff --git a/src/engine/clock.c b/src/engine/clock.c
index cb8af64a8..416aaa6bb 100644
--- a/src/engine/clock.c
+++ b/src/engine/clock.c
@@ -20,7 +20,7 @@ static void ReturnFromStartWallClock(void);
 
 static void InitTimeBasedEvents(void)
 {
-    FlagSet(SYS_CLOCK_SET);
+    FlagSet(FLAG_SYS_CLOCK_SET);
     RtcCalcLocalTime();
     gSaveBlock2.lastBerryTreeUpdate = gLocalTime;
     VarSet(VAR_DAYS, gLocalTime.days);
@@ -28,7 +28,7 @@ static void InitTimeBasedEvents(void)
 
 void DoTimeBasedEvents(void)
 {
-    if (FlagGet(SYS_CLOCK_SET))
+    if (FlagGet(FLAG_SYS_CLOCK_SET))
     {
         RtcCalcLocalTime();
         UpdatePerDay(&gLocalTime);
@@ -45,7 +45,7 @@ static void UpdatePerDay(struct Time *time)
     if (days != time->days && days <= time->days)
     {
         newDays = time->days - days;
-        ClearUpperFlags();
+        ClearDailyFlags();
         UpdateDewfordTrendPerDay(newDays);
         UpdateTVShowsPerDay(newDays);
         UpdateWeatherPerDay(newDays);
diff --git a/src/engine/record_mixing.c b/src/engine/record_mixing.c
index 2624837c7..6cb1e54b2 100644
--- a/src/engine/record_mixing.c
+++ b/src/engine/record_mixing.c
@@ -131,7 +131,7 @@ void Task_RecordMixing_Main(u8 taskId)
         if (!gTasks[data[10]].isActive)
         {
             tState = 2;
-            FlagSet(SYS_MIX_RECORD);
+            FlagSet(FLAG_SYS_MIX_RECORD);
             DestroyRecordMixingSprite();
             DestroyTask(tSndEffTaskId);
         }
@@ -1019,7 +1019,7 @@ void sub_80B9F3C(u16 *a, u8 b)
                 VarSet(VAR_0x4001, *a);
                 StringCopy(gStringVar1, gLinkPlayers[0].name);
                 if (*a == ITEM_EON_TICKET)
-                    FlagSet(SYS_HAS_EON_TICKET);
+                    FlagSet(FLAG_SYS_HAS_EON_TICKET);
             }
             else
             {
diff --git a/src/engine/save_menu_util.c b/src/engine/save_menu_util.c
index a2d17bd36..771cb72c7 100644
--- a/src/engine/save_menu_util.c
+++ b/src/engine/save_menu_util.c
@@ -15,7 +15,7 @@ void HandleDrawSaveWindowInfo(s16 left, s16 top)
     if (IsResizeSaveWindowEnabled())
         width = 13;
 
-    if (FlagGet(SYS_POKEDEX_GET))
+    if (FlagGet(FLAG_SYS_POKEDEX_GET))
     {
         // print info + dex information.
         MenuDrawTextWindow(left, top, left + width, top + 11);
@@ -44,7 +44,7 @@ void HandleCloseSaveWindow(u16 left, u16 top)
     if (IsResizeSaveWindowEnabled())
         width = 13;
 
-    if (FlagGet(SYS_POKEDEX_GET))
+    if (FlagGet(FLAG_SYS_POKEDEX_GET))
         MenuZeroFillWindowRect(left, top, left + width, top + 11);
     else
         MenuZeroFillWindowRect(left, top, left + width, top + 9);
@@ -106,7 +106,7 @@ u8 GetBadgeCount(void)
     u8 badgeCount = 0;
     int badgeFlag;
 
-    for (badgeFlag = BADGE01_GET; badgeFlag <= BADGE08_GET; badgeFlag++)
+    for (badgeFlag = FLAG_BADGE01_GET; badgeFlag <= FLAG_BADGE08_GET; badgeFlag++)
         if (FlagGet(badgeFlag))
             badgeCount++;
 
diff --git a/src/engine/time_events.c b/src/engine/time_events.c
index 831048add..3e3054aa3 100644
--- a/src/engine/time_events.c
+++ b/src/engine/time_events.c
@@ -85,9 +85,9 @@ void UpdateShoalTideFlag(void)
     {
         RtcCalcLocalTime();
         if (tide[gLocalTime.hours])
-            FlagSet(SYS_SHOAL_TIDE);
+            FlagSet(FLAG_SYS_SHOAL_TIDE);
         else
-            FlagClear(SYS_SHOAL_TIDE);
+            FlagClear(FLAG_SYS_SHOAL_TIDE);
     }
 }
 
diff --git a/src/engine/trade.c b/src/engine/trade.c
index 06a6b96c7..0567b4d2f 100644
--- a/src/engine/trade.c
+++ b/src/engine/trade.c
@@ -5696,7 +5696,7 @@ static void sub_804E1DC(void)
         numRibbons += GetMonData(&gEnemyParty[gUnknown_020297D8[1] % 6], MON_DATA_CHAMPION_RIBBON + i);
     }
     if (numRibbons != 0)
-        FlagSet(SYS_RIBBON_GET);
+        FlagSet(FLAG_SYS_RIBBON_GET);
 }
 
 void sub_804E22C(void)
diff --git a/src/engine/trainer_card.c b/src/engine/trainer_card.c
index 468890ca5..207fa5f77 100644
--- a/src/engine/trainer_card.c
+++ b/src/engine/trainer_card.c
@@ -323,7 +323,7 @@ void sub_8093390(struct TrainerCard *trainerCard)
     trainerCard->firstHallOfFameB = (playTime >> 8) & 0xFF;
     trainerCard->firstHallOfFameC = playTime & 0xFF;
 
-    trainerCard->hasPokedex = FlagGet(SYS_POKEDEX_GET);
+    trainerCard->hasPokedex = FlagGet(FLAG_SYS_POKEDEX_GET);
     trainerCard->var_3 = sub_8090FC0();
     trainerCard->pokedexSeen = GetPokedexSeenCount();
 
@@ -543,14 +543,14 @@ void sub_80936D4(void)
         u32 badgeFlag;
         int i = 0;
 
-        badgeFlag = BADGE01_GET;
+        badgeFlag = FLAG_BADGE01_GET;
         while (1)
         {
             if (FlagGet(badgeFlag))
                 ewram0_2.var_e[i]++;
             badgeFlag++;
             i++;
-            if (badgeFlag > BADGE08_GET)
+            if (badgeFlag > FLAG_BADGE08_GET)
             {
                 break;
             }