diff --git a/config/SOUE01/splits.txt b/config/SOUE01/splits.txt index ad33feff..79f7fd9e 100644 --- a/config/SOUE01/splits.txt +++ b/config/SOUE01/splits.txt @@ -3099,6 +3099,10 @@ nw4r/snd/snd_VoiceManager.cpp: nw4r/snd/snd_Util.cpp: .text start:0x80484700 end:0x80484BD4 align:16 + .rodata start:0x804F9320 end:0x804FB7A0 + .data start:0x8056E340 end:0x8056E350 + .sdata start:0x80574EA8 end:0x80574EB0 + .sdata2 start:0x8057F1C0 end:0x8057F1F0 nw4r/snd/snd_WaveFile.cpp: .text start:0x80484BE0 end:0x80484F54 align:16 diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index e851c897..bfde946f 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -29160,14 +29160,14 @@ DecibelSquareTable__Q44nw4r3snd6detail12EnvGenerator = .rodata:0x804F8FB8; // ty @LOCAL@GetSinIdx__Q44nw4r3snd6detail3LfoFi@sinTable = .rodata:0x804F92B8; // type:object size:0x21 scope:weak lbl_804F92E0 = .rodata:0x804F92E0; // type:object size:0x28 data:4byte lbl_804F9308 = .rodata:0x804F9308; // type:object size:0x18 data:4byte -lbl_804F9320 = .rodata:0x804F9320; // type:object size:0x30 -lbl_804F9350 = .rodata:0x804F9350; // type:object size:0x400 -lbl_804F9750 = .rodata:0x804F9750; // type:object size:0xF14 -lbl_804FA664 = .rodata:0x804FA664; // type:object size:0x404 -lbl_804FAA68 = .rodata:0x804FAA68; // type:object size:0x404 -lbl_804FAE6C = .rodata:0x804FAE6C; // type:object size:0x404 -lbl_804FB270 = .rodata:0x804FB270; // type:object size:0x500 -lbl_804FB770 = .rodata:0x804FB770; // type:object size:0x30 +NoteTable__Q44nw4r3snd6detail4Util = .rodata:0x804F9320; // type:object size:0x30 +PitchTable__Q44nw4r3snd6detail4Util = .rodata:0x804F9350; // type:object size:0x400 +Decibel2RatioTable__Q44nw4r3snd6detail4Util = .rodata:0x804F9750; // type:object size:0xF14 +Pan2RatioTableSqrt__Q44nw4r3snd6detail4Util = .rodata:0x804FA664; // type:object size:0x404 +Pan2RatioTableSinCos__Q44nw4r3snd6detail4Util = .rodata:0x804FAA68; // type:object size:0x404 +Pan2RatioTableLinear__Q44nw4r3snd6detail4Util = .rodata:0x804FAE6C; // type:object size:0x404 +RemoteFilterCoefTable__Q44nw4r3snd6detail4Util = .rodata:0x804FB270; // type:object size:0x500 +CalcLpfFreqTable__Q44nw4r3snd6detail4Util = .rodata:0x804FB770; // type:object size:0x30 gRMO_Pal60_640x456Prog_16x9__22@unnamed@eggVideo_cpp@ = .rodata:0x804FB7A0; // type:object size:0x3C scope:local gRMO_Pal60_640x456IntDf_16x9__22@unnamed@eggVideo_cpp@ = .rodata:0x804FB7DC; // type:object size:0x3C scope:local gRMO_Pal50_640x456IntDf_16x9__22@unnamed@eggVideo_cpp@ = .rodata:0x804FB818; // type:object size:0x3C scope:local @@ -38626,7 +38626,7 @@ lbl_8056E2B8 = .data:0x8056E2B8; // type:object size:0x18 lbl_8056E2D0 = .data:0x8056E2D0; // type:object size:0x38 jumptable_8056E308 = .data:0x8056E308; // type:object size:0x24 scope:local lbl_8056E32C = .data:0x8056E32C; // type:object size:0x14 -lbl_8056E340 = .data:0x8056E340; // type:object size:0x10 +PanTableTable__Q44nw4r3snd6detail4Util = .data:0x8056E340; // type:object size:0xC lbl_8056E350 = .data:0x8056E350; // type:object size:0x38 lbl_8056E388 = .data:0x8056E388; // type:object size:0x60 @324 = .data:0x8056E3E8; // type:object size:0x46 scope:local data:string @@ -41149,7 +41149,7 @@ lbl_80574E90 = .sdata:0x80574E90; // type:object size:0x4 lbl_80574E94 = .sdata:0x80574E94; // type:object size:0x4 lbl_80574E98 = .sdata:0x80574E98; // type:object size:0x8 lbl_80574EA0 = .sdata:0x80574EA0; // type:object size:0x8 data:4byte -lbl_80574EA8 = .sdata:0x80574EA8; // type:object size:0x8 data:4byte +@LOCAL@CalcRandom__Q44nw4r3snd6detail4UtilFv@u = .sdata:0x80574EA8; // type:object size:0x4 scope:weak data:4byte NW4R_LYT_Version___22@unnamed@lyt_init_cpp@ = .sdata:0x80574EB0; // type:object size:0x4 scope:local data:4byte @6623 = .sdata:0x80574EB8; // type:object size:0x4 scope:local data:string @1484 = .sdata:0x80574EC0; // type:object size:0x2 scope:local data:string @@ -49772,18 +49772,18 @@ lbl_8057F1AC = .sdata2:0x8057F1AC; // type:object size:0x4 align:4 data:float lbl_8057F1B0 = .sdata2:0x8057F1B0; // type:object size:0x4 align:4 data:float lbl_8057F1B4 = .sdata2:0x8057F1B4; // type:object size:0x4 align:4 data:float lbl_8057F1B8 = .sdata2:0x8057F1B8; // type:object size:0x4 align:4 data:float -lbl_8057F1C0 = .sdata2:0x8057F1C0; // type:object size:0x4 align:4 data:float -lbl_8057F1C4 = .sdata2:0x8057F1C4; // type:object size:0x4 align:4 data:float -lbl_8057F1C8 = .sdata2:0x8057F1C8; // type:object size:0x4 align:4 data:float -lbl_8057F1CC = .sdata2:0x8057F1CC; // type:object size:0x4 align:4 data:float -lbl_8057F1D0 = .sdata2:0x8057F1D0; // type:object size:0x4 align:4 data:float -lbl_8057F1D4 = .sdata2:0x8057F1D4; // type:object size:0x4 align:4 data:float -lbl_8057F1D8 = .sdata2:0x8057F1D8; // type:object size:0x4 align:4 data:float -lbl_8057F1DC = .sdata2:0x8057F1DC; // type:object size:0x4 align:4 data:float -lbl_8057F1E0 = .sdata2:0x8057F1E0; // type:object size:0x4 align:4 data:float -lbl_8057F1E4 = .sdata2:0x8057F1E4; // type:object size:0x4 align:4 data:float -lbl_8057F1E8 = .sdata2:0x8057F1E8; // type:object size:0x4 align:4 data:float -lbl_8057F1EC = .sdata2:0x8057F1EC; // type:object size:0x4 align:4 data:float +@312 = .sdata2:0x8057F1C0; // type:object size:0x4 scope:local align:4 data:float +@313 = .sdata2:0x8057F1C4; // type:object size:0x4 scope:local align:4 data:float +@314 = .sdata2:0x8057F1C8; // type:object size:0x4 scope:local align:4 data:float +@326 = .sdata2:0x8057F1CC; // type:object size:0x4 scope:local align:4 data:float +@327 = .sdata2:0x8057F1D0; // type:object size:0x4 scope:local align:4 data:float +@328 = .sdata2:0x8057F1D4; // type:object size:0x4 scope:local align:4 data:float +@366 = .sdata2:0x8057F1D8; // type:object size:0x4 scope:local align:4 data:float +@367 = .sdata2:0x8057F1DC; // type:object size:0x4 scope:local align:4 data:float +@368 = .sdata2:0x8057F1E0; // type:object size:0x4 scope:local align:4 data:float +@409 = .sdata2:0x8057F1E4; // type:object size:0x4 scope:local align:4 data:float +@410 = .sdata2:0x8057F1E8; // type:object size:0x4 scope:local align:4 data:float +@411 = .sdata2:0x8057F1EC; // type:object size:0x4 scope:local align:4 data:float @1628 = .sdata2:0x8057F1F0; // type:object size:0x4 scope:local align:4 data:float lbl_8057F1F8 = .sdata2:0x8057F1F8; // type:object size:0x4 align:4 data:float lbl_8057F1FC = .sdata2:0x8057F1FC; // type:object size:0x4 align:4 data:float diff --git a/configure.py b/configure.py index df8d5b58..2554881c 100644 --- a/configure.py +++ b/configure.py @@ -1078,7 +1078,7 @@ config.libs = [ Object(Matching, "nw4r/snd/snd_TaskThread.cpp"), Object(NonMatching, "nw4r/snd/snd_Voice.cpp"), Object(NonMatching, "nw4r/snd/snd_VoiceManager.cpp"), - Object(NonMatching, "nw4r/snd/snd_Util.cpp"), + Object(Matching, "nw4r/snd/snd_Util.cpp"), Object(NonMatching, "nw4r/snd/snd_WaveArchive.cpp"), Object(NonMatching, "nw4r/snd/snd_WaveFile.cpp"), Object(NonMatching, "nw4r/snd/snd_WaveSound.cpp"),