From 6b9c7701fe475de8456b7fd67969486c604fc834 Mon Sep 17 00:00:00 2001 From: Aetias Date: Mon, 6 Jan 2025 22:09:32 +0100 Subject: PlayerControl: Decomp 5% --- src/00_Core/Actor/Actor.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'src/00_Core/Actor/Actor.cpp') diff --git a/src/00_Core/Actor/Actor.cpp b/src/00_Core/Actor/Actor.cpp index 3f1f2850..2508b381 100644 --- a/src/00_Core/Actor/Actor.cpp +++ b/src/00_Core/Actor/Actor.cpp @@ -5,6 +5,7 @@ extern "C" { #include "Actor/Actor.hpp" #include "Actor/ActorManager.hpp" #include "Actor/ActorPlayerDummy.hpp" +#include "DTCM/UnkStruct_027e077c.hpp" #include "Item/ItemManager.hpp" #include "Map/MapManager.hpp" #include "Player/EquipSword.hpp" @@ -255,13 +256,6 @@ ARM bool Actor::func_ov00_020c195c() { return true; } -struct UnkStruct2 { - /* 0 */ u32 mUnk_0; - /* 4 */ u32 mUnk_4; - /* 8 */ -}; -extern UnkStruct2 data_027e077c; -extern u8 data_02056be4[]; extern "C" bool func_ov05_02103f4c(s32 param1); extern s32 data_027e103c; ARM bool Actor::func_ov00_020c198c() { -- cgit v1.2.3 From a8dc7ef705f777cc725e1ec08918fc8c2d61b60a Mon Sep 17 00:00:00 2001 From: Aetias Date: Sat, 8 Mar 2025 12:35:55 +0100 Subject: Delink and 81% decomp `ActorActionObject` --- src/00_Core/Actor/Actor.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/00_Core/Actor/Actor.cpp') diff --git a/src/00_Core/Actor/Actor.cpp b/src/00_Core/Actor/Actor.cpp index f008064d..572ead78 100644 --- a/src/00_Core/Actor/Actor.cpp +++ b/src/00_Core/Actor/Actor.cpp @@ -318,8 +318,8 @@ ARM void Actor::SetTransform(Transform *transform) { ARM void Actor::vfunc_a8() {} -ARM void Actor::func_Ov00_020c1bfc(s32 param1) { - gMapManager->func_ov00_02084be0(mUnk_020.mUnk_0a[param1], mUnk_020.mUnk_08[param1]); +ARM bool Actor::func_Ov00_020c1bfc(s32 param1) { + return gMapManager->func_ov00_02084be0(mUnk_020.mUnk_0a[param1], mUnk_020.mUnk_08[param1]); } ARM void Actor::func_ov00_020c1c20(s32 param1, unk32 param2) { -- cgit v1.2.3 From 59648074067128dbe6306b9fdb80af3f6abfa91b Mon Sep 17 00:00:00 2001 From: Aetias Date: Sun, 9 Mar 2025 09:57:20 +0100 Subject: Fix accidental capital letter in `func_Ov00_020c1bfc` --- src/00_Core/Actor/Actor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/00_Core/Actor/Actor.cpp') diff --git a/src/00_Core/Actor/Actor.cpp b/src/00_Core/Actor/Actor.cpp index 572ead78..74f0da25 100644 --- a/src/00_Core/Actor/Actor.cpp +++ b/src/00_Core/Actor/Actor.cpp @@ -318,7 +318,7 @@ ARM void Actor::SetTransform(Transform *transform) { ARM void Actor::vfunc_a8() {} -ARM bool Actor::func_Ov00_020c1bfc(s32 param1) { +ARM bool Actor::func_ov00_020c1bfc(s32 param1) { return gMapManager->func_ov00_02084be0(mUnk_020.mUnk_0a[param1], mUnk_020.mUnk_08[param1]); } -- cgit v1.2.3 From 12674a6b83ee3b35acb72ffcef9f11f9805e2a74 Mon Sep 17 00:00:00 2001 From: Aetias Date: Sat, 24 May 2025 12:28:04 +0200 Subject: Fix build --- src/00_Core/Actor/Actor.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/00_Core/Actor/Actor.cpp') diff --git a/src/00_Core/Actor/Actor.cpp b/src/00_Core/Actor/Actor.cpp index afa066fc..db721414 100644 --- a/src/00_Core/Actor/Actor.cpp +++ b/src/00_Core/Actor/Actor.cpp @@ -6,6 +6,7 @@ extern "C" { #include "Actor/ActorManager.hpp" #include "Actor/ActorPlayerDummy.hpp" #include "DTCM/UnkStruct_027e077c.hpp" +#include "DTCM/UnkStruct_027e103c.hpp" #include "Item/ItemManager.hpp" #include "Map/MapManager.hpp" #include "Player/EquipSword.hpp" @@ -256,13 +257,9 @@ ARM bool Actor::func_ov00_020c195c() { return true; } -extern "C" bool func_ov05_02103f4c(s32 param1); -extern s32 data_027e103c; ARM bool Actor::func_ov00_020c198c() { - u32 unk1 = data_027e077c.mUnk_0; - u32 unk2 = data_027e077c.mUnk_4; - if (data_027e077c.mUnk_0 != data_027e077c.mUnk_4 || (data_02056be4[unk1] & 1) != 0 || (data_02056be4[unk2] & 4) != 0 || - func_ov05_02103f4c(data_027e103c) || gPlayer->mHealth <= 0) + if (data_027e077c.GetUnk0() != data_027e077c.GetUnk4() || (data_02056be4[data_027e077c.GetUnk0()] & 1) != 0 || + (data_02056be4[data_027e077c.GetUnk4()] & 4) != 0 || data_027e103c->func_ov005_02103f4c() || gPlayer->mHealth <= 0) { return false; } -- cgit v1.2.3 From 5739c36160430ecb777bc5a71065d00732353cfa Mon Sep 17 00:00:00 2001 From: Aetias Date: Thu, 29 May 2025 12:38:15 +0200 Subject: `Actor::vfunc_08` -> `Actor::Init` --- src/00_Core/Actor/Actor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/00_Core/Actor/Actor.cpp') diff --git a/src/00_Core/Actor/Actor.cpp b/src/00_Core/Actor/Actor.cpp index db721414..20ba75ae 100644 --- a/src/00_Core/Actor/Actor.cpp +++ b/src/00_Core/Actor/Actor.cpp @@ -113,7 +113,7 @@ ARM Actor::Actor() : ARM Actor::~Actor() {} -ARM bool Actor::vfunc_08() { +ARM bool Actor::Init() { return true; } -- cgit v1.2.3 From fdb4f5ee3f9e1957ffdc3e175c0eb26b650e0dfa Mon Sep 17 00:00:00 2001 From: Aetias Date: Fri, 30 May 2025 18:45:04 +0200 Subject: `ActorRefill::vfunc_b4` -> `ActorRefill::GetAmmoItem` --- src/00_Core/Actor/Actor.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/00_Core/Actor/Actor.cpp') diff --git a/src/00_Core/Actor/Actor.cpp b/src/00_Core/Actor/Actor.cpp index 20ba75ae..411a6628 100644 --- a/src/00_Core/Actor/Actor.cpp +++ b/src/00_Core/Actor/Actor.cpp @@ -48,8 +48,7 @@ ARM Actor::Actor() : mUnk_010(0), mUnk_011(0), mUnk_012(0), - mUnk_034(-1), - mUnk_038(-1), + mUnk_034(-1, -1), mUnk_03c(-1), mUnk_040(-1, -1), mGravity(FLOAT_TO_Q20(0.0498)), -- cgit v1.2.3 From 0893ad86f2204eb5c45146f3798437154c39ac66 Mon Sep 17 00:00:00 2001 From: mike8699 Date: Mon, 28 Apr 2025 23:32:20 -0400 Subject: Decompile `ActorSwitchObject` `vfunc_08` and `vfunc_0c` --- src/00_Core/Actor/Actor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/00_Core/Actor/Actor.cpp') diff --git a/src/00_Core/Actor/Actor.cpp b/src/00_Core/Actor/Actor.cpp index db721414..123b2abe 100644 --- a/src/00_Core/Actor/Actor.cpp +++ b/src/00_Core/Actor/Actor.cpp @@ -117,7 +117,7 @@ ARM bool Actor::vfunc_08() { return true; } -ARM void Actor::vfunc_0c() {} +ARM bool Actor::vfunc_0c() {} ARM void Actor::vfunc_10(u32 param1) {} ARM void Actor::vfunc_24() {} ARM void Actor::vfunc_28() {} -- cgit v1.2.3