From 30799716df96869dc63663d5378082898e5e0ea3 Mon Sep 17 00:00:00 2001 From: meintte Date: Mon, 5 May 2025 14:33:17 +0200 Subject: [PATCH] d_a_obj_lv6SzGate matching (#2420) --- configure.py | 2 +- include/d/actor/d_a_obj_lv6SzGate.h | 49 ++- src/d/actor/d_a_obj_lv6SzGate.cpp | 600 ++++++++++------------------ 3 files changed, 244 insertions(+), 407 deletions(-) diff --git a/configure.py b/configure.py index 10c56328857..94ec1df7312 100755 --- a/configure.py +++ b/configure.py @@ -2011,7 +2011,7 @@ config.libs = [ ActorRel(NonMatching, "d_a_obj_lv6FurikoTrap"), ActorRel(NonMatching, "d_a_obj_lv6Lblock"), ActorRel(NonMatching, "d_a_obj_lv6SwGate"), - ActorRel(NonMatching, "d_a_obj_lv6SzGate"), + ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lv6SzGate"), ActorRel(NonMatching, "d_a_obj_lv6Tenbin"), ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lv6TogeRoll"), ActorRel(NonMatching, "d_a_obj_lv6TogeTrap"), diff --git a/include/d/actor/d_a_obj_lv6SzGate.h b/include/d/actor/d_a_obj_lv6SzGate.h index 0147df492ba..023a191ceae 100644 --- a/include/d/actor/d_a_obj_lv6SzGate.h +++ b/include/d/actor/d_a_obj_lv6SzGate.h @@ -1,6 +1,7 @@ #ifndef D_A_OBJ_LV6SZGATE_H #define D_A_OBJ_LV6SZGATE_H +#include "d/d_bg_s_movebg_actor.h" #include "f_op/f_op_actor_mng.h" /** @@ -11,12 +12,21 @@ * @details * */ -class daLv6SzGate_c : public fopAc_ac_c { +class daLv6SzGate_c : public dBgS_MoveBgActor { public: + enum Mode { + MODE_WAIT = 0, + MODE_OPENWAIT0 = 1, + MODE_OPENWAIT = 2, + MODE_OPEN = 3, + MODE_CLOSE = 4, + MODE_END = 5, + }; + /* 80C75900 */ void setBaseMtx(); - /* 80C75A54 */ void CreateHeap(); - /* 80C75C0C */ void create(); - /* 80C75E18 */ void Execute(f32 (**)[3][4]); + /* 80C75A54 */ int CreateHeap(); + /* 80C75C0C */ cPhs__Step create(); + /* 80C75E18 */ int Execute(Mtx**); /* 80C75E78 */ void moveGate(); /* 80C75F64 */ void init_modeWait(); /* 80C75F70 */ void modeWait(); @@ -29,20 +39,41 @@ public: /* 80C7624C */ void modeClose(); /* 80C76328 */ void init_modeEnd(); /* 80C76344 */ void modeEnd(); - /* 80C7637C */ void Draw(); - /* 80C76490 */ void Delete(); + /* 80C7637C */ int Draw(); + /* 80C76490 */ int Delete(); + + u32 getWaitTime() { return fopAcM_GetParamBit(this, 8, 8); } + u32 getSw() { return fopAcM_GetParamBit(this, 0, 8); } private: - /* 0x568 */ u8 field_0x568[0x61c - 0x568]; + /* 0x5A0 */ request_of_phase_process_class mPhase; + /* 0x5A8 */ J3DModel* field_0x5a8; + /* 0x5AC */ J3DModel* field_0x5ac; + /* 0x5B0 */ mDoExt_brkAnm field_0x5b0; + /* 0x5C8 */ mDoExt_btkAnm field_0x5c8; + /* 0x5E0 */ u8 mMode; + /* 0x5E1 */ u8 field_0x5e1; + /* 0x5E2 */ u8 field_0x5e2; + /* 0x5E3 */ u8 field_0x5e3; + /* 0x5E4 */ f32 field_0x5e4; + /* 0x5E8 */ dBgW* field_0x5e8; + /* 0x5EC */ Mtx mMtx; }; STATIC_ASSERT(sizeof(daLv6SzGate_c) == 0x61c); -class daLv6SzGate_HIO_c { +class daLv6SzGate_HIO_c : public mDoHIO_entry_c { public: /* 80C7586C */ daLv6SzGate_HIO_c(); - /* 80C76584 */ ~daLv6SzGate_HIO_c(); + /* 80C76584 */ virtual ~daLv6SzGate_HIO_c() {}; + + /* 0x04 */ f32 mSpeed; + /* 0x08 */ f32 field_0x08; + /* 0x0C */ f32 field_0x0c; + /* 0x10 */ f32 field_0x10; + /* 0x14 */ u8 mShockStrength; }; +STATIC_ASSERT(sizeof(daLv6SzGate_HIO_c) == 0x18); #endif /* D_A_OBJ_LV6SZGATE_H */ diff --git a/src/d/actor/d_a_obj_lv6SzGate.cpp b/src/d/actor/d_a_obj_lv6SzGate.cpp index d5d1416d0ef..903c2ad9ae4 100644 --- a/src/d/actor/d_a_obj_lv6SzGate.cpp +++ b/src/d/actor/d_a_obj_lv6SzGate.cpp @@ -1,494 +1,300 @@ /** * @file d_a_obj_lv6SzGate.cpp - * -*/ + * + */ #include "d/actor/d_a_obj_lv6SzGate.h" -#include "dol2asm.h" +#include "d/d_bg_w.h" +#include "d/d_com_inf_game.h" - - -// -// Forward References: -// - -extern "C" void __ct__17daLv6SzGate_HIO_cFv(); -extern "C" void __dt__14mDoHIO_entry_cFv(); -extern "C" void setBaseMtx__13daLv6SzGate_cFv(); -extern "C" void CreateHeap__13daLv6SzGate_cFv(); -extern "C" void create__13daLv6SzGate_cFv(); -extern "C" void __dt__12J3DFrameCtrlFv(); -extern "C" void Execute__13daLv6SzGate_cFPPA3_A4_f(); -extern "C" void moveGate__13daLv6SzGate_cFv(); -extern "C" void init_modeWait__13daLv6SzGate_cFv(); -extern "C" void modeWait__13daLv6SzGate_cFv(); -extern "C" void init_modeOpenWait0__13daLv6SzGate_cFv(); -extern "C" void modeOpenWait0__13daLv6SzGate_cFv(); -extern "C" void init_modeOpenWait__13daLv6SzGate_cFv(); -extern "C" void modeOpenWait__13daLv6SzGate_cFv(); -extern "C" void init_modeOpen__13daLv6SzGate_cFv(); -extern "C" void modeOpen__13daLv6SzGate_cFv(); -extern "C" void modeClose__13daLv6SzGate_cFv(); -extern "C" void init_modeEnd__13daLv6SzGate_cFv(); -extern "C" void modeEnd__13daLv6SzGate_cFv(); -extern "C" void Draw__13daLv6SzGate_cFv(); -extern "C" void Delete__13daLv6SzGate_cFv(); -extern "C" static void daLv6SzGate_Draw__FP13daLv6SzGate_c(); -extern "C" static void daLv6SzGate_Execute__FP13daLv6SzGate_c(); -extern "C" static void daLv6SzGate_Delete__FP13daLv6SzGate_c(); -extern "C" static void daLv6SzGate_Create__FP10fopAc_ac_c(); -extern "C" void __dt__17daLv6SzGate_HIO_cFv(); -extern "C" void __sinit_d_a_obj_lv6SzGate_cpp(); -extern "C" extern char const* const d_a_obj_lv6SzGate__stringBase0; - -// -// External References: -// - -extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); -extern "C" void transM__14mDoMtx_stack_cFfff(); -extern "C" void play__14mDoExt_baseAnmFv(); -extern "C" void init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss(); -extern "C" void entry__13mDoExt_btkAnmFP16J3DMaterialTablef(); -extern "C" void init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss(); -extern "C" void entry__13mDoExt_brkAnmFP16J3DMaterialTablef(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfGp_getReverb__Fi(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void StartShock__12dVibration_cFii4cXyz(); -extern "C" void Release__4cBgSFP9dBgW_Base(); -extern "C" void Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c(); -extern "C" void dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz(); -extern "C" void __ct__16dBgS_MoveBgActorFv(); -extern "C" bool Create__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 Set__4cBgWFP6cBgD_tUlPA3_A4_f(); -extern "C" void __ct__4dBgWFv(); -extern "C" void Move__4dBgWFv(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void ChkUsed__9cBgW_BgIdCFv(); -extern "C" void cLib_addCalc__FPfffff(); -extern "C" void cLib_chaseF__FPfff(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_29(); -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" void __register_global_object(); - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 80C76630-80C76634 000000 0004+00 3/3 0/0 0/0 .rodata @3627 */ -SECTION_RODATA static f32 const lit_3627 = 4.0f; -COMPILER_STRIP_GATE(0x80C76630, &lit_3627); - -/* 80C76634-80C76638 000004 0004+00 0/1 0/0 0/0 .rodata @3628 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3628 = 30.0f; -COMPILER_STRIP_GATE(0x80C76634, &lit_3628); -#pragma pop - -/* 80C76638-80C7663C 000008 0004+00 0/1 0/0 0/0 .rodata @3629 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3629 = 15.0f; -COMPILER_STRIP_GATE(0x80C76638, &lit_3629); -#pragma pop - -/* 80C7663C-80C76640 00000C 0004+00 0/1 0/0 0/0 .rodata @3630 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3630 = 400.0f; -COMPILER_STRIP_GATE(0x80C7663C, &lit_3630); -#pragma pop - -/* 80C76668-80C76674 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, -}; - -/* 80C76674-80C76688 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 /* 80C76688-80C766A0 000020 0018+00 1/1 0/0 0/0 .data l_cull_box */ -SECTION_DATA static u8 l_cull_box[24] = { - 0xC4, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00, 0xC2, 0xC8, 0x00, 0x00, - 0x44, 0x96, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00, -}; +static cull_box l_cull_box = {{-1200.0f, -300.0f, -100.0f}, {1200.0f, 300.0f, 100.0f}}; -/* 80C766A0-80C766AC -00001 000C+00 0/1 0/0 0/0 .data @3799 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3799[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeWait__13daLv6SzGate_cFv, -}; -#pragma pop - -/* 80C766AC-80C766B8 -00001 000C+00 0/2 0/0 0/0 .data @3800 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3800[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeOpenWait0__13daLv6SzGate_cFv, -}; -#pragma pop - -/* 80C766B8-80C766C4 -00001 000C+00 0/1 0/0 0/0 .data @3801 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3801[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeOpenWait__13daLv6SzGate_cFv, -}; -#pragma pop - -/* 80C766C4-80C766D0 -00001 000C+00 0/1 0/0 0/0 .data @3802 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3802[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeOpen__13daLv6SzGate_cFv, -}; -#pragma pop - -/* 80C766D0-80C766DC -00001 000C+00 0/1 0/0 0/0 .data @3803 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3803[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeClose__13daLv6SzGate_cFv, -}; -#pragma pop - -/* 80C766DC-80C766E8 -00001 000C+00 0/1 0/0 0/0 .data @3804 */ -#pragma push -#pragma force_active on -SECTION_DATA static void* lit_3804[3] = { - (void*)NULL, - (void*)0xFFFFFFFF, - (void*)modeEnd__13daLv6SzGate_cFv, -}; -#pragma pop - -/* 80C766E8-80C76730 000080 0048+00 0/1 0/0 0/0 .data mode_proc$3798 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 mode_proc[72] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -#pragma pop - -/* 80C76730-80C76750 -00001 0020+00 1/0 0/0 0/0 .data l_daLv6SzGate_Method */ -static actor_method_class l_daLv6SzGate_Method = { - (process_method_func)daLv6SzGate_Create__FP10fopAc_ac_c, - (process_method_func)daLv6SzGate_Delete__FP13daLv6SzGate_c, - (process_method_func)daLv6SzGate_Execute__FP13daLv6SzGate_c, - 0, - (process_method_func)daLv6SzGate_Draw__FP13daLv6SzGate_c, -}; - -/* 80C76750-80C76780 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv6SzGate */ -extern actor_process_profile_definition g_profile_Obj_Lv6SzGate = { - fpcLy_CURRENT_e, // mLayerID - 3, // mListID - fpcPi_CURRENT_e, // mListPrio - PROC_Obj_Lv6SzGate, // mProcName - &g_fpcLf_Method.base, // sub_method - sizeof(daLv6SzGate_c), // mSize - 0, // mSizeOther - 0, // mParameters - &g_fopAc_Method.base, // sub_method - 628, // mPriority - &l_daLv6SzGate_Method, // sub_method - 0x00040000, // mStatus - fopAc_ACTOR_e, // mActorType - fopAc_CULLBOX_CUSTOM_e, // cullType -}; - -/* 80C76780-80C7678C 000118 000C+00 2/2 0/0 0/0 .data __vt__12J3DFrameCtrl */ -SECTION_DATA extern void* __vt__12J3DFrameCtrl[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__12J3DFrameCtrlFv, -}; - -/* 80C7678C-80C767B4 000124 0028+00 1/1 0/0 0/0 .data __vt__13daLv6SzGate_c */ -SECTION_DATA extern void* __vt__13daLv6SzGate_c[10] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)CreateHeap__13daLv6SzGate_cFv, - (void*)Create__16dBgS_MoveBgActorFv, - (void*)Execute__13daLv6SzGate_cFPPA3_A4_f, - (void*)Draw__13daLv6SzGate_cFv, - (void*)Delete__13daLv6SzGate_cFv, - (void*)IsDelete__16dBgS_MoveBgActorFv, - (void*)ToFore__16dBgS_MoveBgActorFv, - (void*)ToBack__16dBgS_MoveBgActorFv, -}; - -/* 80C767B4-80C767C0 00014C 000C+00 2/2 0/0 0/0 .data __vt__17daLv6SzGate_HIO_c */ -SECTION_DATA extern void* __vt__17daLv6SzGate_HIO_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__17daLv6SzGate_HIO_cFv, -}; - -/* 80C767C0-80C767CC 000158 000C+00 3/3 0/0 0/0 .data __vt__14mDoHIO_entry_c */ -SECTION_DATA extern void* __vt__14mDoHIO_entry_c[3] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__14mDoHIO_entry_cFv, -}; +/* 80C767E4-80C767FC 000014 0018+00 4/4 0/0 0/0 .bss l_HIO */ +static daLv6SzGate_HIO_c l_HIO; /* 80C7586C-80C758B8 0000EC 004C+00 1/1 0/0 0/0 .text __ct__17daLv6SzGate_HIO_cFv */ daLv6SzGate_HIO_c::daLv6SzGate_HIO_c() { - // NONMATCHING + mSpeed = 4.0f; + field_0x08 = 30.0f; + field_0x0c = 15.0f; + field_0x10 = 400.0f; + mShockStrength = 3; } -/* 80C758B8-80C75900 000138 0048+00 1/0 0/0 0/0 .text __dt__14mDoHIO_entry_cFv */ -// mDoHIO_entry_c::~mDoHIO_entry_c() { -extern "C" void __dt__14mDoHIO_entry_cFv() { - // NONMATCHING -} - -/* ############################################################################################## */ -/* 80C76640-80C76644 000010 0004+00 1/1 0/0 0/0 .rodata @3665 */ -SECTION_RODATA static f32 const lit_3665 = -200.0f; -COMPILER_STRIP_GATE(0x80C76640, &lit_3665); - -/* 80C76644-80C76648 000014 0004+00 2/4 0/0 0/0 .rodata @3666 */ -SECTION_RODATA static u8 const lit_3666[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80C76644, &lit_3666); - /* 80C75900-80C75A54 000180 0154+00 2/2 0/0 0/0 .text setBaseMtx__13daLv6SzGate_cFv */ void daLv6SzGate_c::setBaseMtx() { - // NONMATCHING + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z); + mDoMtx_stack_c::transM(-200.0f - field_0x5e4, 0.0f, 0.0f); + + field_0x5a8->setBaseScale(scale); + field_0x5a8->setBaseTRMtx(mDoMtx_stack_c::get()); + mDoMtx_copy(mDoMtx_stack_c::get(), mBgMtx); + + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y + 0x10000 - 0x8000, shape_angle.z); + mDoMtx_stack_c::transM(-200.0f - field_0x5e4, 0.0f, 0.0f); + + field_0x5ac->setBaseScale(scale); + field_0x5ac->setBaseTRMtx(mDoMtx_stack_c::get()); + mDoMtx_copy(mDoMtx_stack_c::get(), mMtx); } -/* ############################################################################################## */ -/* 80C76648-80C7664C 000018 0004+00 2/4 0/0 0/0 .rodata @3697 */ -SECTION_RODATA static f32 const lit_3697 = 1.0f; -COMPILER_STRIP_GATE(0x80C76648, &lit_3697); - -/* 80C7665C-80C7665C 00002C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_80C7665C = "L6SzGate"; -#pragma pop - /* 80C75A54-80C75C0C 0002D4 01B8+00 1/0 0/0 0/0 .text CreateHeap__13daLv6SzGate_cFv */ -void daLv6SzGate_c::CreateHeap() { - // NONMATCHING +int daLv6SzGate_c::CreateHeap() { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L6SzGate", 6); + field_0x5a8 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); + + if (field_0x5a8 == NULL) { + return 0; + } + + field_0x5ac = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); + if (field_0x5ac == NULL) { + return 0; + } + + field_0x5e8 = new dBgW(); + + if (field_0x5e8 != NULL && + !field_0x5e8->Set(static_cast(dComIfG_getObjectRes("L6SzGate", 15)), 1, &mMtx)) + { + field_0x5e8->SetCrrFunc(dBgS_MoveBGProc_TypicalRotY); + } else { + field_0x5e8 = NULL; + return 0; + } + + field_0x5b0.init(modelData, static_cast(dComIfG_getObjectRes("L6SzGate", 9)), + 1, 0, 1.0f, 0, -1); + field_0x5c8.init(modelData, + static_cast(dComIfG_getObjectRes("L6SzGate", 12)), 1, 0, + 1.0f, 0, -1); + + return 1; } -/* ############################################################################################## */ -/* 80C767D8-80C767E4 000008 000C+00 1/1 0/0 0/0 .bss @3621 */ -static u8 lit_3621[12]; - -/* 80C767E4-80C767FC 000014 0018+00 4/4 0/0 0/0 .bss l_HIO */ -static u8 l_HIO[24]; - /* 80C75C0C-80C75DD0 00048C 01C4+00 1/1 0/0 0/0 .text create__13daLv6SzGate_cFv */ -void daLv6SzGate_c::create() { - // NONMATCHING -} +cPhs__Step daLv6SzGate_c::create() { + fopAcM_SetupActor(this, daLv6SzGate_c); -/* 80C75DD0-80C75E18 000650 0048+00 1/0 0/0 0/0 .text __dt__12J3DFrameCtrlFv */ -// J3DFrameCtrl::~J3DFrameCtrl() { -extern "C" void __dt__12J3DFrameCtrlFv() { - // NONMATCHING + cPhs__Step phase = static_cast(dComIfG_resLoad(&mPhase, "L6SzGate")); + if (phase == cPhs_COMPLEATE_e) { + if (MoveBGCreate("L6SzGate", 15, dBgS_MoveBGProc_TypicalRotY, 0x1d80, NULL) == cPhs_ERROR_e) + { + return cPhs_ERROR_e; + } + fopAcM_SetMtx(this, field_0x5a8->getBaseTRMtx()); + fopAcM_setCullSizeBox(this, l_cull_box.min.x, l_cull_box.min.y, l_cull_box.min.z, + l_cull_box.max.x, l_cull_box.max.y, l_cull_box.max.y); + + if (field_0x5e8 != NULL) { + g_dComIfG_gameInfo.play.mBgs.Regist(field_0x5e8, this); + field_0x5e8->Move(); + } + field_0x5e2 = getSw(); + field_0x5e3 = fopAcM_isSwitch(this, field_0x5e2); + field_0x5e4 = 0.0f; + if (field_0x5e3 != 0) { + field_0x5e4 = l_HIO.field_0x10; + init_modeEnd(); + } else { + init_modeWait(); + } + setBaseMtx(); + } + return phase; } /* 80C75E18-80C75E78 000698 0060+00 1/0 0/0 0/0 .text Execute__13daLv6SzGate_cFPPA3_A4_f */ -void daLv6SzGate_c::Execute(f32 (**param_0)[3][4]) { - // NONMATCHING +int daLv6SzGate_c::Execute(Mtx** param_0) { + moveGate(); + *param_0 = &field_0x5a8->getBaseTRMtx(); + setBaseMtx(); + if (field_0x5e8 != NULL) { + field_0x5e8->Move(); + } + return 1; } -/* ############################################################################################## */ -/* 80C767FC-80C76800 00002C 0004+00 1/1 0/0 0/0 .bss None */ -static u8 data_80C767FC[4]; - /* 80C75E78-80C75F64 0006F8 00EC+00 1/1 0/0 0/0 .text moveGate__13daLv6SzGate_cFv */ void daLv6SzGate_c::moveGate() { - // NONMATCHING + typedef void (daLv6SzGate_c::*daLv6SzGate_modeFunc)(); + static daLv6SzGate_modeFunc mode_proc[] = { + &daLv6SzGate_c::modeWait, &daLv6SzGate_c::modeOpenWait0, &daLv6SzGate_c::modeOpenWait, + &daLv6SzGate_c::modeOpen, &daLv6SzGate_c::modeClose, &daLv6SzGate_c::modeEnd, + }; + + (this->*mode_proc[mMode])(); } /* 80C75F64-80C75F70 0007E4 000C+00 2/2 0/0 0/0 .text init_modeWait__13daLv6SzGate_cFv */ void daLv6SzGate_c::init_modeWait() { - // NONMATCHING + mMode = MODE_WAIT; } /* 80C75F70-80C75FC0 0007F0 0050+00 1/0 0/0 0/0 .text modeWait__13daLv6SzGate_cFv */ void daLv6SzGate_c::modeWait() { - // NONMATCHING + if (fopAcM_isSwitch(this, field_0x5e2)) { + init_modeOpenWait0(); + } } /* 80C75FC0-80C75FD8 000840 0018+00 1/1 0/0 0/0 .text init_modeOpenWait0__13daLv6SzGate_cFv */ void daLv6SzGate_c::init_modeOpenWait0() { - // NONMATCHING + field_0x5e1 = getWaitTime(); + mMode = MODE_OPENWAIT0; } /* 80C75FD8-80C76010 000858 0038+00 1/0 0/0 0/0 .text modeOpenWait0__13daLv6SzGate_cFv */ void daLv6SzGate_c::modeOpenWait0() { - // NONMATCHING + if (field_0x5e1 != 0) { + --field_0x5e1; + } else { + init_modeOpenWait(); + } } -/* ############################################################################################## */ -/* 80C7664C-80C76650 00001C 0004+00 2/4 0/0 0/0 .rodata @3843 */ -SECTION_RODATA static f32 const lit_3843 = -1.0f; -COMPILER_STRIP_GATE(0x80C7664C, &lit_3843); - /* 80C76010-80C76094 000890 0084+00 1/1 0/0 0/0 .text init_modeOpenWait__13daLv6SzGate_cFv */ void daLv6SzGate_c::init_modeOpenWait() { - // NONMATCHING + mDoAud_seStart(Z2SE_OBJ_L6_MARIO_GATE_ON, ¤t.pos, 0, + dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + mMode = MODE_OPENWAIT; } /* 80C76094-80C760F0 000914 005C+00 1/0 0/0 0/0 .text modeOpenWait__13daLv6SzGate_cFv */ void daLv6SzGate_c::modeOpenWait() { - // NONMATCHING + int iVar1 = field_0x5b0.play(); + int iVar2 = field_0x5c8.play(); + if (iVar1 == 1 || iVar2 == 1) { + init_modeOpen(); + } } /* 80C760F0-80C760FC 000970 000C+00 1/1 0/0 0/0 .text init_modeOpen__13daLv6SzGate_cFv */ void daLv6SzGate_c::init_modeOpen() { - // NONMATCHING + mMode = MODE_OPEN; } -/* ############################################################################################## */ -/* 80C76650-80C76654 000020 0004+00 0/1 0/0 0/0 .rodata @3879 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3879 = 1.0f / 5.0f; -COMPILER_STRIP_GATE(0x80C76650, &lit_3879); -#pragma pop - -/* 80C76654-80C76658 000024 0004+00 0/1 0/0 0/0 .rodata @3880 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3880 = 0.5f; -COMPILER_STRIP_GATE(0x80C76654, &lit_3880); -#pragma pop - /* 80C760FC-80C7624C 00097C 0150+00 1/0 0/0 0/0 .text modeOpen__13daLv6SzGate_cFv */ void daLv6SzGate_c::modeOpen() { - // NONMATCHING -} + float tmp = cLib_addCalc(&field_0x5e4, l_HIO.field_0x10, 0.2f, l_HIO.mSpeed, 0.5f); + mDoAud_seStartLevel(Z2SE_OBJ_L6_MARIO_GATE_MV, ¤t.pos, 0, + dComIfGp_getReverb(fopAcM_GetRoomNo(this))); -/* ############################################################################################## */ -/* 80C76658-80C7665C 000028 0004+00 0/1 0/0 0/0 .rodata @3901 */ -#pragma push -#pragma force_active on -SECTION_RODATA static f32 const lit_3901 = 5.0f; -COMPILER_STRIP_GATE(0x80C76658, &lit_3901); -#pragma pop + if (tmp == 0.0f) { + mDoAud_seStart(Z2SE_OBJ_L6_MARIO_GATE_OFF, ¤t.pos, 0, + dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + dComIfGp_getVibration().StartShock(l_HIO.mShockStrength, 0xf, cXyz(0.0f, 1.0f, 0.0f)); + init_modeEnd(); + } +} /* 80C7624C-80C76328 000ACC 00DC+00 1/0 0/0 0/0 .text modeClose__13daLv6SzGate_cFv */ void daLv6SzGate_c::modeClose() { - // NONMATCHING + f32 fVar1 = cLib_chaseF(&speedF, l_HIO.field_0x08, l_HIO.field_0x0c); + fVar1 = cLib_addCalc(&field_0x5e4, 0.0f, 1.0f, fopAcM_GetSpeedF(this), 5.0f); + mDoAud_seStartLevel(Z2SE_OBJ_L6_MARIO_GATE_MV, ¤t.pos, 0, + dComIfGp_getReverb(fopAcM_GetRoomNo(this))); + if (fVar1 == 0.0f) { + init_modeWait(); + } } /* 80C76328-80C76344 000BA8 001C+00 2/2 0/0 0/0 .text init_modeEnd__13daLv6SzGate_cFv */ void daLv6SzGate_c::init_modeEnd() { - // NONMATCHING + field_0x5b0.setPlaySpeed(-1.0f); + field_0x5c8.setPlaySpeed(-1.0f); + mMode = MODE_END; } /* 80C76344-80C7637C 000BC4 0038+00 1/0 0/0 0/0 .text modeEnd__13daLv6SzGate_cFv */ void daLv6SzGate_c::modeEnd() { - // NONMATCHING + field_0x5b0.play(); + field_0x5c8.play(); } /* 80C7637C-80C76490 000BFC 0114+00 1/0 0/0 0/0 .text Draw__13daLv6SzGate_cFv */ -void daLv6SzGate_c::Draw() { - // NONMATCHING +int daLv6SzGate_c::Draw() { + g_env_light.settingTevStruct(16, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(field_0x5a8, &tevStr); + g_env_light.setLightTevColorType_MAJI(field_0x5ac, &tevStr); + + J3DModelData* tmp = field_0x5a8->getModelData(); + field_0x5b0.entry(tmp); + field_0x5c8.entry(tmp); + tmp = field_0x5ac->getModelData(); + field_0x5b0.entry(tmp); + field_0x5c8.entry(tmp); + + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(field_0x5a8); + mDoExt_modelUpdateDL(field_0x5ac); + dComIfGd_setList(); + + return 1; } /* 80C76490-80C764F8 000D10 0068+00 1/0 0/0 0/0 .text Delete__13daLv6SzGate_cFv */ -void daLv6SzGate_c::Delete() { - // NONMATCHING +int daLv6SzGate_c::Delete() { + dComIfG_resDelete(&mPhase, "L6SzGate"); + if (field_0x5e8 != NULL) { + if (field_0x5e8->ChkUsed()) { + dComIfG_Bgsp().Release(field_0x5e8); + } + } + return 1; } /* 80C764F8-80C76524 000D78 002C+00 1/0 0/0 0/0 .text daLv6SzGate_Draw__FP13daLv6SzGate_c */ -static void daLv6SzGate_Draw(daLv6SzGate_c* param_0) { - // NONMATCHING +static int daLv6SzGate_Draw(daLv6SzGate_c* i_this) { + return i_this->MoveBGDraw(); } /* 80C76524-80C76544 000DA4 0020+00 1/0 0/0 0/0 .text daLv6SzGate_Execute__FP13daLv6SzGate_c */ -static void daLv6SzGate_Execute(daLv6SzGate_c* param_0) { - // NONMATCHING +static int daLv6SzGate_Execute(daLv6SzGate_c* i_this) { + return i_this->MoveBGExecute(); } /* 80C76544-80C76564 000DC4 0020+00 1/0 0/0 0/0 .text daLv6SzGate_Delete__FP13daLv6SzGate_c */ -static void daLv6SzGate_Delete(daLv6SzGate_c* param_0) { - // NONMATCHING +static int daLv6SzGate_Delete(daLv6SzGate_c* i_this) { + fopAcM_GetID(i_this); + return i_this->MoveBGDelete(); } /* 80C76564-80C76584 000DE4 0020+00 1/0 0/0 0/0 .text daLv6SzGate_Create__FP10fopAc_ac_c */ -static void daLv6SzGate_Create(fopAc_ac_c* param_0) { - // NONMATCHING +static int daLv6SzGate_Create(fopAc_ac_c* i_this) { + fopAcM_GetID(i_this); + return static_cast(i_this)->create(); } -/* 80C76584-80C765E0 000E04 005C+00 2/1 0/0 0/0 .text __dt__17daLv6SzGate_HIO_cFv */ -daLv6SzGate_HIO_c::~daLv6SzGate_HIO_c() { - // NONMATCHING -} +/* 80C76730-80C76750 -00001 0020+00 1/0 0/0 0/0 .data l_daLv6SzGate_Method */ +static actor_method_class l_daLv6SzGate_Method = { + (process_method_func)daLv6SzGate_Create, (process_method_func)daLv6SzGate_Delete, + (process_method_func)daLv6SzGate_Execute, (process_method_func)NULL, + (process_method_func)daLv6SzGate_Draw, +}; -/* 80C765E0-80C7661C 000E60 003C+00 0/0 1/0 0/0 .text __sinit_d_a_obj_lv6SzGate_cpp */ -void __sinit_d_a_obj_lv6SzGate_cpp() { - // NONMATCHING -} - -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80C765E0, __sinit_d_a_obj_lv6SzGate_cpp); -#pragma pop - -/* 80C7665C-80C7665C 00002C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ +/* 80C76750-80C76780 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Lv6SzGate */ +extern actor_process_profile_definition g_profile_Obj_Lv6SzGate = { + fpcLy_CURRENT_e, // mLayerID + 3, // mListID + fpcPi_CURRENT_e, // mListPrio + PROC_Obj_Lv6SzGate, // mProcName + &g_fpcLf_Method.base, // sub_method + sizeof(daLv6SzGate_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // sub_method + 628, // mPriority + &l_daLv6SzGate_Method, // sub_method + 0x00040000, // mStatus + fopAc_ACTOR_e, // mActorType + fopAc_CULLBOX_CUSTOM_e, // cullType +};