diff --git a/config/SOUE01/rels/d_a_obj_ruined_saveNP/symbols.txt b/config/SOUE01/rels/d_a_obj_ruined_saveNP/symbols.txt index d925af1d..3f99468c 100644 --- a/config/SOUE01/rels/d_a_obj_ruined_saveNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_ruined_saveNP/symbols.txt @@ -8,14 +8,14 @@ __dt__29sFState_c<16dAcOruinedSave_c>Fv = .text:0x000001F0; // type:function siz __dt__32sFStateFct_c<16dAcOruinedSave_c>Fv = .text:0x00000250; // type:function size:0x6C __dt__85sStateMgr_c<16dAcOruinedSave_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x000002C0; // type:function size:0xA0 __dt__55sFStateMgr_c<16dAcOruinedSave_c,20sStateMethodUsr_FI_c>Fv = .text:0x00000360; // type:function size:0xA4 -fn_624_410 = .text:0x00000410; // type:function size:0xDC -fn_624_4F0 = .text:0x000004F0; // type:function size:0xE8 +createHeap__16dAcOruinedSave_cFv = .text:0x00000410; // type:function size:0xDC +create__16dAcOruinedSave_cFv = .text:0x000004F0; // type:function size:0xE8 changeState__85sStateMgr_c<16dAcOruinedSave_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x000005E0; // type:function size:0x10 -fn_624_5F0 = .text:0x000005F0; // type:function size:0x8 -fn_624_600 = .text:0x00000600; // type:function size:0x30 +doDelete__16dAcOruinedSave_cFv = .text:0x000005F0; // type:function size:0x8 +actorExecute__16dAcOruinedSave_cFv = .text:0x00000600; // type:function size:0x30 executeState__85sStateMgr_c<16dAcOruinedSave_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000630; // type:function size:0x10 -fn_624_640 = .text:0x00000640; // type:function size:0x30 -fn_624_670 = .text:0x00000670; // type:function size:0x28 +actorExecuteInEvent__16dAcOruinedSave_cFv = .text:0x00000640; // type:function size:0x30 +draw__16dAcOruinedSave_cFv = .text:0x00000670; // type:function size:0x28 initializeState_Wait__16dAcOruinedSave_cFv = .text:0x000006A0; // type:function size:0x4 executeState_Wait__16dAcOruinedSave_cFv = .text:0x000006B0; // type:function size:0x68 finalizeState_Wait__16dAcOruinedSave_cFv = .text:0x00000720; // type:function size:0x4 @@ -44,21 +44,21 @@ isSameName__31sFStateID_c<16dAcOruinedSave_c>CFPCc = .text:0x00000D30; // type:f _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_624_rodata_0 = .rodata:0x00000000; // type:object size:0x4 data:float -lbl_624_rodata_4 = .rodata:0x00000004; // type:object size:0x4 align:4 data:float -lbl_624_rodata_8 = .rodata:0x00000008; // type:object size:0x4 align:4 data:float -lbl_624_rodata_C = .rodata:0x0000000C; // type:object size:0x4 align:4 data:float +lbl_624_rodata_0 = .rodata:0x00000000; // type:object size:0x4 scope:local data:float +lbl_624_rodata_4 = .rodata:0x00000004; // type:object size:0x4 scope:local align:4 data:float +lbl_624_rodata_8 = .rodata:0x00000008; // type:object size:0x4 scope:local align:4 data:float +lbl_624_rodata_C = .rodata:0x0000000C; // type:object size:0x4 scope:local align:4 data:float g_profile_OBJ_RUINED_SAVE = .data:0x00000000; // type:object size:0x10 data:4byte -lbl_624_data_10 = .data:0x00000010; // type:object size:0x10 -lbl_624_data_20 = .data:0x00000020; // type:object size:0x18 -lbl_624_data_38 = .data:0x00000038; // type:object size:0x20 -lbl_624_data_58 = .data:0x00000058; // type:object size:0x80 -lbl_624_data_D8 = .data:0x000000D8; // type:object size:0x30 -lbl_624_data_108 = .data:0x00000108; // type:object size:0x30 -lbl_624_data_138 = .data:0x00000138; // type:object size:0x18 -lbl_624_data_150 = .data:0x00000150; // type:object size:0xA4 -lbl_624_data_1F4 = .data:0x000001F4; // type:object size:0x34 +lbl_624_data_10 = .data:0x00000010; // type:object size:0x10 scope:local +lbl_624_data_20 = .data:0x00000020; // type:object size:0x18 scope:local +lbl_624_data_38 = .data:0x00000038; // type:object size:0x20 scope:local +__vt__16dAcOruinedSave_c = .data:0x00000058; // type:object size:0x80 +__vt__55sFStateMgr_c<16dAcOruinedSave_c,20sStateMethodUsr_FI_c> = .data:0x000000D8; // type:object size:0x30 +__vt__85sStateMgr_c<16dAcOruinedSave_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c> = .data:0x00000108; // type:object size:0x30 +lbl_624_data_138 = .data:0x00000138; // type:object size:0x18 scope:local +lbl_624_data_150 = .data:0x00000150; // type:object size:0xA4 scope:local +__vt__31sFStateID_c<16dAcOruinedSave_c> = .data:0x000001F4; // type:object size:0x34 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_624_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte -lbl_624_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte -lbl_624_bss_58 = .bss:0x00000058; // type:object size:0x30 data:4byte +lbl_624_bss_8 = .bss:0x00000008; // type:object size:0x10 scope:local data:4byte +lbl_624_bss_18 = .bss:0x00000018; // type:object size:0x40 scope:local data:4byte +lbl_624_bss_58 = .bss:0x00000058; // type:object size:0x30 scope:local data:4byte diff --git a/configure.py b/configure.py index d2aca699..32bfa05b 100644 --- a/configure.py +++ b/configure.py @@ -2582,7 +2582,7 @@ config.libs = [ "REL/d/a/obj/d_a_obj_roulette_island_r.cpp", ), Rel(NonMatching, "d_a_obj_ro_at_target", "REL/d/a/obj/d_a_obj_ro_at_target.cpp"), - Rel(NonMatching, "d_a_obj_ruined_save", "REL/d/a/obj/d_a_obj_ruined_save.cpp"), + Rel(Matching, "d_a_obj_ruined_save", "REL/d/a/obj/d_a_obj_ruined_save.cpp"), Rel(NonMatching, "d_a_obj_sail", "REL/d/a/obj/d_a_obj_sail.cpp"), Rel(NonMatching, "d_a_obj_sandbag", "REL/d/a/obj/d_a_obj_sandbag.cpp"), Rel(NonMatching, "d_a_obj_sand_D301", "REL/d/a/obj/d_a_obj_sand_D301.cpp"), diff --git a/include/d/a/obj/d_a_obj_ruined_save.h b/include/d/a/obj/d_a_obj_ruined_save.h index 34ada361..95107c28 100644 --- a/include/d/a/obj/d_a_obj_ruined_save.h +++ b/include/d/a/obj/d_a_obj_ruined_save.h @@ -2,19 +2,36 @@ #define D_A_OBJ_RUINED_SAVE_H #include "d/a/obj/d_a_obj_base.h" +#include "m/m3d/m_anmmatclr.h" +#include "m/m3d/m_smdl.h" +#include "nw4r/g3d/res/g3d_resfile.h" #include "s/s_State.hpp" #include "s/s_StateMgr.hpp" +#include "toBeSorted/actor_event.h" class dAcOruinedSave_c : public dAcObjBase_c { public: - dAcOruinedSave_c() : mStateMgr(*this, sStateID::null) {} + dAcOruinedSave_c() : mStateMgr(*this, sStateID::null), mEvent(*this, nullptr) {} virtual ~dAcOruinedSave_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; + STATE_FUNC_DECLARE(dAcOruinedSave_c, Wait); STATE_FUNC_DECLARE(dAcOruinedSave_c, Vanish); private: - /* 0x??? */ STATE_MGR_DECLARE(dAcOruinedSave_c); + /* 0x330 */ nw4r::g3d::ResFile mResFile; + /* 0x334 */ m3d::smdl_c mMdl; + /* 0x350 */ STATE_MGR_DECLARE(dAcOruinedSave_c); + /* 0x38C */ ActorEventRelated mEvent; + /* 0x3DC */ m3d::anmMatClr_c mAnmMatClr; + /* 0x408 */ f32 field_0x408; + /* 0x40C */ u32 field_0x40C; }; #endif diff --git a/src/REL/d/a/obj/d_a_obj_ruined_save.cpp b/src/REL/d/a/obj/d_a_obj_ruined_save.cpp index 1dbc35ad..7e367891 100644 --- a/src/REL/d/a/obj/d_a_obj_ruined_save.cpp +++ b/src/REL/d/a/obj/d_a_obj_ruined_save.cpp @@ -1,13 +1,89 @@ #include "d/a/obj/d_a_obj_ruined_save.h" +#include "d/a/obj/d_a_obj_base.h" +#include "d/flag/storyflag_manager.h" +#include "f/f_base.h" +#include "m/m3d/m_anmmatclr.h" +#include "m/m_vec.h" +#include "nw4r/g3d/res/g3d_resfile.h" +#include "nw4r/g3d/res/g3d_resmdl.h" + SPECIAL_ACTOR_PROFILE(OBJ_RUINED_SAVE, dAcOruinedSave_c, fProfile::OBJ_RUINED_SAVE, 0x15C, 0, 0); STATE_DEFINE(dAcOruinedSave_c, Wait); STATE_DEFINE(dAcOruinedSave_c, Vanish); +bool dAcOruinedSave_c::createHeap() { + void *data = getOarcResFile("SaveObjectKoke"); + mResFile = nw4r::g3d::ResFile(data); + nw4r::g3d::ResMdl mdl = mResFile.GetResMdl("SaveObjectKoke"); + TRY_CREATE(mMdl.create(mdl, &heap_allocator, 0x128)); + nw4r::g3d::ResFile resFile(data); + mdl = mMdl.getResMdl(); + nw4r::g3d::ResAnmClr resAnmClr = resFile.GetResAnmClr("SaveObjectKoke_First"); + TRY_CREATE(mAnmMatClr.create(mdl, resAnmClr, &heap_allocator, nullptr, 1)); + return true; +} + +int dAcOruinedSave_c::create() { + if (StoryflagManager::sInstance->getCounterOrFlag(492)) { + return FAILED; + } + CREATE_ALLOCATOR(dAcOruinedSave_c); + updateMatrix(); + mMdl.setLocalMtx(mWorldMtx); + poscopy2 = position; + poscopy2.y += 300.0f; + poscopy3 = poscopy2; + field_0x40C = 0; + mStateMgr.changeState(StateID_Wait); + return SUCCEEDED; +} + +int dAcOruinedSave_c::doDelete() { + return SUCCEEDED; +} + +int dAcOruinedSave_c::actorExecute() { + mStateMgr.executeState(); + return SUCCEEDED; +} + +int dAcOruinedSave_c::actorExecuteInEvent() { + actorExecute(); + return SUCCEEDED; +} + +int dAcOruinedSave_c::draw() { + drawModelType1(&mMdl); + return SUCCEEDED; +} + void dAcOruinedSave_c::initializeState_Wait() {} -void dAcOruinedSave_c::executeState_Wait() {} + +void dAcOruinedSave_c::executeState_Wait() { + if (StoryflagManager::sInstance->getCounterOrFlag(492)) { + mStateMgr.changeState(StateID_Vanish); + } +} + void dAcOruinedSave_c::finalizeState_Wait() {} -void dAcOruinedSave_c::initializeState_Vanish() {} -void dAcOruinedSave_c::executeState_Vanish() {} + +void dAcOruinedSave_c::initializeState_Vanish() { + mMdl.setAnm(mAnmMatClr); + field_0x408 = mAnmMatClr.getFrameMax(0) - 1.0f; +} + +void dAcOruinedSave_c::executeState_Vanish() { + field_0x40C++; + if (((u16)field_0x40C & 0xF) == 3) { + poscopy3.z = poscopy2.z + cM::rndFX(50.0f); + poscopy3.y = poscopy2.y - cM::rndFX(20.0f); + } + mAnmMatClr.play(); + if (field_0x408 == mAnmMatClr.getFrame(0)) { + deleteRequest(); + } +} + void dAcOruinedSave_c::finalizeState_Vanish() {}