From b223bc80de9f16fc137f033e7ed50d0037cebbe1 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Sun, 21 Aug 2022 20:06:01 -0500
Subject: [PATCH] YM2612: #581

---
 src/engine/platform/genesis.cpp | 36 ++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/engine/platform/genesis.cpp b/src/engine/platform/genesis.cpp
index 143a90fe..7dde9790 100644
--- a/src/engine/platform/genesis.cpp
+++ b/src/engine/platform/genesis.cpp
@@ -263,19 +263,37 @@ void DivPlatformGenesis::tick(bool sysTick) {
       }
     }
 
-    if (chan[i].std.arp.had) {
-      if (!chan[i].inPorta) {
-        if (chan[i].std.arp.mode) {
-          chan[i].baseFreq=NOTE_FNUM_BLOCK(chan[i].std.arp.val,11);
-        } else {
-          chan[i].baseFreq=NOTE_FNUM_BLOCK(chan[i].note+(signed char)chan[i].std.arp.val,11);
+    if (i>=5 && chan[i].furnaceDac) {
+      if (chan[i].std.arp.had) {
+        if (!chan[i].inPorta) {
+          if (chan[i].std.arp.mode) {
+            chan[i].baseFreq=parent->calcBaseFreq(1,1,chan[i].std.arp.val,false);
+          } else {
+            chan[i].baseFreq=parent->calcBaseFreq(1,1,chan[i].note+(signed char)chan[i].std.arp.val,false);
+          }
+        }
+        chan[i].freqChanged=true;
+      } else {
+        if (chan[i].std.arp.mode && chan[i].std.arp.finished) {
+          chan[i].baseFreq=parent->calcBaseFreq(1,1,chan[i].note,false);
+          chan[i].freqChanged=true;
         }
       }
-      chan[i].freqChanged=true;
     } else {
-      if (chan[i].std.arp.mode && chan[i].std.arp.finished) {
-        chan[i].baseFreq=NOTE_FNUM_BLOCK(chan[i].note,11);
+       if (chan[i].std.arp.had) {
+        if (!chan[i].inPorta) {
+          if (chan[i].std.arp.mode) {
+            chan[i].baseFreq=NOTE_FNUM_BLOCK(chan[i].std.arp.val,11);
+          } else {
+            chan[i].baseFreq=NOTE_FNUM_BLOCK(chan[i].note+(signed char)chan[i].std.arp.val,11);
+          }
+        }
         chan[i].freqChanged=true;
+      } else {
+        if (chan[i].std.arp.mode && chan[i].std.arp.finished) {
+          chan[i].baseFreq=NOTE_FNUM_BLOCK(chan[i].note,11);
+          chan[i].freqChanged=true;
+        }
       }
     }