Merge remote-tracking branch 'zeldaret/main' into decomp-PlayerControl

1 files changed, 8 insertions, 8 deletions

diff --git a/src/00_Core/Actor/Actor.cpp b/src/00_Core/Actor/Actor.cpp
index 2508b381..e12b246d 100644
--- a/src/00_Core/Actor/Actor.cpp
+++ b/src/00_Core/Actor/Actor.cpp
@@ -252,7 +252,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;
 }
 
@@ -266,7 +266,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;
 }
 
@@ -545,12 +545,12 @@ 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;
 
                 case ActorTypeId_Bomb:
-                case ActorTypeId_BLST:
+                case ActorTypeId_Blast:
                 case ActorTypeId_BMTY:
                 case ActorTypeId_CBLS: {
                     knockback.mUnk_10 = 6;
@@ -753,7 +753,7 @@ ARM EquipBoomerang *Actor::GetEquipBoomerang() {
 
 ARM bool Actor::func_ov00_020c2d54() {
     const ActorTypeId types[] = {
-        ActorTypeId_ROPE,
+        ActorTypeId_GrapplingHook,
         ActorTypeId_Null,
     };
     if (mHitbox.size >= 0) {
@@ -774,7 +774,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)) {
@@ -813,8 +813,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;