summaryrefslogtreecommitdiff
path: root/include/Z2AudioLib
diff options
context:
space:
mode:
authorTakaRikka <38417346+TakaRikka@users.noreply.github.com>2022-02-06 06:23:54 -0800
committerGitHub <noreply@github.com>2022-02-06 09:23:54 -0500
commit3a79e96e8b033e26a3970da68d0633010fac0f03 (patch)
tree4f96139d922bc2af03685bca121fb327723447f2 /include/Z2AudioLib
parent612f26c132280da43ecfa5fa8c8cc32966f06eb6 (diff)
d_meter2 wip / d_s_play / d_file_sel_info (#179)
* d_meter2 wip * d_s_play * d_file_sel_info * format * tag_lv5soup / tag_setBall / fix dKyeff * d_cc_uty
Diffstat (limited to 'include/Z2AudioLib')
-rw-r--r--include/Z2AudioLib/Z2EnvSeMgr.h116
-rw-r--r--include/Z2AudioLib/Z2SceneMgr.h2
2 files changed, 115 insertions, 3 deletions
diff --git a/include/Z2AudioLib/Z2EnvSeMgr.h b/include/Z2AudioLib/Z2EnvSeMgr.h
index a926878fc7..e80ced990c 100644
--- a/include/Z2AudioLib/Z2EnvSeMgr.h
+++ b/include/Z2AudioLib/Z2EnvSeMgr.h
@@ -1,9 +1,48 @@
#ifndef Z2ENVSEMGR_H
#define Z2ENVSEMGR_H
+#include "Z2AudioLib/Z2Calc.h"
+#include "Z2AudioLib/Z2SeMgr.h"
#include "dolphin/mtx/mtxvec.h"
#include "dolphin/types.h"
+struct Z2EnvSeBase {
+ /* 802C589C */ Z2EnvSeBase(Vec*);
+ /* 802C58AC */ ~Z2EnvSeBase();
+ /* 802C5908 */ void startEnvSe(JAISoundID, f32, f32, f32, f32, f32, u32);
+ /* 802C5AB4 */ void startEnvSeLevel(JAISoundID, f32, f32, f32, f32, f32, u32);
+
+ /* 0x0 */ Vec* mPos;
+ /* 0x4 */ JAISoundHandle mHandle;
+}; // Size: 0x8
+
+struct Z2EnvSeAutoPan : public Z2EnvSeBase {
+ /* 802C5ECC */ Z2EnvSeAutoPan();
+ /* 802C5F28 */ ~Z2EnvSeAutoPan();
+ /* 802C5F7C */ void setPanParam(f32, f32, bool, bool, f32, f32);
+ /* 802C5F98 */ void calcPan();
+ /* 802C60E0 */ void startEnvSeAutoPanLevel(JAISoundID, f32, f32, f32);
+
+ /* 0x08 */ f32 field_0x8;
+ /* 0x0C */ f32 field_0xc;
+ /* 0x10 */ f32 field_0x10;
+ /* 0x14 */ f32 field_0x14;
+ /* 0x18 */ bool field_0x18;
+ /* 0x19 */ bool field_0x19;
+}; // Size: 0x1C
+
+struct Z2EnvSeDir : public Z2EnvSeBase {
+ /* 802C5C9C */ Z2EnvSeDir(Vec*);
+ /* 802C5D1C */ ~Z2EnvSeDir();
+ /* 802C5D70 */ void setPanDir(Vec*);
+ /* 802C5D9C */ void calcPan(f32);
+ /* 802C5E90 */ void startEnvSeDirLevel(JAISoundID, f32, f32);
+
+ /* 0x08 */ f32 field_0x8;
+ /* 0x0C */ f32 field_0xc;
+ /* 0x10 */ Vec mPanDir;
+}; // Size: 0x1C
+
struct Z2EnvSeMgr {
/* 802C611C */ Z2EnvSeMgr();
/* 802C6540 */ ~Z2EnvSeMgr();
@@ -41,7 +80,80 @@ struct Z2EnvSeMgr {
/* 802C9F58 */ void registLv3WaterSePos(u8, Vec*);
/* 802CA794 */ void startLv3WaterSe(s8);
- u8 field_0x0[780];
-};
+ /* 0x000 */ Z2EnvSeAutoPan field_0x0;
+ /* 0x01C */ Z2EnvSeAutoPan field_0x1c;
+ /* 0x038 */ u8 field_0x38;
+ /* 0x039 */ u8 field_0x39;
+ /* 0x03C */ f32 field_0x3c;
+ /* 0x040 */ f32 field_0x40;
+ /* 0x044 */ f32 field_0x44;
+ /* 0x048 */ f32 field_0x48;
+ /* 0x04C */ f32 field_0x4c;
+ /* 0x050 */ f32 field_0x50;
+ /* 0x054 */ f32 field_0x54;
+ /* 0x058 */ f32 field_0x58;
+ /* 0x05C */ f32 field_0x5c;
+ /* 0x060 */ f32 field_0x60;
+ /* 0x064 */ Z2MultiSeMgr field_0x64;
+ /* 0x080 */ Z2EnvSeBase field_0x80;
+ /* 0x088 */ Z2EnvSeBase field_0x88;
+ /* 0x090 */ Z2Calc::FNoise1f field_0x90;
+ /* 0x0A0 */ Z2Calc::FNoise1f field_0xa0;
+ /* 0x0B0 */ Z2Calc::FNoise1f field_0xb0;
+ /* 0x0C0 */ Z2Calc::FNoise1f field_0xc0;
+ /* 0x0D0 */ Z2Calc::FNoise1f field_0xd0;
+ /* 0x0E0 */ Z2Calc::FNoise1f field_0xe0;
+ /* 0x0F0 */ Z2Calc::FNoise1f field_0xf0;
+ /* 0x100 */ Z2Calc::FNoise1f field_0x100;
+ /* 0x110 */ Z2EnvSeBase field_0x110;
+ /* 0x118 */ Z2EnvSeBase field_0x118;
+ /* 0x120 */ Z2Calc::FNoise1f field_0x120;
+ /* 0x130 */ Z2Calc::FNoise1f field_0x130;
+ /* 0x140 */ u8 field_0x140;
+ /* 0x141 */ u8 field_0x141;
+ /* 0x144 */ Z2EnvSeDir field_0x144;
+ /* 0x160 */ u8 field_0x160;
+ /* 0x164 */ Z2MultiSeMgr field_0x164;
+ /* 0x180 */ Z2EnvSeBase field_0x180;
+ /* 0x188 */ u8 field_0x188;
+ /* 0x18C */ Z2Calc::FNoise1f field_0x18c;
+ /* 0x19C */ Z2Calc::FNoise1f field_0x19c;
+ /* 0x1BC */ Z2MultiSeMgr field_0x1bc;
+ /* 0x1D8 */ Z2EnvSeBase field_0x1d8;
+ /* 0x1E0 */ u8 field_0x1e0;
+ /* 0x1E4 */ f32 field_0x1e4;
+ /* 0x1E8 */ f32 field_0x1e8;
+ /* 0x1EC */ f32 field_0x1ec;
+ /* 0x1F0 */ Z2MultiSeMgr field_0x1f0;
+ /* 0x20C */ Z2EnvSeBase field_0x20c;
+ /* 0x214 */ u8 field_0x214;
+ /* 0x218 */ f32 field_0x218;
+ /* 0x21C */ f32 field_0x21c;
+ /* 0x220 */ f32 field_0x220;
+ /* 0x224 */ Z2MultiSeMgr field_0x224;
+ /* 0x240 */ Z2EnvSeBase field_0x240;
+ /* 0x248 */ u8 field_0x248;
+ /* 0x24C */ f32 field_0x24c;
+ /* 0x250 */ f32 field_0x250;
+ /* 0x254 */ f32 field_0x254;
+ /* 0x258 */ Z2MultiSeMgr field_0x258;
+ /* 0x274 */ Z2EnvSeBase field_0x274;
+ /* 0x27C */ u8 field_0x27c;
+ /* 0x280 */ f32 field_0x280;
+ /* 0x284 */ f32 field_0x284;
+ /* 0x288 */ f32 field_0x288;
+ /* 0x28C */ Z2MultiSeMgr field_0x28c;
+ /* 0x2A8 */ Z2EnvSeBase field_0x2a8;
+ /* 0x2B0 */ u8 field_0x2b0;
+ /* 0x2B4 */ f32 field_0x2b4;
+ /* 0x2B8 */ f32 field_0x2b8;
+ /* 0x2BC */ f32 field_0x2bc;
+ /* 0x2C0 */ Z2MultiSeMgr field_0x2c0;
+ /* 0x2DC */ Z2EnvSeBase field_0x2dc;
+ /* 0x2E4 */ u8 field_0x2e4;
+ /* 0x2E8 */ Z2Calc::FNoise1f field_0x2e8;
+ /* 0x2F8 */ Z2Calc::FNoise1f field_0x2f8;
+ /* 0x308 */ f32 field_0x308;
+}; // Size: 0x30C
#endif /* Z2ENVSEMGR_H */
diff --git a/include/Z2AudioLib/Z2SceneMgr.h b/include/Z2AudioLib/Z2SceneMgr.h
index dfb77c2aed..6445f8f6b2 100644
--- a/include/Z2AudioLib/Z2SceneMgr.h
+++ b/include/Z2AudioLib/Z2SceneMgr.h
@@ -17,7 +17,7 @@ public:
void load1stDynamicWave();
void _load1stWaveInner_1();
void _load1stWaveInner_2();
- void check1stDynamicWave();
+ bool check1stDynamicWave();
void load2ndDynamicWave();
void sceneBgmStart();
void loadStaticWaves();