From 9cedf68407057eccd27f03c6a88e9b13b310f4e2 Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Sun, 16 Jun 2019 00:51:29 +1000
Subject: [PATCH] Inline waveform

---
 BizHawk.Emulation.Cores/Sound/YM2413.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/BizHawk.Emulation.Cores/Sound/YM2413.cs b/BizHawk.Emulation.Cores/Sound/YM2413.cs
index 2698714e69..2e6b7d3af9 100644
--- a/BizHawk.Emulation.Cores/Sound/YM2413.cs
+++ b/BizHawk.Emulation.Cores/Sound/YM2413.cs
@@ -280,8 +280,6 @@ namespace BizHawk.Emulation.Common.Components
 		static short[] fullsintable = new short[PG_WIDTH];
 		static short[] halfsintable = new short[PG_WIDTH];
 
-		static short[][] waveform = new short[2][] { fullsintable, halfsintable };
-
 		/* LFO Table */
 		static int[] pmtable = new int[PM_PG_WIDTH];
 		static int[] amtable = new int[AM_PG_WIDTH];
@@ -636,7 +634,7 @@ namespace BizHawk.Emulation.Common.Components
 			}
 		}
 		static void UPDATE_RKS(OPLL_SLOT S) { (S).rks = (uint)rksTable[((S).fnum) >> 8, (S).block, (S).patch.kr]; }
-		static void UPDATE_WF(OPLL_SLOT S) { (S).sintbl = waveform[(S).patch.wf]; }
+		static void UPDATE_WF(OPLL_SLOT S) { (S).sintbl = (S).patch.wf == 0 ? fullsintable : halfsintable; }
 		static void UPDATE_EG(OPLL_SLOT S) { (S).eg_dphase = calc_eg_dphase(S); }
 		static void UPDATE_ALL(OPLL_SLOT S)
 		{
@@ -891,7 +889,7 @@ namespace BizHawk.Emulation.Common.Components
 		static void OPLL_SLOT_reset(OPLL_SLOT slot, int type)
 		{
 			slot.type = type;
-			slot.sintbl = waveform[0];
+			slot.sintbl = fullsintable;
 			slot.phase = 0;
 			slot.dphase = 0;
 			slot.output[0] = 0;