Decomp `Actor`

1 files changed, 148 insertions, 28 deletions

diff --git a/src/00_Core/Actor/Actor.cpp b/src/00_Core/Actor/Actor.cpp
index e7d1bbcc..99180b91 100644
--- a/src/00_Core/Actor/Actor.cpp
+++ b/src/00_Core/Actor/Actor.cpp
@@ -1,6 +1,7 @@
 #include "Actor/Actor.hpp"
+#include "Actor/ActorManager.hpp"
 #include "Map/MapManager.hpp"
-
+#include "Player/PlayerLinkBase.hpp"
 
 KILL(_ZN5ActorC1Ev)
 Actor::Actor() {}
@@ -20,7 +21,7 @@ void Actor::GetOffsetPos(Vec3p *pos) {
     pos->y += mYOffset;
 }
 
-extern unk32 func_ov00_02087ef0();
+extern "C" unk32 func_ov00_02087ef0();
 unk32 Actor::vfunc_38() {
     return func_ov00_02087ef0();
 }
@@ -29,11 +30,17 @@ unk8 Actor::func_ov00_020c1788() {
     return gMapManager->func_ov00_02083570(mUnk_010, mUnk_011);
 }
 
-s32 Actor::vfunc_2c() {}
-unk32 Actor::vfunc_30() {}
+s32 Actor::vfunc_2c() {
+    return -1;
+}
+
+unk32 Actor::vfunc_30() {
+    return 0;
+}
+
 void Actor::vfunc_14(u32 param1) {}
 
-extern void func_ov00_0207a1c8(Actor_UnkStruct_0a4 *param1, u32 param2, Vec3p *param3);
+extern "C" void func_ov00_0207a1c8(Actor_UnkStruct_0a4 *param1, u32 param2, Vec3p *param3);
 void Actor::vfunc_18(u32 param1) {
     func_ov00_0207a1c8(&mUnk_0a4, param1, &mPos);
 }
@@ -55,13 +62,14 @@ struct UnkStruct1 {
     /* 20 */
 };
 extern void *data_027e0d3c;
-extern void *data_02063e4c;
+extern unk32 data_02063e4c;
 extern "C" bool func_ov00_02079470(void *param1, Vec3p *param2, unk32 param3, unk32 param4, unk32 *param5, unk32 *param6, unk32 param7, unk32 param8);
 extern "C" void func_01ffbe34(UnkStruct1 *param1);
