fix record mixing merge conflicts

This commit is contained in:
DizzyEggg committed 2018-05-19 12:32:44 +02:00
commit e44f35c7b7
26 files changed
+1631 -2452

No files matched your search

+3
View File
@@ -90,6 +90,9 @@ u8 sub_8153430(void);
bool8 sub_8153474(void);
u8 Save_LoadGameData(u8 a1);
u16 sub_815355C(void);
u8 sub_81534D0(u8);
u8 sub_8153430(void);
bool8 sub_8153474(void);
u32 TryCopySpecialSaveSection(u8 sector, u8* dst);
u32 sub_8153634(u8 sector, u8* src);
void sub_8153688(u8 taskId);