clang-format

11 files changed, 45 insertions, 47 deletions

diff --git a/src/d/d_a/d_a_alink.cpp b/src/d/d_a/d_a_alink.cpp
index db268f1303..6c232c9109 100644
--- a/src/d/d_a/d_a_alink.cpp
+++ b/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;
diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp
index 8dbb25e62b..83eb2ec56c 100644
--- a/src/d/d_attention.cpp
+++ b/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
diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp
index fddaf7e1b1..0c95dfec58 100644
--- a/src/d/d_camera.cpp
+++ b/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
diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp
index ef679f9120..5f59c2785f 100644
--- a/src/d/d_kankyo.cpp
+++ b/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" {
diff --git a/src/d/d_kankyo/d_kankyo_wether.cpp b/src/d/d_kankyo/d_kankyo_wether.cpp
index 6ef9600f13..a27b93099e 100644
--- a/src/d/d_kankyo/d_kankyo_wether.cpp
+++ b/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
diff --git a/src/d/d_meter/d_meter_button.cpp b/src/d/d_meter/d_meter_button.cpp
index 970151d0c0..d47de72985 100644
--- a/src/d/d_meter/d_meter_button.cpp
+++ b/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
diff --git a/src/d/d_meter/d_meter_map.cpp b/src/d/d_meter/d_meter_map.cpp
index 4205b9b014..d4ac0fadcd 100644
--- a/src/d/d_meter/d_meter_map.cpp
+++ b/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
diff --git a/src/d/d_meter2.cpp b/src/d/d_meter2.cpp
index df25b68bea..a45a748bc4 100644
--- a/src/d/d_meter2.cpp
+++ b/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
diff --git a/src/d/d_meter2/d_meter2_draw.cpp b/src/d/d_meter2/d_meter2_draw.cpp
index 9a4451b188..0ab548fa08 100644
--- a/src/d/d_meter2/d_meter2_draw.cpp
+++ b/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
diff --git a/src/m_Do/m_Do_audio.cpp b/src/m_Do/m_Do_audio.cpp
index 82578f346c..dd1ba974ed 100644
--- a/src/m_Do/m_Do_audio.cpp
+++ b/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"
-} 
\ No newline at end of file
+#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 7561716d60..7001ca9f9a 100644
--- a/src/m_Do/m_Do_main.cpp
+++ b/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)) &&