From 6ff9dd199a75770fcbb6ce76ca7332ce9dd2d9d3 Mon Sep 17 00:00:00 2001 From: robojumper Date: Sun, 25 May 2025 23:17:24 +0200 Subject: [PATCH] snd_WsdFile OK --- config/SOUE01/splits.txt | 1 + config/SOUE01/symbols.txt | 2 +- configure.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/config/SOUE01/splits.txt b/config/SOUE01/splits.txt index c8b9c60e..d2b02709 100644 --- a/config/SOUE01/splits.txt +++ b/config/SOUE01/splits.txt @@ -3109,6 +3109,7 @@ nw4r/snd/snd_WaveSoundHandle.cpp: nw4r/snd/snd_WsdFile.cpp: .text start:0x80485460 end:0x80485824 align:16 + .sdata2 start:0x8057F1F0 end:0x8057F1F8 nw4r/snd/snd_WsdPlayer.cpp: .text start:0x80485830 end:0x804869D8 align:16 diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index 57386b7f..71700049 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -49784,7 +49784,7 @@ 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 -lbl_8057F1F0 = .sdata2:0x8057F1F0; // type:object size:0x4 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 lbl_8057F200 = .sdata2:0x8057F200; // type:object size:0x4 align:4 data:float diff --git a/configure.py b/configure.py index d64db591..8837c519 100644 --- a/configure.py +++ b/configure.py @@ -1083,7 +1083,7 @@ config.libs = [ Object(NonMatching, "nw4r/snd/snd_WaveFile.cpp"), Object(NonMatching, "nw4r/snd/snd_WaveSound.cpp"), Object(NonMatching, "nw4r/snd/snd_WaveSoundHandle.cpp"), - Object(NonMatching, "nw4r/snd/snd_WsdFile.cpp"), + Object(Matching, "nw4r/snd/snd_WsdFile.cpp"), Object(NonMatching, "nw4r/snd/snd_WsdPlayer.cpp"), Object(Matching, "nw4r/snd/snd_adpcm.cpp"), ],