m_Do_audio

7 files changed, 29 insertions, 14 deletions

diff --git a/libs/Z2AudioLib/Z2AudioMgr.cpp b/libs/Z2AudioLib/Z2AudioMgr.cpp
index 976f5e19fa..315f057edd 100644
--- a/libs/Z2AudioLib/Z2AudioMgr.cpp
+++ b/libs/Z2AudioLib/Z2AudioMgr.cpp
@@ -1,72 +1,83 @@
 /* Z2AudioMgr.cpp autogenerated by split.py v0.3 at 2021-01-04 23:11:48.333955 */
 
-#include "Z2AudioLib/Z2Param/Z2Param.h"
 #include "global.h"
+#include "Z2AudioLib/Z2Param/Z2Param.h"
+#include "Z2AudioLib/Z2AudioMgr/Z2AudioMgr.h"
+#include "m_Do/m_Do_audio/m_Do_audio.h"
 
-extern "C" {
+
+
+
+extern "C"{
 // __ct__10Z2AudioMgrFv
 // Z2AudioMgr::Z2AudioMgr(void)
-asm void Z2AudioMgr(void) {
+asm void __ct__10Z2AudioMgrFv() { //cpp constructor won't compile???
     nofralloc
 #include "Z2AudioLib/Z2AudioMgr/asm/func_802CD248.s"
 }
+};
 
 // init__10Z2AudioMgrFP12JKRSolidHeapUlPvP10JKRArchive
 // Z2AudioMgr::init(JKRSolidHeap*, unsigned long, void*, JKRArchive*)
-asm void Z2AudioMgr_NS_init(void) {
+asm void Z2AudioMgr::init(JKRSolidHeap*, unsigned long, void*, JKRArchive*) {
     nofralloc
 #include "Z2AudioLib/Z2AudioMgr/asm/func_802CD34C.s"
 }
 
 // __dt__24JAUStreamAramMgrBase_<1>Fv
 // JAUStreamAramMgrBase_<1>::~JAUStreamAramMgrBase_<1>(void)
+extern "C"{
 asm void func_802CD7F8(void) {
     nofralloc
 #include "Z2AudioLib/Z2AudioMgr/asm/func_802CD7F8.s"
 }
+};
+
 
 // setOutputMode__10Z2AudioMgrFUl
 // Z2AudioMgr::setOutputMode(unsigned long)
-asm void Z2AudioMgr_NS_setOutputMode(void*, unsigned long) {
+asm Z2AudioMgr* Z2AudioMgr::setOutputMode(unsigned long) {
     nofralloc
 #include "Z2AudioLib/Z2AudioMgr/asm/func_802CD888.s"
 }
 
+extern "C"{
 // zeldaGFrameWork__10Z2AudioMgrFv
 // Z2AudioMgr::zeldaGFrameWork(void)
 asm void Z2AudioMgr_NS_zeldaGFrameWork(void) {
     nofralloc
 #include "Z2AudioLib/Z2AudioMgr/asm/func_802CD8B4.s"
 }
+};
+
 
 // gframeProcess__10Z2AudioMgrFv
 // Z2AudioMgr::gframeProcess(void)
-asm void Z2AudioMgr_NS_gframeProcess(void) {
+asm void Z2AudioMgr::gframeProcess(void) {
     nofralloc
 #include "Z2AudioLib/Z2AudioMgr/asm/func_802CD904.s"
 }
-
 // resetProcess__10Z2AudioMgrFUlb
 // Z2AudioMgr::resetProcess(unsigned long, bool)
-asm void Z2AudioMgr_NS_resetProcess(void) {
+asm u32 Z2AudioMgr::resetProcess(u32,bool) {
     nofralloc
 #include "Z2AudioLib/Z2AudioMgr/asm/func_802CD974.s"
 }
-
 // resetRecover__10Z2AudioMgrFv
 // Z2AudioMgr::resetRecover(void)
-asm void Z2AudioMgr_NS_resetRecover(void) {
+asm void Z2AudioMgr::resetRecover(void) {
     nofralloc
 #include "Z2AudioLib/Z2AudioMgr/asm/func_802CD9CC.s"
 }
 
 // hasReset__10Z2AudioMgrCFv
 // Z2AudioMgr::hasReset(void) const
-asm u32 Z2AudioMgr_NS_hasReset(void*) {
+asm bool Z2AudioMgr::hasReset(void) const {
     nofralloc
 #include "Z2AudioLib/Z2AudioMgr/asm/func_802CDA6C.s"
 }
 
+extern "C" {
 // startSound__10Z2AudioMgrF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3<f>
 // Z2AudioMgr::startSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3<f>)
 asm void func_802CDB1C(void) {
@@ -94,4 +105,4 @@ asm void func_802CDCEC(void) {
     nofralloc
 #include "Z2AudioLib/Z2AudioMgr/asm/func_802CDCEC.s"
 }
-};
+};
\ No newline at end of file
diff --git a/libs/Z2AudioLib/Z2Creature.cpp b/libs/Z2AudioLib/Z2Creature.cpp
index 2da944db5e..d852df7c00 100644
--- a/libs/Z2AudioLib/Z2Creature.cpp
+++ b/libs/Z2AudioLib/Z2Creature.cpp
@@ -3,6 +3,7 @@
 #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
 #include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h"
 #include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h"
+#include "m_Do/m_Do_audio/m_Do_audio.h"
 #include "global.h"
 
 extern "C" {
diff --git a/libs/Z2AudioLib/Z2SceneMgr.cpp b/libs/Z2AudioLib/Z2SceneMgr.cpp
index 19aa8eba9c..34a91c96b5 100644
--- a/libs/Z2AudioLib/Z2SceneMgr.cpp
+++ b/libs/Z2AudioLib/Z2SceneMgr.cpp
@@ -235,7 +235,7 @@ asm void Z2SceneMgr_NS_framework(void) {
 
 // load1stDynamicWave__10Z2SceneMgrFv
 // Z2SceneMgr::load1stDynamicWave(void)
-asm void Z2SceneMgr_NS_load1stDynamicWave(void) {
+asm void Z2SceneMgr::load1stDynamicWave(void) {
     nofralloc
 #include "Z2AudioLib/Z2SceneMgr/asm/func_802B9D40.s"
 }
diff --git a/libs/Z2AudioLib/Z2SeMgr.cpp b/libs/Z2AudioLib/Z2SeMgr.cpp
index 9018ec675e..c529b4cd87 100644
--- a/libs/Z2AudioLib/Z2SeMgr.cpp
+++ b/libs/Z2AudioLib/Z2SeMgr.cpp
@@ -1,10 +1,10 @@
 #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
 #include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h"
+#include "m_Do/m_Do_audio/m_Do_audio.h"
 
 extern "C" {
 void JAISoundHandle(void);
 void JAISoundHandle_NS_dtor(void);
-void Z2MultiSeObj_NS_dtor(void);
 }
 
 asm Z2SeMgr::Z2SeMgr(void) {
diff --git a/libs/Z2AudioLib/Z2SoundMgr.cpp b/libs/Z2AudioLib/Z2SoundMgr.cpp
index 6f1a41cdd4..71c5764560 100644
--- a/libs/Z2AudioLib/Z2SoundMgr.cpp
+++ b/libs/Z2AudioLib/Z2SoundMgr.cpp
@@ -3,6 +3,7 @@
 #include "Z2AudioLib/Z2SoundMgr/Z2SoundMgr.h"
 #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
 #include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h"
+#include "m_Do/m_Do_audio/m_Do_audio.h"
 #include "global.h"
 
 extern "C" {
diff --git a/libs/Z2AudioLib/Z2SoundStarter.cpp b/libs/Z2AudioLib/Z2SoundStarter.cpp
index 8b0969859f..27d65e9a7a 100644
--- a/libs/Z2AudioLib/Z2SoundStarter.cpp
+++ b/libs/Z2AudioLib/Z2SoundStarter.cpp
@@ -2,6 +2,7 @@
 
 #include "Z2AudioLib/Z2EnvSeMgr/Z2EnvSeMgr.h"
 #include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h"
+#include "m_Do/m_Do_audio/m_Do_audio.h"
 #include "global.h"
 
 extern "C" {
diff --git a/libs/Z2AudioLib/Z2SpeechMgr2.cpp b/libs/Z2AudioLib/Z2SpeechMgr2.cpp
index 0c94677a3f..2fb8bf25eb 100644
--- a/libs/Z2AudioLib/Z2SpeechMgr2.cpp
+++ b/libs/Z2AudioLib/Z2SpeechMgr2.cpp
@@ -4,6 +4,7 @@
 #include "Z2AudioLib/Z2EnvSeMgr/Z2EnvSeMgr.h"
 #include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h"
 #include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h"
+#include "m_Do/m_Do_audio/m_Do_audio.h"
 #include "global.h"
 
 extern "C" {