From 5a51c7ac95c61f7fe608732f51e5daf94e8da452 Mon Sep 17 00:00:00 2001 From: Orstedra Date: Thu, 29 May 2025 11:52:21 +0200 Subject: [PATCH] executeState_appear() 92% --- .../rels/d_a_obj_girahim_footNP/symbols.txt | 20 +++++++++---------- include/d/a/obj/d_a_obj_girahim_foot.h | 12 +++++------ src/REL/d/a/obj/d_a_obj_girahim_foot.cpp | 5 ++--- 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/config/SOUE01/rels/d_a_obj_girahim_footNP/symbols.txt b/config/SOUE01/rels/d_a_obj_girahim_footNP/symbols.txt index 5b3720b2..3366d7c3 100644 --- a/config/SOUE01/rels/d_a_obj_girahim_footNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_girahim_footNP/symbols.txt @@ -4,7 +4,7 @@ _unresolved = .text:0x00000060; // type:function size:0x4 scope:global __register_global_object = .text:0x00000070; // type:function size:0x1C scope:global __destroy_global_chain = .text:0x00000090; // type:function size:0x54 scope:global dAcOgirahimFoot_c_classInit__Fv = .text:0x000000F0; // type:function size:0xD0 -fn_425_1C0 = .text:0x000001C0; // type:function size:0x58 +__dt__15dShadowCircle_cFv = .text:0x000001C0; // type:function size:0x58 __dt__30sFState_c<17dAcOgirahimFoot_c>Fv = .text:0x00000220; // type:function size:0x58 __dt__33sFStateFct_c<17dAcOgirahimFoot_c>Fv = .text:0x00000280; // type:function size:0x6C __dt__86sStateMgr_c<17dAcOgirahimFoot_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x000002F0; // type:function size:0xA0 @@ -46,15 +46,15 @@ _dtors = .dtors:0x00000000; // type:label scope:global __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global lbl_425_rodata_0 = .rodata:0x00000000; // type:object size:0x18 data:float g_profile_OBJ_GIRAHIM_FOOT = .data:0x00000000; // type:object size:0x10 data:4byte -lbl_425_data_10 = .data:0x00000010; // type:object size:0x10 -lbl_425_data_20 = .data:0x00000020; // type:object size:0x20 -lbl_425_data_40 = .data:0x00000040; // type:object size:0x80 -lbl_425_data_C0 = .data:0x000000C0; // type:object size:0x30 -lbl_425_data_F0 = .data:0x000000F0; // type:object size:0x30 -lbl_425_data_120 = .data:0x00000120; // type:object size:0x18 -lbl_425_data_138 = .data:0x00000138; // type:object size:0x18 -lbl_425_data_150 = .data:0x00000150; // type:object size:0x9C -lbl_425_data_1EC = .data:0x000001EC; // type:object size:0x34 +lbl_425_data_10 = .data:0x00000010; // type:object size:0x10 scope:local +lbl_425_data_20 = .data:0x00000020; // type:object size:0x20 scope:local +__vt__17dAcOgirahimFoot_c = .data:0x00000040; // type:object size:0x80 +lbl_425_data_C0 = .data:0x000000C0; // type:object size:0x30 scope:local +lbl_425_data_F0 = .data:0x000000F0; // type:object size:0x30 scope:local +lbl_425_data_120 = .data:0x00000120; // type:object size:0x18 scope:local +lbl_425_data_138 = .data:0x00000138; // type:object size:0x18 scope:local +lbl_425_data_150 = .data:0x00000150; // type:object size:0x9C scope:local +lbl_425_data_1EC = .data:0x000001EC; // type:object size:0x34 scope:local __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global lbl_425_bss_8 = .bss:0x00000008; // type:object size:0x10 data:4byte lbl_425_bss_18 = .bss:0x00000018; // type:object size:0x40 data:4byte diff --git a/include/d/a/obj/d_a_obj_girahim_foot.h b/include/d/a/obj/d_a_obj_girahim_foot.h index fe9e6ed6..ddc5199a 100644 --- a/include/d/a/obj/d_a_obj_girahim_foot.h +++ b/include/d/a/obj/d_a_obj_girahim_foot.h @@ -13,11 +13,11 @@ public: dAcOgirahimFoot_c() : mStateMgr(*this, sStateID::null) {} virtual ~dAcOgirahimFoot_c() {} - virtual int create() override; // fn_425_4C0 - virtual int doDelete() override; // fn_425_5C0 - virtual int draw() override; // fn_425_610 - virtual bool createHeap() override; // fn_425_440 - virtual int actorExecute() override; // fn_425_5D0 + virtual int create() override; + virtual int doDelete() override; + virtual int draw() override; + virtual bool createHeap() override; + virtual int actorExecute() override; STATE_FUNC_DECLARE(dAcOgirahimFoot_c, Wait); STATE_FUNC_DECLARE(dAcOgirahimFoot_c, Appear); @@ -27,7 +27,7 @@ private: /* 0x334 */ m3d::smdl_c mMdl; /* 0x350 */ dShadowCircle_c mShadow; /* 0x358 */ STATE_MGR_DECLARE(dAcOgirahimFoot_c); - bool field_0x394; + /* 0x394 */ bool field_0x394; }; #endif diff --git a/src/REL/d/a/obj/d_a_obj_girahim_foot.cpp b/src/REL/d/a/obj/d_a_obj_girahim_foot.cpp index cab38aae..4e00ed88 100644 --- a/src/REL/d/a/obj/d_a_obj_girahim_foot.cpp +++ b/src/REL/d/a/obj/d_a_obj_girahim_foot.cpp @@ -79,14 +79,13 @@ void dAcOgirahimFoot_c::initializeState_Appear() { field_0x394 = true; } +// Not matching by one instruction void dAcOgirahimFoot_c::executeState_Appear() { if (field_0x394) { return; } - dJEffManager_c::spawnEffect( - PARTICLE_RESOURCE_ID_MAPPING_77_, position, (mAng3_c *)0x0, &mScale, nullptr, nullptr, 0, 0 - ); + dJEffManager_c::spawnEffect(PARTICLE_RESOURCE_ID_MAPPING_77_, position, nullptr, &mScale, nullptr, nullptr, 0, 0); deleteRequest(); }