mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-07-08 22:04:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

snd_SoundArchive OK

Browse Source
This commit is contained in:
robojumper
2025-05-26 22:42:46 +02:00
parent cb438c5fc6
commit 62b35d8629
6 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/SOUE01/splits.txt
+3 -2
View File
@@ -3046,10 +3046,11 @@ nw4r/snd/snd_Sound3DManager.cpp:
.ctors start:0x804DB964 end:0x804DB968
nw4r/snd/snd_SoundActor.cpp:
.text start:0x80475F80 end:0x80476264 align:16
.text start:0x80475F80 end:0x80476278 align:16
nw4r/snd/snd_SoundArchive.cpp:
.text start:0x80476270 end:0x8047697C align:16
.text start:0x80476280 end:0x8047697C align:16
.data start:0x8056E190 end:0x8056E1B0
nw4r/snd/snd_SoundArchiveFile.cpp:
.text start:0x80476980 end:0x80477C90 align:16
config/SOUE01/symbols.txt
+3 -3
View File
@@ -25493,8 +25493,8 @@ GetPlayerCount__Q34nw4r3snd12SoundArchiveCFv = .text:0x80476340; // type:functio
GetGroupCount__Q34nw4r3snd12SoundArchiveCFv = .text:0x80476350; // type:function size:0x8
GetSoundLabelString__Q34nw4r3snd12SoundArchiveCFUl = .text:0x80476360; // type:function size:0x8
ConvertLabelStringToSoundId__Q34nw4r3snd12SoundArchiveCFPCc = .text:0x80476370; // type:function size:0x10
ConvertLabelStringToPlayerId__Q34nw4r3snd12SoundArchiveCFPCc = .text:0x80476380; // type:function size:0x10
ConvertLabelStringToGroupId__Q34nw4r3snd12SoundArchiveCFPCc = .text:0x80476390; // type:function size:0x10
ConvertLabelStringToGroupId__Q34nw4r3snd12SoundArchiveCFPCc = .text:0x80476380; // type:function size:0x10
ConvertLabelStringToBankId__Q34nw4r3snd12SoundArchiveCFPCc = .text:0x80476390; // type:function size:0x10
GetSoundUserParam__Q34nw4r3snd12SoundArchiveCFUl = .text:0x804763A0; // type:function size:0x8
GetSoundType__Q34nw4r3snd12SoundArchiveCFUl = .text:0x804763B0; // type:function size:0x8
ReadSoundInfo__Q34nw4r3snd12SoundArchiveCFUlPQ44nw4r3snd12SoundArchive9SoundInfo = .text:0x804763C0; // type:function size:0x8
@@ -38613,7 +38613,7 @@ lbl_8056E0E8 = .data:0x8056E0E8; // type:object size:0x30
lbl_8056E118 = .data:0x8056E118; // type:object size:0x20
lbl_8056E138 = .data:0x8056E138; // type:object size:0x38
lbl_8056E170 = .data:0x8056E170; // type:object size:0x20
lbl_8056E190 = .data:0x8056E190; // type:object size:0x20
__vt__Q34nw4r3snd12SoundArchive = .data:0x8056E190; // type:object size:0x20
lbl_8056E1B0 = .data:0x8056E1B0; // type:object size:0x30
WSDCallback = .data:0x8056E1E0; // type:object size:0x10
SeqCallback = .data:0x8056E1F0; // type:object size:0x10
configure.py
+1 -1
View File
@@ -1058,7 +1058,7 @@ config.libs = [
Object(NonMatching, "nw4r/snd/snd_Sound3DListener.cpp"),
Object(NonMatching, "nw4r/snd/snd_Sound3DManager.cpp"),
Object(NonMatching, "nw4r/snd/snd_SoundActor.cpp"),
Object(NonMatching, "nw4r/snd/snd_SoundArchive.cpp"),
Object(Matching, "nw4r/snd/snd_SoundArchive.cpp"),
Object(NonMatching, "nw4r/snd/snd_SoundArchiveFile.cpp"),
Object(NonMatching, "nw4r/snd/snd_SoundArchiveLoader.cpp"),
Object(NonMatching, "nw4r/snd/snd_SoundArchivePlayer.cpp"),
include/nw4r/snd/snd_SoundArchive.h
+2
View File
@@ -180,6 +180,7 @@ namespace nw4r { namespace snd
u32 ConvertLabelStringToSoundId(char const *label) const;
u32 ConvertLabelStringToPlayerId(const char* pLabel) const;
u32 ConvertLabelStringToGroupId(const char* pLabel) const;
u32 ConvertLabelStringToBankId(const char* pLabel) const;
u32 GetSoundUserParam(u32 id) const;
bool ReadSoundInfo(u32 soundId, SoundInfo *info) const;
@@ -189,6 +190,7 @@ namespace nw4r { namespace snd
bool ReadPlayerInfo(u32 playerId, PlayerInfo *info) const;
bool ReadSoundArchivePlayerInfo(SoundArchivePlayerInfo *info) const;
bool detail_ReadSound3DParam(u32 soundId, nw4r::snd::SoundArchive::Sound3DParam*) const;
bool ReadBankInfo(u32 bankId, BankInfo *info) const;
include/nw4r/snd/snd_SoundArchiveFile.h
+4
View File
@@ -323,6 +323,7 @@ namespace nw4r { namespace snd { namespace detail
bool ReadBankInfo(u32 bankId, SoundArchive::BankInfo *info) const;
bool ReadPlayerInfo(u32 playerId, SoundArchive::PlayerInfo *info) const;
bool ReadSound3DParam(u32 soundId, nw4r::snd::SoundArchive::Sound3DParam* info) const;
bool ReadGroupItemInfo(u32 groupId, u32 index,
SoundArchive::GroupItemInfo *info) const;
@@ -346,6 +347,9 @@ namespace nw4r { namespace snd { namespace detail
u32 ConvertLabelStringToGroupId(const char* pLabel) const {
return ConvertLabelStringToId(mStringTreeGroup, pLabel);
}
u32 ConvertLabelStringToBankId(const char* pLabel) const {
return ConvertLabelStringToId(mStringTreeBank, pLabel);
}
private:
static bool IsValidFileHeader(void const *soundArchiveData);
src/nw4r/snd/snd_SoundArchive.cpp
+9
View File
@@ -89,6 +89,10 @@ u32 SoundArchive::ConvertLabelStringToGroupId(const char* pLabel) const {
return mFileReader->ConvertLabelStringToGroupId(pLabel);
}
u32 SoundArchive::ConvertLabelStringToBankId(const char* pLabel) const {
return mFileReader->ConvertLabelStringToBankId(pLabel);
}
u32 SoundArchive::GetSoundUserParam(u32 id) const {
return mFileReader->GetSoundUserParam(id);
}
@@ -131,6 +135,11 @@ bool SoundArchive::ReadSoundArchivePlayerInfo(
return mFileReader->ReadSoundArchivePlayerInfo(info);
}
bool SoundArchive::detail_ReadSound3DParam(u32 soundId, nw4r::snd::SoundArchive::Sound3DParam* info) const
{
return mFileReader->ReadSound3DParam(soundId, info);
}
bool SoundArchive::ReadBankInfo(u32 bankId, BankInfo *info) const
{
return mFileReader->ReadBankInfo(bankId, info);