From 1d4fc368c29d6ec3940fff2e8e56364827e45b62 Mon Sep 17 00:00:00 2001 From: Aetias Date: Thu, 23 Jan 2025 23:11:04 +0100 Subject: Move ov000 documentation from Ghidra --- 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 3f1f2850..d72307f4 100644 --- a/src/00_Core/Actor/Actor.cpp +++ b/src/00_Core/Actor/Actor.cpp @@ -251,7 +251,7 @@ ARM bool Actor::vfunc_9c() {} ARM bool Actor::func_ov00_020c195c() { if (!mUnk_11b) return false; - gPlayerLink->func_ov00_020bc854(&mPos); + gPlayerLink->func_ov000_020bc854(&mPos); return true; } @@ -272,7 +272,7 @@ ARM bool Actor::func_ov00_020c198c() { { return false; } - if (gPlayerLink && !gPlayerLink->func_ov00_020bd304()) return false; + if (gPlayerLink && !gPlayerLink->func_ov000_020bd304()) return false; return true; } -- cgit v1.2.3 From 96dd3beb453077749061227cebb40947e110aac1 Mon Sep 17 00:00:00 2001 From: Aetias Date: Fri, 31 Jan 2025 21:38:50 +0100 Subject: Move ov014 documentation from Ghidra --- 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 d72307f4..3944a710 100644 --- a/src/00_Core/Actor/Actor.cpp +++ b/src/00_Core/Actor/Actor.cpp @@ -556,7 +556,7 @@ ARM bool Actor::func_ov00_020c243c(ActorTypeId *actorTypes, Actor **out) { } break; case ActorTypeId_Bomb: - case ActorTypeId_BLST: + case ActorTypeId_Blast: case ActorTypeId_BMTY: case ActorTypeId_CBLS: { knockback.mUnk_10 = 6; -- cgit v1.2.3 From d5376fc903f3677a4f9c97bd3abd85c229f1ceb6 Mon Sep 17 00:00:00 2001 From: Aetias Date: Sun, 2 Feb 2025 11:38:39 +0100 Subject: Add `ActorRope` --- src/00_Core/Actor/Actor.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 3944a710..f008064d 100644 --- a/src/00_Core/Actor/Actor.cpp +++ b/src/00_Core/Actor/Actor.cpp @@ -551,7 +551,7 @@ ARM bool Actor::func_ov00_020c243c(ActorTypeId *actorTypes, Actor **out) { knockback.mUnk_10 = 5; } break; - case ActorTypeId_ROPE: { + case ActorTypeId_GrapplingHook: { knockback.mUnk_10 = 8; } break; @@ -759,7 +759,7 @@ ARM EquipBoomerang *Actor::GetEquipBoomerang() { ARM bool Actor::func_ov00_020c2d54() { const ActorTypeId types[] = { - ActorTypeId_ROPE, + ActorTypeId_GrapplingHook, ActorTypeId_Null, }; if (mHitbox.size >= 0) { @@ -780,7 +780,7 @@ ARM bool Actor::func_ov00_020c2de4() { EquipRope *rope = EquipSword::GetEquipRope(); - Actor *actor = rope->func_ov14_0213d420(); + ActorRope *actor = rope->GetRopeActor(); if (actor) { Vec3p_Sub(&actor->mPos, &mPos, &vel); if (Vec3p_Length(&vel) > FLOAT_TO_Q20(1.0)) { @@ -819,8 +819,8 @@ ARM bool Actor::func_ov00_020c2ed4() { s32 index = rope->func_ov14_0213d440(mRef.id); if (index >= 0) { - bool unk1 = rope->func_ov14_0213d420(); - if (unk1) { + ActorRope *actor = rope->GetRopeActor(); + if (actor) { Vec3p vel; if (rope->func_ov14_0213d81c(index, &vel)) { mVel = vel; -- cgit v1.2.3