fix record mixing merge conflicts

2018-05-19 12:32:44 +02:00
parent 0c1f85f200 db898d0e48
commit e44f35c7b7
26 changed files with 1631 additions and 2452 deletions
@@ -11,9 +11,16 @@ enum MauvilleOldManType
    MAUVILLE_MAN_GIDDY
 };

+extern struct BardSong gBardSong;
+
 void SetMauvilleOldMan(void);
 u8 GetCurrentMauvilleOldMan(void);
-extern struct BardSong gBardSong;
 void ScrSpecial_SetMauvilleOldManMapObjGfx(void);
+u8 sub_81201C8(void);
+void sub_8120B70(OldMan *dest);
+void sub_8120670(void);
+void sub_8120D34(union OldMan * oldMan, u32 r1, u32 r6);
+void sub_8120CD0(union OldMan * oldMan, u32 unused, u32 a2);
+void ResetMauvilleOldManFlag(void);

 #endif // GUARD_MAUVILLE_OLD_MAN_H