ActorNavi (#132)

* Map symbol in Game

* ActorNavi 93%

* ActorNavi_04 96%

* Document Actor fields

* Move MAX_KEYS to ItemManager

* Move gTouchControl to its own header

* Fix missing includes

* Fix regressions

* Fix build

* Update decompiling guide images

* Fix regression

1 files changed, 15 insertions, 15 deletions

diff --git a/src/00_Core/Actor/Actor.cpp b/src/00_Core/Actor/Actor.cpp
index c2a0f06c..efe35900 100644
--- a/src/00_Core/Actor/Actor.cpp
+++ b/src/00_Core/Actor/Actor.cpp
@@ -70,8 +70,8 @@ ARM Actor::Actor() :
     mUnk_107(0),
     mUnk_108(0),
     mUnk_109(0),
-    mUnk_110(0),
-    mUnk_111(0),
+    mTouchingWall(false),
+    mTouchingFloor(false),
     mUnk_112(0),
     mUnk_113(0),
     mUnk_114(0),
@@ -79,7 +79,7 @@ ARM Actor::Actor() :
     mAlive(true),
     mUnk_119(1),
     mVisible(true),
-    mUnk_11b(false),
+    mGrabbed(false),
     mUnk_11c(0),
     mUnk_11d(false),
     mYOffset(0),
@@ -202,21 +202,21 @@ ARM void Actor::SetUnk_129(bool value) {
     }
 }
 
-ARM bool Actor::SetUnk_11b() {
-    if (mUnk_11b) {
+ARM bool Actor::Grab() {
+    if (mGrabbed) {
         return false;
     }
-    mUnk_11b = true;
+    mGrabbed = true;
     return true;
 }
 
-ARM bool Actor::SetVelocity(Vec3p *vel) {
-    if (!mUnk_11b) {
-        return false;
+ARM bool Actor::Drop(Vec3p *vel) {
+    if (mGrabbed) {
+        mVel     = *vel;
+        mGrabbed = false;
+        return true;
     }
-    mVel     = *vel;
-    mUnk_11b = false;
-    return true;
+    return false;
 }
 
 ARM bool Actor::vfunc_60() {
@@ -263,7 +263,7 @@ ARM bool Actor::vfunc_98() {}
 ARM bool Actor::vfunc_9c() {}
 
 ARM bool Actor::func_ov00_020c195c() {
-    if (!mUnk_11b) {
+    if (!mGrabbed) {
         return false;
     }
     gPlayerLink->func_ov000_020bc854(&mPos);
@@ -359,7 +359,7 @@ ARM bool Actor::IsNearLink() {
 }
 
 ARM void Actor::func_ov00_020c1cf8() {
-    if (mUnk_0a4.mUnk_00 || mUnk_0a4.mUnk_01 || mUnk_129 == true || mUnk_11d == true || mUnk_11b == true) {
+    if (mUnk_0a4.mUnk_00 || mUnk_0a4.mUnk_01 || mUnk_129 == true || mUnk_11d == true || mGrabbed == true) {
         mInactive = 0;
     } else {
         if (this->IsNearLink()) {
@@ -648,7 +648,7 @@ ARM bool Actor::CollidesWith(Actor *other) {
 }
 
 ARM bool Actor::func_ov00_020c27a8(unk32 param1) {
-    if (mUnk_11b) {
+    if (mGrabbed) {
         return false;
     }
     if (param1 == 0) {