mirror of
https://github.com/zeldaret/ss
synced 2026-09-07 19:11:02 -04:00
mField -> field
This commit is contained in:
elijah-thomas774
@@ -80,13 +80,13 @@ public:
|
||||
/* 0x1A4 */ f32 mCullingDistance;
|
||||
/* 0x1A8 */ f32 field_0x1A8;
|
||||
/* 0x1AC */ u32 mObjectActorFlags;
|
||||
/* 0x1B0 */ f32 mField_0x1B0;
|
||||
/* 0x1B4 */ mVec3_c mField_0x1B4;
|
||||
/* 0x1B0 */ f32 field_0x1B0;
|
||||
/* 0x1B4 */ mVec3_c field_0x1B4;
|
||||
/* 0x1C0 */ cCcD_Stts mStts;
|
||||
/* 0x1FC */ mVec3_c mStartingPos;
|
||||
/* 0x208 */ mAng3_c mStartingRot;
|
||||
/* 0x210 */ dLinkage_c mLinkage;
|
||||
/* 0x2B8 */ u32 mField_0x2B8;
|
||||
/* 0x2B8 */ u32 field_0x2B8;
|
||||
/* 0x2BC */ ActorLighting mLightingInfo;
|
||||
/* 0x32C */ dSalvageIf_c *mpSalvageIf;
|
||||
|
||||
|
||||
@@ -51,8 +51,8 @@ private:
|
||||
/* 0x364 */ dBgW mBgW;
|
||||
/* 0x574 */ dCcD_Cyl *mCyl;
|
||||
/* 0x578 */ u32 mSubtype;
|
||||
/* 0x57C */ u16 mField_0x57C;
|
||||
/* 0x57E */ u16 mField_0x57E;
|
||||
/* 0x57C */ u16 field_0x57C;
|
||||
/* 0x57E */ u16 field_0x57E;
|
||||
|
||||
struct SubtypeData {
|
||||
s32 mSubtype;
|
||||
|
||||
@@ -18,10 +18,10 @@
|
||||
// This may need its own file and could be independent of a bomb
|
||||
class UnkBombColInfo : public cBgS_PolyInfo {
|
||||
public:
|
||||
UnkBombColInfo() : mField_0x10(0), mField_0x14(0), mField_0x18(0) {}
|
||||
u32 mField_0x10;
|
||||
u32 mField_0x14;
|
||||
u32 mField_0x18;
|
||||
UnkBombColInfo() : field_0x10(0), field_0x14(0), field_0x18(0) {}
|
||||
u32 field_0x10;
|
||||
u32 field_0x14;
|
||||
u32 field_0x18;
|
||||
};
|
||||
|
||||
class dAcBomb_c : public dAcObjBase_c {
|
||||
@@ -70,9 +70,9 @@ public:
|
||||
/* 0xA08 */ EffectsStruct mEffect2;
|
||||
/* 0xA3C */ u32 field_0xA3C;
|
||||
/* 0xA40 */ u32 field_0xA40;
|
||||
/* 0xA44 */ s16 mField_0xA44;
|
||||
/* 0xA44 */ s16 field_0xA44;
|
||||
/* 0xA46 */ u8 _3[0xA50 - 0xA46];
|
||||
/* 0xA50 */ f32 mField_0xA50;
|
||||
/* 0xA50 */ f32 field_0xA50;
|
||||
/* 0xA54 */ u8 _4[0xA9C - 0xA54];
|
||||
/* 0xA9C */ STATE_MGR_DECLARE(dAcBomb_c);
|
||||
};
|
||||
|
||||
@@ -63,7 +63,7 @@ private:
|
||||
/* 0x5D0 */ STATE_MGR_DECLARE(dAcOChest_c);
|
||||
/* 0x60C */ ActorEventRelated mEvent;
|
||||
/* 0x65C */ bool mGaveItem;
|
||||
/* 0x65D */ bool mField_0x65D;
|
||||
/* 0x65D */ bool field_0x65D;
|
||||
/* 0x65E */ bool mHasInsideModel;
|
||||
/* 0x65F */ bool mIsLinksCloset;
|
||||
/* 0x660 */ DowsingTarget mDowsingTarget;
|
||||
|
||||
@@ -12,12 +12,13 @@
|
||||
#include "m/m_vec.h"
|
||||
#include "s/s_State.hpp"
|
||||
#include "toBeSorted/actor_event.h"
|
||||
#include "toBeSorted/d_path.h"
|
||||
#include "toBeSorted/attention.h"
|
||||
#include "toBeSorted/d_path.h"
|
||||
|
||||
|
||||
class dAcOivyRope_c : public dAcObjBase_c {
|
||||
public:
|
||||
dAcOivyRope_c() : mField_0x330(0), mStateMgr(*this, sStateID::null), mStts2(this), mEvent(*this, nullptr) {}
|
||||
dAcOivyRope_c() : field_0x330(0), mStateMgr(*this, sStateID::null), mStts2(this), mEvent(*this, nullptr) {}
|
||||
virtual ~dAcOivyRope_c();
|
||||
|
||||
virtual int create() override;
|
||||
@@ -140,7 +141,7 @@ public:
|
||||
}
|
||||
|
||||
private:
|
||||
/* 0x 330 */ UNKWORD mField_0x330;
|
||||
/* 0x 330 */ UNKWORD field_0x330;
|
||||
/* 0x 334 */ m3d::smdl_c mMdlArr[2];
|
||||
/* 0x 36C */ dShadowCircle_c mShadow;
|
||||
/* 0x 374 */ dCcD_Sph mSph;
|
||||
@@ -158,91 +159,91 @@ private:
|
||||
/* 0x ED0 */ ActorEventRelated mEvent;
|
||||
/* 0x F20 */ mVec3_c mTightropeEnd;
|
||||
/* 0x F2C */ mVec3_c mTightropeStart;
|
||||
/* 0x F38 */ mVec3_c mField_0xF38;
|
||||
/* 0x F44 */ mVec3_c mField_0xF44;
|
||||
/* 0x F50 */ mVec3_c mField_0xF50;
|
||||
/* 0x F38 */ mVec3_c field_0xF38;
|
||||
/* 0x F44 */ mVec3_c field_0xF44;
|
||||
/* 0x F50 */ mVec3_c field_0xF50;
|
||||
/* 0x F5C */ u8 _F5C[0xF68 - 0xF5C];
|
||||
/* 0x F68 */ mVec3_c mField_0xF68;
|
||||
/* 0x F68 */ mVec3_c field_0xF68;
|
||||
/* 0x F74 */ u8 _F74[0xFA4 - 0xF74];
|
||||
/* 0x FA4 */ f32 mField_0xFA4;
|
||||
/* 0x FA8 */ f32 mField_0xFA8;
|
||||
/* 0x FAC */ f32 mField_0xFAC;
|
||||
/* 0x FB0 */ f32 mField_0xFB0;
|
||||
/* 0x FB4 */ f32 mField_0xFB4;
|
||||
/* 0x FA4 */ f32 field_0xFA4;
|
||||
/* 0x FA8 */ f32 field_0xFA8;
|
||||
/* 0x FAC */ f32 field_0xFAC;
|
||||
/* 0x FB0 */ f32 field_0xFB0;
|
||||
/* 0x FB4 */ f32 field_0xFB4;
|
||||
/* 0x FB8 */ f32 mDistance;
|
||||
/* 0x FBC */ f32 mOldDistance;
|
||||
/* 0x FC0 */ UNKWORD mField_0xFC0;
|
||||
/* 0x FC4 */ f32 mField_0xFC4;
|
||||
/* 0x FC8 */ UNKWORD mField_0xFC8;
|
||||
/* 0x FCC */ mAng mField_0xFCC;
|
||||
/* 0x FCE */ u16 mField_0xFCE;
|
||||
/* 0x FC0 */ UNKWORD field_0xFC0;
|
||||
/* 0x FC4 */ f32 field_0xFC4;
|
||||
/* 0x FC8 */ UNKWORD field_0xFC8;
|
||||
/* 0x FCC */ mAng field_0xFCC;
|
||||
/* 0x FCE */ u16 field_0xFCE;
|
||||
/* 0x FD0 */ u8 _FD0[0xFD2 - 0xFD0];
|
||||
/* 0x FD2 */ s16 mField_0xFD2;
|
||||
/* 0x FD4 */ s16 mField_0xFD4;
|
||||
/* 0x FD6 */ s16 mField_0xFD6;
|
||||
/* 0x FD8 */ s16 mField_0xFD8;
|
||||
/* 0x FDA */ mAng mField_0xFDA;
|
||||
/* 0x FDC */ s16 mField_0xFDC;
|
||||
/* 0x FD2 */ s16 field_0xFD2;
|
||||
/* 0x FD4 */ s16 field_0xFD4;
|
||||
/* 0x FD6 */ s16 field_0xFD6;
|
||||
/* 0x FD8 */ s16 field_0xFD8;
|
||||
/* 0x FDA */ mAng field_0xFDA;
|
||||
/* 0x FDC */ s16 field_0xFDC;
|
||||
/* 0x FDA */ u8 _FDE[0xFE2 - 0xFDE];
|
||||
/* 0x FE2 */ s16 mField_0xFE2;
|
||||
/* 0x FE2 */ s16 field_0xFE2;
|
||||
/* 0x FE4 */ u8 mDropsceneFlag;
|
||||
/* 0x FE5 */ u8 mWoodTagSceneflag;
|
||||
/* 0x FE6 */ u8 mSegmentCount;
|
||||
/* 0x FE7 */ u8 mSubtype;
|
||||
/* 0x FE8 */ bool mbField_0xFE8;
|
||||
/* 0x FE9 */ u8 mField_0xFE9;
|
||||
/* 0x FEA */ u8 mField_0xFEA;
|
||||
/* 0x FEB */ u8 mField_0xFEB;
|
||||
/* 0x FEC */ u8 mField_0xFEC;
|
||||
/* 0x FE9 */ u8 field_0xFE9;
|
||||
/* 0x FEA */ u8 field_0xFEA;
|
||||
/* 0x FEB */ u8 field_0xFEB;
|
||||
/* 0x FEC */ u8 field_0xFEC;
|
||||
/* 0x FED */ u8 mEventIdx;
|
||||
/* 0x FEE */ u8 mField_0xFEE;
|
||||
/* 0x FEF */ u8 mField_0xFEF;
|
||||
/* 0x FF0 */ u8 mField_0xFF0[4];
|
||||
/* 0x FF4 */ u8 mField_0xFF4;
|
||||
/* 0x FF5 */ u8 mField_0xFF5;
|
||||
/* 0x FF6 */ u8 mField_0xFF6;
|
||||
/* 0x FF7 */ u8 mField_0xFF7;
|
||||
/* 0x FF8 */ u8 mField_0xFF8;
|
||||
/* 0x FEE */ u8 field_0xFEE;
|
||||
/* 0x FEF */ u8 field_0xFEF;
|
||||
/* 0x FF0 */ u8 field_0xFF0[4];
|
||||
/* 0x FF4 */ u8 field_0xFF4;
|
||||
/* 0x FF5 */ u8 field_0xFF5;
|
||||
/* 0x FF6 */ u8 field_0xFF6;
|
||||
/* 0x FF7 */ u8 field_0xFF7;
|
||||
/* 0x FF8 */ u8 field_0xFF8;
|
||||
/* 0x FF9 */ u8 _FF9[0x1005 - 0xFF9];
|
||||
/* 0x1005 */ u8 mField_0x1005;
|
||||
/* 0x1005 */ u8 field_0x1005;
|
||||
/* 0x1006 */ u8 _1006[0x1010 - 0x1006];
|
||||
/* 0x1010 */ mVec3_c mField_0x1010;
|
||||
/* 0x101C */ mVec3_c mField_0x101C;
|
||||
/* 0x1028 */ f32 mField_0x1028;
|
||||
/* 0x102C */ f32 mField_0x102C;
|
||||
/* 0x1030 */ mAng mField_0x1030;
|
||||
/* 0x1032 */ mAng mField_0x1032;
|
||||
/* 0x1010 */ mVec3_c field_0x1010;
|
||||
/* 0x101C */ mVec3_c field_0x101C;
|
||||
/* 0x1028 */ f32 field_0x1028;
|
||||
/* 0x102C */ f32 field_0x102C;
|
||||
/* 0x1030 */ mAng field_0x1030;
|
||||
/* 0x1032 */ mAng field_0x1032;
|
||||
/* 0x1034 */ u8 _1034[0x1038 - 0x1034];
|
||||
/* 0x1038 */ u8 mField_0x1038;
|
||||
/* 0x1039 */ u8 mField_0x1039; // TODO make field enum
|
||||
/* 0x103A */ s8 mField_0x103A;
|
||||
/* 0x103B */ u8 mField_0x103B;
|
||||
/* 0x103C */ u8 mField_0x103C;
|
||||
/* 0x103D */ u8 mField_0x103D;
|
||||
/* 0x1038 */ u8 field_0x1038;
|
||||
/* 0x1039 */ u8 field_0x1039; // TODO make field enum
|
||||
/* 0x103A */ s8 field_0x103A;
|
||||
/* 0x103B */ u8 field_0x103B;
|
||||
/* 0x103C */ u8 field_0x103C;
|
||||
/* 0x103D */ u8 field_0x103D;
|
||||
/* 0x103E */ bool mDropped;
|
||||
/* 0x1040 */ f32 mField_0x1040;
|
||||
/* 0x1040 */ f32 field_0x1040;
|
||||
/* 0x1044 */ u8 _1044[0x1050 - 0x1044];
|
||||
/* 0x1050 */ f32 mField_0x1050;
|
||||
/* 0x1050 */ f32 field_0x1050;
|
||||
/* 0x1054 */ u8 _1054[0x105E - 0x1054];
|
||||
/* 0x105E */ u8 mField_0x105E;
|
||||
/* 0x105F */ u8 mField_0x105F;
|
||||
/* 0x1060 */ u8 mField_0x1060;
|
||||
/* 0x1061 */ u8 mField_0x1061;
|
||||
/* 0x1062 */ u8 mField_0x1062;
|
||||
/* 0x1064 */ f32 mField_0x1064;
|
||||
/* 0x1068 */ f32 mField_0x1068;
|
||||
/* 0x106C */ f32 mField_0x106C;
|
||||
/* 0x105E */ u8 field_0x105E;
|
||||
/* 0x105F */ u8 field_0x105F;
|
||||
/* 0x1060 */ u8 field_0x1060;
|
||||
/* 0x1061 */ u8 field_0x1061;
|
||||
/* 0x1062 */ u8 field_0x1062;
|
||||
/* 0x1064 */ f32 field_0x1064;
|
||||
/* 0x1068 */ f32 field_0x1068;
|
||||
/* 0x106C */ f32 field_0x106C;
|
||||
/* 0x1070 */ u8 _1070[0x1083 - 0x1070];
|
||||
/* 0x1083 */ u8 mField_0x1083;
|
||||
/* 0x1083 */ u8 field_0x1083;
|
||||
/* 0x1084 */ u8 _1084[0x1088 - 0x1084];
|
||||
/* 0x1088 */ dCcD_Cps mCpsArr2[16];
|
||||
/* 0x2788 */ mVec3_c *mPnts1;
|
||||
/* 0x278C */ mVec3_c *mPnts2;
|
||||
/* 0x2790 */ u16 mField_0x2790;
|
||||
/* 0x2792 */ u8 mField_0x2792;
|
||||
/* 0x2790 */ u16 field_0x2790;
|
||||
/* 0x2792 */ u8 field_0x2792;
|
||||
/* 0x2793 */ bool mbField_0x2793;
|
||||
/* 0x2794 */ u8 _2794[0x27C0 - 0x2794];
|
||||
/* 0x27C0 */ f32 mField_0x27C0;
|
||||
/* 0x27C0 */ f32 field_0x27C0;
|
||||
/* 0x27C4 */ bool mbField_0x27C4;
|
||||
/* 0x27C5 */ bool mbField_0x27C5;
|
||||
|
||||
|
||||
@@ -17,13 +17,13 @@ public:
|
||||
STATE_FUNC_DECLARE(dAcOlog_c, Shake);
|
||||
|
||||
u8 getField_0xE4E() const {
|
||||
return mField_0xE4E;
|
||||
return field_0xE4E;
|
||||
}
|
||||
|
||||
private:
|
||||
// TODO: Fixup stuff
|
||||
/* 0x330 */ u8 _330[0xE4E - 0x330];
|
||||
/* 0xE4E */ u8 mField_0xE4E;
|
||||
/* 0xE4E */ u8 field_0xE4E;
|
||||
/* 0x??? */ STATE_MGR_DECLARE(dAcOlog_c);
|
||||
};
|
||||
|
||||
|
||||
@@ -56,9 +56,9 @@ private:
|
||||
/* 0x774 */ EffectsStruct mEff;
|
||||
/* 0x7A8 */ mMtx_c mSwordMtx;
|
||||
/* 0x7D8 */ mVec3_c mEffPos;
|
||||
/* 0x7E4 */ f32 mField_0x7E4;
|
||||
/* 0x7E8 */ mAng mField_0x7E8;
|
||||
/* 0x7EA */ u8 mField_0x7EA;
|
||||
/* 0x7E4 */ f32 field_0x7E4;
|
||||
/* 0x7E8 */ mAng field_0x7E8;
|
||||
/* 0x7EA */ u8 field_0x7EA;
|
||||
/* 0x7EB */ u8 mSubtype;
|
||||
/* 0x7EC */ bool mbNoSword;
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
class dAcOtubo_c : public dAcObjBase_c {
|
||||
public:
|
||||
dAcOtubo_c() : mStateMgr(*this, sStateID::null), mField_0x8F0(this) {}
|
||||
dAcOtubo_c() : mStateMgr(*this, sStateID::null), field_0x8F0(this) {}
|
||||
virtual ~dAcOtubo_c() {}
|
||||
|
||||
virtual int doDelete() override;
|
||||
@@ -90,26 +90,26 @@ private:
|
||||
/* 0x3B4 */ dBgS_ObjAcch mObjAcch;
|
||||
/* 0x764 */ dCcD_Sph mSph;
|
||||
/* 0x8B4 */ STATE_MGR_DECLARE(dAcOtubo_c);
|
||||
/* 0x8F0 */ dAcObjRef_unk mField_0x8F0;
|
||||
/* 0x8F0 */ dAcObjRef_unk field_0x8F0;
|
||||
/* 0x91C */ dWaterEffect_c mEff_0x91C;
|
||||
/* 0x964 */ dAcRef_c<dAcNpcCeLady_c> mCeLady;
|
||||
/* 0x970 */ dAcRef_c<dAcNpcCeFriend_c> mCeFriend;
|
||||
/* 0x97C */ mQuat_c mQuat_0x97C;
|
||||
/* 0x98C */ mQuat_c mQuat_0x98C;
|
||||
/* 0x99C */ mQuat_c mQuat_0x99C;
|
||||
/* 0x9AC */ mVec3_c mField_0x9AC;
|
||||
/* 0x9B8 */ mVec3_c mField_0x9B8;
|
||||
/* 0x9C4 */ mAng mField_0x9C4;
|
||||
/* 0x9C6 */ mAng mField_0x9C6;
|
||||
/* 0x9C8 */ mAng mField_0x9C8;
|
||||
/* 0x9CA */ mAng mField_0x9CA;
|
||||
/* 0x9CC */ mAng mField_0x9CC;
|
||||
/* 0x9D0 */ f32 mField_0x9D0;
|
||||
/* 0x9D4 */ f32 mField_0x9D4;
|
||||
/* 0x9D8 */ f32 mField_0x9D8;
|
||||
/* 0x9DC */ f32 mField_0x9DC;
|
||||
/* 0x9E0 */ f32 mField_0x9E0;
|
||||
/* 0x9E4 */ f32 mField_0x9E4;
|
||||
/* 0x9AC */ mVec3_c field_0x9AC;
|
||||
/* 0x9B8 */ mVec3_c field_0x9B8;
|
||||
/* 0x9C4 */ mAng field_0x9C4;
|
||||
/* 0x9C6 */ mAng field_0x9C6;
|
||||
/* 0x9C8 */ mAng field_0x9C8;
|
||||
/* 0x9CA */ mAng field_0x9CA;
|
||||
/* 0x9CC */ mAng field_0x9CC;
|
||||
/* 0x9D0 */ f32 field_0x9D0;
|
||||
/* 0x9D4 */ f32 field_0x9D4;
|
||||
/* 0x9D8 */ f32 field_0x9D8;
|
||||
/* 0x9DC */ f32 field_0x9DC;
|
||||
/* 0x9E0 */ f32 field_0x9E0;
|
||||
/* 0x9E4 */ f32 field_0x9E4;
|
||||
/* 0x9E8 */ u16 mTimer_0x9E8;
|
||||
/* 0x9EA */ bool mbMovingForward;
|
||||
/* 0x9EB */ bool mbField_0x9EB;
|
||||
@@ -123,11 +123,11 @@ private:
|
||||
/* 0x9F2 */ bool mbField_0x9F3;
|
||||
/* 0x9F4 */ u8 mTimer_0x9F4;
|
||||
/* 0x9F5 */ u8 mTimer_0x9F5;
|
||||
/* 0x9F6 */ u8 mField_0x9F6;
|
||||
/* 0x9F6 */ u8 field_0x9F6;
|
||||
/* 0x9F7 */ u8 mTimer_0x9F7;
|
||||
/* 0x9F8 */ u8 mSceneflag;
|
||||
/* 0x9F9 */ u8 mSubtype;
|
||||
/* 0x9FC */ int mField_0x9FC;
|
||||
/* 0x9FC */ int field_0x9FC;
|
||||
|
||||
static dCcD_SrcSph sSphSrc;
|
||||
};
|
||||
|
||||
@@ -68,20 +68,20 @@ private:
|
||||
/* 0x504 */ dBgS_ObjAcch mObjAcch;
|
||||
/* 0x8B4 */ DowsingTarget mDowsingTarget;
|
||||
/* 0x8D4 */ STATE_MGR_DECLARE(dAcOTumbleWeed_c);
|
||||
/* 0x910 */ mQuat_c mField_0x910;
|
||||
/* 0x910 */ mQuat_c field_0x910;
|
||||
/* 0x920 */ TimeAreaStruct mTimeArea;
|
||||
/* 0x92C */ mMtx_c mShadowMtx;
|
||||
/* 0x95C */ mVec3_c mWind;
|
||||
/* 0x968 */ mVec3_c mField_0x968;
|
||||
/* 0x974 */ f32 mField_0x974;
|
||||
/* 0x978 */ f32 mField_0x978;
|
||||
/* 0x97C */ f32 mField_0x97C;
|
||||
/* 0x980 */ f32 mField_0x980;
|
||||
/* 0x968 */ mVec3_c field_0x968;
|
||||
/* 0x974 */ f32 field_0x974;
|
||||
/* 0x978 */ f32 field_0x978;
|
||||
/* 0x97C */ f32 field_0x97C;
|
||||
/* 0x980 */ f32 field_0x980;
|
||||
/* 0x984 */ f32 mSpeedTarget;
|
||||
/* 0x988 */ u16 mTumbleTimer;
|
||||
/* 0x98A */ u8 mWindTimer;
|
||||
/* 0x98B */ u8 mField_0x98B;
|
||||
/* 0x98C */ u8 mField_0x98C;
|
||||
/* 0x98B */ u8 field_0x98B;
|
||||
/* 0x98C */ u8 field_0x98C;
|
||||
/* 0x98D */ bool mbOnGround;
|
||||
|
||||
static dCcD_SrcSph sSphSrc;
|
||||
|
||||
Reference in New Issue
Block a user