From ca1a8a91b36d8e32fbf20aa4c52c2b1a14e2f66f Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Fri, 12 Apr 2024 21:21:12 -0400
Subject: [PATCH] Identify MapObjectManager struct

---
 include/field/field_system.h                |   2 +-
 include/overlay005/ov5_021ECC20.h           |   6 +-
 include/overlay005/ov5_021ECE40.h           |   8 +-
 include/overlay005/struct_ov5_021ED0A4.h    |   2 +-
 include/struct_decls/struct_02061830_decl.h |   2 +-
 include/unk_0205C22C.h                      |   2 +-
 include/unk_0205E7D0.h                      |   6 +-
 include/unk_02061804.h                      |  80 +++++-----
 src/overlay005/ov5_021DFB54.c               |   2 +-
 src/overlay005/ov5_021ECC20.c               |  16 +-
 src/overlay005/ov5_021ECE40.c               |  40 ++---
 src/overlay005/ov5_021F17B8.c               |   2 +-
 src/overlay005/ov5_021F6454.c               |   8 +-
 src/overlay006/ov6_02248050.c               |   2 +-
 src/overlay008/ov8_02249960.c               |   6 +-
 src/overlay009/ov9_02249960.c               |   8 +-
 src/unk_0203F6C4.c                          |   6 +-
 src/unk_0205C22C.c                          |  14 +-
 src/unk_0205E7D0.c                          |  16 +-
 src/unk_02061804.c                          | 162 ++++++++++----------
 src/unk_02063400.c                          |   6 +-
 src/unk_02067A84.c                          |  10 +-
 src/unk_02069BE0.c                          |   6 +-
 23 files changed, 206 insertions(+), 206 deletions(-)

