diff options
| author | Sam Chaturvedi <samridhchaturvedi@gmail.com> | 2025-03-26 21:38:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-26 18:38:45 -0700 |
| commit | 764eb0493e347f0f23eca95961716d449aed3e4e (patch) | |
| tree | d390eacf8a1d11ed177a6d82130c3a50dc4fb9ad /include | |
| parent | b6febdc2b6e4b2f7674d581a8a59eec173e4b188 (diff) | |
d_a_obj_sword matching (#2349)
* d_a_obj_sword matching
* d_a_obj_sword -- Addressed PR comments
Diffstat (limited to 'include')
| -rw-r--r-- | include/d/actor/d_a_obj_sword.h | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/include/d/actor/d_a_obj_sword.h b/include/d/actor/d_a_obj_sword.h index feb3b1fb58..6dcb6bb587 100644 --- a/include/d/actor/d_a_obj_sword.h +++ b/include/d/actor/d_a_obj_sword.h @@ -1,7 +1,7 @@ #ifndef D_A_OBJ_SWORD_H #define D_A_OBJ_SWORD_H -#include "f_op/f_op_actor_mng.h" +#include "d/actor/d_a_itembase.h" /** * @ingroup actors-objects @@ -11,25 +11,30 @@ * @details * */ -class daObjSword_c : public fopAc_ac_c { +class daObjSword_c : public daItemBase_c { public: /* 80CFD558 */ void initBaseMtx(); /* 80CFD594 */ void setBaseMtx(); - /* 80CFD600 */ void Create(); - /* 80CFD67C */ void create(); - /* 80CFDA14 */ void actionWait(); - /* 80CFDA8C */ void initActionOrderGetDemo(); - /* 80CFDB04 */ void actionOrderGetDemo(); - /* 80CFDB80 */ void actionGetDemo(); - /* 80CFDC1C */ void execute(); - /* 80CFDD18 */ void draw(); - /* 80CFDD6C */ void _delete(); + /* 80CFD600 */ int Create(); + /* 80CFD67C */ cPhs__Step create(); + /* 80CFDA14 */ int actionWait(); + /* 80CFDA8C */ int initActionOrderGetDemo(); + /* 80CFDB04 */ int actionOrderGetDemo(); + /* 80CFDB80 */ int actionGetDemo(); + /* 80CFDC1C */ int execute(); + /* 80CFDD18 */ int draw(); + /* 80CFDD6C */ int _delete(); + + u8 getItemBit() { return fopAcM_GetParamBit(this, 0, 8); } + u8 getSwbit() { return fopAcM_GetParamBit(this, 8, 8); } + void setStatus(u8 status) { mStatus = status; } private: - /* 0x568 */ u8 field_0x568[0x938 - 0x568]; + /* 0x92c */ u32 field_0x92c; + /* 0x930 */ fpc_ProcID mProcID; + /* 0x934 */ u8 mStatus; }; STATIC_ASSERT(sizeof(daObjSword_c) == 0x938); - #endif /* D_A_OBJ_SWORD_H */ |