fix merge conflicts

1 files changed, 3 insertions, 3 deletions

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;
             }