From 6b9aeb9a9ae29154d55150ea25361b826cbc18f6 Mon Sep 17 00:00:00 2001 From: CovenEsme <84377742+CovenEsme@users.noreply.github.com> Date: Tue, 27 May 2025 05:26:02 +0100 Subject: [PATCH 1/5] d_a_obj_distant_ship OK --- .../rels/d_a_obj_distant_shipNP/symbols.txt | 14 ++--- configure.py | 2 +- include/d/a/obj/d_a_obj_distant_ship.h | 12 ++++ src/REL/d/a/obj/d_a_obj_distant_ship.cpp | 58 +++++++++++++++++++ 4 files changed, 78 insertions(+), 8 deletions(-) diff --git a/config/SOUE01/rels/d_a_obj_distant_shipNP/symbols.txt b/config/SOUE01/rels/d_a_obj_distant_shipNP/symbols.txt index 6461e3b5..9c6df247 100644 --- a/config/SOUE01/rels/d_a_obj_distant_shipNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_distant_shipNP/symbols.txt @@ -2,12 +2,12 @@ _prolog = .text:0x00000000; // type:function size:0x2C scope:global _epilog = .text:0x00000030; // type:function size:0x2C scope:global _unresolved = .text:0x00000060; // type:function size:0x4 scope:global dAcOdistantShip_c_classInit__Fv = .text:0x00000070; // type:function size:0x5C -AcOdistantShip__initModels = .text:0x000000D0; // type:function size:0x90 -AcOdistantShip__init = .text:0x00000160; // type:function size:0x100 -fn_616_260 = .text:0x00000260; // type:function size:0x8 -fn_616_270 = .text:0x00000270; // type:function size:0x8 -AcOdistantShip__draw = .text:0x00000280; // type:function size:0x34 -AcOdistantShip__getModelName = .text:0x000002C0; // type:function size:0x38 +createHeap__17dAcOdistantShip_cFv = .text:0x000000D0; // type:function size:0x90 +create__17dAcOdistantShip_cFv = .text:0x00000160; // type:function size:0x100 +doDelete__17dAcOdistantShip_cFv = .text:0x00000260; // type:function size:0x8 +actorExecute__17dAcOdistantShip_cFv = .text:0x00000270; // type:function size:0x8 +draw__17dAcOdistantShip_cFv = .text:0x00000280; // type:function size:0x34 +getModelName__17dAcOdistantShip_cFv = .text:0x000002C0; // type:function size:0x38 __dt__17dAcOdistantShip_cFv = .text:0x00000300; // type:function size:0x68 _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global @@ -18,4 +18,4 @@ lbl_616_data_10 = .data:0x00000010; // type:object size:0x10 data:string lbl_616_data_20 = .data:0x00000020; // type:object size:0x20 lbl_616_data_40 = .data:0x00000040; // type:object size:0x10 lbl_616_data_50 = .data:0x00000050; // type:object size:0x18 -AcOdistantShip__vtable = .data:0x00000068; // type:object size:0x80 +__vt__17dAcOdistantShip_c = .data:0x00000068; // type:object size:0x80 diff --git a/configure.py b/configure.py index 566db45b..e85da535 100644 --- a/configure.py +++ b/configure.py @@ -2017,7 +2017,7 @@ config.libs = [ "d_a_obj_display_only_nbs", "REL/d/a/obj/d_a_obj_display_only_nbs.cpp", ), - Rel(NonMatching, "d_a_obj_distant_ship", "REL/d/a/obj/d_a_obj_distant_ship.cpp"), + Rel(Matching, "d_a_obj_distant_ship", "REL/d/a/obj/d_a_obj_distant_ship.cpp"), Rel( NonMatching, "d_a_obj_diviner_crystal", diff --git a/include/d/a/obj/d_a_obj_distant_ship.h b/include/d/a/obj/d_a_obj_distant_ship.h index 42261420..0771a1f6 100644 --- a/include/d/a/obj/d_a_obj_distant_ship.h +++ b/include/d/a/obj/d_a_obj_distant_ship.h @@ -2,13 +2,25 @@ #define D_A_OBJ_DISTANT_SHIP_H #include "d/a/obj/d_a_obj_base.h" +#include "m/m3d/m_smdl.h" +#include "nw4r/g3d/res/g3d_resfile.h" class dAcOdistantShip_c : public dAcObjBase_c { public: dAcOdistantShip_c() {} virtual ~dAcOdistantShip_c() {} + virtual int create() override; + virtual int doDelete() override; + virtual int draw() override; + virtual bool createHeap() override; + virtual int actorExecute() override; + char *getModelName(); private: + /* 0x330 */ nw4r::g3d::ResFile mBrres; + /* 0x334 */ m3d::smdl_c mModel; + /* 0x350 */ u8 mSubtype; + /* 0x351 */ bool mIsVisible; }; #endif diff --git a/src/REL/d/a/obj/d_a_obj_distant_ship.cpp b/src/REL/d/a/obj/d_a_obj_distant_ship.cpp index af5666b7..2c8bf662 100644 --- a/src/REL/d/a/obj/d_a_obj_distant_ship.cpp +++ b/src/REL/d/a/obj/d_a_obj_distant_ship.cpp @@ -1,3 +1,61 @@ #include "d/a/obj/d_a_obj_distant_ship.h" +#include "common.h" +#include "d/a/obj/d_a_obj_base.h" +#include "d/flag/sceneflag_manager.h" +#include "f/f_base.h" +#include "nw4r/g3d/res/g3d_resfile.h" +#include "toBeSorted/arc_managers/current_stage_arc_manager.h" + SPECIAL_ACTOR_PROFILE(OBJ_DIS_SHIP, dAcOdistantShip_c, fProfile::OBJ_DIS_SHIP, 0x143, 0, 0); + +bool dAcOdistantShip_c::createHeap() { + char *modelName = getModelName(); + mBrres = (nw4r::g3d::ResFile)CurrentStageArcManager::GetInstance()->getData("g3d/stage.brres"); + TRY_CREATE(mModel.create(mBrres.GetResMdl(modelName), &heap_allocator, 0x120, 1, 0)); + return SUCCEEDED; +} + +int dAcOdistantShip_c::create() { + // Sure, why not + mIsVisible = false; + u32 p = params; + u16 r = (s32)roomid; + mSubtype = (p >> 8) & 0xF; + + bool flag = SceneflagManager::sInstance->checkFlag(r, p & 0xFF); + if (flag) { + mIsVisible = true; + } + + if (mIsVisible) { + CREATE_ALLOCATOR(dAcOdistantShip_c); + updateMatrix(); + mModel.setLocalMtx(mWorldMtx); + boundingBox.Set(mVec3_c(-0.0f, -0.0f, -0.0f), mVec3_c(0.0f, 0.0f, 0.0f)); + } + return SUCCEEDED; +} + +int dAcOdistantShip_c::doDelete() { + return SUCCEEDED; +} + +int dAcOdistantShip_c::actorExecute() { + return SUCCEEDED; +} + +int dAcOdistantShip_c::draw() { + if (mIsVisible) { + drawModelType1(&mModel); + } + return SUCCEEDED; +} + +char *dAcOdistantShip_c::getModelName() { + switch (mSubtype) { + case 0: return "StageF301_D300"; + case 1: return "StageF301_3_D300"; + default: return nullptr; + } +} From 18785a094da8528b1c7212d202782d46aca965e1 Mon Sep 17 00:00:00 2001 From: CovenEsme <84377742+CovenEsme@users.noreply.github.com> Date: Tue, 27 May 2025 15:06:53 +0100 Subject: [PATCH 2/5] Apply feedback --- include/f/f_base.h | 2 +- src/REL/d/a/obj/d_a_obj_distant_ship.cpp | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/include/f/f_base.h b/include/f/f_base.h index 34bc8bec..34ecfa13 100644 --- a/include/f/f_base.h +++ b/include/f/f_base.h @@ -90,7 +90,7 @@ public: group_type = m_tmpCtData.group_type; } - inline u32 getFromParams(u8 shift, u32 mask) { + u32 getFromParams(u8 shift, u32 mask) { return (params >> shift) & mask; } diff --git a/src/REL/d/a/obj/d_a_obj_distant_ship.cpp b/src/REL/d/a/obj/d_a_obj_distant_ship.cpp index 2c8bf662..6d7e8870 100644 --- a/src/REL/d/a/obj/d_a_obj_distant_ship.cpp +++ b/src/REL/d/a/obj/d_a_obj_distant_ship.cpp @@ -20,11 +20,10 @@ int dAcOdistantShip_c::create() { // Sure, why not mIsVisible = false; u32 p = params; - u16 r = (s32)roomid; + u16 r = getRoomId(); mSubtype = (p >> 8) & 0xF; - bool flag = SceneflagManager::sInstance->checkFlag(r, p & 0xFF); - if (flag) { + if (SceneflagManager::sInstance->checkBoolFlag(r, p & 0xFF)) { mIsVisible = true; } From 0c9d9fa357d0733058c792556aca9b70f702a3fd Mon Sep 17 00:00:00 2001 From: CovenEsme <84377742+CovenEsme@users.noreply.github.com> Date: Tue, 27 May 2025 15:15:13 +0100 Subject: [PATCH 3/5] Add scratch comment for odd dAcOdistantShip_c::create match --- src/REL/d/a/obj/d_a_obj_distant_ship.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/REL/d/a/obj/d_a_obj_distant_ship.cpp b/src/REL/d/a/obj/d_a_obj_distant_ship.cpp index 6d7e8870..b30fde1e 100644 --- a/src/REL/d/a/obj/d_a_obj_distant_ship.cpp +++ b/src/REL/d/a/obj/d_a_obj_distant_ship.cpp @@ -18,6 +18,8 @@ bool dAcOdistantShip_c::createHeap() { int dAcOdistantShip_c::create() { // Sure, why not + // Scratch for anyone who wants to look for a better solution: + // https://decomp.me/scratch/0qPPj mIsVisible = false; u32 p = params; u16 r = getRoomId(); From b1381add583cb995bf2c3c9ba577cfc61f1a2eb5 Mon Sep 17 00:00:00 2001 From: CovenEsme <84377742+CovenEsme@users.noreply.github.com> Date: Tue, 27 May 2025 15:50:39 +0100 Subject: [PATCH 4/5] Improve dAcOdistantShip_c::create --- src/REL/d/a/obj/d_a_obj_distant_ship.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/REL/d/a/obj/d_a_obj_distant_ship.cpp b/src/REL/d/a/obj/d_a_obj_distant_ship.cpp index b30fde1e..6ca6c8ef 100644 --- a/src/REL/d/a/obj/d_a_obj_distant_ship.cpp +++ b/src/REL/d/a/obj/d_a_obj_distant_ship.cpp @@ -17,15 +17,11 @@ bool dAcOdistantShip_c::createHeap() { } int dAcOdistantShip_c::create() { - // Sure, why not - // Scratch for anyone who wants to look for a better solution: - // https://decomp.me/scratch/0qPPj mIsVisible = false; - u32 p = params; - u16 r = getRoomId(); - mSubtype = (p >> 8) & 0xF; + u8 flag = getFromParams(0, 0xFF); + mSubtype = getFromParams(8, 0xF); - if (SceneflagManager::sInstance->checkBoolFlag(r, p & 0xFF)) { + if (SceneflagManager::sInstance->checkBoolFlag(roomid, flag)) { mIsVisible = true; } From 0eb6bae4a670d258a84a29214cdb50e29d5d68db Mon Sep 17 00:00:00 2001 From: CovenEsme <84377742+CovenEsme@users.noreply.github.com> Date: Sat, 31 May 2025 13:55:40 +0100 Subject: [PATCH 5/5] Apply feedback --- .../SOUE01/rels/d_a_obj_distant_shipNP/symbols.txt | 12 ++++++------ include/d/a/obj/d_a_obj_distant_ship.h | 2 +- src/REL/d/a/obj/d_a_obj_distant_ship.cpp | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/config/SOUE01/rels/d_a_obj_distant_shipNP/symbols.txt b/config/SOUE01/rels/d_a_obj_distant_shipNP/symbols.txt index 9c6df247..0db61b3a 100644 --- a/config/SOUE01/rels/d_a_obj_distant_shipNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_distant_shipNP/symbols.txt @@ -11,11 +11,11 @@ getModelName__17dAcOdistantShip_cFv = .text:0x000002C0; // type:function size:0x __dt__17dAcOdistantShip_cFv = .text:0x00000300; // type:function size:0x68 _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global -lbl_616_rodata_0 = .rodata:0x00000000; // type:object size:0x4 data:float -lbl_616_rodata_4 = .rodata:0x00000004; // type:object size:0x4 align:4 data:float +lbl_616_rodata_0 = .rodata:0x00000000; // type:object size:0x4 scope:local data:float +lbl_616_rodata_4 = .rodata:0x00000004; // type:object size:0x4 scope:local align:4 data:float g_profile_OBJ_DIS_SHIP = .data:0x00000000; // type:object size:0x10 -lbl_616_data_10 = .data:0x00000010; // type:object size:0x10 data:string -lbl_616_data_20 = .data:0x00000020; // type:object size:0x20 -lbl_616_data_40 = .data:0x00000040; // type:object size:0x10 -lbl_616_data_50 = .data:0x00000050; // type:object size:0x18 +lbl_616_data_10 = .data:0x00000010; // type:object size:0x10 scope:local data:string +lbl_616_data_20 = .data:0x00000020; // type:object size:0x20 scope:local +lbl_616_data_40 = .data:0x00000040; // type:object size:0x10 scope:local +lbl_616_data_50 = .data:0x00000050; // type:object size:0x18 scope:local __vt__17dAcOdistantShip_c = .data:0x00000068; // type:object size:0x80 diff --git a/include/d/a/obj/d_a_obj_distant_ship.h b/include/d/a/obj/d_a_obj_distant_ship.h index 0771a1f6..d1df78b2 100644 --- a/include/d/a/obj/d_a_obj_distant_ship.h +++ b/include/d/a/obj/d_a_obj_distant_ship.h @@ -14,7 +14,7 @@ public: virtual int draw() override; virtual bool createHeap() override; virtual int actorExecute() override; - char *getModelName(); + const char *getModelName(); private: /* 0x330 */ nw4r::g3d::ResFile mBrres; diff --git a/src/REL/d/a/obj/d_a_obj_distant_ship.cpp b/src/REL/d/a/obj/d_a_obj_distant_ship.cpp index 6ca6c8ef..45d773c3 100644 --- a/src/REL/d/a/obj/d_a_obj_distant_ship.cpp +++ b/src/REL/d/a/obj/d_a_obj_distant_ship.cpp @@ -10,7 +10,7 @@ SPECIAL_ACTOR_PROFILE(OBJ_DIS_SHIP, dAcOdistantShip_c, fProfile::OBJ_DIS_SHIP, 0x143, 0, 0); bool dAcOdistantShip_c::createHeap() { - char *modelName = getModelName(); + const char *modelName = getModelName(); mBrres = (nw4r::g3d::ResFile)CurrentStageArcManager::GetInstance()->getData("g3d/stage.brres"); TRY_CREATE(mModel.create(mBrres.GetResMdl(modelName), &heap_allocator, 0x120, 1, 0)); return SUCCEEDED; @@ -49,7 +49,7 @@ int dAcOdistantShip_c::draw() { return SUCCEEDED; } -char *dAcOdistantShip_c::getModelName() { +const char *dAcOdistantShip_c::getModelName() { switch (mSubtype) { case 0: return "StageF301_D300"; case 1: return "StageF301_3_D300";