PrimeDecomp/prime
2
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2025-12-10 13:47:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Lots of stuff

Browse Source 
Former-commit-id: 39b5f3c01e
This commit is contained in:
Luke Street
2022-10-03 20:00:46 -04:00
parent 469c499a6b
commit bc202ba493
47 changed files with 701 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/MetroidPrime/ScriptObjects/CScriptSpecialFunction.hpp
View File

@@ -67,7 +67,12 @@ public:
float x4_rotateSpeed;
bool x8_reachedTarget;
CVector3f xc_;
SRingController(TUniqueId uid, float rotateSpeed, bool reachedTarget);
SRingController(TUniqueId uid, float rotateSpeed, bool reachedTarget)
: x0_id(uid)
, x4_rotateSpeed(rotateSpeed)
, x8_reachedTarget(reachedTarget)
, xc_(CVector3f::Zero()) {}
};
private:
@@ -87,7 +92,7 @@ private:
u16 x172_sfx2;
u16 x174_sfx3;
CSfxHandle x178_sfxHandle;
u32 x17c_;
uint x17c_;
float x180_;
TAverage< f32 > x184_;
float x194_;
@@ -142,7 +147,7 @@ public:
bool ShouldSkipCinematic(CStateManager& stateMgr) const;
void DeleteEmitter(CSfxHandle& handle);
u32 GetSpecialEnding(const CStateManager&) const;
int GetSpecialEnding(const CStateManager&) const;
void AddOrUpdateEmitter(float pitch, CSfxHandle& handle, u16 id, const CVector3f& pos, uchar vol);
};