mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-09 14:55:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

run clang-format

Browse Source
This commit is contained in:
Pheenoh
2020-12-26 11:31:49 -05:00
parent 64a6a97b7b
commit 4c504d078d
180 changed files with 4083 additions and 4253 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/Z2AudioLib/Z2SceneMgr.cpp
+39 -47
View File
@@ -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