From 1b97d3912bcd7872da78ac8b47779ee54c821c01 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Mon, 25 Apr 2022 11:59:02 -0500
Subject: [PATCH] YM2612: hopefully the final pitch slide fix

---
 src/engine/platform/genesis.cpp    | 6 +++---
 src/engine/platform/genesisext.cpp | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/engine/platform/genesis.cpp b/src/engine/platform/genesis.cpp
index f2203fc3..72dc9c0f 100644
--- a/src/engine/platform/genesis.cpp
+++ b/src/engine/platform/genesis.cpp
@@ -434,7 +434,7 @@ void DivPlatformGenesis::tick(bool sysTick) {
             off=(double)s->centerRate/8363.0;
           }
         }
-        chan[i].freq=parent->calcFreq(chan[i].baseFreq,chan[i].pitch,false,4)+chan[i].std.pitch.val;;
+        chan[i].freq=parent->calcFreq(chan[i].baseFreq,chan[i].pitch,false,4)+chan[i].std.pitch.val;
         dacRate=chan[i].freq*off;
         if (dacRate<1) dacRate=1;
         if (dumpWrites) addWrite(0xffff0001,dacRate);
@@ -686,12 +686,12 @@ int DivPlatformGenesis::dispatch(DivCommand c) {
       // check for octave boundary
       // what the heck!
       if (!chan[c.chan].portaPause) {
-        if ((newFreq&0x7ff)>1288) {
+        if ((newFreq&0x7ff)>1288 && (newFreq&0xf800)<0x3800) {
           chan[c.chan].portaPauseFreq=(644)|((newFreq+0x800)&0xf800);
           chan[c.chan].portaPause=true;
           break;
         }
-        if ((newFreq&0x7ff)<644) {
+        if ((newFreq&0x7ff)<644 && (newFreq&0xf800)>0) {
           chan[c.chan].portaPauseFreq=newFreq=(1287)|((newFreq-0x800)&0xf800);
           chan[c.chan].portaPause=true;
           break;
diff --git a/src/engine/platform/genesisext.cpp b/src/engine/platform/genesisext.cpp
index f146e2fc..59b77587 100644
--- a/src/engine/platform/genesisext.cpp
+++ b/src/engine/platform/genesisext.cpp
@@ -148,7 +148,7 @@ int DivPlatformGenesisExt::dispatch(DivCommand c) {
       }
       // what the heck!
       if (!opChan[ch].portaPause) {
-        if ((newFreq&0x7ff)>1288) {
+        if ((newFreq&0x7ff)>1288 && (newFreq&0xf800)<0x3800) {
           if (parent->song.fbPortaPause) {
             opChan[ch].portaPauseFreq=(644)|((newFreq+0x800)&0xf800);
             opChan[ch].portaPause=true;
@@ -157,7 +157,7 @@ int DivPlatformGenesisExt::dispatch(DivCommand c) {
             newFreq=(newFreq>>1)|((newFreq+0x800)&0xf800);
           }
         }
-        if ((newFreq&0x7ff)<644) {
+        if ((newFreq&0x7ff)<644 && (newFreq&0xf800)>0) {
           if (parent->song.fbPortaPause) {
             opChan[ch].portaPauseFreq=newFreq=(1287)|((newFreq-0x800)&0xf800);
             opChan[ch].portaPause=true;