From 162fad62713d6b2e175c4cd5d7e53ebe7dedef11 Mon Sep 17 00:00:00 2001
From: Astatin <git@astatin.live>
Date: Thu, 7 Aug 2025 12:40:56 +0200
Subject: Add menu, next floor, attack cancel/arrow move failed sound effects

---
 gui.gbasm | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

(limited to 'gui.gbasm')

diff --git a/gui.gbasm b/gui.gbasm
index 6f1e2b2..667788d 100644
--- a/gui.gbasm
+++ b/gui.gbasm
@@ -171,6 +171,8 @@ Move_dialogue_cursor:
 	CP $enum_dungeon_menu_mode
 	RET NZ
 
+	LD A, $mem_menu_cursor_position
+	LD D, A
 	LD A, $mem_cursor_max_position
 	LD C, A
 	LD A, $mem_last_button_direction
@@ -181,15 +183,13 @@ Move_dialogue_cursor:
 	CP B
 	RET Z
 
-	.SET_SOUND_EFFECT =_sound_effect_Click
-
 	DEC A
 	BIT 1, A
 	JR Z, =.Vertical_axis
 	LD A, $mem_menu_cursor_position
 	XOR $02
 	CP C
-	JR NC, =Reload_EP_Cost
+	JR NC, =.Sound_effect
 	LD $mem_menu_cursor_position, A
 	JR =Reload_EP_Cost
 
@@ -197,9 +197,17 @@ Move_dialogue_cursor:
 	LD A, $mem_menu_cursor_position
 	XOR $01
 	CP C
-	JR NC, =Reload_EP_Cost
+	JR NC, =.Sound_effect
 	LD $mem_menu_cursor_position, A
 
+	.Sound_effect:
+	LD A, $mem_menu_cursor_position
+	CP D
+	JR NZ, =.moved_sound_effect
+	.fail_move_sound_effect:
+	.SET_SOUND_EFFECT =_sound_effect_Move_arrow_failed
+	.moved_sound_effect:
+
 Reload_EP_Cost:
 	LD A, $mem_menu_cursor_position
 	ADD low($mem_bunny_attacks)
@@ -272,13 +280,14 @@ Check_dialogue_action:
 	CP $00
 	RET Z
 	BIT 3, A
-	JP NZ, =Exit_Menu
+	JR Z, =.test_attack_chosen
+	.SET_SOUND_EFFECT =_sound_effect_Menu_Close
+	JP =Exit_Menu
+
+	.test_attack_chosen:
 	BIT 0, A
 	RET Z
 
-	LD A, $mem_menu_cursor_position
-	LD D, A
-
 	LD A, $mem_current_focused_attack_ep_cost
 	LD B, A
 	LD A, $mem_bunny_mana
@@ -295,10 +304,6 @@ Check_dialogue_action:
 	ADD L
 	LD L, A
 
-	LD A, $mem_menu_cursor_position
-	CP D
-	JR NZ, =.moved_sound_effect
-		.SET_SOUND_EFFECT =_sound_effect_Click
 	.moved_sound_effect:
 	LD A, (HL+)
 	LD D, A
@@ -355,7 +360,7 @@ Open_dialogue_on_dungeon_menu_mode:
 	AND $40 ; Keeping object additional tile
 	OR $0d
 	LD $mem_display_flag, A
-	.SET_SOUND_EFFECT =_sound_effect_Click
+	.SET_SOUND_EFFECT =_sound_effect_Menu_Open
 
 	RET
 
-- 
cgit v1.2.3-70-g09d2