diff options
| author | robojumper <robojumper@gmail.com> | 2025-05-27 21:57:07 +0200 |
|---|---|---|
| committer | robojumper <robojumper@gmail.com> | 2025-05-27 21:57:07 +0200 |
| commit | cbcee6811fa7ac735c9a31052d6dc140b820c939 (patch) | |
| tree | 577dfcdda361b3048c99f6c472b23affe61c0edf | |
| parent | d6859dfd74ca205cf9cae2fa343df56124403a9d (diff) | |
snd_WaveArchive, snd_WaveFile OK
| -rw-r--r-- | config/SOUE01/splits.txt | 5 | ||||
| -rw-r--r-- | configure.py | 4 | ||||
| -rw-r--r-- | src/nw4r/snd/snd_WaveArchive.cpp | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/config/SOUE01/splits.txt b/config/SOUE01/splits.txt index c613b099..a66cc63d 100644 --- a/config/SOUE01/splits.txt +++ b/config/SOUE01/splits.txt @@ -3170,8 +3170,11 @@ nw4r/snd/snd_Util.cpp: .sdata start:0x80574EA8 end:0x80574EB0 .sdata2 start:0x8057F1C0 end:0x8057F1F0 +nw4r/snd/snd_WaveArchive.cpp: + .text start:0x80484BE0 end:0x80484CE8 align:16 + nw4r/snd/snd_WaveFile.cpp: - .text start:0x80484BE0 end:0x80484F54 align:16 + .text start:0x80484CF0 end:0x80484F54 align:16 nw4r/snd/snd_WaveSound.cpp: .text start:0x80484F60 end:0x8048531C align:16 diff --git a/configure.py b/configure.py index 1005d8ef..d8072128 100644 --- a/configure.py +++ b/configure.py @@ -1079,8 +1079,8 @@ config.libs = [ Object(Matching, "nw4r/snd/snd_Voice.cpp"), Object(Matching, "nw4r/snd/snd_VoiceManager.cpp"), Object(Matching, "nw4r/snd/snd_Util.cpp"), - Object(NonMatching, "nw4r/snd/snd_WaveArchive.cpp"), - Object(NonMatching, "nw4r/snd/snd_WaveFile.cpp"), + Object(Matching, "nw4r/snd/snd_WaveArchive.cpp"), + Object(Matching, "nw4r/snd/snd_WaveFile.cpp"), Object(Matching, "nw4r/snd/snd_WaveSound.cpp"), Object(Matching, "nw4r/snd/snd_WaveSoundHandle.cpp"), Object(Matching, "nw4r/snd/snd_WsdFile.cpp"), diff --git a/src/nw4r/snd/snd_WaveArchive.cpp b/src/nw4r/snd/snd_WaveArchive.cpp index e3255fe6..52ab01ba 100644 --- a/src/nw4r/snd/snd_WaveArchive.cpp +++ b/src/nw4r/snd/snd_WaveArchive.cpp @@ -9,7 +9,7 @@ #include "nw4r/snd/snd_Util.h" #include "nw4r/snd/snd_WaveFile.h" -#include "nw4r/ut/binaryFileFormat.h" // ut::BinaryFileHeader +#include "nw4r/ut/ut_binaryFileFormat.h" // ut::BinaryFileHeader #include "nw4r/ut/ut_algorithm.h" // ut::AddOffsetToPtr #include <nw4r/NW4RAssert.hpp> |