-extern "C" void func_020313c8(void *param1, unk32 *param2, unk32 *param3, u32 param4, UnkStruct1 *param5);
+extern "C" void func_020313c8(unk32 *param1, unk32 param2, unk32 param3, u32 param4, UnkStruct1 *param5);
 void Actor::vfunc_1c(u16 *param1) {
-    unk16 unk1 = mUnk_129 ? mUnk_126 : mUnk_07a;
-    if (unk1 != -1) {
+    u16 unk1 = mUnk_07a;
+    if (mUnk_129) unk1 = mUnk_126;
+    if (unk1 != 0xffff) {
         if ((*param1 & 4) == 0 && (*param1 & 8) == 0) return;
         unk32 unk2;
         unk32 unk3;
@@ -69,41 +77,153 @@ void Actor::vfunc_1c(u16 *param1) {
             UnkStruct1 unk4;
             func_01ffbe34(&unk4);
             unk4.mUnk_04 = 1;
-            func_020313c8(data_02063e4c, &unk2, &unk3, unk1, &unk4);
+            func_020313c8(&data_02063e4c, unk2, unk3, unk1, &unk4);
         }
     }
 }
 
 void Actor::vfunc_20(s32 param1) {}
-void Actor::SetUnk_129(bool value) {}
-void Actor::SetUnk_11b() {}
-bool Actor::SetVelocity(Vec3p *vel) {}
-bool Actor::vfunc_60() {}
+
+void Actor::SetUnk_129(bool value) {
+    if (mUnk_128) mUnk_129 = value;
+}
+
+bool Actor::SetUnk_11b() {
+    if (mUnk_11b) return false;
+    mUnk_11b = true;
+    return true;
+}
+
+bool Actor::SetVelocity(Vec3p *vel) {
+    if (!mUnk_11b) return false;
+    mVel = *vel;
+    mUnk_11b = false;
+    return true;
+}
+
+bool Actor::vfunc_60() {
+    return false;
+}
+
 void Actor::vfunc_64() {}
-void Actor::SetUnk_11c(unk8 value) {}
+
+void Actor::SetUnk_11c(unk8 value) {
+    mUnk_11c = value;
+}
+
 void Actor::vfunc_68() {}
-bool Actor::vfunc_6c() {}
-bool Actor::vfunc_70() {}
+
+bool Actor::vfunc_6c() {
+    return true;
+}
+
+bool Actor::vfunc_70() {
+    return true;
+}
+
 void Actor::vfunc_74() {}
 void Actor::vfunc_7c() {}
-bool Actor::vfunc_78() {}
+
+bool Actor::vfunc_78() {
+    return true;
+}
+
 void Actor::vfunc_80() {}
 void Actor::vfunc_84() {}
 void Actor::vfunc_88() {}
-void Actor::vfunc_8c() {}
-bool Actor::vfunc_90() {}
+
+bool Actor::vfunc_8c() {
+    return true;
+}
+
+bool Actor::vfunc_90() {
+    return true;
+}
+
 void Actor::vfunc_94() {}
 bool Actor::vfunc_98() {}
 bool Actor::vfunc_9c() {}
-bool Actor::func_ov00_020c195c() {}
-bool Actor::func_ov00_020c198c() {}
-bool KillPickupItemActors::Filter(Actor *actor) {}
-void Actor::KillPickupItemActors() {}
-bool Actor::TrySetTransform(Transform *transform) {}
-void Actor::SetTransform(Transform *transform) {}
+
+bool Actor::func_ov00_020c195c() {
+    if (!mUnk_11b) return false;
+    gPlayerLink->func_ov00_020bc854(&mPos);
+    return true;
+}
+
+struct UnkStruct2 {
+    /* 0 */ s32 mUnk_0;
+    /* 4 */ s32 mUnk_4;
+    /* 8 */
+};
+extern UnkStruct2 data_027e077c;
+extern u8 *data_02056be4;
+extern "C" bool func_ov05_02103f4c(s32 param1);
+extern s32 data_027e103c;
+bool Actor::func_ov00_020c198c() {
+    if (
+        data_027e077c.mUnk_0 != data_027e077c.mUnk_4
+        || (data_02056be4[data_027e077c.mUnk_0] & 1) != 0
+        || (data_02056be4[data_027e077c.mUnk_0] & 4) != 0
+        || func_ov05_02103f4c(data_027e103c)
+        || gPlayer->mHealth <= 0
+    ) {
+        return false;
+    }
+    if (gPlayerLink && !gPlayerLink->func_ov00_020bd304()) return false;
+    return true;
+}
+
+bool KillPickupsFilter::Filter(Actor *actor) {
+    switch (actor->mType) {
+        case ActorTypeId_Rupee:
+        case ActorTypeId_Heart:
+        case ActorTypeId_Bomb:
+        case ActorTypeId_Arrow:
+        case ActorTypeId_BMRN:
+        case ActorTypeId_BMTY:
+        case ActorTypeId_FLAL:
+        case ActorTypeId_FLBM:
+        case ActorTypeId_FLBT:
+        case ActorTypeId_FLTM:
+        {
+            actor->Kill();
+            return true;
+        }
+
+        default: return false;
+    }
+}
+
+void Actor::KillPickupItemActors() {
+    KillPickupsFilter killPickups;
+    gActorManager->FilterActors(&killPickups, NULL);
+}
+
+bool Actor::TrySetTransform(Transform *transform) {
+    mPrevPos = mPos;
+    mPos = transform->pos;
+    mRotation = transform->rotation;
+    mVisible = transform->visible;
+    return true;
+}
+
+void Actor::SetTransform(Transform *transform) {
+    mPrevPos = mPos;
+    mPos = transform->pos;
+    mRotation = transform->rotation;
+    mVisible = transform->visible;
+}
+
 void Actor::vfunc_a8() {}
-void Actor::func_Ov00_020c1bfc(s32 param1) {}
-void Actor::func_ov00_020c1c20(s32 param1, unk32 param2, unk32 param3) {}
+
+void Actor::func_Ov00_020c1bfc(s32 param1) {
+    gMapManager->func_ov00_02084be0(mUnk_020.mUnk_0a[param1], mUnk_020.mUnk_08[param1]);
+}
+
+void Actor::func_ov00_020c1c20(s32 param1, unk32 param2) {
+    gMapManager->func_ov00_02084b38(mUnk_020.mUnk_0a[param1], mUnk_020.mUnk_08[param1], param2);
+}
+
 bool Actor::vfunc_48(unk32 param1) {}
 bool Actor::vfunc_4c(unk32 *param1) {}
 bool Actor::IsNearLink() {}