mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-08-13 12:18:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

mField -> field

Browse Source
This commit is contained in:
elijah-thomas774
2025-09-16 22:30:32 -04:00
parent e3b5103cbe
commit 4894038c4e
55 changed files with 684 additions and 684 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/JParticle/JPAResource.h
+1 -1
View File
@@ -66,7 +66,7 @@ public:
/* 0x34 */ JPAKeyBlock** mpKeyBlocks;
/* 0x38 */ u16 const* mpTDB1;
/* 0x3C */ u16 mUsrIdx;
/* 0x3E */ u8 mFieldBlockNum;
/* 0x3E */ u8 fieldBlockNum;
/* 0x3F */ u8 mKeyBlockNum;
/* 0x40 */ u8 mTDB1Num;
/* 0x41 */ u8 mpCalcEmitterFuncListNum;
include/d/a/d_a_item.h
+41 -41
View File
@@ -107,7 +107,7 @@ private:
/* 0x334 */ UNKTYPE *mpMdl; // Model has its own handling system
/* 0x338 */ dShadowCircle_c mShdw;
/* 0x340 */ mVec3_c mField_0x340;
/* 0x340 */ mVec3_c field_0x340;
/* 0x34C */ nw4r::ut::Color mColorFilter;
/* 0x350 */ f32 mLightLevelMaybe;
/* 0x354 */ u8 _354[0x35C - 0x354];
@@ -129,8 +129,8 @@ private:
/* 0xAB8 */ fLiNdBa_c mNode;
/* 0xAC4 */ ActorEventRelated mEventRelated;
/* 0xB14 */ DowsingTarget mDowsingTarget;
/* 0xB34 */ dAcItem_0xB34 *mField_0xB34[2];
/* 0xB34 */ dAcItem_0xB34 *mField_0xB3C;
/* 0xB34 */ dAcItem_0xB34 *field_0xB34[2];
/* 0xB34 */ dAcItem_0xB34 *field_0xB3C;
/* 0xB40 */ UNKTYPE (dAcItem_c::*mFunc_0xB40)(UNKTYPE);
/* 0xB4C */ UNKTYPE (dAcItem_c::*mFunc_0xB4C)(UNKTYPE);
/* 0xB58 */ UNKTYPE (dAcItem_c::*mFunc_0xB58)(UNKTYPE);
@@ -165,62 +165,62 @@ private:
/* 0xCB4 */ UNKTYPE (dAcItem_c::*mFunc_0xCB4)(UNKTYPE);
/* 0xCC0 */ dAcRef_c<dAcItem_c> mItemQueuePrev;
/* 0xCCC */ dAcRef_c<dAcItem_c> mItemQueueNext;
/* 0xCD8 */ f32 mField_0xCD8;
/* 0xCD8 */ f32 field_0xCD8;
/* 0xCDC */ f32 mBaseScale;
/* 0xCE0 */ f32 mCurrentScale;
/* 0xCE4 */ f32 mField_0xCE4;
/* 0xCE8 */ f32 mField_0xCE8;
/* 0xCEC */ f32 mField_0xCEC;
/* 0xCE4 */ f32 field_0xCE4;
/* 0xCE8 */ f32 field_0xCE8;
/* 0xCEC */ f32 field_0xCEC;
/* 0xCF0 */ u8 _CF0[0xD00 - 0xCF0];
/* 0xD00 */ f32 mField_0xD00;
/* 0xD04 */ f32 mField_0xD04;
/* 0xD00 */ f32 field_0xD00;
/* 0xD04 */ f32 field_0xD04;
/* 0xD08 */ u8 _D08[0xD14 - 0xD08];
/* 0xD14 */ f32 mFreestandingOffsetH;
/* 0xD18 */ f32 mField_0xD18;
/* 0xD18 */ f32 field_0xD18;
/* 0xD1C */ int mGetItemPouchSlot;
/* 0xD20 */ int mField_0xD20;
/* 0xD20 */ int field_0xD20;
/* 0xD24 */ u8 _D24[0xD2C - 0xD24];
/* 0xD2C */ u32 mFramesInAir;
/* 0xD30 */ int mItemQuantity;
/* 0xD34 */ u32 mItemFlags;
/* 0xD38 */ mAng3_c mField_0xD38;
/* 0xD3E */ u16 mField_0xD3E;
/* 0xD38 */ mAng3_c field_0xD38;
/* 0xD3E */ u16 field_0xD3E;
/* 0xD40 */ mAng mMdlRotY;
/* 0xD42 */ s16 mField_0xD42;
/* 0xD42 */ s16 field_0xD42;
/* 0xD44 */ u16 mRealItemId;
/* 0xD46 */ s16 mDespawnTimer;
/* 0xD48 */ u8 mField_0xD48;
/* 0xD49 */ u8 mField_0xD49;
/* 0xD4A */ u8 mField_0xD4A;
/* 0xD4B */ u8 mField_0xD4B;
/* 0xD4C */ u8 mField_0xD4C;
/* 0xD4D */ u8 mField_0xD4D;
/* 0xD48 */ u8 field_0xD48;
/* 0xD49 */ u8 field_0xD49;
/* 0xD4A */ u8 field_0xD4A;
/* 0xD4B */ u8 field_0xD4B;
/* 0xD4C */ u8 field_0xD4C;
/* 0xD4D */ u8 field_0xD4D;
/* 0xD4E */ u8 mMdlScaleType;
/* 0xD4F */ u8 mbNoDespawn;
/* 0xD50 */ u8 mbNoGravity;
/* 0xD51 */ u8 mField_0xD51;
/* 0xD52 */ u8 mField_0xD52;
/* 0xD53 */ u8 mField_0xD53;
/* 0xD51 */ u8 field_0xD51;
/* 0xD52 */ u8 field_0xD52;
/* 0xD53 */ u8 field_0xD53;
/* 0xD54 */ u8 mbIsWaiting;
/* 0xD55 */ u8 mField_0xD55;
/* 0xD56 */ u8 mField_0xD56;
/* 0xD57 */ u8 mField_0xD57;
/* 0xD58 */ u8 mField_0xD58;
/* 0xD59 */ u8 mField_0xD59;
/* 0xD5A */ u8 mField_0xD5A;
/* 0xD5B */ u8 mField_0xD5B;
/* 0xD5C */ u8 mField_0xD5C;
/* 0xD55 */ u8 field_0xD55;
/* 0xD56 */ u8 field_0xD56;
/* 0xD57 */ u8 field_0xD57;
/* 0xD58 */ u8 field_0xD58;
/* 0xD59 */ u8 field_0xD59;
/* 0xD5A */ u8 field_0xD5A;
/* 0xD5B */ u8 field_0xD5B;
/* 0xD5C */ u8 field_0xD5C;
/* 0xD5D */ bool mbShowItemLighting;
/* 0xD5E */ u8 mField_0xD5E;
/* 0xD5F */ u8 mField_0xD5F;
/* 0xD60 */ u8 mField_0xD60;
/* 0xD61 */ u8 mField_0xD61;
/* 0xD62 */ u8 mField_0xD62;
/* 0xD63 */ u8 mField_0xD63;
/* 0xD64 */ u8 mField_0xD64;
/* 0xD65 */ u8 mField_0xD65;
/* 0xD66 */ u8 mField_0xD66;
/* 0xD67 */ u8 mField_0xD67;
/* 0xD5E */ u8 field_0xD5E;
/* 0xD5F */ u8 field_0xD5F;
/* 0xD60 */ u8 field_0xD60;
/* 0xD61 */ u8 field_0xD61;
/* 0xD62 */ u8 field_0xD62;
/* 0xD63 */ u8 field_0xD63;
/* 0xD64 */ u8 field_0xD64;
/* 0xD65 */ u8 field_0xD65;
/* 0xD66 */ u8 field_0xD66;
/* 0xD67 */ u8 field_0xD67;
public:
static fLiMgBa_c sItemList;
include/d/a/d_a_itembase.h
+5 -5
View File
@@ -226,13 +226,13 @@ enum SHIELD_TYPE_e {
};
struct ItemFlagStruct {
u8 mField_0x00;
u8 mField_0x01;
u8 mField_0x02;
u8 mField_0x03;
u8 field_0x00;
u8 field_0x01;
u8 field_0x02;
u8 field_0x03;
u16 mFlag;
u8 mFlagKind;
u8 mField_0x07;
u8 field_0x07;
};
class dAcItemBase_c : public dAcObjBase_c {
public:
include/d/a/obj/d_a_obj_base.h
+3 -3
View File
@@ -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;
include/d/a/obj/d_a_obj_block_underground.h
+2 -2
View File
@@ -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;
include/d/a/obj/d_a_obj_bomb.h
+6 -6
View File
@@ -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);
};
include/d/a/obj/d_a_obj_chest.h
+1 -1
View File
@@ -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;
include/d/a/obj/d_a_obj_ivy_rope.h
+64 -63
View File
@@ -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;
include/d/a/obj/d_a_obj_log.h
+2 -2
View File
@@ -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);
};
include/d/a/obj/d_a_obj_seat_sword.h
+3 -3
View File
@@ -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;
include/d/a/obj/d_a_obj_tubo.h
+17 -17
View File
@@ -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;
};
include/d/a/obj/d_a_obj_tumble_weed.h
+8 -8
View File
@@ -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;
include/d/col/bg/d_bg_s.h
+6 -6
View File
@@ -52,10 +52,10 @@ public:
check = !other->ChkSameActorPid(mObj.get());
}
if (check) {
check = !(other->mField_0x0C & mpBgW->GetField_0x20());
check = !(other->field_0x0C & mpBgW->GetField_0x20());
}
if (check) {
check = (other->mField_0x0E & mpBgW->GetField_0x22());
check = (other->field_0x0E & mpBgW->GetField_0x22());
}
return check;
}
@@ -124,8 +124,8 @@ struct dMapGradation {
struct MapSrollText_t {
/* 0x00 */ u8 _0[0x0E - 0x00];
/* 0x0E */ s16 mField_0x0E;
/* 0x10 */ s16 mField_0x10;
/* 0x0E */ s16 field_0x0E;
/* 0x10 */ s16 field_0x10;
/* 0x12 */ u8 _1[0x1C - 0x12];
};
@@ -156,8 +156,8 @@ public:
/* 0x2EFC */ dBgW_Base *mColllisionTbl[BG_ID_MAX];
/* 0x385C */ s32 mColllisionTblLen;
/* 0x3860 */ bool mInSkyKeep;
/* 0x3864 */ s32 mField_0x3864[5];
/* 0x3878 */ s32 mField_0x3878[5];
/* 0x3864 */ s32 field_0x3864[5];
/* 0x3878 */ s32 field_0x3878[5];
/* 0x388C */ MapLineList mList_0x388C;
/* 0x3894 */ dMapGradation mMapGradation;
include/d/col/bg/d_bg_s_acch.h
+23 -23
View File
@@ -16,7 +16,7 @@ class dBgS_AcchCir : public cBgS_PolyInfo {
private:
/* 0x2C */ cM3dGCir m_cir;
/* 0x40 */ f32 mWallRR;
/* 0x44 */ f32 mField_0x44;
/* 0x44 */ f32 field_0x44;
/* 0x48 */ f32 mWallH;
/* 0x4C */ f32 mWallR;
/* 0x50 */ f32 mWallHDirect;
@@ -104,9 +104,9 @@ public:
// TODO: Needs to be relocated when Known
struct dBgS_Acch_0x1A8 {
u8 mField_0x00;
mVec3_c mField_0x04;
mVec3_c mField_0x10;
u8 field_0x00;
mVec3_c field_0x04;
mVec3_c field_0x10;
dBgS_Acch_0x1A8();
@@ -153,7 +153,7 @@ public:
dBgS_Acch();
void Init() {
mField_0x394 = 0;
field_0x394 = 0;
ClrGroundAway();
ClrWallHit();
ClrGroundLanding();
@@ -527,7 +527,7 @@ public:
}
void SetField_0xD4(f32 v) {
mField_0x0D4 = v;
field_0x0D4 = v;
}
public:
@@ -541,37 +541,37 @@ public:
/* 0x064 */ cM3dGLin mLine;
/* 0x07C */ cM3dGCyl mWallCyl;
/* 0x090 */ int mBgIndex;
/* 0x094 */ void *mField_0x094;
/* 0x098 */ u32 mField_0x098;
/* 0x094 */ void *field_0x094;
/* 0x098 */ u32 field_0x098;
/* 0x09C */ dAcObjBase_c *mpMyObj;
/* 0x0A0 */ int mTblSize;
/* 0x0A4 */ dBgS_AcchCir *mpAcchCir;
/* 0x0A8 */ f32 mField_0x0A8;
/* 0x0AC */ f32 mField_0x0AC;
/* 0x0A8 */ f32 field_0x0A8;
/* 0x0AC */ f32 field_0x0AC;
/* 0x0B0 */ f32 mGroundHeight;
/* 0x0B4 */ f32 mField_0x0B4;
/* 0x0B4 */ f32 field_0x0B4;
/* 0x0B8 */ cM3dGPla mPlane_0x0B8;
/* 0x0C8 */ f32 mField_0x0C8;
/* 0x0CC */ f32 mField_0x0CC;
/* 0x0C8 */ f32 field_0x0C8;
/* 0x0CC */ f32 field_0x0CC;
/* 0x0D0 */ f32 mRoofHeight;
/* 0x0D4 */ f32 mField_0x0D4;
/* 0x0D8 */ f32 mField_0x0D8;
/* 0x0D4 */ f32 field_0x0D4;
/* 0x0D8 */ f32 field_0x0D8;
/* 0x0DC */ cBgS_PolyInfo *mpOutPolyInfo;
/* 0x0E0 */ f32 mRoofH_0x0E0;
/* 0x0E4 */ f32 mGroundH_0x0E4;
/* 0x0E8 */ f32 mField_0x0E8;
/* 0x0E8 */ f32 field_0x0E8;
/* 0x0EC */ dBgS_SphChk mSph;
/* 0x1A8 */ dBgS_Acch_0x1A8 mField_0x1A8;
/* 0x1A8 */ dBgS_Acch_0x1A8 field_0x1A8;
/* 0x1C4 */ u8 _0[0x1D0 - 0x1C4];
/* 0x1D0 */ f32 mField_0x1D0;
/* 0x1D0 */ f32 field_0x1D0;
/* 0x1D4 */ dBgS_GndChk mGnd;
/* 0x264 */ dBgS_RoofChk mRoof;
/* 0x2F4 */ f32 mField_0x2F4;
/* 0x2F4 */ f32 field_0x2F4;
/* 0x2F8 */ dBgS_WtrChk mWtr;
/* 0x390 */ u8 mField_0x390;
/* 0x394 */ s32 mField_0x394;
/* 0x398 */ mVec3_c mField_0x398;
/* 0x3A4 */ mVec3_c mField_0x3A4;
/* 0x390 */ u8 field_0x390;
/* 0x394 */ s32 field_0x394;
/* 0x398 */ mVec3_c field_0x398;
/* 0x3A4 */ mVec3_c field_0x3A4;
};
class dBgS_ObjAcch : public dBgS_Acch {
include/d/col/bg/d_bg_s_cap_poly.h
+1 -1
View File
@@ -14,7 +14,7 @@ public:
}
/* 0x40 */ cM3dGAab mBnd;
/* 0x58 */ UNKWORD mField_0x58;
/* 0x58 */ UNKWORD field_0x58;
/* 0x5C */ CaptPolyCallback mCallback;
};
#endif
include/d/col/bg/d_bg_s_poly_pass_chk.h
+4 -4
View File
@@ -43,7 +43,7 @@ public:
return mBellows;
}
bool Chk0xE() {
return mField_0xE;
return field_0xE;
}
void ClrObj() {
@@ -77,7 +77,7 @@ public:
mBellows = false;
}
void Clr0xE() {
mField_0xE = false;
field_0xE = false;
}
void SetObj() {
@@ -111,7 +111,7 @@ public:
mBellows = true;
}
void Set0xE() {
mField_0xE = true;
field_0xE = true;
}
void SetPassChkInfo(dBgS_PolyPassChk &chk);
@@ -127,7 +127,7 @@ private:
/* 0xB */ bool mClawshot;
/* 0xC */ bool mUnderwaterRoof;
/* 0xD */ bool mBellows;
/* 0xE */ bool mField_0xE;
/* 0xE */ bool field_0xE;
};
#endif
include/d/col/bg/d_bg_s_roof_chk.h
+2 -2
View File
@@ -9,7 +9,7 @@ class dBgS_RoofChk : public cBgS_PolyInfo, public cBgS_Chk, public dBgS_Chk {
public:
/* 0x6C */ mVec3_c mPos;
/* 0x78 */ f32 mNowY;
/* 0x7C */ u8 mField_0x7C;
/* 0x7C */ u8 field_0x7C;
/* 0x80 */ mVec3_c mPosCopy;
dBgS_RoofChk();
@@ -24,7 +24,7 @@ public:
void SetPos(mVec3_c const *);
void SetField_0x7C(u8 param0) {
mField_0x7C = param0;
field_0x7C = param0;
}
void SetNowY(f32 y) {
include/d/col/bg/d_bg_s_sph_chk.h
+8 -8
View File
@@ -12,18 +12,18 @@ typedef void *(*SphChk_Callback)(dBgS_SphChk *, cBgD_Vtx_t *, int, int, int, cM3
class dBgS_SphChk : public cM3dGSph, public cBgS_PolyInfo, public cBgS_Chk, public dBgS_Chk {
public:
/* 0x80 */ f32 mField_0x80;
/* 0x84 */ mVec3_c mField_0x84;
/* 0x80 */ f32 field_0x80;
/* 0x84 */ mVec3_c field_0x84;
/* 0x90 */ cM3dGAab mAabb;
/* 0xA8 */ u32 mField_0xA8;
/* 0xAC */ void *mField_0xAC;
/* 0xB0 */ u32 mField_0xB0;
/* 0xA8 */ u32 field_0xA8;
/* 0xAC */ void *field_0xAC;
/* 0xB0 */ u32 field_0xB0;
/* 0xB4 */ SphChk_Callback mCallback;
void SetInfo(int i, void *pV, int a) {
mField_0xA8 = i;
mField_0xAC = pV;
mField_0xB0 = a;
field_0xA8 = i;
field_0xAC = pV;
field_0xB0 = a;
}
dBgS_SphChk();
include/d/col/bg/d_bg_w.h
+2 -2
View File
@@ -6,8 +6,8 @@
#include "d/col/bg/d_bg_w_base.h"
#include "d/col/c/c_m3d_g_aab.h"
#include "m/m_math.h" // IWYU pragma: export
#include "rvl/MTX.h" // IWYU pragma: export
#include "rvl/MTX.h" // IWYU pragma: export
class cBgS_GrpPassChk;
class cBgS_PolyPassChk;
@@ -391,7 +391,7 @@ public:
}
private:
/* 0x1F8 */ u32 mField_0x1F8;
/* 0x1F8 */ u32 field_0x1F8;
/* 0x1FC */ dBgW_CrrFunc mpCrrFunc;
/* 0x200 */ dBgW_RideCallback mpRide_cb;
/* 0x204 */ dBgW_ArrowStickCallback mpArrowStick_cb;
include/d/col/bg/d_bg_w_base.h
+2 -2
View File
@@ -177,7 +177,7 @@ public:
mPriority = priority;
}
void SetUnkBase(u8 val) {
mField_0x18.field_0x00 = val;
field_0x18.field_0x00 = val;
}
void OnStickWall() {
field_0x24 |= 1;
@@ -217,7 +217,7 @@ public:
// private:
/* 0x08 */ cPartition mPartitionInfo;
/* 0x18 */ dBgW_Base_0x18 mField_0x18;
/* 0x18 */ dBgW_Base_0x18 field_0x18;
/* 0x20 */ u16 field_0x20;
/* 0x22 */ u16 field_0x22;
/* 0x24 */ u16 field_0x24;
include/d/col/bg/d_bg_w_sv.h
+1 -1
View File
@@ -24,7 +24,7 @@ public:
private:
/* 0x210 */ nw4r::math::VEC3 *mpVtx;
/* 0x214 */ u32 mField_0x214;
/* 0x214 */ u32 field_0x214;
};
#endif
include/d/col/c/c_bg_s_chk.h
+9 -10
View File
@@ -7,7 +7,6 @@
#include "rvl/MTX.h" // IWYU pragma: export
struct cBgD_Vtx_t : public nw4r::math::VEC3 {};
class cBgS_GrpPassChk {
@@ -23,9 +22,9 @@ public:
/* 0x00 */ cBgS_PolyPassChk *mPolyPassChk;
/* 0x04 */ cBgS_GrpPassChk *mGrpPassChk;
/* 0x08 */ u32 mActorId;
/* 0x0C */ u16 mField_0x0C;
/* 0x0E */ u16 mField_0x0E;
/* 0x10 */ u8 mField_0x10;
/* 0x0C */ u16 field_0x0C;
/* 0x0E */ u16 field_0x0E;
/* 0x10 */ u8 field_0x10;
/* 0x14 */ cPartition mPartition;
/* 0x24 */ // __vtable__
@@ -49,27 +48,27 @@ public:
int ChkSameActorPid(const fBase_c *pActor) const {
int id = pActor ? pActor->mID : 0;
if (id == 0 || mActorId == 0 || mField_0x10 == 0) {
if (id == 0 || mActorId == 0 || field_0x10 == 0) {
return false;
}
return mActorId == id ? 1 : 0;
}
bool ChkField_0xC(const dBgW_Base *pBg) const {
return mField_0x0C & pBg->GetField_0x20();
return field_0x0C & pBg->GetField_0x20();
}
bool ChkField_0xE(const dBgW_Base *pBg) const {
return mField_0x0E & pBg->GetField_0x22();
return field_0x0E & pBg->GetField_0x22();
}
void SetExtChk(const cBgS_Chk &other) {
mPolyPassChk = other.mPolyPassChk;
mGrpPassChk = other.mGrpPassChk;
mActorId = other.mActorId;
mField_0x10 = other.mField_0x10;
mField_0x0C = other.mField_0x0C;
mField_0x0E = other.mField_0x0E;
field_0x10 = other.field_0x10;
field_0x0C = other.field_0x0C;
field_0x0E = other.field_0x0E;
}
};
include/d/col/c/c_bg_s_gnd_chk.h
+3 -3
View File
@@ -10,8 +10,8 @@ public:
/* 0x54 */ mVec3_c mPos;
/* 0x60 */ f32 mNowY;
/* 0x64 */ u8 unk0x64[0x68 - 0x64];
/* 0x68 */ mVec3_c mField_0x68;
/* 0x74 */ u8 mField_0x74;
/* 0x68 */ mVec3_c field_0x68;
/* 0x74 */ u8 field_0x74;
cBgS_GndChk();
virtual ~cBgS_GndChk();
@@ -28,7 +28,7 @@ public:
return mPos;
}
void SetField_0x68(const mVec3_c &other) {
mField_0x68 = other;
field_0x68 = other;
}
// u32 GetWallPrecheck() const {
// return mWallPrecheck;
include/d/col/c/c_bg_s_lin_chk.h
+1 -1
View File
@@ -8,7 +8,7 @@
class cBgS_LinChk : public cBgS_Chk, public cBgS_PolyInfo {
public:
/* 0x54 */ cM3dGLin mLin;
/* 0x6C */ mVec3_c mField_0x6C;
/* 0x6C */ mVec3_c field_0x6C;
/* 0x78 */ bool mFrontFlag;
/* 0x79 */ bool mBackFlag;
/* 0x7A */ bool mHit;
include/d/col/c/c_bg_s_poly_info.h
+2 -2
View File
@@ -14,7 +14,7 @@ private:
/* 0x08 */ void *unk_0x04; // Collision Pointer?
/* 0x0C */ int mActorPId; // Matched the Unique Actor Id
/* 0x10 */ cM3dGPla mPla;
/* 0x20 */ mVec3_c mField_0x20;
/* 0x20 */ mVec3_c field_0x20;
public:
cBgS_PolyInfo() {
@@ -56,7 +56,7 @@ public:
}
const mVec3_c &GetField0x20() const {
return mField_0x20;
return field_0x20;
}
};
include/d/col/c/c_cc_d.h
+34 -34
View File
@@ -82,10 +82,10 @@ public:
struct Shape {
~Shape();
/* 0x00 */ int mField_0x00;
/* 0x04 */ mVec3_c mField_0x04;
/* 0x10 */ mVec3_c mField_0x10;
/* 0x1C */ mVec3_c mField_0x1C;
/* 0x00 */ int field_0x00;
/* 0x04 */ mVec3_c field_0x04;
/* 0x10 */ mVec3_c field_0x10;
/* 0x1C */ mVec3_c field_0x1C;
};
cCcD_ShapeAttr();
/* vt 0x08 */ virtual ~cCcD_ShapeAttr();
@@ -286,8 +286,8 @@ public:
/* 0x04 */ int mAtOldApid;
/* 0x08 */ int mTgApid;
/* 0x0C */ int mTgOldApid;
/* 0x10 */ mVec3_c mField_0x10;
/* 0x1C */ mVec3_c mField_0x1C;
/* 0x10 */ mVec3_c field_0x10;
/* 0x1C */ mVec3_c field_0x1C;
/* 0x28 */ mVec3_c mCcMove;
/* 0x34 */ dAcObjBase_c *mpActor;
/* 0x38 */ int mRank;
@@ -318,17 +318,17 @@ public:
};
struct cCcD_SrcGObjTgInfo {
/* 0x00 */ u8 mField_0x0;
/* 0x01 */ u8 mField_0x1;
/* 0x02 */ u16 mField_0x2;
/* 0x00 */ u8 field_0x0;
/* 0x01 */ u8 field_0x1;
/* 0x02 */ u16 field_0x2;
};
struct cCcD_SrcGObjTg {
/* 0x00 */ u32 mType;
/* 0x04 */ u32 mSPrm;
/* 0x08 */ cCcD_SrcGObjTgInfo mInfo;
/* 0x0C */ u16 mField_0x0C;
/* 0x0E */ u16 mField_0x0E;
/* 0x0C */ u16 field_0x0C;
/* 0x0E */ u16 field_0x0E;
};
enum dCcD_ObjAtType {
@@ -378,8 +378,8 @@ enum cCcD_AtModifiers_e {
/* 0x 0000 0400 */ AT_MOD_CURSED = (1 << 10),
};
struct cCcD_SrcGObjAtInfo {
/* 0x00 */ u8 mField_0x0;
/* 0x01 */ u8 mField_0x1;
/* 0x00 */ u8 field_0x0;
/* 0x01 */ u8 field_0x1;
/* 0x02 */ u16 mModifier;
};
@@ -392,11 +392,11 @@ struct cCcD_SrcGObjAt {
/* 0x04 */ u32 mSPrm;
/* 0x08 */ cCcD_SrcGObjAtInfo mInfo;
/* 0x0C */ u8 mDamage;
/* 0x0D */ u8 mField_0xD;
/* 0x0E */ u8 mField_0xE;
/* 0x0F */ u8 mField_0xF;
/* 0x10 */ u16 mField_0x10;
/* 0x12 */ s16 mField_0x12;
/* 0x0D */ u8 field_0xD;
/* 0x0E */ u8 field_0xE;
/* 0x0F */ u8 field_0xF;
/* 0x10 */ u16 field_0x10;
/* 0x12 */ s16 field_0x12;
};
struct cCcD_SrcGObjCo {
@@ -567,7 +567,7 @@ public:
/* 0x30 */ mVec3_c mHitPos;
/* 0x3C */ mVec3_c mVec;
/* 0x48 */ cCcD_SrcGObjTg mTgHitSrc;
/* 0x58 */ cCcD_HitCallback mField_0x58;
/* 0x58 */ cCcD_HitCallback field_0x58;
};
class cCcD_ObjTg : public cCcD_GAtTgCoCommonBase {
@@ -589,11 +589,11 @@ public:
}
void SetFlag_0xA(u16 flag) {
mSrc.mField_0x0E = flag;
mSrc.field_0x0E = flag;
}
u16 GetFlag_0xA(u16 mask) const {
return mSrc.mField_0x0E & mask;
return mSrc.field_0x0E & mask;
}
void ClrSet() {
OffSPrm(1);
@@ -603,7 +603,7 @@ public:
}
void Set_0x4C(u32 f) {
mField_0x4C = f;
field_0x4C = f;
}
u32 MskType(u32 mask) const {
@@ -654,15 +654,15 @@ public:
}
void Set_0x4B(u8 val) {
mField_0x4B = val;
field_0x4B = val;
}
void SetInfo_0x1(u8 val) {
mSrc.mInfo.mField_0x1 = val;
mSrc.mInfo.field_0x1 = val;
}
void SetInfo_0x2(u16 val) {
mSrc.mInfo.mField_0x2 = val;
mSrc.mInfo.field_0x2 = val;
}
public:
@@ -671,14 +671,14 @@ public:
/* 0x38 */ mVec3_c mHitPos;
/* 0x44 */ s16 *mShieldFrontRangeYAngle;
/* 0x48 */ s16 mShieldRange;
/* 0x4A */ u8 mField_0x4A;
/* 0x4B */ u8 mField_0x4B;
/* 0x4C */ u32 mField_0x4C;
/* 0x50 */ u32 mField_0x50;
/* 0x54 */ cCcD_ShieldChkCallback mField_0x54;
/* 0x4A */ u8 field_0x4A;
/* 0x4B */ u8 field_0x4B;
/* 0x4C */ u32 field_0x4C;
/* 0x50 */ u32 field_0x50;
/* 0x54 */ cCcD_ShieldChkCallback field_0x54;
/* 0x58 */ cCcD_SrcGObjAt mAtHitSrc;
/* 0x6C */ mVec3_c mField_0x6C;
/* 0x78 */ cCcD_HitCallback mField_0x78;
/* 0x6C */ mVec3_c field_0x6C;
/* 0x78 */ cCcD_HitCallback field_0x78;
};
class cCcD_ObjCo : public cCcD_GAtTgCoCommonBase {
@@ -719,7 +719,7 @@ public:
/* 0x1C */ cCcD_SrcGObjCo mSrc;
/* 0x20 */ u32 mGrp;
/* 0x24 */ cCcD_SrcGObjCo mCoHitSrc;
/* 0x28 */ cCcD_HitCallback mField_0x28_callback;
/* 0x28 */ cCcD_HitCallback field_0x28_callback;
};
// Maybe ?
@@ -736,7 +736,7 @@ public:
/* 0x05C */ cCcD_ObjTg mTg;
/* 0x0D8 */ cCcD_ObjCo mCo;
/* 0x104 */ cCcD_Stts *mStts;
/* 0x108 */ u32 mField_0x108;
/* 0x108 */ u32 field_0x108;
public:
cCcD_Obj();
include/d/col/c/c_m3d_g_cps.h
+2 -2
View File
@@ -9,8 +9,8 @@
class cM3dGCps : public cM3dGLin {
public:
/* 0x18 */ f32 mRadius;
/* 0x1C */ f32 mField_0x1C;
/* 0x20 */ u8 mField_0x20;
/* 0x1C */ f32 field_0x1C;
/* 0x20 */ u8 field_0x20;
/* 0x24 */ u32 mFlags;
cM3dGCps();
include/d/col/c/c_m3d_g_unk.h
+5 -5
View File
@@ -18,12 +18,12 @@ public:
/* 0x60 */ mVec3_c mMin;
/* 0x6C */ mVec3_c mMax;
/* 0x78 */ cM3dGLin mLin;
/* 0x90 */ mVec3_c mField_0x90;
/* 0x9C */ mVec3_c mField_0x9C;
/* 0xA8 */ mVec3_c mField_0xA8;
/* 0xB4 */ u32 mField_0xB4;
/* 0x90 */ mVec3_c field_0x90;
/* 0x9C */ mVec3_c field_0x9C;
/* 0xA8 */ mVec3_c field_0xA8;
/* 0xB4 */ u32 field_0xB4;
/* 0xB8 */ mVec3_c mVirtCenter;
/* 0xC4 */ f32 mField_0xC4;
/* 0xC4 */ f32 field_0xC4;
cM3dGUnk();
include/d/d_rope_model.h
+4 -4
View File
@@ -15,12 +15,12 @@ public:
class dSkinMat_c : public m3d::blineMat_c {
public:
dSkinMat_c() : mField_0x4C(-1), mField_0x50(0xFF), mField_0x54(0xFF) {}
dSkinMat_c() : field_0x4C(-1), field_0x50(0xFF), field_0x54(0xFF) {}
virtual void setupGX(bool bTransparent) override;
/* 0x4C */ s32 mField_0x4C;
/* 0x50 */ s32 mField_0x50;
/* 0x54 */ s32 mField_0x54;
/* 0x4C */ s32 field_0x4C;
/* 0x50 */ s32 field_0x50;
/* 0x54 */ s32 field_0x54;
};
#endif