Skip to content

reimplement: SHC_3BB0A8C1_0x0047A660 100% #106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
TheRedDaemon wants to merge 1 commit into
base: main
Choose a base branch
from
+24 −2
Draft

reimplement: SHC_3BB0A8C1_0x0047A660 100% #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/OpenSHC/Audio/SoundEffectsHelperData1.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ namespace Audio {
undefined4 field16_0x5c; // 0x0000005C length: 4
undefined4 DAT_WinMusicVariation; // 0x00000060 length: 4
undefined4 field18_0x64; // 0x00000064 length: 4
undefined4 DAT_LossMusicVariation; // 0x00000068 length: 4
int DAT_LossMusicVariation; // 0x00000068 length: 4
DWORD DAT_enemyInsideCastleSoundWarningCooldownTimer; // 0x0000006C length: 4
undefined4 field21_0x70; // 0x00000070 length: 4
WAVEFORMATEX SND_Waveformat; // 0x00000074 length: 18
Expand Down
22 changes: 22 additions & 0 deletions src/OpenSHC/Audio/mss/SoundSystem/setupLossMusic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#include "../SoundSystem.func.hpp"

#include "OpenSHC/Globals/DAT_SoundEffectsHelperData1.hpp"

namespace OpenSHC {
namespace Audio {
namespace MSS {

// FUNCTION: STRONGHOLDCRUSADER 0x0047A660
void SoundSystem::setupLossMusic()
{
MACRO_CALL_MEMBER(SoundSystem_Func::setupVolumeAndSoundIDWithMultiplier, this)(
DAT_SoundEffectsHelperData1::ptr->DAT_LossMusicVariation + DE::SHCDE::MUSIC_TUNE_LOSE1, 100);
++DAT_SoundEffectsHelperData1::ptr->DAT_LossMusicVariation;
if (DAT_SoundEffectsHelperData1::ptr->DAT_LossMusicVariation > 1) {
DAT_SoundEffectsHelperData1::ptr->DAT_LossMusicVariation = 0;
}
}

}
}
}
2 changes: 1 addition & 1 deletion status/addresses-SHC-3BB0A8C1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10910,7 +10910,7 @@ SHC_3BB0A8C1_0x0047A570 | 100.0% | Reimplemented
SHC_3BB0A8C1_0x0047A580 | 0.0% | Pending
SHC_3BB0A8C1_0x0047A5E0 | 100.0% | Pending
SHC_3BB0A8C1_0x0047A630 | 0.0% | Pending
SHC_3BB0A8C1_0x0047A660 | 0.0% | Pending
SHC_3BB0A8C1_0x0047A660 | 100.0% | Reimplemented
SHC_3BB0A8C1_0x0047A690 | 0.0% | Pending
SHC_3BB0A8C1_0x0047A790 | 0.0% | Pending
SHC_3BB0A8C1_0x0047A9E0 | 0.0% | Pending
Expand Down