From 33408802ebcb49f411e54085cf60e652ab25c063 Mon Sep 17 00:00:00 2001 From: Ry Date: Wed, 23 Mar 2022 15:13:08 -0700 Subject: [PATCH] fox32rom: Ensure the menu bar is enabled for MENU_BAR_CLICK_EVENT_TYPE --- mouse.asm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mouse.asm b/mouse.asm index 35f2ab8..a77e34f 100644 --- a/mouse.asm +++ b/mouse.asm @@ -62,8 +62,13 @@ mouse_update: ; if Y <= 16, mouse was clicked in the menu bar ; this is less expensive than calling overlay_check_if_enabled_covers_position every frame + ; first check if the menu bar is enabled + in r3, 0x8000031E ; overlay 30: enable status + cmp r3, 0 + ifz jmp mouse_update_no_menu cmp r1, 17 ifc jmp mouse_update_menu_was_clicked +mouse_update_no_menu: ; if a menu is open, don't push a click event ; this is hacky as fuck