clang-format

include/JSystem/JAudio2/JAUClusterSound/JAUClusterSound.h

@@ -3,6 +3,4 @@
 
 #include "dolphin/types.h"
 
-
-
 #endif

include/Z2AudioLib/Z2AudioLib.h

@@ -1,13 +1,13 @@
 #ifndef _Z2AUDIOLIB_H
 #define _Z2AUDIOLIB_H
 
-#include "Z2AudioLib/Z2SoundStarter/Z2SoundStarter.h"
-#include "Z2AudioLib/Z2SpeechMgr2/Z2SpeechMgr2.h"
+#include "Z2AudioLib/Z2AudioMgr/Z2AudioMgr.h"
+#include "Z2AudioLib/Z2SceneMgr/Z2SceneMgr.h"
+#include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
 #include "Z2AudioLib/Z2SoundInfo/Z2SoundInfo.h"
 #include "Z2AudioLib/Z2SoundObjMgr/Z2SoundObjMgr.h"
+#include "Z2AudioLib/Z2SoundStarter/Z2SoundStarter.h"
+#include "Z2AudioLib/Z2SpeechMgr2/Z2SpeechMgr2.h"
 #include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h"
-#include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
-#include "Z2AudioLib/Z2SceneMgr/Z2SceneMgr.h"
-#include "Z2AudioLib/Z2AudioMgr/Z2AudioMgr.h"
 
 #endif

include/Z2AudioLib/Z2AudioMgr/Z2AudioMgr.h

@@ -1,13 +1,13 @@
 #ifndef Z2AUDIOMGR_H_
 #define Z2AUDIOMGR_H_
-#include "Z2AudioLib/Z2SceneMgr/Z2SceneMgr.h"
 #include "JSystem/JKernel/JKRAramArchive/JKRAramArchive.h"
 #include "JSystem/JKernel/JKRSolidHeap/JKRSolidHeap.h"
