From 4ae64687009800d9bbd0a1d75e7c6fb576889c97 Mon Sep 17 00:00:00 2001 From: Dylan Ascencio Date: Wed, 4 Oct 2023 02:08:02 -0400 Subject: [PATCH] Name base_process_class.mUnk2 to mCreateResult, and add fpcM_CreateResult --- include/f_pc/f_pc_base.h | 2 +- include/f_pc/f_pc_manager.h | 4 ++++ src/d/actor/d_a_obj_mknjd.cpp | 3 ++- src/f_pc/f_pc_base.cpp | 8 ++++---- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/include/f_pc/f_pc_base.h b/include/f_pc/f_pc_base.h index 3ff0c85d2..984a1b1ba 100644 --- a/include/f_pc/f_pc_base.h +++ b/include/f_pc/f_pc_base.h @@ -19,7 +19,7 @@ typedef struct base_process_class { /* 0x0A */ s8 mUnk0; /* 0x0B */ u8 mPauseFlag; /* 0x0C */ s8 mInitState; - /* 0x0D */ s8 mUnk2; + /* 0x0D */ s8 mCreateResult; /* 0x0E */ s16 mProfName; /* 0x10 */ process_profile_definition* mpProf; /* 0x14 */ struct create_request* mpCtRq; diff --git a/include/f_pc/f_pc_manager.h b/include/f_pc/f_pc_manager.h index 602c62b57..8169415c4 100644 --- a/include/f_pc/f_pc_manager.h +++ b/include/f_pc/f_pc_manager.h @@ -70,6 +70,10 @@ inline void* fpcM_LyJudge(process_node_class* i_node, fpcLyIt_JudgeFunc i_func, return fpcLyIt_Judge(&i_node->mLayer, i_func, i_data); } +inline s8 fpcM_CreateResult(const void* pActor) { + return ((base_process_class*)pActor)->mCreateResult; +} + void fpcM_Draw(void* pProc); s32 fpcM_DrawIterater(fpcM_DrawIteraterFunc pFunc); s32 fpcM_Execute(void* pProc); diff --git a/src/d/actor/d_a_obj_mknjd.cpp b/src/d/actor/d_a_obj_mknjd.cpp index 32e46066a..7be6a4a9b 100644 --- a/src/d/actor/d_a_obj_mknjd.cpp +++ b/src/d/actor/d_a_obj_mknjd.cpp @@ -4,6 +4,7 @@ // #include "f_op/f_op_actor_mng.h" +#include "f_pc/f_pc_manager.h" #include "f_op/f_op_msg.h" #include "f_op/f_op_draw_tag.h" #include "JSystem/JKernel/JKRHeap.h" @@ -429,7 +430,7 @@ int daObjMknjD::Act_c::Delete() { s32 daObjMknjD::Act_c::Mthd_Delete() { int bgDeleteResult = MoveBGDelete(); - if (mBase.mUnk2 != 3) { + if (fpcM_CreateResult(this) != 3) { dComIfG_resDelete(&mPhs, M_arcname); } diff --git a/src/f_pc/f_pc_base.cpp b/src/f_pc/f_pc_base.cpp index bc742bfa7..b46805d66 100644 --- a/src/f_pc/f_pc_base.cpp +++ b/src/f_pc/f_pc_base.cpp @@ -119,19 +119,19 @@ s32 fpcBs_SubCreate(base_process_class* i_proc) { case 2: case cPhs_COMPLEATE_e: fpcBs_DeleteAppend(i_proc); - i_proc->mUnk2 = 2; + i_proc->mCreateResult = 2; return 2; case cPhs_INIT_e: case 1: i_proc->mInitState = 1; - i_proc->mUnk2 = 0; + i_proc->mCreateResult = 0; return cPhs_INIT_e; case 3: - i_proc->mUnk2 = 3; + i_proc->mCreateResult = 3; return 3; case cPhs_ERROR_e: default: - i_proc->mUnk2 = 5; + i_proc->mCreateResult = 5; return cPhs_ERROR_e; } }