mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-11 23:30:05 -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
include/Z2AudioLib/Z2Calc/Z2Calc.h
+5 -5
View File
@@ -1,11 +1,11 @@
#include "global.h"
namespace Z2Calc{
struct CurveSign{
// temp
namespace Z2Calc {
struct CurveSign {
// temp
};
struct FNoise1f{
struct FNoise1f {
void setParam(float, float, float);
float tau(float);
float calcNoise1f();
@@ -20,4 +20,4 @@ float linearTransform(float, float, float, float, float, bool);
float getParamByExp(float, float, float, float, float, float, Z2Calc::CurveSign);
float getRandom(float, float, float);
float getRandom_0_1(void);
}
} // namespace Z2Calc
include/Z2AudioLib/Z2LinkMgr/Z2LinkMgr.h
+49 -50
View File
@@ -1,61 +1,60 @@
#include "global.h"
#include "JSystem/JAudio2/JAISe/JAISe.h"
#include "JSystem/JAudio2/JAUClusterSound/JAUClusterSound.h"
#include "global.h"
struct Z2SoundObjBase{
};
struct Z2SoundObjBase {};
struct Z2CreatureLink {
void setLinkState(u8);
void setLinkGroupInfo(u8);
void setLinkHp(s32, s32);
void setLinkSwordType(s32, s32);
void setLinkShieldType(s32, s32);
void setLinkBootsType(s32);
Z2CreatureLink(void);
~Z2CreatureLink();
void deleteObject();
void init(Vec*, Vec*, Vec*);
void initKantera(Vec*);
void deleteKantera(void);
void setKanteraState(u8);
void framework(u32, s8);
void setSinkDepth(s8);
void setRiding(bool);
void setMagnetized(bool);
void setWolfEyeOpen(bool);
void startLinkSound(JAISoundID, u32, s8);
void startLinkSoundLevel(JAISoundID, u32, s8);
void startLinkVoice(JAISoundID, s8);
void startLinkVoiceLevel(JAISoundID, s8);
void startLinkSwordSound(JAISoundID, u32, s8);
void startCollisionSE(u32, u32);
int startHitItemSE(u32, u32, Z2SoundObjBase*, float);
void setResumeAttack(bool);
void setLinkState(u8);
void setLinkGroupInfo(u8);
void setLinkHp(s32, s32);
void setLinkSwordType(s32, s32);
void setLinkShieldType(s32, s32);
void setLinkBootsType(s32);
Z2CreatureLink(void);
~Z2CreatureLink();
void deleteObject();
void init(Vec*, Vec*, Vec*);
void initKantera(Vec*);
void deleteKantera(void);
void setKanteraState(u8);
void framework(u32, s8);
void setSinkDepth(s8);
void setRiding(bool);
void setMagnetized(bool);
void setWolfEyeOpen(bool);
void startLinkSound(JAISoundID, u32, s8);
void startLinkSoundLevel(JAISoundID, u32, s8);
void startLinkVoice(JAISoundID, s8);
void startLinkVoiceLevel(JAISoundID, s8);
void startLinkSwordSound(JAISoundID, u32, s8);
void startCollisionSE(u32, u32);
int startHitItemSE(u32, u32, Z2SoundObjBase*, float);
void setResumeAttack(bool);
u8 unk0[179];
u8 unk179;
float unk180;
float unk184;
float unk188;
u8 link_state;
u8 unk193;
u8 unk194;
u8 link_hp;
u8 unk196;
u8 lantern_state;
u8 unk198;
u8 unk199;
u8 unk200;
u8 unk201;
u8 sink_depth;
u8 unk203;
u8 unk204;
u8 unk0[179];
u8 unk179;
float unk180;
float unk184;
float unk188;
u8 link_state;
u8 unk193;
u8 unk194;
u8 link_hp;
u8 unk196;
u8 lantern_state;
u8 unk198;
u8 unk199;
u8 unk200;
u8 unk201;
u8 sink_depth;
u8 unk203;
u8 unk204;
};
struct Z2LinkSoundStarter{
struct Z2LinkSoundStarter {
Z2LinkSoundStarter(void);
~Z2LinkSoundStarter();
//u32 startSound(JAISoundID, JAISoundHandle, TVec3<float>*, u32, float, float, float, float, float, u32);
// u32 startSound(JAISoundID, JAISoundHandle, TVec3<float>*, u32, float, float, float, float,
// float, u32);
};
include/Z2AudioLib/Z2SceneMgr/Z2SceneMgr.h
+4 -4
View File
@@ -1,20 +1,20 @@
#include "global.h"
#include "JSystem/JAudio2/JAISe/JAISe.h"
#include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h"
#include "global.h"
struct JAISoundParamsMove{
struct JAISoundParamsMove {
void moveVolume(float param_1, u32 param_2);
float unk_1;
};
struct Z2SoundMgr{
struct Z2SoundMgr {
void resetFilterAll();
u8 p1[0x3ec];
JAISoundParamsMove* JAISoundParamsMove;
};
struct Z2SceneMgr{
struct Z2SceneMgr {
long BGM_ID;
int sceneNum;
int timer;
include/Z2AudioLib/Z2SeMgr/Z2SeMgr.h
+64 -62
View File
@@ -1,15 +1,15 @@
#ifndef Z2SEMGR_H_
#define Z2SEMGR_H_
#include "global.h"
#include "JSystem/JAudio2/JAISe/JAISe.h"
#include "Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h"
#include "global.h"
struct Z2MultiSeObj{
struct Z2MultiSeObj {
Z2MultiSeObj();
};
struct Z2SeMgr{
struct Z2SeMgr {
Z2SeMgr(void);
void initSe(void);
void resetModY(void);
@@ -32,7 +32,7 @@ struct Z2SeMgr{
bool isSoundCulling(JAISoundID);
};
struct Z2MultiSeMgr{
struct Z2MultiSeMgr {
Z2MultiSeMgr();
~Z2MultiSeMgr();
u32 registMultiSePos(Vec*);
@@ -41,42 +41,44 @@ struct Z2MultiSeMgr{
float getDolbyPower(void);
};
extern "C"{
void Z2MultiSeObj(void);
void __ct__12Z2MultiSeObjFv(void);
void resetModY__7Z2SeMgrFv(void);
void JAISoundHandles_NS_getFreeHandle(void);
void JAISoundHandles_NS_getHandleSoundID(void);
void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(JAISoundID, Vec const*, u32, s8, float, float, float, float, u8);
void JAISoundParamsMove_NS_moveDolby(void);
void JAISoundParamsMove_NS_movePan(void);
void JAISoundParamsMove_NS_moveFxMix(void);
void Z2Audience_NS_calcOffMicSound(void);
void modHeightAtCamera__7Z2SeMgrFPPC3Vec(Vec const** );
void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(JAISoundID, Vec const*, u32, s8, float, float, float, float, u8);
void JAISoundHandle_NS_releaseSound(void);
void seStop__7Z2SeMgrF10JAISoundIDUl(JAISoundID, u32);
void JAISeCategoryMgr_NS_stop(void);
void seMoveVolumeAll__7Z2SeMgrFfUl(float, u32);
void Z2SpeechMgr2_NS_playOneShotVoice(void);
void setLevObjSE__7Z2SeMgrFUlP3VecSc(u32, Vec*, s8);
void setMultiTriggerSE__7Z2SeMgrFUlP3VecSc(u32, Vec*, s8);
void isLevelSe__7Z2SeMgrF10JAISoundID(JAISoundID);
void Z2SoundMgr_NS_stopSoundID(void);
void Z2SoundMgr_NS_multiVolumeSoundID(void);
void isSoundCulling__7Z2SeMgrF10JAISoundID(JAISoundID);
void __ct__12Z2MultiSeMgrFv(void);
void Z2Audience_NS_calcRelPosDolby(void);
void Z2Audience_NS_calcRelPosPan(void);
void Z2Audience_NS_calcRelPosVolume(void);
void Z2Audience_NS_convertAbsToRel(void);
void registMultiSePos__12Z2MultiSeMgrFP3Vec(Vec*);
void resetMultiSePos__12Z2MultiSeMgrFv(void);
float getPanPower__12Z2MultiSeMgrFv(void);
float getDolbyPower__12Z2MultiSeMgrFv(void);
extern "C" {
void Z2MultiSeObj(void);
void __ct__12Z2MultiSeObjFv(void);
void resetModY__7Z2SeMgrFv(void);
void JAISoundHandles_NS_getFreeHandle(void);
void JAISoundHandles_NS_getHandleSoundID(void);
void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(JAISoundID, Vec const*, u32, s8, float, float,
float, float, u8);
void JAISoundParamsMove_NS_moveDolby(void);
void JAISoundParamsMove_NS_movePan(void);
void JAISoundParamsMove_NS_moveFxMix(void);
void Z2Audience_NS_calcOffMicSound(void);
void modHeightAtCamera__7Z2SeMgrFPPC3Vec(Vec const**);
void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(JAISoundID, Vec const*, u32, s8, float,
float, float, float, u8);
void JAISoundHandle_NS_releaseSound(void);
void seStop__7Z2SeMgrF10JAISoundIDUl(JAISoundID, u32);
void JAISeCategoryMgr_NS_stop(void);
void seMoveVolumeAll__7Z2SeMgrFfUl(float, u32);
void Z2SpeechMgr2_NS_playOneShotVoice(void);
void setLevObjSE__7Z2SeMgrFUlP3VecSc(u32, Vec*, s8);
void setMultiTriggerSE__7Z2SeMgrFUlP3VecSc(u32, Vec*, s8);
void isLevelSe__7Z2SeMgrF10JAISoundID(JAISoundID);
void Z2SoundMgr_NS_stopSoundID(void);
void Z2SoundMgr_NS_multiVolumeSoundID(void);
void isSoundCulling__7Z2SeMgrF10JAISoundID(JAISoundID);
void __ct__12Z2MultiSeMgrFv(void);
void Z2Audience_NS_calcRelPosDolby(void);
void Z2Audience_NS_calcRelPosPan(void);
void Z2Audience_NS_calcRelPosVolume(void);
void Z2Audience_NS_convertAbsToRel(void);
void registMultiSePos__12Z2MultiSeMgrFP3Vec(Vec*);
void resetMultiSePos__12Z2MultiSeMgrFv(void);
float getPanPower__12Z2MultiSeMgrFv(void);
float getDolbyPower__12Z2MultiSeMgrFv(void);
}
extern Z2SeMgr* lbl_80450B88; // Z2SeMgr sInstance
extern Z2SeMgr* lbl_80450B88; // Z2SeMgr sInstance
extern double lbl_804558D8;
extern float lbl_804558D0;
extern float lbl_804558D4;
@@ -141,29 +143,29 @@ extern float lbl_80455994;
extern u32 lbl_8039B9F0;
extern u32 lbl_8039B9FC;
extern u8 lbl_803C9D98[0x60];
extern u32 lbl_804507F8; //VOL_SE_SYSTEM_DEFAULT
extern u32 lbl_804507FC; //VOL_SE_LINK_VOICE_DEFAULT
extern u32 lbl_80450800; //VOL_SE_LINK_MOTION_DEFAULT
extern u32 lbl_80450804; //VOL_SE_LINK_FOOTNOTE_DEFAULT
extern u32 lbl_80450808; //VOL_SE_CHAR_VOICE_DEFAULT
extern u32 lbl_8045080C; //VOL_SE_CHAR_MOVE_DEFAULT
extern u32 lbl_80450810; //VOL_SE_OBJECT_DEFAULT
extern u32 lbl_80450814; //VOL_SE_ATMOSPHERE_DEFAULT
extern u32 lbl_8045081C; //VOL_SE_SYSTEM_TALKING
extern u32 lbl_80450820; //VOL_SE_LINK_VOICE_TALKING
extern u32 lbl_80450824; //VOL_SE_LINK_MOTION_TALKING
extern u32 lbl_80450828; //VOL_SE_LINK_FOOTNOTE_TALKING
extern u32 lbl_8045082C; //VOL_SE_CHAR_VOICE_TALKING
extern u32 lbl_80450830; //VOL_SE_CHAR_MOVE_TALKING
extern u32 lbl_80450834; //VOL_SE_OBJECT_TALKING
extern u32 lbl_80450838; //VOL_SE_ATMOSPHERE_TALKING
extern u32 lbl_80450840; //VOL_SE_SYSTEM_PAUSING
extern u32 lbl_80450844; //VOL_SE_LINK_VOICE_PAUSING
extern u32 lbl_80450848; //VOL_SE_LINK_MOTION_PAUSING
extern u32 lbl_8045084C; //VOL_VOL_SE_LINK_FOOTNOTE_PAUSING
extern u32 lbl_80450850; //VOL_SE_CHAR_VOICE_PAUSING
extern u32 lbl_80450854; //VOL_SE_CHAR_MOVE_PAUSING
extern u32 lbl_80450858; //VOL_SE_OBJECT_PAUSING
extern u32 lbl_8045085C; //VOL_SE_ATMOSPHERE_PAUSING
extern u32 lbl_804507F8; // VOL_SE_SYSTEM_DEFAULT
extern u32 lbl_804507FC; // VOL_SE_LINK_VOICE_DEFAULT
extern u32 lbl_80450800; // VOL_SE_LINK_MOTION_DEFAULT
extern u32 lbl_80450804; // VOL_SE_LINK_FOOTNOTE_DEFAULT
extern u32 lbl_80450808; // VOL_SE_CHAR_VOICE_DEFAULT
extern u32 lbl_8045080C; // VOL_SE_CHAR_MOVE_DEFAULT
extern u32 lbl_80450810; // VOL_SE_OBJECT_DEFAULT
extern u32 lbl_80450814; // VOL_SE_ATMOSPHERE_DEFAULT
extern u32 lbl_8045081C; // VOL_SE_SYSTEM_TALKING
extern u32 lbl_80450820; // VOL_SE_LINK_VOICE_TALKING
extern u32 lbl_80450824; // VOL_SE_LINK_MOTION_TALKING
extern u32 lbl_80450828; // VOL_SE_LINK_FOOTNOTE_TALKING
extern u32 lbl_8045082C; // VOL_SE_CHAR_VOICE_TALKING
extern u32 lbl_80450830; // VOL_SE_CHAR_MOVE_TALKING
extern u32 lbl_80450834; // VOL_SE_OBJECT_TALKING
extern u32 lbl_80450838; // VOL_SE_ATMOSPHERE_TALKING
extern u32 lbl_80450840; // VOL_SE_SYSTEM_PAUSING
extern u32 lbl_80450844; // VOL_SE_LINK_VOICE_PAUSING
extern u32 lbl_80450848; // VOL_SE_LINK_MOTION_PAUSING
extern u32 lbl_8045084C; // VOL_VOL_SE_LINK_FOOTNOTE_PAUSING
extern u32 lbl_80450850; // VOL_SE_CHAR_VOICE_PAUSING
extern u32 lbl_80450854; // VOL_SE_CHAR_MOVE_PAUSING
extern u32 lbl_80450858; // VOL_SE_OBJECT_PAUSING
extern u32 lbl_8045085C; // VOL_SE_ATMOSPHERE_PAUSING
#endif
include/Z2AudioLib/Z2SeqMgr/Z2SeqMgr.h
+32 -33
View File
@@ -1,14 +1,14 @@
#ifndef Z2SEQMGR_H_
#define Z2SEQMGR_H_
#include "global.h"
#include "JSystem/JAudio2/JAISe/JAISe.h"
#include "JSystem/JAudio2/JAUClusterSound/JAUClusterSound.h"
#include "global.h"
struct Z2SeqMgr{
struct Z2SeqMgr {
Z2SeqMgr(void);
void bgmStart(u32,u32,s32);
void bgmStop(u32,s32);
void bgmStart(u32, u32, s32);
void bgmStop(u32, s32);
void subBgmStart(u32);
void subBgmStop(void);
void subBgmStopInner(void);
@@ -42,7 +42,7 @@ struct Z2SeqMgr{
void setBattleLastHit(u8);
void battleBgmFramework(void);
void startBattleBgm(bool);
void stopBattleBgm(u8,u8);
void stopBattleBgm(u8, u8);
void fieldBgmStart(void);
void fieldRidingMute(void);
void onFieldBgmJumpStart(void);
@@ -59,40 +59,40 @@ struct Z2SeqMgr{
u8 unk_1;
};
extern "C"{
void Z2SeqMgr_NS_fieldBgmStart(void);
void JAIStreamMgr_NS_stop_X1_(void);
void JAISeqMgr_NS_stop_X1_(void);
void bgmStart__8Z2SeqMgrFUlUll(u32,u32,s32);
void bgmStop__8Z2SeqMgrFUll(u32, s32);
void JAISoundHandle_NS_releaseSound(void);
void Z2SeqMgr_NS_subBgmStop(void);
void subBgmStop__8Z2SeqMgrFv(void);
void subBgmStopInner__8Z2SeqMgrFv(void);
void JAISoundStatus__NS_lockWhenPrepared();
void bgmStreamPrepare__8Z2SeqMgrFUl(u32);
void JAISound_NS_stop_X1_(void);
void JAISoundStatus__NS_unlockIfLocked(void);
void bgmStreamPlay__8Z2SeqMgrFv(void);
void bgmStreamStop__8Z2SeqMgrFUl(u32);
void subBgmStart__8Z2SeqMgrFUl(u32);
void Z2SeqMgr_NS_setChildTrackVolume(void);
void changeBgmStatus__8Z2SeqMgrFl(s32);
void changeSubBgmStatus__8Z2SeqMgrFl(s32);
void JAISeqMgr_NS_mixOut(void);
void JAISeqMgr_NS_calc(void);
extern "C" {
void Z2SeqMgr_NS_fieldBgmStart(void);
void JAIStreamMgr_NS_stop_X1_(void);
void JAISeqMgr_NS_stop_X1_(void);
void bgmStart__8Z2SeqMgrFUlUll(u32, u32, s32);
void bgmStop__8Z2SeqMgrFUll(u32, s32);
void JAISoundHandle_NS_releaseSound(void);
void Z2SeqMgr_NS_subBgmStop(void);
void subBgmStop__8Z2SeqMgrFv(void);
void subBgmStopInner__8Z2SeqMgrFv(void);
void JAISoundStatus__NS_lockWhenPrepared();
void bgmStreamPrepare__8Z2SeqMgrFUl(u32);
void JAISound_NS_stop_X1_(void);
void JAISoundStatus__NS_unlockIfLocked(void);
void bgmStreamPlay__8Z2SeqMgrFv(void);
void bgmStreamStop__8Z2SeqMgrFUl(u32);
void subBgmStart__8Z2SeqMgrFUl(u32);
void Z2SeqMgr_NS_setChildTrackVolume(void);
void changeBgmStatus__8Z2SeqMgrFl(s32);
void changeSubBgmStatus__8Z2SeqMgrFl(s32);
void JAISeqMgr_NS_mixOut(void);
void JAISeqMgr_NS_calc(void);
}
extern u8 lbl_8039BA08[0x280]; // Z2AudioLib stringBase0
extern u8 lbl_8039BA08[0x280]; // Z2AudioLib stringBase0
extern u32 lbl_803C9DF8;
extern u32 lbl_803CA08C;
extern u32 lbl_803CA308;
extern u32 lbl_80450860;
extern u8 lbl_80450861;
extern u8 lbl_80450862;
extern float lbl_804507F4; // SONIC_SPEED
extern float lbl_80450818; // VOL_BGM_TALKING
extern float lbl_8045083C; // VOL_BGM_PAUSING
extern float lbl_804507F4; // SONIC_SPEED
extern float lbl_80450818; // VOL_BGM_TALKING
extern float lbl_8045083C; // VOL_BGM_PAUSING
extern float lbl_80455998;
extern float lbl_8045599C;
extern float lbl_804559A0;
@@ -112,7 +112,6 @@ extern float lbl_804559DC;
extern float lbl_804559E0;
extern double lbl_804559E8;
extern Z2SeqMgr* lbl_80450B84; // Z2SeqMgr sInstance
extern Z2SeqMgr* lbl_80450B84; // Z2SeqMgr sInstance
#endif
include/Z2AudioLib/Z2StatusMgr/Z2StatusMgr.h
+20 -20
View File
@@ -3,7 +3,7 @@
#include "global.h"
struct Z2StatusMgr{
struct Z2StatusMgr {
Z2StatusMgr(void);
void heartGaugeOn(void);
void processHeartGaugeSound(void);
@@ -39,29 +39,29 @@ struct Z2StatusMgr{
u8 padding3[2];
};
extern "C"{
void menuIn__11Z2StatusMgrFv(void);
void menuOut__11Z2StatusMgrFv(void);
bool isMovieDemo__11Z2StatusMgrFv(void);
void Z2SceneMgr_NS_sceneBgmStart(void);
void setDemoName__11Z2StatusMgrFPc(char*);
bool checkDayTime__11Z2StatusMgrFv(void);
void processTime__11Z2StatusMgrFv(void);
void setEventBit__11Z2StatusMgrFPv(void*);
void setCameraPolygonPos__11Z2StatusMgrFP3Vec(Vec*);
void setCameraGroupInfo__11Z2StatusMgrFUc(u8);
void Z2FxLineMgr_NS_setUnderWaterFx(void);
extern "C" {
void menuIn__11Z2StatusMgrFv(void);
void menuOut__11Z2StatusMgrFv(void);
bool isMovieDemo__11Z2StatusMgrFv(void);
void Z2SceneMgr_NS_sceneBgmStart(void);
void setDemoName__11Z2StatusMgrFPc(char*);
bool checkDayTime__11Z2StatusMgrFv(void);
void processTime__11Z2StatusMgrFv(void);
void setEventBit__11Z2StatusMgrFPv(void*);
void setCameraPolygonPos__11Z2StatusMgrFP3Vec(Vec*);
void setCameraGroupInfo__11Z2StatusMgrFUc(u8);
void Z2FxLineMgr_NS_setUnderWaterFx(void);
}
extern Z2StatusMgr* lbl_80450B7C; // Z2StatusMgr sInstance
extern u8 lbl_8039BC88[0x320]; // stringBase0
extern Z2StatusMgr* lbl_80450B7C; // Z2StatusMgr sInstance
extern u8 lbl_8039BC88[0x320]; // stringBase0
extern double lbl_80455A28;
extern u32 lbl_803CA508;
extern float lbl_80455A18; // polygon_position init to 1.0E7
extern float lbl_80455A1C; // underwater_depth / unk28 init to 0.0
extern float lbl_80455A20; // processHeartGaugeSound etc
extern float lbl_80455A24; // processHeartGaugeSound
extern u8 lbl_80451124; // used in processHeartGaugeSound
extern float lbl_80455A18; // polygon_position init to 1.0E7
extern float lbl_80455A1C; // underwater_depth / unk28 init to 0.0
extern float lbl_80455A20; // processHeartGaugeSound etc
extern float lbl_80455A24; // processHeartGaugeSound
extern u8 lbl_80451124; // used in processHeartGaugeSound
extern float lbl_80455A30;
extern float lbl_80455A34;