summaryrefslogtreecommitdiff
path: root/src/00_Core/Actor/Actor.cpp
diff options
context:
space:
mode:
authorAetias <aetias@outlook.com>2025-02-02 11:38:39 +0100
committerAetias <aetias@outlook.com>2025-02-02 11:38:39 +0100
commitd5376fc903f3677a4f9c97bd3abd85c229f1ceb6 (patch)
tree9b7d6b255f280029b2a2cb2f410fd04f30c02337 /src/00_Core/Actor/Actor.cpp
parent1d2d2e4a2ab125487764c9d9a3fea10379442eb7 (diff)
Add `ActorRope`
Diffstat (limited to 'src/00_Core/Actor/Actor.cpp')
-rw-r--r--src/00_Core/Actor/Actor.cpp10
1 files changed, 5 insertions, 5 deletions
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;