diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2021-11-13 23:19:57 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-13 23:19:57 -0500 |
commit | 159bb37bbe9d960f0d2a3da9736e1be5eefb8290 (patch) | |
tree | 44e6d447e57941a77623253884304c3174b72886 /src/record_mixing.c | |
parent | 9d3345a6d69c38bf31014df69c52583c877eed24 (diff) | |
parent | 9a932cd9c3089c03adada30ace4c79a84bf73cf0 (diff) |
Merge branch 'master' into fix_saveblock_reorder
Diffstat (limited to 'src/record_mixing.c')
-rw-r--r-- | src/record_mixing.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/record_mixing.c b/src/record_mixing.c index f308e5b3d..6efded838 100644 --- a/src/record_mixing.c +++ b/src/record_mixing.c @@ -1002,11 +1002,11 @@ static void Task_DoRecordMixing(u8 taskId) case 2: // Mixing Ruby/Sapphire records. SetContinueGameWarpStatusToDynamicWarp(); - FullSaveGame(); + WriteSaveBlock2(); task->tState++; break; case 3: - if (CheckSaveFile()) + if (WriteSaveBlock1Sector()) { ClearContinueGameWarpStatus2(); task->tState = 4; @@ -1030,12 +1030,12 @@ static void Task_DoRecordMixing(u8 taskId) case 6: if (!Rfu_SetLinkRecovery(FALSE)) { - CreateTask(Task_LinkSave, 5); + CreateTask(Task_LinkFullSave, 5); task->tState++; } break; - case 7: // wait for Task_LinkSave to finish. - if (!FuncIsActiveTask(Task_LinkSave)) + case 7: // wait for Task_LinkFullSave to finish. + if (!FuncIsActiveTask(Task_LinkFullSave)) { if (gWirelessCommType) { |