From cfa5f44bb7884ed2842017329fa154453c2fd5ee Mon Sep 17 00:00:00 2001 From: Trueffel <106771418+Trueffeloot@users.noreply.github.com> Date: Sat, 28 Oct 2023 01:46:18 +0200 Subject: decompile a few daItemKantera_c funcs (#1970) * attempt on daItemKantera_c * format cpp --- include/SSystem/SComponent/c_cc_d.h | 1 + include/f_op/f_op_actor_mng.h | 5 +++++ include/rel/d/a/obj/d_a_obj_kantera/d_a_obj_kantera.h | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/SSystem/SComponent/c_cc_d.h b/include/SSystem/SComponent/c_cc_d.h index 28f49eec29..3c8caa2ec3 100644 --- a/include/SSystem/SComponent/c_cc_d.h +++ b/include/SSystem/SComponent/c_cc_d.h @@ -489,6 +489,7 @@ public: 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 index 1df55cdfb2..2b36b5feff 100644 --- 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 index a038afdcc9..0b1e0c968a 100644 --- 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 */ -- cgit v1.2.3