fix record mixing merge conflicts

src/berry_blender.c

@@ -151,15 +151,14 @@ extern const u8 gText_Space[];
 extern const u8 gText_BlenderMaxSpeedRecord[];
 extern const u8 gText_234Players[];
 
-extern void sub_81978B0(u16);
 extern void sub_800A418(void);
 extern u8 sub_800A9D8(void);
-extern bool8 sub_800A4D8(u8);
 extern void sub_809882C(u8, u16, u8);
 extern void copy_textbox_border_tile_patterns_to_vram(u8, u16, u8);
 extern void sub_81AABF0(void (*callback)(void));
 extern void sub_800B4C0(void);
 extern void ClearLinkCallback(void);
+extern void sub_8009F8C(void);
 extern void sub_8153430(void);
 extern bool8 sub_8153474(void);
 extern void sub_80EECEC(void);

src/lilycove_lady.c

@@ -801,26 +801,26 @@ void sub_818E564(void)
     EnableBothScriptContexts();
 }
 
-void sub_818E570(const struct LilycoveLadyQuiz *quiz)
+void sub_818E570(const LilycoveLady *lilycoveLady)
 {
     u8 i;
 
     gUnknown_0203CD68 = &gSaveBlock1Ptr->lilycoveLady.quiz;
-    if (quiz->unk_02c < 16 && gUnknown_0203CD68->id == LILYCOVE_LADY_QUIZ)
+    if (lilycoveLady->quiz.unk_02c < 16 && gUnknown_0203CD68->id == LILYCOVE_LADY_QUIZ)
     {
         for (i = 0; i < 4; i ++)
         {
-            if (quiz->unk_02c != gUnknown_0203CD68->unk_02b)
+            if (lilycoveLady->quiz.unk_02c != gUnknown_0203CD68->unk_02b)
             {
                 break;
             }
             gUnknown_0203CD68->unk_02b = Random() % 16;
         }
-        if (quiz->unk_02c == gUnknown_0203CD68->unk_02b)
+        if (lilycoveLady->quiz.unk_02c == gUnknown_0203CD68->unk_02b)
         {
             gUnknown_0203CD68->unk_02b = (gUnknown_0203CD68->unk_02b + 1) % 16;
         }
-        gUnknown_0203CD68->unk_02c = quiz->unk_02c;
+        gUnknown_0203CD68->unk_02c = lilycoveLady->quiz.unk_02c;
     }
 }
 

src/link.c

@@ -798,7 +798,7 @@ bool32 sub_800A040(void)
     return TRUE;
 }
 
-bool32 sub_800A064(void)
+bool32 Link_AnyPartnersPlayingRubyOrSapphire(void)
 {
     if (sub_8009FF8(VERSION_RUBY, VERSION_SAPPHIRE) >= 0)
     {

src/mauville_old_man.c

@@ -387,7 +387,7 @@ static void ResetStorytellerFlag(void)
     Storyteller_ResetFlag();
 }
 
-void ResetMauvilleOldManFlag(void) // ResetMauvilleOldManFlag
+void ResetMauvilleOldManFlag(void)
 {
     switch (GetCurrentMauvilleOldMan())
     {