From 0f7e070c1421fd540da6f55f1a362b306a34c847 Mon Sep 17 00:00:00 2001 From: gymnast86 Date: Tue, 30 Sep 2025 09:18:33 -0700 Subject: [PATCH] obj_warp_hole work --- include/d/a/npc/d_a_npc_kensei.h | 8 ++ include/d/a/obj/d_a_obj_warp_hole.h | 22 ++++- src/REL/d/a/obj/d_a_obj_warp_hole.cpp | 114 ++++++++++++++++++++++++++ 3 files changed, 143 insertions(+), 1 deletion(-) diff --git a/include/d/a/npc/d_a_npc_kensei.h b/include/d/a/npc/d_a_npc_kensei.h index 2d2c77eb..292f8e31 100644 --- a/include/d/a/npc/d_a_npc_kensei.h +++ b/include/d/a/npc/d_a_npc_kensei.h @@ -10,8 +10,16 @@ public: dAcNpcKensei_c() : mStateMgr(*this, sStateID::null) {} virtual ~dAcNpcKensei_c() {} + static dAcNpcKensei_c* GetInstance() { + return sInstance; + } + private: + static dAcNpcKensei_c *sInstance; + /* 0x??? */ STATE_MGR_DECLARE(dAcNpcKensei_c); }; + + #endif diff --git a/include/d/a/obj/d_a_obj_warp_hole.h b/include/d/a/obj/d_a_obj_warp_hole.h index 1df439af..4defe361 100644 --- a/include/d/a/obj/d_a_obj_warp_hole.h +++ b/include/d/a/obj/d_a_obj_warp_hole.h @@ -2,13 +2,33 @@ #define D_A_OBJ_WARP_HOLE_H #include "d/a/obj/d_a_obj_base.h" +#include "d/col/cc/d_cc_d.h" +#include "toBeSorted/actor_event.h" +#include "toBeSorted/d_emitter.h" class dAcOwarpHole_c : public dAcObjBase_c { public: - dAcOwarpHole_c() {} + dAcOwarpHole_c() : mEvent(*this, nullptr) {} virtual ~dAcOwarpHole_c() {} + virtual bool createHeap() override; + virtual int create() override; + + virtual int doDelete() override; + virtual int actorExecute() override; + virtual int actorExecuteInEvent() override; + virtual int draw() override; + private: + /* 0x330 */ dCcD_Cyl mCcCyl; + /* 0x480 */ EffectsStruct mEff; + /* 0x4B4 */ ActorEventRelated mEvent; + /* 0x504 */ mVec3_c mLinkPos; + /* 0x510 */ u8 mExitListIdx; + /* 0x511 */ u8 mWalkFramesMaybe; + + static dCcD_SrcCyl sCylSrc; + static const float dummy600; }; #endif diff --git a/src/REL/d/a/obj/d_a_obj_warp_hole.cpp b/src/REL/d/a/obj/d_a_obj_warp_hole.cpp index 958f7d87..3092cdd7 100644 --- a/src/REL/d/a/obj/d_a_obj_warp_hole.cpp +++ b/src/REL/d/a/obj/d_a_obj_warp_hole.cpp @@ -1,3 +1,117 @@ #include "d/a/obj/d_a_obj_warp_hole.h" +#include "c/c_lib.h" +#include "d/a/d_a_player.h" +#include "d/a/npc/d_a_npc_talk_kensei.h" +#include "d/col/cc/d_cc_s.h" +#include "d/d_sc_game.h" +#include "toBeSorted/event_manager.h" + SPECIAL_ACTOR_PROFILE(OBJ_WARP_HOLE, dAcOwarpHole_c, fProfile::OBJ_WARP_HOLE, 0x25C, 0, 0); + +dCcD_SrcCyl dAcOwarpHole_c::sCylSrc = { + /* mObjInf */ + {/* mObjAt */ {0, 0, {0, 0, 0}, 0, 0, 0, 0, 0, 0}, + /* mObjTg */ + {~(AT_TYPE_BUGNET | AT_TYPE_0x80000 | AT_TYPE_BEETLE | AT_TYPE_WIND | AT_TYPE_0x8000), 0x111, {0, 0, 0x407}, 0, 0}, + /* mObjCo */ {0x29}}, + /* mCylInf */ + {320.f, 300.f} +}; + +// Unused(?) 600.0f float at start of rodata +const float dAcOwarpHole_c::dummy600 = 600.0f; + +bool dAcOwarpHole_c::createHeap() { + return true; +} + +int dAcOwarpHole_c::create() { + mExitListIdx = mParams; + CREATE_ALLOCATOR(dAcOwarpHole_c); + mStts.SetRank(0xD); + mCcCyl.Set(sCylSrc); + mCcCyl.SetStts(mStts); + dCcS::GetInstance()->Set(&mCcCyl); + mCcCyl.OnCoSet(); + mCcCyl.ClrTgSet(); + mLinkPos = dAcPy_c::GetLink()->mPosition; + mEff.init(this); + mWalkFramesMaybe = 0; + mPositionCopy2 = mPosition; + mPositionCopy2.y += 170.0f; + mPositionCopy3 = mPositionCopy2; + + return SUCCEEDED; +} + +int dAcOwarpHole_c::doDelete() { + return SUCCEEDED; +} + +int dAcOwarpHole_c::actorExecute() { + if (!dAcPy_c::GetLink()->checkObjectProperty(0x200) && getDistanceTo(dAcPy_c::GetLinkM()->mPosition) < 600.0f) { + Event ev = Event("BeforeLastBossBattleTalk", 100, 0x100001, nullptr, nullptr); + EventManager::alsoSetAsCurrentEvent(dAcNpcTalkKensei_c::GetInstance(), &ev, nullptr); + } + + dCcS::GetInstance()->Set(&mCcCyl); + updateMatrix(); + mEff.createContinuousEffect(PARTICLE_RESOURCE_ID_MAPPING_914_, mWorldMtx, nullptr, nullptr); + holdSound(0xC90); + + return SUCCEEDED; +} + +int dAcOwarpHole_c::actorExecuteInEvent() { + mEff.createContinuousEffect(PARTICLE_RESOURCE_ID_MAPPING_914_, mWorldMtx, nullptr, nullptr); + holdSound(0xC90); + bool advance = mEvent.isAdvance(); + mPositionCopy2 = mPosition; + mPositionCopy2.y += 170.0f; + s16 targetAngleY; + + switch (mEvent.getCurrentEventCommand()) { + case 'none': mEvent.advanceNext(); break; + case 'plwk': + if (advance) { + mLinkPos = dAcPy_c::GetLink()->mPosition; + targetAngleY = cLib::targetAngleY(mPosition, dAcPy_c::GetLink()->mPosition); + mLinkPos.x += 330.0f * nw4r::math::SinIdx(targetAngleY); + mLinkPos.z += 330.0f * nw4r::math::CosIdx(targetAngleY); + } + if (EventManager::isInEvent()) { + if (EventManager::isCurrentEvent("BeforeLastBossBattleChicken")) { + dAcPy_c::GetLinkM()->vt_0x2AC(); + dAcPy_c::GetLinkM()->triggerMoveEventMaybe(); // TODO: parameters + } + } + if (dAcPy_c::GetLinkM()->mPosition.absXZTo(mLinkPos) < 10.0f) { + mEvent.advanceNext(); + } + break; + case 'warp': + if (advance) { + dJEffManager_c::spawnEffect(PARTICLE_RESOURCE_ID_MAPPING_916_, mWorldMtx, nullptr, nullptr, 0, 0); + mWalkFramesMaybe = 80; + } + if (mWalkFramesMaybe) { + mWalkFramesMaybe -= 1; + } + if (mWalkFramesMaybe == 77) { + dAcPy_c::GetLinkM()->setObjectProperty(OBJ_PROP_0x200); + } + if (mWalkFramesMaybe == 20) { + dScGame_c::GetInstance()->triggerExit(mRoomID, mExitListIdx); + } + if (!mWalkFramesMaybe) { + mEvent.advanceNext(); + } + } + + return SUCCEEDED; +} + +int dAcOwarpHole_c::draw() { + return SUCCEEDED; +}