From e52f5c914780cdaf1b84d07cbaf24f6a7646a074 Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Sun, 5 Dec 2021 01:30:33 -0500
Subject: [PATCH] wow

---
 src/engine/platform/c64.cpp | 16 +++++++---------
 src/engine/platform/c64.h   |  3 ++-
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/engine/platform/c64.cpp b/src/engine/platform/c64.cpp
index 5ab17b43..37ddaa5e 100644
--- a/src/engine/platform/c64.cpp
+++ b/src/engine/platform/c64.cpp
@@ -69,14 +69,9 @@ void DivPlatformC64::tick() {
       }
     }
     if (chan[i].std.hadDuty) {
-      chan[i].duty=chan[i].std.duty;
-      if (i==3 && chan[i].duty>1) chan[i].duty=1;
-      DivInstrument* ins=parent->getIns(chan[i].ins);
-      if (i!=2) {
-      }
-      if (i==3) { // noise
-        chan[i].freqChanged=true;
-      }
+      chan[i].duty+=(signed char)chan[i].std.duty;
+      sid.write(i*7+2,chan[i].duty&0xff);
+      sid.write(i*7+3,chan[i].duty>>8);
     }
     if (chan[i].sweepChanged) {
       chan[i].sweepChanged=false;
@@ -97,7 +92,7 @@ void DivPlatformC64::tick() {
     }
     if (chan[i].freqChanged || chan[i].keyOn || chan[i].keyOff) {
       DivInstrument* ins=parent->getIns(chan[i].ins);
-      chan[i].freq=(chan[i].baseFreq*(ONE_SEMITONE-chan[i].pitch))/ONE_SEMITONE;
+      chan[i].freq=(chan[i].baseFreq*(ONE_SEMITONE+chan[i].pitch))/ONE_SEMITONE;
       if (chan[i].keyOn) {
         sid.write(i*7+5,(ins->c64.a<<4)|(ins->c64.d));
         sid.write(i*7+6,(ins->c64.s<<4)|(ins->c64.r));
@@ -138,6 +133,9 @@ int DivPlatformC64::dispatch(DivCommand c) {
       chan[c.chan].note=c.value;
       chan[c.chan].active=true;
       chan[c.chan].keyOn=true;
+      chan[c.chan].duty=(parent->getIns(chan[c.chan].ins)->c64.duty*4095)/100;
+      sid.write(c.chan*7+2,chan[c.chan].duty&0xff);
+      sid.write(c.chan*7+3,chan[c.chan].duty>>8);
       chan[c.chan].std.init(parent->getIns(chan[c.chan].ins));
       break;
     case DIV_CMD_NOTE_OFF:
diff --git a/src/engine/platform/c64.h b/src/engine/platform/c64.h
index efd6a405..317417db 100644
--- a/src/engine/platform/c64.h
+++ b/src/engine/platform/c64.h
@@ -8,7 +8,8 @@
 class DivPlatformC64: public DivDispatch {
   struct Channel {
     int freq, baseFreq, pitch, prevFreq;
-    unsigned char ins, note, duty, sweep;
+    unsigned char ins, note, sweep;
+    unsigned short duty;
     bool active, insChanged, freqChanged, sweepChanged, keyOn, keyOff, inPorta, onTheKey;
     signed char vol, outVol, wave;
     DivMacroInt std;