diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2022-08-30 14:22:17 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-30 15:22:17 -0600 |
| commit | f8979749e3ef8e8cacf2ea8f474c7f23fc5cb6b3 (patch) | |
| tree | 69659df2105266e9b26a4d50b9a2d610b3e437a2 /include/d/cc | |
| parent | bc30d007e11458a198c5725626a10bb06a5da536 (diff) | |
j2d / map_path work, d_drawlist / d_attention cleanup (#208)
* work on fop actor / actor mng, daalink, d_a_obj_item
* d_a_title mostly decompiled
* daalink / d_event / JMessage / dmsg_out_font work
* msg_scrn_base / msg_scrn_boss
* some work on mDo machine, d_menu_save, d_tresure, and various
* remove asm
* progress
* finish d_menu_save / d_pane_class_alpha / d_pane_class / rename some data
* rename more data
* remove asm / progress
* match all of d_pane_class
* fixes / some dKankyo doc
* bunch of j2d work. d_drawlist / d_attention cleanup
* progress / asm
* cleanup wip
* decompile JStage
* setup some more JStudio structs
* set up d_demo classes
* some d_demo work
* cleanup dolphin os stuff
* some initial dEvent documentation
* some At collision documentation
* match JUTConsole::doDraw
* dbgs work / split up some of d_a_alink into .inc files
* d_a_alink_spinner work
Diffstat (limited to 'include/d/cc')
| -rw-r--r-- | include/d/cc/d_cc_mass_s.h | 21 | ||||
| -rw-r--r-- | include/d/cc/d_cc_uty.h | 9 |
2 files changed, 21 insertions, 9 deletions
diff --git a/include/d/cc/d_cc_mass_s.h b/include/d/cc/d_cc_mass_s.h index a4c0a53478..9a0a0ec2cb 100644 --- a/include/d/cc/d_cc_mass_s.h +++ b/include/d/cc/d_cc_mass_s.h @@ -13,11 +13,13 @@ private: /* 0x08 */ dCcMassS_ObjCallback mpCallback; /* 0x0C */ cCcD_DivideInfo mDivideInfo; /* 0x1C vtable */ + public: dCcMassS_Obj(); virtual ~dCcMassS_Obj() {} - /* 800852E0 */ void Set(cCcD_Obj*, u8, void (*)(fopAc_ac_c*, cXyz*, u32)); - /* 800852F0 */ void Clear(); + void Set(cCcD_Obj* p_obj, u8 priority, dCcMassS_ObjCallback callback); + void Clear(); + cCcD_Obj* GetObj() { return mpObj; } u8 GetPriority() const { return mPriority; } dCcMassS_ObjCallback GetCallback() const { return mpCallback; } @@ -34,7 +36,7 @@ private: /* 0x0C */ f32 mCoHitLen; public: - /* 80085334 */ void ClearPointer(); + void ClearPointer(); void SetAreaHitObj(cCcD_Obj* obj) { mpArea = obj; } void SetCoHitObj(cCcD_Obj* obj) { mpCoObj = obj; } void SetAtHitObj(cCcD_Obj* obj) { mpAtObj = obj; } @@ -60,18 +62,19 @@ public: /* 0x0224 */ cCcD_CpsAttr mCpsAttr; /* 0x0264 */ cCcD_DivideInfo mDivideInfo; /* 0x0274 vtable */ + public: - dCcMassS_Mng(void); + dCcMassS_Mng(); virtual ~dCcMassS_Mng() {} /* 800855E4 */ void Ct(); - /* 80085630 */ void SetAttr(f32, f32, u8, u8); + /* 80085630 */ void SetAttr(f32 radius, f32 height, u8 param_2, u8 param_3); /* 80085690 */ void Prepare(); - /* 800858AC */ u32 Chk(cXyz*, fopAc_ac_c**, dCcMassS_HitInf*); + /* 800858AC */ u32 Chk(cXyz* p_xyz, fopAc_ac_c** p_actor, dCcMassS_HitInf* p_hitInf); /* 80085CF0 */ void Clear(); - /* 80085D98 */ void Set(cCcD_Obj*, u8); - /* 80085E6C */ void SetCam(cM3dGCps const&); + /* 80085D98 */ void Set(cCcD_Obj* p_obj, u8 priority); + /* 80085E6C */ void SetCam(cM3dGCps const& cps); /* 80085EB0 */ u8 GetResultCam() const; - /* 80085EB8 */ void GetCamTopPos(Vec*); + /* 80085EB8 */ void GetCamTopPos(Vec* p_out); }; STATIC_ASSERT(sizeof(dCcMassS_Mng) == 0x278); diff --git a/include/d/cc/d_cc_uty.h b/include/d/cc/d_cc_uty.h index 243bcce721..81719f4bf9 100644 --- a/include/d/cc/d_cc_uty.h +++ b/include/d/cc/d_cc_uty.h @@ -5,6 +5,15 @@ #include "dolphin/types.h" #include "f_op/f_op_actor.h" +enum dCcU_AtType { + /* 0x01 */ HIT_TYPE_LINK_NORMAL_ATTACK = 1, + /* 0x02 */ HIT_TYPE_BOMB, + /* 0x09 */ HIT_TYPE_LINK_HEAVY_ATTACK = 9, + /* 0x0A */ HIT_TYPE_BOOMERANG, + /* 0x0F */ HIT_TYPE_ARROW = 15, + /* 0x10 */ HIT_TYPE_STUN, +}; + struct dCcU_AtInfo { /* 0x00 */ cCcD_Obj* mpCollider; /* 0x04 */ fopAc_ac_c* mpActor; |