run clang-format

libs/Z2AudioLib/Z2Calc.cpp

@@ -2,104 +2,97 @@
 
 // 1 instruction off
 #ifdef NONMATCHING
-float Z2Calc::linearTransform(float param1, float param2, float param3, float param4, float param5, bool param6){
+float Z2Calc::linearTransform(float param1, float param2, float param3, float param4, float param5,
+                              bool param6) {
     float temp;
-    
+
     temp = param4 + (param1 - param2) * ((param5 - param4) / (param3 - param2));
 
-    if(param6){
+    if (param6) {
         return temp;
-    }
-    else if(param4 < param5){
-        if(temp > param5){
+    } else if (param4 < param5) {
+        if (temp > param5) {
             return param5;
-        }
-        else if(temp >= param4){ // something wrong here idk
+        } else if (temp >= param4) {  // something wrong here idk
             return temp;
-        }
-        else{
+        } else {
             return param4;
         }
-    }
-    else if(temp > param4){
+    } else if (temp > param4) {
         return param4;
-    }
-    else if(temp < param5){
+    } else if (temp < param5) {
         return param5;
-    }
-    else{
+    } else {
         return temp;
     }
 }
 #else
-asm float Z2Calc::linearTransform(float param1, float param2, float param3, float param4, float param5, bool param6) {
+asm float Z2Calc::linearTransform(float param1, float param2, float param3, float param4,
+                                  float param5, bool param6) {
     nofralloc
-    #include "Z2AudioLib/Z2Calc/asm/func_802A968C.s"
+#include "Z2AudioLib/Z2Calc/asm/func_802A968C.s"
 }
 #endif
 
 asm float Z2Calc::getParamByExp(float, float, float, float, float, float, Z2Calc::CurveSign) {
     nofralloc
-    #include "Z2AudioLib/Z2Calc/asm/func_802A96F4.s"
+#include "Z2AudioLib/Z2Calc/asm/func_802A96F4.s"
 }
 
 asm float Z2Calc::getRandom(float, float, float) {
     nofralloc
-    #include "Z2AudioLib/Z2Calc/asm/func_802A9814.s"
+#include "Z2AudioLib/Z2Calc/asm/func_802A9814.s"
 }
 
 asm float Z2Calc::getRandom_0_1(void) {
     nofralloc
-    #include "Z2AudioLib/Z2Calc/asm/func_802A98D4.s"
+#include "Z2AudioLib/Z2Calc/asm/func_802A98D4.s"
 }
 
-
-void Z2Calc::FNoise1f::setParam(float param1, float param2, float param3){
+void Z2Calc::FNoise1f::setParam(float param1, float param2, float param3) {
     this->unk0 = param1;
     this->unk4 = param1;
     this->unk12 = param2;
     this->unk8 = param3;
 }
 
-float Z2Calc::FNoise1f::tau(float param1){
+float Z2Calc::FNoise1f::tau(float param1) {
     float temp1;
     float temp2;
 
     temp1 = param1;
     temp2 = temp1 + (temp1 * temp1);
 
-    if(temp2 > lbl_8045582C){
+    if (temp2 > lbl_8045582C) {
         temp2 = temp2 - lbl_8045582C;
-        
-        if(temp1 < this->unk12){
+
+        if (temp1 < this->unk12) {
             temp2 = temp2 + this->unk12;
         }
 
         return temp2;
-    }
-    else if(temp1 < this->unk12){
+    } else if (temp1 < this->unk12) {
         temp2 = temp2 + this->unk12;
     }
     return temp2;
 }
 
-float Z2Calc::FNoise1f::calcNoise1f(void){
+float Z2Calc::FNoise1f::calcNoise1f(void) {
     float temp1;
     float temp2;
 
     temp1 = this->unk0;
 
-    if(this->unk0 < this->unk4){
+    if (this->unk0 < this->unk4) {
         this->unk0 = temp1 + this->unk8;
 
-        if(this->unk0 < this->unk4){
+        if (this->unk0 < this->unk4) {
             return this->unk0;
         }
-    }
-    else{
+    } else {
         this->unk0 = temp1 - this->unk8;
-        
-        if(this->unk0 > this->unk4){
+
+        if (this->unk0 > this->unk4) {
             return this->unk0;
         }
     }

libs/Z2AudioLib/Z2LinkMgr.cpp

@@ -13,32 +13,32 @@ void Z2CreatureLink::setLinkHp(s32 health, s32 param2) {
 
 asm void Z2CreatureLink::setLinkSwordType(s32, s32) {
     nofralloc
-    #include "Z2AudioLib/Z2LinkMgr/asm/func_802C3228.s"
+#include "Z2AudioLib/Z2LinkMgr/asm/func_802C3228.s"
 }
 
 asm void Z2CreatureLink::setLinkShieldType(s32, s32) {
     nofralloc
-    #include "Z2AudioLib/Z2LinkMgr/asm/func_802C328C.s"
+#include "Z2AudioLib/Z2LinkMgr/asm/func_802C328C.s"
 }
 
 asm void Z2CreatureLink::setLinkBootsType(s32) {
     nofralloc
-    #include "Z2AudioLib/Z2LinkMgr/asm/func_802C32F0.s"
+#include "Z2AudioLib/Z2LinkMgr/asm/func_802C32F0.s"
 }
 
 asm Z2CreatureLink::Z2CreatureLink(void) {
     nofralloc
-    #include "Z2AudioLib/Z2LinkMgr/asm/func_802C333C.s"
+#include "Z2AudioLib/Z2LinkMgr/asm/func_802C333C.s"
 }
 
 asm Z2LinkSoundStarter::~Z2LinkSoundStarter() {
     nofralloc
-    #include "Z2AudioLib/Z2LinkMgr/asm/func_802C3464.s"
+#include "Z2AudioLib/Z2LinkMgr/asm/func_802C3464.s"
 }
 
 asm Z2CreatureLink::~Z2CreatureLink() {
     nofralloc
-    #include "Z2AudioLib/Z2LinkMgr/asm/func_802C3500.s"
+#include "Z2AudioLib/Z2LinkMgr/asm/func_802C3500.s"
 }
 
 // few instructions off
@@ -52,18 +52,18 @@ asm Z2CreatureLink::~Z2CreatureLink() {
 #else
 asm void Z2CreatureLink::deleteObject(void) {
     nofralloc
-    #include "Z2AudioLib/Z2LinkMgr/asm/func_802C35F8.s"
+#include "Z2AudioLib/Z2LinkMgr/asm/func_802C35F8.s"
 }
 #endif
 
 asm void Z2CreatureLink::init(Vec* param1, Vec* param2, Vec* param3) {
     nofralloc
-    #include "Z2AudioLib/Z2LinkMgr/asm/func_802C3638.s"
+#include "Z2AudioLib/Z2LinkMgr/asm/func_802C3638.s"
 }
 
 asm void Z2CreatureLink::initKantera(Vec* param1) {
     nofralloc
-    #include "Z2AudioLib/Z2LinkMgr/asm/func_802C3710.s"
+#include "Z2AudioLib/Z2LinkMgr/asm/func_802C3710.s"
 }
 
 // 1 instruction off
@@ -75,7 +75,7 @@ asm void Z2CreatureLink::initKantera(Vec* param1) {
 #else
 asm void Z2CreatureLink::deleteKantera(void) {
     nofralloc
-    #include "Z2AudioLib/Z2LinkMgr/asm/func_802C374C.s"
+#include "Z2AudioLib/Z2LinkMgr/asm/func_802C374C.s"
 }
 #endif
 
@@ -85,7 +85,7 @@ void Z2CreatureLink::setKanteraState(u8 param1) {
 
 asm void Z2CreatureLink::framework(u32 param1, s8 param2) {
     nofralloc
-    #include "Z2AudioLib/Z2LinkMgr/asm/func_802C3780.s"
+#include "Z2AudioLib/Z2LinkMgr/asm/func_802C3780.s"
 }
 
 void Z2CreatureLink::setSinkDepth(s8 param1) {
@@ -94,7 +94,7 @@ void Z2CreatureLink::setSinkDepth(s8 param1) {
 
 asm void Z2CreatureLink::setRiding(bool) {
     nofralloc
-    #include "Z2AudioLib/Z2LinkMgr/asm/func_802C3A6C.s"
+#include "Z2AudioLib/Z2LinkMgr/asm/func_802C3A6C.s"
 }
 
 // 1 instruction off
@@ -105,59 +105,59 @@ void Z2CreatureLink::setMagnetized(bool param1) {
 #else
 asm void Z2CreatureLink::setMagnetized(bool param1) {
     nofralloc
-    #include "Z2AudioLib/Z2LinkMgr/asm/func_802C3AEC.s"
+#include "Z2AudioLib/Z2LinkMgr/asm/func_802C3AEC.s"
 }
 #endif
 
 asm void Z2CreatureLink::setWolfEyeOpen(bool) {
     nofralloc
-    #include "Z2AudioLib/Z2LinkMgr/asm/func_802C3AFC.s"
+#include "Z2AudioLib/Z2LinkMgr/asm/func_802C3AFC.s"
 }
 
 asm void Z2CreatureLink::startLinkSound(JAISoundID, u32, s8) {
     nofralloc
-    #include "Z2AudioLib/Z2LinkMgr/asm/func_802C3BD4.s"
+#include "Z2AudioLib/Z2LinkMgr/asm/func_802C3BD4.s"
 }
 
 asm void Z2CreatureLink::startLinkSoundLevel(JAISoundID, u32, s8) {
     nofralloc
-    #include "Z2AudioLib/Z2LinkMgr/asm/func_802C3E68.s"
+#include "Z2AudioLib/Z2LinkMgr/asm/func_802C3E68.s"
 }
 
 asm void Z2CreatureLink::startLinkVoice(JAISoundID, s8) {
     nofralloc
-    #include "Z2AudioLib/Z2LinkMgr/asm/func_802C4320.s"
+#include "Z2AudioLib/Z2LinkMgr/asm/func_802C4320.s"
 }
 
 asm void Z2CreatureLink::startLinkVoiceLevel(JAISoundID, s8) {
     nofralloc
-    #include "Z2AudioLib/Z2LinkMgr/asm/func_802C45B0.s"
+#include "Z2AudioLib/Z2LinkMgr/asm/func_802C45B0.s"
 }
 
 asm void Z2CreatureLink::startLinkSwordSound(JAISoundID, u32, s8) {
     nofralloc
-    #include "Z2AudioLib/Z2LinkMgr/asm/func_802C46F0.s"
+#include "Z2AudioLib/Z2LinkMgr/asm/func_802C46F0.s"
 }
 
 asm void Z2CreatureLink::startCollisionSE(u32, u32) {
     nofralloc
-    #include "Z2AudioLib/Z2LinkMgr/asm/func_802C4784.s"
+#include "Z2AudioLib/Z2LinkMgr/asm/func_802C4784.s"
 }
 
 asm int Z2CreatureLink::startHitItemSE(u32, u32, Z2SoundObjBase*, float) {
     nofralloc
-    #include "Z2AudioLib/Z2LinkMgr/asm/func_802C4814.s"
+#include "Z2AudioLib/Z2LinkMgr/asm/func_802C4814.s"
 }
 
 // 1 instruction off
 #ifdef NONMATCHING
-void Z2CreatureLink::setResumeAttack(bool param1){
+void Z2CreatureLink::setResumeAttack(bool param1) {
     this->unk203 = ((param1 & 0x1) << 5) | (unk203 & 0xdf);
     return;
 }
 #else
 asm void Z2CreatureLink::setResumeAttack(bool) {
     nofralloc
-    #include "Z2AudioLib/Z2LinkMgr/asm/func_802C48D8.s"
+#include "Z2AudioLib/Z2LinkMgr/asm/func_802C48D8.s"
 }
 #endif

libs/Z2AudioLib/Z2SceneMgr.cpp

@@ -3,9 +3,9 @@
 #include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h"
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 
-//Missing 2 instructions (beginning and end)
+// Missing 2 instructions (beginning and end)
 #ifdef NONMATCHING
-Z2SceneMgr::Z2SceneMgr(void){
+Z2SceneMgr::Z2SceneMgr(void) {
     lbl_80450B80 = this;
     this->sceneNum = -1;
     this->timer = -1;
@@ -32,53 +32,49 @@ Z2SceneMgr::Z2SceneMgr(void){
     return;
 }
 #else
-asm Z2SceneMgr::Z2SceneMgr(void){
+asm Z2SceneMgr::Z2SceneMgr(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SceneMgr/asm/func_802B6840.s"
+#include "Z2AudioLib/Z2SceneMgr/asm/func_802B6840.s"
 }
 #endif
 
-
-void Z2SceneMgr::setInDarkness(bool param_1){
+void Z2SceneMgr::setInDarkness(bool param_1) {
     this->inDarkness = param_1;
-    if (param_1 == false){
+    if (param_1 == false) {
         lbl_80450B60->resetFilterAll();
     }
     return;
 }
 
-
 extern float lbl_80455A38;
 extern float lbl_80455A3C;
 
 #ifdef NONMATCHING
-void Z2SceneMgr::setSceneExist(bool param_1){
-    Z2SoundMgr *Z2soundMgrPtr;
+void Z2SceneMgr::setSceneExist(bool param_1) {
+    Z2SoundMgr* Z2soundMgrPtr;
     this->sceneExist = param_1;
     this->timer = 0;
     Z2soundMgrPtr = lbl_80450B60;
-    if(param_1==false){
-        Z2soundMgrPtr->JAISoundParamsMove->moveVolume(lbl_80455A38,0xb4);
-    }
-    else{
+    if (param_1 == false) {
+        Z2soundMgrPtr->JAISoundParamsMove->moveVolume(lbl_80455A38, 0xb4);
+    } else {
         this->inGame = 1;
         if (this->SeWave_3 == 0x85) {
-            Z2soundMgrPtr->JAISoundParamsMove->moveVolume(lbl_80455A38,0);
-        }
-        else{
+            Z2soundMgrPtr->JAISoundParamsMove->moveVolume(lbl_80455A38, 0);
+        } else {
             if (this->SeWave_3 == 0x7f) {
-                lbl_80450B88->seMoveVolumeAll(lbl_80455A38,0);
-            }else{
-                Z2soundMgrPtr->JAISoundParamsMove->moveVolume(lbl_80455A3C,0x21);
+                lbl_80450B88->seMoveVolumeAll(lbl_80455A38, 0);
+            } else {
+                Z2soundMgrPtr->JAISoundParamsMove->moveVolume(lbl_80455A3C, 0x21);
             }
         }
     }
     return;
 }
 #else
-asm void Z2SceneMgr::setSceneExist(bool param_1){
+asm void Z2SceneMgr::setSceneExist(bool param_1) {
     nofralloc
-    #include "Z2AudioLib/Z2SceneMgr/asm/func_802B68E0.s"
+#include "Z2AudioLib/Z2SceneMgr/asm/func_802B68E0.s"
 }
 #endif
 
@@ -87,54 +83,50 @@ extern double lbl_80455A48;
 
 asm void Z2SceneMgr::setFadeOutStart(u8 param_1) {
     nofralloc
-    #include "Z2AudioLib/Z2SceneMgr/asm/func_802B697C.s"
+#include "Z2AudioLib/Z2SceneMgr/asm/func_802B697C.s"
 }
 
 asm void Z2SceneMgr::setFadeInStart(u8 param_1) {
     nofralloc
-    #include "Z2AudioLib/Z2SceneMgr/asm/func_802B6A18.s"
+#include "Z2AudioLib/Z2SceneMgr/asm/func_802B6A18.s"
 }
 
-
 extern float lbl_80455A50;
-extern char lbl_8039BFA8[]; //probably wrong
-extern char* lbl_803CA5C0[]; //array of char*
-extern void* lbl_803CA878[]; //switch table (array of void*)
-extern void* lbl_803CA844[]; //switch table (array of void*)
-extern void* lbl_803CA824[]; //switch table (array of void*)
-extern void* lbl_803CA7F4[]; //switch table (array of void*)
-extern void* lbl_803CA7BC[]; //switch table (array of void*)
-extern void* lbl_803CA784[]; //switch table (array of void*)
+extern char lbl_8039BFA8[];   // probably wrong
+extern char* lbl_803CA5C0[];  // array of char*
+extern void* lbl_803CA878[];  // switch table (array of void*)
+extern void* lbl_803CA844[];  // switch table (array of void*)
+extern void* lbl_803CA824[];  // switch table (array of void*)
+extern void* lbl_803CA7F4[];  // switch table (array of void*)
+extern void* lbl_803CA7BC[];  // switch table (array of void*)
+extern void* lbl_803CA784[];  // switch table (array of void*)
 extern float lbl_80455A54;
 extern float lbl_80455A58;
-extern void* lbl_803CA744[]; //switch table (array of void*)
-extern void* lbl_803CA704[]; //switch table (array of void*)
+extern void* lbl_803CA744[];  // switch table (array of void*)
+extern void* lbl_803CA704[];  // switch table (array of void*)
 extern float lbl_80455A5C;
 extern u32 lbl_80450860;
 extern float lbl_80455A60;
 extern float lbl_80455A64;
-extern void* lbl_80450B58; //JAUSoundTable sInstance
-extern void* lbl_80450B3C; //Z2EnvSeMgr sInstance
+extern void* lbl_80450B58;  // JAUSoundTable sInstance
+extern void* lbl_80450B3C;  // Z2EnvSeMgr sInstance
 
-
-
-asm void Z2SceneMgr::setSceneName(char* stageName, long roomNum, long layerNum) {
-    nofralloc
-    #include "Z2AudioLib/Z2SceneMgr/asm/func_802B6AF8.s"
+asm void Z2SceneMgr::setSceneName(char* stageName, long roomNum, long layerNum){nofralloc
+#include "Z2AudioLib/Z2SceneMgr/asm/func_802B6AF8.s"
 }
 
-JAISoundID::JAISoundID(JAISoundID const &soundIdToSet){
+JAISoundID::JAISoundID(JAISoundID const& soundIdToSet) {
     this->soundId = soundIdToSet.soundId;
     return;
 }
 
-#ifdef NONMATCHING //1 Instruction off
+#ifdef NONMATCHING  // 1 Instruction off
 void Z2SeqMgr::setFieldBgmPlay(bool param_1) {
     this->unk_1 = (param_1 & 1U) << 2 | this->unk_1 & 0xfb;
 }
-#else 
-asm void Z2SeqMgr::setFieldBgmPlay(bool param_1){
+#else
+asm void Z2SeqMgr::setFieldBgmPlay(bool param_1) {
     nofralloc
-    #include "Z2AudioLib/Z2SceneMgr/asm/func_802B9968.s"
+#include "Z2AudioLib/Z2SceneMgr/asm/func_802B9968.s"
 }
 #endif

libs/Z2AudioLib/Z2SeMgr.cpp

@@ -1,144 +1,143 @@
 #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
 #include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h"
 
-extern "C"{
-    void JAISoundHandle(void);
-    void JAISoundHandle_NS_dtor(void);
-    void Z2MultiSeObj_NS_dtor(void);
+extern "C" {
+void JAISoundHandle(void);
+void JAISoundHandle_NS_dtor(void);
+void Z2MultiSeObj_NS_dtor(void);
 }
 
-asm Z2SeMgr::Z2SeMgr(void){
+asm Z2SeMgr::Z2SeMgr(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802AB64C.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802AB64C.s"
 }
 
-asm Z2MultiSeObj::Z2MultiSeObj(void){
+asm Z2MultiSeObj::Z2MultiSeObj(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802AB710.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802AB710.s"
 }
 
-asm void Z2SeMgr::initSe(void){
+asm void Z2SeMgr::initSe(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802AB750.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802AB750.s"
 }
 
-asm void Z2SeMgr::resetModY(void){
+asm void Z2SeMgr::resetModY(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802AB80C.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802AB80C.s"
 }
 
-asm void Z2SeMgr::modHeightAtCamera(Vec const** param1){
+asm void Z2SeMgr::modHeightAtCamera(Vec const** param1) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802AB830.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802AB830.s"
 }
 
-asm void Z2SeMgr::incrCrowdSize(void){
+asm void Z2SeMgr::incrCrowdSize(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802AB93C.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802AB93C.s"
 }
 
-asm void Z2SeMgr::decrCrowdSize(void){
+asm void Z2SeMgr::decrCrowdSize(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802AB960.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802AB960.s"
 }
 
-asm void Z2SeMgr::seStart(JAISoundID, Vec const*, u32, s8, float, float, float, float, u8){
+asm void Z2SeMgr::seStart(JAISoundID, Vec const*, u32, s8, float, float, float, float, u8) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802AB984.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802AB984.s"
 }
 
-asm void Z2SeMgr::seStartLevel(JAISoundID, Vec const*, u32, s8, float, float, float, float, u8){
+asm void Z2SeMgr::seStartLevel(JAISoundID, Vec const*, u32, s8, float, float, float, float, u8) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802AC50C.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802AC50C.s"
 }
 
-asm void Z2SeMgr::seStop(JAISoundID, u32){
+asm void Z2SeMgr::seStop(JAISoundID, u32) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802AD8B0.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802AD8B0.s"
 }
 
-asm void Z2SeMgr::seStopAll(u32){
+asm void Z2SeMgr::seStopAll(u32) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802AD94C.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802AD94C.s"
 }
 
-asm void Z2SeMgr::seMoveVolumeAll(float, u32){
+asm void Z2SeMgr::seMoveVolumeAll(float, u32) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802AD9F4.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802AD9F4.s"
 }
 
-asm void Z2SeMgr::messageSePlay(u16, Vec*, s8){
+asm void Z2SeMgr::messageSePlay(u16, Vec*, s8) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802ADB14.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802ADB14.s"
 }
 
-asm void Z2SeMgr::talkInSe(void){
+asm void Z2SeMgr::talkInSe(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802ADB50.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802ADB50.s"
 }
 
-asm void Z2SeMgr::talkOutSe(void){
+asm void Z2SeMgr::talkOutSe(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802ADC54.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802ADC54.s"
 }
 
-asm void Z2SeMgr::menuInSe(void){
+asm void Z2SeMgr::menuInSe(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802ADD58.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802ADD58.s"
 }
 
-asm void Z2SeMgr::setLevObjSE(u32, Vec*, s8){
+asm void Z2SeMgr::setLevObjSE(u32, Vec*, s8) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802ADE5C.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802ADE5C.s"
 }
 
-asm void Z2SeMgr::setMultiTriggerSE(u32, Vec*, s8){
+asm void Z2SeMgr::setMultiTriggerSE(u32, Vec*, s8) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802ADFF4.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802ADFF4.s"
 }
 
-asm void Z2SeMgr::processSeFramework(void){
+asm void Z2SeMgr::processSeFramework(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802AE184.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802AE184.s"
 }
 
-asm bool Z2SeMgr::isLevelSe(JAISoundID){
+asm bool Z2SeMgr::isLevelSe(JAISoundID) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802AE524.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802AE524.s"
 }
 
-asm bool Z2SeMgr::isSoundCulling(JAISoundID){
+asm bool Z2SeMgr::isSoundCulling(JAISoundID) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802AE5B0.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802AE5B0.s"
 }
 
-
-asm Z2MultiSeMgr::Z2MultiSeMgr(void){
+asm Z2MultiSeMgr::Z2MultiSeMgr(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802AEB04.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802AEB04.s"
 }
 
-asm Z2MultiSeMgr::~Z2MultiSeMgr(){
+asm Z2MultiSeMgr::~Z2MultiSeMgr() {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802AEB34.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802AEB34.s"
 }
 
-asm u32 Z2MultiSeMgr::registMultiSePos(Vec*){
+asm u32 Z2MultiSeMgr::registMultiSePos(Vec*) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802AEB70.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802AEB70.s"
 }
 
-asm void Z2MultiSeMgr::resetMultiSePos(void){
+asm void Z2MultiSeMgr::resetMultiSePos(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802AECBC.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802AECBC.s"
 }
 
-asm float Z2MultiSeMgr::getPanPower(void){
+asm float Z2MultiSeMgr::getPanPower(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802AECE0.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802AECE0.s"
 }
 
-asm float Z2MultiSeMgr::getDolbyPower(void){
+asm float Z2MultiSeMgr::getDolbyPower(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SeMgr/asm/func_802AEDC0.s"
+#include "Z2AudioLib/Z2SeMgr/asm/func_802AEDC0.s"
 }

libs/Z2AudioLib/Z2SeqMgr.cpp

@@ -1,93 +1,92 @@
-#include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h"
 #include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h"
+#include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h"
 
-
-asm Z2SeqMgr::Z2SeqMgr(void){
+asm Z2SeqMgr::Z2SeqMgr(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SeqMgr/asm/func_802AEEA0.s"
+#include "Z2AudioLib/Z2SeqMgr/asm/func_802AEEA0.s"
 }
 
-asm void Z2SeqMgr::bgmStart(u32,u32,s32){
+asm void Z2SeqMgr::bgmStart(u32, u32, s32) {
     nofralloc
-    #include "Z2AudioLib/Z2SeqMgr/asm/func_802AF010.s"
+#include "Z2AudioLib/Z2SeqMgr/asm/func_802AF010.s"
 }
 
-asm void Z2SeqMgr::bgmStop(u32,s32){
+asm void Z2SeqMgr::bgmStop(u32, s32) {
     nofralloc
-    #include "Z2AudioLib/Z2SeqMgr/asm/func_802AF408.s"
+#include "Z2AudioLib/Z2SeqMgr/asm/func_802AF408.s"
 }
 
-asm void Z2SeqMgr::subBgmStart(u32){
+asm void Z2SeqMgr::subBgmStart(u32) {
     nofralloc
-    #include "Z2AudioLib/Z2SeqMgr/asm/func_802AF49C.s"
+#include "Z2AudioLib/Z2SeqMgr/asm/func_802AF49C.s"
 }
 
-asm void Z2SeqMgr::subBgmStop(void){
+asm void Z2SeqMgr::subBgmStop(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SeqMgr/asm/func_802AF884.s"
+#include "Z2AudioLib/Z2SeqMgr/asm/func_802AF884.s"
 }
 
-asm void Z2SeqMgr::subBgmStopInner(void){
+asm void Z2SeqMgr::subBgmStopInner(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SeqMgr/asm/func_802AF9D0.s"
+#include "Z2AudioLib/Z2SeqMgr/asm/func_802AF9D0.s"
 }
 
-asm void Z2SeqMgr::bgmStreamPrepare(u32){
+asm void Z2SeqMgr::bgmStreamPrepare(u32) {
     nofralloc
-    #include "Z2AudioLib/Z2SeqMgr/asm/func_802AFB94.s"
+#include "Z2AudioLib/Z2SeqMgr/asm/func_802AFB94.s"
 }
 
-asm int Z2SeqMgr::bgmStreamCheckReady(void){
+asm int Z2SeqMgr::bgmStreamCheckReady(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SeqMgr/asm/func_802AFDEC.s"
+#include "Z2AudioLib/Z2SeqMgr/asm/func_802AFDEC.s"
 }
 
-asm void Z2SeqMgr::bgmStreamPlay(void){
+asm void Z2SeqMgr::bgmStreamPlay(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SeqMgr/asm/func_802AFE18.s"
+#include "Z2AudioLib/Z2SeqMgr/asm/func_802AFE18.s"
 }
 
-asm void Z2SeqMgr::bgmStreamStop(u32){
+asm void Z2SeqMgr::bgmStreamStop(u32) {
     nofralloc
-    #include "Z2AudioLib/Z2SeqMgr/asm/func_802AFEDC.s"
+#include "Z2AudioLib/Z2SeqMgr/asm/func_802AFEDC.s"
 }
 
-asm void Z2SeqMgr::changeBgmStatus(s32){
+asm void Z2SeqMgr::changeBgmStatus(s32) {
     nofralloc
-    #include "Z2AudioLib/Z2SeqMgr/asm/func_802AFF8C.s"
+#include "Z2AudioLib/Z2SeqMgr/asm/func_802AFF8C.s"
 }
 
-asm void Z2SeqMgr::changeSubBgmStatus(s32){
+asm void Z2SeqMgr::changeSubBgmStatus(s32) {
     nofralloc
-    #include "Z2AudioLib/Z2SeqMgr/asm/func_802B1DF4.s"
+#include "Z2AudioLib/Z2SeqMgr/asm/func_802B1DF4.s"
 }
 
-asm void Z2SeqMgr::onVariantBgmJumpEnd(bool){
+asm void Z2SeqMgr::onVariantBgmJumpEnd(bool) {
     nofralloc
-    #include "Z2AudioLib/Z2SeqMgr/asm/func_802B299C.s"
+#include "Z2AudioLib/Z2SeqMgr/asm/func_802B299C.s"
 }
 
-asm void Z2SeqMgr::changeFishingBgm(s32){
+asm void Z2SeqMgr::changeFishingBgm(s32) {
     nofralloc
-    #include "Z2AudioLib/Z2SeqMgr/asm/func_802B2A88.s"
+#include "Z2AudioLib/Z2SeqMgr/asm/func_802B2A88.s"
 }
 
-asm void Z2SeqMgr::talkInBgm(void){
+asm void Z2SeqMgr::talkInBgm(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SeqMgr/asm/func_802B2CA4.s"
+#include "Z2AudioLib/Z2SeqMgr/asm/func_802B2CA4.s"
 }
 
-asm void Z2SeqMgr::talkOutBgm(void){
+asm void Z2SeqMgr::talkOutBgm(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SeqMgr/asm/func_802B2D64.s"
+#include "Z2AudioLib/Z2SeqMgr/asm/func_802B2D64.s"
 }
 
-asm void Z2SeqMgr::menuInBgm(void){
+asm void Z2SeqMgr::menuInBgm(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SeqMgr/asm/func_802B2DAC.s"
+#include "Z2AudioLib/Z2SeqMgr/asm/func_802B2DAC.s"
 }
 
-asm void Z2SeqMgr::menuOutBgm(void){
+asm void Z2SeqMgr::menuOutBgm(void) {
     nofralloc
-    #include "Z2AudioLib/Z2SeqMgr/asm/func_802B2DF4.s"
+#include "Z2AudioLib/Z2SeqMgr/asm/func_802B2DF4.s"
 }

libs/Z2AudioLib/Z2StatusMgr.cpp

@@ -1,10 +1,10 @@
 #include "Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h"
 #include "Z2AudioLib/Z2SceneMgr/Z2SceneMgr.h"
-#include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h"
 #include "Z2AudioLib/Z2SeMgr/Z2SeMgr.h"
+#include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h"
 #include "d/d_com/d_com_inf_game/d_com_inf_game.h"
 
-Z2StatusMgr::Z2StatusMgr(){
+Z2StatusMgr::Z2StatusMgr() {
     lbl_80450B7C = this;
     this->hour = 0;
     this->minute = 0;
@@ -25,106 +25,104 @@ Z2StatusMgr::Z2StatusMgr(){
     this->heart_gauge_on = 0;
 }
 
-void Z2StatusMgr::heartGaugeOn(void){
+void Z2StatusMgr::heartGaugeOn(void) {
     this->heart_gauge_on = 2;
 }
 
-asm void Z2StatusMgr::processHeartGaugeSound(void){
+asm void Z2StatusMgr::processHeartGaugeSound(void) {
     nofralloc
-    #include "Z2AudioLib/Z2StatusMgr/asm/func_802B5F7C.s"
+#include "Z2AudioLib/Z2StatusMgr/asm/func_802B5F7C.s"
 }
 
-void Z2StatusMgr::talkIn(void){
+void Z2StatusMgr::talkIn(void) {
     u8 is_demo;
 
     is_demo = isMovieDemo();
-    if(is_demo == false){
+    if (is_demo == false) {
         lbl_80450B84->talkInBgm();
         lbl_80450B88->talkInSe();
     }
 }
 
-void Z2StatusMgr::talkOut(void){
+void Z2StatusMgr::talkOut(void) {
     u8 is_demo;
 
     is_demo = isMovieDemo();
-    if(is_demo == false){
+    if (is_demo == false) {
         lbl_80450B84->talkOutBgm();
         lbl_80450B88->talkOutSe();
     }
 }
 
-void Z2StatusMgr::menuIn(){
+void Z2StatusMgr::menuIn() {
     lbl_80450B84->menuInBgm();
     lbl_80450B88->menuInSe();
-    
+
     this->is_menu_in = true;
 }
 
-void Z2StatusMgr::menuOut(){
+void Z2StatusMgr::menuOut() {
     lbl_80450B84->menuOutBgm();
     lbl_80450B88->talkOutSe();
-    
+
     this->is_menu_in = false;
 }
 
-//right instructions, wrong registers
+// right instructions, wrong registers
 #ifdef NONMATCHING
-bool Z2StatusMgr::isMovieDemo(void){
+bool Z2StatusMgr::isMovieDemo(void) {
     bool uvar2;
 
     uvar2 = false;
-    if(this->demo_status == 2 || this->demo_status == 8 || this->demo_status == 9){
+    if (this->demo_status == 2 || this->demo_status == 8 || this->demo_status == 9) {
         uvar2 = true;
     }
     return uvar2;
 }
 #else
-asm bool Z2StatusMgr::isMovieDemo(void){
+asm bool Z2StatusMgr::isMovieDemo(void) {
     nofralloc
-    #include "Z2AudioLib/Z2StatusMgr/asm/func_802B61BC.s"
+#include "Z2AudioLib/Z2StatusMgr/asm/func_802B61BC.s"
 }
 #endif
 
-asm void Z2StatusMgr::setDemoName(char*){
+asm void Z2StatusMgr::setDemoName(char*) {
     nofralloc
-    #include "Z2AudioLib/Z2StatusMgr/asm/func_802B61E8.s"
+#include "Z2AudioLib/Z2StatusMgr/asm/func_802B61E8.s"
 }
 
-void Z2StatusMgr::processTime(void){
+void Z2StatusMgr::processTime(void) {
     u16 temp = this->hour * 256;
     this->time = temp + minute;
 }
 
-bool Z2StatusMgr::checkDayTime(void){
-    if(this->hour >= 6 && this->hour < 19){
+bool Z2StatusMgr::checkDayTime(void) {
+    if (this->hour >= 6 && this->hour < 19) {
         return true;
-    }
-    else{
+    } else {
         return false;
     }
 }
 
-void Z2StatusMgr::setEventBit(void* event_bit){
+void Z2StatusMgr::setEventBit(void* event_bit) {
     this->event_bit = event_bit;
 }
 
-void Z2StatusMgr::setCameraPolygonPos(Vec* polygon_pos){
-    if(polygon_pos == 0){
+void Z2StatusMgr::setCameraPolygonPos(Vec* polygon_pos) {
+    if (polygon_pos == 0) {
         return;
-    }
-    else{
+    } else {
         this->polygon_position.x = polygon_pos->x;
         this->polygon_position.y = polygon_pos->y;
         this->polygon_position.z = polygon_pos->z;
     }
 }
 
-void Z2StatusMgr::setCameraGroupInfo(u8 param1){
+void Z2StatusMgr::setCameraGroupInfo(u8 param1) {
     return;
 }
 
-asm void Z2StatusMgr::setCameraInWaterDepth(float){
+asm void Z2StatusMgr::setCameraInWaterDepth(float) {
     nofralloc
-    #include "Z2AudioLib/Z2StatusMgr/asm/func_802B6788.s"
+#include "Z2AudioLib/Z2StatusMgr/asm/func_802B6788.s"
 }