From 40e32707ebe30eed9c45fa84987b62305a4ca496 Mon Sep 17 00:00:00 2001 From: TheRedDaemon <66257843+TheRedDaemon@users.noreply.github.com> Date: Thu, 14 May 2026 21:11:04 +0200 Subject: [PATCH 1/3] reimplement: SHC_3BB0A8C1_0x00424700 100% --- .../Audio/mss/SoundSystem/meth_0x424700.cpp | 23 +++++++++++++++++++ status/addresses-SHC-3BB0A8C1.txt | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 src/OpenSHC/Audio/mss/SoundSystem/meth_0x424700.cpp diff --git a/src/OpenSHC/Audio/mss/SoundSystem/meth_0x424700.cpp b/src/OpenSHC/Audio/mss/SoundSystem/meth_0x424700.cpp new file mode 100644 index 0000000..db0dbd3 --- /dev/null +++ b/src/OpenSHC/Audio/mss/SoundSystem/meth_0x424700.cpp @@ -0,0 +1,23 @@ +#include "OpenSHC/Audio/MSS/SoundSystem.hpp" + +#include "OpenSHC/Audio/MSS/SoundSystem.func.hpp" + +#include "OpenSHC/Audio/MSS/enums/SHC_SoundStream.hpp" + +namespace OpenSHC { +namespace Audio { + namespace MSS { + + // FUNCTION: STRONGHOLDCRUSADER 0x00424700 + void SoundSystem::meth_0x424700() + { + const UnkSoundFlagsAndLoopCount unkSoundFlagsAndLoopCount = { }; + this->streamFlagsUnkAndLoopCount_0x34[4] = unkSoundFlagsAndLoopCount; + this->streamFlagsUnkAndLoopCount_0x34[3] = unkSoundFlagsAndLoopCount; + MACRO_CALL_MEMBER(SoundSystem_Func::endSoundStream, this)(enums::SND_STR_SPEECH_1); + MACRO_CALL_MEMBER(SoundSystem_Func::endSoundStream, this)(enums::SND_STR_SPEECH_2); + } + + } +} +} diff --git a/status/addresses-SHC-3BB0A8C1.txt b/status/addresses-SHC-3BB0A8C1.txt index f1a6853..b7a5778 100644 --- a/status/addresses-SHC-3BB0A8C1.txt +++ b/status/addresses-SHC-3BB0A8C1.txt @@ -3328,7 +3328,7 @@ SHC_3BB0A8C1_0x00424650 | 0.0% | Pending SHC_3BB0A8C1_0x00424680 | 0.0% | Pending SHC_3BB0A8C1_0x004246B0 | 0.0% | Pending SHC_3BB0A8C1_0x004246E0 | 0.0% | Pending -SHC_3BB0A8C1_0x00424700 | 0.0% | Pending +SHC_3BB0A8C1_0x00424700 | 100.0% | Reimplemented SHC_3BB0A8C1_0x00424720 | 0.0% | Pending SHC_3BB0A8C1_0x00424770 | 0.0% | Pending SHC_3BB0A8C1_0x004247A0 | 0.0% | Pending From 8326d0485e70ce5b602c804cc49a70cdd1b929ff Mon Sep 17 00:00:00 2001 From: TheRedDaemon <66257843+TheRedDaemon@users.noreply.github.com> Date: Thu, 14 May 2026 22:28:33 +0200 Subject: [PATCH 2/3] [0x00424700] fix formatting --- src/OpenSHC/Audio/mss/SoundSystem/meth_0x424700.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OpenSHC/Audio/mss/SoundSystem/meth_0x424700.cpp b/src/OpenSHC/Audio/mss/SoundSystem/meth_0x424700.cpp index db0dbd3..c67beba 100644 --- a/src/OpenSHC/Audio/mss/SoundSystem/meth_0x424700.cpp +++ b/src/OpenSHC/Audio/mss/SoundSystem/meth_0x424700.cpp @@ -11,7 +11,7 @@ namespace Audio { // FUNCTION: STRONGHOLDCRUSADER 0x00424700 void SoundSystem::meth_0x424700() { - const UnkSoundFlagsAndLoopCount unkSoundFlagsAndLoopCount = { }; + const UnkSoundFlagsAndLoopCount unkSoundFlagsAndLoopCount = {}; this->streamFlagsUnkAndLoopCount_0x34[4] = unkSoundFlagsAndLoopCount; this->streamFlagsUnkAndLoopCount_0x34[3] = unkSoundFlagsAndLoopCount; MACRO_CALL_MEMBER(SoundSystem_Func::endSoundStream, this)(enums::SND_STR_SPEECH_1); From 632f826d2f6ea4bf255564a7802a19ccb7bc68ee Mon Sep 17 00:00:00 2001 From: TheRedDaemon <66257843+TheRedDaemon@users.noreply.github.com> Date: Fri, 15 May 2026 11:58:43 +0200 Subject: [PATCH 3/3] [0x00424700] switch const notation --- src/OpenSHC/Audio/mss/SoundSystem/meth_0x424700.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OpenSHC/Audio/mss/SoundSystem/meth_0x424700.cpp b/src/OpenSHC/Audio/mss/SoundSystem/meth_0x424700.cpp index c67beba..0284109 100644 --- a/src/OpenSHC/Audio/mss/SoundSystem/meth_0x424700.cpp +++ b/src/OpenSHC/Audio/mss/SoundSystem/meth_0x424700.cpp @@ -11,7 +11,7 @@ namespace Audio { // FUNCTION: STRONGHOLDCRUSADER 0x00424700 void SoundSystem::meth_0x424700() { - const UnkSoundFlagsAndLoopCount unkSoundFlagsAndLoopCount = {}; + UnkSoundFlagsAndLoopCount const unkSoundFlagsAndLoopCount = {}; this->streamFlagsUnkAndLoopCount_0x34[4] = unkSoundFlagsAndLoopCount; this->streamFlagsUnkAndLoopCount_0x34[3] = unkSoundFlagsAndLoopCount; MACRO_CALL_MEMBER(SoundSystem_Func::endSoundStream, this)(enums::SND_STR_SPEECH_1);