Merge branch 'main' into actor-manager

13 files changed, 188 insertions, 230 deletions

diff --git a/src/00_Core/Actor/Actor.cpp b/src/00_Core/Actor/Actor.cpp
index b15fee13..3f1f2850 100644
--- a/src/00_Core/Actor/Actor.cpp
+++ b/src/00_Core/Actor/Actor.cpp
@@ -1,5 +1,5 @@
 extern "C" {
-    #include <stdlib.h>
+#include <stdlib.h>
 }
 
 #include "Actor/Actor.hpp"
@@ -13,7 +13,7 @@ extern "C" {
 #include "Player/TouchControl.hpp"
 #include "Save/AdventureFlags.hpp"
 
-static char *sShipTypes[] = { "brg", "anc", "bow", "hul", "can", "dco", "pdl", "fnl" };
+static char *sShipTypes[] = {"brg", "anc", "bow", "hul", "can", "dco", "pdl", "fnl"};
 
 struct UnkStruct3 {
     /* 0 */ s16 mUnk_0;
@@ -21,45 +21,16 @@ struct UnkStruct3 {
     /* 3 */
 };
 const UnkStruct3 sUnkTable[] = {
-    { 0xff, 2 },
-    { 0xff, 2 },
-    { 0xff, 2 },
-    { 0xff, 2 },
-    { 0xff, 2 },
-    { 6, 2 },
-    { 4, 2 },
-    { 4, 2 },
-    { 4, 2 },
-    { 1, 2 },
-    { 12, 2 },
-    { 4, 2 },
-    { 4, 2 },
-    { 8, 2 },
-    { 12, 2 },
-    { 2, 2 },
-    { 2, 2 },
-    { 20, 2 },
-    { 20, 2 },
-    { 1, 2 },
-    { 4, 2 },
-    { 4, 2 },
-    { 4, 2 },
-    { 8, 2 },
-    { 4, 2 },
-    { 0xff, 2 },
-    { 20, 2 },
-    { 6, 2 },
-    { 6, 2 },
-    { 2, 2 },
+    {0xff, 2}, {0xff, 2}, {0xff, 2}, {0xff, 2}, {0xff, 2}, {6, 2},    {4, 2},  {4, 2},  {4, 2},  {1, 2},
+    {12, 2},   {4, 2},    {4, 2},    {8, 2},    {12, 2},   {2, 2},    {2, 2},  {20, 2}, {20, 2}, {1, 2},
+    {4, 2},    {4, 2},    {4, 2},    {8, 2},    {4, 2},    {0xff, 2}, {20, 2}, {6, 2},  {6, 2},  {2, 2},
 };
 
-KILL(_ZN19Actor_UnkStruct_020C2Ev)
-Actor_UnkStruct_020::Actor_UnkStruct_020():
+Actor_UnkStruct_020::Actor_UnkStruct_020() :
     mUnk_0c(-1),
     mUnk_0d(0),
     mUnk_0e(1),
-    mUnk_10(-1)
-{
+    mUnk_10(-1) {
     for (s32 i = 0; i < 4; ++i) {
         mUnk_00[i] = 0;
     }
@@ -69,8 +40,7 @@ Actor_UnkStruct_020::Actor_UnkStruct_020():
     }
 }
 
-KILL(_ZN5ActorC1Ev)
-ARM Actor::Actor():
+ARM Actor::Actor() :
     mType(ActorTypeId_Null),
     mRef(-1, -1),
     mUnk_010(0),
@@ -124,20 +94,19 @@ ARM Actor::Actor():
     mActiveFrames(0),
     mUnk_13c(0),
     mUnk_140(0),
-    mUnk_144(0)
-{
+    mUnk_144(0) {
     mUnk_014.x = 0;
     mUnk_014.y = 0;
     mUnk_014.z = 0;
-    mPos.x = 0;
-    mPos.y = 0;
-    mPos.z = 0;
+    mPos.x     = 0;
+    mPos.y     = 0;
+    mPos.z     = 0;
     mPrevPos.x = 0;
     mPrevPos.y = 0;
     mPrevPos.z = 0;
-    mVel.x = 0;
-    mVel.y = 0;
-    mVel.z = 0;
+    mVel.x     = 0;
+    mVel.y     = 0;
+    mVel.z     = 0;
 }
 
 ARM Actor::~Actor() {}
@@ -198,7 +167,8 @@ struct UnkStruct1 {
 };
 extern void *data_027e0d3c;
 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" 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(unk32 *param1, unk32 param2, unk32 param3, u32 param4, UnkStruct1 *param5);
 ARM void Actor::vfunc_1c(u16 *param1) {
@@ -217,7 +187,7 @@ ARM void Actor::vfunc_1c(u16 *param1) {
     }
 }
 
-ARM void Actor::vfunc_20(s32 param1) {}
+ARM void Actor::vfunc_20(bool param1) {}
 
 ARM void Actor::SetUnk_129(bool value) {
     if (mUnk_128) mUnk_129 = value;
@@ -231,7 +201,7 @@ ARM bool Actor::SetUnk_11b() {
 
 ARM bool Actor::SetVelocity(Vec3p *vel) {
     if (!mUnk_11b) return false;
-    mVel = *vel;
+    mVel     = *vel;
     mUnk_11b = false;
     return true;
 }
@@ -297,13 +267,9 @@ extern s32 data_027e103c;
 ARM bool Actor::func_ov00_020c198c() {
     u32 unk1 = data_027e077c.mUnk_0;
     u32 unk2 = data_027e077c.mUnk_4;
-    if (
-        data_027e077c.mUnk_0 != data_027e077c.mUnk_4
-        || (data_02056be4[unk1] & 1) != 0
-        || (data_02056be4[unk2] & 4) != 0
-        || func_ov05_02103f4c(data_027e103c)
-        || gPlayer->mHealth <= 0
-    ) {
+    if (data_027e077c.mUnk_0 != data_027e077c.mUnk_4 || (data_02056be4[unk1] & 1) != 0 || (data_02056be4[unk2] & 4) != 0 ||
+        func_ov05_02103f4c(data_027e103c) || gPlayer->mHealth <= 0)
+    {
         return false;
     }
     if (gPlayerLink && !gPlayerLink->func_ov00_020bd304()) return false;
@@ -321,8 +287,7 @@ ARM bool KillPickupsFilter::Filter(Actor *actor) {
         case ActorTypeId_FLAL:
         case ActorTypeId_FLBM:
         case ActorTypeId_FLBT:
-        case ActorTypeId_FLTM:
-        {
+        case ActorTypeId_FLTM: {
             actor->Kill();
             return true;
         }
@@ -338,16 +303,16 @@ ARM void Actor::KillPickupItemActors() {
 
 ARM bool Actor::TrySetTransform(Transform *transform) {
     mPrevPos = mPos;
-    mPos = transform->pos;
-    mAngle = transform->angle;
+    mPos     = transform->pos;
+    mAngle   = transform->angle;
     mVisible = transform->visible;
     return true;
 }
 
 ARM void Actor::SetTransform(Transform *transform) {
     mPrevPos = mPos;
-    mPos = transform->pos;
-    mAngle = transform->angle;
+    mPos     = transform->pos;
+    mAngle   = transform->angle;
     mVisible = transform->visible;
 }
 
@@ -378,7 +343,8 @@ ARM bool Actor::vfunc_4c(unk32 *param1) {
 
 ARM bool Actor::IsNearLink() {
     Vec3p playerPos = gPlayerPos;
-    q20 z = playerPos.z;
+
+    q20 z  = playerPos.z;
     q20 dx = abs(playerPos.x - mPos.x);
     if (dx > FLOAT_TO_Q20(10.0)) return false;
     q20 dz = abs(playerPos.z - mPos.z);
@@ -459,38 +425,42 @@ ARM bool Actor::func_ov00_020c1fc8(PlayerCollide flags) {
         if (this->CollidesWithPlayer(flags & PlayerCollide_Sword)) {
             Knockback knockback;
             knockback.mUnk_00 = gPlayer->EquipItem_vfunc_2c();
-            knockback.vec = vecFromPlayer;
+            knockback.vec     = vecFromPlayer;
             knockback.mUnk_10 = 0;
-            knockback.actor = NULL;
+            knockback.actor   = NULL;
+
             result = this->vfunc_48(&knockback);
         } else if (this->CollidesWithPlayer(flags & PlayerCollide_Shield)) {
             Knockback knockback;
             knockback.mUnk_00 = 0;
-            knockback.vec = vecFromPlayer;
+            knockback.vec     = vecFromPlayer;
             if ((s32) gItemManager->GetActiveFairyLevel(FairyId_Wisdom) >= 1) {
                 knockback.mUnk_10 = 3;
             } else {
                 knockback.mUnk_10 = 2;
             }
             knockback.actor = NULL;
+
             result = this->vfunc_48(&knockback);
         } else if (this->CollidesWithPlayer(flags & PlayerCollide_Hammer)) {
             Knockback knockback;
             knockback.mUnk_00 = gPlayer->EquipItem_vfunc_2c();
-            knockback.vec = vecFromPlayer;
+            knockback.vec     = vecFromPlayer;
             knockback.mUnk_10 = 4;
-            knockback.actor = NULL;
+            knockback.actor   = NULL;
+
             result = this->vfunc_48(&knockback);
         } else if (this->CollidesWithPlayer(flags & PlayerCollide_Gongoron)) {
             Knockback knockback;
             knockback.mUnk_00 = gPlayerLink->vfunc_78();
-            knockback.vec = vecFromPlayer;
+            knockback.vec     = vecFromPlayer;
             if (knockback.mUnk_00 != 0) {
                 knockback.mUnk_10 = 9;
             } else {
                 knockback.mUnk_10 = 2;
             }
             knockback.actor = NULL;
+
             result = this->vfunc_48(&knockback);
         }
     }
@@ -501,8 +471,8 @@ ARM bool Actor::CollidesWithShield(Cylinder *param1) {
     Vec3p vecFromPlayer;
     Vec3p_Sub(&mPos, &gPlayerPos, &vecFromPlayer);
     s32 currAngle = gPlayerAngle;
-    s32 angle = Atan2(vecFromPlayer.x, vecFromPlayer.z);
-    s32 angleDiff = (s16)angle - currAngle;
+    s32 angle     = Atan2(vecFromPlayer.x, vecFromPlayer.z);
+    s32 angleDiff = (s16) angle - currAngle;
     if (angleDiff < 0) angleDiff = -angleDiff;
     if (angleDiff <= DEG_TO_ANG(90) && gPlayer->EquipCollidesWith(param1, ItemFlag_WoodenShield)) {
         return true;
@@ -558,6 +528,7 @@ ARM bool Actor::func_ov00_020c243c(ActorTypeId *actorTypes, Actor **out) {
             if (actor->mType == ActorTypeId_Arrow || actor->mType == ActorTypeId_SBEM) {
                 q20 cos = COS(actor->mAngle);
                 q20 sin = SIN(actor->mAngle);
+
                 knockback.vec.x = sin;
                 knockback.vec.y = 0;
                 knockback.vec.z = cos;
@@ -565,7 +536,7 @@ ARM bool Actor::func_ov00_020c243c(ActorTypeId *actorTypes, Actor **out) {
                 Vec3p_Sub(&mPos, &actor->mPrevPos, &knockback.vec);
             }
             knockback.mUnk_00 = actor->mUnk_125;
-            knockback.actor = actor;
+            knockback.actor   = actor;
 
             switch (actor->mType) {
                 case ActorTypeId_SBEM: {
@@ -599,8 +570,7 @@ ARM bool Actor::func_ov00_020c243c(ActorTypeId *actorTypes, Actor **out) {
                 case ActorTypeId_BKEY:
                 case ActorTypeId_FORC:
                 case ActorTypeId_FLTB:
-                case ActorTypeId_TSUB:
-                {
+                case ActorTypeId_TSUB: {
                     knockback.mUnk_10 = 10;
                 } break;
 
@@ -678,12 +648,14 @@ ARM q20 Actor::XzDistanceToLink() {
     Vec3p src;
     Vec3p_CopyXZ(&mPos, &src);
     Vec3p dest = gPlayerPos;
+
     dest.y = 0;
     return Vec3p_Distance(&src, &dest);
 }
 
 ARM s16 Actor::GetAngleTo(Vec3p *vec) {
     s16 angle = mAngle;
+
     q20 dz = vec->z - mPos.z;
     q20 dx = vec->x - mPos.x;
     if (dx != 0 || dz != 0) {
@@ -700,10 +672,11 @@ extern "C" void func_0202d95c(Vec3p *param1, q20 param2);
 ARM void Actor::func_ov00_020c2988(Vec3p *param1, q20 param2, Vec3p *param3) {
     q20 z1 = param1->z;
     q20 z0 = mPos.z;
+
     param3->x = param1->x - mPos.x;
     param3->y = 0;
     param3->z = z1 - z0;
-    q20 dist = this->XzDistanceTo(param1);
+    q20 dist  = this->XzDistanceTo(param1);
     if (dist < param2) param2 = dist;
     func_0202d95c(param3, param2);
 }
@@ -719,8 +692,8 @@ ARM bool Actor::func_ov00_020c29ec(q20 param1) {
 }
 
 ARM void Actor::GetHitbox(Cylinder *hitbox) {
-    hitbox->size = mHitbox.size;
-    u32 angle = 2 * (mAngle >> 4);
+    hitbox->size  = mHitbox.size;
+    u32 angle     = 2 * (mAngle >> 4);
     hitbox->pos.x = mPos.x;
     hitbox->pos.y = mPos.y;
     hitbox->pos.z = mPos.z;
@@ -732,8 +705,8 @@ ARM void Actor::GetHitbox(Cylinder *hitbox) {
 }
 
 ARM void Actor::GetUnk_08c(Cylinder *param1) {
-    param1->size = mUnk_08c.size;
-    u32 angle = 2 * (mAngle >> 4);
+    param1->size  = mUnk_08c.size;
+    u32 angle     = 2 * (mAngle >> 4);
     param1->pos.x = mPos.x;
     param1->pos.y = mPos.y;
     param1->pos.z = mPos.z;
@@ -780,8 +753,8 @@ ARM bool Actor::func_ov00_020c2c70() {
     return boomerang != NULL;
 }
 
-ARM EquipBoomerang* Actor::GetEquipBoomerang() {
-    return (EquipBoomerang*) ItemManager::GetEquipItemUnchecked(ItemFlag_Boomerang);
+ARM EquipBoomerang *Actor::GetEquipBoomerang() {
+    return (EquipBoomerang *) ItemManager::GetEquipItemUnchecked(ItemFlag_Boomerang);
 }
 
 ARM bool Actor::func_ov00_020c2d54() {
@@ -806,6 +779,7 @@ ARM bool Actor::func_ov00_020c2de4() {
     Vec3p vel;
 
     EquipRope *rope = EquipSword::GetEquipRope();
+
     Actor *actor = rope->func_ov14_0213d420();
     if (actor) {
         Vec3p_Sub(&actor->mPos, &mPos, &vel);
@@ -822,6 +796,7 @@ ARM bool Actor::func_ov00_020c2de4() {
 
 ARM bool Actor::func_ov00_020c2e7c() {
     bool result = false;
+
     EquipRope *rope = EquipSword::GetEquipRope();
     if (!mUnk_11d) {
         s32 unk1 = rope->func_ov14_0213ddd4(this);
@@ -841,6 +816,7 @@ ARM bool Actor::func_ov00_020c2ebc() {
 
 ARM bool Actor::func_ov00_020c2ed4() {
     EquipRope *rope = EquipSword::GetEquipRope();
+
     s32 index = rope->func_ov14_0213d440(mRef.id);
     if (index >= 0) {
         bool unk1 = rope->func_ov14_0213d420();
@@ -870,6 +846,7 @@ ARM bool Actor::func_ov00_020c2ed4() {
 
 ARM bool Actor::IsHitboxTouched(bool param1) {
     q20 size = mHitbox.size;
+
     bool result = false;
     if (size >= 0) {
         Vec3p pos = mPos;
@@ -901,7 +878,7 @@ ARM bool Actor::func_ov00_020c3094() {
     return result;
 }
 
-ARM Vec3p* Actor::GetPos() {
+ARM Vec3p *Actor::GetPos() {
     return &mPos;
 }
 
@@ -948,6 +925,7 @@ ARM void Actor::vfunc_ac() {}
 
 ARM void Actor::func_ov00_020c3200(s32 param1) {
     const UnkStruct3 *entry = &sUnkTable[param1];
+
     mUnk_122 = sUnkTable[param1].mUnk_0;
     mUnk_120 = sUnkTable[param1].mUnk_0;
     mUnk_124 = entry->mUnk_2;
@@ -965,7 +943,7 @@ ARM void Actor::GetLinkPos(Vec3p *result) {
 ARM void Actor::GetLinkDummyPos(Vec3p *result) {
     ActorRef dummyRef;
     ActorManager::FindActorByType(&dummyRef, gActorManager, ActorTypeId_PlayerDummy);
-    ActorPlayerDummy *dummy = (ActorPlayerDummy*) gActorManager->GetActor(&dummyRef);
+    ActorPlayerDummy *dummy = (ActorPlayerDummy *) gActorManager->GetActor(&dummyRef);
     if (dummy != NULL && dummy->mUnk_16e == 0) {
         *result = dummy->mPos;
         return;
@@ -980,3 +958,4 @@ Actor_UnkStruct_09c::Actor_UnkStruct_09c() {
     mUnk_4 = 0;
 }
 
+Actor_UnkStruct_012::Actor_UnkStruct_012() {}
diff --git a/src/00_Core/Actor/ActorManager.cpp b/src/00_Core/Actor/ActorManager.cpp
index d3e7f13f..4438c7a1 100644
--- a/src/00_Core/Actor/ActorManager.cpp
+++ b/src/00_Core/Actor/ActorManager.cpp
@@ -1,20 +1,21 @@
 #include "Actor/ActorManager.hpp"
 
 void ActorManager::func_ov00_020c3484(ActorRef *ref, Actor *actor, unk32 param3) {}
-Actor* ActorManager::GetActor(ActorRef *ref) {}
+void ActorManager::Actor_vfunc_10(u32 param1) {}
+Actor *ActorManager::FindActorById(u32 id) {}
+Actor *ActorManager::GetActor(ActorRef *ref) {}
 bool FilterActor::Filter(Actor *actor) {}
 s32 ActorManager::FilterActors(FilterActorBase *filter, ActorList *filteredActors) {}
 void ActorManager::FindActorByType(ActorRef *ref, ActorManager *manager, ActorTypeId type) {}
 void ActorManager::FindNearestActorOfType(ActorRef *ref, ActorManager *manager, ActorTypeId type, Vec3p *pos) {}
 bool ActorManager::func_ov00_020c398c(u32 index) {}
 void ActorManager::func_ov00_020c399c(u32 index, Cylinder *cylinder) {}
-Actor* ActorManager::func_ov00_020c39ac(u32 index, const ActorTypeId *actorTypes, bool param3) {}
+Actor *ActorManager::func_ov00_020c39ac(u32 index, const ActorTypeId *actorTypes, bool param3) {}
 s32 ActorManager::func_ov00_020c3b2c(s32 *param1) {}
 s32 ActorManager::func_ov00_020c3bb0(unk32 param1, s32 *param2) {}
 void ActorManager::func_ov00_020c3ce8(unk32 param1, unk32 param2) {}
 void ActorManager::Actor_vfunc_28() {}
 
-
 extern void func_ov00_020c3f54(void *, u32 param2);
 extern s32 *data_027e103c;
 extern s32 *data_027e077c;
@@ -29,7 +30,7 @@ ARM void ActorManager::DeleteActor(u32 index, bool param2) {
     if (this->mActorTable[index] != NULL) {
         delete this->mActorTable[index];
     }
-    
+
     this->mActorTable[index] = NULL;
 
     if (param2) {
@@ -37,7 +38,7 @@ ARM void ActorManager::DeleteActor(u32 index, bool param2) {
     }
 
     this->mNumActors--;
-    
+
     if (index + 1 != this->mMaxActorIndex) {
         return;
     }
@@ -59,7 +60,7 @@ ARM void ActorManager::Actor_vfunc_10(u32 param1) {
     Actor *actor;
     int i;
 
-    u32 uVar1 = param1;
+    u32 uVar1            = param1;
     Actor **currentActor = this->mActorTable;
 
     for (i = 0; i < this->mMaxActorIndex; ++i) {
@@ -75,7 +76,7 @@ ARM void ActorManager::Actor_vfunc_10(u32 param1) {
     return;
 }
 
-ARM Actor* ActorManager::FindActorById(s32 id) {
+ARM Actor *ActorManager::FindActorById(s32 id) {
     u32 actorId;
     s32 cacheIndex;
     Actor *actor;
@@ -88,24 +89,24 @@ ARM Actor* ActorManager::FindActorById(s32 id) {
         if ((cacheIndex >= 0) && (cacheIndex < this->mMaxActorIndex)) {
             pActor = this->mActorTable;
             if (pActor[cacheIndex] != NULL) {
-                if ((Actor**)(u32)pActor[cacheIndex]->mAlive != NULL && id == pActor[cacheIndex]->mId) {
+                if ((Actor **) (u32) pActor[cacheIndex]->mAlive != NULL && id == pActor[cacheIndex]->mId) {
                     actor = pActor[cacheIndex];
                     goto ret;
                 }
             }
         }
-        pActor = this->mActorTable;
-        actorId = this->mMaxActorIndex;
+        pActor    = this->mActorTable;
+        actorId   = this->mMaxActorIndex;
         lastActor = pActor + actorId;
 
         for (; pActor < lastActor; pActor = pActor + 1) {
-          if (*pActor != NULL) {
-            actorId = (u32)(*pActor)->mAlive;
-            if (actorId != 0 && id == (*pActor)->mId) {
-                actor = *pActor;
-                break;
+            if (*pActor != NULL) {
+                actorId = (u32) (*pActor)->mAlive;
+                if (actorId != 0 && id == (*pActor)->mId) {
+                    actor = *pActor;
+                    break;
+                }
             }
-          }
         }
     }
 
@@ -113,13 +114,13 @@ ret:
     return actor;
 }
 
-Actor* ActorManager::GetActor(ActorRef *ref) {
+Actor *ActorManager::GetActor(ActorRef *ref) {
     Actor *pActor;
     u32 alive;
 
     alive = ref->index;
 
-    if ((s32)alive < 0) {
+    if ((s32) alive < 0) {
         return NULL;
     }
 
@@ -128,7 +129,7 @@ Actor* ActorManager::GetActor(ActorRef *ref) {
         alive = pActor->mAlive;
         if (alive != 0 && ref->id == pActor->mId) {
             return pActor;
-        }   
+        }
     }
 
     return NULL;
diff --git a/src/00_Core/Item/ItemManager.cpp b/src/00_Core/Item/ItemManager.cpp
index e20081d4..9b4a71fb 100644
--- a/src/00_Core/Item/ItemManager.cpp
+++ b/src/00_Core/Item/ItemManager.cpp
@@ -1,10 +1,10 @@
 #include "Item/ItemManager.hpp"

 #include "Player/PlayerLinkBase.hpp"

 

-static const char *sShipPartTypes[] = { "anc", "bow", "hul", "can", "dco", "pdl", "fnl", "brg" };

+static const char *sShipPartTypes[] = {"anc", "bow", "hul", "can", "dco", "pdl", "fnl", "brg"};

 

 extern u32 *data_027e0ce0[];

-THUMB ItemManager* ItemManager::Create() {

+THUMB ItemManager *ItemManager::Create() {

     gItemManager = new(data_027e0ce0[1], 4) ItemManager();

     return gItemManager;

 }

@@ -24,12 +24,12 @@ THUMB void ItemManager::Save(SaveItemManager *save) {
     for (s32 i = 0; i < NUM_POTIONS; ++i) {

         save->potions[i] = mPotions[i];

     }

-    save->numBombs = (u8) (*mAmmo)[ItemFlag_BombBag];

-    save->numBombchus = (u8) (*mAmmo)[ItemFlag_BombchuBag];

-    save->numArrows = (u8) (*mAmmo)[ItemFlag_Bow];

-    save->equippedItem = (u8) mEquippedItem;

+    save->numBombs              = (u8) (*mAmmo)[ItemFlag_BombBag];

+    save->numBombchus           = (u8) (*mAmmo)[ItemFlag_BombchuBag];

+    save->numArrows             = (u8) (*mAmmo)[ItemFlag_Bow];

+    save->equippedItem          = (u8) mEquippedItem;

     save->salvagedTreasureFlags = mSalvagedTreasureFlags;

-    save->hourglassSeconds = FastDivide(mHourglassSandFrames, 60);

+    save->hourglassSeconds      = FastDivide(mHourglassSandFrames, 60);

     for (s32 i = 0; i < Gem_COUNT; ++i) {

         save->numGems[i] = mNumGems[i];

     }

@@ -48,8 +48,8 @@ THUMB void ItemManager::Save(SaveItemManager *save) {
         save->unk_9f[i] = mUnk_098[i];

         save->unk_82[i] = mUnk_09e[i];

     }

-    save->quiverSize = mQuiverSize;

-    save->bombBagSize = mBombBagSize;

+    save->quiverSize     = mQuiverSize;

+    save->bombBagSize    = mBombBagSize;

     save->bombchuBagSize = mBombchuBagSize;

     if (mEquippedFairy == FairyId_None) {

         save->equippedFairy = 3;

@@ -61,21 +61,20 @@ THUMB void ItemManager::Save(SaveItemManager *save) {
 THUMB void ItemManager::Load(const SaveItemManager *save) {

     mItemFlags = save->itemFlags;

     mNumRupees = save->numRupees;

-    mHourglassSandFrames = save->hourglassSeconds <= MAX_HOURGLASS_SECONDS

-        ? save->hourglassSeconds * 60

-        : MAX_HOURGLASS_SECONDS * 60;

+    mHourglassSandFrames =

+        save->hourglassSeconds <= MAX_HOURGLASS_SECONDS ? save->hourglassSeconds * 60 : MAX_HOURGLASS_SECONDS * 60;

     for (s32 i = ItemFlag_EQUIP_START; i < ItemFlag_EQUIP_END; ++i) {

         if (GET_FLAG(mItemFlags.flags, (u32) i)) {

             (*mAmmo)[i] = 1;

         }

     }

-    (*mAmmo)[ItemFlag_BombBag] = save->numBombs;

+    (*mAmmo)[ItemFlag_BombBag]    = save->numBombs;

     (*mAmmo)[ItemFlag_BombchuBag] = save->numBombchus;

-    (*mAmmo)[ItemFlag_Bow] = save->numArrows;

+    (*mAmmo)[ItemFlag_Bow]        = save->numArrows;

     for (s32 i = 0; i < NUM_POTIONS; ++i) {

         mPotions[i] = save->potions[i];

     }

-    mEquippedItem = save->equippedItem;

+    mEquippedItem          = save->equippedItem;

     mSalvagedTreasureFlags = save->salvagedTreasureFlags;

     for (s32 i = 0; i < Gem_COUNT; ++i) {

         mNumGems[i] = save->numGems[i];

@@ -95,10 +94,10 @@ THUMB void ItemManager::Load(const SaveItemManager *save) {
         mUnk_098[i] = save->unk_9f[i];

         mUnk_09e[i] = save->unk_82[i];

     }

-    mQuiverSize = save->quiverSize;

-    mBombBagSize = save->bombBagSize;

+    mQuiverSize     = save->quiverSize;

+    mBombBagSize    = save->bombBagSize;

     mBombchuBagSize = save->bombchuBagSize;

-    mEquippedFairy = save->equippedFairy;

+    mEquippedFairy  = save->equippedFairy;

     if (mEquippedFairy >= FairyId_COUNT) {

         mEquippedFairy = FairyId_None;

     }

@@ -121,7 +120,7 @@ ARM FairyId ItemManager::GetEquippedFairy() const {
     return fairy;

 }

 

-ARM ActorNavi* ItemManager::GetFairy(FairyId id) const {

+ARM ActorNavi *ItemManager::GetFairy(FairyId id) const {

     return mFairies[id];

 }

 

@@ -150,29 +149,29 @@ ARM void ItemManager::TickEquipItem(void) {
 

 ARM void ItemManager::func_ov00_020ad528() {}

 

-ARM ItemModel* ItemManager::GetItemModel(ItemModelId id) {

+ARM ItemModel *ItemManager::GetItemModel(ItemModelId id) {

     return mItemModels[id];

 }

 

 extern unk32 data_027e0fc4;

-extern "C" void* func_ov00_020bb3a8(unk32 param1, u32 index);

+extern "C" void *func_ov00_020bb3a8(unk32 param1, u32 index);

 extern "C" void func_ov00_020c0bdc(void *param1, unk32 param2);

 ARM void ItemManager::func_ov00_020ad538(unk32 param1) const {

-    void* unk1 = func_ov00_020bb3a8(data_027e0fc4, 6);

+    void *unk1 = func_ov00_020bb3a8(data_027e0fc4, 6);

     func_ov00_020c0bdc(unk1, param1);

 }

 

 ARM void ItemManager::func_ov00_020ad560(unk32 param1) const {

-    void* unk1 = func_ov00_020bb3a8(data_027e0fc4, 7);

+    void *unk1 = func_ov00_020bb3a8(data_027e0fc4, 7);

     func_ov00_020c0bdc(unk1, param1);

 }

 

-ARM ItemModel* ItemManager::GetDungeonItemModel(u32 index) {

+ARM ItemModel *ItemManager::GetDungeonItemModel(u32 index) {

     return mDungeonItemModels[index];

 }

 

 ARM void ItemManager::func_ov00_020ad594(unk32 param1) const {

-    void* unk1 = func_ov00_020bb3a8(data_027e0fc4, 11);

+    void *unk1 = func_ov00_020bb3a8(data_027e0fc4, 11);

     func_ov00_020c0bdc(unk1, param1);

 }

 

@@ -191,7 +190,7 @@ ARM void ItemManager::EquipItem_vfunc_38(unk32 param1) {
         this->Shield_vfunc_38(param1);

     }

     if (data_027e0d38->mUnk_14 == 1) return;

-    

+

     ItemFlag equip = this->GetEquippedItem();

     if (equip == ItemFlag_None) return;

     if (mEquipLoadTimer > 0) return;

@@ -215,7 +214,7 @@ ARM s32 ItemManager::EquipItem_vfunc_2c(ItemFlag equipId) {
     return (*mEquipItems)[equipId]->vfunc_2c();

 }

 

-ARM EquipItem* ItemManager::GetEquipItem(ItemFlag equipId) {

+ARM EquipItem *ItemManager::GetEquipItem(ItemFlag equipId) {

     if (equipId == ItemFlag_None) {

         return NULL;

     } else {

@@ -237,14 +236,10 @@ extern "C" unk32 func_ov00_02078b40(UnkStruct_027e0d38 *param1);
 extern void *data_027e10a4;

 extern "C" bool func_ov15_02136670(void *param1);

 extern unk8 data_ov29_0217a4ac[];

-extern "C" bool _ZN10MapManager18func_ov00_020849f8Ei(void *param1);

 extern "C" bool _ZN14PlayerLinkBase18func_ov00_020bbd80Ei(unk32 param1, unk32 param2);

 extern "C" bool _ZNK11ItemManager7HasItemEi();

 extern "C" void _ZN11ItemManager12GetEquipItemEi();

-ARM bool NONMATCH(ItemManager::func_ov00_020ad790)(unk32 param1) {

-    #ifndef NONMATCHING

-    #include "../asm/ov00/Item/ItemManager_func_ov00_020ad790.inc"

-    #else

+ARM bool ItemManager::func_ov00_020ad790(unk32 param1) {

     unk32 unk1 = func_ov00_02078b40(data_027e0d38);

     if (unk1 == 2) return func_ov15_02136670(data_027e10a4);

     if (data_027e0d38->mUnk_14 == 1) return false;

@@ -252,24 +247,20 @@ ARM bool NONMATCH(ItemManager::func_ov00_020ad790)(unk32 param1) {
     if (gOverlayManager.mLoadedOverlays[OverlayIndex_6] == OverlayId_29 && data_ov29_0217a4ac[0x54] != 0) {

         return false;

     }

-    

+

     ItemFlag equipId = mForcedItem;

-    bool unk2 = !gMapManager->func_ov00_020849f8();

-    if (

-        mEquippedItem != ItemFlag_None &&

-        (unk2 || (u32) mEquippedItem - 9 <= 1) &&

-        (gPlayerLink == 0 || gPlayerLink->func_ov00_020bbd80(param1)) &&

-        this->HasItem(mEquippedItem)

-    ) {

+    bool unk2        = !gMapManager->func_ov00_020849f8(equipId);

+    if (mEquippedItem != ItemFlag_None && (unk2 || (u32) mEquippedItem - 9 <= 1) &&

+        (gPlayerLink == 0 || gPlayerLink->func_ov00_020bbd80(param1)) && this->HasItem(mEquippedItem))

+    {

         equipId = mEquippedItem;

     }

-    

+

     if (equipId != ItemFlag_None) {

         if (mEquipLoadTimer != 0) return param1 == 0;

         return this->GetEquipItem(equipId)->IsUsable(param1);

     }

     return false;

-    #endif

 }

 

 THUMB ShipType ItemManager::GetEquippedShipPart(ShipPart part) const {

@@ -308,7 +299,7 @@ THUMB u16 ItemManager::GetUnk_09e(u32 index) const {
 

 THUMB s32 ItemManager::GetUnk_09e_Divided(u32 index) const {

     q20 quotient = Divide(INT_TO_Q20(mUnk_09e[index]), FLOAT_TO_Q20(2.54));

-    s32 result = ROUND_Q20(quotient);

+    s32 result   = ROUND_Q20(quotient);

     if (result < 1) result = 1;

     return result;

 }

@@ -323,7 +314,7 @@ THUMB void ItemManager::SetUnk_09e(u32 index, u16 value) {
     }

 }

 

-const u16 sQuiverSizes[] = {20, 20, 30, 50};

+const u16 sQuiverSizes[]  = {20, 20, 30, 50};

 const u16 sBombBagSizes[] = {10, 20, 30};

 

 THUMB u16 ItemManager::GetMaxAmmo(ItemFlag equipId) const {

@@ -383,11 +374,12 @@ THUMB void ItemManager::RemoveItem(ItemFlag item) {
 

 extern ItemModel **data_027e1058;

 extern ItemModel **data_027e105c;

-extern "C" ItemModel* func_ov00_02079ffc(void*, const char *modelName, const char *textureName, unk32 param4, unk8 param5, unk8 param6, bool param7);

-extern "C" ItemModel* LoadTreasureItemFanfare(ItemModel**, s32 treasureType, bool, bool);

-static char *sDefaultItemModel = "key";

+extern "C" ItemModel *func_ov00_02079ffc(void *, const char *modelName, const char *textureName, unk32 param4, unk8 param5,

+                                         unk8 param6, bool param7);

+extern "C" ItemModel *LoadTreasureItemFanfare(ItemModel **, s32 treasureType, bool, bool);

+static char *sDefaultItemModel   = "key";

 static char *sItemModelNames[70] = {

-    [ItemId_None]              = "key",

+    [ItemId_Nothing]           = "key",

     [ItemId_SmallKey]          = "key",

     [ItemId_GreenRupee]        = "rupee_g",

     [ItemId_OshusSword]        = "swA",

@@ -480,37 +472,24 @@ static char *sItemModelNames3[9] = {
     [ItemId_Unk_135 - ItemId_CycloneSlate]      = NULL,

 };

 char *sSpecialItemModelNames[7] = {

-    "mapTakara\0\0",

-    "arrowpodL\0\0",

-    "bmbagL\0",

-    "bcbagL\0",

-    "Player/get/gd_\0",

-    ".nsbmd\0",

-    ".nsbtx\0",

+    "mapTakara\0\0", "arrowpodL\0\0", "bmbagL\0", "bcbagL\0", "Player/get/gd_\0", ".nsbmd\0", ".nsbtx\0",

 };

 THUMB void ItemManager::LoadFanfareItem(ItemId id) {

     mFanfareItem = id;

-    

+

     ItemModel *model;

-    if (

-        id == ItemId_Unk_43 ||

-        id == ItemId_Cannon ||

-        (id >= ItemId_GOLDEN_SHIP_START && id <= ItemId_GOLDEN_SHIP_END) ||

-        id == ItemId_Unk_126 ||

-        id == ItemId_Unk_133

-    ) {

+    if (id == ItemId_Unk_43 || id == ItemId_Cannon || (id >= ItemId_GOLDEN_SHIP_START && id <= ItemId_GOLDEN_SHIP_END) ||

+        id == ItemId_Unk_126 || id == ItemId_Unk_133)

+    {

         model = *data_027e1058;

-    } else if (

-        id >= ItemId_TREASURE_START &&

-        id <= ItemId_TREASURE_END

-    ) {

+    } else if (id >= ItemId_TREASURE_START && id <= ItemId_TREASURE_END) {

         model = LoadTreasureItemFanfare(data_027e105c, id - ItemId_TREASURE_START, true, false);

     } else if (id == ItemId_Unk_125) {

         model = *data_027e105c;

     } else {

-        char modelName[0x80] = {};

+        char modelName[0x80]   = {};

         char textureName[0x80] = {};

-        const char *itemName = NULL;

+        const char *itemName   = NULL;

         if (id == ItemId_Quiver && (s32) mQuiverSize >= 1) {

             itemName = sSpecialItemModelNames[1];

         } else if (id == ItemId_BigBombBag && (s32) mBombBagSize >= 1) {

@@ -774,11 +753,11 @@ THUMB void ItemManager::GiveItem(ItemId id) {
                 break;

             }

         } break;

-        

+

         case ItemId_SandOfHours: {

             mHourglassSandFrames += 3600;

         } break;

-        

+

         case ItemId_GoldenChimney: {

             gAdventureFlags->Set(AdventureFlag_ReceivedGoldenChimney, true);

             GiveShipPart(ShipPart_Chimney, ShipType_Golden);

@@ -814,8 +793,8 @@ THUMB void ItemManager::GiveItem(ItemId id) {
         case ItemId_Rupoor50: {

             this->GiveRupees(-50, true);

         } break;

-        

-        case ItemId_None: break;

+

+        case ItemId_Nothing: break;

         case ItemId_Unk_5: break;

         case ItemId_Unk_16: break;

         case ItemId_Unk_131: break;

@@ -827,11 +806,9 @@ THUMB void ItemManager::GiveItem(ItemId id) {
             }

         } break;

     }

-    if (

-        gAdventureFlags->Get(AdventureFlag_Azurine) &&

-        gAdventureFlags->Get(AdventureFlag_Crimsonine) &&

-        gAdventureFlags->Get(AdventureFlag_Aquanine)

-    ) {

+    if (gAdventureFlags->Get(AdventureFlag_Azurine) && gAdventureFlags->Get(AdventureFlag_Crimsonine) &&

+        gAdventureFlags->Get(AdventureFlag_Aquanine))

+    {

         gAdventureFlags->Set(AdventureFlag_Unk_128, true);

     }

 }

@@ -841,7 +818,7 @@ THUMB void ItemManager::GiveEquipItem(ItemFlag item, u16 ammo) {
     SET_FLAG(mItemFlags.flags, flag);

     this->GetEquipItem(item)->GiveAmmo(ammo);

     if (mEquippedItem == ItemFlag_None) {

-        this->mEquippedItem = item;

+        this->mEquippedItem   = item;

         this->mEquipLoadTimer = 1;

     }

 }

@@ -862,7 +839,7 @@ ARM s32 ItemManager::GetMaxRupees() const {
 extern void *data_027e103c;

 extern "C" s32 func_ov00_020cf374(void *param1, bool param2);

 extern "C" void func_ov05_02104004(void *param1);

-ARM void ItemManager::GiveRupees(s16 amount, bool param2) {

+ARM void ItemManager::GiveRupees(s32 amount, bool param2) {

     s32 newRupees = mNumRupees + amount;

     if (newRupees > this->GetMaxRupees()) {

         newRupees = this->GetMaxRupees();

@@ -898,8 +875,8 @@ ARM ItemFlag ItemManager::GetEquippedItem() const {
 

 ARM bool ItemManager::SetEquippedItem(ItemFlag equipId) {

     mPrevEquippedItem = mEquippedItem;

-    mEquippedItem = equipId;

-    mEquipLoadTimer = 2;

+    mEquippedItem     = equipId;

+    mEquipLoadTimer   = 2;

     return true;

 }

 

@@ -912,7 +889,7 @@ THUMB void ItemManager::ForceEquipItem(ItemFlag equipId) {
         if (i == equipId) continue;

         (*mEquipItems)[i - ItemFlag_EQUIP_START]->UpdateInUse(0);

     }

-    mForcedItem = equipId;

+    mForcedItem     = equipId;

     mEquipLoadTimer = 1;

 }

 

@@ -966,12 +943,10 @@ ARM bool ItemManager::HasPotion(u32 index) const {
     switch (mPotions[index]) {

         case Potion_Red:

         case Potion_Purple:

-        case Potion_Yellow:

-            return true;

-        

+        case Potion_Yellow: return true;

+

         case Potion_None:

-        default:

-            return false;

+        default: return false;

     }

 }

 

@@ -1032,7 +1007,7 @@ THUMB void ItemManager::PlayItemFanfareSfx(ItemId item) {
         case ItemId_GoldRupee: {

             sfx = SfxId_Fanfare_GoldRupee;

         } break;

-        

+

         case ItemId_SmallKey:

         case ItemId_GreenRupee:

         case ItemId_BlueRupee:

@@ -1040,12 +1015,12 @@ THUMB void ItemManager::PlayItemFanfareSfx(ItemId item) {
             sfx = SfxId_Fanfare_Rupee;

         } break;

 

-        case ItemId_Rupoor10: 

+        case ItemId_Rupoor10:

         case ItemId_Rupoor50: {

             sfx = SfxId_Fanfare_Rupoor;

         } break;

 

-        case ItemId_None:

+        case ItemId_Nothing:

         case ItemId_HerosNewClothes: {

             sfx = SfxId_Fanfare_Nothing_2;

         } break;

@@ -1053,13 +1028,14 @@ THUMB void ItemManager::PlayItemFanfareSfx(ItemId item) {
         case ItemId_HeartContainer: {

             sfx = SfxId_Fanfare_HeartContainer;

         } break;

-        

+

         default: {

             sfx = SfxId_Fanfare_Treasure;

         } break;

     }

     if (gItemManager->mFanfareSfx != SfxId_None) {

         sfx = gItemManager->mFanfareSfx;

+

         gItemManager->mFanfareSfx = SfxId_None;

     }

     PlaySoundEffect(&data_ov00_020eec68, sfx);

diff --git a/src/00_Core/Map/Course.cpp b/src/00_Core/Map/Course.cpp
index 316b05ee..4771048d 100644
--- a/src/00_Core/Map/Course.cpp
+++ b/src/00_Core/Map/Course.cpp
@@ -2,12 +2,12 @@
 
 void Course::GetDungeonProgress(CourseProgress *param_2) {}
 void Course::func_ov00_0207ca28(s32 param_2, unk32 param_3, unk32 param_4) {}
-char* Course::SetCourseName(char *src) {}
+char *Course::SetCourseName(char *src) {}
 void Course::func_ov00_0207ca78(unk32 param_2, unk8 param_3, unk32 param_4) {}
 bool Course::func_ov00_0207caa8(s32 param_2, unk32 *param_3, unk8 *param_4) {}
 unk32 Course::func_ov00_0207cb30(s32 param_2) {}
 void Course::FindMapGridPos(Vec2b *pos, Course *param_2, u32 map) {}
-Vec3p* Course::FindMapCenter(unk32 map) {}
+Vec3p *Course::FindMapCenter(unk32 map) {}
 void Course::func_ov00_0207cbe8(s32 param_2) {}
 unk8 Course::func_ov00_0207cc24(s32 param_2) {}
 unk32 Course::FindMapData_Unk_08(unk32 map) {}
@@ -47,5 +47,5 @@ void Course::SetMapDataFlag3(unk32 param_2, bool param_3) {}
 bool Course::GetMapDataFlag3(unk32 param_2) {}
 void Course::SetMapDataFlag4(unk32 param_2, unk32 param_3) {}
 bool Course::GetMapDataFlag4(unk32 param_2) {}
-MapData* Course::FindMapData(u32 map) {}
-MapData* Course::FindCurrentMapData() {}
+MapData *Course::FindMapData(u32 map) {}
+MapData *Course::FindCurrentMapData() {}
diff --git a/src/00_Core/Map/MapBase.cpp b/src/00_Core/Map/MapBase.cpp
index 1afc8c29..8d6d3c96 100644
--- a/src/00_Core/Map/MapBase.cpp
+++ b/src/00_Core/Map/MapBase.cpp
@@ -29,7 +29,7 @@ unk8 MapBase::func_ov00_0207e968() {}
 unk8 MapBase::func_ov00_0207e96c() {}
 unk8 MapBase::vfunc_6c(unk32 param_2, unk32 param_3, unk32 param_4) {}
 unk32 MapBase::vfunc_70(Vec3p *param_2) {}
-s32* MapBase::vfunc_74(Vec3p *param_2) {}
+s32 *MapBase::vfunc_74(Vec3p *param_2) {}
 unk8 MapBase::func_ov00_0207f100() {}
 bool MapBase::func_ov00_0207f104(unk32 param_2, unk32 param_3) {}
 unk32 MapBase::func_ov00_0207f1f4(Vec3p *param_2, unk32 *param_3) {}
@@ -74,7 +74,7 @@ unk8 MapBase::GetTriggerBoundingBoxes(unk32 param_2, AABB *param_3, unk32 param_
 unk32 MapBase::GetOverlappingTrigger(Vec3p *param_2) {}
 bool TriggerBase::Overlaps() {}
 unk8 MapBase::FindTrigger(unk32 type) {}
-unk8 MapBase::GetOverlappingTriggers(Vec3p *param_2, TriggerBase * *triggers, unk32 capacity) {}
+unk8 MapBase::GetOverlappingTriggers(Vec3p *param_2, TriggerBase **triggers, unk32 capacity) {}
 bool MapBase::IsTriggerTypeOverlapped(unk32 type, Vec3p *param_3) {}
 bool MapBase::AnyTrigger_func_0c(unk32 type) {}
 unk32 TriggerBase::vfunc_0c() {}
@@ -99,7 +99,7 @@ bool MapBase::func_ov00_02080824(unk32 param_2, unk32 param_3) {}
 bool MapBase::AddUnk_130(unk32 param_2) {}
 bool MapBase::func_ov00_020809b8(unk32 param_2) {}
 unk8 MapBase::func_ov00_02080a78(Vec3p *param_2) {}
-void MapBase_Unk2::func_ov00_02080ad0(TriggerBase * *param_2, TriggerBase * *param_3) {}
+void MapBase_Unk2::func_ov00_02080ad0(TriggerBase **param_2, TriggerBase **param_3) {}
 unk8 MapBase::func_ov00_02080b24(Vec2b *param_2) {}
 void MapBase::func_ov00_02080d08(unk32 param_2) {}
 void MapBase::vfunc_bc() {}
diff --git a/src/00_Core/Map/MapManager.cpp b/src/00_Core/Map/MapManager.cpp
index 93dc3579..3dc72153 100644
--- a/src/00_Core/Map/MapManager.cpp
+++ b/src/00_Core/Map/MapManager.cpp
@@ -17,7 +17,7 @@ unk8 MapManager::func_ov00_02082454(unk32 param_2, unk32 param_3) {}
 unk8 MapManager::func_ov00_02082494(unk32 param_2) {}
 unk8 MapManager::func_ov00_020824cc(unk32 param_2) {}
 unk8 MapManager::func_ov00_02082504() {}
-unk8 * MapManager::func_ov00_02082538() {}
+unk8 *MapManager::func_ov00_02082538() {}
 void MapManager::func_ov00_02082594() {}
 void MapManager::func_ov00_020825ac() {}
 s32 MapManager::GetCourseFilePath(char *courseName, char *buf) {}
@@ -39,7 +39,7 @@ bool MapManager::func_ov00_020828f8(s32 *param_2) {}
 unk8 MapManager::GetCourseData_Unk_b0() {}
 s32 MapManager::func_ov00_02082914(unk32 param_2) {}
 unk8 MapManager::func_ov00_02082acc() {}
-unk32 * MapManager::func_ov00_02082adc() {}
+unk32 *MapManager::func_ov00_02082adc() {}
 unk8 MapManager::func_ov00_02082af4() {}
 bool MapManager::func_ov00_02082b3c(s32 param_2) {}
 unk8 MapManager::func_ov00_02082d08() {}
@@ -131,7 +131,7 @@ s32 MapManager::func_ov00_02083ef8(Vec3p *param_2, Vec3p *param_3, unk32 param_4
 void MapManager::func_ov00_02083f44(Vec3p *param_2) {}
 unk8 MapManager::MapData_vfunc_6c() {}
 unk8 MapManager::MapData_vfunc_70() {}
-unk8 MapManager::func_ov00_02083fb0(unk32 param_1, MapManager *param_2, unk32 param_3) {}
+unk8 MapManager::func_ov00_02083fb0(u32 *param_1, MapManager *param_2, Vec3p *param_3) {}
 void MapManager::func_ov00_02084024(unk32 param_2, AABB *param_3) {}
 unk8 MapManager::MapData_vfunc_54() {}
 unk8 MapManager::func_ov00_020840a0(unk8 param_2, unk8 param_3, unk32 param_4) {}
@@ -196,5 +196,7 @@ unk8 MapManager::func_ov00_020858b0() {}
 s32 MapManager::func_ov00_02085a34(unk32 param_2, unk32 param_3) {}
 unk8 MapManager::func_ov00_02085c60(unk32 param_2, unk32 param_3, unk32 param_4, unk32 param_5) {}
 unk8 MapManager::func_ov00_02086044(unk32 param_2, unk32 param_3, unk32 param_4) {}
-bool MapManager::func_ov00_02086284(s32 *param_2, Vec3p *param_3, Vec3p *param_4, s32 param_5, u16 param_6, Vec3p *param_7, Vec3p *param_8) {}
-bool MapManager::func_ov00_02086a84(s32 *param_2, Vec3p *param_3, Vec3p *param_4, s32 param_5, s32 param_6, unk32 param_7, Vec3p *param_8, Vec3p *param_9) {}
+bool MapManager::func_ov00_02086284(s32 *param_2, Vec3p *param_3, Vec3p *param_4, s32 param_5, u16 param_6, Vec3p *param_7,
+                                    Vec3p *param_8) {}
+bool MapManager::func_ov00_02086a84(s32 *param_2, Vec3p *param_3, Vec3p *param_4, s32 param_5, s32 param_6, unk32 param_7,
+                                    Vec3p *param_8, Vec3p *param_9) {}
diff --git a/src/00_Core/Player/LinkStateBase.cpp b/src/00_Core/Player/LinkStateBase.cpp
index abe7bd34..7479667e 100644
--- a/src/00_Core/Player/LinkStateBase.cpp
+++ b/src/00_Core/Player/LinkStateBase.cpp
@@ -14,7 +14,7 @@ void LinkStateBase::ChangeLinkSubState(LinkStateId id, s32 subState) {}
 void LinkStateBase::EquipItem_vfunc_28() {}
 void LinkStateBase::UpdateSwordShieldInUse() {}
 void LinkStateBase::func_ov00_020a81b8(unk32 param1, unk32 param2) {}
-LinkStateItem* LinkStateBase::GetLinkItemState() {}
+LinkStateItem *LinkStateBase::GetLinkItemState() {}
 void LinkStateBase::LookAt(Vec3p *target) {}
 void LinkStateBase::func_ov00_020a81fc() {}
 void LinkStateBase::AddHealth(s16 amount) {}
@@ -57,29 +57,29 @@ bool LinkStateBase::HasFlags_PlayerLinkBase_Unk48(u16 flags) {}
 unk8 LinkStateBase::Get_PlayerLinkBase_Unk5e() {}
 unk32 LinkStateBase::Get_PlayerControlData_Unk004() {}
 PlayerCharacter LinkStateBase::GetCurrentCharacter() {}
-PlayerControlData* LinkStateBase::GetPlayerControlData() {}
+PlayerControlData *LinkStateBase::GetPlayerControlData() {}
 LinkStateId LinkStateBase::GetStateId() {}
 s32 LinkStateBase::GetHealth() {}
 s32 LinkStateBase::GetCurrentCharacterHealth() {}
 bool LinkStateBase::func_ov00_020a8c34() {}
-Vec3p* LinkStateBase::GetPlayerPos() {}
-Vec3p* LinkStateBase::GetPlayerVel() {}
-unk8* LinkStateBase::func_ov00_020a8c64() {}
-s16* LinkStateBase::GetPlayerAngle() {}
-void* LinkStateBase::GetPlayer_Unk18() {}
+Vec3p *LinkStateBase::GetPlayerPos() {}
+Vec3p *LinkStateBase::GetPlayerVel() {}
+unk8 *LinkStateBase::func_ov00_020a8c64() {}
+s16 *LinkStateBase::GetPlayerAngle() {}
+void *LinkStateBase::GetPlayer_Unk18() {}
 s32 LinkStateBase::Get_PlayerControlData_Unk32() {}
-Actor* LinkStateBase::GetGrabActor() {}
-ActorRef* LinkStateBase::GetGrabActorRef() {}
+Actor *LinkStateBase::GetGrabActor() {}
+ActorRef *LinkStateBase::GetGrabActorRef() {}
 unk32 LinkStateBase::Grab() {}
 s32 LinkStateBase::Get_PlayerLinkBase_Unk44() {}
 bool LinkStateBase::IsEquipBeingUsed(ItemFlag id) {}
-EquipItem* LinkStateBase::GetEquipItem(ItemFlag id) {}
-void* LinkStateBase::func_ov00_020a8d40() {}
+EquipItem *LinkStateBase::GetEquipItem(ItemFlag id) {}
+void *LinkStateBase::func_ov00_020a8d40() {}
 unk32 LinkStateBase::func_ov00_020a8d50() {}
 unk32 LinkStateBase::func_ov00_020a8d6c() {}
 s32 LinkStateBase::PlayerControlData_vfunc_14(s32 param1) {}
 unk32 LinkStateBase::Get_PlayerControlData_Unk100() {}
 unk32 LinkStateBase::Get_PlayerControlData_Unk120() {}
 s32 LinkStateBase::Get_PlayerLinkBase_Unk38() {}
-DebugHierarchy* LinkStateBase::GetDebugHierarchy0() {}
-DebugHierarchy* LinkStateBase::GetDebugHierarchy1() {}
+DebugHierarchy *LinkStateBase::GetDebugHierarchy0() {}
+DebugHierarchy *LinkStateBase::GetDebugHierarchy1() {}
diff --git a/src/00_Core/Player/LinkStateFollow.cpp b/src/00_Core/Player/LinkStateFollow.cpp
index 69d173dd..4ffbb0a4 100644
--- a/src/00_Core/Player/LinkStateFollow.cpp
+++ b/src/00_Core/Player/LinkStateFollow.cpp
@@ -6,7 +6,7 @@ void LinkStateFollow::MoveTowardTarget() {}
 void LinkStateFollow::OnStateLeave(s32 param1) {}
 bool LinkStateFollow::vfunc_24(s32 param1) {}
 bool LinkStateFollow::vfunc_28() {}
-LinkStateCutscene* LinkStateFollow::GetLinkStateCutscene() {}
+LinkStateCutscene *LinkStateFollow::GetLinkStateCutscene() {}
 bool LinkStateFollow::vfunc_34(Vec3p *param1) {}
 bool LinkStateFollow::func_ov00_020a9180(Vec3p *param1) {}
 bool LinkStateFollow::func_ov00_020a9210(Vec3p *param1, Actor *param2) {}
diff --git a/src/00_Core/Player/LinkStateInteract.cpp b/src/00_Core/Player/LinkStateInteract.cpp
index 6cbda713..cf71654d 100644
--- a/src/00_Core/Player/LinkStateInteract.cpp
+++ b/src/00_Core/Player/LinkStateInteract.cpp
@@ -9,7 +9,7 @@ void LinkStateInteract::OnStateLeave(s32 param1) {}
 bool LinkStateInteract::func_ov00_020aa818() {}
 void LinkStateInteract::func_ov00_020aa844(Actor *param1) {}
 bool LinkStateInteract::vfunc_20(s32 param1) {}
-LinkStateRoll* LinkStateInteract::GetLinkStateRoll() {}
+LinkStateRoll *LinkStateInteract::GetLinkStateRoll() {}
 bool LinkStateInteract::vfunc_24(s32 param1) {}
 bool LinkStateInteract::vfunc_34(Vec3p *param1) {}
 void LinkStateInteract::SetGrabActorVelocity(Vec3p *velocity) {}
diff --git a/src/00_Core/Player/LinkStateItem.cpp b/src/00_Core/Player/LinkStateItem.cpp
index eaf3c8b6..ecedca78 100644
--- a/src/00_Core/Player/LinkStateItem.cpp
+++ b/src/00_Core/Player/LinkStateItem.cpp
@@ -4,7 +4,7 @@ void LinkStateItem::vfunc_00() {}
 LinkStateId LinkStateItem::GetId() {}
 s32 LinkStateItem::IsHammerEquipped() {}
 void LinkStateItem::OnStateLeave(s32 param1) {}
-EquipBombchu* LinkStateItem::GetEquipBombchu() {}
-LinkStateMove* LinkStateItem::GetLinkStateMove() {}
+EquipBombchu *LinkStateItem::GetEquipBombchu() {}
+LinkStateMove *LinkStateItem::GetLinkStateMove() {}
 bool LinkStateItem::func_ov00_020abf70() {}
 bool LinkStateItem::vfunc_28() {}
diff --git a/src/00_Core/Player/PlayerBase.cpp b/src/00_Core/Player/PlayerBase.cpp
index 4736b928..a33dc210 100644
--- a/src/00_Core/Player/PlayerBase.cpp
+++ b/src/00_Core/Player/PlayerBase.cpp
@@ -5,8 +5,8 @@ ItemFlag PlayerBase::GetEquipId() {}
 bool PlayerBase::CanMove() {}
 void PlayerBase::SetUpdatePos(bool updatePos) {}
 void PlayerBase::SetVisible(bool visible) {}
-EquipSword* PlayerBase::GetEquipSword() {}
-EquipShield* PlayerBase::GetEquipShield() {}
+EquipSword *PlayerBase::GetEquipSword() {}
+EquipShield *PlayerBase::GetEquipShield() {}
 void PlayerBase::LookAt(Vec3p *target) {}
 bool PlayerBase::func_ov00_020a7c00(s32 param1) {}
 bool PlayerBase::CollidesWith(Cylinder *cylinder) {}
diff --git a/src/00_Core/Player/PlayerControl.cpp b/src/00_Core/Player/PlayerControl.cpp
index f51d0a89..6cf39bda 100644
--- a/src/00_Core/Player/PlayerControl.cpp
+++ b/src/00_Core/Player/PlayerControl.cpp
@@ -4,7 +4,7 @@ bool PlayerControl::func_ov00_020aeeac() {}
 void PlayerControl::func_ov00_020aeef8() {}
 void PlayerControl::func_ov00_020aef30() {}
 void PlayerControl::UpdateAim() {}
-Actor* PlayerControl::GetFollowActor() {}
+Actor *PlayerControl::GetFollowActor() {}
 bool PlayerControl::func_ov00_020af01c(unk8 *param1) {}
 void PlayerControl::SetUnk_80() {}
 void PlayerControl::StopFollowing() {}
diff --git a/src/00_Core/Save/AdventureFlags.cpp b/src/00_Core/Save/AdventureFlags.cpp
index 14f377c1..03bb6c76 100644
--- a/src/00_Core/Save/AdventureFlags.cpp
+++ b/src/00_Core/Save/AdventureFlags.cpp
@@ -32,14 +32,14 @@ unk32 AdventureFlags::Get_FlagsUnk_44(int index) {}
 unk32 AdventureFlags::Get_FlagsUnk_30(int index) {}
 bool AdventureFlags::Get_FlagsUnk_00(int index, FlagsUnk2 *result) {}
 bool AdventureFlags::Get_FlagsUnk_18(int index, FlagsUnk2 *result) {}
-FlagsUnk* AdventureFlags::Get_FlagsUnk(int index) {}
+FlagsUnk *AdventureFlags::Get_FlagsUnk(int index) {}
 bool AdventureFlags::func_ov00_02097e6c() {}
 bool AdventureFlags::func_ov00_02097e7c() {}
 bool AdventureFlags::func_ov00_02097ea4() {}
 unk32 AdventureFlags::func_ov00_02097ecc() {}
-void* AdventureFlags::func_ov00_02097f8c() {}
-void* AdventureFlags::func_ov00_02097fac() {}
-void* AdventureFlags::func_ov00_02097fd0() {}
+void *AdventureFlags::func_ov00_02097f8c() {}
+void *AdventureFlags::func_ov00_02097fac() {}
+void *AdventureFlags::func_ov00_02097fd0() {}
 void AdventureFlags::func_ov00_02097ff4(bool param1, bool param2) {}
 unk32 AdventureFlags::func_ov00_02098058() {}
 bool AdventureFlags::func_ov00_02098064(unk32 param1) {}