From c33ddb3ac12ee1b60e77fed06fadb796aad15772 Mon Sep 17 00:00:00 2001 From: Stbn-antier <99532548+Stbn-antier@users.noreply.github.com> Date: Mon, 24 Mar 2025 19:47:49 +0900 Subject: [PATCH] d_a_obj_sekidoor matching (#2344) * Started work on d_a_obj_sekidoor, 38% match * Filled functions, rough 70% match * 76% method matching * 84% match, only setPrtcls remaining * Object 100% matching * Cleanup, remove padding * Adressed review comments * Adressed review comment --- configure.py | 2 +- include/d/actor/d_a_obj_sekidoor.h | 37 ++- src/d/actor/d_a_obj_sekidoor.cpp | 491 +++++++++++++---------------- 3 files changed, 252 insertions(+), 278 deletions(-) diff --git a/configure.py b/configure.py index 80505c736f3..f9ead919c0e 100755 --- a/configure.py +++ b/configure.py @@ -2053,7 +2053,7 @@ config.libs = [ ActorRel(NonMatching, "d_a_obj_scannon"), ActorRel(NonMatching, "d_a_obj_scannon_crs"), ActorRel(NonMatching, "d_a_obj_scannon_ten"), - ActorRel(NonMatching, "d_a_obj_sekidoor"), + ActorRel(MatchingFor("GZ2E01"), "d_a_obj_sekidoor"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_sekizo"), ActorRel(NonMatching, "d_a_obj_sekizoa"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_shield"), diff --git a/include/d/actor/d_a_obj_sekidoor.h b/include/d/actor/d_a_obj_sekidoor.h index e938fea64c6..ff2796b3b16 100644 --- a/include/d/actor/d_a_obj_sekidoor.h +++ b/include/d/actor/d_a_obj_sekidoor.h @@ -1,6 +1,9 @@ #ifndef D_A_OBJ_SEKIDOOR_H #define D_A_OBJ_SEKIDOOR_H +#include "d/d_bg_s_movebg_actor.h" +#include "SSystem/SComponent/c_phase.h" +#include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" /** @@ -11,30 +14,44 @@ * @details * */ -class daObj_SekiDoor_c : public fopAc_ac_c { +class daObj_SekiDoor_c : public dBgS_MoveBgActor { public: - /* 80CCD02C */ void create(); - /* 80CCD154 */ void CreateHeap(); - /* 80CCD1F0 */ void Create(); - /* 80CCD23C */ void Delete(); - /* 80CCD290 */ void Execute(f32 (**)[3][4]); - /* 80CCD538 */ void Draw(); + /* 80CCD02C */ int create(); + /* 80CCD154 */ virtual int CreateHeap(); + /* 80CCD1F0 */ virtual int Create(); + /* 80CCD23C */ virtual int Delete(); + /* 80CCD290 */ virtual int Execute(Mtx**); + /* 80CCD538 */ virtual int Draw(); /* 80CCD5DC */ void evtSkip(); /* 80CCD64C */ void setPrtcls(); /* 80CCD810 */ void initBaseMtx(); /* 80CCD84C */ void setBaseMtx(); + u16 getBitSW() { return (fopAcM_GetParam(this) & 0xff); } + void open() { mOpening = true; } + bool chkDestroy() { return (mDestroyed == true); } + private: - /* 0x568 */ u8 field_0x568[0x5d8 - 0x568]; + /* 0x5A0 */ s32 field_0x5A0; + /* 0x5A4 */ request_of_phase_process_class mPhaseReq; + /* 0x5AC */ J3DModel* mpModel; + /* 0x5B0 */ csXyz mRotation; + /* 0x5B8 */ int mFrameCounter; + /* 0x5BC */ float mDoorPosY; + /* 0x5C0 */ s16 mOpenSpeed; + /* 0x5C4 */ u32 mpEmitters[4]; + /* 0x5D4 */ u8 mDestroyed; + /* 0x5D5 */ u8 mOpening; + /* 0x5D6 */ u8 mBitSW; }; STATIC_ASSERT(sizeof(daObj_SekiDoor_c) == 0x5d8); class daObj_SekiDoor_Param_c { public: - /* 80CCD9AC */ ~daObj_SekiDoor_Param_c(); + /* 80CCD9AC */ virtual ~daObj_SekiDoor_Param_c() {}; - static u8 const m[1 + 3 /* padding */]; + static u8 const m; }; diff --git a/src/d/actor/d_a_obj_sekidoor.cpp b/src/d/actor/d_a_obj_sekidoor.cpp index 6432e970c7f..233dc3f6f69 100644 --- a/src/d/actor/d_a_obj_sekidoor.cpp +++ b/src/d/actor/d_a_obj_sekidoor.cpp @@ -4,343 +4,300 @@ */ #include "d/actor/d_a_obj_sekidoor.h" -#include "dol2asm.h" +/* ############################################################################################## */ - -// -// Forward References: -// - -extern "C" void create__16daObj_SekiDoor_cFv(); -extern "C" void CreateHeap__16daObj_SekiDoor_cFv(); -extern "C" void Create__16daObj_SekiDoor_cFv(); -extern "C" void Delete__16daObj_SekiDoor_cFv(); -extern "C" void Execute__16daObj_SekiDoor_cFPPA3_A4_f(); -extern "C" static void dComIfGp_event_runCheck__Fv(); -extern "C" void Draw__16daObj_SekiDoor_cFv(); -extern "C" void evtSkip__16daObj_SekiDoor_cFv(); -extern "C" void setPrtcls__16daObj_SekiDoor_cFv(); -extern "C" void initBaseMtx__16daObj_SekiDoor_cFv(); -extern "C" void setBaseMtx__16daObj_SekiDoor_cFv(); -extern "C" static void daObj_SekiDoor_Create__FPv(); -extern "C" static void daObj_SekiDoor_Delete__FPv(); -extern "C" static void daObj_SekiDoor_Execute__FPv(); -extern "C" static void daObj_SekiDoor_Draw__FPv(); -extern "C" static bool daObj_SekiDoor_IsDelete__FPv(); -extern "C" void __sinit_d_a_obj_sekidoor_cpp(); -extern "C" void __dt__22daObj_SekiDoor_Param_cFv(); -extern "C" u8 const m__22daObj_SekiDoor_Param_c[1 + 3 /* padding */]; -extern "C" extern char const* const d_a_obj_sekidoor__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_YrotM__FPA4_fs(); -extern "C" void mDoMtx_ZrotM__FPA4_fs(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void fopAcM_delete__FP10fopAc_ac_c(); -extern "C" void fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void getEmitter__Q213dPa_control_c7level_cFUl(); -extern "C" void -set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -extern "C" void StartShock__12dVibration_cFii4cXyz(); -extern "C" void StopQuake__12dVibration_cFi(); -extern "C" void dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz(); -extern "C" void __ct__16dBgS_MoveBgActorFv(); -extern "C" bool IsDelete__16dBgS_MoveBgActorFv(); -extern "C" bool ToFore__16dBgS_MoveBgActorFv(); -extern "C" bool ToBack__16dBgS_MoveBgActorFv(); -extern "C" void -MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f(); -extern "C" void MoveBGDelete__16dBgS_MoveBgActorFv(); -extern "C" void MoveBGExecute__16dBgS_MoveBgActorFv(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void cLib_chaseS__FPsss(); -extern "C" void cLib_chaseF__FPfff(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void __dl__FPv(); -extern "C" void _savegpr_24(); -extern "C" void _restgpr_24(); -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" u8 sincosTable___5JMath[65536]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" void __register_global_object(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80CCDA30-80CCDA30 000028 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80CCDA30 = ""; -SECTION_DEAD static char const* const stringBase_80CCDA31 = "SekiDoor"; -#pragma pop - -/* 80CCDA3C-80CCDA48 000000 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ -SECTION_DATA static u8 cNullVec__6Z2Calc[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 80CCDA48-80CCDA5C 00000C 0004+10 0/0 0/0 0/0 .data @1787 */ -#pragma push -#pragma force_active on -SECTION_DATA static u32 lit_1787[1 + 4 /* padding */] = { - 0x02000201, - /* padding */ - 0x40080000, - 0x00000000, - 0x3FE00000, - 0x00000000, -}; -#pragma pop +UNK_REL_DATA; /* 80CCDA5C-80CCDA64 000020 0008+00 2/3 0/0 0/0 .data l_bmdData */ -SECTION_DATA static u8 l_bmdData[8] = { - 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, -}; +static struct { + u32 bmdIdx; + u32 resIdx; +} l_bmdData[1] = {4, 1}; /* 80CCDA64-80CCDA6C 000028 0008+00 0/1 0/0 0/0 .data l_dzbData */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 l_dzbData[8] = { - 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x01, -}; -#pragma pop +static struct { + u32 dzbIdx; + u32 resIdx; +} l_dzbData[1] = {7, 1}; /* 80CCDA6C-80CCDA74 -00001 0008+00 2/3 0/0 0/0 .data l_resNameList */ -SECTION_DATA static void* l_resNameList[2] = { - (void*)&d_a_obj_sekidoor__stringBase0, - (void*)(((char*)&d_a_obj_sekidoor__stringBase0) + 0x1), -}; - -/* 80CCDA74-80CCDA94 -00001 0020+00 1/0 0/0 0/0 .data daObj_SekiDoor_MethodTable */ -static actor_method_class daObj_SekiDoor_MethodTable = { - (process_method_func)daObj_SekiDoor_Create__FPv, - (process_method_func)daObj_SekiDoor_Delete__FPv, - (process_method_func)daObj_SekiDoor_Execute__FPv, - (process_method_func)daObj_SekiDoor_IsDelete__FPv, - (process_method_func)daObj_SekiDoor_Draw__FPv, -}; - -/* 80CCDA94-80CCDAC4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_SEKIDOOR */ -extern actor_process_profile_definition g_profile_OBJ_SEKIDOOR = { - fpcLy_CURRENT_e, // mLayerID - 7, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_OBJ_SEKIDOOR, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daObj_SekiDoor_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 87, // mPriority - &daObj_SekiDoor_MethodTable, // sub_method - 0x00044000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType -}; - -/* 80CCDAC4-80CCDAEC 000088 0028+00 1/1 0/0 0/0 .data __vt__16daObj_SekiDoor_c */ -SECTION_DATA extern void* __vt__16daObj_SekiDoor_c[10] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__16daObj_SekiDoor_cFv, - (void*)Create__16daObj_SekiDoor_cFv, - (void*)Execute__16daObj_SekiDoor_cFPPA3_A4_f, - (void*)Draw__16daObj_SekiDoor_cFv, - (void*)Delete__16daObj_SekiDoor_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, -}; +static char* l_resNameList[2] = {"", "SekiDoor"}; /* 80CCD02C-80CCD154 0000EC 0128+00 1/1 0/0 0/0 .text create__16daObj_SekiDoor_cFv */ -void daObj_SekiDoor_c::create() { - // NONMATCHING +int daObj_SekiDoor_c::create() { + fopAcM_SetupActor(this, daObj_SekiDoor_c); + + mBitSW = 0; + + cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhaseReq, l_resNameList[l_bmdData[mBitSW].resIdx]); + if (step == cPhs_COMPLEATE_e) { + if (getBitSW() != 0xff){ + if (dComIfGs_isSwitch(getBitSW(), fopAcM_GetRoomNo(this))) { + return cPhs_ERROR_e; + } + } + + step = (cPhs__Step)MoveBGCreate(l_resNameList[l_dzbData[mBitSW].resIdx], + l_dzbData[mBitSW].dzbIdx, dBgS_MoveBGProc_TypicalRotY, 0xc20, NULL + ); + + if (step == cPhs_ERROR_e) { + return step; + } + } + + return step; } /* 80CCD154-80CCD1F0 000214 009C+00 1/0 0/0 0/0 .text CreateHeap__16daObj_SekiDoor_cFv */ -void daObj_SekiDoor_c::CreateHeap() { - // NONMATCHING +int daObj_SekiDoor_c::CreateHeap() { + J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes( + l_resNameList[l_bmdData[mBitSW].resIdx], + l_bmdData[mBitSW].bmdIdx + ); + + if (model_data == NULL){ + return 0; + } + + mpModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084); + + if (mpModel == NULL) { + return 0; + } + return 1; } /* 80CCD1F0-80CCD23C 0002B0 004C+00 1/0 0/0 0/0 .text Create__16daObj_SekiDoor_cFv */ -void daObj_SekiDoor_c::Create() { - // NONMATCHING +int daObj_SekiDoor_c::Create() { + initBaseMtx(); + fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); + fopAcM_setCullSizeBox2(this, mpModel->getModelData()); + + return 1; } /* 80CCD23C-80CCD290 0002FC 0054+00 1/0 0/0 0/0 .text Delete__16daObj_SekiDoor_cFv */ -void daObj_SekiDoor_c::Delete() { - // NONMATCHING +int daObj_SekiDoor_c::Delete() { + dComIfG_resDelete(&mPhaseReq, l_resNameList[l_bmdData[mBitSW].resIdx]); + + return 1; } /* ############################################################################################## */ + /* 80CCDA08-80CCDA0C 000000 0001+03 2/2 0/0 0/0 .rodata m__22daObj_SekiDoor_Param_c */ -SECTION_RODATA u8 const daObj_SekiDoor_Param_c::m[1 + 3 /* padding */] = { - 0x00, - /* padding */ - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80CCDA08, &daObj_SekiDoor_Param_c::m); +const u8 daObj_SekiDoor_Param_c::m = 0; /* 80CCDA0C-80CCDA10 000004 0004+00 1/3 0/0 0/0 .rodata @3956 */ -SECTION_RODATA static f32 const lit_3956 = 460.0f; -COMPILER_STRIP_GATE(0x80CCDA0C, &lit_3956); +static const f32 reference_posy = 460.0f; /* 80CCDA10-80CCDA14 000008 0004+00 0/1 0/0 0/0 .rodata @3957 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3957 = 4.0f; -COMPILER_STRIP_GATE(0x80CCDA10, &lit_3957); -#pragma pop +static const f32 rising_speed_y = 4.0f; -/* 80CCDA14-80CCDA18 00000C 0004+00 0/2 0/0 0/0 .rodata @3958 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3958 = 1.0f; -COMPILER_STRIP_GATE(0x80CCDA14, &lit_3958); -#pragma pop - -/* 80CCDA18-80CCDA1C 000010 0004+00 0/1 0/0 0/0 .rodata @3959 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3959 = -1.0f; -COMPILER_STRIP_GATE(0x80CCDA18, &lit_3959); -#pragma pop - -/* 80CCDA1C-80CCDA20 000014 0004+00 0/1 0/0 0/0 .rodata @3960 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3960[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80CCDA1C, &lit_3960); -#pragma pop - -/* 80CCDA20-80CCDA28 000018 0008+00 0/1 0/0 0/0 .rodata @3962 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const lit_3962[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; -COMPILER_STRIP_GATE(0x80CCDA20, &lit_3962); -#pragma pop /* 80CCD290-80CCD51C 000350 028C+00 1/0 0/0 0/0 .text Execute__16daObj_SekiDoor_cFPPA3_A4_f */ -void daObj_SekiDoor_c::Execute(f32 (**param_0)[3][4]) { - // NONMATCHING -} +int daObj_SekiDoor_c::Execute(Mtx** i_mtx) { + cXyz temp_y_position; + *i_mtx = &mBgMtx; -/* 80CCD51C-80CCD538 0005DC 001C+00 1/0 0/0 0/0 .text dComIfGp_event_runCheck__Fv */ -static void dComIfGp_event_runCheck() { - // NONMATCHING + if (mOpening != 0) { + if (mDestroyed != 0) { + if(!dComIfGp_event_runCheck){ + fopAcM_delete(this); + } + } + else { + if (cM3d_IsZero(mDoorPosY) && mFrameCounter == 0) { + mOpenSpeed = 0; + mFrameCounter++; + } + else { + if (mOpenSpeed != 0) { + mRotation.z = mOpenSpeed * cM_ssin(mFrameCounter << 14); + + if (cLib_chaseS(&mOpenSpeed, 0, 0x10)) { + dComIfGp_getVibration().StopQuake(0xf); + } + + mFrameCounter++; + } + if (mOpenSpeed == 0) { + temp_y_position = current.pos; + if (mDoorPosY < reference_posy) { + speed.y = rising_speed_y; + cLib_chaseF(&mDoorPosY, reference_posy, speed.y); + + temp_y_position.y += mDoorPosY; + + mDoAud_seStartLevel(Z2SE_OBJ_SEKI_DOOR_OP, &temp_y_position, + 0, 0); + } + else { + temp_y_position.y += mDoorPosY; + + mDoAud_seStart(Z2SE_OBJ_SEKI_DOOR_OP_ST, NULL, + 0, 0); + + dComIfGp_getVibration().StartShock(VIBMODE_S_POWER5, 0xf, + cXyz(0.0f, 1.0f, 0.0f)); + mDestroyed = 1; + } + + } + } + } + } + else { + speed.setall(0.0f); + mFrameCounter = 0; + mOpenSpeed = 0; + mDoorPosY = 0.0f; + mDestroyed = 0; + } + + setBaseMtx(); + setPrtcls(); + return 1; } /* 80CCD538-80CCD5DC 0005F8 00A4+00 1/0 0/0 0/0 .text Draw__16daObj_SekiDoor_cFv */ -void daObj_SekiDoor_c::Draw() { - // NONMATCHING +int daObj_SekiDoor_c::Draw() { + g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); + + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(mpModel); + dComIfGd_setList(); + + return 1; } /* 80CCD5DC-80CCD64C 00069C 0070+00 0/0 0/0 1/1 .text evtSkip__16daObj_SekiDoor_cFv */ void daObj_SekiDoor_c::evtSkip() { - // NONMATCHING + if (mFrameCounter != 0){ + dComIfGp_getVibration().StopQuake(0xf); + } + mRotation.setall(0); + mDoorPosY = reference_posy; + mOpening = true; + mDestroyed = true; } /* ############################################################################################## */ -/* 80CCDA28-80CCDA30 000020 0008+00 0/1 0/0 0/0 .rodata id$4006 */ -#pragma push -#pragma force_active on -SECTION_RODATA static u8 const id[8] = { - 0x8B, 0x85, 0x8B, 0x86, 0x8B, 0x87, 0x8B, 0x88, -}; -COMPILER_STRIP_GATE(0x80CCDA28, &id); -#pragma pop /* 80CCD64C-80CCD810 00070C 01C4+00 1/1 0/0 0/0 .text setPrtcls__16daObj_SekiDoor_cFv */ void daObj_SekiDoor_c::setPrtcls() { - // NONMATCHING + static const u16 id[4] = { + 0x8B85, 0x8B86, 0x8B87, 0x8B88, + }; + + cXyz particle_pos = current.pos; + cXyz particle_scale(1.0f,1.0f,1.0f); + particle_pos.y += mDoorPosY; + + if (mOpening == false) { + return; + } + if (mDestroyed != false) { + for (int index = 2; index <= 3; index++){ + u16 id_partcl = id[index]; + + mpEmitters[index] = dComIfGp_particle_set( + mpEmitters[index], id_partcl, &particle_pos, + NULL, &particle_scale + ); + } + } + + + else { + if (mDoorPosY < reference_posy) { + for (int index = 0; index <= 1; index++){ + mpEmitters[index] = dComIfGp_particle_set( + mpEmitters[index], id[index], &particle_pos, + NULL, &particle_scale + ); + + JPABaseEmitter* emitter_p = dComIfGp_particle_getEmitter(mpEmitters[index]); + if (emitter_p != NULL) { + emitter_p->setGlobalTranslation(particle_pos.x, particle_pos.y,particle_pos.z); + } + } + } + } } -/* 80CCD810-80CCD84C 0008D0 003C+00 1/1 0/0 0/0 .text initBaseMtx__16daObj_SekiDoor_cFv - */ +/* 80CCD810-80CCD84C 0008D0 003C+00 1/1 0/0 0/0 .text initBaseMtx__16daObj_SekiDoor_cFv */ void daObj_SekiDoor_c::initBaseMtx() { - // NONMATCHING + mpModel->setBaseScale(scale); + setBaseMtx(); } /* 80CCD84C-80CCD8D8 00090C 008C+00 2/2 0/0 0/0 .text setBaseMtx__16daObj_SekiDoor_cFv */ void daObj_SekiDoor_c::setBaseMtx() { - // NONMATCHING + mDoMtx_stack_c::transS(current.pos.x, current.pos.y + mDoorPosY, current.pos.z); + mDoMtx_stack_c::YrotM(shape_angle.y); + mDoMtx_stack_c::ZrotM(mRotation.z); + + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); + MTXCopy(mDoMtx_stack_c::get(), mBgMtx); } /* 80CCD8D8-80CCD8F8 000998 0020+00 1/0 0/0 0/0 .text daObj_SekiDoor_Create__FPv */ -static void daObj_SekiDoor_Create(void* param_0) { - // NONMATCHING +static int daObj_SekiDoor_Create(void* i_this) { + return static_cast(i_this)->create(); } /* 80CCD8F8-80CCD918 0009B8 0020+00 1/0 0/0 0/0 .text daObj_SekiDoor_Delete__FPv */ -static void daObj_SekiDoor_Delete(void* param_0) { - // NONMATCHING +static int daObj_SekiDoor_Delete(void* i_this) { + return static_cast(i_this)->MoveBGDelete(); } /* 80CCD918-80CCD938 0009D8 0020+00 1/0 0/0 0/0 .text daObj_SekiDoor_Execute__FPv */ -static void daObj_SekiDoor_Execute(void* param_0) { - // NONMATCHING +static int daObj_SekiDoor_Execute(void* i_this) { + return static_cast(i_this)->MoveBGExecute(); } /* 80CCD938-80CCD964 0009F8 002C+00 1/0 0/0 0/0 .text daObj_SekiDoor_Draw__FPv */ -static void daObj_SekiDoor_Draw(void* param_0) { - // NONMATCHING +static int daObj_SekiDoor_Draw(void* i_this) { + return static_cast(i_this)->MoveBGDraw(); } /* 80CCD964-80CCD96C 000A24 0008+00 1/0 0/0 0/0 .text daObj_SekiDoor_IsDelete__FPv */ -static bool daObj_SekiDoor_IsDelete(void* param_0) { - return true; +static int daObj_SekiDoor_IsDelete(void* param_0) { + return 1; } /* ############################################################################################## */ -/* 80CCDAEC-80CCDAF8 0000B0 000C+00 2/2 0/0 0/0 .data __vt__22daObj_SekiDoor_Param_c */ -SECTION_DATA extern void* __vt__22daObj_SekiDoor_Param_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__22daObj_SekiDoor_Param_cFv, -}; - -/* 80CCDB00-80CCDB0C 000008 000C+00 1/1 0/0 0/0 .bss @3803 */ -static u8 lit_3803[12]; /* 80CCDB0C-80CCDB10 000014 0004+00 1/1 0/0 0/0 .bss l_HIO */ -static u8 l_HIO[4]; +static daObj_SekiDoor_Param_c l_HIO; -/* 80CCD96C-80CCD9AC 000A2C 0040+00 0/0 1/0 0/0 .text __sinit_d_a_obj_sekidoor_cpp */ -void __sinit_d_a_obj_sekidoor_cpp() { - // NONMATCHING -} +/* 80CCDA74-80CCDA94 -00001 0020+00 1/0 0/0 0/0 .data daObj_SekiDoor_MethodTable */ +static actor_method_class daObj_SekiDoor_MethodTable = { + (process_method_func)daObj_SekiDoor_Create, + (process_method_func)daObj_SekiDoor_Delete, + (process_method_func)daObj_SekiDoor_Execute, + (process_method_func)daObj_SekiDoor_IsDelete, + (process_method_func)daObj_SekiDoor_Draw, +}; -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80CCD96C, __sinit_d_a_obj_sekidoor_cpp); -#pragma pop - -/* 80CCD9AC-80CCD9F4 000A6C 0048+00 2/1 0/0 0/0 .text __dt__22daObj_SekiDoor_Param_cFv */ -daObj_SekiDoor_Param_c::~daObj_SekiDoor_Param_c() { - // NONMATCHING -} - -/* 80CCDA30-80CCDA30 000028 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 80CCDA94-80CCDAC4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_SEKIDOOR */ +extern actor_process_profile_definition g_profile_OBJ_SEKIDOOR = { + fpcLy_CURRENT_e, // mLayerID + 7, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_OBJ_SEKIDOOR, // mProcName + &g_fpcLf_Method.base, // sub_method + sizeof(daObj_SekiDoor_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 87, // mPriority + &daObj_SekiDoor_MethodTable, // sub_method + 0x00044000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType + };