diff --git a/include/Unknown/UnkStruct_ov000_020e2f04.hpp b/include/Unknown/UnkStruct_ov000_020e2f04.hpp
index 74739291..b62ae550 100644
--- a/include/Unknown/UnkStruct_ov000_020e2f04.hpp
+++ b/include/Unknown/UnkStruct_ov000_020e2f04.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <nds/math.H>
+#include <nds/math.h>
 
 #include "Physics/AABB.hpp"
 #include "global.h"
diff --git a/src/00_Core/Actor/Actor.cpp b/src/00_Core/Actor/Actor.cpp
index f008064d..d35b77c8 100644
--- a/src/00_Core/Actor/Actor.cpp
+++ b/src/00_Core/Actor/Actor.cpp
@@ -342,7 +342,7 @@ ARM bool Actor::vfunc_4c(unk32 *param1) {
 }
 
 ARM bool Actor::IsNearLink() {
-    Vec3p playerPos = gPlayerPos;
+    Vec3p playerPos = *gPlayerPos;
 
     q20 z  = playerPos.z;
     q20 dx = abs(playerPos.x - mPos.x);
@@ -375,7 +375,7 @@ ARM bool Actor::func_ov00_020c1da0(s32 param1, Vec3p *param2) {
     if (param2) {
         vec = *param2;
     } else {
-        Vec3p_Sub(&gPlayerPos, &mPrevPos, &vec);
+        Vec3p_Sub(gPlayerPos, &mPrevPos, &vec);
     }
 
     return gPlayer->vfunc_30(mUnk_124, &vec, param1);
@@ -389,7 +389,7 @@ ARM bool Actor::func_ov00_020c1e2c(s32 param1, Vec3p *param2) {
     if (param2) {
         vec = *param2;
     } else {
-        Vec3p_Sub(&gPlayerPos, &mPrevPos, &vec);
+        Vec3p_Sub(gPlayerPos, &mPrevPos, &vec);
     }
 
     Cylinder hitbox;
@@ -421,7 +421,7 @@ ARM bool Actor::func_ov00_020c1fc8(PlayerCollide flags) {
     bool result = false;
     if (mHitbox.size >= 0) {
         Vec3p vecFromPlayer;
-        Vec3p_Sub(&mPos, &gPlayerPos, &vecFromPlayer);
+        Vec3p_Sub(&mPos, gPlayerPos, &vecFromPlayer);
         if (this->CollidesWithPlayer(flags & PlayerCollide_Sword)) {
             Knockback knockback;
             knockback.mUnk_00 = gPlayer->EquipItem_vfunc_2c();
@@ -469,7 +469,7 @@ ARM bool Actor::func_ov00_020c1fc8(PlayerCollide flags) {
 
 ARM bool Actor::CollidesWithShield(Cylinder *param1) {
     Vec3p vecFromPlayer;
-    Vec3p_Sub(&mPos, &gPlayerPos, &vecFromPlayer);
+    Vec3p_Sub(&mPos, gPlayerPos, &vecFromPlayer);
     s32 currAngle = gPlayerAngle;
     s32 angle     = Atan2(vecFromPlayer.x, vecFromPlayer.z);
     s32 angleDiff = (s16) angle - currAngle;
@@ -641,13 +641,13 @@ ARM q20 Actor::XzDistanceTo(Vec3p *vec) {
 }
 
 ARM q20 Actor::DistanceToLink() {
-    return Vec3p_Distance(&mPos, &gPlayerPos);
+    return Vec3p_Distance(&mPos, gPlayerPos);
 }
 
 ARM q20 Actor::XzDistanceToLink() {
     Vec3p src;
     Vec3p_CopyXZ(&mPos, &src);
-    Vec3p dest = gPlayerPos;
+    Vec3p dest = *gPlayerPos;
 
     dest.y = 0;
     return Vec3p_Distance(&src, &dest);
@@ -665,7 +665,7 @@ ARM s16 Actor::GetAngleTo(Vec3p *vec) {
 }
 
 ARM s32 Actor::GetAngleToLink() {
-    return this->GetAngleTo(&gPlayerPos);
+    return this->GetAngleTo(gPlayerPos);
 }
 
 extern "C" void func_0202d95c(Vec3p *param1, q20 param2);
@@ -745,7 +745,7 @@ ARM bool Actor::func_ov00_020c2c70() {
             this->GetLinkPos(&pos);
             Vec3p_Sub(&pos, &mPos, &vel);
         } else {
-            Vec3p_Sub(&gPlayerPos, &mPos, &vel);
+            Vec3p_Sub(gPlayerPos, &mPos, &vel);
         }
     }
     Vec3p_Add(&mPos, &vel, &mPos);
@@ -787,7 +787,7 @@ ARM bool Actor::func_ov00_020c2de4() {
             func_0202d95c(&vel, FLOAT_TO_Q20(1.0));
         }
     } else {
-        Vec3p_Sub(&gPlayerPos, &mPos, &vel);
+        Vec3p_Sub(gPlayerPos, &mPos, &vel);
     }
     Vec3p_Add(&mPos, &vel, &mPos);
     mVel = vel;
@@ -870,7 +870,7 @@ ARM bool Actor::func_ov00_020c3094() {
     Vec3p pos, prevPos;
     Vec3p_Copy(&mPos, &pos);
     Vec3p_Copy(&mPrevPos, &prevPos);
-    s32 unk1 = gMapManager->func_ov00_02083ef8(&pos, &prevPos, 0);
+    s32 unk1 = gMapManager->func_ov00_02083ef8(&pos, &prevPos);
     if (mPos.y <= unk1) {
         result = true;
         mPos.y = unk1;
@@ -896,7 +896,7 @@ ARM bool Actor::func_ov00_020c313c(u32 param1) {
 
 ARM void Actor::func_ov00_020c3158() {
     if (mUnk_03c < 0) return;
-    gMapManager->func_ov00_02084c5c(mUnk_03c, 1);
+    gMapManager->SetMapDataFlag1(mUnk_03c, 1);
 }
 
 ARM void Actor::Kill() {
@@ -937,7 +937,7 @@ ARM void Actor::GetLinkPos(Vec3p *result) {
     if (gPlayerLink != NULL && gPlayerLink->GetCurrentCharacter() != PlayerCharacter_Link) {
         return this->GetLinkDummyPos(result);
     }
-    *result = gPlayerPos;
+    result = gPlayerPos;
 }
 
 ARM void Actor::GetLinkDummyPos(Vec3p *result) {
@@ -948,7 +948,7 @@ ARM void Actor::GetLinkDummyPos(Vec3p *result) {
         *result = dummy->mPos;
         return;
     }
-    *result = gPlayerPos;
+    result = gPlayerPos;
 }
 
 Actor_UnkStruct_09c::Actor_UnkStruct_09c() {
diff --git a/src/00_Core/Item/ItemManager.cpp b/src/00_Core/Item/ItemManager.cpp
index 96fbad4c..06122703 100644
--- a/src/00_Core/Item/ItemManager.cpp
+++ b/src/00_Core/Item/ItemManager.cpp
@@ -254,7 +254,7 @@ ARM bool ItemManager::func_ov00_020ad790(unk32 param1) {
     }
 
     ItemFlag equipId = mForcedItem;
-    bool unk2        = !gMapManager->func_ov00_020849f8(equipId);
+    bool unk2        = !gMapManager->func_ov00_020849f8();
     if (mEquippedItem != ItemFlag_None && (unk2 || (u32) mEquippedItem - 9 <= 1) &&
         (gPlayerLink == 0 || gPlayerLink->func_ov000_020bbd80(param1)) && this->HasItem(mEquippedItem))
     {
diff --git a/src/00_Core/Map/MapBase.cpp b/src/00_Core/Map/MapBase.cpp
index ba2b3c58..629886d2 100644
--- a/src/00_Core/Map/MapBase.cpp
+++ b/src/00_Core/Map/MapBase.cpp
@@ -70,8 +70,8 @@ void MapBase::AddTrigger(TriggerParams *param_2) {}
 void TriggerBase::vfunc_08() {}
 s32 MapBase::GetTriggerBoundingBox(unk32 param_2, AABB *param_3) {}
 bool TriggerBase::GetBoundingBox(AABB *bbox) {}
-unk8 MapBase::GetTriggerBoundingBoxes(unk32 param_2, AABB *param_3, unk32 param_4) {}
-unk32 MapBase::GetOverlappingTrigger(Vec3p *param_2) {}
+s32 MapBase::GetTriggerBoundingBoxes(s32 param_2, AABB *param_3, s32 param_4) {}
+bool MapBase::GetOverlappingTrigger(Vec3p *param_2) {}
 bool TriggerBase::Overlaps(Vec3p *point) {}
 unk8 MapBase::FindTrigger(unk32 type) {}
 unk8 MapBase::GetOverlappingTriggers(Vec3p *param_2, TriggerBase **triggers, unk32 capacity) {}
diff --git a/tools/transform_dep.py b/tools/transform_dep.py
old mode 100644
new mode 100755