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

CScriptSpecialFunction progress & symbol updates

Browse Source 
Former-commit-id: 84d590be2f
This commit is contained in:
Luke Street
2022-10-04 20:16:03 -04:00
parent c8528fc2ee
commit e7ecda7a36
20 changed files with 234 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -115,11 +115,11 @@ private:
bool x1e5_24_doSave : 1;
bool x1e5_25_playerInArea : 1;
bool x1e5_26_displayBillboard : 1;
rstl::optional_object< CToken > x1e8_; // CTexture?
rstl::optional_object< CToken > x1e8_;
public:
CScriptSpecialFunction(TUniqueId, const rstl::string&, const CEntityInfo&, const CTransform4f&,
ESpecialFunction, const rstl::string&, float, float, float, float,
const CVector3f&, const CColor&, bool, const CDamageInfo&, s32, s32,
const CVector3f&, const CColor&, bool, const CDamageInfo&, int, int,
CPlayerState::EItemType, u16, u16, u16);
void Accept(IVisitor& visitor) override;
@@ -148,7 +148,7 @@ public:
void DeleteEmitter(CSfxHandle& handle);
int GetSpecialEnding(const CStateManager&) const;
void AddOrUpdateEmitter(float pitch, CSfxHandle& handle, u16 id, const CVector3f& pos, uchar vol);
void AddOrUpdateEmitter(float pitch, CSfxHandle& handle, u16 id, CVector3f pos, u8 vol);
};
#endif _CSCRIPTSPECIALFUNCTION_HPP