mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-08-15 20:59:53 -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/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