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/start_menu.c | |
| parent | 9d3345a6d69c38bf31014df69c52583c877eed24 (diff) | |
| parent | 9a932cd9c3089c03adada30ace4c79a84bf73cf0 (diff) | |
Merge branch 'master' into fix_saveblock_reorder
Diffstat (limited to 'src/start_menu.c')
| -rw-r--r-- | src/start_menu.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/start_menu.c b/src/start_menu.c index ef4c67832..90230c3dd 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -1269,11 +1269,11 @@ static void Task_SaveAfterLinkBattle(u8 taskId) break; case 1: SetContinueGameWarpStatusToDynamicWarp(); - FullSaveGame(); + WriteSaveBlock2(); *state = 2; break; case 2: - if (CheckSaveFile()) + if (WriteSaveBlock1Sector()) { ClearContinueGameWarpStatus2(); *state = 3; @@ -1290,11 +1290,11 @@ static void Task_SaveAfterLinkBattle(u8 taskId) DestroyTask(taskId); break; case 5: - CreateTask(Task_LinkSave, 5); + CreateTask(Task_LinkFullSave, 5); *state = 6; break; case 6: - if (!FuncIsActiveTask(Task_LinkSave)) + if (!FuncIsActiveTask(Task_LinkFullSave)) { *state = 3; } @@ -1374,23 +1374,23 @@ static void RemoveSaveInfoWindow(void) static void Task_WaitForBattleTowerLinkSave(u8 taskId) { - if (!FuncIsActiveTask(Task_LinkSave)) + if (!FuncIsActiveTask(Task_LinkFullSave)) { DestroyTask(taskId); EnableBothScriptContexts(); } } -#define tPartialSave data[2] +#define tInBattleTower data[2] void SaveForBattleTowerLink(void) { - u8 taskId = CreateTask(Task_LinkSave, 5); - gTasks[taskId].tPartialSave = TRUE; + u8 taskId = CreateTask(Task_LinkFullSave, 5); + gTasks[taskId].tInBattleTower = TRUE; gTasks[CreateTask(Task_WaitForBattleTowerLinkSave, 6)].data[1] = taskId; } -#undef tPartialSave +#undef tInBattleTower static void HideStartMenuWindow(void) { |