From 7038a266f43549423c6627bdb5e9d1bfacf08560 Mon Sep 17 00:00:00 2001 From: robojumper Date: Sun, 25 May 2025 22:29:50 +0200 Subject: [PATCH] snd_EnvGenerator OK --- config/SOUE01/splits.txt | 2 ++ config/SOUE01/symbols.txt | 24 ++++++++++++------------ configure.py | 2 +- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/config/SOUE01/splits.txt b/config/SOUE01/splits.txt index 61a4d279..11eb4f0a 100644 --- a/config/SOUE01/splits.txt +++ b/config/SOUE01/splits.txt @@ -2943,6 +2943,8 @@ nw4r/snd/snd_DvdSoundArchive.cpp: nw4r/snd/snd_EnvGenerator.cpp: .text start:0x8046C1D0 end:0x8046C5A0 align:16 + .rodata start:0x804F8FB8 end:0x804F92B8 + .sdata2 start:0x8057EFD0 end:0x8057F000 nw4r/snd/snd_ExternalSoundPlayer.cpp: .text start:0x8046C5A0 end:0x8046CB18 align:16 diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index a23267f9..93c1695a 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -29156,8 +29156,8 @@ coefTable__Q44nw4r3snd6detail15BiquadFilterHpf = .rodata:0x804F7FE0; // type:obj 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 +DecibelSquareTable__Q44nw4r3snd6detail12EnvGenerator = .rodata:0x804F8FB8; // type:object size:0x100 +@LOCAL@SetAttack__Q44nw4r3snd6detail12EnvGeneratorFi@attackTable = .rodata:0x804F90B8; // type:object size:0x200 scope:weak lbl_804F92B8 = .rodata:0x804F92B8; // type:object size:0x28 lbl_804F92E0 = .rodata:0x804F92E0; // type:object size:0x28 data:4byte lbl_804F9308 = .rodata:0x804F9308; // type:object size:0x18 data:4byte @@ -49676,16 +49676,16 @@ lbl_8057EFB4 = .sdata2:0x8057EFB4; // type:object size:0x4 align:4 data:float lbl_8057EFB8 = .sdata2:0x8057EFB8; // type:object size:0x4 align:4 data:float lbl_8057EFC0 = .sdata2:0x8057EFC0; // type:object size:0x8 align:8 data:double lbl_8057EFC8 = .sdata2:0x8057EFC8; // type:object size:0x8 align:8 data:double -lbl_8057EFD0 = .sdata2:0x8057EFD0; // type:object size:0x4 align:4 data:float -lbl_8057EFD4 = .sdata2:0x8057EFD4; // type:object size:0x4 align:4 data:float -lbl_8057EFD8 = .sdata2:0x8057EFD8; // type:object size:0x4 align:4 data:float -lbl_8057EFDC = .sdata2:0x8057EFDC; // type:object size:0x4 align:4 data:float -lbl_8057EFE0 = .sdata2:0x8057EFE0; // type:object size:0x4 align:4 data:float -lbl_8057EFE8 = .sdata2:0x8057EFE8; // type:object size:0x8 align:8 data:double -lbl_8057EFF0 = .sdata2:0x8057EFF0; // type:object size:0x4 align:4 data:float -lbl_8057EFF4 = .sdata2:0x8057EFF4; // type:object size:0x4 align:4 data:float -lbl_8057EFF8 = .sdata2:0x8057EFF8; // type:object size:0x4 align:4 data:float -lbl_8057EFFC = .sdata2:0x8057EFFC; // type:object size:0x4 align:4 data:float +VOLUME_INIT__Q44nw4r3snd6detail12EnvGenerator = .sdata2:0x8057EFD0; // type:object size:0x4 align:4 data:float +@180 = .sdata2:0x8057EFD4; // type:object size:0x4 scope:local align:4 data:float +@181 = .sdata2:0x8057EFD8; // type:object size:0x4 scope:local align:4 data:float +@189 = .sdata2:0x8057EFDC; // type:object size:0x4 scope:local align:4 data:float +@210 = .sdata2:0x8057EFE0; // type:object size:0x4 scope:local align:4 data:float +@213 = .sdata2:0x8057EFE8; // type:object size:0x8 scope:local align:8 data:double +@224 = .sdata2:0x8057EFF0; // type:object size:0x4 scope:local align:4 data:float +@225 = .sdata2:0x8057EFF4; // type:object size:0x4 scope:local align:4 data:float +@226 = .sdata2:0x8057EFF8; // type:object size:0x4 scope:local align:4 data:float +@227 = .sdata2:0x8057EFFC; // type:object size:0x4 scope:local align:4 data:float lbl_8057F000 = .sdata2:0x8057F000; // type:object size:0x4 align:4 data:float lbl_8057F004 = .sdata2:0x8057F004; // type:object size:0x4 align:4 data:float lbl_8057F008 = .sdata2:0x8057F008; // type:object size:0x4 align:4 data:float diff --git a/configure.py b/configure.py index 2f9bb007..e4c39068 100644 --- a/configure.py +++ b/configure.py @@ -1026,7 +1026,7 @@ config.libs = [ Object(Matching, "nw4r/snd/snd_DisposeCallbackManager.cpp"), Object(NonMatching, "nw4r/snd/snd_debug.cpp"), Object(Matching, "nw4r/snd/snd_DvdSoundArchive.cpp"), - Object(NonMatching, "nw4r/snd/snd_EnvGenerator.cpp"), + Object(Matching, "nw4r/snd/snd_EnvGenerator.cpp"), Object(NonMatching, "nw4r/snd/snd_ExternalSoundPlayer.cpp"), Object(NonMatching, "nw4r/snd/snd_FrameHeap.cpp"), Object(NonMatching, "nw4r/snd/snd_FxBase.cpp"),