diff --git a/include/field/field_system.h b/include/field/field_system.h
index 721272844f..ba3cd72ac7 100644
--- a/include/field/field_system.h
+++ b/include/field/field_system.h
@@ -59,7 +59,7 @@ typedef struct FieldSystem_t {
     UnkStruct_02039E30 * unk_2C;
     UnkStruct_ov5_021EF76C * unk_30;
     UnkStruct_ov5_021D1A68 * unk_34;
-    UnkStruct_02061830 * unk_38;
+    MapObjectManager * unk_38;
     PlayerAvatar * playerAvatar;
     UnkStruct_ov5_021DF47C * unk_40;
     UnkStruct_ov5_021D5894 * unk_44;
diff --git a/include/overlay005/ov5_021ECC20.h b/include/overlay005/ov5_021ECC20.h
index f9a18808b0..7347d0bfa8 100644
--- a/include/overlay005/ov5_021ECC20.h
+++ b/include/overlay005/ov5_021ECC20.h
@@ -7,12 +7,12 @@
 
 #include <nitro/fx/fx.h>
 
-void ov5_021ECC20(UnkStruct_02061830 * param0, int param1, int param2, const int * param3, int param4);
-void ov5_021ECC78(UnkStruct_02061830 * param0);
+void ov5_021ECC20(MapObjectManager * param0, int param1, int param2, const int * param3, int param4);
+void ov5_021ECC78(MapObjectManager * param0);
 void ov5_021ECCC8(LocalMapObject * param0);
 const UnkStruct_ov5_021ECD10 * ov5_021ECD04(const LocalMapObject * param0);
 int ov5_021ECD38(const LocalMapObject * param0);
-void * ov5_021ECD68(const UnkStruct_02061830 * param0, u32 param1, int param2);
+void * ov5_021ECD68(const MapObjectManager * param0, u32 param1, int param2);
 void ov5_021ECDA0(const LocalMapObject * param0, VecFx32 * param1);
 void ov5_021ECDFC(LocalMapObject * param0, int param1);
 void ov5_021ECE18(LocalMapObject * param0);
diff --git a/include/overlay005/ov5_021ECE40.h b/include/overlay005/ov5_021ECE40.h
index ea3bad743a..d3c1c88751 100644
--- a/include/overlay005/ov5_021ECE40.h
+++ b/include/overlay005/ov5_021ECE40.h
@@ -12,7 +12,7 @@
 #include "overlay005/struct_ov5_021ED0A4.h"
 #include "overlay005/funcptr_ov5_021EE454.h"
 
-void ov5_021ECE40(UnkStruct_ov5_021ED0A4 * param0, const UnkStruct_02061830 * param1, int param2, int param3, int param4, int param5, const int * param6, int param7);
+void ov5_021ECE40(UnkStruct_ov5_021ED0A4 * param0, const MapObjectManager * param1, int param2, int param3, int param4, int param5, const int * param6, int param7);
 void ov5_021ECE94(UnkStruct_ov5_021ED0A4 * param0);
 int ov5_021ECEB4(LocalMapObject * param0, UnkStruct_020216E0 ** param1, int param2);
 int ov5_021ECF04(LocalMapObject * param0, UnkStruct_020216E0 ** param1);
@@ -23,9 +23,9 @@ void ov5_021ECFD8(const LocalMapObject * param0, UnkStruct_020216E0 ** param1, i
 void ov5_021ED01C(UnkStruct_020216E0 * param0, UnkStruct_ov5_021ED01C * param1);
 void ov5_021ED03C(UnkStruct_020216E0 * param0, UnkStruct_ov5_021ED01C * param1);
 void ov5_021ED060(LocalMapObject * param0, UnkStruct_020216E0 ** param1, int param2);
-int ov5_021ED150(const UnkStruct_02061830 * param0, u32 param1, UnkStruct_ov5_021DF84C * param2);
-void ov5_021EDA38(UnkStruct_02061830 * param0, UnkStruct_ov5_021ED0A4 * param1);
-void ov5_021EDBC4(const UnkStruct_02061830 * param0, int param1, LocalMapObject * param2);
+int ov5_021ED150(const MapObjectManager * param0, u32 param1, UnkStruct_ov5_021DF84C * param2);
+void ov5_021EDA38(MapObjectManager * param0, UnkStruct_ov5_021ED0A4 * param1);
+void ov5_021EDBC4(const MapObjectManager * param0, int param1, LocalMapObject * param2);
 void ov5_021EDC84(UnkStruct_ov5_021ED0A4 * param0, UnkStruct_02020C44 * param1);
 UnkStruct_02020C44 * ov5_021EDC8C(UnkStruct_ov5_021ED0A4 * param0);
 void ov5_021EDC94(UnkStruct_ov5_021ED0A4 * param0, int param1);
diff --git a/include/overlay005/struct_ov5_021ED0A4.h b/include/overlay005/struct_ov5_021ED0A4.h
index 450ff93cb5..3a8f5705a0 100644
--- a/include/overlay005/struct_ov5_021ED0A4.h
+++ b/include/overlay005/struct_ov5_021ED0A4.h
@@ -31,7 +31,7 @@ typedef struct UnkStruct_ov5_021ED0A4_t {
     UnkStruct_ov5_021F06D8 * unk_F8;
     UnkStruct_ov5_021F06D8 * unk_FC;
     UnkStruct_ov5_021EDF3C * unk_100;
-    const UnkStruct_02061830 * unk_104;
+    const MapObjectManager * unk_104;
 } UnkStruct_ov5_021ED0A4;
 
 #endif // POKEPLATINUM_STRUCT_OV5_021ED0A4_H
diff --git a/include/struct_decls/struct_02061830_decl.h b/include/struct_decls/struct_02061830_decl.h
index 47cdde9c69..02ee5f269e 100644
--- a/include/struct_decls/struct_02061830_decl.h
+++ b/include/struct_decls/struct_02061830_decl.h
@@ -1,6 +1,6 @@
 #ifndef POKEPLATINUM_STRUCT_02061830_DECL_H
 #define POKEPLATINUM_STRUCT_02061830_DECL_H
 
-typedef struct UnkStruct_02061830_t UnkStruct_02061830;
+typedef struct UnkStruct_02061830_t MapObjectManager;
 
 #endif // POKEPLATINUM_STRUCT_02061830_DECL_H
diff --git a/include/unk_0205C22C.h b/include/unk_0205C22C.h
index b6e8255976..c9516e03e6 100644
--- a/include/unk_0205C22C.h
+++ b/include/unk_0205C22C.h
@@ -10,7 +10,7 @@ UnkStruct_0205C22C * sub_0205C22C(UnkStruct_0205B43C * param0);
 void sub_0205C2B0(UnkStruct_0205C22C * param0);
 void sub_0205C2C8(UnkStruct_0205C22C * param0);
 void sub_0205C2E0(UnkStruct_0205C22C * param0);
-void sub_0205C820(UnkStruct_02061830 * param0, UnkStruct_0205C22C * param1);
+void sub_0205C820(MapObjectManager * param0, UnkStruct_0205C22C * param1);
 UnkStruct_0205C95C * sub_0205C95C(int param0);
 void sub_0205C970(UnkStruct_0205C95C * param0);
 
diff --git a/include/unk_0205E7D0.h b/include/unk_0205E7D0.h
index eb3b7a0910..8c152aa6c9 100644
--- a/include/unk_0205E7D0.h
+++ b/include/unk_0205E7D0.h
@@ -10,12 +10,12 @@
 
 #include <nitro/fx/fx.h>
 
-PlayerAvatar * sub_0205E7D0(const UnkStruct_02061830 * param0, int param1, int param2, int param3, int param4, int param5, int param6, UnkStruct_0205EC34 * param7);
-PlayerAvatar * sub_0205E820(const UnkStruct_02061830 * param0, UnkStruct_0205EC34 * param1, int param2);
+PlayerAvatar * sub_0205E7D0(const MapObjectManager * param0, int param1, int param2, int param3, int param4, int param5, int param6, UnkStruct_0205EC34 * param7);
+PlayerAvatar * sub_0205E820(const MapObjectManager * param0, UnkStruct_0205EC34 * param1, int param2);
 void sub_0205E884(PlayerAvatar * param0, int param1);
 void sub_0205E8E0(PlayerAvatar * param0);
 void Player_Delete(PlayerAvatar * param0);
-LocalMapObject * sub_0205EA24(const UnkStruct_02061830 * param0);
+LocalMapObject * sub_0205EA24(const MapObjectManager * param0);
 int Player_Dir(PlayerAvatar * const param0);
 void Player_SetDir(PlayerAvatar * param0, int param1);
 int sub_0205EA94(PlayerAvatar * const param0);
diff --git a/include/unk_02061804.h b/include/unk_02061804.h
index 1f397add5d..10605e24cd 100644
--- a/include/unk_02061804.h
+++ b/include/unk_02061804.h
@@ -20,46 +20,46 @@
 
 #include <nitro/fx/fx.h>
 
-UnkStruct_02061830 * sub_02061804(FieldSystem * param0, int param1, int param2);
-void sub_02061830(UnkStruct_02061830 * param0);
-void sub_0206184C(UnkStruct_02061830 * param0, int param1, int param2, int param3, const UnkStruct_020619DC * param4);
-LocalMapObject * sub_02061918(const UnkStruct_02061830 * param0, const UnkStruct_020619DC * param1, int param2);
-LocalMapObject * sub_020619DC(const UnkStruct_02061830 * param0, int param1, int param2, int param3, int param4, int param5, int param6);
-LocalMapObject * sub_02061A74(const UnkStruct_02061830 * param0, int param1, int param2, int param3, const UnkStruct_020619DC * param4);
+MapObjectManager * sub_02061804(FieldSystem * param0, int param1, int param2);
+void sub_02061830(MapObjectManager * param0);
+void sub_0206184C(MapObjectManager * param0, int param1, int param2, int param3, const UnkStruct_020619DC * param4);
+LocalMapObject * sub_02061918(const MapObjectManager * param0, const UnkStruct_020619DC * param1, int param2);
+LocalMapObject * sub_020619DC(const MapObjectManager * param0, int param1, int param2, int param3, int param4, int param5, int param6);
+LocalMapObject * sub_02061A74(const MapObjectManager * param0, int param1, int param2, int param3, const UnkStruct_020619DC * param4);
 void sub_02061AB4(LocalMapObject * param0, int param1);
 void sub_02061AD4(LocalMapObject * param0, int param1);
 void sub_02061AF4(LocalMapObject * param0);
 void sub_02061B28(LocalMapObject * param0);
 void sub_02061B48(LocalMapObject * param0);
-void sub_02061BBC(UnkStruct_02061830 * param0);
-void sub_02061BF0(UnkStruct_02061830 * param0);
-void sub_02061C48(UnkStruct_02061830 * param0);
-void sub_02061CA8(FieldSystem * param0, const UnkStruct_02061830 * param1, UnkStruct_02061D3C * param2, int param3);
-void sub_02061D04(const UnkStruct_02061830 * param0, UnkStruct_02061D3C * param1, int param2);
-void sub_02062068(const UnkStruct_02061830 * param0, int param1, int param2, const UnkStruct_020619DC * param3);
-LocalMapObject * sub_0206251C(const UnkStruct_02061830 * param0, int param1);
-LocalMapObject * sub_02062570(const UnkStruct_02061830 * param0, int param1);
-int sub_020625B0(const UnkStruct_02061830 * param0, LocalMapObject ** param1, int * param2, u32 param3);
+void sub_02061BBC(MapObjectManager * param0);
+void sub_02061BF0(MapObjectManager * param0);
+void sub_02061C48(MapObjectManager * param0);
+void sub_02061CA8(FieldSystem * param0, const MapObjectManager * param1, UnkStruct_02061D3C * param2, int param3);
+void sub_02061D04(const MapObjectManager * param0, UnkStruct_02061D3C * param1, int param2);
+void sub_02062068(const MapObjectManager * param0, int param1, int param2, const UnkStruct_020619DC * param3);
+LocalMapObject * sub_0206251C(const MapObjectManager * param0, int param1);
+LocalMapObject * sub_02062570(const MapObjectManager * param0, int param1);
+int sub_020625B0(const MapObjectManager * param0, LocalMapObject ** param1, int * param2, u32 param3);
 int sub_020626B4(const LocalMapObject * param0);
 int sub_02062758(const LocalMapObject * param0, int param1);
 int sub_02062764(const LocalMapObject * param0, int param1, int param2);
 int sub_020627B4(const LocalMapObject * param0, int param1, int param2, int param3);
-void sub_02062820(UnkStruct_02061830 * param0, int param1);
-int sub_02062824(const UnkStruct_02061830 * param0);
-void sub_02062838(UnkStruct_02061830 * param0, u32 param1);
-void sub_02062840(UnkStruct_02061830 * param0, u32 param1);
-u32 sub_0206284C(const UnkStruct_02061830 * param0, u32 param1);
-void sub_02062854(UnkStruct_02061830 * param0, int param1);
-int sub_02062858(const UnkStruct_02061830 * param0);
-UnkStruct_ov5_021ED0A4 * sub_0206285C(const UnkStruct_02061830 * param0);
-void sub_02062860(UnkStruct_02061830 * param0, LocalMapObject * param1);
-const LocalMapObject * sub_02062868(const UnkStruct_02061830 * param0);
-LocalMapObject * sub_02062878(const UnkStruct_02061830 * param0);
+void sub_02062820(MapObjectManager * param0, int param1);
+int sub_02062824(const MapObjectManager * param0);
+void sub_02062838(MapObjectManager * param0, u32 param1);
+void sub_02062840(MapObjectManager * param0, u32 param1);
+u32 sub_0206284C(const MapObjectManager * param0, u32 param1);
+void sub_02062854(MapObjectManager * param0, int param1);
+int sub_02062858(const MapObjectManager * param0);
+UnkStruct_ov5_021ED0A4 * sub_0206285C(const MapObjectManager * param0);
+void sub_02062860(MapObjectManager * param0, LocalMapObject * param1);
+const LocalMapObject * sub_02062868(const MapObjectManager * param0);
+LocalMapObject * sub_02062878(const MapObjectManager * param0);
 void sub_02062880(const LocalMapObject ** param0);
-void sub_0206288C(UnkStruct_02061830 * param0, FieldSystem * param1);
-FieldSystem * sub_02062894(const UnkStruct_02061830 * param0);
-void sub_0206289C(UnkStruct_02061830 * param0, NARC * param1);
-NARC * sub_020628A0(const UnkStruct_02061830 * param0);
+void sub_0206288C(MapObjectManager * param0, FieldSystem * param1);
+FieldSystem * sub_02062894(const MapObjectManager * param0);
+void sub_0206289C(MapObjectManager * param0, NARC * param1);
+NARC * sub_020628A0(const MapObjectManager * param0);
 void sub_020628B4(LocalMapObject * param0, u32 param1);
 u32 sub_020628B8(const LocalMapObject * param0);
 void sub_020628BC(LocalMapObject * param0, u32 param1);
@@ -106,8 +106,8 @@ u32 sub_02062A14(const LocalMapObject * param0);
 void sub_02062A1C(LocalMapObject * param0, SysTask * param1);
 SysTask * sub_02062A24(const LocalMapObject * param0);
 void sub_02062A2C(const LocalMapObject * param0);
-void sub_02062A38(LocalMapObject * param0, const UnkStruct_02061830 * param1);
-const UnkStruct_02061830 * sub_02062A40(const LocalMapObject * param0);
+void sub_02062A38(LocalMapObject * param0, const MapObjectManager * param1);
+const MapObjectManager * sub_02062A40(const LocalMapObject * param0);
 void * sub_02062A54(LocalMapObject * param0, int param1);
 void * sub_02062A78(LocalMapObject * param0);
 void * sub_02062A7C(LocalMapObject * param0, int param1);
@@ -145,14 +145,14 @@ u32 sub_02062BF8(const LocalMapObject * param0);
 FieldSystem * sub_02062C00(const LocalMapObject * param0);
 int sub_02062C0C(const LocalMapObject * param0);
 int sub_02062C18(const LocalMapObject * param0);
-void sub_02062C30(UnkStruct_02061830 * param0);
-void sub_02062C3C(UnkStruct_02061830 * param0);
-void sub_02062C48(UnkStruct_02061830 * param0);
-void sub_02062C78(UnkStruct_02061830 * param0);
-int sub_02062CA8(const UnkStruct_02061830 * param0);
+void sub_02062C30(MapObjectManager * param0);
+void sub_02062C3C(MapObjectManager * param0);
+void sub_02062C48(MapObjectManager * param0);
+void sub_02062C78(MapObjectManager * param0);
+int sub_02062CA8(const MapObjectManager * param0);
 u32 sub_02062CBC(const LocalMapObject * param0, u32 param1);
-void sub_02062CCC(UnkStruct_02061830 * param0, int param1);
-int sub_02062CE4(const UnkStruct_02061830 * param0);
+void sub_02062CCC(MapObjectManager * param0, int param1);
+int sub_02062CE4(const MapObjectManager * param0);
 int sub_02062CF8(const LocalMapObject * param0);
 void sub_02062D04(LocalMapObject * param0);
 void sub_02062D10(LocalMapObject * param0);
@@ -247,7 +247,7 @@ void sub_02063194(UnkStruct_020619DC * param0, int param1);
 int sub_02063198(const UnkStruct_020619DC * param0);
 void sub_0206319C(UnkStruct_020619DC * param0, int param1);
 int sub_020631A0(const UnkStruct_020619DC * param0);
-LocalMapObject * sub_0206326C(const UnkStruct_02061830 * param0, int param1, int param2, int param3);
+LocalMapObject * sub_0206326C(const MapObjectManager * param0, int param1, int param2, int param3);
 void sub_020632D4(LocalMapObject * param0, const VecFx32 * param1, int param2);
 void LocalMapObj_SetPosDir(LocalMapObject * param0, int param1, int param2, int param3, int param4);
 void sub_020633A8(LocalMapObject * param0, u32 param1);
diff --git a/src/overlay005/ov5_021DFB54.c b/src/overlay005/ov5_021DFB54.c
index 156142b69d..8a370ea239 100644
--- a/src/overlay005/ov5_021DFB54.c
+++ b/src/overlay005/ov5_021DFB54.c
@@ -1759,7 +1759,7 @@ static LocalMapObject * ov5_021E10D4 (PlayerAvatar * param0, int param1)
 {
     int v0 = Player_XPos(param0) + sub_0206419C(param1);
     int v1 = Player_ZPos(param0) + sub_020641A8(param1);
-    const UnkStruct_02061830 * v2 = sub_02062A40(Player_LocalMapObject(param0));
+    const MapObjectManager * v2 = sub_02062A40(Player_LocalMapObject(param0));
     LocalMapObject * v3 = sub_0206326C(v2, v0, v1, 0);
 
     return v3;
diff --git a/src/overlay005/ov5_021ECC20.c b/src/overlay005/ov5_021ECC20.c
index dc410d18c6..0165b137f0 100644
--- a/src/overlay005/ov5_021ECC20.c
+++ b/src/overlay005/ov5_021ECC20.c
@@ -16,11 +16,11 @@
 #include "overlay005/ov5_021ECC20.h"
 #include "overlay005/ov5_021ECE40.h"
 
-static void ov5_021ECCA4(UnkStruct_02061830 * param0);
-static void ov5_021ECCBC(UnkStruct_02061830 * param0);
+static void ov5_021ECCA4(MapObjectManager * param0);
+static void ov5_021ECCBC(MapObjectManager * param0);
 static const UnkStruct_ov5_021ECD10 * ov5_021ECD10(int param0);
 
-void ov5_021ECC20 (UnkStruct_02061830 * param0, int param1, int param2, const int * param3, int param4)
+void ov5_021ECC20 (MapObjectManager * param0, int param1, int param2, const int * param3, int param4)
 {
     int v0, v1;
     UnkStruct_ov5_021ED0A4 * v2;
@@ -37,7 +37,7 @@ void ov5_021ECC20 (UnkStruct_02061830 * param0, int param1, int param2, const in
     sub_02062838(param0, (1 << 0));
 }
 
-void ov5_021ECC78 (UnkStruct_02061830 * param0)
+void ov5_021ECC78 (MapObjectManager * param0)
 {
     int v0;
 
@@ -50,13 +50,13 @@ void ov5_021ECC78 (UnkStruct_02061830 * param0)
     ov5_021ECCBC(param0);
 }
 
-static void ov5_021ECCA4 (UnkStruct_02061830 * param0)
+static void ov5_021ECCA4 (MapObjectManager * param0)
 {
     NARC * v0 = NARC_ctor(NARC_INDEX_DATA__MMODEL__MMODEL, 4);
     sub_0206289C(param0, v0);
 }
 
-static void ov5_021ECCBC (UnkStruct_02061830 * param0)
+static void ov5_021ECCBC (MapObjectManager * param0)
 {
     NARC * v0 = sub_020628A0(param0);
     NARC_dtor(v0);
@@ -64,7 +64,7 @@ static void ov5_021ECCBC (UnkStruct_02061830 * param0)
 
 void ov5_021ECCC8 (LocalMapObject * param0)
 {
-    const UnkStruct_02061830 * v0 = sub_02062A40(param0);
+    const MapObjectManager * v0 = sub_02062A40(param0);
 
     if (sub_0206284C(v0, (1 << 2))) {
         return;
@@ -118,7 +118,7 @@ int ov5_021ECD38 (const LocalMapObject * param0)
     return 0;
 }
 
-void * ov5_021ECD68 (const UnkStruct_02061830 * param0, u32 param1, int param2)
+void * ov5_021ECD68 (const MapObjectManager * param0, u32 param1, int param2)
 {
     void * v0;
     NARC * v1 = sub_020628A0(param0);
diff --git a/src/overlay005/ov5_021ECE40.c b/src/overlay005/ov5_021ECE40.c
index a70b51c961..8b934e61f1 100644
--- a/src/overlay005/ov5_021ECE40.c
+++ b/src/overlay005/ov5_021ECE40.c
@@ -85,7 +85,7 @@ static void ov5_021ED0F0(UnkStruct_ov5_021ED0A4 * param0);
 static UnkStruct_ov5_021DF84C * ov5_021ED110(UnkStruct_ov5_021ED0A4 * param0, u32 param1);
 static void ov5_021ED184(UnkStruct_ov5_021ED0A4 * param0, u32 param1);
 static void ov5_021ED1A4(UnkStruct_ov5_021ED0A4 * param0);
-static int ov5_021ED1C8(const UnkStruct_02061830 * param0, const LocalMapObject * param1, int param2);
+static int ov5_021ED1C8(const MapObjectManager * param0, const LocalMapObject * param1, int param2);
 static void ov5_021ED224(UnkStruct_ov5_021ED0A4 * param0, int param1, int param2, int param3, int param4, int param5, int param6);
 static void ov5_021ED2AC(UnkStruct_ov5_021ED0A4 * param0);
 static const UnkStruct_ov5_021ED2D0 * ov5_021ED2D0(int param0, int param1, const UnkStruct_ov5_021ED2D0 * param2);
@@ -111,20 +111,20 @@ static int ov5_021ED598(UnkStruct_ov5_021ED0A4 * param0, int param1);
 static void ov5_021ED5B4(UnkStruct_ov5_021ED0A4 * param0, int param1);
 static int ov5_021ED5E8(UnkStruct_ov5_021ED0A4 * param0, int param1);
 static void ov5_021ED610(UnkStruct_ov5_021ED0A4 * param0, int param1);
-static void ov5_021ED63C(UnkStruct_02061830 * param0, UnkStruct_ov5_021ED0A4 * param1);
+static void ov5_021ED63C(MapObjectManager * param0, UnkStruct_ov5_021ED0A4 * param1);
 static void ov5_021ED694(UnkStruct_ov5_021ED0A4 * param0);
 static void ov5_021ED6A8(UnkStruct_ov5_021ED0A4 * param0, int param1);
 static int ov5_021ED6D4(UnkStruct_ov5_021ED0A4 * param0, int param1);
 static void ov5_021ED6F0(UnkStruct_ov5_021ED0A4 * param0, int param1);
 static void ov5_021ED74C(UnkStruct_ov5_021ED0A4 * param0, int param1);
-static void ov5_021ED778(UnkStruct_02061830 * param0, UnkStruct_ov5_021ED0A4 * param1);
+static void ov5_021ED778(MapObjectManager * param0, UnkStruct_ov5_021ED0A4 * param1);
 static void ov5_021ED7D0(UnkStruct_ov5_021ED0A4 * param0);
 static void ov5_021ED7E4(UnkStruct_ov5_021ED0A4 * param0, int param1);
 static int ov5_021ED810(UnkStruct_ov5_021ED0A4 * param0, int param1);
 static int ov5_021ED82C(UnkStruct_ov5_021ED0A4 * param0, int param1);
 static void ov5_021ED858(UnkStruct_ov5_021ED0A4 * param0, int param1);
 static void ov5_021ED88C(UnkStruct_ov5_021ED0A4 * param0, int param1);
-static void ov5_021ED8B8(UnkStruct_02061830 * param0, UnkStruct_ov5_021ED0A4 * param1);
+static void ov5_021ED8B8(MapObjectManager * param0, UnkStruct_ov5_021ED0A4 * param1);
 static int ov5_021ED924(UnkStruct_ov5_021ED0A4 * param0, int param1);
 static int ov5_021ED94C(UnkStruct_ov5_021ED0A4 * param0, int param1);
 static int ov5_021ED974(UnkStruct_ov5_021ED0A4 * param0, int param1);
@@ -133,9 +133,9 @@ static void ov5_021ED9C4(UnkStruct_ov5_021ED0A4 * param0, int param1);
 static void ov5_021ED9DC(UnkStruct_ov5_021ED0A4 * param0, int param1);
 static void ov5_021ED9F4(UnkStruct_ov5_021ED0A4 * param0, int param1);
 static void ov5_021EDA0C(UnkStruct_ov5_021ED0A4 * param0, int param1);
-static int ov5_021EDA54(const UnkStruct_02061830 * param0, int param1, const LocalMapObject * param2);
-static int ov5_021EDAB4(const UnkStruct_02061830 * param0, int param1, const LocalMapObject * param2);
-static int ov5_021EDB3C(const UnkStruct_02061830 * param0, int param1, const LocalMapObject * param2);
+static int ov5_021EDA54(const MapObjectManager * param0, int param1, const LocalMapObject * param2);
+static int ov5_021EDAB4(const MapObjectManager * param0, int param1, const LocalMapObject * param2);
+static int ov5_021EDB3C(const MapObjectManager * param0, int param1, const LocalMapObject * param2);
 static int * ov5_021EDCB8(UnkStruct_ov5_021ED0A4 * param0);
 static int * ov5_021EDCBC(UnkStruct_ov5_021ED0A4 * param0);
 static int * ov5_021EDCC0(UnkStruct_ov5_021ED0A4 * param0);
@@ -181,7 +181,7 @@ static void ov5_021EE3C4(UnkStruct_ov5_021ED0A4 * param0);
 static UnkStruct_020216E0 * ov5_021EE454(LocalMapObject * param0, int param1, UnkFuncPtr_ov5_021EE454 param2, void * param3);
 static void ov5_021EE698(SysTask * param0, void * param1);
 
-void ov5_021ECE40 (UnkStruct_ov5_021ED0A4 * param0, const UnkStruct_02061830 * param1, int param2, int param3, int param4, int param5, const int * param6, int param7)
+void ov5_021ECE40 (UnkStruct_ov5_021ED0A4 * param0, const MapObjectManager * param1, int param2, int param3, int param4, int param5, const int * param6, int param7)
 {
     param0->unk_104 = param1;
 
@@ -408,7 +408,7 @@ static UnkStruct_ov5_021DF84C * ov5_021ED110 (UnkStruct_ov5_021ED0A4 * param0, u
     return NULL;
 }
 
-int ov5_021ED150 (const UnkStruct_02061830 * param0, u32 param1, UnkStruct_ov5_021DF84C * param2)
+int ov5_021ED150 (const MapObjectManager * param0, u32 param1, UnkStruct_ov5_021DF84C * param2)
 {
     int v0;
     const UnkStruct_ov5_021ED0A4 * v1;
@@ -469,7 +469,7 @@ static void ov5_021ED1A4 (UnkStruct_ov5_021ED0A4 * param0)
     } while (v0);
 }
 
-static int ov5_021ED1C8 (const UnkStruct_02061830 * param0, const LocalMapObject * param1, int param2)
+static int ov5_021ED1C8 (const MapObjectManager * param0, const LocalMapObject * param1, int param2)
 {
     int v0, v1;
     const LocalMapObject * v2;
@@ -796,7 +796,7 @@ static void ov5_021ED610 (UnkStruct_ov5_021ED0A4 * param0, int param1)
     ov5_021ED53C(v1, param1, 0xffff, v0);
 }
 
-static void ov5_021ED63C (UnkStruct_02061830 * param0, UnkStruct_ov5_021ED0A4 * param1)
+static void ov5_021ED63C (MapObjectManager * param0, UnkStruct_ov5_021ED0A4 * param1)
 {
     int v0;
     int * v1;
@@ -888,7 +888,7 @@ static void ov5_021ED74C (UnkStruct_ov5_021ED0A4 * param0, int param1)
     ov5_021ED53C(v1, param1, 0xffff, v0);
 }
 
-static void ov5_021ED778 (UnkStruct_02061830 * param0, UnkStruct_ov5_021ED0A4 * param1)
+static void ov5_021ED778 (MapObjectManager * param0, UnkStruct_ov5_021ED0A4 * param1)
 {
     int v0;
     int * v1;
@@ -979,7 +979,7 @@ static void ov5_021ED88C (UnkStruct_ov5_021ED0A4 * param0, int param1)
     ov5_021ED53C(v1, param1, 0xffff, v0);
 }
 
-static void ov5_021ED8B8 (UnkStruct_02061830 * param0, UnkStruct_ov5_021ED0A4 * param1)
+static void ov5_021ED8B8 (MapObjectManager * param0, UnkStruct_ov5_021ED0A4 * param1)
 {
     int v0, v1;
     int * v2;
@@ -1094,14 +1094,14 @@ static void ov5_021EDA0C (UnkStruct_ov5_021ED0A4 * param0, int param1)
     ov5_021ED9C4(param0, param1);
 }
 
-void ov5_021EDA38 (UnkStruct_02061830 * param0, UnkStruct_ov5_021ED0A4 * param1)
+void ov5_021EDA38 (MapObjectManager * param0, UnkStruct_ov5_021ED0A4 * param1)
 {
     ov5_021ED63C(param0, param1);
     ov5_021ED778(param0, param1);
     ov5_021ED8B8(param0, param1);
 }
 
-static int ov5_021EDA54 (const UnkStruct_02061830 * param0, int param1, const LocalMapObject * param2)
+static int ov5_021EDA54 (const MapObjectManager * param0, int param1, const LocalMapObject * param2)
 {
     int v0 = 0, v1;
     LocalMapObject * v2 = NULL;
@@ -1125,7 +1125,7 @@ static int ov5_021EDA54 (const UnkStruct_02061830 * param0, int param1, const Lo
     return 0;
 }
 
-static int ov5_021EDAB4 (const UnkStruct_02061830 * param0, int param1, const LocalMapObject * param2)
+static int ov5_021EDAB4 (const MapObjectManager * param0, int param1, const LocalMapObject * param2)
 {
     int v0, v1 = 0;
     LocalMapObject * v2 = NULL;
@@ -1163,7 +1163,7 @@ static int ov5_021EDAB4 (const UnkStruct_02061830 * param0, int param1, const Lo
     return 0;
 }
 
-static int ov5_021EDB3C (const UnkStruct_02061830 * param0, int param1, const LocalMapObject * param2)
+static int ov5_021EDB3C (const MapObjectManager * param0, int param1, const LocalMapObject * param2)
 {
     int v0, v1 = 0;
     LocalMapObject * v2 = NULL;
@@ -1201,7 +1201,7 @@ static int ov5_021EDB3C (const UnkStruct_02061830 * param0, int param1, const Lo
     return 0;
 }
 
-void ov5_021EDBC4 (const UnkStruct_02061830 * param0, int param1, LocalMapObject * param2)
+void ov5_021EDBC4 (const MapObjectManager * param0, int param1, LocalMapObject * param2)
 {
     int v0;
     UnkStruct_ov5_021ED0A4 * v1 = sub_0206285C(param0);
@@ -1502,7 +1502,7 @@ static void ov5_021EDE3C (UnkStruct_ov5_021ED0A4 * param0, u32 param1, UnkStruct
 
 static UnkStruct_ov5_021ED0A4 * ov5_021EDEA8 (const LocalMapObject * param0)
 {
-    const UnkStruct_02061830 * v0;
+    const MapObjectManager * v0;
 
     v0 = sub_02062A40(param0);
     return (UnkStruct_ov5_021ED0A4 *)sub_0206285C(v0);
@@ -1929,7 +1929,7 @@ UnkStruct_020216E0 * ov5_021EE3FC (LocalMapObject * param0, int param1, UnkFuncP
 {
     if ((ov5_021EDD94(param0) == 1) || (ov5_021EB1A0(param0) == NULL)) {
         int v0 = sub_02062920(param0);
-        const UnkStruct_02061830 * v1 = sub_02062A40(param0);
+        const MapObjectManager * v1 = sub_02062A40(param0);
 
         sub_02061B48(param0);
         ov5_021EDBC4(v1, v0, param0);
diff --git a/src/overlay005/ov5_021F17B8.c b/src/overlay005/ov5_021F17B8.c
index 12d46ba16b..3e73dc5481 100644
--- a/src/overlay005/ov5_021F17B8.c
+++ b/src/overlay005/ov5_021F17B8.c
@@ -293,7 +293,7 @@ static void ov5_021F1A8C (UnkStruct_ov101_021D5D90 * param0, UnkStruct_ov5_021F1
     UnkStruct_ov5_021DF84C v3;
 
     {
-        const UnkStruct_02061830 * v4 = sub_02062A40(param1->unk_14.unk_0C);
+        const MapObjectManager * v4 = sub_02062A40(param1->unk_14.unk_0C);
 
         if (ov5_021ED150(v4, param1->unk_08, &v3) == 0) {
             return;
diff --git a/src/overlay005/ov5_021F6454.c b/src/overlay005/ov5_021F6454.c
index 52b3ac904d..3d73389c3a 100644
--- a/src/overlay005/ov5_021F6454.c
+++ b/src/overlay005/ov5_021F6454.c
@@ -986,7 +986,7 @@ BOOL ov5_021F7538 (UnkStruct_0203E724 * param0)
     UnkStruct_020216E0 * v2;
     int v3 = 0;
     FieldSystem * v4 = param0->unk_34;
-    UnkStruct_02061830 * v5 = v4->unk_38;
+    MapObjectManager * v5 = v4->unk_38;
     LocalMapObject * v6 = Player_LocalMapObject(v4->playerAvatar);
     LocalMapObject * v7;
 
@@ -1027,7 +1027,7 @@ BOOL ov5_021F7604 (UnkStruct_0203E724 * param0)
 {
     int v0 = 0;
     FieldSystem * v1 = param0->unk_34;
-    UnkStruct_02061830 * v2 = v1->unk_38;
+    MapObjectManager * v2 = v1->unk_38;
     LocalMapObject * v3 = Player_LocalMapObject(v1->playerAvatar);
     LocalMapObject * v4;
 
@@ -1065,7 +1065,7 @@ BOOL ov5_021F76A0 (UnkStruct_0203E724 * param0)
 {
     LocalMapObject * v0;
     FieldSystem * v1 = param0->unk_34;
-    UnkStruct_02061830 * v2 = v1->unk_38;
+    MapObjectManager * v2 = v1->unk_38;
 
     v0 = sub_0206251C(v2, 32);
 
@@ -1085,7 +1085,7 @@ BOOL ov5_021F76A0 (UnkStruct_0203E724 * param0)
 BOOL ov5_021F76D0 (UnkStruct_0203E724 * param0)
 {
     LocalMapObject * v0;
-    UnkStruct_02061830 * v1 = param0->unk_34->unk_38;
+    MapObjectManager * v1 = param0->unk_34->unk_38;
 
     v0 = sub_0206251C(v1, 32);
 
diff --git a/src/overlay006/ov6_02248050.c b/src/overlay006/ov6_02248050.c
index 202e3d73da..afaa7cd312 100644
--- a/src/overlay006/ov6_02248050.c
+++ b/src/overlay006/ov6_02248050.c
@@ -68,7 +68,7 @@ typedef struct {
     u32 unk_D0C;
 } UnkStruct_ov6_022487F8;
 
-static void ov6_02248050 (UnkStruct_02061830 * param0, u32 param1, UnkStruct_02017294 * param2)
+static void ov6_02248050 (MapObjectManager * param0, u32 param1, UnkStruct_02017294 * param2)
 {
     int v0;
     int v1, v2;
diff --git a/src/overlay008/ov8_02249960.c b/src/overlay008/ov8_02249960.c
index 03e6a36505..e6ffbd9498 100644
--- a/src/overlay008/ov8_02249960.c
+++ b/src/overlay008/ov8_02249960.c
@@ -3239,7 +3239,7 @@ static void ov8_0224B958 (UnkStruct_ov8_0224B8D0 * param0)
     int v0 = 0, v1 = 0;
     LocalMapObject * v2;
     FieldSystem * v3 = param0->unk_00;
-    UnkStruct_02061830 * v4 = v3->unk_38;
+    MapObjectManager * v4 = v3->unk_38;
     UnkStruct_ov8_0224B8A0 * v5 = param0->unk_04;
     UnkStruct_ov8_0224BCA8 * v6 = param0->unk_10C;
 
@@ -4022,7 +4022,7 @@ static void ov8_0224C444 (UnkStruct_ov8_0224C444 * param0)
     int v0, v1, v2, v3, v4;
     LocalMapObject * v5;
     UnkStruct_ov8_0224C4F8 * v6 = param0->unk_04;
-    const UnkStruct_02061830 * v7 = param0->unk_00->unk_38;
+    const MapObjectManager * v7 = param0->unk_00->unk_38;
 
     v0 = 0;
     v1 = 0;
@@ -4076,7 +4076,7 @@ BOOL ov8_0224C51C (FieldSystem * param0)
     int v0, v1, v2, v3;
     UnkStruct_02027860 * v4;
     PlayerAvatar * v5;
-    UnkStruct_02061830 * v6;
+    MapObjectManager * v6;
     LocalMapObject * v7;
     LocalMapObject * v8;
 
diff --git a/src/overlay009/ov9_02249960.c b/src/overlay009/ov9_02249960.c
index 187755585d..c507f421e4 100644
--- a/src/overlay009/ov9_02249960.c
+++ b/src/overlay009/ov9_02249960.c
@@ -3351,7 +3351,7 @@ static void ov9_0224BA6C (UnkStruct_ov101_021D5D90 * param0, void * param1)
     if ((v2->unk_08.unk_04 == 0) && (v5 == v2->unk_02)) {
         int v6 = 0;
         int v7 = ((v2->unk_08.unk_08) * 2);
-        const UnkStruct_02061830 * v8 = v2->unk_14->unk_00->unk_38;
+        const MapObjectManager * v8 = v2->unk_14->unk_00->unk_38;
         LocalMapObject * v9;
 
         while (sub_020625B0(
@@ -5712,7 +5712,7 @@ static void ov9_0224DCA8 (UnkStruct_ov9_02249B04 * param0)
         int v0 = 0;
         UnkStruct_ov9_0224E0DC * v1;
         LocalMapObject * v2;
-        UnkStruct_02061830 * v3 = param0->unk_00->unk_38;
+        MapObjectManager * v3 = param0->unk_00->unk_38;
 
         while (sub_020625B0(v3, &v2, &v0, (1 << 0)) == 1) {
             if (sub_02062910(v2) == 0xfd) {
@@ -7143,7 +7143,7 @@ static LocalMapObject * ov9_0224EECC (UnkStruct_ov9_02249B04 * param0, const Unk
 {
     int v0 = 0;
     LocalMapObject * v1;
-    const UnkStruct_02061830 * v2 = param0->unk_00->unk_38;
+    const MapObjectManager * v2 = param0->unk_00->unk_38;
 
     while (sub_020625B0(v2, &v1, &v0, (1 << 0))) {
         if (sub_02062918(v1) == param2) {
@@ -7318,7 +7318,7 @@ void ov9_0224F16C (FieldSystem * param0, u16 param1)
     int v0 = 0;
     LocalMapObject * v1;
     u32 v2 = param0->unk_1C->unk_00;
-    UnkStruct_02061830 * v3 = param0->unk_38;
+    MapObjectManager * v3 = param0->unk_38;
     UnkStruct_ov9_02249B04 * v4 = param0->unk_04->unk_24;
 
     while (sub_020625B0(
diff --git a/src/unk_0203F6C4.c b/src/unk_0203F6C4.c
index 52041d62b7..720ef0d88a 100644
--- a/src/unk_0203F6C4.c
+++ b/src/unk_0203F6C4.c
@@ -3183,7 +3183,7 @@ static void sub_02040F5C (SysTask * param0, void * param1)
 
 static BOOL sub_02040FA4 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_02061830 * v0;
+    MapObjectManager * v0;
     FieldSystem * v1 = param0->unk_34;
     LocalMapObject ** v2 = sub_0203F098(v1, 10);
 
@@ -3292,7 +3292,7 @@ static BOOL sub_020410F4 (UnkStruct_0203E724 * param0)
     LocalMapObject * v2 = Player_LocalMapObject(v0->playerAvatar);
     LocalMapObject * v3 = sub_02062570(v0->unk_38, 0x30);
     LocalMapObject * v4 = sub_02069EB8(*v1);
-    UnkStruct_02061830 * v5;
+    MapObjectManager * v5;
 
     v5 = v0->unk_38;
 
@@ -3329,7 +3329,7 @@ static BOOL sub_020410F4 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_020411C4 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_02061830 * v0;
+    MapObjectManager * v0;
     FieldSystem * v1 = param0->unk_34;
 
     v0 = v1->unk_38;
diff --git a/src/unk_0205C22C.c b/src/unk_0205C22C.c
index 271bc4ef85..b45a630b7d 100644
--- a/src/unk_0205C22C.c
+++ b/src/unk_0205C22C.c
@@ -38,15 +38,15 @@
 #include "overlay005/ov5_021F600C.h"
 
 static void sub_0205C304(SysTask * param0, void * param1);
-static void sub_0205C44C(UnkStruct_0205C22C * param0, UnkStruct_0205B43C * param1, UnkStruct_02061830 * param2, UnkStruct_02027F8C * param3);
+static void sub_0205C44C(UnkStruct_0205C22C * param0, UnkStruct_0205B43C * param1, MapObjectManager * param2, UnkStruct_02027F8C * param3);
 static int sub_0205C340(UnkStruct_0205C22C * param0, int param1, WMBssDesc * param2, UnkStruct_02027F8C * param3);
-static void sub_0205C51C(UnkStruct_0205C22C * param0, UnkStruct_02061830 * param1);
+static void sub_0205C51C(UnkStruct_0205C22C * param0, MapObjectManager * param1);
 static void sub_0205C680(UnkStruct_0205C680 * param0, int param1);
 static void sub_0205C6BC(UnkStruct_0205C680 * param0);
 static void sub_0205C6E0(UnkStruct_0205C680 * param0, LocalMapObject * param1, int param2, int param3);
 static void sub_0205C788(UnkStruct_0205C680 * param0, LocalMapObject * param1);
 static void sub_0205C7BC(UnkStruct_0205C680 * param0, LocalMapObject * param1);
-static void sub_0205C7E4(UnkStruct_02061830 * param0, int param1, int param2);
+static void sub_0205C7E4(MapObjectManager * param0, int param1, int param2);
 static void sub_0205C444(UnkStruct_0205C680 param0[], int param1, int param2);
 void sub_0205C970(UnkStruct_0205C95C * param0);
 UnkStruct_0205C95C * sub_0205C95C(int param0);
@@ -190,7 +190,7 @@ static void sub_0205C444 (UnkStruct_0205C680 param0[], int param1, int param2)
     param0[param1].unk_00 = param2;
 }
 
-static void sub_0205C44C (UnkStruct_0205C22C * param0, UnkStruct_0205B43C * param1, UnkStruct_02061830 * param2, UnkStruct_02027F8C * param3)
+static void sub_0205C44C (UnkStruct_0205C22C * param0, UnkStruct_0205B43C * param1, MapObjectManager * param2, UnkStruct_02027F8C * param3)
 {
     WMBssDesc * v0;
     int v1;
@@ -244,7 +244,7 @@ static void sub_0205C44C (UnkStruct_0205C22C * param0, UnkStruct_0205B43C * para
     }
 }
 
-static void sub_0205C51C (UnkStruct_0205C22C * param0, UnkStruct_02061830 * param1)
+static void sub_0205C51C (UnkStruct_0205C22C * param0, MapObjectManager * param1)
 {
     LocalMapObject * v0;
     int v1, v2, v3;
@@ -418,7 +418,7 @@ static void sub_0205C7BC (UnkStruct_0205C680 * param0, LocalMapObject * param1)
     }
 }
 
-static void sub_0205C7E4 (UnkStruct_02061830 * param0, int param1, int param2)
+static void sub_0205C7E4 (MapObjectManager * param0, int param1, int param2)
 {
     int v0;
     LocalMapObject * v1;
@@ -436,7 +436,7 @@ static void sub_0205C7E4 (UnkStruct_02061830 * param0, int param1, int param2)
     }
 }
 
-void sub_0205C820 (UnkStruct_02061830 * param0, UnkStruct_0205C22C * param1)
+void sub_0205C820 (MapObjectManager * param0, UnkStruct_0205C22C * param1)
 {
     LocalMapObject * v0;
     UnkStruct_0205C680 * v1;
diff --git a/src/unk_0205E7D0.c b/src/unk_0205E7D0.c
index 67fa2679f7..fb1db8c6fc 100644
--- a/src/unk_0205E7D0.c
+++ b/src/unk_0205E7D0.c
@@ -36,14 +36,14 @@ typedef struct UnkStruct_0205E884_t {
 
 static PlayerAvatar * sub_0205E8FC(void);
 static void sub_0205E91C(PlayerAvatar * param0, int param1, int param2, UnkStruct_0205EC34 * param3);
-static void sub_0205E988(PlayerAvatar * param0, const UnkStruct_02061830 * param1, int param2, int param3, int param4, int param5);
-static LocalMapObject * sub_0205EA64(const UnkStruct_02061830 * param0);
+static void sub_0205E988(PlayerAvatar * param0, const MapObjectManager * param1, int param2, int param3, int param4, int param5);
+static LocalMapObject * sub_0205EA64(const MapObjectManager * param0);
 static void sub_0205EB9C(PlayerAvatar * param0, u32 param1);
 static void sub_0205EBA4(PlayerAvatar * param0, u32 param1);
 static u32 sub_0205EBB0(PlayerAvatar * param0, u32 param1);
 static void sub_0205EC08(PlayerAvatar * param0, UnkStruct_0205EC34 * param1);
 
-PlayerAvatar * sub_0205E7D0 (const UnkStruct_02061830 * param0, int param1, int param2, int param3, int param4, int param5, int param6, UnkStruct_0205EC34 * param7)
+PlayerAvatar * sub_0205E7D0 (const MapObjectManager * param0, int param1, int param2, int param3, int param4, int param5, int param6, UnkStruct_0205EC34 * param7)
 {
     PlayerAvatar * v0;
 
@@ -69,7 +69,7 @@ PlayerAvatar * sub_0205E7D0 (const UnkStruct_02061830 * param0, int param1, int
     return v0;
 }
 
-PlayerAvatar * sub_0205E820 (const UnkStruct_02061830 * param0, UnkStruct_0205EC34 * param1, int param2)
+PlayerAvatar * sub_0205E820 (const MapObjectManager * param0, UnkStruct_0205EC34 * param1, int param2)
 {
     int v0;
     PlayerAvatar * v1;
@@ -94,7 +94,7 @@ void sub_0205E884 (PlayerAvatar * param0, int param1)
 {
     int v0, v1;
     LocalMapObject * v2;
-    const UnkStruct_02061830 * v3;
+    const MapObjectManager * v3;
 
     v2 = Player_LocalMapObject(param0);
     GF_ASSERT(v2 != NULL);
@@ -156,7 +156,7 @@ static void sub_0205E91C (PlayerAvatar * param0, int param1, int param2, UnkStru
     sub_0205EFF0(param0, 1);
 }
 
-static void sub_0205E988 (PlayerAvatar * param0, const UnkStruct_02061830 * param1, int param2, int param3, int param4, int param5)
+static void sub_0205E988 (PlayerAvatar * param0, const MapObjectManager * param1, int param2, int param3, int param4, int param5)
 {
     LocalMapObject * v0;
 
@@ -179,7 +179,7 @@ static void sub_0205E988 (PlayerAvatar * param0, const UnkStruct_02061830 * para
     sub_0205EB38(param0, v0);
 }
 
-LocalMapObject * sub_0205EA24 (const UnkStruct_02061830 * param0)
+LocalMapObject * sub_0205EA24 (const MapObjectManager * param0)
 {
     int v0 = 0;
     LocalMapObject * v1 = NULL;
@@ -193,7 +193,7 @@ LocalMapObject * sub_0205EA24 (const UnkStruct_02061830 * param0)
     return v1;
 }
 
-static LocalMapObject * sub_0205EA64 (const UnkStruct_02061830 * param0)
+static LocalMapObject * sub_0205EA64 (const MapObjectManager * param0)
 {
     LocalMapObject * v0 = sub_0205EA24(param0);
 
diff --git a/src/unk_02061804.c b/src/unk_02061804.c
index 459e7f8586..9c95889b72 100644
--- a/src/unk_02061804.c
+++ b/src/unk_02061804.c
@@ -46,7 +46,7 @@ typedef struct UnkStruct_02061830_t {
     UnkStruct_02061830_sub1 * unk_120;
     LocalMapObject * unk_124;
     FieldSystem * unk_128;
-} UnkStruct_02061830;
+} MapObjectManager;
 
 typedef struct UnkStruct_02061AB4_t {
     u32 unk_00;
@@ -87,7 +87,7 @@ typedef struct UnkStruct_02061AB4_t {
     u16 unk_AC;
     u16 unk_AE;
     SysTask * unk_B0;
-    const UnkStruct_02061830 * unk_B4;
+    const MapObjectManager * unk_B4;
     UnkFuncPtr_020EDF0C unk_B8;
     UnkFuncPtr_020EDF0C_1 unk_BC;
     UnkFuncPtr_020EDF0C_2 unk_C0;
@@ -106,28 +106,28 @@ typedef struct {
     int unk_00;
     int unk_04;
     int unk_08;
-    const UnkStruct_02061830 * unk_0C;
+    const MapObjectManager * unk_0C;
     UnkStruct_020619DC * unk_10;
 } UnkStruct_020620C4;
 
-static UnkStruct_02061830 * sub_020618C8(int param0);
+static MapObjectManager * sub_020618C8(int param0);
 static void sub_02061D3C(FieldSystem * param0, LocalMapObject * param1, UnkStruct_02061D3C * param2);
 static void sub_02061E80(LocalMapObject * param0, UnkStruct_02061D3C * param1);
-static void sub_02061FA8(const UnkStruct_02061830 * param0, LocalMapObject * param1);
+static void sub_02061FA8(const MapObjectManager * param0, LocalMapObject * param1);
 static void sub_02061FF0(LocalMapObject * param0);
 static void sub_02062010(LocalMapObject * param0);
 static void sub_020620C4(UnkStruct_020620C4 * param0);
-static LocalMapObject * sub_02062120(const UnkStruct_02061830 * param0);
-static LocalMapObject * sub_02062154(const UnkStruct_02061830 * param0, int param1, int param2);
-static void sub_020621AC(const UnkStruct_02061830 * param0, LocalMapObject * param1);
+static LocalMapObject * sub_02062120(const MapObjectManager * param0);
+static LocalMapObject * sub_02062154(const MapObjectManager * param0, int param1, int param2);
+static void sub_020621AC(const MapObjectManager * param0, LocalMapObject * param1);
 static void sub_020621E8(LocalMapObject * param0, const UnkStruct_020619DC * param1, FieldSystem * param2);
 static void sub_020622B8(LocalMapObject * param0, const UnkStruct_020619DC * param1);
-static void sub_0206234C(LocalMapObject * param0, const UnkStruct_02061830 * param1);
+static void sub_0206234C(LocalMapObject * param0, const MapObjectManager * param1);
 static void sub_0206239C(LocalMapObject * param0);
 static void sub_020623D4(LocalMapObject * param0);
 static void sub_0206243C(LocalMapObject * param0);
 static int sub_0206244C(const LocalMapObject * param0, int param1, int param2, const UnkStruct_020619DC * param3);
-static LocalMapObject * sub_020624CC(const UnkStruct_02061830 * param0, int param1, int param2);
+static LocalMapObject * sub_020624CC(const MapObjectManager * param0, int param1, int param2);
 static void sub_02062604(LocalMapObject * param0);
 static void sub_02062618(LocalMapObject * param0);
 static void sub_02062628(LocalMapObject * param0);
@@ -139,11 +139,11 @@ static void sub_020626D0(LocalMapObject * param0, const UnkStruct_020619DC * par
 static void sub_02062714(LocalMapObject * param0, int param1, const UnkStruct_020619DC * param2);
 static void sub_020627E8(SysTask * param0, void * param1);
 static void sub_02062804(LocalMapObject * param0);
-static UnkStruct_02061830 * sub_0206281C(const UnkStruct_02061830 * param0);
-static void sub_02062828(UnkStruct_02061830 * param0);
-static void sub_02062830(UnkStruct_02061830 * param0);
-static LocalMapObject * sub_02062870(const UnkStruct_02061830 * param0);
-static UnkStruct_02061830 * sub_02062A48(const LocalMapObject * param0);
+static MapObjectManager * sub_0206281C(const MapObjectManager * param0);
+static void sub_02062828(MapObjectManager * param0);
+static void sub_02062830(MapObjectManager * param0);
+static LocalMapObject * sub_02062870(const MapObjectManager * param0);
+static MapObjectManager * sub_02062A48(const LocalMapObject * param0);
 static const UnkStruct_020619DC * sub_020631A4(int param0, int param1, const UnkStruct_020619DC * param2);
 static int sub_020631D8(const UnkStruct_020619DC * param0);
 static int sub_020631F4(const UnkStruct_020619DC * param0);
@@ -160,9 +160,9 @@ static UnkFuncPtr_ov5_021FB0F0_1 sub_02063234(const UnkStruct_ov5_021FB0F0 * par
 static UnkFuncPtr_ov5_021FB0F0_2 sub_02063238(const UnkStruct_ov5_021FB0F0 * param0);
 static const UnkStruct_ov5_021FB0F0 * sub_02063244(u32 param0);
 
-UnkStruct_02061830 * sub_02061804 (FieldSystem * param0, int param1, int param2)
+MapObjectManager * sub_02061804 (FieldSystem * param0, int param1, int param2)
 {
-    UnkStruct_02061830 * v0;
+    MapObjectManager * v0;
 
     v0 = sub_020618C8(param1);
     sub_0206288C(v0, param0);
@@ -172,13 +172,13 @@ UnkStruct_02061830 * sub_02061804 (FieldSystem * param0, int param1, int param2)
     return v0;
 }
 
-void sub_02061830 (UnkStruct_02061830 * param0)
+void sub_02061830 (MapObjectManager * param0)
 {
     Heap_FreeToHeapExplicit(11, sub_02062878(param0));
     Heap_FreeToHeapExplicit(11, param0);
 }
 
-void sub_0206184C (UnkStruct_02061830 * param0, int param1, int param2, int param3, const UnkStruct_020619DC * param4)
+void sub_0206184C (MapObjectManager * param0, int param1, int param2, int param3, const UnkStruct_020619DC * param4)
 {
     int v0, v1 = sub_02062824(param0);
     LocalMapObject * v2 = sub_02062878(param0);
@@ -210,16 +210,16 @@ void sub_0206184C (UnkStruct_02061830 * param0, int param1, int param2, int para
     ov5_021EDA38(param0, sub_0206285C(param0));
 }
 
-static UnkStruct_02061830 * sub_020618C8 (int param0)
+static MapObjectManager * sub_020618C8 (int param0)
 {
     int v0;
     LocalMapObject * v1;
-    UnkStruct_02061830 * v2;
+    MapObjectManager * v2;
 
-    v2 = Heap_AllocFromHeap(11, (sizeof(UnkStruct_02061830)));
+    v2 = Heap_AllocFromHeap(11, (sizeof(MapObjectManager)));
 
     GF_ASSERT(v2 != NULL);
-    memset(v2, 0, (sizeof(UnkStruct_02061830)));
+    memset(v2, 0, (sizeof(MapObjectManager)));
 
     v0 = (sizeof(LocalMapObject)) * param0;
     v1 = Heap_AllocFromHeap(11, v0);
@@ -232,7 +232,7 @@ static UnkStruct_02061830 * sub_020618C8 (int param0)
     return v2;
 }
 
-LocalMapObject * sub_02061918 (const UnkStruct_02061830 * param0, const UnkStruct_020619DC * param1, int param2)
+LocalMapObject * sub_02061918 (const MapObjectManager * param0, const UnkStruct_020619DC * param1, int param2)
 {
     LocalMapObject * v0;
     UnkStruct_020619DC v1 = *param1;
@@ -277,7 +277,7 @@ LocalMapObject * sub_02061918 (const UnkStruct_02061830 * param0, const UnkStruc
     return v0;
 }
 
-LocalMapObject * sub_020619DC (const UnkStruct_02061830 * param0, int param1, int param2, int param3, int param4, int param5, int param6)
+LocalMapObject * sub_020619DC (const MapObjectManager * param0, int param1, int param2, int param3, int param4, int param5, int param6)
 {
     UnkStruct_020619DC v0;
     LocalMapObject * v1;
@@ -303,7 +303,7 @@ LocalMapObject * sub_020619DC (const UnkStruct_02061830 * param0, int param1, in
     return v1;
 }
 
-LocalMapObject * sub_02061A74 (const UnkStruct_02061830 * param0, int param1, int param2, int param3, const UnkStruct_020619DC * param4)
+LocalMapObject * sub_02061A74 (const MapObjectManager * param0, int param1, int param2, int param3, const UnkStruct_020619DC * param4)
 {
     LocalMapObject * v0 = NULL;
     const UnkStruct_020619DC * v1 = sub_020631A4(param1, param2, param4);
@@ -339,7 +339,7 @@ void sub_02061AD4 (LocalMapObject * param0, int param1)
 
 void sub_02061AF4 (LocalMapObject * param0)
 {
-    const UnkStruct_02061830 * v0;
+    const MapObjectManager * v0;
 
     v0 = sub_02062A40(param0);
 
@@ -364,7 +364,7 @@ void sub_02061B28 (LocalMapObject * param0)
 
 void sub_02061B48 (LocalMapObject * param0)
 {
-    const UnkStruct_02061830 * v0;
+    const MapObjectManager * v0;
 
     v0 = sub_02062A40(param0);
 
@@ -384,7 +384,7 @@ void sub_02061B48 (LocalMapObject * param0)
     sub_02062B9C(param0, sub_020633FC);
 }
 
-void sub_02061BBC (UnkStruct_02061830 * param0)
+void sub_02061BBC (MapObjectManager * param0)
 {
     int v0, v1;
     LocalMapObject * v2;
@@ -403,7 +403,7 @@ void sub_02061BBC (UnkStruct_02061830 * param0)
     } while (v0 < v1);
 }
 
-void sub_02061BF0 (UnkStruct_02061830 * param0)
+void sub_02061BF0 (MapObjectManager * param0)
 {
     GF_ASSERT(sub_02062CA8(param0) == 1);
 
@@ -429,7 +429,7 @@ void sub_02061BF0 (UnkStruct_02061830 * param0)
     }
 }
 
-void sub_02061C48 (UnkStruct_02061830 * param0)
+void sub_02061C48 (MapObjectManager * param0)
 {
     GF_ASSERT(sub_02062CA8(param0) == 1);
 
@@ -456,7 +456,7 @@ void sub_02061C48 (UnkStruct_02061830 * param0)
     }
 }
 
-void sub_02061CA8 (FieldSystem * param0, const UnkStruct_02061830 * param1, UnkStruct_02061D3C * param2, int param3)
+void sub_02061CA8 (FieldSystem * param0, const MapObjectManager * param1, UnkStruct_02061D3C * param2, int param3)
 {
     int v0 = 0;
     LocalMapObject * v1;
@@ -472,7 +472,7 @@ void sub_02061CA8 (FieldSystem * param0, const UnkStruct_02061830 * param1, UnkS
     }
 }
 
-void sub_02061D04 (const UnkStruct_02061830 * param0, UnkStruct_02061D3C * param1, int param2)
+void sub_02061D04 (const MapObjectManager * param0, UnkStruct_02061D3C * param1, int param2)
 {
     int v0 = 0;
     LocalMapObject * v1;
@@ -579,7 +579,7 @@ static void sub_02061E80 (LocalMapObject * param0, UnkStruct_02061D3C * param1)
     memcpy(sub_02062AA0(param0), param1->unk_40, 16);
 }
 
-static void sub_02061FA8 (const UnkStruct_02061830 * param0, LocalMapObject * param1)
+static void sub_02061FA8 (const MapObjectManager * param0, LocalMapObject * param1)
 {
     sub_02061FF0(param1);
     sub_02062010(param1);
@@ -620,7 +620,7 @@ static void sub_02062010 (LocalMapObject * param0)
     sub_02063060(param0, &v1);
 }
 
-void sub_02062068 (const UnkStruct_02061830 * param0, int param1, int param2, const UnkStruct_020619DC * param3)
+void sub_02062068 (const MapObjectManager * param0, int param1, int param2, const UnkStruct_020619DC * param3)
 {
     int v0;
     UnkStruct_020619DC * v1;
@@ -669,7 +669,7 @@ static void sub_020620C4 (UnkStruct_020620C4 * param0)
     Heap_FreeToHeapExplicit(11, param0);
 }
 
-static LocalMapObject * sub_02062120 (const UnkStruct_02061830 * param0)
+static LocalMapObject * sub_02062120 (const MapObjectManager * param0)
 {
     int v0, v1;
     LocalMapObject * v2;
@@ -690,7 +690,7 @@ static LocalMapObject * sub_02062120 (const UnkStruct_02061830 * param0)
     return NULL;
 }
 
-static LocalMapObject * sub_02062154 (const UnkStruct_02061830 * param0, int param1, int param2)
+static LocalMapObject * sub_02062154 (const MapObjectManager * param0, int param1, int param2)
 {
     int v0 = 0;
     LocalMapObject * v1;
@@ -708,7 +708,7 @@ static LocalMapObject * sub_02062154 (const UnkStruct_02061830 * param0, int par
     return NULL;
 }
 
-static void sub_020621AC (const UnkStruct_02061830 * param0, LocalMapObject * param1)
+static void sub_020621AC (const MapObjectManager * param0, LocalMapObject * param1)
 {
     int v0, v1;
     SysTask * v2;
@@ -772,7 +772,7 @@ static void sub_020622B8 (LocalMapObject * param0, const UnkStruct_020619DC * pa
     sub_02063060(param0, &v1);
 }
 
-static void sub_0206234C (LocalMapObject * param0, const UnkStruct_02061830 * param1)
+static void sub_0206234C (LocalMapObject * param0, const MapObjectManager * param1)
 {
     sub_020628BC(param0, (1 << 0) | (1 << 12) | (1 << 11));
 
@@ -855,7 +855,7 @@ static int sub_0206244C (const LocalMapObject * param0, int param1, int param2,
     return 0;
 }
 
-static LocalMapObject * sub_020624CC (const UnkStruct_02061830 * param0, int param1, int param2)
+static LocalMapObject * sub_020624CC (const MapObjectManager * param0, int param1, int param2)
 {
     int v0 = 0;
     LocalMapObject * v1;
@@ -869,7 +869,7 @@ static LocalMapObject * sub_020624CC (const UnkStruct_02061830 * param0, int par
     return NULL;
 }
 
-LocalMapObject * sub_0206251C (const UnkStruct_02061830 * param0, int param1)
+LocalMapObject * sub_0206251C (const MapObjectManager * param0, int param1)
 {
     int v0;
     LocalMapObject * v1;
@@ -895,7 +895,7 @@ LocalMapObject * sub_0206251C (const UnkStruct_02061830 * param0, int param1)
     return NULL;
 }
 
-LocalMapObject * sub_02062570 (const UnkStruct_02061830 * param0, int param1)
+LocalMapObject * sub_02062570 (const MapObjectManager * param0, int param1)
 {
     int v0;
     LocalMapObject * v1;
@@ -917,7 +917,7 @@ LocalMapObject * sub_02062570 (const UnkStruct_02061830 * param0, int param1)
     return NULL;
 }
 
-int sub_020625B0 (const UnkStruct_02061830 * param0, LocalMapObject ** param1, int * param2, u32 param3)
+int sub_020625B0 (const MapObjectManager * param0, LocalMapObject ** param1, int * param2, u32 param3)
 {
     int v0;
     LocalMapObject * v1;
@@ -986,7 +986,7 @@ static void sub_02062660 (LocalMapObject * param0)
 
 static void sub_02062670 (LocalMapObject * param0)
 {
-    const UnkStruct_02061830 * v0 = sub_02062A40(param0);
+    const MapObjectManager * v0 = sub_02062A40(param0);
 
     if (sub_02062CA8(v0) == 0) {
         return;
@@ -1099,84 +1099,84 @@ static void sub_020627E8 (SysTask * param0, void * param1)
 
 static void sub_02062804 (LocalMapObject * param0)
 {
-    const UnkStruct_02061830 * v0 = sub_02062A40(param0);
+    const MapObjectManager * v0 = sub_02062A40(param0);
 
     if (sub_02062CA8(v0) == 1) {
         ov5_021ECCC8(param0);
     }
 }
 
-static UnkStruct_02061830 * sub_0206281C (const UnkStruct_02061830 * param0)
+static MapObjectManager * sub_0206281C (const MapObjectManager * param0)
 {
-    return (UnkStruct_02061830 * )param0;
+    return (MapObjectManager * )param0;
 }
 
-void sub_02062820 (UnkStruct_02061830 * param0, int param1)
+void sub_02062820 (MapObjectManager * param0, int param1)
 {
     param0->unk_04 = param1;
 }
 
-int sub_02062824 (const UnkStruct_02061830 * param0)
+int sub_02062824 (const MapObjectManager * param0)
 {
     return param0->unk_04;
 }
 
-static void sub_02062828 (UnkStruct_02061830 * param0)
+static void sub_02062828 (MapObjectManager * param0)
 {
     param0->unk_08++;
 }
 
-static void sub_02062830 (UnkStruct_02061830 * param0)
+static void sub_02062830 (MapObjectManager * param0)
 {
     param0->unk_08--;
 }
 
-void sub_02062838 (UnkStruct_02061830 * param0, u32 param1)
+void sub_02062838 (MapObjectManager * param0, u32 param1)
 {
     param0->unk_00 |= param1;
 }
 
-void sub_02062840 (UnkStruct_02061830 * param0, u32 param1)
+void sub_02062840 (MapObjectManager * param0, u32 param1)
 {
     param0->unk_00 &= ~param1;
 }
 
-u32 sub_0206284C (const UnkStruct_02061830 * param0, u32 param1)
+u32 sub_0206284C (const MapObjectManager * param0, u32 param1)
 {
     return(param0->unk_00 & param1);
 }
 
-void sub_02062854 (UnkStruct_02061830 * param0, int param1)
+void sub_02062854 (MapObjectManager * param0, int param1)
 {
     param0->unk_0C = param1;
 }
 
-int sub_02062858 (const UnkStruct_02061830 * param0)
+int sub_02062858 (const MapObjectManager * param0)
 {
     return param0->unk_0C;
 }
 
-UnkStruct_ov5_021ED0A4 * sub_0206285C (const UnkStruct_02061830 * param0)
+UnkStruct_ov5_021ED0A4 * sub_0206285C (const MapObjectManager * param0)
 {
-    return &(((UnkStruct_02061830 *)param0)->unk_18);
+    return &(((MapObjectManager *)param0)->unk_18);
 }
 
-void sub_02062860 (UnkStruct_02061830 * param0, LocalMapObject * param1)
+void sub_02062860 (MapObjectManager * param0, LocalMapObject * param1)
 {
     param0->unk_124 = param1;
 }
 
-const LocalMapObject * sub_02062868 (const UnkStruct_02061830 * param0)
+const LocalMapObject * sub_02062868 (const MapObjectManager * param0)
 {
     return param0->unk_124;
 }
 
-static LocalMapObject * sub_02062870 (const UnkStruct_02061830 * param0)
+static LocalMapObject * sub_02062870 (const MapObjectManager * param0)
 {
     return param0->unk_124;
 }
 
-LocalMapObject * sub_02062878 (const UnkStruct_02061830 * param0)
+LocalMapObject * sub_02062878 (const MapObjectManager * param0)
 {
     return param0->unk_124;
 }
@@ -1186,25 +1186,25 @@ void sub_02062880 (const LocalMapObject ** param0)
     (*param0)++;
 }
 
-void sub_0206288C (UnkStruct_02061830 * param0, FieldSystem * param1)
+void sub_0206288C (MapObjectManager * param0, FieldSystem * param1)
 {
     param0->unk_128 = param1;
 }
 
-FieldSystem * sub_02062894 (const UnkStruct_02061830 * param0)
+FieldSystem * sub_02062894 (const MapObjectManager * param0)
 {
     return param0->unk_128;
 }
 
-void sub_0206289C (UnkStruct_02061830 * param0, NARC * param1)
+void sub_0206289C (MapObjectManager * param0, NARC * param1)
 {
     param0->unk_14 = param1;
 }
 
-NARC * sub_020628A0 (const UnkStruct_02061830 * param0)
+NARC * sub_020628A0 (const MapObjectManager * param0)
 {
     GF_ASSERT(param0->unk_14 != NULL);
-    return ((UnkStruct_02061830 *)param0)->unk_14;
+    return ((MapObjectManager *)param0)->unk_14;
 }
 
 void sub_020628B4 (LocalMapObject * param0, u32 param1)
@@ -1475,17 +1475,17 @@ void sub_02062A2C (const LocalMapObject * param0)
     SysTask_Done(sub_02062A24(param0));
 }
 
-void sub_02062A38 (LocalMapObject * param0, const UnkStruct_02061830 * param1)
+void sub_02062A38 (LocalMapObject * param0, const MapObjectManager * param1)
 {
     param0->unk_B4 = param1;
 }
 
-const UnkStruct_02061830 * sub_02062A40 (const LocalMapObject * param0)
+const MapObjectManager * sub_02062A40 (const LocalMapObject * param0)
 {
     return param0->unk_B4;
 }
 
-static UnkStruct_02061830 * sub_02062A48 (const LocalMapObject * param0)
+static MapObjectManager * sub_02062A48 (const LocalMapObject * param0)
 {
     return sub_0206281C(param0->unk_B4);
 }
@@ -1691,7 +1691,7 @@ u32 sub_02062BF8 (const LocalMapObject * param0)
 
 FieldSystem * sub_02062C00 (const LocalMapObject * param0)
 {
-    UnkStruct_02061830 * v0;
+    MapObjectManager * v0;
 
     v0 = sub_02062A48(param0);
     return sub_02062894(v0);
@@ -1708,17 +1708,17 @@ int sub_02062C18 (const LocalMapObject * param0)
     return sub_02062958(param0);
 }
 
-void sub_02062C30 (UnkStruct_02061830 * param0)
+void sub_02062C30 (MapObjectManager * param0)
 {
     sub_02062838(param0, (1 << 1) | (1 << 2));
 }
 
-void sub_02062C3C (UnkStruct_02061830 * param0)
+void sub_02062C3C (MapObjectManager * param0)
 {
     sub_02062840(param0, (1 << 1) | (1 << 2));
 }
 
-void sub_02062C48 (UnkStruct_02061830 * param0)
+void sub_02062C48 (MapObjectManager * param0)
 {
     int v0 = sub_02062824(param0);
     LocalMapObject * v1 = sub_02062878(param0);
@@ -1733,7 +1733,7 @@ void sub_02062C48 (UnkStruct_02061830 * param0)
     } while (v0);
 }
 
-void sub_02062C78 (UnkStruct_02061830 * param0)
+void sub_02062C78 (MapObjectManager * param0)
 {
     int v0 = sub_02062824(param0);
     LocalMapObject * v1 = sub_02062878(param0);
@@ -1748,7 +1748,7 @@ void sub_02062C78 (UnkStruct_02061830 * param0)
     } while (v0);
 }
 
-int sub_02062CA8 (const UnkStruct_02061830 * param0)
+int sub_02062CA8 (const MapObjectManager * param0)
 {
     if (sub_0206284C(param0, (1 << 0))) {
         return 1;
@@ -1759,12 +1759,12 @@ int sub_02062CA8 (const UnkStruct_02061830 * param0)
 
 u32 sub_02062CBC (const LocalMapObject * param0, u32 param1)
 {
-    const UnkStruct_02061830 * v0 = sub_02062A40(param0);
+    const MapObjectManager * v0 = sub_02062A40(param0);
 
     return sub_0206284C(v0, param1);
 }
 
-void sub_02062CCC (UnkStruct_02061830 * param0, int param1)
+void sub_02062CCC (MapObjectManager * param0, int param1)
 {
     if (param1 == 0) {
         sub_02062838(param0, (1 << 3));
@@ -1773,7 +1773,7 @@ void sub_02062CCC (UnkStruct_02061830 * param0, int param1)
     }
 }
 
-int sub_02062CE4 (const UnkStruct_02061830 * param0)
+int sub_02062CE4 (const MapObjectManager * param0)
 {
     if (sub_0206284C(param0, (1 << 3))) {
         return 0;
@@ -1884,7 +1884,7 @@ int sub_02062DE8 (const LocalMapObject * param0)
 
 int sub_02062DFC (const LocalMapObject * param0)
 {
-    const UnkStruct_02061830 * v0;
+    const MapObjectManager * v0;
 
     v0 = sub_02062A40(param0);
 
@@ -2476,7 +2476,7 @@ static const UnkStruct_ov5_021FB0F0 * sub_02063244 (u32 param0)
     return NULL;
 }
 
-LocalMapObject * sub_0206326C (const UnkStruct_02061830 * param0, int param1, int param2, int param3)
+LocalMapObject * sub_0206326C (const MapObjectManager * param0, int param1, int param2, int param3)
 {
     int v0;
     LocalMapObject * v1;
diff --git a/src/unk_02063400.c b/src/unk_02063400.c
index 52fe9a1b8f..fa6c464e61 100644
--- a/src/unk_02063400.c
+++ b/src/unk_02063400.c
@@ -383,7 +383,7 @@ static void sub_02063A70 (LocalMapObject * param0, u8 param1, u8 param2, const U
 static void sub_02063A78 (LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
 {
     {
-        const UnkStruct_02061830 * v0 = sub_02062A40(param0);
+        const MapObjectManager * v0 = sub_02062A40(param0);
 
         if (sub_02062CE4(v0) == 0) {
             return;
@@ -407,7 +407,7 @@ static void sub_02063A78 (LocalMapObject * param0, u8 param1, u8 param2, const U
 static void sub_02063B20 (LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
 {
     {
-        const UnkStruct_02061830 * v0 = sub_02062A40(param0);
+        const MapObjectManager * v0 = sub_02062A40(param0);
 
         if (sub_02062CE4(v0) == 0) {
             return;
@@ -616,7 +616,7 @@ u32 sub_02063EBC (const LocalMapObject * param0, int param1)
 int sub_02063F00 (const LocalMapObject * param0, int param1, int param2, int param3)
 {
     int v0, v1, v2;
-    const UnkStruct_02061830 * v3;
+    const MapObjectManager * v3;
     const LocalMapObject * v4;
 
     v3 = sub_02062A40(param0);
diff --git a/src/unk_02067A84.c b/src/unk_02067A84.c
index 199aa24c5b..2106d698db 100644
--- a/src/unk_02067A84.c
+++ b/src/unk_02067A84.c
@@ -48,14 +48,14 @@ typedef struct {
     FieldSystem * unk_2C;
 } UnkStruct_020EF6D0;
 
-static int sub_02067BA8(FieldSystem * param0, UnkStruct_02061830 * param1, PlayerAvatar * param2, const LocalMapObject * param3, UnkStruct_02067C28 * param4);
+static int sub_02067BA8(FieldSystem * param0, MapObjectManager * param1, PlayerAvatar * param2, const LocalMapObject * param3, UnkStruct_02067C28 * param4);
 static void sub_02067C28(UnkStruct_02067C28 * param0, LocalMapObject * param1, int param2, int param3);
 static int sub_02067C54(const LocalMapObject * param0);
 static int sub_02067C80(const LocalMapObject * param0, PlayerAvatar * param1, int * param2);
 static int sub_02067DA8(const LocalMapObject * param0, int param1, int param2, int param3, int param4, int param5);
 static int sub_02067E74(const LocalMapObject * param0, int param1, int param2);
 static int sub_02067F14(LocalMapObject * param0);
-static LocalMapObject * sub_02067F2C(FieldSystem * param0, UnkStruct_02061830 * param1, LocalMapObject * param2, int param3);
+static LocalMapObject * sub_02067F2C(FieldSystem * param0, MapObjectManager * param1, LocalMapObject * param2, int param3);
 static SysTask * sub_02067FF0(FieldSystem * param0, LocalMapObject * param1, PlayerAvatar * param2, int param3, int param4, int param5, int param6, int param7);
 static int sub_02068048(SysTask * param0);
 static void sub_02068054(SysTask * param0);
@@ -67,7 +67,7 @@ int(*const Unk_020EF6D0[])(UnkStruct_020EF6D0 *);
 int sub_02067A84 (FieldSystem * param0, BOOL param1)
 {
     UnkStruct_02067C28 v0;
-    UnkStruct_02061830 * v1 = param0->unk_38;
+    MapObjectManager * v1 = param0->unk_38;
     PlayerAvatar * v2 = param0->playerAvatar;
 
     if (sub_02067BA8(param0, v1, v2, NULL, &v0) == 0) {
@@ -113,7 +113,7 @@ int sub_02067A84 (FieldSystem * param0, BOOL param1)
     return 0;
 }
 
-static int sub_02067BA8 (FieldSystem * param0, UnkStruct_02061830 * param1, PlayerAvatar * param2, const LocalMapObject * param3, UnkStruct_02067C28 * param4)
+static int sub_02067BA8 (FieldSystem * param0, MapObjectManager * param1, PlayerAvatar * param2, const LocalMapObject * param3, UnkStruct_02067C28 * param4)
 {
     int v0, v1, v2;
     LocalMapObject * v3;
@@ -358,7 +358,7 @@ int sub_02067F24 (LocalMapObject * param0)
     return sub_02067F14(param0);
 }
 
-static LocalMapObject * sub_02067F2C (FieldSystem * param0, UnkStruct_02061830 * param1, LocalMapObject * param2, int param3)
+static LocalMapObject * sub_02067F2C (FieldSystem * param0, MapObjectManager * param1, LocalMapObject * param2, int param3)
 {
     int v0;
     LocalMapObject * v1;
diff --git a/src/unk_02069BE0.c b/src/unk_02069BE0.c
index 28ccddc1e9..670c53bd3f 100644
--- a/src/unk_02069BE0.c
+++ b/src/unk_02069BE0.c
@@ -138,7 +138,7 @@ static int(*const Unk_020EF8D4[])(LocalMapObject *, UnkStruct_02069CA8 *) = {
 
 static int sub_02069CA8 (LocalMapObject * param0, UnkStruct_02069CA8 * param1)
 {
-    const UnkStruct_02061830 * v0 = sub_02062A40(param0);
+    const MapObjectManager * v0 = sub_02062A40(param0);
     LocalMapObject * v1 = sub_0205EA24(v0);
 
     if (v1 == NULL) {
@@ -311,7 +311,7 @@ LocalMapObject * sub_02069EB8 (LocalMapObject * param0)
     int v1 = sub_02062950(param0);
     int v2 = sub_02062918(param0);
     u32 v3 = sub_02067F24(param0);
-    const UnkStruct_02061830 * v4 = sub_02062A40(param0);
+    const MapObjectManager * v4 = sub_02062A40(param0);
     LocalMapObject * v5;
 
     switch (v1) {
@@ -340,7 +340,7 @@ static int sub_02069F48 (LocalMapObject * param0, UnkStruct_02069F48 * param1)
     int v0, v1;
     u32 v2;
     LocalMapObject * v3;
-    const UnkStruct_02061830 * v4 = sub_02062A40(param0);
+    const MapObjectManager * v4 = sub_02062A40(param0);
 
     v0 = 0;
     v1 = sub_02062918(param0);