General update, trying to clean up FM volume code, work in progress

1 files changed, 19 insertions, 13 deletions

diff --git a/src-z80/core/sfx.z80 b/src-z80/core/sfx.z80
index b7e26aa..c778776 100644
--- a/src-z80/core/sfx.z80
+++ b/src-z80/core/sfx.z80
@@ -276,23 +276,29 @@ ClearSFX:
     ld a, b                     ; Kill ADSR
     call KillFM
 
-    PollPCM
+    ;PollPCM
+
+    ;ld hl, RAM_BGMFMVol           ; Restore BGM FM volume
+    ;ld a, b
+    ;add l
+    ;ld l, a
+    ;ld c, (hl)
+    ;ld a, l
+    ;add 8
+    ;ld l, a
+    ;ld (hl), c
 
-    ld hl, RAM_BGMFMVol           ; Restore BGM FM volume
+    PollPCM
+    
+    ;ld a, l                       ; Restore BGM FM instrument
+    ;sub 8*2
+    ;ld l, a
+    
+    ld hl, RAM_BGMFMInstr
     ld a, b
     add l
     ld l, a
-    ld c, (hl)
-    ld a, l
-    add 8
-    ld l, a
-    ld (hl), c
-
-    PollPCM
-
-    ld a, l                       ; Restore BGM FM instrument
-    sub 8*2
-    ld l, a
+    
     push bc
     push de
     push hl