encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

Work on Z2EnvSeMgr (#2059)

Browse Source
This commit is contained in:
hatal175
2024-02-03 02:28:50 -08:00
committed by GitHub
parent 228b5e17d8
commit c4cd497fd6
18 changed files with 1767 additions and 882 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/Z2AudioLib/Z2EnvSeMgr/initStrongWindSe__10Z2EnvSeMgrFv.s
-4
View File
@@ -1,4 +0,0 @@
lbl_802C7FBC:
/* 802C7FBC 38 00 00 03 */ li r0, 3
/* 802C7FC0 98 03 01 60 */ stb r0, 0x160(r3)
/* 802C7FC4 4E 80 00 20 */ blr
asm/Z2AudioLib/Z2EnvSeMgr/registEtcSePos__10Z2EnvSeMgrFP3Vec.s
-10
View File
@@ -1,10 +0,0 @@
lbl_802C8C24:
/* 802C8C24 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802C8C28 7C 08 02 A6 */ mflr r0
/* 802C8C2C 90 01 00 14 */ stw r0, 0x14(r1)
/* 802C8C30 38 63 01 F0 */ addi r3, r3, 0x1f0
/* 802C8C34 4B FE 5F 3D */ bl registMultiSePos__12Z2MultiSeMgrFP3Vec
/* 802C8C38 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802C8C3C 7C 08 03 A6 */ mtlr r0
/* 802C8C40 38 21 00 10 */ addi r1, r1, 0x10
/* 802C8C44 4E 80 00 20 */ blr
asm/Z2AudioLib/Z2EnvSeMgr/registFallSePos__10Z2EnvSeMgrFP3Vec.s
-10
View File
@@ -1,10 +0,0 @@
lbl_802C886C:
/* 802C886C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802C8870 7C 08 02 A6 */ mflr r0
/* 802C8874 90 01 00 14 */ stw r0, 0x14(r1)
/* 802C8878 38 63 01 BC */ addi r3, r3, 0x1bc
/* 802C887C 4B FE 62 F5 */ bl registMultiSePos__12Z2MultiSeMgrFP3Vec
/* 802C8880 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802C8884 7C 08 03 A6 */ mtlr r0
/* 802C8888 38 21 00 10 */ addi r1, r1, 0x10
/* 802C888C 4E 80 00 20 */ blr
asm/Z2AudioLib/Z2EnvSeMgr/registLv3WaterSePos__10Z2EnvSeMgrFUcP3Vec.s
-560
View File
File diff suppressed because it is too large Load Diff
asm/Z2AudioLib/Z2EnvSeMgr/registRiverSePos__10Z2EnvSeMgrFP3Vec.s
-10
View File
@@ -1,10 +0,0 @@
lbl_802C8234:
/* 802C8234 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802C8238 7C 08 02 A6 */ mflr r0
/* 802C823C 90 01 00 14 */ stw r0, 0x14(r1)
/* 802C8240 38 63 01 64 */ addi r3, r3, 0x164
/* 802C8244 4B FE 69 2D */ bl registMultiSePos__12Z2MultiSeMgrFP3Vec
/* 802C8248 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802C824C 7C 08 03 A6 */ mtlr r0
/* 802C8250 38 21 00 10 */ addi r1, r1, 0x10
/* 802C8254 4E 80 00 20 */ blr
asm/Z2AudioLib/Z2EnvSeMgr/registWindowPos__10Z2EnvSeMgrFP3Vec.s
-10
View File
@@ -1,10 +0,0 @@
lbl_802C780C:
/* 802C780C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802C7810 7C 08 02 A6 */ mflr r0
/* 802C7814 90 01 00 14 */ stw r0, 0x14(r1)
/* 802C7818 38 63 00 64 */ addi r3, r3, 0x64
/* 802C781C 4B FE 73 55 */ bl registMultiSePos__12Z2MultiSeMgrFP3Vec
/* 802C7820 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802C7824 7C 08 03 A6 */ mtlr r0
/* 802C7828 38 21 00 10 */ addi r1, r1, 0x10
/* 802C782C 4E 80 00 20 */ blr
asm/Z2AudioLib/Z2EnvSeMgr/registWolfSmellSePos__10Z2EnvSeMgrFP3Vec.s
-10
View File
@@ -1,10 +0,0 @@
lbl_802C92C8:
/* 802C92C8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802C92CC 7C 08 02 A6 */ mflr r0
/* 802C92D0 90 01 00 14 */ stw r0, 0x14(r1)
/* 802C92D4 38 63 02 C0 */ addi r3, r3, 0x2c0
/* 802C92D8 4B FE 58 99 */ bl registMultiSePos__12Z2MultiSeMgrFP3Vec
/* 802C92DC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802C92E0 7C 08 03 A6 */ mtlr r0
/* 802C92E4 38 21 00 10 */ addi r1, r1, 0x10
/* 802C92E8 4E 80 00 20 */ blr
asm/Z2AudioLib/Z2EnvSeMgr/setPanParam__14Z2EnvSeAutoPanFffbbff.s
-8
View File
@@ -1,8 +0,0 @@
lbl_802C5F7C:
/* 802C5F7C D0 23 00 08 */ stfs f1, 8(r3)
/* 802C5F80 D0 43 00 0C */ stfs f2, 0xc(r3)
/* 802C5F84 D0 63 00 10 */ stfs f3, 0x10(r3)
/* 802C5F88 D0 83 00 14 */ stfs f4, 0x14(r3)
/* 802C5F8C 98 83 00 18 */ stb r4, 0x18(r3)
/* 802C5F90 98 A3 00 19 */ stb r5, 0x19(r3)
/* 802C5F94 4E 80 00 20 */ blr
asm/Z2AudioLib/Z2EnvSeMgr/setWindDirection__10Z2EnvSeMgrFP3Vec.s
-20
View File
@@ -1,20 +0,0 @@
lbl_802C7FC8:
/* 802C7FC8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802C7FCC 7C 08 02 A6 */ mflr r0
/* 802C7FD0 90 01 00 14 */ stw r0, 0x14(r1)
/* 802C7FD4 88 03 01 60 */ lbz r0, 0x160(r3)
/* 802C7FD8 28 00 00 03 */ cmplwi r0, 3
/* 802C7FDC 40 82 00 18 */ bne lbl_802C7FF4
/* 802C7FE0 38 63 01 44 */ addi r3, r3, 0x144
/* 802C7FE4 3C 80 80 3A */ lis r4, cNullVec__6Z2Calc@ha /* 0x8039C250@ha */
/* 802C7FE8 38 84 C2 50 */ addi r4, r4, cNullVec__6Z2Calc@l /* 0x8039C250@l */
/* 802C7FEC 4B FF DD 85 */ bl setPanDir__10Z2EnvSeDirFP3Vec
/* 802C7FF0 48 00 00 0C */ b lbl_802C7FFC
lbl_802C7FF4:
/* 802C7FF4 38 63 01 44 */ addi r3, r3, 0x144
/* 802C7FF8 4B FF DD 79 */ bl setPanDir__10Z2EnvSeDirFP3Vec
lbl_802C7FFC:
/* 802C7FFC 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802C8000 7C 08 03 A6 */ mtlr r0
/* 802C8004 38 21 00 10 */ addi r1, r1, 0x10
/* 802C8008 4E 80 00 20 */ blr
asm/Z2AudioLib/Z2EnvSeMgr/startEnvSeAutoPanLevel__14Z2EnvSeAutoPanF10JAISoundIDfff.s
-16
View File
@@ -1,16 +0,0 @@
lbl_802C60E0:
/* 802C60E0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802C60E4 7C 08 02 A6 */ mflr r0
/* 802C60E8 90 01 00 14 */ stw r0, 0x14(r1)
/* 802C60EC FC A0 18 90 */ fmr f5, f3
/* 802C60F0 80 04 00 00 */ lwz r0, 0(r4)
/* 802C60F4 90 01 00 08 */ stw r0, 8(r1)
/* 802C60F8 38 81 00 08 */ addi r4, r1, 8
/* 802C60FC C0 63 00 08 */ lfs f3, 8(r3)
/* 802C6100 C0 83 00 0C */ lfs f4, 0xc(r3)
/* 802C6104 38 A0 00 00 */ li r5, 0
/* 802C6108 4B FF F9 AD */ bl startEnvSeLevel__11Z2EnvSeBaseF10JAISoundIDfffffUl
/* 802C610C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802C6110 7C 08 03 A6 */ mtlr r0
/* 802C6114 38 21 00 10 */ addi r1, r1, 0x10
/* 802C6118 4E 80 00 20 */ blr
include/JSystem/JAudio2/JAISound.h
+1 -1
View File
@@ -257,7 +257,7 @@ public:
}
void updateLifeTime(u32 param_0) {
if (lifeTime < param_0) {
if (param_0 > lifeTime) {
lifeTime = param_0;
}
}
include/JSystem/JMath/JMath.h
+1
View File
@@ -6,6 +6,7 @@
void JMAMTXApplyScale(const Mtx, Mtx, f32, f32, f32);
void JMAEulerToQuat(s16 param_0, s16 param_1, s16 param_2, Quaternion* param_3);
void JMAQuatLerp(const Quaternion*, const Quaternion*, f32, Quaternion*);
void JMAFastVECNormalize(register const Vec* src, register Vec* dst);
inline f32 JMAFastReciprocal(f32 value) {
return __fres(value);
include/Z2AudioLib/Z2Creature.h
+1
View File
@@ -82,6 +82,7 @@ public:
Z2SoundObjSimple& getKantera() { return mKantera; }
u8 getLinkHp() const { return mLinkHp; }
u8 getMovingTime() { return mMovingTime; }
u8 isWolfSmellOpen() const { return mWolfEyeOpen; }
static Z2CreatureLink* mLinkPtr;
include/Z2AudioLib/Z2EnvSeMgr.h
+30 -22
View File
@@ -5,11 +5,21 @@
#include "Z2AudioLib/Z2SeMgr.h"
#include "global.h"
enum WindType {
WIND_TYPE_0,
WIND_TYPE_1,
WIND_TYPE_2,
WIND_TYPE_3,
};
struct Z2EnvSeBase {
/* 802C589C */ Z2EnvSeBase(Vec* param_0 = NULL);
/* 802C58AC */ ~Z2EnvSeBase();
/* 802C5908 */ void startEnvSe(JAISoundID, f32, f32, f32, f32, f32, u32);
/* 802C5AB4 */ void startEnvSeLevel(JAISoundID, f32, f32, f32, f32, f32, u32);
/* 802C5908 */ bool startEnvSe(JAISoundID, f32, f32, f32, f32, f32, u32);
/* 802C5AB4 */ bool startEnvSeLevel(JAISoundID, f32, f32, f32, f32, f32, u32);
JAISoundHandle* getHandle() { return &mHandle; }
void setPos(Vec* pos) { mPos = pos; }
/* 0x0 */ Vec* mPos;
/* 0x4 */ JAISoundHandle mHandle;
@@ -20,7 +30,7 @@ struct Z2EnvSeAutoPan : public Z2EnvSeBase {
/* 802C5F28 */ ~Z2EnvSeAutoPan();
/* 802C5F7C */ void setPanParam(f32, f32, bool, bool, f32, f32);
/* 802C5F98 */ void calcPan();
/* 802C60E0 */ void startEnvSeAutoPanLevel(JAISoundID, f32, f32, f32);
/* 802C60E0 */ bool startEnvSeAutoPanLevel(JAISoundID, f32, f32, f32);
/* 0x08 */ f32 field_0x8;
/* 0x0C */ f32 field_0xc;
@@ -35,7 +45,7 @@ struct Z2EnvSeDir : public Z2EnvSeBase {
/* 802C5D1C */ ~Z2EnvSeDir();
/* 802C5D70 */ void setPanDir(Vec*);
/* 802C5D9C */ void calcPan(f32);
/* 802C5E90 */ void startEnvSeDirLevel(JAISoundID, f32, f32);
/* 802C5E90 */ bool startEnvSeDirLevel(JAISoundID, f32, f32);
/* 0x08 */ f32 field_0x8;
/* 0x0C */ f32 field_0xc;
@@ -51,30 +61,30 @@ struct Z2EnvSeMgr : public JASGlobalInstance<Z2EnvSeMgr> {
/* 802C6AC0 */ void initSceneEnvSe(s32, s8, f32);
/* 802C6C1C */ void playSceneEnvSe();
/* 802C6C84 */ void initStaticEnvSe(u8, u8, u8, u8, Vec*);
/* 802C70C8 */ void startStaticEnvSe(s8);
/* 802C70C8 */ bool startStaticEnvSe(s8);
/* 802C780C */ void registWindowPos(Vec*);
/* 802C7830 */ void startRainSe(s32, s8);
/* 802C7830 */ bool startRainSe(s32, s8);
/* 802C7CF4 */ void startNearThunderSe(s8);
/* 802C7E68 */ void startFarThunderSe(Vec*, s8);
/* 802C7FB4 */ void setSnowPower(s8);
/* 802C7FBC */ void initStrongWindSe();
/* 802C7FC8 */ void setWindDirection(Vec*);
/* 802C800C */ void startStrongWindSe(s8);
/* 802C800C */ bool startStrongWindSe(s8);
/* 802C80F8 */ void initRiverSe(u8, u8, u8, u8);
/* 802C8234 */ void registRiverSePos(Vec*);
/* 802C8258 */ void setHyrulSewerOpen(bool);
/* 802C8300 */ void startRiverSe(s8);
/* 802C8300 */ bool startRiverSe(s8);
/* 802C8730 */ void initFallSe(u8, u8, u8, u8);
/* 802C886C */ void registFallSePos(Vec*);
/* 802C8890 */ void startFallSe(s8);
/* 802C8890 */ bool startFallSe(s8);
/* 802C8A90 */ void initEtcSe(u8, u8, u8, u8);
/* 802C8C24 */ void registEtcSePos(Vec*);
/* 802C8C48 */ void startEtcSe(s8);
/* 802C8C48 */ bool startEtcSe(s8);
/* 802C92C8 */ void registWolfSmellSePos(Vec*);
/* 802C92EC */ void startFogWipeTrigger(Vec*);
/* 802C92EC */ bool startFogWipeTrigger(Vec*);
/* 802C93A0 */ void setFogWipeWidth(f32);
/* 802C93E4 */ f32 getFogDensity();
/* 802C9400 */ void startFogSe();
/* 802C9400 */ bool startFogSe();
/* 802C950C */ void initLv3WaterSe(u8, u8, u8, u8);
/* 802C9F58 */ void registLv3WaterSePos(u8, Vec*);
/* 802CA794 */ void startLv3WaterSe(s8);
@@ -90,9 +100,7 @@ struct Z2EnvSeMgr : public JASGlobalInstance<Z2EnvSeMgr> {
/* 0x01C */ Z2EnvSeAutoPan field_0x1c;
/* 0x038 */ u8 field_0x38;
/* 0x039 */ u8 field_0x39;
/* 0x03C */ f32 field_0x3c;
/* 0x040 */ f32 field_0x40;
/* 0x044 */ f32 field_0x44;
/* 0x03C */ Vec field_0x3c;
/* 0x048 */ f32 field_0x48;
/* 0x04C */ f32 field_0x4c;
/* 0x050 */ f32 field_0x50;
@@ -115,11 +123,11 @@ struct Z2EnvSeMgr : public JASGlobalInstance<Z2EnvSeMgr> {
/* 0x118 */ Z2EnvSeBase field_0x118;
/* 0x120 */ Z2Calc::FNoise1f field_0x120;
/* 0x130 */ Z2Calc::FNoise1f field_0x130;
/* 0x140 */ u8 field_0x140;
/* 0x141 */ u8 mSnowPower;
/* 0x140 */ s8 field_0x140;
/* 0x141 */ s8 mSnowPower;
/* 0x144 */ Z2EnvSeDir field_0x144;
/* 0x160 */ u8 mWindType;
/* 0x164 */ Z2MultiSeMgr field_0x164;
/* 0x164 */ Z2MultiSeMgr mRiverSeMgr;
/* 0x180 */ Z2EnvSeBase field_0x180;
/* 0x188 */ u8 field_0x188;
/* 0x18C */ Z2Calc::FNoise1f field_0x18c;
@@ -127,14 +135,14 @@ struct Z2EnvSeMgr : public JASGlobalInstance<Z2EnvSeMgr> {
/* 0x1AC */ f32 field_0x1ac;
/* 0x1B0 */ f32 field_0x1b0;
/* 0x1B4 */ f32 field_0x1b4;
/* 0x1B8 */ u8 field_0x1b8;
/* 0x1BC */ Z2MultiSeMgr field_0x1bc;
/* 0x1B8 */ s8 field_0x1b8;
/* 0x1BC */ Z2MultiSeMgr mFallSeMgr;
/* 0x1D8 */ Z2EnvSeBase field_0x1d8;
/* 0x1E0 */ u8 field_0x1e0;
/* 0x1E4 */ f32 field_0x1e4;
/* 0x1E8 */ f32 field_0x1e8;
/* 0x1EC */ f32 field_0x1ec;
/* 0x1F0 */ Z2MultiSeMgr field_0x1f0;
/* 0x1F0 */ Z2MultiSeMgr mEtcSeMgr;
/* 0x20C */ Z2EnvSeBase field_0x20c;
/* 0x214 */ u8 field_0x214;
/* 0x218 */ f32 field_0x218;
@@ -158,7 +166,7 @@ struct Z2EnvSeMgr : public JASGlobalInstance<Z2EnvSeMgr> {
/* 0x2B4 */ f32 field_0x2b4;
/* 0x2B8 */ f32 field_0x2b8;
/* 0x2BC */ f32 field_0x2bc;
/* 0x2C0 */ Z2MultiSeMgr field_0x2c0;
/* 0x2C0 */ Z2MultiSeMgr mWolfSmellSeMgr;
/* 0x2DC */ Z2EnvSeBase field_0x2dc;
/* 0x2E4 */ u8 field_0x2e4;
/* 0x2E8 */ Z2Calc::FNoise1f field_0x2e8;
include/Z2AudioLib/Z2SeMgr.h
+6 -28
View File
@@ -26,45 +26,23 @@ struct Z2MultiSeMgr {
}
f32 getMaxPowR() {
if (mMaxPowR > 1.0f) {
return 1.0f;
} else if (mMaxPowR < 0.0f) {
return 0.0f;
} else {
return mMaxPowR;
}
return (mMaxPowR > 1.0f) ? 1.0f : (mMaxPowR < 0.0f ? 0.0f : mMaxPowR);
}
f32 getMaxPowL() {
if (mMaxPowL > 1.0f) {
return 1.0f;
} else if (mMaxPowL < 0.0f) {
return 0.0f;
} else {
return mMaxPowL;
}
return (mMaxPowL > 1.0f) ? 1.0f : (mMaxPowL < 0.0f ? 0.0f : mMaxPowL);
}
f32 getMaxPowB() {
if (mMaxPowB > 1.0f) {
return 1.0f;
} else if (mMaxPowB < 0.0f) {
return 0.0f;
} else {
return mMaxPowB;
}
return (mMaxPowB > 1.0f) ? 1.0f : (mMaxPowB < 0.0f ? 0.0f : mMaxPowB);
}
f32 getMaxPowF() {
if (mMaxPowF > 1.0f) {
return 1.0f;
} else if (mMaxPowF < 0.0f) {
return 0.0f;
} else {
return mMaxPowF;
}
return (mMaxPowF > 1.0f) ? 1.0f : (mMaxPowF < 0.0f ? 0.0f : mMaxPowF);
}
s8 getPosCount() { return mPosCount; }
/* 0x00 */ float mVolumeScale;
/* 0x04 */ float mMaxVolume;
/* 0x08 */ float mMaxPowL;
libs/Z2AudioLib/Z2EnvSeMgr.cpp
+1714 -168
View File
File diff suppressed because it is too large Load Diff
libs/Z2AudioLib/Z2SeMgr.cpp
+2 -2
View File
@@ -1338,7 +1338,7 @@ void Z2MultiSeMgr::resetMultiSePos(void) {
/* 802AECE0-802AEDC0 2A9620 00E0+00 1/1 8/8 0/0 .text getPanPower__12Z2MultiSeMgrFv */
#ifdef NONMATCHING
// regalloc
// Matches with literals
f32 Z2MultiSeMgr::getPanPower() {
f32 pow_r = getMaxPowR();
f32 pow_l = getMaxPowL();
@@ -1363,7 +1363,7 @@ asm f32 Z2MultiSeMgr::getPanPower() {
/* 802AEDC0-802AEEA0 2A9700 00E0+00 1/1 8/8 0/0 .text getDolbyPower__12Z2MultiSeMgrFv */
#ifdef NONMATCHING
// regalloc
// Matches with literals
f32 Z2MultiSeMgr::getDolbyPower() {
f32 pow_b = getMaxPowB();
f32 pow_f = getMaxPowF();
libs/Z2AudioLib/Z2SeqMgr.cpp
+12 -3
View File
@@ -1087,11 +1087,11 @@ asm void Z2SeqMgr::subBgmStopInner() {
#endif
/* 802AFB94-802AFDEC 2AA4D4 0258+00 1/1 3/3 46/46 .text bgmStreamPrepare__8Z2SeqMgrFUl */
// Matches with literals
#ifdef NONMATCHING
// regalloc
void Z2SeqMgr::bgmStreamPrepare(u32 i_bgmID) {
if (mStreamBgmHandle) {
mStreamBgmHandle->stop(0);
bgmStreamStop(0);
}
Z2GetSoundMgr()->startSound(i_bgmID, &mStreamBgmHandle, NULL);
mStreamBgmHandle->lockWhenPrepared();
@@ -2864,6 +2864,7 @@ asm void Z2SeqMgr::battleBgmFramework() {
#endif
/* 802B4EB0-802B5204 2AF7F0 0354+00 1/1 0/0 0/0 .text startBattleBgm__8Z2SeqMgrFb */
// Matches with literals
#ifdef NONMATCHING
void Z2SeqMgr::startBattleBgm(bool i_fade) {
if (!mFlags.mBattleBgmOff && Z2GetSceneMgr()->isSceneExist()
@@ -2873,7 +2874,8 @@ void Z2SeqMgr::startBattleBgm(bool i_fade) {
if (Z2GetSceneMgr()->isInDarkness() || Z2GetSoundObjMgr()->isTwilightBattle()) {
bgm_id = Z2BGM_BATTLE_TWILIGHT;
}
if (getSubBgmID() != bgm_id) {
u32 subBgmID = getSubBgmID();
if (subBgmID != bgm_id) {
mBattleSeqState = 1;
if (Z2GetSoundMgr()->startSound(bgm_id, &mSubBgmHandle, NULL)) {
Z2GetSoundObjMgr()->setBattleInit();
@@ -3099,6 +3101,7 @@ SECTION_DATA static void* lit_6877[21] = {
};
/* 802B594C-802B5E80 2B028C 0534+00 2/1 0/0 0/0 .text fieldBgmFramework__8Z2SeqMgrFv */
// Switch table needs to be verified
#ifdef NONMATCHING
void Z2SeqMgr::fieldBgmFramework() {
if (Z2GetSceneMgr()->isSceneExist() && !Z2GetSceneMgr()->isInDarkness()
@@ -3158,6 +3161,12 @@ void Z2SeqMgr::fieldBgmFramework() {
case 4:
changeBgmStatus(5);
break;
case 0:
case 1:
case 5:
case 7:
case 19:
case 20:
default:
changeBgmStatus(4);
break;