From 7587ab0ddccad4420e13059f51063d48b467d4f3 Mon Sep 17 00:00:00 2001 From: Swekka Date: Sun, 22 Jun 2025 23:03:10 +0200 Subject: [PATCH] d_a_obj_hole OK --- config/SOUE01/rels/d_a_obj_holeNP/symbols.txt | 34 ++++++------ configure.py | 2 +- include/d/a/obj/d_a_obj_hole.h | 17 +++++- src/REL/d/a/obj/d_a_obj_hole.cpp | 54 +++++++++++++++++++ 4 files changed, 88 insertions(+), 19 deletions(-) diff --git a/config/SOUE01/rels/d_a_obj_holeNP/symbols.txt b/config/SOUE01/rels/d_a_obj_holeNP/symbols.txt index 997b66b3..e864b895 100644 --- a/config/SOUE01/rels/d_a_obj_holeNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_holeNP/symbols.txt @@ -8,13 +8,13 @@ __dt__23sFState_c<10dAcOhole_c>Fv = .text:0x000001C0; // type:function size:0x58 __dt__26sFStateFct_c<10dAcOhole_c>Fv = .text:0x00000220; // type:function size:0x6C __dt__79sStateMgr_c<10dAcOhole_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000290; // type:function size:0xA0 __dt__49sFStateMgr_c<10dAcOhole_c,20sStateMethodUsr_FI_c>Fv = .text:0x00000330; // type:function size:0xA4 -fn_198_3E0 = .text:0x000003E0; // type:function size:0xA4 -fn_198_490 = .text:0x00000490; // type:function size:0x128 +createHeap__10dAcOhole_cFv = .text:0x000003E0; // type:function size:0xA4 +create__10dAcOhole_cFv = .text:0x00000490; // type:function size:0x128 changeState__79sStateMgr_c<10dAcOhole_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x000005C0; // type:function size:0x10 -fn_198_5D0 = .text:0x000005D0; // type:function size:0x8 -fn_198_5E0 = .text:0x000005E0; // type:function size:0x30 +doDelete__10dAcOhole_cFv = .text:0x000005D0; // type:function size:0x8 +actorExecute__10dAcOhole_cFv = .text:0x000005E0; // type:function size:0x30 executeState__79sStateMgr_c<10dAcOhole_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000610; // type:function size:0x10 -fn_198_620 = .text:0x00000620; // type:function size:0x28 +draw__10dAcOhole_cFv = .text:0x00000620; // type:function size:0x28 initializeState_Wait__10dAcOhole_cFv = .text:0x00000650; // type:function size:0x4 executeState_Wait__10dAcOhole_cFv = .text:0x00000660; // type:function size:0x4 finalizeState_Wait__10dAcOhole_cFv = .text:0x00000670; // type:function size:0x4 @@ -40,17 +40,17 @@ isSameName__25sFStateID_c<10dAcOhole_c>CFPCc = .text:0x00000AB0; // type:functio _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global -lbl_198_rodata_0 = .rodata:0x00000000; // type:object size:0xC data:float +lbl_198_rodata_0 = .rodata:0x00000000; // type:object size:0xC scope:local data:float g_profile_OBJ_HOLE = .data:0x00000000; // type:object size:0x10 data:4byte -lbl_198_data_10 = .data:0x00000010; // type:object size:0x4 -lbl_198_data_14 = .data:0x00000014; // type:object size:0x14 -lbl_198_data_28 = .data:0x00000028; // type:object size:0x18 data:string -lbl_198_data_40 = .data:0x00000040; // type:object size:0x80 -lbl_198_data_C0 = .data:0x000000C0; // type:object size:0x30 -lbl_198_data_F0 = .data:0x000000F0; // type:object size:0x30 -lbl_198_data_120 = .data:0x00000120; // type:object size:0x18 -lbl_198_data_138 = .data:0x00000138; // type:object size:0x58 -lbl_198_data_190 = .data:0x00000190; // type:object size:0x34 +lbl_198_data_10 = .data:0x00000010; // type:object size:0x4 scope:local +lbl_198_data_14 = .data:0x00000014; // type:object size:0x14 scope:local +lbl_198_data_28 = .data:0x00000028; // type:object size:0x18 scope:local data:string +__vt__10dAcOhole_c = .data:0x00000040; // type:object size:0x80 +__vt__49sFStateMgr_c<10dAcOhole_c,20sStateMethodUsr_FI_c> = .data:0x000000C0; // type:object size:0x30 +__vt__79sStateMgr_c<10dAcOhole_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c> = .data:0x000000F0; // type:object size:0x30 +lbl_198_data_120 = .data:0x00000120; // type:object size:0x18 scope:local +lbl_198_data_138 = .data:0x00000138; // type:object size:0x58 scope:local +__vt__25sFStateID_c<10dAcOhole_c> = .data:0x00000190; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_198_bss_8 = .bss:0x00000008; // type:object size:0x10 -lbl_198_bss_18 = .bss:0x00000018; // type:object size:0x30 data:4byte +lbl_198_bss_8 = .bss:0x00000008; // type:object size:0x10 scope:local +lbl_198_bss_18 = .bss:0x00000018; // type:object size:0x30 scope:local data:4byte diff --git a/configure.py b/configure.py index 71c72273..88b593ed 100644 --- a/configure.py +++ b/configure.py @@ -2104,7 +2104,7 @@ config.libs = [ Rel(NonMatching, "d_a_obj_harp_hint", "REL/d/a/obj/d_a_obj_harp_hint.cpp"), Rel(NonMatching, "d_a_obj_himo", "REL/d/a/obj/d_a_obj_himo.cpp"), Rel(NonMatching, "d_a_obj_hit_lever_sw", "REL/d/a/obj/d_a_obj_hit_lever_sw.cpp"), - Rel(NonMatching, "d_a_obj_hole", "REL/d/a/obj/d_a_obj_hole.cpp"), + Rel(Matching, "d_a_obj_hole", "REL/d/a/obj/d_a_obj_hole.cpp"), Rel(NonMatching, "d_a_obj_hole_minigame", "REL/d/a/obj/d_a_obj_hole_minigame.cpp"), Rel(Matching, "d_a_obj_impa_door", "REL/d/a/obj/d_a_obj_impa_door.cpp"), Rel(NonMatching, "d_a_obj_insect_island", "REL/d/a/obj/d_a_obj_insect_island.cpp"), diff --git a/include/d/a/obj/d_a_obj_hole.h b/include/d/a/obj/d_a_obj_hole.h index 55b261cf..56d4eb29 100644 --- a/include/d/a/obj/d_a_obj_hole.h +++ b/include/d/a/obj/d_a_obj_hole.h @@ -2,6 +2,9 @@ #define D_A_OBJ_HOLE_H #include "d/a/obj/d_a_obj_base.h" +#include "d/col/bg/d_bg_s_acch.h" +#include "m/m3d/m_smdl.h" +#include "nw4r/g3d/res/g3d_resfile.h" #include "s/s_State.hpp" #include "s/s_StateMgr.hpp" @@ -10,10 +13,22 @@ public: dAcOhole_c() : mStateMgr(*this, sStateID::null) {} virtual ~dAcOhole_c() {} + virtual bool createHeap() override; + virtual int create() override; + virtual int doDelete() override; + virtual int actorExecute() override; + virtual int draw() override; + STATE_FUNC_DECLARE(dAcOhole_c, Wait); private: - /* 0x??? */ STATE_MGR_DECLARE(dAcOhole_c); + /* 0x330 */ nw4r::g3d::ResFile mResFile; + /* 0x334 */ m3d::smdl_c mMdl; + /* 0x350 */ STATE_MGR_DECLARE(dAcOhole_c); + /* 0x38C */ dBgS_AcchCir mAcchCir; + /* 0x3E8 */ dBgS_ObjAcch mObjAcch; + /* 0x798 */ u8 field_0x798; + /* 0x799 */ u8 field_0x799; }; #endif diff --git a/src/REL/d/a/obj/d_a_obj_hole.cpp b/src/REL/d/a/obj/d_a_obj_hole.cpp index 0d3a1452..436a9938 100644 --- a/src/REL/d/a/obj/d_a_obj_hole.cpp +++ b/src/REL/d/a/obj/d_a_obj_hole.cpp @@ -1,9 +1,63 @@ #include "d/a/obj/d_a_obj_hole.h" +#include "d/a/obj/d_a_obj_base.h" +#include "d/col/bg/d_bg_s.h" +#include "d/col/bg/d_bg_s_gnd_chk.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" + SPECIAL_ACTOR_PROFILE(OBJ_HOLE, dAcOhole_c, fProfile::OBJ_HOLE, 0xF7, 0, 258); STATE_DEFINE(dAcOhole_c, Wait); +bool dAcOhole_c::createHeap() { + void *data = getOarcResFile("Or"); + mResFile = nw4r::g3d::ResFile(data); + nw4r::g3d::ResMdl mdl = mResFile.GetResMdl("octarock_hole"); + bool ok = mMdl.create(mdl, &heap_allocator, 0x20, 1, nullptr); + if (!ok) { + return ok; + } + updateMatrix(); + mMdl.setScale(mScale); + mMdl.setLocalMtx(mWorldMtx); + return ok; +} + +int dAcOhole_c::create() { + CREATE_ALLOCATOR(dAcOhole_c); + + u8 params1 = getFromParams(0, 3); + field_0x798 = params1 != 3 ? params1 : 0; + + u8 params2 = getFromParams(2, 0xF); + field_0x799 = params2 != (s8)0xF ? params2 : 0xFF; + + boundingBox.Set(mVec3_c(-200.0f, -200.0f, -200.0f), mVec3_c(200.0f, 200.0f, 200.0f)); + mObjAcch.Set(this, 1, &mAcchCir); + mAcchCir.SetWall(100.0f, 100.0f); + mObjAcch.CrrPos(*dBgS::GetInstance()); + dBgS_ObjGndChk::CheckPos(position); + mStateMgr.changeState(StateID_Wait); + return SUCCEEDED; +} + +int dAcOhole_c::doDelete() { + return SUCCEEDED; +} + +int dAcOhole_c::actorExecute() { + mStateMgr.executeState(); + return SUCCEEDED; +} + +int dAcOhole_c::draw() { + drawModelType1(&mMdl); + return SUCCEEDED; +} + void dAcOhole_c::initializeState_Wait() {} void dAcOhole_c::executeState_Wait() {} void dAcOhole_c::finalizeState_Wait() {}