From 8eba0dd290e75cf11f5c3193476f84e11a42fc37 Mon Sep 17 00:00:00 2001
From: Randy Thiemann <randy.thiemann@student.pxl.be>
Date: Sat, 21 Oct 2023 15:25:02 +0200
Subject: [PATCH] Properly kill SFX

---
 src/sfx.asm          | 14 ++++++++++++++
 tools/Emulicious.ini | 10 +++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/sfx.asm b/src/sfx.asm
index 9629778..a1661b0 100644
--- a/src/sfx.asm
+++ b/src/sfx.asm
@@ -1242,6 +1242,20 @@ SFXEnqueue::
 
 
 SFXKill::
+    ; Kill all sound without pops.
+    ld a, %00111111
+    ldh [rNR11], a
+    ldh [rNR21], a
+    ld a, $FF
+    ldh [rNR31], a
+    ldh [rNR41], a
+    ld a, %01000000
+    ldh [rNR14], a
+    ldh [rNR24], a
+    ldh [rNR34], a
+    ldh [rNR44], a
+
+    ; Clear the queue.
     ld a, $FF
     ldh [hPlayQueue], a
     ldh [hPlayQueue+1], a
diff --git a/tools/Emulicious.ini b/tools/Emulicious.ini
index 0de2e0b..3f18f83 100644
--- a/tools/Emulicious.ini
+++ b/tools/Emulicious.ini
@@ -1,5 +1,5 @@
 #Emulicious settings file
-#Sat Oct 21 15:13:26 CEST 2023
+#Sat Oct 21 15:24:27 CEST 2023
 WindowProfilerWindowOpen=false
 WindowEventViewerWindowHeight=1416
 WindowEventViewerWindowDivider=876
@@ -7,7 +7,7 @@ WindowMemoryTracerWindowY=631
 WindowMemoryTracerWindowX=383
 Update=2
 AudioSync=false
-DebuggerMemoryTabVisibleRect=0,0,687,128
+DebuggerMemoryTabVisibleRect=0,0,0,0
 WindowProfilerWindowWidth=1073
 UninitializedMemoryBreakpointSuspend=true
 GameBoyErrorBreakpointEnabled32=false
@@ -92,7 +92,7 @@ GameBoyErrorBreakpointSuspend2=true
 GameBoyErrorBreakpointSuspend1=true
 GameBoyErrorBreakpointSuspend0=true
 DebuggerConsoleLogBreakpoints=true
-WindowDebuggerOpen=true
+WindowDebuggerOpen=false
 Gamepad1Key37=-1
 Gamepad1Key36=-1
 Gamepad1Key35=-1
@@ -287,8 +287,8 @@ SouthPanelHeight=1064
 SMSbuttonsKeyboard=false
 StackSplitLocation=534
 WindowMemoryEditorHeight=534
-WindowTilemapViewerWidth=404
 GBGamepadKeyboard=false
+WindowTilemapViewerWidth=404
 UninitializedMemoryBreakpointCondition=
 GameBoyErrorBreakpointSuspend19=true
 GameBoyErrorBreakpointSuspend18=true
@@ -300,5 +300,5 @@ WindowSpriteViewerOpen=false
 WindowProfilerWindowY=639
 WindowProfilerWindowX=461
 Scale=5.0
-KeyboardRequireWindowFocus=true
 WindowProfilerWindowProcedureProfiler=true
+KeyboardRequireWindowFocus=true