From 80f8ccf627455d8283ee73b9a51a590796bd53ed Mon Sep 17 00:00:00 2001
From: tildearrow <tildearrow@protonmail.com>
Date: Fri, 7 Oct 2022 17:21:53 -0500
Subject: [PATCH] C64: partially fix wave after gate

---
 src/engine/platform/c64.cpp | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/engine/platform/c64.cpp b/src/engine/platform/c64.cpp
index 6e98fd8a..9fb10d41 100644
--- a/src/engine/platform/c64.cpp
+++ b/src/engine/platform/c64.cpp
@@ -129,18 +129,6 @@ void DivPlatformC64::tick(bool sysTick) {
       rWrite(i*7+2,chan[i].duty&0xff);
       rWrite(i*7+3,chan[i].duty>>8);
     }
-    if (sysTick) {
-      if (chan[i].testWhen>0) {
-        if (--chan[i].testWhen<1) {
-          if (!chan[i].resetMask && !chan[i].inPorta) {
-            DivInstrument* ins=parent->getIns(chan[i].ins,DIV_INS_C64);
-            rWrite(i*7+5,0);
-            rWrite(i*7+6,0);
-            rWrite(i*7+4,(chan[i].wave<<4)|(ins->c64.noTest?0:8)|(chan[i].test<<3)|(chan[i].ring<<2)|(chan[i].sync<<1));
-          }
-        }
-      }
-    }
     if (chan[i].std.wave.had) {
       chan[i].wave=chan[i].std.wave.val;
       rWrite(i*7+4,(chan[i].wave<<4)|(chan[i].test<<3)|(chan[i].ring<<2)|(chan[i].sync<<1)|(int)(chan[i].active));
@@ -173,6 +161,19 @@ void DivPlatformC64::tick(bool sysTick) {
       rWrite(i*7+4,(chan[i].wave<<4)|(chan[i].test<<3)|(chan[i].ring<<2)|(chan[i].sync<<1)|(int)(chan[i].active));
     }
 
+    if (sysTick) {
+      if (chan[i].testWhen>0) {
+        if (--chan[i].testWhen<1) {
+          if (!chan[i].resetMask && !chan[i].inPorta) {
+            DivInstrument* ins=parent->getIns(chan[i].ins,DIV_INS_C64);
+            rWrite(i*7+5,0);
+            rWrite(i*7+6,0);
+            rWrite(i*7+4,(chan[i].wave<<4)|(ins->c64.noTest?0:8)|(chan[i].test<<3)|(chan[i].ring<<2)|(chan[i].sync<<1));
+          }
+        }
+      }
+    }
+
     if (chan[i].freqChanged || chan[i].keyOn || chan[i].keyOff) {
       chan[i].freq=parent->calcFreq(chan[i].baseFreq,chan[i].pitch,false,8,chan[i].pitch2,chipClock,CHIP_FREQBASE);
       if (chan[i].freq>0xffff) chan[i].freq=0xffff;