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

Cleanup

Browse Source
This commit is contained in:
robojumper
2025-07-09 22:18:34 +02:00
parent 4f9d63d357
commit a617b9f8cf
14 changed files with 58 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/snd/d_snd_bgm_mgr.h
+3
View File
@@ -73,7 +73,10 @@ public:
/** Runs when the fight is over, no matter how you started it */
bool endBgmBattleRoom();
bool beginBgmBattleMainLoop();
bool isPlayingAnyBattleMusic();
void cullTooManyPreparingSounds();
void removeFromAllBgmSoundLists(dSndBgmSound_c *sound);
void addToBgmSoundList(BgmSoundList_e list, dSndBgmSound_c *sound);
include/d/snd/d_snd_source.h
+2 -2
View File
@@ -183,7 +183,7 @@ public:
return false;
}
/* 0x0F0 */ virtual void vt_0x0F0_noop() override {}
/* 0x0F4 */ virtual void setField0x101(u8 value) override {
/* 0x0F4 */ virtual void setField0x101(bool value) override {
field_0x101 = value;
}
/* 0x0F8 */ virtual void setField0x102(u8 value) override {
@@ -273,7 +273,7 @@ protected:
/* 0x0FE */ u8 mSubtype;
/* 0x0FF */ bool mIsSetup;
/* 0x100 */ u8 field_0x100;
/* 0x101 */ u8 field_0x101;
/* 0x101 */ bool field_0x101;
/* 0x102 */ u8 field_0x102;
/* 0x104 */ u32 mFlagsPersistent;
/* 0x108 */ u32 mFlagsHold;
include/d/snd/d_snd_source_if.h
+1 -1
View File
@@ -93,7 +93,7 @@ public:
/* 0x0E8 */ virtual bool isPlayingActionSound() const = 0;
/* 0x0EC */ virtual bool isCurrentActionSound(u32 id) const = 0;
/* 0x0F0 */ virtual void vt_0x0F0_noop() = 0;
/* 0x0F4 */ virtual void setField0x101(u8 value) = 0;
/* 0x0F4 */ virtual void setField0x101(bool value) = 0;
/* 0x0F8 */ virtual void setField0x102(u8 value) = 0;
/* 0x0FC */ virtual bool isInaudible() = 0;
/* 0x100 */ virtual bool hasAnimSound() = 0;
include/d/snd/d_snd_source_mgr.h
+2
View File
@@ -62,6 +62,8 @@ public:
field_0x3868--;
}
void setMutedFromFader(bool muteFlag);
private:
void calcEnemyObjVolume();
include/toBeSorted/music_mgrs.h
+1 -11
View File
@@ -2,9 +2,7 @@
#define MUSIC_MGRS_H
#include "common.h"
#include "d/snd/d_snd_bgm_mgr.h"
#include "d/snd/d_snd_player_mgr.h"
#include "d/snd/d_snd_source_mgr.h"
#include "d/snd/d_snd_state_mgr.h"
class dSndSound_c;
@@ -16,6 +14,7 @@ extern "C" void fn_8035E000();
extern "C" void fn_8035E860(dSndPlayerMgr_c *);
extern "C" void fn_8035E820(dSndPlayerMgr_c *);
extern "C" void fn_8035E880(dSndPlayerMgr_c *);
extern "C" void fn_8035E310(dSndPlayerMgr_c *);
#define ENEMY_SOUND_MGR (dSndStateMgr_c::GetInstance())
extern "C" void fn_80362150(dSndStateMgr_c *, u16);
@@ -24,17 +23,8 @@ extern "C" void fn_803618F0(dSndStateMgr_c *);
extern "C" void fn_80362730(dSndStateMgr_c *);
extern "C" void fn_80365D20(dSndStateMgr_c *);
extern "C" void fn_803624F0(dSndStateMgr_c *);
extern "C" void fn_80364FD0(dSndStateMgr_c *, s32);
extern "C" bool fn_80364DA0(dSndStateMgr_c *);
extern "C" void fn_80365020(dSndStateMgr_c *);
extern "C" void fn_80364D00(dSndStateMgr_c *, s32);
#define ENEMY_BGM_RELATED_MGR (dSndSourceMgr_c::GetInstance())
extern "C" void fn_80384570(dSndSourceMgr_c *, bool);
// This one has a SoundActor that actually plays the BGM_ music tracks,
// including the battle BGM track.
#define FANFARE_SOUND_MGR (dSndBgmMgr_c::GetInstance())
extern "C" void fn_80372920(dSndBgmMgr_c *);
#endif