From da98253489b1334f9d23f477ec8fa2a76e664aa6 Mon Sep 17 00:00:00 2001
From: Javier Degirolmo
Date: Sat, 7 Apr 2012 20:28:18 -0300
Subject: Bugfixes (especially killing FM channels), panning is restored,
 version bumped up to 0.9 - going to look mainly for bugs now...

---
 src-z80/player/psg.z80 | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src-z80/player/psg.z80')

diff --git a/src-z80/player/psg.z80 b/src-z80/player/psg.z80
index 46df82a..f0c5a76 100644
--- a/src-z80/player/psg.z80
+++ b/src-z80/player/psg.z80
@@ -573,8 +573,6 @@ SetNotePSGBGM:
 
     push hl
     and $0F                     ; Check if channel is free
-    ;ld hl, RAM_Locked
-    ;add l
     ld h, RAM_Locked>>8
     add RAM_Locked&$FF
     ld l, a
@@ -640,14 +638,14 @@ SetNoteNoiseBGM:
 ;****************************************************************************
 
 LockChannelPSG:
+    and $03
     ld b, a
     PollPCM
     push hl
 
     ld h, RAM_Locked>>8         ; Get address of channel to lock
     ld a, b
-    and $0F
-    add RAM_Locked&$FF
+    add (RAM_Locked&$FF)+8
     ld l, a
 
     ld (hl), $01                ; Lock channel
-- 
cgit v1.2.3