Update and link reset of MusyX

PrimeDecomp · Dec 17, 2024 · c854a74 · c854a74
1 parent 10d6750
commit c854a74
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/config/GM8E01_00/splits.txt b/config/GM8E01_00/splits.txt
@@ -4302,6 +4302,9 @@ musyx/runtime/hw_dolphin.c:
 	.bss        start:0x805678A0 end:0x80569900
 	.sbss       start:0x805A9B70 end:0x805A9B98
 
+Dolphin/dummy.c:
+	.bss        start:0x80569900 end:0x80569908
+
 musyx/runtime/hw_memory.c:
 	.text       start:0x803B5134 end:0x803B5188
 

diff --git a/configure.py b/configure.py
@@ -1285,7 +1285,7 @@ def MatchingFor(*versions):
             Object(Matching, "musyx/runtime/synth_vsamples.c"),
             Object(Matching, "musyx/runtime/synth_dbtab.c"),
             Object(Matching, "musyx/runtime/s_data.c"),
-            Object(NonMatching, "musyx/runtime/hw_dspctrl.c"),
+            Object(Matching, "musyx/runtime/hw_dspctrl.c"),
             Object(Matching, "musyx/runtime/hw_volconv.c"),
             Object(Matching, "musyx/runtime/snd3d.c"),
             Object(Matching, "musyx/runtime/snd_init.c"),
@@ -1307,6 +1307,12 @@ def MatchingFor(*versions):
             Object(Matching, "musyx/runtime/profile.c"),
         ],
     ),
+    DolphinLib(
+        "Dummy",
+        [
+            Object(Matching, "Dolphin/dummy.c"),
+        ],
+    ),
     DolphinLib(
         "dtk",
         [

diff --git a/extern/musyx b/extern/musyx
+2 −0		include/musyx/adsr.h
+2 −50		include/musyx/assert.h
+19 −0		include/musyx/hardware.h
+891 −56		src/musyx/runtime/hw_dspctrl.c