-struct Z2AudioMgr{
+#include "Z2AudioLib/Z2SceneMgr/Z2SceneMgr.h"
+struct Z2AudioMgr {
     Z2AudioMgr();
     ~Z2AudioMgr();
     void gframeProcess(void);
-    Z2AudioMgr* setOutputMode(unsigned long outputMode); 
+    Z2AudioMgr* setOutputMode(unsigned long outputMode);
     u32 resetProcess(u32 param_1, bool param_2);
     bool hasReset(void) const;
     void resetRecover(void);
@@ -18,9 +18,9 @@ struct Z2AudioMgr{
     u8 p2[0xdad];
 };
 
-extern "C"{
-    void setOutputMode__10Z2AudioMgrFUl(void);
-    void setOutputMode__9JASDriverFUl(void);
+extern "C" {
+void setOutputMode__10Z2AudioMgrFUl(void);
+void setOutputMode__9JASDriverFUl(void);
 }
 
 extern Z2AudioMgr lbl_803DBF4C;

include/m_Do/m_Do_audio/m_Do_audio.h

@@ -1,15 +1,15 @@
 #ifndef __M_DO_AUDIO_H_
 #define __M_DO_AUDIO_H_
-#include "global.h"
 #include "Z2AudioLib/Z2AudioMgr/Z2AudioMgr.h"
+#include "global.h"
 
-class mDoAud_zelAudio_c{ //Based on Z2AudioMgr
+class mDoAud_zelAudio_c {  // Based on Z2AudioMgr
 public:
     void reset(void);
     ~mDoAud_zelAudio_c();
 };
 
-class JAISeCategoryMgr{
+class JAISeCategoryMgr {
 public:
     ~JAISeCategoryMgr();
 };
@@ -17,7 +17,7 @@ public:
 void mDoAud_Create(void);
 void mDoAud_Execute(void);
 
-void mDoAud_setSceneName(const char *spot,long room,long layer);
+void mDoAud_setSceneName(const char* spot, long room, long layer);
 
 bool mDoAud_load1stDynamicWave(void);
 
@@ -29,65 +29,64 @@ void mDoAud_resetProcess(void);
 
 bool mDoAud_resetRecover(void);
 
-void init(void); 
+void init(void);
 
 extern bool lbl_80450BBA;
 extern bool lbl_80450BB9;
 
-//required for inline asm
+// required for inline asm
 extern u8 lbl_80450BC0;
 extern char lbl_80373D68[];
 extern u8 lbl_80450BC4;
-extern void* lbl_803A2F40; //is a vtable, change later
+extern void* lbl_803A2F40;  // is a vtable, change later
 extern u8 lbl_803DBF40;
 struct JAIStreamMgr;
-extern JAIStreamMgr* lbl_80450B64; //JAIStreamMgr sInstance
-extern void* lbl_803C9958; //vtable
+extern JAIStreamMgr* lbl_80450B64;  // JAIStreamMgr sInstance
+extern void* lbl_803C9958;          // vtable
 struct JAISeqMgr;
-extern JAISeqMgr* lbl_80450B68; //JAISeqMgr sInstance
-extern void* lbl_803C98B0; //vtable
+extern JAISeqMgr* lbl_80450B68;  // JAISeqMgr sInstance
+extern void* lbl_803C98B0;       // vtable
 struct JAISeMgr;
 extern JAISeMgr* lbl_80450B6C;
-extern void* lbl_803C98C4; //vtable
-
+extern void* lbl_803C98C4;  // vtable
 
 extern "C" {
-    void mDoAud_Execute__Fv(void);
-    void Z2MultiSeObj_NS_dtor(void);
-    void Z2MultiSeMgr_NS_dtor(void);
-    void __dt__16JAISeCategoryMgrFv(void);
-    void __dt__14JAISoundHandleFv(void);
-    void __dt__12Z2MultiSeObjFv(void);
-    void Z2MultiSeObj_NS_dtor(void);
-    void JAISoundHandle_NS_dtor(void);
-    void JASAudioReseter_NS_dtor(void);
-    void func_80361CE8(void);
-    void JAISeqDataUser_NS_dtor(void);
-    void JAISoundInfo_NS_dtor(void);
-    void JAIStreamDataMgr_NS_dtor(void);
-    void Z2Audience_NS_dtor(void);
-    void releaseSound__14JAISoundHandleFv(void);
-    void __dt__17mDoAud_zelAudio_cFv(void);
-    void __dt__10Z2AudioMgrFv(void);
-    void __ct__10Z2AudioMgrFv(void);
-    void hasReset__10Z2AudioMgrCFv(void);
-    void mDoAud_zelAudio_c_NS_dtor(void);
-    void mDoAud_resetRecover__Fv(void);
-    void resetRecover__10Z2AudioMgrFv(void);
-    void resetProcess__10Z2AudioMgrFUlb(void);
-    void gframeProcess__10Z2AudioMgrFv(void);
-    void mDoAud_Create__Fv(void);
-    void reset__17mDoAud_zelAudio_cFv(void);
-    void Z2StatusMgr_NS_setEventBit(void);
-    void mDoDvdThd_mountXArchive_c_NS_create(void);
-    void mDoDvdThd_toMainRam_c_NS_create(void);
-    void setOutputMode__10Z2AudioMgrFUl(void);
-    void mDoAud_setSceneName__FPCcll(void);
-    void __ct__12JAIStreamMgrFb(void);
-    void __ct__9JAISeqMgrFb(void);
-    void __ct__8JAISeMgrFb(void);
-    void Z2AudioMgr_NS_setOutputMode__9JASDriverFUl(void);
-    void init__10Z2AudioMgrFP12JKRSolidHeapUlPvP10JKRArchive(void);
-    void mDoAud_resetProcess__Fv(void);
+void mDoAud_Execute__Fv(void);
+void Z2MultiSeObj_NS_dtor(void);
+void Z2MultiSeMgr_NS_dtor(void);
+void __dt__16JAISeCategoryMgrFv(void);
+void __dt__14JAISoundHandleFv(void);
+void __dt__12Z2MultiSeObjFv(void);
+void Z2MultiSeObj_NS_dtor(void);
+void JAISoundHandle_NS_dtor(void);
+void JASAudioReseter_NS_dtor(void);
+void func_80361CE8(void);
+void JAISeqDataUser_NS_dtor(void);
+void JAISoundInfo_NS_dtor(void);
+void JAIStreamDataMgr_NS_dtor(void);
+void Z2Audience_NS_dtor(void);
+void releaseSound__14JAISoundHandleFv(void);
+void __dt__17mDoAud_zelAudio_cFv(void);
+void __dt__10Z2AudioMgrFv(void);
+void __ct__10Z2AudioMgrFv(void);
+void hasReset__10Z2AudioMgrCFv(void);
+void mDoAud_zelAudio_c_NS_dtor(void);
+void mDoAud_resetRecover__Fv(void);
+void resetRecover__10Z2AudioMgrFv(void);
+void resetProcess__10Z2AudioMgrFUlb(void);
+void gframeProcess__10Z2AudioMgrFv(void);
+void mDoAud_Create__Fv(void);
+void reset__17mDoAud_zelAudio_cFv(void);
+void Z2StatusMgr_NS_setEventBit(void);
+void mDoDvdThd_mountXArchive_c_NS_create(void);
+void mDoDvdThd_toMainRam_c_NS_create(void);
+void setOutputMode__10Z2AudioMgrFUl(void);
+void mDoAud_setSceneName__FPCcll(void);
+void __ct__12JAIStreamMgrFb(void);
+void __ct__9JAISeqMgrFb(void);
+void __ct__8JAISeMgrFb(void);
+void Z2AudioMgr_NS_setOutputMode__9JASDriverFUl(void);
+void init__10Z2AudioMgrFP12JKRSolidHeapUlPvP10JKRArchive(void);
+void mDoAud_resetProcess__Fv(void);
 }
 #endif

libs/Z2AudioLib/Z2AudioMgr.cpp

@@ -1,19 +1,15 @@
 /* Z2AudioMgr.cpp autogenerated by split.py v0.3 at 2021-01-04 23:11:48.333955 */
 
+#include "Z2AudioLib/Z2AudioMgr/Z2AudioMgr.h"
 #include "Z2AudioLib/Z2Param/Z2Param.h"
 #include "Z2AudioLib/Z2SoundInfo/Z2SoundInfo.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 __ct__10Z2AudioMgrFv() { //cpp constructor won't compile???
+asm void __ct__10Z2AudioMgrFv() {  // cpp constructor won't compile???
     nofralloc
 #include "Z2AudioLib/Z2AudioMgr/asm/func_802CD248.s"
 }
@@ -28,14 +24,13 @@ asm void Z2AudioMgr::init(JKRSolidHeap*, unsigned long, void*, JKRArchive*) {
 
 // __dt__24JAUStreamAramMgrBase_<1>Fv
 // JAUStreamAramMgrBase_<1>::~JAUStreamAramMgrBase_<1>(void)
-extern "C"{
+extern "C" {
 asm void func_802CD7F8(void) {
     nofralloc
 #include "Z2AudioLib/Z2AudioMgr/asm/func_802CD7F8.s"
 }
 };
 
-
 // setOutputMode__10Z2AudioMgrFUl
 // Z2AudioMgr::setOutputMode(unsigned long)
 asm Z2AudioMgr* Z2AudioMgr::setOutputMode(unsigned long) {
@@ -43,7 +38,7 @@ asm Z2AudioMgr* Z2AudioMgr::setOutputMode(unsigned long) {
 #include "Z2AudioLib/Z2AudioMgr/asm/func_802CD888.s"
 }
 
-extern "C"{
+extern "C" {
 // zeldaGFrameWork__10Z2AudioMgrFv
 // Z2AudioMgr::zeldaGFrameWork(void)
 asm void Z2AudioMgr_NS_zeldaGFrameWork(void) {
@@ -52,7 +47,6 @@ asm void Z2AudioMgr_NS_zeldaGFrameWork(void) {
 }
 };
 
-
 // gframeProcess__10Z2AudioMgrFv
 // Z2AudioMgr::gframeProcess(void)
 asm void Z2AudioMgr::gframeProcess(void) {
@@ -61,7 +55,7 @@ asm void Z2AudioMgr::gframeProcess(void) {
 }
 // resetProcess__10Z2AudioMgrFUlb
 // Z2AudioMgr::resetProcess(unsigned long, bool)
-asm u32 Z2AudioMgr::resetProcess(u32,bool) {
+asm u32 Z2AudioMgr::resetProcess(u32, bool) {
     nofralloc
 #include "Z2AudioLib/Z2AudioMgr/asm/func_802CD974.s"
 }

libs/Z2AudioLib/Z2Creature.cpp

@@ -6,8 +6,8 @@
 #include "Z2AudioLib/Z2SoundObjMgr/Z2SoundObjMgr.h"
 #include "Z2AudioLib/Z2SpeechMgr2/Z2SpeechMgr2.h"
 #include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h"
-#include "m_Do/m_Do_audio/m_Do_audio.h"
 #include "global.h"
+#include "m_Do/m_Do_audio/m_Do_audio.h"
 
 extern "C" {
 // __ct__10Z2CreatureFv

libs/Z2AudioLib/Z2SoundMgr.cpp

@@ -3,10 +3,10 @@
 #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 "Z2AudioLib/Z2SoundInfo/Z2SoundInfo.h"
 #include "Z2AudioLib/Z2SpeechMgr2/Z2SpeechMgr2.h"
 #include "global.h"
+#include "m_Do/m_Do_audio/m_Do_audio.h"
 
 extern "C" {
 // seqCallback__FP8JASTrackUs

libs/Z2AudioLib/Z2SoundStarter.cpp

@@ -3,8 +3,8 @@
 #include "Z2AudioLib/Z2SoundStarter/Z2SoundStarter.h"
 #include "Z2AudioLib/Z2EnvSeMgr/Z2EnvSeMgr.h"
 #include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h"
-#include "m_Do/m_Do_audio/m_Do_audio.h"
 #include "global.h"
+#include "m_Do/m_Do_audio/m_Do_audio.h"
 
 extern "C" {
 // __ct__14Z2SoundStarterFb

libs/Z2AudioLib/Z2SpeechMgr2.cpp

@@ -5,8 +5,8 @@
 #include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h"
 #include "Z2AudioLib/Z2SoundStarter/Z2SoundStarter.h"
 #include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h"
-#include "m_Do/m_Do_audio/m_Do_audio.h"
 #include "global.h"
+#include "m_Do/m_Do_audio/m_Do_audio.h"
 
 #ifdef NONMATCHING
 Z2SpeechMgr2::Z2SpeechMgr2()

src/d/d_a/d_a_alink.cpp

@@ -6,8 +6,8 @@
 #include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h"
 #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"
+#include "m_Do/m_Do_controller_pad/m_Do_controller_pad.h"
 
 u32 daAlink_c::getE3Zhint(void) {
     return 0;

src/d/d_attention.cpp

@@ -5,8 +5,8 @@
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 #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"
+#include "m_Do/m_Do_controller_pad/m_Do_controller_pad.h"
 
 extern "C" {
 // padLockButton__25@unnamed@d_attention_cpp@Fl

src/d/d_camera.cpp

@@ -6,8 +6,8 @@
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 #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"
+#include "m_Do/m_Do_controller_pad/m_Do_controller_pad.h"
 
 extern "C" {
 // limitf__22@unnamed@d_camera_cpp@Ffff

src/d/d_kankyo.cpp

@@ -2,8 +2,8 @@
 
 #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 "m_Do/m_Do_audio/m_Do_audio.h"
 #include "os/OS.h"
 
 extern "C" {

src/d/d_kankyo/d_kankyo_wether.cpp

@@ -3,8 +3,8 @@
 #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"
+#include "m_Do/m_Do_audio/m_Do_audio.h"
 
 extern "C" {
 // dKyw_setDrawPacketList__FP9J3DPacketi

src/d/d_meter/d_meter_button.cpp

@@ -2,8 +2,8 @@
 
 #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 "m_Do/m_Do_audio/m_Do_audio.h"
 
 extern "C" {
 // __ct__14dMeterButton_cFv

src/d/d_meter/d_meter_map.cpp

@@ -3,8 +3,8 @@
 #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
 #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"
+#include "m_Do/m_Do_controller_pad/m_Do_controller_pad.h"
 
 extern "C" {
 // isEnableDispMap__11dMeterMap_cFv

src/d/d_meter2.cpp

@@ -2,8 +2,8 @@
 
 #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 "m_Do/m_Do_audio/m_Do_audio.h"
 
 extern "C" {
 // _create__9dMeter2_cFv

src/d/d_meter2/d_meter2_draw.cpp

@@ -2,8 +2,8 @@
 
 #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 "m_Do/m_Do_audio/m_Do_audio.h"
 
 extern "C" {
 // __ct__13dMeter2Draw_cFP10JKRExpHeap

src/m_Do/m_Do_audio.cpp

@@ -1,60 +1,59 @@
-#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 "JSystem/JAudio2/JAUClusterSound/JAUClusterSound.h"
 #include "Z2AudioLib/Z2AudioLib.h"
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
+#include "global.h"
+#include "m_Do/m_Do_Reset/m_Do_Reset.h"
+#include "m_Do/m_Do_main/m_Do_main.h"
 
-void mDoAud_zelAudio_c::reset(void){
+void mDoAud_zelAudio_c::reset(void) {
     lbl_80450BBA = false;
 }
 
-
-asm void mDoAud_Create(void){
+asm void mDoAud_Create(void) {
     nofralloc
-    #include "m_Do/m_Do_audio/asm/mDoAud_Create.s"
+#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){
+        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{
+    } else {
         lbl_803DBF4C.gframeProcess();
     }
 }
 
-void mDoAud_setSceneName(const char *spot,long room,long layer){
+void mDoAud_setSceneName(const char* spot, long room, long layer) {
     lbl_80451368->sceneMgr.setSceneName((char*)spot, room, layer);
 }
 
-bool mDoAud_load1stDynamicWave(){
+bool mDoAud_load1stDynamicWave() {
     lbl_80451368->sceneMgr.load1stDynamicWave();
     return true;
 }
 
-void mDoAud_setFadeOutStart(u8 param_1){
+void mDoAud_setFadeOutStart(u8 param_1) {
     lbl_80451368->sceneMgr.setFadeOutStart((int)param_1);
 }
 
-void mDoAud_setFadeInStart(u8 param_1){
+void mDoAud_setFadeInStart(u8 param_1) {
     lbl_80451368->sceneMgr.setFadeInStart((int)param_1);
 }
 
-void mDoAud_resetProcess(){
+void mDoAud_resetProcess() {
     if (lbl_80450BB9 == false) {
-        lbl_80451368->resetProcess(0x1e,false);
+        lbl_80451368->resetProcess(0x1e, false);
         lbl_80450BB9 = true;
     }
 }
 
-
-bool mDoAud_resetRecover(void){
-    if (lbl_80450BB9){
+bool mDoAud_resetRecover(void) {
+    if (lbl_80450BB9) {
         bool hasReset = lbl_80451368->hasReset();
-        if (hasReset == false){
+        if (hasReset == false) {
             return false;
         }
         lbl_80451368->resetRecover();
@@ -63,35 +62,34 @@ bool mDoAud_resetRecover(void){
     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"
-    }
+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(){
+asm mDoAud_zelAudio_c::~mDoAud_zelAudio_c() {
     nofralloc
-    #include "m_Do/m_Do_audio/asm/mDoAud_zelAudio_c_NS_dtor.s"
+#include "m_Do/m_Do_audio/asm/mDoAud_zelAudio_c_NS_dtor.s"
 }
 
-
-asm Z2AudioMgr::~Z2AudioMgr(void){
+asm Z2AudioMgr::~Z2AudioMgr(void) {
     nofralloc
-    #include "m_Do/m_Do_audio/asm/Z2AudioMgr_NS_dtor.s"
+#include "m_Do/m_Do_audio/asm/Z2AudioMgr_NS_dtor.s"
 }
 
-asm JAISoundHandle::~JAISoundHandle(){
+asm JAISoundHandle::~JAISoundHandle() {
     nofralloc
-    #include "m_Do/m_Do_audio/asm/JAISoundHandle_NS_dtor.s"
+#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"
+#include "m_Do/m_Do_audio/asm/Z2MultiSeObj_NS_dtor.s"
 }
 
-asm JAISeCategoryMgr::~JAISeCategoryMgr(){
+asm JAISeCategoryMgr::~JAISeCategoryMgr() {
     nofralloc
-    #include "m_Do/m_Do_audio/asm/JAISeCategoryMgr_NS_dtor.s"
-} 
+#include "m_Do/m_Do_audio/asm/JAISeCategoryMgr_NS_dtor.s"
+}

src/m_Do/m_Do_main.cpp

@@ -1,15 +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_audio/m_Do_audio.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)) &&