Cleanup, comments, and names for enemy ice/fire

This commit is contained in:
LagoLunatic
2023-10-10 19:51:20 -04:00
parent 888bb95051
commit 25791037b5
2 changed files with 154 additions and 136 deletions
+12 -12
View File
@@ -18,7 +18,7 @@ public:
/* 0x00C */ s8 m00C;
/* 0x00D */ s8 mState;
/* 0x00E */ s16 mFreezeTimer;
/* 0x010 */ s16 m010;
/* 0x010 */ s16 mMoveDelayTimer;
/* 0x012 */ s16 mAngleY;
/* 0x014 */ s16 mAngularVelY;
/* 0x016 */ u8 m016[0x018 - 0x016];
@@ -44,22 +44,22 @@ STATIC_ASSERT(sizeof(enemyice) == 0x3B8);
struct enemyfire {
public:
/* 0x000 */ fopAc_ac_c* mpActor;
/* 0x004 */ s16 m004;
/* 0x006 */ s8 m006;
/* 0x004 */ s16 mFireDuration;
/* 0x006 */ s8 mState;
/* 0x007 */ u8 m007[0x008 - 0x007];
/* 0x008 */ s16 m008;
/* 0x008 */ s16 mFireTimer;
/* 0x00A */ u8 m00A[0x00C - 0x00A];
/* 0x00C */ mDoExt_McaMorf* mpMcaMorf;
/* 0x010 */ s8 m010[10];
/* 0x010 */ s8 mFlameJntIdxs[10];
/* 0x01A */ u8 m01A[0x01C - 0x01A];
/* 0x01C */ f32 m01C[10];
/* 0x044 */ s16 m044[10];
/* 0x058 */ JPABaseEmitter* mpFireEmitters[10];
/* 0x080 */ cXyz m080;
/* 0x08C */ JGeometry::TVec3<f32> m08C;
/* 0x098 */ f32 m098;
/* 0x01C */ f32 mParticleScale[10];
/* 0x044 */ s16 mFlameTimers[10];
/* 0x058 */ JPABaseEmitter* mpFlameEmitters[10];
/* 0x080 */ cXyz mPrevPos;
/* 0x08C */ JGeometry::TVec3<f32> mDirection;
/* 0x098 */ f32 mFlameScaleY;
/* 0x09C */ u8 m09C[0x09D - 0x09C];
/* 0x09D */ u8 m09D;
/* 0x09D */ u8 mHitboxFlameIdx;
/* 0x09E */ u8 m09E[0x0A0 - 0x09E];
/* 0x0A0 */ dCcD_Stts mStts;
/* 0x0DC */ dCcD_Sph mSph;