mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-06-10 20:58:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_snd_small_effect_mgr OK

Browse Source
This commit is contained in:
robojumper
2025-07-20 22:10:38 +02:00
parent ac846aea3e
commit 1be399e999
7 changed files with 169 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/snd/d_snd_player_mgr.h
+6
View File
@@ -219,12 +219,18 @@ private:
void initialize();
void createFileManager();
public:
virtual nw4r::snd::SoundStartable::StartResult
startSound(nw4r::snd::SoundHandle *pHandle, u32 soundId, const nw4r::snd::SoundStartable::StartInfo *pStartInfo);
virtual nw4r::snd::SoundStartable::StartResult startSound(
nw4r::snd::SoundHandle *pHandle, const char *soundLabel, const nw4r::snd::SoundStartable::StartInfo *pStartInfo
);
nw4r::snd::SoundStartable::StartResult startDemoSound(
nw4r::snd::SoundHandle *pHandle, u32 soundId, const nw4r::snd::SoundStartable::StartInfo *pStartInfo
);
private:
/* 0x028 */ nw4r::snd::MemorySoundArchive mDemoSoundArchive;
/* 0x178 */ nw4r::snd::SoundArchivePlayer mDemoSoundArchivePlayer;
};
include/d/snd/d_snd_small_effect_mgr.h
+3
View File
@@ -66,6 +66,7 @@ public:
bool playMinigameMusasabiSound(s32 count);
bool playSkbSound(u32 soundId);
bool playDemoSound(u32 soundId, nw4r::snd::SoundHandle *pHandle);
bool playButtonPressSoundWhenAdvancingTextBoxes(f32);
void resetButtonPressSound();
@@ -82,6 +83,8 @@ private:
bool isPlayingSound(u32 playerIdx, u32 soundId);
bool isPlayingSound(u32 soundId);
bool doSideEffects(u32 soundId);
void setBitsIfAdjacent(dSndBgmDataHarpVarSetBase_c *set, s32 count, s32 target, u32 *pMask);
/**
include/d/snd/d_snd_state_mgr.h
+14 -1
View File
@@ -34,6 +34,15 @@ public:
STAGE_SILENT_GROUNDS = 0x200,
};
enum Flag0x10_e {
FLAG0x10_0x01 = 0x01,
FLAG0x10_0x02 = 0x02,
FLAG0x10_0x04 = 0x04,
FLAG0x10_0x08 = 0x08,
FLAG0x10_0x10 = 0x10,
};
// 0x94
enum EventFlags_e {
EVENT_IN_EVENT = 0x1,
EVENT_DEMO = 0x2,
@@ -58,6 +67,10 @@ public:
static bool isInStage(const char *stageName);
bool getField_0x064() const {
return field_0x064;
}
s32 getField_0x14() const {
return field_0x014;
}
@@ -307,7 +320,7 @@ private:
/* 0x058 */ s32 mLayer;
/* 0x05C */ s32 mRoomId;
/* 0x060 */ UNKWORD field_0x060;
/* 0x064 */ u8 field_0x064;
/* 0x064 */ bool field_0x064;
/* 0x065 */ bool field_0x065;
/* 0x066 */ bool mHasChangedTgSndAreaFlags;
/* 0x067 */ bool mHasChangedTgSndAreaMgFlags;