decompile a few daItemKantera_c funcs (#1970)

* attempt on daItemKantera_c * format cpp
zeldaret · Oct 27, 2023 · cfa5f44 · cfa5f44
1 parent b13ff9e
commit cfa5f44
Show file tree

Hide file tree

Showing 4 changed files with 285 additions and 129 deletions.
diff --git a/include/SSystem/SComponent/c_cc_d.h b/include/SSystem/SComponent/c_cc_d.h
@@ -489,6 +489,7 @@ class cCcD_ObjHitInf {
     u32 ChkCoSph3DCrr() const { return mObjCo.ChkSph3DCrr(); }
     void OnAtSPrmBit(u32 flag) { mObjAt.OnSPrmBit(flag); }
     void OffAtSPrmBit(u32 flag) { mObjAt.OffSPrmBit(flag); }
+    void OffTgSPrmBit(u32 flag) { mObjTg.OffSPrmBit(flag); }
     void OffCoSPrmBit(u32 flag) { mObjCo.OffSPrmBit(flag); }
     void SetAtType(u32 type) { mObjAt.SetType(type); }
     void OnAtSetBit() { mObjAt.OnSPrmBit(1); }

diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h
@@ -140,6 +140,7 @@ enum fopAcM_CARRY {
     /* 0x04 */ fopAcM_CARRY_SIDE = 4,
     /* 0x08 */ fopAcM_CARRY_TYPE_8 = 8,
     /* 0x10 */ fopAcM_CARRY_LIGHT = 16, // guess based on context
+    /* 0x20 */ fopAcM_CARRY_ITEM = 32,
     /* 0x30 */ fopAcM_CARRY_UNK_30 = 0x30,
 };
 
@@ -315,6 +316,10 @@ inline f32 fopAcM_getCullSizeFar(const fopAc_ac_c* i_actor) {
     return i_actor->mCullSizeFar;
 }
 
+inline void fopAcM_SetCullSize(fopAc_ac_c* i_actor, s8 i_cullsize) {
+    i_actor->mCullType = i_cullsize;
+}
+
 inline int fopAcM_GetCullSize(const fopAc_ac_c* i_actor) {
     return i_actor->mCullType;
 }

diff --git a/include/rel/d/a/obj/d_a_obj_kantera/d_a_obj_kantera.h b/include/rel/d/a/obj/d_a_obj_kantera/d_a_obj_kantera.h
@@ -1,6 +1,6 @@
 #ifndef D_A_OBJ_KANTERA_H
 #define D_A_OBJ_KANTERA_H
 
-#include "dolphin/types.h"
+#include "d/a/d_a_itembase.h"
 
 #endif /* D_A_OBJ_KANTERA_H */