From b5bbe8d00dd793e96de77efad6a42528f2b6b210 Mon Sep 17 00:00:00 2001 From: jdflyer Date: Thu, 21 Jan 2021 22:06:54 -0700 Subject: [PATCH] clang-format --- .../JAudio2/JAUClusterSound/JAUClusterSound.h | 2 - include/Z2AudioLib/Z2AudioLib.h | 10 +- include/Z2AudioLib/Z2AudioMgr/Z2AudioMgr.h | 12 +-- include/m_Do/m_Do_audio/m_Do_audio.h | 99 +++++++++---------- libs/Z2AudioLib/Z2AudioMgr.cpp | 18 ++-- libs/Z2AudioLib/Z2Creature.cpp | 2 +- libs/Z2AudioLib/Z2SoundMgr.cpp | 2 +- libs/Z2AudioLib/Z2SoundStarter.cpp | 2 +- libs/Z2AudioLib/Z2SpeechMgr2.cpp | 2 +- src/d/d_a/d_a_alink.cpp | 2 +- src/d/d_attention.cpp | 2 +- src/d/d_camera.cpp | 2 +- src/d/d_kankyo.cpp | 2 +- src/d/d_kankyo/d_kankyo_wether.cpp | 2 +- src/d/d_meter/d_meter_button.cpp | 2 +- src/d/d_meter/d_meter_map.cpp | 2 +- src/d/d_meter2.cpp | 2 +- src/d/d_meter2/d_meter2_draw.cpp | 2 +- src/m_Do/m_Do_audio.cpp | 70 +++++++------ src/m_Do/m_Do_main.cpp | 4 +- 20 files changed, 115 insertions(+), 126 deletions(-) diff --git a/include/JSystem/JAudio2/JAUClusterSound/JAUClusterSound.h b/include/JSystem/JAudio2/JAUClusterSound/JAUClusterSound.h index fc10479595c..b34354b56b9 100644 --- a/include/JSystem/JAudio2/JAUClusterSound/JAUClusterSound.h +++ b/include/JSystem/JAudio2/JAUClusterSound/JAUClusterSound.h @@ -3,6 +3,4 @@ #include "dolphin/types.h" - - #endif \ No newline at end of file diff --git a/include/Z2AudioLib/Z2AudioLib.h b/include/Z2AudioLib/Z2AudioLib.h index 88cb5f05ed1..5c164dd34db 100644 --- a/include/Z2AudioLib/Z2AudioLib.h +++ b/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 \ No newline at end of file diff --git a/include/Z2AudioLib/Z2AudioMgr/Z2AudioMgr.h b/include/Z2AudioLib/Z2AudioMgr/Z2AudioMgr.h index 9e3211d949b..250a821a305 100644 --- a/include/Z2AudioLib/Z2AudioMgr/Z2AudioMgr.h +++ b/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; 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 aeb801402c5..fc17794f31c 100644 --- a/include/m_Do/m_Do_audio/m_Do_audio.h +++ b/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 \ No newline at end of file diff --git a/libs/Z2AudioLib/Z2AudioMgr.cpp b/libs/Z2AudioLib/Z2AudioMgr.cpp index 52f642c8937..52b9647b2b2 100644 --- a/libs/Z2AudioLib/Z2AudioMgr.cpp +++ b/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" } diff --git a/libs/Z2AudioLib/Z2Creature.cpp b/libs/Z2AudioLib/Z2Creature.cpp index 2e7ed99d7d7..e82e8af1975 100644 --- a/libs/Z2AudioLib/Z2Creature.cpp +++ b/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 diff --git a/libs/Z2AudioLib/Z2SoundMgr.cpp b/libs/Z2AudioLib/Z2SoundMgr.cpp index 303ce41daff..152f6159320 100644 --- a/libs/Z2AudioLib/Z2SoundMgr.cpp +++ b/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 diff --git a/libs/Z2AudioLib/Z2SoundStarter.cpp b/libs/Z2AudioLib/Z2SoundStarter.cpp index b04a21d8f7d..1ce8081f839 100644 --- a/libs/Z2AudioLib/Z2SoundStarter.cpp +++ b/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 diff --git a/libs/Z2AudioLib/Z2SpeechMgr2.cpp b/libs/Z2AudioLib/Z2SpeechMgr2.cpp index 8b535b9c759..558d7a8d7d5 100644 --- a/libs/Z2AudioLib/Z2SpeechMgr2.cpp +++ b/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() diff --git a/src/d/d_a/d_a_alink.cpp b/src/d/d_a/d_a_alink.cpp index db268f13034..6c232c9109f 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 8dbb25e62ba..83eb2ec56c2 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 fddaf7e1b1a..0c95dfec58d 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 ef679f91209..5f59c2785fc 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 6ef9600f13e..a27b93099e0 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 970151d0c0c..d47de729857 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 4205b9b0145..d4ac0fadcdf 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 df25b68bea5..a45a748bc4f 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 9a4451b1889..0ab548fa08c 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 82578f346c9..dd1ba974ed5 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 7561716d606..7001ca9f9a3 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)) &&