From 4ce51c0de6c1bfc8b80d15b961e3db08713df1fb Mon Sep 17 00:00:00 2001 From: Kristopher Early <1191258+MrPolymorph@users.noreply.github.com> Date: Wed, 11 Oct 2023 16:42:05 +0100 Subject: [PATCH] 100% --- configure.py | 2 +- include/f_op/f_op_actor.h | 1 + src/d/actor/d_a_seatag.cpp | 67 ++++++++++++++++++++++++++------------ 3 files changed, 48 insertions(+), 22 deletions(-) diff --git a/configure.py b/configure.py index bf142005d..368dd934d 100644 --- a/configure.py +++ b/configure.py @@ -1370,7 +1370,7 @@ config.libs = [ ActorRel(NonMatching, "d_a_oq"), ActorRel(NonMatching, "d_a_pedestal"), ActorRel(NonMatching, "d_a_saku"), - ActorRel(NonMatching, "d_a_seatag"), + ActorRel(Matching, "d_a_seatag"), ActorRel(NonMatching, "d_a_shand"), ActorRel(NonMatching, "d_a_ship"), ActorRel(NonMatching, "d_a_shop_item"), diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h index 2dcd4e315..03a343946 100644 --- a/include/f_op/f_op_actor.h +++ b/include/f_op/f_op_actor.h @@ -24,6 +24,7 @@ enum fopAc_Status_e { fopAcStts_UNK4000_e = 0x00004000, fopAcStts_NOPAUSE_e = 0x00020000, fopAcStts_UNK40000_e = 0x00040000, + fopAcStts_UNK00040180_e = 0x00040180, fopAcStts_UNK80000_e = 0x00080000, fopAcStts_HOOK_CARRY_e = 0x00100000, fopAcStts_UNK200000_e = 0x00200000, diff --git a/src/d/actor/d_a_seatag.cpp b/src/d/actor/d_a_seatag.cpp index db2acefcb..e00dee9cb 100644 --- a/src/d/actor/d_a_seatag.cpp +++ b/src/d/actor/d_a_seatag.cpp @@ -1,33 +1,58 @@ -// -// Generated by dtk -// Translation Unit: d_a_seatag.cpp -// +/* + * d_a_seatag.cpp + */ +#include "JSystem/JKernel/JKRHeap.h" +#include "f_op/f_op_actor_mng.h" +#include "d/d_procname.h" -#include "d_a_seatag.h" -#include "dolphin/types.h" +struct daSeatag_c : public fopAc_ac_c { +public: + /* 0x00 */ int field_0x00; + /* 0x04 */ int field_0x04; +}; // size 0x298 -/* 00000078-00000080 .text daSeatag_Draw__FP10daSeatag_c */ -void daSeatag_Draw(daSeatag_c*) { - /* Nonmatching */ +static BOOL daSeatag_Draw(daSeatag_c*) { + return true; } -/* 00000080-00000088 .text daSeatag_Execute__FP10daSeatag_c */ -void daSeatag_Execute(daSeatag_c*) { - /* Nonmatching */ +static BOOL daSeatag_Execute(daSeatag_c*) { + return true; } -/* 00000088-00000090 .text daSeatag_IsDelete__FP10daSeatag_c */ -void daSeatag_IsDelete(daSeatag_c*) { - /* Nonmatching */ +static BOOL daSeatag_IsDelete(daSeatag_c*) { + return true; } -/* 00000090-000000C0 .text daSeatag_Delete__FP10daSeatag_c */ -void daSeatag_Delete(daSeatag_c*) { - /* Nonmatching */ +static BOOL daSeatag_Delete(daSeatag_c* a_this) { + a_this->~daSeatag_c(); + return 1; } -/* 000000C0-00000110 .text daSeatag_Create__FP10fopAc_ac_c */ -void daSeatag_Create(fopAc_ac_c*) { - /* Nonmatching */ +static int daSeatag_Create(fopAc_ac_c* a_this) { + fopAcM_SetupActor(a_this, daSeatag_c); + return 4; } +static actor_method_class l_daSeatag_Method = { + (process_method_func)daSeatag_Create, + (process_method_func)daSeatag_Delete, + (process_method_func)daSeatag_Execute, + (process_method_func)daSeatag_IsDelete, + (process_method_func)daSeatag_Draw, +}; +extern actor_process_profile_definition g_profile_SEATAG = { + fpcLy_CURRENT_e, + 2, + fpcLy_CURRENT_e, + PROC_SEATAG, + &g_fpcLf_Method.mBase, + sizeof(daSeatag_c), + 0, + 0, + &g_fopAc_Method.base, + 0x01DF, + &l_daSeatag_Method, + fopAcStts_UNK00040180_e, + fopAc_ACTOR_e, + fopAc_CULLBOX_0_e, +};