From 62c34af44e89c53bd1cc395768fbb72439dffe72 Mon Sep 17 00:00:00 2001 From: robojumper Date: Mon, 26 May 2025 02:32:30 +0200 Subject: [PATCH] snd_WaveSound OK --- config/SOUE01/splits.txt | 2 ++ config/SOUE01/symbols.txt | 16 ++++++++-------- configure.py | 2 +- include/nw4r/snd/snd_SeqSound.h | 2 +- include/nw4r/snd/snd_StrmSound.h | 2 +- include/nw4r/snd/snd_WaveSound.h | 2 +- 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/config/SOUE01/splits.txt b/config/SOUE01/splits.txt index 6ad9eaa0..eeb8d588 100644 --- a/config/SOUE01/splits.txt +++ b/config/SOUE01/splits.txt @@ -3128,6 +3128,8 @@ nw4r/snd/snd_WaveFile.cpp: nw4r/snd/snd_WaveSound.cpp: .text start:0x80484F60 end:0x8048531C align:16 .ctors start:0x804DB970 end:0x804DB974 + .data start:0x8056E350 end:0x8056E388 + .sbss start:0x805766E8 end:0x805766F0 nw4r/snd/snd_WaveSoundHandle.cpp: .text start:0x80485320 end:0x80485458 align:16 diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index 75158385..15dee1a5 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -25801,18 +25801,18 @@ __ct__Q44nw4r3snd6detail14WaveFileReaderFPCQ54nw4r3snd6detail8WaveFile8WaveInfo ReadWaveInfo__Q44nw4r3snd6detail14WaveFileReaderCFPQ44nw4r3snd6detail8WaveInfoPCv = .text:0x80484D20; // type:function size:0x1CC GetWaveDataAddress__Q44nw4r3snd6detail14WaveFileReaderCFPCQ54nw4r3snd6detail8WaveFile15WaveChannelInfoPCv = .text:0x80484EF0; // type:function size:0x64 __ct__Q44nw4r3snd6detail9WaveSoundFPQ44nw4r3snd6detail50SoundInstanceManagerii = .text:0x80484F60; // type:function size:0x68 -__dt__Q44nw4r3snd6detail9WsdPlayerFv = .text:0x80484FD0; // type:function size:0x40 +__dt__Q44nw4r3snd6detail9WsdPlayerFv = .text:0x80484FD0; // type:function size:0x40 scope:weak Prepare__Q44nw4r3snd6detail9WaveSoundFPCvlQ54nw4r3snd6detail9WsdPlayer15StartOffsetTypelPCQ54nw4r3snd6detail9WsdPlayer11WsdCallbackUl = .text:0x80485010; // type:function size:0xA0 Shutdown__Q44nw4r3snd6detail9WaveSoundFv = .text:0x804850B0; // type:function size:0x9C -__dt__Q44nw4r3snd6detail9WaveSoundFv = .text:0x80485150; // type:function size:0x40 +__dt__Q44nw4r3snd6detail9WaveSoundFv = .text:0x80485150; // type:function size:0x40 scope:weak SetChannelPriority__Q44nw4r3snd6detail9WaveSoundFi = .text:0x80485190; // type:function size:0x8 SetReleasePriorityFix__Q44nw4r3snd6detail9WaveSoundFb = .text:0x804851A0; // type:function size:0x8 OnUpdatePlayerPriority__Q44nw4r3snd6detail9WaveSoundFv = .text:0x804851B0; // type:function size:0xE4 IsAttachedTempSpecialHandle__Q44nw4r3snd6detail9WaveSoundFv = .text:0x804852A0; // type:function size:0x14 DetachTempSpecialHandle__Q44nw4r3snd6detail9WaveSoundFv = .text:0x804852C0; // type:function size:0x8 -GetBasicPlayer__Q44nw4r3snd6detail9WaveSoundFv = .text:0x804852D0; // type:function size:0x8 -GetBasicPlayer__Q44nw4r3snd6detail9WaveSoundCFv = .text:0x804852E0; // type:function size:0x8 -IsPrepared__Q44nw4r3snd6detail9WaveSoundCFv = .text:0x804852F0; // type:function size:0x8 +GetBasicPlayer__Q44nw4r3snd6detail9WaveSoundFv = .text:0x804852D0; // type:function size:0x8 scope:weak +GetBasicPlayer__Q44nw4r3snd6detail9WaveSoundCFv = .text:0x804852E0; // type:function size:0x8 scope:weak +IsPrepared__Q44nw4r3snd6detail9WaveSoundCFv = .text:0x804852F0; // type:function size:0x8 scope:weak GetRuntimeTypeInfo__Q44nw4r3snd6detail9WaveSoundCFv = .text:0x80485300; // type:function size:0x8 scope:weak __sinit_\snd_WaveSound_cpp = .text:0x80485310; // type:function size:0xC scope:local __ct__Q34nw4r3snd15WaveSoundHandleFPQ34nw4r3snd11SoundHandle = .text:0x80485320; // type:function size:0xF4 @@ -38626,7 +38626,7 @@ 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 PanTableTable__Q44nw4r3snd6detail4Util = .data:0x8056E340; // type:object size:0xC -lbl_8056E350 = .data:0x8056E350; // type:object size:0x38 +__vt__Q44nw4r3snd6detail9WaveSound = .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 __vt__Q34nw4r3lyt4Pane = .data:0x8056E430; // type:object size:0x74 @@ -42423,7 +42423,7 @@ sBiquadFilterBpf2048__Q44nw4r3snd6detail9AxManager = .sbss:0x80576660; // type:o @GUARD@GetInstance__Q44nw4r3snd6detail14AxVoiceManagerFv@instance = .sbss:0x80576668; // type:object size:0x1 scope:weak data:byte lbl_80576670 = .sbss:0x80576670; // type:object size:0x4 data:4byte lbl_80576674 = .sbss:0x80576674; // type:object size:0x4 data:4byte -lbl_80576678 = .sbss:0x80576678; // type:object size:0x8 data:4byte +typeInfo__Q44nw4r3snd6detail10BasicSound = .sbss:0x80576678; // type:object size:0x8 data:4byte @GUARD@GetInstance__Q44nw4r3snd6detail14ChannelManagerFv@instance = .sbss:0x80576680; // type:object size:0x1 scope:weak data:byte @GUARD@GetInstance__Q44nw4r3snd6detail22DisposeCallbackManagerFv@instance = .sbss:0x80576688; // type:object size:0x1 scope:weak data:byte mPrintVarEnabledFlag__Q44nw4r3snd6detail9MmlParser = .sbss:0x80576690; // type:object size:0x1 data:byte @@ -42439,7 +42439,7 @@ lbl_805766C8 = .sbss:0x805766C8; // type:object size:0x8 data:byte lbl_805766D0 = .sbss:0x805766D0; // type:object size:0x8 data:4byte @GUARD@GetInstance__Q44nw4r3snd6detail11TaskManagerFv@instance = .sbss:0x805766D8; // type:object size:0x1 scope:weak data:byte lbl_805766E0 = .sbss:0x805766E0; // type:object size:0x8 data:byte -lbl_805766E8 = .sbss:0x805766E8; // type:object size:0x8 data:4byte +typeInfo__Q44nw4r3snd6detail9WaveSound = .sbss:0x805766E8; // type:object size:0x4 data:4byte typeInfo__Q34nw4r3lyt4Pane = .sbss:0x805766F0; // type:object size:0x4 data:4byte mspAllocator__Q34nw4r3lyt6Layout = .sbss:0x805766F8; // type:object size:0x4 data:4byte typeInfo__Q34nw4r3lyt7Picture = .sbss:0x80576700; // type:object size:0x4 data:4byte diff --git a/configure.py b/configure.py index 5c6a28c8..7dcd938f 100644 --- a/configure.py +++ b/configure.py @@ -1081,7 +1081,7 @@ config.libs = [ 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"), + Object(Matching, "nw4r/snd/snd_WaveSound.cpp"), Object(NonMatching, "nw4r/snd/snd_WaveSoundHandle.cpp"), Object(Matching, "nw4r/snd/snd_WsdFile.cpp"), Object(NonMatching, "nw4r/snd/snd_WsdPlayer.cpp"), diff --git a/include/nw4r/snd/snd_SeqSound.h b/include/nw4r/snd/snd_SeqSound.h index 0960cbb9..d700b34f 100644 --- a/include/nw4r/snd/snd_SeqSound.h +++ b/include/nw4r/snd/snd_SeqSound.h @@ -41,7 +41,7 @@ namespace nw4r { namespace snd { namespace detail /* redeclare with this class instead of BasicSound for * SoundInstanceManager */ - typedef ut::LinkList PriorityLinkList; + typedef ut::LinkList PriorityLinkList; // nested types public: diff --git a/include/nw4r/snd/snd_StrmSound.h b/include/nw4r/snd/snd_StrmSound.h index 45175c92..db0d52d1 100644 --- a/include/nw4r/snd/snd_StrmSound.h +++ b/include/nw4r/snd/snd_StrmSound.h @@ -40,7 +40,7 @@ namespace nw4r { namespace snd { namespace detail /* redeclare with this class instead of BasicSound for * SoundInstanceManager */ - typedef ut::LinkList PriorityLinkList; + typedef ut::LinkList PriorityLinkList; // methods public: diff --git a/include/nw4r/snd/snd_WaveSound.h b/include/nw4r/snd/snd_WaveSound.h index ebac599c..87989c8e 100644 --- a/include/nw4r/snd/snd_WaveSound.h +++ b/include/nw4r/snd/snd_WaveSound.h @@ -36,7 +36,7 @@ namespace nw4r { namespace snd { namespace detail /* redeclare with this class instead of BasicSound for * SoundInstanceManager */ - typedef ut::LinkList PriorityLinkList; + typedef ut::LinkList PriorityLinkList; // methods public: