diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-19 22:58:13 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-19 22:58:13 +0100 |
| commit | ad3a97e178b93c38b1d43f8120449b042ac23a0e (patch) | |
| tree | 1c0e790d275ae85cc82360406fd2e655ae262d1f /src/save.c | |
| parent | a3b5af17eabb255e983e61c6306e30f27de82524 (diff) | |
| parent | 5dc8beb034e70b4e1eba61cca4009d5e06356605 (diff) | |
berry blender merge conflicts
Diffstat (limited to 'src/save.c')
| -rw-r--r-- | src/save.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/save.c b/src/save.c index 2c1b26ca9..528c67145 100644 --- a/src/save.c +++ b/src/save.c @@ -797,7 +797,7 @@ u16 sub_815355C(void) return 0; } -u32 sub_81535DC(u8 sector, u8* dst) +u32 TryCopySpecialSaveSection(u8 sector, u8* dst) { s32 i; s32 size; @@ -826,6 +826,7 @@ u32 sub_8153634(u8 sector, u8* src) if (sector != 30 && sector != 31) return 0xFF; + savDataBuffer = &gSaveDataBuffer; *(u32*)(savDataBuffer) = 0xB39D; |