From 1e03b4747fa259d735dd958f6ea3b1dd7097f822 Mon Sep 17 00:00:00 2001 From: TheXaman <48356183+TheXaman@users.noreply.github.com> Date: Wed, 14 Sep 2022 13:43:26 +0200 Subject: [PATCH] debug menu: object events now frozen while open --- src/debug.c | 2 ++ src/field_control_avatar.c | 1 + src/start_menu.c | 1 + 3 files changed, 4 insertions(+) diff --git a/src/debug.c b/src/debug.c index e40ed4afee..38da0696f6 100644 --- a/src/debug.c +++ b/src/debug.c @@ -709,6 +709,7 @@ static void Debug_DestroyMenu_Full(u8 taskId) ClearStdWindowAndFrame(gTasks[taskId].data[1], TRUE); RemoveWindow(gTasks[taskId].data[1]); DestroyTask(taskId); + UnfreezeObjectEvents(); } static void DebugAction_Cancel(u8 taskId) { @@ -725,6 +726,7 @@ static void DebugAction_DestroyExtraWindow(u8 taskId) DestroyTask(taskId); ScriptContext_Enable(); + UnfreezeObjectEvents(); } diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index d407cc0279..c325b63e5c 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -201,6 +201,7 @@ int ProcessPlayerFieldInput(struct FieldInput *input) if (input->input_field_1_2) { PlaySE(SE_WIN_OPEN); + FreezeObjectEvents(); Debug_ShowMainMenu(); return TRUE; } diff --git a/src/start_menu.c b/src/start_menu.c index a0cff087cd..388b2ce35a 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -761,6 +761,7 @@ static bool8 StartMenuDebugCallback(void) HideStartMenuDebug(); // Hide start menu without enabling movement #if DEBUG_SYSTEM_ENABLE == TRUE + FreezeObjectEvents(); Debug_ShowMainMenu(); #endif