diff --git a/config/SOUE01/splits.txt b/config/SOUE01/splits.txt index e6a42f8c..b1a17f9c 100644 --- a/config/SOUE01/splits.txt +++ b/config/SOUE01/splits.txt @@ -2925,6 +2925,9 @@ nw4r/snd/snd_BasicSound.cpp: nw4r/snd/snd_BiquadFilterPreset.cpp: .text start:0x8046A370 end:0x8046A7B0 align:16 + .rodata start:0x804F7B80 end:0x804F8FB8 + .data start:0x8056DB98 end:0x8056DBE8 + .sdata2 start:0x8057EF98 end:0x8057EFA8 nw4r/snd/snd_Channel.cpp: .text start:0x8046A7B0 end:0x8046B7C8 align:16 diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index cfb5a8f4..d9f4cf61 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -25170,11 +25170,11 @@ GetCoef__Q44nw4r3snd6detail15BiquadFilterHpfCFifPQ44nw4r3snd20BiquadFilterCallba GetCoef__Q44nw4r3snd6detail18BiquadFilterBpf512CFifPQ44nw4r3snd20BiquadFilterCallback10BiquadCoef = .text:0x8046A490; // type:function size:0x94 GetCoef__Q44nw4r3snd6detail19BiquadFilterBpf1024CFifPQ44nw4r3snd20BiquadFilterCallback10BiquadCoef = .text:0x8046A530; // type:function size:0x94 GetCoef__Q44nw4r3snd6detail19BiquadFilterBpf2048CFifPQ44nw4r3snd20BiquadFilterCallback10BiquadCoef = .text:0x8046A5D0; // type:function size:0x94 -__dt__Q44nw4r3snd6detail15BiquadFilterLpfFv = .text:0x8046A670; // type:function size:0x40 -__dt__Q44nw4r3snd6detail15BiquadFilterHpfFv = .text:0x8046A6B0; // type:function size:0x40 -__dt__Q44nw4r3snd6detail18BiquadFilterBpf512Fv = .text:0x8046A6F0; // type:function size:0x40 -__dt__Q44nw4r3snd6detail19BiquadFilterBpf1024Fv = .text:0x8046A730; // type:function size:0x40 -__dt__Q44nw4r3snd6detail19BiquadFilterBpf2048Fv = .text:0x8046A770; // type:function size:0x40 +__dt__Q44nw4r3snd6detail15BiquadFilterLpfFv = .text:0x8046A670; // type:function size:0x40 scope:weak +__dt__Q44nw4r3snd6detail15BiquadFilterHpfFv = .text:0x8046A6B0; // type:function size:0x40 scope:weak +__dt__Q44nw4r3snd6detail18BiquadFilterBpf512Fv = .text:0x8046A6F0; // type:function size:0x40 scope:weak +__dt__Q44nw4r3snd6detail19BiquadFilterBpf1024Fv = .text:0x8046A730; // type:function size:0x40 scope:weak +__dt__Q44nw4r3snd6detail19BiquadFilterBpf2048Fv = .text:0x8046A770; // type:function size:0x40 scope:weak GetInstance__Q44nw4r3snd6detail14ChannelManagerFv = .text:0x8046A7B0; // type:function size:0x74 __dt__Q44nw4r3snd6detail14ChannelManagerFv = .text:0x8046A830; // type:function size:0x60 GetRequiredMemSize__Q44nw4r3snd6detail14ChannelManagerFi = .text:0x8046A890; // type:function size:0xC @@ -29151,11 +29151,11 @@ TYPE_NAME__Q34nw4r3g3d12ScnMdlSimple = .rodata:0x804F7B30; // type:object size:0 TYPE_NAME__Q34nw4r3g3d6ScnMdl = .rodata:0x804F7B48; // type:object size:0xC TYPE_NAME__Q34nw4r3g3d14ScnMdl1Mat1Shp = .rodata:0x804F7B58; // type:object size:0x18 TYPE_NAME__Q34nw4r3g3d7ScnProc = .rodata:0x804F7B70; // type:object size:0x10 -lbl_804F7B80 = .rodata:0x804F7B80; // type:object size:0x460 -lbl_804F7FE0 = .rodata:0x804F7FE0; // type:object size:0x3CC -lbl_804F83AC = .rodata:0x804F83AC; // type:object size:0x4C4 -lbl_804F8870 = .rodata:0x804F8870; // type:object size:0x3A4 -lbl_804F8C14 = .rodata:0x804F8C14; // type:object size:0x3A4 +coefTable__Q44nw4r3snd6detail15BiquadFilterLpf = .rodata:0x804F7B80; // type:object size:0x460 +coefTable__Q44nw4r3snd6detail15BiquadFilterHpf = .rodata:0x804F7FE0; // type:object size:0x3CA +coefTable__Q44nw4r3snd6detail18BiquadFilterBpf512 = .rodata:0x804F83AC; // type:object size:0x4C4 +coefTable__Q44nw4r3snd6detail19BiquadFilterBpf1024 = .rodata:0x804F8870; // type:object size:0x3A2 +coefTable__Q44nw4r3snd6detail19BiquadFilterBpf2048 = .rodata:0x804F8C14; // type:object size:0x3A2 lbl_804F8FB8 = .rodata:0x804F8FB8; // type:object size:0x100 lbl_804F90B8 = .rodata:0x804F90B8; // type:object size:0x200 lbl_804F92B8 = .rodata:0x804F92B8; // type:object size:0x28 @@ -49667,8 +49667,8 @@ lbl_8057EF78 = .sdata2:0x8057EF78; // type:object size:0x4 align:4 data:float lbl_8057EF88 = .sdata2:0x8057EF88; // type:object size:0x4 align:4 data:float lbl_8057EF8C = .sdata2:0x8057EF8C; // type:object size:0x4 align:4 data:float lbl_8057EF90 = .sdata2:0x8057EF90; // type:object size:0x8 align:8 data:double -lbl_8057EF98 = .sdata2:0x8057EF98; // type:object size:0x8 align:8 data:double -lbl_8057EFA0 = .sdata2:0x8057EFA0; // type:object size:0x4 align:4 data:float +@212 = .sdata2:0x8057EF98; // type:object size:0x8 scope:local align:8 data:double +@247 = .sdata2:0x8057EFA0; // type:object size:0x4 scope:local align:4 data:float lbl_8057EFA8 = .sdata2:0x8057EFA8; // type:object size:0x4 align:4 data:float lbl_8057EFAC = .sdata2:0x8057EFAC; // type:object size:0x4 align:4 data:float lbl_8057EFB0 = .sdata2:0x8057EFB0; // type:object size:0x4 align:4 data:float diff --git a/configure.py b/configure.py index cba8e03c..c7ae35d8 100644 --- a/configure.py +++ b/configure.py @@ -1021,7 +1021,7 @@ config.libs = [ Object(NonMatching, "nw4r/snd/snd_BankFile.cpp"), Object(Matching, "nw4r/snd/snd_BasicPlayer.cpp"), Object(NonMatching, "nw4r/snd/snd_BasicSound.cpp"), - Object(NonMatching, "nw4r/snd/snd_BiquadFilterPreset.cpp"), + Object(Matching, "nw4r/snd/snd_BiquadFilterPreset.cpp"), Object(NonMatching, "nw4r/snd/snd_Channel.cpp"), Object(NonMatching, "nw4r/snd/snd_DisposeCallbackManager.cpp"), Object(NonMatching, "nw4r/snd/snd_debug.cpp"),