From 78615095f20e81db8b572d4189389104a9ed3958 Mon Sep 17 00:00:00 2001
From: alyosha-tas <alexei.f.k@gmail.com>
Date: Mon, 15 Nov 2021 15:10:36 -0500
Subject: [PATCH] A2600: fix AUDC 2 audio

---
 .../Consoles/Atari/2600/Tia/Tia.Audio.cs           | 14 ++++++--------
 .../Atari/A7800Hawk/TIA_Sound/Tia.Audio.cs         |  7 +++----
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Tia/Tia.Audio.cs b/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Tia/Tia.Audio.cs
index 1f8f222c08..ef4cfb364e 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Tia/Tia.Audio.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Atari/2600/Tia/Tia.Audio.cs
@@ -125,10 +125,9 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
 							Run5_L();
 							break;
 						case 0x02:
-							if (((sr5_L & 0x0f) == 0) || ((sr5_L & 0x0f) == 0x0f))
+							if ((sr5_L == 31) || (sr5_L == 16))
 							{
 								on_L = Run4_L();
-								Run5_L();
 							}
 							Run5_L();
 							break;
@@ -153,11 +152,11 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
 						case 0x06:
 						case 0x0a:
 							Run5_L();
-							if ((sr5_L & 0x0f) == 0)
+							if (sr5_L == 16)
 							{
 								on_L = false;
 							}
-							else if ((sr5_L & 0x0f) == 0x0f)
+							else if (sr5_L == 31)
 							{
 								on_L = true;
 							}
@@ -277,10 +276,9 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
 							Run5_R();
 							break;
 						case 0x02:
-							if (((sr5_R & 0x0f) == 0) || ((sr5_R & 0x0f) == 0x0f))
+							if ((sr5_R == 31) || (sr5_R == 16))
 							{
 								on_R = Run4_R();
-								Run5_R();
 							}
 							Run5_R();
 							break;
@@ -305,11 +303,11 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
 						case 0x06:
 						case 0x0a:
 							Run5_R();
-							if ((sr5_R & 0x0f) == 0)
+							if (sr5_R == 16)
 							{
 								on_R = false;
 							}
-							else if ((sr5_R & 0x0f) == 0x0f)
+							else if (sr5_R == 31)
 							{
 								on_R = true;
 							}
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/TIA_Sound/Tia.Audio.cs b/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/TIA_Sound/Tia.Audio.cs
index 538f183424..e060c0ac1e 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/TIA_Sound/Tia.Audio.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/TIA_Sound/Tia.Audio.cs
@@ -120,10 +120,9 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
 							Run5();
 							break;
 						case 0x02:
-							if ((sr5 & 0x0f) == 0 || (sr5 & 0x0f) == 0x0f)
+							if ((sr5 == 31) || (sr5 == 16))
 							{
 								on = Run4();
-								Run5();
 							}
 							Run5();
 							break;
@@ -146,11 +145,11 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
 						case 0x06:
 						case 0x0a:
 							Run5();
-							if ((sr5 & 0x0f) == 0)
+							if (sr5 == 16)
 							{
 								on = false;
 							}
-							else if ((sr5 & 0x0f) == 0x0f)
+							else if (sr5 == 31)
 							{
 								on = true;
 							}