m_Do / d_a_npc work

This commit is contained in:
TakaRikka
2022-06-01 03:49:32 -07:00
parent 36e62e0b80
commit 3f22fa4483
63 changed files with 925 additions and 963 deletions
+1 -1
View File
@@ -91,7 +91,7 @@ public:
u32 ChkGrpInf(cBgS_PolyInfo const&, u32);
s32 GetRoomId(cBgS_PolyInfo const&);
bool GetPolyAttackThrough(cBgS_PolyInfo const&);
bool ChkPolyHSStick(cBgS_PolyInfo const&);
u32 ChkPolyHSStick(cBgS_PolyInfo const&);
void WallCorrect(dBgS_Acch*);
void WallCorrectSort(dBgS_Acch*);
f32 RoofChk(dBgS_RoofChk*);
+3
View File
@@ -180,6 +180,9 @@ public:
};
class dBgS_LinkAcch : public dBgS_Acch {
public:
dBgS_LinkAcch() { SetLink(); }
/* 80140F30 */ virtual ~dBgS_LinkAcch();
};
+1
View File
@@ -13,6 +13,7 @@ public:
class dBgS_LinkGndChk : public dBgS_GndChk {
public:
dBgS_LinkGndChk() { SetLink(); }
/* 80140EB8 */ virtual ~dBgS_LinkGndChk();
};
+3 -1
View File
@@ -8,7 +8,8 @@ class dBgS_GrpPassChk : public cBgS_GrpPassChk {
public:
enum {
/* 0x1 */ NORMAL_GRP = 1,
/* 0x2 */ WATER_GRP
/* 0x2 */ WATER_GRP,
/* 0x3 */ FULL_GRP
};
/* 80077BA0 */ dBgS_GrpPassChk();
@@ -19,6 +20,7 @@ public:
void OnSpl() { mGrp |= WATER_GRP; }
void OnNormalGrp() { mGrp |= NORMAL_GRP; }
void OffNormalGrp() { mGrp &= ~NORMAL_GRP; }
void OffFullGrp() { mGrp &= ~FULL_GRP; }
private:
/* 0x4 */ u32 mGrp;
+2 -1
View File
@@ -24,8 +24,9 @@ private:
/* 0x4C */ f32 mNowY;
}; // Size: 0x50
class dBgS_LinkRoofChk : dBgS_RoofChk {
class dBgS_LinkRoofChk : public dBgS_RoofChk {
public:
dBgS_LinkRoofChk() { SetLink(); }
/* 80140E40 */ virtual ~dBgS_LinkRoofChk();
};
+2 -2
View File
@@ -117,7 +117,7 @@ public:
virtual void GetPolyCamThrough(int) = 0;
virtual void GetPolyLinkThrough(int) = 0;
virtual void GetPolyArrowThrough(int) = 0;
virtual bool GetPolyHSStick(int) = 0;
virtual u32 GetPolyHSStick(int) = 0;
virtual void GetPolyBoomerangThrough(int) = 0;
virtual void GetPolyRopeThrough(int) = 0;
virtual void GetPolyBombThrough(int) = 0;
@@ -216,7 +216,7 @@ public:
/* 8007B504 */ virtual void GetPolyCamThrough(int);
/* 8007B52C */ virtual void GetPolyLinkThrough(int);
/* 8007B550 */ virtual void GetPolyArrowThrough(int);
/* 8007B574 */ virtual bool GetPolyHSStick(int);
/* 8007B574 */ virtual u32 GetPolyHSStick(int);
/* 8007B598 */ virtual void GetPolyBoomerangThrough(int);
/* 8007B5BC */ virtual void GetPolyRopeThrough(int);
/* 8007B5E0 */ virtual void GetPolyBombThrough(int);
+2 -1
View File
@@ -57,7 +57,7 @@ public:
virtual void GetPolyCamThrough(int) = 0;
virtual void GetPolyLinkThrough(int) = 0;
virtual void GetPolyArrowThrough(int) = 0;
virtual bool GetPolyHSStick(int) = 0;
virtual u32 GetPolyHSStick(int) = 0;
virtual void GetPolyBoomerangThrough(int) = 0;
virtual void GetPolyRopeThrough(int) = 0;
virtual void GetPolyBombThrough(int) = 0;
@@ -88,6 +88,7 @@ public:
u8 GetRoomId() { return m_roomId; }
bool chkStickWall() { return field_0xb & 1; }
bool chkStickRoof() { return field_0xb & 2; }
bool ChkPushPullOk() const { return m_pushPull_Ok; }
private:
/* 0x08 */ u8 m_priority;
+1 -1
View File
@@ -53,7 +53,7 @@ public:
/* 80082B98 */ virtual void GetPolyCamThrough(int);
/* 80082BC4 */ virtual void GetPolyLinkThrough(int);
/* 80082BF0 */ virtual void GetPolyArrowThrough(int);
/* 80082C1C */ virtual void GetPolyHSStick(int);
/* 80082C1C */ virtual u32 GetPolyHSStick(int);
/* 80082C48 */ virtual void GetPolyBoomerangThrough(int);
/* 80082C74 */ virtual void GetPolyRopeThrough(int);
/* 80082CA0 */ virtual void GetPolyBombThrough(int);