From b2f664953aeaf33b98b6a60d8d7ad2312df9c70b Mon Sep 17 00:00:00 2001 From: HashtagMarky <143505183+HashtagMarky@users.noreply.github.com> Date: Thu, 5 Feb 2026 14:25:52 +0000 Subject: [PATCH 1/2] Destroy Task Fix --- src/rotom_start_menu.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/rotom_start_menu.c b/src/rotom_start_menu.c index 785a1d8c4a09..7654157c2083 100644 --- a/src/rotom_start_menu.c +++ b/src/rotom_start_menu.c @@ -2328,7 +2328,7 @@ static void RotomPhone_StartMenu_DoCleanUpAndDestroyTask(u8 taskId, bool32 overw { RotomPhone_RotomRealityMenu_SaveScreen_FreeResources(); } - DestroyTask(taskId); + if (taskId != TASK_NONE) DestroyTask(taskId);; } static void Task_RotomPhone_StartMenu_WaitSaveGame(u8 taskId) @@ -2339,7 +2339,7 @@ static void Task_RotomPhone_StartMenu_WaitSaveGame(u8 taskId) ScriptUnfreezeObjectEvents(); UnlockPlayerFieldControls(); SoftResetInBattlePyramid(); - DestroyTask(taskId); + if (taskId != TASK_NONE) DestroyTask(taskId);; } else if (!FuncIsActiveTask(SaveGameTask) && RotomPhone_StartMenu_IsRotomReality()) { @@ -2475,7 +2475,7 @@ static void Task_RotomPhone_OverworldMenu_PhoneSlideClose(u8 taskId) { SetGpuReg(REG_OFFSET_BG0VOFS, 0); ReleaseComfyAnim(tPhoneComfyAnimId); - DestroyTask(taskId); + if (taskId != TASK_NONE) DestroyTask(taskId);; } } @@ -2633,7 +2633,7 @@ static void Task_RotomPhone_OverworldMenu_CloseForSafari(u8 taskId) else if (!FuncIsActiveTask(Task_RotomPhone_OverworldMenu_PhoneSlideClose) && tPhoneCloseParameterSaveSafariFade == TRUE) { - DestroyTask(taskId); + if (taskId != TASK_NONE) DestroyTask(taskId);; SafariZoneRetirePrompt(); } } @@ -2646,7 +2646,7 @@ static void Task_RotomPhone_RotomRealityMenu_Open(u8 taskId) { CleanupOverworldWindowsAndTilemaps(); RotomPhone_RotomRealityMenu_Init(); - DestroyTask(taskId); + if (taskId != TASK_NONE) DestroyTask(taskId);; } } @@ -3102,7 +3102,7 @@ static void Task_RotomPhone_RotomRealityMenu_WaitFadeAndExitGracefullyForSave(u8 { m4aSongNumStop(SE_PC_OFF); sRotomPhone_RotomReality = FALSE; - DestroyTask(taskId); + if (taskId != TASK_NONE) DestroyTask(taskId);; RotomPhone_StartMenu_DoCleanUpAndChangeCallback(RotomPhone_SaveScreen_SetupCB); } } @@ -3111,7 +3111,7 @@ static void Task_RotomPhone_RotomRealityMenu_WaitFadeForSelection(u8 taskId) { if (!gPaletteFade.active && sRotomPhoneOptions[menuSelectedRotomReality].selectedFunc) { - DestroyTask(taskId); + if (taskId != TASK_NONE) DestroyTask(taskId);; sRotomPhoneOptions[menuSelectedRotomReality].selectedFunc(); } } @@ -3610,7 +3610,7 @@ static void Task_RotomPhone_SaveScreen_WaitFadeAndExit(u8 taskId) SetMainCallback2(CB2_ReturnToField); RotomPhone_RotomRealityMenu_SaveScreen_FreeResources(); m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 256); - DestroyTask(taskId); + if (taskId != TASK_NONE) DestroyTask(taskId);; } } From e8b19fa3035a0ad3177ae0939b54d2b7f6cf99e5 Mon Sep 17 00:00:00 2001 From: HashtagMarky <143505183+HashtagMarky@users.noreply.github.com> Date: Thu, 5 Feb 2026 14:28:37 +0000 Subject: [PATCH 2/2] Remove Excess Semi-Colon --- src/rotom_start_menu.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/rotom_start_menu.c b/src/rotom_start_menu.c index 7654157c2083..f9ea90608508 100644 --- a/src/rotom_start_menu.c +++ b/src/rotom_start_menu.c @@ -2328,7 +2328,7 @@ static void RotomPhone_StartMenu_DoCleanUpAndDestroyTask(u8 taskId, bool32 overw { RotomPhone_RotomRealityMenu_SaveScreen_FreeResources(); } - if (taskId != TASK_NONE) DestroyTask(taskId);; + if (taskId != TASK_NONE) DestroyTask(taskId); } static void Task_RotomPhone_StartMenu_WaitSaveGame(u8 taskId) @@ -2339,7 +2339,7 @@ static void Task_RotomPhone_StartMenu_WaitSaveGame(u8 taskId) ScriptUnfreezeObjectEvents(); UnlockPlayerFieldControls(); SoftResetInBattlePyramid(); - if (taskId != TASK_NONE) DestroyTask(taskId);; + if (taskId != TASK_NONE) DestroyTask(taskId); } else if (!FuncIsActiveTask(SaveGameTask) && RotomPhone_StartMenu_IsRotomReality()) { @@ -2475,7 +2475,7 @@ static void Task_RotomPhone_OverworldMenu_PhoneSlideClose(u8 taskId) { SetGpuReg(REG_OFFSET_BG0VOFS, 0); ReleaseComfyAnim(tPhoneComfyAnimId); - if (taskId != TASK_NONE) DestroyTask(taskId);; + if (taskId != TASK_NONE) DestroyTask(taskId); } } @@ -2633,7 +2633,7 @@ static void Task_RotomPhone_OverworldMenu_CloseForSafari(u8 taskId) else if (!FuncIsActiveTask(Task_RotomPhone_OverworldMenu_PhoneSlideClose) && tPhoneCloseParameterSaveSafariFade == TRUE) { - if (taskId != TASK_NONE) DestroyTask(taskId);; + if (taskId != TASK_NONE) DestroyTask(taskId); SafariZoneRetirePrompt(); } } @@ -2646,7 +2646,7 @@ static void Task_RotomPhone_RotomRealityMenu_Open(u8 taskId) { CleanupOverworldWindowsAndTilemaps(); RotomPhone_RotomRealityMenu_Init(); - if (taskId != TASK_NONE) DestroyTask(taskId);; + if (taskId != TASK_NONE) DestroyTask(taskId); } } @@ -3102,7 +3102,7 @@ static void Task_RotomPhone_RotomRealityMenu_WaitFadeAndExitGracefullyForSave(u8 { m4aSongNumStop(SE_PC_OFF); sRotomPhone_RotomReality = FALSE; - if (taskId != TASK_NONE) DestroyTask(taskId);; + if (taskId != TASK_NONE) DestroyTask(taskId); RotomPhone_StartMenu_DoCleanUpAndChangeCallback(RotomPhone_SaveScreen_SetupCB); } } @@ -3111,7 +3111,7 @@ static void Task_RotomPhone_RotomRealityMenu_WaitFadeForSelection(u8 taskId) { if (!gPaletteFade.active && sRotomPhoneOptions[menuSelectedRotomReality].selectedFunc) { - if (taskId != TASK_NONE) DestroyTask(taskId);; + if (taskId != TASK_NONE) DestroyTask(taskId); sRotomPhoneOptions[menuSelectedRotomReality].selectedFunc(); } } @@ -3610,7 +3610,7 @@ static void Task_RotomPhone_SaveScreen_WaitFadeAndExit(u8 taskId) SetMainCallback2(CB2_ReturnToField); RotomPhone_RotomRealityMenu_SaveScreen_FreeResources(); m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 256); - if (taskId != TASK_NONE) DestroyTask(taskId);; + if (taskId != TASK_NONE) DestroyTask(taskId); } }