diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/GGHawkLink/GGHawkLink.IEmulator.cs b/BizHawk.Emulation.Cores/Consoles/Sega/GGHawkLink/GGHawkLink.IEmulator.cs
index 93793ba1fd..54f009a9b3 100644
--- a/BizHawk.Emulation.Cores/Consoles/Sega/GGHawkLink/GGHawkLink.IEmulator.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Sega/GGHawkLink/GGHawkLink.IEmulator.cs
@@ -90,8 +90,8 @@ namespace BizHawk.Emulation.Cores.Sega.GGHawkLink
 					 * 
 					 */
 
-					L.PSG.generate_sound(1);
-					R.PSG.generate_sound(1);
+					L.PSG.generate_sound();
+					R.PSG.generate_sound();
 
 					int s_L = L.PSG.current_sample_L;
 					int s_R = L.PSG.current_sample_R;
diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.IEmulator.cs b/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.IEmulator.cs
index eed3e78fe8..e3578436d4 100644
--- a/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.IEmulator.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Sega/SMS/SMS.IEmulator.cs
@@ -38,6 +38,9 @@ namespace BizHawk.Emulation.Cores.Sega.MasterSystem
 			}
 		}
 
+		// not savestated variables
+		int s_L, s_R;
+
 		public bool FrameAdvance(IController controller, bool render, bool rendersound)
 		{
 			_controller = controller;
@@ -87,10 +90,11 @@ namespace BizHawk.Emulation.Cores.Sega.MasterSystem
 				for (int j = 0; j < Vdp.IPeriod; j++)
 				{
 					Cpu.ExecuteOne();
-					PSG.generate_sound(1);
 
-					int s_L = PSG.current_sample_L;
-					int s_R = PSG.current_sample_R;
+					PSG.generate_sound();
+
+					s_L = PSG.current_sample_L;
+					s_R = PSG.current_sample_R;
 
 					if (s_L != old_s_L)
 					{
diff --git a/BizHawk.Emulation.Cores/Sound/SN76489sms.cs b/BizHawk.Emulation.Cores/Sound/SN76489sms.cs
index 529720d20d..2d04ccd233 100644
--- a/BizHawk.Emulation.Cores/Sound/SN76489sms.cs
+++ b/BizHawk.Emulation.Cores/Sound/SN76489sms.cs
@@ -171,103 +171,87 @@ namespace BizHawk.Emulation.Cores.Components
 			}
 		}
 
-		public void generate_sound(int cycles_to_do)
+		public void generate_sound()
 		{
 			// there are 16 cpu cycles for every psg cycle
-			for (int i = 0; i < cycles_to_do; i++)
+			psg_clock++;
+
+			if (psg_clock == 16)
 			{
-				psg_clock++;
+				psg_clock = 0;
 
-				if (psg_clock == 16)
+				clock_A--;
+				clock_B--;
+				clock_C--;
+				noise_clock--;
+
+				// clock noise
+				if (noise_clock == 0)
 				{
-					psg_clock = 0;
-
-					clock_A--;
-					clock_B--;
-					clock_C--;
-					noise_clock--;
-
-					// clock noise
-					if (noise_clock == 0)
+					noise_bit = noise.Bit(0);
+					if (noise_type)
 					{
-						noise_bit = noise.Bit(0);
-						if (noise_type)
-						{
-							int bit = (noise & 1) ^ ((noise >> 1) & 1);
-							noise = noise >> 1;
-							noise |= bit << 14;
-							
-						}
-						else
-						{
-							int bit = noise & 1;
-							noise = noise >> 1;
-							noise |= bit << 14;
-						}
-
-						if (noise_rate == 0)
-						{
-							noise_clock = 0x10;
-						}
-						else if (noise_rate == 1)
-						{
-							noise_clock = 0x20;
-						}
-						else if (noise_rate == 2)
-						{
-							noise_clock = 0x40;
-						}
-						else
-						{
-							noise_clock = Chan_tone[2] + 1;
-						}
-
-						noise_clock *= 2;					
+						noise = (((noise & 1) ^ ((noise >> 1) & 1)) << 14) | (noise >> 1);						
 					}
-					
-					if (clock_A == 0)
+					else
 					{
-						A_up = !A_up;
-						clock_A = Chan_tone[0] + 1;
+						noise = ((noise & 1) << 14) | (noise >> 1);
 					}
 
-					if (clock_B == 0)
+					if (noise_rate == 0)
 					{
-						B_up = !B_up;
-						clock_B = Chan_tone[1] + 1;
+						noise_clock = 0x10;
+					}
+					else if (noise_rate == 1)
+					{
+						noise_clock = 0x20;
+					}
+					else if (noise_rate == 2)
+					{
+						noise_clock = 0x40;
+					}
+					else
+					{
+						noise_clock = Chan_tone[2] + 1;
 					}
 
-					if (clock_C == 0)
-					{
-						C_up = !C_up;
-						clock_C = Chan_tone[2] + 1;
-					}
-
-					// now calculate the volume of each channel and add them together
-					// the magic number 42 is to make the volume comparable to the MSG volume
-					int v_L;
-					int v_R; 
-	
-					v_L = (A_L ? (A_up ? LogScale[Chan_vol[0]] * 42 : 0) : 0);
-					 
-					v_L += (B_L ? (B_up ? LogScale[Chan_vol[1]] * 42 : 0) : 0);
-
-					v_L += (C_L ? (C_up ? LogScale[Chan_vol[2]] * 42 : 0) : 0);
-
-					v_L += (noise_L ? (noise_bit ? LogScale[Chan_vol[3]] * 42 : 0) : 0);
-
-					v_R = (A_R ? (A_up ? LogScale[Chan_vol[0]] * 42 : 0) : 0);
-
-					v_R += (B_R ? (B_up ? LogScale[Chan_vol[1]] * 42 : 0) : 0);
-
-					v_R += (C_R ? (C_up ? LogScale[Chan_vol[2]] * 42 : 0) : 0);
-
-					v_R += (noise_R ? (noise_bit ? LogScale[Chan_vol[3]] * 42 : 0) : 0);
-
-					current_sample_L = v_L;
-
-					current_sample_R = v_R;
+					noise_clock *= 2;					
 				}
+					
+				if (clock_A == 0)
+				{
+					A_up = !A_up;
+					clock_A = Chan_tone[0] + 1;
+				}
+
+				if (clock_B == 0)
+				{
+					B_up = !B_up;
+					clock_B = Chan_tone[1] + 1;
+				}
+
+				if (clock_C == 0)
+				{
+					C_up = !C_up;
+					clock_C = Chan_tone[2] + 1;
+				}
+
+				// now calculate the volume of each channel and add them together
+				current_sample_L = (A_L ? (A_up ? LogScale[Chan_vol[0]] * 42 : 0) : 0);
+
+				current_sample_L += (B_L ? (B_up ? LogScale[Chan_vol[1]] * 42 : 0) : 0);
+
+				current_sample_L += (C_L ? (C_up ? LogScale[Chan_vol[2]] * 42 : 0) : 0);
+
+				current_sample_L += (noise_L ? (noise_bit ? LogScale[Chan_vol[3]] * 42 : 0) : 0);
+
+				current_sample_R = (A_R ? (A_up ? LogScale[Chan_vol[0]] * 42 : 0) : 0);
+
+				current_sample_R += (B_R ? (B_up ? LogScale[Chan_vol[1]] * 42 : 0) : 0);
+
+				current_sample_R += (C_R ? (C_up ? LogScale[Chan_vol[2]] * 42 : 0) : 0);
+
+				current_sample_R += (noise_R ? (noise_bit ? LogScale[Chan_vol[3]] * 42 : 0) : 0);
 			}
 		}
 	}