diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2022-02-06 06:23:54 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-06 09:23:54 -0500 |
| commit | 3a79e96e8b033e26a3970da68d0633010fac0f03 (patch) | |
| tree | 4f96139d922bc2af03685bca121fb327723447f2 /include/d/cc | |
| parent | 612f26c132280da43ecfa5fa8c8cc32966f06eb6 (diff) | |
d_meter2 wip / d_s_play / d_file_sel_info (#179)
* d_meter2 wip
* d_s_play
* d_file_sel_info
* format
* tag_lv5soup / tag_setBall / fix dKyeff
* d_cc_uty
Diffstat (limited to 'include/d/cc')
| -rw-r--r-- | include/d/cc/d_cc_d.h | 6 | ||||
| -rw-r--r-- | include/d/cc/d_cc_uty.h | 17 |
2 files changed, 23 insertions, 0 deletions
diff --git a/include/d/cc/d_cc_d.h b/include/d/cc/d_cc_d.h index 011835eb3b..b348bee671 100644 --- a/include/d/cc/d_cc_d.h +++ b/include/d/cc/d_cc_d.h @@ -136,6 +136,9 @@ public: void SetSe(u8 se) { mSe = se; } void SetMtrl(u8 mtrl) { mMtrl = mtrl; } void SetAtSpl(dCcG_At_Spl spl) { mSpl = spl; } + u8 GetSe() { return mSe; } + u8 GetSpl() { return mSpl; } + u8 GetMtrl() { return mMtrl; } // private: /* 0x1C */ u8 mSe; @@ -207,6 +210,9 @@ public: cXyz* GetAtVecP() { return mGObjAt.GetVecP(); } void SetAtSpl(dCcG_At_Spl spl) { mGObjAt.SetAtSpl(spl); } void SetAtHitCallback(dCcD_AtHitCallback callback) { mGObjAt.SetHitCallback(callback); } + u8 GetAtSe() { return mGObjAt.GetSe(); } + s32 GetAtSpl() { return mGObjAt.GetSpl(); } + u8 GetAtMtrl() { return mGObjAt.GetMtrl(); } static u32 const m_hitSeID[24]; diff --git a/include/d/cc/d_cc_uty.h b/include/d/cc/d_cc_uty.h index 16844cee7f..1182425f29 100644 --- a/include/d/cc/d_cc_uty.h +++ b/include/d/cc/d_cc_uty.h @@ -2,5 +2,22 @@ #define D_CC_D_CC_UTY_H #include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" +#include "d/com/d_com_inf_game.h" + +struct dCcU_AtInfo { + /* 0x00 */ cCcD_Obj* mpCollider; + /* 0x04 */ fopAc_ac_c* mpActor; + /* 0x08 */ Z2Creature* mpSound; + /* 0x0C */ u8 field_0xc[2]; + /* 0x0E */ s16 mHitDirection; + /* 0x10 */ u8 field_0x10[4]; + /* 0x14 */ u32 mHitBit; + /* 0x18 */ u32 field_0x18; + /* 0x1C */ u16 mAttackPower; + /* 0x1E */ u8 mPowerType; + /* 0x1F */ s8 mHitStatus; // maybe inaccurate name + /* 0x20 */ u8 mHitType; +}; #endif /* D_CC_D_CC_UTY_H */ |