summaryrefslogtreecommitdiff
path: root/include/toBeSorted
diff options
context:
space:
mode:
authorrobojumper <robojumper@gmail.com>2025-06-13 11:21:04 +0200
committerrobojumper <robojumper@gmail.com>2025-09-13 10:49:03 +0200
commitf9e95f9bb03b9474bbee85b03121c9b4e158aea4 (patch)
treea99cd7311da8ceb83c86e850120ce780a9af3bc1 /include/toBeSorted
parenta30123ac3d0f998fdc62027092fa63e256b2e163 (diff)
More d/snd
Diffstat (limited to 'include/toBeSorted')
-rw-r--r--include/toBeSorted/music_mgrs.h38
1 files changed, 15 insertions, 23 deletions
diff --git a/include/toBeSorted/music_mgrs.h b/include/toBeSorted/music_mgrs.h
index 518ef793..fb5e5397 100644
--- a/include/toBeSorted/music_mgrs.h
+++ b/include/toBeSorted/music_mgrs.h
@@ -2,10 +2,11 @@
#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 dSndPlayerMgr_c;
class dSndSound_c;
// A lot of these names are and were guesses that are probably wrong in a lot of ways.
@@ -17,33 +18,24 @@ extern "C" void fn_8035E820(dSndPlayerMgr_c *);
extern "C" void fn_8035E880(dSndPlayerMgr_c *);
extern "C" void fn_8035E790(dSndPlayerMgr_c *, UNKWORD, void *);
-extern "C" void *ENEMY_SOUND_MGR;
-extern "C" void fn_80362150(void *, u16);
-extern "C" void fn_803625F0(void *, u16);
-extern "C" void fn_803618F0(void *);
-extern "C" void fn_80362730(void *);
-extern "C" void fn_80365D20(void *);
-extern "C" void fn_803624F0(void *);
-extern "C" void fn_80364FD0(void *, s32);
-extern "C" bool fn_80364DA0(void *);
-extern "C" void fn_80365020(void *);
-extern "C" void fn_80364D00(void *, s32);
+#define ENEMY_SOUND_MGR (dSndStateMgr_c::GetInstance())
+extern "C" void fn_80362150(dSndStateMgr_c *, u16);
+extern "C" void fn_803625F0(dSndStateMgr_c *, u16);
+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.
-extern "C" void *FANFARE_SOUND_MGR;
-extern "C" void AnotherSoundMgr__playSound(void *, s32);
-extern "C" bool fn_803721F0(void *, u32);
-extern "C" bool fn_803720E0(void *, u32);
-extern "C" bool fn_80372070(void *, u32);
-extern "C" bool fn_803734C0(void *, u32);
-extern "C" bool fn_80373550(void *, u32);
-extern "C" void fn_80372920(void *);
-extern "C" void fn_803738B0(void *, dSndSound_c *sound);
-extern "C" void fn_80373900(void *, dSndSound_c *sound);
-extern "C" bool fn_803733B0(void *, u32);
+#define FANFARE_SOUND_MGR (dSndBgmMgr_c::GetInstance())
+extern "C" void fn_80372920(dSndBgmMgr_c *);
#endif