diff options
| -rw-r--r-- | configure.py | 2 | ||||
| -rw-r--r-- | include/d/actor/d_a_deku_item.h | 39 | ||||
| -rw-r--r-- | src/d/actor/d_a_deku_item.cpp | 227 |
3 files changed, 236 insertions, 32 deletions
diff --git a/configure.py b/configure.py index 0eac1193..f30fb5b9 100644 --- a/configure.py +++ b/configure.py @@ -1416,7 +1416,7 @@ config.libs = [ ActorRel(NonMatching, "d_a_bwds"), ActorRel(NonMatching, "d_a_daiocta"), ActorRel(NonMatching, "d_a_daiocta_eye"), - ActorRel(NonMatching, "d_a_deku_item"), + ActorRel(Matching, "d_a_deku_item", extra_cflags=['-pragma "nosyminline on"']), ActorRel(NonMatching, "d_a_dk"), ActorRel(Matching, "d_a_dummy"), ActorRel(NonMatching, "d_a_fallrock_tag"), diff --git a/include/d/actor/d_a_deku_item.h b/include/d/actor/d_a_deku_item.h index 91645654..eb09fc72 100644 --- a/include/d/actor/d_a_deku_item.h +++ b/include/d/actor/d_a_deku_item.h @@ -1,12 +1,25 @@ #ifndef D_A_DEKU_ITEM_H #define D_A_DEKU_ITEM_H -#include "f_op/f_op_actor.h" +#include "d/d_bg_s_acch.h" +#include "d/d_cc_d.h" +#include "d/d_particle.h" +#include "f_op/f_op_actor_mng.h" +#include "m_Do/m_Do_ext.h" class daDekuItem_c : public fopAc_ac_c { public: + typedef void (daDekuItem_c::*ModeFunc)(); + + enum Mode_e { + Mode_WAIT_e, + Mode_GETDEMO_INIT_e, + Mode_GETDEMO_WAIT_e, + Mode_GETDEMO_e, + }; + BOOL _delete(); - void CreateHeap(); + BOOL CreateHeap(); void CreateInit(); s32 _create(); void set_mtx(); @@ -20,8 +33,28 @@ public: void checkOrder(); BOOL _draw(); + static const char m_arcname[]; + public: - /* Place member variables here */ + /* 0x290 */ request_of_phase_process_class mPhs; + /* 0x298 */ J3DModel* mpModel; + /* 0x29C */ mDoExt_bckAnm mBck1; + /* 0x2AC */ mDoExt_bckAnm mBck2; + /* 0x2BC */ dBgS_ObjAcch mAcch; + /* 0x480 */ dBgS_AcchCir mAcchCir; + /* 0x4C0 */ dCcD_Stts mStts; + /* 0x4FC */ dCcD_Cyl mCyl; + /* 0x62C */ Mode_e mMode; + /* 0x630 */ BOOL unk630; + /* 0x634 */ s32 mItemBitNo; + /* 0x638 */ uint mItemPID; + /* 0x63C */ JPABaseEmitter* mpEmitter; +}; + +namespace daDekuItem_prm { +inline u8 getItemBitNo(daDekuItem_c* ac) { + return (fopAcM_GetParam(ac) >> 0) & 0xFF; +} }; #endif /* D_A_DEKU_ITEM_H */ diff --git a/src/d/actor/d_a_deku_item.cpp b/src/d/actor/d_a_deku_item.cpp index eccced29..17ca4683 100644 --- a/src/d/actor/d_a_deku_item.cpp +++ b/src/d/actor/d_a_deku_item.cpp @@ -4,106 +4,277 @@ // #include "d/actor/d_a_deku_item.h" +#include "d/res/res_deku.h" +#include "d/d_com_inf_game.h" #include "d/d_procname.h" +// Needed for the .data section to match. +static f32 dummy1[3] = {1.0f, 1.0f, 1.0f}; +static f32 dummy2[3] = {1.0f, 1.0f, 1.0f}; +static u8 dummy3[4] = {0x02, 0x00, 0x02, 0x01}; +static f64 dummy4[2] = {3.0, 0.5}; + +const char daDekuItem_c::m_arcname[] = "Deku"; + +static dCcD_SrcCyl l_cyl_src = { + // dCcD_SrcGObjInf + { + /* Flags */ 0, + /* SrcObjAt Type */ 0, + /* SrcObjAt Atp */ 0, + /* SrcObjAt SPrm */ 0, + /* SrcObjTg Type */ AT_TYPE_ALL, + /* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_OTHER, + /* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK8 | CO_SPRM_VS_UNK2, + /* SrcGObjAt Se */ 0, + /* SrcGObjAt HitMark */ 0, + /* SrcGObjAt Spl */ 0, + /* SrcGObjAt Mtrl */ 0, + /* SrcGObjAt SPrm */ 0, + /* SrcGObjTg Se */ 0, + /* SrcGObjTg HitMark */ 0, + /* SrcGObjTg Spl */ 0, + /* SrcGObjTg Mtrl */ 0, + /* SrcGObjTg SPrm */ G_TG_SPRM_NO_HIT_MARK, + /* SrcGObjCo SPrm */ 0, + }, + // cCcD_SrcCylAttr + { + /* Center */ 0.0f, 0.0f, 0.0f, + /* Radius */ 50.0f, + /* Height */ 100.0f, + }}; + /* 00000078-000000D0 .text _delete__12daDekuItem_cFv */ BOOL daDekuItem_c::_delete() { - /* Nonmatching */ + if (mpEmitter != NULL) { + mpEmitter->becomeInvalidEmitter(); + mpEmitter = NULL; + } + + dComIfG_resDelete(&mPhs, m_arcname); + + return TRUE; } /* 000000D0-000000F0 .text CheckCreateHeap__FP10fopAc_ac_c */ -static BOOL CheckCreateHeap(fopAc_ac_c*) { - /* Nonmatching */ +static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { + return static_cast<daDekuItem_c*>(i_this)->CreateHeap(); } /* 000000F0-000002C8 .text CreateHeap__12daDekuItem_cFv */ -void daDekuItem_c::CreateHeap() { - /* Nonmatching */ +BOOL daDekuItem_c::CreateHeap() { + J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, DEKU_BDL_VLFDM); + JUT_ASSERT(0xF4, modelData != 0); + + mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203U); + + if (!mpModel) { + return FALSE; + } + + J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arcname, DEKU_BCK_VLFDK); + JUT_ASSERT(0x103, pbck != 0); + + if (!mBck1.init(modelData, pbck, TRUE, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f, 0, -1, false)) { + return FALSE; + } + + pbck = (J3DAnmTransform*)dComIfG_getObjectRes(m_arcname, DEKU_BCK_VLFDM); + JUT_ASSERT(0x110, pbck != 0); + + if (!mBck2.init(modelData, pbck, TRUE, J3DFrameCtrl::LOOP_ONCE_e, 1.0f, 0, -1, false)) { + return FALSE; + } + + return TRUE; } /* 000002C8-000003A8 .text CreateInit__12daDekuItem_cFv */ void daDekuItem_c::CreateInit() { - /* Nonmatching */ + fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); + + fopAcM_setCullSizeBox(this, -50.0f, 0.0f, -50.0f, 50.0f, 100.0f, 50.0f); + mStts.Init(0xFF, 0xFF, this); + + mCyl.Set(l_cyl_src); + mCyl.SetStts(&mStts); + mAcchCir.SetWall(50.0f, 50.0f); + mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir, fopAcM_GetSpeed_p(this)); + + set_mtx(); + + mMode = Mode_WAIT_e; + fopAcM_SetGravity(this, -3.0f); } /* 000003A8-00000598 .text _create__12daDekuItem_cFv */ s32 daDekuItem_c::_create() { - /* Nonmatching */ + fopAcM_SetupActor(this, daDekuItem_c); + + mItemBitNo = daDekuItem_prm::getItemBitNo(this); + + if (fopAcM_isItem(this, mItemBitNo)) { + return cPhs_ERROR_e; + } + + if (!dComIfGs_isEventBit(0x1801U)) { + return cPhs_ERROR_e; + } + + s32 phase_state = dComIfG_resLoad(&mPhs, m_arcname); + + if (phase_state == cPhs_COMPLEATE_e) { + if (!fopAcM_entrySolidHeap(this, CheckCreateHeap, 0x5000)) { + return cPhs_ERROR_e; + } + + CreateInit(); + } + + return phase_state; } /* 00000948-000009C8 .text set_mtx__12daDekuItem_cFv */ void daDekuItem_c::set_mtx() { - /* Nonmatching */ + mpModel->setBaseScale(scale); + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::YrotM(current.angle.y); + + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } /* 000009C8-00000A74 .text _execute__12daDekuItem_cFv */ BOOL daDekuItem_c::_execute() { - /* Nonmatching */ + eyePos = current.pos; + fopAcM_posMoveF(this, mStts.GetCCMoveP()); + mAcch.CrrPos(*dComIfG_Bgsp()); + + checkOrder(); + mode_proc_call(); + eventOrder(); + + set_mtx(); + mBck1.setFrame(mBck1.getEndFrame()); + + return TRUE; } /* 00000A74-00000B30 .text mode_proc_call__12daDekuItem_cFv */ void daDekuItem_c::mode_proc_call() { - /* Nonmatching */ + static ModeFunc mode_proc[] = { + &mode_wait, + &mode_getdemo_init, + &mode_getdemo_wait, + &mode_getdemo, + }; + + (this->*mode_proc[mMode])(); } /* 00000B30-00000C50 .text mode_wait__12daDekuItem_cFv */ void daDekuItem_c::mode_wait() { - /* Nonmatching */ + if (mCyl.ChkCoHit()) { + mMode = Mode_GETDEMO_INIT_e; + } + + if (mpEmitter == NULL) { + mpEmitter = dComIfGp_particle_set(0x820F, ¤t.pos); + } else if (mpEmitter != NULL) { + mpEmitter->setGlobalTranslation(current.pos); + } + + fopAcM_seStart(this, JA_SE_OBJ_DEKU_HA_LIGHT, 0); + mCyl.SetC(current.pos); + dComIfG_Ccsp()->Set(&mCyl); } /* 00000C50-00000CB8 .text mode_getdemo_init__12daDekuItem_cFv */ void daDekuItem_c::mode_getdemo_init() { - /* Nonmatching */ + fopAcM_offDraw(this); + + if (mpEmitter != NULL) { + mpEmitter->becomeInvalidEmitter(); + mpEmitter = NULL; + } + + mMode = Mode_GETDEMO_WAIT_e; + unk630 = TRUE; } /* 00000CB8-00000D34 .text mode_getdemo_wait__12daDekuItem_cFv */ void daDekuItem_c::mode_getdemo_wait() { - /* Nonmatching */ + if (!unk630) { + mItemPID = fopAcM_createItemForTrBoxDemo(¤t.pos, dItem_DEKU_LEAF_e, -1, fopAcM_GetRoomNo(this)); + + if (mItemPID != fpcM_ERROR_PROCESS_ID_e) { + dComIfGp_event_setItemPartnerId(mItemPID); + } + + mMode = Mode_GETDEMO_e; + } } /* 00000D34-00000D38 .text mode_getdemo__12daDekuItem_cFv */ -void daDekuItem_c::mode_getdemo() { - /* Nonmatching */ -} +void daDekuItem_c::mode_getdemo() {} /* 00000D38-00000D94 .text eventOrder__12daDekuItem_cFv */ void daDekuItem_c::eventOrder() { - /* Nonmatching */ + if (unk630 == TRUE) { + fopAcM_orderOtherEvent(this, "DEFAULT_GETITEM"); + eventInfo.onCondition(dEvtCnd_UNK2_e); + } } /* 00000D94-00000E54 .text checkOrder__12daDekuItem_cFv */ void daDekuItem_c::checkOrder() { - /* Nonmatching */ + if (eventInfo.checkCommandDemoAccrpt()) { + if (dComIfGp_evmng_startCheck("DEFAULT_GETITEM") && unk630) { + unk630 = FALSE; + } + + if (dComIfGp_evmng_endCheck("DEFAULT_GETITEM")) { + dComIfGp_event_reset(); + fopAcM_delete(this); + fopAcM_onItem(this, mItemBitNo); + } + } } /* 00000E54-00000ECC .text _draw__12daDekuItem_cFv */ BOOL daDekuItem_c::_draw() { - /* Nonmatching */ + g_env_light.settingTevStruct(TEV_TYPE_ACTOR, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType(mpModel, &tevStr); + + mBck1.entry(mpModel->getModelData()); + mDoExt_modelUpdateDL(mpModel); + + return TRUE; } /* 00000ECC-00000EEC .text daDekuItem_Create__FPv */ -static s32 daDekuItem_Create(void*) { - /* Nonmatching */ +static s32 daDekuItem_Create(void* i_this) { + return static_cast<daDekuItem_c*>(i_this)->_create(); } /* 00000EEC-00000F10 .text daDekuItem_Delete__FPv */ -static BOOL daDekuItem_Delete(void*) { - /* Nonmatching */ +static BOOL daDekuItem_Delete(void* i_this) { + return (u8) static_cast<daDekuItem_c*>(i_this)->_delete(); } /* 00000F10-00000F34 .text daDekuItem_Draw__FPv */ -static BOOL daDekuItem_Draw(void*) { - /* Nonmatching */ +static BOOL daDekuItem_Draw(void* i_this) { + return (u8) static_cast<daDekuItem_c*>(i_this)->_draw(); } /* 00000F34-00000F58 .text daDekuItem_Execute__FPv */ -static BOOL daDekuItem_Execute(void*) { - /* Nonmatching */ +static BOOL daDekuItem_Execute(void* i_this) { + return (u8) static_cast<daDekuItem_c*>(i_this)->_execute(); } /* 00000F58-00000F60 .text daDekuItem_IsDelete__FPv */ static BOOL daDekuItem_IsDelete(void*) { - /* Nonmatching */ + return TRUE; } static actor_method_class daDekuItemMethodTable = { |