Match and link synthmacros, update musyx

This commit is contained in:
Phillip Stephens 2024-04-24 21:27:01 -07:00
parent 0aac17ba44
commit 530b4540f0
5 changed files with 5 additions and 4 deletions

View File

@ -1460,7 +1460,7 @@ UpdateThermalVisor__9CGameAreaFf = .text:0x8005E174; // type:function size:0x60
SetWeaponWorldLighting__9CGameAreaFff = .text:0x8005E1D4; // type:function size:0x14 scope:global SetWeaponWorldLighting__9CGameAreaFff = .text:0x8005E1D4; // type:function size:0x14 scope:global
SetXRaySpeedAndTarget__9CGameAreaFff = .text:0x8005E1E8; // 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 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 GetXRayFogDistance__9CGameAreaFv = .text:0x8005E23C; // type:function size:0x20 scope:global
SetLoadPauseState__9CGameAreaFb = .text:0x8005E25C; // type:function size:0x90 scope:global SetLoadPauseState__9CGameAreaFb = .text:0x8005E25C; // type:function size:0x90 scope:global
GetLayerScriptBuffer__9CGameAreaFi = .text:0x8005E2EC; // type:function size:0x50 scope:global GetLayerScriptBuffer__9CGameAreaFi = .text:0x8005E2EC; // type:function size:0x50 scope:global

View File

@ -1460,7 +1460,7 @@ UpdateThermalVisor__9CGameAreaFf = .text:0x8005E1F0; // type:function size:0x60
SetWeaponWorldLighting__9CGameAreaFff = .text:0x8005E250; // type:function size:0x14 scope:global SetWeaponWorldLighting__9CGameAreaFff = .text:0x8005E250; // type:function size:0x14 scope:global
SetXRaySpeedAndTarget__9CGameAreaFff = .text:0x8005E264; // 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 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 GetXRayFogDistance__9CGameAreaFv = .text:0x8005E2B8; // type:function size:0x20 scope:global
SetLoadPauseState__9CGameAreaFb = .text:0x8005E2D8; // type:function size:0x90 scope:global SetLoadPauseState__9CGameAreaFb = .text:0x8005E2D8; // type:function size:0x90 scope:global
GetLayerScriptBuffer__9CGameAreaFi = .text:0x8005E368; // type:function size:0x50 scope:global GetLayerScriptBuffer__9CGameAreaFi = .text:0x8005E368; // type:function size:0x50 scope:global

View File

@ -1207,7 +1207,7 @@ config.libs = [
Object(Matching, "musyx/runtime/snd_synthapi.c"), Object(Matching, "musyx/runtime/snd_synthapi.c"),
Object(NonMatching, "musyx/runtime/stream.c"), Object(NonMatching, "musyx/runtime/stream.c"),
Object(Matching, "musyx/runtime/synthdata.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/synthvoice.c"),
Object(Matching, "musyx/runtime/synth_ac.c"), Object(Matching, "musyx/runtime/synth_ac.c"),
Object(Matching, "musyx/runtime/synth_adsr.c"), Object(Matching, "musyx/runtime/synth_adsr.c"),

2
extern/musyx vendored

@ -1 +1 @@
Subproject commit ddfad60c3e4fede55479c744a1c70081e0d6cd12 Subproject commit 006c34f2dab56b5a21de1c3322d0ee77da2513f9

1
tools/decompctx.py Normal file → Executable file
View File

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