Match and link synthmacros, update musyx

PrimeDecomp · Apr 25, 2024 · 530b454 · 530b454
1 parent 0aac17b
commit 530b454
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/config/GM8E01_00/symbols.txt b/config/GM8E01_00/symbols.txt
@@ -1460,7 +1460,7 @@ UpdateThermalVisor__9CGameAreaFf = .text:0x8005E174; // type:function size:0x60
 SetWeaponWorldLighting__9CGameAreaFff = .text:0x8005E1D4; // type:function size:0x14 scope:global
 SetXRaySpeedAndTarget__9CGameAreaFff = .text:0x8005E1E8; // type:function size:0x14 scope:global
 SetThermalSpeedAndTarget__9CGameAreaFff = .text:0x8005E1FC; // type:function size:0x14 scope:global
-SetAreaAttributes__9CGameAreaFPC21CScriptAreaAttributes = .text:0x8005E210; // type:function size:0x2C scope:global
+SetAreaAttributes__9CGameAreaFP21CScriptAreaAttributes = .text:0x8005E210; // type:function size:0x2C scope:global
 GetXRayFogDistance__9CGameAreaFv = .text:0x8005E23C; // type:function size:0x20 scope:global
 SetLoadPauseState__9CGameAreaFb = .text:0x8005E25C; // type:function size:0x90 scope:global
 GetLayerScriptBuffer__9CGameAreaFi = .text:0x8005E2EC; // type:function size:0x50 scope:global

diff --git a/config/GM8E01_01/symbols.txt b/config/GM8E01_01/symbols.txt
@@ -1460,7 +1460,7 @@ UpdateThermalVisor__9CGameAreaFf = .text:0x8005E1F0; // type:function size:0x60
 SetWeaponWorldLighting__9CGameAreaFff = .text:0x8005E250; // type:function size:0x14 scope:global
 SetXRaySpeedAndTarget__9CGameAreaFff = .text:0x8005E264; // type:function size:0x14 scope:global
 SetThermalSpeedAndTarget__9CGameAreaFff = .text:0x8005E278; // type:function size:0x14 scope:global
-SetAreaAttributes__9CGameAreaFPC21CScriptAreaAttributes = .text:0x8005E28C; // type:function size:0x2C scope:global
+SetAreaAttributes__9CGameAreaFP21CScriptAreaAttributes = .text:0x8005E28C; // type:function size:0x2C scope:global
 GetXRayFogDistance__9CGameAreaFv = .text:0x8005E2B8; // type:function size:0x20 scope:global
 SetLoadPauseState__9CGameAreaFb = .text:0x8005E2D8; // type:function size:0x90 scope:global
 GetLayerScriptBuffer__9CGameAreaFi = .text:0x8005E368; // type:function size:0x50 scope:global

diff --git a/configure.py b/configure.py
@@ -1207,7 +1207,7 @@ def Rel(lib_name, objects):
             Object(Matching, "musyx/runtime/snd_synthapi.c"),
             Object(NonMatching, "musyx/runtime/stream.c"),
             Object(Matching, "musyx/runtime/synthdata.c"),
-            Object(NonMatching, "musyx/runtime/synthmacros.c"),
+            Object(Matching, "musyx/runtime/synthmacros.c"),
             Object(Matching, "musyx/runtime/synthvoice.c"),
             Object(Matching, "musyx/runtime/synth_ac.c"),
             Object(Matching, "musyx/runtime/synth_adsr.c"),

diff --git a/extern/musyx b/extern/musyx
diff --git a/tools/decompctx.py b/tools/decompctx.py
@@ -20,6 +20,7 @@
 include_dirs = [
     os.path.join(root_dir, "include"),
     os.path.join(root_dir, "libc"),
+    os.path.join(root_dir, "extern/musyx/include")
 ]
 
 include_pattern = re.compile(r'^#include\s*[<"](.+?)[>"]$')