diff options
| author | Caroline Madsen <69010899+randomsalience@users.noreply.github.com> | 2024-10-19 04:54:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-19 11:54:40 +0300 |
| commit | 69dc7cbbf15ece9533ca6afc85f9500ba1b2647b (patch) | |
| tree | a8ff6e3f3f5113d2185100af36df67c9e568d0d1 /include/SSystem/SComponent | |
| parent | 0652b2c7b3722e40ded1a34f8846b8ae9d8fa4eb (diff) | |
d_a_b_yo and d_a_b_yo_ice mostly OK (#2219)
Diffstat (limited to 'include/SSystem/SComponent')
| -rw-r--r-- | include/SSystem/SComponent/c_bg_s_chk.h | 3 | ||||
| -rw-r--r-- | include/SSystem/SComponent/c_cc_d.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/SSystem/SComponent/c_bg_s_chk.h b/include/SSystem/SComponent/c_bg_s_chk.h index 98d22fe790..3bacd16583 100644 --- a/include/SSystem/SComponent/c_bg_s_chk.h +++ b/include/SSystem/SComponent/c_bg_s_chk.h @@ -18,7 +18,7 @@ public: /* 0x0 */ cBgS_PolyPassChk* mPolyPassChk; /* 0x4 */ cBgS_GrpPassChk* mGrpPassChk; /* 0x8 */ fpc_ProcID mActorPid; - /* 0xC */ u8 unk_0x0C; + /* 0xC */ bool mSameActorChk; /* 0x10 */ // __vtable__ public: @@ -32,6 +32,7 @@ public: void SetGrpPassChk(cBgS_GrpPassChk* p_chk) { mGrpPassChk = p_chk; } cBgS_PolyPassChk* GetPolyPassChk() const { return mPolyPassChk; } cBgS_GrpPassChk* GetGrpPassChk() const { return mGrpPassChk; } + void OffSameActorChk() { mSameActorChk = false; } virtual ~cBgS_Chk(void); }; // Size: 0x14 diff --git a/include/SSystem/SComponent/c_cc_d.h b/include/SSystem/SComponent/c_cc_d.h index ab63e9d724..bd02aa56e8 100644 --- a/include/SSystem/SComponent/c_cc_d.h +++ b/include/SSystem/SComponent/c_cc_d.h @@ -494,6 +494,8 @@ public: void OffCoSPrmBit(u32 flag) { mObjCo.OffSPrmBit(flag); } void SetAtType(u32 type) { mObjAt.SetType(type); } void OnAtSetBit() { mObjAt.OnSPrmBit(1); } + void OnAtNoTgHitInfSet() { mObjAt.OnSPrmBit(0x20); } + void OffAtNoTgHitInfSet() { mObjAt.OffSPrmBit(0x20); } u32 MskTgSPrm(u32 mask) const { return mObjTg.MskSPrm(mask); } void SetAtAtp(int atp) { mObjAt.SetAtp(atp); } void OffCoSetBit() { mObjCo.ClrSet(); } |