From ab45947d3fdc9885c497d9fc3dd124c7986f6ea4 Mon Sep 17 00:00:00 2001
From: Astatin <git@astatin.live>
Date: Tue, 11 Mar 2025 18:46:42 +0900
Subject: Add invincible friendly bunny you can talk to

---
 gui.gbasm | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

(limited to 'gui.gbasm')

diff --git a/gui.gbasm b/gui.gbasm
index 340783f..2ec6f5d 100644
--- a/gui.gbasm
+++ b/gui.gbasm
@@ -225,26 +225,36 @@ Reload_EP_Cost:
 Check_dialogue_action:
 	LD A, $mem_current_mode
 	CP $enum_dungeon_menu_mode
-	JR Z, =.Check_exit
+	JR Z, =.Dungeon_Menu
 
 	CP $enum_dungeon_dialogue_mode
 	RET NZ
 
-	.Check_exit:
-	LD A, $mem_last_button_action
+	.Dialogue_Box:
+	LD A, $mem_button_action
 	LD B, A
+	LD A, $mem_last_button_action
+	XOR B
+	AND B
+	CP $00
+	RET Z
+	BIT 0, A
+	JP NZ, =Exit_Menu
+	RET
+
+	.Dungeon_Menu:
 	LD A, $mem_button_action
-	CP B
+	LD B, A
+	LD A, $mem_last_button_action
+	XOR B
+	AND B
+	CP $00
 	RET Z
 	BIT 3, A
 	JP NZ, =Exit_Menu
 	BIT 0, A
 	RET Z
 
-	LD A, $mem_current_mode
-	CP $enum_dungeon_menu_mode
-	RET NZ
-
 	LD A, $mem_current_focused_attack_ep_cost
 	LD B, A
 	LD A, $mem_bunny_mana
@@ -274,6 +284,10 @@ Check_Open_Menu_button:
 	CP $enum_dungeon_mode
 	RET NZ
 
+	LD A, $mem_requested_mode
+	CP $enum_dungeon_mode
+	RET NZ
+
 	LD A, $mem_bunny_status
 	BIT 0, A
 	RET NZ
-- 
cgit v1.2.3-70-g09d2