diff options
| author | Kurausukun <lord.uber1@gmail.com> | 2021-03-19 14:34:58 -0400 |
|---|---|---|
| committer | Kurausukun <lord.uber1@gmail.com> | 2021-03-19 14:34:58 -0400 |
| commit | c94e5e9ab0b2b65c8c6275f84043807b2743d6f2 (patch) | |
| tree | b188427bb1942695f32e14ee3fe137855d638c8c /src/save.c | |
| parent | 0643255c85d0ebd5212e731c9fad3b43d0d99a10 (diff) | |
| parent | ed16a7409ae9c808a110975dec1930f9f949a6d6 (diff) | |
Merge remote-tracking branch 'upstream/master' into port_matchings
Diffstat (limited to 'src/save.c')
| -rw-r--r-- | src/save.c | 40 |
1 files changed, 19 insertions, 21 deletions
diff --git a/src/save.c b/src/save.c index d5993182c..894b420f6 100644 --- a/src/save.c +++ b/src/save.c @@ -45,26 +45,24 @@ min(sizeof(structure) - chunkNum * SECTOR_DATA_SIZE, SECTOR_DATA_SIZE) \ } \ -// TODO: use gSaveblock2, gSaveblock1, gPokemonStorage instead of structs -// Will be done when load_save is decompiled. const struct SaveSectionOffsets gSaveSectionOffsets[] = { - SAVEBLOCK_CHUNK(struct SaveBlock2, 0), - - SAVEBLOCK_CHUNK(struct SaveBlock1, 0), - SAVEBLOCK_CHUNK(struct SaveBlock1, 1), - SAVEBLOCK_CHUNK(struct SaveBlock1, 2), - SAVEBLOCK_CHUNK(struct SaveBlock1, 3), - - SAVEBLOCK_CHUNK(struct PokemonStorage, 0), - SAVEBLOCK_CHUNK(struct PokemonStorage, 1), - SAVEBLOCK_CHUNK(struct PokemonStorage, 2), - SAVEBLOCK_CHUNK(struct PokemonStorage, 3), - SAVEBLOCK_CHUNK(struct PokemonStorage, 4), - SAVEBLOCK_CHUNK(struct PokemonStorage, 5), - SAVEBLOCK_CHUNK(struct PokemonStorage, 6), - SAVEBLOCK_CHUNK(struct PokemonStorage, 7), - SAVEBLOCK_CHUNK(struct PokemonStorage, 8) + SAVEBLOCK_CHUNK(gSaveBlock2, 0), + + SAVEBLOCK_CHUNK(gSaveBlock1, 0), + SAVEBLOCK_CHUNK(gSaveBlock1, 1), + SAVEBLOCK_CHUNK(gSaveBlock1, 2), + SAVEBLOCK_CHUNK(gSaveBlock1, 3), + + SAVEBLOCK_CHUNK(gPokemonStorage, 0), + SAVEBLOCK_CHUNK(gPokemonStorage, 1), + SAVEBLOCK_CHUNK(gPokemonStorage, 2), + SAVEBLOCK_CHUNK(gPokemonStorage, 3), + SAVEBLOCK_CHUNK(gPokemonStorage, 4), + SAVEBLOCK_CHUNK(gPokemonStorage, 5), + SAVEBLOCK_CHUNK(gPokemonStorage, 6), + SAVEBLOCK_CHUNK(gPokemonStorage, 7), + SAVEBLOCK_CHUNK(gPokemonStorage, 8) }; // Sector num to begin writing save data. Sectors are rotated each time the game is saved. (possibly to avoid wear on flash memory?) @@ -855,7 +853,7 @@ void Task_SaveGame_UpdatedLinkRecords(u8 taskId) gTasks[taskId].data[0] = 1; break; case 1: - PrepareSendLinkCmd2FFE_or_RfuCmd6600(); + SetLinkStandbyCallback(); gTasks[taskId].data[0] = 2; break; case 2: @@ -889,7 +887,7 @@ void Task_SaveGame_UpdatedLinkRecords(u8 taskId) break; case 7: ClearContinueGameWarpStatus2(); - PrepareSendLinkCmd2FFE_or_RfuCmd6600(); + SetLinkStandbyCallback(); gTasks[taskId].data[0] = 8; break; case 8: @@ -900,7 +898,7 @@ void Task_SaveGame_UpdatedLinkRecords(u8 taskId) } break; case 9: - PrepareSendLinkCmd2FFE_or_RfuCmd6600(); + SetLinkStandbyCallback(); gTasks[taskId].data[0] = 10; break; case 10: |