diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2018-01-14 14:15:59 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-14 14:15:59 -0600 |
| commit | dbe9b11ce67e8ec70ffffa0c6b0e12236656f644 (patch) | |
| tree | 16b65b26faee42ba480e9081d08de17e7fc38b3f /src/field | |
| parent | 408c6ceddcc54a3aa45cdbb2923dc443d2e6297f (diff) | |
| parent | 378443528451875e5436814780a0420086bf5935 (diff) | |
Merge pull request #530 from camthesaxman/refactor_save
clean up save.c
Diffstat (limited to 'src/field')
| -rw-r--r-- | src/field/battle_tower.c | 2 | ||||
| -rw-r--r-- | src/field/start_menu.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/field/battle_tower.c b/src/field/battle_tower.c index 11c05e478..ab2a818a7 100644 --- a/src/field/battle_tower.c +++ b/src/field/battle_tower.c @@ -1895,7 +1895,7 @@ void SaveBattleTowerProgress(void) VarSet(VAR_TEMP_0, 0); gSaveBlock2.battleTower.unk_554 = 1; - TrySavingData(EREADER_SAVE); + Save_WriteData(SAVE_EREADER); } void BattleTower_SoftReset(void) diff --git a/src/field/start_menu.c b/src/field/start_menu.c index 2f6f1e7dd..87597eb6a 100644 --- a/src/field/start_menu.c +++ b/src/field/start_menu.c @@ -664,20 +664,20 @@ static u8 SaveDialogCB_DisplaySavingMessage(void) static u8 SaveDialogCB_DoSave(void) { - bool8 saveSucceeded; + u8 saveStatus; IncrementGameStat(0); if (gDifferentSaveFile == TRUE) { - saveSucceeded = TrySavingData(DIFFERENT_FILE_SAVE); + saveStatus = Save_WriteData(SAVE_OVERWRITE_DIFFERENT_FILE); gDifferentSaveFile = FALSE; } else { - saveSucceeded = TrySavingData(NORMAL_SAVE); + saveStatus = Save_WriteData(SAVE_NORMAL); } - if (saveSucceeded == TRUE) + if (saveStatus == SAVE_STATUS_OK) { //"(Player) saved the game." DisplaySaveMessageWithCallback(gSaveText_PlayerSavedTheGame, SaveDialogCB_SaveSuccess); |