diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-14 17:25:07 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-14 17:25:07 -0500 |
| commit | d357394a7a5d7d02544efe2e79382207d2d3054e (patch) | |
| tree | 69b9cee5ea826cdb9be7fdbdf9def90ff50c6568 /src/scene | |
| parent | e79b3ce9ff39fa48928e8adf84dab542e78c5d64 (diff) | |
| parent | 69a662de660bf075e97521c4d220c893b96b793b (diff) | |
Merge branch 'master' into fix_file_modes
Diffstat (limited to 'src/scene')
| -rw-r--r-- | src/scene/hall_of_fame.c | 6 | ||||
| -rw-r--r-- | src/scene/intro.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/scene/hall_of_fame.c b/src/scene/hall_of_fame.c index 303dcf3e0..a9532fd09 100644 --- a/src/scene/hall_of_fame.c +++ b/src/scene/hall_of_fame.c @@ -539,7 +539,7 @@ static void sub_814217C(u8 taskID) ewram1E000(i) = 0; } else - sub_8125EC8(3); + Save_LoadGameData(SAVE_HALL_OF_FAME); for (i = 0; i < HALL_OF_FAME_MAX_TEAMS; i++, lastSavedTeam++) { @@ -566,7 +566,7 @@ static void sub_814217C(u8 taskID) static void sub_8142274(u8 taskID) { gGameContinueCallback = sub_8141FC4; - TrySavingData(3); + Save_WriteData(3); PlaySE(SE_SAVE); gTasks[taskID].func = sub_81422B8; gTasks[taskID].tFrameCount = 32; @@ -840,7 +840,7 @@ void sub_81428CC(void) static void sub_8142A28(u8 taskID) { - if (sub_8125EC8(3) != 1) + if (Save_LoadGameData(SAVE_HALL_OF_FAME) != SAVE_STATUS_OK) gTasks[taskID].func = sub_8142FEC; else { diff --git a/src/scene/intro.c b/src/scene/intro.c index d7d772a40..f7e196133 100644 --- a/src/scene/intro.c +++ b/src/scene/intro.c @@ -930,8 +930,8 @@ void CB2_InitCopyrightScreenAfterBootup(void) if (!SetUpCopyrightScreen()) { sub_8052E4C(); - ResetSaveCounters(); - sub_8125EC8(0); + Save_ResetSaveCounters(); + Save_LoadGameData(SAVE_NORMAL); if (gSaveFileStatus == 0 || gSaveFileStatus == 2) ClearSav2(); SetPokemonCryStereo(gSaveBlock2.optionsSound); |