From d14b187e662b69637bc7d05a75080faf50575cba Mon Sep 17 00:00:00 2001
From: tildearrow <me@tildearrow.org>
Date: Sun, 1 Sep 2024 17:30:06 -0500
Subject: [PATCH] AY: batman is expanding

---
 src/engine/platform/ay.cpp | 12 ++++++------
 src/engine/platform/ay.h   |  4 +++-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/engine/platform/ay.cpp b/src/engine/platform/ay.cpp
index c25e32d39..ab2904572 100644
--- a/src/engine/platform/ay.cpp
+++ b/src/engine/platform/ay.cpp
@@ -162,8 +162,8 @@ void DivPlatformAY8910::runTFX(int runRate) {
   because for some reason, the register remap doesn't work
   when the user uses AtomicSSG core
   */
-  // TODO: this
-  if (runRate==0) runRate=dacRate;
+  float counterRatio=1.0;
+  if (runRate!=0) counterRatio=(double)rate/(double)runRate;
   int timerPeriod, output;
   for (int i=0; i<3; i++) {
     if (chan[i].active && (chan[i].curPSGMode.val&16) && !(chan[i].curPSGMode.val&8) && chan[i].tfx.mode!=-1) {
@@ -185,9 +185,9 @@ void DivPlatformAY8910::runTFX(int runRate) {
           continue;
         }
       }
-      chan[i].tfx.counter += 1;
+      chan[i].tfx.counter += counterRatio;
       if (chan[i].tfx.counter >= chan[i].tfx.period && chan[i].tfx.mode == 0) {
-        chan[i].tfx.counter = 0;
+        chan[i].tfx.counter -= chan[i].tfx.period;
         chan[i].tfx.out ^= 1;
         output = ((chan[i].tfx.out) ? chan[i].outVol : (chan[i].tfx.lowBound-(15-chan[i].outVol)));
         // TODO: fix this stupid crackling noise that happens
@@ -204,7 +204,7 @@ void DivPlatformAY8910::runTFX(int runRate) {
         }
       }
       if (chan[i].tfx.counter >= chan[i].tfx.period && chan[i].tfx.mode == 1) {
-        chan[i].tfx.counter = 0;
+        chan[i].tfx.counter -= chan[i].tfx.period;
         if (!isMuted[i]) {
           if (intellivision && selCore) {
             immWrite(0xa, ayEnvMode);
@@ -214,7 +214,7 @@ void DivPlatformAY8910::runTFX(int runRate) {
         }
       }
       if (chan[i].tfx.counter >= chan[i].tfx.period && chan[i].tfx.mode == 2) {
-        chan[i].tfx.counter = 0;
+        chan[i].tfx.counter -= chan[i].tfx.period;
       }
     }
     if (chan[i].tfx.num > 0) {
diff --git a/src/engine/platform/ay.h b/src/engine/platform/ay.h
index 8a4773167..ffc2c3c55 100644
--- a/src/engine/platform/ay.h
+++ b/src/engine/platform/ay.h
@@ -78,7 +78,9 @@ class DivPlatformAY8910: public DivDispatch {
       } dac;
 
       struct TFX {
-        int period, counter, offset, den, num, mode, lowBound, out;
+        int period;
+        float counter;
+        int offset, den, num, mode, lowBound, out;
         TFX():
           period(0),
           counter(0),