コミット: c079b91d9219c21a4aefeab9d6e0fb4915325a53 - satousynth (hg)

VGM playback library for Common Lisp

コミットメタ情報

• リビジョン: c079b91d9219c21a4aefeab9d6e0fb4915325a53 (tree)
• 日時: 2023-08-18 19:04:31
• 作者: Remilia Scarlet <remilia@post...>
• コミッター: Remilia Scarlet

ログメッセージ

Fix noise not being played correctly

変更サマリ

• modified: src/chips/emu-huc6280-ootake.lisp

差分

diff -r 7411c8cb96fe -r c079b91d9219 src/chips/emu-huc6280-ootake.lisp
--- a/src/chips/emu-huc6280-ootake.lisp	Wed Jun 14 13:49:37 2023 -0600
+++ b/src/chips/emu-huc6280-ootake.lisp	Fri Aug 18 04:04:31 2023 -0600
@@ -312,7 +312,7 @@
           (setf bit1 (ash (logand reg 2) -1))
           (setf bit14 (logxor bit0 bit1))
           (setf reg (ash reg -1))
-          (setf reg (logior reg (coerce-to-uint32 (ash bit14 14))))
+          (setf reg (coerce-to-uint32 (logior reg (ash bit14 14))))
           (setf (aref (%ootake-noise-table emu) i) (if (zerop bit0) -1 -18)))
   nil)
 
@@ -364,7 +364,7 @@
 
   (dotimes (j 32)
     ;; ch3は最大値で初期化。F1トリプルバトル。v2.65
-    (setf (aref (%psg-wave (aref (%ootake-psg emu) 3)) j) -17))
+    (setf (aref (%psg-wave (aref (%ootake-psg emu) 3)) j) 17))
   nil)
 
 (define-typed-fn ootake-read ((emu-ootake emu) (fixnum reg))
@@ -531,13 +531,14 @@
       (7 ;; Noise on, noise frequency
        (when (>= (%ootake-channel emu) 4)
          (let ((psg-chan (aref (%ootake-psg emu) (%ootake-channel emu))))
-           (setf (%psg-noise-on-p psg-chan) (/= (logand data #x80) 0))
+           (setf (%psg-noise-on-p psg-chan) (flag? data #x80))
            (setf (%psg-noise-freq psg-chan) (- #x1F (logand data #x1F)))
            (setf (%psg-delta-noise-phase psg-chan)
-                 (if (zerop (%psg-noise-freq psg-chan))
-                     (coerce-to-uint32 (truncate (+ (* 2048.0d0 (%ootake-resample-rate emu)) 0.5d0)))
-                     (coerce-to-uint32 (truncate (/ (* 2048.0d0 (%ootake-resample-rate emu))
-                                                    (+ (%psg-noise-freq psg-chan) 0.5d0)))))))))
+                 (coerce-to-uint32
+                  (if (zerop (%psg-noise-freq psg-chan))
+                      (truncate (+ (* 2048.0d0 (%ootake-resample-rate emu)) 0.5d0))
+                      (truncate (/ (* 2048.0d0 (%ootake-resample-rate emu))
+                                   (+ (%psg-noise-freq psg-chan) 0.5d0)))))))))
 
       (8 ;; LFO frequency
        (setf (%ootake-lfo-freq emu) data))
@@ -557,7 +558,7 @@
 (define-typed-fn ootake-write ((emu-ootake emu) (fixnum reg) (fixnum data))
     (null t)
   (declare (optimize (speed 3) (debug 1) (safety 0) (compilation-speed 0)))
-  (ootake-write-reg emu reg data))
+  (ootake-write-reg emu (logand reg #xFF) data))
 
 (define-typed-fn ootake-update ((emu-ootake emu) (satou-chips::t/output-buffer outputs) (t/uint32 start samples))
     (null)
@@ -619,11 +620,11 @@
                          ;; 1/16384 + 1/32768)。この"+1/32768"で絶妙(主観。大魔
                          ;; 界村,ソルジャーブレイドなど)になる。v2.62更新
                          (setf smp (* sample (%psg-out-volume-l psg-chan)))
-                         (incf sample-all-l (+ (ash smp -11) (ash smp -14) (ash smp -15)))
+                         (incf sample-all-l (+ smp (ash smp -11) (ash smp -14) (ash smp -15)))
 
                          ;; Kitao更新。ノイズの音量を実機並みに調整
                          (setf smp (* sample (%psg-out-volume-r psg-chan)))
-                         (incf sample-all-r (+ (ash smp -11) (ash smp -14) (ash smp -15)))))
+                         (incf sample-all-r (+ smp (ash smp -11) (ash smp -14) (ash smp -15)))))
 
                       (setf (%psg-phase psg-chan)
                             (coerce-to-uint32 (+ (%psg-phase psg-chan) (%psg-delta-noise-phase psg-chan)))))