diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2018-05-19 12:32:44 +0200 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-05-19 12:32:44 +0200 |
commit | e44f35c7b7fb49a55073c5b40257a4b8052cd5a0 (patch) | |
tree | ad35f76e058386824229a64290a1ef15a9f120c2 /include/save.h | |
parent | 0c1f85f2002e911f64a3b188fa30d8f465c0fc7e (diff) | |
parent | db898d0e4854c70a356d037919ea48aed1f62816 (diff) |
fix record mixing merge conflicts
Diffstat (limited to 'include/save.h')
-rw-r--r-- | include/save.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/save.h b/include/save.h index f06db2955..7b271129a 100644 --- a/include/save.h +++ b/include/save.h @@ -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); |