From db79db103b352b1de4306de64bbe9c87ae043337 Mon Sep 17 00:00:00 2001 From: jdflyer Date: Thu, 21 Jan 2021 22:20:43 -0700 Subject: [PATCH] Various Fixes --- include/JSystem/JAudio2/JAISeMgr/JAISeMgr.h | 9 +++++++++ include/Z2AudioLib/Z2AudioMgr/Z2AudioMgr.h | 4 ++-- include/m_Do/m_Do_audio/m_Do_audio.h | 7 +------ src/m_Do/m_Do_audio.cpp | 1 + 4 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 include/JSystem/JAudio2/JAISeMgr/JAISeMgr.h diff --git a/include/JSystem/JAudio2/JAISeMgr/JAISeMgr.h b/include/JSystem/JAudio2/JAISeMgr/JAISeMgr.h new file mode 100644 index 00000000000..4e947d74046 --- /dev/null +++ b/include/JSystem/JAudio2/JAISeMgr/JAISeMgr.h @@ -0,0 +1,9 @@ +#ifndef _JAI_SE_MGR_H +#define _JAI_SE_MGR_H + +class JAISeCategoryMgr { +public: + ~JAISeCategoryMgr(); +}; + +#endif \ No newline at end of file diff --git a/include/Z2AudioLib/Z2AudioMgr/Z2AudioMgr.h b/include/Z2AudioLib/Z2AudioMgr/Z2AudioMgr.h index 250a821a305..7d8a89d4e7b 100644 --- a/include/Z2AudioLib/Z2AudioMgr/Z2AudioMgr.h +++ b/include/Z2AudioLib/Z2AudioMgr/Z2AudioMgr.h @@ -13,9 +13,9 @@ struct Z2AudioMgr { void resetRecover(void); void init(JKRSolidHeap*, unsigned long, void*, JKRArchive*); - u8 p1[0x4a4]; + u8 unk_1[0x4a4]; Z2SceneMgr sceneMgr; - u8 p2[0xdad]; + u8 unk_2[0xdad]; }; extern "C" { diff --git a/include/m_Do/m_Do_audio/m_Do_audio.h b/include/m_Do/m_Do_audio/m_Do_audio.h index fc17794f31c..1a7524fc082 100644 --- a/include/m_Do/m_Do_audio/m_Do_audio.h +++ b/include/m_Do/m_Do_audio/m_Do_audio.h @@ -3,17 +3,12 @@ #include "Z2AudioLib/Z2AudioMgr/Z2AudioMgr.h" #include "global.h" -class mDoAud_zelAudio_c { // Based on Z2AudioMgr +class mDoAud_zelAudio_c { // Seems to be based on Z2AudioMgr; more research is needed public: void reset(void); ~mDoAud_zelAudio_c(); }; -class JAISeCategoryMgr { -public: - ~JAISeCategoryMgr(); -}; - void mDoAud_Create(void); void mDoAud_Execute(void); diff --git a/src/m_Do/m_Do_audio.cpp b/src/m_Do/m_Do_audio.cpp index dd1ba974ed5..bf7cf719f69 100644 --- a/src/m_Do/m_Do_audio.cpp +++ b/src/m_Do/m_Do_audio.cpp @@ -1,4 +1,5 @@ #include "m_Do/m_Do_audio/m_Do_audio.h" +#include "JSystem/JAudio2/JAISeMgr/JAISeMgr.h" #include "JSystem/JAudio2/JAUClusterSound/JAUClusterSound.h" #include "Z2AudioLib/Z2AudioLib.h" #include "d/d_com/d_com_inf_game/d_com_inf_game.h"