fixed some issues

3 files changed, 16 insertions, 15 deletions

diff --git a/src/00_Core/Actor/Navi/ActorNavi.cpp b/src/00_Core/Actor/Navi/ActorNavi.cpp
index 7c195178..41a2015a 100644
--- a/src/00_Core/Actor/Navi/ActorNavi.cpp
+++ b/src/00_Core/Actor/Navi/ActorNavi.cpp
@@ -18,7 +18,7 @@ FairyId ActorNavi::GetFairyId() {}
 s32 ActorNavi::vfunc_b8() {}
 void ActorNavi::vfunc_d4() {}
 void ActorNavi::vfunc_d0() {}
-void ActorNavi::SetActive(bool active) {}
+void ActorNavi::SetActive(unk32 active) {}
 void ActorNavi::vfunc_e0() {}
 void ActorNavi::vfunc_d8() {}
 void ActorNavi::vfunc_20(bool param1) {}
diff --git a/src/59_Hammer/Actor/Navi/ActorNaviBase.cpp b/src/59_Hammer/Actor/Navi/ActorNaviBase.cpp
index d8fc5425..29af8f47 100644
--- a/src/59_Hammer/Actor/Navi/ActorNaviBase.cpp
+++ b/src/59_Hammer/Actor/Navi/ActorNaviBase.cpp
@@ -177,11 +177,11 @@ ARM void ActorNavi::func_ov059_0219aba8(u32 param1) {
             if (gMapManager->func_01ffbf5c(&auStack_80, &local_110, &local_11c, this->mUnk_08c.size) ? false : true) {
                 this->mPos     = local_e4;
                 this->mPrevPos = local_e4;
-                this->mUnk_158 = local_e4;
+                this->mOffsetPos = local_e4;
             } else {
-                this->mUnk_158.x = uVar4;
-                this->mUnk_158.y = iVar5;
-                this->mUnk_158.z = uVar6;
+                this->mOffsetPos.x = uVar4;
+                this->mOffsetPos.y = iVar5;
+                this->mOffsetPos.z = uVar6;
             }
             break;
         case 4:
@@ -232,7 +232,7 @@ ARM void ActorNavi::func_ov059_0219aba8(u32 param1) {
             if (!bVar7) {
                 this->mPos     = auStack_e0.mUnk_14;
                 this->mPrevPos = auStack_e0.mUnk_14;
-                this->mUnk_158 = auStack_e0.mUnk_14;
+                this->mOffsetPos = auStack_e0.mUnk_14;
             }
             break;
         default: this->func_ov000_020b853c(); break;
@@ -276,11 +276,11 @@ ARM bool ActorNavi::func_ov059_0219af14() {
             break;
         case 4:
             if (this->mHammer->IsReleased()) {
-                this->mVel.y = this->mUnk_158.y - this->mPos.y;
+                this->mVel.y = this->mOffsetPos.y - this->mPos.y;
                 return true;
             } else {
                 this->func_ov000_020b8c50(0x3000);
-                this->mVel.y = this->mUnk_158.y - this->mPos.y;
+                this->mVel.y = this->mOffsetPos.y - this->mPos.y;
                 return true;
             }
         default: break;
@@ -294,7 +294,7 @@ ARM bool ActorNavi::func_ov059_0219afc4() {
     this->func_ov059_0219933c(0);
 
     switch (this->mUnk_130) {
-        case 3: this->mUnk_158.y = gPlayerPos.y + 0x1666; return true;
+        case 3: this->mOffsetPos.y = gPlayerPos.y + 0x1666; return true;
         case 4: return true;
         default: break;
     }
@@ -306,12 +306,12 @@ ARM void ActorNavi::func_ov059_0219b020() {
     if (gItemManager->GetEquippedFairy() != FairyId_Courage) {
         ItemManager *itemMgr = gItemManager;
 
-        this->mPrevPos = this->mUnk_158 = this->mPos = itemMgr->GetFairy(itemMgr->GetEquippedFairy())->mPos;
+        this->mPrevPos = this->mOffsetPos = this->mPos = itemMgr->GetFairy(itemMgr->GetEquippedFairy())->mPos;
     } else {
-        this->mUnk_158 = this->mPos;
+        this->mOffsetPos = this->mPos;
     }
 
-    gPlayerControl->mAimWorld = this->mUnk_158;
+    gPlayerControl->mAimWorld = this->mOffsetPos;
 
     this->mHammer     = GetEquipHammer();
     this->mUnk_3c0[0] = 0x0;
diff --git a/src/59_Hammer/Player/EquipHammer.cpp b/src/59_Hammer/Player/EquipHammer.cpp
index b126f292..842dff18 100644
--- a/src/59_Hammer/Player/EquipHammer.cpp
+++ b/src/59_Hammer/Player/EquipHammer.cpp
@@ -6,6 +6,7 @@
 #include "Player/LinkStateItem.hpp"
 #include "Player/PlayerControl.hpp"
 #include "Player/PlayerLink.hpp"
+#include "Actor/Navi/ActorNavi.hpp"
 
 extern "C" void ApproachAngle_thunk(s16 *src, s16 dst, u32 param3);
 
@@ -38,7 +39,7 @@ ARM bool EquipHammer::IsUsable(unk32 param1) const {
         return false;
     }
 
-    pAVar3 = gItemManager->GetFairy(FairyId_Courage);
+    pAVar3 = (ActorNavi*)gItemManager->GetFairy(FairyId_Courage);
 
     if (pAVar3 == NULL || pAVar3->mUnk_3b8 != 0) {
         return false;
@@ -192,7 +193,7 @@ ARM void LinkStateItem::func_ov059_021990a4() {
     }
 
     pEVar4 = GetEquipHammer();
-    pAVar5 = gItemManager->GetFairy(FairyId_Courage);
+    pAVar5 = (ActorNavi*)gItemManager->GetFairy(FairyId_Courage);
 
     if (CHECK_0219b160(data_ov059_0219b160.mUnk_20)) {
         this->mUnk_38 = gPlayerControl->mAimWorld;
@@ -242,5 +243,5 @@ ARM EquipHammer *GetEquipHammer() {
 }
 
 ARM void LinkStateItem::StopUsingHammer() {
-    gItemManager->GetFairy(FairyId_Courage)->func_ov000_020b853c();
+    ((ActorNavi*)gItemManager->GetFairy(FairyId_Courage))->func_ov000_020b853c();
 }