Skip to content

Destroy Task Crash Fix #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Ddaretrogamer merged 2 commits into from
Feb 5, 2026
Merged

Destroy Task Crash Fix #35

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2f6649
Destroy Task Fix
HashtagMarky Feb 5, 2026
e8b19fa
Remove Excess Semi-Colon
HashtagMarky Feb 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/rotom_start_menu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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())
{
Expand Down Expand Up @@ -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);
}
}

Expand Down Expand Up @@ -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();
}
}
Expand All @@ -2646,7 +2646,7 @@ static void Task_RotomPhone_RotomRealityMenu_Open(u8 taskId)
{
CleanupOverworldWindowsAndTilemaps();
RotomPhone_RotomRealityMenu_Init();
DestroyTask(taskId);
if (taskId != TASK_NONE) DestroyTask(taskId);
}
}

Expand Down Expand Up @@ -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);
}
}
Expand All @@ -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();
}
}
Expand Down Expand Up @@ -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);
}
}

Expand Down
Loading