diff --git a/config/SOUE01/rels/d_a_obj_bellNP/symbols.txt b/config/SOUE01/rels/d_a_obj_bellNP/symbols.txt index d78fc105..fd35cb4f 100644 --- a/config/SOUE01/rels/d_a_obj_bellNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_bellNP/symbols.txt @@ -8,13 +8,13 @@ __dt__23sFState_c<10dAcObell_c>Fv = .text:0x000001E0; // type:function size:0x58 __dt__26sFStateFct_c<10dAcObell_c>Fv = .text:0x00000240; // type:function size:0x6C __dt__79sStateMgr_c<10dAcObell_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x000002B0; // type:function size:0xA0 __dt__49sFStateMgr_c<10dAcObell_c,20sStateMethodUsr_FI_c>Fv = .text:0x00000350; // type:function size:0xA4 -AcObell__initModels = .text:0x00000400; // type:function size:0xFC -AcObell__init = .text:0x00000500; // type:function size:0x1A4 +createHeap__10dAcObell_cFv = .text:0x00000400; // type:function size:0xFC +create__10dAcObell_cFv = .text:0x00000500; // type:function size:0x1A4 changeState__79sStateMgr_c<10dAcObell_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x000006B0; // type:function size:0x10 -fn_417_6C0 = .text:0x000006C0; // type:function size:0x8 -AcObell__update = .text:0x000006D0; // type:function size:0x10C +doDelete__10dAcObell_cFv = .text:0x000006C0; // type:function size:0x8 +execute__10dAcObell_cFv = .text:0x000006D0; // type:function size:0x10C executeState__79sStateMgr_c<10dAcObell_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x000007E0; // type:function size:0x10 -AcObell__draw = .text:0x000007F0; // type:function size:0x28 +draw__10dAcObell_cFv = .text:0x000007F0; // type:function size:0x28 initializeState_Wait__10dAcObell_cFv = .text:0x00000820; // type:function size:0xC executeState_Wait__10dAcObell_cFv = .text:0x00000830; // type:function size:0x17C finalizeState_Wait__10dAcObell_cFv = .text:0x000009B0; // type:function size:0x4 diff --git a/include/d/a/obj/d_a_obj_bell.h b/include/d/a/obj/d_a_obj_bell.h index 45cdbae5..79b5a4bf 100644 --- a/include/d/a/obj/d_a_obj_bell.h +++ b/include/d/a/obj/d_a_obj_bell.h @@ -2,19 +2,39 @@ #define D_A_OBJ_BELL_H #include "d/a/obj/d_a_obj_base.h" +#include "d/col/bg/d_bg_w.h" +#include "d/col/cc/d_cc_d.h" +#include "m/m3d/m_smdl.h" +#include "m/m_vec.h" +#include "nw4r/g3d/res/g3d_resfile.h" #include "s/s_State.hpp" +#include "toBeSorted/dowsing_target.h" class dAcObell_c : public dAcObjBase_c { public: - dAcObell_c() : mStateMgr(*this) {} + dAcObell_c() : mStateMgr(*this), mDowsingTarget(this, DowsingTarget::SLOT_NONE) {} virtual ~dAcObell_c() {} + virtual int create() override; + virtual int doDelete() override; + virtual int draw() override; + virtual bool createHeap() override; + virtual int actorExecute() override; + STATE_FUNC_DECLARE(dAcObell_c, Wait); STATE_FUNC_DECLARE(dAcObell_c, WaitRupee); STATE_FUNC_DECLARE(dAcObell_c, After); private: - /* 0x??? */ STATE_MGR_DECLARE(dAcObell_c); + /* 0x330 */ nw4r::g3d::ResFile mResFile; + /* 0x334 */ m3d::smdl_c mMdl; + /* 0x350 */ dBgW mBgW; + /* 0x560 */ dCcD_Sph mSph; + /* 0x6B0 */ STATE_MGR_DECLARE(dAcObell_c); + /* 0x6EC */ DowsingTarget mDowsingTarget; + /* 0x70C */ mVec3_c mRupeeDir; + /* 0x718 */ mVec3_c field_0x718; + /* 0x### */ // More }; #endif diff --git a/src/REL/d/a/obj/d_a_obj_bell.cpp b/src/REL/d/a/obj/d_a_obj_bell.cpp index a23ab54e..735903c4 100644 --- a/src/REL/d/a/obj/d_a_obj_bell.cpp +++ b/src/REL/d/a/obj/d_a_obj_bell.cpp @@ -1,11 +1,71 @@ #include "d/a/obj/d_a_obj_bell.h" +#include "common.h" +#include "d/a/obj/d_a_obj_base.h" +#include "d/col/bg/d_bg_plc.h" +#include "d/col/bg/d_bg_s.h" +#include "d/col/bg/d_bg_w.h" +#include "d/col/cc/d_cc_d.h" +#include "d/d_stage.h" +#include "f/f_base.h" +#include "m/m_vec.h" +#include "nw4r/g3d/res/g3d_resfile.h" +#include "nw4r/g3d/res/g3d_resmdl.h" +#include "toBeSorted/arc_managers/current_stage_arc_manager.h" +#include "toBeSorted/dowsing_target.h" + SPECIAL_ACTOR_PROFILE(OBJ_BELL, dAcObell_c, fProfile::OBJ_BELL, 0x208, 0, 2); STATE_DEFINE(dAcObell_c, Wait); STATE_DEFINE(dAcObell_c, WaitRupee); STATE_DEFINE(dAcObell_c, After); +static dCcD_SrcSph sSrcSph = { + // TODO +}; + +bool dAcObell_c::createHeap() { + mResFile = nw4r::g3d::ResFile(CurrentStageArcManager::GetInstance()->getData("g3d/stage.brres")); + dStage_c::bindStageResToFile(&mResFile); + dStage_c::bindSkyCmnToResFile(&mResFile); + + nw4r::g3d::ResMdl resMdl = mResFile.GetResMdl("StageF000Bell"); + TRY_CREATE(mMdl.create(resMdl, &mAllocator, 0x120)); + + cBgD_t *dzb = (cBgD_t *)CurrentStageArcManager::GetInstance()->getData("dzb/StageF000Bell.dzb"); + PLC *plc = (PLC *)CurrentStageArcManager::GetInstance()->getData("dat/StageF000Bell.plc"); + updateMatrix(); + + TRY_CREATE(!(BOOL)mBgW.Set(dzb, plc, 1, &mWorldMtx, &mScale)); + + return true; +} + +int dAcObell_c::create() { + CREATE_ALLOCATOR(dAcObell_c); + + mBgW.SetCrrFunc(dBgS_MoveBGProc_Typical); + dBgS::GetInstance()->Regist(&mBgW, this); + + mStts.SetRank(13); + mSph.Set(sSrcSph); + mSph.SetStts(mStts); + + mRupeeDir = mVec3_c(0.f, -300.f, 0.f); + field_0x718 = mVec3_c(0.f, -210.f, 0.f); + + mDowsingTarget.initialize(DowsingTarget::SLOT_RUPEE, 0, nullptr, 0.f); + mDowsingTarget.doRegister(); + mDowsingTarget.setOffset(mVec3_c::Ey * -150.f); + + mStateMgr.changeState(StateID_Wait); + + mMdl.setPriorityDraw(0x1C, 9); + mBoundingBox.Set(mVec3_c(-160.f, -320.f, -160.f), mVec3_c(160.f, 10.f, 160.f)); + mCullingDistance = 50000.f; + return SUCCEEDED; +} + void dAcObell_c::initializeState_Wait() {} void dAcObell_c::executeState_Wait() {} void dAcObell_c::finalizeState_Wait() {}