From 530b4540f00a0c8b8917b231dd0d20736c0bdebb Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Wed, 24 Apr 2024 21:27:01 -0700 Subject: [PATCH] Match and link synthmacros, update musyx --- config/GM8E01_00/symbols.txt | 2 +- config/GM8E01_01/symbols.txt | 2 +- configure.py | 2 +- extern/musyx | 2 +- tools/decompctx.py | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) mode change 100644 => 100755 tools/decompctx.py diff --git a/config/GM8E01_00/symbols.txt b/config/GM8E01_00/symbols.txt index 411dd09d..1288631a 100644 --- 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 index f2090015..0cedd277 100644 --- 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 index a0371149..4c9d421b 100755 --- a/configure.py +++ b/configure.py @@ -1207,7 +1207,7 @@ config.libs = [ 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 index ddfad60c..006c34f2 160000 --- a/extern/musyx +++ b/extern/musyx @@ -1 +1 @@ -Subproject commit ddfad60c3e4fede55479c744a1c70081e0d6cd12 +Subproject commit 006c34f2dab56b5a21de1c3322d0ee77da2513f9 diff --git a/tools/decompctx.py b/tools/decompctx.py old mode 100644 new mode 100755 index 28d3cbad..d2dc5224 --- a/tools/decompctx.py +++ b/tools/decompctx.py @@ -20,6 +20,7 @@ src_dir = os.path.join(root_dir, "src") 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*[<"](.+?)[>"]$')