Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix UB when using time menu (#7023)

Browse Source
This commit is contained in:
cawtds 2025-05-30 20:00:25 +02:00 committed by GitHub
parent 37669e62ae
commit 555bda4e66
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/debug.c
View File

@ -1922,20 +1922,28 @@ static void DebugAction_Util_OpenTimeMenu(u8 taskId)
static void DebugAction_TimeMenu_TimesOfDay(u8 taskId)
{
Debug_DestroyMenu_Full(taskId);
if (!OW_USE_FAKE_RTC)
{
Debug_DestroyMenu_Full_Script(taskId, Debug_EventScript_FakeRTCNotEnabled);
}
else
{
Debug_DestroyMenu_Full(taskId);
Debug_ShowMenu(DebugTask_HandleMenuInput_TimeMenu_TimesOfDay, sDebugMenu_ListTemplate_TimeMenu_TimesOfDay);
}
}
static void DebugAction_TimeMenu_Weekdays(u8 taskId)
{
Debug_DestroyMenu_Full(taskId);
if (!OW_USE_FAKE_RTC)
{
Debug_DestroyMenu_Full_Script(taskId, Debug_EventScript_FakeRTCNotEnabled);
}
else
{
Debug_DestroyMenu_Full(taskId);
Debug_ShowMenu(DebugTask_HandleMenuInput_TimeMenu_Weekdays, sDebugMenu_ListTemplate_TimeMenu_Weekdays);
}
}
static void DebugAction_OpenPlayerMenu(u8 taskId)
@ -2384,7 +2392,6 @@ void BufferExpansionVersion(struct ScriptContext *ctx)
static void DebugAction_TimeMenu_PrintTime(u8 taskId)
{
Debug_DestroyMenu_Full(taskId);
LockPlayerFieldControls();
Debug_DestroyMenu_Full_Script(taskId, Debug_EventScript_TellTheTime);
}
@ -2410,7 +2417,6 @@ void DebugMenu_CalculateTime(struct ScriptContext *ctx)
static void DebugAction_TimeMenu_PrintTimeOfDay(u8 taskId)
{
Debug_DestroyMenu_Full(taskId);
LockPlayerFieldControls();
Debug_DestroyMenu_Full_Script(taskId, Debug_EventScript_PrintTimeOfDay);
}