From 6ce67ca98dc41d60010fee74265ea6386557ccda Mon Sep 17 00:00:00 2001
From: Cuyler36 <Cuyler36@users.noreply.github.com>
Date: Sat, 21 Jun 2025 10:05:56 -0400
Subject: [PATCH] jaudio_NES: link jamosc

---
 configure.py                            |  4 ++--
 src/static/jaudio_NES/internal/jamosc.c | 19 +++++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/configure.py b/configure.py
index d19ea101..40562b4a 100644
--- a/configure.py
+++ b/configure.py
@@ -761,7 +761,7 @@ config.libs = [
             Object(NonMatching, "jaudio_NES/internal/audioconst.c"),
             Object(NonMatching, "jaudio_NES/internal/audiotable.c"),
             Object(NonMatching, "jaudio_NES/internal/audiowork.c"),
-            Object(Matching, "jaudio_NES/internal/bankdrv.c", extra_cflags=["-proc 7400"]),
+            Object(Matching, "jaudio_NES/internal/bankdrv.c", extra_cflags=["-pragma \"scheduling 7400\""]),
             Object(Matching, "jaudio_NES/internal/bankread.c"),
             Object(Matching, "jaudio_NES/internal/centcalc.c"),
             Object(NonMatching, "jaudio_NES/internal/channel.c"),
@@ -780,7 +780,7 @@ config.libs = [
             Object(Matching, "jaudio_NES/internal/ipldec.c"),
             Object(Matching, "jaudio_NES/internal/ja_calc.c", extra_cflags=["-sym off"]),
             Object(NonMatching, "jaudio_NES/internal/jammain_2.c", extra_cflags=["-sym on"]),
-            Object(NonMatching, "jaudio_NES/internal/jamosc.c"),
+            Object(Matching, "jaudio_NES/internal/jamosc.c"),
             Object(NonMatching, "jaudio_NES/internal/memory.c"),
             Object(Matching, "jaudio_NES/internal/midplay.c"),
             Object(Matching, "jaudio_NES/internal/noteon.c"),
diff --git a/src/static/jaudio_NES/internal/jamosc.c b/src/static/jaudio_NES/internal/jamosc.c
index 1dd6caf2..ec5a756d 100644
--- a/src/static/jaudio_NES/internal/jamosc.c
+++ b/src/static/jaudio_NES/internal/jamosc.c
@@ -21,9 +21,6 @@ Osc_ OSC_DEF    = { 0, 1.0f, NULL, REL_TABLE, 1.0f, 0.0f };
  */
 void Osc_Update_Param(seqp_* track, u8 id, f32 val)
 {
-	u8* REF_id   = &id;
-	f32* REF_val = &val;
-
 	switch (id) {
 	case 6:
 		track->oscillators[0].width = val;
@@ -163,11 +160,17 @@ void Osc_Setup_ADSR(seqp_* track, s16* addr)
  */
 void Osc_Setup_Full(seqp_* track, u8 flag, u32 offs1, u32 offs2)
 {
-	u32 a   = flag & 0xF;
-	u32 b   = flag & 0x40;
-	u32 idx = (flag >> 4) & 0x1;
-	u32 c   = flag & 0x20;
-	u32 d   = flag & 0x80;
+    u8 idx;
+    u8 a;
+    u8 b;
+    u8 c;
+    u8 d;
+
+    idx = (flag >> 4) & 0x1;
+    a   = flag & 0xF;
+    b   = flag & 0x40;
+    c   = flag & 0x20;
+    d   = flag & 0x80;
 	if (d) {
 		track->oscillators[idx] = ENVELOPE_DEF;