m_Do_audio

14 files changed, 113 insertions, 7 deletions

diff --git a/src/d/d_a/d_a_alink.cpp b/src/d/d_a/d_a_alink.cpp
index afe63d9718..db268f1303 100644
--- a/src/d/d_a/d_a_alink.cpp
+++ b/src/d/d_a/d_a_alink.cpp
@@ -7,6 +7,7 @@
 #include "f/f_pc/f_pc_manager.h"
 #include "f/f_pc/f_pc_searcher.h"
 #include "m_Do/m_Do_controller_pad/m_Do_controller_pad.h"
+#include "m_Do/m_Do_audio/m_Do_audio.h"
 
 u32 daAlink_c::getE3Zhint(void) {
     return 0;
diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp
index f64c11b78c..8dbb25e62b 100644
--- a/src/d/d_attention.cpp
+++ b/src/d/d_attention.cpp
@@ -6,6 +6,7 @@
 #include "f/f_pc/f_pc_searcher.h"
 #include "global.h"
 #include "m_Do/m_Do_controller_pad/m_Do_controller_pad.h"
+#include "m_Do/m_Do_audio/m_Do_audio.h"
 
 extern "C" {
 // padLockButton__25@unnamed@d_attention_cpp@Fl
diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp
index 1f57b00e04..fddaf7e1b1 100644
--- a/src/d/d_camera.cpp
+++ b/src/d/d_camera.cpp
@@ -7,6 +7,7 @@
 #include "f/f_pc/f_pc_searcher.h"
 #include "global.h"
 #include "m_Do/m_Do_controller_pad/m_Do_controller_pad.h"
+#include "m_Do/m_Do_audio/m_Do_audio.h"
 
 extern "C" {
 // limitf__22@unnamed@d_camera_cpp@Ffff
diff --git a/src/d/d_com/d_com_inf_game.cpp b/src/d/d_com/d_com_inf_game.cpp
index 8e1c0681cd..2e1ffe149b 100644
--- a/src/d/d_com/d_com_inf_game.cpp
+++ b/src/d/d_com/d_com_inf_game.cpp
@@ -5,6 +5,7 @@
 #include "d/d_item/d_item/d_item.h"
 #include "global.h"
 #include "m_Do/m_Do_Reset/m_Do_Reset.h"
+#include "m_Do/m_Do_audio/m_Do_audio.h"
 #include "m_Do/m_Do_controller_pad/m_Do_controller_pad.h"
 #include "m_Do/m_Do_ext/m_Do_ext.h"
 
diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp
index 89a289499a..ef679f9120 100644
--- a/src/d/d_kankyo.cpp
+++ b/src/d/d_kankyo.cpp
@@ -2,6 +2,7 @@
 
 #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
+#include "m_Do/m_Do_audio/m_Do_audio.h"
 #include "global.h"
 #include "os/OS.h"
 
diff --git a/src/d/d_kankyo/d_kankyo_wether.cpp b/src/d/d_kankyo/d_kankyo_wether.cpp
index 2a83d3a9b4..6ef9600f13 100644
--- a/src/d/d_kankyo/d_kankyo_wether.cpp
+++ b/src/d/d_kankyo/d_kankyo_wether.cpp
@@ -3,6 +3,7 @@
 #include "SComponent/c_xyz.h"
 #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
+#include "m_Do/m_Do_audio/m_Do_audio.h"
 #include "global.h"
 
 extern "C" {
diff --git a/src/d/d_meter/d_meter_button.cpp b/src/d/d_meter/d_meter_button.cpp
index 0aca54e8e0..970151d0c0 100644
--- a/src/d/d_meter/d_meter_button.cpp
+++ b/src/d/d_meter/d_meter_button.cpp
@@ -2,6 +2,7 @@
 
 #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
+#include "m_Do/m_Do_audio/m_Do_audio.h"
 #include "global.h"
 
 extern "C" {
diff --git a/src/d/d_meter/d_meter_map.cpp b/src/d/d_meter/d_meter_map.cpp
index 0b80e48859..4205b9b014 100644
--- a/src/d/d_meter/d_meter_map.cpp
+++ b/src/d/d_meter/d_meter_map.cpp
@@ -4,6 +4,7 @@
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 #include "global.h"
 #include "m_Do/m_Do_controller_pad/m_Do_controller_pad.h"
+#include "m_Do/m_Do_audio/m_Do_audio.h"
 
 extern "C" {
 // isEnableDispMap__11dMeterMap_cFv
diff --git a/src/d/d_meter2.cpp b/src/d/d_meter2.cpp
index e17d545d03..df25b68bea 100644
--- a/src/d/d_meter2.cpp
+++ b/src/d/d_meter2.cpp
@@ -2,6 +2,7 @@
 
 #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
+#include "m_Do/m_Do_audio/m_Do_audio.h"
 #include "global.h"
 
 extern "C" {
diff --git a/src/d/d_meter2/d_meter2_draw.cpp b/src/d/d_meter2/d_meter2_draw.cpp
index 003d35ea9f..9a4451b188 100644
--- a/src/d/d_meter2/d_meter2_draw.cpp
+++ b/src/d/d_meter2/d_meter2_draw.cpp
@@ -2,6 +2,7 @@
 
 #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
+#include "m_Do/m_Do_audio/m_Do_audio.h"
 #include "global.h"
 
 extern "C" {
diff --git a/src/d/d_save/d_save.cpp b/src/d/d_save/d_save.cpp
index 1bc3fd417a..89f3c439b0 100644
--- a/src/d/d_save/d_save.cpp
+++ b/src/d/d_save/d_save.cpp
@@ -900,10 +900,10 @@ void dSv_player_config_c::init(void) {
     os_mSoundMode = OSGetSoundMode();
     if (os_mSoundMode == SOUND_MODE_MONO) {
         this->mSoundMode = SOUND_MODE_MONO;
-        Z2AudioMgr_NS_setOutputMode(lbl_80451368, SOUND_MODE_MONO);
+        lbl_80451368->setOutputMode(SOUND_MODE_MONO);
     } else {
         this->mSoundMode = SOUND_MODE_STEREO;
-        Z2AudioMgr_NS_setOutputMode(lbl_80451368, SOUND_MODE_STEREO);
+        lbl_80451368->setOutputMode(SOUND_MODE_STEREO);
     }
 
     this->unk2 = 0;
diff --git a/src/m_Do/m_Do_Reset.cpp b/src/m_Do/m_Do_Reset.cpp
index e8141783af..a6f2744de2 100644
--- a/src/m_Do/m_Do_Reset.cpp
+++ b/src/m_Do/m_Do_Reset.cpp
@@ -30,10 +30,9 @@ void mDoRst_reset(int p1, u32 p2, int p3) {
     /* sManager */ lbl_80451550->clearIndex();
     mDoDvdErr_ThdCleanup();
     cAPICPad_recalibrate__Fv();
-    if (lbl_80450BB8 != 0) {
+    if (lbl_80450BB8 != false) {
         do {
-            // uVar2 = lbl_80451368->hasReset();
-            uVar2 = Z2AudioMgr_NS_hasReset(lbl_80451368);
+            uVar2 = lbl_80451368->hasReset();
         } while ((uVar2 & 0xff) == 0);
     }
 
diff --git a/src/m_Do/m_Do_audio.cpp b/src/m_Do/m_Do_audio.cpp
index 4bf93c8658..82578f346c 100644
--- a/src/m_Do/m_Do_audio.cpp
+++ b/src/m_Do/m_Do_audio.cpp
@@ -1 +1,97 @@
-// ok
+#include "global.h"
+#include "JSystem/JAudio2/JAUClusterSound/JAUClusterSound.h"
+#include "m_Do/m_Do_audio/m_Do_audio.h"
+#include "m_Do/m_Do_Reset/m_Do_Reset.h"
+#include "m_Do/m_Do_main/m_Do_main.h"
+#include "Z2AudioLib/Z2AudioLib.h"
+#include "d/d_com/d_com_inf_game/d_com_inf_game.h"
+
+void mDoAud_zelAudio_c::reset(void){
+    lbl_80450BBA = false;
+}
+
+
+asm void mDoAud_Create(void){
+    nofralloc
+    #include "m_Do/m_Do_audio/asm/mDoAud_Create.s"
+}
+
+void mDoAud_Execute(void) {
+    if (lbl_80450BB8 == false) {
+        if((int)m_Do_Reset_NS_mDoRst_NS_mResetData->field_0x10 == 0 && (int)m_Do_Reset_NS_mDoRst_NS_mResetData->field_0x11 == 0){
+            mDoAud_Create();
+        }
+    }else{
+        lbl_803DBF4C.gframeProcess();
+    }
+}
+
+void mDoAud_setSceneName(const char *spot,long room,long layer){
+    lbl_80451368->sceneMgr.setSceneName((char*)spot, room, layer);
+}
+
+bool mDoAud_load1stDynamicWave(){
+    lbl_80451368->sceneMgr.load1stDynamicWave();
+    return true;
+}
+
+void mDoAud_setFadeOutStart(u8 param_1){
+    lbl_80451368->sceneMgr.setFadeOutStart((int)param_1);
+}
+
+void mDoAud_setFadeInStart(u8 param_1){
+    lbl_80451368->sceneMgr.setFadeInStart((int)param_1);
+}
+
+void mDoAud_resetProcess(){
+    if (lbl_80450BB9 == false) {
+        lbl_80451368->resetProcess(0x1e,false);
+        lbl_80450BB9 = true;
+    }
+}
+
+
+bool mDoAud_resetRecover(void){
+    if (lbl_80450BB9){
+        bool hasReset = lbl_80451368->hasReset();
+        if (hasReset == false){
+            return false;
+        }
+        lbl_80451368->resetRecover();
+        lbl_80450BB9 = false;
+    }
+    return true;
+}
+
+extern "C"{
+    asm void __sinit_m_Do_audio_cpp(void){
+        nofralloc
+        #include "m_Do/m_Do_audio/asm/__sinit_m_Do_audio_cpp.s"
+    }
+}
+
+asm mDoAud_zelAudio_c::~mDoAud_zelAudio_c(){
+    nofralloc
+    #include "m_Do/m_Do_audio/asm/mDoAud_zelAudio_c_NS_dtor.s"
+}
+
+
+asm Z2AudioMgr::~Z2AudioMgr(void){
+    nofralloc
+    #include "m_Do/m_Do_audio/asm/Z2AudioMgr_NS_dtor.s"
+}
+
+asm JAISoundHandle::~JAISoundHandle(){
+    nofralloc
+    #include "m_Do/m_Do_audio/asm/JAISoundHandle_NS_dtor.s"
+}
+
+asm Z2MultiSeObj::~Z2MultiSeObj() {
+    nofralloc
+    #include "m_Do/m_Do_audio/asm/Z2MultiSeObj_NS_dtor.s"
+}
+
+asm JAISeCategoryMgr::~JAISeCategoryMgr(){
+    nofralloc
+    #include "m_Do/m_Do_audio/asm/JAISeCategoryMgr_NS_dtor.s"
+} 
\ No newline at end of file
diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp
index 8534743a3a..7561716d60 100644
--- a/src/m_Do/m_Do_main.cpp
+++ b/src/m_Do/m_Do_main.cpp
@@ -1,14 +1,15 @@
+#include "global.h"
 #include "m_Do/m_Do_main/m_Do_main.h"
 #include "SComponent/c_API_controller_pad.h"
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 #include "dvd/dvd.h"
-#include "global.h"
 #include "m_Do/m_Do_controller_pad/m_Do_controller_pad.h"
 #include "m_Do/m_Do_dvd_thread/m_Do_dvd_thread.h"
 #include "m_Do/m_Do_ext/m_Do_ext.h"
 #include "m_Do/m_Do_graphic/m_Do_graphic.h"
 #include "m_Do/m_Do_machine/m_Do_machine.h"
 #include "m_Do/m_Do_reset/m_Do_reset.h"
+#include "m_Do/m_Do_audio/m_Do_audio.h"
 
 void version_check(void) {
     if ((!strcmp((char*)lbl_803739A0, (char*)lbl_803739A0)) &&