From 815478d9d4e7dedda0de7f8accc9cb1fefead043 Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Tue, 2 Apr 2024 12:18:16 -0400
Subject: [PATCH 01/11] CommPlayerData -> CommPlayerInfo

basically the player data is better used for the coords of players on the map lol
---
 include/communication_information.h |  2 +-
 src/communication_information.c     | 60 ++++++++++++++---------------
 src/unk_02032798.c                  |  4 +-
 3 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/include/communication_information.h b/include/communication_information.h
index 8e5d84720c..4f5c6d7549 100644
--- a/include/communication_information.h
+++ b/include/communication_information.h
@@ -11,7 +11,7 @@ void CommInfo_Init(SaveData * saveData, const BattleRegulation * regulation);
 void CommInfo_Delete(void);
 BOOL CommInfo_IsInitialized(void);
 void CommInfo_SendBattleRegulation(void);
-int CommPlayerData_Size(void);
+int CommPlayerInfo_Size(void);
 void CommunicatitonInformaion_FinishReading(int param0, int param1, void * param2, void * param3);
 BOOL CommInfo_IsDataFinishedReading(void);
 void CommInfo_RecvPlayerDataArray(int netId, int unused1, void * src, void * unused3);
diff --git a/src/communication_information.c b/src/communication_information.c
index bdf6dd8519..31b79fef6f 100644
--- a/src/communication_information.c
+++ b/src/communication_information.c
@@ -24,7 +24,7 @@
 #include "communication_system.h"
 #include "unk_0203909C.h"
 
-typedef struct CommPlayerData {
+typedef struct CommPlayerInfo {
     u8 regulationBuffer[32];
     u8 trainerInfoBuffer[32];
     DWCFriendData friendData;
@@ -34,7 +34,7 @@ typedef struct CommPlayerData {
     u8 country;
     u8 region;
     u8 unk_65;
-} CommPlayerData;
+} CommPlayerInfo;
 
 typedef struct CommPlayerRecord {
     u16 win;
@@ -54,7 +54,7 @@ typedef struct CommunicationInformation {
     TrainerInfo * personalTrainerInfo;
     const BattleRegulation * regulation;
     SaveData * saveData;
-    CommPlayerData playerData[MAX_CONNECTED_PLAYERS];
+    CommPlayerInfo playerInfo[MAX_CONNECTED_PLAYERS];
     TrainerInfo * trainerInfo[MAX_CONNECTED_PLAYERS];
     CommPlayerRecord playerRecord[MAX_CONNECTED_PLAYERS];
     u8 infoState[MAX_CONNECTED_PLAYERS];
@@ -78,7 +78,7 @@ void CommInfo_Init (SaveData * saveData, const BattleRegulation * regulation)
     MI_CpuClear8(sCommInfo, sizeof(CommunicationInformation));
 
     for (netId = 0; netId < MAX_CONNECTED_PLAYERS; netId++) {
-        sCommInfo->trainerInfo[netId] = (TrainerInfo *)&sCommInfo->playerData[netId].trainerInfoBuffer[0];
+        sCommInfo->trainerInfo[netId] = (TrainerInfo *)&sCommInfo->playerInfo[netId].trainerInfoBuffer[0];
         CommInfo_InitPlayer(netId);
     }
 
@@ -129,30 +129,30 @@ void CommInfo_SendBattleRegulation (void)
     }
 
     TrainerInfo_Copy(trainerInfo, sCommInfo->trainerInfo[netId]);
-    OS_GetMacAddress(&sCommInfo->playerData[netId].macAddress[0]);
+    OS_GetMacAddress(&sCommInfo->playerInfo[netId].macAddress[0]);
 
     v2 = sub_0202B42C(v3, 1, 0);
 
-    MI_CpuCopy8(v2, sCommInfo->playerData[netId].unk_4C, sizeof(sCommInfo->playerData[netId].unk_4C));
+    MI_CpuCopy8(v2, sCommInfo->playerInfo[netId].unk_4C, sizeof(sCommInfo->playerInfo[netId].unk_4C));
 
-    sCommInfo->playerData[netId].country = sub_0202C8C0(v5);
-    sCommInfo->playerData[netId].region = sub_0202C8C4(v5);
-    sCommInfo->playerData[netId].unk_65 = sub_02028810(sCommInfo->saveData);
-    sCommInfo->playerData[netId].unk_65 = 1 - sCommInfo->playerData[netId].unk_65;
+    sCommInfo->playerInfo[netId].country = sub_0202C8C0(v5);
+    sCommInfo->playerInfo[netId].region = sub_0202C8C4(v5);
+    sCommInfo->playerInfo[netId].unk_65 = sub_02028810(sCommInfo->saveData);
+    sCommInfo->playerInfo[netId].unk_65 = 1 - sCommInfo->playerInfo[netId].unk_65;
 
-    DWC_CreateExchangeToken(sub_0202AD28(v4), &sCommInfo->playerData[netId].friendData);
-    MI_CpuClear8(sCommInfo->playerData[netId].regulationBuffer, 32);
+    DWC_CreateExchangeToken(sub_0202AD28(v4), &sCommInfo->playerInfo[netId].friendData);
+    MI_CpuClear8(sCommInfo->playerInfo[netId].regulationBuffer, 32);
 
     if (sCommInfo->regulation) {
-        BattleRegulation_Copy(sCommInfo->regulation, (BattleRegulation *)sCommInfo->playerData[netId].regulationBuffer);
+        BattleRegulation_Copy(sCommInfo->regulation, (BattleRegulation *)sCommInfo->playerInfo[netId].regulationBuffer);
     }
 
-    CommSys_SendData(3, &sCommInfo->playerData[netId], sizeof(CommPlayerData));
+    CommSys_SendData(3, &sCommInfo->playerInfo[netId], sizeof(CommPlayerInfo));
 }
 
-int CommPlayerData_Size (void)
+int CommPlayerInfo_Size (void)
 {
-    return sizeof(CommPlayerData);
+    return sizeof(CommPlayerInfo);
 }
 
 void CommunicatitonInformaion_FinishReading (int param0, int param1, void * param2, void * param3)
@@ -171,7 +171,7 @@ BOOL CommInfo_IsDataFinishedReading (void)
 
 void CommInfo_RecvPlayerDataArray (int netId, int param1, void * src, void * unused)
 {
-    CommPlayerData * playerData = (CommPlayerData *)src;
+    CommPlayerInfo * playerInfo = (CommPlayerInfo *)src;
 
     if (!sCommInfo) {
         return;
@@ -181,8 +181,8 @@ void CommInfo_RecvPlayerDataArray (int netId, int param1, void * src, void * unu
         return;
     }
 
-    MI_CpuCopy8(src, &sCommInfo->playerData[playerData->netId], sizeof(CommPlayerData));
-    sCommInfo->curNetId = playerData->netId;
+    MI_CpuCopy8(src, &sCommInfo->playerInfo[playerInfo->netId], sizeof(CommPlayerInfo));
+    sCommInfo->curNetId = playerInfo->netId;
 
     if (TrainerInfo_HasNoName(sCommInfo->trainerInfo[sCommInfo->curNetId]) == 1) {
         return;
@@ -203,8 +203,8 @@ void CommInfo_RecvPlayerData (int netId, int param1, void * src, void * param3)
         return;
     }
 
-    MI_CpuCopy8(src, &sCommInfo->playerData[netId], sizeof(CommPlayerData));
-    sub_02033FDC(&sCommInfo->playerData[netId].macAddress[0], netId);
+    MI_CpuCopy8(src, &sCommInfo->playerInfo[netId], sizeof(CommPlayerInfo));
+    sub_02033FDC(&sCommInfo->playerInfo[netId].macAddress[0], netId);
 
     sCommInfo->infoState[netId] = INFO_STATE_BEGIN_RECIEVE;
 
@@ -230,9 +230,9 @@ BOOL CommInfo_ServerSendArray (void)
     if (!sub_02036254(5)) {
         for (netId = 0; netId < MAX_CONNECTED_PLAYERS; netId++) {
             if (sCommInfo->infoState[netId] != INFO_STATE_EMPTY) {
-                sCommInfo->playerData[netId].netId = netId;
-                MI_CpuCopy8(sCommInfo->trainerInfo[netId], sCommInfo->playerData[netId].trainerInfoBuffer, TrainerInfo_Size());
-                CommSys_ServerSetSendQueue(4, &sCommInfo->playerData[netId], sizeof(CommPlayerData));
+                sCommInfo->playerInfo[netId].netId = netId;
+                MI_CpuCopy8(sCommInfo->trainerInfo[netId], sCommInfo->playerInfo[netId].trainerInfoBuffer, TrainerInfo_Size());
+                CommSys_ServerSetSendQueue(4, &sCommInfo->playerInfo[netId], sizeof(CommPlayerInfo));
             }
         }
 
@@ -352,7 +352,7 @@ TrainerInfo * CommInfo_TrainerInfo (int netId)
 DWCFriendData * CommInfo_DWCFriendData (int netId)
 {
     if (sCommInfo->infoState[netId] != INFO_STATE_EMPTY) {
-        return &sCommInfo->playerData[netId].friendData;
+        return &sCommInfo->playerInfo[netId].friendData;
     }
 
     return NULL;
@@ -366,7 +366,7 @@ int sub_02032F40 (int param0)
 u16 * sub_02032F54 (int netId)
 {
     if (sCommInfo->infoState[netId] != 0) {
-        return sCommInfo->playerData[netId].unk_4C;
+        return sCommInfo->playerInfo[netId].unk_4C;
     }
 
     return NULL;
@@ -375,7 +375,7 @@ u16 * sub_02032F54 (int netId)
 int CommInfo_PlayerCountry (int netId)
 {
     if (sCommInfo->infoState[netId] != 0) {
-        return sCommInfo->playerData[netId].country;
+        return sCommInfo->playerInfo[netId].country;
     }
 
     return 0;
@@ -384,7 +384,7 @@ int CommInfo_PlayerCountry (int netId)
 int CommInfo_PlayerRegion (int netId)
 {
     if (sCommInfo->infoState[netId] != 0) {
-        return sCommInfo->playerData[netId].region;
+        return sCommInfo->playerInfo[netId].region;
     }
 
     return 0;
@@ -393,7 +393,7 @@ int CommInfo_PlayerRegion (int netId)
 int sub_02032FC0 (int param0)
 {
     if (sCommInfo->infoState[param0] != 0) {
-        return sCommInfo->playerData[param0].unk_65;
+        return sCommInfo->playerInfo[param0].unk_65;
     }
 
     return 0;
@@ -407,7 +407,7 @@ BOOL CommInfo_CheckBattleRegulation (void)
         if (CommSys_IsPlayerConnected(netId) && (sCommInfo->infoState[netId] != 0)) {
             if (CommSys_IsPlayerConnected(netId + 1) && (sCommInfo->infoState[netId + 1] != 0)) {
                 for (i = 0; i < 32; i++) {
-                    if (sCommInfo->playerData[netId].regulationBuffer[i] != sCommInfo->playerData[netId + 1].regulationBuffer[i]) {
+                    if (sCommInfo->playerInfo[netId].regulationBuffer[i] != sCommInfo->playerInfo[netId + 1].regulationBuffer[i]) {
                         return FALSE;
                     }
                 }
diff --git a/src/unk_02032798.c b/src/unk_02032798.c
index 461fe8f619..374dede13c 100644
--- a/src/unk_02032798.c
+++ b/src/unk_02032798.c
@@ -30,8 +30,8 @@ static const UnkStruct_02039A58 Unk_020E5D64[] = {
     {NULL, sub_0203294C, NULL},
     {NULL, sub_0203294C, NULL},
     {sub_0203619C, sub_0203294C, NULL},
-    {CommInfo_RecvPlayerData, CommPlayerData_Size, NULL},
-    {CommInfo_RecvPlayerDataArray, CommPlayerData_Size, NULL},
+    {CommInfo_RecvPlayerData, CommPlayerInfo_Size, NULL},
+    {CommInfo_RecvPlayerDataArray, CommPlayerInfo_Size, NULL},
     {CommunicatitonInformaion_FinishReading, sub_0203294C, NULL},
     {sub_02037A78, sub_02037B54, NULL},
     {sub_02037AD8, sub_02037B54, NULL},

From 268938b9d31d906743572de1afb59b4bb5bcadd6 Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Tue, 2 Apr 2024 18:24:05 -0400
Subject: [PATCH 02/11] CommPlayerLocation struct

---
 include/overlay023/struct_ov23_0224A294.h |   8 +-
 include/struct_defs/struct_02057B48.h     |  10 +-
 include/unk_02057518.h                    |   4 +-
 src/field_comm_manager.c                  |   4 +-
 src/overlay023/ov23_02241F74.c            |   2 +-
 src/overlay023/ov23_0224A1D0.c            | 128 ++--
 src/unk_02057518.c                        | 850 +++++++++++-----------
 7 files changed, 503 insertions(+), 503 deletions(-)

diff --git a/include/overlay023/struct_ov23_0224A294.h b/include/overlay023/struct_ov23_0224A294.h
index 0b6c550a6d..9e102aeda5 100644
--- a/include/overlay023/struct_ov23_0224A294.h
+++ b/include/overlay023/struct_ov23_0224A294.h
@@ -18,11 +18,11 @@ typedef struct {
     UnkStruct_ov101_021D5D90 * unk_28[8];
     u8 unk_48[8];
     SysTask * unk_50;
-    FieldSystem * unk_54;
+    FieldSystem * fieldSys;
     UnkStruct_ov23_0224A294_sub1 unk_58;
     u8 unk_5A[8];
-    UnkStruct_02057B48 unk_62[8];
-    UnkStruct_02057B48 unk_A2[8];
+    CommPlayerLocation playerLocationServer[8];
+    CommPlayerLocation playerLocation[8];
     u8 unk_E2[8];
     u8 unk_EA[8];
     u8 unk_F2[8];
@@ -54,6 +54,6 @@ typedef struct {
     u8 unk_2C1;
     u8 unk_2C2;
     u8 unk_2C3;
-} UnkStruct_ov23_0224A294;
+} CommPlayerData;
 
 #endif // POKEPLATINUM_STRUCT_OV23_0224A294_H
diff --git a/include/struct_defs/struct_02057B48.h b/include/struct_defs/struct_02057B48.h
index 90e3c23f20..7b8b0c020f 100644
--- a/include/struct_defs/struct_02057B48.h
+++ b/include/struct_defs/struct_02057B48.h
@@ -2,12 +2,12 @@
 #define POKEPLATINUM_STRUCT_02057B48_H
 
 typedef struct {
-    u16 unk_00;
-    u16 unk_02;
-    s8 unk_04;
-    u8 unk_05;
+    u16 x;
+    u16 z;
+    s8 dir;
+    u8 moveSpeed;
     u8 unk_06;
     u8 unk_07;
-} UnkStruct_02057B48;
+} CommPlayerLocation;
 
 #endif // POKEPLATINUM_STRUCT_02057B48_H
diff --git a/include/unk_02057518.h b/include/unk_02057518.h
index 088b57dcef..b7e90de484 100644
--- a/include/unk_02057518.h
+++ b/include/unk_02057518.h
@@ -4,8 +4,8 @@
 #include "field/field_system_decl.h"
 #include "overlay023/struct_ov23_0224A294.h"
 
-UnkStruct_ov23_0224A294 * sub_02057518(void);
-BOOL sub_02057524(void * param0, FieldSystem * param1, BOOL param2);
+CommPlayerData * CommPlayerData_Get(void);
+BOOL CommPlayerManager_Init(void * param0, FieldSystem * param1, BOOL param2);
 void sub_0205764C(void);
 void sub_020576A0(void);
 void sub_020576CC(BOOL param0);
diff --git a/src/field_comm_manager.c b/src/field_comm_manager.c
index 1f989f858f..7e1f7f42e0 100644
--- a/src/field_comm_manager.c
+++ b/src/field_comm_manager.c
@@ -286,7 +286,7 @@ static void sub_02059984 (void)
 
     if (sub_02036540(98)) {
         v0 = Heap_AllocFromHeap(HEAP_ID_COMMUNICATION, sub_02057C84());
-        sub_02057524(v0, sFieldCommMan->fieldSys, 0);
+        CommPlayerManager_Init(v0, sFieldCommMan->fieldSys, 0);
         sub_02059524();
         sub_02035EC8();
         sub_020364F0(92);
@@ -357,7 +357,7 @@ static void sub_02059AB4 (void)
 
     if (sub_02036540(98)) {
         v0 = Heap_AllocFromHeap(HEAP_ID_COMMUNICATION, sub_02057C84());
-        sub_02057524(v0, sFieldCommMan->fieldSys, 0);
+        CommPlayerManager_Init(v0, sFieldCommMan->fieldSys, 0);
         sub_02059524();
         sub_020364F0(92);
         FieldCommMan_SetTask(sub_02059B10, 0);
diff --git a/src/overlay023/ov23_02241F74.c b/src/overlay023/ov23_02241F74.c
index cbdb1b3cb2..6508e5bd65 100644
--- a/src/overlay023/ov23_02241F74.c
+++ b/src/overlay023/ov23_02241F74.c
@@ -780,7 +780,7 @@ void ov23_02242BC0 (FieldSystem * param0)
         ov23_02241F74(v0, param0);
 
         v0 = Heap_AllocFromHeap(15, sub_02057C84());
-        sub_02057524(v0, param0, 1);
+        CommPlayerManager_Init(v0, param0, 1);
 
         v0 = Heap_AllocFromHeap(15, ov23_02243858());
         ov23_022434BC(v0, param0);
diff --git a/src/overlay023/ov23_0224A1D0.c b/src/overlay023/ov23_0224A1D0.c
index 1f0e167a8d..b706189b05 100644
--- a/src/overlay023/ov23_0224A1D0.c
+++ b/src/overlay023/ov23_0224A1D0.c
@@ -57,12 +57,12 @@ typedef struct {
     u8 unk_02;
 } UnkStruct_ov23_0224A570;
 
-UnkStruct_ov23_0224A294 * sub_02057518(void);
+CommPlayerData * CommPlayerData_Get(void);
 
 void ov23_0224A1D0 (void)
 {
     int v0;
-    UnkStruct_ov23_0224A294 * v1 = sub_02057518();
+    CommPlayerData * v1 = CommPlayerData_Get();
 
     if (v1 == NULL) {
         return;
@@ -79,11 +79,11 @@ void ov23_0224A1D0 (void)
 static void ov23_0224A204 (int param0)
 {
     int v0;
-    UnkStruct_ov23_0224A294 * v1 = sub_02057518();
+    CommPlayerData * v1 = CommPlayerData_Get();
 
     if (param0 == CommSys_CurNetId()) {
         if (v1->unk_290[param0] != NULL) {
-            sub_0202CFEC(sub_0202CD88(v1->unk_54->unk_0C), 28);
+            sub_0202CFEC(sub_0202CD88(v1->fieldSys->unk_0C), 28);
 
             if (v1->unk_27C[5 - 1]) {
                 Heap_FreeToHeap(v1->unk_27C[5 - 1]);
@@ -94,7 +94,7 @@ static void ov23_0224A204 (int param0)
             }
 
             v1->unk_27C[0] = v1->unk_290[param0];
-            sub_02028830(sub_020298B0(sub_0203D174(v1->unk_54)), v1->unk_290[param0]);
+            sub_02028830(sub_020298B0(sub_0203D174(v1->fieldSys)), v1->unk_290[param0]);
 
             v1->unk_290[param0] = NULL;
             v1->unk_14A[param0].unk_20 = 0xff;
@@ -106,7 +106,7 @@ static void ov23_0224A204 (int param0)
 
 static BOOL ov23_0224A294 (int param0, int param1)
 {
-    UnkStruct_ov23_0224A294 * v0 = sub_02057518();
+    CommPlayerData * v0 = CommPlayerData_Get();
 
     if ((v0->unk_290[param0] == NULL) && (v0->unk_290[param1] != NULL)) {
         v0->unk_290[param0] = v0->unk_290[param1];
@@ -149,7 +149,7 @@ static void ov23_0224A328 (int param0)
 
 static void ov23_0224A334 (int param0)
 {
-    UnkStruct_ov23_0224A294 * v0 = sub_02057518();
+    CommPlayerData * v0 = CommPlayerData_Get();
 
     if (v0) {
         v0->unk_2B8 = 0;
@@ -159,7 +159,7 @@ static void ov23_0224A334 (int param0)
 void ov23_0224A348 (int param0, int param1, void * param2, void * param3)
 {
     UnkStruct_ov23_0224A348 v0;
-    UnkStruct_ov23_0224A294 * v1 = sub_02057518();
+    CommPlayerData * v1 = CommPlayerData_Get();
 
     v0.unk_00 = 2;
     v0.unk_01 = param0;
@@ -181,7 +181,7 @@ void ov23_0224A348 (int param0, int param1, void * param2, void * param3)
 
 void ov23_0224A3A8 (int param0, int param1, void * param2, void * param3)
 {
-    UnkStruct_ov23_0224A294 * v0 = sub_02057518();
+    CommPlayerData * v0 = CommPlayerData_Get();
     UnkStruct_ov23_0224A348 * v1 = param2;
 
     if (!sub_02035EE0()) {
@@ -192,21 +192,21 @@ void ov23_0224A3A8 (int param0, int param1, void * param2, void * param3)
         if (!v0->unk_2B8) {
             v0->unk_2B8 = 1;
 
-            ov23_0224F758(ov23_0224A334, v0->unk_54);
+            ov23_0224F758(ov23_0224A334, v0->fieldSys);
         }
     } else if ((v1->unk_00 == 3) && (v1->unk_01 == CommSys_CurNetId())) {
         if (!v0->unk_2B8) {
             v0->unk_2B8 = 1;
-            ov23_02250A50(ov23_0224A334, v0->unk_54);
+            ov23_02250A50(ov23_0224A334, v0->fieldSys);
         }
     }
 }
 
 void ov23_0224A410 (int param0, int param1, void * param2, void * param3)
 {
-    UnkStruct_ov23_0224A294 * v0 = sub_02057518();
+    CommPlayerData * v0 = CommPlayerData_Get();
     UnkStruct_ov23_0224A348 * v1 = param2;
-    UnkStruct_020507E4 * v2 = SaveData_Events(v0->unk_54->unk_0C);
+    UnkStruct_020507E4 * v2 = SaveData_Events(v0->fieldSys->unk_0C);
 
     GF_ASSERT(v1->unk_01 < (7 + 1));
 
@@ -220,7 +220,7 @@ void ov23_0224A410 (int param0, int param1, void * param2, void * param3)
     }
 
     if ((v1->unk_00 == 1) && (v1->unk_01 == CommSys_CurNetId())) {
-        ov23_0224DCB8(v1->unk_02, ov23_0224A334, v0->unk_54);
+        ov23_0224DCB8(v1->unk_02, ov23_0224A334, v0->fieldSys);
 
         v0->unk_58.unk_00_0 = v1->unk_01;
         v0->unk_58.unk_00_4 = v1->unk_02;
@@ -228,7 +228,7 @@ void ov23_0224A410 (int param0, int param1, void * param2, void * param3)
         v0->unk_58.unk_00_9 = 0;
 
         if (v0->unk_5A[v1->unk_02] == 0) {
-            sub_020294F4(sub_020298A0(sub_0203D174(v0->unk_54)), v1->unk_02);
+            sub_020294F4(sub_020298A0(sub_0203D174(v0->fieldSys)), v1->unk_02);
             sub_0206B364(v2, sub_0206B354(v2) + 1);
             sub_0206B384(v2, sub_0206B374(v2) + 1);
 
@@ -237,7 +237,7 @@ void ov23_0224A410 (int param0, int param1, void * param2, void * param3)
     }
 
     if ((v1->unk_00 == 1) && (v1->unk_02 == CommSys_CurNetId())) {
-        ov23_0224F07C(v1->unk_02, v1->unk_01, v0->unk_54);
+        ov23_0224F07C(v1->unk_02, v1->unk_01, v0->fieldSys);
     }
 
     if ((v1->unk_00 == 2) && (v1->unk_01 == CommSys_CurNetId())) {
@@ -285,7 +285,7 @@ static void ov23_0224A5B0 (int param0)
 
 static void ov23_0224A5CC (SysTask * param0, void * param1)
 {
-    UnkStruct_ov23_0224A294 * v0 = sub_02057518();
+    CommPlayerData * v0 = CommPlayerData_Get();
     UnkStruct_ov23_0224A5CC * v1 = param1;
     u8 v2 = v1->unk_04;
     u8 v3 = 0;
@@ -311,7 +311,7 @@ static void ov23_0224A5CC (SysTask * param0, void * param1)
 
 static void ov23_0224A620 (int param0)
 {
-    UnkStruct_ov23_0224A294 * v0 = sub_02057518();
+    CommPlayerData * v0 = CommPlayerData_Get();
     UnkStruct_ov23_0224A5CC * v1 = Heap_AllocFromHeap(11, sizeof(UnkStruct_ov23_0224A5CC));
 
     v1->unk_00 = 0;
@@ -368,7 +368,7 @@ BOOL ov23_0224A6B8 (int param0)
 
 static void ov23_0224A6E4 (UnkStruct_ov23_0224A570 * param0, BOOL param1, UnkStruct_0202855C * param2)
 {
-    UnkStruct_ov23_0224A294 * v0 = sub_02057518();
+    CommPlayerData * v0 = CommPlayerData_Get();
 
     ov23_0224321C();
 
@@ -392,11 +392,11 @@ static void ov23_0224A6E4 (UnkStruct_ov23_0224A570 * param0, BOOL param1, UnkStr
 
 void ov23_0224A77C (int param0, int param1, void * param2, void * param3)
 {
-    UnkStruct_ov23_0224A294 * v0 = sub_02057518();
+    CommPlayerData * v0 = CommPlayerData_Get();
     UnkStruct_ov23_0224A570 * v1 = param2;
     BOOL v2;
     int v3 = 0;
-    UnkStruct_0202855C * v4 = sub_020298A0(sub_0203D174(v0->unk_54));
+    UnkStruct_0202855C * v4 = sub_020298A0(sub_0203D174(v0->fieldSys));
 
     switch (v1->unk_00) {
     case 0:
@@ -470,14 +470,14 @@ void ov23_0224A77C (int param0, int param1, void * param2, void * param3)
         ov23_0224B040(v1->unk_01);
 
         if (v1->unk_01 == CommSys_CurNetId()) {
-            UnkStruct_0202855C * v5 = sub_020298A0(sub_0203D174(v0->unk_54));
+            UnkStruct_0202855C * v5 = sub_020298A0(sub_0203D174(v0->fieldSys));
             u8 v6 = sub_0202958C(v5);
 
             sub_020295C0(v5);
-            sub_0206AA40(SaveData_Events(v0->unk_54->unk_0C));
+            sub_0206AA40(SaveData_Events(v0->fieldSys->unk_0C));
 
             if (v0->unk_290[v1->unk_01]) {
-                sub_0206DAB8(v0->unk_54, v0->unk_290[v1->unk_01]);
+                sub_0206DAB8(v0->fieldSys, v0->unk_290[v1->unk_01]);
 
                 if (v0->unk_2B2 != 0xffff) {
                     v0->unk_2B2++;
@@ -498,7 +498,7 @@ void ov23_0224A77C (int param0, int param1, void * param2, void * param3)
 
         if (v0->unk_290[v1->unk_01]) {
             if (TrainerInfo_Equals(v0->unk_290[v1->unk_01], CommInfo_TrainerInfo(CommSys_CurNetId())) == 1) {
-                sub_0206DAD4(v0->unk_54, CommInfo_TrainerInfo(v1->unk_01));
+                sub_0206DAD4(v0->fieldSys, CommInfo_TrainerInfo(v1->unk_01));
             }
         }
 
@@ -510,7 +510,7 @@ void ov23_0224A77C (int param0, int param1, void * param2, void * param3)
 void ov23_0224AA84 (void)
 {
     int v0;
-    UnkStruct_ov23_0224A294 * v1 = sub_02057518();
+    CommPlayerData * v1 = CommPlayerData_Get();
 
     for (v0 = 0; v0 < (7 + 1); v0++) {
         v1->unk_14A[v0].unk_20 = 0xff;
@@ -519,13 +519,13 @@ void ov23_0224AA84 (void)
 
 u8 * ov23_0224AAA0 (int param0, void * param1, int param2)
 {
-    UnkStruct_ov23_0224A294 * v0 = sub_02057518();
+    CommPlayerData * v0 = CommPlayerData_Get();
     return (u8 *)&v0->unk_14A[(7 + 1)];
 }
 
 void ov23_0224AAB0 (void)
 {
-    UnkStruct_ov23_0224A294 * v0 = sub_02057518();
+    CommPlayerData * v0 = CommPlayerData_Get();
 
     v0->unk_2B9 = 0;
 
@@ -552,7 +552,7 @@ int ov23_0224AB2C (void)
 
 void ov23_0224AB30 (int param0, int param1, void * param2, void * param3)
 {
-    UnkStruct_ov23_0224A294 * v0 = sub_02057518();
+    CommPlayerData * v0 = CommPlayerData_Get();
     int v1;
     const TrainerInfo * v2 = param2;
     Strbuf* v3;
@@ -585,7 +585,7 @@ void ov23_0224AB30 (int param0, int param1, void * param2, void * param3)
 
 void ov23_0224ABC4 (int param0, int param1, void * param2, void * param3)
 {
-    UnkStruct_ov23_0224A294 * v0 = sub_02057518();
+    CommPlayerData * v0 = CommPlayerData_Get();
     UnkStruct_ov23_0224ABC4 * v1 = param2;
     int v2, v3;
 
@@ -610,7 +610,7 @@ int ov23_0224AC0C (void)
 void ov23_0224AC10 (int param0, int param1, void * param2, void * param3)
 {
     u8 * v0 = param2;
-    UnkStruct_ov23_0224A294 * v1 = sub_02057518();
+    CommPlayerData * v1 = CommPlayerData_Get();
 
     if (v0[0] == CommSys_CurNetId()) {
         v1->unk_2B9 = 1;
@@ -621,7 +621,7 @@ void ov23_0224AC10 (int param0, int param1, void * param2, void * param3)
 
 BOOL ov23_0224AC3C (void)
 {
-    UnkStruct_ov23_0224A294 * v0 = sub_02057518();
+    CommPlayerData * v0 = CommPlayerData_Get();
     return v0->unk_2B9;
 }
 
@@ -630,7 +630,7 @@ void ov23_0224AC4C (void)
     TrainerInfo * v0 = NULL;
     int v1, v2;
     int v3 = CommSys_CurNetId();
-    UnkStruct_ov23_0224A294 * v4 = sub_02057518();
+    CommPlayerData * v4 = CommPlayerData_Get();
 
     if (v4->unk_290[v3]) {
         v0 = v4->unk_290[v3];
@@ -655,7 +655,7 @@ void ov23_0224AC4C (void)
 
 BOOL ov23_0224ACC0 (int param0)
 {
-    UnkStruct_ov23_0224A294 * v0 = sub_02057518();
+    CommPlayerData * v0 = CommPlayerData_Get();
 
     if (v0->unk_04) {
         return !ov23_0224999C(
@@ -679,81 +679,81 @@ void ov23_0224ACF8 (int param0, int param1, void * param2, void * param3)
 
 int ov23_0224AD04 (int param0)
 {
-    UnkStruct_ov23_0224A294 * v0 = sub_02057518();
+    CommPlayerData * v0 = CommPlayerData_Get();
 
     if (!v0) {
         return 0xffff;
     } else if (CommSys_CurNetId() == param0) {
-        return v0->unk_A2[param0].unk_00;
+        return v0->playerLocation[param0].x;
     } else if (!sub_02058C40()) {
         return 0xffff;
     }
 
-    return v0->unk_A2[param0].unk_00;
+    return v0->playerLocation[param0].x;
 }
 
 int ov23_0224AD40 (int param0)
 {
-    UnkStruct_ov23_0224A294 * v0 = sub_02057518();
+    CommPlayerData * v0 = CommPlayerData_Get();
 
     if (!v0) {
         return 0xffff;
     } else if (CommSys_CurNetId() == param0) {
-        return v0->unk_A2[param0].unk_02;
+        return v0->playerLocation[param0].z;
     } else if (!sub_02058C40()) {
         return 0xffff;
     }
 
-    return v0->unk_A2[param0].unk_02;
+    return v0->playerLocation[param0].z;
 }
 
 void ov23_0224AD7C (int param0, int param1)
 {
-    UnkStruct_ov23_0224A294 * v0 = sub_02057518();
+    CommPlayerData * v0 = CommPlayerData_Get();
     ov23_02249994(ov23_0224993C(v0->unk_04, param0), param1);
 }
 
 void ov23_0224AD98 (int param0)
 {
-    UnkStruct_ov23_0224A294 * v0 = sub_02057518();
+    CommPlayerData * v0 = CommPlayerData_Get();
     ov23_02249994(ov23_0224993C(v0->unk_04, param0), 0);
 }
 
 void ov23_0224ADB0 (int param0, int param1, int param2, int param3)
 {
-    UnkStruct_ov23_0224A294 * v0 = sub_02057518();
-    UnkStruct_02057B48 * v1 = &v0->unk_62[param0];
+    CommPlayerData * v0 = CommPlayerData_Get();
+    CommPlayerLocation * v1 = &v0->playerLocationServer[param0];
 
-    v1->unk_00 = param1 + sub_0206419C(param3);
-    v1->unk_02 = param2 + sub_020641A8(param3);
-    v1->unk_04 = param3;
+    v1->x = param1 + sub_0206419C(param3);
+    v1->z = param2 + sub_020641A8(param3);
+    v1->dir = param3;
 }
 
 void ov23_0224ADE8 (int param0, int param1, int param2, int param3)
 {
-    UnkStruct_ov23_0224A294 * v0 = sub_02057518();
-    UnkStruct_02057B48 * v1;
+    CommPlayerData * v0 = CommPlayerData_Get();
+    CommPlayerLocation * v1;
 
     if (!v0) {
         return;
     }
 
-    v1 = &v0->unk_A2[param0];
+    v1 = &v0->playerLocation[param0];
 
     if (!v0->unk_2BD) {
-        ov5_021F5634(v0->unk_54, v1->unk_00, 0, v1->unk_02);
+        ov5_021F5634(v0->fieldSys, v1->x, 0, v1->z);
     }
 
-    v1->unk_00 = param1;
-    v1->unk_02 = param2;
-    v1->unk_04 = param3;
+    v1->x = param1;
+    v1->z = param2;
+    v1->dir = param3;
 
     if (v0->unk_08[param0]) {
         sub_0205ECE0(v0->unk_08[param0], param1, param2, param3);
     }
 
     if (!v0->unk_2BD) {
-        ov5_021F5634(v0->unk_54, v1->unk_00, 0, v1->unk_02);
+        ov5_021F5634(v0->fieldSys, v1->x, 0, v1->z);
     }
 
     if (!v0->unk_2BD) {
@@ -763,7 +763,7 @@ void ov23_0224ADE8 (int param0, int param1, int param2, int param3)
 
 BOOL ov23_0224AE60 (int param0)
 {
-    UnkStruct_ov23_0224A294 * v0 = sub_02057518();
+    CommPlayerData * v0 = CommPlayerData_Get();
 
     if (v0->unk_290[param0] != NULL) {
         Heap_FreeToHeap(v0->unk_290[param0]);
@@ -780,7 +780,7 @@ BOOL ov23_0224AE60 (int param0)
 
 BOOL ov23_0224AEA4 (int param0)
 {
-    UnkStruct_ov23_0224A294 * v0 = sub_02057518();
+    CommPlayerData * v0 = CommPlayerData_Get();
 
     if (v0->unk_290[param0] != NULL) {
         return 1;
@@ -791,7 +791,7 @@ BOOL ov23_0224AEA4 (int param0)
 
 BOOL ov23_0224AEC4 (int param0, int param1)
 {
-    UnkStruct_ov23_0224A294 * v0 = sub_02057518();
+    CommPlayerData * v0 = CommPlayerData_Get();
 
     if (v0->unk_290[param0] == NULL) {
         TrainerInfo * v1 = CommInfo_TrainerInfo(param1);
@@ -806,7 +806,7 @@ BOOL ov23_0224AEC4 (int param0, int param1)
             TrainerInfo_Copy(v1, (TrainerInfo *)&v0->unk_14A[param0].unk_00);
 
             if (param1 == CommSys_CurNetId()) {
-                UnkStruct_0202855C * v2 = sub_020298A0(v0->unk_54->unk_0C);
+                UnkStruct_0202855C * v2 = sub_020298A0(v0->fieldSys->unk_0C);
                 sub_020297B4(v2);
             }
 
@@ -819,7 +819,7 @@ BOOL ov23_0224AEC4 (int param0, int param1)
 
 void ov23_0224AF4C (int param0)
 {
-    UnkStruct_ov23_0224A294 * v0 = sub_02057518();
+    CommPlayerData * v0 = CommPlayerData_Get();
 
     if (v0->unk_28[param0] != NULL) {
         if (sub_020714F0(v0->unk_28[param0])) {
@@ -834,7 +834,7 @@ void ov23_0224AF4C (int param0)
 
 void ov23_0224AF7C (int param0)
 {
-    UnkStruct_ov23_0224A294 * v0 = sub_02057518();
+    CommPlayerData * v0 = CommPlayerData_Get();
 
     if (!v0->unk_2BD) {
         if (v0->unk_08[param0]) {
@@ -866,7 +866,7 @@ void ov23_0224AF7C (int param0)
 
 void ov23_0224B00C (int param0)
 {
-    UnkStruct_ov23_0224A294 * v0 = sub_02057518();
+    CommPlayerData * v0 = CommPlayerData_Get();
 
     if (v0->unk_FA[param0] != 1) {
         v0->unk_FA[param0] = 2;
@@ -875,7 +875,7 @@ void ov23_0224B00C (int param0)
 
 void ov23_0224B024 (int param0)
 {
-    UnkStruct_ov23_0224A294 * v0 = sub_02057518();
+    CommPlayerData * v0 = CommPlayerData_Get();
 
     if (v0->unk_FA[param0] != 1) {
         v0->unk_FA[param0] = 3;
@@ -886,7 +886,7 @@ void ov23_0224B024 (int param0)
 
 void ov23_0224B040 (int param0)
 {
-    UnkStruct_ov23_0224A294 * v0 = sub_02057518();
+    CommPlayerData * v0 = CommPlayerData_Get();
 
     if (v0->unk_FA[param0] != 1) {
         v0->unk_FA[param0] = 0;
diff --git a/src/unk_02057518.c b/src/unk_02057518.c
index bb9bc5cd0b..4d6a245932 100644
--- a/src/unk_02057518.c
+++ b/src/unk_02057518.c
@@ -58,55 +58,55 @@ static void sub_02057EF8(void * param0);
 static void sub_020587C0(int param0);
 static void sub_020591A8(void);
 
-static UnkStruct_ov23_0224A294 * Unk_021C0848 = NULL;
+static CommPlayerData * sCommPlayerData = NULL;
 
-UnkStruct_ov23_0224A294 * sub_02057518 (void)
+CommPlayerData * CommPlayerData_Get (void)
 {
-    return Unk_021C0848;
+    return sCommPlayerData;
 }
 
-BOOL sub_02057524 (void * param0, FieldSystem * param1, BOOL param2)
+BOOL CommPlayerManager_Init (void * dest, FieldSystem * fieldSys, BOOL param2)
 {
-    int v0, v1;
+    int netId;
 
-    if (Unk_021C0848) {
+    if (sCommPlayerData) {
         return 0;
     }
 
-    if (Unk_021C0848 == NULL) {
-        Unk_021C0848 = param0;
-        MI_CpuFill8(Unk_021C0848, 0, sizeof(UnkStruct_ov23_0224A294));
+    if (sCommPlayerData == NULL) {
+        sCommPlayerData = dest;
+        MI_CpuFill8(sCommPlayerData, 0, sizeof(CommPlayerData));
     }
 
-    Unk_021C0848->unk_2BE = param2;
-    Unk_021C0848->unk_04 = NULL;
+    sCommPlayerData->unk_2BE = param2;
+    sCommPlayerData->unk_04 = NULL;
 
     if (param2) {
-        Unk_021C0848->unk_04 = Heap_AllocFromHeap(15, ov23_02249918());
-        ov23_0224991C(Unk_021C0848->unk_04);
+        sCommPlayerData->unk_04 = Heap_AllocFromHeap(15, ov23_02249918());
+        ov23_0224991C(sCommPlayerData->unk_04);
     }
 
-    Unk_021C0848->unk_54 = param1;
+    sCommPlayerData->fieldSys = fieldSys;
 
-    for (v0 = 0; v0 < (7 + 1); v0++) {
-        Unk_021C0848->unk_A2[v0].unk_04 = -1;
-        Unk_021C0848->unk_A2[v0].unk_00 = 0xffff;
-        Unk_021C0848->unk_A2[v0].unk_02 = 0xffff;
-        Unk_021C0848->unk_A2[v0].unk_05 = 2;
-        Unk_021C0848->unk_62[v0].unk_04 = -1;
-        Unk_021C0848->unk_62[v0].unk_00 = 0xffff;
-        Unk_021C0848->unk_62[v0].unk_02 = 0xffff;
-        Unk_021C0848->unk_62[v0].unk_05 = 2;
-        Unk_021C0848->unk_102[v0] = -1;
-        Unk_021C0848->unk_E2[v0] = 0;
-        Unk_021C0848->unk_EA[v0] = 1;
-        Unk_021C0848->unk_F2[v0] = 0;
-        Unk_021C0848->unk_14A[v0].unk_20 = 0xff;
+    for (netId = 0; netId < (7 + 1); netId++) {
+        sCommPlayerData->playerLocation[netId].dir = -1;
+        sCommPlayerData->playerLocation[netId].x = 0xffff;
+        sCommPlayerData->playerLocation[netId].z = 0xffff;
+        sCommPlayerData->playerLocation[netId].moveSpeed = 2;
+        sCommPlayerData->playerLocationServer[netId].dir = -1;
+        sCommPlayerData->playerLocationServer[netId].x = 0xffff;
+        sCommPlayerData->playerLocationServer[netId].z = 0xffff;
+        sCommPlayerData->playerLocationServer[netId].moveSpeed = 2;
+        sCommPlayerData->unk_102[netId] = -1;
+        sCommPlayerData->unk_E2[netId] = 0;
+        sCommPlayerData->unk_EA[netId] = 1;
+        sCommPlayerData->unk_F2[netId] = 0;
+        sCommPlayerData->unk_14A[netId].unk_20 = 0xff;
     }
 
-    Unk_021C0848->unk_2BC = 0;
-    Unk_021C0848->unk_2BF = 0;
-    Unk_021C0848->unk_50 = SysTask_Start(sub_02057E80, NULL, (100 + 100));
+    sCommPlayerData->unk_2BC = 0;
+    sCommPlayerData->unk_2BF = 0;
+    sCommPlayerData->unk_50 = SysTask_Start(sub_02057E80, NULL, (100 + 100));
 
     sub_02035EA8();
     sub_020578DC();
@@ -118,20 +118,20 @@ void sub_0205764C (void)
 {
     int v0;
 
-    if (Unk_021C0848 == NULL) {
+    if (sCommPlayerData == NULL) {
         return;
     }
 
     for (v0 = 0; v0 < (7 + 1); v0++) {
-        if (Unk_021C0848->unk_2BE) {
+        if (sCommPlayerData->unk_2BE) {
             sub_02057DB8(v0, 1, 0);
         } else {
             sub_02057DB8(v0, 1, 1);
         }
     }
 
-    if (Unk_021C0848->unk_2BE) {
-        Unk_021C0848->unk_2BD = 1;
+    if (sCommPlayerData->unk_2BE) {
+        sCommPlayerData->unk_2BD = 1;
     }
 }
 
@@ -139,12 +139,12 @@ void sub_020576A0 (void)
 {
     int v0, v1;
 
-    if (Unk_021C0848 == NULL) {
+    if (sCommPlayerData == NULL) {
         return;
     }
 
-    Unk_021C0848->unk_2BB = 1;
-    Unk_021C0848->unk_2BD = 0;
+    sCommPlayerData->unk_2BB = 1;
+    sCommPlayerData->unk_2BD = 0;
 
     sub_020578DC();
     sub_02057AE4(1);
@@ -154,31 +154,31 @@ void sub_020576CC (BOOL param0)
 {
     int v0, v1;
 
-    if (Unk_021C0848) {
+    if (sCommPlayerData) {
         for (v1 = 0; v1 < 5; v1++) {
-            if (Unk_021C0848->unk_27C[v1]) {
-                Heap_FreeToHeap(Unk_021C0848->unk_27C[v1]);
-                Unk_021C0848->unk_27C[v1] = NULL;
+            if (sCommPlayerData->unk_27C[v1]) {
+                Heap_FreeToHeap(sCommPlayerData->unk_27C[v1]);
+                sCommPlayerData->unk_27C[v1] = NULL;
             }
         }
 
-        if (Unk_021C0848->unk_2B2 >= 5) {
-            sub_0206DF60(Unk_021C0848->unk_54, Unk_021C0848->unk_2B2);
+        if (sCommPlayerData->unk_2B2 >= 5) {
+            sub_0206DF60(sCommPlayerData->fieldSys, sCommPlayerData->unk_2B2);
         }
 
         for (v0 = 0; v0 < (7 + 1); v0++) {
             sub_02057DB8(v0, 0, param0);
         }
 
-        SysTask_Done(Unk_021C0848->unk_50);
+        SysTask_Done(sCommPlayerData->unk_50);
 
-        if (Unk_021C0848->unk_04) {
-            ov23_02249938(Unk_021C0848->unk_04);
-            Heap_FreeToHeap(Unk_021C0848->unk_04);
+        if (sCommPlayerData->unk_04) {
+            ov23_02249938(sCommPlayerData->unk_04);
+            Heap_FreeToHeap(sCommPlayerData->unk_04);
         }
 
-        Heap_FreeToHeap(Unk_021C0848);
-        Unk_021C0848 = NULL;
+        Heap_FreeToHeap(sCommPlayerData);
+        sCommPlayerData = NULL;
     }
 }
 
@@ -187,7 +187,7 @@ void sub_02057764 (void)
     int v0, v1;
 
     for (v0 = 0; v0 < (7 + 1); v0++) {
-        if (Unk_021C0848->unk_2BE) {
+        if (sCommPlayerData->unk_2BE) {
             ov23_0224AF4C(v0);
             ov23_0224AD98(v0);
 
@@ -196,93 +196,93 @@ void sub_02057764 (void)
             }
         }
 
-        if (Unk_021C0848->unk_08[v0] != NULL) {
-            if (Unk_021C0848->unk_54->unk_3C != Unk_021C0848->unk_08[v0]) {
-                if (Unk_021C0848->unk_2BE) {
-                    sub_0205E8E8(Unk_021C0848->unk_08[v0]);
+        if (sCommPlayerData->unk_08[v0] != NULL) {
+            if (sCommPlayerData->fieldSys->unk_3C != sCommPlayerData->unk_08[v0]) {
+                if (sCommPlayerData->unk_2BE) {
+                    sub_0205E8E8(sCommPlayerData->unk_08[v0]);
                 }
             }
 
-            Unk_021C0848->unk_08[v0] = NULL;
+            sCommPlayerData->unk_08[v0] = NULL;
         }
 
-        Unk_021C0848->unk_48[v0] = 0;
-        Unk_021C0848->unk_A2[v0].unk_04 = -1;
-        Unk_021C0848->unk_A2[v0].unk_00 = 0xffff;
-        Unk_021C0848->unk_A2[v0].unk_02 = 0xffff;
-        Unk_021C0848->unk_A2[v0].unk_05 = 2;
-        Unk_021C0848->unk_62[v0].unk_04 = -1;
-        Unk_021C0848->unk_62[v0].unk_00 = 0xffff;
-        Unk_021C0848->unk_62[v0].unk_02 = 0xffff;
-        Unk_021C0848->unk_62[v0].unk_05 = 2;
-        Unk_021C0848->unk_102[v0] = -1;
-        Unk_021C0848->unk_10A[v0] = 0;
-        Unk_021C0848->unk_E2[v0] = 0;
-        Unk_021C0848->unk_EA[v0] = 1;
-        Unk_021C0848->unk_F2[v0] = 0;
-        Unk_021C0848->unk_13A[v0] = 0;
-        Unk_021C0848->unk_142[v0] = 0;
+        sCommPlayerData->unk_48[v0] = 0;
+        sCommPlayerData->playerLocation[v0].dir = -1;
+        sCommPlayerData->playerLocation[v0].x = 0xffff;
+        sCommPlayerData->playerLocation[v0].z = 0xffff;
+        sCommPlayerData->playerLocation[v0].moveSpeed = 2;
+        sCommPlayerData->playerLocationServer[v0].dir = -1;
+        sCommPlayerData->playerLocationServer[v0].x = 0xffff;
+        sCommPlayerData->playerLocationServer[v0].z = 0xffff;
+        sCommPlayerData->playerLocationServer[v0].moveSpeed = 2;
+        sCommPlayerData->unk_102[v0] = -1;
+        sCommPlayerData->unk_10A[v0] = 0;
+        sCommPlayerData->unk_E2[v0] = 0;
+        sCommPlayerData->unk_EA[v0] = 1;
+        sCommPlayerData->unk_F2[v0] = 0;
+        sCommPlayerData->unk_13A[v0] = 0;
+        sCommPlayerData->unk_142[v0] = 0;
     }
 
-    Unk_021C0848->unk_2BF = 0;
+    sCommPlayerData->unk_2BF = 0;
     sub_020578DC();
 
-    if (Unk_021C0848->unk_50 == NULL) {
-        Unk_021C0848->unk_50 = SysTask_Start(sub_02057E80, NULL, (100 + 100));
+    if (sCommPlayerData->unk_50 == NULL) {
+        sCommPlayerData->unk_50 = SysTask_Start(sub_02057E80, NULL, (100 + 100));
     }
 }
 
 void sub_020578B0 (void)
 {
-    if (Unk_021C0848->unk_50) {
+    if (sCommPlayerData->unk_50) {
         sub_02057E80(NULL, NULL);
-        SysTask_Done(Unk_021C0848->unk_50);
+        SysTask_Done(sCommPlayerData->unk_50);
     }
 
-    Unk_021C0848->unk_50 = NULL;
+    sCommPlayerData->unk_50 = NULL;
 }
 
 void sub_020578DC (void)
 {
-    Unk_021C0848->unk_08[CommSys_CurNetId()] = Unk_021C0848->unk_54->unk_3C;
-    Unk_021C0848->unk_48[CommSys_CurNetId()] = 1;
-    Unk_021C0848->unk_A2[CommSys_CurNetId()].unk_00 = sub_0205EABC(Unk_021C0848->unk_54->unk_3C);
-    Unk_021C0848->unk_A2[CommSys_CurNetId()].unk_02 = sub_0205EAC8(Unk_021C0848->unk_54->unk_3C);
-    Unk_021C0848->unk_A2[CommSys_CurNetId()].unk_04 = sub_0205EA78(Unk_021C0848->unk_54->unk_3C);
-    Unk_021C0848->unk_62[CommSys_CurNetId()].unk_00 = sub_0205EABC(Unk_021C0848->unk_54->unk_3C);
-    Unk_021C0848->unk_62[CommSys_CurNetId()].unk_02 = sub_0205EAC8(Unk_021C0848->unk_54->unk_3C);
-    Unk_021C0848->unk_62[CommSys_CurNetId()].unk_04 = sub_0205EA78(Unk_021C0848->unk_54->unk_3C);
+    sCommPlayerData->unk_08[CommSys_CurNetId()] = sCommPlayerData->fieldSys->unk_3C;
+    sCommPlayerData->unk_48[CommSys_CurNetId()] = 1;
+    sCommPlayerData->playerLocation[CommSys_CurNetId()].x = sub_0205EABC(sCommPlayerData->fieldSys->unk_3C);
+    sCommPlayerData->playerLocation[CommSys_CurNetId()].z = sub_0205EAC8(sCommPlayerData->fieldSys->unk_3C);
+    sCommPlayerData->playerLocation[CommSys_CurNetId()].dir = sub_0205EA78(sCommPlayerData->fieldSys->unk_3C);
+    sCommPlayerData->playerLocationServer[CommSys_CurNetId()].x = sub_0205EABC(sCommPlayerData->fieldSys->unk_3C);
+    sCommPlayerData->playerLocationServer[CommSys_CurNetId()].z = sub_0205EAC8(sCommPlayerData->fieldSys->unk_3C);
+    sCommPlayerData->playerLocationServer[CommSys_CurNetId()].dir = sub_0205EA78(sCommPlayerData->fieldSys->unk_3C);
 }
 
 void sub_020579BC (int param0)
 {
     int v0;
 
-    Unk_021C0848->unk_2BF = 0;
+    sCommPlayerData->unk_2BF = 0;
     v0 = CommSys_CurNetId();
 
-    Unk_021C0848->unk_08[v0] = Unk_021C0848->unk_54->unk_3C;
-    Unk_021C0848->unk_48[v0] = 1;
-    Unk_021C0848->unk_A2[v0].unk_00 = Unk_021C0848->unk_A2[param0].unk_00;
-    Unk_021C0848->unk_A2[v0].unk_02 = Unk_021C0848->unk_A2[param0].unk_02;
-    Unk_021C0848->unk_A2[v0].unk_04 = Unk_021C0848->unk_A2[param0].unk_04;
-    Unk_021C0848->unk_62[v0].unk_00 = Unk_021C0848->unk_62[param0].unk_00;
-    Unk_021C0848->unk_62[v0].unk_02 = Unk_021C0848->unk_62[param0].unk_02;
-    Unk_021C0848->unk_62[v0].unk_04 = Unk_021C0848->unk_62[param0].unk_04;
-    Unk_021C0848->unk_290[v0] = Unk_021C0848->unk_290[param0];
-    Unk_021C0848->unk_290[param0] = NULL;
+    sCommPlayerData->unk_08[v0] = sCommPlayerData->fieldSys->unk_3C;
+    sCommPlayerData->unk_48[v0] = 1;
+    sCommPlayerData->playerLocation[v0].x = sCommPlayerData->playerLocation[param0].x;
+    sCommPlayerData->playerLocation[v0].z = sCommPlayerData->playerLocation[param0].z;
+    sCommPlayerData->playerLocation[v0].dir = sCommPlayerData->playerLocation[param0].dir;
+    sCommPlayerData->playerLocationServer[v0].x = sCommPlayerData->playerLocationServer[param0].x;
+    sCommPlayerData->playerLocationServer[v0].z = sCommPlayerData->playerLocationServer[param0].z;
+    sCommPlayerData->playerLocationServer[v0].dir = sCommPlayerData->playerLocationServer[param0].dir;
+    sCommPlayerData->unk_290[v0] = sCommPlayerData->unk_290[param0];
+    sCommPlayerData->unk_290[param0] = NULL;
 
-    if (Unk_021C0848->unk_290[v0]) {
-        TrainerInfo_Copy(Unk_021C0848->unk_290[v0], (TrainerInfo *)&Unk_021C0848->unk_14A[v0].unk_00);
+    if (sCommPlayerData->unk_290[v0]) {
+        TrainerInfo_Copy(sCommPlayerData->unk_290[v0], (TrainerInfo *)&sCommPlayerData->unk_14A[v0].unk_00);
     }
 
-    Unk_021C0848->unk_14A[param0].unk_20 = 0xff;
+    sCommPlayerData->unk_14A[param0].unk_20 = 0xff;
 }
 
 void sub_02057A94 (BOOL param0, int param1, int param2)
 {
     u8 v0[5 + 1];
-    int v1 = sub_0205EA78(Unk_021C0848->unk_54->unk_3C);
+    int v1 = sub_0205EA78(sCommPlayerData->fieldSys->unk_3C);
 
     v0[0] = param1;
     v0[1] = param1 >> 8;
@@ -295,39 +295,39 @@ void sub_02057A94 (BOOL param0, int param1, int param2)
     }
 
     sub_020360D0(22, v0);
-    Unk_021C0848->unk_2BB = 1;
+    sCommPlayerData->unk_2BB = 1;
 }
 
 void sub_02057AE4 (BOOL param0)
 {
-    int v0 = sub_0205EABC(Unk_021C0848->unk_54->unk_3C);
-    int v1 = sub_0205EAC8(Unk_021C0848->unk_54->unk_3C);
+    int v0 = sub_0205EABC(sCommPlayerData->fieldSys->unk_3C);
+    int v1 = sub_0205EAC8(sCommPlayerData->fieldSys->unk_3C);
 
     sub_02057A94(param0, v0, v1);
 }
 
 void sub_02057B14 (BOOL param0)
 {
-    int v0 = Unk_021C0848->unk_62[CommSys_CurNetId()].unk_00;
-    int v1 = Unk_021C0848->unk_62[CommSys_CurNetId()].unk_02;
+    int v0 = sCommPlayerData->playerLocationServer[CommSys_CurNetId()].x;
+    int v1 = sCommPlayerData->playerLocationServer[CommSys_CurNetId()].z;
 
     sub_02057A94(param0, v0, v1);
 }
 
-static void sub_02057B48 (int param0, const UnkStruct_02057B48 * param1)
+static void sub_02057B48 (int param0, const CommPlayerLocation * playerLocation)
 {
     u8 v0[4 + 1];
-    int v1 = param1->unk_00, v2 = param1->unk_02;
+    int v1 = playerLocation->x, v2 = playerLocation->z;
 
-    if (param1->unk_00 < 0) {
+    if (playerLocation->x < 0) {
         v1 = 0;
-    } else if (param1->unk_00 >= 0xf000) {
+    } else if (playerLocation->x >= 0xf000) {
         v1 = 0xf000 - 1;
     }
 
-    if (param1->unk_02 < 0) {
+    if (playerLocation->z < 0) {
         v2 = 0;
-    } else if (param1->unk_02 >= 0xf000) {
+    } else if (playerLocation->z >= 0xf000) {
         v2 = 0xf000 - 1;
     }
 
@@ -336,30 +336,30 @@ static void sub_02057B48 (int param0, const UnkStruct_02057B48 * param1)
     v0[2] = ((v1 >> 8) & 0x1) + ((v2 >> 7) & 0x2);
     v0[3] = v2;
 
-    if (param1->unk_07) {
+    if (playerLocation->unk_07) {
         v0[2] |= 0x80;
     }
 
-    v0[0] += ((param1->unk_04 % 4) << 4);
-    v0[0] += (param1->unk_05 << 6);
+    v0[0] += ((playerLocation->dir % 4) << 4);
+    v0[0] += (playerLocation->moveSpeed << 6);
 
     sub_02035AC4(23, v0, 0);
 }
 
 void sub_02057BC4 (void * param0)
 {
-    int v0 = sub_0205EB0C(Unk_021C0848->unk_54->unk_3C);
-    int v1 = sub_0205EB14(Unk_021C0848->unk_54->unk_3C);
+    int v0 = sub_0205EB0C(sCommPlayerData->fieldSys->unk_3C);
+    int v1 = sub_0205EB14(sCommPlayerData->fieldSys->unk_3C);
 
     if ((0 == v0) && CommSys_IsPlayerConnected(CommSys_CurNetId())) {
-        if (!Unk_021C0848->unk_2BA) {
+        if (!sCommPlayerData->unk_2BA) {
             sub_02057AE4(1);
-            Unk_021C0848->unk_2BA = 1;
+            sCommPlayerData->unk_2BA = 1;
         }
     }
 
     if ((1 == v0) && (1 == v1)) {
-        Unk_021C0848->unk_2BA = 0;
+        sCommPlayerData->unk_2BA = 0;
     }
 }
 
@@ -368,22 +368,22 @@ static void sub_02057C2C (void * param0)
     int v0;
 
     for (v0 = 0; v0 < (7 + 1); v0++) {
-        if (Unk_021C0848->unk_48[v0]) {
-            UnkStruct_02057B48 * v1 = &Unk_021C0848->unk_62[v0];
+        if (sCommPlayerData->unk_48[v0]) {
+            CommPlayerLocation * v1 = &sCommPlayerData->playerLocationServer[v0];
 
-            if (Unk_021C0848->unk_132[v0] || Unk_021C0848->unk_2BB) {
-                Unk_021C0848->unk_132[v0] = 0;
+            if (sCommPlayerData->unk_132[v0] || sCommPlayerData->unk_2BB) {
+                sCommPlayerData->unk_132[v0] = 0;
                 sub_02057B48(v0, v1);
             }
         }
     }
 
-    Unk_021C0848->unk_2BB = 0;
+    sCommPlayerData->unk_2BB = 0;
 }
 
 u32 sub_02057C84 (void)
 {
-    return sizeof(UnkStruct_ov23_0224A294);
+    return sizeof(CommPlayerData);
 }
 
 static void sub_02057C8C (u8 param0)
@@ -391,11 +391,11 @@ static void sub_02057C8C (u8 param0)
     fx32 v0, v1;
     UnkStruct_0205E884 * v2;
 
-    if (Unk_021C0848->unk_08[param0] != NULL) {
+    if (sCommPlayerData->unk_08[param0] != NULL) {
         return;
     }
 
-    if (Unk_021C0848->unk_2BD) {
+    if (sCommPlayerData->unk_2BD) {
         return;
     }
 
@@ -407,9 +407,9 @@ static void sub_02057C8C (u8 param0)
         }
 
         if (v3) {
-            if (!Unk_021C0848->unk_2BE) {
+            if (!sCommPlayerData->unk_2BE) {
                 if (param0 != CommSys_CurNetId()) {
-                    UnkStruct_02061AB4 * v4 = sub_0206251C(Unk_021C0848->unk_54->unk_38, 0xff + param0 + 1);
+                    UnkStruct_02061AB4 * v4 = sub_0206251C(sCommPlayerData->fieldSys->unk_38, 0xff + param0 + 1);
 
                     if (v4) {
                         sub_02061AF4(v4);
@@ -424,26 +424,26 @@ static void sub_02057C8C (u8 param0)
                     v5 = 1;
                 }
 
-                v2 = sub_0205E7D0(Unk_021C0848->unk_54->unk_38, Unk_021C0848->unk_A2[param0].unk_00, Unk_021C0848->unk_A2[param0].unk_02, Unk_021C0848->unk_A2[param0].unk_04, 0x0, TrainerInfo_Gender(v3), v5, NULL);
+                v2 = sub_0205E7D0(sCommPlayerData->fieldSys->unk_38, sCommPlayerData->playerLocation[param0].x, sCommPlayerData->playerLocation[param0].z, sCommPlayerData->playerLocation[param0].dir, 0x0, TrainerInfo_Gender(v3), v5, NULL);
             }
 
             GF_ASSERT(v2);
-            Unk_021C0848->unk_08[param0] = v2;
+            sCommPlayerData->unk_08[param0] = v2;
 
             sub_0206290C(sub_0205EB3C(v2), 0xff + param0 + 1);
 
-            if (Unk_021C0848->unk_2BE) {
+            if (sCommPlayerData->unk_2BE) {
                 ov23_02243038(param0);
             }
 
-            if (Unk_021C0848->unk_2BE && !Unk_021C0848->unk_48[param0]) {
-                if (!Unk_021C0848->unk_2BD) {
-                    ov5_021F5634(Unk_021C0848->unk_54, Unk_021C0848->unk_A2[param0].unk_00, 0, Unk_021C0848->unk_A2[param0].unk_02);
+            if (sCommPlayerData->unk_2BE && !sCommPlayerData->unk_48[param0]) {
+                if (!sCommPlayerData->unk_2BD) {
+                    ov5_021F5634(sCommPlayerData->fieldSys, sCommPlayerData->playerLocation[param0].x, 0, sCommPlayerData->playerLocation[param0].z);
                 }
 
-                Unk_021C0848->unk_48[param0] = 1;
-            } else if (!Unk_021C0848->unk_2BE) {
-                Unk_021C0848->unk_48[param0] = 1;
+                sCommPlayerData->unk_48[param0] = 1;
+            } else if (!sCommPlayerData->unk_2BE) {
+                sCommPlayerData->unk_48[param0] = 1;
             }
         }
     }
@@ -453,38 +453,38 @@ void sub_02057DB8 (u8 param0, BOOL param1, BOOL param2)
 {
     int v0;
 
-    if (Unk_021C0848 == NULL) {
+    if (sCommPlayerData == NULL) {
         return;
     }
 
-    MI_CpuClear8(Unk_021C0848->unk_5A, (7 + 1));
+    MI_CpuClear8(sCommPlayerData->unk_5A, (7 + 1));
 
-    if (Unk_021C0848->unk_2BE) {
+    if (sCommPlayerData->unk_2BE) {
         ov23_0224AF4C(param0);
     }
 
-    if (Unk_021C0848->unk_08[param0] != NULL) {
-        if (Unk_021C0848->unk_54->unk_3C != Unk_021C0848->unk_08[param0]) {
-            if (Unk_021C0848->unk_2BE || param2) {
-                sub_0205E8E8(Unk_021C0848->unk_08[param0]);
+    if (sCommPlayerData->unk_08[param0] != NULL) {
+        if (sCommPlayerData->fieldSys->unk_3C != sCommPlayerData->unk_08[param0]) {
+            if (sCommPlayerData->unk_2BE || param2) {
+                sub_0205E8E8(sCommPlayerData->unk_08[param0]);
             } else {
-                sub_0205E8E0(Unk_021C0848->unk_08[param0]);
+                sub_0205E8E0(sCommPlayerData->unk_08[param0]);
             }
         }
 
-        Unk_021C0848->unk_08[param0] = NULL;
+        sCommPlayerData->unk_08[param0] = NULL;
     }
 
-    if ((Unk_021C0848->unk_48[param0]) && (!param1)) {
-        Unk_021C0848->unk_48[param0] = 0;
+    if ((sCommPlayerData->unk_48[param0]) && (!param1)) {
+        sCommPlayerData->unk_48[param0] = 0;
     }
 
-    Unk_021C0848->unk_132[param0] = 1;
+    sCommPlayerData->unk_132[param0] = 1;
 
     if (!param1) {
-        Unk_021C0848->unk_FA[param0] = 0;
+        sCommPlayerData->unk_FA[param0] = 0;
 
-        if (Unk_021C0848->unk_2BE) {
+        if (sCommPlayerData->unk_2BE) {
             ov23_0224AE60(param0);
 
             if (param0 != 0) {
@@ -516,8 +516,8 @@ static void sub_02057E80 (SysTask * param0, void * param1)
             sub_02057C2C(param1);
             sub_02057BC4(param1);
 
-            if (Unk_021C0848->unk_04) {
-                ov23_02249954(Unk_021C0848->unk_04);
+            if (sCommPlayerData->unk_04) {
+                ov23_02249954(sCommPlayerData->unk_04);
             }
         } else {
             sub_02057BC4(param1);
@@ -527,7 +527,7 @@ static void sub_02057E80 (SysTask * param0, void * param1)
     }
 
     for (v0 = 0; v0 < (7 + 1); v0++) {
-        if (Unk_021C0848->unk_2BE) {
+        if (sCommPlayerData->unk_2BE) {
             if (CommSys_CurNetId() == 0) {
                 if (NULL == CommInfo_TrainerInfo(v0)) {
                     ov23_0224B5CC(v0);
@@ -544,7 +544,7 @@ static void sub_02057EF8 (void * param0)
     for (v0 = 0; v0 < (7 + 1); v0++) {
         if (!CommSys_IsPlayerConnected(v0)) {
             if (!(sub_02036180() && (v0 == 0))) {
-                if ((CommSys_CurNetId() == 0) && (Unk_021C0848->unk_2BE)) {
+                if ((CommSys_CurNetId() == 0) && (sCommPlayerData->unk_2BE)) {
                     ov23_0224D898(v0);
                 }
             }
@@ -553,19 +553,19 @@ static void sub_02057EF8 (void * param0)
         if (CommSys_IsPlayerConnected(v0) || (sub_02036180() && (v0 == 0))) {
             sub_020587C0(v0);
 
-            if (Unk_021C0848->unk_2BE) {
+            if (sCommPlayerData->unk_2BE) {
                 ov23_0224AF7C(v0);
             }
         } else {
-            if (Unk_021C0848->unk_48[v0]) {
-                if ((CommSys_CurNetId() == 0) && (Unk_021C0848->unk_2BE)) {
+            if (sCommPlayerData->unk_48[v0]) {
+                if ((CommSys_CurNetId() == 0) && (sCommPlayerData->unk_2BE)) {
                     ov23_022436F0(v0);
                     ov23_02241648(v0);
                 }
 
                 {
                     u8 v2 = v0;
-                    sub_0205853C(0, 1, &v2, Unk_021C0848->unk_54);
+                    sub_0205853C(0, 1, &v2, sCommPlayerData->fieldSys);
                 }
             }
         }
@@ -574,8 +574,8 @@ static void sub_02057EF8 (void * param0)
 
 BOOL sub_02057FAC (void)
 {
-    if (Unk_021C0848 != NULL) {
-        return Unk_021C0848->unk_2BC;
+    if (sCommPlayerData != NULL) {
+        return sCommPlayerData->unk_2BC;
     }
 
     return 0;
@@ -583,21 +583,21 @@ BOOL sub_02057FAC (void)
 
 void sub_02057FC4 (BOOL param0)
 {
-    if (Unk_021C0848 != NULL) {
-        if (Unk_021C0848->unk_2BC != param0) {
-            Unk_021C0848->unk_2BC = param0;
+    if (sCommPlayerData != NULL) {
+        if (sCommPlayerData->unk_2BC != param0) {
+            sCommPlayerData->unk_2BC = param0;
         }
 
-        sub_020360D0(62, &Unk_021C0848->unk_2BC);
+        sub_020360D0(62, &sCommPlayerData->unk_2BC);
     }
 }
 
 static void sub_02057FF0 (BOOL param0)
 {
-    if (Unk_021C0848 != NULL) {
-        if (Unk_021C0848->unk_2BC != param0) {
-            Unk_021C0848->unk_2BC = param0;
-            sub_020360D0(62, &Unk_021C0848->unk_2BC);
+    if (sCommPlayerData != NULL) {
+        if (sCommPlayerData->unk_2BC != param0) {
+            sCommPlayerData->unk_2BC = param0;
+            sub_020360D0(62, &sCommPlayerData->unk_2BC);
         }
     }
 }
@@ -606,7 +606,7 @@ void sub_02058018 (int param0, int param1, void * param2, void * param3)
 {
     u8 * v0 = (u8 *)param2;
 
-    if (Unk_021C0848) {
+    if (sCommPlayerData) {
         GF_ASSERT(param1 == 1);
         GF_ASSERT(param0 < (7 + 1));
         GF_ASSERT((v0[0] == 1) || (v0[0] == 0));
@@ -617,25 +617,25 @@ void sub_02058018 (int param0, int param1, void * param2, void * param3)
 
 void sub_0205805C (FieldSystem * param0, BOOL param1)
 {
-    if (Unk_021C0848 == NULL) {
+    if (sCommPlayerData == NULL) {
         return;
     }
 
-    if (!Unk_021C0848->unk_2BE) {
+    if (!sCommPlayerData->unk_2BE) {
         sub_02057FF0(param1);
-        Unk_021C0848->unk_2C1 = param1;
+        sCommPlayerData->unk_2C1 = param1;
     }
 
     if (param0->unk_3C) {
-        Unk_021C0848->unk_08[CommSys_CurNetId()] = param0->unk_3C;
+        sCommPlayerData->unk_08[CommSys_CurNetId()] = param0->unk_3C;
     }
 
     if (CommSys_IsInitialized() && (CommSys_CurNetId() == 0)) {
-        sub_0205820C(NULL, Unk_021C0848);
+        sub_0205820C(NULL, sCommPlayerData);
     }
 
     if (CommSys_IsInitialized() && (CommSys_CurNetId() == 0)) {
-        if (!Unk_021C0848->unk_2BE) {
+        if (!sCommPlayerData->unk_2BE) {
             sub_020591A8();
         }
     }
@@ -667,8 +667,8 @@ BOOL sub_02058108 (int param0, int param1)
     int v0, v1;
     const UnkStruct_020619DC * v2;
 
-    v0 = sub_0203A4B4(Unk_021C0848->unk_54);
-    v2 = sub_0203A4BC(Unk_021C0848->unk_54);
+    v0 = sub_0203A4B4(sCommPlayerData->fieldSys);
+    v2 = sub_0203A4BC(sCommPlayerData->fieldSys);
 
     for (v1 = 0; v1 < v0; v1++) {
         if ((v2[v1].unk_1A == param0) && (v2[v1].unk_1C == param1)) {
@@ -698,14 +698,14 @@ static BOOL sub_0205814C (int param0, int param1, int param2)
             return 1;
         }
 
-        if (Unk_021C0848->unk_2BE) {
+        if (sCommPlayerData->unk_2BE) {
             if (!ov23_0224D1A0(param0, param1)) {
                 return 1;
             }
         }
     }
 
-    return sub_02054F68(Unk_021C0848->unk_54, param0, param1);
+    return sub_02054F68(sCommPlayerData->fieldSys, param0, param1);
 }
 
 static int sub_020581CC (int param0, int param1)
@@ -734,29 +734,29 @@ static void sub_0205820C (SysTask * param0, void * param1)
     u16 v0;
     u8 v1;
     int v2, v3, v4, v5, v6;
-    UnkStruct_02057B48 * v7;
+    CommPlayerLocation * playerLocation;
     UnkStruct_ov23_02249978 * v8 = NULL;
 
     for (v5 = 0; v5 < (7 + 1); v5++) {
-        if (Unk_021C0848->unk_48[v5] && Unk_021C0848->unk_E2[v5] && Unk_021C0848->unk_EA[v5]) {
-            v7 = &Unk_021C0848->unk_62[v5];
+        if (sCommPlayerData->unk_48[v5] && sCommPlayerData->unk_E2[v5] && sCommPlayerData->unk_EA[v5]) {
+            playerLocation = &sCommPlayerData->playerLocationServer[v5];
 
-            if (Unk_021C0848->unk_04) {
-                v8 = ov23_0224993C(Unk_021C0848->unk_04, v5);
+            if (sCommPlayerData->unk_04) {
+                v8 = ov23_0224993C(sCommPlayerData->unk_04, v5);
             }
 
-            if (Unk_021C0848->unk_2BE) {
+            if (sCommPlayerData->unk_2BE) {
                 if (ov23_0224C1C8(v5)) {
                     continue;
                 }
             }
 
-            if (Unk_021C0848->unk_13A[v5] != 0) {
-                Unk_021C0848->unk_13A[v5]--;
+            if (sCommPlayerData->unk_13A[v5] != 0) {
+                sCommPlayerData->unk_13A[v5]--;
             }
 
-            if (Unk_021C0848->unk_13A[v5] == 0) {
-                if (Unk_021C0848->unk_2BE) {
+            if (sCommPlayerData->unk_13A[v5] == 0) {
+                if (sCommPlayerData->unk_2BE) {
                     if (ov23_0224444C(v5)) {
                         continue;
                     }
@@ -775,36 +775,36 @@ static void sub_0205820C (SysTask * param0, void * param1)
                 }
             }
 
-            if (!Unk_021C0848->unk_F2[v5]) {
+            if (!sCommPlayerData->unk_F2[v5]) {
                 v0 = sub_02035E84(v5);
             } else {
                 v0 = 0;
             }
 
-            v7->unk_05 = sub_02035E70(v5);
+            playerLocation->moveSpeed = sub_02035E70(v5);
 
-            if (Unk_021C0848->unk_13A[v5] != 0) {
+            if (sCommPlayerData->unk_13A[v5] != 0) {
                 continue;
             }
 
-            v6 = sub_020581CC(Unk_021C0848->unk_10A[v5], Unk_021C0848->unk_12A[v5]);
+            v6 = sub_020581CC(sCommPlayerData->unk_10A[v5], sCommPlayerData->unk_12A[v5]);
 
             if (sub_02058A18(v5, v6)) {
-                Unk_021C0848->unk_13A[v5] = v6;
-                Unk_021C0848->unk_132[v5] = 1;
+                sCommPlayerData->unk_13A[v5] = v6;
+                sCommPlayerData->unk_132[v5] = 1;
                 continue;
             }
 
-            if (v7->unk_07 == 1) {
-                Unk_021C0848->unk_132[v5] = 1;
+            if (playerLocation->unk_07 == 1) {
+                sCommPlayerData->unk_132[v5] = 1;
             }
 
-            v7->unk_07 = 0;
+            playerLocation->unk_07 = 0;
 
-            if (Unk_021C0848->unk_122[v5] == 2) {
+            if (sCommPlayerData->unk_122[v5] == 2) {
                 u8 v9 = v5;
 
-                Unk_021C0848->unk_122[v5] = 1;
+                sCommPlayerData->unk_122[v5] = 1;
                 sub_02035B48(40, &v9);
                 continue;
             }
@@ -814,35 +814,35 @@ static void sub_0205820C (SysTask * param0, void * param1)
             v4 = sub_02058F18(v5);
 
             if ((v3 != 0xffff) && (v4 != 0xffff) && (v2 != -1)) {
-                if (v7->unk_04 != v2) {
-                    v7->unk_04 = v2;
-                    Unk_021C0848->unk_13A[v5] = 4;
-                    Unk_021C0848->unk_132[v5] = 1;
+                if (playerLocation->dir != v2) {
+                    playerLocation->dir = v2;
+                    sCommPlayerData->unk_13A[v5] = 4;
+                    sCommPlayerData->unk_132[v5] = 1;
 
-                    if (Unk_021C0848->unk_122[v5] > 2) {
-                        Unk_021C0848->unk_122[v5]--;
+                    if (sCommPlayerData->unk_122[v5] > 2) {
+                        sCommPlayerData->unk_122[v5]--;
                         continue;
                     }
-                } else if (Unk_021C0848->unk_122[v5] != 0) {
+                } else if (sCommPlayerData->unk_122[v5] != 0) {
                     continue;
-                } else if (Unk_021C0848->unk_2BE && (ov23_0224B8E0(v5, v3, v4) == 1)) {
+                } else if (sCommPlayerData->unk_2BE && (ov23_0224B8E0(v5, v3, v4) == 1)) {
                     continue;
                 } else if (sub_0205814C(v3, v4, v5)) {
-                    v7->unk_07 = 1;
-                    Unk_021C0848->unk_132[v5] = 1;
-                    Unk_021C0848->unk_13A[v5] = 4;
+                    playerLocation->unk_07 = 1;
+                    sCommPlayerData->unk_132[v5] = 1;
+                    sCommPlayerData->unk_13A[v5] = 4;
                 } else {
-                    Unk_021C0848->unk_132[v5] = 1;
-                    v7->unk_00 = v3;
-                    v7->unk_02 = v4;
-                    v7->unk_04 = v2;
+                    sCommPlayerData->unk_132[v5] = 1;
+                    playerLocation->x = v3;
+                    playerLocation->z = v4;
+                    playerLocation->dir = v2;
 
-                    Unk_021C0848->unk_13A[v5] = sub_020581E0(v7->unk_05);
+                    sCommPlayerData->unk_13A[v5] = sub_020581E0(playerLocation->moveSpeed);
 
-                    if (Unk_021C0848->unk_11A[v5] != 0) {
-                        Unk_021C0848->unk_11A[v5]--;
+                    if (sCommPlayerData->unk_11A[v5] != 0) {
+                        sCommPlayerData->unk_11A[v5]--;
 
-                        if (Unk_021C0848->unk_11A[v5] == 0) {
+                        if (sCommPlayerData->unk_11A[v5] == 0) {
                             u8 v10 = 1;
                             ov23_0224540C(v5, 1, &v10, NULL);
                         }
@@ -856,39 +856,39 @@ static void sub_0205820C (SysTask * param0, void * param1)
 void sub_02058488 (int param0, int param1, void * param2, void * param3)
 {
     u8 * v0 = (u8 *)param2;
-    UnkStruct_02057B48 * v1;
+    CommPlayerLocation * playerLocation;
 
-    if (Unk_021C0848 == NULL) {
+    if (sCommPlayerData == NULL) {
         return;
     }
 
-    v1 = &Unk_021C0848->unk_62[param0];
+    playerLocation = &sCommPlayerData->playerLocationServer[param0];
 
     if (v0[4] & 0x80) {
-        Unk_021C0848->unk_2BB = 1;
+        sCommPlayerData->unk_2BB = 1;
         return;
     }
 
-    if (v1->unk_04 == -1) {
+    if (playerLocation->dir == -1) {
         int v2;
 
         for (v2 = 0; v2 < (7 + 1); v2++) {
-            Unk_021C0848->unk_132[v2] = 1;
+            sCommPlayerData->unk_132[v2] = 1;
         }
     }
 
-    v1->unk_00 = 0;
-    v1->unk_02 = 0;
-    v1->unk_00 += ((u32)v0[0]) & 0xff;
-    v1->unk_00 += ((u32)v0[1] << 8) & 0xff00;
-    v1->unk_02 += ((u32)v0[2]) & 0xff;
-    v1->unk_02 += ((u32)v0[3] << 8) & 0xff00;
-    v1->unk_04 = v0[4] & 0xf;
+    playerLocation->x = 0;
+    playerLocation->z = 0;
+    playerLocation->x += ((u32)v0[0]) & 0xff;
+    playerLocation->x += ((u32)v0[1] << 8) & 0xff00;
+    playerLocation->z += ((u32)v0[2]) & 0xff;
+    playerLocation->z += ((u32)v0[3] << 8) & 0xff00;
+    playerLocation->dir = v0[4] & 0xf;
 
-    Unk_021C0848->unk_48[param0] = 1;
-    Unk_021C0848->unk_132[param0] = 1;
+    sCommPlayerData->unk_48[param0] = 1;
+    sCommPlayerData->unk_132[param0] = 1;
 
-    if (sub_02054F68(Unk_021C0848->unk_54, v1->unk_00, v1->unk_02)) {
+    if (sub_02054F68(sCommPlayerData->fieldSys, playerLocation->x, playerLocation->z)) {
         GF_ASSERT(0);
     }
 }
@@ -898,7 +898,7 @@ void sub_0205853C (int param0, int param1, void * param2, void * param3)
     u8 * v0 = (u8 *)param2;
     u8 v1 = v0[0];
 
-    if (Unk_021C0848 == NULL) {
+    if (sCommPlayerData == NULL) {
         return;
     }
 
@@ -906,11 +906,11 @@ void sub_0205853C (int param0, int param1, void * param2, void * param3)
         return;
     }
 
-    if (Unk_021C0848->unk_2BE) {
+    if (sCommPlayerData->unk_2BE) {
         ov23_022430B8(v1);
 
-        if (!Unk_021C0848->unk_2BD) {
-            ov5_021F5634(Unk_021C0848->unk_54, Unk_021C0848->unk_A2[v1].unk_00, 0, Unk_021C0848->unk_A2[v1].unk_02);
+        if (!sCommPlayerData->unk_2BD) {
+            ov5_021F5634(sCommPlayerData->fieldSys, sCommPlayerData->playerLocation[v1].x, 0, sCommPlayerData->playerLocation[v1].z);
         }
     }
 
@@ -927,50 +927,50 @@ void sub_020585A8 (int param0, int param1, void * param2, void * param3)
 {
     u16 v0;
     u8 * v1 = (u8 *)param2;
-    UnkStruct_02057B48 * v2;
+    CommPlayerLocation * playerLocation;
     int v3;
 
     v3 = v1[0] & 0xf;
 
-    if (Unk_021C0848 == NULL) {
+    if (sCommPlayerData == NULL) {
         return;
     }
 
-    if ((param0 == CommSys_CurNetId()) && Unk_021C0848->unk_2C3) {
+    if ((param0 == CommSys_CurNetId()) && sCommPlayerData->unk_2C3) {
         return;
     }
 
-    v2 = &Unk_021C0848->unk_A2[v3];
+    playerLocation = &sCommPlayerData->playerLocation[v3];
 
     if (v1[2] & 0x80) {
-        v2->unk_07 = 1;
+        playerLocation->unk_07 = 1;
     } else {
-        v2->unk_07 = 0;
+        playerLocation->unk_07 = 0;
     }
 
-    v2->unk_00 = 0;
-    v2->unk_02 = 0;
-    v2->unk_00 += ((u32)v1[1]) & 0xff;
-    v2->unk_00 += ((u32)v1[2] << 8) & 0x100;
-    v2->unk_02 += ((u32)v1[3]) & 0xff;
-    v2->unk_02 += ((u32)v1[2] << 7) & 0x100;
-    v2->unk_04 = ((v1[0] >> 4) & 0x3);
-    v2->unk_05 = ((v1[0] >> 6) & 0x3);
+    playerLocation->x = 0;
+    playerLocation->z = 0;
+    playerLocation->x += ((u32)v1[1]) & 0xff;
+    playerLocation->x += ((u32)v1[2] << 8) & 0x100;
+    playerLocation->z += ((u32)v1[3]) & 0xff;
+    playerLocation->z += ((u32)v1[2] << 7) & 0x100;
+    playerLocation->dir = ((v1[0] >> 4) & 0x3);
+    playerLocation->moveSpeed = ((v1[0] >> 6) & 0x3);
 
     sub_02057C8C(v3);
 }
 
 static void sub_02058644 (int param0)
 {
-    UnkStruct_020298B0 * v0 = sub_020298B0(sub_0203D174(Unk_021C0848->unk_54));
-    UnkStruct_0202855C * v1 = sub_020298A0(sub_0203D174(Unk_021C0848->unk_54));
+    UnkStruct_020298B0 * v0 = sub_020298B0(sub_0203D174(sCommPlayerData->fieldSys));
+    UnkStruct_0202855C * v1 = sub_020298A0(sub_0203D174(sCommPlayerData->fieldSys));
 
-    if (Unk_021C0848->unk_2BE) {
+    if (sCommPlayerData->unk_2BE) {
         if (param0 == CommSys_CurNetId()) {
             sub_0202929C(v0);
 
             if (sub_020292B4(v0) == 50) {
-                sub_0202CFEC(sub_0202CD88(Unk_021C0848->unk_54->unk_0C), 37);
+                sub_0202CFEC(sub_0202CD88(sCommPlayerData->fieldSys->unk_0C), 37);
             }
         }
     }
@@ -984,7 +984,7 @@ static BOOL sub_020586A8 (int param0, int param1, int param2, int param3)
         0x14, 0x15, 0x16, 0x17, 0x10, 0x11, 0x12, 0x13, 0xc, 0xd, 0xe, 0xf
     };
 
-    if ((Unk_021C0848->unk_102[param0] == -1) || (Unk_021C0848->unk_08[param0] == NULL)) {
+    if ((sCommPlayerData->unk_102[param0] == -1) || (sCommPlayerData->unk_08[param0] == NULL)) {
         return 0;
     }
 
@@ -992,11 +992,11 @@ static BOOL sub_020586A8 (int param0, int param1, int param2, int param3)
         return 1;
     }
 
-    v0 = sub_0205EB3C(Unk_021C0848->unk_08[param0]);
+    v0 = sub_0205EB3C(sCommPlayerData->unk_08[param0]);
 
-    if (sub_0205EA78(Unk_021C0848->unk_08[param0]) != sub_02059328(Unk_021C0848->unk_102[param0])) {
+    if (sub_0205EA78(sCommPlayerData->unk_08[param0]) != sub_02059328(sCommPlayerData->unk_102[param0])) {
         sub_020628C4(v0, (1 << 7));
-        sub_0205EA84(Unk_021C0848->unk_08[param0], sub_02059328(Unk_021C0848->unk_102[param0]));
+        sub_0205EA84(sCommPlayerData->unk_08[param0], sub_02059328(sCommPlayerData->unk_102[param0]));
         sub_020628BC(v0, (1 << 7));
     }
 
@@ -1009,13 +1009,13 @@ static BOOL sub_020586A8 (int param0, int param1, int param2, int param3)
 
         switch (param3) {
         case 0:
-            sub_02065638(v0, v3[Unk_021C0848->unk_102[param0]]);
+            sub_02065638(v0, v3[sCommPlayerData->unk_102[param0]]);
             break;
         case 1:
-            sub_02065638(v0, v3[Unk_021C0848->unk_102[param0] + 4]);
+            sub_02065638(v0, v3[sCommPlayerData->unk_102[param0] + 4]);
             break;
         case 2:
-            sub_02065638(v0, v3[Unk_021C0848->unk_102[param0] + 8]);
+            sub_02065638(v0, v3[sCommPlayerData->unk_102[param0] + 8]);
             break;
         }
     } else {
@@ -1029,38 +1029,38 @@ static void sub_020587C0 (int param0)
 {
     BOOL v0 = 0, v1 = 1;
     u16 v2 = 0;
-    UnkStruct_02057B48 * v3;
+    CommPlayerLocation * playerLocation;
     UnkStruct_0205E884 * v4;
     int v5;
 
-    v3 = &Unk_021C0848->unk_A2[param0];
+    playerLocation = &sCommPlayerData->playerLocation[param0];
 
-    if (Unk_021C0848->unk_142[param0] != 0) {
-        Unk_021C0848->unk_142[param0]--;
+    if (sCommPlayerData->unk_142[param0] != 0) {
+        sCommPlayerData->unk_142[param0]--;
         return;
     }
 
-    if ((v3->unk_00 == 0xffff) || (v3->unk_02 == 0xffff)) {
+    if ((playerLocation->x == 0xffff) || (playerLocation->z == 0xffff)) {
         return;
     }
 
-    if (Unk_021C0848->unk_2BD) {
+    if (sCommPlayerData->unk_2BD) {
         return;
     }
 
-    if (!Unk_021C0848->unk_2BE) {
+    if (!sCommPlayerData->unk_2BE) {
         if (param0 == CommSys_CurNetId()) {
-            if (!Unk_021C0848->unk_2C1) {
+            if (!sCommPlayerData->unk_2C1) {
                 return;
             }
         }
     }
 
-    v4 = Unk_021C0848->unk_08[param0];
+    v4 = sCommPlayerData->unk_08[param0];
 
     if (v4) {
-        int v6 = sub_0205EABC(v4) - v3->unk_00;
-        int v7 = sub_0205EAC8(v4) - v3->unk_02;
+        int v6 = sub_0205EABC(v4) - playerLocation->x;
+        int v7 = sub_0205EAC8(v4) - playerLocation->z;
         int v8 = sub_0205EA78(v4);
 
         if ((v6 == 0) && (v7 == 0)) {
@@ -1083,7 +1083,7 @@ static void sub_020587C0 (int param0)
             v1 = 0;
         }
 
-        if (sub_020586A8(param0, v2, v2, v3->unk_05)) {
+        if (sub_020586A8(param0, v2, v2, playerLocation->moveSpeed)) {
             return;
         }
 
@@ -1091,9 +1091,9 @@ static void sub_020587C0 (int param0)
             u32 v9 = 0xff;
             int v10;
 
-            v5 = v3->unk_05;
+            v5 = playerLocation->moveSpeed;
 
-            switch (v3->unk_05) {
+            switch (playerLocation->moveSpeed) {
             case 0:
                 v10 = 5;
                 break;
@@ -1109,15 +1109,15 @@ static void sub_020587C0 (int param0)
                 break;
             }
 
-            if (Unk_021C0848->unk_2C0 && (param0 == CommSys_CurNetId())) {
-                Unk_021C0848->unk_2C0--;
-            } else if (!sub_02035EE0() && Unk_021C0848->unk_2BE && (param0 == CommSys_CurNetId())) {
+            if (sCommPlayerData->unk_2C0 && (param0 == CommSys_CurNetId())) {
+                sCommPlayerData->unk_2C0--;
+            } else if (!sub_02035EE0() && sCommPlayerData->unk_2BE && (param0 == CommSys_CurNetId())) {
                 v9 = sub_0206147C(
                     v4, v2, v2, v10, 1, 0);
-            } else if (((v2 & ~PAD_BUTTON_B) == 0) && (v3->unk_07)) {
+            } else if (((v2 & ~PAD_BUTTON_B) == 0) && (playerLocation->unk_07)) {
                 v5 = 3;
 
-                switch (v3->unk_04) {
+                switch (playerLocation->dir) {
                 case 0:
                     v9 = 0x1c;
                     break;
@@ -1132,8 +1132,8 @@ static void sub_020587C0 (int param0)
                     v9 = 0x1f;
                     break;
                 }
-            } else if (((v2 & ~PAD_BUTTON_B) == 0) && (v3->unk_04 != v8)) {
-                v9 = sub_02065838(v3->unk_04, 0x24);
+            } else if (((v2 & ~PAD_BUTTON_B) == 0) && (playerLocation->dir != v8)) {
+                v9 = sub_02065838(playerLocation->dir, 0x24);
             } else {
                 v9 = sub_0206147C(v4, v2, v2, v10, 1, 0);
             }
@@ -1148,12 +1148,12 @@ static void sub_020587C0 (int param0)
                 sub_02061550(v4, v9, 1);
 
                 if (v2 & ~PAD_BUTTON_B) {
-                    if (Unk_021C0848->unk_142[param0] == 0) {
-                        Unk_021C0848->unk_142[param0] = sub_020581E0(v5);
+                    if (sCommPlayerData->unk_142[param0] == 0) {
+                        sCommPlayerData->unk_142[param0] = sub_020581E0(v5);
                     }
 
-                    if (Unk_021C0848->unk_142[param0] != 0) {
-                        Unk_021C0848->unk_142[param0]--;
+                    if (sCommPlayerData->unk_142[param0] != 0) {
+                        sCommPlayerData->unk_142[param0]--;
                     }
 
                     sub_02058644(param0);
@@ -1166,17 +1166,17 @@ static void sub_020587C0 (int param0)
 static BOOL sub_02058A18 (int param0, int param1)
 {
     int v0, v1;
-    UnkStruct_02057B48 * v2;
+    CommPlayerLocation * playerLocation;
 
-    if (Unk_021C0848->unk_10A[param0] == 0) {
+    if (sCommPlayerData->unk_10A[param0] == 0) {
         return 0;
     }
 
-    if (Unk_021C0848->unk_10A[param0] == 0xff) {
+    if (sCommPlayerData->unk_10A[param0] == 0xff) {
         return 1;
     }
 
-    Unk_021C0848->unk_10A[param0]--;
+    sCommPlayerData->unk_10A[param0]--;
 
     if (1 == param1) {
         return 1;
@@ -1184,37 +1184,37 @@ static BOOL sub_02058A18 (int param0, int param1)
 
     v0 = sub_02058DF8(param0);
     v1 = sub_02058E4C(param0);
-    v0 += sub_0206419C(Unk_021C0848->unk_112[param0]);
-    v1 += sub_020641A8(Unk_021C0848->unk_112[param0]);
+    v0 += sub_0206419C(sCommPlayerData->unk_112[param0]);
+    v1 += sub_020641A8(sCommPlayerData->unk_112[param0]);
 
-    if (Unk_021C0848->unk_10A[param0] != 0) {
+    if (sCommPlayerData->unk_10A[param0] != 0) {
         if (sub_0205814C(v0, v1, param0)) {
-            Unk_021C0848->unk_10A[param0] = 1;
+            sCommPlayerData->unk_10A[param0] = 1;
         }
     }
 
-    if (Unk_021C0848->unk_10A[param0] == 1) {
+    if (sCommPlayerData->unk_10A[param0] == 1) {
         return 1;
-    } else if (Unk_021C0848->unk_10A[param0] == 0) {
+    } else if (sCommPlayerData->unk_10A[param0] == 0) {
         u8 v3 = 1;
 
         ov23_0224540C(param0, 1, &v3, NULL);
         return 1;
     }
 
-    v2 = &Unk_021C0848->unk_62[param0];
-    v2->unk_00 = v0;
-    v2->unk_02 = v1;
+    playerLocation = &sCommPlayerData->playerLocationServer[param0];
+    playerLocation->x = v0;
+    playerLocation->z = v1;
 
     switch (param1) {
     case 2:
-        v2->unk_05 = 0;
+        playerLocation->moveSpeed = 0;
         break;
     case 4:
-        v2->unk_05 = 1;
+        playerLocation->moveSpeed = 1;
         break;
     case 8:
-        v2->unk_05 = 2;
+        playerLocation->moveSpeed = 2;
         break;
     }
 
@@ -1223,65 +1223,65 @@ static BOOL sub_02058A18 (int param0, int param1)
 
 void sub_02058B0C (int param0, int param1, BOOL param2)
 {
-    UnkStruct_02057B48 * v0 = &Unk_021C0848->unk_62[param0];
+    CommPlayerLocation * playerLocation = &sCommPlayerData->playerLocationServer[param0];
     u8 v1[3];
 
-    v0->unk_04 = sub_02059328(param1);
-    Unk_021C0848->unk_112[param0] = param1;
+    playerLocation->dir = sub_02059328(param1);
+    sCommPlayerData->unk_112[param0] = param1;
 
     if (param2) {
-        Unk_021C0848->unk_12A[param0] = 1;
-        Unk_021C0848->unk_10A[param0] = 45;
+        sCommPlayerData->unk_12A[param0] = 1;
+        sCommPlayerData->unk_10A[param0] = 45;
     } else {
-        Unk_021C0848->unk_12A[param0] = 0;
-        Unk_021C0848->unk_10A[param0] = 27;
+        sCommPlayerData->unk_12A[param0] = 0;
+        sCommPlayerData->unk_10A[param0] = 27;
     }
 
-    Unk_021C0848->unk_132[param0] = 1;
+    sCommPlayerData->unk_132[param0] = 1;
 }
 
 void sub_02058B7C (int param0)
 {
-    Unk_021C0848->unk_10A[param0] = 0;
+    sCommPlayerData->unk_10A[param0] = 0;
 }
 
 void sub_02058B94 (int param0)
 {
-    Unk_021C0848->unk_10A[param0] = 0xff;
+    sCommPlayerData->unk_10A[param0] = 0xff;
 }
 
 void sub_02058BA8 (int param0, int param1, BOOL param2)
 {
     UnkStruct_02061AB4 * v0;
 
-    if (Unk_021C0848->unk_08[param0] == NULL) {
+    if (sCommPlayerData->unk_08[param0] == NULL) {
         return;
     }
 
-    v0 = sub_0205EB3C(Unk_021C0848->unk_08[param0]);
+    v0 = sub_0205EB3C(sCommPlayerData->unk_08[param0]);
 
     sub_020628BC(v0, (1 << 7));
     sub_020628BC(v0, (1 << 8));
 
-    Unk_021C0848->unk_102[param0] = param1;
+    sCommPlayerData->unk_102[param0] = param1;
 }
 
 void sub_02058BE8 (int param0)
 {
     UnkStruct_02061AB4 * v0;
 
-    if (Unk_021C0848->unk_08[param0] == NULL) {
+    if (sCommPlayerData->unk_08[param0] == NULL) {
         return;
     }
 
-    if (Unk_021C0848->unk_102[param0] != -1) {
-        v0 = sub_0205EB3C(Unk_021C0848->unk_08[param0]);
+    if (sCommPlayerData->unk_102[param0] != -1) {
+        v0 = sub_0205EB3C(sCommPlayerData->unk_08[param0]);
 
         sub_020656AC(v0);
         sub_020628C4(v0, (1 << 7));
         sub_020628C4(v0, (1 << 8));
 
-        Unk_021C0848->unk_102[param0] = -1;
+        sCommPlayerData->unk_102[param0] = -1;
     }
 }
 
@@ -1296,7 +1296,7 @@ BOOL sub_02058C40 (void)
         return 1;
     }
 
-    if (!Unk_021C0848) {
+    if (!sCommPlayerData) {
         return 0;
     }
 
@@ -1304,7 +1304,7 @@ BOOL sub_02058C40 (void)
         return 0;
     }
 
-    if (Unk_021C0848->unk_2BE && !ov23_02249BD4()) {
+    if (sCommPlayerData->unk_2BE && !ov23_02249BD4()) {
         return 0;
     }
 
@@ -1313,51 +1313,51 @@ BOOL sub_02058C40 (void)
 
 BOOL sub_02058C90 (int param0)
 {
-    return Unk_021C0848->unk_48[param0];
+    return sCommPlayerData->unk_48[param0];
 }
 
 int sub_02058CA0 (int param0)
 {
-    if (!Unk_021C0848) {
+    if (!sCommPlayerData) {
         return 0xffff;
     } else if (CommSys_CurNetId() == param0) {
-        return Unk_021C0848->unk_A2[param0].unk_00;
-    } else if (!sub_02058C40() || !Unk_021C0848->unk_48[param0]) {
+        return sCommPlayerData->playerLocation[param0].x;
+    } else if (!sub_02058C40() || !sCommPlayerData->unk_48[param0]) {
         return 0xffff;
     }
 
-    return Unk_021C0848->unk_A2[param0].unk_00;
+    return sCommPlayerData->playerLocation[param0].x;
 }
 
 int sub_02058CF4 (int param0)
 {
-    if (!Unk_021C0848) {
+    if (!sCommPlayerData) {
         return 0xffff;
     } else if (CommSys_CurNetId() == param0) {
-        return Unk_021C0848->unk_A2[param0].unk_02;
-    } else if (!sub_02058C40() || !Unk_021C0848->unk_48[param0]) {
+        return sCommPlayerData->playerLocation[param0].z;
+    } else if (!sub_02058C40() || !sCommPlayerData->unk_48[param0]) {
         return 0xffff;
     }
 
-    return Unk_021C0848->unk_A2[param0].unk_02;
+    return sCommPlayerData->playerLocation[param0].z;
 }
 
 int sub_02058D48 (int param0)
 {
-    if (!Unk_021C0848) {
+    if (!sCommPlayerData) {
         return 0xffff;
     }
 
-    return Unk_021C0848->unk_A2[param0].unk_00;
+    return sCommPlayerData->playerLocation[param0].x;
 }
 
 int sub_02058D68 (int param0)
 {
-    if (!Unk_021C0848) {
+    if (!sCommPlayerData) {
         return 0xffff;
     }
 
-    return Unk_021C0848->unk_A2[param0].unk_02;
+    return sCommPlayerData->playerLocation[param0].z;
 }
 
 int sub_02058D88 (int param0)
@@ -1366,7 +1366,7 @@ int sub_02058D88 (int param0)
         return 0xffff;
     }
 
-    return Unk_021C0848->unk_A2[param0].unk_00 + sub_0206419C(Unk_021C0848->unk_A2[param0].unk_04);
+    return sCommPlayerData->playerLocation[param0].x + sub_0206419C(sCommPlayerData->playerLocation[param0].dir);
 }
 
 int sub_02058DC0 (int param0)
@@ -1375,51 +1375,51 @@ int sub_02058DC0 (int param0)
         return 0xffff;
     }
 
-    return Unk_021C0848->unk_A2[param0].unk_02 + sub_020641A8(Unk_021C0848->unk_A2[param0].unk_04);
+    return sCommPlayerData->playerLocation[param0].z + sub_020641A8(sCommPlayerData->playerLocation[param0].dir);
 }
 
 int sub_02058DF8 (int param0)
 {
-    if (!Unk_021C0848) {
+    if (!sCommPlayerData) {
         return 0xffff;
     } else if (CommSys_CurNetId() == param0) {
-        return Unk_021C0848->unk_62[param0].unk_00;
-    } else if (!sub_02058C40() || !Unk_021C0848->unk_48[param0]) {
+        return sCommPlayerData->playerLocationServer[param0].x;
+    } else if (!sub_02058C40() || !sCommPlayerData->unk_48[param0]) {
         return 0xffff;
     }
 
-    return Unk_021C0848->unk_62[param0].unk_00;
+    return sCommPlayerData->playerLocationServer[param0].x;
 }
 
 int sub_02058E4C (int param0)
 {
-    if (!Unk_021C0848) {
+    if (!sCommPlayerData) {
         return 0xffff;
     } else if (CommSys_CurNetId() == param0) {
-        return Unk_021C0848->unk_62[param0].unk_02;
-    } else if (!sub_02058C40() || !Unk_021C0848->unk_48[param0]) {
+        return sCommPlayerData->playerLocationServer[param0].z;
+    } else if (!sub_02058C40() || !sCommPlayerData->unk_48[param0]) {
         return 0xffff;
     }
 
-    return Unk_021C0848->unk_62[param0].unk_02;
+    return sCommPlayerData->playerLocationServer[param0].z;
 }
 
 int sub_02058EA0 (int param0)
 {
-    if (!Unk_021C0848) {
+    if (!sCommPlayerData) {
         return 0xffff;
     }
 
-    return Unk_021C0848->unk_62[param0].unk_00;
+    return sCommPlayerData->playerLocationServer[param0].x;
 }
 
 int sub_02058EC0 (int param0)
 {
-    if (!Unk_021C0848) {
+    if (!sCommPlayerData) {
         return 0xffff;
     }
 
-    return Unk_021C0848->unk_62[param0].unk_02;
+    return sCommPlayerData->playerLocationServer[param0].z;
 }
 
 int sub_02058EE0 (int param0)
@@ -1428,7 +1428,7 @@ int sub_02058EE0 (int param0)
         return 0xffff;
     }
 
-    return Unk_021C0848->unk_62[param0].unk_00 + sub_0206419C(Unk_021C0848->unk_62[param0].unk_04);
+    return sCommPlayerData->playerLocationServer[param0].x + sub_0206419C(sCommPlayerData->playerLocationServer[param0].dir);
 }
 
 int sub_02058F18 (int param0)
@@ -1437,56 +1437,56 @@ int sub_02058F18 (int param0)
         return 0xffff;
     }
 
-    return Unk_021C0848->unk_62[param0].unk_02 + sub_020641A8(Unk_021C0848->unk_62[param0].unk_04);
+    return sCommPlayerData->playerLocationServer[param0].z + sub_020641A8(sCommPlayerData->playerLocationServer[param0].dir);
 }
 
 int sub_02058F50 (int param0)
 {
-    if (!sub_02058C40() || !Unk_021C0848->unk_48[param0]) {
+    if (!sub_02058C40() || !sCommPlayerData->unk_48[param0]) {
         return -1;
     }
 
-    return Unk_021C0848->unk_A2[param0].unk_04;
+    return sCommPlayerData->playerLocation[param0].dir;
 }
 
 int sub_02058F80 (int param0)
 {
-    if (!sub_02058C40() || !Unk_021C0848->unk_48[param0]) {
+    if (!sub_02058C40() || !sCommPlayerData->unk_48[param0]) {
         return -1;
     }
 
-    return Unk_021C0848->unk_62[param0].unk_04;
+    return sCommPlayerData->playerLocationServer[param0].dir;
 }
 
 void sub_02058FB0 (int param0, int param1)
 {
-    int v0 = sub_02059328(Unk_021C0848->unk_62[param0].unk_04);
+    int v0 = sub_02059328(sCommPlayerData->playerLocationServer[param0].dir);
 
-    Unk_021C0848->unk_62[param1].unk_04 = v0;
-    Unk_021C0848->unk_132[param1] = 1;
+    sCommPlayerData->playerLocationServer[param1].dir = v0;
+    sCommPlayerData->unk_132[param1] = 1;
 }
 
 void sub_02058FE4 (int param0, int param1)
 {
-    int v0 = sub_02059328(Unk_021C0848->unk_A2[param0].unk_04);
-    Unk_021C0848->unk_A2[param1].unk_04 = v0;
+    int v0 = sub_02059328(sCommPlayerData->playerLocation[param0].dir);
+    sCommPlayerData->playerLocation[param1].dir = v0;
 }
 
 int sub_0205900C (int param0, int param1)
 {
     int v0, v1, v2;
 
-    if (!Unk_021C0848) {
+    if (!sCommPlayerData) {
         return 0xff;
     }
 
     for (v0 = 0; v0 < (7 + 1); v0++) {
-        if (Unk_021C0848->unk_48[v0] == 0) {
+        if (sCommPlayerData->unk_48[v0] == 0) {
             continue;
         }
 
-        v1 = Unk_021C0848->unk_62[v0].unk_00;
-        v2 = Unk_021C0848->unk_62[v0].unk_02;
+        v1 = sCommPlayerData->playerLocationServer[v0].x;
+        v2 = sCommPlayerData->playerLocationServer[v0].z;
 
         if ((param0 == v1) && (param1 == v2)) {
             return v0;
@@ -1498,25 +1498,25 @@ int sub_0205900C (int param0, int param1)
 
 void sub_02059058 (int param0, BOOL param1)
 {
-    if (Unk_021C0848->unk_E2[param0] != param1) {
-        Unk_021C0848->unk_E2[param0] = param1;
-        Unk_021C0848->unk_62[param0].unk_07 = 0;
-        Unk_021C0848->unk_132[param0] = 1;
-        Unk_021C0848->unk_62[param0].unk_05 = 2;
+    if (sCommPlayerData->unk_E2[param0] != param1) {
+        sCommPlayerData->unk_E2[param0] = param1;
+        sCommPlayerData->playerLocationServer[param0].unk_07 = 0;
+        sCommPlayerData->unk_132[param0] = 1;
+        sCommPlayerData->playerLocationServer[param0].moveSpeed = 2;
     }
 }
 
 BOOL sub_02059094 (int param0)
 {
-    if (Unk_021C0848->unk_2C2) {
+    if (sCommPlayerData->unk_2C2) {
         return 0;
     }
 
-    if (!Unk_021C0848->unk_EA[param0]) {
+    if (!sCommPlayerData->unk_EA[param0]) {
         return 0;
     }
 
-    return Unk_021C0848->unk_E2[param0];
+    return sCommPlayerData->unk_E2[param0];
 }
 
 BOOL sub_020590C4 (void)
@@ -1570,9 +1570,9 @@ void sub_02059180 (int param0, int param1, void * param2, void * param3)
     u8 * v0 = param2;
 
     if (v0[0] == 3) {
-        Unk_021C0848->unk_F2[param0] = 0;
+        sCommPlayerData->unk_F2[param0] = 0;
     } else {
-        Unk_021C0848->unk_2B4[param0] = v0[0];
+        sCommPlayerData->unk_2B4[param0] = v0[0];
     }
 }
 
@@ -1603,13 +1603,13 @@ static void sub_020591A8 (void)
     }
 
     for (v7 = 0; v7 < v0; v7++) {
-        if (!Unk_021C0848->unk_2B4[v7]) {
+        if (!sCommPlayerData->unk_2B4[v7]) {
             continue;
         }
 
         for (v1 = 0; v1 < v0; v1++) {
             if ((sub_02058DF8(v7) == v6[v1].unk_00) && (sub_02058E4C(v7) == v6[v1].unk_02)) {
-                Unk_021C0848->unk_F2[v7] = 1;
+                sCommPlayerData->unk_F2[v7] = 1;
                 sub_02035B48(95, &v7);
             }
         }
@@ -1629,7 +1629,7 @@ void sub_02059240 (void)
         v1 = sub_02065838(3, 0x24);
     }
 
-    sub_02061550(Unk_021C0848->unk_08[v0], v1, 1);
+    sub_02061550(sCommPlayerData->unk_08[v0], v1, 1);
     sub_02059624();
 }
 
@@ -1640,20 +1640,20 @@ BOOL sub_0205928C (void)
     int v6 = 0;
 
     for (v1 = 0; v1 < v0; v1++) {
-        if ((Unk_021C0848->unk_48[v1] == 0) || (Unk_021C0848->unk_132[v1] == 1)) {
+        if ((sCommPlayerData->unk_48[v1] == 0) || (sCommPlayerData->unk_132[v1] == 1)) {
             return 0;
         }
     }
 
     for (v1 = 0; v1 < v0; v1++) {
-        UnkStruct_02057B48 * v7 = &Unk_021C0848->unk_62[v1];
+        CommPlayerLocation * playerLocation = &sCommPlayerData->playerLocationServer[v1];
 
-        v5 = sub_02059328(v7->unk_04);
-        v7->unk_00 += sub_0206419C(v5);
-        v7->unk_02 += sub_020641A8(v5);
-        v7->unk_05 = 2;
+        v5 = sub_02059328(playerLocation->dir);
+        playerLocation->x += sub_0206419C(v5);
+        playerLocation->z += sub_020641A8(v5);
+        playerLocation->moveSpeed = 2;
 
-        Unk_021C0848->unk_132[v1] = 1;
+        sCommPlayerData->unk_132[v1] = 1;
         sub_02059058(v1, 1);
     }
 
@@ -1678,99 +1678,99 @@ int sub_02059328 (int param0)
 
 void sub_02059354 (int param0, int param1)
 {
-    Unk_021C0848->unk_11A[param0] = param1;
-    Unk_021C0848->unk_13A[param0] = 15;
+    sCommPlayerData->unk_11A[param0] = param1;
+    sCommPlayerData->unk_13A[param0] = 15;
 }
 
 void sub_02059378 (int param0)
 {
-    Unk_021C0848->unk_11A[param0] = 0;
+    sCommPlayerData->unk_11A[param0] = 0;
 }
 
 void sub_02059390 (int param0, int param1)
 {
-    Unk_021C0848->unk_122[param0] = param1;
-    Unk_021C0848->unk_13A[param0] = 15;
+    sCommPlayerData->unk_122[param0] = param1;
+    sCommPlayerData->unk_13A[param0] = 15;
 }
 
 void sub_020593B4 (int param0)
 {
-    Unk_021C0848->unk_122[param0] = 0;
+    sCommPlayerData->unk_122[param0] = 0;
 }
 
 int sub_020593CC (int param0)
 {
-    return Unk_021C0848->unk_142[param0];
+    return sCommPlayerData->unk_142[param0];
 }
 
 int sub_020593E0 (int param0)
 {
-    return Unk_021C0848->unk_13A[param0];
+    return sCommPlayerData->unk_13A[param0];
 }
 
 void sub_020593F4 (int param0)
 {
-    sub_0205EA84(Unk_021C0848->unk_54->unk_3C, param0);
-    Unk_021C0848->unk_A2[CommSys_CurNetId()].unk_04 = param0;
+    sub_0205EA84(sCommPlayerData->fieldSys->unk_3C, param0);
+    sCommPlayerData->playerLocation[CommSys_CurNetId()].dir = param0;
     sub_02057AE4(0);
 }
 
 void sub_02059424 (int param0, int param1)
 {
-    Unk_021C0848->unk_A2[param0].unk_04 = param1;
-    sub_0205EA84(Unk_021C0848->unk_08[param0], param1);
+    sCommPlayerData->playerLocation[param0].dir = param1;
+    sub_0205EA84(sCommPlayerData->unk_08[param0], param1);
 }
 
 int sub_02059444 (int param0)
 {
-    if (!Unk_021C0848->unk_08[param0]) {
+    if (!sCommPlayerData->unk_08[param0]) {
         return -1;
     }
 
-    return sub_0205EA78(Unk_021C0848->unk_08[param0]);
+    return sub_0205EA78(sCommPlayerData->unk_08[param0]);
 }
 
 void sub_02059464 (int param0)
 {
     if (0 != param0) {
-        Unk_021C0848->unk_00 |= param0;
+        sCommPlayerData->unk_00 |= param0;
     }
 
     sub_0203D128();
-    Unk_021C0848->unk_2BC = 0;
+    sCommPlayerData->unk_2BC = 0;
 }
 
 void sub_0205948C (int param0)
 {
     if (0 != param0) {
-        Unk_021C0848->unk_00 &= ~(param0);
+        sCommPlayerData->unk_00 &= ~(param0);
     }
 
-    if (Unk_021C0848->unk_00 == 0x10) {
+    if (sCommPlayerData->unk_00 == 0x10) {
         u8 v0 = 1;
         sub_020360D0(62, &v0);
     }
 
-    if (Unk_021C0848->unk_00 == 0) {
+    if (sCommPlayerData->unk_00 == 0) {
         if (0x10 != param0) {
             sub_0203D140();
             sub_02057FC4(1);
         } else {
             sub_0203D140();
-            Unk_021C0848->unk_2BC = 1;
+            sCommPlayerData->unk_2BC = 1;
         }
     }
 }
 
 void sub_020594EC (void)
 {
-    Unk_021C0848->unk_00 = 0;
+    sCommPlayerData->unk_00 = 0;
 }
 
 void sub_020594FC (void)
 {
     sub_0203D128();
-    Unk_021C0848->unk_2BC = 0;
+    sCommPlayerData->unk_2BC = 0;
 }
 
 void sub_02059514 (void)
@@ -1781,13 +1781,13 @@ void sub_02059514 (void)
 
 void sub_02059524 (void)
 {
-    if (Unk_021C0848->unk_2BF == 0) {
-        if (!Unk_021C0848->unk_2BE) {
+    if (sCommPlayerData->unk_2BF == 0) {
+        if (!sCommPlayerData->unk_2BE) {
             sub_02059514();
-            Unk_021C0848->unk_2BF = 1;
+            sCommPlayerData->unk_2BF = 1;
         } else if (ov23_02243298(CommSys_CurNetId())) {
             sub_02059514();
-            Unk_021C0848->unk_2BF = 1;
+            sCommPlayerData->unk_2BF = 1;
         } else {
             (void)0;
         }
@@ -1796,8 +1796,8 @@ void sub_02059524 (void)
 
 void sub_02059570 (void)
 {
-    if (Unk_021C0848->unk_2BF == 0) {
-        if (Unk_021C0848->unk_2BE) {
+    if (sCommPlayerData->unk_2BF == 0) {
+        if (sCommPlayerData->unk_2BE) {
             if (!ov23_02243298(CommSys_CurNetId())) {
                 sub_02057FC4(0);
             }
@@ -1810,12 +1810,12 @@ void sub_020595A4 (void)
     int v0, v1, v2, v3;
     UnkStruct_02061AB4 * v4;
 
-    if (!Unk_021C0848) {
+    if (!sCommPlayerData) {
         return;
     }
 
     for (v0 = 0; v0 < (7 + 1); v0++) {
-        if (Unk_021C0848->unk_08[v0] == NULL) {
+        if (sCommPlayerData->unk_08[v0] == NULL) {
             continue;
         }
 
@@ -1823,10 +1823,10 @@ void sub_020595A4 (void)
             continue;
         }
 
-        v4 = sub_0205EB3C(Unk_021C0848->unk_08[v0]);
-        v1 = Unk_021C0848->unk_A2[v0].unk_00;
-        v2 = Unk_021C0848->unk_A2[v0].unk_02;
-        v3 = Unk_021C0848->unk_A2[v0].unk_04;
+        v4 = sub_0205EB3C(sCommPlayerData->unk_08[v0]);
+        v1 = sCommPlayerData->playerLocation[v0].x;
+        v2 = sCommPlayerData->playerLocation[v0].z;
+        v3 = sCommPlayerData->playerLocation[v0].dir;
 
         sub_02063024(v4, v1);
         sub_02063044(v4, v2);
@@ -1836,10 +1836,10 @@ void sub_020595A4 (void)
 
 void sub_02059624 (void)
 {
-    Unk_021C0848->unk_2C0 = 8;
+    sCommPlayerData->unk_2C0 = 8;
 }
 
 void sub_02059638 (BOOL param0)
 {
-    Unk_021C0848->unk_2C3 = param0;
+    sCommPlayerData->unk_2C3 = param0;
 }

From ae08bfce743ac233526d60dcceceac85ba0094b3 Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Tue, 2 Apr 2024 19:34:31 -0400
Subject: [PATCH 03/11] Player_{XZ}Pos

---
 include/communication_system.h            |   2 +-
 include/overlay023/struct_ov23_0224A294.h |  47 +++--
 include/unk_02057518.h                    |  24 +--
 include/unk_0205E7D0.h                    |   6 +-
 src/communication_system.c                |   2 +-
 src/field_comm_manager.c                  |  20 +-
 src/overlay005/ov5_021D0D80.c             |  20 +-
 src/overlay005/ov5_021D1C30.c             |  40 ++--
 src/overlay005/ov5_021D431C.c             |   6 +-
 src/overlay005/ov5_021DB888.c             |   4 +-
 src/overlay005/ov5_021DFB54.c             |  16 +-
 src/overlay005/ov5_021E135C.c             |   2 +-
 src/overlay005/ov5_021E1D20.c             |   6 +-
 src/overlay005/ov5_021EE75C.c             |   4 +-
 src/overlay005/ov5_021EFB0C.c             |   6 +-
 src/overlay005/ov5_021F007C.c             |   4 +-
 src/overlay005/ov5_021F61BC.c             |   2 +-
 src/overlay006/ov6_02240C9C.c             |  16 +-
 src/overlay006/ov6_02242984.c             |   4 +-
 src/overlay006/ov6_02242AF0.c             |   8 +-
 src/overlay006/ov6_02248050.c             |   6 +-
 src/overlay007/ov7_0224CD28.c             |   2 +-
 src/overlay008/ov8_02249960.c             |  18 +-
 src/overlay009/ov9_02249960.c             |  12 +-
 src/overlay023/ov23_0223E140.c            |   4 +-
 src/overlay023/ov23_02241F74.c            |  12 +-
 src/overlay023/ov23_0224340C.c            |  22 +-
 src/overlay023/ov23_02248F1C.c            |   4 +-
 src/overlay023/ov23_022499E4.c            |  32 +--
 src/overlay023/ov23_0224A1D0.c            |  12 +-
 src/overlay023/ov23_0224B05C.c            |  12 +-
 src/overlay023/ov23_0224F294.c            |   2 +-
 src/overlay023/ov23_0225128C.c            |   4 +-
 src/pokeradar.c                           |   4 +-
 src/unk_020366A0.c                        |  10 +-
 src/unk_0203A9C8.c                        |   6 +-
 src/unk_0203C954.c                        |  16 +-
 src/unk_0203CC84.c                        |   2 +-
 src/unk_0203E880.c                        |   6 +-
 src/unk_0203F6C4.c                        |  14 +-
 src/unk_02049D08.c                        |   2 +-
 src/unk_02050568.c                        |   4 +-
 src/unk_020530C8.c                        |   4 +-
 src/unk_020553DC.c                        |   4 +-
 src/unk_02055C50.c                        |  14 +-
 src/unk_02056B30.c                        |  28 +--
 src/unk_02057518.c                        | 245 +++++++++++-----------
 src/unk_0205A0D8.c                        |   4 +-
 src/unk_0205C22C.c                        |   4 +-
 src/unk_0205E7D0.c                        |  14 +-
 src/unk_0205F180.c                        |  14 +-
 src/unk_0206450C.c                        |   8 +-
 src/unk_02067A84.c                        |  14 +-
 src/unk_020683F4.c                        |  10 +-
 src/unk_02069BE0.c                        |  16 +-
 src/unk_0206B70C.c                        |   4 +-
 src/unk_0206C784.c                        |   4 +-
 src/unk_0207070C.c                        |   6 +-
 58 files changed, 419 insertions(+), 419 deletions(-)

diff --git a/include/communication_system.h b/include/communication_system.h
index 5166a3376e..836a9f89b0 100644
--- a/include/communication_system.h
+++ b/include/communication_system.h
@@ -36,7 +36,7 @@ BOOL CommSys_IsInitialized(void);
 void sub_02035E5C(u8 param0);
 u8 sub_02035E70(int param0);
 u16 sub_02035E84(int param0);
-void sub_02035EA8(void);
+void CommSys_EnableSendMovementData(void);
 void sub_02035EC8(void);
 BOOL sub_02035EE0(void);
 BOOL CommSys_ServerSetSendQueue(int param0, const void * param1, int param2);
diff --git a/include/overlay023/struct_ov23_0224A294.h b/include/overlay023/struct_ov23_0224A294.h
index 9e102aeda5..0151b049c8 100644
--- a/include/overlay023/struct_ov23_0224A294.h
+++ b/include/overlay023/struct_ov23_0224A294.h
@@ -6,6 +6,7 @@
 #include "field/field_system_decl.h"
 #include "struct_defs/struct_02057B48.h"
 #include "struct_decls/struct_0205E884_decl.h"
+#include "communication_system.h"
 #include "overlay023/struct_ov23_0224991C_decl.h"
 #include "overlay023/struct_ov23_0224A294_sub1.h"
 #include "overlay023/struct_ov23_0224ABC4.h"
@@ -14,31 +15,31 @@
 typedef struct {
     u32 unk_00;
     UnkStruct_ov23_0224991C * unk_04;
-    UnkStruct_0205E884 * unk_08[8];
-    UnkStruct_ov101_021D5D90 * unk_28[8];
-    u8 unk_48[8];
-    SysTask * unk_50;
+    UnkStruct_0205E884 * unk_08[MAX_CONNECTED_PLAYERS];
+    UnkStruct_ov101_021D5D90 * unk_28[MAX_CONNECTED_PLAYERS];
+    u8 unk_48[MAX_CONNECTED_PLAYERS];
+    SysTask * task;
     FieldSystem * fieldSys;
     UnkStruct_ov23_0224A294_sub1 unk_58;
-    u8 unk_5A[8];
-    CommPlayerLocation playerLocationServer[8];
-    CommPlayerLocation playerLocation[8];
-    u8 unk_E2[8];
-    u8 unk_EA[8];
-    u8 unk_F2[8];
-    u8 unk_FA[8];
-    s8 unk_102[8];
-    u8 unk_10A[8];
-    u8 unk_112[8];
-    u8 unk_11A[8];
-    u8 unk_122[8];
-    u8 unk_12A[8];
-    u8 unk_132[8];
-    u8 unk_13A[8];
-    u8 unk_142[8];
+    u8 unk_5A[MAX_CONNECTED_PLAYERS];
+    CommPlayerLocation playerLocationServer[MAX_CONNECTED_PLAYERS];
+    CommPlayerLocation playerLocation[MAX_CONNECTED_PLAYERS];
+    u8 unk_E2[MAX_CONNECTED_PLAYERS];
+    u8 unk_EA[MAX_CONNECTED_PLAYERS];
+    u8 unk_F2[MAX_CONNECTED_PLAYERS];
+    u8 unk_FA[MAX_CONNECTED_PLAYERS];
+    s8 unk_102[MAX_CONNECTED_PLAYERS];
+    u8 unk_10A[MAX_CONNECTED_PLAYERS];
+    u8 unk_112[MAX_CONNECTED_PLAYERS];
+    u8 unk_11A[MAX_CONNECTED_PLAYERS];
+    u8 unk_122[MAX_CONNECTED_PLAYERS];
+    u8 unk_12A[MAX_CONNECTED_PLAYERS];
+    u8 unk_132[MAX_CONNECTED_PLAYERS];
+    u8 unk_13A[MAX_CONNECTED_PLAYERS];
+    u8 unk_142[MAX_CONNECTED_PLAYERS];
     UnkStruct_ov23_0224ABC4 unk_14A[8 + 1];
     TrainerInfo * unk_27C[5];
-    TrainerInfo * unk_290[8];
+    TrainerInfo * unk_290[MAX_CONNECTED_PLAYERS];
     u16 unk_2B0;
     u16 unk_2B2;
     u8 unk_2B4[4];
@@ -47,8 +48,8 @@ typedef struct {
     u8 unk_2BA;
     u8 unk_2BB;
     u8 unk_2BC;
-    u8 unk_2BD;
-    u8 unk_2BE;
+    u8 isResetting;
+    u8 isUnderground;
     u8 unk_2BF;
     u8 unk_2C0;
     u8 unk_2C1;
diff --git a/include/unk_02057518.h b/include/unk_02057518.h
index b7e90de484..893421444f 100644
--- a/include/unk_02057518.h
+++ b/include/unk_02057518.h
@@ -6,18 +6,18 @@
 
 CommPlayerData * CommPlayerData_Get(void);
 BOOL CommPlayerManager_Init(void * param0, FieldSystem * param1, BOOL param2);
-void sub_0205764C(void);
-void sub_020576A0(void);
-void sub_020576CC(BOOL param0);
-void sub_02057764(void);
-void sub_020578B0(void);
-void sub_020578DC(void);
-void sub_020579BC(int param0);
-void sub_02057A94(BOOL param0, int param1, int param2);
-void sub_02057AE4(BOOL param0);
-void sub_02057B14(BOOL param0);
-u32 sub_02057C84(void);
-void sub_02057DB8(u8 param0, BOOL param1, BOOL param2);
+void CommPlayerMan_Reset(void);
+void CommPlayerMan_Restart(void);
+void CommPlayerMan_Delete(BOOL param0);
+void CommPlayerMan_Reinit(void);
+void CommPlayerMan_Stop(void);
+void CommPlayer_InitPersonal(void);
+void CommPlayer_CopyPersonal(int param0);
+void CommPlayer_SendXZPos(BOOL param0, int param1, int param2);
+void CommPlayer_SendPos(BOOL param0);
+void CommPlayer_SendPosServer(BOOL param0);
+u32 CommPlayer_Size(void);
+void CommPlayer_Destory(u8 param0, BOOL param1, BOOL param2);
 BOOL sub_02057FAC(void);
 void sub_02057FC4(BOOL param0);
 void sub_02058018(int param0, int param1, void * param2, void * param3);
diff --git a/include/unk_0205E7D0.h b/include/unk_0205E7D0.h
index 9d4e18a572..bb6ad21fc6 100644
--- a/include/unk_0205E7D0.h
+++ b/include/unk_0205E7D0.h
@@ -16,12 +16,12 @@ void sub_0205E884(UnkStruct_0205E884 * param0, int param1);
 void sub_0205E8E0(UnkStruct_0205E884 * param0);
 void sub_0205E8E8(UnkStruct_0205E884 * param0);
 UnkStruct_02061AB4 * sub_0205EA24(const UnkStruct_02061830 * param0);
-int sub_0205EA78(UnkStruct_0205E884 * const param0);
+int Player_Dir(UnkStruct_0205E884 * const param0);
 void sub_0205EA84(UnkStruct_0205E884 * param0, int param1);
 int sub_0205EA94(UnkStruct_0205E884 * const param0);
 int sub_0205EAA0(UnkStruct_0205E884 * const param0);
-int sub_0205EABC(UnkStruct_0205E884 * const param0);
-int sub_0205EAC8(UnkStruct_0205E884 * const param0);
+int Player_XPos(UnkStruct_0205E884 * const param0);
+int Player_ZPos(UnkStruct_0205E884 * const param0);
 int sub_0205EAD4(UnkStruct_0205E884 * const param0);
 int sub_0205EAE0(UnkStruct_0205E884 * const param0);
 void sub_0205EAEC(UnkStruct_0205E884 * const param0, VecFx32 * param1);
diff --git a/src/communication_system.c b/src/communication_system.c
index 42c7241f96..e87451e64e 100644
--- a/src/communication_system.c
+++ b/src/communication_system.c
@@ -1662,7 +1662,7 @@ u16 sub_02035E84 (int param0)
     return v0;
 }
 
-void sub_02035EA8 (void)
+void CommSys_EnableSendMovementData (void)
 {
     if (sCommunicationSystem) {
         sCommunicationSystem->unk_654 |= 0x8000;
diff --git a/src/field_comm_manager.c b/src/field_comm_manager.c
index 7e1f7f42e0..e82d3a2599 100644
--- a/src/field_comm_manager.c
+++ b/src/field_comm_manager.c
@@ -285,7 +285,7 @@ static void sub_02059984 (void)
     void * v0;
 
     if (sub_02036540(98)) {
-        v0 = Heap_AllocFromHeap(HEAP_ID_COMMUNICATION, sub_02057C84());
+        v0 = Heap_AllocFromHeap(HEAP_ID_COMMUNICATION, CommPlayer_Size());
         CommPlayerManager_Init(v0, sFieldCommMan->fieldSys, 0);
         sub_02059524();
         sub_02035EC8();
@@ -312,8 +312,8 @@ static void sub_020599E4 (void)
         sub_0200F174(0, 1, 1, 0x0, 6, 1, 4);
         sub_0200F32C(0);
         sub_0200F32C(1);
-        sub_020576A0();
-        sub_02057AE4(0);
+        CommPlayerMan_Restart();
+        CommPlayer_SendPos(0);
         FieldCommMan_SetTask(sub_02059A70, 1);
     }
 }
@@ -326,7 +326,7 @@ static void sub_02059A3C (void)
     }
 
     if (sub_02036540(30)) {
-        sub_02035EA8();
+        CommSys_EnableSendMovementData();
         FieldCommMan_SetTask(sub_02059BF4, 0);
     }
 }
@@ -356,7 +356,7 @@ static void sub_02059AB4 (void)
     void * v0;
 
     if (sub_02036540(98)) {
-        v0 = Heap_AllocFromHeap(HEAP_ID_COMMUNICATION, sub_02057C84());
+        v0 = Heap_AllocFromHeap(HEAP_ID_COMMUNICATION, CommPlayer_Size());
         CommPlayerManager_Init(v0, sFieldCommMan->fieldSys, 0);
         sub_02059524();
         sub_020364F0(92);
@@ -379,8 +379,8 @@ static void sub_02059B10 (void)
     }
 
     if (sub_02036540(92)) {
-        sub_020576A0();
-        sub_02057AE4(0);
+        CommPlayerMan_Restart();
+        CommPlayer_SendPos(0);
 
         {
             u8 v0 = 1;
@@ -590,7 +590,7 @@ static void sub_02059E50 (void)
         return;
     }
 
-    sub_020576CC(0);
+    CommPlayerMan_Delete(0);
     sub_020364F0(3);
     FieldCommMan_SetTask(sub_02059E34, 0);
 }
@@ -700,14 +700,14 @@ static void sub_0205A018 (void)
 {
     if (sub_02036540(91)) {
         CommMan_SetErrorHandling(0, 0);
-        sub_020576CC(1);
+        CommPlayerMan_Delete(1);
         FieldCommMan_SetTask(sub_0205A058, 5);
     }
 }
 
 static void Task_EndBattle (void)
 {
-    sub_020576CC(1);
+    CommPlayerMan_Delete(1);
     FieldCommMan_SetTask(sub_0205A058, 5);
 }
 
diff --git a/src/overlay005/ov5_021D0D80.c b/src/overlay005/ov5_021D0D80.c
index 207eee8774..90a9a87bae 100644
--- a/src/overlay005/ov5_021D0D80.c
+++ b/src/overlay005/ov5_021D0D80.c
@@ -287,9 +287,9 @@ static int ov5_021D0FB4 (UnkStruct_020067E8 * param0, int * param1)
         sub_02068368(v0);
         ov5_021E9338(v0->unk_28);
 
-        v0->unk_1C->unk_08 = sub_0205EABC(v0->unk_3C);
-        v0->unk_1C->unk_0C = sub_0205EAC8(v0->unk_3C);
-        v0->unk_1C->unk_10 = sub_0205EA78(v0->unk_3C);
+        v0->unk_1C->unk_08 = Player_XPos(v0->unk_3C);
+        v0->unk_1C->unk_0C = Player_ZPos(v0->unk_3C);
+        v0->unk_1C->unk_10 = Player_Dir(v0->unk_3C);
 
         ov5_021EF300(v0->unk_A0);
 
@@ -400,8 +400,8 @@ static BOOL ov5_021D119C (FieldSystem * param0)
 {
     int v0, v1;
 
-    v0 = sub_0205EABC(param0->unk_3C);
-    v1 = sub_0205EAC8(param0->unk_3C);
+    v0 = Player_XPos(param0->unk_3C);
+    v1 = Player_ZPos(param0->unk_3C);
 
     if ((v0 != param0->unk_1C->unk_08) || (v1 != param0->unk_1C->unk_0C)) {
         param0->unk_1C->unk_08 = v0;
@@ -423,8 +423,8 @@ static BOOL ov5_021D11CC (FieldSystem * param0)
         return 0;
     }
 
-    v2 = (sub_0205EABC(param0->unk_3C) - ov5_021EA6AC(param0->unk_28)) / 32;
-    v3 = (sub_0205EAC8(param0->unk_3C) - ov5_021EA6B4(param0->unk_28)) / 32;
+    v2 = (Player_XPos(param0->unk_3C) - ov5_021EA6AC(param0->unk_28)) / 32;
+    v3 = (Player_ZPos(param0->unk_3C) - ov5_021EA6B4(param0->unk_28)) / 32;
     v0 = sub_02039E30(param0->unk_2C, v2, v3);
     v1 = param0->unk_1C->unk_00;
 
@@ -554,9 +554,9 @@ static void ov5_021D13B4 (FieldSystem * param0)
     }
 
     v0 = sub_0203A76C(sub_0203A790(param0->unk_0C));
-    v1 = (sub_0205EABC(param0->unk_3C) - ov5_021EA6AC(param0->unk_28)) / 32;
-    v2 = (sub_0205EAC8(param0->unk_3C) - ov5_021EA6B4(param0->unk_28)) / 32;
-    v3 = sub_0205EA78(param0->unk_3C);
+    v1 = (Player_XPos(param0->unk_3C) - ov5_021EA6AC(param0->unk_28)) / 32;
+    v2 = (Player_ZPos(param0->unk_3C) - ov5_021EA6B4(param0->unk_28)) / 32;
+    v3 = Player_Dir(param0->unk_3C);
 
     sub_02055740(v0, v1, v2, v3);
 }
diff --git a/src/overlay005/ov5_021D1C30.c b/src/overlay005/ov5_021D1C30.c
index 2f0d62d7d3..8043c4009a 100644
--- a/src/overlay005/ov5_021D1C30.c
+++ b/src/overlay005/ov5_021D1C30.c
@@ -125,7 +125,7 @@ void ov5_021D1CAC (UnkStruct_ov5_021D1CAC * param0, FieldSystem * param1, u16 pa
 
     v0 = sub_0205EB14(param1->unk_3C);
     v1 = sub_0205EB0C(param1->unk_3C);
-    v2 = sub_0205EA78(param1->unk_3C);
+    v2 = Player_Dir(param1->unk_3C);
 
     param0->unk_04 = param2;
     param0->unk_06 = param3;
@@ -239,7 +239,7 @@ int ov5_021D1DA4 (const UnkStruct_ov5_021D1CAC * param0, FieldSystem * param1)
             int v3 = (s8)param0->unk_02;
 
             if (v3 == -1) {
-                v3 = sub_0205EA78(param1->unk_3C);
+                v3 = Player_Dir(param1->unk_3C);
             }
 
             if (ov9_0224A67C(param1, v3) == 1) {
@@ -248,7 +248,7 @@ int ov5_021D1DA4 (const UnkStruct_ov5_021D1CAC * param0, FieldSystem * param1)
         }
     }
 
-    if (param0->unk_00_4 && (sub_0205EA78(param1->unk_3C) == param0->unk_02)) {
+    if (param0->unk_00_4 && (Player_Dir(param1->unk_3C) == param0->unk_02)) {
         if (ov5_021D20DC(param1) == 1) {
             return 1;
         }
@@ -270,7 +270,7 @@ int ov5_021D1DA4 (const UnkStruct_ov5_021D1CAC * param0, FieldSystem * param1)
 
                 if (sub_0205F588(param1->unk_3C) == 1) {
                     sub_0205F5E4(
-                        param1->unk_3C, sub_0205EA78(param1->unk_3C));
+                        param1->unk_3C, Player_Dir(param1->unk_3C));
                 }
 
                 if (sub_02062950(v5) != 0x9) {
@@ -324,7 +324,7 @@ int ov5_021D1DA4 (const UnkStruct_ov5_021D1CAC * param0, FieldSystem * param1)
         {
             int v13, v14, v15;
 
-            v15 = sub_0205EA78(param1->unk_3C);
+            v15 = Player_Dir(param1->unk_3C);
             ov5_021D2C98(param1, &v13, &v14);
 
             if (ov5_021F8410(param1, v13, v14, v15) == 1) {
@@ -432,7 +432,7 @@ BOOL ov5_021D219C (UnkStruct_ov5_021D1CAC * param0, FieldSystem * param1)
 
                 if (0x1 != sub_02062948(v0)) {
                     if (sub_0205F588(param1->unk_3C) == 1) {
-                        sub_0205F5E4(param1->unk_3C, sub_0205EA78(param1->unk_3C));
+                        sub_0205F5E4(param1->unk_3C, Player_Dir(param1->unk_3C));
                     }
 
                     sub_0203E880(param1, sub_02062960(v0), v0);
@@ -490,7 +490,7 @@ BOOL ov5_021D2298 (const UnkStruct_ov5_021D1CAC * param0, FieldSystem * param1)
 
         if (sub_0203CA40(param1, &v0) == 1) {
             if (sub_0205F588(param1->unk_3C) == 1) {
-                sub_0205F5E4(param1->unk_3C, sub_0205EA78(param1->unk_3C));
+                sub_0205F5E4(param1->unk_3C, Player_Dir(param1->unk_3C));
             }
 
             sub_02036B84();
@@ -535,7 +535,7 @@ int ov5_021D2368 (const UnkStruct_ov5_021D1CAC * param0, FieldSystem * param1)
                 UnkStruct_ov5_021D219C * v1;
 
                 if (sub_0205F588(param1->unk_3C) == 1) {
-                    sub_0205F5E4(param1->unk_3C, sub_0205EA78(param1->unk_3C));
+                    sub_0205F5E4(param1->unk_3C, Player_Dir(param1->unk_3C));
                 }
 
                 if (sub_02062950(v0) != 0x9) {
@@ -710,7 +710,7 @@ static BOOL ov5_021D2504 (FieldSystem * param0, const UnkStruct_ov5_021D1CAC * p
 
 u16 ov5_021D271C (FieldSystem * param0, u8 param1)
 {
-    int v0 = sub_0205EA78(param0->unk_3C);
+    int v0 = Player_Dir(param0->unk_3C);
 
     if (sub_0205DBE4(param1) && (v0 == 0)) {
         return 2018;
@@ -776,14 +776,14 @@ static BOOL ov5_021D2884 (FieldSystem * param0)
         }
     }
 
-    v3 = sub_0205EA78(param0->unk_3C);
+    v3 = Player_Dir(param0->unk_3C);
 
     if (ov5_021E1154(param0, param0->unk_3C, v3) == 1) {
         return 1;
     }
 
-    v1 = sub_0205EABC(param0->unk_3C);
-    v2 = sub_0205EAC8(param0->unk_3C);
+    v1 = Player_XPos(param0->unk_3C);
+    v2 = Player_ZPos(param0->unk_3C);
     v0 = sub_02054F94(param0, v1, v2);
 
     if (ov5_021D29A0(param0) == 1) {
@@ -856,7 +856,7 @@ static BOOL ov5_021D29D8 (FieldSystem * param0, const int param1, const int para
     }
 
     if (sub_0205DC2C(param3) == 1) {
-        int v1 = sub_0205EA78(param0->unk_3C);
+        int v1 = Player_Dir(param0->unk_3C);
 
         if (v1 == 2) {
             v1 = 3;
@@ -870,7 +870,7 @@ static BOOL ov5_021D29D8 (FieldSystem * param0, const int param1, const int para
         sub_02056BDC(param0, v0.unk_00, v0.unk_04, 0, 0, v1, 2);
         return 1;
     } else if (sub_0205DC38(param3) == 1) {
-        int v1 = sub_0205EA78(param0->unk_3C);
+        int v1 = Player_Dir(param0->unk_3C);
 
         if ((v1 != 2) && (v1 != 3)) {
             GF_ASSERT(FALSE);
@@ -1021,15 +1021,15 @@ static BOOL ov5_021D2C14 (FieldSystem * param0)
 
 static void ov5_021D2C7C (const FieldSystem * param0, int * param1, int * param2)
 {
-    *param1 = sub_0205EABC(param0->unk_3C);
-    *param2 = sub_0205EAC8(param0->unk_3C);
+    *param1 = Player_XPos(param0->unk_3C);
+    *param2 = Player_ZPos(param0->unk_3C);
 }
 
 static void ov5_021D2C98 (const FieldSystem * param0, int * param1, int * param2)
 {
     int v0;
 
-    v0 = sub_0205EA78(param0->unk_3C);
+    v0 = Player_Dir(param0->unk_3C);
     ov5_021D2CB4(param0, v0, param1, param2);
 }
 
@@ -1097,7 +1097,7 @@ static BOOL ov5_021D2D34 (const FieldSystem * param0, int param1, int param2, Un
 
     {
         UnkStruct_02049FA8 * v2 = sub_0203A724(sub_0203A790(param0->unk_0C));
-        inline_02049FA8(v2, param0->unk_1C->unk_00, v1, param1, param2, sub_0205EA78(param0->unk_3C));
+        inline_02049FA8(v2, param0->unk_1C->unk_00, v1, param1, param2, Player_Dir(param0->unk_3C));
     }
 
     return 1;
@@ -1130,14 +1130,14 @@ static void ov5_021D2E14 (FieldSystem * param0)
 
     if (ov5_021D2D34(param0, v0, v1, &v2)) {
         if ((MapHeader_IsOnMainMatrix(param0->unk_1C->unk_00) == 1) && (MapHeader_IsOnMainMatrix(v2.unk_00) == 0)) {
-            ov5_021D2DCC(param0, v0, v1, sub_0205EA78(param0->unk_3C));
+            ov5_021D2DCC(param0, v0, v1, Player_Dir(param0->unk_3C));
         }
     } else {
         ov5_021D2C98(param0, &v0, &v1);
 
         if (ov5_021D2D34(param0, v0, v1, &v2)) {
             if ((MapHeader_IsOnMainMatrix(param0->unk_1C->unk_00) == 1) && (MapHeader_IsOnMainMatrix(v2.unk_00) == 0)) {
-                ov5_021D2DCC(param0, v0, v1, sub_0205EA78(param0->unk_3C));
+                ov5_021D2DCC(param0, v0, v1, Player_Dir(param0->unk_3C));
             }
         }
     }
diff --git a/src/overlay005/ov5_021D431C.c b/src/overlay005/ov5_021D431C.c
index e79bee7eb9..3c221ce1c8 100644
--- a/src/overlay005/ov5_021D431C.c
+++ b/src/overlay005/ov5_021D431C.c
@@ -894,7 +894,7 @@ BOOL ov5_021D4E10 (UnkStruct_020508D4 * param0)
     case 0:
         v0 = sub_0205EB3C(v1->unk_3C);
 
-        if (sub_0205EA78(v1->unk_3C) == 1) {
+        if (Player_Dir(v1->unk_3C) == 1) {
             sub_02062D64(v0, 1);
             (v2->unk_00) = 1;
         } else {
@@ -1027,7 +1027,7 @@ BOOL ov5_021D5020 (UnkStruct_020508D4 * param0)
         u8 v4;
 
         v0 = sub_0205EB3C(v1->unk_3C);
-        v3 = sub_0205EA78(v1->unk_3C);
+        v3 = Player_Dir(v1->unk_3C);
 
         if (v3 == 1) {
             sub_02062D64(v0, 1);
@@ -1108,7 +1108,7 @@ BOOL ov5_021D5150 (UnkStruct_020508D4 * param0)
         u8 v4;
 
         v0 = sub_0205EB3C(v1->unk_3C);
-        v3 = sub_0205EA78(v1->unk_3C);
+        v3 = Player_Dir(v1->unk_3C);
 
         if (v3 == 1) {
             sub_02062D64(v0, 1);
diff --git a/src/overlay005/ov5_021DB888.c b/src/overlay005/ov5_021DB888.c
index f28273be7d..274162f968 100644
--- a/src/overlay005/ov5_021DB888.c
+++ b/src/overlay005/ov5_021DB888.c
@@ -469,8 +469,8 @@ static void ov5_021DBA7C (UnkStruct_ov5_021DBA58 * param0)
         param0->unk_10[v5] = NULL;
     }
 
-    v3 = sub_0205EABC(param0->unk_04->unk_3C);
-    v4 = sub_0205EAC8(param0->unk_04->unk_3C);
+    v3 = Player_XPos(param0->unk_04->unk_3C);
+    v4 = Player_ZPos(param0->unk_04->unk_3C);
     v7 = v3 - 7;
     v8 = v3 + 7;
     v9 = v4 - 7;
diff --git a/src/overlay005/ov5_021DFB54.c b/src/overlay005/ov5_021DFB54.c
index 9ab40310c3..e6ff1f3f92 100644
--- a/src/overlay005/ov5_021DFB54.c
+++ b/src/overlay005/ov5_021DFB54.c
@@ -266,7 +266,7 @@ static void ov5_021DFC3C (UnkStruct_0205E884 * param0)
     sub_0205EC00(param0, NULL);
 
     if (sub_0205F16C(param0) == 1) {
-        v1 = sub_0205EA78(param0);
+        v1 = Player_Dir(param0);
     } else {
         v1 = sub_0205EA94(param0);
     }
@@ -645,8 +645,8 @@ static BOOL ov5_021E0160 (UnkStruct_020508D4 * param0)
     case 2:
     {
         if (sub_0205F108(v0->unk_20) == 0) {
-            int v1 = sub_0205EABC(v0->unk_20) + sub_0206419C(v0->unk_04);
-            int v2 = sub_0205EAC8(v0->unk_20) + sub_020641A8(v0->unk_04);
+            int v1 = Player_XPos(v0->unk_20) + sub_0206419C(v0->unk_04);
+            int v2 = Player_ZPos(v0->unk_20) + sub_020641A8(v0->unk_04);
 
             v0->unk_28 = ov5_021F261C(v0->unk_24, v1, v2, v0->unk_04, 0);
         } else {
@@ -877,7 +877,7 @@ static BOOL ov5_021E0560 (UnkStruct_020508D4 * param0)
         v0->unk_00++;
     case 2:
     {
-        int v2 = sub_0205EA78(v0->unk_0C);
+        int v2 = Player_Dir(v0->unk_0C);
         u32 v3, v4 = gCoreSys.pressedKeys, v5 = gCoreSys.heldKeys;
         int v6 = sub_02061308(v0->unk_0C, v4, v5);
 
@@ -1043,8 +1043,8 @@ static int ov5_021E07E4 (UnkStruct_ov5_021F9B54 * param0)
 
 static int ov5_021E07FC (UnkStruct_ov5_021F9B54 * param0)
 {
-    int v0 = sub_0205EABC(param0->unk_10) + sub_0206419C(param0->unk_04);
-    int v1 = sub_0205EAC8(param0->unk_10) + sub_020641A8(param0->unk_04);
+    int v0 = Player_XPos(param0->unk_10) + sub_0206419C(param0->unk_04);
+    int v1 = Player_ZPos(param0->unk_10) + sub_020641A8(param0->unk_04);
 
     param0->unk_18 = ov5_021F28F4(param0->unk_14, v0, v1, param0->unk_04, 0);
     param0->unk_2C = ov6_0224892C(param0->unk_0C);
@@ -1757,8 +1757,8 @@ static void ov5_021E10C0 (void * param0, const UnkStruct_020216E0 * param1)
 
 static UnkStruct_02061AB4 * ov5_021E10D4 (UnkStruct_0205E884 * param0, int param1)
 {
-    int v0 = sub_0205EABC(param0) + sub_0206419C(param1);
-    int v1 = sub_0205EAC8(param0) + sub_020641A8(param1);
+    int v0 = Player_XPos(param0) + sub_0206419C(param1);
+    int v1 = Player_ZPos(param0) + sub_020641A8(param1);
     const UnkStruct_02061830 * v2 = sub_02062A40(sub_0205EB3C(param0));
     UnkStruct_02061AB4 * v3 = sub_0206326C(v2, v0, v1, 0);
 
diff --git a/src/overlay005/ov5_021E135C.c b/src/overlay005/ov5_021E135C.c
index 1eebd6f920..6548fa94d1 100644
--- a/src/overlay005/ov5_021E135C.c
+++ b/src/overlay005/ov5_021E135C.c
@@ -136,7 +136,7 @@ void ov5_021E15A8 (FieldSystem * param0, BOOL param1, BOOL * param2)
 
     v0->unk_00 = param0;
     v0->unk_04 = param2;
-    v0->unk_10 = sub_0205EA78(param0->unk_3C);
+    v0->unk_10 = Player_Dir(param0->unk_3C);
 
     if (param1) {
         SysTask_Start(ov5_021E139C, v0, 100);
diff --git a/src/overlay005/ov5_021E1D20.c b/src/overlay005/ov5_021E1D20.c
index a39aa916af..53c2830c90 100644
--- a/src/overlay005/ov5_021E1D20.c
+++ b/src/overlay005/ov5_021E1D20.c
@@ -234,10 +234,10 @@ static void ov5_021E2028 (FieldSystem * param0)
     sub_0203A7A8(param0);
     ov5_021EA714(param0, 4, 0);
 
-    param0->unk_1C->unk_08 = sub_0205EABC(param0->unk_3C);
-    param0->unk_1C->unk_0C = sub_0205EAC8(param0->unk_3C);
+    param0->unk_1C->unk_08 = Player_XPos(param0->unk_3C);
+    param0->unk_1C->unk_0C = Player_ZPos(param0->unk_3C);
     param0->unk_1C->unk_04 = -1;
-    param0->unk_1C->unk_10 = sub_0205EA78(param0->unk_3C);
+    param0->unk_1C->unk_10 = Player_Dir(param0->unk_3C);
 }
 
 void ov5_021E2064 (FieldSystem * param0)
diff --git a/src/overlay005/ov5_021EE75C.c b/src/overlay005/ov5_021EE75C.c
index 5b9c04f1ff..48cd343104 100644
--- a/src/overlay005/ov5_021EE75C.c
+++ b/src/overlay005/ov5_021EE75C.c
@@ -39,8 +39,8 @@ static void ov5_021EE768 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1,
     u8 v3;
     UnkStruct_ov5_021EE75C * v4 = (UnkStruct_ov5_021EE75C *)param2;
 
-    v1 = sub_0205EABC(param1->unk_3C);
-    v2 = sub_0205EAC8(param1->unk_3C);
+    v1 = Player_XPos(param1->unk_3C);
+    v2 = Player_ZPos(param1->unk_3C);
 
     if ((v4->unk_00 == v1) && (v4->unk_04 == v2)) {
         return;
diff --git a/src/overlay005/ov5_021EFB0C.c b/src/overlay005/ov5_021EFB0C.c
index 424d6899b0..d1723f83e4 100644
--- a/src/overlay005/ov5_021EFB0C.c
+++ b/src/overlay005/ov5_021EFB0C.c
@@ -111,9 +111,9 @@ BOOL ov5_021EFB40 (FieldSystem * param0, int * param1)
 
     *param1 = 2008;
 
-    v1 = sub_0205EABC(param0->unk_3C);
-    v2 = sub_0205EAC8(param0->unk_3C);
-    v4 = sub_0205EA78(param0->unk_3C);
+    v1 = Player_XPos(param0->unk_3C);
+    v2 = Player_ZPos(param0->unk_3C);
+    v4 = Player_Dir(param0->unk_3C);
 
     if (v4 == 0) {
         sub_020550F4(v1, v2, 0, -1, 1, 1, &v0);
diff --git a/src/overlay005/ov5_021F007C.c b/src/overlay005/ov5_021F007C.c
index cc2baebf16..73755a13e7 100644
--- a/src/overlay005/ov5_021F007C.c
+++ b/src/overlay005/ov5_021F007C.c
@@ -485,8 +485,8 @@ BOOL ov5_021F0488 (UnkStruct_020508D4 * param0)
                     u8 v3;
                     int v4, v5;
 
-                    v4 = sub_0205EABC(v0->unk_3C);
-                    v5 = sub_0205EAC8(v0->unk_3C);
+                    v4 = Player_XPos(v0->unk_3C);
+                    v5 = Player_ZPos(v0->unk_3C);
                     v3 = (u8)sub_02054F94(v0, v4, v5);
 
                     if (ov6_02242110(v0, v3)) {
diff --git a/src/overlay005/ov5_021F61BC.c b/src/overlay005/ov5_021F61BC.c
index fe76201545..0c34a6d716 100644
--- a/src/overlay005/ov5_021F61BC.c
+++ b/src/overlay005/ov5_021F61BC.c
@@ -143,7 +143,7 @@ static void ov5_021F62A0 (UnkStruct_ov101_021D5D90 * param0, void * param1)
     v1->unk_04 = ov5_021F6414(v1->unk_08);
     v1->unk_00 = 0;
 
-    if ((v1->unk_04 == -1) || (v1->unk_04 != sub_0205EA78(v2))) {
+    if ((v1->unk_04 == -1) || (v1->unk_04 != Player_Dir(v2))) {
         v1->unk_1C = 0;
         v1->unk_20 = 0;
         v1->unk_00 = 1;
diff --git a/src/overlay006/ov6_02240C9C.c b/src/overlay006/ov6_02240C9C.c
index 26460beaea..2b4f625ca0 100644
--- a/src/overlay006/ov6_02240C9C.c
+++ b/src/overlay006/ov6_02240C9C.c
@@ -244,8 +244,8 @@ BOOL ov6_02240D5C (FieldSystem * param0)
     UnkStruct_ov6_0224222C v13[12];
     UnkStruct_ov6_022422D0 v14;
 
-    v2 = sub_0205EABC(param0->unk_3C);
-    v3 = sub_0205EAC8(param0->unk_3C);
+    v2 = Player_XPos(param0->unk_3C);
+    v3 = Player_ZPos(param0->unk_3C);
     v4 = (u8)sub_02054F94(param0, v2, v3);
 
     {
@@ -498,8 +498,8 @@ BOOL ov6_022411C8 (FieldSystem * param0, UnkStruct_020508D4 * param1)
     UnkStruct_ov6_0224222C v12[12];
     UnkStruct_ov6_022422D0 v13;
 
-    v2 = sub_0205EABC(param0->unk_3C);
-    v3 = sub_0205EAC8(param0->unk_3C);
+    v2 = Player_XPos(param0->unk_3C);
+    v3 = Player_ZPos(param0->unk_3C);
     v4 = (u8)sub_02054F94(param0, v2, v3);
 
     {
@@ -623,8 +623,8 @@ BOOL ov6_022413E4 (FieldSystem * param0, BattleParams ** param1)
 
     *param1 = NULL;
 
-    v1 = sub_0205EABC(param0->unk_3C);
-    v2 = sub_0205EAC8(param0->unk_3C);
+    v1 = Player_XPos(param0->unk_3C);
+    v2 = Player_ZPos(param0->unk_3C);
     v3 = (u8)sub_02054F94(param0, v1, v2);
 
     {
@@ -779,8 +779,8 @@ static BOOL ov6_02241674 (FieldSystem * param0, Pokemon * param1, BattleParams *
             {
                 int v4, v5;
 
-                v4 = sub_0205EABC(param0->unk_3C);
-                v5 = sub_0205EAC8(param0->unk_3C);
+                v4 = Player_XPos(param0->unk_3C);
+                v5 = Player_ZPos(param0->unk_3C);
 
                 RadarSpawnPatches(param0, v4, v5, param0->chain);
             }
diff --git a/src/overlay006/ov6_02242984.c b/src/overlay006/ov6_02242984.c
index d0e0bcba6f..58cb77db3f 100644
--- a/src/overlay006/ov6_02242984.c
+++ b/src/overlay006/ov6_02242984.c
@@ -75,8 +75,8 @@ UnkStruct_ov6_02242A8C * ov6_02242A10 (const int param0, FieldSystem * param1)
         }
 
         {
-            v1->unk_00[5].unk_00 = sub_0205EABC(param1->unk_3C);
-            v1->unk_00[5].unk_02 = sub_0205EAC8(param1->unk_3C);
+            v1->unk_00[5].unk_00 = Player_XPos(param1->unk_3C);
+            v1->unk_00[5].unk_02 = Player_ZPos(param1->unk_3C);
             v1->unk_30 = param1->unk_1C->unk_00;
         }
 
diff --git a/src/overlay006/ov6_02242AF0.c b/src/overlay006/ov6_02242AF0.c
index 29916e7908..3e677e660c 100644
--- a/src/overlay006/ov6_02242AF0.c
+++ b/src/overlay006/ov6_02242AF0.c
@@ -310,13 +310,13 @@ static BOOL ov6_02242E60 (FieldSystem * param0, UnkStruct_ov6_02242B58 * param1,
             if (sub_020655F4(v0) == 1) {
                 sub_02065638(v0, Unk_ov6_02249058[param1->unk_06]);
 
-                if ((param1->unk_06 < 7 - 1) && (sub_0205EAC8(param0->unk_3C) > param1->unk_10)) {
+                if ((param1->unk_06 < 7 - 1) && (Player_ZPos(param0->unk_3C) > param1->unk_10)) {
                     if (param1->unk_06 == 0) {
                         Sound_PlayEffect(1753);
                     }
 
                     param1->unk_06++;
-                } else if (sub_0205EAC8(param0->unk_3C) <= param1->unk_10) {
+                } else if (Player_ZPos(param0->unk_3C) <= param1->unk_10) {
                     if (param1->unk_06 != 0) {
                         if (param1->unk_06 == 7 - 1) {
                             Sound_PlayEffect(1754);
@@ -330,13 +330,13 @@ static BOOL ov6_02242E60 (FieldSystem * param0, UnkStruct_ov6_02242B58 * param1,
             if (sub_020655F4(v0) == 1) {
                 sub_02065638(v0, Unk_ov6_0224903C[param1->unk_06]);
 
-                if ((param1->unk_06 < 7 - 1) && (sub_0205EAC8(param0->unk_3C) < param1->unk_10)) {
+                if ((param1->unk_06 < 7 - 1) && (Player_ZPos(param0->unk_3C) < param1->unk_10)) {
                     if (param1->unk_06 == 0) {
                         Sound_PlayEffect(1753);
                     }
 
                     param1->unk_06++;
-                } else if (sub_0205EAC8(param0->unk_3C) >= param1->unk_10) {
+                } else if (Player_ZPos(param0->unk_3C) >= param1->unk_10) {
                     if (param1->unk_06 != 0) {
                         if (param1->unk_06 == 7 - 1) {
                             Sound_PlayEffect(1754);
diff --git a/src/overlay006/ov6_02248050.c b/src/overlay006/ov6_02248050.c
index 79770d13b2..a67647bc08 100644
--- a/src/overlay006/ov6_02248050.c
+++ b/src/overlay006/ov6_02248050.c
@@ -112,9 +112,9 @@ static void ov6_022480BC (UnkStruct_0205E884 * const param0, UnkStruct_02017294
 
     sub_0205EAEC(param0, &v3);
 
-    v1 = sub_0205EABC(param0);
-    v2 = sub_0205EAC8(param0);
-    v0 = sub_0205EA78(param0);
+    v1 = Player_XPos(param0);
+    v2 = Player_ZPos(param0);
+    v0 = Player_Dir(param0);
 
     switch (v0) {
     case 0:
diff --git a/src/overlay007/ov7_0224CD28.c b/src/overlay007/ov7_0224CD28.c
index 0525161d73..c3cf0cf479 100644
--- a/src/overlay007/ov7_0224CD28.c
+++ b/src/overlay007/ov7_0224CD28.c
@@ -221,7 +221,7 @@ void ov7_0224CDA4 (UnkStruct_020508D4 * param0, FieldSystem * param1, u16 * para
 
 static u8 ov7_0224CE90 (FieldSystem * param0)
 {
-    int v0 = sub_0205EA78(param0->unk_3C);
+    int v0 = Player_Dir(param0->unk_3C);
 
     if ((v0 == 0) || (v0 == 1) || (v0 == 3)) {
         return 10;
diff --git a/src/overlay008/ov8_02249960.c b/src/overlay008/ov8_02249960.c
index b2d91ceb4c..ca68e5238a 100644
--- a/src/overlay008/ov8_02249960.c
+++ b/src/overlay008/ov8_02249960.c
@@ -351,8 +351,8 @@ void ov8_0224997C (FieldSystem * param0)
     int v4;
     int v5[] = {239, 240, 241};
 
-    v1 = sub_0205EABC(param0->unk_3C);
-    v2 = sub_0205EAC8(param0->unk_3C);
+    v1 = Player_XPos(param0->unk_3C);
+    v2 = Player_ZPos(param0->unk_3C);
 
     sub_020550F4(v1, v2, 0, 0, 1, 1, &v0);
 
@@ -2619,8 +2619,8 @@ static void ov8_0224B18C (FieldSystem * param0, UnkStruct_ov8_0224B28C * param1,
     int v0, v1, v2, v3;
     const VecFx32 * v4;
 
-    v0 = sub_0205EABC(param0->unk_3C);
-    v1 = sub_0205EAC8(param0->unk_3C);
+    v0 = Player_XPos(param0->unk_3C);
+    v1 = Player_ZPos(param0->unk_3C);
 
     param1->unk_10 = v0;
     param1->unk_14 = v1;
@@ -2954,8 +2954,8 @@ static BOOL ov8_0224B3D4 (UnkStruct_020508D4 * param0)
         v2->unk_00++;
     case 12:
         if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
-            int v9 = sub_0205EABC(v1->unk_3C);
-            int v10 = sub_0205EAC8(v1->unk_3C);
+            int v9 = Player_XPos(v1->unk_3C);
+            int v10 = Player_ZPos(v1->unk_3C);
 
             ov8_0224B240(&v2->unk_1C, v9, v10);
             sub_0200E084(v2->unk_44, 0);
@@ -3659,7 +3659,7 @@ BOOL ov8_0224BF4C (FieldSystem * param0)
     {
         int v1, v2, v3;
         UnkStruct_ov8_0224BCA8 * v4;
-        int v5 = sub_0205EA78(param0->unk_3C);
+        int v5 = Player_Dir(param0->unk_3C);
         UnkStruct_ov8_0224B8D0 * v6 = param0->unk_04->unk_24;
 
         sub_0206157C(param0->unk_3C, v5, &v1, &v2);
@@ -3704,8 +3704,8 @@ static void ov8_0224BFCC (FieldSystem * param0, UnkStruct_ov8_0224C098 * param1,
     v3->unk_18 = v0 + (sub_0206419C(param3) * v3->unk_24);
     v3->unk_1C = v1 + (sub_020641A8(param3) * v3->unk_24);
 
-    v0 = sub_0205EABC(param0->unk_3C);
-    v1 = sub_0205EAC8(param0->unk_3C);
+    v0 = Player_XPos(param0->unk_3C);
+    v1 = Player_ZPos(param0->unk_3C);
 
     v3->unk_10 = v0;
     v3->unk_14 = v1;
diff --git a/src/overlay009/ov9_02249960.c b/src/overlay009/ov9_02249960.c
index 1115340524..4e00014ee3 100644
--- a/src/overlay009/ov9_02249960.c
+++ b/src/overlay009/ov9_02249960.c
@@ -2147,7 +2147,7 @@ BOOL ov9_0224A71C (FieldSystem * param0)
 
     {
         int v1, v2, v3;
-        int v4 = sub_0205EA78(param0->unk_3C);
+        int v4 = Player_Dir(param0->unk_3C);
         UnkStruct_ov9_02249B04 * v5 = param0->unk_04->unk_24;
 
         ov9_02250F44(v5, &v1, &v2, &v3);
@@ -2292,7 +2292,7 @@ static void ov9_0224A8C0 (UnkStruct_ov9_02249B04 * param0)
 
     if (v5 == 0x2) {
         UnkStruct_ov101_021D5D90 * v9;
-        int v10 = sub_0205EA78(v7);
+        int v10 = Player_Dir(v7);
 
         v9 = ov5_021F85BC(v7, v2, v3, v4, v10, 1, v0);
         sub_0205EC00(v7, v9);
@@ -4413,8 +4413,8 @@ static void ov9_0224C8E8 (UnkStruct_ov9_02249B04 * param0)
     }
 
     {
-        int v10 = sub_0205EABC(v3->unk_3C);
-        int v11 = sub_0205EAC8(v3->unk_3C);
+        int v10 = Player_XPos(v3->unk_3C);
+        int v11 = Player_ZPos(v3->unk_3C);
 
         ov5_021E99D8(v2->unk_18, v10, v11);
         v2->unk_08 = 1;
@@ -4687,8 +4687,8 @@ static int ov9_0224CCB8 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224CBD8
     ov9_0224BF18(param0, v2->unk_08);
     ov5_021E9CD8(v0->unk_28);
 
-    param1->unk_08 = sub_0205EABC(v0->unk_3C);
-    param1->unk_0A = sub_0205EAC8(v0->unk_3C);
+    param1->unk_08 = Player_XPos(v0->unk_3C);
+    param1->unk_0A = Player_ZPos(v0->unk_3C);
 
     ov5_021E9D3C(v1->unk_10, v1->unk_14, v1->unk_18, v0->unk_28, param1->unk_08, param1->unk_0A);
     v1->unk_08 = 0;
diff --git a/src/overlay023/ov23_0223E140.c b/src/overlay023/ov23_0223E140.c
index da5372046f..b07b2de3e2 100644
--- a/src/overlay023/ov23_0223E140.c
+++ b/src/overlay023/ov23_0223E140.c
@@ -1422,7 +1422,7 @@ static void ov23_0223F118 (SysTask * param0, void * param1)
     case 0:
         ov23_0224DBF4(0);
         ov23_022417CC();
-        sub_0205764C();
+        CommPlayerMan_Reset();
         ov23_0224B430();
         (v0->unk_00)++;
         break;
@@ -1603,7 +1603,7 @@ static void ov23_0223F118 (SysTask * param0, void * param1)
 
             sub_02006E84(50, 52, 0, 10 * 0x20, 4 * 0x20, 4);
             sub_0200DAA4(v0->unk_10->unk_08, 3, 1024 - (18 + 12) - 9, 11, 2, 4);
-            sub_020576A0();
+            CommPlayerMan_Restart();
 
             ov23_0224B460();
             ov23_022417E0();
diff --git a/src/overlay023/ov23_02241F74.c b/src/overlay023/ov23_02241F74.c
index 6508e5bd65..a94079cfdf 100644
--- a/src/overlay023/ov23_02241F74.c
+++ b/src/overlay023/ov23_02241F74.c
@@ -758,7 +758,7 @@ void ov23_02242B14 (void)
 
     if (CommSys_CurNetId() == 0) {
         if (CommInfo_ServerSendArray()) {
-            sub_02057AE4(1);
+            CommPlayer_SendPos(1);
         }
     }
 
@@ -779,7 +779,7 @@ void ov23_02242BC0 (FieldSystem * param0)
         v0 = Heap_AllocFromHeap(15, sizeof(UnkStruct_ov23_02257748));
         ov23_02241F74(v0, param0);
 
-        v0 = Heap_AllocFromHeap(15, sub_02057C84());
+        v0 = Heap_AllocFromHeap(15, CommPlayer_Size());
         CommPlayerManager_Init(v0, param0, 1);
 
         v0 = Heap_AllocFromHeap(15, ov23_02243858());
@@ -807,7 +807,7 @@ void ov23_02242C78 (void)
         ov23_022417CC();
         ov23_0224B430();
         ov23_02243520();
-        sub_0205764C();
+        CommPlayerMan_Reset();
         ov23_0223E2F0();
         ov23_022421EC();
 
@@ -818,7 +818,7 @@ void ov23_02242C78 (void)
 void ov23_02242CB4 (void)
 {
     if (Unk_ov23_02257748) {
-        sub_020576A0();
+        CommPlayerMan_Restart();
         ov23_02253604();
         ov23_022417E0();
         ov23_0224B460();
@@ -835,7 +835,7 @@ void ov23_02242D08 (void)
         sub_020287F8(Unk_ov23_02257748->unk_0C->unk_0C);
         ov23_0224B4E4();
         ov23_022435DC();
-        sub_020576CC(1);
+        CommPlayerMan_Delete(1);
         ov23_022417F4();
         ov23_0223E2F8();
         ov23_0224F5B8();
@@ -850,7 +850,7 @@ void ov23_02242D44 (FieldSystem * param0)
 
     if (Unk_ov23_02257748 != NULL) {
         ov23_02243670(param0);
-        sub_02057764();
+        CommPlayerMan_Reinit();
         ov23_0224B518();
     }
 }
diff --git a/src/overlay023/ov23_0224340C.c b/src/overlay023/ov23_0224340C.c
index 026bdb4282..57d0441acd 100644
--- a/src/overlay023/ov23_0224340C.c
+++ b/src/overlay023/ov23_0224340C.c
@@ -1824,15 +1824,15 @@ static void ov23_022448FC (int param0)
     v0 = v0 + sub_0206419C(v2);
     v1 = v1 + sub_020641A8(v2);
 
-    sub_02057A94(0, v0, v1);
+    CommPlayer_SendXZPos(0, v0, v1);
 }
 
 static BOOL ov23_0224495C (int param0, BOOL param1)
 {
     int v0, v1, v2, v3, v4;
 
-    v0 = sub_0205EABC(Unk_ov23_02257764->unk_40->unk_3C);
-    v1 = sub_0205EAC8(Unk_ov23_02257764->unk_40->unk_3C);
+    v0 = Player_XPos(Unk_ov23_02257764->unk_40->unk_3C);
+    v1 = Player_ZPos(Unk_ov23_02257764->unk_40->unk_3C);
     v4 = sub_02059328(param0);
     v2 = Unk_ov23_02257764->unk_B28[CommSys_CurNetId()].unk_00.unk_00;
     v3 = Unk_ov23_02257764->unk_B28[CommSys_CurNetId()].unk_00.unk_02;
@@ -2014,8 +2014,8 @@ static int ov23_02244C10 (void)
 {
     int v0, v1, v2;
 
-    v1 = sub_0205EABC(Unk_ov23_02257764->unk_40->unk_3C);
-    v2 = sub_0205EAC8(Unk_ov23_02257764->unk_40->unk_3C);
+    v1 = Player_XPos(Unk_ov23_02257764->unk_40->unk_3C);
+    v2 = Player_ZPos(Unk_ov23_02257764->unk_40->unk_3C);
 
     ov5_021F5634(Unk_ov23_02257764->unk_40, v1, 0, v2);
     ov23_022541B4(ov23_0224219C(), 0, Unk_ov23_02257764->unk_B9F);
@@ -2944,8 +2944,8 @@ static void ov23_02245BA8 (SysTask * param0, void * param1)
             ov23_02254044(ov23_0224219C());
 
             v0->unk_00 = 7;
-            v2 = sub_0205EABC(Unk_ov23_02257764->unk_40->unk_3C);
-            v3 = sub_0205EAC8(Unk_ov23_02257764->unk_40->unk_3C);
+            v2 = Player_XPos(Unk_ov23_02257764->unk_40->unk_3C);
+            v3 = Player_ZPos(Unk_ov23_02257764->unk_40->unk_3C);
 
             if (!v0->unk_08) {
                 v0->unk_14 = ov5_021F4EAC(Unk_ov23_02257764->unk_40, v2, v3, 2, 32);
@@ -2958,7 +2958,7 @@ static void ov23_02245BA8 (SysTask * param0, void * param1)
         break;
     case 7:
     {
-        int v5 = sub_0205EA78(Unk_ov23_02257764->unk_40->unk_3C);
+        int v5 = Player_Dir(Unk_ov23_02257764->unk_40->unk_3C);
 
         if (v0->unk_18 != v5) {
             Sound_PlayEffect(1515);
@@ -3029,7 +3029,7 @@ static void ov23_02245DF8 (BOOL param0, BOOL param1, int param2)
     v1->unk_08 = param0;
     v1->unk_10 = 0;
     v1->unk_0D = param1;
-    v1->unk_18 = sub_0205EA78(Unk_ov23_02257764->unk_40->unk_3C);
+    v1->unk_18 = Player_Dir(Unk_ov23_02257764->unk_40->unk_3C);
     v1->unk_0C = param2;
 
     Unk_ov23_02257764->unk_300 = v1;
@@ -3947,8 +3947,8 @@ static BOOL ov23_02247568 (BGL * param0, UnkStruct_ov23_022471D8 * param1)
     switch (param1->unk_125) {
     case 0:
         param1->unk_124 = 0;
-        v5 = sub_0205EABC(Unk_ov23_02257764->unk_40->unk_3C);
-        v6 = sub_0205EAC8(Unk_ov23_02257764->unk_40->unk_3C);
+        v5 = Player_XPos(Unk_ov23_02257764->unk_40->unk_3C);
+        v6 = Player_ZPos(Unk_ov23_02257764->unk_40->unk_3C);
         param1->unk_114 = ov5_021F4F18(Unk_ov23_02257764->unk_40, v5, v6, 5, 32);
         param1->unk_125 = 1;
         Sound_PlayEffect(1630);
diff --git a/src/overlay023/ov23_02248F1C.c b/src/overlay023/ov23_02248F1C.c
index 62e3b7bd90..4fca5eb87e 100644
--- a/src/overlay023/ov23_02248F1C.c
+++ b/src/overlay023/ov23_02248F1C.c
@@ -226,8 +226,8 @@ static void ov23_02249214 (UnkStruct_0205E884 * const param0, int param1[][2], i
 
     if (CommSys_IsInitialized()) {
         if (CommSys_IsPlayerConnected(CommSys_CurNetId()) == 0) {
-            param1[0][0] = sub_0205EABC(param0);
-            param1[0][1] = sub_0205EAC8(param0);
+            param1[0][0] = Player_XPos(param0);
+            param1[0][1] = Player_ZPos(param0);
         } else {
             int v1 = param1[0][0];
             int v2 = param1[0][1];
diff --git a/src/overlay023/ov23_022499E4.c b/src/overlay023/ov23_022499E4.c
index 5436fadd69..b144d41a59 100644
--- a/src/overlay023/ov23_022499E4.c
+++ b/src/overlay023/ov23_022499E4.c
@@ -265,7 +265,7 @@ static void ov23_02249C34 (void)
     ov23_02242D44(v0->fieldSys);
 
     CommInfo_SendBattleRegulation();
-    sub_02057AE4(0);
+    CommPlayer_SendPos(0);
 
     ov23_02243AF0();
     ov23_0224C21C();
@@ -340,13 +340,13 @@ static void ov23_02249D20 (void)
         }
 
         ov23_0224321C();
-        sub_020579BC(0);
+        CommPlayer_CopyPersonal(0);
 
         ov23_0224546C(0, 0, NULL, NULL);
         ov23_02244858(0, 1);
 
         CommInfo_InitPlayer(0);
-        sub_02057DB8(0, 0, 0);
+        CommPlayer_Destory(0, 0, 0);
         sub_02059570();
 
         ov23_02249C24(ov23_02249EBC, 10);
@@ -371,7 +371,7 @@ static void ov23_02249DBC (void)
 
         ov23_022499E4("\u0090\u0065\u008B\u0040\u0090\u00DA\u0091\u00B1");
 
-        sub_02057AE4(0);
+        CommPlayer_SendPos(0);
 
         ov23_0224AAB0();
         ov23_0224C21C();
@@ -409,7 +409,7 @@ static void ov23_02249E18 (void)
 
 static void ov23_02249E84 (void)
 {
-    sub_0205764C();
+    CommPlayerMan_Reset();
     ov23_02249C24(ov23_02249E98, 0);
 }
 
@@ -423,7 +423,7 @@ static void ov23_02249EA0 (void)
     FieldCommunicationManager * v0 = FieldCommMan_Get();
 
     ov23_0224C198();
-    sub_020576A0();
+    CommPlayerMan_Restart();
     ov23_02249C24(ov23_02249E18, 0);
 }
 
@@ -437,7 +437,7 @@ static void ov23_02249EBC (void)
     }
 
     if (v0->timer == 1) {
-        sub_02057B14(0);
+        CommPlayer_SendPosServer(0);
     }
 
     if (v0->timer != 0) {
@@ -491,7 +491,7 @@ static void ov23_02249F7C (void)
     if (ov23_0224C420()) {
         ov23_022499E4("\u0094\u00E9\u0096\u00A7\u008A\u00EE\u0092\u006E\u0082\u00CC\u0088\u00CA\u0092\u0075\u0082\u00AA\u0082\u00AB\u0082\u00BD");
         ov23_0224C434();
-        sub_02057AE4(1);
+        CommPlayer_SendPos(1);
         Link_Message(31);
         ov23_02249C24(ov23_0224A09C, 0);
         return;
@@ -550,7 +550,7 @@ static void ov23_0224A02C (void)
     if (CommSys_CurNetId() == 0) {
         ov23_02242D44(v0->fieldSys);
         CommInfo_SendBattleRegulation();
-        sub_02057AE4(0);
+        CommPlayer_SendPos(0);
         ov23_02243AF0();
         ov23_0224C21C();
         ov23_02249C24(ov23_0224A024, 0);
@@ -562,7 +562,7 @@ static void ov23_0224A064 (void)
     ov23_02244858(CommSys_CurNetId(), 1);
     ov23_0224D9AC(CommSys_CurNetId(), 1);
     ov23_0224160C();
-    sub_020578B0();
+    CommPlayerMan_Stop();
     ov23_0224321C();
     sub_020367F0();
     ov23_0224AC4C();
@@ -587,7 +587,7 @@ static void ov23_0224A09C (void)
 
 static void ov23_0224A0CC (void)
 {
-    sub_0205764C();
+    CommPlayerMan_Reset();
     ov23_02249C24(ov23_0224A0E0, 0);
 }
 
@@ -601,11 +601,11 @@ static void ov23_0224A0E8 (void)
     FieldCommunicationManager * v0 = FieldCommMan_Get();
 
     ov23_0224C198();
-    sub_020576A0();
+    CommPlayerMan_Restart();
 
     if (sub_02033E68() || sub_020360F0()) {
         ov23_0224B518();
-        sub_020578B0();
+        CommPlayerMan_Stop();
         ov23_0224321C();
         sub_020367F0();
         ov23_0224AC4C();
@@ -617,7 +617,7 @@ static void ov23_0224A0E8 (void)
 
 static void ov23_0224A138 (void)
 {
-    sub_0205764C();
+    CommPlayerMan_Reset();
     ov23_02249C24(ov23_0224A14C, 0);
 }
 
@@ -631,7 +631,7 @@ static void ov23_0224A150 (void)
     FieldCommunicationManager * v0 = FieldCommMan_Get();
 
     ov23_0224C198();
-    sub_020576A0();
+    CommPlayerMan_Restart();
     ov23_02249C24(ov23_02249CE4, 0);
 }
 
@@ -651,7 +651,7 @@ static void ov23_0224A184 (void)
     FieldCommunicationManager * v0 = FieldCommMan_Get();
 
     ov23_0224C198();
-    sub_020576A0();
+    CommPlayerMan_Restart();
     ov23_02249C24(ov23_0224A024, 0);
 }
 
diff --git a/src/overlay023/ov23_0224A1D0.c b/src/overlay023/ov23_0224A1D0.c
index b706189b05..0a1a0576a9 100644
--- a/src/overlay023/ov23_0224A1D0.c
+++ b/src/overlay023/ov23_0224A1D0.c
@@ -69,11 +69,11 @@ void ov23_0224A1D0 (void)
     }
 
     for (v0 = 0; v0 < (7 + 1); v0++) {
-        sub_02057DB8(v0, 0, 0);
+        CommPlayer_Destory(v0, 0, 0);
         sub_020593B4(v0);
     }
 
-    v1->unk_2BD = 1;
+    v1->isResetting = 1;
 }
 
 static void ov23_0224A204 (int param0)
@@ -740,7 +740,7 @@ void ov23_0224ADE8 (int param0, int param1, int param2, int param3)
 
     v1 = &v0->playerLocation[param0];
 
-    if (!v0->unk_2BD) {
+    if (!v0->isResetting) {
         ov5_021F5634(v0->fieldSys, v1->x, 0, v1->z);
     }
 
@@ -752,11 +752,11 @@ void ov23_0224ADE8 (int param0, int param1, int param2, int param3)
         sub_0205ECE0(v0->unk_08[param0], param1, param2, param3);
     }
 
-    if (!v0->unk_2BD) {
+    if (!v0->isResetting) {
         ov5_021F5634(v0->fieldSys, v1->x, 0, v1->z);
     }
 
-    if (!v0->unk_2BD) {
+    if (!v0->isResetting) {
         ov23_0224B040(param0);
     }
 }
@@ -836,7 +836,7 @@ void ov23_0224AF7C (int param0)
 {
     CommPlayerData * v0 = CommPlayerData_Get();
 
-    if (!v0->unk_2BD) {
+    if (!v0->isResetting) {
         if (v0->unk_08[param0]) {
             switch (v0->unk_FA[param0]) {
             case 3:
diff --git a/src/overlay023/ov23_0224B05C.c b/src/overlay023/ov23_0224B05C.c
index b40809758f..5fcb327191 100644
--- a/src/overlay023/ov23_0224B05C.c
+++ b/src/overlay023/ov23_0224B05C.c
@@ -1290,7 +1290,7 @@ void ov23_0224C25C (int param0, int param1, void * param2, void * param3)
 
             sub_02059514();
             Link_Message(56);
-            sub_02057AE4(0);
+            CommPlayer_SendPos(0);
 
             ov23_0224DC24();
             return;
@@ -1465,8 +1465,8 @@ static void ov23_0224C5B4 (SysTask * param0, void * param1)
         return;
     }
 
-    v4 = sub_0205EABC(Unk_ov23_022577AC->unk_00->unk_3C);
-    v5 = sub_0205EAC8(Unk_ov23_022577AC->unk_00->unk_3C);
+    v4 = Player_XPos(Unk_ov23_022577AC->unk_00->unk_3C);
+    v5 = Player_ZPos(Unk_ov23_022577AC->unk_00->unk_3C);
 
     if (ov23_02242E58(v4, v5)) {
         return;
@@ -1638,7 +1638,7 @@ static BOOL ov23_0224C790 (UnkStruct_020508D4 * param0)
             v1->unk_2E = 1;
         }
 
-        sub_02035EA8();
+        CommSys_EnableSendMovementData();
         sub_020594FC();
 
         sub_02006E84(50, 52, 0, 10 * 0x20, 4 * 0x20, 4);
@@ -1783,7 +1783,7 @@ static void ov23_0224CB1C (SysTask * param0, void * param1)
     {
         v6 = sub_02058D88(CommSys_CurNetId());
         v7 = sub_02058DC0(CommSys_CurNetId());
-        v8 = sub_02059328(sub_0205EA78(v1->unk_3C));
+        v8 = sub_02059328(Player_Dir(v1->unk_3C));
 
         ov23_02253F40(ov23_0224219C(), 34, 0, NULL);
         ov23_0224C588(v6, v7, v8, 16);
@@ -2669,7 +2669,7 @@ void ov23_0224DA8C (void)
 {
     if (Unk_ov23_022577AC->unk_12D4 == 1) {
         Unk_ov23_022577AC->unk_12D4 = 2;
-        sub_020578DC();
+        CommPlayer_InitPersonal();
         ov23_0224B5CC(0);
     }
 }
diff --git a/src/overlay023/ov23_0224F294.c b/src/overlay023/ov23_0224F294.c
index 89cb04bca5..d3d34bb615 100644
--- a/src/overlay023/ov23_0224F294.c
+++ b/src/overlay023/ov23_0224F294.c
@@ -1373,7 +1373,7 @@ static void ov23_0225093C (UnkStruct_ov23_02250CD4 * param0)
 {
     ov23_0224FB7C(param0);
 
-    if (ov23_02242E58(sub_0205EABC(param0->unk_0C->unk_3C), sub_0205EAC8(param0->unk_0C->unk_3C))) {
+    if (ov23_02242E58(Player_XPos(param0->unk_0C->unk_3C), Player_ZPos(param0->unk_0C->unk_3C))) {
         ov23_02253F40(ov23_0224219C(), 66, 0, NULL);
         param0->unk_2AA = 13;
     } else {
diff --git a/src/overlay023/ov23_0225128C.c b/src/overlay023/ov23_0225128C.c
index f90ac3c0dd..6c7ab9625d 100644
--- a/src/overlay023/ov23_0225128C.c
+++ b/src/overlay023/ov23_0225128C.c
@@ -602,8 +602,8 @@ static void ov23_02251A84 (BOOL param0, FieldSystem * param1)
     VecFx32 v0;
 
     v0.y = 0;
-    v0.x = 15 * FX32_ONE * 16 - sub_0205EABC(param1->unk_3C) * FX32_ONE * 16;
-    v0.z = 17 * FX32_ONE * 16 - sub_0205EAC8(param1->unk_3C) * FX32_ONE * 16;
+    v0.x = 15 * FX32_ONE * 16 - Player_XPos(param1->unk_3C) * FX32_ONE * 16;
+    v0.z = 17 * FX32_ONE * 16 - Player_ZPos(param1->unk_3C) * FX32_ONE * 16;
 
     if (!param0) {
         v0.x = -v0.x;
diff --git a/src/pokeradar.c b/src/pokeradar.c
index 67e74bba1b..b6be6f6b40 100644
--- a/src/pokeradar.c
+++ b/src/pokeradar.c
@@ -409,8 +409,8 @@ BOOL RefreshRadarChain (UnkStruct_020508D4 *param0) {
             *v1 = 4;
         } else {
             *v2 = 0;
-            int v3 = sub_0205EABC(v0->unk_3C);
-            int v4 = sub_0205EAC8(v0->unk_3C);
+            int v3 = Player_XPos(v0->unk_3C);
+            int v4 = Player_ZPos(v0->unk_3C);
             RadarSpawnPatches(v0, v3, v4, v0->chain);
             if (v0->chain->active) {
                 SetupGrassPatches(v0, 0x1, v0->chain);
diff --git a/src/unk_020366A0.c b/src/unk_020366A0.c
index 679c5c72da..0c4689d862 100644
--- a/src/unk_020366A0.c
+++ b/src/unk_020366A0.c
@@ -572,7 +572,7 @@ static void sub_02036CA4 (void)
     sub_02033200(Unk_021C07D4->unk_2C, 1);
     CommInfo_Init(Unk_021C07D4->unk_28, NULL);
     sub_02036168(1);
-    sub_02035EA8();
+    CommSys_EnableSendMovementData();
 
     if (Unk_021C07D4->unk_55) {
         if (sub_02034778(1, Unk_021C07D4->unk_4E, 500, 1)) {
@@ -601,7 +601,7 @@ static void sub_02036D80 (void)
     }
 
     sub_02036168(1);
-    sub_02035EA8();
+    CommSys_EnableSendMovementData();
 
     if (Unk_021C07D4->unk_55) {
         sub_02036C94(sub_02036FD4, 0);
@@ -696,7 +696,7 @@ static void sub_02036F44 (void)
     if (CommSys_IsPlayerConnected(CommSys_CurNetId())) {
         sub_02034AE4();
         sub_02036168(0);
-        sub_02035EA8();
+        CommSys_EnableSendMovementData();
         sub_02036C94(sub_020370B8, 0);
         return;
     }
@@ -776,7 +776,7 @@ static void sub_02037094 (void)
 {
     sub_02036168(0);
     sub_02033EA8(1);
-    sub_02035EA8();
+    CommSys_EnableSendMovementData();
     sub_02036C94(sub_020370B4, 0);
 }
 
@@ -798,7 +798,7 @@ static void sub_020370BC (void)
         }
 
         sub_02036168(1);
-        sub_02035EA8();
+        CommSys_EnableSendMovementData();
         sub_02033794(1);
     } else {
         (void)0;
diff --git a/src/unk_0203A9C8.c b/src/unk_0203A9C8.c
index 3cbddcd81c..f60a833413 100644
--- a/src/unk_0203A9C8.c
+++ b/src/unk_0203A9C8.c
@@ -277,7 +277,7 @@ void sub_0203A9E0 (FieldSystem * param0)
     v0->unk_228 = 0;
 
     if (sub_0205F588(param0->unk_3C) == 1) {
-        sub_0205F5E4(param0->unk_3C, sub_0205EA78(param0->unk_3C));
+        sub_0205F5E4(param0->unk_3C, Player_Dir(param0->unk_3C));
     }
 
     sub_02050904(param0, sub_0203AC44, v0);
@@ -291,7 +291,7 @@ void sub_0203AA78 (FieldSystem * param0)
     v0->unk_228 = 1;
 
     if (sub_0205F588(param0->unk_3C) == 1) {
-        sub_0205F5E4(param0->unk_3C, sub_0205EA78(param0->unk_3C));
+        sub_0205F5E4(param0->unk_3C, Player_Dir(param0->unk_3C));
     }
 
     sub_02050904(param0, sub_0203AC44, v0);
@@ -305,7 +305,7 @@ void sub_0203AABC (FieldSystem * param0)
     v0->unk_228 = 0;
 
     if (sub_0205F588(param0->unk_3C) == 1) {
-        sub_0205F5E4(param0->unk_3C, sub_0205EA78(param0->unk_3C));
+        sub_0205F5E4(param0->unk_3C, Player_Dir(param0->unk_3C));
     }
 
     sub_02050904(param0, sub_0203AC44, v0);
diff --git a/src/unk_0203C954.c b/src/unk_0203C954.c
index 84647653a5..25a7a1a3d6 100644
--- a/src/unk_0203C954.c
+++ b/src/unk_0203C954.c
@@ -20,10 +20,10 @@ static u8 sub_0203CAEC(FieldSystem * param0, const UnkStruct_0203A594 * param1);
 
 static int sub_0203C954 (FieldSystem * param0, int * param1, int * param2)
 {
-    int v0 = sub_0205EA78(param0->unk_3C);
+    int v0 = Player_Dir(param0->unk_3C);
 
-    *param1 = sub_0205EABC(param0->unk_3C);
-    *param2 = sub_0205EAC8(param0->unk_3C);
+    *param1 = Player_XPos(param0->unk_3C);
+    *param2 = Player_ZPos(param0->unk_3C);
 
     switch (v0) {
     case 0:
@@ -142,7 +142,7 @@ static u8 sub_0203CB18 (FieldSystem * param0, const UnkStruct_0203A594 * param1)
         return 1;
     }
 
-    switch (sub_0205EA78(param0->unk_3C)) {
+    switch (Player_Dir(param0->unk_3C)) {
     case 0:
         if ((param1->unk_10 == 0) || (param1->unk_10 == 6)) {
             return 1;
@@ -174,7 +174,7 @@ u16 sub_0203CB80 (FieldSystem * param0, void * param1, int param2)
     int v1, v2;
     int v3;
 
-    if (sub_0205EA78(param0->unk_3C) != 0) {
+    if (Player_Dir(param0->unk_3C) != 0) {
         return 0xffff;
     }
 
@@ -192,7 +192,7 @@ u16 sub_0203CB80 (FieldSystem * param0, void * param1, int param2)
 
 u8 sub_0203CBE0 (FieldSystem * param0, UnkStruct_02061AB4 ** param1)
 {
-    if (sub_0205EA78(param0->unk_3C) != 0) {
+    if (Player_Dir(param0->unk_3C) != 0) {
         return 0;
     }
 
@@ -214,8 +214,8 @@ u16 sub_0203CC14 (FieldSystem * param0, void * param1, int param2)
     int v3;
 
     v0 = (const UnkStruct_0203A4AC *)param1;
-    v1 = sub_0205EABC(param0->unk_3C);
-    v2 = sub_0205EAC8(param0->unk_3C);
+    v1 = Player_XPos(param0->unk_3C);
+    v2 = Player_ZPos(param0->unk_3C);
 
     for (v3 = 0; v3 < param2; v3++) {
         if ((v1 >= v0[v3].unk_02) && (v1 < (v0[v3].unk_02 + v0[v3].unk_06)) && (v2 >= v0[v3].unk_04) && (v2 < (v0[v3].unk_04 + v0[v3].unk_08)) && (sub_0203F150(param0, v0[v3].unk_0E) == v0[v3].unk_0C)) {
diff --git a/src/unk_0203CC84.c b/src/unk_0203CC84.c
index ab11e8c68b..e1e2907439 100644
--- a/src/unk_0203CC84.c
+++ b/src/unk_0203CC84.c
@@ -368,7 +368,7 @@ void sub_0203D128 (void)
 void sub_0203D140 (void)
 {
     Unk_021C07DC->unk_00->unk_08 = 0;
-    sub_02035EA8();
+    CommSys_EnableSendMovementData();
 }
 
 struct UnkStruct_ov25_02253CE0_t * sub_0203D158 (void)
diff --git a/src/unk_0203E880.c b/src/unk_0203E880.c
index 46262a372c..f411da23d0 100644
--- a/src/unk_0203E880.c
+++ b/src/unk_0203E880.c
@@ -261,7 +261,7 @@ static void sub_0203EA68 (FieldSystem * param0, UnkStruct_0203EF60 * param1, u16
 {
     u16 * v0 = sub_0203EF60(param1, 54);
 
-    param1->unk_28 = sub_0205EA78(param0->unk_3C);
+    param1->unk_28 = Player_Dir(param0->unk_3C);
     param1->unk_2C = param3;
     param1->unk_0A = param2;
     param1->unk_34 = param4;
@@ -855,8 +855,8 @@ UnkStruct_0203F478 * sub_0203F478 (FieldSystem * param0, int param1)
         return v0;
     }
 
-    v2 = sub_0205EABC(param0->unk_3C);
-    v3 = sub_0205EAC8(param0->unk_3C);
+    v2 = Player_XPos(param0->unk_3C);
+    v3 = Player_ZPos(param0->unk_3C);
     v8 = v2 - 7;
     v9 = v2 + 7;
     v10 = v3 - 7;
diff --git a/src/unk_0203F6C4.c b/src/unk_0203F6C4.c
index b57f7072f4..130c07d833 100644
--- a/src/unk_0203F6C4.c
+++ b/src/unk_0203F6C4.c
@@ -3470,7 +3470,7 @@ static BOOL sub_020413F0 (UnkStruct_0203E724 * param0)
 
         v3 = param0->unk_34;
         v4 = v3->unk_3C;
-        v0 = sub_0205EA78(v4);
+        v0 = Player_Dir(v4);
     }
 
     v0 = sub_0206447C(v0);
@@ -3492,8 +3492,8 @@ static BOOL sub_02041420 (UnkStruct_0203E724 * param0)
 
     v0 = inline_0204FCAC(param0);
     v1 = inline_0204FCAC(param0);
-    *v0 = sub_0205EABC(v2->unk_3C);
-    *v1 = sub_0205EAC8(v2->unk_3C);
+    *v0 = Player_XPos(v2->unk_3C);
+    *v1 = Player_ZPos(v2->unk_3C);
 
     return 0;
 }
@@ -3518,7 +3518,7 @@ static BOOL sub_020414C4 (UnkStruct_0203E724 * param0)
     u16 * v0;
 
     v0 = inline_0204FCAC(param0);
-    *v0 = sub_0205EA78(param0->unk_34->unk_3C);
+    *v0 = Player_Dir(param0->unk_34->unk_3C);
 
     return 0;
 }
@@ -4763,7 +4763,7 @@ static BOOL sub_02042A8C (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02042AB0 (UnkStruct_0203E724 * param0)
 {
-    ov5_021E0734(param0->unk_28, sub_0205EA78(param0->unk_34->unk_3C), inline_02049538(param0));
+    ov5_021E0734(param0->unk_28, Player_Dir(param0->unk_34->unk_3C), inline_02049538(param0));
     return 1;
 }
 
@@ -4775,7 +4775,7 @@ static BOOL sub_02042AE0 (UnkStruct_0203E724 * param0)
         int v0;
 
         if (sub_0205F16C(param0->unk_34->unk_3C) == 1) {
-            v0 = sub_0205EA78(param0->unk_34->unk_3C);
+            v0 = Player_Dir(param0->unk_34->unk_3C);
         } else {
             v0 = sub_0205EA94(param0->unk_34->unk_3C);
         }
@@ -4788,7 +4788,7 @@ static BOOL sub_02042AE0 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02042B3C (UnkStruct_0203E724 * param0)
 {
-    ov5_021E0998(param0->unk_28, sub_0205EA78(param0->unk_34->unk_3C), inline_02049538(param0));
+    ov5_021E0998(param0->unk_28, Player_Dir(param0->unk_34->unk_3C), inline_02049538(param0));
     return 1;
 }
 
diff --git a/src/unk_02049D08.c b/src/unk_02049D08.c
index 0cf588c8f8..28365ae432 100644
--- a/src/unk_02049D08.c
+++ b/src/unk_02049D08.c
@@ -228,7 +228,7 @@ void sub_02049FA8 (FieldSystem * param0)
 {
     UnkStruct_02049FA8 * v0 = sub_0203A730(sub_0203A790(param0->unk_0C));
 
-    inline_02049FA8(v0, param0->unk_1C->unk_00, -1, sub_0205EABC(param0->unk_3C), sub_0205EAC8(param0->unk_3C), 0);
+    inline_02049FA8(v0, param0->unk_1C->unk_00, -1, Player_XPos(param0->unk_3C), Player_ZPos(param0->unk_3C), 0);
     sub_0206AD9C(SaveData_Events(param0->unk_0C));
 
     return;
diff --git a/src/unk_02050568.c b/src/unk_02050568.c
index 35bfafc7db..36c362a131 100644
--- a/src/unk_02050568.c
+++ b/src/unk_02050568.c
@@ -56,8 +56,8 @@ static BOOL sub_020505A0 (UnkStruct_020508D4 * param0)
 
     switch (v1->unk_08) {
     case 0:
-        v1->unk_04 = sub_0205EABC(v0->unk_3C);
-        v1->unk_06 = sub_0205EAC8(v0->unk_3C);
+        v1->unk_04 = Player_XPos(v0->unk_3C);
+        v1->unk_06 = Player_ZPos(v0->unk_3C);
         sub_02070428(v0, 1);
         sub_020558AC(param0);
         v1->unk_08++;
diff --git a/src/unk_020530C8.c b/src/unk_020530C8.c
index dbebb80b8f..de40459105 100644
--- a/src/unk_020530C8.c
+++ b/src/unk_020530C8.c
@@ -444,7 +444,7 @@ static void sub_020534BC (FieldSystem * param0)
 
 static void sub_020534EC (UnkStruct_02049FA8 * param0, const FieldSystem * param1)
 {
-    inline_02049FA8(param0, param1->unk_1C->unk_00, -1, sub_0205EABC(param1->unk_3C), sub_0205EAC8(param1->unk_3C), 1);
+    inline_02049FA8(param0, param1->unk_1C->unk_00, -1, Player_XPos(param1->unk_3C), Player_ZPos(param1->unk_3C), 1);
 }
 
 static BOOL sub_02053518 (const FieldSystem * param0)
@@ -1097,7 +1097,7 @@ void sub_02053F58 (FieldSystem * param0, int param1, int param2)
 
     MI_CpuClear8(v1, sizeof(UnkStruct_02053E98));
 
-    inline_02049FA8(&v0, param1, param2, 0, 0, sub_0205EA78(param0->unk_3C));
+    inline_02049FA8(&v0, param1, param2, 0, 0, Player_Dir(param0->unk_3C));
     v1->unk_08 = v0;
     sub_02050904(param0, sub_02053E98, v1);
 }
diff --git a/src/unk_020553DC.c b/src/unk_020553DC.c
index adbac50dbd..c3f1c9dd2b 100644
--- a/src/unk_020553DC.c
+++ b/src/unk_020553DC.c
@@ -212,8 +212,8 @@ static u16 sub_020554E8 (FieldSystem * param0, int param1)
     UnkStruct_0203A790 * v2 = sub_0203A790(param0->unk_0C);
     UnkStruct_02049FA8 * v3 = sub_0203A728(v2);
 
-    v0 = sub_0205EABC(param0->unk_3C);
-    v1 = sub_0205EAC8(param0->unk_3C);
+    v0 = Player_XPos(param0->unk_3C);
+    v1 = Player_ZPos(param0->unk_3C);
 
     if (param1 != 350) {
         return 0;
diff --git a/src/unk_02055C50.c b/src/unk_02055C50.c
index 8e0223c3d4..9062ae0a2a 100644
--- a/src/unk_02055C50.c
+++ b/src/unk_02055C50.c
@@ -305,8 +305,8 @@ static BOOL sub_02056010 (FieldSystem * param0, UnkStruct_020562AC * param1, int
 {
     int v0, v1;
 
-    v0 = sub_0205EABC(param0->unk_3C);
-    v1 = sub_0205EAC8(param0->unk_3C);
+    v0 = Player_XPos(param0->unk_3C);
+    v1 = Player_ZPos(param0->unk_3C);
 
     if (param2 == 2) {
         v0--;
@@ -331,8 +331,8 @@ static UnkStruct_02061AB4 * sub_02056074 (FieldSystem * param0, int param1)
 {
     int v0, v1;
 
-    v0 = sub_0205EABC(param0->unk_3C);
-    v1 = sub_0205EAC8(param0->unk_3C);
+    v0 = Player_XPos(param0->unk_3C);
+    v1 = Player_ZPos(param0->unk_3C);
     v1 -= 1;
 
     if (param1 == 2) {
@@ -348,8 +348,8 @@ static UnkStruct_02061AB4 * sub_020560A8 (FieldSystem * param0, UnkStruct_020562
 {
     int v0, v1;
 
-    v0 = sub_0205EABC(param0->unk_3C);
-    v1 = sub_0205EAC8(param0->unk_3C);
+    v0 = Player_XPos(param0->unk_3C);
+    v1 = Player_ZPos(param0->unk_3C);
 
     if (param1->unk_04 == 0) {
         v1 -= 1;
@@ -472,7 +472,7 @@ void sub_020562AC (FieldSystem * param0)
 
     v0->unk_00 = 0;
     v0->unk_0C = NULL;
-    v0->unk_04 = sub_0205EA78(param0->unk_3C);
+    v0->unk_04 = Player_Dir(param0->unk_3C);
 
     sub_02050944(param0->unk_10, sub_02056124, v0);
 }
diff --git a/src/unk_02056B30.c b/src/unk_02056B30.c
index 9d186bffcf..7518552869 100644
--- a/src/unk_02056B30.c
+++ b/src/unk_02056B30.c
@@ -283,7 +283,7 @@ static BOOL sub_02056E20 (UnkStruct_020508D4 * param0)
     case 0:
         v1->unk_1C = ov5_021D431C();
         v2 = (UnkStruct_ov5_021D432C *)v1->unk_1C;
-        ov5_021D4334(sub_0205EABC(v0->unk_3C), sub_0205EAC8(v0->unk_3C), v2);
+        ov5_021D4334(Player_XPos(v0->unk_3C), Player_ZPos(v0->unk_3C), v2);
         (v1->unk_04)++;
         break;
     case 1:
@@ -315,13 +315,13 @@ static BOOL sub_02056EA4 (UnkStruct_020508D4 * param0)
     case 0:
         v1->unk_1C = ov5_021D431C();
         v2 = (UnkStruct_ov5_021D432C *)v1->unk_1C;
-        ov5_021D4334(sub_0205EABC(v0->unk_3C), sub_0205EAC8(v0->unk_3C), v2);
+        ov5_021D4334(Player_XPos(v0->unk_3C), Player_ZPos(v0->unk_3C), v2);
         (v1->unk_04)++;
         break;
     case 1:
         v2 = (UnkStruct_ov5_021D432C *)v1->unk_1C;
 
-        if (ov5_021D4A24(v0, v2, sub_0205EA78(v0->unk_3C))) {
+        if (ov5_021D4A24(v0, v2, Player_Dir(v0->unk_3C))) {
             ov5_021D432C(v1->unk_1C);
             (v1->unk_04)++;
         }
@@ -342,7 +342,7 @@ static BOOL sub_02056F1C (UnkStruct_020508D4 * param0)
     switch (v1->unk_04) {
     case 0:
     {
-        int v3 = sub_0205EA78(v0->unk_3C);
+        int v3 = Player_Dir(v0->unk_3C);
 
         v2 = sub_0205EB3C(v0->unk_3C);
 
@@ -438,7 +438,7 @@ static BOOL sub_02057050 (UnkStruct_020508D4 * param0)
         u8 v4;
         UnkStruct_02061AB4 * v5 = sub_0205EB3C(v1->unk_3C);
 
-        v4 = sub_02054F94(v1, sub_0205EABC(v1->unk_3C), sub_0205EAC8(v1->unk_3C));
+        v4 = sub_02054F94(v1, Player_XPos(v1->unk_3C), Player_ZPos(v1->unk_3C));
 
         if (sub_0205DAEC(v4)) {
             sub_02062D64(v5, 1);
@@ -455,7 +455,7 @@ static BOOL sub_02057050 (UnkStruct_020508D4 * param0)
     case 1:
         v2->unk_1C = (UnkStruct_ov5_021D432C *)ov5_021D431C();
         v3 = (UnkStruct_ov5_021D432C *)v2->unk_1C;
-        ov5_021D4334(sub_0205EABC(v1->unk_3C), sub_0205EAC8(v1->unk_3C), v3);
+        ov5_021D4334(Player_XPos(v1->unk_3C), Player_ZPos(v1->unk_3C), v3);
         (v2->unk_04)++;
         break;
     case 2:
@@ -491,7 +491,7 @@ static BOOL sub_0205711C (UnkStruct_020508D4 * param0)
         u8 v4;
         UnkStruct_02061AB4 * v5 = sub_0205EB3C(v1->unk_3C);
 
-        v4 = sub_02054F94(v1, sub_0205EABC(v1->unk_3C), sub_0205EAC8(v1->unk_3C));
+        v4 = sub_02054F94(v1, Player_XPos(v1->unk_3C), Player_ZPos(v1->unk_3C));
 
         if (sub_0205DAEC(v4)) {
             sub_02062D64(v5, 1);
@@ -523,13 +523,13 @@ static BOOL sub_020571A0 (UnkStruct_020508D4 * param0)
     case 0:
         v1->unk_1C = ov5_021D431C();
         v2 = (UnkStruct_ov5_021D432C *)v1->unk_1C;
-        ov5_021D4334(sub_0205EABC(v0->unk_3C), sub_0205EAC8(v0->unk_3C), v2);
+        ov5_021D4334(Player_XPos(v0->unk_3C), Player_ZPos(v0->unk_3C), v2);
         (v1->unk_04)++;
         break;
     case 1:
         v2 = (UnkStruct_ov5_021D432C *)v1->unk_1C;
 
-        if (ov5_021D4858(v0, v2, sub_0205EA78(v0->unk_3C))) {
+        if (ov5_021D4858(v0, v2, Player_Dir(v0->unk_3C))) {
             ov5_021D432C(v1->unk_1C);
             (v1->unk_04)++;
         }
@@ -556,7 +556,7 @@ static BOOL sub_02057218 (UnkStruct_020508D4 * param0)
         if (1) {
             int v3;
 
-            v3 = sub_0205EA78(v0->unk_3C);
+            v3 = Player_Dir(v0->unk_3C);
 
             if (v3 == 2) {
                 sub_02065638(v2, 0xa);
@@ -619,7 +619,7 @@ static void sub_02057300 (FieldSystem * param0)
     int v0;
     VecFx32 v1;
 
-    v0 = sub_0205EA78(param0->unk_3C);
+    v0 = Player_Dir(param0->unk_3C);
     sub_0205EAEC(param0->unk_3C, &v1);
 
     if (v0 == 3) {
@@ -641,11 +641,11 @@ static void sub_02057368 (FieldSystem * param0)
     VecFx32 v3;
     u8 v4;
 
-    v2 = sub_0205EA78(param0->unk_3C);
+    v2 = Player_Dir(param0->unk_3C);
     sub_0205EAEC(param0->unk_3C, &v3);
 
-    v0 = sub_0205EABC(param0->unk_3C);
-    v1 = sub_0205EAC8(param0->unk_3C);
+    v0 = Player_XPos(param0->unk_3C);
+    v1 = Player_ZPos(param0->unk_3C);
     v4 = sub_02054F94(param0, v0, v1);
 
     if (sub_0205DC44(v4)) {
diff --git a/src/unk_02057518.c b/src/unk_02057518.c
index 4d6a245932..97b83c43a0 100644
--- a/src/unk_02057518.c
+++ b/src/unk_02057518.c
@@ -21,6 +21,7 @@
 
 #include "unk_0200D9E8.h"
 #include "heap.h"
+#include "constants/heap.h"
 #include "trainer_info.h"
 #include "unk_0202854C.h"
 #include "unk_0202CD50.h"
@@ -51,7 +52,7 @@ static BOOL sub_02058A18(int param0, int param1);
 static BOOL sub_020586A8(int param0, int param1, int param2, int param3);
 static void sub_02057BC4(void * param0);
 static void sub_02057C2C(void * param0);
-static void sub_02057C8C(u8 param0);
+static void CommPlayer_Add(u8 param0);
 static void sub_0205820C(SysTask * param0, void * param1);
 static void sub_02057E80(SysTask * param0, void * param1);
 static void sub_02057EF8(void * param0);
@@ -65,7 +66,7 @@ CommPlayerData * CommPlayerData_Get (void)
     return sCommPlayerData;
 }
 
-BOOL CommPlayerManager_Init (void * dest, FieldSystem * fieldSys, BOOL param2)
+BOOL CommPlayerManager_Init (void * dest, FieldSystem * fieldSys, BOOL isUnderground)
 {
     int netId;
 
@@ -78,17 +79,17 @@ BOOL CommPlayerManager_Init (void * dest, FieldSystem * fieldSys, BOOL param2)
         MI_CpuFill8(sCommPlayerData, 0, sizeof(CommPlayerData));
     }
 
-    sCommPlayerData->unk_2BE = param2;
+    sCommPlayerData->isUnderground = isUnderground;
     sCommPlayerData->unk_04 = NULL;
 
-    if (param2) {
-        sCommPlayerData->unk_04 = Heap_AllocFromHeap(15, ov23_02249918());
+    if (isUnderground) {
+        sCommPlayerData->unk_04 = Heap_AllocFromHeap(HEAP_ID_COMMUNICATION, ov23_02249918());
         ov23_0224991C(sCommPlayerData->unk_04);
     }
 
     sCommPlayerData->fieldSys = fieldSys;
 
-    for (netId = 0; netId < (7 + 1); netId++) {
+    for (netId = 0; netId < MAX_CONNECTED_PLAYERS; netId++) {
         sCommPlayerData->playerLocation[netId].dir = -1;
         sCommPlayerData->playerLocation[netId].x = 0xffff;
         sCommPlayerData->playerLocation[netId].z = 0xffff;
@@ -106,55 +107,53 @@ BOOL CommPlayerManager_Init (void * dest, FieldSystem * fieldSys, BOOL param2)
 
     sCommPlayerData->unk_2BC = 0;
     sCommPlayerData->unk_2BF = 0;
-    sCommPlayerData->unk_50 = SysTask_Start(sub_02057E80, NULL, (100 + 100));
+    sCommPlayerData->task = SysTask_Start(sub_02057E80, NULL, (100 + 100));
 
-    sub_02035EA8();
-    sub_020578DC();
+    CommSys_EnableSendMovementData();
+    CommPlayer_InitPersonal();
 
     return 1;
 }
 
-void sub_0205764C (void)
+void CommPlayerMan_Reset (void)
 {
-    int v0;
+    int netId;
 
     if (sCommPlayerData == NULL) {
         return;
     }
 
-    for (v0 = 0; v0 < (7 + 1); v0++) {
-        if (sCommPlayerData->unk_2BE) {
-            sub_02057DB8(v0, 1, 0);
+    for (netId = 0; netId < MAX_CONNECTED_PLAYERS; netId++) {
+        if (sCommPlayerData->isUnderground) {
+            CommPlayer_Destory(netId, TRUE, FALSE);
         } else {
-            sub_02057DB8(v0, 1, 1);
+            CommPlayer_Destory(netId, TRUE, TRUE);
         }
     }
 
-    if (sCommPlayerData->unk_2BE) {
-        sCommPlayerData->unk_2BD = 1;
+    if (sCommPlayerData->isUnderground) {
+        sCommPlayerData->isResetting = TRUE;
     }
 }
 
-void sub_020576A0 (void)
+void CommPlayerMan_Restart (void)
 {
-    int v0, v1;
-
     if (sCommPlayerData == NULL) {
         return;
     }
 
     sCommPlayerData->unk_2BB = 1;
-    sCommPlayerData->unk_2BD = 0;
+    sCommPlayerData->isResetting = 0;
 
-    sub_020578DC();
-    sub_02057AE4(1);
+    CommPlayer_InitPersonal();
+    CommPlayer_SendPos(1);
 }
 
-void sub_020576CC (BOOL param0)
+void CommPlayerMan_Delete (BOOL deletePlayerData)
 {
-    int v0, v1;
+    int netId, v1;
 
-    if (sCommPlayerData) {
+    if (sCommPlayerData != NULL) {
         for (v1 = 0; v1 < 5; v1++) {
             if (sCommPlayerData->unk_27C[v1]) {
                 Heap_FreeToHeap(sCommPlayerData->unk_27C[v1]);
@@ -166,11 +165,11 @@ void sub_020576CC (BOOL param0)
             sub_0206DF60(sCommPlayerData->fieldSys, sCommPlayerData->unk_2B2);
         }
 
-        for (v0 = 0; v0 < (7 + 1); v0++) {
-            sub_02057DB8(v0, 0, param0);
+        for (netId = 0; netId < MAX_CONNECTED_PLAYERS; netId++) {
+            CommPlayer_Destory(netId, FALSE, deletePlayerData);
         }
 
-        SysTask_Done(sCommPlayerData->unk_50);
+        SysTask_Done(sCommPlayerData->task);
 
         if (sCommPlayerData->unk_04) {
             ov23_02249938(sCommPlayerData->unk_04);
@@ -182,79 +181,79 @@ void sub_020576CC (BOOL param0)
     }
 }
 
-void sub_02057764 (void)
+void CommPlayerMan_Reinit (void)
 {
-    int v0, v1;
+    int netId, v1;
 
-    for (v0 = 0; v0 < (7 + 1); v0++) {
-        if (sCommPlayerData->unk_2BE) {
-            ov23_0224AF4C(v0);
-            ov23_0224AD98(v0);
+    for (netId = 0; netId < MAX_CONNECTED_PLAYERS; netId++) {
+        if (sCommPlayerData->isUnderground) {
+            ov23_0224AF4C(netId);
+            ov23_0224AD98(netId);
 
-            if (v0 != 0) {
-                ov23_0224AE60(v0);
+            if (netId != 0) {
+                ov23_0224AE60(netId);
             }
         }
 
-        if (sCommPlayerData->unk_08[v0] != NULL) {
-            if (sCommPlayerData->fieldSys->unk_3C != sCommPlayerData->unk_08[v0]) {
-                if (sCommPlayerData->unk_2BE) {
-                    sub_0205E8E8(sCommPlayerData->unk_08[v0]);
+        if (sCommPlayerData->unk_08[netId] != NULL) {
+            if (sCommPlayerData->fieldSys->unk_3C != sCommPlayerData->unk_08[netId]) {
+                if (sCommPlayerData->isUnderground) {
+                    sub_0205E8E8(sCommPlayerData->unk_08[netId]);
                 }
             }
 
-            sCommPlayerData->unk_08[v0] = NULL;
+            sCommPlayerData->unk_08[netId] = NULL;
         }
 
-        sCommPlayerData->unk_48[v0] = 0;
-        sCommPlayerData->playerLocation[v0].dir = -1;
-        sCommPlayerData->playerLocation[v0].x = 0xffff;
-        sCommPlayerData->playerLocation[v0].z = 0xffff;
-        sCommPlayerData->playerLocation[v0].moveSpeed = 2;
-        sCommPlayerData->playerLocationServer[v0].dir = -1;
-        sCommPlayerData->playerLocationServer[v0].x = 0xffff;
-        sCommPlayerData->playerLocationServer[v0].z = 0xffff;
-        sCommPlayerData->playerLocationServer[v0].moveSpeed = 2;
-        sCommPlayerData->unk_102[v0] = -1;
-        sCommPlayerData->unk_10A[v0] = 0;
-        sCommPlayerData->unk_E2[v0] = 0;
-        sCommPlayerData->unk_EA[v0] = 1;
-        sCommPlayerData->unk_F2[v0] = 0;
-        sCommPlayerData->unk_13A[v0] = 0;
-        sCommPlayerData->unk_142[v0] = 0;
+        sCommPlayerData->unk_48[netId] = 0;
+        sCommPlayerData->playerLocation[netId].dir = -1;
+        sCommPlayerData->playerLocation[netId].x = 0xffff;
+        sCommPlayerData->playerLocation[netId].z = 0xffff;
+        sCommPlayerData->playerLocation[netId].moveSpeed = 2;
+        sCommPlayerData->playerLocationServer[netId].dir = -1;
+        sCommPlayerData->playerLocationServer[netId].x = 0xffff;
+        sCommPlayerData->playerLocationServer[netId].z = 0xffff;
+        sCommPlayerData->playerLocationServer[netId].moveSpeed = 2;
+        sCommPlayerData->unk_102[netId] = -1;
+        sCommPlayerData->unk_10A[netId] = 0;
+        sCommPlayerData->unk_E2[netId] = 0;
+        sCommPlayerData->unk_EA[netId] = 1;
+        sCommPlayerData->unk_F2[netId] = 0;
+        sCommPlayerData->unk_13A[netId] = 0;
+        sCommPlayerData->unk_142[netId] = 0;
     }
 
     sCommPlayerData->unk_2BF = 0;
-    sub_020578DC();
+    CommPlayer_InitPersonal();
 
-    if (sCommPlayerData->unk_50 == NULL) {
-        sCommPlayerData->unk_50 = SysTask_Start(sub_02057E80, NULL, (100 + 100));
+    if (sCommPlayerData->task == NULL) {
+        sCommPlayerData->task = SysTask_Start(sub_02057E80, NULL, (100 + 100));
     }
 }
 
-void sub_020578B0 (void)
+void CommPlayerMan_Stop (void)
 {
-    if (sCommPlayerData->unk_50) {
+    if (sCommPlayerData->task) {
         sub_02057E80(NULL, NULL);
-        SysTask_Done(sCommPlayerData->unk_50);
+        SysTask_Done(sCommPlayerData->task);
     }
 
-    sCommPlayerData->unk_50 = NULL;
+    sCommPlayerData->task = NULL;
 }
 
-void sub_020578DC (void)
+void CommPlayer_InitPersonal (void)
 {
     sCommPlayerData->unk_08[CommSys_CurNetId()] = sCommPlayerData->fieldSys->unk_3C;
     sCommPlayerData->unk_48[CommSys_CurNetId()] = 1;
-    sCommPlayerData->playerLocation[CommSys_CurNetId()].x = sub_0205EABC(sCommPlayerData->fieldSys->unk_3C);
-    sCommPlayerData->playerLocation[CommSys_CurNetId()].z = sub_0205EAC8(sCommPlayerData->fieldSys->unk_3C);
-    sCommPlayerData->playerLocation[CommSys_CurNetId()].dir = sub_0205EA78(sCommPlayerData->fieldSys->unk_3C);
-    sCommPlayerData->playerLocationServer[CommSys_CurNetId()].x = sub_0205EABC(sCommPlayerData->fieldSys->unk_3C);
-    sCommPlayerData->playerLocationServer[CommSys_CurNetId()].z = sub_0205EAC8(sCommPlayerData->fieldSys->unk_3C);
-    sCommPlayerData->playerLocationServer[CommSys_CurNetId()].dir = sub_0205EA78(sCommPlayerData->fieldSys->unk_3C);
+    sCommPlayerData->playerLocation[CommSys_CurNetId()].x = Player_XPos(sCommPlayerData->fieldSys->unk_3C);
+    sCommPlayerData->playerLocation[CommSys_CurNetId()].z = Player_ZPos(sCommPlayerData->fieldSys->unk_3C);
+    sCommPlayerData->playerLocation[CommSys_CurNetId()].dir = Player_Dir(sCommPlayerData->fieldSys->unk_3C);
+    sCommPlayerData->playerLocationServer[CommSys_CurNetId()].x = Player_XPos(sCommPlayerData->fieldSys->unk_3C);
+    sCommPlayerData->playerLocationServer[CommSys_CurNetId()].z = Player_ZPos(sCommPlayerData->fieldSys->unk_3C);
+    sCommPlayerData->playerLocationServer[CommSys_CurNetId()].dir = Player_Dir(sCommPlayerData->fieldSys->unk_3C);
 }
 
-void sub_020579BC (int param0)
+void CommPlayer_CopyPersonal (int param0)
 {
     int v0;
 
@@ -279,10 +278,10 @@ void sub_020579BC (int param0)
     sCommPlayerData->unk_14A[param0].unk_20 = 0xff;
 }
 
-void sub_02057A94 (BOOL param0, int param1, int param2)
+void CommPlayer_SendXZPos (BOOL param0, int param1, int param2)
 {
     u8 v0[5 + 1];
-    int v1 = sub_0205EA78(sCommPlayerData->fieldSys->unk_3C);
+    int v1 = Player_Dir(sCommPlayerData->fieldSys->unk_3C);
 
     v0[0] = param1;
     v0[1] = param1 >> 8;
@@ -298,20 +297,20 @@ void sub_02057A94 (BOOL param0, int param1, int param2)
     sCommPlayerData->unk_2BB = 1;
 }
 
-void sub_02057AE4 (BOOL param0)
+void CommPlayer_SendPos (BOOL param0)
 {
-    int v0 = sub_0205EABC(sCommPlayerData->fieldSys->unk_3C);
-    int v1 = sub_0205EAC8(sCommPlayerData->fieldSys->unk_3C);
+    int v0 = Player_XPos(sCommPlayerData->fieldSys->unk_3C);
+    int v1 = Player_ZPos(sCommPlayerData->fieldSys->unk_3C);
 
-    sub_02057A94(param0, v0, v1);
+    CommPlayer_SendXZPos(param0, v0, v1);
 }
 
-void sub_02057B14 (BOOL param0)
+void CommPlayer_SendPosServer (BOOL param0)
 {
     int v0 = sCommPlayerData->playerLocationServer[CommSys_CurNetId()].x;
     int v1 = sCommPlayerData->playerLocationServer[CommSys_CurNetId()].z;
 
-    sub_02057A94(param0, v0, v1);
+    CommPlayer_SendXZPos(param0, v0, v1);
 }
 
 static void sub_02057B48 (int param0, const CommPlayerLocation * playerLocation)
@@ -353,7 +352,7 @@ void sub_02057BC4 (void * param0)
 
     if ((0 == v0) && CommSys_IsPlayerConnected(CommSys_CurNetId())) {
         if (!sCommPlayerData->unk_2BA) {
-            sub_02057AE4(1);
+            CommPlayer_SendPos(1);
             sCommPlayerData->unk_2BA = 1;
         }
     }
@@ -381,12 +380,12 @@ static void sub_02057C2C (void * param0)
     sCommPlayerData->unk_2BB = 0;
 }
 
-u32 sub_02057C84 (void)
+u32 CommPlayer_Size (void)
 {
     return sizeof(CommPlayerData);
 }
 
-static void sub_02057C8C (u8 param0)
+static void CommPlayer_Add (u8 param0)
 {
     fx32 v0, v1;
     UnkStruct_0205E884 * v2;
@@ -395,7 +394,7 @@ static void sub_02057C8C (u8 param0)
         return;
     }
 
-    if (sCommPlayerData->unk_2BD) {
+    if (sCommPlayerData->isResetting) {
         return;
     }
 
@@ -407,7 +406,7 @@ static void sub_02057C8C (u8 param0)
         }
 
         if (v3) {
-            if (!sCommPlayerData->unk_2BE) {
+            if (!sCommPlayerData->isUnderground) {
                 if (param0 != CommSys_CurNetId()) {
                     UnkStruct_02061AB4 * v4 = sub_0206251C(sCommPlayerData->fieldSys->unk_38, 0xff + param0 + 1);
 
@@ -432,24 +431,24 @@ static void sub_02057C8C (u8 param0)
 
             sub_0206290C(sub_0205EB3C(v2), 0xff + param0 + 1);
 
-            if (sCommPlayerData->unk_2BE) {
+            if (sCommPlayerData->isUnderground) {
                 ov23_02243038(param0);
             }
 
-            if (sCommPlayerData->unk_2BE && !sCommPlayerData->unk_48[param0]) {
-                if (!sCommPlayerData->unk_2BD) {
+            if (sCommPlayerData->isUnderground && !sCommPlayerData->unk_48[param0]) {
+                if (!sCommPlayerData->isResetting) {
                     ov5_021F5634(sCommPlayerData->fieldSys, sCommPlayerData->playerLocation[param0].x, 0, sCommPlayerData->playerLocation[param0].z);
                 }
 
                 sCommPlayerData->unk_48[param0] = 1;
-            } else if (!sCommPlayerData->unk_2BE) {
+            } else if (!sCommPlayerData->isUnderground) {
                 sCommPlayerData->unk_48[param0] = 1;
             }
         }
     }
 }
 
-void sub_02057DB8 (u8 param0, BOOL param1, BOOL param2)
+void CommPlayer_Destory (u8 param0, BOOL param1, BOOL param2)
 {
     int v0;
 
@@ -459,13 +458,13 @@ void sub_02057DB8 (u8 param0, BOOL param1, BOOL param2)
 
     MI_CpuClear8(sCommPlayerData->unk_5A, (7 + 1));
 
-    if (sCommPlayerData->unk_2BE) {
+    if (sCommPlayerData->isUnderground) {
         ov23_0224AF4C(param0);
     }
 
     if (sCommPlayerData->unk_08[param0] != NULL) {
         if (sCommPlayerData->fieldSys->unk_3C != sCommPlayerData->unk_08[param0]) {
-            if (sCommPlayerData->unk_2BE || param2) {
+            if (sCommPlayerData->isUnderground || param2) {
                 sub_0205E8E8(sCommPlayerData->unk_08[param0]);
             } else {
                 sub_0205E8E0(sCommPlayerData->unk_08[param0]);
@@ -484,7 +483,7 @@ void sub_02057DB8 (u8 param0, BOOL param1, BOOL param2)
     if (!param1) {
         sCommPlayerData->unk_FA[param0] = 0;
 
-        if (sCommPlayerData->unk_2BE) {
+        if (sCommPlayerData->isUnderground) {
             ov23_0224AE60(param0);
 
             if (param0 != 0) {
@@ -494,7 +493,7 @@ void sub_02057DB8 (u8 param0, BOOL param1, BOOL param2)
     }
 }
 
-static void sub_02057E68 ()
+static void CommPlayer_SendMoveSpeed ()
 {
     u8 v0 = 2;
 
@@ -510,7 +509,7 @@ static void sub_02057E80 (SysTask * param0, void * param1)
     int v0;
 
     if (CommSys_IsInitialized()) {
-        sub_02057E68();
+        CommPlayer_SendMoveSpeed();
 
         if (CommSys_CurNetId() == 0) {
             sub_02057C2C(param1);
@@ -527,7 +526,7 @@ static void sub_02057E80 (SysTask * param0, void * param1)
     }
 
     for (v0 = 0; v0 < (7 + 1); v0++) {
-        if (sCommPlayerData->unk_2BE) {
+        if (sCommPlayerData->isUnderground) {
             if (CommSys_CurNetId() == 0) {
                 if (NULL == CommInfo_TrainerInfo(v0)) {
                     ov23_0224B5CC(v0);
@@ -544,7 +543,7 @@ static void sub_02057EF8 (void * param0)
     for (v0 = 0; v0 < (7 + 1); v0++) {
         if (!CommSys_IsPlayerConnected(v0)) {
             if (!(sub_02036180() && (v0 == 0))) {
-                if ((CommSys_CurNetId() == 0) && (sCommPlayerData->unk_2BE)) {
+                if ((CommSys_CurNetId() == 0) && (sCommPlayerData->isUnderground)) {
                     ov23_0224D898(v0);
                 }
             }
@@ -553,12 +552,12 @@ static void sub_02057EF8 (void * param0)
         if (CommSys_IsPlayerConnected(v0) || (sub_02036180() && (v0 == 0))) {
             sub_020587C0(v0);
 
-            if (sCommPlayerData->unk_2BE) {
+            if (sCommPlayerData->isUnderground) {
                 ov23_0224AF7C(v0);
             }
         } else {
             if (sCommPlayerData->unk_48[v0]) {
-                if ((CommSys_CurNetId() == 0) && (sCommPlayerData->unk_2BE)) {
+                if ((CommSys_CurNetId() == 0) && (sCommPlayerData->isUnderground)) {
                     ov23_022436F0(v0);
                     ov23_02241648(v0);
                 }
@@ -621,7 +620,7 @@ void sub_0205805C (FieldSystem * param0, BOOL param1)
         return;
     }
 
-    if (!sCommPlayerData->unk_2BE) {
+    if (!sCommPlayerData->isUnderground) {
         sub_02057FF0(param1);
         sCommPlayerData->unk_2C1 = param1;
     }
@@ -635,7 +634,7 @@ void sub_0205805C (FieldSystem * param0, BOOL param1)
     }
 
     if (CommSys_IsInitialized() && (CommSys_CurNetId() == 0)) {
-        if (!sCommPlayerData->unk_2BE) {
+        if (!sCommPlayerData->isUnderground) {
             sub_020591A8();
         }
     }
@@ -698,7 +697,7 @@ static BOOL sub_0205814C (int param0, int param1, int param2)
             return 1;
         }
 
-        if (sCommPlayerData->unk_2BE) {
+        if (sCommPlayerData->isUnderground) {
             if (!ov23_0224D1A0(param0, param1)) {
                 return 1;
             }
@@ -745,7 +744,7 @@ static void sub_0205820C (SysTask * param0, void * param1)
                 v8 = ov23_0224993C(sCommPlayerData->unk_04, v5);
             }
 
-            if (sCommPlayerData->unk_2BE) {
+            if (sCommPlayerData->isUnderground) {
                 if (ov23_0224C1C8(v5)) {
                     continue;
                 }
@@ -756,7 +755,7 @@ static void sub_0205820C (SysTask * param0, void * param1)
             }
 
             if (sCommPlayerData->unk_13A[v5] == 0) {
-                if (sCommPlayerData->unk_2BE) {
+                if (sCommPlayerData->isUnderground) {
                     if (ov23_0224444C(v5)) {
                         continue;
                     }
@@ -825,7 +824,7 @@ static void sub_0205820C (SysTask * param0, void * param1)
                     }
                 } else if (sCommPlayerData->unk_122[v5] != 0) {
                     continue;
-                } else if (sCommPlayerData->unk_2BE && (ov23_0224B8E0(v5, v3, v4) == 1)) {
+                } else if (sCommPlayerData->isUnderground && (ov23_0224B8E0(v5, v3, v4) == 1)) {
                     continue;
                 } else if (sub_0205814C(v3, v4, v5)) {
                     playerLocation->unk_07 = 1;
@@ -906,15 +905,15 @@ void sub_0205853C (int param0, int param1, void * param2, void * param3)
         return;
     }
 
-    if (sCommPlayerData->unk_2BE) {
+    if (sCommPlayerData->isUnderground) {
         ov23_022430B8(v1);
 
-        if (!sCommPlayerData->unk_2BD) {
+        if (!sCommPlayerData->isResetting) {
             ov5_021F5634(sCommPlayerData->fieldSys, sCommPlayerData->playerLocation[v1].x, 0, sCommPlayerData->playerLocation[v1].z);
         }
     }
 
-    sub_02057DB8(v1, 0, 0);
+    CommPlayer_Destory(v1, 0, 0);
     CommInfo_InitPlayer(v1);
 }
 
@@ -957,7 +956,7 @@ void sub_020585A8 (int param0, int param1, void * param2, void * param3)
     playerLocation->dir = ((v1[0] >> 4) & 0x3);
     playerLocation->moveSpeed = ((v1[0] >> 6) & 0x3);
 
-    sub_02057C8C(v3);
+    CommPlayer_Add(v3);
 }
 
 static void sub_02058644 (int param0)
@@ -965,7 +964,7 @@ static void sub_02058644 (int param0)
     UnkStruct_020298B0 * v0 = sub_020298B0(sub_0203D174(sCommPlayerData->fieldSys));
     UnkStruct_0202855C * v1 = sub_020298A0(sub_0203D174(sCommPlayerData->fieldSys));
 
-    if (sCommPlayerData->unk_2BE) {
+    if (sCommPlayerData->isUnderground) {
         if (param0 == CommSys_CurNetId()) {
             sub_0202929C(v0);
 
@@ -994,7 +993,7 @@ static BOOL sub_020586A8 (int param0, int param1, int param2, int param3)
 
     v0 = sub_0205EB3C(sCommPlayerData->unk_08[param0]);
 
-    if (sub_0205EA78(sCommPlayerData->unk_08[param0]) != sub_02059328(sCommPlayerData->unk_102[param0])) {
+    if (Player_Dir(sCommPlayerData->unk_08[param0]) != sub_02059328(sCommPlayerData->unk_102[param0])) {
         sub_020628C4(v0, (1 << 7));
         sub_0205EA84(sCommPlayerData->unk_08[param0], sub_02059328(sCommPlayerData->unk_102[param0]));
         sub_020628BC(v0, (1 << 7));
@@ -1044,11 +1043,11 @@ static void sub_020587C0 (int param0)
         return;
     }
 
-    if (sCommPlayerData->unk_2BD) {
+    if (sCommPlayerData->isResetting) {
         return;
     }
 
-    if (!sCommPlayerData->unk_2BE) {
+    if (!sCommPlayerData->isUnderground) {
         if (param0 == CommSys_CurNetId()) {
             if (!sCommPlayerData->unk_2C1) {
                 return;
@@ -1059,9 +1058,9 @@ static void sub_020587C0 (int param0)
     v4 = sCommPlayerData->unk_08[param0];
 
     if (v4) {
-        int v6 = sub_0205EABC(v4) - playerLocation->x;
-        int v7 = sub_0205EAC8(v4) - playerLocation->z;
-        int v8 = sub_0205EA78(v4);
+        int v6 = Player_XPos(v4) - playerLocation->x;
+        int v7 = Player_ZPos(v4) - playerLocation->z;
+        int v8 = Player_Dir(v4);
 
         if ((v6 == 0) && (v7 == 0)) {
             v2 = 0;
@@ -1111,7 +1110,7 @@ static void sub_020587C0 (int param0)
 
             if (sCommPlayerData->unk_2C0 && (param0 == CommSys_CurNetId())) {
                 sCommPlayerData->unk_2C0--;
-            } else if (!sub_02035EE0() && sCommPlayerData->unk_2BE && (param0 == CommSys_CurNetId())) {
+            } else if (!sub_02035EE0() && sCommPlayerData->isUnderground && (param0 == CommSys_CurNetId())) {
                 v9 = sub_0206147C(
                     v4, v2, v2, v10, 1, 0);
             } else if (((v2 & ~PAD_BUTTON_B) == 0) && (playerLocation->unk_07)) {
@@ -1304,7 +1303,7 @@ BOOL sub_02058C40 (void)
         return 0;
     }
 
-    if (sCommPlayerData->unk_2BE && !ov23_02249BD4()) {
+    if (sCommPlayerData->isUnderground && !ov23_02249BD4()) {
         return 0;
     }
 
@@ -1712,7 +1711,7 @@ void sub_020593F4 (int param0)
 {
     sub_0205EA84(sCommPlayerData->fieldSys->unk_3C, param0);
     sCommPlayerData->playerLocation[CommSys_CurNetId()].dir = param0;
-    sub_02057AE4(0);
+    CommPlayer_SendPos(0);
 }
 
 void sub_02059424 (int param0, int param1)
@@ -1727,7 +1726,7 @@ int sub_02059444 (int param0)
         return -1;
     }
 
-    return sub_0205EA78(sCommPlayerData->unk_08[param0]);
+    return Player_Dir(sCommPlayerData->unk_08[param0]);
 }
 
 void sub_02059464 (int param0)
@@ -1782,7 +1781,7 @@ void sub_02059514 (void)
 void sub_02059524 (void)
 {
     if (sCommPlayerData->unk_2BF == 0) {
-        if (!sCommPlayerData->unk_2BE) {
+        if (!sCommPlayerData->isUnderground) {
             sub_02059514();
             sCommPlayerData->unk_2BF = 1;
         } else if (ov23_02243298(CommSys_CurNetId())) {
@@ -1797,7 +1796,7 @@ void sub_02059524 (void)
 void sub_02059570 (void)
 {
     if (sCommPlayerData->unk_2BF == 0) {
-        if (sCommPlayerData->unk_2BE) {
+        if (sCommPlayerData->isUnderground) {
             if (!ov23_02243298(CommSys_CurNetId())) {
                 sub_02057FC4(0);
             }
diff --git a/src/unk_0205A0D8.c b/src/unk_0205A0D8.c
index 06cb75d025..ab6e250387 100644
--- a/src/unk_0205A0D8.c
+++ b/src/unk_0205A0D8.c
@@ -236,7 +236,7 @@ static BOOL sub_0205A2DC (UnkStruct_0205A0D8 * param0)
 {
     if (sub_020509DC(param0->unk_24)) {
         ov5_021D1744(1);
-        sub_020576A0();
+        CommPlayerMan_Restart();
         return 1;
     }
 
@@ -1069,7 +1069,7 @@ static BOOL sub_0205B140 (UnkStruct_020508D4 * param0)
     case 6:
         if (!sub_020509DC(v0)) {
             ov5_021D1744(1);
-            sub_020576A0();
+            CommPlayerMan_Restart();
             v1->unk_28++;
         }
         break;
diff --git a/src/unk_0205C22C.c b/src/unk_0205C22C.c
index 6171775582..9e1de51be6 100644
--- a/src/unk_0205C22C.c
+++ b/src/unk_0205C22C.c
@@ -251,8 +251,8 @@ static void sub_0205C51C (UnkStruct_0205C22C * param0, UnkStruct_02061830 * para
 
     GF_ASSERT(param0->unk_08 != NULL);
 
-    v2 = sub_0205EABC(param0->unk_08);
-    v3 = sub_0205EAC8(param0->unk_08);
+    v2 = Player_XPos(param0->unk_08);
+    v3 = Player_ZPos(param0->unk_08);
 
     for (v1 = 0; v1 < 50; v1++) {
         v0 = sub_0206251C(param1, v1 + 1);
diff --git a/src/unk_0205E7D0.c b/src/unk_0205E7D0.c
index 1a08caf94a..8a83829df2 100644
--- a/src/unk_0205E7D0.c
+++ b/src/unk_0205E7D0.c
@@ -104,9 +104,9 @@ void sub_0205E884 (UnkStruct_0205E884 * param0, int param1)
 
     if (sub_0205EB74(param0) == 0x2) {
         if (param1 != 9) {
-            int v4 = sub_0205EABC(param0);
-            int v5 = sub_0205EAC8(param0);
-            int v6 = sub_0205EA78(param0);
+            int v4 = Player_XPos(param0);
+            int v5 = Player_ZPos(param0);
+            int v6 = Player_Dir(param0);
             UnkStruct_ov101_021D5D90 * v7 = ov5_021F261C(v2, v4, v5, v6, 1);
 
             sub_0205EC00(param0, v7);
@@ -201,7 +201,7 @@ static UnkStruct_02061AB4 * sub_0205EA64 (const UnkStruct_02061830 * param0)
     return v0;
 }
 
-int sub_0205EA78 (UnkStruct_0205E884 * const param0)
+int Player_Dir (UnkStruct_0205E884 * const param0)
 {
     return sub_0206298C(sub_0205EB3C(param0));
 }
@@ -219,18 +219,18 @@ int sub_0205EA94 (UnkStruct_0205E884 * const param0)
 int sub_0205EAA0 (UnkStruct_0205E884 * const param0)
 {
     if (sub_0205F16C(param0) == 1) {
-        return sub_0205EA78(param0);
+        return Player_Dir(param0);
     }
 
     return sub_0205EA94(param0);
 }
 
-int sub_0205EABC (UnkStruct_0205E884 * const param0)
+int Player_XPos (UnkStruct_0205E884 * const param0)
 {
     return sub_02063020(sub_0205EB3C(param0));
 }
 
-int sub_0205EAC8 (UnkStruct_0205E884 * const param0)
+int Player_ZPos (UnkStruct_0205E884 * const param0)
 {
     return sub_02063040(sub_0205EB3C(param0));
 }
diff --git a/src/unk_0205F180.c b/src/unk_0205F180.c
index e6e60f7320..1e6b0f7bb3 100644
--- a/src/unk_0205F180.c
+++ b/src/unk_0205F180.c
@@ -864,7 +864,7 @@ static int sub_0205FCC0 (UnkStruct_0205E884 * param0, int param1)
         return 0;
     }
 
-    v0 = sub_0205EA78(param0);
+    v0 = Player_Dir(param0);
 
     {
         int v1 = sub_0205F108(param0);
@@ -1329,7 +1329,7 @@ static int sub_020604E4 (UnkStruct_0205E884 * param0, int param1)
         return 0;
     }
 
-    v0 = sub_0205EA78(param0);
+    v0 = Player_Dir(param0);
     sub_0205EF98(param0, 0);
 
     if ((v0 != param1) && (sub_0205EB0C(param0) != 1)) {
@@ -1532,7 +1532,7 @@ static int sub_02060850 (UnkStruct_0205E884 * param0, int param1)
         return 3;
     }
 
-    v0 = sub_0205EA78(param0);
+    v0 = Player_Dir(param0);
 
     if ((v0 != param1) && (sub_0205EB0C(param0) != 1)) {
         if (v1 < 2) {
@@ -2278,7 +2278,7 @@ u32 sub_0206147C (UnkStruct_0205E884 * param0, u16 param1, u16 param2, int param
     sub_0205EB08(param0, v2);
 
     if (v2 == 0) {
-        v1 = sub_0205EA78(param0);
+        v1 = Player_Dir(param0);
         v0 = sub_02065838(v1, 0x0);
         return v0;
     }
@@ -2358,13 +2358,13 @@ u32 sub_0206156C (UnkStruct_0205E884 * param0, int param1)
 
 void sub_0206157C (UnkStruct_0205E884 * param0, int param1, int * param2, int * param3)
 {
-    *param2 = sub_0205EABC(param0) + sub_0206419C(param1);
-    *param3 = sub_0205EAC8(param0) + sub_020641A8(param1);
+    *param2 = Player_XPos(param0) + sub_0206419C(param1);
+    *param3 = Player_ZPos(param0) + sub_020641A8(param1);
 }
 
 void sub_020615AC (UnkStruct_0205E884 * param0, int * param1, int * param2)
 {
-    int v0 = sub_0205EA78(param0);
+    int v0 = Player_Dir(param0);
     sub_0206157C(param0, v0, param1, param2);
 }
 
diff --git a/src/unk_0206450C.c b/src/unk_0206450C.c
index 22c14c3954..9fbde4c131 100644
--- a/src/unk_0206450C.c
+++ b/src/unk_0206450C.c
@@ -1320,8 +1320,8 @@ static int sub_0206537C (UnkStruct_02061AB4 * param0)
         }
 
         {
-            int v8 = sub_0205EABC(v2);
-            int v9 = sub_0205EAC8(v2);
+            int v8 = Player_XPos(v2);
+            int v9 = Player_ZPos(v2);
             int v10 = sub_020629D8(param0, 0);
             int v11 = sub_02063020(param0);
             int v12 = sub_02063040(param0);
@@ -1376,8 +1376,8 @@ static int sub_02065448 (UnkStruct_02061AB4 * param0, int param1, int param2)
                 int v7 = sub_02063040(param0);
                 FieldSystem * v8 = sub_02062C00(param0);
                 UnkStruct_0205E884 * v9 = sub_0205EF3C(v8);
-                int v10 = sub_0205EABC(v9);
-                int v11 = sub_0205EAC8(v9);
+                int v10 = Player_XPos(v9);
+                int v11 = Player_ZPos(v9);
 
                 if (v6 > v10) {
                     v4 = 2;
diff --git a/src/unk_02067A84.c b/src/unk_02067A84.c
index d440f6a479..c3fd0d30b8 100644
--- a/src/unk_02067A84.c
+++ b/src/unk_02067A84.c
@@ -172,8 +172,8 @@ static int sub_02067C80 (const UnkStruct_02061AB4 * param0, UnkStruct_0205E884 *
     v0 = sub_02067C54(param0);
 
     if (v0 == 0x1) {
-        v3 = sub_0205EABC(param1);
-        v4 = sub_0205EAC8(param1);
+        v3 = Player_XPos(param1);
+        v4 = Player_ZPos(param1);
         v2 = sub_0206298C(param0);
         v1 = sub_020629D8(param0, 0);
         v5 = sub_02067DA8(param0, v2, v1, v3, v4, 0);
@@ -189,8 +189,8 @@ static int sub_02067C80 (const UnkStruct_02061AB4 * param0, UnkStruct_0205E884 *
     }
 
     if (v0 == 0x2) {
-        v3 = sub_0205EABC(param1);
-        v4 = sub_0205EAC8(param1);
+        v3 = Player_XPos(param1);
+        v4 = Player_ZPos(param1);
         v1 = sub_020629D8(param0, 0);
         v2 = 0;
 
@@ -215,8 +215,8 @@ static int sub_02067C80 (const UnkStruct_02061AB4 * param0, UnkStruct_0205E884 *
 
 int sub_02067D58 (const UnkStruct_02061AB4 * param0, UnkStruct_0205E884 * param1, int param2, int param3)
 {
-    int v0 = sub_0205EABC(param1);
-    int v1 = sub_0205EAC8(param1);
+    int v0 = Player_XPos(param1);
+    int v1 = Player_ZPos(param1);
     int v2 = sub_02067DA8(param0, param2, param3, v0, v1, 0);
 
     if (v2 != -1) {
@@ -648,7 +648,7 @@ static int sub_02068264 (UnkStruct_020EF6D0 * param0)
     v2 = sub_0205EB3C(param0->unk_28);
     v1 = sub_02064488(sub_02063020(v2), sub_02063040(v2), sub_02063020(param0->unk_24), sub_02063040(param0->unk_24));
 
-    if ((sub_0205EA78(param0->unk_28) != v1) && ((param0->unk_18 == 0) || (param0->unk_14 == 2))) {
+    if ((Player_Dir(param0->unk_28) != v1) && ((param0->unk_18 == 0) || (param0->unk_14 == 2))) {
         if (sub_020655F4(v2) == 1) {
             sub_020628C4(v2, (1 << 7));
             v0 = sub_02065838(v1, 0x0);
diff --git a/src/unk_020683F4.c b/src/unk_020683F4.c
index d15e62b34d..423008de71 100644
--- a/src/unk_020683F4.c
+++ b/src/unk_020683F4.c
@@ -221,12 +221,12 @@ void sub_0206842C (FieldSystem * param0, UnkStruct_020684D0 * param1)
     param1->unk_04 = sub_0206A984(SaveData_Events(param0->unk_0C));
     param1->unk_08 = sub_0205EB74(param0->unk_3C);
 
-    v0 = sub_0205EABC(param0->unk_3C);
-    v1 = sub_0205EAC8(param0->unk_3C);
+    v0 = Player_XPos(param0->unk_3C);
+    v1 = Player_ZPos(param0->unk_3C);
 
     param1->unk_0E = sub_02054F94(param0, v0, v1);
 
-    v2 = sub_0205EA78(param0->unk_3C);
+    v2 = Player_Dir(param0->unk_3C);
 
     switch (v2) {
     case 0:
@@ -443,8 +443,8 @@ static u32 sub_0206877C (const UnkStruct_020684D0 * param0)
     {
         u16 v0, v1;
 
-        v0 = sub_0205EABC(param0->unk_18->unk_3C);
-        v1 = sub_0205EAC8(param0->unk_18->unk_3C);
+        v0 = Player_XPos(param0->unk_18->unk_3C);
+        v1 = Player_ZPos(param0->unk_18->unk_3C);
 
         if (sub_0203A6A4(param0->unk_18, v0, v1) == 0) {
             return -1;
diff --git a/src/unk_02069BE0.c b/src/unk_02069BE0.c
index 8ca428d61e..243cdde4ad 100644
--- a/src/unk_02069BE0.c
+++ b/src/unk_02069BE0.c
@@ -159,8 +159,8 @@ static void sub_02069CD4 (UnkStruct_02061AB4 * param0, UnkStruct_02069CA8 * para
     UnkStruct_0205E884 * v1 = sub_0205EF3C(v0);
 
     param1->unk_01 = 1;
-    param1->unk_02 = sub_0205EABC(v1);
-    param1->unk_04 = sub_0205EAC8(v1);
+    param1->unk_02 = Player_XPos(v1);
+    param1->unk_04 = Player_ZPos(v1);
     param1->unk_06 = 0xff;
 }
 
@@ -170,8 +170,8 @@ static int sub_02069CFC (UnkStruct_02061AB4 * param0, UnkStruct_02069CA8 * param
     UnkStruct_0205E884 * v1 = sub_0205EF3C(v0);
 
     if (v1 != NULL) {
-        int v2 = sub_0205EABC(v1);
-        int v3 = sub_0205EAC8(v1);
+        int v2 = Player_XPos(v1);
+        int v3 = Player_ZPos(v1);
 
         if ((v2 != param1->unk_02) || (v3 != param1->unk_04)) {
             return 1;
@@ -186,8 +186,8 @@ static void sub_02069D30 (UnkStruct_02061AB4 * param0, UnkStruct_02069CA8 * para
     FieldSystem * v0 = sub_02062C00(param0);
     UnkStruct_0205E884 * v1 = sub_0205EF3C(v0);
 
-    param1->unk_02 = sub_0205EABC(v1);
-    param1->unk_04 = sub_0205EAC8(v1);
+    param1->unk_02 = Player_XPos(v1);
+    param1->unk_04 = Player_ZPos(v1);
 }
 
 static u32 sub_02069D50 (UnkStruct_02061AB4 * param0)
@@ -629,7 +629,7 @@ static int sub_0206A324 (UnkStruct_02061AB4 * param0, UnkStruct_0206A23C * param
     if (param1->unk_01 == -1) {
         FieldSystem * v0 = sub_02062C00(param0);
 
-        param1->unk_01 = sub_0205EA78(v0->unk_3C);
+        param1->unk_01 = Player_Dir(v0->unk_3C);
     }
 
     sub_02062D10(param0);
@@ -675,7 +675,7 @@ static int sub_0206A3BC (UnkStruct_02061AB4 * param0, UnkStruct_0206A23C * param
 {
     int v0;
     FieldSystem * v1 = sub_02062C00(param0);
-    int v2 = sub_0205EA78(v1->unk_3C);
+    int v2 = Player_Dir(v1->unk_3C);
     u32 v3 = sub_0205EC1C(v1->unk_3C);
 
     switch (v3) {
diff --git a/src/unk_0206B70C.c b/src/unk_0206B70C.c
index 6f084cb5ca..b18686258b 100644
--- a/src/unk_0206B70C.c
+++ b/src/unk_0206B70C.c
@@ -84,8 +84,8 @@ void sub_0206B70C (FieldSystem * param0, UnkStruct_0203D8AC * param1, int param2
 
     memset(param1, 0, sizeof(UnkStruct_0203D8AC));
 
-    v4 = sub_0205EABC(param0->unk_3C);
-    v5 = sub_0205EAC8(param0->unk_3C);
+    v4 = Player_XPos(param0->unk_3C);
+    v5 = Player_ZPos(param0->unk_3C);
 
     {
         int v11 = 10 - 1;
diff --git a/src/unk_0206C784.c b/src/unk_0206C784.c
index 97776d027f..599975b299 100644
--- a/src/unk_0206C784.c
+++ b/src/unk_0206C784.c
@@ -84,13 +84,13 @@ void sub_0206C784 (FieldSystem * param0, const u8 param1, const u8 param2, const
 
     if (param1 == 3) {
         v4 = 34;
-        sub_020550F4(sub_0205EABC(param0->unk_3C), sub_0205EAC8(param0->unk_3C), 1, -3, 3, 6, &v3);
+        sub_020550F4(Player_XPos(param0->unk_3C), Player_ZPos(param0->unk_3C), 1, -3, 3, 6, &v3);
         v1 = 1;
         v5 = (25 * 16 * FX32_ONE);
         v0->unk_10 = (14 * 16 * FX32_ONE);
     } else if (param1 == 2) {
         v4 = 538;
-        sub_020550F4(sub_0205EABC(param0->unk_3C), sub_0205EAC8(param0->unk_3C), -2, 2, 6, 3, &v3);
+        sub_020550F4(Player_XPos(param0->unk_3C), Player_ZPos(param0->unk_3C), -2, 2, 6, 3, &v3);
         v1 = 1;
         v5 = (12 * 16 * FX32_ONE);
     }
diff --git a/src/unk_0207070C.c b/src/unk_0207070C.c
index 578e046e49..d408dd7f67 100644
--- a/src/unk_0207070C.c
+++ b/src/unk_0207070C.c
@@ -195,8 +195,8 @@ void sub_02070728 (FieldSystem * param0, UnkStruct_02070950 * param1)
         }
     }
 
-    v1 = sub_0205EABC(param0->unk_3C);
-    v2 = sub_0205EAC8(param0->unk_3C);
+    v1 = Player_XPos(param0->unk_3C);
+    v2 = Player_ZPos(param0->unk_3C);
     v4 = sub_02054F94(param0, v1, v2);
 
     sub_020615AC(param0->unk_3C, &v1, &v2);
@@ -206,7 +206,7 @@ void sub_02070728 (FieldSystem * param0, UnkStruct_02070950 * param1)
         param1->unk_0C |= (1 << 2);
     }
 
-    if (ov5_021E0760(v3, sub_0205EA78(param0->unk_3C))) {
+    if (ov5_021E0760(v3, Player_Dir(param0->unk_3C))) {
         param1->unk_0C |= (1 << 7);
     }
 

From af78055ba0c0f5b50ef2168bf3f75ddf81ec002d Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Wed, 3 Apr 2024 11:59:08 -0400
Subject: [PATCH 04/11] Identify PlayerAvatar

---
 include/communication_system.h              |   2 +-
 include/field/field_system.h                |   2 +-
 include/overlay005/ov5_021DFB54.h           |  12 +-
 include/overlay005/ov5_021E1154.h           |   2 +-
 include/overlay005/ov5_021F61BC.h           |   2 +-
 include/overlay005/ov5_021F8560.h           |   2 +-
 include/overlay023/struct_ov23_0224A294.h   |   6 +-
 include/struct_decls/struct_0205E884_decl.h |   2 +-
 include/struct_defs/struct_0205C22C.h       |   2 +-
 include/struct_defs/struct_020684D0.h       |   2 +-
 include/unk_02057518.h                      |  24 +-
 include/unk_0205E7D0.h                      | 154 ++--
 include/unk_0205F180.h                      |  46 +-
 include/unk_02067A84.h                      |   4 +-
 src/communication_system.c                  |   6 +-
 src/overlay005/ov5_021D0D80.c               |  26 +-
 src/overlay005/ov5_021D1C30.c               |  78 +-
 src/overlay005/ov5_021D431C.c               |  54 +-
 src/overlay005/ov5_021DB888.c               |   4 +-
 src/overlay005/ov5_021DFB54.c               | 122 +--
 src/overlay005/ov5_021E1154.c               |   8 +-
 src/overlay005/ov5_021E135C.c               |  10 +-
 src/overlay005/ov5_021E1D20.c               |   6 +-
 src/overlay005/ov5_021EE75C.c               |   4 +-
 src/overlay005/ov5_021EFB0C.c               |   6 +-
 src/overlay005/ov5_021F007C.c               |   4 +-
 src/overlay005/ov5_021F08CC.c               |  42 +-
 src/overlay005/ov5_021F101C.c               |   2 +-
 src/overlay005/ov5_021F61BC.c               |   6 +-
 src/overlay005/ov5_021F6454.c               |   4 +-
 src/overlay005/ov5_021F8560.c               |   6 +-
 src/overlay006/ov6_0223E140.c               |   2 +-
 src/overlay006/ov6_02240C9C.c               |  18 +-
 src/overlay006/ov6_02242984.c               |   4 +-
 src/overlay006/ov6_02242AF0.c               |  12 +-
 src/overlay006/ov6_02243258.c               |   4 +-
 src/overlay006/ov6_02247100.c               |  10 +-
 src/overlay006/ov6_02247660.c               |   2 +-
 src/overlay006/ov6_02248050.c               |  26 +-
 src/overlay007/ov7_0224CD28.c               |   2 +-
 src/overlay008/ov8_02249960.c               |  72 +-
 src/overlay009/ov9_02249960.c               | 102 +--
 src/overlay023/ov23_0223E140.c              |   8 +-
 src/overlay023/ov23_022416A8.c              |   2 +-
 src/overlay023/ov23_02241F74.c              |  14 +-
 src/overlay023/ov23_0224340C.c              |  62 +-
 src/overlay023/ov23_02248F1C.c              |  10 +-
 src/overlay023/ov23_022499E4.c              |   2 +-
 src/overlay023/ov23_0224A1D0.c              |  88 +--
 src/overlay023/ov23_0224B05C.c              |  32 +-
 src/overlay023/ov23_0224DC40.c              |   2 +-
 src/overlay023/ov23_0224F294.c              |   2 +-
 src/overlay023/ov23_0225128C.c              |  10 +-
 src/overlay023/ov23_022521F0.c              |   2 +-
 src/overlay023/ov23_02253598.c              |   2 +-
 src/overlay058/ov58_021D0D80.c              |   4 +-
 src/pokeradar.c                             |   6 +-
 src/unk_02032798.c                          |   2 +-
 src/unk_0203A9C8.c                          |  12 +-
 src/unk_0203C954.c                          |  20 +-
 src/unk_0203CC84.c                          |  14 +-
 src/unk_0203D1B8.c                          |   2 +-
 src/unk_0203E880.c                          |   6 +-
 src/unk_0203F6C4.c                          |  62 +-
 src/unk_02048614.c                          |   4 +-
 src/unk_02049D08.c                          |   2 +-
 src/unk_02050568.c                          |  12 +-
 src/unk_020530C8.c                          |  16 +-
 src/unk_020553DC.c                          |  12 +-
 src/unk_02055C50.c                          |  38 +-
 src/unk_02056B30.c                          |  64 +-
 src/unk_02057518.c                          | 800 ++++++++++----------
 src/unk_0205A0D8.c                          |   6 +-
 src/unk_0205B33C.c                          |   4 +-
 src/unk_0205C22C.c                          |   4 +-
 src/unk_0205CA94.c                          |  14 +-
 src/unk_0205E7D0.c                          | 196 ++---
 src/unk_0205F180.c                          | 296 ++++----
 src/unk_0206450C.c                          |   6 +-
 src/unk_02067A84.c                          |  20 +-
 src/unk_020683F4.c                          |  42 +-
 src/unk_02069BE0.c                          |  16 +-
 src/unk_0206B70C.c                          |   4 +-
 src/unk_0206C0E8.c                          |   2 +-
 src/unk_0206C784.c                          |   6 +-
 src/unk_0207064C.c                          |   2 +-
 src/unk_0207070C.c                          |  24 +-
 src/unk_0207160C.c                          |  12 +-
 src/unk_02095E98.c                          |   6 +-
 src/unk_02099500.c                          |   4 +-
 90 files changed, 1440 insertions(+), 1440 deletions(-)

diff --git a/include/communication_system.h b/include/communication_system.h
index 836a9f89b0..7e63bd94b2 100644
--- a/include/communication_system.h
+++ b/include/communication_system.h
@@ -27,7 +27,7 @@ void sub_02035938(u8 param0);
 BOOL sub_0203597C(int param0, const void * param1, int param2);
 BOOL CommSys_SendData(int param0, const void * param1, int param2);
 BOOL sub_02035A3C(int param0, const void * param1, int param2);
-BOOL sub_02035AC4(int param0, const void * param1, int param2);
+BOOL CommSys_SendDataServer(int param0, const void * param1, int param2);
 BOOL sub_02035B48(int param0, const void * param1);
 int sub_02035B54(void);
 BOOL CommSys_IsPlayerConnected(u16 param0);
diff --git a/include/field/field_system.h b/include/field/field_system.h
index a4eaa06fa6..04595b0610 100644
--- a/include/field/field_system.h
+++ b/include/field/field_system.h
@@ -60,7 +60,7 @@ typedef struct FieldSystem_t {
     UnkStruct_ov5_021EF76C * unk_30;
     UnkStruct_ov5_021D1A68 * unk_34;
     UnkStruct_02061830 * unk_38;
-    UnkStruct_0205E884 * unk_3C;
+    PlayerAvatar * playerAvatar;
     UnkStruct_ov5_021DF47C * unk_40;
     UnkStruct_ov5_021D5894 * unk_44;
     UnkStruct_ov5_021D57D8 * unk_48;
diff --git a/include/overlay005/ov5_021DFB54.h b/include/overlay005/ov5_021DFB54.h
index 279cb79a6d..a428bf5ac1 100644
--- a/include/overlay005/ov5_021DFB54.h
+++ b/include/overlay005/ov5_021DFB54.h
@@ -6,18 +6,18 @@
 #include "struct_decls/struct_020508D4_decl.h"
 #include "struct_decls/struct_0205E884_decl.h"
 
-void ov5_021DFB54(UnkStruct_0205E884 * param0, u32 param1);
-void ov5_021DFB5C(UnkStruct_0205E884 * param0);
-int ov5_021DFDE0(FieldSystem * param0, UnkStruct_0205E884 * param1, int param2, int param3);
+void ov5_021DFB54(PlayerAvatar * param0, u32 param1);
+void ov5_021DFB5C(PlayerAvatar * param0);
+int ov5_021DFDE0(FieldSystem * param0, PlayerAvatar * param1, int param2, int param3);
 void ov5_021E00EC(UnkStruct_020508D4 * param0, int param1, int param2);
-int ov5_021E0118(UnkStruct_0205E884 * param0, u32 param1, u32 param2);
+int ov5_021E0118(PlayerAvatar * param0, u32 param1, u32 param2);
 void ov5_021E0734(UnkStruct_020508D4 * param0, int param1, int param2);
 int ov5_021E0760(u32 param0, int param1);
 void ov5_021E097C(FieldSystem * param0, int param1);
 void ov5_021E0998(UnkStruct_020508D4 * param0, int param1, int param2);
 void ov5_021E0DD4(UnkStruct_020508D4 * param0);
-void ov5_021E0E94(UnkStruct_0205E884 * param0);
-void ov5_021E0EEC(UnkStruct_0205E884 * param0);
+void ov5_021E0E94(PlayerAvatar * param0);
+void ov5_021E0EEC(PlayerAvatar * param0);
 SysTask * ov5_021E1000(FieldSystem * param0);
 void ov5_021E100C(SysTask * param0);
 SysTask * ov5_021E1014(FieldSystem * param0);
diff --git a/include/overlay005/ov5_021E1154.h b/include/overlay005/ov5_021E1154.h
index 832d8f0c1c..f455feff49 100644
--- a/include/overlay005/ov5_021E1154.h
+++ b/include/overlay005/ov5_021E1154.h
@@ -4,6 +4,6 @@
 #include "field/field_system_decl.h"
 #include "struct_decls/struct_0205E884_decl.h"
 
-int ov5_021E1154(FieldSystem * param0, UnkStruct_0205E884 * param1, int param2);
+int ov5_021E1154(FieldSystem * param0, PlayerAvatar * param1, int param2);
 
 #endif // POKEPLATINUM_OV5_021E1154_H
diff --git a/include/overlay005/ov5_021F61BC.h b/include/overlay005/ov5_021F61BC.h
index c00ec0ff17..0b77e33365 100644
--- a/include/overlay005/ov5_021F61BC.h
+++ b/include/overlay005/ov5_021F61BC.h
@@ -6,6 +6,6 @@
 
 void * ov5_021F61BC(UnkStruct_ov5_021DF47C * param0);
 void ov5_021F61D8(void * param0);
-void ov5_021F6218(UnkStruct_0205E884 * param0);
+void ov5_021F6218(PlayerAvatar * param0);
 
 #endif // POKEPLATINUM_OV5_021F61BC_H
diff --git a/include/overlay005/ov5_021F8560.h b/include/overlay005/ov5_021F8560.h
index 8d1ef0e49f..d23c25298c 100644
--- a/include/overlay005/ov5_021F8560.h
+++ b/include/overlay005/ov5_021F8560.h
@@ -10,7 +10,7 @@
 
 void * ov5_021F8560(UnkStruct_ov5_021DF47C * param0);
 void ov5_021F857C(void * param0);
-UnkStruct_ov101_021D5D90 * ov5_021F85BC(UnkStruct_0205E884 * param0, int param1, int param2, int param3, int param4, int param5, int param6);
+UnkStruct_ov101_021D5D90 * ov5_021F85BC(PlayerAvatar * param0, int param1, int param2, int param3, int param4, int param5, int param6);
 UnkStruct_ov5_02201C58 * ov5_021F88A8(UnkStruct_ov101_021D5D90 * param0);
 void ov5_021F88B4(UnkStruct_ov101_021D5D90 * param0, int param1, int param2);
 void ov5_021F88CC(UnkStruct_ov101_021D5D90 * param0, int param1);
diff --git a/include/overlay023/struct_ov23_0224A294.h b/include/overlay023/struct_ov23_0224A294.h
index 0151b049c8..295cfdee73 100644
--- a/include/overlay023/struct_ov23_0224A294.h
+++ b/include/overlay023/struct_ov23_0224A294.h
@@ -15,7 +15,7 @@
 typedef struct {
     u32 unk_00;
     UnkStruct_ov23_0224991C * unk_04;
-    UnkStruct_0205E884 * unk_08[MAX_CONNECTED_PLAYERS];
+    PlayerAvatar * playerAvatar[MAX_CONNECTED_PLAYERS];
     UnkStruct_ov101_021D5D90 * unk_28[MAX_CONNECTED_PLAYERS];
     u8 unk_48[MAX_CONNECTED_PLAYERS];
     SysTask * task;
@@ -51,10 +51,10 @@ typedef struct {
     u8 isResetting;
     u8 isUnderground;
     u8 unk_2BF;
-    u8 unk_2C0;
+    u8 forceDirTimer;
     u8 unk_2C1;
     u8 unk_2C2;
     u8 unk_2C3;
-} CommPlayerData;
+} CommPlayer;
 
 #endif // POKEPLATINUM_STRUCT_OV23_0224A294_H
diff --git a/include/struct_decls/struct_0205E884_decl.h b/include/struct_decls/struct_0205E884_decl.h
index 8616715859..aaaa52ecff 100644
--- a/include/struct_decls/struct_0205E884_decl.h
+++ b/include/struct_decls/struct_0205E884_decl.h
@@ -1,6 +1,6 @@
 #ifndef POKEPLATINUM_STRUCT_0205E884_DECL_H
 #define POKEPLATINUM_STRUCT_0205E884_DECL_H
 
-typedef struct UnkStruct_0205E884_t UnkStruct_0205E884;
+typedef struct UnkStruct_0205E884_t PlayerAvatar;
 
 #endif // POKEPLATINUM_STRUCT_0205E884_DECL_H
diff --git a/include/struct_defs/struct_0205C22C.h b/include/struct_defs/struct_0205C22C.h
index 9cfd3c876a..9d0fc35e3c 100644
--- a/include/struct_defs/struct_0205C22C.h
+++ b/include/struct_defs/struct_0205C22C.h
@@ -12,7 +12,7 @@
 typedef struct UnkStruct_0205C22C_t {
     UnkStruct_0205B43C * unk_00;
     SysTask * unk_04;
-    UnkStruct_0205E884 * unk_08;
+    PlayerAvatar * unk_08;
     UnkStruct_0205C680 unk_0C[50 + 1];
     FieldSystem * unk_470;
     UnkStruct_02027F8C * unk_474;
diff --git a/include/struct_defs/struct_020684D0.h b/include/struct_defs/struct_020684D0.h
index 2c59025776..21047e6b88 100644
--- a/include/struct_defs/struct_020684D0.h
+++ b/include/struct_defs/struct_020684D0.h
@@ -12,7 +12,7 @@ typedef struct {
     u16 unk_0E;
     u16 unk_10;
     u8 padding_12[2];
-    UnkStruct_0205E884 * unk_14;
+    PlayerAvatar * unk_14;
     FieldSystem * unk_18;
 } UnkStruct_020684D0;
 
diff --git a/include/unk_02057518.h b/include/unk_02057518.h
index 893421444f..d071fb53a5 100644
--- a/include/unk_02057518.h
+++ b/include/unk_02057518.h
@@ -4,7 +4,7 @@
 #include "field/field_system_decl.h"
 #include "overlay023/struct_ov23_0224A294.h"
 
-CommPlayerData * CommPlayerData_Get(void);
+CommPlayer * CommPlayerData_Get(void);
 BOOL CommPlayerManager_Init(void * param0, FieldSystem * param1, BOOL param2);
 void CommPlayerMan_Reset(void);
 void CommPlayerMan_Restart(void);
@@ -17,14 +17,14 @@ void CommPlayer_SendXZPos(BOOL param0, int param1, int param2);
 void CommPlayer_SendPos(BOOL param0);
 void CommPlayer_SendPosServer(BOOL param0);
 u32 CommPlayer_Size(void);
-void CommPlayer_Destory(u8 param0, BOOL param1, BOOL param2);
+void CommPlayer_Destroy(u8 param0, BOOL param1, BOOL param2);
 BOOL sub_02057FAC(void);
 void sub_02057FC4(BOOL param0);
 void sub_02058018(int param0, int param1, void * param2, void * param3);
 void sub_0205805C(FieldSystem * param0, BOOL param1);
-BOOL sub_02058108(int param0, int param1);
-void sub_02058488(int param0, int param1, void * param2, void * param3);
-void sub_0205853C(int param0, int param1, void * param2, void * param3);
+BOOL CommPlayer_CheckNPCCollision(int param0, int param1);
+void CommPlayer_RecvLocation(int param0, int param1, void * param2, void * param3);
+void CommPlayer_RecvDelete(int param0, int param1, void * param2, void * param3);
 int sub_020585A4(void);
 void sub_020585A8(int param0, int param1, void * param2, void * param3);
 void sub_02058B0C(int param0, int param1, BOOL param2);
@@ -34,9 +34,9 @@ void sub_02058BA8(int param0, int param1, BOOL param2);
 void sub_02058BE8(int param0);
 int sub_02058C3C(void);
 BOOL sub_02058C40(void);
-BOOL sub_02058C90(int param0);
-int sub_02058CA0(int param0);
-int sub_02058CF4(int param0);
+BOOL CommPlayer_IsActive(int param0);
+int CommPlayer_XPos(int param0);
+int CommPlayer_ZPos(int param0);
 int sub_02058D48(int param0);
 int sub_02058D68(int param0);
 int sub_02058D88(int param0);
@@ -47,7 +47,7 @@ int sub_02058EA0(int param0);
 int sub_02058EC0(int param0);
 int sub_02058EE0(int param0);
 int sub_02058F18(int param0);
-int sub_02058F50(int param0);
+int CommPlayer_Dir(int param0);
 int sub_02058F80(int param0);
 void sub_02058FB0(int param0, int param1);
 void sub_02058FE4(int param0, int param1);
@@ -58,7 +58,7 @@ BOOL sub_020590C4(void);
 void sub_02059180(int param0, int param1, void * param2, void * param3);
 void sub_02059240(void);
 BOOL sub_0205928C(void);
-int sub_02059328(int param0);
+int CommPlayer_GetOppositeDir(int param0);
 void sub_02059354(int param0, int param1);
 void sub_02059378(int param0);
 void sub_02059390(int param0, int param1);
@@ -67,7 +67,7 @@ int sub_020593CC(int param0);
 int sub_020593E0(int param0);
 void sub_020593F4(int param0);
 void sub_02059424(int param0, int param1);
-int sub_02059444(int param0);
+int CommPlayer_DirClient(int param0);
 void sub_02059464(int param0);
 void sub_0205948C(int param0);
 void sub_020594EC(void);
@@ -76,7 +76,7 @@ void sub_02059514(void);
 void sub_02059524(void);
 void sub_02059570(void);
 void sub_020595A4(void);
-void sub_02059624(void);
+void CommPlayerManager_ForceDir(void);
 void sub_02059638(BOOL param0);
 
 #endif // POKEPLATINUM_UNK_02057518_H
diff --git a/include/unk_0205E7D0.h b/include/unk_0205E7D0.h
index bb6ad21fc6..4ef3376800 100644
--- a/include/unk_0205E7D0.h
+++ b/include/unk_0205E7D0.h
@@ -10,92 +10,92 @@
 
 #include <nitro/fx/fx.h>
 
-UnkStruct_0205E884 * sub_0205E7D0(const UnkStruct_02061830 * param0, int param1, int param2, int param3, int param4, int param5, int param6, UnkStruct_0205EC34 * param7);
-UnkStruct_0205E884 * sub_0205E820(const UnkStruct_02061830 * param0, UnkStruct_0205EC34 * param1, int param2);
-void sub_0205E884(UnkStruct_0205E884 * param0, int param1);
-void sub_0205E8E0(UnkStruct_0205E884 * param0);
-void sub_0205E8E8(UnkStruct_0205E884 * param0);
+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);
+void sub_0205E884(PlayerAvatar * param0, int param1);
+void sub_0205E8E0(PlayerAvatar * param0);
+void sub_0205E8E8(PlayerAvatar * param0);
 UnkStruct_02061AB4 * sub_0205EA24(const UnkStruct_02061830 * param0);
-int Player_Dir(UnkStruct_0205E884 * const param0);
-void sub_0205EA84(UnkStruct_0205E884 * param0, int param1);
-int sub_0205EA94(UnkStruct_0205E884 * const param0);
-int sub_0205EAA0(UnkStruct_0205E884 * const param0);
-int Player_XPos(UnkStruct_0205E884 * const param0);
-int Player_ZPos(UnkStruct_0205E884 * const param0);
-int sub_0205EAD4(UnkStruct_0205E884 * const param0);
-int sub_0205EAE0(UnkStruct_0205E884 * const param0);
-void sub_0205EAEC(UnkStruct_0205E884 * const param0, VecFx32 * param1);
-const VecFx32 * sub_0205EAFC(UnkStruct_0205E884 * const param0);
-void sub_0205EB08(UnkStruct_0205E884 * param0, int param1);
-int sub_0205EB0C(const UnkStruct_0205E884 * param0);
-void sub_0205EB10(UnkStruct_0205E884 * param0, int param1);
-int sub_0205EB14(const UnkStruct_0205E884 * param0);
-void sub_0205EB18(UnkStruct_0205E884 * param0, int param1);
-void sub_0205EB38(UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1);
-UnkStruct_02061AB4 * sub_0205EB3C(UnkStruct_0205E884 * param0);
-const UnkStruct_02061AB4 * sub_0205EB54(const UnkStruct_0205E884 * param0);
-void sub_0205EB58(UnkStruct_0205E884 * param0, int param1);
-int sub_0205EB74(UnkStruct_0205E884 * param0);
-void sub_0205EB84(UnkStruct_0205E884 * param0, u32 param1);
-void sub_0205EB8C(UnkStruct_0205E884 * param0, u32 param1);
-u32 sub_0205EB90(UnkStruct_0205E884 * param0);
-void sub_0205EB94(UnkStruct_0205E884 * param0, int param1);
-int sub_0205EB98(UnkStruct_0205E884 * param0);
-int sub_0205EBB8(UnkStruct_0205E884 * param0);
-void sub_0205EBBC(UnkStruct_0205E884 * param0, int param1);
-void sub_0205EBC0(UnkStruct_0205E884 * param0);
-int sub_0205EBCC(UnkStruct_0205E884 * param0, int param1, int param2);
-void sub_0205EBDC(UnkStruct_0205E884 * param0, int param1);
-int sub_0205EBE0(UnkStruct_0205E884 * param0);
-void sub_0205EBE4(UnkStruct_0205E884 * param0, int param1);
-int sub_0205EBE8(UnkStruct_0205E884 * param0);
-void sub_0205EBEC(UnkStruct_0205E884 * param0, int param1, int param2);
-void sub_0205EC00(UnkStruct_0205E884 * param0, UnkStruct_ov101_021D5D90 * param1);
-UnkStruct_ov101_021D5D90 * sub_0205EC04(UnkStruct_0205E884 * param0);
-UnkStruct_0205EC34 * sub_0205EC0C(UnkStruct_0205E884 * param0);
-void sub_0205EC10(UnkStruct_0205E884 * param0, u32 param1);
-u32 sub_0205EC14(UnkStruct_0205E884 * param0);
-void sub_0205EC18(UnkStruct_0205E884 * param0, int param1);
-int sub_0205EC1C(UnkStruct_0205E884 * param0);
-void sub_0205EC20(UnkStruct_0205E884 * param0, u32 param1, int param2);
+int Player_Dir(PlayerAvatar * const param0);
+void sub_0205EA84(PlayerAvatar * param0, int param1);
+int sub_0205EA94(PlayerAvatar * const param0);
+int sub_0205EAA0(PlayerAvatar * const param0);
+int Player_XPos(PlayerAvatar * const param0);
+int Player_ZPos(PlayerAvatar * const param0);
+int sub_0205EAD4(PlayerAvatar * const param0);
+int sub_0205EAE0(PlayerAvatar * const param0);
+void sub_0205EAEC(PlayerAvatar * const param0, VecFx32 * param1);
+const VecFx32 * sub_0205EAFC(PlayerAvatar * const param0);
+void sub_0205EB08(PlayerAvatar * param0, int param1);
+int sub_0205EB0C(const PlayerAvatar * param0);
+void sub_0205EB10(PlayerAvatar * param0, int param1);
+int sub_0205EB14(const PlayerAvatar * param0);
+void sub_0205EB18(PlayerAvatar * param0, int param1);
+void sub_0205EB38(PlayerAvatar * param0, UnkStruct_02061AB4 * param1);
+UnkStruct_02061AB4 * sub_0205EB3C(PlayerAvatar * param0);
+const UnkStruct_02061AB4 * sub_0205EB54(const PlayerAvatar * param0);
+void sub_0205EB58(PlayerAvatar * param0, int param1);
+int sub_0205EB74(PlayerAvatar * param0);
+void sub_0205EB84(PlayerAvatar * param0, u32 param1);
+void sub_0205EB8C(PlayerAvatar * param0, u32 param1);
+u32 sub_0205EB90(PlayerAvatar * param0);
+void sub_0205EB94(PlayerAvatar * param0, int param1);
+int sub_0205EB98(PlayerAvatar * param0);
+int sub_0205EBB8(PlayerAvatar * param0);
+void sub_0205EBBC(PlayerAvatar * param0, int param1);
+void sub_0205EBC0(PlayerAvatar * param0);
+int sub_0205EBCC(PlayerAvatar * param0, int param1, int param2);
+void sub_0205EBDC(PlayerAvatar * param0, int param1);
+int sub_0205EBE0(PlayerAvatar * param0);
+void sub_0205EBE4(PlayerAvatar * param0, int param1);
+int sub_0205EBE8(PlayerAvatar * param0);
+void sub_0205EBEC(PlayerAvatar * param0, int param1, int param2);
+void sub_0205EC00(PlayerAvatar * param0, UnkStruct_ov101_021D5D90 * param1);
+UnkStruct_ov101_021D5D90 * sub_0205EC04(PlayerAvatar * param0);
+UnkStruct_0205EC34 * sub_0205EC0C(PlayerAvatar * param0);
+void sub_0205EC10(PlayerAvatar * param0, u32 param1);
+u32 sub_0205EC14(PlayerAvatar * param0);
+void sub_0205EC18(PlayerAvatar * param0, int param1);
+int sub_0205EC1C(PlayerAvatar * param0);
+void sub_0205EC20(PlayerAvatar * param0, u32 param1, int param2);
 void sub_0205EC34(UnkStruct_0205EC34 * param0);
 int sub_0205EC40(UnkStruct_0205EC34 * param0);
 void sub_0205EC54(UnkStruct_0205EC34 * param0, int param1);
 int sub_0205EC64(UnkStruct_0205EC34 * param0);
 void sub_0205EC70(UnkStruct_0205EC34 * param0, int param1);
-void sub_0205EC78(UnkStruct_0205E884 * param0, int param1);
-int sub_0205EC88(UnkStruct_0205E884 * param0);
+void sub_0205EC78(PlayerAvatar * param0, int param1);
+int sub_0205EC88(PlayerAvatar * param0);
 u32 sub_0205EC94(UnkStruct_0205EC34 * param0);
 void sub_0205ECA0(UnkStruct_0205EC34 * param0, u32 param1);
-void sub_0205ECA8(UnkStruct_0205E884 * param0, u32 param1);
-void sub_0205ECB8(UnkStruct_0205E884 * param0, const VecFx32 * param1, int param2);
-void sub_0205ECE0(UnkStruct_0205E884 * param0, int param1, int param2, int param3);
-void sub_0205ED0C(UnkStruct_0205E884 * param0, fx32 param1);
-void sub_0205ED2C(UnkStruct_0205E884 * param0, int param1);
-void sub_0205ED48(UnkStruct_0205E884 * param0, int param1);
+void sub_0205ECA8(PlayerAvatar * param0, u32 param1);
+void sub_0205ECB8(PlayerAvatar * param0, const VecFx32 * param1, int param2);
+void sub_0205ECE0(PlayerAvatar * param0, int param1, int param2, int param3);
+void sub_0205ED0C(PlayerAvatar * param0, fx32 param1);
+void sub_0205ED2C(PlayerAvatar * param0, int param1);
+void sub_0205ED48(PlayerAvatar * param0, int param1);
 int sub_0205ED6C(int param0, int param1);
 u32 sub_0205EED8(int param0);
-UnkStruct_0205E884 * sub_0205EF3C(FieldSystem * param0);
-void sub_0205EF40(UnkStruct_0205E884 * param0, int param1);
-int sub_0205EF58(UnkStruct_0205E884 * param0);
-void sub_0205EF6C(UnkStruct_0205E884 * param0, int param1);
-int sub_0205EF84(UnkStruct_0205E884 * param0);
-void sub_0205EF98(UnkStruct_0205E884 * param0, int param1);
-int sub_0205EFB0(UnkStruct_0205E884 * param0);
-void sub_0205EFC4(UnkStruct_0205E884 * param0, int param1);
-int sub_0205EFDC(UnkStruct_0205E884 * param0);
-void sub_0205EFF0(UnkStruct_0205E884 * param0, int param1);
-int sub_0205F008(UnkStruct_0205E884 * param0);
-void sub_0205F01C(UnkStruct_0205E884 * param0, int param1);
-int sub_0205F034(UnkStruct_0205E884 * param0);
-void sub_0205F048(UnkStruct_0205E884 * param0);
-void sub_0205F054(UnkStruct_0205E884 * param0);
-int sub_0205F060(UnkStruct_0205E884 * param0);
-void sub_0205F074(UnkStruct_0205E884 * param0, int param1);
-int sub_0205F08C(UnkStruct_0205E884 * param0);
-void sub_0205F098(UnkStruct_0205E884 * param0, int param1);
-int sub_0205F108(UnkStruct_0205E884 * const param0);
-BOOL sub_0205F158(UnkStruct_0205E884 * const param0);
-BOOL sub_0205F16C(UnkStruct_0205E884 * const param0);
+PlayerAvatar * sub_0205EF3C(FieldSystem * param0);
+void sub_0205EF40(PlayerAvatar * param0, int param1);
+int sub_0205EF58(PlayerAvatar * param0);
+void sub_0205EF6C(PlayerAvatar * param0, int param1);
+int sub_0205EF84(PlayerAvatar * param0);
+void sub_0205EF98(PlayerAvatar * param0, int param1);
+int sub_0205EFB0(PlayerAvatar * param0);
+void sub_0205EFC4(PlayerAvatar * param0, int param1);
+int sub_0205EFDC(PlayerAvatar * param0);
+void sub_0205EFF0(PlayerAvatar * param0, int param1);
+int sub_0205F008(PlayerAvatar * param0);
+void sub_0205F01C(PlayerAvatar * param0, int param1);
+int sub_0205F034(PlayerAvatar * param0);
+void sub_0205F048(PlayerAvatar * param0);
+void sub_0205F054(PlayerAvatar * param0);
+int sub_0205F060(PlayerAvatar * param0);
+void sub_0205F074(PlayerAvatar * param0, int param1);
+int sub_0205F08C(PlayerAvatar * param0);
+void sub_0205F098(PlayerAvatar * param0, int param1);
+int sub_0205F108(PlayerAvatar * const param0);
+BOOL sub_0205F158(PlayerAvatar * const param0);
+BOOL sub_0205F16C(PlayerAvatar * const param0);
 
 #endif // POKEPLATINUM_UNK_0205E7D0_H
diff --git a/include/unk_0205F180.h b/include/unk_0205F180.h
index f6af742cd5..01b44860ba 100644
--- a/include/unk_0205F180.h
+++ b/include/unk_0205F180.h
@@ -5,28 +5,28 @@
 #include "struct_decls/struct_02061AB4_decl.h"
 #include "overlay005/struct_ov5_021E8F60_decl.h"
 
-void sub_0205F180(UnkStruct_0205E884 * param0, const UnkStruct_ov5_021E8F60 * param1, int param2, u16 param3, u16 param4, BOOL param5);
-int sub_0205F224(UnkStruct_0205E884 * param0, int param1);
-void sub_0205F490(UnkStruct_0205E884 * param0);
-void sub_0205F56C(UnkStruct_0205E884 * param0);
-int sub_0205F588(UnkStruct_0205E884 * param0);
-void sub_0205F5E4(UnkStruct_0205E884 * param0, int param1);
-u32 sub_02060B7C(UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2);
-u32 sub_020611FC(UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2);
-int sub_02061308(UnkStruct_0205E884 * param0, u16 param1, u16 param2);
-int sub_020613AC(UnkStruct_0205E884 * param0);
-int sub_020613FC(UnkStruct_0205E884 * param0, u16 param1);
-int sub_0206140C(UnkStruct_0205E884 * param0);
-int sub_02061434(UnkStruct_0205E884 * param0, int param1);
-u32 sub_0206147C(UnkStruct_0205E884 * param0, u16 param1, u16 param2, int param3, int param4, int param5);
-int sub_02061544(UnkStruct_0205E884 * param0);
-void sub_02061550(UnkStruct_0205E884 * param0, u32 param1, int param2);
-u32 sub_0206156C(UnkStruct_0205E884 * param0, int param1);
-void sub_0206157C(UnkStruct_0205E884 * param0, int param1, int * param2, int * param3);
-void sub_020615AC(UnkStruct_0205E884 * param0, int * param1, int * param2);
-void sub_02061674(UnkStruct_0205E884 * param0, int param1, int * param2, int * param3, int * param4);
-u32 sub_020616F0(UnkStruct_0205E884 * param0, int param1);
-u32 sub_02061760(UnkStruct_0205E884 * param0);
-void sub_020617BC(UnkStruct_0205E884 * const param0, int * param1, int * param2, int * param3);
+void sub_0205F180(PlayerAvatar * param0, const UnkStruct_ov5_021E8F60 * param1, int param2, u16 param3, u16 param4, BOOL param5);
+int sub_0205F224(PlayerAvatar * param0, int param1);
+void sub_0205F490(PlayerAvatar * param0);
+void sub_0205F56C(PlayerAvatar * param0);
+int sub_0205F588(PlayerAvatar * param0);
+void sub_0205F5E4(PlayerAvatar * param0, int param1);
+u32 sub_02060B7C(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2);
+u32 sub_020611FC(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2);
+int sub_02061308(PlayerAvatar * param0, u16 param1, u16 param2);
+int sub_020613AC(PlayerAvatar * param0);
+int sub_020613FC(PlayerAvatar * param0, u16 param1);
+int sub_0206140C(PlayerAvatar * param0);
+int sub_02061434(PlayerAvatar * param0, int param1);
+u32 sub_0206147C(PlayerAvatar * param0, u16 param1, u16 param2, int param3, int param4, int param5);
+int sub_02061544(PlayerAvatar * param0);
+void sub_02061550(PlayerAvatar * param0, u32 param1, int param2);
+u32 sub_0206156C(PlayerAvatar * param0, int param1);
+void sub_0206157C(PlayerAvatar * param0, int param1, int * param2, int * param3);
+void sub_020615AC(PlayerAvatar * param0, int * param1, int * param2);
+void sub_02061674(PlayerAvatar * param0, int param1, int * param2, int * param3, int * param4);
+u32 sub_020616F0(PlayerAvatar * param0, int param1);
+u32 sub_02061760(PlayerAvatar * param0);
+void sub_020617BC(PlayerAvatar * const param0, int * param1, int * param2, int * param3);
 
 #endif // POKEPLATINUM_UNK_0205F180_H
diff --git a/include/unk_02067A84.h b/include/unk_02067A84.h
index 22c2a626b4..43dde97b5b 100644
--- a/include/unk_02067A84.h
+++ b/include/unk_02067A84.h
@@ -7,10 +7,10 @@
 #include "struct_decls/struct_02061AB4_decl.h"
 
 int sub_02067A84(FieldSystem * param0, BOOL param1);
-int sub_02067D58(const UnkStruct_02061AB4 * param0, UnkStruct_0205E884 * param1, int param2, int param3);
+int sub_02067D58(const UnkStruct_02061AB4 * param0, PlayerAvatar * param1, int param2, int param3);
 int sub_02067F24(UnkStruct_02061AB4 * param0);
 int sub_02067F88(FieldSystem * param0, UnkStruct_02061AB4 * param1);
-SysTask * sub_02067FB8(FieldSystem * param0, UnkStruct_02061AB4 * param1, UnkStruct_0205E884 * param2, int param3, int param4, int param5, int param6, int param7);
+SysTask * sub_02067FB8(FieldSystem * param0, UnkStruct_02061AB4 * param1, PlayerAvatar * param2, int param3, int param4, int param5, int param6, int param7);
 int sub_02067FD4(SysTask * param0);
 void sub_02067FE8(SysTask * param0);
 
diff --git a/src/communication_system.c b/src/communication_system.c
index e87451e64e..c10c54309c 100644
--- a/src/communication_system.c
+++ b/src/communication_system.c
@@ -1397,7 +1397,7 @@ BOOL sub_02035A3C (int param0, const void * param1, int param2)
     return 0;
 }
 
-BOOL sub_02035AC4 (int param0, const void * param1, int param2)
+BOOL CommSys_SendDataServer (int param0, const void * param1, int param2)
 {
     if (CommSys_CurNetId() != 0) {
         sub_020363BC();
@@ -1426,7 +1426,7 @@ BOOL sub_02035AC4 (int param0, const void * param1, int param2)
 
 BOOL sub_02035B48 (int param0, const void * param1)
 {
-    return sub_02035AC4(param0, param1, 0);
+    return CommSys_SendDataServer(param0, param1, 0);
 }
 
 int sub_02035B54 (void)
@@ -1712,7 +1712,7 @@ static void sub_02035F84 (void)
         if (sub_02034890() == 1) {
             v0 = sub_020360D0(11, &sCommunicationSystem->unk_6A4);
         } else {
-            v0 = sub_02035AC4(11, &sCommunicationSystem->unk_6A4, 1);
+            v0 = CommSys_SendDataServer(11, &sCommunicationSystem->unk_6A4, 1);
         }
 
         if (v0) {
diff --git a/src/overlay005/ov5_021D0D80.c b/src/overlay005/ov5_021D0D80.c
index 90a9a87bae..d0ff4c6729 100644
--- a/src/overlay005/ov5_021D0D80.c
+++ b/src/overlay005/ov5_021D0D80.c
@@ -287,9 +287,9 @@ static int ov5_021D0FB4 (UnkStruct_020067E8 * param0, int * param1)
         sub_02068368(v0);
         ov5_021E9338(v0->unk_28);
 
-        v0->unk_1C->unk_08 = Player_XPos(v0->unk_3C);
-        v0->unk_1C->unk_0C = Player_ZPos(v0->unk_3C);
-        v0->unk_1C->unk_10 = Player_Dir(v0->unk_3C);
+        v0->unk_1C->unk_08 = Player_XPos(v0->playerAvatar);
+        v0->unk_1C->unk_0C = Player_ZPos(v0->playerAvatar);
+        v0->unk_1C->unk_10 = Player_Dir(v0->playerAvatar);
 
         ov5_021EF300(v0->unk_A0);
 
@@ -400,8 +400,8 @@ static BOOL ov5_021D119C (FieldSystem * param0)
 {
     int v0, v1;
 
-    v0 = Player_XPos(param0->unk_3C);
-    v1 = Player_ZPos(param0->unk_3C);
+    v0 = Player_XPos(param0->playerAvatar);
+    v1 = Player_ZPos(param0->playerAvatar);
 
     if ((v0 != param0->unk_1C->unk_08) || (v1 != param0->unk_1C->unk_0C)) {
         param0->unk_1C->unk_08 = v0;
@@ -423,8 +423,8 @@ static BOOL ov5_021D11CC (FieldSystem * param0)
         return 0;
     }
 
-    v2 = (Player_XPos(param0->unk_3C) - ov5_021EA6AC(param0->unk_28)) / 32;
-    v3 = (Player_ZPos(param0->unk_3C) - ov5_021EA6B4(param0->unk_28)) / 32;
+    v2 = (Player_XPos(param0->playerAvatar) - ov5_021EA6AC(param0->unk_28)) / 32;
+    v3 = (Player_ZPos(param0->playerAvatar) - ov5_021EA6B4(param0->unk_28)) / 32;
     v0 = sub_02039E30(param0->unk_2C, v2, v3);
     v1 = param0->unk_1C->unk_00;
 
@@ -554,9 +554,9 @@ static void ov5_021D13B4 (FieldSystem * param0)
     }
 
     v0 = sub_0203A76C(sub_0203A790(param0->unk_0C));
-    v1 = (Player_XPos(param0->unk_3C) - ov5_021EA6AC(param0->unk_28)) / 32;
-    v2 = (Player_ZPos(param0->unk_3C) - ov5_021EA6B4(param0->unk_28)) / 32;
-    v3 = Player_Dir(param0->unk_3C);
+    v1 = (Player_XPos(param0->playerAvatar) - ov5_021EA6AC(param0->unk_28)) / 32;
+    v2 = (Player_ZPos(param0->playerAvatar) - ov5_021EA6B4(param0->unk_28)) / 32;
+    v3 = Player_Dir(param0->playerAvatar);
 
     sub_02055740(v0, v1, v2, v3);
 }
@@ -909,13 +909,13 @@ static void ov5_021D1878 (FieldSystem * param0)
         UnkStruct_02027860 * v3 = sub_02027860(sub_0203D174(param0));
         int v4 = sub_02027F80(v3);
 
-        sub_0205E884(param0->unk_3C, v4);
+        sub_0205E884(param0->playerAvatar, v4);
     }
 
     sub_02061C48(param0->unk_38);
     sub_020595A4();
     sub_02062C3C(param0->unk_38);
-    ov5_021E931C(sub_0205EAFC(param0->unk_3C), param0->unk_28);
+    ov5_021E931C(sub_0205EAFC(param0->playerAvatar), param0->unk_28);
 
     param0->unk_04->unk_18 = sub_02055C8C(param0, 4);
 }
@@ -930,7 +930,7 @@ static void ov5_021D1968 (FieldSystem * param0)
 
     {
         int v0 = sub_0203A770(sub_0203A790(param0->unk_0C));
-        ov5_021D5B40(sub_0205EAFC(param0->unk_3C), param0, v0, 1);
+        ov5_021D5B40(sub_0205EAFC(param0->playerAvatar), param0, v0, 1);
     }
 
     param0->unk_4C = ov5_021D521C(param0->unk_44, ov5_021EFAD8(param0->unk_30));
diff --git a/src/overlay005/ov5_021D1C30.c b/src/overlay005/ov5_021D1C30.c
index 8043c4009a..35b35f733b 100644
--- a/src/overlay005/ov5_021D1C30.c
+++ b/src/overlay005/ov5_021D1C30.c
@@ -123,9 +123,9 @@ void ov5_021D1CAC (UnkStruct_ov5_021D1CAC * param0, FieldSystem * param1, u16 pa
 
     ov5_021D1C30(param0);
 
-    v0 = sub_0205EB14(param1->unk_3C);
-    v1 = sub_0205EB0C(param1->unk_3C);
-    v2 = Player_Dir(param1->unk_3C);
+    v0 = sub_0205EB14(param1->playerAvatar);
+    v1 = sub_0205EB0C(param1->playerAvatar);
+    v2 = Player_Dir(param1->playerAvatar);
 
     param0->unk_04 = param2;
     param0->unk_06 = param3;
@@ -170,7 +170,7 @@ void ov5_021D1CAC (UnkStruct_ov5_021D1CAC * param0, FieldSystem * param1, u16 pa
         param0->unk_03 = -1;
     }
 
-    param0->unk_02 = sub_02061308(param1->unk_3C, param2, param3);
+    param0->unk_02 = sub_02061308(param1->playerAvatar, param2, param3);
 }
 
 int ov5_021D1DA4 (const UnkStruct_ov5_021D1CAC * param0, FieldSystem * param1)
@@ -188,7 +188,7 @@ int ov5_021D1DA4 (const UnkStruct_ov5_021D1CAC * param0, FieldSystem * param1)
             }
 
             if ((sub_02067A84(param1, v0) == 1) || ((sub_02071CB4(param1, 2) == 1) && (ov8_0224C51C(param1) == 1))) {
-                sub_0205F56C(param1->unk_3C);
+                sub_0205F56C(param1->playerAvatar);
                 sub_02062C48(param1->unk_38);
                 return 1;
             }
@@ -205,7 +205,7 @@ int ov5_021D1DA4 (const UnkStruct_ov5_021D1CAC * param0, FieldSystem * param1)
 
     if (param0->unk_00_11 == 0) {
         int v1 = 0;
-        int v2 = sub_02061308(param1->unk_3C, param0->unk_04, param0->unk_06);
+        int v2 = sub_02061308(param1->playerAvatar, param0->unk_04, param0->unk_06);
 
         if (inline_0204E650_2(SaveData_Events(param1->unk_0C))) {
             v1 |= 1 << 0;
@@ -221,7 +221,7 @@ int ov5_021D1DA4 (const UnkStruct_ov5_021D1CAC * param0, FieldSystem * param1)
             }
         }
 
-        if (ov5_021DFDE0(param1, param1->unk_3C, v2, v1) == 1) {
+        if (ov5_021DFDE0(param1, param1->playerAvatar, v2, v1) == 1) {
             return 1;
         }
     }
@@ -239,7 +239,7 @@ int ov5_021D1DA4 (const UnkStruct_ov5_021D1CAC * param0, FieldSystem * param1)
             int v3 = (s8)param0->unk_02;
 
             if (v3 == -1) {
-                v3 = Player_Dir(param1->unk_3C);
+                v3 = Player_Dir(param1->playerAvatar);
             }
 
             if (ov9_0224A67C(param1, v3) == 1) {
@@ -248,7 +248,7 @@ int ov5_021D1DA4 (const UnkStruct_ov5_021D1CAC * param0, FieldSystem * param1)
         }
     }
 
-    if (param0->unk_00_4 && (Player_Dir(param1->unk_3C) == param0->unk_02)) {
+    if (param0->unk_00_4 && (Player_Dir(param1->playerAvatar) == param0->unk_02)) {
         if (ov5_021D20DC(param1) == 1) {
             return 1;
         }
@@ -268,9 +268,9 @@ int ov5_021D1DA4 (const UnkStruct_ov5_021D1CAC * param0, FieldSystem * param1)
             if (v4 == 1) {
                 UnkStruct_ov5_021D219C * v6;
 
-                if (sub_0205F588(param1->unk_3C) == 1) {
+                if (sub_0205F588(param1->playerAvatar) == 1) {
                     sub_0205F5E4(
-                        param1->unk_3C, Player_Dir(param1->unk_3C));
+                        param1->playerAvatar, Player_Dir(param1->playerAvatar));
                 }
 
                 if (sub_02062950(v5) != 0x9) {
@@ -286,7 +286,7 @@ int ov5_021D1DA4 (const UnkStruct_ov5_021D1CAC * param0, FieldSystem * param1)
         {
             int v7;
 
-            v7 = sub_0205F108(param1->unk_3C);
+            v7 = sub_0205F108(param1->playerAvatar);
 
             if ((v7 == 0) || (v7 == 1)) {
                 int v8;
@@ -311,8 +311,8 @@ int ov5_021D1DA4 (const UnkStruct_ov5_021D1CAC * param0, FieldSystem * param1)
         }
 
         {
-            int v10 = sub_0205EAA0(param1->unk_3C);
-            u32 v11 = sub_020616F0(param1->unk_3C, v10);
+            int v10 = sub_0205EAA0(param1->playerAvatar);
+            u32 v11 = sub_020616F0(param1->playerAvatar, v10);
             int v12 = ov5_021D271C(param1, v11);
 
             if (v12 != 0xffff) {
@@ -324,7 +324,7 @@ int ov5_021D1DA4 (const UnkStruct_ov5_021D1CAC * param0, FieldSystem * param1)
         {
             int v13, v14, v15;
 
-            v15 = Player_Dir(param1->unk_3C);
+            v15 = Player_Dir(param1->playerAvatar);
             ov5_021D2C98(param1, &v13, &v14);
 
             if (ov5_021F8410(param1, v13, v14, v15) == 1) {
@@ -431,8 +431,8 @@ BOOL ov5_021D219C (UnkStruct_ov5_021D1CAC * param0, FieldSystem * param1)
                 UnkStruct_ov5_021D219C * v1;
 
                 if (0x1 != sub_02062948(v0)) {
-                    if (sub_0205F588(param1->unk_3C) == 1) {
-                        sub_0205F5E4(param1->unk_3C, Player_Dir(param1->unk_3C));
+                    if (sub_0205F588(param1->playerAvatar) == 1) {
+                        sub_0205F5E4(param1->playerAvatar, Player_Dir(param1->playerAvatar));
                     }
 
                     sub_0203E880(param1, sub_02062960(v0), v0);
@@ -489,8 +489,8 @@ BOOL ov5_021D2298 (const UnkStruct_ov5_021D1CAC * param0, FieldSystem * param1)
         UnkStruct_02061AB4 * v0;
 
         if (sub_0203CA40(param1, &v0) == 1) {
-            if (sub_0205F588(param1->unk_3C) == 1) {
-                sub_0205F5E4(param1->unk_3C, Player_Dir(param1->unk_3C));
+            if (sub_0205F588(param1->playerAvatar) == 1) {
+                sub_0205F5E4(param1->playerAvatar, Player_Dir(param1->playerAvatar));
             }
 
             sub_02036B84();
@@ -534,8 +534,8 @@ int ov5_021D2368 (const UnkStruct_ov5_021D1CAC * param0, FieldSystem * param1)
             if (sub_0203CA40(param1, &v0) == 1) {
                 UnkStruct_ov5_021D219C * v1;
 
-                if (sub_0205F588(param1->unk_3C) == 1) {
-                    sub_0205F5E4(param1->unk_3C, Player_Dir(param1->unk_3C));
+                if (sub_0205F588(param1->playerAvatar) == 1) {
+                    sub_0205F5E4(param1->playerAvatar, Player_Dir(param1->playerAvatar));
                 }
 
                 if (sub_02062950(v0) != 0x9) {
@@ -710,7 +710,7 @@ static BOOL ov5_021D2504 (FieldSystem * param0, const UnkStruct_ov5_021D1CAC * p
 
 u16 ov5_021D271C (FieldSystem * param0, u8 param1)
 {
-    int v0 = Player_Dir(param0->unk_3C);
+    int v0 = Player_Dir(param0->playerAvatar);
 
     if (sub_0205DBE4(param1) && (v0 == 0)) {
         return 2018;
@@ -744,11 +744,11 @@ u16 ov5_021D271C (FieldSystem * param0, u8 param1)
         return 10003;
     }
 
-    if (sub_0205EB74(param0->unk_3C) != 0x2) {
+    if (sub_0205EB74(param0->playerAvatar) != 0x2) {
         TrainerInfo * v1 = SaveData_GetTrainerInfo(param0->unk_0C);
-        u32 v2 = sub_02061760(param0->unk_3C);
+        u32 v2 = sub_02061760(param0->playerAvatar);
 
-        if (ov5_021E0118(param0->unk_3C, v2, param1)
+        if (ov5_021E0118(param0->playerAvatar, v2, param1)
 
             && TrainerInfo_HasBadge(v1, 3)) {
             if (sub_020549A0(Party_GetFromSavedata(param0->unk_0C), 57) != 0xff) {
@@ -776,14 +776,14 @@ static BOOL ov5_021D2884 (FieldSystem * param0)
         }
     }
 
-    v3 = Player_Dir(param0->unk_3C);
+    v3 = Player_Dir(param0->playerAvatar);
 
-    if (ov5_021E1154(param0, param0->unk_3C, v3) == 1) {
+    if (ov5_021E1154(param0, param0->playerAvatar, v3) == 1) {
         return 1;
     }
 
-    v1 = Player_XPos(param0->unk_3C);
-    v2 = Player_ZPos(param0->unk_3C);
+    v1 = Player_XPos(param0->playerAvatar);
+    v2 = Player_ZPos(param0->playerAvatar);
     v0 = sub_02054F94(param0, v1, v2);
 
     if (ov5_021D29A0(param0) == 1) {
@@ -795,7 +795,7 @@ static BOOL ov5_021D2884 (FieldSystem * param0)
         return 1;
     }
 
-    if (sub_0205EF58(param0->unk_3C)) {
+    if (sub_0205EF58(param0->playerAvatar)) {
         return 0;
     }
 
@@ -856,7 +856,7 @@ static BOOL ov5_021D29D8 (FieldSystem * param0, const int param1, const int para
     }
 
     if (sub_0205DC2C(param3) == 1) {
-        int v1 = Player_Dir(param0->unk_3C);
+        int v1 = Player_Dir(param0->playerAvatar);
 
         if (v1 == 2) {
             v1 = 3;
@@ -870,7 +870,7 @@ static BOOL ov5_021D29D8 (FieldSystem * param0, const int param1, const int para
         sub_02056BDC(param0, v0.unk_00, v0.unk_04, 0, 0, v1, 2);
         return 1;
     } else if (sub_0205DC38(param3) == 1) {
-        int v1 = Player_Dir(param0->unk_3C);
+        int v1 = Player_Dir(param0->playerAvatar);
 
         if ((v1 != 2) && (v1 != 3)) {
             GF_ASSERT(FALSE);
@@ -1021,15 +1021,15 @@ static BOOL ov5_021D2C14 (FieldSystem * param0)
 
 static void ov5_021D2C7C (const FieldSystem * param0, int * param1, int * param2)
 {
-    *param1 = Player_XPos(param0->unk_3C);
-    *param2 = Player_ZPos(param0->unk_3C);
+    *param1 = Player_XPos(param0->playerAvatar);
+    *param2 = Player_ZPos(param0->playerAvatar);
 }
 
 static void ov5_021D2C98 (const FieldSystem * param0, int * param1, int * param2)
 {
     int v0;
 
-    v0 = Player_Dir(param0->unk_3C);
+    v0 = Player_Dir(param0->playerAvatar);
     ov5_021D2CB4(param0, v0, param1, param2);
 }
 
@@ -1097,7 +1097,7 @@ static BOOL ov5_021D2D34 (const FieldSystem * param0, int param1, int param2, Un
 
     {
         UnkStruct_02049FA8 * v2 = sub_0203A724(sub_0203A790(param0->unk_0C));
-        inline_02049FA8(v2, param0->unk_1C->unk_00, v1, param1, param2, Player_Dir(param0->unk_3C));
+        inline_02049FA8(v2, param0->unk_1C->unk_00, v1, param1, param2, Player_Dir(param0->playerAvatar));
     }
 
     return 1;
@@ -1130,14 +1130,14 @@ static void ov5_021D2E14 (FieldSystem * param0)
 
     if (ov5_021D2D34(param0, v0, v1, &v2)) {
         if ((MapHeader_IsOnMainMatrix(param0->unk_1C->unk_00) == 1) && (MapHeader_IsOnMainMatrix(v2.unk_00) == 0)) {
-            ov5_021D2DCC(param0, v0, v1, Player_Dir(param0->unk_3C));
+            ov5_021D2DCC(param0, v0, v1, Player_Dir(param0->playerAvatar));
         }
     } else {
         ov5_021D2C98(param0, &v0, &v1);
 
         if (ov5_021D2D34(param0, v0, v1, &v2)) {
             if ((MapHeader_IsOnMainMatrix(param0->unk_1C->unk_00) == 1) && (MapHeader_IsOnMainMatrix(v2.unk_00) == 0)) {
-                ov5_021D2DCC(param0, v0, v1, Player_Dir(param0->unk_3C));
+                ov5_021D2DCC(param0, v0, v1, Player_Dir(param0->playerAvatar));
             }
         }
     }
@@ -1148,7 +1148,7 @@ static BOOL ov5_021D2EA4 (FieldSystem * param0, UnkStruct_02061AB4 ** param1)
     int v0 = 0;
     int v1, v2, v3, v4, v5, v6;
 
-    sub_020617BC(param0->unk_3C, &v1, &v2, &v3);
+    sub_020617BC(param0->playerAvatar, &v1, &v2, &v3);
 
     while (sub_020625B0(param0->unk_38, param1, &v0, (1 << 0))) {
         v4 = sub_02063020(*param1);
diff --git a/src/overlay005/ov5_021D431C.c b/src/overlay005/ov5_021D431C.c
index 3c221ce1c8..481d299a81 100644
--- a/src/overlay005/ov5_021D431C.c
+++ b/src/overlay005/ov5_021D431C.c
@@ -176,12 +176,12 @@ BOOL ov5_021D433C (FieldSystem * param0, UnkStruct_ov5_021D432C * param1)
     }
     break;
     case 3:
-        v0 = sub_0205EB3C(param0->unk_3C);
+        v0 = sub_0205EB3C(param0->playerAvatar);
         sub_02065638(v0, 0xc);
         (param1->unk_00)++;
         break;
     case 4:
-        v0 = sub_0205EB3C(param0->unk_3C);
+        v0 = sub_0205EB3C(param0->playerAvatar);
 
         if (sub_02065684(v0) == 1) {
             sub_020656AC(v0);
@@ -346,19 +346,19 @@ BOOL ov5_021D453C (FieldSystem * param0, UnkStruct_ov5_021D432C * param1)
         v12 = ov5_021D42F0(param0->unk_54, 1);
 
         if (v12) {
-            v0 = sub_0205EB3C(param0->unk_3C);
+            v0 = sub_0205EB3C(param0->playerAvatar);
             sub_02062D64(v0, 0);
             (param1->unk_00)++;
         }
     }
     break;
     case 3:
-        v0 = sub_0205EB3C(param0->unk_3C);
+        v0 = sub_0205EB3C(param0->playerAvatar);
         sub_02065638(v0, 0xd);
         (param1->unk_00)++;
         break;
     case 4:
-        v0 = sub_0205EB3C(param0->unk_3C);
+        v0 = sub_0205EB3C(param0->playerAvatar);
 
         if (sub_02065684(v0) == 1) {
             sub_020656AC(v0);
@@ -524,7 +524,7 @@ BOOL ov5_021D4858 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const
             return 1;
         }
 
-        v0 = sub_0205EB3C(param0->unk_3C);
+        v0 = sub_0205EB3C(param0->playerAvatar);
 
         if (sub_020655F4(v0) == 1) {
             sub_02065638(v0, 0x49);
@@ -539,7 +539,7 @@ BOOL ov5_021D4858 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const
         ov5_021D1744(1);
         ov5_021D4278(param0->unk_54, 2, 0, 1557);
 
-        v0 = sub_0205EB3C(param0->unk_3C);
+        v0 = sub_0205EB3C(param0->playerAvatar);
 
         if (sub_020655F4(v0) == 1) {
             int v8;
@@ -558,7 +558,7 @@ BOOL ov5_021D4858 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const
         (param1->unk_00)++;
         break;
     case 2:
-        v0 = sub_0205EB3C(param0->unk_3C);
+        v0 = sub_0205EB3C(param0->playerAvatar);
 
         if (sub_020655F4(v0) == 1) {
             sub_02065638(v0, 0x4a);
@@ -566,7 +566,7 @@ BOOL ov5_021D4858 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const
         }
         break;
     case 3:
-        v0 = sub_0205EB3C(param0->unk_3C);
+        v0 = sub_0205EB3C(param0->playerAvatar);
 
         if (sub_020655F4(v0) == 1) {
             int v9;
@@ -582,7 +582,7 @@ BOOL ov5_021D4858 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const
         }
         break;
     case 4:
-        v0 = sub_0205EB3C(param0->unk_3C);
+        v0 = sub_0205EB3C(param0->playerAvatar);
 
         if (sub_02065684(v0) == 1) {
             sub_020656AC(v0);
@@ -640,7 +640,7 @@ BOOL ov5_021D4A24 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const
             return 1;
         }
 
-        v0 = sub_0205EB3C(param0->unk_3C);
+        v0 = sub_0205EB3C(param0->playerAvatar);
 
         if (sub_020655F4(v0) == 1) {
             sub_02065638(v0, 0x49);
@@ -653,7 +653,7 @@ BOOL ov5_021D4A24 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const
     break;
     case 1:
         ov5_021D4278(param0->unk_54, 2, 0, 1557);
-        v0 = sub_0205EB3C(param0->unk_3C);
+        v0 = sub_0205EB3C(param0->playerAvatar);
 
         if (sub_020655F4(v0) == 1) {
             int v8;
@@ -672,7 +672,7 @@ BOOL ov5_021D4A24 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const
         (param1->unk_00)++;
         break;
     case 2:
-        v0 = sub_0205EB3C(param0->unk_3C);
+        v0 = sub_0205EB3C(param0->playerAvatar);
 
         if (sub_020655F4(v0) == 1) {
             sub_02065638(v0, 0x4a);
@@ -682,7 +682,7 @@ BOOL ov5_021D4A24 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const
         }
         break;
     case 3:
-        v0 = sub_0205EB3C(param0->unk_3C);
+        v0 = sub_0205EB3C(param0->playerAvatar);
 
         if (sub_02065684(v0) == 1) {
             sub_020656AC(v0);
@@ -892,9 +892,9 @@ BOOL ov5_021D4E10 (UnkStruct_020508D4 * param0)
 
     switch (v2->unk_00) {
     case 0:
-        v0 = sub_0205EB3C(v1->unk_3C);
+        v0 = sub_0205EB3C(v1->playerAvatar);
 
-        if (Player_Dir(v1->unk_3C) == 1) {
+        if (Player_Dir(v1->playerAvatar) == 1) {
             sub_02062D64(v0, 1);
             (v2->unk_00) = 1;
         } else {
@@ -914,13 +914,13 @@ BOOL ov5_021D4E10 (UnkStruct_020508D4 * param0)
         v2->unk_08 = 1;
         break;
     case 1:
-        v0 = sub_0205EB3C(v1->unk_3C);
+        v0 = sub_0205EB3C(v1->playerAvatar);
         sub_02062D64(v0, 0);
         sub_02065638(v0, 0xd);
         (v2->unk_00)++;
         break;
     case 2:
-        v0 = sub_0205EB3C(v1->unk_3C);
+        v0 = sub_0205EB3C(v1->playerAvatar);
 
         if (sub_02065684(v0) == 1) {
             sub_020656AC(v0);
@@ -952,7 +952,7 @@ BOOL ov5_021D4F14 (UnkStruct_020508D4 * param0)
     {
         UnkStruct_02061AB4 * v2;
 
-        v2 = sub_0205EB3C(v0->unk_3C);
+        v2 = sub_0205EB3C(v0->playerAvatar);
 
         sub_02062D64(v2, 1);
 
@@ -1026,8 +1026,8 @@ BOOL ov5_021D5020 (UnkStruct_020508D4 * param0)
         u8 v3;
         u8 v4;
 
-        v0 = sub_0205EB3C(v1->unk_3C);
-        v3 = Player_Dir(v1->unk_3C);
+        v0 = sub_0205EB3C(v1->playerAvatar);
+        v3 = Player_Dir(v1->playerAvatar);
 
         if (v3 == 1) {
             sub_02062D64(v0, 1);
@@ -1067,13 +1067,13 @@ BOOL ov5_021D5020 (UnkStruct_020508D4 * param0)
     }
     break;
     case 1:
-        v0 = sub_0205EB3C(v1->unk_3C);
+        v0 = sub_0205EB3C(v1->playerAvatar);
         sub_02062D64(v0, 0);
         sub_02065638(v0, 0xd);
         (v2->unk_00)++;
         break;
     case 2:
-        v0 = sub_0205EB3C(v1->unk_3C);
+        v0 = sub_0205EB3C(v1->playerAvatar);
 
         if (sub_02065684(v0) == 1) {
             sub_020656AC(v0);
@@ -1107,8 +1107,8 @@ BOOL ov5_021D5150 (UnkStruct_020508D4 * param0)
         u8 v3;
         u8 v4;
 
-        v0 = sub_0205EB3C(v1->unk_3C);
-        v3 = Player_Dir(v1->unk_3C);
+        v0 = sub_0205EB3C(v1->playerAvatar);
+        v3 = Player_Dir(v1->playerAvatar);
 
         if (v3 == 1) {
             sub_02062D64(v0, 1);
@@ -1122,13 +1122,13 @@ BOOL ov5_021D5150 (UnkStruct_020508D4 * param0)
     }
     break;
     case 1:
-        v0 = sub_0205EB3C(v1->unk_3C);
+        v0 = sub_0205EB3C(v1->playerAvatar);
         sub_02062D64(v0, 0);
         sub_02065638(v0, 0xd);
         (v2->unk_00)++;
         break;
     case 2:
-        v0 = sub_0205EB3C(v1->unk_3C);
+        v0 = sub_0205EB3C(v1->playerAvatar);
 
         if (sub_02065684(v0) == 1) {
             sub_020656AC(v0);
diff --git a/src/overlay005/ov5_021DB888.c b/src/overlay005/ov5_021DB888.c
index 274162f968..6cc70c1e05 100644
--- a/src/overlay005/ov5_021DB888.c
+++ b/src/overlay005/ov5_021DB888.c
@@ -469,8 +469,8 @@ static void ov5_021DBA7C (UnkStruct_ov5_021DBA58 * param0)
         param0->unk_10[v5] = NULL;
     }
 
-    v3 = Player_XPos(param0->unk_04->unk_3C);
-    v4 = Player_ZPos(param0->unk_04->unk_3C);
+    v3 = Player_XPos(param0->unk_04->playerAvatar);
+    v4 = Player_ZPos(param0->unk_04->playerAvatar);
     v7 = v3 - 7;
     v8 = v3 + 7;
     v9 = v4 - 7;
diff --git a/src/overlay005/ov5_021DFB54.c b/src/overlay005/ov5_021DFB54.c
index e6ff1f3f92..2556127cb6 100644
--- a/src/overlay005/ov5_021DFB54.c
+++ b/src/overlay005/ov5_021DFB54.c
@@ -57,7 +57,7 @@ typedef struct {
     int unk_00;
     int unk_04;
     FieldSystem * unk_08;
-    UnkStruct_0205E884 * unk_0C;
+    PlayerAvatar * unk_0C;
     UnkStruct_02061AB4 * unk_10;
     UnkStruct_ov9_0224F6EC * unk_14;
 } UnkStruct_ov5_021DFF88;
@@ -68,7 +68,7 @@ typedef struct {
     int unk_08;
     UnkStruct_ov5_021E1050 unk_0C;
     FieldSystem * unk_1C;
-    UnkStruct_0205E884 * unk_20;
+    PlayerAvatar * unk_20;
     UnkStruct_02061AB4 * unk_24;
     UnkStruct_ov101_021D5D90 * unk_28;
 } UnkStruct_ov5_021E00B0;
@@ -77,7 +77,7 @@ typedef struct {
     int unk_00;
     int unk_04;
     FieldSystem * unk_08;
-    UnkStruct_0205E884 * unk_0C;
+    PlayerAvatar * unk_0C;
     UnkStruct_02061AB4 * unk_10;
     UnkStruct_ov101_021D5D90 * unk_14;
 } UnkStruct_ov5_021E0390;
@@ -87,7 +87,7 @@ typedef struct {
     int unk_04;
     int unk_08;
     FieldSystem * unk_0C;
-    UnkStruct_0205E884 * unk_10;
+    PlayerAvatar * unk_10;
     UnkStruct_02061AB4 * unk_14;
     UnkStruct_ov101_021D5D90 * unk_18;
     UnkStruct_ov5_021E1050 unk_1C;
@@ -105,7 +105,7 @@ typedef struct {
     VecFx32 unk_1C;
     VecFx32 unk_28;
     FieldSystem * unk_34;
-    UnkStruct_0205E884 * unk_38;
+    PlayerAvatar * unk_38;
     UnkStruct_02061AB4 * unk_3C;
     UnkStruct_ov5_021E1050 unk_40;
     UnkStruct_ov5_021D1BEC * unk_50;
@@ -115,12 +115,12 @@ typedef struct {
     int unk_00;
     int unk_04;
     FieldSystem * unk_08;
-    UnkStruct_0205E884 * unk_0C;
+    PlayerAvatar * unk_0C;
 } UnkStruct_ov5_021E0534;
 
 typedef struct {
     FieldSystem * unk_00;
-    UnkStruct_0205E884 * unk_04;
+    PlayerAvatar * unk_04;
     UnkStruct_02061AB4 * unk_08;
     int unk_0C;
     int unk_10;
@@ -131,25 +131,25 @@ typedef struct {
     int unk_00;
     int unk_04;
     FieldSystem * unk_08;
-    UnkStruct_0205E884 * unk_0C;
+    PlayerAvatar * unk_0C;
 } UnkStruct_ov5_021E0FF0;
 
-static int ov5_021DFE68(FieldSystem * param0, UnkStruct_0205E884 * param1, int param2, int param3);
-static int ov5_021DFEF4(FieldSystem * param0, UnkStruct_0205E884 * param1, int param2, int param3);
-static int ov5_021DFF1C(FieldSystem * param0, UnkStruct_0205E884 * param1, int param2, int param3);
-static void ov5_021DFF88(int param0, FieldSystem * param1, UnkStruct_0205E884 * param2, UnkStruct_02061AB4 * param3);
+static int ov5_021DFE68(FieldSystem * param0, PlayerAvatar * param1, int param2, int param3);
+static int ov5_021DFEF4(FieldSystem * param0, PlayerAvatar * param1, int param2, int param3);
+static int ov5_021DFF1C(FieldSystem * param0, PlayerAvatar * param1, int param2, int param3);
+static void ov5_021DFF88(int param0, FieldSystem * param1, PlayerAvatar * param2, UnkStruct_02061AB4 * param3);
 static BOOL ov5_021DFFBC(UnkStruct_020508D4 * param0);
 static void ov5_021E00B0(FieldSystem * param0, int param1, const UnkStruct_ov5_021E1050 * param2);
 static BOOL ov5_021E0160(UnkStruct_020508D4 * param0);
-static int ov5_021E032C(FieldSystem * param0, UnkStruct_0205E884 * param1, int param2, int param3);
-static void ov5_021E0390(int param0, FieldSystem * param1, UnkStruct_0205E884 * param2);
+static int ov5_021E032C(FieldSystem * param0, PlayerAvatar * param1, int param2, int param3);
+static void ov5_021E0390(int param0, FieldSystem * param1, PlayerAvatar * param2);
 static BOOL ov5_021E03C8(UnkStruct_020508D4 * param0);
-static int ov5_021E04A8(FieldSystem * param0, UnkStruct_0205E884 * param1, int param2, int param3);
-static int ov5_021E04EC(FieldSystem * param0, UnkStruct_0205E884 * param1, int param2, int param3);
-static void ov5_021E0534(FieldSystem * param0, UnkStruct_0205E884 * param1);
+static int ov5_021E04A8(FieldSystem * param0, PlayerAvatar * param1, int param2, int param3);
+static int ov5_021E04EC(FieldSystem * param0, PlayerAvatar * param1, int param2, int param3);
+static void ov5_021E0534(FieldSystem * param0, PlayerAvatar * param1);
 static BOOL ov5_021E0560(UnkStruct_020508D4 * param0);
-static int ov5_021E067C(FieldSystem * param0, UnkStruct_0205E884 * param1, int param2);
-static int ov5_021E06A8(FieldSystem * param0, UnkStruct_0205E884 * param1);
+static int ov5_021E067C(FieldSystem * param0, PlayerAvatar * param1, int param2);
+static int ov5_021E06A8(FieldSystem * param0, PlayerAvatar * param1);
 static void ov5_021E06F8(FieldSystem * param0, int param1, const UnkStruct_ov5_021E1050 * param2);
 static BOOL ov5_021E07A0(UnkStruct_020508D4 * param0);
 static UnkStruct_ov5_021F9B10 * ov5_021E0948(FieldSystem * param0, int param1, const UnkStruct_ov5_021E1050 * param2);
@@ -160,26 +160,26 @@ static void ov5_021E0FF0(SysTask * param0, void * param1);
 static void ov5_021E1028(FieldSystem * param0, Pokemon * param1, UnkStruct_ov5_021E1050 * param2);
 static void ov5_021E103C(FieldSystem * param0, UnkStruct_ov5_021E1050 * param1);
 static int ov5_021E1050(UnkStruct_ov5_021E1050 * param0);
-static void ov5_021E106C(UnkStruct_0205E884 * param0, int param1);
+static void ov5_021E106C(PlayerAvatar * param0, int param1);
 static void ov5_021E10C0(void * param0, const UnkStruct_020216E0 * param1);
-static UnkStruct_02061AB4 * ov5_021E10D4(UnkStruct_0205E884 * param0, int param1);
+static UnkStruct_02061AB4 * ov5_021E10D4(PlayerAvatar * param0, int param1);
 static void * ov5_021E1110(int param0);
 static void ov5_021E1134(void * param0);
 static Pokemon * ov5_021E1140(FieldSystem * param0, int param1);
 static void ov5_021E0DE0(FieldSystem * param0);
 static BOOL ov5_021E0E10(UnkStruct_020508D4 * param0);
 
-static void(*const Unk_ov5_021F9B74[10])(UnkStruct_0205E884 *);
+static void(*const Unk_ov5_021F9B74[10])(PlayerAvatar *);
 int(*const Unk_ov5_021F9B54[])(UnkStruct_ov5_021F9B54 *);
 int(*const Unk_ov5_021F9B10[])(UnkStruct_ov5_021F9B10 *);
 int(*const Unk_ov5_021F9AFC[])(UnkStruct_ov5_021F9B10 *);
 
-void ov5_021DFB54 (UnkStruct_0205E884 * param0, u32 param1)
+void ov5_021DFB54 (PlayerAvatar * param0, u32 param1)
 {
     sub_0205EB84(param0, param1);
 }
 
-void ov5_021DFB5C (UnkStruct_0205E884 * param0)
+void ov5_021DFB5C (PlayerAvatar * param0)
 {
     u32 v0 = 0;
     u32 v1 = sub_0205EB90(param0);
@@ -195,7 +195,7 @@ void ov5_021DFB5C (UnkStruct_0205E884 * param0)
     sub_0205EB8C(param0, 0);
 }
 
-static void ov5_021DFB90 (UnkStruct_0205E884 * param0)
+static void ov5_021DFB90 (PlayerAvatar * param0)
 {
     int v0;
     int v1 = 0x0;
@@ -228,7 +228,7 @@ static void ov5_021DFB90 (UnkStruct_0205E884 * param0)
     }
 }
 
-static void ov5_021DFBF4 (UnkStruct_0205E884 * param0)
+static void ov5_021DFBF4 (PlayerAvatar * param0)
 {
     int v0;
 
@@ -251,7 +251,7 @@ static void ov5_021DFBF4 (UnkStruct_0205E884 * param0)
     Sound_PlayEffect(1560);
 }
 
-static void ov5_021DFC3C (UnkStruct_0205E884 * param0)
+static void ov5_021DFC3C (PlayerAvatar * param0)
 {
     int v0, v1;
     UnkStruct_02061AB4 * v2 = sub_0205EB3C(param0);
@@ -288,12 +288,12 @@ static void ov5_021DFC3C (UnkStruct_0205E884 * param0)
     sub_0205EBC0(param0);
 }
 
-static void ov5_021DFCE4 (UnkStruct_0205E884 * param0)
+static void ov5_021DFCE4 (PlayerAvatar * param0)
 {
     sub_0205EF6C(param0, 1);
 }
 
-static void ov5_021DFCF0 (UnkStruct_0205E884 * param0)
+static void ov5_021DFCF0 (PlayerAvatar * param0)
 {
     int v0;
 
@@ -301,7 +301,7 @@ static void ov5_021DFCF0 (UnkStruct_0205E884 * param0)
     ov5_021E106C(param0, v0);
 }
 
-static void ov5_021DFD0C (UnkStruct_0205E884 * param0)
+static void ov5_021DFD0C (PlayerAvatar * param0)
 {
     int v0;
 
@@ -309,7 +309,7 @@ static void ov5_021DFD0C (UnkStruct_0205E884 * param0)
     ov5_021E106C(param0, v0);
 }
 
-static void ov5_021DFD28 (UnkStruct_0205E884 * param0)
+static void ov5_021DFD28 (PlayerAvatar * param0)
 {
     int v0;
     int v1 = 0x14;
@@ -329,7 +329,7 @@ static void ov5_021DFD28 (UnkStruct_0205E884 * param0)
     ov5_021E106C(param0, v0);
 }
 
-static void ov5_021DFD68 (UnkStruct_0205E884 * param0)
+static void ov5_021DFD68 (PlayerAvatar * param0)
 {
     int v0;
     int v1 = 0x15;
@@ -349,7 +349,7 @@ static void ov5_021DFD68 (UnkStruct_0205E884 * param0)
     ov5_021E106C(param0, v0);
 }
 
-static void ov5_021DFDA8 (UnkStruct_0205E884 * param0)
+static void ov5_021DFDA8 (PlayerAvatar * param0)
 {
     int v0;
 
@@ -357,7 +357,7 @@ static void ov5_021DFDA8 (UnkStruct_0205E884 * param0)
     ov5_021E106C(param0, v0);
 }
 
-static void ov5_021DFDC4 (UnkStruct_0205E884 * param0)
+static void ov5_021DFDC4 (PlayerAvatar * param0)
 {
     int v0;
 
@@ -365,7 +365,7 @@ static void ov5_021DFDC4 (UnkStruct_0205E884 * param0)
     ov5_021E106C(param0, v0);
 }
 
-static void(*const Unk_ov5_021F9B74[10])(UnkStruct_0205E884 *) = {
+static void(*const Unk_ov5_021F9B74[10])(PlayerAvatar *) = {
     ov5_021DFB90,
     ov5_021DFBF4,
     ov5_021DFC3C,
@@ -378,7 +378,7 @@ static void(*const Unk_ov5_021F9B74[10])(UnkStruct_0205E884 *) = {
     ov5_021DFDC4
 };
 
-int ov5_021DFDE0 (FieldSystem * param0, UnkStruct_0205E884 * param1, int param2, int param3)
+int ov5_021DFDE0 (FieldSystem * param0, PlayerAvatar * param1, int param2, int param3)
 {
     {
         UnkStruct_02061AB4 * v0;
@@ -415,7 +415,7 @@ int ov5_021DFDE0 (FieldSystem * param0, UnkStruct_0205E884 * param1, int param2,
     return 0;
 }
 
-static int ov5_021DFE68 (FieldSystem * param0, UnkStruct_0205E884 * param1, int param2, int param3)
+static int ov5_021DFE68 (FieldSystem * param0, PlayerAvatar * param1, int param2, int param3)
 {
     int v0 = sub_02061434(param1, param2);
 
@@ -448,7 +448,7 @@ static int ov5_021DFE68 (FieldSystem * param0, UnkStruct_0205E884 * param1, int
     return 0;
 }
 
-static int ov5_021DFEF4 (FieldSystem * param0, UnkStruct_0205E884 * param1, int param2, int param3)
+static int ov5_021DFEF4 (FieldSystem * param0, PlayerAvatar * param1, int param2, int param3)
 {
     int v0 = sub_02061434(param1, param2);
 
@@ -459,7 +459,7 @@ static int ov5_021DFEF4 (FieldSystem * param0, UnkStruct_0205E884 * param1, int
     return 0;
 }
 
-static int ov5_021DFF1C (FieldSystem * param0, UnkStruct_0205E884 * param1, int param2, int param3)
+static int ov5_021DFF1C (FieldSystem * param0, PlayerAvatar * param1, int param2, int param3)
 {
     if (param3 != 1) {
         return 0;
@@ -501,7 +501,7 @@ static int ov5_021DFF1C (FieldSystem * param0, UnkStruct_0205E884 * param1, int
     }
 }
 
-static void ov5_021DFF88 (int param0, FieldSystem * param1, UnkStruct_0205E884 * param2, UnkStruct_02061AB4 * param3)
+static void ov5_021DFF88 (int param0, FieldSystem * param1, PlayerAvatar * param2, UnkStruct_02061AB4 * param3)
 {
     UnkStruct_ov5_021DFF88 * v0 = ov5_021E1110((sizeof(UnkStruct_ov5_021DFF88)));
 
@@ -585,7 +585,7 @@ static void ov5_021E00B0 (FieldSystem * param0, int param1, const UnkStruct_ov5_
 
     v0->unk_04 = param1;
     v0->unk_1C = param0;
-    v0->unk_20 = param0->unk_3C;
+    v0->unk_20 = param0->playerAvatar;
     v0->unk_24 = sub_0205EB3C(v0->unk_20);
     v0->unk_0C = *param2;
 
@@ -602,7 +602,7 @@ void ov5_021E00EC (UnkStruct_020508D4 * param0, int param1, int param2)
     ov5_021E00B0(v1, param1, &v0);
 }
 
-int ov5_021E0118 (UnkStruct_0205E884 * param0, u32 param1, u32 param2)
+int ov5_021E0118 (PlayerAvatar * param0, u32 param1, u32 param2)
 {
     UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0);
 
@@ -708,7 +708,7 @@ static BOOL ov5_021E0160 (UnkStruct_020508D4 * param0)
     return 0;
 }
 
-static int ov5_021E032C (FieldSystem * param0, UnkStruct_0205E884 * param1, int param2, int param3)
+static int ov5_021E032C (FieldSystem * param0, PlayerAvatar * param1, int param2, int param3)
 {
     if ((param3 != 1) || (sub_0205EB74(param1) != 0x2)) {
         return 0;
@@ -739,7 +739,7 @@ static int ov5_021E032C (FieldSystem * param0, UnkStruct_0205E884 * param1, int
     return 1;
 }
 
-static void ov5_021E0390 (int param0, FieldSystem * param1, UnkStruct_0205E884 * param2)
+static void ov5_021E0390 (int param0, FieldSystem * param1, PlayerAvatar * param2)
 {
     UnkStruct_ov5_021E0390 * v0 = ov5_021E1110((sizeof(UnkStruct_ov5_021E0390)));
 
@@ -803,7 +803,7 @@ static BOOL ov5_021E03C8 (UnkStruct_020508D4 * param0)
     return 0;
 }
 
-static int ov5_021E04A8 (FieldSystem * param0, UnkStruct_0205E884 * param1, int param2, int param3)
+static int ov5_021E04A8 (FieldSystem * param0, PlayerAvatar * param1, int param2, int param3)
 {
     if ((param2 != 1) || (param3 != 1) || (sub_0205EB74(param1) != 0x2)) {
         return 0;
@@ -821,7 +821,7 @@ static int ov5_021E04A8 (FieldSystem * param0, UnkStruct_0205E884 * param1, int
     return 1;
 }
 
-static int ov5_021E04EC (FieldSystem * param0, UnkStruct_0205E884 * param1, int param2, int param3)
+static int ov5_021E04EC (FieldSystem * param0, PlayerAvatar * param1, int param2, int param3)
 {
     if (sub_0205F008(param1) == 1) {
         return 0;
@@ -840,7 +840,7 @@ static int ov5_021E04EC (FieldSystem * param0, UnkStruct_0205E884 * param1, int
     return 1;
 }
 
-static void ov5_021E0534 (FieldSystem * param0, UnkStruct_0205E884 * param1)
+static void ov5_021E0534 (FieldSystem * param0, PlayerAvatar * param1)
 {
     UnkStruct_ov5_021E0534 * v0 = ov5_021E1110((sizeof(UnkStruct_ov5_021E0534)));
 
@@ -920,7 +920,7 @@ static BOOL ov5_021E0560 (UnkStruct_020508D4 * param0)
     return 0;
 }
 
-static int ov5_021E067C (FieldSystem * param0, UnkStruct_0205E884 * param1, int param2)
+static int ov5_021E067C (FieldSystem * param0, PlayerAvatar * param1, int param2)
 {
     UnkStruct_02061AB4 * v0 = sub_0205EB3C(param1);
 
@@ -935,7 +935,7 @@ static int ov5_021E067C (FieldSystem * param0, UnkStruct_0205E884 * param1, int
     return 0;
 }
 
-static int ov5_021E06A8 (FieldSystem * param0, UnkStruct_0205E884 * param1)
+static int ov5_021E06A8 (FieldSystem * param0, PlayerAvatar * param1)
 {
     if (sub_0205EBB8(param1) < 1) {
         return 0;
@@ -971,7 +971,7 @@ static void ov5_021E06F8 (FieldSystem * param0, int param1, const UnkStruct_ov5_
 
     v0->unk_04 = param1;
     v0->unk_0C = param0;
-    v0->unk_10 = param0->unk_3C;
+    v0->unk_10 = param0->playerAvatar;
     v0->unk_14 = sub_0205EB3C(v0->unk_10);
     v0->unk_1C = *param2;
 
@@ -1148,8 +1148,8 @@ static UnkStruct_ov5_021F9B10 * ov5_021E0948 (FieldSystem * param0, int param1,
 
     v0->unk_04 = param1;
     v0->unk_34 = param0;
-    v0->unk_38 = param0->unk_3C;
-    v0->unk_3C = sub_0205EB3C(param0->unk_3C);
+    v0->unk_38 = param0->playerAvatar;
+    v0->unk_3C = sub_0205EB3C(param0->playerAvatar);
 
     if (param2 != NULL) {
         v0->unk_40 = *param2;
@@ -1523,7 +1523,7 @@ static void ov5_021E0DE0 (FieldSystem * param0)
     UnkStruct_ov5_021E0DE0 * v0 = ov5_021E1110((sizeof(UnkStruct_ov5_021E0DE0)));
 
     v0->unk_00 = param0;
-    v0->unk_04 = param0->unk_3C;
+    v0->unk_04 = param0->playerAvatar;
     v0->unk_08 = sub_0205EB3C(v0->unk_04);
     v0->unk_10 = sub_0205EB98(v0->unk_04);
 
@@ -1562,7 +1562,7 @@ static BOOL ov5_021E0E10 (UnkStruct_020508D4 * param0)
     return 0;
 }
 
-void ov5_021E0E94 (UnkStruct_0205E884 * param0)
+void ov5_021E0E94 (PlayerAvatar * param0)
 {
     UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0);
 
@@ -1595,7 +1595,7 @@ void ov5_021E0E94 (UnkStruct_0205E884 * param0)
     }
 }
 
-void ov5_021E0EEC (UnkStruct_0205E884 * param0)
+void ov5_021E0EEC (PlayerAvatar * param0)
 {
     UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0);
 
@@ -1630,7 +1630,7 @@ void ov5_021E0EEC (UnkStruct_0205E884 * param0)
 
 static SysTask * ov5_021E0F54 (FieldSystem * param0, u32 param1)
 {
-    UnkStruct_0205E884 * v0 = param0->unk_3C;
+    PlayerAvatar * v0 = param0->playerAvatar;
     int v1 = sub_0205EB74(v0);
 
     if (v1 != 0x0) {
@@ -1666,7 +1666,7 @@ static void ov5_021E0FC0 (SysTask * param0)
 
     {
         UnkStruct_ov5_021E0FF0 * v0 = sub_0201CED0(param0);
-        UnkStruct_0205E884 * v1 = v0->unk_0C;
+        PlayerAvatar * v1 = v0->unk_0C;
         int v2 = sub_0205ED6C(0x0, sub_0205EB98(v1));
 
         ov5_021DFB90(v1);
@@ -1707,7 +1707,7 @@ static void ov5_021E1028 (FieldSystem * param0, Pokemon * param1, UnkStruct_ov5_
 {
     param2->unk_00 = 1;
     param2->unk_08 = param1;
-    param2->unk_04 = sub_0205EB98(param0->unk_3C);
+    param2->unk_04 = sub_0205EB98(param0->playerAvatar);
 }
 
 static void ov5_021E103C (FieldSystem * param0, UnkStruct_ov5_021E1050 * param1)
@@ -1725,7 +1725,7 @@ static int ov5_021E1050 (UnkStruct_ov5_021E1050 * param0)
     return 0;
 }
 
-static void ov5_021E106C (UnkStruct_0205E884 * param0, int param1)
+static void ov5_021E106C (PlayerAvatar * param0, int param1)
 {
     UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0);
 
@@ -1748,14 +1748,14 @@ static void ov5_021E106C (UnkStruct_0205E884 * param0, int param1)
 
 static void ov5_021E10C0 (void * param0, const UnkStruct_020216E0 * param1)
 {
-    UnkStruct_0205E884 * v0 = param0;
+    PlayerAvatar * v0 = param0;
     UnkStruct_02061AB4 * v1 = sub_0205EB3C(v0);
     FieldSystem * v2 = sub_02062C00(v1);
 
     ov9_0224A564(v2, param1);
 }
 
-static UnkStruct_02061AB4 * ov5_021E10D4 (UnkStruct_0205E884 * param0, int param1)
+static UnkStruct_02061AB4 * ov5_021E10D4 (PlayerAvatar * param0, int param1)
 {
     int v0 = Player_XPos(param0) + sub_0206419C(param1);
     int v1 = Player_ZPos(param0) + sub_020641A8(param1);
diff --git a/src/overlay005/ov5_021E1154.c b/src/overlay005/ov5_021E1154.c
index f48f351b30..f5176a839a 100644
--- a/src/overlay005/ov5_021E1154.c
+++ b/src/overlay005/ov5_021E1154.c
@@ -22,16 +22,16 @@ typedef struct {
     int unk_04;
     int unk_08;
     FieldSystem * unk_0C;
-    UnkStruct_0205E884 * unk_10;
+    PlayerAvatar * unk_10;
     UnkStruct_02061AB4 * unk_14;
 } UnkStruct_ov5_021E11B0;
 
-static void ov5_021E11B0(FieldSystem * param0, UnkStruct_0205E884 * param1, int param2);
+static void ov5_021E11B0(FieldSystem * param0, PlayerAvatar * param1, int param2);
 static BOOL ov5_021E120C(UnkStruct_020508D4 * param0);
 static void * ov5_021E132C(int param0);
 static void ov5_021E1350(void * param0);
 
-int ov5_021E1154 (FieldSystem * param0, UnkStruct_0205E884 * param1, int param2)
+int ov5_021E1154 (FieldSystem * param0, PlayerAvatar * param1, int param2)
 {
     UnkStruct_02061AB4 * v0 = sub_0205EB3C(param1);
     u8 v1 = sub_02062BE8(v0);
@@ -53,7 +53,7 @@ int ov5_021E1154 (FieldSystem * param0, UnkStruct_0205E884 * param1, int param2)
     return 1;
 }
 
-static void ov5_021E11B0 (FieldSystem * param0, UnkStruct_0205E884 * param1, int param2)
+static void ov5_021E11B0 (FieldSystem * param0, PlayerAvatar * param1, int param2)
 {
     UnkStruct_ov5_021E11B0 * v0 = ov5_021E132C((sizeof(UnkStruct_ov5_021E11B0)));
 
diff --git a/src/overlay005/ov5_021E135C.c b/src/overlay005/ov5_021E135C.c
index 6548fa94d1..fd9acae986 100644
--- a/src/overlay005/ov5_021E135C.c
+++ b/src/overlay005/ov5_021E135C.c
@@ -42,13 +42,13 @@ static void ov5_021E135C (UnkStruct_ov5_021E135C * param0)
         break;
     }
 
-    sub_0205EA84(param0->unk_00->unk_3C, param0->unk_10);
+    sub_0205EA84(param0->unk_00->playerAvatar, param0->unk_10);
 }
 
 static void ov5_021E139C (SysTask * param0, void * param1)
 {
     UnkStruct_ov5_021E135C * v0 = param1;
-    UnkStruct_02061AB4 * v1 = sub_0205EB3C(v0->unk_00->unk_3C);
+    UnkStruct_02061AB4 * v1 = sub_0205EB3C(v0->unk_00->playerAvatar);
     VecFx32 v2;
 
     switch (v0->unk_08) {
@@ -81,7 +81,7 @@ static void ov5_021E139C (SysTask * param0, void * param1)
 static void ov5_021E1470 (SysTask * param0, void * param1)
 {
     UnkStruct_ov5_021E135C * v0 = param1;
-    UnkStruct_02061AB4 * v1 = sub_0205EB3C(v0->unk_00->unk_3C);
+    UnkStruct_02061AB4 * v1 = sub_0205EB3C(v0->unk_00->playerAvatar);
     VecFx32 v2;
     int v3;
 
@@ -119,7 +119,7 @@ static void ov5_021E1470 (SysTask * param0, void * param1)
         break;
     case 2:
         if (ScreenWipe_Done()) {
-            sub_0205EA84(v0->unk_00->unk_3C, 1);
+            sub_0205EA84(v0->unk_00->playerAvatar, 1);
             *v0->unk_04 = 1;
             Heap_FreeToHeap(v0);
             SysTask_Done(param0);
@@ -136,7 +136,7 @@ void ov5_021E15A8 (FieldSystem * param0, BOOL param1, BOOL * param2)
 
     v0->unk_00 = param0;
     v0->unk_04 = param2;
-    v0->unk_10 = Player_Dir(param0->unk_3C);
+    v0->unk_10 = Player_Dir(param0->playerAvatar);
 
     if (param1) {
         SysTask_Start(ov5_021E139C, v0, 100);
diff --git a/src/overlay005/ov5_021E1D20.c b/src/overlay005/ov5_021E1D20.c
index 53c2830c90..a2c4176631 100644
--- a/src/overlay005/ov5_021E1D20.c
+++ b/src/overlay005/ov5_021E1D20.c
@@ -234,10 +234,10 @@ static void ov5_021E2028 (FieldSystem * param0)
     sub_0203A7A8(param0);
     ov5_021EA714(param0, 4, 0);
 
-    param0->unk_1C->unk_08 = Player_XPos(param0->unk_3C);
-    param0->unk_1C->unk_0C = Player_ZPos(param0->unk_3C);
+    param0->unk_1C->unk_08 = Player_XPos(param0->playerAvatar);
+    param0->unk_1C->unk_0C = Player_ZPos(param0->playerAvatar);
     param0->unk_1C->unk_04 = -1;
-    param0->unk_1C->unk_10 = Player_Dir(param0->unk_3C);
+    param0->unk_1C->unk_10 = Player_Dir(param0->playerAvatar);
 }
 
 void ov5_021E2064 (FieldSystem * param0)
diff --git a/src/overlay005/ov5_021EE75C.c b/src/overlay005/ov5_021EE75C.c
index 48cd343104..f18e23dab0 100644
--- a/src/overlay005/ov5_021EE75C.c
+++ b/src/overlay005/ov5_021EE75C.c
@@ -39,8 +39,8 @@ static void ov5_021EE768 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1,
     u8 v3;
     UnkStruct_ov5_021EE75C * v4 = (UnkStruct_ov5_021EE75C *)param2;
 
-    v1 = Player_XPos(param1->unk_3C);
-    v2 = Player_ZPos(param1->unk_3C);
+    v1 = Player_XPos(param1->playerAvatar);
+    v2 = Player_ZPos(param1->playerAvatar);
 
     if ((v4->unk_00 == v1) && (v4->unk_04 == v2)) {
         return;
diff --git a/src/overlay005/ov5_021EFB0C.c b/src/overlay005/ov5_021EFB0C.c
index d1723f83e4..1ec0c8adc1 100644
--- a/src/overlay005/ov5_021EFB0C.c
+++ b/src/overlay005/ov5_021EFB0C.c
@@ -111,9 +111,9 @@ BOOL ov5_021EFB40 (FieldSystem * param0, int * param1)
 
     *param1 = 2008;
 
-    v1 = Player_XPos(param0->unk_3C);
-    v2 = Player_ZPos(param0->unk_3C);
-    v4 = Player_Dir(param0->unk_3C);
+    v1 = Player_XPos(param0->playerAvatar);
+    v2 = Player_ZPos(param0->playerAvatar);
+    v4 = Player_Dir(param0->playerAvatar);
 
     if (v4 == 0) {
         sub_020550F4(v1, v2, 0, -1, 1, 1, &v0);
diff --git a/src/overlay005/ov5_021F007C.c b/src/overlay005/ov5_021F007C.c
index 73755a13e7..f8d7bca956 100644
--- a/src/overlay005/ov5_021F007C.c
+++ b/src/overlay005/ov5_021F007C.c
@@ -485,8 +485,8 @@ BOOL ov5_021F0488 (UnkStruct_020508D4 * param0)
                     u8 v3;
                     int v4, v5;
 
-                    v4 = Player_XPos(v0->unk_3C);
-                    v5 = Player_ZPos(v0->unk_3C);
+                    v4 = Player_XPos(v0->playerAvatar);
+                    v5 = Player_ZPos(v0->playerAvatar);
                     v3 = (u8)sub_02054F94(v0, v4, v5);
 
                     if (ov6_02242110(v0, v3)) {
diff --git a/src/overlay005/ov5_021F08CC.c b/src/overlay005/ov5_021F08CC.c
index 50d9a85e2c..11b6889687 100644
--- a/src/overlay005/ov5_021F08CC.c
+++ b/src/overlay005/ov5_021F08CC.c
@@ -84,7 +84,7 @@ static void ov5_021F0DE8(UnkStruct_ov5_021F0D6C * param0, u32 param1);
 static int ov5_021F0E24(UnkStruct_ov5_021F0D6C * param0);
 static u16 ov5_021F0E58(int param0);
 
-int(*const Unk_ov5_021FFA0C[])(UnkStruct_ov5_021F0D6C *, UnkStruct_0205E884 *, UnkStruct_02061AB4 *);
+int(*const Unk_ov5_021FFA0C[])(UnkStruct_ov5_021F0D6C *, PlayerAvatar *, UnkStruct_02061AB4 *);
 const int Unk_ov5_021FFA00[];
 
 void * ov5_021F08CC (FieldSystem * param0, u32 param1, int param2)
@@ -187,7 +187,7 @@ void ov5_021F09F0 (SysTask * param0)
 static void ov5_021F0A04 (SysTask * param0, void * param1)
 {
     UnkStruct_ov5_021F0D6C * v0 = param1;
-    UnkStruct_0205E884 * v1 = v0->unk_20->unk_3C;
+    PlayerAvatar * v1 = v0->unk_20->playerAvatar;
     UnkStruct_02061AB4 * v2 = sub_0205EB3C(v1);
 
     while (Unk_ov5_021FFA0C[v0->unk_0C](v0, v1, v2)) {
@@ -195,7 +195,7 @@ static void ov5_021F0A04 (SysTask * param0, void * param1)
     }
 }
 
-static int ov5_021F0A30 (UnkStruct_ov5_021F0D6C * param0, UnkStruct_0205E884 * param1, UnkStruct_02061AB4 * param2)
+static int ov5_021F0A30 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, UnkStruct_02061AB4 * param2)
 {
     ov5_021F0D6C(param0);
     sub_02062DDC(param2);
@@ -204,7 +204,7 @@ static int ov5_021F0A30 (UnkStruct_ov5_021F0D6C * param0, UnkStruct_0205E884 * p
     return 1;
 }
 
-static int ov5_021F0A48 (UnkStruct_ov5_021F0D6C * param0, UnkStruct_0205E884 * param1, UnkStruct_02061AB4 * param2)
+static int ov5_021F0A48 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, UnkStruct_02061AB4 * param2)
 {
     if (sub_020655F4(param2) == 1) {
         sub_020656AC(param2);
@@ -217,7 +217,7 @@ static int ov5_021F0A48 (UnkStruct_ov5_021F0D6C * param0, UnkStruct_0205E884 * p
     return 0;
 }
 
-static int ov5_021F0A80 (UnkStruct_ov5_021F0D6C * param0, UnkStruct_0205E884 * param1, UnkStruct_02061AB4 * param2)
+static int ov5_021F0A80 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, UnkStruct_02061AB4 * param2)
 {
     param0->unk_10++;
 
@@ -239,7 +239,7 @@ static int ov5_021F0A80 (UnkStruct_ov5_021F0D6C * param0, UnkStruct_0205E884 * p
     return 1;
 }
 
-static int ov5_021F0AB8 (UnkStruct_ov5_021F0D6C * param0, UnkStruct_0205E884 * param1, UnkStruct_02061AB4 * param2)
+static int ov5_021F0AB8 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, UnkStruct_02061AB4 * param2)
 {
     param0->unk_14 = ((LCRNG_Next() % 4) + 1) * 30;
     param0->unk_18 = Unk_ov5_021FFA00[param0->unk_1C];
@@ -248,7 +248,7 @@ static int ov5_021F0AB8 (UnkStruct_ov5_021F0D6C * param0, UnkStruct_0205E884 * p
     return 1;
 }
 
-static int ov5_021F0AEC (UnkStruct_ov5_021F0D6C * param0, UnkStruct_0205E884 * param1, UnkStruct_02061AB4 * param2)
+static int ov5_021F0AEC (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, UnkStruct_02061AB4 * param2)
 {
     param0->unk_14--;
 
@@ -269,7 +269,7 @@ static int ov5_021F0AEC (UnkStruct_ov5_021F0D6C * param0, UnkStruct_0205E884 * p
     return 1;
 }
 
-static int ov5_021F0B30 (UnkStruct_ov5_021F0D6C * param0, UnkStruct_0205E884 * param1, UnkStruct_02061AB4 * param2)
+static int ov5_021F0B30 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, UnkStruct_02061AB4 * param2)
 {
     param0->unk_18--;
 
@@ -287,7 +287,7 @@ static int ov5_021F0B30 (UnkStruct_ov5_021F0D6C * param0, UnkStruct_0205E884 * p
     return 0;
 }
 
-static int ov5_021F0B5C (UnkStruct_ov5_021F0D6C * param0, UnkStruct_0205E884 * param1, UnkStruct_02061AB4 * param2)
+static int ov5_021F0B5C (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, UnkStruct_02061AB4 * param2)
 {
     ov5_021F5C58(param0->unk_24);
     sub_02062A0C(param2, 0x3);
@@ -298,7 +298,7 @@ static int ov5_021F0B5C (UnkStruct_ov5_021F0D6C * param0, UnkStruct_0205E884 * p
     return 0;
 }
 
-static int ov5_021F0B7C (UnkStruct_ov5_021F0D6C * param0, UnkStruct_0205E884 * param1, UnkStruct_02061AB4 * param2)
+static int ov5_021F0B7C (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, UnkStruct_02061AB4 * param2)
 {
     param0->unk_10++;
 
@@ -316,7 +316,7 @@ static int ov5_021F0B7C (UnkStruct_ov5_021F0D6C * param0, UnkStruct_0205E884 * p
     return 0;
 }
 
-static int ov5_021F0BB0 (UnkStruct_ov5_021F0D6C * param0, UnkStruct_0205E884 * param1, UnkStruct_02061AB4 * param2)
+static int ov5_021F0BB0 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, UnkStruct_02061AB4 * param2)
 {
     if (ov5_021F0E24(param0) == 0) {
         return 0;
@@ -326,7 +326,7 @@ static int ov5_021F0BB0 (UnkStruct_ov5_021F0D6C * param0, UnkStruct_0205E884 * p
     return 1;
 }
 
-static int ov5_021F0BC8 (UnkStruct_ov5_021F0D6C * param0, UnkStruct_0205E884 * param1, UnkStruct_02061AB4 * param2)
+static int ov5_021F0BC8 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, UnkStruct_02061AB4 * param2)
 {
     param0->unk_08 = 1;
     param0->unk_0C = 15;
@@ -334,7 +334,7 @@ static int ov5_021F0BC8 (UnkStruct_ov5_021F0D6C * param0, UnkStruct_0205E884 * p
     return 1;
 }
 
-static int ov5_021F0BD4 (UnkStruct_ov5_021F0D6C * param0, UnkStruct_0205E884 * param1, UnkStruct_02061AB4 * param2)
+static int ov5_021F0BD4 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, UnkStruct_02061AB4 * param2)
 {
     sub_02062A0C(param2, 0x0);
     ov5_021F0DE8(param0, 56);
@@ -345,7 +345,7 @@ static int ov5_021F0BD4 (UnkStruct_ov5_021F0D6C * param0, UnkStruct_0205E884 * p
     return 1;
 }
 
-static int ov5_021F0BF4 (UnkStruct_ov5_021F0D6C * param0, UnkStruct_0205E884 * param1, UnkStruct_02061AB4 * param2)
+static int ov5_021F0BF4 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, UnkStruct_02061AB4 * param2)
 {
     sub_02062A0C(param2, 0x0);
     ov5_021F0DE8(param0, 55);
@@ -363,7 +363,7 @@ static int ov5_021F0BF4 (UnkStruct_ov5_021F0D6C * param0, UnkStruct_0205E884 * p
     return 1;
 }
 
-static int ov5_021F0C34 (UnkStruct_ov5_021F0D6C * param0, UnkStruct_0205E884 * param1, UnkStruct_02061AB4 * param2)
+static int ov5_021F0C34 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, UnkStruct_02061AB4 * param2)
 {
     param0->unk_10 = 30 * 4;
     param0->unk_0C = 13;
@@ -371,7 +371,7 @@ static int ov5_021F0C34 (UnkStruct_ov5_021F0D6C * param0, UnkStruct_0205E884 * p
     return 1;
 }
 
-static int ov5_021F0C40 (UnkStruct_ov5_021F0D6C * param0, UnkStruct_0205E884 * param1, UnkStruct_02061AB4 * param2)
+static int ov5_021F0C40 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, UnkStruct_02061AB4 * param2)
 {
     param0->unk_10--;
 
@@ -393,7 +393,7 @@ static int ov5_021F0C40 (UnkStruct_ov5_021F0D6C * param0, UnkStruct_0205E884 * p
     return 0;
 }
 
-static int ov5_021F0C84 (UnkStruct_ov5_021F0D6C * param0, UnkStruct_0205E884 * param1, UnkStruct_02061AB4 * param2)
+static int ov5_021F0C84 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, UnkStruct_02061AB4 * param2)
 {
     param0->unk_10++;
 
@@ -412,7 +412,7 @@ static int ov5_021F0C84 (UnkStruct_ov5_021F0D6C * param0, UnkStruct_0205E884 * p
     return 1;
 }
 
-static int ov5_021F0CB0 (UnkStruct_ov5_021F0D6C * param0, UnkStruct_0205E884 * param1, UnkStruct_02061AB4 * param2)
+static int ov5_021F0CB0 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, UnkStruct_02061AB4 * param2)
 {
     if (param0->unk_24 != NULL) {
         ov5_021F5C58(param0->unk_24);
@@ -434,7 +434,7 @@ static int ov5_021F0CB0 (UnkStruct_ov5_021F0D6C * param0, UnkStruct_0205E884 * p
     return 1;
 }
 
-static int ov5_021F0CEC (UnkStruct_ov5_021F0D6C * param0, UnkStruct_0205E884 * param1, UnkStruct_02061AB4 * param2)
+static int ov5_021F0CEC (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, UnkStruct_02061AB4 * param2)
 {
     param0->unk_10++;
 
@@ -445,7 +445,7 @@ static int ov5_021F0CEC (UnkStruct_ov5_021F0D6C * param0, UnkStruct_0205E884 * p
     return 0;
 }
 
-static int ov5_021F0D00 (UnkStruct_ov5_021F0D6C * param0, UnkStruct_0205E884 * param1, UnkStruct_02061AB4 * param2)
+static int ov5_021F0D00 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, UnkStruct_02061AB4 * param2)
 {
     if (param0->unk_24 != NULL) {
         sub_0207136C(param0->unk_24);
@@ -456,7 +456,7 @@ static int ov5_021F0D00 (UnkStruct_ov5_021F0D6C * param0, UnkStruct_0205E884 * p
     return 0;
 }
 
-static int(*const Unk_ov5_021FFA0C[])(UnkStruct_ov5_021F0D6C *, UnkStruct_0205E884 *, UnkStruct_02061AB4 *) = {
+static int(*const Unk_ov5_021FFA0C[])(UnkStruct_ov5_021F0D6C *, PlayerAvatar *, UnkStruct_02061AB4 *) = {
     ov5_021F0A30,
     ov5_021F0A48,
     ov5_021F0A80,
diff --git a/src/overlay005/ov5_021F101C.c b/src/overlay005/ov5_021F101C.c
index baaac24b93..8d181a82e0 100644
--- a/src/overlay005/ov5_021F101C.c
+++ b/src/overlay005/ov5_021F101C.c
@@ -43,7 +43,7 @@ BOOL ov5_021F101C (UnkStruct_020508D4 * param0)
         break;
     case 2:
     {
-        int v5 = sub_0205EB98(v0->unk_3C);
+        int v5 = sub_0205EB98(v0->playerAvatar);
         v3->unk_00 = ov6_02243F88(v0, 0, v1->unk_00, v5);
     }
         (*v2)++;
diff --git a/src/overlay005/ov5_021F61BC.c b/src/overlay005/ov5_021F61BC.c
index 0c34a6d716..0263f9a7c6 100644
--- a/src/overlay005/ov5_021F61BC.c
+++ b/src/overlay005/ov5_021F61BC.c
@@ -29,7 +29,7 @@ typedef struct {
 typedef struct {
     UnkStruct_ov5_021DF47C * unk_00;
     UnkStruct_021F61E8 * unk_04;
-    UnkStruct_0205E884 * unk_08;
+    PlayerAvatar * unk_08;
 } UnkStruct_021F6218;
 
 typedef struct {
@@ -83,7 +83,7 @@ static void ov5_021F620C (UnkStruct_021F61E8 * param0)
     sub_0207395C(&param0->unk_04);
 }
 
-void ov5_021F6218 (UnkStruct_0205E884 * param0)
+void ov5_021F6218 (PlayerAvatar * param0)
 {
     int v0 = 0, v1;
     UnkStruct_021F6218 v2;
@@ -129,7 +129,7 @@ static void ov5_021F62A0 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
     int v0;
     UnkStruct_021F6264 * v1 = param1;
-    UnkStruct_0205E884 * v2 = v1->unk_24.unk_08;
+    PlayerAvatar * v2 = v1->unk_24.unk_08;
     UnkStruct_02061AB4 * v3 = sub_0205EB3C(v2);
 
     if (sub_02062764(v3, v1->unk_14, v1->unk_18) == 0) {
diff --git a/src/overlay005/ov5_021F6454.c b/src/overlay005/ov5_021F6454.c
index 3bea5717f2..1a832ca55c 100644
--- a/src/overlay005/ov5_021F6454.c
+++ b/src/overlay005/ov5_021F6454.c
@@ -989,7 +989,7 @@ BOOL ov5_021F7538 (UnkStruct_0203E724 * param0)
     int v3 = 0;
     FieldSystem * v4 = param0->unk_34;
     UnkStruct_02061830 * v5 = v4->unk_38;
-    UnkStruct_02061AB4 * v6 = sub_0205EB3C(v4->unk_3C);
+    UnkStruct_02061AB4 * v6 = sub_0205EB3C(v4->playerAvatar);
     UnkStruct_02061AB4 * v7;
 
     sub_02063050(v6, &v1);
@@ -1030,7 +1030,7 @@ BOOL ov5_021F7604 (UnkStruct_0203E724 * param0)
     int v0 = 0;
     FieldSystem * v1 = param0->unk_34;
     UnkStruct_02061830 * v2 = v1->unk_38;
-    UnkStruct_02061AB4 * v3 = sub_0205EB3C(v1->unk_3C);
+    UnkStruct_02061AB4 * v3 = sub_0205EB3C(v1->playerAvatar);
     UnkStruct_02061AB4 * v4;
 
     while (sub_020625B0(v2, &v4, &v0, (1 << 0)) == 1) {
diff --git a/src/overlay005/ov5_021F8560.c b/src/overlay005/ov5_021F8560.c
index 09a3b066c8..d7784a2843 100644
--- a/src/overlay005/ov5_021F8560.c
+++ b/src/overlay005/ov5_021F8560.c
@@ -32,7 +32,7 @@ typedef struct {
     UnkStruct_ov5_021DF47C * unk_08;
     UnkStruct_ov5_021F858C * unk_0C;
     UnkStruct_02061AB4 * unk_10;
-    UnkStruct_0205E884 * unk_14;
+    PlayerAvatar * unk_14;
 } UnkStruct_ov5_021F8668;
 
 typedef struct {
@@ -91,7 +91,7 @@ static void ov5_021F85B0 (UnkStruct_ov5_021F858C * param0)
     sub_0207395C(&param0->unk_04);
 }
 
-UnkStruct_ov101_021D5D90 * ov5_021F85BC (UnkStruct_0205E884 * param0, int param1, int param2, int param3, int param4, int param5, int param6)
+UnkStruct_ov101_021D5D90 * ov5_021F85BC (PlayerAvatar * param0, int param1, int param2, int param3, int param4, int param5, int param6)
 {
     int v0;
     UnkStruct_ov101_021D5D90 * v1;
@@ -163,7 +163,7 @@ static void ov5_021F86E4 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
     UnkStruct_ov5_021F86CC * v0 = param1;
     UnkStruct_02061AB4 * v1 = v0->unk_38.unk_10;
-    UnkStruct_0205E884 * v2 = v0->unk_38.unk_14;
+    PlayerAvatar * v2 = v0->unk_38.unk_14;
 
     if (((v0)->unk_00 & (1 << 1)) == 0) {
         return;
diff --git a/src/overlay006/ov6_0223E140.c b/src/overlay006/ov6_0223E140.c
index 5129e58c97..2e2a5b6f2d 100644
--- a/src/overlay006/ov6_0223E140.c
+++ b/src/overlay006/ov6_0223E140.c
@@ -143,7 +143,7 @@ typedef struct {
     UnkStruct_02061AB4 * unk_108;
     UnkStruct_02061AB4 * unk_10C;
     UnkStruct_02061AB4 * unk_110;
-    UnkStruct_0205E884 * unk_114;
+    PlayerAvatar * unk_114;
 } UnkStruct_ov6_0223EA98;
 
 typedef struct UnkStruct_ov6_0223FDE4_t {
diff --git a/src/overlay006/ov6_02240C9C.c b/src/overlay006/ov6_02240C9C.c
index 2b4f625ca0..6dfb15b84e 100644
--- a/src/overlay006/ov6_02240C9C.c
+++ b/src/overlay006/ov6_02240C9C.c
@@ -244,8 +244,8 @@ BOOL ov6_02240D5C (FieldSystem * param0)
     UnkStruct_ov6_0224222C v13[12];
     UnkStruct_ov6_022422D0 v14;
 
-    v2 = Player_XPos(param0->unk_3C);
-    v3 = Player_ZPos(param0->unk_3C);
+    v2 = Player_XPos(param0->playerAvatar);
+    v3 = Player_ZPos(param0->playerAvatar);
     v4 = (u8)sub_02054F94(param0, v2, v3);
 
     {
@@ -498,8 +498,8 @@ BOOL ov6_022411C8 (FieldSystem * param0, UnkStruct_020508D4 * param1)
     UnkStruct_ov6_0224222C v12[12];
     UnkStruct_ov6_022422D0 v13;
 
-    v2 = Player_XPos(param0->unk_3C);
-    v3 = Player_ZPos(param0->unk_3C);
+    v2 = Player_XPos(param0->playerAvatar);
+    v3 = Player_ZPos(param0->playerAvatar);
     v4 = (u8)sub_02054F94(param0, v2, v3);
 
     {
@@ -623,8 +623,8 @@ BOOL ov6_022413E4 (FieldSystem * param0, BattleParams ** param1)
 
     *param1 = NULL;
 
-    v1 = Player_XPos(param0->unk_3C);
-    v2 = Player_ZPos(param0->unk_3C);
+    v1 = Player_XPos(param0->playerAvatar);
+    v2 = Player_ZPos(param0->playerAvatar);
     v3 = (u8)sub_02054F94(param0, v1, v2);
 
     {
@@ -779,8 +779,8 @@ static BOOL ov6_02241674 (FieldSystem * param0, Pokemon * param1, BattleParams *
             {
                 int v4, v5;
 
-                v4 = Player_XPos(param0->unk_3C);
-                v5 = Player_ZPos(param0->unk_3C);
+                v4 = Player_XPos(param0->playerAvatar);
+                v5 = Player_ZPos(param0->playerAvatar);
 
                 RadarSpawnPatches(param0, v4, v5, param0->chain);
             }
@@ -857,7 +857,7 @@ static BOOL ov6_022417C8 (FieldSystem * param0, const u32 param1, const u8 param
     if (sub_0205DAD4(param2)) {
         v0 += 30;
     } else {
-        if (sub_0205EB74(param0->unk_3C) == 0x1) {
+        if (sub_0205EB74(param0->playerAvatar) == 0x1) {
             v0 += 30;
         }
     }
diff --git a/src/overlay006/ov6_02242984.c b/src/overlay006/ov6_02242984.c
index 58cb77db3f..0934e26010 100644
--- a/src/overlay006/ov6_02242984.c
+++ b/src/overlay006/ov6_02242984.c
@@ -75,8 +75,8 @@ UnkStruct_ov6_02242A8C * ov6_02242A10 (const int param0, FieldSystem * param1)
         }
 
         {
-            v1->unk_00[5].unk_00 = Player_XPos(param1->unk_3C);
-            v1->unk_00[5].unk_02 = Player_ZPos(param1->unk_3C);
+            v1->unk_00[5].unk_00 = Player_XPos(param1->playerAvatar);
+            v1->unk_00[5].unk_02 = Player_ZPos(param1->playerAvatar);
             v1->unk_30 = param1->unk_1C->unk_00;
         }
 
diff --git a/src/overlay006/ov6_02242AF0.c b/src/overlay006/ov6_02242AF0.c
index 3e677e660c..7e8ee354ea 100644
--- a/src/overlay006/ov6_02242AF0.c
+++ b/src/overlay006/ov6_02242AF0.c
@@ -298,8 +298,8 @@ static BOOL ov6_02242E60 (FieldSystem * param0, UnkStruct_ov6_02242B58 * param1,
     UnkStruct_02061AB4 * v0;
     VecFx32 v1;
 
-    v0 = sub_0205EB3C(param0->unk_3C);
-    sub_0205EAEC(param0->unk_3C, &v1);
+    v0 = sub_0205EB3C(param0->playerAvatar);
+    sub_0205EAEC(param0->playerAvatar, &v1);
 
     param3->z = v1.z + ((FX32_ONE * 16) / 2);
 
@@ -310,13 +310,13 @@ static BOOL ov6_02242E60 (FieldSystem * param0, UnkStruct_ov6_02242B58 * param1,
             if (sub_020655F4(v0) == 1) {
                 sub_02065638(v0, Unk_ov6_02249058[param1->unk_06]);
 
-                if ((param1->unk_06 < 7 - 1) && (Player_ZPos(param0->unk_3C) > param1->unk_10)) {
+                if ((param1->unk_06 < 7 - 1) && (Player_ZPos(param0->playerAvatar) > param1->unk_10)) {
                     if (param1->unk_06 == 0) {
                         Sound_PlayEffect(1753);
                     }
 
                     param1->unk_06++;
-                } else if (Player_ZPos(param0->unk_3C) <= param1->unk_10) {
+                } else if (Player_ZPos(param0->playerAvatar) <= param1->unk_10) {
                     if (param1->unk_06 != 0) {
                         if (param1->unk_06 == 7 - 1) {
                             Sound_PlayEffect(1754);
@@ -330,13 +330,13 @@ static BOOL ov6_02242E60 (FieldSystem * param0, UnkStruct_ov6_02242B58 * param1,
             if (sub_020655F4(v0) == 1) {
                 sub_02065638(v0, Unk_ov6_0224903C[param1->unk_06]);
 
-                if ((param1->unk_06 < 7 - 1) && (Player_ZPos(param0->unk_3C) < param1->unk_10)) {
+                if ((param1->unk_06 < 7 - 1) && (Player_ZPos(param0->playerAvatar) < param1->unk_10)) {
                     if (param1->unk_06 == 0) {
                         Sound_PlayEffect(1753);
                     }
 
                     param1->unk_06++;
-                } else if (Player_ZPos(param0->unk_3C) >= param1->unk_10) {
+                } else if (Player_ZPos(param0->playerAvatar) >= param1->unk_10) {
                     if (param1->unk_06 != 0) {
                         if (param1->unk_06 == 7 - 1) {
                             Sound_PlayEffect(1754);
diff --git a/src/overlay006/ov6_02243258.c b/src/overlay006/ov6_02243258.c
index 95a287d174..081e376b31 100644
--- a/src/overlay006/ov6_02243258.c
+++ b/src/overlay006/ov6_02243258.c
@@ -1026,7 +1026,7 @@ static void ov6_02243F50 (void)
 
 static void ov6_02243F74 (FieldSystem * param0, int param1)
 {
-    UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0->unk_3C);
+    UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0->playerAvatar);
     sub_02062D64(v0, param1);
 }
 
@@ -3042,7 +3042,7 @@ static void * ov6_02245F44 (u32 param0, int param1)
 
 static void ov6_02245F64 (UnkStruct_ov6_02243FFC * param0, int param1)
 {
-    UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0->unk_60->unk_3C);
+    UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0->unk_60->playerAvatar);
 
     sub_02062DDC(v0);
     sub_02062D64(v0, param1);
diff --git a/src/overlay006/ov6_02247100.c b/src/overlay006/ov6_02247100.c
index 569d7bebf5..4edbe459c6 100644
--- a/src/overlay006/ov6_02247100.c
+++ b/src/overlay006/ov6_02247100.c
@@ -54,7 +54,7 @@ void * ov6_02247100 (FieldSystem * param0, u32 param1)
 
     v0->unk_08 = 0;
     v0->unk_1C = param0;
-    v0->unk_18 = sub_0205EB3C(param0->unk_3C);
+    v0->unk_18 = sub_0205EB3C(param0->playerAvatar);
 
     return v0;
 }
@@ -174,7 +174,7 @@ void * ov6_022472C8 (FieldSystem * param0, u32 param1, int param2)
 
     v0->unk_08 = param2;
     v0->unk_1C = param0;
-    v0->unk_18 = sub_0205EB3C(param0->unk_3C);
+    v0->unk_18 = sub_0205EB3C(param0->playerAvatar);
 
     return v0;
 }
@@ -293,7 +293,7 @@ void * ov6_02247488 (FieldSystem * param0, Pokemon * param1, u32 param2)
 
     v0->unk_08 = 1;
     v0->unk_1C = param0;
-    v0->unk_18 = sub_0205EB3C(param0->unk_3C);
+    v0->unk_18 = sub_0205EB3C(param0->playerAvatar);
     v0->unk_20 = param1;
 
     return v0;
@@ -318,7 +318,7 @@ BOOL ov6_022474AC (UnkStruct_020508D4 * param0)
 
 static int ov6_022474E8 (UnkStruct_020508D4 * param0, FieldSystem * param1, UnkStruct_ov6_02247100 * param2)
 {
-    int v0 = sub_0205EB98(param1->unk_3C);
+    int v0 = sub_0205EB98(param1->playerAvatar);
 
     param2->unk_10 = ov6_02243F88(param1, 0, param2->unk_20, v0);
     param2->unk_00++;
@@ -352,7 +352,7 @@ void * ov6_02247530 (FieldSystem * param0, Pokemon * param1, u32 param2)
 
     v0->unk_08 = 2;
     v0->unk_1C = param0;
-    v0->unk_18 = sub_0205EB3C(param0->unk_3C);
+    v0->unk_18 = sub_0205EB3C(param0->playerAvatar);
     v0->unk_20 = param1;
 
     return v0;
diff --git a/src/overlay006/ov6_02247660.c b/src/overlay006/ov6_02247660.c
index dccb6035cf..6639afacc7 100644
--- a/src/overlay006/ov6_02247660.c
+++ b/src/overlay006/ov6_02247660.c
@@ -37,7 +37,7 @@ BOOL ov6_02247660 (FieldSystem * param0)
 
     v13 = sub_0202B428(sub_0202B4A0(param0->unk_0C));
 
-    sub_020615AC(param0->unk_3C, &v15, &v16);
+    sub_020615AC(param0->playerAvatar, &v15, &v16);
 
     v14 = sub_02039E10(param0->unk_2C);
     v12 = 0;
diff --git a/src/overlay006/ov6_02248050.c b/src/overlay006/ov6_02248050.c
index a67647bc08..21fb2ccea3 100644
--- a/src/overlay006/ov6_02248050.c
+++ b/src/overlay006/ov6_02248050.c
@@ -104,7 +104,7 @@ static void ov6_02248050 (UnkStruct_02061830 * param0, u32 param1, UnkStruct_020
     sub_02017350(param2, (((v1) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1), v3.y, (((v2) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1));
 }
 
-static void ov6_022480BC (UnkStruct_0205E884 * const param0, UnkStruct_02017294 * param1)
+static void ov6_022480BC (PlayerAvatar * const param0, UnkStruct_02017294 * param1)
 {
     int v0;
     int v1, v2;
@@ -137,7 +137,7 @@ static void ov6_022480BC (UnkStruct_0205E884 * const param0, UnkStruct_02017294
     sub_02017350(param1, (((v1) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1), v3.y, (((v2) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1));
 }
 
-static void ov6_02248124 (UnkStruct_0205E884 * const param0, UnkStruct_02017294 * param1)
+static void ov6_02248124 (PlayerAvatar * const param0, UnkStruct_02017294 * param1)
 {
     VecFx32 v0;
 
@@ -215,7 +215,7 @@ static void ov6_0224825C (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1,
     ov6_02248140(&v0->unk_00, v2, 3, 0, 3, &v0->unk_DC);
     NARC_dtor(v2);
 
-    ov6_022480BC(param1->unk_3C, &v0->unk_00.unk_00);
+    ov6_022480BC(param1->playerAvatar, &v0->unk_00.unk_00);
     Sound_PlayEffect(1611);
 
     v0->unk_EC = 0;
@@ -296,7 +296,7 @@ static void ov6_02248340 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1,
     ov6_02248140(&v0->unk_00, v2, 8, 4, 4, &v0->unk_DC);
     NARC_dtor(v2);
 
-    ov6_022480BC(param1->unk_3C, &v0->unk_00.unk_00);
+    ov6_022480BC(param1->playerAvatar, &v0->unk_00.unk_00);
     Sound_PlayEffect(1610);
 
     v0->unk_EC = 0;
@@ -416,7 +416,7 @@ static void ov6_02248498 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1,
     v2 = NARC_ctor(NARC_INDEX_GRAPHIC__HIDEN_EFFECT, 4);
 
     ov6_02248140(&v0->unk_00[0], v2, 14, 12, 2, &v0->unk_1B8);
-    ov6_02248124(param1->unk_3C, &v0->unk_00[0].unk_00);
+    ov6_02248124(param1->playerAvatar, &v0->unk_00[0].unk_00);
 
     NARC_dtor(v2);
     Sound_PlayEffect(1613);
@@ -445,23 +445,23 @@ static void ov6_02248520 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1,
         v2 = NARC_ctor(NARC_INDEX_GRAPHIC__HIDEN_EFFECT, 4);
         ov6_02248140(&v0->unk_00[1], v2, 11, 9, 2, &v0->unk_1B8);
         NARC_dtor(v2);
-        ov6_02248124(param1->unk_3C, &v0->unk_00[1].unk_00);
+        ov6_02248124(param1->playerAvatar, &v0->unk_00[1].unk_00);
         sub_02017348(&v0->unk_00[1].unk_00, 0);
         v0->unk_1C8++;
     case 1:
         v1 = ov6_022481F0(&v0->unk_00[0]);
-        ov6_02248124(param1->unk_3C, &v0->unk_00[0].unk_00);
+        ov6_02248124(param1->playerAvatar, &v0->unk_00[0].unk_00);
 
         if (v1 == 1) {
             sub_02017348(&v0->unk_00[1].unk_00, 1);
             sub_02017348(&v0->unk_00[0].unk_00, 0);
-            ov6_02248124(param1->unk_3C, &v0->unk_00[1].unk_00);
+            ov6_02248124(param1->playerAvatar, &v0->unk_00[1].unk_00);
             v0->unk_1C8++;
         }
         break;
     case 2:
         ov6_02248224(&v0->unk_00[1]);
-        ov6_02248124(param1->unk_3C, &v0->unk_00[1].unk_00);
+        ov6_02248124(param1->playerAvatar, &v0->unk_00[1].unk_00);
         break;
     default:
         break;
@@ -499,7 +499,7 @@ void ov6_02248608 (UnkStruct_ov5_021D1BEC * param0)
     ov5_021D1BEC(param0);
 }
 
-static void ov6_02248610 (UnkStruct_ov6_022486B4 * param0, UnkStruct_0205E884 * const param1, fx32 param2, fx32 param3)
+static void ov6_02248610 (UnkStruct_ov6_022486B4 * param0, PlayerAvatar * const param1, fx32 param2, fx32 param3)
 {
     VecFx32 v0;
     int v1;
@@ -570,7 +570,7 @@ static void ov6_02248728 (UnkStruct_ov6_022487F8 * param0)
 {
     VecFx32 v0;
 
-    sub_0205EAEC(param0->unk_CE0->unk_3C, &v0);
+    sub_0205EAEC(param0->unk_CE0->playerAvatar, &v0);
 
     if (((v0.x - param0->unk_CF0.x) == 0) && (v0.y < param0->unk_CF0.y) && (v0.z > param0->unk_CF0.z)) {
         param0->unk_CE8 = 0;
@@ -591,7 +591,7 @@ static void ov6_02248798 (UnkStruct_ov6_022487F8 * param0)
 
     for (v0 = 0; v0 < 16; v0++) {
         if (param0->unk_10[v0].unk_C8 == 0) {
-            ov6_02248610(&param0->unk_10[v0], param0->unk_CE0->unk_3C, param0->unk_CE8, param0->unk_CEC);
+            ov6_02248610(&param0->unk_10[v0], param0->unk_CE0->playerAvatar, param0->unk_CE8, param0->unk_CEC);
             return;
         }
     }
@@ -630,7 +630,7 @@ static void ov6_022487F8 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1,
     }
 
     v0->unk_CE0 = param1;
-    sub_0205EAEC(v0->unk_CE0->unk_3C, &v0->unk_CF0);
+    sub_0205EAEC(v0->unk_CE0->playerAvatar, &v0->unk_CF0);
 
     v0->unk_D0C = 0;
     NARC_dtor(v2);
diff --git a/src/overlay007/ov7_0224CD28.c b/src/overlay007/ov7_0224CD28.c
index c3cf0cf479..52b3a71180 100644
--- a/src/overlay007/ov7_0224CD28.c
+++ b/src/overlay007/ov7_0224CD28.c
@@ -221,7 +221,7 @@ void ov7_0224CDA4 (UnkStruct_020508D4 * param0, FieldSystem * param1, u16 * para
 
 static u8 ov7_0224CE90 (FieldSystem * param0)
 {
-    int v0 = Player_Dir(param0->unk_3C);
+    int v0 = Player_Dir(param0->playerAvatar);
 
     if ((v0 == 0) || (v0 == 1) || (v0 == 3)) {
         return 10;
diff --git a/src/overlay008/ov8_02249960.c b/src/overlay008/ov8_02249960.c
index ca68e5238a..b0e3e84d73 100644
--- a/src/overlay008/ov8_02249960.c
+++ b/src/overlay008/ov8_02249960.c
@@ -351,8 +351,8 @@ void ov8_0224997C (FieldSystem * param0)
     int v4;
     int v5[] = {239, 240, 241};
 
-    v1 = Player_XPos(param0->unk_3C);
-    v2 = Player_ZPos(param0->unk_3C);
+    v1 = Player_XPos(param0->playerAvatar);
+    v2 = Player_ZPos(param0->playerAvatar);
 
     sub_020550F4(v1, v2, 0, 0, 1, 1, &v0);
 
@@ -768,7 +768,7 @@ void ov8_02249FB8 (FieldSystem * param0)
         v2 = sub_02027860(sub_0203D174(param0));
         v3 = (UnkStruct_ov8_02249FB8 *)sub_02027F6C(v2, 2);
 
-        sub_0205EAEC(param0->unk_3C, &v1);
+        sub_0205EAEC(param0->playerAvatar, &v1);
 
         if (v1.y == (FX32_ONE * 16 * 0)) {
             sub_02050944(param0->unk_10, ov8_0224A018, v0);
@@ -788,7 +788,7 @@ static BOOL ov8_0224A018 (UnkStruct_020508D4 * param0)
 
     switch (v2->unk_00) {
     case 0:
-        sub_0205ED2C(v1->unk_3C, 0);
+        sub_0205ED2C(v1->playerAvatar, 0);
         Sound_PlayEffect(1553);
         (v2->unk_00)++;
         break;
@@ -809,14 +809,14 @@ static BOOL ov8_0224A018 (UnkStruct_020508D4 * param0)
                 (v2->unk_00)++;
             }
 
-            sub_0205ED0C(v1->unk_3C, v3.y);
+            sub_0205ED0C(v1->playerAvatar, v3.y);
             ov5_021E18A4(v0, &v3);
         }
     }
     break;
     case 2:
         ov5_021EF388(0, (FX32_ONE * 16 * 10), v1->unk_A0);
-        sub_0205ED48(v1->unk_3C, 1);
+        sub_0205ED48(v1->playerAvatar, 1);
         Sound_PlayEffect(1562);
         (v2->unk_00)++;
         break;
@@ -836,7 +836,7 @@ static BOOL ov8_0224A0E8 (UnkStruct_020508D4 * param0)
 
     switch (v2->unk_00) {
     case 0:
-        sub_0205ED2C(v1->unk_3C, 0);
+        sub_0205ED2C(v1->playerAvatar, 0);
         Sound_PlayEffect(1553);
         (v2->unk_00)++;
         break;
@@ -856,14 +856,14 @@ static BOOL ov8_0224A0E8 (UnkStruct_020508D4 * param0)
                 (v2->unk_00)++;
             }
 
-            sub_0205ED0C(v1->unk_3C, v3.y);
+            sub_0205ED0C(v1->playerAvatar, v3.y);
             ov5_021E18A4(v0, &v3);
         }
     }
     break;
     case 2:
         ov5_021EF388(0, (FX32_ONE * 16 * 0), v1->unk_A0);
-        sub_0205ED48(v1->unk_3C, 1);
+        sub_0205ED48(v1->playerAvatar, 1);
         Sound_PlayEffect(1562);
         (v2->unk_00)++;
         break;
@@ -1230,7 +1230,7 @@ static u8 ov8_0224A1E4 (UnkStruct_ov8_0224A1E4 * param0)
     u8 v3;
     VecFx32 v4;
 
-    sub_0205EAEC(param0->unk_00->unk_3C, &v4);
+    sub_0205EAEC(param0->unk_00->playerAvatar, &v4);
 
     v1 = v4.y / (FX32_ONE * 16);
     v2 = v4.x / (FX32_ONE * 16);
@@ -1353,7 +1353,7 @@ static BOOL ov8_0224A4FC (UnkStruct_020508D4 * param0)
 
     switch (v2->unk_00) {
     case 0:
-        sub_0205ED2C(v1->unk_3C, 0);
+        sub_0205ED2C(v1->playerAvatar, 0);
         Sound_PlayEffect(1553);
         (v2->unk_00)++;
         break;
@@ -1390,7 +1390,7 @@ static BOOL ov8_0224A4FC (UnkStruct_020508D4 * param0)
                 GF_ASSERT(FALSE);
             }
 
-            sub_0205ED0C(v1->unk_3C, v5.y);
+            sub_0205ED0C(v1->playerAvatar, v5.y);
 
             ov5_021E18A4(v0, &v5);
             ov8_0224A434(v3, v5.y);
@@ -1398,7 +1398,7 @@ static BOOL ov8_0224A4FC (UnkStruct_020508D4 * param0)
     }
     break;
     case 2:
-        sub_0205ED48(v1->unk_3C, 1);
+        sub_0205ED48(v1->playerAvatar, 1);
         Sound_PlayEffect(1562);
         (v2->unk_00)++;
         break;
@@ -1419,7 +1419,7 @@ static BOOL ov8_0224A620 (UnkStruct_020508D4 * param0)
     UnkStruct_ov8_0224A1E4 * v4;
 
     v4 = (UnkStruct_ov8_0224A1E4 *)v2->unk_04->unk_24;
-    v1 = sub_0205EB3C(v2->unk_3C);
+    v1 = sub_0205EB3C(v2->playerAvatar);
 
     switch (v3->unk_00) {
     case 0:
@@ -1441,7 +1441,7 @@ static BOOL ov8_0224A620 (UnkStruct_020508D4 * param0)
             VecFx32 v6, v7;
 
             v6 = ov5_021E1894(v0);
-            sub_0205EAEC(v2->unk_3C, &v7);
+            sub_0205EAEC(v2->playerAvatar, &v7);
             v6.x = v7.x;
 
             if (v4->unk_F0 == 4) {
@@ -1503,7 +1503,7 @@ static BOOL ov8_0224A770 (UnkStruct_020508D4 * param0)
     UnkStruct_ov8_0224A1E4 * v4;
 
     v4 = (UnkStruct_ov8_0224A1E4 *)v2->unk_04->unk_24;
-    v1 = sub_0205EB3C(v2->unk_3C);
+    v1 = sub_0205EB3C(v2->playerAvatar);
 
     switch (v3->unk_00) {
     case 0:
@@ -1525,7 +1525,7 @@ static BOOL ov8_0224A770 (UnkStruct_020508D4 * param0)
             VecFx32 v6, v7;
 
             v6 = ov5_021E1894(v0);
-            sub_0205EAEC(v2->unk_3C, &v7);
+            sub_0205EAEC(v2->playerAvatar, &v7);
             v6.z = v7.z;
 
             if (v4->unk_F0 == 3) {
@@ -1568,7 +1568,7 @@ static BOOL ov8_0224A770 (UnkStruct_020508D4 * param0)
     {
         UnkStruct_02061AB4 * v8;
 
-        v8 = sub_0205EB3C(v2->unk_3C);
+        v8 = sub_0205EB3C(v2->playerAvatar);
 
         if (sub_02065684(v8) == 1) {
             sub_020656AC(v8);
@@ -1644,7 +1644,7 @@ void ov8_0224A8C8 (FieldSystem * param0)
     {
         VecFx32 v6;
 
-        sub_0205EAEC(param0->unk_3C, &v6);
+        sub_0205EAEC(param0->playerAvatar, &v6);
         ov8_0224A434(v0, v6.y);
     }
 
@@ -2619,8 +2619,8 @@ static void ov8_0224B18C (FieldSystem * param0, UnkStruct_ov8_0224B28C * param1,
     int v0, v1, v2, v3;
     const VecFx32 * v4;
 
-    v0 = Player_XPos(param0->unk_3C);
-    v1 = Player_ZPos(param0->unk_3C);
+    v0 = Player_XPos(param0->playerAvatar);
+    v1 = Player_ZPos(param0->playerAvatar);
 
     param1->unk_10 = v0;
     param1->unk_14 = v1;
@@ -2727,7 +2727,7 @@ static void ov8_0224B2B4 (UnkStruct_ov8_0224B28C * param0, int param1, int param
 
 static void ov8_0224B2C4 (FieldSystem * param0, UnkStruct_ov8_0224B28C * param1)
 {
-    const VecFx32 * v0 = sub_0205EAFC(param0->unk_3C);
+    const VecFx32 * v0 = sub_0205EAFC(param0->playerAvatar);
 
     ov5_021E931C(v0, param0->unk_28);
     sub_02020690(v0, param0->unk_24);
@@ -2954,8 +2954,8 @@ static BOOL ov8_0224B3D4 (UnkStruct_020508D4 * param0)
         v2->unk_00++;
     case 12:
         if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
-            int v9 = Player_XPos(v1->unk_3C);
-            int v10 = Player_ZPos(v1->unk_3C);
+            int v9 = Player_XPos(v1->playerAvatar);
+            int v10 = Player_ZPos(v1->playerAvatar);
 
             ov8_0224B240(&v2->unk_1C, v9, v10);
             sub_0200E084(v2->unk_44, 0);
@@ -3346,7 +3346,7 @@ static BOOL ov8_0224BAF4 (UnkStruct_020508D4 * param0)
     UnkStruct_ov8_0224C098 * v2 = sub_02050A64(param0);
     UnkStruct_ov8_0224B8D0 * v3 = v2->unk_3C;
 
-    v0 = sub_0205EB3C(v1->unk_3C);
+    v0 = sub_0205EB3C(v1->playerAvatar);
 
     switch (v2->unk_00) {
     case 0:
@@ -3406,7 +3406,7 @@ static int ov8_0224BBD0 (UnkStruct_ov8_0224C098 * param0)
 {
     UnkStruct_02061AB4 * v0;
 
-    v0 = sub_0205EB3C(param0->unk_3C->unk_00->unk_3C);
+    v0 = sub_0205EB3C(param0->unk_3C->unk_00->playerAvatar);
 
     if (sub_020655F4(v0) == 0) {
         return 0;
@@ -3586,7 +3586,7 @@ static int ov8_0224BEA4 (UnkStruct_ov8_0224C098 * param0)
 {
     UnkStruct_02061AB4 * v0;
 
-    v0 = sub_0205EB3C(param0->unk_3C->unk_00->unk_3C);
+    v0 = sub_0205EB3C(param0->unk_3C->unk_00->playerAvatar);
 
     if (sub_02065684(v0) == 1) {
         sub_020656AC(v0);
@@ -3659,10 +3659,10 @@ BOOL ov8_0224BF4C (FieldSystem * param0)
     {
         int v1, v2, v3;
         UnkStruct_ov8_0224BCA8 * v4;
-        int v5 = Player_Dir(param0->unk_3C);
+        int v5 = Player_Dir(param0->playerAvatar);
         UnkStruct_ov8_0224B8D0 * v6 = param0->unk_04->unk_24;
 
-        sub_0206157C(param0->unk_3C, v5, &v1, &v2);
+        sub_0206157C(param0->playerAvatar, v5, &v1, &v2);
         v4 = ov8_0224B854(v6, v1, v2);
 
         if (v4 == NULL) {
@@ -3704,8 +3704,8 @@ static void ov8_0224BFCC (FieldSystem * param0, UnkStruct_ov8_0224C098 * param1,
     v3->unk_18 = v0 + (sub_0206419C(param3) * v3->unk_24);
     v3->unk_1C = v1 + (sub_020641A8(param3) * v3->unk_24);
 
-    v0 = Player_XPos(param0->unk_3C);
-    v1 = Player_ZPos(param0->unk_3C);
+    v0 = Player_XPos(param0->playerAvatar);
+    v1 = Player_ZPos(param0->playerAvatar);
 
     v3->unk_10 = v0;
     v3->unk_14 = v1;
@@ -3725,7 +3725,7 @@ static void ov8_0224BFCC (FieldSystem * param0, UnkStruct_ov8_0224C098 * param1,
 static void ov8_0224C098 (UnkStruct_ov8_0224C098 * param0)
 {
     UnkStruct_ov8_0224C0C4 * v0 = &param0->unk_40;
-    const VecFx32 * v1 = sub_0205EAFC(v0->unk_34->unk_3C);
+    const VecFx32 * v1 = sub_0205EAFC(v0->unk_34->playerAvatar);
 
     ov5_021E931C(v1, v0->unk_34->unk_28);
     sub_02020690(v1, v0->unk_34->unk_24);
@@ -3896,10 +3896,10 @@ void ov8_0224C198 (FieldSystem * param0)
 
     {
         int v3 = 0xd2;
-        UnkStruct_0205E884 * v4 = param0->unk_3C;
+        PlayerAvatar * v4 = param0->playerAvatar;
         UnkStruct_02061AB4 * v5 = sub_0205EB3C(v4);
 
-        if (sub_0205EB98(param0->unk_3C) == 1) {
+        if (sub_0205EB98(param0->playerAvatar) == 1) {
             v3 = 0xd3;
         }
 
@@ -4075,7 +4075,7 @@ BOOL ov8_0224C51C (FieldSystem * param0)
 {
     int v0, v1, v2, v3;
     UnkStruct_02027860 * v4;
-    UnkStruct_0205E884 * v5;
+    PlayerAvatar * v5;
     UnkStruct_02061830 * v6;
     UnkStruct_02061AB4 * v7;
     UnkStruct_02061AB4 * v8;
@@ -4089,7 +4089,7 @@ BOOL ov8_0224C51C (FieldSystem * param0)
     v0 = 0;
     v7 = NULL;
     v6 = param0->unk_38;
-    v5 = param0->unk_3C;
+    v5 = param0->playerAvatar;
     v8 = sub_0205EB3C(v5);
     v2 = 2;
     v1 = sub_0206447C(sub_0206298C(v8));
diff --git a/src/overlay009/ov9_02249960.c b/src/overlay009/ov9_02249960.c
index 4e00014ee3..3ef1974621 100644
--- a/src/overlay009/ov9_02249960.c
+++ b/src/overlay009/ov9_02249960.c
@@ -2061,7 +2061,7 @@ BOOL ov9_0224A59C (FieldSystem * param0, int param1)
         int v1, v2, v3, v4;
         UnkStruct_ov9_02249B04 * v5 = param0->unk_04->unk_24;
 
-        v4 = sub_02061434(param0->unk_3C, param1);
+        v4 = sub_02061434(param0->playerAvatar, param1);
         ov9_02250F44(v5, &v1, &v2, &v3);
 
         if (v4 == 1) {
@@ -2147,7 +2147,7 @@ BOOL ov9_0224A71C (FieldSystem * param0)
 
     {
         int v1, v2, v3;
-        int v4 = Player_Dir(param0->unk_3C);
+        int v4 = Player_Dir(param0->playerAvatar);
         UnkStruct_ov9_02249B04 * v5 = param0->unk_04->unk_24;
 
         ov9_02250F44(v5, &v1, &v2, &v3);
@@ -2241,7 +2241,7 @@ static void ov9_0224A8C0 (UnkStruct_ov9_02249B04 * param0)
     u32 v0, v1;
     int v2, v3, v4, v5;
     int v6[6] = {0, 0, 0, 90, 270, 180};
-    UnkStruct_0205E884 * v7 = param0->unk_00->unk_3C;
+    PlayerAvatar * v7 = param0->unk_00->playerAvatar;
     UnkStruct_02061AB4 * v8 = sub_0205EB3C(v7);
 
     ov9_02250F44(param0, &v2, &v3, &v4);
@@ -2303,7 +2303,7 @@ static void ov9_0224A8C0 (UnkStruct_ov9_02249B04 * param0)
 
 static void ov9_0224A9E8 (UnkStruct_ov9_02249B04 * param0)
 {
-    UnkStruct_0205E884 * v0 = param0->unk_00->unk_3C;
+    PlayerAvatar * v0 = param0->unk_00->playerAvatar;
 
     sub_0205F098(v0, 0);
     sub_0205EBC0(v0);
@@ -2317,7 +2317,7 @@ static BOOL ov9_0224AA00 (UnkStruct_ov9_02249B04 * param0, int param1, int param
         v0 = ov9_0224C69C(param0, param1, param2, param3, param4);
 
         if (v0) {
-            UnkStruct_02061AB4 * v1 = sub_0205EB3C(param0->unk_00->unk_3C);
+            UnkStruct_02061AB4 * v1 = sub_0205EB3C(param0->unk_00->playerAvatar);
 
             Unk_ov9_02251224[v0->unk_00](param0, v0);
             return 1;
@@ -2361,7 +2361,7 @@ static BOOL ov9_0224AAD4 (UnkStruct_020508D4 * param0)
     FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_ov9_02249B04 * v1 = sub_02050A64(param0);
     UnkStruct_ov9_0224AC58 * v2 = ov9_0224A598(v1);
-    UnkStruct_0205E884 * v3 = v0->unk_3C;
+    PlayerAvatar * v3 = v0->playerAvatar;
     UnkStruct_02061AB4 * v4 = sub_0205EB3C(v3);
 
     switch (v2->unk_00) {
@@ -4397,7 +4397,7 @@ static void ov9_0224C8E8 (UnkStruct_ov9_02249B04 * param0)
         NARC * v6 = ov5_021E9828(v3->unk_28);
 
         v2->unk_18 = ov5_021E9830(v2->unk_10, v2->unk_14, v6);
-        ov5_021E931C(sub_0205EAFC(v3->unk_3C), v2->unk_18);
+        ov5_021E931C(sub_0205EAFC(v3->playerAvatar), v2->unk_18);
     }
 
     {
@@ -4413,8 +4413,8 @@ static void ov9_0224C8E8 (UnkStruct_ov9_02249B04 * param0)
     }
 
     {
-        int v10 = Player_XPos(v3->unk_3C);
-        int v11 = Player_ZPos(v3->unk_3C);
+        int v10 = Player_XPos(v3->playerAvatar);
+        int v11 = Player_ZPos(v3->playerAvatar);
 
         ov5_021E99D8(v2->unk_18, v10, v11);
         v2->unk_08 = 1;
@@ -4424,7 +4424,7 @@ static void ov9_0224C8E8 (UnkStruct_ov9_02249B04 * param0)
 
     if (ov9_02249D38(param0) == 0) {
         VecFx32 v12, v13;
-        UnkStruct_02061AB4 * v14 = sub_0205EB3C(v3->unk_3C);
+        UnkStruct_02061AB4 * v14 = sub_0205EB3C(v3->playerAvatar);
 
         sub_02063050(v14, &v13);
         ov5_021EA6BC(v3->unk_28, &v12);
@@ -4687,8 +4687,8 @@ static int ov9_0224CCB8 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224CBD8
     ov9_0224BF18(param0, v2->unk_08);
     ov5_021E9CD8(v0->unk_28);
 
-    param1->unk_08 = Player_XPos(v0->unk_3C);
-    param1->unk_0A = Player_ZPos(v0->unk_3C);
+    param1->unk_08 = Player_XPos(v0->playerAvatar);
+    param1->unk_0A = Player_ZPos(v0->playerAvatar);
 
     ov5_021E9D3C(v1->unk_10, v1->unk_14, v1->unk_18, v0->unk_28, param1->unk_08, param1->unk_0A);
     v1->unk_08 = 0;
@@ -4994,7 +4994,7 @@ static int ov9_0224D0C8 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078
     }
 
     v3 = ov9_0224DE70(param1->unk_02);
-    v1 = sub_0205EB3C(param0->unk_00->unk_3C);
+    v1 = sub_0205EB3C(param0->unk_00->playerAvatar);
 
     sub_02063050(v1, &param1->unk_14);
     sub_02062E28(v1, 1);
@@ -5049,7 +5049,7 @@ static int ov9_0224D0C8 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078
 static int ov9_0224D288 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078 * param1)
 {
     VecFx32 v0;
-    UnkStruct_0205E884 * v1 = param0->unk_00->unk_3C;
+    PlayerAvatar * v1 = param0->unk_00->playerAvatar;
     UnkStruct_02061AB4 * v2 = sub_0205EB3C(v1);
     VecFx32 * v3 = ov9_0224E330(param1->unk_64->unk_20);
 
@@ -5110,7 +5110,7 @@ static int ov9_0224D288 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078
 static int ov9_0224D374 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078 * param1)
 {
     int v0;
-    UnkStruct_0205E884 * v1 = param0->unk_00->unk_3C;
+    PlayerAvatar * v1 = param0->unk_00->playerAvatar;
     UnkStruct_02061AB4 * v2 = sub_0205EB3C(v1);
     VecFx32 * v3 = ov9_0224E330(param1->unk_64->unk_20);
 
@@ -5192,7 +5192,7 @@ static int ov9_0224D430 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078
 static int ov9_0224D4C4 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078 * param1)
 {
     int v0;
-    UnkStruct_0205E884 * v1 = param0->unk_00->unk_3C;
+    PlayerAvatar * v1 = param0->unk_00->playerAvatar;
     UnkStruct_02061AB4 * v2 = sub_0205EB3C(v1);
     VecFx32 * v3 = ov9_0224E330(param1->unk_64->unk_20);
 
@@ -5229,7 +5229,7 @@ static int ov9_0224D4C4 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078
             sub_020057A4(1481, 0);
             param1->unk_04 = 5;
         } else {
-            UnkStruct_02061AB4 * v5 = sub_0205EB3C(param0->unk_00->unk_3C);
+            UnkStruct_02061AB4 * v5 = sub_0205EB3C(param0->unk_00->playerAvatar);
 
             sub_02063024(v5, param1->unk_0A);
             sub_02063034(v5, param1->unk_0C);
@@ -5260,13 +5260,13 @@ static int ov9_0224D4C4 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078
 static int ov9_0224D5E8 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078 * param1)
 {
     if (ov9_0224CC7C(param0) == 0) {
-        UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0->unk_00->unk_3C);
+        UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0->unk_00->playerAvatar);
 
         sub_02063024(v0, param1->unk_0A);
         sub_02063034(v0, param1->unk_0C);
         sub_02063044(v0, param1->unk_0E);
         sub_02064208(v0);
-        sub_0205ED48(param0->unk_00->unk_3C, 1);
+        sub_0205ED48(param0->unk_00->playerAvatar, 1);
 
         if (param1->unk_68 != NULL) {
             sub_02063034(param1->unk_68, param1->unk_0C);
@@ -6380,7 +6380,7 @@ static int ov9_0224E550 (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
 
     if (v0->unk_02 == 1) {
         VecFx32 v3;
-        UnkStruct_02061AB4 * v4 = sub_0205EB3C(param0->unk_00->unk_3C);
+        UnkStruct_02061AB4 * v4 = sub_0205EB3C(param0->unk_00->playerAvatar);
 
         sub_02062E28(v4, 1);
         sub_0206309C(v4, &v3);
@@ -6402,7 +6402,7 @@ static int ov9_0224E5EC (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
     VecFx32 * v3 = ov9_0224E330(v2->unk_24->unk_20);
 
     if (v1->unk_02 == 1) {
-        v0 = sub_0205EB3C(param0->unk_00->unk_3C);
+        v0 = sub_0205EB3C(param0->unk_00->playerAvatar);
     }
 
     v3->y = v2->unk_2C + v2->unk_30;
@@ -6488,7 +6488,7 @@ static int ov9_0224E6B0 (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
 
     if (v1->unk_02 == 1) {
         VecFx32 v4;
-        UnkStruct_02061AB4 * v5 = sub_0205EB3C(param0->unk_00->unk_3C);
+        UnkStruct_02061AB4 * v5 = sub_0205EB3C(param0->unk_00->playerAvatar);
 
         sub_02063050(v5, &v4);
 
@@ -6511,7 +6511,7 @@ static int ov9_0224E798 (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
     const UnkStruct_ov9_0224E550 * v0 = param3;
 
     if (v0->unk_02 == 1) {
-        UnkStruct_02061AB4 * v1 = sub_0205EB3C(param0->unk_00->unk_3C);
+        UnkStruct_02061AB4 * v1 = sub_0205EB3C(param0->unk_00->playerAvatar);
         int v2 = sub_02063020(v1) + v0->unk_06;
         int v3 = sub_02063030(v1) + ((v0->unk_08) * 2);
         int v4 = sub_02063040(v1) + v0->unk_0A;
@@ -6523,7 +6523,7 @@ static int ov9_0224E798 (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
 
         {
             u32 v5;
-            UnkStruct_0205E884 * v6 = param0->unk_00->unk_3C;
+            PlayerAvatar * v6 = param0->unk_00->playerAvatar;
 
             v3 = ((v3) / 2);
             ov9_0224C378(param0, v2, v3, v4, 4);
@@ -7807,7 +7807,7 @@ static void ov9_0224F760 (UnkStruct_ov9_02249B04 * param0)
 static void ov9_0224F764 (UnkStruct_ov9_02249B04 * param0)
 {
     UnkStruct_ov9_0224ADC0 * v0 = &param0->unk_1D00;
-    UnkStruct_0205E884 * v1 = param0->unk_00->unk_3C;
+    PlayerAvatar * v1 = param0->unk_00->playerAvatar;
     const VecFx32 * v2 = sub_0205EAFC(v1);
 
     if (v0->unk_06 == 0) {
@@ -8024,7 +8024,7 @@ static const UnkStruct_ov9_0224A8A0 Unk_ov9_02251888 = {
 
 static void ov9_0224FA94 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224FA94 * param1)
 {
-    UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0->unk_00->unk_3C);
+    UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0->unk_00->playerAvatar);
     int v1 = (((param1->unk_40.unk_10.y) >> 4) / FX32_ONE);
 
     if ((param1->unk_04 == 0) && (v1 == -20)) {
@@ -8053,14 +8053,14 @@ static int ov9_0224FB3C (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
     VecFx32 v0;
     UnkStruct_ov9_0224F930 * v1;
     UnkStruct_02061AB4 * v2;
-    UnkStruct_0205E884 * v3;
+    PlayerAvatar * v3;
     UnkStruct_ov9_0224FA94 * v4;
     const UnkStruct_ov9_02252384 * v5;
 
     v5 = param3;
     v4 = ov9_0224E37C(param0, sizeof(UnkStruct_ov9_0224FA94));
     v1 = &v4->unk_40;
-    v3 = param0->unk_00->unk_3C;
+    v3 = param0->unk_00->playerAvatar;
     v2 = sub_0205EB3C(v3);
 
     sub_02063050(v2, &v0);
@@ -8113,7 +8113,7 @@ static int ov9_0224FB3C (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
 
 static int ov9_0224FC2C (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * param1, u16 * param2, const void * param3)
 {
-    UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0->unk_00->unk_3C);
+    UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0->unk_00->playerAvatar);
     UnkStruct_ov9_0224FA94 * v1 = ov9_0224E39C(param0);
     UnkStruct_ov9_0224F930 * v2 = &v1->unk_40;
 
@@ -8122,7 +8122,7 @@ static int ov9_0224FC2C (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
     ov9_0224FA94(param0, v1);
 
     {
-        UnkStruct_ov101_021D5D90 * v3 = sub_0205EC04(param0->unk_00->unk_3C);
+        UnkStruct_ov101_021D5D90 * v3 = sub_0205EC04(param0->unk_00->playerAvatar);
 
         {
             UnkStruct_ov5_02201C58 * v4 = ov5_021F88A8(v3);
@@ -8160,7 +8160,7 @@ static int ov9_0224FC2C (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
         ov9_0224F930(v2, 0, 0x400, (FX32_ONE * 4));
 
         {
-            UnkStruct_ov101_021D5D90 * v6 = sub_0205EC04(param0->unk_00->unk_3C);
+            UnkStruct_ov101_021D5D90 * v6 = sub_0205EC04(param0->unk_00->playerAvatar);
             VecFx32 * v7;
 
             v7 = ov5_021F88FC(v6);
@@ -8185,8 +8185,8 @@ static int ov9_0224FC2C (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
 static int ov9_0224FD74 (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * param1, u16 * param2, const void * param3)
 {
     int v0;
-    UnkStruct_ov101_021D5D90 * v1 = sub_0205EC04(param0->unk_00->unk_3C);
-    UnkStruct_02061AB4 * v2 = sub_0205EB3C(param0->unk_00->unk_3C);
+    UnkStruct_ov101_021D5D90 * v1 = sub_0205EC04(param0->unk_00->playerAvatar);
+    UnkStruct_02061AB4 * v2 = sub_0205EB3C(param0->unk_00->playerAvatar);
     UnkStruct_ov9_0224FA94 * v3 = ov9_0224E39C(param0);
     UnkStruct_ov9_0224F930 * v4 = &v3->unk_40;
 
@@ -8261,8 +8261,8 @@ static int ov9_0224FD74 (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
 static int ov9_0224FEDC (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * param1, u16 * param2, const void * param3)
 {
     int v0;
-    UnkStruct_ov101_021D5D90 * v1 = sub_0205EC04(param0->unk_00->unk_3C);
-    UnkStruct_02061AB4 * v2 = sub_0205EB3C(param0->unk_00->unk_3C);
+    UnkStruct_ov101_021D5D90 * v1 = sub_0205EC04(param0->unk_00->playerAvatar);
+    UnkStruct_02061AB4 * v2 = sub_0205EB3C(param0->unk_00->playerAvatar);
     UnkStruct_ov9_0224FA94 * v3 = ov9_0224E39C(param0);
     UnkStruct_ov9_0224F930 * v4 = &v3->unk_40;
 
@@ -8316,7 +8316,7 @@ static int ov9_0224FEDC (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
         sub_02063088(v2, &v13);
         sub_020630AC(v2, &v13);
         ov9_0224C378(param0, v8, ((v9) / 2), v10, 4);
-        sub_0205F098(param0->unk_00->unk_3C, 1);
+        sub_0205F098(param0->unk_00->playerAvatar, 1);
         sub_02062E28(v2, 0);
 
         {
@@ -8349,7 +8349,7 @@ static int ov9_022500E0 (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
 {
     u32 v0[2] = {0xa, 0x6};
     UnkStruct_ov9_0224FA94 * v1 = ov9_0224E39C(param0);
-    UnkStruct_02061AB4 * v2 = sub_0205EB3C(param0->unk_00->unk_3C);
+    UnkStruct_02061AB4 * v2 = sub_0205EB3C(param0->unk_00->playerAvatar);
 
     if (sub_020655F4(v2) == 0) {
         return 0;
@@ -8383,7 +8383,7 @@ static const UnkStruct_ov9_0224A8A0 Unk_ov9_02251C48 = {
 
 static void ov9_02250138 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_02250138 * param1)
 {
-    UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0->unk_00->unk_3C);
+    UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0->unk_00->playerAvatar);
     int v1 = (((param1->unk_34.unk_10.y) >> 4) / FX32_ONE);
 
     if ((param1->unk_04 == 0) && (v1 == 20)) {
@@ -8397,14 +8397,14 @@ static int ov9_02250170 (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
     VecFx32 v0;
     UnkStruct_ov9_0224F930 * v1;
     UnkStruct_02061AB4 * v2;
-    UnkStruct_0205E884 * v3;
+    PlayerAvatar * v3;
     UnkStruct_ov9_02250138 * v4;
     const UnkStruct_ov9_022523F0 * v5;
 
     v5 = param3;
     v4 = ov9_0224E37C(param0, sizeof(UnkStruct_ov9_02250138));
     v1 = &v4->unk_34;
-    v3 = param0->unk_00->unk_3C;
+    v3 = param0->unk_00->playerAvatar;
     v2 = sub_0205EB3C(v3);
 
     sub_02063050(v2, &v0);
@@ -8457,7 +8457,7 @@ static int ov9_02250170 (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
 
 static int ov9_02250260 (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * param1, u16 * param2, const void * param3)
 {
-    UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0->unk_00->unk_3C);
+    UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0->unk_00->playerAvatar);
     UnkStruct_ov9_02250138 * v1 = ov9_0224E39C(param0);
     UnkStruct_ov9_0224F930 * v2 = &v1->unk_34;
 
@@ -8466,7 +8466,7 @@ static int ov9_02250260 (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
     ov9_02250138(param0, v1);
 
     {
-        UnkStruct_ov101_021D5D90 * v3 = sub_0205EC04(param0->unk_00->unk_3C);
+        UnkStruct_ov101_021D5D90 * v3 = sub_0205EC04(param0->unk_00->playerAvatar);
 
         {
             UnkStruct_ov5_02201C58 * v4 = ov5_021F88A8(v3);
@@ -8504,7 +8504,7 @@ static int ov9_02250260 (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
         ov9_0224F930(v2, 0, 0x200, (FX32_ONE * 4));
 
         {
-            UnkStruct_ov101_021D5D90 * v6 = sub_0205EC04(param0->unk_00->unk_3C);
+            UnkStruct_ov101_021D5D90 * v6 = sub_0205EC04(param0->unk_00->playerAvatar);
             VecFx32 * v7;
 
             v7 = ov5_021F88FC(v6);
@@ -8526,8 +8526,8 @@ static int ov9_02250260 (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
 static int ov9_02250388 (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * param1, u16 * param2, const void * param3)
 {
     int v0;
-    UnkStruct_ov101_021D5D90 * v1 = sub_0205EC04(param0->unk_00->unk_3C);
-    UnkStruct_02061AB4 * v2 = sub_0205EB3C(param0->unk_00->unk_3C);
+    UnkStruct_ov101_021D5D90 * v1 = sub_0205EC04(param0->unk_00->playerAvatar);
+    UnkStruct_02061AB4 * v2 = sub_0205EB3C(param0->unk_00->playerAvatar);
     UnkStruct_ov9_02250138 * v3 = ov9_0224E39C(param0);
     UnkStruct_ov9_0224F930 * v4 = &v3->unk_34;
 
@@ -8579,8 +8579,8 @@ static int ov9_02250388 (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
 static int ov9_02250468 (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * param1, u16 * param2, const void * param3)
 {
     int v0;
-    UnkStruct_ov101_021D5D90 * v1 = sub_0205EC04(param0->unk_00->unk_3C);
-    UnkStruct_02061AB4 * v2 = sub_0205EB3C(param0->unk_00->unk_3C);
+    UnkStruct_ov101_021D5D90 * v1 = sub_0205EC04(param0->unk_00->playerAvatar);
+    UnkStruct_02061AB4 * v2 = sub_0205EB3C(param0->unk_00->playerAvatar);
     UnkStruct_ov9_02250138 * v3 = ov9_0224E39C(param0);
     UnkStruct_ov9_0224F930 * v4 = &v3->unk_34;
 
@@ -8634,7 +8634,7 @@ static int ov9_02250468 (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
         sub_02063088(v2, &v13);
         sub_020630AC(v2, &v13);
         ov9_0224C378(param0, v8, ((v9) / 2), v10, 4);
-        sub_0205F098(param0->unk_00->unk_3C, 5);
+        sub_0205F098(param0->unk_00->playerAvatar, 5);
         sub_02062E28(v2, 1);
 
         {
@@ -8662,7 +8662,7 @@ static int ov9_02250650 (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
 {
     u32 v0[3] = {0x97, 0x93, 0x73};
     UnkStruct_ov9_02250138 * v1 = ov9_0224E39C(param0);
-    UnkStruct_02061AB4 * v2 = sub_0205EB3C(param0->unk_00->unk_3C);
+    UnkStruct_02061AB4 * v2 = sub_0205EB3C(param0->unk_00->playerAvatar);
 
     if (sub_020655F4(v2) == 0) {
         return 0;
@@ -9282,7 +9282,7 @@ static int ov9_02250C48 (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
         }
 
         v0->unk_10 = sub_02065700(v0->unk_18, v6);
-        v0->unk_14 = sub_02065700(sub_0205EB3C(param0->unk_00->unk_3C), v5);
+        v0->unk_14 = sub_02065700(sub_0205EB3C(param0->unk_00->playerAvatar), v5);
         *param2 = 2;
     }
 
@@ -9497,7 +9497,7 @@ static void ov9_02250F1C (fx32 * param0, fx32 param1)
 
 static void ov9_02250F44 (UnkStruct_ov9_02249B04 * param0, int * param1, int * param2, int * param3)
 {
-    UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0->unk_00->unk_3C);
+    UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0->unk_00->playerAvatar);
 
     *param1 = sub_02063020(v0);
     *param2 = sub_02063030(v0);
diff --git a/src/overlay023/ov23_0223E140.c b/src/overlay023/ov23_0223E140.c
index b07b2de3e2..1a3acb4a70 100644
--- a/src/overlay023/ov23_0223E140.c
+++ b/src/overlay023/ov23_0223E140.c
@@ -719,7 +719,7 @@ BOOL ov23_0223E354 (int param0, UnkStruct_ov23_0224271C * param1)
             return 1;
         }
 
-        sub_02035AC4(64, &v1, 1);
+        CommSys_SendDataServer(64, &v1, 1);
         sub_02059058(param0, 0);
 
         Unk_ov23_02257740->unk_84C[param0] = v0;
@@ -1068,7 +1068,7 @@ void ov23_0223EAF8 (int param0, int param1, void * param2, void * param3)
 
     if ((v3[0] != 0) && v1) {
         if (v1->unk_04 == 0xff) {
-            sub_02035AC4(66, &v2, 1);
+            CommSys_SendDataServer(66, &v2, 1);
 
             v1->unk_04 = 0xff;
             v1->unk_00 = 0xffff;
@@ -2457,8 +2457,8 @@ static void ov23_02240758 (UnkStruct_ov23_0223EE80 * param0)
 
     for (v1 = 0; v1 < (7 + 1); v1++) {
         if ((Unk_ov23_02257740->unk_910[v1] != 0xff) && (Unk_ov23_02257740->unk_918[v1] != 0xff)) {
-            int v2 = sub_02058CA0(CommSys_CurNetId());
-            int v3 = sub_02058CF4(CommSys_CurNetId());
+            int v2 = CommPlayer_XPos(CommSys_CurNetId());
+            int v3 = CommPlayer_ZPos(CommSys_CurNetId());
             int v4 = ov23_0224AD04(v1);
             int v5 = ov23_0224AD40(v1);
 
diff --git a/src/overlay023/ov23_022416A8.c b/src/overlay023/ov23_022416A8.c
index 2c6154031b..53f34f725e 100644
--- a/src/overlay023/ov23_022416A8.c
+++ b/src/overlay023/ov23_022416A8.c
@@ -360,7 +360,7 @@ void ov23_02241AE8 (int param0, int param1, int param2, int param3)
         return;
     }
 
-    if (sub_02058108(param2, param3)) {
+    if (CommPlayer_CheckNPCCollision(param2, param3)) {
         ov23_02253F40(ov23_0224219C(), 55, 0, NULL);
         return;
     }
diff --git a/src/overlay023/ov23_02241F74.c b/src/overlay023/ov23_02241F74.c
index a94079cfdf..4d9571b0cd 100644
--- a/src/overlay023/ov23_02241F74.c
+++ b/src/overlay023/ov23_02241F74.c
@@ -430,10 +430,10 @@ static void ov23_022425B8 (int param0, UnkStruct_ov23_0224271C * param1)
     v0[0] = param0;
 
     v3 = ov23_02242540(v0, ov23_022442D8, param1);
-    sub_02035AC4(49, v0, v3);
+    CommSys_SendDataServer(49, v0, v3);
 
     v3 = ov23_02242540(v0, ov23_02241200, param1);
-    sub_02035AC4(50, v0, v3);
+    CommSys_SendDataServer(50, v0, v3);
 }
 
 void ov23_022425F8 (int param0, int param1, void * param2, void * param3)
@@ -650,7 +650,7 @@ void ov23_022428D8 (int param0, int param1, void * param2, void * param3)
             v0.unk_02 = v3;
             v0.unk_01 = param0;
 
-            sub_02035AC4(30, &v0, sizeof(v0));
+            CommSys_SendDataServer(30, &v0, sizeof(v0));
             sub_02059058(param0, 0);
         } else if (ov23_0224A658(param0, v3, 0)) {
             (void)0;
@@ -662,7 +662,7 @@ void ov23_022428D8 (int param0, int param1, void * param2, void * param3)
                 v0.unk_02 = v3;
                 v0.unk_01 = param0;
 
-                sub_02035AC4(30, &v0, sizeof(v0));
+                CommSys_SendDataServer(30, &v0, sizeof(v0));
                 sub_02059058(param0, 0);
             }
         } else if (!sub_02059094(param0)) {
@@ -672,7 +672,7 @@ void ov23_022428D8 (int param0, int param1, void * param2, void * param3)
             v0.unk_02 = v3;
             v0.unk_01 = param0;
 
-            sub_02035AC4(30, &v0, sizeof(v0));
+            CommSys_SendDataServer(30, &v0, sizeof(v0));
             sub_02059058(param0, 0);
         } else {
             v0.unk_00 = 1;
@@ -680,7 +680,7 @@ void ov23_022428D8 (int param0, int param1, void * param2, void * param3)
             v0.unk_01 = param0;
 
             if (sub_02059094(v3)) {
-                if (sub_02035AC4(30, &v0, sizeof(v0))) {
+                if (CommSys_SendDataServer(30, &v0, sizeof(v0))) {
                     sub_02059058(param0, 0);
                     sub_02059058(v3, 0);
                     sub_02058FB0(param0, v3);
@@ -711,7 +711,7 @@ void ov23_022428D8 (int param0, int param1, void * param2, void * param3)
         return;
     }
 
-    if (sub_02058108(v2.unk_00, v2.unk_02)) {
+    if (CommPlayer_CheckNPCCollision(v2.unk_00, v2.unk_02)) {
         if (ov23_0224A658(param0, 0xff, 0)) {
             return;
         }
diff --git a/src/overlay023/ov23_0224340C.c b/src/overlay023/ov23_0224340C.c
index 57d0441acd..84c58240ab 100644
--- a/src/overlay023/ov23_0224340C.c
+++ b/src/overlay023/ov23_0224340C.c
@@ -1024,31 +1024,31 @@ void ov23_02243B0C (int param0, int param1, void * param2, void * param3)
 
     if ((sub_02058DF8(param0) == 0xffff) && (sub_02058E4C(param0) == 0xffff)) {
         v4.unk_07 = 7;
-        sub_02035AC4(34, &v4, sizeof(UnkStruct_ov23_02243ED4));
+        CommSys_SendDataServer(34, &v4, sizeof(UnkStruct_ov23_02243ED4));
         return;
     }
 
     if (0xff != sub_0205900C(v1, v2)) {
         v4.unk_07 = 5;
-        sub_02035AC4(34, &v4, sizeof(UnkStruct_ov23_02243ED4));
+        CommSys_SendDataServer(34, &v4, sizeof(UnkStruct_ov23_02243ED4));
         return;
     }
 
-    if (sub_02058108(v1, v2)) {
+    if (CommPlayer_CheckNPCCollision(v1, v2)) {
         v4.unk_07 = 5;
-        sub_02035AC4(34, &v4, sizeof(UnkStruct_ov23_02243ED4));
+        CommSys_SendDataServer(34, &v4, sizeof(UnkStruct_ov23_02243ED4));
         return;
     }
 
     if (ov23_02242E58(v1, v2)) {
         v4.unk_07 = 4;
-        sub_02035AC4(34, &v4, sizeof(UnkStruct_ov23_02243ED4));
+        CommSys_SendDataServer(34, &v4, sizeof(UnkStruct_ov23_02243ED4));
         return;
     }
 
     if (sub_02054F68(Unk_ov23_02257764->unk_40, v1, v2)) {
         v4.unk_07 = 6;
-        sub_02035AC4(34, &v4, sizeof(UnkStruct_ov23_02243ED4));
+        CommSys_SendDataServer(34, &v4, sizeof(UnkStruct_ov23_02243ED4));
         return;
     }
 
@@ -1061,7 +1061,7 @@ void ov23_02243B0C (int param0, int param1, void * param2, void * param3)
         }
     }
 
-    sub_02035AC4(34, &v4, sizeof(UnkStruct_ov23_02243ED4));
+    CommSys_SendDataServer(34, &v4, sizeof(UnkStruct_ov23_02243ED4));
 }
 
 int ov23_02243C38 (void)
@@ -1291,7 +1291,7 @@ void ov23_02243F9C (int param0, int param1, void * param2, void * param3)
     v0[0] = param0;
     v0[1] = 1;
 
-    sub_02035AC4(36, v0, 2);
+    CommSys_SendDataServer(36, v0, 2);
     ov23_02244638();
 }
 
@@ -1360,7 +1360,7 @@ BOOL ov23_02244080 (int param0, UnkStruct_ov23_0224271C * param1, u8 param2)
         }
 
         sub_02059058(param0, 0);
-        sub_02035AC4(51, &v4, sizeof(UnkStruct_ov23_02244140));
+        CommSys_SendDataServer(51, &v4, sizeof(UnkStruct_ov23_02244140));
 
         return 1;
     }
@@ -1502,7 +1502,7 @@ static BOOL ov23_022442F0 (int param0)
         sub_02028FB4(v2, v0.unk_00.unk_05);
     }
 
-    sub_02035AC4(37, &v0, sizeof(UnkStruct_ov23_02244140));
+    CommSys_SendDataServer(37, &v0, sizeof(UnkStruct_ov23_02244140));
     Unk_ov23_02257764->unk_BA0[param0] = v1->unk_04;
     ov23_02243A00(v1);
 
@@ -1527,7 +1527,7 @@ void ov23_022443CC (int param0, int param1, int param2, int param3, int param4,
     v0.unk_00.unk_02 = param4;
     v0.unk_07_4 = param5;
 
-    sub_02035AC4(37, &v0, sizeof(UnkStruct_ov23_02244140));
+    CommSys_SendDataServer(37, &v0, sizeof(UnkStruct_ov23_02244140));
     Unk_ov23_02257764->unk_BA0[param0] = param2;
 }
 
@@ -1815,9 +1815,9 @@ static void ov23_022448FC (int param0)
 {
     int v0, v1, v2;
 
-    v2 = sub_02059328(param0);
+    v2 = CommPlayer_GetOppositeDir(param0);
 
-    sub_0205EA84(Unk_ov23_02257764->unk_40->unk_3C, v2);
+    sub_0205EA84(Unk_ov23_02257764->unk_40->playerAvatar, v2);
 
     v0 = Unk_ov23_02257764->unk_B28[CommSys_CurNetId()].unk_00.unk_00;
     v1 = Unk_ov23_02257764->unk_B28[CommSys_CurNetId()].unk_00.unk_02;
@@ -1831,9 +1831,9 @@ static BOOL ov23_0224495C (int param0, BOOL param1)
 {
     int v0, v1, v2, v3, v4;
 
-    v0 = Player_XPos(Unk_ov23_02257764->unk_40->unk_3C);
-    v1 = Player_ZPos(Unk_ov23_02257764->unk_40->unk_3C);
-    v4 = sub_02059328(param0);
+    v0 = Player_XPos(Unk_ov23_02257764->unk_40->playerAvatar);
+    v1 = Player_ZPos(Unk_ov23_02257764->unk_40->playerAvatar);
+    v4 = CommPlayer_GetOppositeDir(param0);
     v2 = Unk_ov23_02257764->unk_B28[CommSys_CurNetId()].unk_00.unk_00;
     v3 = Unk_ov23_02257764->unk_B28[CommSys_CurNetId()].unk_00.unk_02;
 
@@ -2014,8 +2014,8 @@ static int ov23_02244C10 (void)
 {
     int v0, v1, v2;
 
-    v1 = Player_XPos(Unk_ov23_02257764->unk_40->unk_3C);
-    v2 = Player_ZPos(Unk_ov23_02257764->unk_40->unk_3C);
+    v1 = Player_XPos(Unk_ov23_02257764->unk_40->playerAvatar);
+    v2 = Player_ZPos(Unk_ov23_02257764->unk_40->playerAvatar);
 
     ov5_021F5634(Unk_ov23_02257764->unk_40, v1, 0, v2);
     ov23_022541B4(ov23_0224219C(), 0, Unk_ov23_02257764->unk_B9F);
@@ -2835,7 +2835,7 @@ static void ov23_02245AA4 (int param0, BOOL param1)
         if (Unk_ov23_02257764->unk_300) {
             UnkStruct_ov23_02245AA4 * v0 = Unk_ov23_02257764->unk_300;
 
-            sub_0205ED0C(Unk_ov23_02257764->unk_40->unk_3C, 0);
+            sub_0205ED0C(Unk_ov23_02257764->unk_40->playerAvatar, 0);
             SysTask_Done(Unk_ov23_02257764->unk_2F0);
             Heap_FreeToHeap(v0);
 
@@ -2864,7 +2864,7 @@ static void ov23_02245AF4 (int param0, BOOL param1)
         G2_BlendNone();
         GX_SetMasterBrightness(0);
 
-        sub_0205ED0C(Unk_ov23_02257764->unk_40->unk_3C, 0);
+        sub_0205ED0C(Unk_ov23_02257764->unk_40->playerAvatar, 0);
         SysTask_Done(Unk_ov23_02257764->unk_2F0);
         Heap_FreeToHeap(v0);
 
@@ -2944,21 +2944,21 @@ static void ov23_02245BA8 (SysTask * param0, void * param1)
             ov23_02254044(ov23_0224219C());
 
             v0->unk_00 = 7;
-            v2 = Player_XPos(Unk_ov23_02257764->unk_40->unk_3C);
-            v3 = Player_ZPos(Unk_ov23_02257764->unk_40->unk_3C);
+            v2 = Player_XPos(Unk_ov23_02257764->unk_40->playerAvatar);
+            v3 = Player_ZPos(Unk_ov23_02257764->unk_40->playerAvatar);
 
             if (!v0->unk_08) {
                 v0->unk_14 = ov5_021F4EAC(Unk_ov23_02257764->unk_40, v2, v3, 2, 32);
-                sub_0205ED0C(Unk_ov23_02257764->unk_40->unk_3C, -2 * FX32_ONE);
+                sub_0205ED0C(Unk_ov23_02257764->unk_40->playerAvatar, -2 * FX32_ONE);
             } else {
                 v0->unk_14 = ov5_021F4EAC(Unk_ov23_02257764->unk_40, v2, v3, 3, 32);
-                sub_0205ED0C(Unk_ov23_02257764->unk_40->unk_3C, -3 * FX32_ONE);
+                sub_0205ED0C(Unk_ov23_02257764->unk_40->playerAvatar, -3 * FX32_ONE);
             }
         }
         break;
     case 7:
     {
-        int v5 = Player_Dir(Unk_ov23_02257764->unk_40->unk_3C);
+        int v5 = Player_Dir(Unk_ov23_02257764->unk_40->playerAvatar);
 
         if (v0->unk_18 != v5) {
             Sound_PlayEffect(1515);
@@ -2971,7 +2971,7 @@ static void ov23_02245BA8 (SysTask * param0, void * param1)
     case 8:
         break;
     case 9:
-        sub_0205ED0C(Unk_ov23_02257764->unk_40->unk_3C, 0);
+        sub_0205ED0C(Unk_ov23_02257764->unk_40->playerAvatar, 0);
         Heap_FreeToHeap(param1);
         SysTask_Done(param0);
         Unk_ov23_02257764->unk_2F0 = NULL;
@@ -2996,7 +2996,7 @@ static void ov23_02245BA8 (SysTask * param0, void * param1)
         break;
     case 14:
         if (-10 != v4[v0->unk_10]) {
-            sub_0205ED0C(Unk_ov23_02257764->unk_40->unk_3C, v4[v0->unk_10] * FX32_ONE);
+            sub_0205ED0C(Unk_ov23_02257764->unk_40->playerAvatar, v4[v0->unk_10] * FX32_ONE);
             v0->unk_10++;
 
             if (v0->unk_10 == 5) {
@@ -3029,7 +3029,7 @@ static void ov23_02245DF8 (BOOL param0, BOOL param1, int param2)
     v1->unk_08 = param0;
     v1->unk_10 = 0;
     v1->unk_0D = param1;
-    v1->unk_18 = Player_Dir(Unk_ov23_02257764->unk_40->unk_3C);
+    v1->unk_18 = Player_Dir(Unk_ov23_02257764->unk_40->playerAvatar);
     v1->unk_0C = param2;
 
     Unk_ov23_02257764->unk_300 = v1;
@@ -3947,8 +3947,8 @@ static BOOL ov23_02247568 (BGL * param0, UnkStruct_ov23_022471D8 * param1)
     switch (param1->unk_125) {
     case 0:
         param1->unk_124 = 0;
-        v5 = Player_XPos(Unk_ov23_02257764->unk_40->unk_3C);
-        v6 = Player_ZPos(Unk_ov23_02257764->unk_40->unk_3C);
+        v5 = Player_XPos(Unk_ov23_02257764->unk_40->playerAvatar);
+        v6 = Player_ZPos(Unk_ov23_02257764->unk_40->playerAvatar);
         param1->unk_114 = ov5_021F4F18(Unk_ov23_02257764->unk_40, v5, v6, 5, 32);
         param1->unk_125 = 1;
         Sound_PlayEffect(1630);
@@ -4909,7 +4909,7 @@ static void ov23_02248A6C (SysTask * param0, void * param1)
     }
 
     v3 = v0->unk_08;
-    v2 = sub_02059444(v3);
+    v2 = CommPlayer_DirClient(v3);
 
     if ((v0->unk_00 == 1) || (v2 == -1)) {
         Unk_ov23_02257764->unk_00[v3] = NULL;
diff --git a/src/overlay023/ov23_02248F1C.c b/src/overlay023/ov23_02248F1C.c
index 4fca5eb87e..aa9882b569 100644
--- a/src/overlay023/ov23_02248F1C.c
+++ b/src/overlay023/ov23_02248F1C.c
@@ -75,7 +75,7 @@ int Unk_ov23_0225776C[8][2];
 
 static void ov23_0224944C(BGL * param0, Window * param1);
 static void ov23_02249584(UnkStruct_ov23_0224942C * param0);
-static void ov23_02249214(UnkStruct_0205E884 * const param0, int param1[][2], int param2[][3]);
+static void ov23_02249214(PlayerAvatar * const param0, int param1[][2], int param2[][3]);
 static void ov23_022491CC(int param0[][2], int param1[][3]);
 static void ov23_022492C8(int param0[][3], GraphicElementData * param1[]);
 static void ov23_0224944C(BGL * param0, Window * param1);
@@ -162,7 +162,7 @@ static void ov23_02248F1C (SysTask * param0, void * param1)
         v0->unk_00++;
         break;
     case 5:
-        ov23_02249214(v0->unk_1B4->unk_3C, v0->unk_04, v0->unk_44);
+        ov23_02249214(v0->unk_1B4->playerAvatar, v0->unk_04, v0->unk_44);
         ov23_022492C8(v0->unk_44, v0->unk_390);
         ov23_02249334(v0->unk_A4);
         ov23_0224937C(v0->unk_A4, v0->unk_3B0);
@@ -215,13 +215,13 @@ static void ov23_022491CC (int param0[][2], int param1[][3])
     }
 }
 
-static void ov23_02249214 (UnkStruct_0205E884 * const param0, int param1[][2], int param2[][3])
+static void ov23_02249214 (PlayerAvatar * const param0, int param1[][2], int param2[][3])
 {
     int v0;
 
     for (v0 = 0; v0 < (7 + 1); v0++) {
-        param1[v0][0] = sub_02058CA0(v0);
-        param1[v0][1] = sub_02058CF4(v0);
+        param1[v0][0] = CommPlayer_XPos(v0);
+        param1[v0][1] = CommPlayer_ZPos(v0);
     }
 
     if (CommSys_IsInitialized()) {
diff --git a/src/overlay023/ov23_022499E4.c b/src/overlay023/ov23_022499E4.c
index b144d41a59..20b367219d 100644
--- a/src/overlay023/ov23_022499E4.c
+++ b/src/overlay023/ov23_022499E4.c
@@ -346,7 +346,7 @@ static void ov23_02249D20 (void)
         ov23_02244858(0, 1);
 
         CommInfo_InitPlayer(0);
-        CommPlayer_Destory(0, 0, 0);
+        CommPlayer_Destroy(0, 0, 0);
         sub_02059570();
 
         ov23_02249C24(ov23_02249EBC, 10);
diff --git a/src/overlay023/ov23_0224A1D0.c b/src/overlay023/ov23_0224A1D0.c
index 0a1a0576a9..7ef8a53025 100644
--- a/src/overlay023/ov23_0224A1D0.c
+++ b/src/overlay023/ov23_0224A1D0.c
@@ -57,19 +57,19 @@ typedef struct {
     u8 unk_02;
 } UnkStruct_ov23_0224A570;
 
-CommPlayerData * CommPlayerData_Get(void);
+CommPlayer * CommPlayerData_Get(void);
 
 void ov23_0224A1D0 (void)
 {
     int v0;
-    CommPlayerData * v1 = CommPlayerData_Get();
+    CommPlayer * v1 = CommPlayerData_Get();
 
     if (v1 == NULL) {
         return;
     }
 
     for (v0 = 0; v0 < (7 + 1); v0++) {
-        CommPlayer_Destory(v0, 0, 0);
+        CommPlayer_Destroy(v0, 0, 0);
         sub_020593B4(v0);
     }
 
@@ -79,7 +79,7 @@ void ov23_0224A1D0 (void)
 static void ov23_0224A204 (int param0)
 {
     int v0;
-    CommPlayerData * v1 = CommPlayerData_Get();
+    CommPlayer * v1 = CommPlayerData_Get();
 
     if (param0 == CommSys_CurNetId()) {
         if (v1->unk_290[param0] != NULL) {
@@ -106,7 +106,7 @@ static void ov23_0224A204 (int param0)
 
 static BOOL ov23_0224A294 (int param0, int param1)
 {
-    CommPlayerData * v0 = CommPlayerData_Get();
+    CommPlayer * v0 = CommPlayerData_Get();
 
     if ((v0->unk_290[param0] == NULL) && (v0->unk_290[param1] != NULL)) {
         v0->unk_290[param0] = v0->unk_290[param1];
@@ -149,7 +149,7 @@ static void ov23_0224A328 (int param0)
 
 static void ov23_0224A334 (int param0)
 {
-    CommPlayerData * v0 = CommPlayerData_Get();
+    CommPlayer * v0 = CommPlayerData_Get();
 
     if (v0) {
         v0->unk_2B8 = 0;
@@ -159,7 +159,7 @@ static void ov23_0224A334 (int param0)
 void ov23_0224A348 (int param0, int param1, void * param2, void * param3)
 {
     UnkStruct_ov23_0224A348 v0;
-    CommPlayerData * v1 = CommPlayerData_Get();
+    CommPlayer * v1 = CommPlayerData_Get();
 
     v0.unk_00 = 2;
     v0.unk_01 = param0;
@@ -172,7 +172,7 @@ void ov23_0224A348 (int param0, int param1, void * param2, void * param3)
         }
     }
 
-    if (sub_02035AC4(29, &v0, 2)) {
+    if (CommSys_SendDataServer(29, &v0, 2)) {
         if (v0.unk_00 != 2) {
             sub_02059058(param0, 0);
         }
@@ -181,7 +181,7 @@ void ov23_0224A348 (int param0, int param1, void * param2, void * param3)
 
 void ov23_0224A3A8 (int param0, int param1, void * param2, void * param3)
 {
-    CommPlayerData * v0 = CommPlayerData_Get();
+    CommPlayer * v0 = CommPlayerData_Get();
     UnkStruct_ov23_0224A348 * v1 = param2;
 
     if (!sub_02035EE0()) {
@@ -204,7 +204,7 @@ void ov23_0224A3A8 (int param0, int param1, void * param2, void * param3)
 
 void ov23_0224A410 (int param0, int param1, void * param2, void * param3)
 {
-    CommPlayerData * v0 = CommPlayerData_Get();
+    CommPlayer * v0 = CommPlayerData_Get();
     UnkStruct_ov23_0224A348 * v1 = param2;
     UnkStruct_020507E4 * v2 = SaveData_Events(v0->fieldSys->unk_0C);
 
@@ -285,7 +285,7 @@ static void ov23_0224A5B0 (int param0)
 
 static void ov23_0224A5CC (SysTask * param0, void * param1)
 {
-    CommPlayerData * v0 = CommPlayerData_Get();
+    CommPlayer * v0 = CommPlayerData_Get();
     UnkStruct_ov23_0224A5CC * v1 = param1;
     u8 v2 = v1->unk_04;
     u8 v3 = 0;
@@ -311,7 +311,7 @@ static void ov23_0224A5CC (SysTask * param0, void * param1)
 
 static void ov23_0224A620 (int param0)
 {
-    CommPlayerData * v0 = CommPlayerData_Get();
+    CommPlayer * v0 = CommPlayerData_Get();
     UnkStruct_ov23_0224A5CC * v1 = Heap_AllocFromHeap(11, sizeof(UnkStruct_ov23_0224A5CC));
 
     v1->unk_00 = 0;
@@ -368,7 +368,7 @@ BOOL ov23_0224A6B8 (int param0)
 
 static void ov23_0224A6E4 (UnkStruct_ov23_0224A570 * param0, BOOL param1, UnkStruct_0202855C * param2)
 {
-    CommPlayerData * v0 = CommPlayerData_Get();
+    CommPlayer * v0 = CommPlayerData_Get();
 
     ov23_0224321C();
 
@@ -392,7 +392,7 @@ static void ov23_0224A6E4 (UnkStruct_ov23_0224A570 * param0, BOOL param1, UnkStr
 
 void ov23_0224A77C (int param0, int param1, void * param2, void * param3)
 {
-    CommPlayerData * v0 = CommPlayerData_Get();
+    CommPlayer * v0 = CommPlayerData_Get();
     UnkStruct_ov23_0224A570 * v1 = param2;
     BOOL v2;
     int v3 = 0;
@@ -510,7 +510,7 @@ void ov23_0224A77C (int param0, int param1, void * param2, void * param3)
 void ov23_0224AA84 (void)
 {
     int v0;
-    CommPlayerData * v1 = CommPlayerData_Get();
+    CommPlayer * v1 = CommPlayerData_Get();
 
     for (v0 = 0; v0 < (7 + 1); v0++) {
         v1->unk_14A[v0].unk_20 = 0xff;
@@ -519,13 +519,13 @@ void ov23_0224AA84 (void)
 
 u8 * ov23_0224AAA0 (int param0, void * param1, int param2)
 {
-    CommPlayerData * v0 = CommPlayerData_Get();
+    CommPlayer * v0 = CommPlayerData_Get();
     return (u8 *)&v0->unk_14A[(7 + 1)];
 }
 
 void ov23_0224AAB0 (void)
 {
-    CommPlayerData * v0 = CommPlayerData_Get();
+    CommPlayer * v0 = CommPlayerData_Get();
 
     v0->unk_2B9 = 0;
 
@@ -552,7 +552,7 @@ int ov23_0224AB2C (void)
 
 void ov23_0224AB30 (int param0, int param1, void * param2, void * param3)
 {
-    CommPlayerData * v0 = CommPlayerData_Get();
+    CommPlayer * v0 = CommPlayerData_Get();
     int v1;
     const TrainerInfo * v2 = param2;
     Strbuf* v3;
@@ -574,7 +574,7 @@ void ov23_0224AB30 (int param0, int param1, void * param2, void * param3)
             }
         }
 
-        sub_02035AC4(93, &v4, 1);
+        CommSys_SendDataServer(93, &v4, 1);
         Strbuf_Free(v3);
 
         v0->unk_2C2 = 1;
@@ -585,7 +585,7 @@ void ov23_0224AB30 (int param0, int param1, void * param2, void * param3)
 
 void ov23_0224ABC4 (int param0, int param1, void * param2, void * param3)
 {
-    CommPlayerData * v0 = CommPlayerData_Get();
+    CommPlayer * v0 = CommPlayerData_Get();
     UnkStruct_ov23_0224ABC4 * v1 = param2;
     int v2, v3;
 
@@ -610,7 +610,7 @@ int ov23_0224AC0C (void)
 void ov23_0224AC10 (int param0, int param1, void * param2, void * param3)
 {
     u8 * v0 = param2;
-    CommPlayerData * v1 = CommPlayerData_Get();
+    CommPlayer * v1 = CommPlayerData_Get();
 
     if (v0[0] == CommSys_CurNetId()) {
         v1->unk_2B9 = 1;
@@ -621,7 +621,7 @@ void ov23_0224AC10 (int param0, int param1, void * param2, void * param3)
 
 BOOL ov23_0224AC3C (void)
 {
-    CommPlayerData * v0 = CommPlayerData_Get();
+    CommPlayer * v0 = CommPlayerData_Get();
     return v0->unk_2B9;
 }
 
@@ -630,7 +630,7 @@ void ov23_0224AC4C (void)
     TrainerInfo * v0 = NULL;
     int v1, v2;
     int v3 = CommSys_CurNetId();
-    CommPlayerData * v4 = CommPlayerData_Get();
+    CommPlayer * v4 = CommPlayerData_Get();
 
     if (v4->unk_290[v3]) {
         v0 = v4->unk_290[v3];
@@ -655,7 +655,7 @@ void ov23_0224AC4C (void)
 
 BOOL ov23_0224ACC0 (int param0)
 {
-    CommPlayerData * v0 = CommPlayerData_Get();
+    CommPlayer * v0 = CommPlayerData_Get();
 
     if (v0->unk_04) {
         return !ov23_0224999C(
@@ -679,7 +679,7 @@ void ov23_0224ACF8 (int param0, int param1, void * param2, void * param3)
 
 int ov23_0224AD04 (int param0)
 {
-    CommPlayerData * v0 = CommPlayerData_Get();
+    CommPlayer * v0 = CommPlayerData_Get();
 
     if (!v0) {
         return 0xffff;
@@ -694,7 +694,7 @@ int ov23_0224AD04 (int param0)
 
 int ov23_0224AD40 (int param0)
 {
-    CommPlayerData * v0 = CommPlayerData_Get();
+    CommPlayer * v0 = CommPlayerData_Get();
 
     if (!v0) {
         return 0xffff;
@@ -709,19 +709,19 @@ int ov23_0224AD40 (int param0)
 
 void ov23_0224AD7C (int param0, int param1)
 {
-    CommPlayerData * v0 = CommPlayerData_Get();
+    CommPlayer * v0 = CommPlayerData_Get();
     ov23_02249994(ov23_0224993C(v0->unk_04, param0), param1);
 }
 
 void ov23_0224AD98 (int param0)
 {
-    CommPlayerData * v0 = CommPlayerData_Get();
+    CommPlayer * v0 = CommPlayerData_Get();
     ov23_02249994(ov23_0224993C(v0->unk_04, param0), 0);
 }
 
 void ov23_0224ADB0 (int param0, int param1, int param2, int param3)
 {
-    CommPlayerData * v0 = CommPlayerData_Get();
+    CommPlayer * v0 = CommPlayerData_Get();
     CommPlayerLocation * v1 = &v0->playerLocationServer[param0];
 
     v1->x = param1 + sub_0206419C(param3);
@@ -731,7 +731,7 @@ void ov23_0224ADB0 (int param0, int param1, int param2, int param3)
 
 void ov23_0224ADE8 (int param0, int param1, int param2, int param3)
 {
-    CommPlayerData * v0 = CommPlayerData_Get();
+    CommPlayer * v0 = CommPlayerData_Get();
     CommPlayerLocation * v1;
 
     if (!v0) {
@@ -748,8 +748,8 @@ void ov23_0224ADE8 (int param0, int param1, int param2, int param3)
     v1->z = param2;
     v1->dir = param3;
 
-    if (v0->unk_08[param0]) {
-        sub_0205ECE0(v0->unk_08[param0], param1, param2, param3);
+    if (v0->playerAvatar[param0]) {
+        sub_0205ECE0(v0->playerAvatar[param0], param1, param2, param3);
     }
 
     if (!v0->isResetting) {
@@ -763,7 +763,7 @@ void ov23_0224ADE8 (int param0, int param1, int param2, int param3)
 
 BOOL ov23_0224AE60 (int param0)
 {
-    CommPlayerData * v0 = CommPlayerData_Get();
+    CommPlayer * v0 = CommPlayerData_Get();
 
     if (v0->unk_290[param0] != NULL) {
         Heap_FreeToHeap(v0->unk_290[param0]);
@@ -780,7 +780,7 @@ BOOL ov23_0224AE60 (int param0)
 
 BOOL ov23_0224AEA4 (int param0)
 {
-    CommPlayerData * v0 = CommPlayerData_Get();
+    CommPlayer * v0 = CommPlayerData_Get();
 
     if (v0->unk_290[param0] != NULL) {
         return 1;
@@ -791,7 +791,7 @@ BOOL ov23_0224AEA4 (int param0)
 
 BOOL ov23_0224AEC4 (int param0, int param1)
 {
-    CommPlayerData * v0 = CommPlayerData_Get();
+    CommPlayer * v0 = CommPlayerData_Get();
 
     if (v0->unk_290[param0] == NULL) {
         TrainerInfo * v1 = CommInfo_TrainerInfo(param1);
@@ -819,7 +819,7 @@ BOOL ov23_0224AEC4 (int param0, int param1)
 
 void ov23_0224AF4C (int param0)
 {
-    CommPlayerData * v0 = CommPlayerData_Get();
+    CommPlayer * v0 = CommPlayerData_Get();
 
     if (v0->unk_28[param0] != NULL) {
         if (sub_020714F0(v0->unk_28[param0])) {
@@ -834,26 +834,26 @@ void ov23_0224AF4C (int param0)
 
 void ov23_0224AF7C (int param0)
 {
-    CommPlayerData * v0 = CommPlayerData_Get();
+    CommPlayer * v0 = CommPlayerData_Get();
 
     if (!v0->isResetting) {
-        if (v0->unk_08[param0]) {
+        if (v0->playerAvatar[param0]) {
             switch (v0->unk_FA[param0]) {
             case 3:
                 if (v0->unk_28[param0] == NULL) {
-                    v0->unk_28[param0] = ov5_021F5488(sub_0205EB3C(v0->unk_08[param0]));
+                    v0->unk_28[param0] = ov5_021F5488(sub_0205EB3C(v0->playerAvatar[param0]));
                 }
 
                 v0->unk_FA[param0] = 0;
                 break;
             case 2:
                 if (v0->unk_28[param0] == NULL) {
-                    v0->unk_28[param0] = ov5_021F52E4(sub_0205EB3C(v0->unk_08[param0]));
+                    v0->unk_28[param0] = ov5_021F52E4(sub_0205EB3C(v0->playerAvatar[param0]));
                 }
                 break;
             case 1:
                 if (v0->unk_28[param0] == NULL) {
-                    v0->unk_28[param0] = ov5_021F511C(sub_0205EB3C(v0->unk_08[param0]));
+                    v0->unk_28[param0] = ov5_021F511C(sub_0205EB3C(v0->playerAvatar[param0]));
                 }
                 break;
             case 0:
@@ -866,7 +866,7 @@ void ov23_0224AF7C (int param0)
 
 void ov23_0224B00C (int param0)
 {
-    CommPlayerData * v0 = CommPlayerData_Get();
+    CommPlayer * v0 = CommPlayerData_Get();
 
     if (v0->unk_FA[param0] != 1) {
         v0->unk_FA[param0] = 2;
@@ -875,7 +875,7 @@ void ov23_0224B00C (int param0)
 
 void ov23_0224B024 (int param0)
 {
-    CommPlayerData * v0 = CommPlayerData_Get();
+    CommPlayer * v0 = CommPlayerData_Get();
 
     if (v0->unk_FA[param0] != 1) {
         v0->unk_FA[param0] = 3;
@@ -886,7 +886,7 @@ void ov23_0224B024 (int param0)
 
 void ov23_0224B040 (int param0)
 {
-    CommPlayerData * v0 = CommPlayerData_Get();
+    CommPlayer * v0 = CommPlayerData_Get();
 
     if (v0->unk_FA[param0] != 1) {
         v0->unk_FA[param0] = 0;
diff --git a/src/overlay023/ov23_0224B05C.c b/src/overlay023/ov23_0224B05C.c
index 5fcb327191..4d0566debe 100644
--- a/src/overlay023/ov23_0224B05C.c
+++ b/src/overlay023/ov23_0224B05C.c
@@ -570,7 +570,7 @@ static int ov23_0224B65C (int param0, int param1)
             continue;
         }
 
-        if (!sub_02058C90(v0)) {
+        if (!CommPlayer_IsActive(v0)) {
             continue;
         }
 
@@ -995,8 +995,8 @@ static int ov23_0224BD1C (int param0, BOOL param1)
             v3 = sub_02058DF8(v0);
             v4 = sub_02058E4C(v0);
         } else {
-            v3 = sub_02058CA0(v0);
-            v4 = sub_02058CF4(v0);
+            v3 = CommPlayer_XPos(v0);
+            v4 = CommPlayer_ZPos(v0);
         }
 
         if ((v3 == 0xffff) && (v4 == 0xffff)) {
@@ -1156,7 +1156,7 @@ static void ov23_0224BE28 (SysTask * param0, void * param1)
         return;
     }
 
-    if ((v0->unk_2C != 16) && !sub_02058C90(v0->unk_2C)) {
+    if ((v0->unk_2C != 16) && !CommPlayer_IsActive(v0->unk_2C)) {
         if ((8 != v0->unk_0C) && (9 != v0->unk_0C)) {
             v7 = 1;
         }
@@ -1252,7 +1252,7 @@ static void ov23_0224C1EC (int param0, int param1, int param2, int param3)
     if (v0) {
         UnkStruct_02029894 * v1 = (UnkStruct_02029894 *)v0->unk_02;
 
-        sub_02029854(v1, param0, param1, sub_02059328(param2));
+        sub_02029854(v1, param0, param1, CommPlayer_GetOppositeDir(param2));
         v0->unk_00 = param3;
     }
 }
@@ -1461,12 +1461,12 @@ static void ov23_0224C5B4 (SysTask * param0, void * param1)
         return;
     }
 
-    if (Unk_ov23_022577AC->unk_00->unk_3C == NULL) {
+    if (Unk_ov23_022577AC->unk_00->playerAvatar == NULL) {
         return;
     }
 
-    v4 = Player_XPos(Unk_ov23_022577AC->unk_00->unk_3C);
-    v5 = Player_ZPos(Unk_ov23_022577AC->unk_00->unk_3C);
+    v4 = Player_XPos(Unk_ov23_022577AC->unk_00->playerAvatar);
+    v5 = Player_ZPos(Unk_ov23_022577AC->unk_00->playerAvatar);
 
     if (ov23_02242E58(v4, v5)) {
         return;
@@ -1672,8 +1672,8 @@ static BOOL ov23_0224C790 (UnkStruct_020508D4 * param0)
         }
         break;
     case 11:
-        sub_02059624();
-        sub_02061550(v0->unk_3C, sub_02065838(1, 0x24), 1);
+        CommPlayerManager_ForceDir();
+        sub_02061550(v0->playerAvatar, sub_02065838(1, 0x24), 1);
         sub_020593F4(1);
         ov23_02253F40(ov23_0224219C(), 68, 0, NULL);
         Sound_PlayEffect(1540);
@@ -1764,7 +1764,7 @@ static void ov23_0224CB1C (SysTask * param0, void * param1)
         ov23_02254098(ov23_0224219C(), 33);
         Sound_PlayEffect(1566);
 
-        ov5_021F58FC(sub_0205EB3C(v1->unk_3C), 0, 0, 0);
+        ov5_021F58FC(sub_0205EB3C(v1->playerAvatar), 0, 0, 0);
         ov23_02253F40(ov23_0224219C(), 33, 0, NULL);
 
         v0->unk_0C = 1;
@@ -1783,7 +1783,7 @@ static void ov23_0224CB1C (SysTask * param0, void * param1)
     {
         v6 = sub_02058D88(CommSys_CurNetId());
         v7 = sub_02058DC0(CommSys_CurNetId());
-        v8 = sub_02059328(Player_Dir(v1->unk_3C));
+        v8 = CommPlayer_GetOppositeDir(Player_Dir(v1->playerAvatar));
 
         ov23_02253F40(ov23_0224219C(), 34, 0, NULL);
         ov23_0224C588(v6, v7, v8, 16);
@@ -2013,7 +2013,7 @@ void ov23_0224CF18 (int param0, int param1, void * param2, void * param3)
         UnkStruct_ov23_0224B098 v2;
         int v3 = sub_02058D88(v0->unk_00);
         int v4 = sub_02058DC0(v0->unk_00);
-        int v5 = sub_02058F50(v0->unk_00);
+        int v5 = CommPlayer_Dir(v0->unk_00);
 
         ov23_0224C1EC(v3, v4, v5, v0->unk_00);
         ov23_0224C1EC(v3, v4, v5, 16);
@@ -2207,7 +2207,7 @@ static void ov23_0224D238 (void)
     }
 
     MI_CpuFill8(Unk_ov23_022577AC->unk_A04, 0xff, 17 * 32 * (32 / 8));
-    sub_02029854(v0, v2, v3, sub_02059328(v4));
+    sub_02029854(v0, v2, v3, CommPlayer_GetOppositeDir(v4));
 
     MI_CpuCopy8(v0, Unk_ov23_022577AC->unk_08[16].unk_02, 148);
     ov23_0224B39C(v0, Unk_ov23_022577AC->unk_A04[16]);
@@ -2631,8 +2631,8 @@ BOOL ov23_0224D9AC (int param0, BOOL param1)
     }
 
     v5 = Unk_ov23_022577AC->unk_1353[param0];
-    v2 = sub_02058CA0(CommSys_CurNetId());
-    v3 = sub_02058CF4(CommSys_CurNetId());
+    v2 = CommPlayer_XPos(CommSys_CurNetId());
+    v3 = CommPlayer_ZPos(CommSys_CurNetId());
 
     if (!ov23_02242E58(v2, v3)) {
         Unk_ov23_022577AC->unk_1353[param0] = 0xff;
diff --git a/src/overlay023/ov23_0224DC40.c b/src/overlay023/ov23_0224DC40.c
index e2218fd87c..ec65761ff3 100644
--- a/src/overlay023/ov23_0224DC40.c
+++ b/src/overlay023/ov23_0224DC40.c
@@ -1296,7 +1296,7 @@ void ov23_0224F07C (int param0, int param1, FieldSystem * param2)
     v0->unk_2E = 12;
 
     ov23_02253F40(ov23_0224219C(), 22, 0, NULL);
-    sub_02059624();
+    CommPlayerManager_ForceDir();
 
     v0->unk_00 = SysTask_Start(ov23_0224EC50, v0, 10000);
 }
diff --git a/src/overlay023/ov23_0224F294.c b/src/overlay023/ov23_0224F294.c
index d3d34bb615..070d4421c1 100644
--- a/src/overlay023/ov23_0224F294.c
+++ b/src/overlay023/ov23_0224F294.c
@@ -1373,7 +1373,7 @@ static void ov23_0225093C (UnkStruct_ov23_02250CD4 * param0)
 {
     ov23_0224FB7C(param0);
 
-    if (ov23_02242E58(Player_XPos(param0->unk_0C->unk_3C), Player_ZPos(param0->unk_0C->unk_3C))) {
+    if (ov23_02242E58(Player_XPos(param0->unk_0C->playerAvatar), Player_ZPos(param0->unk_0C->playerAvatar))) {
         ov23_02253F40(ov23_0224219C(), 66, 0, NULL);
         param0->unk_2AA = 13;
     } else {
diff --git a/src/overlay023/ov23_0225128C.c b/src/overlay023/ov23_0225128C.c
index 6c7ab9625d..deeb35c69d 100644
--- a/src/overlay023/ov23_0225128C.c
+++ b/src/overlay023/ov23_0225128C.c
@@ -157,7 +157,7 @@ BOOL ov23_02251324 (int param0, UnkStruct_ov23_0224271C * param1)
     UnkStruct_ov23_022513B0 v3;
     int v4 = ov23_022512D4(param1, sub_02058F80(param0));
 
-    if (sub_02058F50(v4) == -1) {
+    if (CommPlayer_Dir(v4) == -1) {
         v4 = 0xff;
     }
 
@@ -602,8 +602,8 @@ static void ov23_02251A84 (BOOL param0, FieldSystem * param1)
     VecFx32 v0;
 
     v0.y = 0;
-    v0.x = 15 * FX32_ONE * 16 - Player_XPos(param1->unk_3C) * FX32_ONE * 16;
-    v0.z = 17 * FX32_ONE * 16 - Player_ZPos(param1->unk_3C) * FX32_ONE * 16;
+    v0.x = 15 * FX32_ONE * 16 - Player_XPos(param1->playerAvatar) * FX32_ONE * 16;
+    v0.z = 17 * FX32_ONE * 16 - Player_ZPos(param1->playerAvatar) * FX32_ONE * 16;
 
     if (!param0) {
         v0.x = -v0.x;
@@ -630,7 +630,7 @@ static BOOL ov23_02251ACC (UnkStruct_020508D4 * param0)
         break;
     case 1:
         if (ScreenWipe_Done()) {
-            sub_0205EB18(v0->unk_3C, 0);
+            sub_0205EB18(v0->playerAvatar, 0);
 
             ov23_02251A84(1, v0);
             v1->unk_00 = 2;
@@ -644,7 +644,7 @@ static BOOL ov23_02251ACC (UnkStruct_020508D4 * param0)
         v1->unk_00 = 4;
         break;
     case 4:
-        sub_0205EB18(v0->unk_3C, 1);
+        sub_0205EB18(v0->playerAvatar, 1);
         ov23_02251A84(0, v0);
         sub_0200F174(1, 1, 1, 0x0, 6, 1, 4);
         v1->unk_00 = 5;
diff --git a/src/overlay023/ov23_022521F0.c b/src/overlay023/ov23_022521F0.c
index 1f6ac1c6e2..4453409bbc 100644
--- a/src/overlay023/ov23_022521F0.c
+++ b/src/overlay023/ov23_022521F0.c
@@ -918,7 +918,7 @@ void ov23_022534A0 (FieldSystem * param0)
     UnkStruct_ov84_02240FA8 v0;
     int v1 = sub_02058D88(CommSys_CurNetId());
     int v2 = sub_02058DC0(CommSys_CurNetId());
-    int v3 = sub_02059328(sub_02058F50(CommSys_CurNetId()));
+    int v3 = CommPlayer_GetOppositeDir(CommPlayer_Dir(CommSys_CurNetId()));
     UnkStruct_ov23_02250CD4 * v4;
     const int v5 = 6;
     int v6;
diff --git a/src/overlay023/ov23_02253598.c b/src/overlay023/ov23_02253598.c
index 002282d723..1a5674b086 100644
--- a/src/overlay023/ov23_02253598.c
+++ b/src/overlay023/ov23_02253598.c
@@ -424,7 +424,7 @@ void ov23_02253968 (void)
 
 void ov23_02253998 (int param0, int param1, void * param2, void * param3)
 {
-    sub_02035AC4(82, param2, param1);
+    CommSys_SendDataServer(82, param2, param1);
 }
 
 void ov23_022539A8 (int param0, int param1, void * param2, void * param3)
diff --git a/src/overlay058/ov58_021D0D80.c b/src/overlay058/ov58_021D0D80.c
index 689b17432b..9baf9c10ac 100644
--- a/src/overlay058/ov58_021D0D80.c
+++ b/src/overlay058/ov58_021D0D80.c
@@ -1209,7 +1209,7 @@ static int ov58_021D2180 (UnkStruct_02095EAC * param0, int param1)
     switch (v0) {
     case 1:
         ov58_021D2CB0(param0, 15);
-        sub_02035AC4(127, NULL, 0);
+        CommSys_SendDataServer(127, NULL, 0);
         sub_0200B498(param0->unk_0C, 0, CommInfo_TrainerInfo(0));
         param1 = 2;
         ov58_021D2D10(param0);
@@ -1666,7 +1666,7 @@ static void ov58_021D29C8 (UnkStruct_02095EAC * param0)
         if (sub_02036284()) {
             param0->unk_43DC.unk_09 = param0->unk_9458;
             param0->unk_9421[0] = param0->unk_43DC;
-            sub_02035AC4(120, param0->unk_9421, 10 * 5);
+            CommSys_SendDataServer(120, param0->unk_9421, 10 * 5);
         }
     } else {
         if (sub_0203629C()) {
diff --git a/src/pokeradar.c b/src/pokeradar.c
index b6be6f6b40..56e489ca5f 100644
--- a/src/pokeradar.c
+++ b/src/pokeradar.c
@@ -98,7 +98,7 @@ BOOL RadarSpawnPatches (FieldSystem *param0, const int param1, const int param2,
         32, 24, 16, 8
     };
 
-    const VecFx32 *v8 = sub_0205EAFC(param0->unk_3C);
+    const VecFx32 *v8 = sub_0205EAFC(param0->playerAvatar);
     v7 = 0;
 
     for (u8 patchRing = 0; patchRing < NUM_GRASS_PATCHES; patchRing++) {
@@ -409,8 +409,8 @@ BOOL RefreshRadarChain (UnkStruct_020508D4 *param0) {
             *v1 = 4;
         } else {
             *v2 = 0;
-            int v3 = Player_XPos(v0->unk_3C);
-            int v4 = Player_ZPos(v0->unk_3C);
+            int v3 = Player_XPos(v0->playerAvatar);
+            int v4 = Player_ZPos(v0->playerAvatar);
             RadarSpawnPatches(v0, v3, v4, v0->chain);
             if (v0->chain->active) {
                 SetupGrassPatches(v0, 0x1, v0->chain);
diff --git a/src/unk_02032798.c b/src/unk_02032798.c
index 374dede13c..36d0efdac3 100644
--- a/src/unk_02032798.c
+++ b/src/unk_02032798.c
@@ -202,7 +202,7 @@ static void sub_02032958 (int param0, int param1, void * param2, void * param3)
         }
     }
 
-    sub_02035AC4(14, NULL, 0);
+    CommSys_SendDataServer(14, NULL, 0);
 }
 
 static void sub_0203299C (int param0, int param1, void * param2, void * param3)
diff --git a/src/unk_0203A9C8.c b/src/unk_0203A9C8.c
index f60a833413..12826b0373 100644
--- a/src/unk_0203A9C8.c
+++ b/src/unk_0203A9C8.c
@@ -276,8 +276,8 @@ void sub_0203A9E0 (FieldSystem * param0)
 
     v0->unk_228 = 0;
 
-    if (sub_0205F588(param0->unk_3C) == 1) {
-        sub_0205F5E4(param0->unk_3C, Player_Dir(param0->unk_3C));
+    if (sub_0205F588(param0->playerAvatar) == 1) {
+        sub_0205F5E4(param0->playerAvatar, Player_Dir(param0->playerAvatar));
     }
 
     sub_02050904(param0, sub_0203AC44, v0);
@@ -290,8 +290,8 @@ void sub_0203AA78 (FieldSystem * param0)
     v0->unk_224 = sub_0203AC34(param0);
     v0->unk_228 = 1;
 
-    if (sub_0205F588(param0->unk_3C) == 1) {
-        sub_0205F5E4(param0->unk_3C, Player_Dir(param0->unk_3C));
+    if (sub_0205F588(param0->playerAvatar) == 1) {
+        sub_0205F5E4(param0->playerAvatar, Player_Dir(param0->playerAvatar));
     }
 
     sub_02050904(param0, sub_0203AC44, v0);
@@ -304,8 +304,8 @@ void sub_0203AABC (FieldSystem * param0)
     v0->unk_224 = sub_0203AC3C(param0);
     v0->unk_228 = 0;
 
-    if (sub_0205F588(param0->unk_3C) == 1) {
-        sub_0205F5E4(param0->unk_3C, Player_Dir(param0->unk_3C));
+    if (sub_0205F588(param0->playerAvatar) == 1) {
+        sub_0205F5E4(param0->playerAvatar, Player_Dir(param0->playerAvatar));
     }
 
     sub_02050904(param0, sub_0203AC44, v0);
diff --git a/src/unk_0203C954.c b/src/unk_0203C954.c
index 25a7a1a3d6..35e8ea863f 100644
--- a/src/unk_0203C954.c
+++ b/src/unk_0203C954.c
@@ -20,10 +20,10 @@ static u8 sub_0203CAEC(FieldSystem * param0, const UnkStruct_0203A594 * param1);
 
 static int sub_0203C954 (FieldSystem * param0, int * param1, int * param2)
 {
-    int v0 = Player_Dir(param0->unk_3C);
+    int v0 = Player_Dir(param0->playerAvatar);
 
-    *param1 = Player_XPos(param0->unk_3C);
-    *param2 = Player_ZPos(param0->unk_3C);
+    *param1 = Player_XPos(param0->playerAvatar);
+    *param2 = Player_ZPos(param0->playerAvatar);
 
     switch (v0) {
     case 0:
@@ -43,7 +43,7 @@ static int sub_0203C954 (FieldSystem * param0, int * param1, int * param2)
     return v0;
 }
 
-static u8 sub_0203C9B0 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1)
+static u8 sub_0203C9B0 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1)
 {
     UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0);
 
@@ -88,7 +88,7 @@ u8 sub_0203CA40 (FieldSystem * param0, UnkStruct_02061AB4 ** param1)
     sub_0203C9D4(param0, param1);
 
     if (*param1 != NULL) {
-        if ((sub_02062D9C(*param1) == 1) && (sub_0203C9B0(param0->unk_3C, *param1) == 1)) {
+        if ((sub_02062D9C(*param1) == 1) && (sub_0203C9B0(param0->playerAvatar, *param1) == 1)) {
             return 1;
         }
     }
@@ -142,7 +142,7 @@ static u8 sub_0203CB18 (FieldSystem * param0, const UnkStruct_0203A594 * param1)
         return 1;
     }
 
-    switch (Player_Dir(param0->unk_3C)) {
+    switch (Player_Dir(param0->playerAvatar)) {
     case 0:
         if ((param1->unk_10 == 0) || (param1->unk_10 == 6)) {
             return 1;
@@ -174,7 +174,7 @@ u16 sub_0203CB80 (FieldSystem * param0, void * param1, int param2)
     int v1, v2;
     int v3;
 
-    if (Player_Dir(param0->unk_3C) != 0) {
+    if (Player_Dir(param0->playerAvatar) != 0) {
         return 0xffff;
     }
 
@@ -192,7 +192,7 @@ u16 sub_0203CB80 (FieldSystem * param0, void * param1, int param2)
 
 u8 sub_0203CBE0 (FieldSystem * param0, UnkStruct_02061AB4 ** param1)
 {
-    if (Player_Dir(param0->unk_3C) != 0) {
+    if (Player_Dir(param0->playerAvatar) != 0) {
         return 0;
     }
 
@@ -214,8 +214,8 @@ u16 sub_0203CC14 (FieldSystem * param0, void * param1, int param2)
     int v3;
 
     v0 = (const UnkStruct_0203A4AC *)param1;
-    v1 = Player_XPos(param0->unk_3C);
-    v2 = Player_ZPos(param0->unk_3C);
+    v1 = Player_XPos(param0->playerAvatar);
+    v2 = Player_ZPos(param0->playerAvatar);
 
     for (v3 = 0; v3 < param2; v3++) {
         if ((v1 >= v0[v3].unk_02) && (v1 < (v0[v3].unk_02 + v0[v3].unk_06)) && (v2 >= v0[v3].unk_04) && (v2 < (v0[v3].unk_04 + v0[v3].unk_08)) && (sub_0203F150(param0, v0[v3].unk_0E) == v0[v3].unk_0C)) {
diff --git a/src/unk_0203CC84.c b/src/unk_0203CC84.c
index e1e2907439..b10784ea5a 100644
--- a/src/unk_0203CC84.c
+++ b/src/unk_0203CC84.c
@@ -261,7 +261,7 @@ void sub_0203CF5C (FieldSystem * param0)
     }
 
     if (v2) {
-        sub_0205F490(param0->unk_3C);
+        sub_0205F490(param0->playerAvatar);
         ov5_021D1CAC(&v1, param0, gCoreSys.pressedKeys, gCoreSys.heldKeys);
     }
 
@@ -301,7 +301,7 @@ void sub_0203CF5C (FieldSystem * param0)
             if (ov5_021D2298(&v1, param0) == 1) {
                 (void)0;
             } else {
-                sub_0205F180(param0->unk_3C, param0->unk_28, -1, v1.unk_04, v1.unk_06, 0);
+                sub_0205F180(param0->playerAvatar, param0->unk_28, -1, v1.unk_04, v1.unk_06, 0);
             }
         }
         break;
@@ -310,7 +310,7 @@ void sub_0203CF5C (FieldSystem * param0)
             if (ov5_021D2368(&v1, param0) == 1) {
                 ov5_021DDA78(param0->unk_04->unk_08);
                 ov5_021E1BCC(param0, 4);
-                ov5_021E0EEC(param0->unk_3C);
+                ov5_021E0EEC(param0->playerAvatar);
                 ov5_021EA714(param0, 0, 1);
             } else {
                 if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
@@ -325,7 +325,7 @@ void sub_0203CF5C (FieldSystem * param0)
                         v3 = ov25_02253DD4(v4);
                     }
 
-                    sub_0205F180(param0->unk_3C, param0->unk_28, -1, v1.unk_04, v1.unk_06, v3);
+                    sub_0205F180(param0->playerAvatar, param0->unk_28, -1, v1.unk_04, v1.unk_06, v3);
                 }
             }
         }
@@ -335,8 +335,8 @@ void sub_0203CF5C (FieldSystem * param0)
             if (ov5_021D1DA4(&v1, param0) == 1) {
                 ov5_021DDA78(param0->unk_04->unk_08);
                 ov5_021E1BCC(param0, 4);
-                sub_0205F56C(param0->unk_3C);
-                ov5_021E0EEC(param0->unk_3C);
+                sub_0205F56C(param0->playerAvatar);
+                ov5_021E0EEC(param0->playerAvatar);
                 ov5_021EA714(param0, 0, 1);
             } else {
                 if (gCoreSys.pressedKeys & PAD_BUTTON_A) {
@@ -351,7 +351,7 @@ void sub_0203CF5C (FieldSystem * param0)
                         v5 = ov25_02253DD4(v6);
                     }
 
-                    sub_0205F180(param0->unk_3C, param0->unk_28, -1, v1.unk_04, v1.unk_06, v5);
+                    sub_0205F180(param0->playerAvatar, param0->unk_28, -1, v1.unk_04, v1.unk_06, v5);
                 }
             }
         }
diff --git a/src/unk_0203D1B8.c b/src/unk_0203D1B8.c
index 7eab882f1c..a85b9e94a2 100644
--- a/src/unk_0203D1B8.c
+++ b/src/unk_0203D1B8.c
@@ -309,7 +309,7 @@ void * sub_0203D20C (FieldSystem * param0, UnkStruct_020684D0 * param1)
     sub_0207CB2C(v1, param0->unk_0C, 0, param0->unk_98);
     sub_0207CB78(v1, param0->unk_70);
 
-    if (sub_0205EB74(param0->unk_3C) == 0x1) {
+    if (sub_0205EB74(param0->playerAvatar) == 0x1) {
         sub_0207CB58(v1);
     }
 
diff --git a/src/unk_0203E880.c b/src/unk_0203E880.c
index f411da23d0..f5c5bbb86c 100644
--- a/src/unk_0203E880.c
+++ b/src/unk_0203E880.c
@@ -261,7 +261,7 @@ static void sub_0203EA68 (FieldSystem * param0, UnkStruct_0203EF60 * param1, u16
 {
     u16 * v0 = sub_0203EF60(param1, 54);
 
-    param1->unk_28 = Player_Dir(param0->unk_3C);
+    param1->unk_28 = Player_Dir(param0->playerAvatar);
     param1->unk_2C = param3;
     param1->unk_0A = param2;
     param1->unk_34 = param4;
@@ -855,8 +855,8 @@ UnkStruct_0203F478 * sub_0203F478 (FieldSystem * param0, int param1)
         return v0;
     }
 
-    v2 = Player_XPos(param0->unk_3C);
-    v3 = Player_ZPos(param0->unk_3C);
+    v2 = Player_XPos(param0->playerAvatar);
+    v3 = Player_ZPos(param0->playerAvatar);
     v8 = v2 - 7;
     v9 = v2 + 7;
     v10 = v3 - 7;
diff --git a/src/unk_0203F6C4.c b/src/unk_0203F6C4.c
index 130c07d833..c63f9301da 100644
--- a/src/unk_0203F6C4.c
+++ b/src/unk_0203F6C4.c
@@ -2393,13 +2393,13 @@ static BOOL sub_02040204 (UnkStruct_0203E724 * param0)
     }
 
     if (gCoreSys.pressedKeys & PAD_KEY_UP) {
-        sub_0205EA84(param0->unk_34->unk_3C, 0);
+        sub_0205EA84(param0->unk_34->playerAvatar, 0);
     } else if (gCoreSys.pressedKeys & PAD_KEY_DOWN) {
-        sub_0205EA84(param0->unk_34->unk_3C, 1);
+        sub_0205EA84(param0->unk_34->playerAvatar, 1);
     } else if (gCoreSys.pressedKeys & PAD_KEY_LEFT) {
-        sub_0205EA84(param0->unk_34->unk_3C, 2);
+        sub_0205EA84(param0->unk_34->playerAvatar, 2);
     } else if (gCoreSys.pressedKeys & PAD_KEY_RIGHT) {
-        sub_0205EA84(param0->unk_34->unk_3C, 3);
+        sub_0205EA84(param0->unk_34->playerAvatar, 3);
     } else if (gCoreSys.pressedKeys & PAD_BUTTON_X) {
         sub_0203F0C0(param0->unk_34);
     } else {
@@ -2663,7 +2663,7 @@ static BOOL sub_02040670 (UnkStruct_0203E724 * param0)
 
     if (v4 != 0xffff) {
         sub_0201D730(*v1);
-        sub_0205EA84(param0->unk_34->unk_3C, v4);
+        sub_0205EA84(param0->unk_34->playerAvatar, v4);
         *v2 = 0;
         return 1;
     }
@@ -2709,7 +2709,7 @@ static BOOL sub_02040730 (UnkStruct_0203E724 * param0)
     }
 
     if (v2 != 0xffff) {
-        sub_0205EA84(param0->unk_34->unk_3C, v2);
+        sub_0205EA84(param0->unk_34->playerAvatar, v2);
         *v1 = 0;
         return 1;
     }
@@ -3236,7 +3236,7 @@ static BOOL sub_02041004 (UnkStruct_0203E724 * param0)
 {
     FieldSystem * v0 = param0->unk_34;
     UnkStruct_02061AB4 ** v1 = sub_0203F098(v0, 10);
-    UnkStruct_02061AB4 * v2 = sub_0205EB3C(v0->unk_3C);
+    UnkStruct_02061AB4 * v2 = sub_0205EB3C(v0->playerAvatar);
 
     if (inline_020410F4_1((1 << 0)) && (sub_02065684(v2) == 1)) {
         sub_02062DD0(v2);
@@ -3290,7 +3290,7 @@ static BOOL sub_020410F4 (UnkStruct_0203E724 * param0)
 {
     FieldSystem * v0 = param0->unk_34;
     UnkStruct_02061AB4 ** v1 = sub_0203F098(v0, 10);
-    UnkStruct_02061AB4 * v2 = sub_0205EB3C(v0->unk_3C);
+    UnkStruct_02061AB4 * v2 = sub_0205EB3C(v0->playerAvatar);
     UnkStruct_02061AB4 * v3 = sub_02062570(v0->unk_38, 0x30);
     UnkStruct_02061AB4 * v4 = sub_02069EB8(*v1);
     UnkStruct_02061830 * v5;
@@ -3466,10 +3466,10 @@ static BOOL sub_020413F0 (UnkStruct_0203E724 * param0)
 
     {
         FieldSystem * v3;
-        UnkStruct_0205E884 * v4;
+        PlayerAvatar * v4;
 
         v3 = param0->unk_34;
-        v4 = v3->unk_3C;
+        v4 = v3->playerAvatar;
         v0 = Player_Dir(v4);
     }
 
@@ -3492,8 +3492,8 @@ static BOOL sub_02041420 (UnkStruct_0203E724 * param0)
 
     v0 = inline_0204FCAC(param0);
     v1 = inline_0204FCAC(param0);
-    *v0 = Player_XPos(v2->unk_3C);
-    *v1 = Player_ZPos(v2->unk_3C);
+    *v0 = Player_XPos(v2->playerAvatar);
+    *v1 = Player_ZPos(v2->playerAvatar);
 
     return 0;
 }
@@ -3518,7 +3518,7 @@ static BOOL sub_020414C4 (UnkStruct_0203E724 * param0)
     u16 * v0;
 
     v0 = inline_0204FCAC(param0);
-    *v0 = Player_Dir(param0->unk_34->unk_3C);
+    *v0 = Player_Dir(param0->unk_34->playerAvatar);
 
     return 0;
 }
@@ -3537,7 +3537,7 @@ static BOOL sub_020414EC (UnkStruct_0203E724 * param0)
     v3.y = FX32_CONST(v1);
     v3.z = FX32_CONST(v2);
 
-    sub_020630AC(sub_0205EB3C(param0->unk_34->unk_3C), &v3);
+    sub_020630AC(sub_0205EB3C(param0->unk_34->playerAvatar), &v3);
     sub_02020990(&v3, param0->unk_34->unk_24);
 
     return 0;
@@ -4763,7 +4763,7 @@ static BOOL sub_02042A8C (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02042AB0 (UnkStruct_0203E724 * param0)
 {
-    ov5_021E0734(param0->unk_28, Player_Dir(param0->unk_34->unk_3C), inline_02049538(param0));
+    ov5_021E0734(param0->unk_28, Player_Dir(param0->unk_34->playerAvatar), inline_02049538(param0));
     return 1;
 }
 
@@ -4774,10 +4774,10 @@ static BOOL sub_02042AE0 (UnkStruct_0203E724 * param0)
     {
         int v0;
 
-        if (sub_0205F16C(param0->unk_34->unk_3C) == 1) {
-            v0 = Player_Dir(param0->unk_34->unk_3C);
+        if (sub_0205F16C(param0->unk_34->playerAvatar) == 1) {
+            v0 = Player_Dir(param0->unk_34->playerAvatar);
         } else {
-            v0 = sub_0205EA94(param0->unk_34->unk_3C);
+            v0 = sub_0205EA94(param0->unk_34->playerAvatar);
         }
 
         ov5_021E00EC(param0->unk_28, v0, inline_02049538(param0));
@@ -4788,7 +4788,7 @@ static BOOL sub_02042AE0 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02042B3C (UnkStruct_0203E724 * param0)
 {
-    ov5_021E0998(param0->unk_28, Player_Dir(param0->unk_34->unk_3C), inline_02049538(param0));
+    ov5_021E0998(param0->unk_28, Player_Dir(param0->unk_34->playerAvatar), inline_02049538(param0));
     return 1;
 }
 
@@ -4831,7 +4831,7 @@ static BOOL sub_02042C18 (UnkStruct_0203E724 * param0)
     u16 v2 = inline_02049538(param0);
 
     v0 = Party_GetPokemonBySlotIndex(Party_GetFromSavedata(param0->unk_34->unk_0C), v2);
-    *v1 = ov6_02243F88(param0->unk_34, 0, v0, sub_0205EB98(param0->unk_34->unk_3C));
+    *v1 = ov6_02243F88(param0->unk_34, 0, v0, sub_0205EB98(param0->unk_34->playerAvatar));
 
     sub_0203E764(param0, sub_02042C80);
     return 1;
@@ -4859,7 +4859,7 @@ static BOOL sub_02042CB4 (UnkStruct_0203E724 * param0)
 {
     u16 * v0 = inline_0204FCAC(param0);
 
-    if (sub_0205EB74(param0->unk_34->unk_3C) == 0x1) {
+    if (sub_0205EB74(param0->unk_34->playerAvatar) == 0x1) {
         *v0 = 1;
     } else {
         *v0 = 0;
@@ -4875,11 +4875,11 @@ static BOOL sub_02042CE4 (UnkStruct_0203E724 * param0)
     if (v0 == 1) {
         sub_020553F0(param0->unk_34, 1152);
         sub_02055554(param0->unk_34, 1152, 1);
-        ov5_021DFB54(param0->unk_34->unk_3C, (1 << 1));
-        ov5_021DFB5C(param0->unk_34->unk_3C);
+        ov5_021DFB54(param0->unk_34->playerAvatar, (1 << 1));
+        ov5_021DFB5C(param0->unk_34->playerAvatar);
     } else {
-        ov5_021DFB54(param0->unk_34->unk_3C, (1 << 0));
-        ov5_021DFB5C(param0->unk_34->unk_3C);
+        ov5_021DFB54(param0->unk_34->playerAvatar, (1 << 0));
+        ov5_021DFB5C(param0->unk_34->playerAvatar);
         sub_020553F0(param0->unk_34, 0);
         sub_02055554(param0->unk_34, sub_02055428(param0->unk_34, param0->unk_34->unk_1C->unk_00), 1);
     }
@@ -4895,7 +4895,7 @@ static BOOL sub_02042D70 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02042D84 (UnkStruct_0203E724 * param0)
 {
-    sub_0205EFC4(param0->unk_34->unk_3C, (*((param0)->unk_08++)));
+    sub_0205EFC4(param0->unk_34->playerAvatar, (*((param0)->unk_08++)));
     return 0;
 }
 
@@ -4903,7 +4903,7 @@ static BOOL sub_02042D9C (UnkStruct_0203E724 * param0)
 {
     u16 * v0 = inline_0204FCAC(param0);
 
-    *v0 = sub_0205EB74(param0->unk_34->unk_3C);
+    *v0 = sub_0205EB74(param0->unk_34->playerAvatar);
     return 0;
 }
 
@@ -4911,13 +4911,13 @@ static BOOL sub_02042DC4 (UnkStruct_0203E724 * param0)
 {
     u16 v0 = sub_0203E838(param0);
 
-    sub_0205EB84(param0->unk_34->unk_3C, v0);
+    sub_0205EB84(param0->unk_34->playerAvatar, v0);
     return 1;
 }
 
 static BOOL sub_02042DDC (UnkStruct_0203E724 * param0)
 {
-    ov5_021DFB5C(param0->unk_34->unk_3C);
+    ov5_021DFB5C(param0->unk_34->playerAvatar);
     return 0;
 }
 
@@ -5999,7 +5999,7 @@ static BOOL sub_020440EC (UnkStruct_0203E724 * param0)
     v1 = inline_0204FCAC(param0);
 
     {
-        UnkStruct_02061AB4 * v4 = sub_0205EB3C(v3->unk_3C);
+        UnkStruct_02061AB4 * v4 = sub_0205EB3C(v3->playerAvatar);
 
         *v0 = sub_02063020(v4);
         *v2 = ((sub_02063030(v4) / 2));
@@ -6582,7 +6582,7 @@ static BOOL sub_02044BA0 (UnkStruct_0203E724 * param0)
 {
     u8 v0 = (*((param0)->unk_08++));
 
-    sub_0205ED2C(param0->unk_34->unk_3C, v0);
+    sub_0205ED2C(param0->unk_34->playerAvatar, v0);
     return 1;
 }
 
diff --git a/src/unk_02048614.c b/src/unk_02048614.c
index e72926eedf..ca2ece2093 100644
--- a/src/unk_02048614.c
+++ b/src/unk_02048614.c
@@ -56,7 +56,7 @@ BOOL sub_02048614 (UnkStruct_0203E724 * param0)
     int * v4;
     SysTask ** v5;
     UnkStruct_02061AB4 ** v6;
-    UnkStruct_0205E884 * v7;
+    PlayerAvatar * v7;
     FieldSystem * v8 = param0->unk_34;
     u16 v9 = inline_02049538(param0);
 
@@ -78,7 +78,7 @@ BOOL sub_02048614 (UnkStruct_0203E724 * param0)
         v5 = sub_0203F098(v8, 37);
     }
 
-    v7 = v8->unk_3C;
+    v7 = v8->playerAvatar;
     *v5 = sub_02067FB8(v8, *v6, v7, *v4, *v0, 0, *v3, v9);
 
     return 0;
diff --git a/src/unk_02049D08.c b/src/unk_02049D08.c
index 28365ae432..0aa08f9e7f 100644
--- a/src/unk_02049D08.c
+++ b/src/unk_02049D08.c
@@ -228,7 +228,7 @@ void sub_02049FA8 (FieldSystem * param0)
 {
     UnkStruct_02049FA8 * v0 = sub_0203A730(sub_0203A790(param0->unk_0C));
 
-    inline_02049FA8(v0, param0->unk_1C->unk_00, -1, Player_XPos(param0->unk_3C), Player_ZPos(param0->unk_3C), 0);
+    inline_02049FA8(v0, param0->unk_1C->unk_00, -1, Player_XPos(param0->playerAvatar), Player_ZPos(param0->playerAvatar), 0);
     sub_0206AD9C(SaveData_Events(param0->unk_0C));
 
     return;
diff --git a/src/unk_02050568.c b/src/unk_02050568.c
index 36c362a131..7fa47b076a 100644
--- a/src/unk_02050568.c
+++ b/src/unk_02050568.c
@@ -37,7 +37,7 @@ typedef struct {
 } UnkStruct_02050568;
 
 static BOOL sub_020505A0(UnkStruct_020508D4 * param0);
-static void sub_0205074C(UnkStruct_0205E884 * param0, BOOL param1);
+static void sub_0205074C(PlayerAvatar * param0, BOOL param1);
 static void sub_0205075C(FieldSystem * param0);
 
 void sub_02050568 (FieldSystem * param0)
@@ -56,8 +56,8 @@ static BOOL sub_020505A0 (UnkStruct_020508D4 * param0)
 
     switch (v1->unk_08) {
     case 0:
-        v1->unk_04 = Player_XPos(v0->unk_3C);
-        v1->unk_06 = Player_ZPos(v0->unk_3C);
+        v1->unk_04 = Player_XPos(v0->playerAvatar);
+        v1->unk_06 = Player_ZPos(v0->playerAvatar);
         sub_02070428(v0, 1);
         sub_020558AC(param0);
         v1->unk_08++;
@@ -82,7 +82,7 @@ static BOOL sub_020505A0 (UnkStruct_020508D4 * param0)
         v1->unk_08++;
         break;
     case 4:
-        sub_0205074C(v0->unk_3C, 1);
+        sub_0205074C(v0->playerAvatar, 1);
         sub_0205075C(v0);
         sub_02056B30(param0, 3, 17, 0xffff, 0x0, 6, 1, 11);
         Sound_PlayEffect(1657);
@@ -118,7 +118,7 @@ static BOOL sub_020505A0 (UnkStruct_020508D4 * param0)
         v1->unk_08++;
         break;
     case 10:
-        sub_0205074C(v0->unk_3C, 0);
+        sub_0205074C(v0->playerAvatar, 0);
         sub_020558F0(param0);
         v1->unk_08++;
         break;
@@ -131,7 +131,7 @@ static BOOL sub_020505A0 (UnkStruct_020508D4 * param0)
     return 0;
 }
 
-static void sub_0205074C (UnkStruct_0205E884 * param0, BOOL param1)
+static void sub_0205074C (PlayerAvatar * param0, BOOL param1)
 {
     UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0);
     sub_02062D64(v0, param1);
diff --git a/src/unk_020530C8.c b/src/unk_020530C8.c
index de40459105..40e649e2b0 100644
--- a/src/unk_020530C8.c
+++ b/src/unk_020530C8.c
@@ -352,7 +352,7 @@ static void sub_02053320 (FieldSystem * param0)
     v2 = sub_0203A790(param0->unk_0C);
     v3 = sub_0203A780(v2);
 
-    param0->unk_3C = sub_0205E7D0(param0->unk_38, param0->unk_1C->unk_08, param0->unk_1C->unk_0C, param0->unk_1C->unk_10, v3->unk_04, v0, 0, v3);
+    param0->playerAvatar = sub_0205E7D0(param0->unk_38, param0->unk_1C->unk_08, param0->unk_1C->unk_0C, param0->unk_1C->unk_10, v3->unk_04, v0, 0, v3);
 
     sub_0203A418(param0);
     sub_02062C30(param0->unk_38);
@@ -360,7 +360,7 @@ static void sub_02053320 (FieldSystem * param0)
 
 static void sub_02053374 (FieldSystem * param0)
 {
-    sub_0205E8E0(param0->unk_3C);
+    sub_0205E8E0(param0->playerAvatar);
     sub_02061BBC(param0->unk_38);
     sub_02061830(param0->unk_38);
 }
@@ -375,7 +375,7 @@ static void sub_0205338C (FieldSystem * param0)
         UnkStruct_0205EC34 * v1 = sub_0203A780(v0);
         int v2 = TrainerInfo_Gender(SaveData_GetTrainerInfo(param0->unk_0C));
 
-        param0->unk_3C = sub_0205E820(param0->unk_38, v1, v2);
+        param0->playerAvatar = sub_0205E820(param0->unk_38, v1, v2);
     }
 
     sub_02062C30(param0->unk_38);
@@ -444,7 +444,7 @@ static void sub_020534BC (FieldSystem * param0)
 
 static void sub_020534EC (UnkStruct_02049FA8 * param0, const FieldSystem * param1)
 {
-    inline_02049FA8(param0, param1->unk_1C->unk_00, -1, Player_XPos(param1->unk_3C), Player_ZPos(param1->unk_3C), 1);
+    inline_02049FA8(param0, param1->unk_1C->unk_00, -1, Player_XPos(param1->playerAvatar), Player_ZPos(param1->playerAvatar), 1);
 }
 
 static BOOL sub_02053518 (const FieldSystem * param0)
@@ -821,7 +821,7 @@ static BOOL sub_02053B44 (UnkStruct_020508D4 * param0)
         (v1->unk_00)++;
         break;
     case 1:
-        sub_0205EB58(v0->unk_3C, 0x0);
+        sub_0205EB58(v0->playerAvatar, 0x0);
         sub_020539A0(param0, &v1->unk_08);
         (v1->unk_00)++;
         break;
@@ -903,7 +903,7 @@ static void sub_02053C70 (UnkStruct_020508D4 * param0)
     }
 
     {
-        v1->unk_04 = ov6_02245CCC(v0, sub_0205EB98(v0->unk_3C));
+        v1->unk_04 = ov6_02245CCC(v0, sub_0205EB98(v0->playerAvatar));
         sub_02050944(param0, sub_02053CB4, v1);
     }
 }
@@ -945,7 +945,7 @@ static BOOL sub_02053D0C (UnkStruct_020508D4 * param0)
         (v1->unk_00)++;
         break;
     case 1:
-        sub_0205EB58(v0->unk_3C, 0x0);
+        sub_0205EB58(v0->playerAvatar, 0x0);
         sub_020539A0(param0, &v1->unk_0C);
         (v1->unk_00)++;
         break;
@@ -1097,7 +1097,7 @@ void sub_02053F58 (FieldSystem * param0, int param1, int param2)
 
     MI_CpuClear8(v1, sizeof(UnkStruct_02053E98));
 
-    inline_02049FA8(&v0, param1, param2, 0, 0, Player_Dir(param0->unk_3C));
+    inline_02049FA8(&v0, param1, param2, 0, 0, Player_Dir(param0->playerAvatar));
     v1->unk_08 = v0;
     sub_02050904(param0, sub_02053E98, v1);
 }
diff --git a/src/unk_020553DC.c b/src/unk_020553DC.c
index c3f1c9dd2b..ac77cad780 100644
--- a/src/unk_020553DC.c
+++ b/src/unk_020553DC.c
@@ -143,11 +143,11 @@ void sub_02055414 (FieldSystem * param0)
 
 u16 sub_02055428 (FieldSystem * param0, int param1)
 {
-    UnkStruct_0205E884 * v0;
+    PlayerAvatar * v0;
     int v1;
     u16 v2, v3;
 
-    v0 = param0->unk_3C;
+    v0 = param0->playerAvatar;
     v1 = sub_0205EB74(v0);
 
     if (v1 == 0x2) {
@@ -212,8 +212,8 @@ static u16 sub_020554E8 (FieldSystem * param0, int param1)
     UnkStruct_0203A790 * v2 = sub_0203A790(param0->unk_0C);
     UnkStruct_02049FA8 * v3 = sub_0203A728(v2);
 
-    v0 = Player_XPos(param0->unk_3C);
-    v1 = Player_ZPos(param0->unk_3C);
+    v0 = Player_XPos(param0->playerAvatar);
+    v1 = Player_ZPos(param0->playerAvatar);
 
     if (param1 != 350) {
         return 0;
@@ -238,10 +238,10 @@ static u16 sub_020554E8 (FieldSystem * param0, int param1)
 
 BOOL sub_02055554 (FieldSystem * param0, u16 param1, int param2)
 {
-    UnkStruct_0205E884 * v0;
+    PlayerAvatar * v0;
     int v1, v2, v3;
 
-    v0 = param0->unk_3C;
+    v0 = param0->playerAvatar;
     v3 = sub_0205EB74(v0);
 
     if (sub_020041DC() == 1) {
diff --git a/src/unk_02055C50.c b/src/unk_02055C50.c
index 9062ae0a2a..f0e22948e8 100644
--- a/src/unk_02055C50.c
+++ b/src/unk_02055C50.c
@@ -305,8 +305,8 @@ static BOOL sub_02056010 (FieldSystem * param0, UnkStruct_020562AC * param1, int
 {
     int v0, v1;
 
-    v0 = Player_XPos(param0->unk_3C);
-    v1 = Player_ZPos(param0->unk_3C);
+    v0 = Player_XPos(param0->playerAvatar);
+    v1 = Player_ZPos(param0->playerAvatar);
 
     if (param2 == 2) {
         v0--;
@@ -331,8 +331,8 @@ static UnkStruct_02061AB4 * sub_02056074 (FieldSystem * param0, int param1)
 {
     int v0, v1;
 
-    v0 = Player_XPos(param0->unk_3C);
-    v1 = Player_ZPos(param0->unk_3C);
+    v0 = Player_XPos(param0->playerAvatar);
+    v1 = Player_ZPos(param0->playerAvatar);
     v1 -= 1;
 
     if (param1 == 2) {
@@ -348,8 +348,8 @@ static UnkStruct_02061AB4 * sub_020560A8 (FieldSystem * param0, UnkStruct_020562
 {
     int v0, v1;
 
-    v0 = Player_XPos(param0->unk_3C);
-    v1 = Player_ZPos(param0->unk_3C);
+    v0 = Player_XPos(param0->playerAvatar);
+    v1 = Player_ZPos(param0->playerAvatar);
 
     if (param1->unk_04 == 0) {
         v1 -= 1;
@@ -380,7 +380,7 @@ static void sub_020560F8 (FieldSystem * param0, UnkStruct_020562AC * param1)
 
 static void sub_0205610C (FieldSystem * param0, UnkStruct_020562AC * param1, const UnkStruct_ov5_021F8E3C * param2)
 {
-    UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0->unk_3C);
+    UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0->playerAvatar);
     param1->unk_0C = sub_02065700(v0, param2);
 }
 
@@ -391,9 +391,9 @@ static BOOL sub_02056124 (UnkStruct_020508D4 * param0)
 
     switch (v1->unk_00) {
     case 0:
-        ov5_021DFB54(v0->unk_3C, (1 << 4));
-        ov5_021DFB5C(v0->unk_3C);
-        sub_02062DDC(sub_0205EB3C(v0->unk_3C));
+        ov5_021DFB54(v0->playerAvatar, (1 << 4));
+        ov5_021DFB5C(v0->playerAvatar);
+        sub_02062DDC(sub_0205EB3C(v0->playerAvatar));
         v1->unk_00 = 1;
         break;
     case 1:
@@ -424,7 +424,7 @@ static BOOL sub_02056124 (UnkStruct_020508D4 * param0)
                 break;
             }
         } else if ((gCoreSys.heldKeys & PAD_KEY_UP) && (v1->unk_04 == 1)) {
-            sub_0205EA84(v0->unk_3C, 0);
+            sub_0205EA84(v0->playerAvatar, 0);
             v1->unk_00 = 4;
             break;
         } else if ((gCoreSys.heldKeys & PAD_KEY_DOWN) && (v1->unk_04 == 0)) {
@@ -435,7 +435,7 @@ static BOOL sub_02056124 (UnkStruct_020508D4 * param0)
         v1->unk_08++;
 
         if (v1->unk_08 > 30 * 3) {
-            sub_0205EA84(v0->unk_3C, v1->unk_04);
+            sub_0205EA84(v0->playerAvatar, v1->unk_04);
             v1->unk_00 = 4;
         }
         break;
@@ -449,14 +449,14 @@ static BOOL sub_02056124 (UnkStruct_020508D4 * param0)
             if ((v3 != NULL) && sub_020560E4(v3)) {
                 v1->unk_00 = 1;
             } else {
-                sub_0205EA84(v0->unk_3C, v1->unk_04);
+                sub_0205EA84(v0->playerAvatar, v1->unk_04);
                 v1->unk_00 = 4;
             }
         }
         break;
     case 4:
-        sub_0205EA84(v0->unk_3C, v1->unk_04);
-        sub_02062DD0(sub_0205EB3C(v0->unk_3C));
+        sub_0205EA84(v0->playerAvatar, v1->unk_04);
+        sub_02062DD0(sub_0205EB3C(v0->playerAvatar));
         Heap_FreeToHeap(v1);
         return 1;
     }
@@ -472,16 +472,16 @@ void sub_020562AC (FieldSystem * param0)
 
     v0->unk_00 = 0;
     v0->unk_0C = NULL;
-    v0->unk_04 = Player_Dir(param0->unk_3C);
+    v0->unk_04 = Player_Dir(param0->playerAvatar);
 
     sub_02050944(param0->unk_10, sub_02056124, v0);
 }
 
 void sub_020562D8 (FieldSystem * param0)
 {
-    int v0 = sub_0205EB74(param0->unk_3C);
+    int v0 = sub_0205EB74(param0->playerAvatar);
     u32 v1 = sub_0205EED8(v0);
 
-    ov5_021DFB54(param0->unk_3C, v1);
-    ov5_021DFB5C(param0->unk_3C);
+    ov5_021DFB54(param0->playerAvatar, v1);
+    ov5_021DFB5C(param0->playerAvatar);
 }
diff --git a/src/unk_02056B30.c b/src/unk_02056B30.c
index 7518552869..bedc4fb65d 100644
--- a/src/unk_02056B30.c
+++ b/src/unk_02056B30.c
@@ -283,7 +283,7 @@ static BOOL sub_02056E20 (UnkStruct_020508D4 * param0)
     case 0:
         v1->unk_1C = ov5_021D431C();
         v2 = (UnkStruct_ov5_021D432C *)v1->unk_1C;
-        ov5_021D4334(Player_XPos(v0->unk_3C), Player_ZPos(v0->unk_3C), v2);
+        ov5_021D4334(Player_XPos(v0->playerAvatar), Player_ZPos(v0->playerAvatar), v2);
         (v1->unk_04)++;
         break;
     case 1:
@@ -315,13 +315,13 @@ static BOOL sub_02056EA4 (UnkStruct_020508D4 * param0)
     case 0:
         v1->unk_1C = ov5_021D431C();
         v2 = (UnkStruct_ov5_021D432C *)v1->unk_1C;
-        ov5_021D4334(Player_XPos(v0->unk_3C), Player_ZPos(v0->unk_3C), v2);
+        ov5_021D4334(Player_XPos(v0->playerAvatar), Player_ZPos(v0->playerAvatar), v2);
         (v1->unk_04)++;
         break;
     case 1:
         v2 = (UnkStruct_ov5_021D432C *)v1->unk_1C;
 
-        if (ov5_021D4A24(v0, v2, Player_Dir(v0->unk_3C))) {
+        if (ov5_021D4A24(v0, v2, Player_Dir(v0->playerAvatar))) {
             ov5_021D432C(v1->unk_1C);
             (v1->unk_04)++;
         }
@@ -342,9 +342,9 @@ static BOOL sub_02056F1C (UnkStruct_020508D4 * param0)
     switch (v1->unk_04) {
     case 0:
     {
-        int v3 = Player_Dir(v0->unk_3C);
+        int v3 = Player_Dir(v0->playerAvatar);
 
-        v2 = sub_0205EB3C(v0->unk_3C);
+        v2 = sub_0205EB3C(v0->playerAvatar);
 
         if (v3 == 2) {
             sub_02065638(v2, 0xa);
@@ -357,7 +357,7 @@ static BOOL sub_02056F1C (UnkStruct_020508D4 * param0)
         (v1->unk_04)++;
         break;
     case 1:
-        v2 = sub_0205EB3C(v0->unk_3C);
+        v2 = sub_0205EB3C(v0->playerAvatar);
 
         if (sub_02065684(v2) == 1) {
             sub_020656AC(v2);
@@ -383,7 +383,7 @@ static BOOL sub_02056FC0 (UnkStruct_020508D4 * param0)
 {
     FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_02056BDC * v1 = sub_02050A64(param0);
-    UnkStruct_02061AB4 * v2 = sub_0205EB3C(v0->unk_3C);
+    UnkStruct_02061AB4 * v2 = sub_0205EB3C(v0->playerAvatar);
 
     switch (v1->unk_04) {
     case 0:
@@ -406,7 +406,7 @@ static BOOL sub_02057008 (UnkStruct_020508D4 * param0)
 {
     FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_02056BDC * v1 = sub_02050A64(param0);
-    UnkStruct_02061AB4 * v2 = sub_0205EB3C(v0->unk_3C);
+    UnkStruct_02061AB4 * v2 = sub_0205EB3C(v0->playerAvatar);
 
     switch (v1->unk_04) {
     case 0:
@@ -436,9 +436,9 @@ static BOOL sub_02057050 (UnkStruct_020508D4 * param0)
     case 0:
     {
         u8 v4;
-        UnkStruct_02061AB4 * v5 = sub_0205EB3C(v1->unk_3C);
+        UnkStruct_02061AB4 * v5 = sub_0205EB3C(v1->playerAvatar);
 
-        v4 = sub_02054F94(v1, Player_XPos(v1->unk_3C), Player_ZPos(v1->unk_3C));
+        v4 = sub_02054F94(v1, Player_XPos(v1->playerAvatar), Player_ZPos(v1->playerAvatar));
 
         if (sub_0205DAEC(v4)) {
             sub_02062D64(v5, 1);
@@ -455,7 +455,7 @@ static BOOL sub_02057050 (UnkStruct_020508D4 * param0)
     case 1:
         v2->unk_1C = (UnkStruct_ov5_021D432C *)ov5_021D431C();
         v3 = (UnkStruct_ov5_021D432C *)v2->unk_1C;
-        ov5_021D4334(Player_XPos(v1->unk_3C), Player_ZPos(v1->unk_3C), v3);
+        ov5_021D4334(Player_XPos(v1->playerAvatar), Player_ZPos(v1->playerAvatar), v3);
         (v2->unk_04)++;
         break;
     case 2:
@@ -464,7 +464,7 @@ static BOOL sub_02057050 (UnkStruct_020508D4 * param0)
         if (ov5_021D453C(v1, v3)) {
             ov5_021D432C(v3);
             {
-                UnkStruct_02061AB4 * v7 = sub_0205EB3C(v1->unk_3C);
+                UnkStruct_02061AB4 * v7 = sub_0205EB3C(v1->playerAvatar);
 
                 sub_02062D64(v7, 0);
             }
@@ -489,9 +489,9 @@ static BOOL sub_0205711C (UnkStruct_020508D4 * param0)
     case 0:
     {
         u8 v4;
-        UnkStruct_02061AB4 * v5 = sub_0205EB3C(v1->unk_3C);
+        UnkStruct_02061AB4 * v5 = sub_0205EB3C(v1->playerAvatar);
 
-        v4 = sub_02054F94(v1, Player_XPos(v1->unk_3C), Player_ZPos(v1->unk_3C));
+        v4 = sub_02054F94(v1, Player_XPos(v1->playerAvatar), Player_ZPos(v1->playerAvatar));
 
         if (sub_0205DAEC(v4)) {
             sub_02062D64(v5, 1);
@@ -523,13 +523,13 @@ static BOOL sub_020571A0 (UnkStruct_020508D4 * param0)
     case 0:
         v1->unk_1C = ov5_021D431C();
         v2 = (UnkStruct_ov5_021D432C *)v1->unk_1C;
-        ov5_021D4334(Player_XPos(v0->unk_3C), Player_ZPos(v0->unk_3C), v2);
+        ov5_021D4334(Player_XPos(v0->playerAvatar), Player_ZPos(v0->playerAvatar), v2);
         (v1->unk_04)++;
         break;
     case 1:
         v2 = (UnkStruct_ov5_021D432C *)v1->unk_1C;
 
-        if (ov5_021D4858(v0, v2, Player_Dir(v0->unk_3C))) {
+        if (ov5_021D4858(v0, v2, Player_Dir(v0->playerAvatar))) {
             ov5_021D432C(v1->unk_1C);
             (v1->unk_04)++;
         }
@@ -551,12 +551,12 @@ static BOOL sub_02057218 (UnkStruct_020508D4 * param0)
     case 0:
 
         ov5_021D1744(1);
-        v2 = sub_0205EB3C(v0->unk_3C);
+        v2 = sub_0205EB3C(v0->playerAvatar);
 
         if (1) {
             int v3;
 
-            v3 = Player_Dir(v0->unk_3C);
+            v3 = Player_Dir(v0->playerAvatar);
 
             if (v3 == 2) {
                 sub_02065638(v2, 0xa);
@@ -572,7 +572,7 @@ static BOOL sub_02057218 (UnkStruct_020508D4 * param0)
         (v1->unk_04)++;
         break;
     case 1:
-        v2 = sub_0205EB3C(v0->unk_3C);
+        v2 = sub_0205EB3C(v0->playerAvatar);
 
         if (sub_02065684(v2) == 1) {
             sub_020656AC(v2);
@@ -595,7 +595,7 @@ static BOOL sub_020572B8 (UnkStruct_020508D4 * param0)
 {
     FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_02056BDC * v1 = sub_02050A64(param0);
-    UnkStruct_02061AB4 * v2 = sub_0205EB3C(v0->unk_3C);
+    UnkStruct_02061AB4 * v2 = sub_0205EB3C(v0->playerAvatar);
 
     switch (v1->unk_04) {
     case 0:
@@ -619,8 +619,8 @@ static void sub_02057300 (FieldSystem * param0)
     int v0;
     VecFx32 v1;
 
-    v0 = Player_Dir(param0->unk_3C);
-    sub_0205EAEC(param0->unk_3C, &v1);
+    v0 = Player_Dir(param0->playerAvatar);
+    sub_0205EAEC(param0->playerAvatar, &v1);
 
     if (v0 == 3) {
         v1.x -= (FX32_ONE * 16);
@@ -630,9 +630,9 @@ static void sub_02057300 (FieldSystem * param0)
 
     v1.y = sub_02054FBC(param0, v1.y, v1.x, v1.z, NULL);
 
-    sub_0205ECB8(param0->unk_3C, &v1, v0);
-    sub_02020A5C(sub_0205EAFC(param0->unk_3C), param0->unk_24);
-    sub_02020690(sub_0205EAFC(param0->unk_3C), param0->unk_24);
+    sub_0205ECB8(param0->playerAvatar, &v1, v0);
+    sub_02020A5C(sub_0205EAFC(param0->playerAvatar), param0->unk_24);
+    sub_02020690(sub_0205EAFC(param0->playerAvatar), param0->unk_24);
 }
 
 static void sub_02057368 (FieldSystem * param0)
@@ -641,11 +641,11 @@ static void sub_02057368 (FieldSystem * param0)
     VecFx32 v3;
     u8 v4;
 
-    v2 = Player_Dir(param0->unk_3C);
-    sub_0205EAEC(param0->unk_3C, &v3);
+    v2 = Player_Dir(param0->playerAvatar);
+    sub_0205EAEC(param0->playerAvatar, &v3);
 
-    v0 = Player_XPos(param0->unk_3C);
-    v1 = Player_ZPos(param0->unk_3C);
+    v0 = Player_XPos(param0->playerAvatar);
+    v1 = Player_ZPos(param0->playerAvatar);
     v4 = sub_02054F94(param0, v0, v1);
 
     if (sub_0205DC44(v4)) {
@@ -660,7 +660,7 @@ static void sub_02057368 (FieldSystem * param0)
 
     v3.y = sub_02054FBC(param0, v3.y, v3.x, v3.z, NULL);
 
-    sub_0205ECB8(param0->unk_3C, &v3, v2);
-    sub_02020A5C(sub_0205EAFC(param0->unk_3C), param0->unk_24);
-    sub_02020690(sub_0205EAFC(param0->unk_3C), param0->unk_24);
+    sub_0205ECB8(param0->playerAvatar, &v3, v2);
+    sub_02020A5C(sub_0205EAFC(param0->playerAvatar), param0->unk_24);
+    sub_02020690(sub_0205EAFC(param0->playerAvatar), param0->unk_24);
 }
diff --git a/src/unk_02057518.c b/src/unk_02057518.c
index 97b83c43a0..7ee7b79c16 100644
--- a/src/unk_02057518.c
+++ b/src/unk_02057518.c
@@ -53,61 +53,61 @@ static BOOL sub_020586A8(int param0, int param1, int param2, int param3);
 static void sub_02057BC4(void * param0);
 static void sub_02057C2C(void * param0);
 static void CommPlayer_Add(u8 param0);
-static void sub_0205820C(SysTask * param0, void * param1);
+static void CommPlayer_Move(SysTask * param0, void * param1);
 static void sub_02057E80(SysTask * param0, void * param1);
 static void sub_02057EF8(void * param0);
-static void sub_020587C0(int param0);
+static void CommPlayer_MoveClient(int param0);
 static void sub_020591A8(void);
 
-static CommPlayerData * sCommPlayerData = NULL;
+static CommPlayer * sCommPlayerManager = NULL;
 
-CommPlayerData * CommPlayerData_Get (void)
+CommPlayer * CommPlayerData_Get (void)
 {
-    return sCommPlayerData;
+    return sCommPlayerManager;
 }
 
 BOOL CommPlayerManager_Init (void * dest, FieldSystem * fieldSys, BOOL isUnderground)
 {
     int netId;
 
-    if (sCommPlayerData) {
+    if (sCommPlayerManager) {
         return 0;
     }
 
-    if (sCommPlayerData == NULL) {
-        sCommPlayerData = dest;
-        MI_CpuFill8(sCommPlayerData, 0, sizeof(CommPlayerData));
+    if (sCommPlayerManager == NULL) {
+        sCommPlayerManager = dest;
+        MI_CpuFill8(sCommPlayerManager, 0, sizeof(CommPlayer));
     }
 
-    sCommPlayerData->isUnderground = isUnderground;
-    sCommPlayerData->unk_04 = NULL;
+    sCommPlayerManager->isUnderground = isUnderground;
+    sCommPlayerManager->unk_04 = NULL;
 
     if (isUnderground) {
-        sCommPlayerData->unk_04 = Heap_AllocFromHeap(HEAP_ID_COMMUNICATION, ov23_02249918());
-        ov23_0224991C(sCommPlayerData->unk_04);
+        sCommPlayerManager->unk_04 = Heap_AllocFromHeap(HEAP_ID_COMMUNICATION, ov23_02249918());
+        ov23_0224991C(sCommPlayerManager->unk_04);
     }
 
-    sCommPlayerData->fieldSys = fieldSys;
+    sCommPlayerManager->fieldSys = fieldSys;
 
     for (netId = 0; netId < MAX_CONNECTED_PLAYERS; netId++) {
-        sCommPlayerData->playerLocation[netId].dir = -1;
-        sCommPlayerData->playerLocation[netId].x = 0xffff;
-        sCommPlayerData->playerLocation[netId].z = 0xffff;
-        sCommPlayerData->playerLocation[netId].moveSpeed = 2;
-        sCommPlayerData->playerLocationServer[netId].dir = -1;
-        sCommPlayerData->playerLocationServer[netId].x = 0xffff;
-        sCommPlayerData->playerLocationServer[netId].z = 0xffff;
-        sCommPlayerData->playerLocationServer[netId].moveSpeed = 2;
-        sCommPlayerData->unk_102[netId] = -1;
-        sCommPlayerData->unk_E2[netId] = 0;
-        sCommPlayerData->unk_EA[netId] = 1;
-        sCommPlayerData->unk_F2[netId] = 0;
-        sCommPlayerData->unk_14A[netId].unk_20 = 0xff;
+        sCommPlayerManager->playerLocation[netId].dir = -1;
+        sCommPlayerManager->playerLocation[netId].x = 0xffff;
+        sCommPlayerManager->playerLocation[netId].z = 0xffff;
+        sCommPlayerManager->playerLocation[netId].moveSpeed = 2;
+        sCommPlayerManager->playerLocationServer[netId].dir = -1;
+        sCommPlayerManager->playerLocationServer[netId].x = 0xffff;
+        sCommPlayerManager->playerLocationServer[netId].z = 0xffff;
+        sCommPlayerManager->playerLocationServer[netId].moveSpeed = 2;
+        sCommPlayerManager->unk_102[netId] = -1;
+        sCommPlayerManager->unk_E2[netId] = 0;
+        sCommPlayerManager->unk_EA[netId] = 1;
+        sCommPlayerManager->unk_F2[netId] = 0;
+        sCommPlayerManager->unk_14A[netId].unk_20 = 0xff;
     }
 
-    sCommPlayerData->unk_2BC = 0;
-    sCommPlayerData->unk_2BF = 0;
-    sCommPlayerData->task = SysTask_Start(sub_02057E80, NULL, (100 + 100));
+    sCommPlayerManager->unk_2BC = 0;
+    sCommPlayerManager->unk_2BF = 0;
+    sCommPlayerManager->task = SysTask_Start(sub_02057E80, NULL, (100 + 100));
 
     CommSys_EnableSendMovementData();
     CommPlayer_InitPersonal();
@@ -119,31 +119,31 @@ void CommPlayerMan_Reset (void)
 {
     int netId;
 
-    if (sCommPlayerData == NULL) {
+    if (sCommPlayerManager == NULL) {
         return;
     }
 
     for (netId = 0; netId < MAX_CONNECTED_PLAYERS; netId++) {
-        if (sCommPlayerData->isUnderground) {
-            CommPlayer_Destory(netId, TRUE, FALSE);
+        if (sCommPlayerManager->isUnderground) {
+            CommPlayer_Destroy(netId, TRUE, FALSE);
         } else {
-            CommPlayer_Destory(netId, TRUE, TRUE);
+            CommPlayer_Destroy(netId, TRUE, TRUE);
         }
     }
 
-    if (sCommPlayerData->isUnderground) {
-        sCommPlayerData->isResetting = TRUE;
+    if (sCommPlayerManager->isUnderground) {
+        sCommPlayerManager->isResetting = TRUE;
     }
 }
 
 void CommPlayerMan_Restart (void)
 {
-    if (sCommPlayerData == NULL) {
+    if (sCommPlayerManager == NULL) {
         return;
     }
 
-    sCommPlayerData->unk_2BB = 1;
-    sCommPlayerData->isResetting = 0;
+    sCommPlayerManager->unk_2BB = 1;
+    sCommPlayerManager->isResetting = 0;
 
     CommPlayer_InitPersonal();
     CommPlayer_SendPos(1);
@@ -153,31 +153,31 @@ void CommPlayerMan_Delete (BOOL deletePlayerData)
 {
     int netId, v1;
 
-    if (sCommPlayerData != NULL) {
+    if (sCommPlayerManager != NULL) {
         for (v1 = 0; v1 < 5; v1++) {
-            if (sCommPlayerData->unk_27C[v1]) {
-                Heap_FreeToHeap(sCommPlayerData->unk_27C[v1]);
-                sCommPlayerData->unk_27C[v1] = NULL;
+            if (sCommPlayerManager->unk_27C[v1]) {
+                Heap_FreeToHeap(sCommPlayerManager->unk_27C[v1]);
+                sCommPlayerManager->unk_27C[v1] = NULL;
             }
         }
 
-        if (sCommPlayerData->unk_2B2 >= 5) {
-            sub_0206DF60(sCommPlayerData->fieldSys, sCommPlayerData->unk_2B2);
+        if (sCommPlayerManager->unk_2B2 >= 5) {
+            sub_0206DF60(sCommPlayerManager->fieldSys, sCommPlayerManager->unk_2B2);
         }
 
         for (netId = 0; netId < MAX_CONNECTED_PLAYERS; netId++) {
-            CommPlayer_Destory(netId, FALSE, deletePlayerData);
+            CommPlayer_Destroy(netId, FALSE, deletePlayerData);
         }
 
-        SysTask_Done(sCommPlayerData->task);
+        SysTask_Done(sCommPlayerManager->task);
 
-        if (sCommPlayerData->unk_04) {
-            ov23_02249938(sCommPlayerData->unk_04);
-            Heap_FreeToHeap(sCommPlayerData->unk_04);
+        if (sCommPlayerManager->unk_04) {
+            ov23_02249938(sCommPlayerManager->unk_04);
+            Heap_FreeToHeap(sCommPlayerManager->unk_04);
         }
 
-        Heap_FreeToHeap(sCommPlayerData);
-        sCommPlayerData = NULL;
+        Heap_FreeToHeap(sCommPlayerManager);
+        sCommPlayerManager = NULL;
     }
 }
 
@@ -186,7 +186,7 @@ void CommPlayerMan_Reinit (void)
     int netId, v1;
 
     for (netId = 0; netId < MAX_CONNECTED_PLAYERS; netId++) {
-        if (sCommPlayerData->isUnderground) {
+        if (sCommPlayerManager->isUnderground) {
             ov23_0224AF4C(netId);
             ov23_0224AD98(netId);
 
@@ -195,93 +195,93 @@ void CommPlayerMan_Reinit (void)
             }
         }
 
-        if (sCommPlayerData->unk_08[netId] != NULL) {
-            if (sCommPlayerData->fieldSys->unk_3C != sCommPlayerData->unk_08[netId]) {
-                if (sCommPlayerData->isUnderground) {
-                    sub_0205E8E8(sCommPlayerData->unk_08[netId]);
+        if (sCommPlayerManager->playerAvatar[netId] != NULL) {
+            if (sCommPlayerManager->fieldSys->playerAvatar != sCommPlayerManager->playerAvatar[netId]) {
+                if (sCommPlayerManager->isUnderground) {
+                    sub_0205E8E8(sCommPlayerManager->playerAvatar[netId]);
                 }
             }
 
-            sCommPlayerData->unk_08[netId] = NULL;
+            sCommPlayerManager->playerAvatar[netId] = NULL;
         }
 
-        sCommPlayerData->unk_48[netId] = 0;
-        sCommPlayerData->playerLocation[netId].dir = -1;
-        sCommPlayerData->playerLocation[netId].x = 0xffff;
-        sCommPlayerData->playerLocation[netId].z = 0xffff;
-        sCommPlayerData->playerLocation[netId].moveSpeed = 2;
-        sCommPlayerData->playerLocationServer[netId].dir = -1;
-        sCommPlayerData->playerLocationServer[netId].x = 0xffff;
-        sCommPlayerData->playerLocationServer[netId].z = 0xffff;
-        sCommPlayerData->playerLocationServer[netId].moveSpeed = 2;
-        sCommPlayerData->unk_102[netId] = -1;
-        sCommPlayerData->unk_10A[netId] = 0;
-        sCommPlayerData->unk_E2[netId] = 0;
-        sCommPlayerData->unk_EA[netId] = 1;
-        sCommPlayerData->unk_F2[netId] = 0;
-        sCommPlayerData->unk_13A[netId] = 0;
-        sCommPlayerData->unk_142[netId] = 0;
+        sCommPlayerManager->unk_48[netId] = 0;
+        sCommPlayerManager->playerLocation[netId].dir = -1;
+        sCommPlayerManager->playerLocation[netId].x = 0xffff;
+        sCommPlayerManager->playerLocation[netId].z = 0xffff;
+        sCommPlayerManager->playerLocation[netId].moveSpeed = 2;
+        sCommPlayerManager->playerLocationServer[netId].dir = -1;
+        sCommPlayerManager->playerLocationServer[netId].x = 0xffff;
+        sCommPlayerManager->playerLocationServer[netId].z = 0xffff;
+        sCommPlayerManager->playerLocationServer[netId].moveSpeed = 2;
+        sCommPlayerManager->unk_102[netId] = -1;
+        sCommPlayerManager->unk_10A[netId] = 0;
+        sCommPlayerManager->unk_E2[netId] = 0;
+        sCommPlayerManager->unk_EA[netId] = 1;
+        sCommPlayerManager->unk_F2[netId] = 0;
+        sCommPlayerManager->unk_13A[netId] = 0;
+        sCommPlayerManager->unk_142[netId] = 0;
     }
 
-    sCommPlayerData->unk_2BF = 0;
+    sCommPlayerManager->unk_2BF = 0;
     CommPlayer_InitPersonal();
 
-    if (sCommPlayerData->task == NULL) {
-        sCommPlayerData->task = SysTask_Start(sub_02057E80, NULL, (100 + 100));
+    if (sCommPlayerManager->task == NULL) {
+        sCommPlayerManager->task = SysTask_Start(sub_02057E80, NULL, (100 + 100));
     }
 }
 
 void CommPlayerMan_Stop (void)
 {
-    if (sCommPlayerData->task) {
+    if (sCommPlayerManager->task) {
         sub_02057E80(NULL, NULL);
-        SysTask_Done(sCommPlayerData->task);
+        SysTask_Done(sCommPlayerManager->task);
     }
 
-    sCommPlayerData->task = NULL;
+    sCommPlayerManager->task = NULL;
 }
 
 void CommPlayer_InitPersonal (void)
 {
-    sCommPlayerData->unk_08[CommSys_CurNetId()] = sCommPlayerData->fieldSys->unk_3C;
-    sCommPlayerData->unk_48[CommSys_CurNetId()] = 1;
-    sCommPlayerData->playerLocation[CommSys_CurNetId()].x = Player_XPos(sCommPlayerData->fieldSys->unk_3C);
-    sCommPlayerData->playerLocation[CommSys_CurNetId()].z = Player_ZPos(sCommPlayerData->fieldSys->unk_3C);
-    sCommPlayerData->playerLocation[CommSys_CurNetId()].dir = Player_Dir(sCommPlayerData->fieldSys->unk_3C);
-    sCommPlayerData->playerLocationServer[CommSys_CurNetId()].x = Player_XPos(sCommPlayerData->fieldSys->unk_3C);
-    sCommPlayerData->playerLocationServer[CommSys_CurNetId()].z = Player_ZPos(sCommPlayerData->fieldSys->unk_3C);
-    sCommPlayerData->playerLocationServer[CommSys_CurNetId()].dir = Player_Dir(sCommPlayerData->fieldSys->unk_3C);
+    sCommPlayerManager->playerAvatar[CommSys_CurNetId()] = sCommPlayerManager->fieldSys->playerAvatar;
+    sCommPlayerManager->unk_48[CommSys_CurNetId()] = 1;
+    sCommPlayerManager->playerLocation[CommSys_CurNetId()].x = Player_XPos(sCommPlayerManager->fieldSys->playerAvatar);
+    sCommPlayerManager->playerLocation[CommSys_CurNetId()].z = Player_ZPos(sCommPlayerManager->fieldSys->playerAvatar);
+    sCommPlayerManager->playerLocation[CommSys_CurNetId()].dir = Player_Dir(sCommPlayerManager->fieldSys->playerAvatar);
+    sCommPlayerManager->playerLocationServer[CommSys_CurNetId()].x = Player_XPos(sCommPlayerManager->fieldSys->playerAvatar);
+    sCommPlayerManager->playerLocationServer[CommSys_CurNetId()].z = Player_ZPos(sCommPlayerManager->fieldSys->playerAvatar);
+    sCommPlayerManager->playerLocationServer[CommSys_CurNetId()].dir = Player_Dir(sCommPlayerManager->fieldSys->playerAvatar);
 }
 
 void CommPlayer_CopyPersonal (int param0)
 {
     int v0;
 
-    sCommPlayerData->unk_2BF = 0;
+    sCommPlayerManager->unk_2BF = 0;
     v0 = CommSys_CurNetId();
 
-    sCommPlayerData->unk_08[v0] = sCommPlayerData->fieldSys->unk_3C;
-    sCommPlayerData->unk_48[v0] = 1;
-    sCommPlayerData->playerLocation[v0].x = sCommPlayerData->playerLocation[param0].x;
-    sCommPlayerData->playerLocation[v0].z = sCommPlayerData->playerLocation[param0].z;
-    sCommPlayerData->playerLocation[v0].dir = sCommPlayerData->playerLocation[param0].dir;
-    sCommPlayerData->playerLocationServer[v0].x = sCommPlayerData->playerLocationServer[param0].x;
-    sCommPlayerData->playerLocationServer[v0].z = sCommPlayerData->playerLocationServer[param0].z;
-    sCommPlayerData->playerLocationServer[v0].dir = sCommPlayerData->playerLocationServer[param0].dir;
-    sCommPlayerData->unk_290[v0] = sCommPlayerData->unk_290[param0];
-    sCommPlayerData->unk_290[param0] = NULL;
+    sCommPlayerManager->playerAvatar[v0] = sCommPlayerManager->fieldSys->playerAvatar;
+    sCommPlayerManager->unk_48[v0] = 1;
+    sCommPlayerManager->playerLocation[v0].x = sCommPlayerManager->playerLocation[param0].x;
+    sCommPlayerManager->playerLocation[v0].z = sCommPlayerManager->playerLocation[param0].z;
+    sCommPlayerManager->playerLocation[v0].dir = sCommPlayerManager->playerLocation[param0].dir;
+    sCommPlayerManager->playerLocationServer[v0].x = sCommPlayerManager->playerLocationServer[param0].x;
+    sCommPlayerManager->playerLocationServer[v0].z = sCommPlayerManager->playerLocationServer[param0].z;
+    sCommPlayerManager->playerLocationServer[v0].dir = sCommPlayerManager->playerLocationServer[param0].dir;
+    sCommPlayerManager->unk_290[v0] = sCommPlayerManager->unk_290[param0];
+    sCommPlayerManager->unk_290[param0] = NULL;
 
-    if (sCommPlayerData->unk_290[v0]) {
-        TrainerInfo_Copy(sCommPlayerData->unk_290[v0], (TrainerInfo *)&sCommPlayerData->unk_14A[v0].unk_00);
+    if (sCommPlayerManager->unk_290[v0]) {
+        TrainerInfo_Copy(sCommPlayerManager->unk_290[v0], (TrainerInfo *)&sCommPlayerManager->unk_14A[v0].unk_00);
     }
 
-    sCommPlayerData->unk_14A[param0].unk_20 = 0xff;
+    sCommPlayerManager->unk_14A[param0].unk_20 = 0xff;
 }
 
 void CommPlayer_SendXZPos (BOOL param0, int param1, int param2)
 {
     u8 v0[5 + 1];
-    int v1 = Player_Dir(sCommPlayerData->fieldSys->unk_3C);
+    int v1 = Player_Dir(sCommPlayerManager->fieldSys->playerAvatar);
 
     v0[0] = param1;
     v0[1] = param1 >> 8;
@@ -294,21 +294,21 @@ void CommPlayer_SendXZPos (BOOL param0, int param1, int param2)
     }
 
     sub_020360D0(22, v0);
-    sCommPlayerData->unk_2BB = 1;
+    sCommPlayerManager->unk_2BB = 1;
 }
 
 void CommPlayer_SendPos (BOOL param0)
 {
-    int v0 = Player_XPos(sCommPlayerData->fieldSys->unk_3C);
-    int v1 = Player_ZPos(sCommPlayerData->fieldSys->unk_3C);
+    int v0 = Player_XPos(sCommPlayerManager->fieldSys->playerAvatar);
+    int v1 = Player_ZPos(sCommPlayerManager->fieldSys->playerAvatar);
 
     CommPlayer_SendXZPos(param0, v0, v1);
 }
 
 void CommPlayer_SendPosServer (BOOL param0)
 {
-    int v0 = sCommPlayerData->playerLocationServer[CommSys_CurNetId()].x;
-    int v1 = sCommPlayerData->playerLocationServer[CommSys_CurNetId()].z;
+    int v0 = sCommPlayerManager->playerLocationServer[CommSys_CurNetId()].x;
+    int v1 = sCommPlayerManager->playerLocationServer[CommSys_CurNetId()].z;
 
     CommPlayer_SendXZPos(param0, v0, v1);
 }
@@ -342,23 +342,23 @@ static void sub_02057B48 (int param0, const CommPlayerLocation * playerLocation)
     v0[0] += ((playerLocation->dir % 4) << 4);
     v0[0] += (playerLocation->moveSpeed << 6);
 
-    sub_02035AC4(23, v0, 0);
+    CommSys_SendDataServer(23, v0, 0);
 }
 
 void sub_02057BC4 (void * param0)
 {
-    int v0 = sub_0205EB0C(sCommPlayerData->fieldSys->unk_3C);
-    int v1 = sub_0205EB14(sCommPlayerData->fieldSys->unk_3C);
+    int v0 = sub_0205EB0C(sCommPlayerManager->fieldSys->playerAvatar);
+    int v1 = sub_0205EB14(sCommPlayerManager->fieldSys->playerAvatar);
 
     if ((0 == v0) && CommSys_IsPlayerConnected(CommSys_CurNetId())) {
-        if (!sCommPlayerData->unk_2BA) {
+        if (!sCommPlayerManager->unk_2BA) {
             CommPlayer_SendPos(1);
-            sCommPlayerData->unk_2BA = 1;
+            sCommPlayerManager->unk_2BA = 1;
         }
     }
 
     if ((1 == v0) && (1 == v1)) {
-        sCommPlayerData->unk_2BA = 0;
+        sCommPlayerManager->unk_2BA = 0;
     }
 }
 
@@ -367,34 +367,34 @@ static void sub_02057C2C (void * param0)
     int v0;
 
     for (v0 = 0; v0 < (7 + 1); v0++) {
-        if (sCommPlayerData->unk_48[v0]) {
-            CommPlayerLocation * v1 = &sCommPlayerData->playerLocationServer[v0];
+        if (sCommPlayerManager->unk_48[v0]) {
+            CommPlayerLocation * v1 = &sCommPlayerManager->playerLocationServer[v0];
 
-            if (sCommPlayerData->unk_132[v0] || sCommPlayerData->unk_2BB) {
-                sCommPlayerData->unk_132[v0] = 0;
+            if (sCommPlayerManager->unk_132[v0] || sCommPlayerManager->unk_2BB) {
+                sCommPlayerManager->unk_132[v0] = 0;
                 sub_02057B48(v0, v1);
             }
         }
     }
 
-    sCommPlayerData->unk_2BB = 0;
+    sCommPlayerManager->unk_2BB = 0;
 }
 
 u32 CommPlayer_Size (void)
 {
-    return sizeof(CommPlayerData);
+    return sizeof(CommPlayer);
 }
 
 static void CommPlayer_Add (u8 param0)
 {
     fx32 v0, v1;
-    UnkStruct_0205E884 * v2;
+    PlayerAvatar * v2;
 
-    if (sCommPlayerData->unk_08[param0] != NULL) {
+    if (sCommPlayerManager->playerAvatar[param0] != NULL) {
         return;
     }
 
-    if (sCommPlayerData->isResetting) {
+    if (sCommPlayerManager->isResetting) {
         return;
     }
 
@@ -406,9 +406,9 @@ static void CommPlayer_Add (u8 param0)
         }
 
         if (v3) {
-            if (!sCommPlayerData->isUnderground) {
+            if (!sCommPlayerManager->isUnderground) {
                 if (param0 != CommSys_CurNetId()) {
-                    UnkStruct_02061AB4 * v4 = sub_0206251C(sCommPlayerData->fieldSys->unk_38, 0xff + param0 + 1);
+                    UnkStruct_02061AB4 * v4 = sub_0206251C(sCommPlayerManager->fieldSys->unk_38, 0xff + param0 + 1);
 
                     if (v4) {
                         sub_02061AF4(v4);
@@ -423,67 +423,67 @@ static void CommPlayer_Add (u8 param0)
                     v5 = 1;
                 }
 
-                v2 = sub_0205E7D0(sCommPlayerData->fieldSys->unk_38, sCommPlayerData->playerLocation[param0].x, sCommPlayerData->playerLocation[param0].z, sCommPlayerData->playerLocation[param0].dir, 0x0, TrainerInfo_Gender(v3), v5, NULL);
+                v2 = sub_0205E7D0(sCommPlayerManager->fieldSys->unk_38, sCommPlayerManager->playerLocation[param0].x, sCommPlayerManager->playerLocation[param0].z, sCommPlayerManager->playerLocation[param0].dir, 0x0, TrainerInfo_Gender(v3), v5, NULL);
             }
 
             GF_ASSERT(v2);
-            sCommPlayerData->unk_08[param0] = v2;
+            sCommPlayerManager->playerAvatar[param0] = v2;
 
             sub_0206290C(sub_0205EB3C(v2), 0xff + param0 + 1);
 
-            if (sCommPlayerData->isUnderground) {
+            if (sCommPlayerManager->isUnderground) {
                 ov23_02243038(param0);
             }
 
-            if (sCommPlayerData->isUnderground && !sCommPlayerData->unk_48[param0]) {
-                if (!sCommPlayerData->isResetting) {
-                    ov5_021F5634(sCommPlayerData->fieldSys, sCommPlayerData->playerLocation[param0].x, 0, sCommPlayerData->playerLocation[param0].z);
+            if (sCommPlayerManager->isUnderground && !sCommPlayerManager->unk_48[param0]) {
+                if (!sCommPlayerManager->isResetting) {
+                    ov5_021F5634(sCommPlayerManager->fieldSys, sCommPlayerManager->playerLocation[param0].x, 0, sCommPlayerManager->playerLocation[param0].z);
                 }
 
-                sCommPlayerData->unk_48[param0] = 1;
-            } else if (!sCommPlayerData->isUnderground) {
-                sCommPlayerData->unk_48[param0] = 1;
+                sCommPlayerManager->unk_48[param0] = 1;
+            } else if (!sCommPlayerManager->isUnderground) {
+                sCommPlayerManager->unk_48[param0] = 1;
             }
         }
     }
 }
 
-void CommPlayer_Destory (u8 param0, BOOL param1, BOOL param2)
+void CommPlayer_Destroy (u8 param0, BOOL param1, BOOL param2)
 {
     int v0;
 
-    if (sCommPlayerData == NULL) {
+    if (sCommPlayerManager == NULL) {
         return;
     }
 
-    MI_CpuClear8(sCommPlayerData->unk_5A, (7 + 1));
+    MI_CpuClear8(sCommPlayerManager->unk_5A, (7 + 1));
 
-    if (sCommPlayerData->isUnderground) {
+    if (sCommPlayerManager->isUnderground) {
         ov23_0224AF4C(param0);
     }
 
-    if (sCommPlayerData->unk_08[param0] != NULL) {
-        if (sCommPlayerData->fieldSys->unk_3C != sCommPlayerData->unk_08[param0]) {
-            if (sCommPlayerData->isUnderground || param2) {
-                sub_0205E8E8(sCommPlayerData->unk_08[param0]);
+    if (sCommPlayerManager->playerAvatar[param0] != NULL) {
+        if (sCommPlayerManager->fieldSys->playerAvatar != sCommPlayerManager->playerAvatar[param0]) {
+            if (sCommPlayerManager->isUnderground || param2) {
+                sub_0205E8E8(sCommPlayerManager->playerAvatar[param0]);
             } else {
-                sub_0205E8E0(sCommPlayerData->unk_08[param0]);
+                sub_0205E8E0(sCommPlayerManager->playerAvatar[param0]);
             }
         }
 
-        sCommPlayerData->unk_08[param0] = NULL;
+        sCommPlayerManager->playerAvatar[param0] = NULL;
     }
 
-    if ((sCommPlayerData->unk_48[param0]) && (!param1)) {
-        sCommPlayerData->unk_48[param0] = 0;
+    if ((sCommPlayerManager->unk_48[param0]) && (!param1)) {
+        sCommPlayerManager->unk_48[param0] = 0;
     }
 
-    sCommPlayerData->unk_132[param0] = 1;
+    sCommPlayerManager->unk_132[param0] = 1;
 
     if (!param1) {
-        sCommPlayerData->unk_FA[param0] = 0;
+        sCommPlayerManager->unk_FA[param0] = 0;
 
-        if (sCommPlayerData->isUnderground) {
+        if (sCommPlayerManager->isUnderground) {
             ov23_0224AE60(param0);
 
             if (param0 != 0) {
@@ -515,8 +515,8 @@ static void sub_02057E80 (SysTask * param0, void * param1)
             sub_02057C2C(param1);
             sub_02057BC4(param1);
 
-            if (sCommPlayerData->unk_04) {
-                ov23_02249954(sCommPlayerData->unk_04);
+            if (sCommPlayerManager->unk_04) {
+                ov23_02249954(sCommPlayerManager->unk_04);
             }
         } else {
             sub_02057BC4(param1);
@@ -526,7 +526,7 @@ static void sub_02057E80 (SysTask * param0, void * param1)
     }
 
     for (v0 = 0; v0 < (7 + 1); v0++) {
-        if (sCommPlayerData->isUnderground) {
+        if (sCommPlayerManager->isUnderground) {
             if (CommSys_CurNetId() == 0) {
                 if (NULL == CommInfo_TrainerInfo(v0)) {
                     ov23_0224B5CC(v0);
@@ -543,28 +543,28 @@ static void sub_02057EF8 (void * param0)
     for (v0 = 0; v0 < (7 + 1); v0++) {
         if (!CommSys_IsPlayerConnected(v0)) {
             if (!(sub_02036180() && (v0 == 0))) {
-                if ((CommSys_CurNetId() == 0) && (sCommPlayerData->isUnderground)) {
+                if ((CommSys_CurNetId() == 0) && (sCommPlayerManager->isUnderground)) {
                     ov23_0224D898(v0);
                 }
             }
         }
 
         if (CommSys_IsPlayerConnected(v0) || (sub_02036180() && (v0 == 0))) {
-            sub_020587C0(v0);
+            CommPlayer_MoveClient(v0);
 
-            if (sCommPlayerData->isUnderground) {
+            if (sCommPlayerManager->isUnderground) {
                 ov23_0224AF7C(v0);
             }
         } else {
-            if (sCommPlayerData->unk_48[v0]) {
-                if ((CommSys_CurNetId() == 0) && (sCommPlayerData->isUnderground)) {
+            if (sCommPlayerManager->unk_48[v0]) {
+                if ((CommSys_CurNetId() == 0) && (sCommPlayerManager->isUnderground)) {
                     ov23_022436F0(v0);
                     ov23_02241648(v0);
                 }
 
                 {
                     u8 v2 = v0;
-                    sub_0205853C(0, 1, &v2, sCommPlayerData->fieldSys);
+                    CommPlayer_RecvDelete(0, 1, &v2, sCommPlayerManager->fieldSys);
                 }
             }
         }
@@ -573,8 +573,8 @@ static void sub_02057EF8 (void * param0)
 
 BOOL sub_02057FAC (void)
 {
-    if (sCommPlayerData != NULL) {
-        return sCommPlayerData->unk_2BC;
+    if (sCommPlayerManager != NULL) {
+        return sCommPlayerManager->unk_2BC;
     }
 
     return 0;
@@ -582,21 +582,21 @@ BOOL sub_02057FAC (void)
 
 void sub_02057FC4 (BOOL param0)
 {
-    if (sCommPlayerData != NULL) {
-        if (sCommPlayerData->unk_2BC != param0) {
-            sCommPlayerData->unk_2BC = param0;
+    if (sCommPlayerManager != NULL) {
+        if (sCommPlayerManager->unk_2BC != param0) {
+            sCommPlayerManager->unk_2BC = param0;
         }
 
-        sub_020360D0(62, &sCommPlayerData->unk_2BC);
+        sub_020360D0(62, &sCommPlayerManager->unk_2BC);
     }
 }
 
 static void sub_02057FF0 (BOOL param0)
 {
-    if (sCommPlayerData != NULL) {
-        if (sCommPlayerData->unk_2BC != param0) {
-            sCommPlayerData->unk_2BC = param0;
-            sub_020360D0(62, &sCommPlayerData->unk_2BC);
+    if (sCommPlayerManager != NULL) {
+        if (sCommPlayerManager->unk_2BC != param0) {
+            sCommPlayerManager->unk_2BC = param0;
+            sub_020360D0(62, &sCommPlayerManager->unk_2BC);
         }
     }
 }
@@ -605,7 +605,7 @@ void sub_02058018 (int param0, int param1, void * param2, void * param3)
 {
     u8 * v0 = (u8 *)param2;
 
-    if (sCommPlayerData) {
+    if (sCommPlayerManager) {
         GF_ASSERT(param1 == 1);
         GF_ASSERT(param0 < (7 + 1));
         GF_ASSERT((v0[0] == 1) || (v0[0] == 0));
@@ -616,58 +616,58 @@ void sub_02058018 (int param0, int param1, void * param2, void * param3)
 
 void sub_0205805C (FieldSystem * param0, BOOL param1)
 {
-    if (sCommPlayerData == NULL) {
+    if (sCommPlayerManager == NULL) {
         return;
     }
 
-    if (!sCommPlayerData->isUnderground) {
+    if (!sCommPlayerManager->isUnderground) {
         sub_02057FF0(param1);
-        sCommPlayerData->unk_2C1 = param1;
+        sCommPlayerManager->unk_2C1 = param1;
     }
 
-    if (param0->unk_3C) {
-        sCommPlayerData->unk_08[CommSys_CurNetId()] = param0->unk_3C;
+    if (param0->playerAvatar) {
+        sCommPlayerManager->playerAvatar[CommSys_CurNetId()] = param0->playerAvatar;
     }
 
     if (CommSys_IsInitialized() && (CommSys_CurNetId() == 0)) {
-        sub_0205820C(NULL, sCommPlayerData);
+        CommPlayer_Move(NULL, sCommPlayerManager);
     }
 
     if (CommSys_IsInitialized() && (CommSys_CurNetId() == 0)) {
-        if (!sCommPlayerData->isUnderground) {
+        if (!sCommPlayerManager->isUnderground) {
             sub_020591A8();
         }
     }
 }
 
-static int sub_020580DC (u16 param0, u16 param1)
+static int CommPlayer_Direction (u16 unused, u16 keys)
 {
-    if ((param1 & PAD_KEY_LEFT)) {
+    if ((keys & PAD_KEY_LEFT)) {
         return 2;
     }
 
-    if ((param1 & PAD_KEY_RIGHT)) {
+    if ((keys & PAD_KEY_RIGHT)) {
         return 3;
     }
 
-    if ((param1 & PAD_KEY_UP)) {
+    if ((keys & PAD_KEY_UP)) {
         return 0;
     }
 
-    if ((param1 & PAD_KEY_DOWN)) {
+    if ((keys & PAD_KEY_DOWN)) {
         return 1;
     }
 
     return(-1);
 }
 
-BOOL sub_02058108 (int param0, int param1)
+BOOL CommPlayer_CheckNPCCollision (int param0, int param1)
 {
     int v0, v1;
     const UnkStruct_020619DC * v2;
 
-    v0 = sub_0203A4B4(sCommPlayerData->fieldSys);
-    v2 = sub_0203A4BC(sCommPlayerData->fieldSys);
+    v0 = sub_0203A4B4(sCommPlayerManager->fieldSys);
+    v2 = sub_0203A4BC(sCommPlayerManager->fieldSys);
 
     for (v1 = 0; v1 < v0; v1++) {
         if ((v2[v1].unk_1A == param0) && (v2[v1].unk_1C == param1)) {
@@ -693,18 +693,18 @@ static BOOL sub_0205814C (int param0, int param1, int param2)
             }
         }
 
-        if (sub_02058108(param0, param1)) {
+        if (CommPlayer_CheckNPCCollision(param0, param1)) {
             return 1;
         }
 
-        if (sCommPlayerData->isUnderground) {
+        if (sCommPlayerManager->isUnderground) {
             if (!ov23_0224D1A0(param0, param1)) {
                 return 1;
             }
         }
     }
 
-    return sub_02054F68(sCommPlayerData->fieldSys, param0, param1);
+    return sub_02054F68(sCommPlayerManager->fieldSys, param0, param1);
 }
 
 static int sub_020581CC (int param0, int param1)
@@ -728,7 +728,7 @@ static int sub_020581E0 (int param0)
     return v0[param0];
 }
 
-static void sub_0205820C (SysTask * param0, void * param1)
+static void CommPlayer_Move (SysTask * param0, void * param1)
 {
     u16 v0;
     u8 v1;
@@ -737,25 +737,25 @@ static void sub_0205820C (SysTask * param0, void * param1)
     UnkStruct_ov23_02249978 * v8 = NULL;
 
     for (v5 = 0; v5 < (7 + 1); v5++) {
-        if (sCommPlayerData->unk_48[v5] && sCommPlayerData->unk_E2[v5] && sCommPlayerData->unk_EA[v5]) {
-            playerLocation = &sCommPlayerData->playerLocationServer[v5];
+        if (sCommPlayerManager->unk_48[v5] && sCommPlayerManager->unk_E2[v5] && sCommPlayerManager->unk_EA[v5]) {
+            playerLocation = &sCommPlayerManager->playerLocationServer[v5];
 
-            if (sCommPlayerData->unk_04) {
-                v8 = ov23_0224993C(sCommPlayerData->unk_04, v5);
+            if (sCommPlayerManager->unk_04) {
+                v8 = ov23_0224993C(sCommPlayerManager->unk_04, v5);
             }
 
-            if (sCommPlayerData->isUnderground) {
+            if (sCommPlayerManager->isUnderground) {
                 if (ov23_0224C1C8(v5)) {
                     continue;
                 }
             }
 
-            if (sCommPlayerData->unk_13A[v5] != 0) {
-                sCommPlayerData->unk_13A[v5]--;
+            if (sCommPlayerManager->unk_13A[v5] != 0) {
+                sCommPlayerManager->unk_13A[v5]--;
             }
 
-            if (sCommPlayerData->unk_13A[v5] == 0) {
-                if (sCommPlayerData->isUnderground) {
+            if (sCommPlayerManager->unk_13A[v5] == 0) {
+                if (sCommPlayerManager->isUnderground) {
                     if (ov23_0224444C(v5)) {
                         continue;
                     }
@@ -774,7 +774,7 @@ static void sub_0205820C (SysTask * param0, void * param1)
                 }
             }
 
-            if (!sCommPlayerData->unk_F2[v5]) {
+            if (!sCommPlayerManager->unk_F2[v5]) {
                 v0 = sub_02035E84(v5);
             } else {
                 v0 = 0;
@@ -782,66 +782,66 @@ static void sub_0205820C (SysTask * param0, void * param1)
 
             playerLocation->moveSpeed = sub_02035E70(v5);
 
-            if (sCommPlayerData->unk_13A[v5] != 0) {
+            if (sCommPlayerManager->unk_13A[v5] != 0) {
                 continue;
             }
 
-            v6 = sub_020581CC(sCommPlayerData->unk_10A[v5], sCommPlayerData->unk_12A[v5]);
+            v6 = sub_020581CC(sCommPlayerManager->unk_10A[v5], sCommPlayerManager->unk_12A[v5]);
 
             if (sub_02058A18(v5, v6)) {
-                sCommPlayerData->unk_13A[v5] = v6;
-                sCommPlayerData->unk_132[v5] = 1;
+                sCommPlayerManager->unk_13A[v5] = v6;
+                sCommPlayerManager->unk_132[v5] = 1;
                 continue;
             }
 
             if (playerLocation->unk_07 == 1) {
-                sCommPlayerData->unk_132[v5] = 1;
+                sCommPlayerManager->unk_132[v5] = 1;
             }
 
             playerLocation->unk_07 = 0;
 
-            if (sCommPlayerData->unk_122[v5] == 2) {
+            if (sCommPlayerManager->unk_122[v5] == 2) {
                 u8 v9 = v5;
 
-                sCommPlayerData->unk_122[v5] = 1;
+                sCommPlayerManager->unk_122[v5] = 1;
                 sub_02035B48(40, &v9);
                 continue;
             }
 
-            v2 = sub_020580DC(v0, v0);
+            v2 = CommPlayer_Direction(v0, v0);
             v3 = sub_02058EE0(v5);
             v4 = sub_02058F18(v5);
 
             if ((v3 != 0xffff) && (v4 != 0xffff) && (v2 != -1)) {
                 if (playerLocation->dir != v2) {
                     playerLocation->dir = v2;
-                    sCommPlayerData->unk_13A[v5] = 4;
-                    sCommPlayerData->unk_132[v5] = 1;
+                    sCommPlayerManager->unk_13A[v5] = 4;
+                    sCommPlayerManager->unk_132[v5] = 1;
 
-                    if (sCommPlayerData->unk_122[v5] > 2) {
-                        sCommPlayerData->unk_122[v5]--;
+                    if (sCommPlayerManager->unk_122[v5] > 2) {
+                        sCommPlayerManager->unk_122[v5]--;
                         continue;
                     }
-                } else if (sCommPlayerData->unk_122[v5] != 0) {
+                } else if (sCommPlayerManager->unk_122[v5] != 0) {
                     continue;
-                } else if (sCommPlayerData->isUnderground && (ov23_0224B8E0(v5, v3, v4) == 1)) {
+                } else if (sCommPlayerManager->isUnderground && (ov23_0224B8E0(v5, v3, v4) == 1)) {
                     continue;
                 } else if (sub_0205814C(v3, v4, v5)) {
                     playerLocation->unk_07 = 1;
-                    sCommPlayerData->unk_132[v5] = 1;
-                    sCommPlayerData->unk_13A[v5] = 4;
+                    sCommPlayerManager->unk_132[v5] = 1;
+                    sCommPlayerManager->unk_13A[v5] = 4;
                 } else {
-                    sCommPlayerData->unk_132[v5] = 1;
+                    sCommPlayerManager->unk_132[v5] = 1;
                     playerLocation->x = v3;
                     playerLocation->z = v4;
                     playerLocation->dir = v2;
 
-                    sCommPlayerData->unk_13A[v5] = sub_020581E0(playerLocation->moveSpeed);
+                    sCommPlayerManager->unk_13A[v5] = sub_020581E0(playerLocation->moveSpeed);
 
-                    if (sCommPlayerData->unk_11A[v5] != 0) {
-                        sCommPlayerData->unk_11A[v5]--;
+                    if (sCommPlayerManager->unk_11A[v5] != 0) {
+                        sCommPlayerManager->unk_11A[v5]--;
 
-                        if (sCommPlayerData->unk_11A[v5] == 0) {
+                        if (sCommPlayerManager->unk_11A[v5] == 0) {
                             u8 v10 = 1;
                             ov23_0224540C(v5, 1, &v10, NULL);
                         }
@@ -852,19 +852,19 @@ static void sub_0205820C (SysTask * param0, void * param1)
     }
 }
 
-void sub_02058488 (int param0, int param1, void * param2, void * param3)
+void CommPlayer_RecvLocation (int param0, int param1, void * src, void * param3)
 {
-    u8 * v0 = (u8 *)param2;
+    u8 * v0 = (u8 *)src;
     CommPlayerLocation * playerLocation;
 
-    if (sCommPlayerData == NULL) {
+    if (sCommPlayerManager == NULL) {
         return;
     }
 
-    playerLocation = &sCommPlayerData->playerLocationServer[param0];
+    playerLocation = &sCommPlayerManager->playerLocationServer[param0];
 
     if (v0[4] & 0x80) {
-        sCommPlayerData->unk_2BB = 1;
+        sCommPlayerManager->unk_2BB = 1;
         return;
     }
 
@@ -872,7 +872,7 @@ void sub_02058488 (int param0, int param1, void * param2, void * param3)
         int v2;
 
         for (v2 = 0; v2 < (7 + 1); v2++) {
-            sCommPlayerData->unk_132[v2] = 1;
+            sCommPlayerManager->unk_132[v2] = 1;
         }
     }
 
@@ -884,20 +884,20 @@ void sub_02058488 (int param0, int param1, void * param2, void * param3)
     playerLocation->z += ((u32)v0[3] << 8) & 0xff00;
     playerLocation->dir = v0[4] & 0xf;
 
-    sCommPlayerData->unk_48[param0] = 1;
-    sCommPlayerData->unk_132[param0] = 1;
+    sCommPlayerManager->unk_48[param0] = 1;
+    sCommPlayerManager->unk_132[param0] = 1;
 
-    if (sub_02054F68(sCommPlayerData->fieldSys, playerLocation->x, playerLocation->z)) {
+    if (sub_02054F68(sCommPlayerManager->fieldSys, playerLocation->x, playerLocation->z)) {
         GF_ASSERT(0);
     }
 }
 
-void sub_0205853C (int param0, int param1, void * param2, void * param3)
+void CommPlayer_RecvDelete (int param0, int param1, void * param2, void * param3)
 {
     u8 * v0 = (u8 *)param2;
     u8 v1 = v0[0];
 
-    if (sCommPlayerData == NULL) {
+    if (sCommPlayerManager == NULL) {
         return;
     }
 
@@ -905,15 +905,15 @@ void sub_0205853C (int param0, int param1, void * param2, void * param3)
         return;
     }
 
-    if (sCommPlayerData->isUnderground) {
+    if (sCommPlayerManager->isUnderground) {
         ov23_022430B8(v1);
 
-        if (!sCommPlayerData->isResetting) {
-            ov5_021F5634(sCommPlayerData->fieldSys, sCommPlayerData->playerLocation[v1].x, 0, sCommPlayerData->playerLocation[v1].z);
+        if (!sCommPlayerManager->isResetting) {
+            ov5_021F5634(sCommPlayerManager->fieldSys, sCommPlayerManager->playerLocation[v1].x, 0, sCommPlayerManager->playerLocation[v1].z);
         }
     }
 
-    CommPlayer_Destory(v1, 0, 0);
+    CommPlayer_Destroy(v1, 0, 0);
     CommInfo_InitPlayer(v1);
 }
 
@@ -931,15 +931,15 @@ void sub_020585A8 (int param0, int param1, void * param2, void * param3)
 
     v3 = v1[0] & 0xf;
 
-    if (sCommPlayerData == NULL) {
+    if (sCommPlayerManager == NULL) {
         return;
     }
 
-    if ((param0 == CommSys_CurNetId()) && sCommPlayerData->unk_2C3) {
+    if ((param0 == CommSys_CurNetId()) && sCommPlayerManager->unk_2C3) {
         return;
     }
 
-    playerLocation = &sCommPlayerData->playerLocation[v3];
+    playerLocation = &sCommPlayerManager->playerLocation[v3];
 
     if (v1[2] & 0x80) {
         playerLocation->unk_07 = 1;
@@ -961,15 +961,15 @@ void sub_020585A8 (int param0, int param1, void * param2, void * param3)
 
 static void sub_02058644 (int param0)
 {
-    UnkStruct_020298B0 * v0 = sub_020298B0(sub_0203D174(sCommPlayerData->fieldSys));
-    UnkStruct_0202855C * v1 = sub_020298A0(sub_0203D174(sCommPlayerData->fieldSys));
+    UnkStruct_020298B0 * v0 = sub_020298B0(sub_0203D174(sCommPlayerManager->fieldSys));
+    UnkStruct_0202855C * v1 = sub_020298A0(sub_0203D174(sCommPlayerManager->fieldSys));
 
-    if (sCommPlayerData->isUnderground) {
+    if (sCommPlayerManager->isUnderground) {
         if (param0 == CommSys_CurNetId()) {
             sub_0202929C(v0);
 
             if (sub_020292B4(v0) == 50) {
-                sub_0202CFEC(sub_0202CD88(sCommPlayerData->fieldSys->unk_0C), 37);
+                sub_0202CFEC(sub_0202CD88(sCommPlayerManager->fieldSys->unk_0C), 37);
             }
         }
     }
@@ -983,7 +983,7 @@ static BOOL sub_020586A8 (int param0, int param1, int param2, int param3)
         0x14, 0x15, 0x16, 0x17, 0x10, 0x11, 0x12, 0x13, 0xc, 0xd, 0xe, 0xf
     };
 
-    if ((sCommPlayerData->unk_102[param0] == -1) || (sCommPlayerData->unk_08[param0] == NULL)) {
+    if ((sCommPlayerManager->unk_102[param0] == -1) || (sCommPlayerManager->playerAvatar[param0] == NULL)) {
         return 0;
     }
 
@@ -991,11 +991,11 @@ static BOOL sub_020586A8 (int param0, int param1, int param2, int param3)
         return 1;
     }
 
-    v0 = sub_0205EB3C(sCommPlayerData->unk_08[param0]);
+    v0 = sub_0205EB3C(sCommPlayerManager->playerAvatar[param0]);
 
-    if (Player_Dir(sCommPlayerData->unk_08[param0]) != sub_02059328(sCommPlayerData->unk_102[param0])) {
+    if (Player_Dir(sCommPlayerManager->playerAvatar[param0]) != CommPlayer_GetOppositeDir(sCommPlayerManager->unk_102[param0])) {
         sub_020628C4(v0, (1 << 7));
-        sub_0205EA84(sCommPlayerData->unk_08[param0], sub_02059328(sCommPlayerData->unk_102[param0]));
+        sub_0205EA84(sCommPlayerManager->playerAvatar[param0], CommPlayer_GetOppositeDir(sCommPlayerManager->unk_102[param0]));
         sub_020628BC(v0, (1 << 7));
     }
 
@@ -1008,13 +1008,13 @@ static BOOL sub_020586A8 (int param0, int param1, int param2, int param3)
 
         switch (param3) {
         case 0:
-            sub_02065638(v0, v3[sCommPlayerData->unk_102[param0]]);
+            sub_02065638(v0, v3[sCommPlayerManager->unk_102[param0]]);
             break;
         case 1:
-            sub_02065638(v0, v3[sCommPlayerData->unk_102[param0] + 4]);
+            sub_02065638(v0, v3[sCommPlayerManager->unk_102[param0] + 4]);
             break;
         case 2:
-            sub_02065638(v0, v3[sCommPlayerData->unk_102[param0] + 8]);
+            sub_02065638(v0, v3[sCommPlayerManager->unk_102[param0] + 8]);
             break;
         }
     } else {
@@ -1024,18 +1024,18 @@ static BOOL sub_020586A8 (int param0, int param1, int param2, int param3)
     return 1;
 }
 
-static void sub_020587C0 (int param0)
+static void CommPlayer_MoveClient (int param0)
 {
     BOOL v0 = 0, v1 = 1;
     u16 v2 = 0;
     CommPlayerLocation * playerLocation;
-    UnkStruct_0205E884 * v4;
+    PlayerAvatar * v4;
     int v5;
 
-    playerLocation = &sCommPlayerData->playerLocation[param0];
+    playerLocation = &sCommPlayerManager->playerLocation[param0];
 
-    if (sCommPlayerData->unk_142[param0] != 0) {
-        sCommPlayerData->unk_142[param0]--;
+    if (sCommPlayerManager->unk_142[param0] != 0) {
+        sCommPlayerManager->unk_142[param0]--;
         return;
     }
 
@@ -1043,19 +1043,19 @@ static void sub_020587C0 (int param0)
         return;
     }
 
-    if (sCommPlayerData->isResetting) {
+    if (sCommPlayerManager->isResetting) {
         return;
     }
 
-    if (!sCommPlayerData->isUnderground) {
+    if (!sCommPlayerManager->isUnderground) {
         if (param0 == CommSys_CurNetId()) {
-            if (!sCommPlayerData->unk_2C1) {
+            if (!sCommPlayerManager->unk_2C1) {
                 return;
             }
         }
     }
 
-    v4 = sCommPlayerData->unk_08[param0];
+    v4 = sCommPlayerManager->playerAvatar[param0];
 
     if (v4) {
         int v6 = Player_XPos(v4) - playerLocation->x;
@@ -1108,9 +1108,9 @@ static void sub_020587C0 (int param0)
                 break;
             }
 
-            if (sCommPlayerData->unk_2C0 && (param0 == CommSys_CurNetId())) {
-                sCommPlayerData->unk_2C0--;
-            } else if (!sub_02035EE0() && sCommPlayerData->isUnderground && (param0 == CommSys_CurNetId())) {
+            if (sCommPlayerManager->forceDirTimer && (param0 == CommSys_CurNetId())) {
+                sCommPlayerManager->forceDirTimer--;
+            } else if (!sub_02035EE0() && sCommPlayerManager->isUnderground && (param0 == CommSys_CurNetId())) {
                 v9 = sub_0206147C(
                     v4, v2, v2, v10, 1, 0);
             } else if (((v2 & ~PAD_BUTTON_B) == 0) && (playerLocation->unk_07)) {
@@ -1147,12 +1147,12 @@ static void sub_020587C0 (int param0)
                 sub_02061550(v4, v9, 1);
 
                 if (v2 & ~PAD_BUTTON_B) {
-                    if (sCommPlayerData->unk_142[param0] == 0) {
-                        sCommPlayerData->unk_142[param0] = sub_020581E0(v5);
+                    if (sCommPlayerManager->unk_142[param0] == 0) {
+                        sCommPlayerManager->unk_142[param0] = sub_020581E0(v5);
                     }
 
-                    if (sCommPlayerData->unk_142[param0] != 0) {
-                        sCommPlayerData->unk_142[param0]--;
+                    if (sCommPlayerManager->unk_142[param0] != 0) {
+                        sCommPlayerManager->unk_142[param0]--;
                     }
 
                     sub_02058644(param0);
@@ -1167,15 +1167,15 @@ static BOOL sub_02058A18 (int param0, int param1)
     int v0, v1;
     CommPlayerLocation * playerLocation;
 
-    if (sCommPlayerData->unk_10A[param0] == 0) {
+    if (sCommPlayerManager->unk_10A[param0] == 0) {
         return 0;
     }
 
-    if (sCommPlayerData->unk_10A[param0] == 0xff) {
+    if (sCommPlayerManager->unk_10A[param0] == 0xff) {
         return 1;
     }
 
-    sCommPlayerData->unk_10A[param0]--;
+    sCommPlayerManager->unk_10A[param0]--;
 
     if (1 == param1) {
         return 1;
@@ -1183,25 +1183,25 @@ static BOOL sub_02058A18 (int param0, int param1)
 
     v0 = sub_02058DF8(param0);
     v1 = sub_02058E4C(param0);
-    v0 += sub_0206419C(sCommPlayerData->unk_112[param0]);
-    v1 += sub_020641A8(sCommPlayerData->unk_112[param0]);
+    v0 += sub_0206419C(sCommPlayerManager->unk_112[param0]);
+    v1 += sub_020641A8(sCommPlayerManager->unk_112[param0]);
 
-    if (sCommPlayerData->unk_10A[param0] != 0) {
+    if (sCommPlayerManager->unk_10A[param0] != 0) {
         if (sub_0205814C(v0, v1, param0)) {
-            sCommPlayerData->unk_10A[param0] = 1;
+            sCommPlayerManager->unk_10A[param0] = 1;
         }
     }
 
-    if (sCommPlayerData->unk_10A[param0] == 1) {
+    if (sCommPlayerManager->unk_10A[param0] == 1) {
         return 1;
-    } else if (sCommPlayerData->unk_10A[param0] == 0) {
+    } else if (sCommPlayerManager->unk_10A[param0] == 0) {
         u8 v3 = 1;
 
         ov23_0224540C(param0, 1, &v3, NULL);
         return 1;
     }
 
-    playerLocation = &sCommPlayerData->playerLocationServer[param0];
+    playerLocation = &sCommPlayerManager->playerLocationServer[param0];
     playerLocation->x = v0;
     playerLocation->z = v1;
 
@@ -1222,65 +1222,65 @@ static BOOL sub_02058A18 (int param0, int param1)
 
 void sub_02058B0C (int param0, int param1, BOOL param2)
 {
-    CommPlayerLocation * playerLocation = &sCommPlayerData->playerLocationServer[param0];
+    CommPlayerLocation * playerLocation = &sCommPlayerManager->playerLocationServer[param0];
     u8 v1[3];
 
-    playerLocation->dir = sub_02059328(param1);
-    sCommPlayerData->unk_112[param0] = param1;
+    playerLocation->dir = CommPlayer_GetOppositeDir(param1);
+    sCommPlayerManager->unk_112[param0] = param1;
 
     if (param2) {
-        sCommPlayerData->unk_12A[param0] = 1;
-        sCommPlayerData->unk_10A[param0] = 45;
+        sCommPlayerManager->unk_12A[param0] = 1;
+        sCommPlayerManager->unk_10A[param0] = 45;
     } else {
-        sCommPlayerData->unk_12A[param0] = 0;
-        sCommPlayerData->unk_10A[param0] = 27;
+        sCommPlayerManager->unk_12A[param0] = 0;
+        sCommPlayerManager->unk_10A[param0] = 27;
     }
 
-    sCommPlayerData->unk_132[param0] = 1;
+    sCommPlayerManager->unk_132[param0] = 1;
 }
 
 void sub_02058B7C (int param0)
 {
-    sCommPlayerData->unk_10A[param0] = 0;
+    sCommPlayerManager->unk_10A[param0] = 0;
 }
 
 void sub_02058B94 (int param0)
 {
-    sCommPlayerData->unk_10A[param0] = 0xff;
+    sCommPlayerManager->unk_10A[param0] = 0xff;
 }
 
 void sub_02058BA8 (int param0, int param1, BOOL param2)
 {
     UnkStruct_02061AB4 * v0;
 
-    if (sCommPlayerData->unk_08[param0] == NULL) {
+    if (sCommPlayerManager->playerAvatar[param0] == NULL) {
         return;
     }
 
-    v0 = sub_0205EB3C(sCommPlayerData->unk_08[param0]);
+    v0 = sub_0205EB3C(sCommPlayerManager->playerAvatar[param0]);
 
     sub_020628BC(v0, (1 << 7));
     sub_020628BC(v0, (1 << 8));
 
-    sCommPlayerData->unk_102[param0] = param1;
+    sCommPlayerManager->unk_102[param0] = param1;
 }
 
 void sub_02058BE8 (int param0)
 {
     UnkStruct_02061AB4 * v0;
 
-    if (sCommPlayerData->unk_08[param0] == NULL) {
+    if (sCommPlayerManager->playerAvatar[param0] == NULL) {
         return;
     }
 
-    if (sCommPlayerData->unk_102[param0] != -1) {
-        v0 = sub_0205EB3C(sCommPlayerData->unk_08[param0]);
+    if (sCommPlayerManager->unk_102[param0] != -1) {
+        v0 = sub_0205EB3C(sCommPlayerManager->playerAvatar[param0]);
 
         sub_020656AC(v0);
         sub_020628C4(v0, (1 << 7));
         sub_020628C4(v0, (1 << 8));
 
-        sCommPlayerData->unk_102[param0] = -1;
+        sCommPlayerManager->unk_102[param0] = -1;
     }
 }
 
@@ -1295,7 +1295,7 @@ BOOL sub_02058C40 (void)
         return 1;
     }
 
-    if (!sCommPlayerData) {
+    if (!sCommPlayerManager) {
         return 0;
     }
 
@@ -1303,122 +1303,122 @@ BOOL sub_02058C40 (void)
         return 0;
     }
 
-    if (sCommPlayerData->isUnderground && !ov23_02249BD4()) {
+    if (sCommPlayerManager->isUnderground && !ov23_02249BD4()) {
         return 0;
     }
 
     return 1;
 }
 
-BOOL sub_02058C90 (int param0)
+BOOL CommPlayer_IsActive (int netId)
 {
-    return sCommPlayerData->unk_48[param0];
+    return sCommPlayerManager->unk_48[netId];
 }
 
-int sub_02058CA0 (int param0)
+int CommPlayer_XPos (int param0)
 {
-    if (!sCommPlayerData) {
+    if (!sCommPlayerManager) {
         return 0xffff;
     } else if (CommSys_CurNetId() == param0) {
-        return sCommPlayerData->playerLocation[param0].x;
-    } else if (!sub_02058C40() || !sCommPlayerData->unk_48[param0]) {
+        return sCommPlayerManager->playerLocation[param0].x;
+    } else if (!sub_02058C40() || !sCommPlayerManager->unk_48[param0]) {
         return 0xffff;
     }
 
-    return sCommPlayerData->playerLocation[param0].x;
+    return sCommPlayerManager->playerLocation[param0].x;
 }
 
-int sub_02058CF4 (int param0)
+int CommPlayer_ZPos (int param0)
 {
-    if (!sCommPlayerData) {
+    if (!sCommPlayerManager) {
         return 0xffff;
     } else if (CommSys_CurNetId() == param0) {
-        return sCommPlayerData->playerLocation[param0].z;
-    } else if (!sub_02058C40() || !sCommPlayerData->unk_48[param0]) {
+        return sCommPlayerManager->playerLocation[param0].z;
+    } else if (!sub_02058C40() || !sCommPlayerManager->unk_48[param0]) {
         return 0xffff;
     }
 
-    return sCommPlayerData->playerLocation[param0].z;
+    return sCommPlayerManager->playerLocation[param0].z;
 }
 
 int sub_02058D48 (int param0)
 {
-    if (!sCommPlayerData) {
+    if (!sCommPlayerManager) {
         return 0xffff;
     }
 
-    return sCommPlayerData->playerLocation[param0].x;
+    return sCommPlayerManager->playerLocation[param0].x;
 }
 
 int sub_02058D68 (int param0)
 {
-    if (!sCommPlayerData) {
+    if (!sCommPlayerManager) {
         return 0xffff;
     }
 
-    return sCommPlayerData->playerLocation[param0].z;
+    return sCommPlayerManager->playerLocation[param0].z;
 }
 
 int sub_02058D88 (int param0)
 {
-    if (sub_02058CA0(param0) == 0xffff) {
+    if (CommPlayer_XPos(param0) == 0xffff) {
         return 0xffff;
     }
 
-    return sCommPlayerData->playerLocation[param0].x + sub_0206419C(sCommPlayerData->playerLocation[param0].dir);
+    return sCommPlayerManager->playerLocation[param0].x + sub_0206419C(sCommPlayerManager->playerLocation[param0].dir);
 }
 
 int sub_02058DC0 (int param0)
 {
-    if (sub_02058CF4(param0) == 0xffff) {
+    if (CommPlayer_ZPos(param0) == 0xffff) {
         return 0xffff;
     }
 
-    return sCommPlayerData->playerLocation[param0].z + sub_020641A8(sCommPlayerData->playerLocation[param0].dir);
+    return sCommPlayerManager->playerLocation[param0].z + sub_020641A8(sCommPlayerManager->playerLocation[param0].dir);
 }
 
 int sub_02058DF8 (int param0)
 {
-    if (!sCommPlayerData) {
+    if (!sCommPlayerManager) {
         return 0xffff;
     } else if (CommSys_CurNetId() == param0) {
-        return sCommPlayerData->playerLocationServer[param0].x;
-    } else if (!sub_02058C40() || !sCommPlayerData->unk_48[param0]) {
+        return sCommPlayerManager->playerLocationServer[param0].x;
+    } else if (!sub_02058C40() || !sCommPlayerManager->unk_48[param0]) {
         return 0xffff;
     }
 
-    return sCommPlayerData->playerLocationServer[param0].x;
+    return sCommPlayerManager->playerLocationServer[param0].x;
 }
 
 int sub_02058E4C (int param0)
 {
-    if (!sCommPlayerData) {
+    if (!sCommPlayerManager) {
         return 0xffff;
     } else if (CommSys_CurNetId() == param0) {
-        return sCommPlayerData->playerLocationServer[param0].z;
-    } else if (!sub_02058C40() || !sCommPlayerData->unk_48[param0]) {
+        return sCommPlayerManager->playerLocationServer[param0].z;
+    } else if (!sub_02058C40() || !sCommPlayerManager->unk_48[param0]) {
         return 0xffff;
     }
 
-    return sCommPlayerData->playerLocationServer[param0].z;
+    return sCommPlayerManager->playerLocationServer[param0].z;
 }
 
 int sub_02058EA0 (int param0)
 {
-    if (!sCommPlayerData) {
+    if (!sCommPlayerManager) {
         return 0xffff;
     }
 
-    return sCommPlayerData->playerLocationServer[param0].x;
+    return sCommPlayerManager->playerLocationServer[param0].x;
 }
 
 int sub_02058EC0 (int param0)
 {
-    if (!sCommPlayerData) {
+    if (!sCommPlayerManager) {
         return 0xffff;
     }
 
-    return sCommPlayerData->playerLocationServer[param0].z;
+    return sCommPlayerManager->playerLocationServer[param0].z;
 }
 
 int sub_02058EE0 (int param0)
@@ -1427,7 +1427,7 @@ int sub_02058EE0 (int param0)
         return 0xffff;
     }
 
-    return sCommPlayerData->playerLocationServer[param0].x + sub_0206419C(sCommPlayerData->playerLocationServer[param0].dir);
+    return sCommPlayerManager->playerLocationServer[param0].x + sub_0206419C(sCommPlayerManager->playerLocationServer[param0].dir);
 }
 
 int sub_02058F18 (int param0)
@@ -1436,56 +1436,56 @@ int sub_02058F18 (int param0)
         return 0xffff;
     }
 
-    return sCommPlayerData->playerLocationServer[param0].z + sub_020641A8(sCommPlayerData->playerLocationServer[param0].dir);
+    return sCommPlayerManager->playerLocationServer[param0].z + sub_020641A8(sCommPlayerManager->playerLocationServer[param0].dir);
 }
 
-int sub_02058F50 (int param0)
+int CommPlayer_Dir (int param0)
 {
-    if (!sub_02058C40() || !sCommPlayerData->unk_48[param0]) {
+    if (!sub_02058C40() || !sCommPlayerManager->unk_48[param0]) {
         return -1;
     }
 
-    return sCommPlayerData->playerLocation[param0].dir;
+    return sCommPlayerManager->playerLocation[param0].dir;
 }
 
 int sub_02058F80 (int param0)
 {
-    if (!sub_02058C40() || !sCommPlayerData->unk_48[param0]) {
+    if (!sub_02058C40() || !sCommPlayerManager->unk_48[param0]) {
         return -1;
     }
 
-    return sCommPlayerData->playerLocationServer[param0].dir;
+    return sCommPlayerManager->playerLocationServer[param0].dir;
 }
 
 void sub_02058FB0 (int param0, int param1)
 {
-    int v0 = sub_02059328(sCommPlayerData->playerLocationServer[param0].dir);
+    int v0 = CommPlayer_GetOppositeDir(sCommPlayerManager->playerLocationServer[param0].dir);
 
-    sCommPlayerData->playerLocationServer[param1].dir = v0;
-    sCommPlayerData->unk_132[param1] = 1;
+    sCommPlayerManager->playerLocationServer[param1].dir = v0;
+    sCommPlayerManager->unk_132[param1] = 1;
 }
 
 void sub_02058FE4 (int param0, int param1)
 {
-    int v0 = sub_02059328(sCommPlayerData->playerLocation[param0].dir);
-    sCommPlayerData->playerLocation[param1].dir = v0;
+    int v0 = CommPlayer_GetOppositeDir(sCommPlayerManager->playerLocation[param0].dir);
+    sCommPlayerManager->playerLocation[param1].dir = v0;
 }
 
 int sub_0205900C (int param0, int param1)
 {
     int v0, v1, v2;
 
-    if (!sCommPlayerData) {
+    if (!sCommPlayerManager) {
         return 0xff;
     }
 
     for (v0 = 0; v0 < (7 + 1); v0++) {
-        if (sCommPlayerData->unk_48[v0] == 0) {
+        if (sCommPlayerManager->unk_48[v0] == 0) {
             continue;
         }
 
-        v1 = sCommPlayerData->playerLocationServer[v0].x;
-        v2 = sCommPlayerData->playerLocationServer[v0].z;
+        v1 = sCommPlayerManager->playerLocationServer[v0].x;
+        v2 = sCommPlayerManager->playerLocationServer[v0].z;
 
         if ((param0 == v1) && (param1 == v2)) {
             return v0;
@@ -1497,25 +1497,25 @@ int sub_0205900C (int param0, int param1)
 
 void sub_02059058 (int param0, BOOL param1)
 {
-    if (sCommPlayerData->unk_E2[param0] != param1) {
-        sCommPlayerData->unk_E2[param0] = param1;
-        sCommPlayerData->playerLocationServer[param0].unk_07 = 0;
-        sCommPlayerData->unk_132[param0] = 1;
-        sCommPlayerData->playerLocationServer[param0].moveSpeed = 2;
+    if (sCommPlayerManager->unk_E2[param0] != param1) {
+        sCommPlayerManager->unk_E2[param0] = param1;
+        sCommPlayerManager->playerLocationServer[param0].unk_07 = 0;
+        sCommPlayerManager->unk_132[param0] = 1;
+        sCommPlayerManager->playerLocationServer[param0].moveSpeed = 2;
     }
 }
 
 BOOL sub_02059094 (int param0)
 {
-    if (sCommPlayerData->unk_2C2) {
+    if (sCommPlayerManager->unk_2C2) {
         return 0;
     }
 
-    if (!sCommPlayerData->unk_EA[param0]) {
+    if (!sCommPlayerManager->unk_EA[param0]) {
         return 0;
     }
 
-    return sCommPlayerData->unk_E2[param0];
+    return sCommPlayerManager->unk_E2[param0];
 }
 
 BOOL sub_020590C4 (void)
@@ -1543,7 +1543,7 @@ BOOL sub_020590C4 (void)
 
     for (v3 = 0; v3 < v2; v3++) {
         for (v4 = 0; v4 < v2; v4++) {
-            if ((sub_02058CA0(v4) == v9[v3].unk_00) && (sub_02058CF4(v4) == v9[v3].unk_02)) {
+            if ((CommPlayer_XPos(v4) == v9[v3].unk_00) && (CommPlayer_ZPos(v4) == v9[v3].unk_02)) {
                 v5++;
                 v6[v4] = v3;
 
@@ -1569,9 +1569,9 @@ void sub_02059180 (int param0, int param1, void * param2, void * param3)
     u8 * v0 = param2;
 
     if (v0[0] == 3) {
-        sCommPlayerData->unk_F2[param0] = 0;
+        sCommPlayerManager->unk_F2[param0] = 0;
     } else {
-        sCommPlayerData->unk_2B4[param0] = v0[0];
+        sCommPlayerManager->unk_2B4[param0] = v0[0];
     }
 }
 
@@ -1602,13 +1602,13 @@ static void sub_020591A8 (void)
     }
 
     for (v7 = 0; v7 < v0; v7++) {
-        if (!sCommPlayerData->unk_2B4[v7]) {
+        if (!sCommPlayerManager->unk_2B4[v7]) {
             continue;
         }
 
         for (v1 = 0; v1 < v0; v1++) {
             if ((sub_02058DF8(v7) == v6[v1].unk_00) && (sub_02058E4C(v7) == v6[v1].unk_02)) {
-                sCommPlayerData->unk_F2[v7] = 1;
+                sCommPlayerManager->unk_F2[v7] = 1;
                 sub_02035B48(95, &v7);
             }
         }
@@ -1620,7 +1620,7 @@ void sub_02059240 (void)
     int v0 = CommSys_CurNetId();
     int v1;
 
-    if (sub_02058CA0(v0) > 8) {
+    if (CommPlayer_XPos(v0) > 8) {
         sub_020593F4(2);
         v1 = sub_02065838(2, 0x24);
     } else {
@@ -1628,8 +1628,8 @@ void sub_02059240 (void)
         v1 = sub_02065838(3, 0x24);
     }
 
-    sub_02061550(sCommPlayerData->unk_08[v0], v1, 1);
-    sub_02059624();
+    sub_02061550(sCommPlayerManager->playerAvatar[v0], v1, 1);
+    CommPlayerManager_ForceDir();
 }
 
 BOOL sub_0205928C (void)
@@ -1639,27 +1639,27 @@ BOOL sub_0205928C (void)
     int v6 = 0;
 
     for (v1 = 0; v1 < v0; v1++) {
-        if ((sCommPlayerData->unk_48[v1] == 0) || (sCommPlayerData->unk_132[v1] == 1)) {
+        if ((sCommPlayerManager->unk_48[v1] == 0) || (sCommPlayerManager->unk_132[v1] == 1)) {
             return 0;
         }
     }
 
     for (v1 = 0; v1 < v0; v1++) {
-        CommPlayerLocation * playerLocation = &sCommPlayerData->playerLocationServer[v1];
+        CommPlayerLocation * playerLocation = &sCommPlayerManager->playerLocationServer[v1];
 
-        v5 = sub_02059328(playerLocation->dir);
+        v5 = CommPlayer_GetOppositeDir(playerLocation->dir);
         playerLocation->x += sub_0206419C(v5);
         playerLocation->z += sub_020641A8(v5);
         playerLocation->moveSpeed = 2;
 
-        sCommPlayerData->unk_132[v1] = 1;
+        sCommPlayerManager->unk_132[v1] = 1;
         sub_02059058(v1, 1);
     }
 
     return 1;
 }
 
-int sub_02059328 (int param0)
+int CommPlayer_GetOppositeDir (int param0)
 {
     if (param0 == 0) {
         return 1;
@@ -1677,99 +1677,99 @@ int sub_02059328 (int param0)
 
 void sub_02059354 (int param0, int param1)
 {
-    sCommPlayerData->unk_11A[param0] = param1;
-    sCommPlayerData->unk_13A[param0] = 15;
+    sCommPlayerManager->unk_11A[param0] = param1;
+    sCommPlayerManager->unk_13A[param0] = 15;
 }
 
 void sub_02059378 (int param0)
 {
-    sCommPlayerData->unk_11A[param0] = 0;
+    sCommPlayerManager->unk_11A[param0] = 0;
 }
 
 void sub_02059390 (int param0, int param1)
 {
-    sCommPlayerData->unk_122[param0] = param1;
-    sCommPlayerData->unk_13A[param0] = 15;
+    sCommPlayerManager->unk_122[param0] = param1;
+    sCommPlayerManager->unk_13A[param0] = 15;
 }
 
 void sub_020593B4 (int param0)
 {
-    sCommPlayerData->unk_122[param0] = 0;
+    sCommPlayerManager->unk_122[param0] = 0;
 }
 
 int sub_020593CC (int param0)
 {
-    return sCommPlayerData->unk_142[param0];
+    return sCommPlayerManager->unk_142[param0];
 }
 
 int sub_020593E0 (int param0)
 {
-    return sCommPlayerData->unk_13A[param0];
+    return sCommPlayerManager->unk_13A[param0];
 }
 
 void sub_020593F4 (int param0)
 {
-    sub_0205EA84(sCommPlayerData->fieldSys->unk_3C, param0);
-    sCommPlayerData->playerLocation[CommSys_CurNetId()].dir = param0;
+    sub_0205EA84(sCommPlayerManager->fieldSys->playerAvatar, param0);
+    sCommPlayerManager->playerLocation[CommSys_CurNetId()].dir = param0;
     CommPlayer_SendPos(0);
 }
 
 void sub_02059424 (int param0, int param1)
 {
-    sCommPlayerData->playerLocation[param0].dir = param1;
-    sub_0205EA84(sCommPlayerData->unk_08[param0], param1);
+    sCommPlayerManager->playerLocation[param0].dir = param1;
+    sub_0205EA84(sCommPlayerManager->playerAvatar[param0], param1);
 }
 
-int sub_02059444 (int param0)
+int CommPlayer_DirClient (int param0)
 {
-    if (!sCommPlayerData->unk_08[param0]) {
+    if (!sCommPlayerManager->playerAvatar[param0]) {
         return -1;
     }
 
-    return Player_Dir(sCommPlayerData->unk_08[param0]);
+    return Player_Dir(sCommPlayerManager->playerAvatar[param0]);
 }
 
 void sub_02059464 (int param0)
 {
     if (0 != param0) {
-        sCommPlayerData->unk_00 |= param0;
+        sCommPlayerManager->unk_00 |= param0;
     }
 
     sub_0203D128();
-    sCommPlayerData->unk_2BC = 0;
+    sCommPlayerManager->unk_2BC = 0;
 }
 
 void sub_0205948C (int param0)
 {
     if (0 != param0) {
-        sCommPlayerData->unk_00 &= ~(param0);
+        sCommPlayerManager->unk_00 &= ~(param0);
     }
 
-    if (sCommPlayerData->unk_00 == 0x10) {
+    if (sCommPlayerManager->unk_00 == 0x10) {
         u8 v0 = 1;
         sub_020360D0(62, &v0);
     }
 
-    if (sCommPlayerData->unk_00 == 0) {
+    if (sCommPlayerManager->unk_00 == 0) {
         if (0x10 != param0) {
             sub_0203D140();
             sub_02057FC4(1);
         } else {
             sub_0203D140();
-            sCommPlayerData->unk_2BC = 1;
+            sCommPlayerManager->unk_2BC = 1;
         }
     }
 }
 
 void sub_020594EC (void)
 {
-    sCommPlayerData->unk_00 = 0;
+    sCommPlayerManager->unk_00 = 0;
 }
 
 void sub_020594FC (void)
 {
     sub_0203D128();
-    sCommPlayerData->unk_2BC = 0;
+    sCommPlayerManager->unk_2BC = 0;
 }
 
 void sub_02059514 (void)
@@ -1780,13 +1780,13 @@ void sub_02059514 (void)
 
 void sub_02059524 (void)
 {
-    if (sCommPlayerData->unk_2BF == 0) {
-        if (!sCommPlayerData->isUnderground) {
+    if (sCommPlayerManager->unk_2BF == 0) {
+        if (!sCommPlayerManager->isUnderground) {
             sub_02059514();
-            sCommPlayerData->unk_2BF = 1;
+            sCommPlayerManager->unk_2BF = 1;
         } else if (ov23_02243298(CommSys_CurNetId())) {
             sub_02059514();
-            sCommPlayerData->unk_2BF = 1;
+            sCommPlayerManager->unk_2BF = 1;
         } else {
             (void)0;
         }
@@ -1795,8 +1795,8 @@ void sub_02059524 (void)
 
 void sub_02059570 (void)
 {
-    if (sCommPlayerData->unk_2BF == 0) {
-        if (sCommPlayerData->isUnderground) {
+    if (sCommPlayerManager->unk_2BF == 0) {
+        if (sCommPlayerManager->isUnderground) {
             if (!ov23_02243298(CommSys_CurNetId())) {
                 sub_02057FC4(0);
             }
@@ -1809,12 +1809,12 @@ void sub_020595A4 (void)
     int v0, v1, v2, v3;
     UnkStruct_02061AB4 * v4;
 
-    if (!sCommPlayerData) {
+    if (!sCommPlayerManager) {
         return;
     }
 
     for (v0 = 0; v0 < (7 + 1); v0++) {
-        if (sCommPlayerData->unk_08[v0] == NULL) {
+        if (sCommPlayerManager->playerAvatar[v0] == NULL) {
             continue;
         }
 
@@ -1822,10 +1822,10 @@ void sub_020595A4 (void)
             continue;
         }
 
-        v4 = sub_0205EB3C(sCommPlayerData->unk_08[v0]);
-        v1 = sCommPlayerData->playerLocation[v0].x;
-        v2 = sCommPlayerData->playerLocation[v0].z;
-        v3 = sCommPlayerData->playerLocation[v0].dir;
+        v4 = sub_0205EB3C(sCommPlayerManager->playerAvatar[v0]);
+        v1 = sCommPlayerManager->playerLocation[v0].x;
+        v2 = sCommPlayerManager->playerLocation[v0].z;
+        v3 = sCommPlayerManager->playerLocation[v0].dir;
 
         sub_02063024(v4, v1);
         sub_02063044(v4, v2);
@@ -1833,12 +1833,12 @@ void sub_020595A4 (void)
     }
 }
 
-void sub_02059624 (void)
+void CommPlayerManager_ForceDir (void)
 {
-    sCommPlayerData->unk_2C0 = 8;
+    sCommPlayerManager->forceDirTimer = 8;
 }
 
 void sub_02059638 (BOOL param0)
 {
-    sCommPlayerData->unk_2C3 = param0;
+    sCommPlayerManager->unk_2C3 = param0;
 }
diff --git a/src/unk_0205A0D8.c b/src/unk_0205A0D8.c
index ab6e250387..b3f06202ec 100644
--- a/src/unk_0205A0D8.c
+++ b/src/unk_0205A0D8.c
@@ -333,7 +333,7 @@ static BOOL sub_0205A324 (UnkStruct_020508D4 * param0)
         if (v0->unk_44 != 0) {
             v0->unk_44--;
         } else {
-            if (sub_02065684(sub_0205EB3C(v1->unk_3C))) {
+            if (sub_02065684(sub_0205EB3C(v1->playerAvatar))) {
                 v0->unk_34 = 11;
             }
         }
@@ -818,7 +818,7 @@ static BOOL sub_0205AD34 (UnkStruct_0205A0D8 * param0)
     BOOL v0;
 
     if (param0->unk_86 == 0) {
-        v0 = sub_02035AC4(107, &(param0->unk_84), 1);
+        v0 = CommSys_SendDataServer(107, &(param0->unk_84), 1);
     } else {
         v0 = CommSys_SendData(107, &(param0->unk_84), 1);
     }
@@ -1096,7 +1096,7 @@ void sub_0205B2D4 (FieldSystem * param0)
             continue;
         }
 
-        if ((v2 == sub_02058CA0(v0)) && (v3 == sub_02058CF4(v0))) {
+        if ((v2 == CommPlayer_XPos(v0)) && (v3 == CommPlayer_ZPos(v0))) {
             UnkStruct_0205B2D4 * v4 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_0205B2D4));
 
             v4->unk_24 = v0;
diff --git a/src/unk_0205B33C.c b/src/unk_0205B33C.c
index 5f9ce63738..4c4be659fd 100644
--- a/src/unk_0205B33C.c
+++ b/src/unk_0205B33C.c
@@ -609,12 +609,12 @@ void sub_0205B930 (UnkStruct_0205B43C * param0, int param1, u32 param2)
         if (param2 == 0) {
             u8 v1 = param0->unk_30;
 
-            sub_02035AC4(103, &v1, 1);
+            CommSys_SendDataServer(103, &v1, 1);
             param0->unk_3C = param2;
         } else {
             u8 v2 = 7;
 
-            sub_02035AC4(103, &v2, 1);
+            CommSys_SendDataServer(103, &v2, 1);
             param0->unk_3C = param2;
         }
         break;
diff --git a/src/unk_0205C22C.c b/src/unk_0205C22C.c
index 9e1de51be6..fb60356cb8 100644
--- a/src/unk_0205C22C.c
+++ b/src/unk_0205C22C.c
@@ -68,7 +68,7 @@ UnkStruct_0205C22C * sub_0205C22C (UnkStruct_0205B43C * param0)
     v0->unk_04 = SysTask_Start(sub_0205C304, v0, 11);
     v0->unk_470 = sub_0205B770(param0);
     v0->unk_474 = SaveData_SaveTable(v0->unk_470->unk_0C, 9);
-    v0->unk_08 = v0->unk_470->unk_3C;
+    v0->unk_08 = v0->unk_470->playerAvatar;
 
     Heap_CreateAtEnd(11, 89, 10000);
     v0->unk_478 = sub_0205C95C(89);
@@ -116,7 +116,7 @@ static void sub_0205C304 (SysTask * param0, void * param1)
     int v3;
 
     if (!sub_020509A4(v0->unk_470)) {
-        v0->unk_08 = v0->unk_470->unk_3C;
+        v0->unk_08 = v0->unk_470->playerAvatar;
         sub_0205C44C(v0, v1, v0->unk_470->unk_38, v0->unk_474);
         sub_0205C51C(v0, v0->unk_470->unk_38);
     }
diff --git a/src/unk_0205CA94.c b/src/unk_0205CA94.c
index 3e109b52df..de81480496 100644
--- a/src/unk_0205CA94.c
+++ b/src/unk_0205CA94.c
@@ -139,8 +139,8 @@ void sub_0205CA94 (SysTask * param0, void * param1)
 
     switch (v0->unk_1E4) {
     case 0:
-        sub_02062DDC(sub_0205EB3C(v0->unk_00->unk_3C));
-        sub_0205EB18(v0->unk_00->unk_3C, 0);
+        sub_02062DDC(sub_0205EB3C(v0->unk_00->playerAvatar));
+        sub_0205EB18(v0->unk_00->playerAvatar, 0);
         v0->unk_1E4++;
         break;
     case 1:
@@ -202,7 +202,7 @@ void sub_0205CBFC (SysTask * param0, void * param1)
 
     switch (v0->unk_1E4) {
     case 0:
-        sub_0205EB18(v0->unk_00->unk_3C, 0);
+        sub_0205EB18(v0->unk_00->playerAvatar, 0);
         v0->unk_1E4++;
         break;
     case 1:
@@ -229,7 +229,7 @@ void sub_0205CBFC (SysTask * param0, void * param1)
 
         if (v0->unk_1E8 > 0) {
             v0->unk_1E4++;
-            sub_0205EB18(v0->unk_00->unk_3C, 1);
+            sub_0205EB18(v0->unk_00->playerAvatar, 1);
         }
         break;
     case 4:
@@ -257,7 +257,7 @@ void sub_0205CD3C (SysTask * param0, void * param1)
 
     switch (v0->unk_1E4) {
     case 0:
-        sub_0205EB18(v0->unk_00->unk_3C, 0);
+        sub_0205EB18(v0->unk_00->playerAvatar, 0);
         v0->unk_1E4++;
         break;
     case 1:
@@ -320,7 +320,7 @@ void sub_0205CE7C (SysTask * param0, void * param1)
 
     switch (v0->unk_1E4) {
     case 0:
-        sub_0205EB18(v0->unk_00->unk_3C, 0);
+        sub_0205EB18(v0->unk_00->playerAvatar, 0);
         sub_0205D274(v0, &v0->unk_1C0[0], 4);
         sub_0205D274(v0, &v0->unk_1C0[1], 5);
         v0->unk_1E0 = 2;
@@ -340,7 +340,7 @@ void sub_0205CE7C (SysTask * param0, void * param1)
         v1[0] = v0->unk_1C0[0].unk_0C(&v0->unk_1C0[0]);
 
         if (v1[0] == 0) {
-            sub_0205EB18(v0->unk_00->unk_3C, 1);
+            sub_0205EB18(v0->unk_00->playerAvatar, 1);
             v0->unk_1E8 = 6;
             v0->unk_1E4++;
         }
diff --git a/src/unk_0205E7D0.c b/src/unk_0205E7D0.c
index 8a83829df2..a809a636f8 100644
--- a/src/unk_0205E7D0.c
+++ b/src/unk_0205E7D0.c
@@ -32,20 +32,20 @@ typedef struct UnkStruct_0205E884_t {
     UnkStruct_ov101_021D5D90 * unk_34;
     UnkStruct_0205EC34 * unk_38;
     const UnkStruct_0205EC34 * unk_3C;
-} UnkStruct_0205E884;
+} PlayerAvatar;
 
-static UnkStruct_0205E884 * sub_0205E8FC(void);
-static void sub_0205E91C(UnkStruct_0205E884 * param0, int param1, int param2, UnkStruct_0205EC34 * param3);
-static void sub_0205E988(UnkStruct_0205E884 * param0, const UnkStruct_02061830 * param1, int param2, int param3, int param4, int param5);
+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 UnkStruct_02061AB4 * sub_0205EA64(const UnkStruct_02061830 * param0);
-static void sub_0205EB9C(UnkStruct_0205E884 * param0, u32 param1);
-static void sub_0205EBA4(UnkStruct_0205E884 * param0, u32 param1);
-static u32 sub_0205EBB0(UnkStruct_0205E884 * param0, u32 param1);
-static void sub_0205EC08(UnkStruct_0205E884 * param0, UnkStruct_0205EC34 * param1);
+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);
 
-UnkStruct_0205E884 * 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 UnkStruct_02061830 * param0, int param1, int param2, int param3, int param4, int param5, int param6, UnkStruct_0205EC34 * param7)
 {
-    UnkStruct_0205E884 * v0;
+    PlayerAvatar * v0;
 
     v0 = sub_0205E8FC();
     sub_0205E91C(v0, param4, param5, param7);
@@ -69,10 +69,10 @@ UnkStruct_0205E884 * sub_0205E7D0 (const UnkStruct_02061830 * param0, int param1
     return v0;
 }
 
-UnkStruct_0205E884 * sub_0205E820 (const UnkStruct_02061830 * param0, UnkStruct_0205EC34 * param1, int param2)
+PlayerAvatar * sub_0205E820 (const UnkStruct_02061830 * param0, UnkStruct_0205EC34 * param1, int param2)
 {
     int v0;
-    UnkStruct_0205E884 * v1;
+    PlayerAvatar * v1;
     UnkStruct_02061AB4 * v2;
 
     v1 = sub_0205E8FC();
@@ -90,7 +90,7 @@ UnkStruct_0205E884 * sub_0205E820 (const UnkStruct_02061830 * param0, UnkStruct_
     return v1;
 }
 
-void sub_0205E884 (UnkStruct_0205E884 * param0, int param1)
+void sub_0205E884 (PlayerAvatar * param0, int param1)
 {
     int v0, v1;
     UnkStruct_02061AB4 * v2;
@@ -114,12 +114,12 @@ void sub_0205E884 (UnkStruct_0205E884 * param0, int param1)
     }
 }
 
-void sub_0205E8E0 (UnkStruct_0205E884 * param0)
+void sub_0205E8E0 (PlayerAvatar * param0)
 {
     Heap_FreeToHeap(param0);
 }
 
-void sub_0205E8E8 (UnkStruct_0205E884 * param0)
+void sub_0205E8E8 (PlayerAvatar * param0)
 {
     UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0);
 
@@ -127,18 +127,18 @@ void sub_0205E8E8 (UnkStruct_0205E884 * param0)
     sub_0205E8E0(param0);
 }
 
-static UnkStruct_0205E884 * sub_0205E8FC (void)
+static PlayerAvatar * sub_0205E8FC (void)
 {
-    UnkStruct_0205E884 * v0;
+    PlayerAvatar * v0;
 
-    v0 = Heap_AllocFromHeap(11, (sizeof(UnkStruct_0205E884)));
+    v0 = Heap_AllocFromHeap(11, (sizeof(PlayerAvatar)));
     GF_ASSERT(v0 != NULL);
-    memset(v0, 0, (sizeof(UnkStruct_0205E884)));
+    memset(v0, 0, (sizeof(PlayerAvatar)));
 
     return v0;
 }
 
-static void sub_0205E91C (UnkStruct_0205E884 * param0, int param1, int param2, UnkStruct_0205EC34 * param3)
+static void sub_0205E91C (PlayerAvatar * param0, int param1, int param2, UnkStruct_0205EC34 * param3)
 {
     sub_0205EC08(param0, param3);
 
@@ -156,7 +156,7 @@ static void sub_0205E91C (UnkStruct_0205E884 * param0, int param1, int param2, U
     sub_0205EFF0(param0, 1);
 }
 
-static void sub_0205E988 (UnkStruct_0205E884 * param0, const UnkStruct_02061830 * param1, int param2, int param3, int param4, int param5)
+static void sub_0205E988 (PlayerAvatar * param0, const UnkStruct_02061830 * param1, int param2, int param3, int param4, int param5)
 {
     UnkStruct_02061AB4 * v0;
 
@@ -201,22 +201,22 @@ static UnkStruct_02061AB4 * sub_0205EA64 (const UnkStruct_02061830 * param0)
     return v0;
 }
 
-int Player_Dir (UnkStruct_0205E884 * const param0)
+int Player_Dir (PlayerAvatar * const param0)
 {
     return sub_0206298C(sub_0205EB3C(param0));
 }
 
-void sub_0205EA84 (UnkStruct_0205E884 * param0, int param1)
+void sub_0205EA84 (PlayerAvatar * param0, int param1)
 {
     sub_02062974(sub_0205EB3C(param0), param1);
 }
 
-int sub_0205EA94 (UnkStruct_0205E884 * const param0)
+int sub_0205EA94 (PlayerAvatar * const param0)
 {
     return sub_0206299C(sub_0205EB3C(param0));
 }
 
-int sub_0205EAA0 (UnkStruct_0205E884 * const param0)
+int sub_0205EAA0 (PlayerAvatar * const param0)
 {
     if (sub_0205F16C(param0) == 1) {
         return Player_Dir(param0);
@@ -225,57 +225,57 @@ int sub_0205EAA0 (UnkStruct_0205E884 * const param0)
     return sub_0205EA94(param0);
 }
 
-int Player_XPos (UnkStruct_0205E884 * const param0)
+int Player_XPos (PlayerAvatar * const param0)
 {
     return sub_02063020(sub_0205EB3C(param0));
 }
 
-int Player_ZPos (UnkStruct_0205E884 * const param0)
+int Player_ZPos (PlayerAvatar * const param0)
 {
     return sub_02063040(sub_0205EB3C(param0));
 }
 
-int sub_0205EAD4 (UnkStruct_0205E884 * const param0)
+int sub_0205EAD4 (PlayerAvatar * const param0)
 {
     return sub_02063008(sub_0205EB3C(param0));
 }
 
-int sub_0205EAE0 (UnkStruct_0205E884 * const param0)
+int sub_0205EAE0 (PlayerAvatar * const param0)
 {
     return sub_02063018(sub_0205EB3C(param0));
 }
 
-void sub_0205EAEC (UnkStruct_0205E884 * const param0, VecFx32 * param1)
+void sub_0205EAEC (PlayerAvatar * const param0, VecFx32 * param1)
 {
     sub_02063050(sub_0205EB3C(param0), param1);
 }
 
-const VecFx32 * sub_0205EAFC (UnkStruct_0205E884 * const param0)
+const VecFx32 * sub_0205EAFC (PlayerAvatar * const param0)
 {
     return sub_02063070(sub_0205EB54(param0));
 }
 
-void sub_0205EB08 (UnkStruct_0205E884 * param0, int param1)
+void sub_0205EB08 (PlayerAvatar * param0, int param1)
 {
     param0->unk_14 = param1;
 }
 
-int sub_0205EB0C (const UnkStruct_0205E884 * param0)
+int sub_0205EB0C (const PlayerAvatar * param0)
 {
     return param0->unk_14;
 }
 
-void sub_0205EB10 (UnkStruct_0205E884 * param0, int param1)
+void sub_0205EB10 (PlayerAvatar * param0, int param1)
 {
     param0->unk_18 = param1;
 }
 
-int sub_0205EB14 (const UnkStruct_0205E884 * param0)
+int sub_0205EB14 (const PlayerAvatar * param0)
 {
     return param0->unk_18;
 }
 
-void sub_0205EB18 (UnkStruct_0205E884 * param0, int param1)
+void sub_0205EB18 (PlayerAvatar * param0, int param1)
 {
     UnkStruct_02061AB4 * v0;
 
@@ -288,12 +288,12 @@ void sub_0205EB18 (UnkStruct_0205E884 * param0, int param1)
     }
 }
 
-void sub_0205EB38 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1)
+void sub_0205EB38 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1)
 {
     param0->unk_30 = param1;
 }
 
-UnkStruct_02061AB4 * sub_0205EB3C (UnkStruct_0205E884 * param0)
+UnkStruct_02061AB4 * sub_0205EB3C (PlayerAvatar * param0)
 {
     GF_ASSERT(param0 != NULL);
     GF_ASSERT(param0->unk_30 != NULL);
@@ -301,12 +301,12 @@ UnkStruct_02061AB4 * sub_0205EB3C (UnkStruct_0205E884 * param0)
     return param0->unk_30;
 }
 
-const UnkStruct_02061AB4 * sub_0205EB54 (const UnkStruct_0205E884 * param0)
+const UnkStruct_02061AB4 * sub_0205EB54 (const PlayerAvatar * param0)
 {
     return param0->unk_30;
 }
 
-void sub_0205EB58 (UnkStruct_0205E884 * param0, int param1)
+void sub_0205EB58 (PlayerAvatar * param0, int param1)
 {
     GF_ASSERT(param1 < 0x6);
     param0->unk_1C = param1;
@@ -314,69 +314,69 @@ void sub_0205EB58 (UnkStruct_0205E884 * param0, int param1)
     sub_0205ECA8(param0, param1);
 }
 
-int sub_0205EB74 (UnkStruct_0205E884 * param0)
+int sub_0205EB74 (PlayerAvatar * param0)
 {
     GF_ASSERT(param0 != NULL);
     return param0->unk_1C;
 }
 
-void sub_0205EB84 (UnkStruct_0205E884 * param0, u32 param1)
+void sub_0205EB84 (PlayerAvatar * param0, u32 param1)
 {
     param0->unk_04 |= param1;
 }
 
-void sub_0205EB8C (UnkStruct_0205E884 * param0, u32 param1)
+void sub_0205EB8C (PlayerAvatar * param0, u32 param1)
 {
     param0->unk_04 = param1;
 }
 
-u32 sub_0205EB90 (UnkStruct_0205E884 * param0)
+u32 sub_0205EB90 (PlayerAvatar * param0)
 {
     return param0->unk_04;
 }
 
-void sub_0205EB94 (UnkStruct_0205E884 * param0, int param1)
+void sub_0205EB94 (PlayerAvatar * param0, int param1)
 {
     param0->unk_20 = param1;
 }
 
-int sub_0205EB98 (UnkStruct_0205E884 * param0)
+int sub_0205EB98 (PlayerAvatar * param0)
 {
     return param0->unk_20;
 }
 
-static void sub_0205EB9C (UnkStruct_0205E884 * param0, u32 param1)
+static void sub_0205EB9C (PlayerAvatar * param0, u32 param1)
 {
     param0->unk_00 |= param1;
 }
 
-static void sub_0205EBA4 (UnkStruct_0205E884 * param0, u32 param1)
+static void sub_0205EBA4 (PlayerAvatar * param0, u32 param1)
 {
     param0->unk_00 &= ~param1;
 }
 
-static u32 sub_0205EBB0 (UnkStruct_0205E884 * param0, u32 param1)
+static u32 sub_0205EBB0 (PlayerAvatar * param0, u32 param1)
 {
     return param0->unk_00 & param1;
 }
 
-int sub_0205EBB8 (UnkStruct_0205E884 * param0)
+int sub_0205EBB8 (PlayerAvatar * param0)
 {
     return param0->unk_24;
 }
 
-void sub_0205EBBC (UnkStruct_0205E884 * param0, int param1)
+void sub_0205EBBC (PlayerAvatar * param0, int param1)
 {
     param0->unk_24 = param1;
 }
 
-void sub_0205EBC0 (UnkStruct_0205E884 * param0)
+void sub_0205EBC0 (PlayerAvatar * param0)
 {
     param0->unk_24 = 0;
     sub_0205EF98(param0, 0);
 }
 
-int sub_0205EBCC (UnkStruct_0205E884 * param0, int param1, int param2)
+int sub_0205EBCC (PlayerAvatar * param0, int param1, int param2)
 {
     param0->unk_24 += param1;
 
@@ -387,73 +387,73 @@ int sub_0205EBCC (UnkStruct_0205E884 * param0, int param1, int param2)
     return param0->unk_24;
 }
 
-void sub_0205EBDC (UnkStruct_0205E884 * param0, int param1)
+void sub_0205EBDC (PlayerAvatar * param0, int param1)
 {
     param0->unk_28 = param1;
 }
 
-int sub_0205EBE0 (UnkStruct_0205E884 * param0)
+int sub_0205EBE0 (PlayerAvatar * param0)
 {
     return param0->unk_28;
 }
 
-void sub_0205EBE4 (UnkStruct_0205E884 * param0, int param1)
+void sub_0205EBE4 (PlayerAvatar * param0, int param1)
 {
     param0->unk_2C = param1;
 }
 
-int sub_0205EBE8 (UnkStruct_0205E884 * param0)
+int sub_0205EBE8 (PlayerAvatar * param0)
 {
     return param0->unk_2C;
 }
 
-void sub_0205EBEC (UnkStruct_0205E884 * param0, int param1, int param2)
+void sub_0205EBEC (PlayerAvatar * param0, int param1, int param2)
 {
     sub_0205EBDC(param0, param1);
     sub_0205EBE4(param0, param2);
 }
 
-void sub_0205EC00 (UnkStruct_0205E884 * param0, UnkStruct_ov101_021D5D90 * param1)
+void sub_0205EC00 (PlayerAvatar * param0, UnkStruct_ov101_021D5D90 * param1)
 {
     param0->unk_34 = param1;
 }
 
-UnkStruct_ov101_021D5D90 * sub_0205EC04 (UnkStruct_0205E884 * param0)
+UnkStruct_ov101_021D5D90 * sub_0205EC04 (PlayerAvatar * param0)
 {
     return param0->unk_34;
 }
 
-static void sub_0205EC08 (UnkStruct_0205E884 * param0, UnkStruct_0205EC34 * param1)
+static void sub_0205EC08 (PlayerAvatar * param0, UnkStruct_0205EC34 * param1)
 {
     param0->unk_38 = param1;
 }
 
-UnkStruct_0205EC34 * sub_0205EC0C (UnkStruct_0205E884 * param0)
+UnkStruct_0205EC34 * sub_0205EC0C (PlayerAvatar * param0)
 {
     return param0->unk_38;
 }
 
-void sub_0205EC10 (UnkStruct_0205E884 * param0, u32 param1)
+void sub_0205EC10 (PlayerAvatar * param0, u32 param1)
 {
     param0->unk_08 = param1;
 }
 
-u32 sub_0205EC14 (UnkStruct_0205E884 * param0)
+u32 sub_0205EC14 (PlayerAvatar * param0)
 {
     return param0->unk_08;
 }
 
-void sub_0205EC18 (UnkStruct_0205E884 * param0, int param1)
+void sub_0205EC18 (PlayerAvatar * param0, int param1)
 {
     param0->unk_0C = param1;
 }
 
-int sub_0205EC1C (UnkStruct_0205E884 * param0)
+int sub_0205EC1C (PlayerAvatar * param0)
 {
     return param0->unk_0C;
 }
 
-void sub_0205EC20 (UnkStruct_0205E884 * param0, u32 param1, int param2)
+void sub_0205EC20 (PlayerAvatar * param0, u32 param1, int param2)
 {
     sub_0205EC10(param0, param1);
     sub_0205EC18(param0, param2);
@@ -502,13 +502,13 @@ void sub_0205EC70 (UnkStruct_0205EC34 * param0, int param1)
     }
 }
 
-void sub_0205EC78 (UnkStruct_0205E884 * param0, int param1)
+void sub_0205EC78 (PlayerAvatar * param0, int param1)
 {
     UnkStruct_0205EC34 * v0 = sub_0205EC0C(param0);
     sub_0205EC70(v0, param1);
 }
 
-int sub_0205EC88 (UnkStruct_0205E884 * param0)
+int sub_0205EC88 (PlayerAvatar * param0)
 {
     UnkStruct_0205EC34 * v0 = sub_0205EC0C(param0);
     return sub_0205EC64(v0);
@@ -530,13 +530,13 @@ void sub_0205ECA0 (UnkStruct_0205EC34 * param0, u32 param1)
     }
 }
 
-void sub_0205ECA8 (UnkStruct_0205E884 * param0, u32 param1)
+void sub_0205ECA8 (PlayerAvatar * param0, u32 param1)
 {
     UnkStruct_0205EC34 * v0 = sub_0205EC0C(param0);
     sub_0205ECA0(v0, param1);
 }
 
-void sub_0205ECB8 (UnkStruct_0205E884 * param0, const VecFx32 * param1, int param2)
+void sub_0205ECB8 (PlayerAvatar * param0, const VecFx32 * param1, int param2)
 {
     UnkStruct_02061AB4 * v0;
 
@@ -547,7 +547,7 @@ void sub_0205ECB8 (UnkStruct_0205E884 * param0, const VecFx32 * param1, int para
     sub_0205EB10(param0, 0);
 }
 
-void sub_0205ECE0 (UnkStruct_0205E884 * param0, int param1, int param2, int param3)
+void sub_0205ECE0 (PlayerAvatar * param0, int param1, int param2, int param3)
 {
     UnkStruct_02061AB4 * v0;
 
@@ -558,7 +558,7 @@ void sub_0205ECE0 (UnkStruct_0205E884 * param0, int param1, int param2, int para
     sub_0205EB10(param0, 0);
 }
 
-void sub_0205ED0C (UnkStruct_0205E884 * param0, fx32 param1)
+void sub_0205ED0C (PlayerAvatar * param0, fx32 param1)
 {
     VecFx32 v0;
     UnkStruct_02061AB4 * v1 = sub_0205EB3C(param0);
@@ -568,7 +568,7 @@ void sub_0205ED0C (UnkStruct_0205E884 * param0, fx32 param1)
     sub_02063060(v1, &v0);
 }
 
-void sub_0205ED2C (UnkStruct_0205E884 * param0, int param1)
+void sub_0205ED2C (PlayerAvatar * param0, int param1)
 {
     UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0);
 
@@ -579,7 +579,7 @@ void sub_0205ED2C (UnkStruct_0205E884 * param0, int param1)
     }
 }
 
-void sub_0205ED48 (UnkStruct_0205E884 * param0, int param1)
+void sub_0205ED48 (PlayerAvatar * param0, int param1)
 {
     UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0);
 
@@ -702,12 +702,12 @@ u32 sub_0205EED8 (int param0)
     return 1 << 0;
 }
 
-UnkStruct_0205E884 * sub_0205EF3C (FieldSystem * param0)
+PlayerAvatar * sub_0205EF3C (FieldSystem * param0)
 {
-    return param0->unk_3C;
+    return param0->playerAvatar;
 }
 
-void sub_0205EF40 (UnkStruct_0205E884 * param0, int param1)
+void sub_0205EF40 (PlayerAvatar * param0, int param1)
 {
     if (param1 == 1) {
         sub_0205EB9C(param0, (1 << 0));
@@ -716,7 +716,7 @@ void sub_0205EF40 (UnkStruct_0205E884 * param0, int param1)
     }
 }
 
-int sub_0205EF58 (UnkStruct_0205E884 * param0)
+int sub_0205EF58 (PlayerAvatar * param0)
 {
     if (sub_0205EBB0(param0, (1 << 0))) {
         return 1;
@@ -725,7 +725,7 @@ int sub_0205EF58 (UnkStruct_0205E884 * param0)
     return 0;
 }
 
-void sub_0205EF6C (UnkStruct_0205E884 * param0, int param1)
+void sub_0205EF6C (PlayerAvatar * param0, int param1)
 {
     if (param1 == 1) {
         sub_0205EB9C(param0, (1 << 1));
@@ -734,7 +734,7 @@ void sub_0205EF6C (UnkStruct_0205E884 * param0, int param1)
     }
 }
 
-int sub_0205EF84 (UnkStruct_0205E884 * param0)
+int sub_0205EF84 (PlayerAvatar * param0)
 {
     if (sub_0205EBB0(param0, (1 << 1))) {
         return 1;
@@ -743,7 +743,7 @@ int sub_0205EF84 (UnkStruct_0205E884 * param0)
     return 0;
 }
 
-void sub_0205EF98 (UnkStruct_0205E884 * param0, int param1)
+void sub_0205EF98 (PlayerAvatar * param0, int param1)
 {
     if (param1 == 1) {
         sub_0205EB9C(param0, (1 << 2));
@@ -752,7 +752,7 @@ void sub_0205EF98 (UnkStruct_0205E884 * param0, int param1)
     }
 }
 
-int sub_0205EFB0 (UnkStruct_0205E884 * param0)
+int sub_0205EFB0 (PlayerAvatar * param0)
 {
     if (sub_0205EBB0(param0, (1 << 2))) {
         return 1;
@@ -761,7 +761,7 @@ int sub_0205EFB0 (UnkStruct_0205E884 * param0)
     return 0;
 }
 
-void sub_0205EFC4 (UnkStruct_0205E884 * param0, int param1)
+void sub_0205EFC4 (PlayerAvatar * param0, int param1)
 {
     if (param1 == 1) {
         sub_0205EB9C(param0, (1 << 3));
@@ -770,7 +770,7 @@ void sub_0205EFC4 (UnkStruct_0205E884 * param0, int param1)
     }
 }
 
-int sub_0205EFDC (UnkStruct_0205E884 * param0)
+int sub_0205EFDC (PlayerAvatar * param0)
 {
     if (sub_0205EBB0(param0, (1 << 3))) {
         return 1;
@@ -779,7 +779,7 @@ int sub_0205EFDC (UnkStruct_0205E884 * param0)
     return 0;
 }
 
-void sub_0205EFF0 (UnkStruct_0205E884 * param0, int param1)
+void sub_0205EFF0 (PlayerAvatar * param0, int param1)
 {
     if (param1 == 1) {
         sub_0205EB9C(param0, (1 << 4));
@@ -788,7 +788,7 @@ void sub_0205EFF0 (UnkStruct_0205E884 * param0, int param1)
     }
 }
 
-int sub_0205F008 (UnkStruct_0205E884 * param0)
+int sub_0205F008 (PlayerAvatar * param0)
 {
     if (sub_0205EBB0(param0, (1 << 4))) {
         return 1;
@@ -797,7 +797,7 @@ int sub_0205F008 (UnkStruct_0205E884 * param0)
     return 0;
 }
 
-void sub_0205F01C (UnkStruct_0205E884 * param0, int param1)
+void sub_0205F01C (PlayerAvatar * param0, int param1)
 {
     if (param1 == 1) {
         sub_0205EB9C(param0, (1 << 5));
@@ -806,7 +806,7 @@ void sub_0205F01C (UnkStruct_0205E884 * param0, int param1)
     }
 }
 
-int sub_0205F034 (UnkStruct_0205E884 * param0)
+int sub_0205F034 (PlayerAvatar * param0)
 {
     if (sub_0205EBB0(param0, (1 << 5))) {
         return 1;
@@ -815,17 +815,17 @@ int sub_0205F034 (UnkStruct_0205E884 * param0)
     return 0;
 }
 
-void sub_0205F048 (UnkStruct_0205E884 * param0)
+void sub_0205F048 (PlayerAvatar * param0)
 {
     sub_0205EB9C(param0, (1 << 6));
 }
 
-void sub_0205F054 (UnkStruct_0205E884 * param0)
+void sub_0205F054 (PlayerAvatar * param0)
 {
     sub_0205EBA4(param0, (1 << 6));
 }
 
-int sub_0205F060 (UnkStruct_0205E884 * param0)
+int sub_0205F060 (PlayerAvatar * param0)
 {
     if (sub_0205EBB0(param0, (1 << 6))) {
         return 1;
@@ -834,7 +834,7 @@ int sub_0205F060 (UnkStruct_0205E884 * param0)
     return 0;
 }
 
-void sub_0205F074 (UnkStruct_0205E884 * param0, int param1)
+void sub_0205F074 (PlayerAvatar * param0, int param1)
 {
     if (param1 == 1) {
         sub_0205EB9C(param0, (1 << 7));
@@ -843,12 +843,12 @@ void sub_0205F074 (UnkStruct_0205E884 * param0, int param1)
     }
 }
 
-int sub_0205F08C (UnkStruct_0205E884 * param0)
+int sub_0205F08C (PlayerAvatar * param0)
 {
     return sub_0205EBB0(param0, (1 << 7));
 }
 
-void sub_0205F098 (UnkStruct_0205E884 * param0, int param1)
+void sub_0205F098 (PlayerAvatar * param0, int param1)
 {
     sub_0205EBA4(param0, ((1 << 8) | (1 << 9) | (1 << 10) | (1 << 11) | (1 << 12)));
 
@@ -875,7 +875,7 @@ void sub_0205F098 (UnkStruct_0205E884 * param0, int param1)
     GF_ASSERT(0);
 }
 
-int sub_0205F108 (UnkStruct_0205E884 * const param0)
+int sub_0205F108 (PlayerAvatar * const param0)
 {
     int v0 = 0;
     u32 v1 = sub_0205EBB0(param0, ((1 << 8) | (1 << 9) | (1 << 10) | (1 << 11) | (1 << 12)));
@@ -901,7 +901,7 @@ int sub_0205F108 (UnkStruct_0205E884 * const param0)
     return v0;
 }
 
-BOOL sub_0205F158 (UnkStruct_0205E884 * const param0)
+BOOL sub_0205F158 (PlayerAvatar * const param0)
 {
     int v0 = sub_0205F108(param0);
 
@@ -912,7 +912,7 @@ BOOL sub_0205F158 (UnkStruct_0205E884 * const param0)
     return 1;
 }
 
-BOOL sub_0205F16C (UnkStruct_0205E884 * const param0)
+BOOL sub_0205F16C (PlayerAvatar * const param0)
 {
     int v0 = sub_0205F108(param0);
 
diff --git a/src/unk_0205F180.c b/src/unk_0205F180.c
index 1e6b0f7bb3..1de8bcde2d 100644
--- a/src/unk_0205F180.c
+++ b/src/unk_0205F180.c
@@ -39,72 +39,72 @@ typedef struct {
     s16 unk_06;
 } UnkStruct_020EDB04;
 
-static int sub_0205F22C(UnkStruct_0205E884 * param0, int param1);
-static void sub_0205F350(UnkStruct_0205E884 * param0, int param1, u16 param2, u16 param3);
-static void sub_0205F378(UnkStruct_0205E884 * param0);
-static void sub_0205F3B8(UnkStruct_0205E884 * param0);
-static int sub_0205F62C(UnkStruct_0205E884 * param0, int param1);
-static u32 sub_0205F644(UnkStruct_0205E884 * param0, int param1);
-static int sub_0205F6A4(UnkStruct_0205E884 * param0, u32 param1, int param2);
-static void sub_0205FA6C(UnkStruct_0205E884 * param0);
-static int sub_0205FAB0(UnkStruct_0205E884 * param0, int param1);
-static int sub_0205FB10(UnkStruct_0205E884 * param0, int param1);
-static void sub_0205FB40(UnkStruct_0205E884 * param0, int param1);
-static void inline_0205F180(UnkStruct_0205E884 * param0, const UnkStruct_ov5_021E8F60 * param1, int param2, u16 param3, u16 param4);
-static void inline_0205F180_sub(UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5);
-static int sub_0205FC48(UnkStruct_0205E884 * param0, int param1);
+static int sub_0205F22C(PlayerAvatar * param0, int param1);
+static void sub_0205F350(PlayerAvatar * param0, int param1, u16 param2, u16 param3);
+static void sub_0205F378(PlayerAvatar * param0);
+static void sub_0205F3B8(PlayerAvatar * param0);
+static int sub_0205F62C(PlayerAvatar * param0, int param1);
+static u32 sub_0205F644(PlayerAvatar * param0, int param1);
+static int sub_0205F6A4(PlayerAvatar * param0, u32 param1, int param2);
+static void sub_0205FA6C(PlayerAvatar * param0);
+static int sub_0205FAB0(PlayerAvatar * param0, int param1);
+static int sub_0205FB10(PlayerAvatar * param0, int param1);
+static void sub_0205FB40(PlayerAvatar * param0, int param1);
+static void inline_0205F180(PlayerAvatar * param0, const UnkStruct_ov5_021E8F60 * param1, int param2, u16 param3, u16 param4);
+static void inline_0205F180_sub(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5);
+static int sub_0205FC48(PlayerAvatar * param0, int param1);
 static int sub_0205FC64(int param0);
 static int sub_0205FC88(UnkStruct_02061AB4 * param0, u8 param1, int param2);
 static int sub_0205FCBC(UnkStruct_02061AB4 * param0, u8 param1, int param2);
-static int sub_0205FCC0(UnkStruct_0205E884 * param0, int param1);
-static void sub_0205FD20(UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
-static void sub_0205FD40(UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
-static void sub_0205FDC8(UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
-static void sub_0205FECC(UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
-static void sub_020600CC(UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
-static void sub_02060150(UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
-static void sub_020601D4(UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
-static void sub_02060258(UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
-static void sub_020602DC(UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5);
-static void sub_02060324(UnkStruct_0205E884 * param0, u16 param1);
-int sub_02060390(UnkStruct_0205E884 * param0, int param1);
-static int sub_020603BC(UnkStruct_0205E884 * param0);
-static int sub_020603EC(UnkStruct_0205E884 * param0);
-static void sub_02060420(UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5);
-static int sub_02060494(UnkStruct_0205E884 * param0, int param1);
+static int sub_0205FCC0(PlayerAvatar * param0, int param1);
+static void sub_0205FD20(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
+static void sub_0205FD40(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
+static void sub_0205FDC8(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
+static void sub_0205FECC(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
+static void sub_020600CC(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
+static void sub_02060150(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
+static void sub_020601D4(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
+static void sub_02060258(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
+static void sub_020602DC(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5);
+static void sub_02060324(PlayerAvatar * param0, u16 param1);
+int sub_02060390(PlayerAvatar * param0, int param1);
+static int sub_020603BC(PlayerAvatar * param0);
+static int sub_020603EC(PlayerAvatar * param0);
+static void sub_02060420(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5);
+static int sub_02060494(PlayerAvatar * param0, int param1);
 static int sub_020604B0(int param0);
-static int sub_020604E4(UnkStruct_0205E884 * param0, int param1);
-static void sub_02060548(UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
-static void sub_02060570(UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
-static void sub_02060688(UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
-static void sub_020606C8(UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
-static void sub_0206078C(UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5);
-static int sub_02060800(UnkStruct_0205E884 * param0, int param1);
+static int sub_020604E4(PlayerAvatar * param0, int param1);
+static void sub_02060548(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
+static void sub_02060570(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
+static void sub_02060688(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
+static void sub_020606C8(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
+static void sub_0206078C(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5);
+static int sub_02060800(PlayerAvatar * param0, int param1);
 static int sub_0206081C(int param0);
-static int sub_02060850(UnkStruct_0205E884 * param0, int param1);
-static void sub_020608BC(UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
-static void sub_020608E4(UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
-static void sub_02060A60(UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
-static void sub_02060AA0(UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
-static u32 sub_02060C24(UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2);
-static int sub_02060CE4(UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2);
-static int sub_02060D98(UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2);
-static int sub_02060E40(UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2);
-static int sub_02060EE4(UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2);
-static int sub_02060F4C(UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2);
-static int sub_02060FA8(UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2);
-static int sub_02061058(UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2);
-static int sub_02061180(UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2);
-static int sub_02061100(UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2);
-static int sub_02061248(UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2);
+static int sub_02060850(PlayerAvatar * param0, int param1);
+static void sub_020608BC(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
+static void sub_020608E4(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
+static void sub_02060A60(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
+static void sub_02060AA0(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
+static u32 sub_02060C24(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2);
+static int sub_02060CE4(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2);
+static int sub_02060D98(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2);
+static int sub_02060E40(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2);
+static int sub_02060EE4(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2);
+static int sub_02060F4C(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2);
+static int sub_02060FA8(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2);
+static int sub_02061058(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2);
+static int sub_02061180(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2);
+static int sub_02061100(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2);
+static int sub_02061248(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2);
 static int sub_02061310(u16 param0);
 static int sub_0206132C(u16 param0);
-static int sub_02061348(UnkStruct_0205E884 * param0, u16 param1, u16 param2);
+static int sub_02061348(PlayerAvatar * param0, u16 param1, u16 param2);
 static int sub_020613D8(int param0);
-static void sub_020615C8(UnkStruct_0205E884 * param0);
-static int sub_020615E0(UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2);
-static int sub_02061630(UnkStruct_0205E884 * param0, u32 param1, int param2);
-static void sub_02060B64(UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, u32 param2, int param3);
+static void sub_020615C8(PlayerAvatar * param0);
+static int sub_020615E0(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2);
+static int sub_02061630(PlayerAvatar * param0, u32 param1, int param2);
+static void sub_02060B64(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, u32 param2, int param3);
 
 static const UnkStruct_020EDB04 Unk_020EDB04[4] = {
     {0x0, 0x0, -1},
@@ -135,9 +135,9 @@ static const UnkStruct_020EDB04 Unk_020EDB64[4] = {
 };
 
 const UnkStruct_020EDB84 Unk_020EDB84[];
-static int(*const Unk_020EDAEC[6])(UnkStruct_0205E884 *, int);
+static int(*const Unk_020EDAEC[6])(PlayerAvatar *, int);
 
-void sub_0205F180 (UnkStruct_0205E884 * param0, const UnkStruct_ov5_021E8F60 * param1, int param2, u16 param3, u16 param4, BOOL param5)
+void sub_0205F180 (PlayerAvatar * param0, const UnkStruct_ov5_021E8F60 * param1, int param2, u16 param3, u16 param4, BOOL param5)
 {
     if (param2 == -1) {
         param2 = sub_02061348(param0, param3, param4);
@@ -173,12 +173,12 @@ void sub_0205F180 (UnkStruct_0205E884 * param0, const UnkStruct_ov5_021E8F60 * p
     sub_0205F3B8(param0);
 }
 
-int sub_0205F224 (UnkStruct_0205E884 * param0, int param1)
+int sub_0205F224 (PlayerAvatar * param0, int param1)
 {
     return sub_0205F22C(param0, param1);
 }
 
-static int sub_0205F22C (UnkStruct_0205E884 * param0, int param1)
+static int sub_0205F22C (PlayerAvatar * param0, int param1)
 {
     int v0;
     UnkStruct_02061AB4 * v1;
@@ -240,13 +240,13 @@ static int sub_0205F22C (UnkStruct_0205E884 * param0, int param1)
     return 0;
 }
 
-static void sub_0205F350 (UnkStruct_0205E884 * param0, int param1, u16 param2, u16 param3)
+static void sub_0205F350 (PlayerAvatar * param0, int param1, u16 param2, u16 param3)
 {
     sub_0205EBEC(param0, sub_02061310(param3), sub_0206132C(param3));
     sub_0205F054(param0);
 }
 
-static void sub_0205F378 (UnkStruct_0205E884 * param0)
+static void sub_0205F378 (PlayerAvatar * param0)
 {
     if ((sub_0205F060(param0) == 1) && (sub_0205EB0C(param0) == 1)) {
         sub_0205EF6C(param0, 0);
@@ -258,7 +258,7 @@ static void sub_0205F378 (UnkStruct_0205E884 * param0)
     }
 }
 
-static void sub_0205F3B8 (UnkStruct_0205E884 * param0)
+static void sub_0205F3B8 (PlayerAvatar * param0)
 {
     if (sub_0205EB0C(param0) == 1) {
         UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0);
@@ -307,7 +307,7 @@ static void sub_0205F3B8 (UnkStruct_0205E884 * param0)
     }
 }
 
-void sub_0205F490 (UnkStruct_0205E884 * param0)
+void sub_0205F490 (PlayerAvatar * param0)
 {
     int v0, v1, v2;
     const UnkStruct_02061AB4 * v3;
@@ -384,14 +384,14 @@ void sub_0205F490 (UnkStruct_0205E884 * param0)
     }
 }
 
-void sub_0205F56C (UnkStruct_0205E884 * param0)
+void sub_0205F56C (PlayerAvatar * param0)
 {
     sub_0205EB08(param0, 0);
     sub_0205EB10(param0, 0);
     sub_0205EBC0(param0);
 }
 
-int sub_0205F588 (UnkStruct_0205E884 * param0)
+int sub_0205F588 (PlayerAvatar * param0)
 {
     int v0, v1, v2;
     const UnkStruct_02061AB4 * v3;
@@ -428,7 +428,7 @@ int sub_0205F588 (UnkStruct_0205E884 * param0)
     return 0;
 }
 
-void sub_0205F5E4 (UnkStruct_0205E884 * param0, int param1)
+void sub_0205F5E4 (PlayerAvatar * param0, int param1)
 {
     UnkStruct_02061AB4 * v0;
 
@@ -444,7 +444,7 @@ void sub_0205F5E4 (UnkStruct_0205E884 * param0, int param1)
     sub_02065638(v0, sub_02065838(param1, 0x0));
 }
 
-static int sub_0205F62C (UnkStruct_0205E884 * param0, int param1)
+static int sub_0205F62C (PlayerAvatar * param0, int param1)
 {
     u32 v0 = sub_0205F644(param0, param1);
 
@@ -452,7 +452,7 @@ static int sub_0205F62C (UnkStruct_0205E884 * param0, int param1)
     return v0;
 }
 
-static u32 sub_0205F644 (UnkStruct_0205E884 * param0, int param1)
+static u32 sub_0205F644 (PlayerAvatar * param0, int param1)
 {
     int v0 = 0;
     u32 v1 = sub_02062BE8(sub_0205EB3C(param0));
@@ -484,7 +484,7 @@ static const UnkStruct_020EDB84 Unk_020EDB84[] = {
     {NULL, 0x6}
 };
 
-static int sub_0205F6A4 (UnkStruct_0205E884 * param0, u32 param1, int param2)
+static int sub_0205F6A4 (PlayerAvatar * param0, u32 param1, int param2)
 {
     if (Unk_020EDAEC[param1](param0, param2) == 1) {
         return 1;
@@ -493,13 +493,13 @@ static int sub_0205F6A4 (UnkStruct_0205E884 * param0, u32 param1, int param2)
     return 0;
 }
 
-static int sub_0205F6C4 (UnkStruct_0205E884 * param0, int param1)
+static int sub_0205F6C4 (PlayerAvatar * param0, int param1)
 {
     sub_0205FA6C(param0);
     return 0;
 }
 
-static int sub_0205F6D0 (UnkStruct_0205E884 * param0, int param1)
+static int sub_0205F6D0 (PlayerAvatar * param0, int param1)
 {
     UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0);
     int v1 = sub_0206299C(v0);
@@ -558,7 +558,7 @@ static int sub_0205F6D0 (UnkStruct_0205E884 * param0, int param1)
     return 1;
 }
 
-static int sub_0205F808 (UnkStruct_0205E884 * param0, int param1)
+static int sub_0205F808 (PlayerAvatar * param0, int param1)
 {
     u32 v0;
     UnkStruct_02061AB4 * v1 = sub_0205EB3C(param0);
@@ -615,7 +615,7 @@ static int sub_0205F808 (UnkStruct_0205E884 * param0, int param1)
     return 0;
 }
 
-static int sub_0205F95C (UnkStruct_0205E884 * param0, int param1)
+static int sub_0205F95C (PlayerAvatar * param0, int param1)
 {
     UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0);
     int v1 = sub_0206299C(v0);
@@ -633,7 +633,7 @@ static int sub_0205F95C (UnkStruct_0205E884 * param0, int param1)
     return 1;
 }
 
-static int sub_0205F9AC (UnkStruct_0205E884 * param0, int param1)
+static int sub_0205F9AC (PlayerAvatar * param0, int param1)
 {
     UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0);
     int v1 = sub_0206299C(v0);
@@ -651,7 +651,7 @@ static int sub_0205F9AC (UnkStruct_0205E884 * param0, int param1)
     return 1;
 }
 
-static int sub_0205F9FC (UnkStruct_0205E884 * param0, int param1)
+static int sub_0205F9FC (PlayerAvatar * param0, int param1)
 {
     int v0 = 1;
     UnkStruct_02061AB4 * v1 = sub_0205EB3C(param0);
@@ -673,7 +673,7 @@ static int sub_0205F9FC (UnkStruct_0205E884 * param0, int param1)
     return 1;
 }
 
-static int(*const Unk_020EDAEC[6])(UnkStruct_0205E884 *, int) = {
+static int(*const Unk_020EDAEC[6])(PlayerAvatar *, int) = {
     sub_0205F6C4,
     sub_0205F6D0,
     sub_0205F808,
@@ -682,7 +682,7 @@ static int(*const Unk_020EDAEC[6])(UnkStruct_0205E884 *, int) = {
     sub_0205F9FC
 };
 
-static void sub_0205FA6C (UnkStruct_0205E884 * param0)
+static void sub_0205FA6C (PlayerAvatar * param0)
 {
     if (sub_0205EF58(param0) == 1) {
         UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0);
@@ -699,7 +699,7 @@ static void sub_0205FA6C (UnkStruct_0205E884 * param0)
     }
 }
 
-static int sub_0205FAB0 (UnkStruct_0205E884 * param0, int param1)
+static int sub_0205FAB0 (PlayerAvatar * param0, int param1)
 {
     int v0;
     VecFx32 v1, v2;
@@ -723,7 +723,7 @@ static int sub_0205FAB0 (UnkStruct_0205E884 * param0, int param1)
     return 1;
 }
 
-static int sub_0205FB10 (UnkStruct_0205E884 * param0, int param1)
+static int sub_0205FB10 (PlayerAvatar * param0, int param1)
 {
     int v0 = sub_0205EBB8(param0);
 
@@ -745,7 +745,7 @@ static int sub_0205FB10 (UnkStruct_0205E884 * param0, int param1)
     return 1;
 }
 
-static void sub_0205FB40 (UnkStruct_0205E884 * param0, int param1)
+static void sub_0205FB40 (PlayerAvatar * param0, int param1)
 {
     UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0);
     int v1 = 0x10;
@@ -771,7 +771,7 @@ static void sub_0205FB40 (UnkStruct_0205E884 * param0, int param1)
     sub_02060B64(param0, v0, v1, v3);
 }
 
-static void inline_0205F180 (UnkStruct_0205E884 * param0, const UnkStruct_ov5_021E8F60 * param1, int param2, u16 param3, u16 param4)
+static void inline_0205F180 (PlayerAvatar * param0, const UnkStruct_ov5_021E8F60 * param1, int param2, u16 param3, u16 param4)
 {
     int v0 = sub_0205EB74(param0);
     UnkStruct_02061AB4 * v1 = sub_0205EB3C(param0);
@@ -790,7 +790,7 @@ static void inline_0205F180 (UnkStruct_0205E884 * param0, const UnkStruct_ov5_02
     }
 }
 
-static void inline_0205F180_sub (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5)
+static void inline_0205F180_sub (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5)
 {
     int v0;
 
@@ -809,7 +809,7 @@ static void inline_0205F180_sub (UnkStruct_0205E884 * param0, UnkStruct_02061AB4
     }
 }
 
-static int sub_0205FC48 (UnkStruct_0205E884 * param0, int param1)
+static int sub_0205FC48 (PlayerAvatar * param0, int param1)
 {
     int v0 = sub_0205FCC0(param0, param1);
     int v1 = sub_0205FC64(v0);
@@ -855,7 +855,7 @@ static int sub_0205FCBC (UnkStruct_02061AB4 * param0, u8 param1, int param2)
     return param2;
 }
 
-static int sub_0205FCC0 (UnkStruct_0205E884 * param0, int param1)
+static int sub_0205FCC0 (PlayerAvatar * param0, int param1)
 {
     int v0;
 
@@ -883,7 +883,7 @@ static int sub_0205FCC0 (UnkStruct_0205E884 * param0, int param1)
     return 1;
 }
 
-static void sub_0205FD20 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
+static void sub_0205FD20 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
 {
     int v0;
 
@@ -891,7 +891,7 @@ static void sub_0205FD20 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * para
     sub_02060B64(param0, param1, v0, 1);
 }
 
-static void sub_0205FD40 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
+static void sub_0205FD40 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
 {
     int v0 = sub_0205F108(param0);
 
@@ -913,7 +913,7 @@ static void sub_0205FD40 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * para
     }
 }
 
-static void sub_0205FDC8 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
+static void sub_0205FDC8 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
 {
     u32 v0;
     int v1;
@@ -981,7 +981,7 @@ static void sub_0205FDC8 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * para
     sub_02060B64(param0, param1, v1, v2);
 }
 
-static void sub_0205FECC (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
+static void sub_0205FECC (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
 {
     u32 v0;
     int v1;
@@ -1050,7 +1050,7 @@ static void sub_0205FECC (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * para
     sub_02060B64(param0, param1, v1, v2);
 }
 
-static void sub_0206000C (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4, const int * param5, const int * param6, const int * param7, const int * param8, const int * param9)
+static void sub_0206000C (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4, const int * param5, const int * param6, const int * param7, const int * param8, const int * param9)
 {
     u32 v0;
     int v1;
@@ -1097,7 +1097,7 @@ static void sub_0206000C (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * para
     sub_02060B64(param0, param1, v1, v2);
 }
 
-static void sub_020600CC (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
+static void sub_020600CC (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
 {
     int v0[4] = {0x69, 0x6a, 0x6b, 0x6c};
     int v1[4] = {0x79, 0x7a, 0x7b, 0x7c};
@@ -1108,7 +1108,7 @@ static void sub_020600CC (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * para
     sub_0206000C(param0, param1, param2, param3, param4, v0, v1, v2, v3, v4);
 }
 
-static void sub_02060150 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
+static void sub_02060150 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
 {
     int v0[4] = {0x6d, 0x6e, 0x6f, 0x70};
     int v1[4] = {0x7d, 0x7e, 0x7f, 0x80};
@@ -1119,7 +1119,7 @@ static void sub_02060150 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * para
     sub_0206000C(param0, param1, param2, param3, param4, v0, v1, v2, v3, v4);
 }
 
-static void sub_020601D4 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
+static void sub_020601D4 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
 {
     int v0[4] = {0x71, 0x72, 0x73, 0x74};
     int v1[4] = {0x81, 0x82, 0x83, 0x84};
@@ -1130,7 +1130,7 @@ static void sub_020601D4 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * para
     sub_0206000C(param0, param1, param2, param3, param4, v0, v1, v2, v3, v4);
 }
 
-static void sub_02060258 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
+static void sub_02060258 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
 {
     int v0, v1;
     int v2;
@@ -1165,7 +1165,7 @@ static void sub_02060258 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * para
     sub_02062994(param1, param2);
 }
 
-static void sub_020602DC (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5)
+static void sub_020602DC (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5)
 {
     int v0;
 
@@ -1176,7 +1176,7 @@ static void sub_020602DC (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * para
     }
 }
 
-static void sub_02060324 (UnkStruct_0205E884 * param0, u16 param1)
+static void sub_02060324 (PlayerAvatar * param0, u16 param1)
 {
     if (sub_0205EB74(param0) != 0x1) {
         return;
@@ -1207,7 +1207,7 @@ static void sub_02060324 (UnkStruct_0205E884 * param0, u16 param1)
     }
 }
 
-int sub_02060390 (UnkStruct_0205E884 * param0, int param1)
+int sub_02060390 (PlayerAvatar * param0, int param1)
 {
     int v0;
 
@@ -1229,7 +1229,7 @@ int sub_02060390 (UnkStruct_0205E884 * param0, int param1)
     return v0;
 }
 
-static int sub_020603BC (UnkStruct_0205E884 * param0)
+static int sub_020603BC (PlayerAvatar * param0)
 {
     int v0 = sub_0205EBCC(param0, 1, 3);
 
@@ -1246,7 +1246,7 @@ static int sub_020603BC (UnkStruct_0205E884 * param0)
     return 0;
 }
 
-static int sub_020603EC (UnkStruct_0205E884 * param0)
+static int sub_020603EC (PlayerAvatar * param0)
 {
     int v0 = 1;
     int v1 = sub_0205EBB8(param0);
@@ -1269,7 +1269,7 @@ static int sub_020603EC (UnkStruct_0205E884 * param0)
     return v0;
 }
 
-static void sub_02060420 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5)
+static void sub_02060420 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5)
 {
     int v0 = sub_02060494(param0, param3);
 
@@ -1289,7 +1289,7 @@ static void sub_02060420 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * para
     }
 }
 
-static int sub_02060494 (UnkStruct_0205E884 * param0, int param1)
+static int sub_02060494 (PlayerAvatar * param0, int param1)
 {
     int v0 = sub_020604E4(param0, param1);
     int v1 = sub_020604B0(v0);
@@ -1315,7 +1315,7 @@ static int sub_020604B0 (int param0)
     return 0;
 }
 
-static int sub_020604E4 (UnkStruct_0205E884 * param0, int param1)
+static int sub_020604E4 (PlayerAvatar * param0, int param1)
 {
     int v0;
 
@@ -1341,7 +1341,7 @@ static int sub_020604E4 (UnkStruct_0205E884 * param0, int param1)
     return 1;
 }
 
-static void sub_02060548 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
+static void sub_02060548 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
 {
     int v0;
 
@@ -1351,7 +1351,7 @@ static void sub_02060548 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * para
     sub_0205EBC0(param0);
 }
 
-static void sub_02060570 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
+static void sub_02060570 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
 {
     u32 v0;
     int v1;
@@ -1413,7 +1413,7 @@ static void sub_02060570 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * para
     sub_02060B64(param0, param1, v1, v2);
 }
 
-static void sub_02060688 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
+static void sub_02060688 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
 {
     sub_0205EBC0(param0);
 
@@ -1428,7 +1428,7 @@ static void sub_02060688 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * para
     }
 }
 
-static void sub_020606C8 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
+static void sub_020606C8 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
 {
     u32 v0;
     int v1;
@@ -1470,7 +1470,7 @@ static void sub_020606C8 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * para
     sub_02060B64(param0, param1, v2, v1);
 }
 
-static void sub_0206078C (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5)
+static void sub_0206078C (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5)
 {
     int v0 = sub_02060800(param0, param3);
 
@@ -1490,7 +1490,7 @@ static void sub_0206078C (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * para
     }
 }
 
-static int sub_02060800 (UnkStruct_0205E884 * param0, int param1)
+static int sub_02060800 (PlayerAvatar * param0, int param1)
 {
     int v0 = sub_02060850(param0, param1);
     int v1 = sub_0206081C(v0);
@@ -1516,7 +1516,7 @@ static int sub_0206081C (int param0)
     return 0;
 }
 
-static int sub_02060850 (UnkStruct_0205E884 * param0, int param1)
+static int sub_02060850 (PlayerAvatar * param0, int param1)
 {
     int v0, v1;
 
@@ -1548,7 +1548,7 @@ static int sub_02060850 (UnkStruct_0205E884 * param0, int param1)
     return 1;
 }
 
-static void sub_020608BC (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
+static void sub_020608BC (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
 {
     int v0;
 
@@ -1558,7 +1558,7 @@ static void sub_020608BC (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * para
     sub_0205EBC0(param0);
 }
 
-static void sub_020608E4 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
+static void sub_020608E4 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
 {
     u32 v0;
     int v1;
@@ -1632,7 +1632,7 @@ static void sub_020608E4 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * para
     sub_02060B64(param0, param1, v1, v2);
 }
 
-static void sub_02060A60 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
+static void sub_02060A60 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
 {
     sub_0205EBC0(param0);
 
@@ -1647,7 +1647,7 @@ static void sub_02060A60 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * para
     }
 }
 
-static void sub_02060AA0 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
+static void sub_02060AA0 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
 {
     u32 v0;
     int v1;
@@ -1689,13 +1689,13 @@ static void sub_02060AA0 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * para
     sub_02060B64(param0, param1, v2, v1);
 }
 
-static void sub_02060B64 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, u32 param2, int param3)
+static void sub_02060B64 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, u32 param2, int param3)
 {
     sub_0205EC20(param0, param2, param3);
     sub_02065638(param1, param2);
 }
 
-u32 sub_02060B7C (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2)
+u32 sub_02060B7C (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2)
 {
     u32 v0, v1;
 
@@ -1741,7 +1741,7 @@ u32 sub_02060B7C (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int
     return v0;
 }
 
-static u32 sub_02060C24 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2)
+static u32 sub_02060C24 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2)
 {
     VecFx32 v0;
     u32 v1, v2;
@@ -1781,7 +1781,7 @@ static u32 sub_02060C24 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param
     return v1;
 }
 
-static int sub_02060CE4 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2)
+static int sub_02060CE4 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2)
 {
     if (param2 != -1) {
         FieldSystem * v0 = sub_02062C00(param1);
@@ -1823,7 +1823,7 @@ static int sub_02060CE4 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param
     return 0;
 }
 
-static int sub_02060D98 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2)
+static int sub_02060D98 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2)
 {
     BOOL v0 = 0;
 
@@ -1860,7 +1860,7 @@ static int sub_02060D98 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param
     return v0;
 }
 
-static int sub_02060E40 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2)
+static int sub_02060E40 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2)
 {
     if (param2 != -1) {
         FieldSystem * v0 = sub_02062C00(param1);
@@ -1903,7 +1903,7 @@ static int sub_02060E40 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param
     return 0;
 }
 
-static int sub_02060EE4 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2)
+static int sub_02060EE4 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2)
 {
     if (param2 != -1) {
         FieldSystem * v0 = sub_02062C00(param1);
@@ -1923,7 +1923,7 @@ static int sub_02060EE4 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param
     return 0;
 }
 
-static int sub_02060F4C (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2)
+static int sub_02060F4C (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2)
 {
     if (param2 != -1) {
         FieldSystem * v0 = sub_02062C00(param1);
@@ -1939,7 +1939,7 @@ static int sub_02060F4C (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param
     return 0;
 }
 
-static int sub_02060FA8 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2)
+static int sub_02060FA8 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2)
 {
     if (param2 != -1) {
         FieldSystem * v0 = sub_02062C00(param1);
@@ -1973,7 +1973,7 @@ static int sub_02060FA8 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param
     return 0;
 }
 
-static int sub_02061058 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2)
+static int sub_02061058 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2)
 {
     if ((param2 != -1) && (sub_0205EB74(param0) == 0x1)) {
         FieldSystem * v0 = sub_02062C00(param1);
@@ -2005,7 +2005,7 @@ static int sub_02061058 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param
     return 0;
 }
 
-static int sub_02061100 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2)
+static int sub_02061100 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2)
 {
     u32 v0 = 0;
     FieldSystem * v1 = sub_02062C00(param1);
@@ -2031,7 +2031,7 @@ static int sub_02061100 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param
     return v0;
 }
 
-static int sub_02061180 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2)
+static int sub_02061180 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2)
 {
     if (param2 != -1) {
         FieldSystem * v0 = sub_02062C00(param1);
@@ -2056,7 +2056,7 @@ static int sub_02061180 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param
     return 0;
 }
 
-u32 sub_020611FC (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2)
+u32 sub_020611FC (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2)
 {
     u32 v0, v1 = 0;
 
@@ -2081,7 +2081,7 @@ u32 sub_020611FC (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int
     return v1;
 }
 
-static int sub_02061248 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2)
+static int sub_02061248 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2)
 {
     BOOL v0 = 0;
 
@@ -2118,7 +2118,7 @@ static int sub_02061248 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param
     return v0;
 }
 
-int sub_02061308 (UnkStruct_0205E884 * param0, u16 param1, u16 param2)
+int sub_02061308 (PlayerAvatar * param0, u16 param1, u16 param2)
 {
     return sub_02061348(param0, param1, param2);
 }
@@ -2149,7 +2149,7 @@ static int sub_0206132C (u16 param0)
     return(-1);
 }
 
-static int sub_02061348 (UnkStruct_0205E884 * param0, u16 param1, u16 param2)
+static int sub_02061348 (PlayerAvatar * param0, u16 param1, u16 param2)
 {
     int v0 = sub_02061310(param2);
     int v1 = sub_0206132C(param2);
@@ -2185,7 +2185,7 @@ static int sub_02061348 (UnkStruct_0205E884 * param0, u16 param1, u16 param2)
     return(-1);
 }
 
-int sub_020613AC (UnkStruct_0205E884 * param0)
+int sub_020613AC (PlayerAvatar * param0)
 {
     UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0);
 
@@ -2217,7 +2217,7 @@ static int sub_020613D8 (int param0)
     return 0;
 }
 
-int sub_020613FC (UnkStruct_0205E884 * param0, u16 param1)
+int sub_020613FC (PlayerAvatar * param0, u16 param1)
 {
     if ((param1 & PAD_BUTTON_B)) {
         return 1;
@@ -2226,7 +2226,7 @@ int sub_020613FC (UnkStruct_0205E884 * param0, u16 param1)
     return 0;
 }
 
-int sub_0206140C (UnkStruct_0205E884 * param0)
+int sub_0206140C (PlayerAvatar * param0)
 {
     u32 v0 = sub_0205EC14(param0);
 
@@ -2241,7 +2241,7 @@ int sub_0206140C (UnkStruct_0205E884 * param0)
     return 0;
 }
 
-int sub_02061434 (UnkStruct_0205E884 * param0, int param1)
+int sub_02061434 (PlayerAvatar * param0, int param1)
 {
     int v0, v1, v2 = sub_0205EB74(param0);
 
@@ -2269,7 +2269,7 @@ int sub_02061434 (UnkStruct_0205E884 * param0, int param1)
     return v1;
 }
 
-u32 sub_0206147C (UnkStruct_0205E884 * param0, u16 param1, u16 param2, int param3, int param4, int param5)
+u32 sub_0206147C (PlayerAvatar * param0, u16 param1, u16 param2, int param3, int param4, int param5)
 {
     u32 v0;
     int v1 = sub_02061348(param0, param1, param2);
@@ -2338,37 +2338,37 @@ u32 sub_0206147C (UnkStruct_0205E884 * param0, u16 param1, u16 param2, int param
     return 0xff;
 }
 
-int sub_02061544 (UnkStruct_0205E884 * param0)
+int sub_02061544 (PlayerAvatar * param0)
 {
     UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0);
     return sub_020655F4(v0);
 }
 
-void sub_02061550 (UnkStruct_0205E884 * param0, u32 param1, int param2)
+void sub_02061550 (PlayerAvatar * param0, u32 param1, int param2)
 {
     UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0);
     sub_02060B64(param0, v0, param1, param2);
 }
 
-u32 sub_0206156C (UnkStruct_0205E884 * param0, int param1)
+u32 sub_0206156C (PlayerAvatar * param0, int param1)
 {
     UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0);
     return sub_02064238(v0, param1);
 }
 
-void sub_0206157C (UnkStruct_0205E884 * param0, int param1, int * param2, int * param3)
+void sub_0206157C (PlayerAvatar * param0, int param1, int * param2, int * param3)
 {
     *param2 = Player_XPos(param0) + sub_0206419C(param1);
     *param3 = Player_ZPos(param0) + sub_020641A8(param1);
 }
 
-void sub_020615AC (UnkStruct_0205E884 * param0, int * param1, int * param2)
+void sub_020615AC (PlayerAvatar * param0, int * param1, int * param2)
 {
     int v0 = Player_Dir(param0);
     sub_0206157C(param0, v0, param1, param2);
 }
 
-static void sub_020615C8 (UnkStruct_0205E884 * param0)
+static void sub_020615C8 (PlayerAvatar * param0)
 {
     UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0);
     FieldSystem * v1 = sub_02062C00(v0);
@@ -2377,7 +2377,7 @@ static void sub_020615C8 (UnkStruct_0205E884 * param0)
     sub_0202CF28(v2, (0 + 0));
 }
 
-static int sub_020615E0 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param1, int param2)
+static int sub_020615E0 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2)
 {
     if (param2 != -1) {
         u8 v0 = sub_02062BE8(param1);
@@ -2402,7 +2402,7 @@ static int sub_020615E0 (UnkStruct_0205E884 * param0, UnkStruct_02061AB4 * param
     return 0;
 }
 
-static int sub_02061630 (UnkStruct_0205E884 * param0, u32 param1, int param2)
+static int sub_02061630 (PlayerAvatar * param0, u32 param1, int param2)
 {
     if (param2 != -1) {
         return 0;
@@ -2427,7 +2427,7 @@ static int sub_02061630 (UnkStruct_0205E884 * param0, u32 param1, int param2)
     return 0;
 }
 
-void sub_02061674 (UnkStruct_0205E884 * param0, int param1, int * param2, int * param3, int * param4)
+void sub_02061674 (PlayerAvatar * param0, int param1, int * param2, int * param3, int * param4)
 {
     const UnkStruct_020EDB04 * v0;
     int v1 = sub_0205F108(param0);
@@ -2456,7 +2456,7 @@ void sub_02061674 (UnkStruct_0205E884 * param0, int param1, int * param2, int *
     (*param4) += v0->unk_04;
 }
 
-u32 sub_020616F0 (UnkStruct_0205E884 * param0, int param1)
+u32 sub_020616F0 (PlayerAvatar * param0, int param1)
 {
     u32 v0;
 
@@ -2476,7 +2476,7 @@ u32 sub_020616F0 (UnkStruct_0205E884 * param0, int param1)
     return v0;
 }
 
-u32 sub_02061760 (UnkStruct_0205E884 * param0)
+u32 sub_02061760 (PlayerAvatar * param0)
 {
     u32 v0;
     UnkStruct_02061AB4 * v1 = sub_0205EB3C(param0);
@@ -2494,7 +2494,7 @@ u32 sub_02061760 (UnkStruct_0205E884 * param0)
     return v0;
 }
 
-void sub_020617BC (UnkStruct_0205E884 * const param0, int * param1, int * param2, int * param3)
+void sub_020617BC (PlayerAvatar * const param0, int * param1, int * param2, int * param3)
 {
     int v0 = sub_0205EAA0(param0);
     UnkStruct_02061AB4 * v1 = sub_0205EB3C(param0);
diff --git a/src/unk_0206450C.c b/src/unk_0206450C.c
index 9fbde4c131..ee4fbc1dd9 100644
--- a/src/unk_0206450C.c
+++ b/src/unk_0206450C.c
@@ -1105,7 +1105,7 @@ static int sub_02065124 (UnkStruct_02061AB4 * param0, UnkStruct_0206502C * param
 {
     if (sub_02062950(param0) == 0xa) {
         FieldSystem * v0 = sub_02062C00(param0);
-        UnkStruct_0205E884 * v1 = sub_0205EF3C(v0);
+        PlayerAvatar * v1 = sub_0205EF3C(v0);
         int v2 = sub_0206298C(param0);
         int v3 = sub_020629D8(param0, 0);
         int v4 = sub_02067D58(param0, v1, v2, v3);
@@ -1285,7 +1285,7 @@ static int sub_0206537C (UnkStruct_02061AB4 * param0)
 
     {
         FieldSystem * v1 = sub_02062C00(param0);
-        UnkStruct_0205E884 * v2 = sub_0205EF3C(v1);
+        PlayerAvatar * v2 = sub_0205EF3C(v1);
 
         if (sub_0206140C(v2) == 0) {
             return(-1);
@@ -1375,7 +1375,7 @@ static int sub_02065448 (UnkStruct_02061AB4 * param0, int param1, int param2)
                 int v6 = sub_02063020(param0);
                 int v7 = sub_02063040(param0);
                 FieldSystem * v8 = sub_02062C00(param0);
-                UnkStruct_0205E884 * v9 = sub_0205EF3C(v8);
+                PlayerAvatar * v9 = sub_0205EF3C(v8);
                 int v10 = Player_XPos(v9);
                 int v11 = Player_ZPos(v9);
 
diff --git a/src/unk_02067A84.c b/src/unk_02067A84.c
index c3fd0d30b8..ee7d02938a 100644
--- a/src/unk_02067A84.c
+++ b/src/unk_02067A84.c
@@ -44,19 +44,19 @@ typedef struct {
     int unk_1C;
     UnkStruct_ov101_021D5D90 * unk_20;
     UnkStruct_02061AB4 * unk_24;
-    UnkStruct_0205E884 * unk_28;
+    PlayerAvatar * unk_28;
     FieldSystem * unk_2C;
 } UnkStruct_020EF6D0;
 
-static int sub_02067BA8(FieldSystem * param0, UnkStruct_02061830 * param1, UnkStruct_0205E884 * param2, const UnkStruct_02061AB4 * param3, UnkStruct_02067C28 * param4);
+static int sub_02067BA8(FieldSystem * param0, UnkStruct_02061830 * param1, PlayerAvatar * param2, const UnkStruct_02061AB4 * param3, UnkStruct_02067C28 * param4);
 static void sub_02067C28(UnkStruct_02067C28 * param0, UnkStruct_02061AB4 * param1, int param2, int param3);
 static int sub_02067C54(const UnkStruct_02061AB4 * param0);
-static int sub_02067C80(const UnkStruct_02061AB4 * param0, UnkStruct_0205E884 * param1, int * param2);
+static int sub_02067C80(const UnkStruct_02061AB4 * param0, PlayerAvatar * param1, int * param2);
 static int sub_02067DA8(const UnkStruct_02061AB4 * param0, int param1, int param2, int param3, int param4, int param5);
 static int sub_02067E74(const UnkStruct_02061AB4 * param0, int param1, int param2);
 static int sub_02067F14(UnkStruct_02061AB4 * param0);
 static UnkStruct_02061AB4 * sub_02067F2C(FieldSystem * param0, UnkStruct_02061830 * param1, UnkStruct_02061AB4 * param2, int param3);
-static SysTask * sub_02067FF0(FieldSystem * param0, UnkStruct_02061AB4 * param1, UnkStruct_0205E884 * param2, int param3, int param4, int param5, int param6, int param7);
+static SysTask * sub_02067FF0(FieldSystem * param0, UnkStruct_02061AB4 * 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);
 static void sub_0206806C(SysTask * param0, void * param1);
@@ -68,7 +68,7 @@ int sub_02067A84 (FieldSystem * param0, BOOL param1)
 {
     UnkStruct_02067C28 v0;
     UnkStruct_02061830 * v1 = param0->unk_38;
-    UnkStruct_0205E884 * v2 = param0->unk_3C;
+    PlayerAvatar * v2 = param0->playerAvatar;
 
     if (sub_02067BA8(param0, v1, v2, NULL, &v0) == 0) {
         return 0;
@@ -113,7 +113,7 @@ int sub_02067A84 (FieldSystem * param0, BOOL param1)
     return 0;
 }
 
-static int sub_02067BA8 (FieldSystem * param0, UnkStruct_02061830 * param1, UnkStruct_0205E884 * param2, const UnkStruct_02061AB4 * param3, UnkStruct_02067C28 * param4)
+static int sub_02067BA8 (FieldSystem * param0, UnkStruct_02061830 * param1, PlayerAvatar * param2, const UnkStruct_02061AB4 * param3, UnkStruct_02067C28 * param4)
 {
     int v0, v1, v2;
     UnkStruct_02061AB4 * v3;
@@ -165,7 +165,7 @@ static int sub_02067C54 (const UnkStruct_02061AB4 * param0)
     return v0;
 }
 
-static int sub_02067C80 (const UnkStruct_02061AB4 * param0, UnkStruct_0205E884 * param1, int * param2)
+static int sub_02067C80 (const UnkStruct_02061AB4 * param0, PlayerAvatar * param1, int * param2)
 {
     int v0, v1, v2, v3, v4, v5;
 
@@ -213,7 +213,7 @@ static int sub_02067C80 (const UnkStruct_02061AB4 * param0, UnkStruct_0205E884 *
     return(-1);
 }
 
-int sub_02067D58 (const UnkStruct_02061AB4 * param0, UnkStruct_0205E884 * param1, int param2, int param3)
+int sub_02067D58 (const UnkStruct_02061AB4 * param0, PlayerAvatar * param1, int param2, int param3)
 {
     int v0 = Player_XPos(param1);
     int v1 = Player_ZPos(param1);
@@ -394,7 +394,7 @@ int sub_02067F88 (FieldSystem * param0, UnkStruct_02061AB4 * param1)
     return 0;
 }
 
-SysTask * sub_02067FB8 (FieldSystem * param0, UnkStruct_02061AB4 * param1, UnkStruct_0205E884 * param2, int param3, int param4, int param5, int param6, int param7)
+SysTask * sub_02067FB8 (FieldSystem * param0, UnkStruct_02061AB4 * param1, PlayerAvatar * param2, int param3, int param4, int param5, int param6, int param7)
 {
     return sub_02067FF0(param0, param1, param2, param3, param4, param5, param6, param7);
 }
@@ -410,7 +410,7 @@ void sub_02067FE8 (SysTask * param0)
     sub_02068054(param0);
 }
 
-static SysTask * sub_02067FF0 (FieldSystem * param0, UnkStruct_02061AB4 * param1, UnkStruct_0205E884 * param2, int param3, int param4, int param5, int param6, int param7)
+static SysTask * sub_02067FF0 (FieldSystem * param0, UnkStruct_02061AB4 * param1, PlayerAvatar * param2, int param3, int param4, int param5, int param6, int param7)
 {
     SysTask * v0;
     UnkStruct_020EF6D0 * v1;
diff --git a/src/unk_020683F4.c b/src/unk_020683F4.c
index 423008de71..92c1c85b26 100644
--- a/src/unk_020683F4.c
+++ b/src/unk_020683F4.c
@@ -211,7 +211,7 @@ void sub_0206842C (FieldSystem * param0, UnkStruct_020684D0 * param1)
     int v0, v1, v2;
     UnkStruct_02061AB4 * v3;
 
-    if (sub_0205F158(param0->unk_3C) == 1) {
+    if (sub_0205F158(param0->playerAvatar) == 1) {
         sub_020684D0(param0, param1);
         return;
     }
@@ -219,14 +219,14 @@ void sub_0206842C (FieldSystem * param0, UnkStruct_020684D0 * param1)
     param1->unk_18 = param0;
     param1->unk_00 = param0->unk_1C->unk_00;
     param1->unk_04 = sub_0206A984(SaveData_Events(param0->unk_0C));
-    param1->unk_08 = sub_0205EB74(param0->unk_3C);
+    param1->unk_08 = sub_0205EB74(param0->playerAvatar);
 
-    v0 = Player_XPos(param0->unk_3C);
-    v1 = Player_ZPos(param0->unk_3C);
+    v0 = Player_XPos(param0->playerAvatar);
+    v1 = Player_ZPos(param0->playerAvatar);
 
     param1->unk_0E = sub_02054F94(param0, v0, v1);
 
-    v2 = Player_Dir(param0->unk_3C);
+    v2 = Player_Dir(param0->playerAvatar);
 
     switch (v2) {
     case 0:
@@ -247,7 +247,7 @@ void sub_0206842C (FieldSystem * param0, UnkStruct_020684D0 * param1)
     sub_0203C9D4(param0, &v3);
 
     param1->unk_10 = sub_02055FC8(param0, v3);
-    param1->unk_14 = param0->unk_3C;
+    param1->unk_14 = param0->playerAvatar;
 }
 
 static void sub_020684D0 (FieldSystem * param0, UnkStruct_020684D0 * param1)
@@ -255,16 +255,16 @@ static void sub_020684D0 (FieldSystem * param0, UnkStruct_020684D0 * param1)
     param1->unk_18 = param0;
     param1->unk_00 = param0->unk_1C->unk_00;
     param1->unk_04 = sub_0206A984(SaveData_Events(param0->unk_0C));
-    param1->unk_08 = sub_0205EB74(param0->unk_3C);
-    param1->unk_0E = sub_02061760(param0->unk_3C);
+    param1->unk_08 = sub_0205EB74(param0->playerAvatar);
+    param1->unk_0E = sub_02061760(param0->playerAvatar);
 
     {
-        int v0 = sub_0205EAA0(param0->unk_3C);
-        param1->unk_0C = sub_020616F0(param0->unk_3C, v0);
+        int v0 = sub_0205EAA0(param0->playerAvatar);
+        param1->unk_0C = sub_020616F0(param0->playerAvatar, v0);
     }
 
     param1->unk_10 = sub_02055FC8(param0, NULL);
-    param1->unk_14 = param0->unk_3C;
+    param1->unk_14 = param0->playerAvatar;
 }
 
 static UnkStruct_0206851C * sub_0206851C (u32 param0, u16 param1, u16 param2, u16 param3, u16 param4)
@@ -443,8 +443,8 @@ static u32 sub_0206877C (const UnkStruct_020684D0 * param0)
     {
         u16 v0, v1;
 
-        v0 = Player_XPos(param0->unk_18->unk_3C);
-        v1 = Player_ZPos(param0->unk_18->unk_3C);
+        v0 = Player_XPos(param0->unk_18->playerAvatar);
+        v1 = Player_ZPos(param0->unk_18->playerAvatar);
 
         if (sub_0203A6A4(param0->unk_18, v0, v1) == 0) {
             return -1;
@@ -488,10 +488,10 @@ static BOOL sub_02068884 (UnkStruct_020508D4 * param0)
         (*v1)++;
         break;
     case 1:
-        if (sub_0205EB74(v0->unk_3C) == 0x1) {
-            sub_02062DDC(sub_0205EB3C(v0->unk_3C));
-            ov5_021DFB54(v0->unk_3C, (1 << 0));
-            ov5_021DFB5C(v0->unk_3C);
+        if (sub_0205EB74(v0->playerAvatar) == 0x1) {
+            sub_02062DDC(sub_0205EB3C(v0->playerAvatar));
+            ov5_021DFB54(v0->playerAvatar, (1 << 0));
+            ov5_021DFB5C(v0->playerAvatar);
 
             sub_020553F0(v0, 0);
             sub_02055554(
@@ -499,10 +499,10 @@ static BOOL sub_02068884 (UnkStruct_020508D4 * param0)
         } else {
             sub_020553F0(v0, 1152);
             sub_02055554(v0, 1152, 1);
-            sub_02062DDC(sub_0205EB3C(v0->unk_3C));
+            sub_02062DDC(sub_0205EB3C(v0->playerAvatar));
 
-            ov5_021DFB54(v0->unk_3C, (1 << 1));
-            ov5_021DFB5C(v0->unk_3C);
+            ov5_021DFB54(v0->playerAvatar, (1 << 1));
+            ov5_021DFB5C(v0->playerAvatar);
 
             RadarChain_Clear(v0->chain);
         }
@@ -742,7 +742,7 @@ static u32 sub_02068C5C (const UnkStruct_020684D0 * param0)
         return 2;
     }
 
-    if (sub_0205EB74(param0->unk_18->unk_3C) == 0x1) {
+    if (sub_0205EB74(param0->unk_18->playerAvatar) == 0x1) {
         return -1;
     }
 
diff --git a/src/unk_02069BE0.c b/src/unk_02069BE0.c
index 243cdde4ad..1ad7bd9520 100644
--- a/src/unk_02069BE0.c
+++ b/src/unk_02069BE0.c
@@ -156,7 +156,7 @@ static int sub_02069CA8 (UnkStruct_02061AB4 * param0, UnkStruct_02069CA8 * param
 static void sub_02069CD4 (UnkStruct_02061AB4 * param0, UnkStruct_02069CA8 * param1)
 {
     FieldSystem * v0 = sub_02062C00(param0);
-    UnkStruct_0205E884 * v1 = sub_0205EF3C(v0);
+    PlayerAvatar * v1 = sub_0205EF3C(v0);
 
     param1->unk_01 = 1;
     param1->unk_02 = Player_XPos(v1);
@@ -167,7 +167,7 @@ static void sub_02069CD4 (UnkStruct_02061AB4 * param0, UnkStruct_02069CA8 * para
 static int sub_02069CFC (UnkStruct_02061AB4 * param0, UnkStruct_02069CA8 * param1)
 {
     FieldSystem * v0 = sub_02062C00(param0);
-    UnkStruct_0205E884 * v1 = sub_0205EF3C(v0);
+    PlayerAvatar * v1 = sub_0205EF3C(v0);
 
     if (v1 != NULL) {
         int v2 = Player_XPos(v1);
@@ -184,7 +184,7 @@ static int sub_02069CFC (UnkStruct_02061AB4 * param0, UnkStruct_02069CA8 * param
 static void sub_02069D30 (UnkStruct_02061AB4 * param0, UnkStruct_02069CA8 * param1)
 {
     FieldSystem * v0 = sub_02062C00(param0);
-    UnkStruct_0205E884 * v1 = sub_0205EF3C(v0);
+    PlayerAvatar * v1 = sub_0205EF3C(v0);
 
     param1->unk_02 = Player_XPos(v1);
     param1->unk_04 = Player_ZPos(v1);
@@ -194,7 +194,7 @@ static u32 sub_02069D50 (UnkStruct_02061AB4 * param0)
 {
     u32 v0;
     FieldSystem * v1 = sub_02062C00(param0);
-    UnkStruct_0205E884 * v2 = sub_0205EF3C(v1);
+    PlayerAvatar * v2 = sub_0205EF3C(v1);
 
     v0 = sub_0205EC14(v2);
 
@@ -219,7 +219,7 @@ static u32 sub_02069D50 (UnkStruct_02061AB4 * param0)
 static int sub_02069D8C (UnkStruct_02061AB4 * param0)
 {
     FieldSystem * v0 = sub_02062C00(param0);
-    UnkStruct_0205E884 * v1 = sub_0205EF3C(v0);
+    PlayerAvatar * v1 = sub_0205EF3C(v0);
     int v2 = sub_02063020(param0);
     int v3 = sub_02063040(param0);
     int v4 = sub_0205EAD4(v1);
@@ -629,7 +629,7 @@ static int sub_0206A324 (UnkStruct_02061AB4 * param0, UnkStruct_0206A23C * param
     if (param1->unk_01 == -1) {
         FieldSystem * v0 = sub_02062C00(param0);
 
-        param1->unk_01 = Player_Dir(v0->unk_3C);
+        param1->unk_01 = Player_Dir(v0->playerAvatar);
     }
 
     sub_02062D10(param0);
@@ -675,8 +675,8 @@ static int sub_0206A3BC (UnkStruct_02061AB4 * param0, UnkStruct_0206A23C * param
 {
     int v0;
     FieldSystem * v1 = sub_02062C00(param0);
-    int v2 = Player_Dir(v1->unk_3C);
-    u32 v3 = sub_0205EC1C(v1->unk_3C);
+    int v2 = Player_Dir(v1->playerAvatar);
+    u32 v3 = sub_0205EC1C(v1->playerAvatar);
 
     switch (v3) {
     case 0:
diff --git a/src/unk_0206B70C.c b/src/unk_0206B70C.c
index b18686258b..43517c570b 100644
--- a/src/unk_0206B70C.c
+++ b/src/unk_0206B70C.c
@@ -84,8 +84,8 @@ void sub_0206B70C (FieldSystem * param0, UnkStruct_0203D8AC * param1, int param2
 
     memset(param1, 0, sizeof(UnkStruct_0203D8AC));
 
-    v4 = Player_XPos(param0->unk_3C);
-    v5 = Player_ZPos(param0->unk_3C);
+    v4 = Player_XPos(param0->playerAvatar);
+    v5 = Player_ZPos(param0->playerAvatar);
 
     {
         int v11 = 10 - 1;
diff --git a/src/unk_0206C0E8.c b/src/unk_0206C0E8.c
index 1ee833388e..14e9de6bbb 100644
--- a/src/unk_0206C0E8.c
+++ b/src/unk_0206C0E8.c
@@ -88,7 +88,7 @@ static BOOL sub_0206C120 (UnkStruct_020508D4 * param0)
         break;
     case 4:
     {
-        UnkStruct_02061AB4 * v3 = sub_0205EB3C(v0->unk_3C);
+        UnkStruct_02061AB4 * v3 = sub_0205EB3C(v0->playerAvatar);
 
         v1->unk_0D++;
 
diff --git a/src/unk_0206C784.c b/src/unk_0206C784.c
index 599975b299..2599e4c733 100644
--- a/src/unk_0206C784.c
+++ b/src/unk_0206C784.c
@@ -84,13 +84,13 @@ void sub_0206C784 (FieldSystem * param0, const u8 param1, const u8 param2, const
 
     if (param1 == 3) {
         v4 = 34;
-        sub_020550F4(Player_XPos(param0->unk_3C), Player_ZPos(param0->unk_3C), 1, -3, 3, 6, &v3);
+        sub_020550F4(Player_XPos(param0->playerAvatar), Player_ZPos(param0->playerAvatar), 1, -3, 3, 6, &v3);
         v1 = 1;
         v5 = (25 * 16 * FX32_ONE);
         v0->unk_10 = (14 * 16 * FX32_ONE);
     } else if (param1 == 2) {
         v4 = 538;
-        sub_020550F4(Player_XPos(param0->unk_3C), Player_ZPos(param0->unk_3C), -2, 2, 6, 3, &v3);
+        sub_020550F4(Player_XPos(param0->playerAvatar), Player_ZPos(param0->playerAvatar), -2, 2, 6, 3, &v3);
         v1 = 1;
         v5 = (12 * 16 * FX32_ONE);
     }
@@ -104,7 +104,7 @@ void sub_0206C784 (FieldSystem * param0, const u8 param1, const u8 param2, const
             v0->unk_03 = 0;
             v0->unk_7C = (FX32_ONE / 4);
 
-            sub_0205EAEC(param0->unk_3C, &v0->unk_24);
+            sub_0205EAEC(param0->playerAvatar, &v0->unk_24);
             sub_020206B0(param0->unk_24);
             sub_02020690(&v0->unk_24, param0->unk_24);
 
diff --git a/src/unk_0207064C.c b/src/unk_0207064C.c
index b1e3537b37..041e62e848 100644
--- a/src/unk_0207064C.c
+++ b/src/unk_0207064C.c
@@ -48,7 +48,7 @@ BOOL sub_02070680 (UnkStruct_020508D4 * param0)
 
     switch (v1->unk_04) {
     case 0:
-        v1->unk_14 = ov6_02243F88(v1->unk_00, 1, v1->unk_10, sub_0205EB98(v1->unk_00->unk_3C));
+        v1->unk_14 = ov6_02243F88(v1->unk_00, 1, v1->unk_10, sub_0205EB98(v1->unk_00->playerAvatar));
         v1->unk_04++;
         break;
     case 1:
diff --git a/src/unk_0207070C.c b/src/unk_0207070C.c
index d408dd7f67..63964eff00 100644
--- a/src/unk_0207070C.c
+++ b/src/unk_0207070C.c
@@ -173,7 +173,7 @@ void sub_02070728 (FieldSystem * param0, UnkStruct_02070950 * param1)
     param1->unk_00 = param0->unk_1C->unk_00;
     param1->unk_0C = 0;
 
-    if (sub_0205F158(param0->unk_3C) == 1) {
+    if (sub_0205F158(param0->playerAvatar) == 1) {
         sub_02070838(param0, param1);
         return;
     }
@@ -195,18 +195,18 @@ void sub_02070728 (FieldSystem * param0, UnkStruct_02070950 * param1)
         }
     }
 
-    v1 = Player_XPos(param0->unk_3C);
-    v2 = Player_ZPos(param0->unk_3C);
+    v1 = Player_XPos(param0->playerAvatar);
+    v2 = Player_ZPos(param0->playerAvatar);
     v4 = sub_02054F94(param0, v1, v2);
 
-    sub_020615AC(param0->unk_3C, &v1, &v2);
+    sub_020615AC(param0->playerAvatar, &v1, &v2);
     v3 = sub_02054F94(param0, v1, v2);
 
-    if (ov5_021E0118(param0->unk_3C, v4, v3)) {
+    if (ov5_021E0118(param0->playerAvatar, v4, v3)) {
         param1->unk_0C |= (1 << 2);
     }
 
-    if (ov5_021E0760(v3, Player_Dir(param0->unk_3C))) {
+    if (ov5_021E0760(v3, Player_Dir(param0->playerAvatar))) {
         param1->unk_0C |= (1 << 7);
     }
 
@@ -229,11 +229,11 @@ static void sub_02070838 (FieldSystem * param0, UnkStruct_02070950 * param1)
     int v0;
     u32 v1, v2;
 
-    v0 = sub_0205EAA0(param0->unk_3C);
-    v2 = sub_020616F0(param0->unk_3C, v0);
-    v1 = sub_02061760(param0->unk_3C);
+    v0 = sub_0205EAA0(param0->playerAvatar);
+    v2 = sub_020616F0(param0->playerAvatar, v0);
+    v1 = sub_02061760(param0->playerAvatar);
 
-    if (ov5_021E0118(param0->unk_3C, v1, v2) == 1) {
+    if (ov5_021E0118(param0->playerAvatar, v1, v2) == 1) {
         param1->unk_0C |= (1 << 2);
     }
 }
@@ -357,7 +357,7 @@ static int sub_02070A24 (const UnkStruct_02070950 * param0)
         return 2;
     }
 
-    if (sub_0205EB74(param0->unk_04->unk_3C) == 0x2) {
+    if (sub_0205EB74(param0->unk_04->playerAvatar) == 0x2) {
         return 4;
     }
 
@@ -497,7 +497,7 @@ static int sub_02070C40 (const UnkStruct_02070950 * param0)
         return 2;
     }
 
-    if (sub_0205EB74(param0->unk_04->unk_3C) == 0x2) {
+    if (sub_0205EB74(param0->unk_04->playerAvatar) == 0x2) {
         return 1;
     }
 
diff --git a/src/unk_0207160C.c b/src/unk_0207160C.c
index d84bdad335..e44c65cebe 100644
--- a/src/unk_0207160C.c
+++ b/src/unk_0207160C.c
@@ -324,7 +324,7 @@ static BOOL sub_020718D8 (UnkStruct_020508D4 * param0)
 
     switch (v2->unk_00) {
     case 0:
-        sub_0205ED2C(v1->unk_3C, 0);
+        sub_0205ED2C(v1->playerAvatar, 0);
         sub_02071ACC(v2->unk_0C);
         (v2->unk_00)++;
         break;
@@ -360,14 +360,14 @@ static BOOL sub_020718D8 (UnkStruct_020508D4 * param0)
                 (v2->unk_00)++;
             }
 
-            sub_0205ED0C(v1->unk_3C, v6.y);
+            sub_0205ED0C(v1->playerAvatar, v6.y);
             ov5_021E18A4(v0, &v6);
         }
     }
     break;
     case 2:
         ov5_021EF388(0, v2->unk_04, v1->unk_A0);
-        sub_0205ED48(v1->unk_3C, 1);
+        sub_0205ED48(v1->playerAvatar, 1);
         Sound_PlayEffect(1562);
         (v2->unk_00)++;
         break;
@@ -387,7 +387,7 @@ static BOOL sub_020719D8 (UnkStruct_020508D4 * param0)
 
     switch (v2->unk_00) {
     case 0:
-        sub_0205ED2C(v1->unk_3C, 0);
+        sub_0205ED2C(v1->playerAvatar, 0);
         sub_02071ACC(v2->unk_0C);
         (v2->unk_00)++;
         break;
@@ -415,14 +415,14 @@ static BOOL sub_020719D8 (UnkStruct_020508D4 * param0)
                 (v2->unk_00)++;
             }
 
-            sub_0205ED0C(v1->unk_3C, v5.y);
+            sub_0205ED0C(v1->playerAvatar, v5.y);
             ov5_021E18A4(v0, &v5);
         }
     }
     break;
     case 2:
         ov5_021EF388(0, v2->unk_04, v1->unk_A0);
-        sub_0205ED48(v1->unk_3C, 1);
+        sub_0205ED48(v1->playerAvatar, 1);
         Sound_PlayEffect(1562);
         (v2->unk_00)++;
         break;
diff --git a/src/unk_02095E98.c b/src/unk_02095E98.c
index 77b5c8f0f0..8b47b6823d 100644
--- a/src/unk_02095E98.c
+++ b/src/unk_02095E98.c
@@ -165,7 +165,7 @@ void sub_02095EAC (int param0, int param1, void * param2, void * param3)
             v0->unk_4430++;
             sub_0209617C(v0, v0->unk_4430);
         } else {
-            sub_02035AC4(124, NULL, 0);
+            CommSys_SendDataServer(124, NULL, 0);
         }
     }
 }
@@ -244,7 +244,7 @@ void sub_02095FE4 (int param0, int param1, void * param2, void * param3)
                 break;
             }
 
-            sub_02035AC4(126, &v1, sizeof(UnkStruct_02095FE4));
+            CommSys_SendDataServer(126, &v1, sizeof(UnkStruct_02095FE4));
         }
     } else {
         switch (v2->unk_02) {
@@ -314,7 +314,7 @@ void sub_0209612C (int param0, int param1, void * param2, void * param3)
     if (CommSys_CurNetId() == 0) {
         if (v0->unk_9460 != 0) {
             v1 = param0;
-            sub_02035AC4(123, &v1, 1);
+            CommSys_SendDataServer(123, &v1, 1);
         } else {
             v0->unk_9460 = 1;
         }
diff --git a/src/unk_02099500.c b/src/unk_02099500.c
index c0517d86ee..716e13e0b1 100644
--- a/src/unk_02099500.c
+++ b/src/unk_02099500.c
@@ -44,7 +44,7 @@ static int sub_02099508 (void)
 }
 
 static const UnkStruct_02039A58 Unk_020F68A4[] = {
-    {sub_02058488, sub_020585A4, NULL},
+    {CommPlayer_RecvLocation, sub_020585A4, NULL},
     {sub_020585A8, sub_02058C3C, NULL},
     {ov23_022431C4, sub_02032950, NULL},
     {ov23_0224ACE8, sub_0203294C, NULL},
@@ -74,7 +74,7 @@ static const UnkStruct_02039A58 Unk_020F68A4[] = {
     {ov23_02242624, sub_02032944, NULL},
     {ov23_02242654, sub_02032944, NULL},
     {ov23_02244140, ov23_0224413C, NULL},
-    {sub_0205853C, sub_02032950, NULL},
+    {CommPlayer_RecvDelete, sub_02032950, NULL},
     {ov23_0224C384, ov23_0224C41C, NULL},
     {ov23_0224C25C, ov23_0224C41C, NULL},
     {ov23_0224C4CC, ov23_0224C584, NULL},

From aa6d519b1ef82b674a1d1e7c46c5e12ce1f86ea6 Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Wed, 3 Apr 2024 12:29:34 -0400
Subject: [PATCH 05/11] Identify LocalMapObject

---
 include/constdata/const_020EE4B8.h          |   2 +-
 include/functypes/funcptr_020EDF0C.h        |   2 +-
 include/functypes/funcptr_020EDF0C_1.h      |   2 +-
 include/functypes/funcptr_020EDF0C_2.h      |   2 +-
 include/functypes/funcptr_020EDF0C_3.h      |   2 +-
 include/overlay005/funcptr_ov5_021FB0F0.h   |   2 +-
 include/overlay005/funcptr_ov5_021FB0F0_1.h |   2 +-
 include/overlay005/funcptr_ov5_021FB0F0_2.h |   2 +-
 include/overlay005/funcptr_ov5_021FB0F0_3.h |   2 +-
 include/overlay005/funcptr_ov5_021FB0F0_4.h |   2 +-
 include/overlay005/ov5_021DB888.h           |   4 +-
 include/overlay005/ov5_021DF440.h           |   2 +-
 include/overlay005/ov5_021EB1A0.h           |  90 +--
 include/overlay005/ov5_021ECA70.h           |  18 +-
 include/overlay005/ov5_021ECC20.h           |  20 +-
 include/overlay005/ov5_021ECE40.h           |  26 +-
 include/overlay005/ov5_021F10E8.h           |   2 +-
 include/overlay005/ov5_021F134C.h           |   4 +-
 include/overlay005/ov5_021F17B8.h           |   2 +-
 include/overlay005/ov5_021F1CC8.h           |  12 +-
 include/overlay005/ov5_021F204C.h           |   4 +-
 include/overlay005/ov5_021F23D0.h           |   2 +-
 include/overlay005/ov5_021F25C0.h           |   2 +-
 include/overlay005/ov5_021F2850.h           |   2 +-
 include/overlay005/ov5_021F2A7C.h           |   2 +-
 include/overlay005/ov5_021F2BD0.h           |   2 +-
 include/overlay005/ov5_021F2D20.h           |   2 +-
 include/overlay005/ov5_021F3284.h           |   2 +-
 include/overlay005/ov5_021F348C.h           |   4 +-
 include/overlay005/ov5_021F37A8.h           |   2 +-
 include/overlay005/ov5_021F3A50.h           |   2 +-
 include/overlay005/ov5_021F3D00.h           |   2 +-
 include/overlay005/ov5_021F3E74.h           |   2 +-
 include/overlay005/ov5_021F47B0.h           |   2 +-
 include/overlay005/ov5_021F50BC.h           |   2 +-
 include/overlay005/ov5_021F5284.h           |   2 +-
 include/overlay005/ov5_021F5428.h           |   2 +-
 include/overlay005/ov5_021F5894.h           |   2 +-
 include/overlay005/ov5_021F5A10.h           |   2 +-
 include/overlay005/ov5_021F600C.h           |   2 +-
 include/overlay005/struct_ov5_021EE294.h    |   2 +-
 include/overlay009/ov9_02249960.h           |   8 +-
 include/struct_decls/struct_02061AB4_decl.h |   2 +-
 include/struct_defs/struct_02070950.h       |   2 +-
 include/unk_0203C954.h                      |   6 +-
 include/unk_0203E880.h                      |   8 +-
 include/unk_02055C50.h                      |  22 +-
 include/unk_0205DFC4.h                      |   4 +-
 include/unk_0205E7D0.h                      |   8 +-
 include/unk_0205F180.h                      |   4 +-
 include/unk_02061804.h                      | 372 +++++-----
 include/unk_02063400.h                      |  46 +-
 include/unk_0206450C.h                      | 112 +--
 include/unk_020655F4.h                      |  18 +-
 include/unk_020673B8.h                      |   4 +-
 include/unk_020677F4.h                      |  22 +-
 include/unk_02067A84.h                      |   8 +-
 include/unk_02069BE0.h                      |  64 +-
 src/overlay005/ov5_021D1C30.c               |  14 +-
 src/overlay005/ov5_021D431C.c               |  64 +-
 src/overlay005/ov5_021DB888.c               |  42 +-
 src/overlay005/ov5_021DF440.c               |   2 +-
 src/overlay005/ov5_021DFB54.c               |  84 +--
 src/overlay005/ov5_021E1154.c               |   6 +-
 src/overlay005/ov5_021E135C.c               |   4 +-
 src/overlay005/ov5_021EB1A0.c               | 210 +++---
 src/overlay005/ov5_021ECA70.c               |  34 +-
 src/overlay005/ov5_021ECC20.c               |  20 +-
 src/overlay005/ov5_021ECE40.c               |  74 +-
 src/overlay005/ov5_021F08CC.c               |  42 +-
 src/overlay005/ov5_021F10E8.c               |   6 +-
 src/overlay005/ov5_021F134C.c               |  10 +-
 src/overlay005/ov5_021F17B8.c               |  12 +-
 src/overlay005/ov5_021F1CC8.c               |  16 +-
 src/overlay005/ov5_021F204C.c               |  10 +-
 src/overlay005/ov5_021F23D0.c               |   8 +-
 src/overlay005/ov5_021F25C0.c               |  10 +-
 src/overlay005/ov5_021F2850.c               |   6 +-
 src/overlay005/ov5_021F2A7C.c               |   2 +-
 src/overlay005/ov5_021F2BD0.c               |   2 +-
 src/overlay005/ov5_021F2D20.c               |   8 +-
 src/overlay005/ov5_021F3284.c               |   8 +-
 src/overlay005/ov5_021F348C.c               |  12 +-
 src/overlay005/ov5_021F37A8.c               |   8 +-
 src/overlay005/ov5_021F3A50.c               |   8 +-
 src/overlay005/ov5_021F3D00.c               |   8 +-
 src/overlay005/ov5_021F3E74.c               |   8 +-
 src/overlay005/ov5_021F47B0.c               |  16 +-
 src/overlay005/ov5_021F50BC.c               |   8 +-
 src/overlay005/ov5_021F5284.c               |   8 +-
 src/overlay005/ov5_021F5428.c               |   8 +-
 src/overlay005/ov5_021F5894.c               |   2 +-
 src/overlay005/ov5_021F5A10.c               |   8 +-
 src/overlay005/ov5_021F600C.c               |   8 +-
 src/overlay005/ov5_021F61BC.c               |  10 +-
 src/overlay005/ov5_021F6454.c               |  18 +-
 src/overlay005/ov5_021F8560.c               |  12 +-
 src/overlay006/ov6_0223E140.c               |  16 +-
 src/overlay006/ov6_02242AF0.c               |   4 +-
 src/overlay006/ov6_02243258.c               |   6 +-
 src/overlay006/ov6_02247100.c               |  10 +-
 src/overlay006/ov6_02248050.c               |   2 +-
 src/overlay008/ov8_02249960.c               |  60 +-
 src/overlay009/ov9_02249960.c               | 228 +++----
 src/overlay023/ov23_02241F74.c              |   2 +-
 src/overlay023/ov23_0224A1D0.c              |   6 +-
 src/overlay023/ov23_0224B05C.c              |   2 +-
 src/overlay023/ov23_022521F0.c              |   2 +-
 src/unk_0203C954.c                          |  10 +-
 src/unk_0203E880.c                          |  22 +-
 src/unk_0203F6C4.c                          | 108 +--
 src/unk_02048614.c                          |   6 +-
 src/unk_0204B64C.c                          |  16 +-
 src/unk_02050568.c                          |   2 +-
 src/unk_02055C50.c                          |  44 +-
 src/unk_02056B30.c                          |  28 +-
 src/unk_02057518.c                          |  46 +-
 src/unk_0205A0D8.c                          |   2 +-
 src/unk_0205C22C.c                          |  26 +-
 src/unk_0205CA94.c                          |   2 +-
 src/unk_0205DFC4.c                          |   8 +-
 src/unk_0205E7D0.c                          |  64 +-
 src/unk_0205F180.c                          | 208 +++---
 src/unk_02061804.c                          | 546 +++++++--------
 src/unk_02063400.c                          | 180 ++---
 src/unk_0206450C.c                          | 224 +++---
 src/unk_020655F4.c                          | 710 ++++++++++----------
 src/unk_020673B8.c                          |  72 +-
 src/unk_020677F4.c                          |  26 +-
 src/unk_02067A84.c                          |  82 +--
 src/unk_020683F4.c                          |  14 +-
 src/unk_02069BE0.c                          | 184 ++---
 src/unk_0206C0E8.c                          |   2 +-
 src/unk_0207070C.c                          |   4 +-
 src/unk_020EDBAC.c                          | 310 ++++-----
 135 files changed, 2538 insertions(+), 2538 deletions(-)

diff --git a/include/constdata/const_020EE4B8.h b/include/constdata/const_020EE4B8.h
index 6129444fc9..7f7fd3887d 100644
--- a/include/constdata/const_020EE4B8.h
+++ b/include/constdata/const_020EE4B8.h
@@ -3,6 +3,6 @@
 
 #include "struct_decls/struct_02061AB4_decl.h"
 
-extern int(*const * const Unk_020EE4B8[0x9a])(UnkStruct_02061AB4 *);
+extern int(*const * const Unk_020EE4B8[0x9a])(LocalMapObject *);
 
 #endif // POKEPLATINUM_CONST_020EE4B8_H
diff --git a/include/functypes/funcptr_020EDF0C.h b/include/functypes/funcptr_020EDF0C.h
index 0a443ca0f1..264b75b8d7 100644
--- a/include/functypes/funcptr_020EDF0C.h
+++ b/include/functypes/funcptr_020EDF0C.h
@@ -3,6 +3,6 @@
 
 #include "struct_decls/struct_02061AB4_decl.h"
 
-typedef void (* UnkFuncPtr_020EDF0C)(UnkStruct_02061AB4 *);
+typedef void (* UnkFuncPtr_020EDF0C)(LocalMapObject *);
 
 #endif // POKEPLATINUM_FUNCPTR_020EDF0C_H
diff --git a/include/functypes/funcptr_020EDF0C_1.h b/include/functypes/funcptr_020EDF0C_1.h
index 38b9d40326..9992c2e4df 100644
--- a/include/functypes/funcptr_020EDF0C_1.h
+++ b/include/functypes/funcptr_020EDF0C_1.h
@@ -3,6 +3,6 @@
 
 #include "struct_decls/struct_02061AB4_decl.h"
 
-typedef void (* UnkFuncPtr_020EDF0C_1)(UnkStruct_02061AB4 *);
+typedef void (* UnkFuncPtr_020EDF0C_1)(LocalMapObject *);
 
 #endif // POKEPLATINUM_FUNCPTR_020EDF0C_1_H
diff --git a/include/functypes/funcptr_020EDF0C_2.h b/include/functypes/funcptr_020EDF0C_2.h
index 685e0b4ca5..ceb8a11a6a 100644
--- a/include/functypes/funcptr_020EDF0C_2.h
+++ b/include/functypes/funcptr_020EDF0C_2.h
@@ -3,6 +3,6 @@
 
 #include "struct_decls/struct_02061AB4_decl.h"
 
-typedef void (* UnkFuncPtr_020EDF0C_2)(UnkStruct_02061AB4 *);
+typedef void (* UnkFuncPtr_020EDF0C_2)(LocalMapObject *);
 
 #endif // POKEPLATINUM_FUNCPTR_020EDF0C_2_H
diff --git a/include/functypes/funcptr_020EDF0C_3.h b/include/functypes/funcptr_020EDF0C_3.h
index 18dfaed7a5..fe5bd10328 100644
--- a/include/functypes/funcptr_020EDF0C_3.h
+++ b/include/functypes/funcptr_020EDF0C_3.h
@@ -3,6 +3,6 @@
 
 #include "struct_decls/struct_02061AB4_decl.h"
 
-typedef void (* UnkFuncPtr_020EDF0C_3)(UnkStruct_02061AB4 *);
+typedef void (* UnkFuncPtr_020EDF0C_3)(LocalMapObject *);
 
 #endif // POKEPLATINUM_FUNCPTR_020EDF0C_3_H
diff --git a/include/overlay005/funcptr_ov5_021FB0F0.h b/include/overlay005/funcptr_ov5_021FB0F0.h
index 565ae39512..def6763d47 100644
--- a/include/overlay005/funcptr_ov5_021FB0F0.h
+++ b/include/overlay005/funcptr_ov5_021FB0F0.h
@@ -3,6 +3,6 @@
 
 #include "struct_decls/struct_02061AB4_decl.h"
 
-typedef void (* UnkFuncPtr_ov5_021FB0F0)(UnkStruct_02061AB4 *);
+typedef void (* UnkFuncPtr_ov5_021FB0F0)(LocalMapObject *);
 
 #endif // POKEPLATINUM_FUNCPTR_OV5_021FB0F0_H
diff --git a/include/overlay005/funcptr_ov5_021FB0F0_1.h b/include/overlay005/funcptr_ov5_021FB0F0_1.h
index b9cf5f20fe..82f7ba2a28 100644
--- a/include/overlay005/funcptr_ov5_021FB0F0_1.h
+++ b/include/overlay005/funcptr_ov5_021FB0F0_1.h
@@ -3,6 +3,6 @@
 
 #include "struct_decls/struct_02061AB4_decl.h"
 
-typedef void (* UnkFuncPtr_ov5_021FB0F0_1)(UnkStruct_02061AB4 *);
+typedef void (* UnkFuncPtr_ov5_021FB0F0_1)(LocalMapObject *);
 
 #endif // POKEPLATINUM_FUNCPTR_OV5_021FB0F0_1_H
diff --git a/include/overlay005/funcptr_ov5_021FB0F0_2.h b/include/overlay005/funcptr_ov5_021FB0F0_2.h
index c51eb74824..22c8c00bdb 100644
--- a/include/overlay005/funcptr_ov5_021FB0F0_2.h
+++ b/include/overlay005/funcptr_ov5_021FB0F0_2.h
@@ -3,6 +3,6 @@
 
 #include "struct_decls/struct_02061AB4_decl.h"
 
-typedef void (* UnkFuncPtr_ov5_021FB0F0_2)(UnkStruct_02061AB4 *);
+typedef void (* UnkFuncPtr_ov5_021FB0F0_2)(LocalMapObject *);
 
 #endif // POKEPLATINUM_FUNCPTR_OV5_021FB0F0_2_H
diff --git a/include/overlay005/funcptr_ov5_021FB0F0_3.h b/include/overlay005/funcptr_ov5_021FB0F0_3.h
index 40d71ce77a..656a4e46b6 100644
--- a/include/overlay005/funcptr_ov5_021FB0F0_3.h
+++ b/include/overlay005/funcptr_ov5_021FB0F0_3.h
@@ -3,6 +3,6 @@
 
 #include "struct_decls/struct_02061AB4_decl.h"
 
-typedef void (* UnkFuncPtr_ov5_021FB0F0_3)(UnkStruct_02061AB4 *);
+typedef void (* UnkFuncPtr_ov5_021FB0F0_3)(LocalMapObject *);
 
 #endif // POKEPLATINUM_FUNCPTR_OV5_021FB0F0_3_H
diff --git a/include/overlay005/funcptr_ov5_021FB0F0_4.h b/include/overlay005/funcptr_ov5_021FB0F0_4.h
index 502f1ab434..503b5ab5cf 100644
--- a/include/overlay005/funcptr_ov5_021FB0F0_4.h
+++ b/include/overlay005/funcptr_ov5_021FB0F0_4.h
@@ -3,6 +3,6 @@
 
 #include "struct_decls/struct_02061AB4_decl.h"
 
-typedef void (* UnkFuncPtr_ov5_021FB0F0_4)(UnkStruct_02061AB4 *);
+typedef void (* UnkFuncPtr_ov5_021FB0F0_4)(LocalMapObject *);
 
 #endif // POKEPLATINUM_FUNCPTR_OV5_021FB0F0_4_H
diff --git a/include/overlay005/ov5_021DB888.h b/include/overlay005/ov5_021DB888.h
index 4f9bc288a9..021b33a313 100644
--- a/include/overlay005/ov5_021DB888.h
+++ b/include/overlay005/ov5_021DB888.h
@@ -8,7 +8,7 @@
 
 void ov5_021DB888(UnkStruct_020508D4 * param0, StringFormatter * param1, u16 * param2);
 BOOL ov5_021DBB94(FieldSystem * param0);
-u16 ov5_021DBD98(FieldSystem * param0, UnkStruct_02061AB4 * param1, u16 param2);
-void ov5_021DBED4(FieldSystem * param0, UnkStruct_02061AB4 * param1);
+u16 ov5_021DBD98(FieldSystem * param0, LocalMapObject * param1, u16 param2);
+void ov5_021DBED4(FieldSystem * param0, LocalMapObject * param1);
 
 #endif // POKEPLATINUM_OV5_021DB888_H
diff --git a/include/overlay005/ov5_021DF440.h b/include/overlay005/ov5_021DF440.h
index a7d29a6cc4..07e3ec7b06 100644
--- a/include/overlay005/ov5_021DF440.h
+++ b/include/overlay005/ov5_021DF440.h
@@ -27,7 +27,7 @@ void * ov5_021DF53C(const UnkStruct_ov5_021DF47C * param0, u32 param1, int param
 void ov5_021DF554(void * param0);
 void * ov5_021DF55C(UnkStruct_ov5_021DF47C * param0, u32 param1);
 FieldSystem * ov5_021DF574(const UnkStruct_ov5_021DF47C * param0);
-UnkStruct_ov5_021DF47C * ov5_021DF578(const UnkStruct_02061AB4 * param0);
+UnkStruct_ov5_021DF47C * ov5_021DF578(const LocalMapObject * param0);
 u32 ov5_021DF5A8(UnkStruct_ov5_021DF47C * param0, u32 param1);
 void ov5_021DF5B4(UnkStruct_ov5_021DF47C * param0, u32 param1, void * param2);
 void * ov5_021DF5C0(UnkStruct_ov5_021DF47C * param0, u32 param1, int param2);
diff --git a/include/overlay005/ov5_021EB1A0.h b/include/overlay005/ov5_021EB1A0.h
index 0ffa740635..cc83194b6e 100644
--- a/include/overlay005/ov5_021EB1A0.h
+++ b/include/overlay005/ov5_021EB1A0.h
@@ -4,50 +4,50 @@
 #include "struct_decls/struct_020216E0_decl.h"
 #include "struct_decls/struct_02061AB4_decl.h"
 
-UnkStruct_020216E0 * ov5_021EB1A0(UnkStruct_02061AB4 * param0);
-void ov5_021EB2EC(UnkStruct_02061AB4 * param0);
-void ov5_021EB314(UnkStruct_02061AB4 * param0);
-void ov5_021EB328(UnkStruct_02061AB4 * param0);
-void ov5_021EB354(UnkStruct_02061AB4 * param0);
-void ov5_021EB398(UnkStruct_02061AB4 * param0);
-void ov5_021EB40C(UnkStruct_02061AB4 * param0);
-void ov5_021EB438(UnkStruct_02061AB4 * param0);
-void ov5_021EB720(UnkStruct_02061AB4 * param0);
-void ov5_021EB7F8(UnkStruct_02061AB4 * param0);
-void ov5_021EB834(UnkStruct_02061AB4 * param0);
-void ov5_021EB848(UnkStruct_02061AB4 * param0);
-void ov5_021EB874(UnkStruct_02061AB4 * param0);
-void ov5_021EB8B8(UnkStruct_02061AB4 * param0);
-void ov5_021EB944(UnkStruct_02061AB4 * param0);
-void ov5_021EBA0C(UnkStruct_02061AB4 * param0);
-void ov5_021EBA34(UnkStruct_02061AB4 * param0);
-void ov5_021EBA60(UnkStruct_02061AB4 * param0);
-void ov5_021EBA8C(UnkStruct_02061AB4 * param0);
-void ov5_021EBAD0(UnkStruct_02061AB4 * param0);
-void ov5_021EBF50(UnkStruct_02061AB4 * param0);
-void ov5_021EC15C(UnkStruct_02061AB4 * param0);
-void ov5_021EC3F0(UnkStruct_02061AB4 * param0);
-void ov5_021EC454(UnkStruct_02061AB4 * param0);
-void ov5_021EC4BC(UnkStruct_02061AB4 * param0);
-void ov5_021EC554(UnkStruct_02061AB4 * param0);
-void ov5_021EC5C0(UnkStruct_02061AB4 * param0);
-void ov5_021EC734(UnkStruct_02061AB4 * param0);
-void ov5_021EC75C(UnkStruct_02061AB4 * param0);
-void ov5_021EC760(UnkStruct_02061AB4 * param0);
-void ov5_021EC778(UnkStruct_02061AB4 * param0);
-void ov5_021EC790(UnkStruct_02061AB4 * param0);
-void ov5_021EC7B8(UnkStruct_02061AB4 * param0);
-void ov5_021EC7D0(UnkStruct_02061AB4 * param0);
-void ov5_021EC7F0(UnkStruct_02061AB4 * param0);
-void ov5_021EC824(UnkStruct_02061AB4 * param0);
-void ov5_021EC858(UnkStruct_02061AB4 * param0);
-void ov5_021EC86C(UnkStruct_02061AB4 * param0);
-void ov5_021EC898(UnkStruct_02061AB4 * param0);
-void ov5_021EC8EC(UnkStruct_02061AB4 * param0);
-void ov5_021EC938(UnkStruct_02061AB4 * param0);
-void ov5_021EC95C(UnkStruct_02061AB4 * param0);
-void ov5_021EC970(UnkStruct_02061AB4 * param0);
-void ov5_021EC9A0(UnkStruct_02061AB4 * param0);
-void ov5_021EC9E8(UnkStruct_02061AB4 * param0);
+UnkStruct_020216E0 * ov5_021EB1A0(LocalMapObject * param0);
+void ov5_021EB2EC(LocalMapObject * param0);
+void ov5_021EB314(LocalMapObject * param0);
+void ov5_021EB328(LocalMapObject * param0);
+void ov5_021EB354(LocalMapObject * param0);
+void ov5_021EB398(LocalMapObject * param0);
+void ov5_021EB40C(LocalMapObject * param0);
+void ov5_021EB438(LocalMapObject * param0);
+void ov5_021EB720(LocalMapObject * param0);
+void ov5_021EB7F8(LocalMapObject * param0);
+void ov5_021EB834(LocalMapObject * param0);
+void ov5_021EB848(LocalMapObject * param0);
+void ov5_021EB874(LocalMapObject * param0);
+void ov5_021EB8B8(LocalMapObject * param0);
+void ov5_021EB944(LocalMapObject * param0);
+void ov5_021EBA0C(LocalMapObject * param0);
+void ov5_021EBA34(LocalMapObject * param0);
+void ov5_021EBA60(LocalMapObject * param0);
+void ov5_021EBA8C(LocalMapObject * param0);
+void ov5_021EBAD0(LocalMapObject * param0);
+void ov5_021EBF50(LocalMapObject * param0);
+void ov5_021EC15C(LocalMapObject * param0);
+void ov5_021EC3F0(LocalMapObject * param0);
+void ov5_021EC454(LocalMapObject * param0);
+void ov5_021EC4BC(LocalMapObject * param0);
+void ov5_021EC554(LocalMapObject * param0);
+void ov5_021EC5C0(LocalMapObject * param0);
+void ov5_021EC734(LocalMapObject * param0);
+void ov5_021EC75C(LocalMapObject * param0);
+void ov5_021EC760(LocalMapObject * param0);
+void ov5_021EC778(LocalMapObject * param0);
+void ov5_021EC790(LocalMapObject * param0);
+void ov5_021EC7B8(LocalMapObject * param0);
+void ov5_021EC7D0(LocalMapObject * param0);
+void ov5_021EC7F0(LocalMapObject * param0);
+void ov5_021EC824(LocalMapObject * param0);
+void ov5_021EC858(LocalMapObject * param0);
+void ov5_021EC86C(LocalMapObject * param0);
+void ov5_021EC898(LocalMapObject * param0);
+void ov5_021EC8EC(LocalMapObject * param0);
+void ov5_021EC938(LocalMapObject * param0);
+void ov5_021EC95C(LocalMapObject * param0);
+void ov5_021EC970(LocalMapObject * param0);
+void ov5_021EC9A0(LocalMapObject * param0);
+void ov5_021EC9E8(LocalMapObject * param0);
 
 #endif // POKEPLATINUM_OV5_021EB1A0_H
diff --git a/include/overlay005/ov5_021ECA70.h b/include/overlay005/ov5_021ECA70.h
index c577a29962..391a5753ad 100644
--- a/include/overlay005/ov5_021ECA70.h
+++ b/include/overlay005/ov5_021ECA70.h
@@ -5,15 +5,15 @@
 #include "struct_decls/struct_02061AB4_decl.h"
 #include "overlay005/struct_ov5_021ECB8C_decl.h"
 
-void ov5_021ECA70(UnkStruct_02061AB4 * param0);
-void ov5_021ECA90(UnkStruct_02061AB4 * param0);
-void ov5_021ECABC(UnkStruct_02061AB4 * param0);
-void ov5_021ECAC4(UnkStruct_02061AB4 * param0);
-void ov5_021ECAF0(UnkStruct_02061AB4 * param0);
-void ov5_021ECB34(UnkStruct_02061AB4 * param0);
-void ov5_021ECB58(UnkStruct_02061AB4 * param0);
-void ov5_021ECB78(UnkStruct_02061AB4 * param0);
-UnkStruct_020216E0 * ov5_021ECB80(UnkStruct_02061AB4 * param0);
+void ov5_021ECA70(LocalMapObject * param0);
+void ov5_021ECA90(LocalMapObject * param0);
+void ov5_021ECABC(LocalMapObject * param0);
+void ov5_021ECAC4(LocalMapObject * param0);
+void ov5_021ECAF0(LocalMapObject * param0);
+void ov5_021ECB34(LocalMapObject * param0);
+void ov5_021ECB58(LocalMapObject * param0);
+void ov5_021ECB78(LocalMapObject * param0);
+UnkStruct_020216E0 * ov5_021ECB80(LocalMapObject * param0);
 UnkStruct_020216E0 * ov5_021ECB8C(UnkStruct_ov5_021ECB8C * param0);
 
 #endif // POKEPLATINUM_OV5_021ECA70_H
diff --git a/include/overlay005/ov5_021ECC20.h b/include/overlay005/ov5_021ECC20.h
index 45f848a105..f9a18808b0 100644
--- a/include/overlay005/ov5_021ECC20.h
+++ b/include/overlay005/ov5_021ECC20.h
@@ -9,16 +9,16 @@
 
 void ov5_021ECC20(UnkStruct_02061830 * param0, int param1, int param2, const int * param3, int param4);
 void ov5_021ECC78(UnkStruct_02061830 * param0);
-void ov5_021ECCC8(UnkStruct_02061AB4 * param0);
-const UnkStruct_ov5_021ECD10 * ov5_021ECD04(const UnkStruct_02061AB4 * param0);
-int ov5_021ECD38(const UnkStruct_02061AB4 * 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_021ECDA0(const UnkStruct_02061AB4 * param0, VecFx32 * param1);
-void ov5_021ECDFC(UnkStruct_02061AB4 * param0, int param1);
-void ov5_021ECE18(UnkStruct_02061AB4 * param0);
-void ov5_021ECE30(UnkStruct_02061AB4 * param0);
-void ov5_021ECE34(UnkStruct_02061AB4 * param0);
-void ov5_021ECE38(UnkStruct_02061AB4 * param0);
-void ov5_021ECE3C(UnkStruct_02061AB4 * param0);
+void ov5_021ECDA0(const LocalMapObject * param0, VecFx32 * param1);
+void ov5_021ECDFC(LocalMapObject * param0, int param1);
+void ov5_021ECE18(LocalMapObject * param0);
+void ov5_021ECE30(LocalMapObject * param0);
+void ov5_021ECE34(LocalMapObject * param0);
+void ov5_021ECE38(LocalMapObject * param0);
+void ov5_021ECE3C(LocalMapObject * param0);
 
 #endif // POKEPLATINUM_OV5_021ECC20_H
diff --git a/include/overlay005/ov5_021ECE40.h b/include/overlay005/ov5_021ECE40.h
index c87b883ac1..ea3bad743a 100644
--- a/include/overlay005/ov5_021ECE40.h
+++ b/include/overlay005/ov5_021ECE40.h
@@ -14,18 +14,18 @@
 
 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_021ECE94(UnkStruct_ov5_021ED0A4 * param0);
-int ov5_021ECEB4(UnkStruct_02061AB4 * param0, UnkStruct_020216E0 ** param1, int param2);
-int ov5_021ECF04(UnkStruct_02061AB4 * param0, UnkStruct_020216E0 ** param1);
-UnkStruct_020216E0 * ov5_021ECF1C(UnkStruct_02061AB4 * param0, int param1);
-void ov5_021ECF70(const UnkStruct_02061AB4 * param0, UnkStruct_020216E0 ** param1, int param2);
-void ov5_021ECFA4(const UnkStruct_02061AB4 * param0, UnkStruct_020216E0 ** param1);
-void ov5_021ECFD8(const UnkStruct_02061AB4 * param0, UnkStruct_020216E0 ** param1, int param2);
+int ov5_021ECEB4(LocalMapObject * param0, UnkStruct_020216E0 ** param1, int param2);
+int ov5_021ECF04(LocalMapObject * param0, UnkStruct_020216E0 ** param1);
+UnkStruct_020216E0 * ov5_021ECF1C(LocalMapObject * param0, int param1);
+void ov5_021ECF70(const LocalMapObject * param0, UnkStruct_020216E0 ** param1, int param2);
+void ov5_021ECFA4(const LocalMapObject * param0, UnkStruct_020216E0 ** param1);
+void ov5_021ECFD8(const LocalMapObject * param0, UnkStruct_020216E0 ** param1, int param2);
 void ov5_021ED01C(UnkStruct_020216E0 * param0, UnkStruct_ov5_021ED01C * param1);
 void ov5_021ED03C(UnkStruct_020216E0 * param0, UnkStruct_ov5_021ED01C * param1);
-void ov5_021ED060(UnkStruct_02061AB4 * param0, UnkStruct_020216E0 ** param1, int param2);
+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, UnkStruct_02061AB4 * param2);
+void ov5_021EDBC4(const UnkStruct_02061830 * 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);
@@ -33,13 +33,13 @@ UnkStruct_0202298C * ov5_021EDC98(const UnkStruct_ov5_021ED0A4 * param0);
 UnkStruct_0202298C * ov5_021EDCA0(const UnkStruct_ov5_021ED0A4 * param0);
 void ov5_021EDCA8(UnkStruct_ov5_021ED0A4 * param0, UnkStruct_02022BD8 * param1);
 UnkStruct_02022BD8 * ov5_021EDCB0(const UnkStruct_ov5_021ED0A4 * param0);
-void ov5_021EDD78(UnkStruct_02061AB4 * param0, int param1);
-int ov5_021EDD94(UnkStruct_02061AB4 * param0);
-BOOL ov5_021EDEB4(UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * param1);
-void ov5_021EDED8(UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * param1);
+void ov5_021EDD78(LocalMapObject * param0, int param1);
+int ov5_021EDD94(LocalMapObject * param0);
+BOOL ov5_021EDEB4(LocalMapObject * param0, UnkStruct_020216E0 * param1);
+void ov5_021EDED8(LocalMapObject * param0, UnkStruct_020216E0 * param1);
 int ov5_021EDF18(int param0);
 int ov5_021EDF24(int param0);
 int ov5_021EDF30(int param0);
-UnkStruct_020216E0 * ov5_021EE3FC(UnkStruct_02061AB4 * param0, int param1, UnkFuncPtr_ov5_021EE454 param2, void * param3);
+UnkStruct_020216E0 * ov5_021EE3FC(LocalMapObject * param0, int param1, UnkFuncPtr_ov5_021EE454 param2, void * param3);
 
 #endif // POKEPLATINUM_OV5_021ECE40_H
diff --git a/include/overlay005/ov5_021F10E8.h b/include/overlay005/ov5_021F10E8.h
index 545a3a6796..e6eb546b43 100644
--- a/include/overlay005/ov5_021F10E8.h
+++ b/include/overlay005/ov5_021F10E8.h
@@ -13,7 +13,7 @@ void ov5_021F10FC(void * param0);
 void ov5_021F1188(UnkStruct_ov5_021DF47C * param0, u32 param1);
 void ov5_021F11C0(UnkStruct_ov5_021DF47C * param0, u32 param1, u32 param2);
 UnkStruct_02073B50 * ov5_021F11FC(UnkStruct_ov5_021DF47C * param0, u32 param1);
-UnkStruct_ov101_021D5D90 * ov5_021F121C(const UnkStruct_02061AB4 * param0, const VecFx32 * param1);
+UnkStruct_ov101_021D5D90 * ov5_021F121C(const LocalMapObject * param0, const VecFx32 * param1);
 void ov5_021F1328(UnkStruct_ov5_021DF47C * param0);
 
 #endif // POKEPLATINUM_OV5_021F10E8_H
diff --git a/include/overlay005/ov5_021F134C.h b/include/overlay005/ov5_021F134C.h
index a4b814be52..0b9b97a8f8 100644
--- a/include/overlay005/ov5_021F134C.h
+++ b/include/overlay005/ov5_021F134C.h
@@ -7,7 +7,7 @@
 
 void * ov5_021F134C(UnkStruct_ov5_021DF47C * param0);
 void ov5_021F1370(void * param0);
-void ov5_021F1570(UnkStruct_02061AB4 * param0);
-UnkStruct_ov101_021D5D90 * ov5_021F16D4(UnkStruct_02061AB4 * param0, int param1);
+void ov5_021F1570(LocalMapObject * param0);
+UnkStruct_ov101_021D5D90 * ov5_021F16D4(LocalMapObject * param0, int param1);
 
 #endif // POKEPLATINUM_OV5_021F134C_H
diff --git a/include/overlay005/ov5_021F17B8.h b/include/overlay005/ov5_021F17B8.h
index 6096ec585f..4b490524ea 100644
--- a/include/overlay005/ov5_021F17B8.h
+++ b/include/overlay005/ov5_021F17B8.h
@@ -11,7 +11,7 @@
 
 void * ov5_021F17B8(UnkStruct_ov5_021DF47C * param0);
 void ov5_021F17D4(void * param0);
-void ov5_021F1800(UnkStruct_02061AB4 * param0, int param1);
+void ov5_021F1800(LocalMapObject * param0, int param1);
 UnkStruct_ov101_021D5D90 * ov5_021F1BA4(UnkStruct_ov5_021DF47C * param0, const UnkStruct_ov5_021DF84C * param1, const UnkStruct_020216E0 * param2, const VecFx32 * param3, int param4, int param5);
 
 #endif // POKEPLATINUM_OV5_021F17B8_H
diff --git a/include/overlay005/ov5_021F1CC8.h b/include/overlay005/ov5_021F1CC8.h
index 54712f7ae0..58a271c62f 100644
--- a/include/overlay005/ov5_021F1CC8.h
+++ b/include/overlay005/ov5_021F1CC8.h
@@ -7,11 +7,11 @@
 
 void * ov5_021F1CC8(UnkStruct_ov5_021DF47C * param0);
 void ov5_021F1CE8(void * param0);
-UnkStruct_ov101_021D5D90 * ov5_021F1E8C(const UnkStruct_02061AB4 * param0);
-UnkStruct_ov101_021D5D90 * ov5_021F1E98(const UnkStruct_02061AB4 * param0);
-UnkStruct_ov101_021D5D90 * ov5_021F1EA4(const UnkStruct_02061AB4 * param0);
-UnkStruct_ov101_021D5D90 * ov5_021F1EB0(const UnkStruct_02061AB4 * param0);
-UnkStruct_ov101_021D5D90 * ov5_021F1EBC(const UnkStruct_02061AB4 * param0);
-UnkStruct_ov101_021D5D90 * ov5_021F1EC8(const UnkStruct_02061AB4 * param0);
+UnkStruct_ov101_021D5D90 * ov5_021F1E8C(const LocalMapObject * param0);
+UnkStruct_ov101_021D5D90 * ov5_021F1E98(const LocalMapObject * param0);
+UnkStruct_ov101_021D5D90 * ov5_021F1EA4(const LocalMapObject * param0);
+UnkStruct_ov101_021D5D90 * ov5_021F1EB0(const LocalMapObject * param0);
+UnkStruct_ov101_021D5D90 * ov5_021F1EBC(const LocalMapObject * param0);
+UnkStruct_ov101_021D5D90 * ov5_021F1EC8(const LocalMapObject * param0);
 
 #endif // POKEPLATINUM_OV5_021F1CC8_H
diff --git a/include/overlay005/ov5_021F204C.h b/include/overlay005/ov5_021F204C.h
index 86d3fc47f6..b48919aa1d 100644
--- a/include/overlay005/ov5_021F204C.h
+++ b/include/overlay005/ov5_021F204C.h
@@ -7,9 +7,9 @@
 
 void * ov5_021F204C(UnkStruct_ov5_021DF47C * param0);
 void ov5_021F2068(void * param0);
-void ov5_021F20D4(UnkStruct_02061AB4 * param0);
+void ov5_021F20D4(LocalMapObject * param0);
 void * ov5_021F21E0(UnkStruct_ov5_021DF47C * param0);
 void ov5_021F21F4(void * param0);
-UnkStruct_ov101_021D5D90 * ov5_021F22BC(UnkStruct_02061AB4 * param0);
+UnkStruct_ov101_021D5D90 * ov5_021F22BC(LocalMapObject * param0);
 
 #endif // POKEPLATINUM_OV5_021F204C_H
diff --git a/include/overlay005/ov5_021F23D0.h b/include/overlay005/ov5_021F23D0.h
index 1534416f13..19f84b753d 100644
--- a/include/overlay005/ov5_021F23D0.h
+++ b/include/overlay005/ov5_021F23D0.h
@@ -7,7 +7,7 @@
 
 void * ov5_021F23D0(UnkStruct_ov5_021DF47C * param0);
 void ov5_021F23EC(void * param0);
-UnkStruct_ov101_021D5D90 * ov5_021F2438(UnkStruct_02061AB4 * param0);
+UnkStruct_ov101_021D5D90 * ov5_021F2438(LocalMapObject * param0);
 void ov5_021F247C(UnkStruct_ov101_021D5D90 * param0);
 
 #endif // POKEPLATINUM_OV5_021F23D0_H
diff --git a/include/overlay005/ov5_021F25C0.h b/include/overlay005/ov5_021F25C0.h
index d01b5510d1..1ca75cc699 100644
--- a/include/overlay005/ov5_021F25C0.h
+++ b/include/overlay005/ov5_021F25C0.h
@@ -7,7 +7,7 @@
 
 void * ov5_021F25C0(UnkStruct_ov5_021DF47C * param0);
 void ov5_021F25DC(void * param0);
-UnkStruct_ov101_021D5D90 * ov5_021F261C(UnkStruct_02061AB4 * param0, int param1, int param2, int param3, int param4);
+UnkStruct_ov101_021D5D90 * ov5_021F261C(LocalMapObject * param0, int param1, int param2, int param3, int param4);
 void ov5_021F2838(UnkStruct_ov101_021D5D90 * param0, int param1);
 
 #endif // POKEPLATINUM_OV5_021F25C0_H
diff --git a/include/overlay005/ov5_021F2850.h b/include/overlay005/ov5_021F2850.h
index 9b4aba8ea5..b80fcb2163 100644
--- a/include/overlay005/ov5_021F2850.h
+++ b/include/overlay005/ov5_021F2850.h
@@ -7,7 +7,7 @@
 
 void * ov5_021F2850(UnkStruct_ov5_021DF47C * param0);
 void ov5_021F2864(void * param0);
-UnkStruct_ov101_021D5D90 * ov5_021F28F4(UnkStruct_02061AB4 * param0, int param1, int param2, int param3, int param4);
+UnkStruct_ov101_021D5D90 * ov5_021F28F4(LocalMapObject * param0, int param1, int param2, int param3, int param4);
 void ov5_021F2974(UnkStruct_ov101_021D5D90 * param0, int param1);
 
 #endif // POKEPLATINUM_OV5_021F2850_H
diff --git a/include/overlay005/ov5_021F2A7C.h b/include/overlay005/ov5_021F2A7C.h
index ed60a23c4c..7795e7a227 100644
--- a/include/overlay005/ov5_021F2A7C.h
+++ b/include/overlay005/ov5_021F2A7C.h
@@ -6,6 +6,6 @@
 
 void * ov5_021F2A7C(UnkStruct_ov5_021DF47C * param0);
 void ov5_021F2A98(void * param0);
-void ov5_021F2AE4(UnkStruct_02061AB4 * param0, int param1, int param2, int param3);
+void ov5_021F2AE4(LocalMapObject * param0, int param1, int param2, int param3);
 
 #endif // POKEPLATINUM_OV5_021F2A7C_H
diff --git a/include/overlay005/ov5_021F2BD0.h b/include/overlay005/ov5_021F2BD0.h
index 9f0f4fac08..2d3e9ffc2f 100644
--- a/include/overlay005/ov5_021F2BD0.h
+++ b/include/overlay005/ov5_021F2BD0.h
@@ -6,6 +6,6 @@
 
 void * ov5_021F2BD0(UnkStruct_ov5_021DF47C * param0);
 void ov5_021F2BEC(void * param0);
-void ov5_021F2C38(UnkStruct_02061AB4 * param0, int param1, int param2, int param3);
+void ov5_021F2C38(LocalMapObject * param0, int param1, int param2, int param3);
 
 #endif // POKEPLATINUM_OV5_021F2BD0_H
diff --git a/include/overlay005/ov5_021F2D20.h b/include/overlay005/ov5_021F2D20.h
index 525de0fea6..a9a1cbf0bd 100644
--- a/include/overlay005/ov5_021F2D20.h
+++ b/include/overlay005/ov5_021F2D20.h
@@ -8,7 +8,7 @@
 
 void * ov5_021F2D20(UnkStruct_ov5_021DF47C * param0);
 void ov5_021F2D3C(void * param0);
-void ov5_021F2EA4(UnkStruct_02061AB4 * param0, int param1);
+void ov5_021F2EA4(LocalMapObject * param0, int param1);
 UnkStruct_ov101_021D5D90 * ov5_021F3154(FieldSystem * param0, int param1, int param2, int param3);
 int ov5_021F31A8(UnkStruct_ov101_021D5D90 * param0);
 
diff --git a/include/overlay005/ov5_021F3284.h b/include/overlay005/ov5_021F3284.h
index 420caba355..d4d6e12c98 100644
--- a/include/overlay005/ov5_021F3284.h
+++ b/include/overlay005/ov5_021F3284.h
@@ -6,6 +6,6 @@
 
 void * ov5_021F3284(UnkStruct_ov5_021DF47C * param0);
 void ov5_021F32A0(void * param0);
-void ov5_021F331C(UnkStruct_02061AB4 * param0, int param1);
+void ov5_021F331C(LocalMapObject * param0, int param1);
 
 #endif // POKEPLATINUM_OV5_021F3284_H
diff --git a/include/overlay005/ov5_021F348C.h b/include/overlay005/ov5_021F348C.h
index eab20988b5..f4df185a8e 100644
--- a/include/overlay005/ov5_021F348C.h
+++ b/include/overlay005/ov5_021F348C.h
@@ -7,7 +7,7 @@
 void * ov5_021F348C(UnkStruct_ov5_021DF47C * param0);
 void ov5_021F34A8(void * param0);
 void ov5_021F34B8(UnkStruct_ov5_021DF47C * param0);
-void ov5_021F3638(UnkStruct_02061AB4 * param0);
-void ov5_021F3678(UnkStruct_02061AB4 * param0, int param1);
+void ov5_021F3638(LocalMapObject * param0);
+void ov5_021F3678(LocalMapObject * param0, int param1);
 
 #endif // POKEPLATINUM_OV5_021F348C_H
diff --git a/include/overlay005/ov5_021F37A8.h b/include/overlay005/ov5_021F37A8.h
index 7e0684cce8..7063616d05 100644
--- a/include/overlay005/ov5_021F37A8.h
+++ b/include/overlay005/ov5_021F37A8.h
@@ -6,6 +6,6 @@
 
 void * ov5_021F37A8(UnkStruct_ov5_021DF47C * param0);
 void ov5_021F37C4(void * param0);
-void ov5_021F3844(UnkStruct_02061AB4 * param0, int param1);
+void ov5_021F3844(LocalMapObject * param0, int param1);
 
 #endif // POKEPLATINUM_OV5_021F37A8_H
diff --git a/include/overlay005/ov5_021F3A50.h b/include/overlay005/ov5_021F3A50.h
index ebd60a4567..1150951b54 100644
--- a/include/overlay005/ov5_021F3A50.h
+++ b/include/overlay005/ov5_021F3A50.h
@@ -6,6 +6,6 @@
 
 void * ov5_021F3A50(UnkStruct_ov5_021DF47C * param0);
 void ov5_021F3A6C(void * param0);
-void ov5_021F3AEC(UnkStruct_02061AB4 * param0, int param1);
+void ov5_021F3AEC(LocalMapObject * param0, int param1);
 
 #endif // POKEPLATINUM_OV5_021F3A50_H
diff --git a/include/overlay005/ov5_021F3D00.h b/include/overlay005/ov5_021F3D00.h
index 135d2301e1..6c550b99b3 100644
--- a/include/overlay005/ov5_021F3D00.h
+++ b/include/overlay005/ov5_021F3D00.h
@@ -7,6 +7,6 @@
 
 void * ov5_021F3D00(UnkStruct_ov5_021DF47C * param0);
 void ov5_021F3D1C(void * param0);
-UnkStruct_ov101_021D5D90 * ov5_021F3D90(UnkStruct_02061AB4 * param0, int param1);
+UnkStruct_ov101_021D5D90 * ov5_021F3D90(LocalMapObject * param0, int param1);
 
 #endif // POKEPLATINUM_OV5_021F3D00_H
diff --git a/include/overlay005/ov5_021F3E74.h b/include/overlay005/ov5_021F3E74.h
index 025ce85ca4..5cf010833c 100644
--- a/include/overlay005/ov5_021F3E74.h
+++ b/include/overlay005/ov5_021F3E74.h
@@ -6,6 +6,6 @@
 
 void * ov5_021F3E74(UnkStruct_ov5_021DF47C * param0);
 void ov5_021F3E90(void * param0);
-void ov5_021F3F10(UnkStruct_02061AB4 * param0);
+void ov5_021F3F10(LocalMapObject * param0);
 
 #endif // POKEPLATINUM_OV5_021F3E74_H
diff --git a/include/overlay005/ov5_021F47B0.h b/include/overlay005/ov5_021F47B0.h
index 19b31999c0..4bc5cb0650 100644
--- a/include/overlay005/ov5_021F47B0.h
+++ b/include/overlay005/ov5_021F47B0.h
@@ -7,7 +7,7 @@
 
 void * ov5_021F47B0(UnkStruct_ov5_021DF47C * param0);
 void ov5_021F47CC(void * param0);
-UnkStruct_ov101_021D5D90 * ov5_021F4840(UnkStruct_ov5_021DF47C * param0, const UnkStruct_02061AB4 * param1, int param2, int param3);
+UnkStruct_ov101_021D5D90 * ov5_021F4840(UnkStruct_ov5_021DF47C * param0, const LocalMapObject * param1, int param2, int param3);
 UnkStruct_ov101_021D5D90 * ov5_021F4CEC(UnkStruct_ov5_021DF47C * param0, int param1, int param2, int param3);
 
 #endif // POKEPLATINUM_OV5_021F47B0_H
diff --git a/include/overlay005/ov5_021F50BC.h b/include/overlay005/ov5_021F50BC.h
index 05b466456f..ac4ef3b8d7 100644
--- a/include/overlay005/ov5_021F50BC.h
+++ b/include/overlay005/ov5_021F50BC.h
@@ -7,6 +7,6 @@
 
 void * ov5_021F50BC(UnkStruct_ov5_021DF47C * param0);
 void ov5_021F50D8(void * param0);
-UnkStruct_ov101_021D5D90 * ov5_021F511C(UnkStruct_02061AB4 * param0);
+UnkStruct_ov101_021D5D90 * ov5_021F511C(LocalMapObject * param0);
 
 #endif // POKEPLATINUM_OV5_021F50BC_H
diff --git a/include/overlay005/ov5_021F5284.h b/include/overlay005/ov5_021F5284.h
index 3d742c6aa2..e2698da587 100644
--- a/include/overlay005/ov5_021F5284.h
+++ b/include/overlay005/ov5_021F5284.h
@@ -7,6 +7,6 @@
 
 void * ov5_021F5284(UnkStruct_ov5_021DF47C * param0);
 void ov5_021F52A0(void * param0);
-UnkStruct_ov101_021D5D90 * ov5_021F52E4(UnkStruct_02061AB4 * param0);
+UnkStruct_ov101_021D5D90 * ov5_021F52E4(LocalMapObject * param0);
 
 #endif // POKEPLATINUM_OV5_021F5284_H
diff --git a/include/overlay005/ov5_021F5428.h b/include/overlay005/ov5_021F5428.h
index 7d04136abd..8bd429e8c6 100644
--- a/include/overlay005/ov5_021F5428.h
+++ b/include/overlay005/ov5_021F5428.h
@@ -7,6 +7,6 @@
 
 void * ov5_021F5428(UnkStruct_ov5_021DF47C * param0);
 void ov5_021F5444(void * param0);
-UnkStruct_ov101_021D5D90 * ov5_021F5488(UnkStruct_02061AB4 * param0);
+UnkStruct_ov101_021D5D90 * ov5_021F5488(LocalMapObject * param0);
 
 #endif // POKEPLATINUM_OV5_021F5428_H
diff --git a/include/overlay005/ov5_021F5894.h b/include/overlay005/ov5_021F5894.h
index 4c18b76fef..b0905ddb55 100644
--- a/include/overlay005/ov5_021F5894.h
+++ b/include/overlay005/ov5_021F5894.h
@@ -6,6 +6,6 @@
 
 void * ov5_021F5894(UnkStruct_ov5_021DF47C * param0);
 void ov5_021F58B0(void * param0);
-void ov5_021F58FC(UnkStruct_02061AB4 * param0, int param1, int param2, int param3);
+void ov5_021F58FC(LocalMapObject * param0, int param1, int param2, int param3);
 
 #endif // POKEPLATINUM_OV5_021F5894_H
diff --git a/include/overlay005/ov5_021F5A10.h b/include/overlay005/ov5_021F5A10.h
index 3ed6340942..282fe334f7 100644
--- a/include/overlay005/ov5_021F5A10.h
+++ b/include/overlay005/ov5_021F5A10.h
@@ -11,6 +11,6 @@ void ov5_021F5A24(void * param0);
 void ov5_021F5AA4(FieldSystem * param0, BOOL param1);
 int ov5_021F5C4C(UnkStruct_ov101_021D5D90 * param0);
 void ov5_021F5C58(UnkStruct_ov101_021D5D90 * param0);
-UnkStruct_ov101_021D5D90 * ov5_021F5D8C(UnkStruct_02061AB4 * param0, int param1, int param2, int param3);
+UnkStruct_ov101_021D5D90 * ov5_021F5D8C(LocalMapObject * param0, int param1, int param2, int param3);
 
 #endif // POKEPLATINUM_OV5_021F5A10_H
diff --git a/include/overlay005/ov5_021F600C.h b/include/overlay005/ov5_021F600C.h
index 04e8d13db2..966c3f3652 100644
--- a/include/overlay005/ov5_021F600C.h
+++ b/include/overlay005/ov5_021F600C.h
@@ -7,6 +7,6 @@
 
 void * ov5_021F600C(UnkStruct_ov5_021DF47C * param0);
 void ov5_021F6028(void * param0);
-UnkStruct_ov101_021D5D90 * ov5_021F6094(UnkStruct_02061AB4 * param0);
+UnkStruct_ov101_021D5D90 * ov5_021F6094(LocalMapObject * param0);
 
 #endif // POKEPLATINUM_OV5_021F600C_H
diff --git a/include/overlay005/struct_ov5_021EE294.h b/include/overlay005/struct_ov5_021EE294.h
index a5a98ae1b3..c53c707a56 100644
--- a/include/overlay005/struct_ov5_021EE294.h
+++ b/include/overlay005/struct_ov5_021EE294.h
@@ -6,7 +6,7 @@
 
 typedef struct {
     int unk_00;
-    UnkStruct_02061AB4 * unk_04;
+    LocalMapObject * unk_04;
     UnkStruct_020216E0 ** unk_08;
 } UnkStruct_ov5_021EE294;
 
diff --git a/include/overlay009/ov9_02249960.h b/include/overlay009/ov9_02249960.h
index c8b51055be..0ecf00fdbc 100644
--- a/include/overlay009/ov9_02249960.h
+++ b/include/overlay009/ov9_02249960.h
@@ -12,7 +12,7 @@ void ov9_02249A60(FieldSystem * param0);
 BOOL ov9_02249E50(FieldSystem * param0, const int param1, const int param2, const fx32 param3, BOOL * param4);
 void ov9_02249F9C(FieldSystem * param0);
 void ov9_02249FD0(FieldSystem * param0);
-int ov9_0224A520(FieldSystem * param0, UnkStruct_02061AB4 * param1);
+int ov9_0224A520(FieldSystem * param0, LocalMapObject * param1);
 void ov9_0224A558(FieldSystem * param0, UnkStruct_020216E0 * param1, int param2);
 void ov9_0224A564(FieldSystem * param0, const UnkStruct_020216E0 * param1);
 BOOL ov9_0224A59C(FieldSystem * param0, int param1);
@@ -25,9 +25,9 @@ void ov9_0224E884(FieldSystem * param0, u16 param1);
 void ov9_0224E8A8(FieldSystem * param0);
 void ov9_0224F158(FieldSystem * param0, u16 param1);
 void ov9_0224F16C(FieldSystem * param0, u16 param1);
-BOOL ov9_0224F240(const UnkStruct_02061AB4 * param0, int param1);
-BOOL ov9_0224F2B0(const UnkStruct_02061AB4 * param0);
-UnkStruct_ov9_0224F6EC * ov9_0224F2BC(FieldSystem * param0, UnkStruct_020508D4 * param1, UnkStruct_02061AB4 * param2);
+BOOL ov9_0224F240(const LocalMapObject * param0, int param1);
+BOOL ov9_0224F2B0(const LocalMapObject * param0);
+UnkStruct_ov9_0224F6EC * ov9_0224F2BC(FieldSystem * param0, UnkStruct_020508D4 * param1, LocalMapObject * param2);
 BOOL ov9_0224F6EC(UnkStruct_ov9_0224F6EC * param0);
 void ov9_02250780(FieldSystem * param0);
 BOOL ov9_02250F74(FieldSystem * param0);
diff --git a/include/struct_decls/struct_02061AB4_decl.h b/include/struct_decls/struct_02061AB4_decl.h
index 6b5a1882f8..ac3f10776a 100644
--- a/include/struct_decls/struct_02061AB4_decl.h
+++ b/include/struct_decls/struct_02061AB4_decl.h
@@ -1,6 +1,6 @@
 #ifndef POKEPLATINUM_STRUCT_02061AB4_DECL_H
 #define POKEPLATINUM_STRUCT_02061AB4_DECL_H
 
-typedef struct UnkStruct_02061AB4_t UnkStruct_02061AB4;
+typedef struct UnkStruct_02061AB4_t LocalMapObject;
 
 #endif // POKEPLATINUM_STRUCT_02061AB4_DECL_H
diff --git a/include/struct_defs/struct_02070950.h b/include/struct_defs/struct_02070950.h
index 1682e5b22e..bb86b304d0 100644
--- a/include/struct_defs/struct_02070950.h
+++ b/include/struct_defs/struct_02070950.h
@@ -7,7 +7,7 @@
 typedef struct UnkStruct_02070950_t {
     u32 unk_00;
     FieldSystem * unk_04;
-    UnkStruct_02061AB4 * unk_08;
+    LocalMapObject * unk_08;
     u16 unk_0C;
 } UnkStruct_02070950;
 
diff --git a/include/unk_0203C954.h b/include/unk_0203C954.h
index d9ccf29d87..9d3ebe199b 100644
--- a/include/unk_0203C954.h
+++ b/include/unk_0203C954.h
@@ -4,11 +4,11 @@
 #include "field/field_system_decl.h"
 #include "struct_decls/struct_02061AB4_decl.h"
 
-void sub_0203C9D4(FieldSystem * param0, UnkStruct_02061AB4 ** param1);
-u8 sub_0203CA40(FieldSystem * param0, UnkStruct_02061AB4 ** param1);
+void sub_0203C9D4(FieldSystem * param0, LocalMapObject ** param1);
+u8 sub_0203CA40(FieldSystem * param0, LocalMapObject ** param1);
 u16 sub_0203CA6C(FieldSystem * param0, void * param1, int param2);
 u16 sub_0203CB80(FieldSystem * param0, void * param1, int param2);
-u8 sub_0203CBE0(FieldSystem * param0, UnkStruct_02061AB4 ** param1);
+u8 sub_0203CBE0(FieldSystem * param0, LocalMapObject ** param1);
 u16 sub_0203CC14(FieldSystem * param0, void * param1, int param2);
 
 #endif // POKEPLATINUM_UNK_0203C954_H
diff --git a/include/unk_0203E880.h b/include/unk_0203E880.h
index ab331d2eed..9b25c09433 100644
--- a/include/unk_0203E880.h
+++ b/include/unk_0203E880.h
@@ -8,10 +8,10 @@
 #include "struct_decls/struct_020508D4_decl.h"
 #include "struct_decls/struct_02061AB4_decl.h"
 
-void sub_0203E880(FieldSystem * param0, u16 param1, UnkStruct_02061AB4 * param2);
-void sub_0203E8B0(FieldSystem * param0, UnkStruct_02061AB4 * param1, int param2, int param3, int param4, int param5, int param6, int param7);
-void sub_0203E8E0(UnkStruct_020508D4 * param0, u16 param1, UnkStruct_02061AB4 * param2, void * param3);
-void sub_0203E918(UnkStruct_020508D4 * param0, u16 param1, UnkStruct_02061AB4 * param2);
+void sub_0203E880(FieldSystem * param0, u16 param1, LocalMapObject * param2);
+void sub_0203E8B0(FieldSystem * param0, LocalMapObject * param1, int param2, int param3, int param4, int param5, int param6, int param7);
+void sub_0203E8E0(UnkStruct_020508D4 * param0, u16 param1, LocalMapObject * param2, void * param3);
+void sub_0203E918(UnkStruct_020508D4 * param0, u16 param1, LocalMapObject * param2);
 UnkStruct_0203E724 * sub_0203EAB8(FieldSystem * param0, u16 param1);
 void * sub_0203EF60(UnkStruct_0203EF60 * param0, u32 param1);
 void * sub_0203F098(FieldSystem * param0, u32 param1);
diff --git a/include/unk_02055C50.h b/include/unk_02055C50.h
index 87b45bc43e..72a9362d21 100644
--- a/include/unk_02055C50.h
+++ b/include/unk_02055C50.h
@@ -9,17 +9,17 @@ UnkStruct_02055CBC * sub_02055C8C(FieldSystem * param0, int param1);
 void sub_02055CBC(UnkStruct_02055CBC * param0);
 void sub_02055CD4(FieldSystem * param0, int param1);
 void sub_02055D94(FieldSystem * param0);
-BOOL sub_02055E00(FieldSystem * param0, UnkStruct_02061AB4 * param1);
-void sub_02055E80(FieldSystem * param0, UnkStruct_02061AB4 * param1, u16 param2);
-void sub_02055EAC(FieldSystem * param0, UnkStruct_02061AB4 * param1, u16 param2);
-void sub_02055EE0(FieldSystem * param0, UnkStruct_02061AB4 * param1);
-int sub_02055F00(const FieldSystem * param0, const UnkStruct_02061AB4 * param1);
-int sub_02055F20(const FieldSystem * param0, const UnkStruct_02061AB4 * param1);
-u16 sub_02055F40(const FieldSystem * param0, const UnkStruct_02061AB4 * param1);
-u16 sub_02055F64(const FieldSystem * param0, const UnkStruct_02061AB4 * param1);
-int sub_02055F88(const FieldSystem * param0, const UnkStruct_02061AB4 * param1);
-int sub_02055FA8(const FieldSystem * param0, const UnkStruct_02061AB4 * param1);
-u32 sub_02055FC8(const FieldSystem * param0, const UnkStruct_02061AB4 * param1);
+BOOL sub_02055E00(FieldSystem * param0, LocalMapObject * param1);
+void sub_02055E80(FieldSystem * param0, LocalMapObject * param1, u16 param2);
+void sub_02055EAC(FieldSystem * param0, LocalMapObject * param1, u16 param2);
+void sub_02055EE0(FieldSystem * param0, LocalMapObject * param1);
+int sub_02055F00(const FieldSystem * param0, const LocalMapObject * param1);
+int sub_02055F20(const FieldSystem * param0, const LocalMapObject * param1);
+u16 sub_02055F40(const FieldSystem * param0, const LocalMapObject * param1);
+u16 sub_02055F64(const FieldSystem * param0, const LocalMapObject * param1);
+int sub_02055F88(const FieldSystem * param0, const LocalMapObject * param1);
+int sub_02055FA8(const FieldSystem * param0, const LocalMapObject * param1);
+u32 sub_02055FC8(const FieldSystem * param0, const LocalMapObject * param1);
 void sub_020562AC(FieldSystem * param0);
 void sub_020562D8(FieldSystem * param0);
 
diff --git a/include/unk_0205DFC4.h b/include/unk_0205DFC4.h
index dc6fd2a9c6..5015fca3da 100644
--- a/include/unk_0205DFC4.h
+++ b/include/unk_0205DFC4.h
@@ -11,8 +11,8 @@ u16 sub_0205E078(u16 param0, u16 param1);
 u16 sub_0205E0E4(u16 param0, u16 param1);
 u16 sub_0205E1B4(SaveData * param0);
 BOOL HasAllLegendaryTitansInParty(SaveData * param0);
-void sub_0205E318(UnkStruct_020508D4 * param0, UnkStruct_02061AB4 * param1, u16 param2, u16 param3, u16 param4, u16 param5);
-void sub_0205E3F4(UnkStruct_020508D4 * param0, UnkStruct_02061AB4 * param1, u16 param2, u16 param3);
+void sub_0205E318(UnkStruct_020508D4 * param0, LocalMapObject * param1, u16 param2, u16 param3, u16 param4, u16 param5);
+void sub_0205E3F4(UnkStruct_020508D4 * param0, LocalMapObject * param1, u16 param2, u16 param3);
 int sub_0205E430(u8 param0, u8 param1);
 int sub_0205E45C(u8 param0, u8 param1);
 int sub_0205E488(u8 param0, u8 param1);
diff --git a/include/unk_0205E7D0.h b/include/unk_0205E7D0.h
index 4ef3376800..202243d372 100644
--- a/include/unk_0205E7D0.h
+++ b/include/unk_0205E7D0.h
@@ -15,7 +15,7 @@ PlayerAvatar * sub_0205E820(const UnkStruct_02061830 * param0, UnkStruct_0205EC3
 void sub_0205E884(PlayerAvatar * param0, int param1);
 void sub_0205E8E0(PlayerAvatar * param0);
 void sub_0205E8E8(PlayerAvatar * param0);
-UnkStruct_02061AB4 * sub_0205EA24(const UnkStruct_02061830 * param0);
+LocalMapObject * sub_0205EA24(const UnkStruct_02061830 * param0);
 int Player_Dir(PlayerAvatar * const param0);
 void sub_0205EA84(PlayerAvatar * param0, int param1);
 int sub_0205EA94(PlayerAvatar * const param0);
@@ -31,9 +31,9 @@ int sub_0205EB0C(const PlayerAvatar * param0);
 void sub_0205EB10(PlayerAvatar * param0, int param1);
 int sub_0205EB14(const PlayerAvatar * param0);
 void sub_0205EB18(PlayerAvatar * param0, int param1);
-void sub_0205EB38(PlayerAvatar * param0, UnkStruct_02061AB4 * param1);
-UnkStruct_02061AB4 * sub_0205EB3C(PlayerAvatar * param0);
-const UnkStruct_02061AB4 * sub_0205EB54(const PlayerAvatar * param0);
+void sub_0205EB38(PlayerAvatar * param0, LocalMapObject * param1);
+LocalMapObject * Player_LocalMapObject(PlayerAvatar * param0);
+const LocalMapObject * sub_0205EB54(const PlayerAvatar * param0);
 void sub_0205EB58(PlayerAvatar * param0, int param1);
 int sub_0205EB74(PlayerAvatar * param0);
 void sub_0205EB84(PlayerAvatar * param0, u32 param1);
diff --git a/include/unk_0205F180.h b/include/unk_0205F180.h
index 01b44860ba..341e609b1b 100644
--- a/include/unk_0205F180.h
+++ b/include/unk_0205F180.h
@@ -11,8 +11,8 @@ void sub_0205F490(PlayerAvatar * param0);
 void sub_0205F56C(PlayerAvatar * param0);
 int sub_0205F588(PlayerAvatar * param0);
 void sub_0205F5E4(PlayerAvatar * param0, int param1);
-u32 sub_02060B7C(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2);
-u32 sub_020611FC(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2);
+u32 sub_02060B7C(PlayerAvatar * param0, LocalMapObject * param1, int param2);
+u32 sub_020611FC(PlayerAvatar * param0, LocalMapObject * param1, int param2);
 int sub_02061308(PlayerAvatar * param0, u16 param1, u16 param2);
 int sub_020613AC(PlayerAvatar * param0);
 int sub_020613FC(PlayerAvatar * param0, u16 param1);
diff --git a/include/unk_02061804.h b/include/unk_02061804.h
index b154bca41e..1f397add5d 100644
--- a/include/unk_02061804.h
+++ b/include/unk_02061804.h
@@ -23,27 +23,27 @@
 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);
-UnkStruct_02061AB4 * sub_02061918(const UnkStruct_02061830 * param0, const UnkStruct_020619DC * param1, int param2);
-UnkStruct_02061AB4 * sub_020619DC(const UnkStruct_02061830 * param0, int param1, int param2, int param3, int param4, int param5, int param6);
-UnkStruct_02061AB4 * sub_02061A74(const UnkStruct_02061830 * param0, int param1, int param2, int param3, const UnkStruct_020619DC * param4);
-void sub_02061AB4(UnkStruct_02061AB4 * param0, int param1);
-void sub_02061AD4(UnkStruct_02061AB4 * param0, int param1);
-void sub_02061AF4(UnkStruct_02061AB4 * param0);
-void sub_02061B28(UnkStruct_02061AB4 * param0);
-void sub_02061B48(UnkStruct_02061AB4 * param0);
+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);
+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);
-UnkStruct_02061AB4 * sub_0206251C(const UnkStruct_02061830 * param0, int param1);
-UnkStruct_02061AB4 * sub_02062570(const UnkStruct_02061830 * param0, int param1);
-int sub_020625B0(const UnkStruct_02061830 * param0, UnkStruct_02061AB4 ** param1, int * param2, u32 param3);
-int sub_020626B4(const UnkStruct_02061AB4 * param0);
-int sub_02062758(const UnkStruct_02061AB4 * param0, int param1);
-int sub_02062764(const UnkStruct_02061AB4 * param0, int param1, int param2);
-int sub_020627B4(const UnkStruct_02061AB4 * param0, int param1, int param2, int 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);
+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);
@@ -52,175 +52,175 @@ 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, UnkStruct_02061AB4 * param1);
-const UnkStruct_02061AB4 * sub_02062868(const UnkStruct_02061830 * param0);
-UnkStruct_02061AB4 * sub_02062878(const UnkStruct_02061830 * param0);
-void sub_02062880(const UnkStruct_02061AB4 ** 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_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_020628B4(UnkStruct_02061AB4 * param0, u32 param1);
-u32 sub_020628B8(const UnkStruct_02061AB4 * param0);
-void sub_020628BC(UnkStruct_02061AB4 * param0, u32 param1);
-void sub_020628C4(UnkStruct_02061AB4 * param0, u32 param1);
-u32 sub_020628D0(const UnkStruct_02061AB4 * param0, u32 param1);
-u32 sub_020628D8(const UnkStruct_02061AB4 * param0, u32 param1);
-void sub_020628E8(UnkStruct_02061AB4 * param0, u32 param1);
-u32 sub_020628EC(const UnkStruct_02061AB4 * param0);
-void sub_020628F0(UnkStruct_02061AB4 * param0, u32 param1);
-void sub_020628F8(UnkStruct_02061AB4 * param0, u32 param1);
-u32 sub_02062904(const UnkStruct_02061AB4 * param0, u32 param1);
-void sub_0206290C(UnkStruct_02061AB4 * param0, u32 param1);
-u32 sub_02062910(const UnkStruct_02061AB4 * param0);
-void sub_02062914(UnkStruct_02061AB4 * param0, int param1);
-int sub_02062918(const UnkStruct_02061AB4 * param0);
-void sub_0206291C(UnkStruct_02061AB4 * param0, u32 param1);
-u32 sub_02062920(const UnkStruct_02061AB4 * param0);
-u32 sub_02062924(const UnkStruct_02061AB4 * param0);
-void sub_02062944(UnkStruct_02061AB4 * param0, u32 param1);
-u32 sub_02062948(const UnkStruct_02061AB4 * param0);
-void sub_0206294C(UnkStruct_02061AB4 * param0, u32 param1);
-u32 sub_02062950(const UnkStruct_02061AB4 * param0);
-void sub_02062954(UnkStruct_02061AB4 * param0, u32 param1);
-u32 sub_02062958(const UnkStruct_02061AB4 * param0);
-void sub_0206295C(UnkStruct_02061AB4 * param0, u32 param1);
-u32 sub_02062960(const UnkStruct_02061AB4 * param0);
-void sub_02062964(UnkStruct_02061AB4 * param0, int param1);
-u32 sub_02062968(const UnkStruct_02061AB4 * param0);
-void sub_0206296C(UnkStruct_02061AB4 * param0, int param1);
-void sub_02062974(UnkStruct_02061AB4 * param0, int param1);
-int sub_0206298C(const UnkStruct_02061AB4 * param0);
-int sub_02062990(const UnkStruct_02061AB4 * param0);
-void sub_02062994(UnkStruct_02061AB4 * param0, int param1);
-int sub_0206299C(const UnkStruct_02061AB4 * param0);
-void sub_020629A0(UnkStruct_02061AB4 * param0, int param1);
-void sub_020629B4(UnkStruct_02061AB4 * param0, int param1, int param2);
-int sub_020629D8(const UnkStruct_02061AB4 * param0, int param1);
-void sub_020629FC(UnkStruct_02061AB4 * param0, int param1);
-int sub_02062A00(const UnkStruct_02061AB4 * param0);
-void sub_02062A04(UnkStruct_02061AB4 * param0, int param1);
-int sub_02062A08(const UnkStruct_02061AB4 * param0);
-void sub_02062A0C(UnkStruct_02061AB4 * param0, u32 param1);
-u32 sub_02062A14(const UnkStruct_02061AB4 * param0);
-void sub_02062A1C(UnkStruct_02061AB4 * param0, SysTask * param1);
-SysTask * sub_02062A24(const UnkStruct_02061AB4 * param0);
-void sub_02062A2C(const UnkStruct_02061AB4 * param0);
-void sub_02062A38(UnkStruct_02061AB4 * param0, const UnkStruct_02061830 * param1);
-const UnkStruct_02061830 * sub_02062A40(const UnkStruct_02061AB4 * param0);
-void * sub_02062A54(UnkStruct_02061AB4 * param0, int param1);
-void * sub_02062A78(UnkStruct_02061AB4 * param0);
-void * sub_02062A7C(UnkStruct_02061AB4 * param0, int param1);
-void * sub_02062AA0(UnkStruct_02061AB4 * param0);
-void * sub_02062AA4(UnkStruct_02061AB4 * param0, int param1);
-void * sub_02062AC8(UnkStruct_02061AB4 * param0);
-void * sub_02062ACC(UnkStruct_02061AB4 * param0, int param1);
-void * sub_02062AF0(UnkStruct_02061AB4 * param0);
-void sub_02062AF8(UnkStruct_02061AB4 * param0, UnkFuncPtr_020EDF0C param1);
-void sub_02062B00(UnkStruct_02061AB4 * param0);
-void sub_02062B0C(UnkStruct_02061AB4 * param0, UnkFuncPtr_020EDF0C_1 param1);
-void sub_02062B14(UnkStruct_02061AB4 * param0);
-void sub_02062B20(UnkStruct_02061AB4 * param0, UnkFuncPtr_020EDF0C_2 param1);
-void sub_02062B28(UnkStruct_02061AB4 * param0);
-void sub_02062B34(UnkStruct_02061AB4 * param0);
-void sub_02062B4C(UnkStruct_02061AB4 * param0, UnkFuncPtr_ov5_021FB0F0 param1);
-void sub_02062B54(UnkStruct_02061AB4 * param0);
-void sub_02062B60(UnkStruct_02061AB4 * param0, UnkFuncPtr_ov5_021FB0F0_1 param1);
-void sub_02062B68(UnkStruct_02061AB4 * param0);
-void sub_02062B74(UnkStruct_02061AB4 * param0, UnkFuncPtr_ov5_021FB0F0_2 param1);
-void sub_02062B7C(UnkStruct_02061AB4 * param0);
-void sub_02062B88(UnkStruct_02061AB4 * param0, UnkFuncPtr_ov5_021FB0F0_3 param1);
-void sub_02062B90(UnkStruct_02061AB4 * param0);
-void sub_02062B9C(UnkStruct_02061AB4 * param0, UnkFuncPtr_ov5_021FB0F0_4 param1);
-void sub_02062BA4(UnkStruct_02061AB4 * param0);
-void sub_02062BB0(UnkStruct_02061AB4 * param0, int param1);
-int sub_02062BB8(const UnkStruct_02061AB4 * param0);
-void sub_02062BC0(UnkStruct_02061AB4 * param0, int param1);
-void sub_02062BC8(UnkStruct_02061AB4 * param0);
-int sub_02062BD8(const UnkStruct_02061AB4 * param0);
-void sub_02062BE0(UnkStruct_02061AB4 * param0, u32 param1);
-u32 sub_02062BE8(const UnkStruct_02061AB4 * param0);
-void sub_02062BF0(UnkStruct_02061AB4 * param0, u32 param1);
-u32 sub_02062BF8(const UnkStruct_02061AB4 * param0);
-FieldSystem * sub_02062C00(const UnkStruct_02061AB4 * param0);
-int sub_02062C0C(const UnkStruct_02061AB4 * param0);
-int sub_02062C18(const UnkStruct_02061AB4 * param0);
+void sub_020628B4(LocalMapObject * param0, u32 param1);
+u32 sub_020628B8(const LocalMapObject * param0);
+void sub_020628BC(LocalMapObject * param0, u32 param1);
+void sub_020628C4(LocalMapObject * param0, u32 param1);
+u32 sub_020628D0(const LocalMapObject * param0, u32 param1);
+u32 sub_020628D8(const LocalMapObject * param0, u32 param1);
+void sub_020628E8(LocalMapObject * param0, u32 param1);
+u32 sub_020628EC(const LocalMapObject * param0);
+void sub_020628F0(LocalMapObject * param0, u32 param1);
+void sub_020628F8(LocalMapObject * param0, u32 param1);
+u32 sub_02062904(const LocalMapObject * param0, u32 param1);
+void sub_0206290C(LocalMapObject * param0, u32 param1);
+u32 sub_02062910(const LocalMapObject * param0);
+void sub_02062914(LocalMapObject * param0, int param1);
+int sub_02062918(const LocalMapObject * param0);
+void sub_0206291C(LocalMapObject * param0, u32 param1);
+u32 sub_02062920(const LocalMapObject * param0);
+u32 sub_02062924(const LocalMapObject * param0);
+void sub_02062944(LocalMapObject * param0, u32 param1);
+u32 sub_02062948(const LocalMapObject * param0);
+void sub_0206294C(LocalMapObject * param0, u32 param1);
+u32 sub_02062950(const LocalMapObject * param0);
+void sub_02062954(LocalMapObject * param0, u32 param1);
+u32 sub_02062958(const LocalMapObject * param0);
+void sub_0206295C(LocalMapObject * param0, u32 param1);
+u32 sub_02062960(const LocalMapObject * param0);
+void sub_02062964(LocalMapObject * param0, int param1);
+u32 sub_02062968(const LocalMapObject * param0);
+void sub_0206296C(LocalMapObject * param0, int param1);
+void sub_02062974(LocalMapObject * param0, int param1);
+int sub_0206298C(const LocalMapObject * param0);
+int sub_02062990(const LocalMapObject * param0);
+void sub_02062994(LocalMapObject * param0, int param1);
+int sub_0206299C(const LocalMapObject * param0);
+void sub_020629A0(LocalMapObject * param0, int param1);
+void sub_020629B4(LocalMapObject * param0, int param1, int param2);
+int sub_020629D8(const LocalMapObject * param0, int param1);
+void sub_020629FC(LocalMapObject * param0, int param1);
+int sub_02062A00(const LocalMapObject * param0);
+void sub_02062A04(LocalMapObject * param0, int param1);
+int sub_02062A08(const LocalMapObject * param0);
+void sub_02062A0C(LocalMapObject * param0, u32 param1);
+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_02062A54(LocalMapObject * param0, int param1);
+void * sub_02062A78(LocalMapObject * param0);
+void * sub_02062A7C(LocalMapObject * param0, int param1);
+void * sub_02062AA0(LocalMapObject * param0);
+void * sub_02062AA4(LocalMapObject * param0, int param1);
+void * sub_02062AC8(LocalMapObject * param0);
+void * sub_02062ACC(LocalMapObject * param0, int param1);
+void * sub_02062AF0(LocalMapObject * param0);
+void sub_02062AF8(LocalMapObject * param0, UnkFuncPtr_020EDF0C param1);
+void sub_02062B00(LocalMapObject * param0);
+void sub_02062B0C(LocalMapObject * param0, UnkFuncPtr_020EDF0C_1 param1);
+void sub_02062B14(LocalMapObject * param0);
+void sub_02062B20(LocalMapObject * param0, UnkFuncPtr_020EDF0C_2 param1);
+void sub_02062B28(LocalMapObject * param0);
+void sub_02062B34(LocalMapObject * param0);
+void sub_02062B4C(LocalMapObject * param0, UnkFuncPtr_ov5_021FB0F0 param1);
+void sub_02062B54(LocalMapObject * param0);
+void sub_02062B60(LocalMapObject * param0, UnkFuncPtr_ov5_021FB0F0_1 param1);
+void sub_02062B68(LocalMapObject * param0);
+void sub_02062B74(LocalMapObject * param0, UnkFuncPtr_ov5_021FB0F0_2 param1);
+void sub_02062B7C(LocalMapObject * param0);
+void sub_02062B88(LocalMapObject * param0, UnkFuncPtr_ov5_021FB0F0_3 param1);
+void sub_02062B90(LocalMapObject * param0);
+void sub_02062B9C(LocalMapObject * param0, UnkFuncPtr_ov5_021FB0F0_4 param1);
+void sub_02062BA4(LocalMapObject * param0);
+void sub_02062BB0(LocalMapObject * param0, int param1);
+int sub_02062BB8(const LocalMapObject * param0);
+void sub_02062BC0(LocalMapObject * param0, int param1);
+void sub_02062BC8(LocalMapObject * param0);
+int sub_02062BD8(const LocalMapObject * param0);
+void sub_02062BE0(LocalMapObject * param0, u32 param1);
+u32 sub_02062BE8(const LocalMapObject * param0);
+void sub_02062BF0(LocalMapObject * param0, u32 param1);
+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);
-u32 sub_02062CBC(const UnkStruct_02061AB4 * param0, u32 param1);
+u32 sub_02062CBC(const LocalMapObject * param0, u32 param1);
 void sub_02062CCC(UnkStruct_02061830 * param0, int param1);
 int sub_02062CE4(const UnkStruct_02061830 * param0);
-int sub_02062CF8(const UnkStruct_02061AB4 * param0);
-void sub_02062D04(UnkStruct_02061AB4 * param0);
-void sub_02062D10(UnkStruct_02061AB4 * param0);
-int sub_02062D1C(const UnkStruct_02061AB4 * param0);
-void sub_02062D28(UnkStruct_02061AB4 * param0);
-void sub_02062D34(UnkStruct_02061AB4 * param0);
-void sub_02062D40(UnkStruct_02061AB4 * param0);
-int sub_02062D4C(const UnkStruct_02061AB4 * param0);
-int sub_02062D58(const UnkStruct_02061AB4 * param0);
-void sub_02062D64(UnkStruct_02061AB4 * param0, int param1);
-void sub_02062D80(UnkStruct_02061AB4 * param0, int param1);
-int sub_02062D9C(UnkStruct_02061AB4 * param0);
-void sub_02062DB4(UnkStruct_02061AB4 * param0, int param1);
-void sub_02062DD0(UnkStruct_02061AB4 * param0);
-void sub_02062DDC(UnkStruct_02061AB4 * param0);
-int sub_02062DE8(const UnkStruct_02061AB4 * param0);
-int sub_02062DFC(const UnkStruct_02061AB4 * param0);
-void sub_02062E28(UnkStruct_02061AB4 * param0, int param1);
-int sub_02062E44(const UnkStruct_02061AB4 * param0);
-void sub_02062E5C(UnkStruct_02061AB4 * param0, int param1);
-void sub_02062E78(UnkStruct_02061AB4 * param0, int param1);
-int sub_02062E94(const UnkStruct_02061AB4 * param0);
-void sub_02062EAC(UnkStruct_02061AB4 * param0, int param1);
-int sub_02062EC8(const UnkStruct_02061AB4 * param0);
-void sub_02062EE0(UnkStruct_02061AB4 * param0, int param1);
-int sub_02062EFC(const UnkStruct_02061AB4 * param0);
-void sub_02062F14(UnkStruct_02061AB4 * param0, int param1);
-int sub_02062F30(const UnkStruct_02061AB4 * param0);
-void sub_02062F48(UnkStruct_02061AB4 * param0, int param1);
-int sub_02062F64(const UnkStruct_02061AB4 * param0);
-int sub_02062F7C(const UnkStruct_02061AB4 * param0);
-void sub_02062F90(UnkStruct_02061AB4 * param0, int param1);
-int sub_02062FAC(const UnkStruct_02061AB4 * param0);
-void sub_02062FC4(UnkStruct_02061AB4 * param0, int param1);
-int sub_02062FDC(const UnkStruct_02061AB4 * param0);
-int sub_02062FF0(const UnkStruct_02061AB4 * param0);
-void sub_02062FF4(UnkStruct_02061AB4 * param0, int param1);
-int sub_02062FF8(const UnkStruct_02061AB4 * param0);
-void sub_02062FFC(UnkStruct_02061AB4 * param0, int param1);
-int sub_02063000(const UnkStruct_02061AB4 * param0);
-void sub_02063004(UnkStruct_02061AB4 * param0, int param1);
-int sub_02063008(const UnkStruct_02061AB4 * param0);
-void sub_0206300C(UnkStruct_02061AB4 * param0, int param1);
-int sub_02063010(const UnkStruct_02061AB4 * param0);
-void sub_02063014(UnkStruct_02061AB4 * param0, int param1);
-int sub_02063018(const UnkStruct_02061AB4 * param0);
-void sub_0206301C(UnkStruct_02061AB4 * param0, int param1);
-int sub_02063020(const UnkStruct_02061AB4 * param0);
-void sub_02063024(UnkStruct_02061AB4 * param0, int param1);
-void sub_02063028(UnkStruct_02061AB4 * param0, int param1);
-int sub_02063030(const UnkStruct_02061AB4 * param0);
-void sub_02063034(UnkStruct_02061AB4 * param0, int param1);
-void sub_02063038(UnkStruct_02061AB4 * param0, int param1);
-int sub_02063040(const UnkStruct_02061AB4 * param0);
-void sub_02063044(UnkStruct_02061AB4 * param0, int param1);
-void sub_02063048(UnkStruct_02061AB4 * param0, int param1);
-void sub_02063050(const UnkStruct_02061AB4 * param0, VecFx32 * param1);
-void sub_02063060(UnkStruct_02061AB4 * param0, const VecFx32 * param1);
-const VecFx32 * sub_02063070(const UnkStruct_02061AB4 * param0);
-fx32 sub_02063074(const UnkStruct_02061AB4 * param0);
-void sub_02063078(const UnkStruct_02061AB4 * param0, VecFx32 * param1);
-void sub_02063088(UnkStruct_02061AB4 * param0, const VecFx32 * param1);
-VecFx32 * sub_02063098(UnkStruct_02061AB4 * param0);
-void sub_0206309C(const UnkStruct_02061AB4 * param0, VecFx32 * param1);
-void sub_020630AC(UnkStruct_02061AB4 * param0, const VecFx32 * param1);
-void sub_020630BC(const UnkStruct_02061AB4 * param0, VecFx32 * param1);
-void sub_020630CC(UnkStruct_02061AB4 * param0, const VecFx32 * param1);
-int sub_020630DC(const UnkStruct_02061AB4 * param0);
+int sub_02062CF8(const LocalMapObject * param0);
+void sub_02062D04(LocalMapObject * param0);
+void sub_02062D10(LocalMapObject * param0);
+int sub_02062D1C(const LocalMapObject * param0);
+void sub_02062D28(LocalMapObject * param0);
+void sub_02062D34(LocalMapObject * param0);
+void sub_02062D40(LocalMapObject * param0);
+int sub_02062D4C(const LocalMapObject * param0);
+int sub_02062D58(const LocalMapObject * param0);
+void sub_02062D64(LocalMapObject * param0, int param1);
+void sub_02062D80(LocalMapObject * param0, int param1);
+int sub_02062D9C(LocalMapObject * param0);
+void sub_02062DB4(LocalMapObject * param0, int param1);
+void sub_02062DD0(LocalMapObject * param0);
+void sub_02062DDC(LocalMapObject * param0);
+int sub_02062DE8(const LocalMapObject * param0);
+int sub_02062DFC(const LocalMapObject * param0);
+void sub_02062E28(LocalMapObject * param0, int param1);
+int sub_02062E44(const LocalMapObject * param0);
+void sub_02062E5C(LocalMapObject * param0, int param1);
+void sub_02062E78(LocalMapObject * param0, int param1);
+int sub_02062E94(const LocalMapObject * param0);
+void sub_02062EAC(LocalMapObject * param0, int param1);
+int sub_02062EC8(const LocalMapObject * param0);
+void sub_02062EE0(LocalMapObject * param0, int param1);
+int sub_02062EFC(const LocalMapObject * param0);
+void sub_02062F14(LocalMapObject * param0, int param1);
+int sub_02062F30(const LocalMapObject * param0);
+void sub_02062F48(LocalMapObject * param0, int param1);
+int sub_02062F64(const LocalMapObject * param0);
+int sub_02062F7C(const LocalMapObject * param0);
+void sub_02062F90(LocalMapObject * param0, int param1);
+int sub_02062FAC(const LocalMapObject * param0);
+void sub_02062FC4(LocalMapObject * param0, int param1);
+int sub_02062FDC(const LocalMapObject * param0);
+int sub_02062FF0(const LocalMapObject * param0);
+void sub_02062FF4(LocalMapObject * param0, int param1);
+int sub_02062FF8(const LocalMapObject * param0);
+void sub_02062FFC(LocalMapObject * param0, int param1);
+int sub_02063000(const LocalMapObject * param0);
+void sub_02063004(LocalMapObject * param0, int param1);
+int sub_02063008(const LocalMapObject * param0);
+void sub_0206300C(LocalMapObject * param0, int param1);
+int sub_02063010(const LocalMapObject * param0);
+void sub_02063014(LocalMapObject * param0, int param1);
+int sub_02063018(const LocalMapObject * param0);
+void sub_0206301C(LocalMapObject * param0, int param1);
+int sub_02063020(const LocalMapObject * param0);
+void LocalMapObj_SetX(LocalMapObject * param0, int param1);
+void sub_02063028(LocalMapObject * param0, int param1);
+int sub_02063030(const LocalMapObject * param0);
+void sub_02063034(LocalMapObject * param0, int param1);
+void sub_02063038(LocalMapObject * param0, int param1);
+int sub_02063040(const LocalMapObject * param0);
+void LocalMapObj_SetZ(LocalMapObject * param0, int param1);
+void sub_02063048(LocalMapObject * param0, int param1);
+void sub_02063050(const LocalMapObject * param0, VecFx32 * param1);
+void sub_02063060(LocalMapObject * param0, const VecFx32 * param1);
+const VecFx32 * sub_02063070(const LocalMapObject * param0);
+fx32 sub_02063074(const LocalMapObject * param0);
+void sub_02063078(const LocalMapObject * param0, VecFx32 * param1);
+void sub_02063088(LocalMapObject * param0, const VecFx32 * param1);
+VecFx32 * sub_02063098(LocalMapObject * param0);
+void sub_0206309C(const LocalMapObject * param0, VecFx32 * param1);
+void sub_020630AC(LocalMapObject * param0, const VecFx32 * param1);
+void sub_020630BC(const LocalMapObject * param0, VecFx32 * param1);
+void sub_020630CC(LocalMapObject * param0, const VecFx32 * param1);
+int sub_020630DC(const LocalMapObject * param0);
 void sub_020630F0(UnkStruct_020619DC * param0, int param1);
 int sub_020630F4(const UnkStruct_020619DC * param0);
 void sub_020630F8(UnkStruct_020619DC * param0, int param1);
@@ -247,18 +247,18 @@ 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);
-UnkStruct_02061AB4 * sub_0206326C(const UnkStruct_02061830 * param0, int param1, int param2, int param3);
-void sub_020632D4(UnkStruct_02061AB4 * param0, const VecFx32 * param1, int param2);
-void sub_02063340(UnkStruct_02061AB4 * param0, int param1, int param2, int param3, int param4);
-void sub_020633A8(UnkStruct_02061AB4 * param0, u32 param1);
-void sub_020633C8(UnkStruct_02061AB4 * param0, int param1);
-void sub_020633E0(UnkStruct_02061AB4 * param0);
-void sub_020633E4(UnkStruct_02061AB4 * param0);
-void sub_020633E8(UnkStruct_02061AB4 * param0);
-void sub_020633EC(UnkStruct_02061AB4 * param0);
-void sub_020633F0(UnkStruct_02061AB4 * param0);
-void sub_020633F4(UnkStruct_02061AB4 * param0);
-void sub_020633F8(UnkStruct_02061AB4 * param0);
-void sub_020633FC(UnkStruct_02061AB4 * param0);
+LocalMapObject * sub_0206326C(const UnkStruct_02061830 * 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);
+void sub_020633C8(LocalMapObject * param0, int param1);
+void sub_020633E0(LocalMapObject * param0);
+void sub_020633E4(LocalMapObject * param0);
+void sub_020633E8(LocalMapObject * param0);
+void sub_020633EC(LocalMapObject * param0);
+void sub_020633F0(LocalMapObject * param0);
+void sub_020633F4(LocalMapObject * param0);
+void sub_020633F8(LocalMapObject * param0);
+void sub_020633FC(LocalMapObject * param0);
 
 #endif // POKEPLATINUM_UNK_02061804_H
diff --git a/include/unk_02063400.h b/include/unk_02063400.h
index 83ecba27d4..ccfee50390 100644
--- a/include/unk_02063400.h
+++ b/include/unk_02063400.h
@@ -6,33 +6,33 @@
 
 #include <nitro/fx/fx.h>
 
-void sub_02063400(UnkStruct_02061AB4 * param0);
-void sub_02063410(UnkStruct_02061AB4 * param0);
-u32 sub_02063E18(const UnkStruct_02061AB4 * param0, const VecFx32 * param1, int param2, int param3, int param4, int param5);
-u32 sub_02063E94(const UnkStruct_02061AB4 * param0, int param1, int param2, int param3, int param4);
-u32 sub_02063EBC(const UnkStruct_02061AB4 * param0, int param1);
-int sub_02063F00(const UnkStruct_02061AB4 * param0, int param1, int param2, int param3);
-int sub_02063FAC(const UnkStruct_02061AB4 * param0, int param1, int param2, int param3);
-int sub_02064004(const UnkStruct_02061AB4 * param0, int param1, int param2, int param3);
-int sub_0206406C(UnkStruct_02061AB4 * param0, u32 param1);
-int sub_020640A0(UnkStruct_02061AB4 * param0, u32 param1);
-int sub_020640D4(UnkStruct_02061AB4 * param0, u32 param1);
-int sub_02064108(UnkStruct_02061AB4 * param0, u32 param1);
-int sub_0206413C(UnkStruct_02061AB4 * param0, u32 param1);
-int sub_0206415C(UnkStruct_02061AB4 * param0, u32 param1);
-int sub_0206417C(UnkStruct_02061AB4 * param0, u32 param1);
+void sub_02063400(LocalMapObject * param0);
+void sub_02063410(LocalMapObject * param0);
+u32 sub_02063E18(const LocalMapObject * param0, const VecFx32 * param1, int param2, int param3, int param4, int param5);
+u32 sub_02063E94(const LocalMapObject * param0, int param1, int param2, int param3, int param4);
+u32 sub_02063EBC(const LocalMapObject * param0, int param1);
+int sub_02063F00(const LocalMapObject * param0, int param1, int param2, int param3);
+int sub_02063FAC(const LocalMapObject * param0, int param1, int param2, int param3);
+int sub_02064004(const LocalMapObject * param0, int param1, int param2, int param3);
+int sub_0206406C(LocalMapObject * param0, u32 param1);
+int sub_020640A0(LocalMapObject * param0, u32 param1);
+int sub_020640D4(LocalMapObject * param0, u32 param1);
+int sub_02064108(LocalMapObject * param0, u32 param1);
+int sub_0206413C(LocalMapObject * param0, u32 param1);
+int sub_0206415C(LocalMapObject * param0, u32 param1);
+int sub_0206417C(LocalMapObject * param0, u32 param1);
 int sub_0206419C(int param0);
 int sub_020641A8(int param0);
-void sub_020641B4(UnkStruct_02061AB4 * param0, int param1);
-void sub_02064208(UnkStruct_02061AB4 * param0);
-u32 sub_02064238(UnkStruct_02061AB4 * param0, int param1);
-void sub_02064270(UnkStruct_02061AB4 * param0, const VecFx32 * param1);
-void sub_020642A4(UnkStruct_02061AB4 * param0, int param1, fx32 param2);
-int sub_020642F8(UnkStruct_02061AB4 * param0);
-int sub_02064390(UnkStruct_02061AB4 * param0);
+void sub_020641B4(LocalMapObject * param0, int param1);
+void sub_02064208(LocalMapObject * param0);
+u32 sub_02064238(LocalMapObject * param0, int param1);
+void sub_02064270(LocalMapObject * param0, const VecFx32 * param1);
+void sub_020642A4(LocalMapObject * param0, int param1, fx32 param2);
+int sub_020642F8(LocalMapObject * param0);
+int sub_02064390(LocalMapObject * param0);
 void sub_02064418(int param0, VecFx32 * param1, fx32 param2);
 void sub_02064450(int param0, int param1, VecFx32 * param2);
-void sub_02064464(UnkStruct_02061AB4 * param0);
+void sub_02064464(LocalMapObject * param0);
 int sub_0206447C(int param0);
 int sub_02064488(int param0, int param1, int param2, int param3);
 int sub_020644A4(FieldSystem * param0, VecFx32 * param1);
diff --git a/include/unk_0206450C.h b/include/unk_0206450C.h
index 4edefbfb7d..23465830d4 100644
--- a/include/unk_0206450C.h
+++ b/include/unk_0206450C.h
@@ -3,61 +3,61 @@
 
 #include "struct_decls/struct_02061AB4_decl.h"
 
-void sub_0206453C(UnkStruct_02061AB4 * param0);
-void sub_02064548(UnkStruct_02061AB4 * param0);
-void sub_02064554(UnkStruct_02061AB4 * param0);
-void sub_02064560(UnkStruct_02061AB4 * param0);
-void sub_0206456C(UnkStruct_02061AB4 * param0);
-void sub_02064578(UnkStruct_02061AB4 * param0);
-void sub_02064584(UnkStruct_02061AB4 * param0);
-void sub_02064590(UnkStruct_02061AB4 * param0);
-void sub_0206459C(UnkStruct_02061AB4 * param0);
-void sub_020645A8(UnkStruct_02061AB4 * param0);
-void sub_020645B4(UnkStruct_02061AB4 * param0);
-void sub_020645C0(UnkStruct_02061AB4 * param0);
-void sub_02064624(UnkStruct_02061AB4 * param0);
-void sub_02064628(UnkStruct_02061AB4 * param0);
-void sub_02064638(UnkStruct_02061AB4 * param0);
-void sub_02064648(UnkStruct_02061AB4 * param0);
-void sub_02064658(UnkStruct_02061AB4 * param0);
-void sub_02064690(UnkStruct_02061AB4 * param0);
-void sub_02064918(UnkStruct_02061AB4 * param0);
-void sub_0206493C(UnkStruct_02061AB4 * param0);
-void sub_02064948(UnkStruct_02061AB4 * param0);
-void sub_02064954(UnkStruct_02061AB4 * param0);
-void sub_02064960(UnkStruct_02061AB4 * param0);
-void sub_02064990(UnkStruct_02061AB4 * param0);
-void sub_0206499C(UnkStruct_02061AB4 * param0);
-void sub_020649A8(UnkStruct_02061AB4 * param0);
-void sub_02064AF0(UnkStruct_02061AB4 * param0);
-void sub_02064AFC(UnkStruct_02061AB4 * param0);
-void sub_02064C28(UnkStruct_02061AB4 * param0);
-void sub_02064C48(UnkStruct_02061AB4 * param0);
-void sub_02064DC8(UnkStruct_02061AB4 * param0);
-void sub_02064DD8(UnkStruct_02061AB4 * param0);
-void sub_02064DE8(UnkStruct_02061AB4 * param0);
-void sub_02064DF8(UnkStruct_02061AB4 * param0);
-void sub_02064E08(UnkStruct_02061AB4 * param0);
-void sub_02064E18(UnkStruct_02061AB4 * param0);
-void sub_02064E28(UnkStruct_02061AB4 * param0);
-void sub_02064E38(UnkStruct_02061AB4 * param0);
-void sub_02064E48(UnkStruct_02061AB4 * param0);
-void sub_02064E58(UnkStruct_02061AB4 * param0);
-void sub_02064E68(UnkStruct_02061AB4 * param0);
-void sub_02064E78(UnkStruct_02061AB4 * param0);
-void sub_02064E88(UnkStruct_02061AB4 * param0);
-void sub_02064E98(UnkStruct_02061AB4 * param0);
-void sub_02064EA8(UnkStruct_02061AB4 * param0);
-void sub_02064EB8(UnkStruct_02061AB4 * param0);
-void sub_02064EC8(UnkStruct_02061AB4 * param0);
-void sub_0206505C(UnkStruct_02061AB4 * param0);
-void sub_0206506C(UnkStruct_02061AB4 * param0);
-void sub_0206507C(UnkStruct_02061AB4 * param0);
-void sub_0206508C(UnkStruct_02061AB4 * param0);
-void sub_0206509C(UnkStruct_02061AB4 * param0);
-void sub_020650AC(UnkStruct_02061AB4 * param0);
-void sub_020650BC(UnkStruct_02061AB4 * param0);
-void sub_020650CC(UnkStruct_02061AB4 * param0);
-void sub_020650DC(UnkStruct_02061AB4 * param0);
+void sub_0206453C(LocalMapObject * param0);
+void sub_02064548(LocalMapObject * param0);
+void sub_02064554(LocalMapObject * param0);
+void sub_02064560(LocalMapObject * param0);
+void sub_0206456C(LocalMapObject * param0);
+void sub_02064578(LocalMapObject * param0);
+void sub_02064584(LocalMapObject * param0);
+void sub_02064590(LocalMapObject * param0);
+void sub_0206459C(LocalMapObject * param0);
+void sub_020645A8(LocalMapObject * param0);
+void sub_020645B4(LocalMapObject * param0);
+void sub_020645C0(LocalMapObject * param0);
+void sub_02064624(LocalMapObject * param0);
+void sub_02064628(LocalMapObject * param0);
+void sub_02064638(LocalMapObject * param0);
+void sub_02064648(LocalMapObject * param0);
+void sub_02064658(LocalMapObject * param0);
+void sub_02064690(LocalMapObject * param0);
+void sub_02064918(LocalMapObject * param0);
+void sub_0206493C(LocalMapObject * param0);
+void sub_02064948(LocalMapObject * param0);
+void sub_02064954(LocalMapObject * param0);
+void sub_02064960(LocalMapObject * param0);
+void sub_02064990(LocalMapObject * param0);
+void sub_0206499C(LocalMapObject * param0);
+void sub_020649A8(LocalMapObject * param0);
+void sub_02064AF0(LocalMapObject * param0);
+void sub_02064AFC(LocalMapObject * param0);
+void sub_02064C28(LocalMapObject * param0);
+void sub_02064C48(LocalMapObject * param0);
+void sub_02064DC8(LocalMapObject * param0);
+void sub_02064DD8(LocalMapObject * param0);
+void sub_02064DE8(LocalMapObject * param0);
+void sub_02064DF8(LocalMapObject * param0);
+void sub_02064E08(LocalMapObject * param0);
+void sub_02064E18(LocalMapObject * param0);
+void sub_02064E28(LocalMapObject * param0);
+void sub_02064E38(LocalMapObject * param0);
+void sub_02064E48(LocalMapObject * param0);
+void sub_02064E58(LocalMapObject * param0);
+void sub_02064E68(LocalMapObject * param0);
+void sub_02064E78(LocalMapObject * param0);
+void sub_02064E88(LocalMapObject * param0);
+void sub_02064E98(LocalMapObject * param0);
+void sub_02064EA8(LocalMapObject * param0);
+void sub_02064EB8(LocalMapObject * param0);
+void sub_02064EC8(LocalMapObject * param0);
+void sub_0206505C(LocalMapObject * param0);
+void sub_0206506C(LocalMapObject * param0);
+void sub_0206507C(LocalMapObject * param0);
+void sub_0206508C(LocalMapObject * param0);
+void sub_0206509C(LocalMapObject * param0);
+void sub_020650AC(LocalMapObject * param0);
+void sub_020650BC(LocalMapObject * param0);
+void sub_020650CC(LocalMapObject * param0);
+void sub_020650DC(LocalMapObject * param0);
 
 #endif // POKEPLATINUM_UNK_0206450C_H
diff --git a/include/unk_020655F4.h b/include/unk_020655F4.h
index 11e7e52560..0ac93dd067 100644
--- a/include/unk_020655F4.h
+++ b/include/unk_020655F4.h
@@ -5,18 +5,18 @@
 #include "struct_decls/struct_02061AB4_decl.h"
 #include "overlay005/struct_ov5_021F8E3C.h"
 
-int sub_020655F4(const UnkStruct_02061AB4 * param0);
-void sub_02065638(UnkStruct_02061AB4 * param0, int param1);
-void sub_02065668(UnkStruct_02061AB4 * param0, int param1);
-int sub_02065684(const UnkStruct_02061AB4 * param0);
-int sub_020656AC(UnkStruct_02061AB4 * param0);
-void sub_020656DC(UnkStruct_02061AB4 * param0);
-SysTask * sub_02065700(UnkStruct_02061AB4 * param0, const UnkStruct_ov5_021F8E3C * param1);
+int sub_020655F4(const LocalMapObject * param0);
+void sub_02065638(LocalMapObject * param0, int param1);
+void sub_02065668(LocalMapObject * param0, int param1);
+int sub_02065684(const LocalMapObject * param0);
+int sub_020656AC(LocalMapObject * param0);
+void sub_020656DC(LocalMapObject * param0);
+SysTask * sub_02065700(LocalMapObject * param0, const UnkStruct_ov5_021F8E3C * param1);
 int sub_0206574C(SysTask * param0);
 void sub_02065758(SysTask * param0);
 int sub_02065838(int param0, int param1);
 int sub_0206587C(int param0);
-void sub_020658B4(UnkStruct_02061AB4 * param0);
-int sub_020658DC(UnkStruct_02061AB4 * param0);
+void sub_020658B4(LocalMapObject * param0);
+int sub_020658DC(LocalMapObject * param0);
 
 #endif // POKEPLATINUM_UNK_020655F4_H
diff --git a/include/unk_020673B8.h b/include/unk_020673B8.h
index 711261403a..78f6732a66 100644
--- a/include/unk_020673B8.h
+++ b/include/unk_020673B8.h
@@ -3,7 +3,7 @@
 
 #include "struct_decls/struct_02061AB4_decl.h"
 
-void sub_020673B8(UnkStruct_02061AB4 * param0);
-int sub_020673C0(UnkStruct_02061AB4 * param0);
+void sub_020673B8(LocalMapObject * param0);
+int sub_020673C0(LocalMapObject * param0);
 
 #endif // POKEPLATINUM_UNK_020673B8_H
diff --git a/include/unk_020677F4.h b/include/unk_020677F4.h
index 32824abf5d..015d2b1406 100644
--- a/include/unk_020677F4.h
+++ b/include/unk_020677F4.h
@@ -5,16 +5,16 @@
 #include "struct_decls/struct_02061AB4_decl.h"
 
 int sub_020677F4(int param0);
-int sub_02067800(const UnkStruct_02061AB4 * param0);
-void sub_02067834(UnkStruct_02061AB4 * param0);
-void sub_02067840(UnkStruct_02061AB4 * param0);
-void sub_02067850(UnkStruct_02061AB4 * param0);
-void sub_0206786C(UnkStruct_02061AB4 * param0);
-void sub_02067870(UnkStruct_02061AB4 * param0);
-void sub_02067890(UnkStruct_02061AB4 * param0);
-void sub_02067950(UnkStruct_02061AB4 * param0);
-void sub_02067968(UnkStruct_02061AB4 * param0);
-void sub_02067998(UnkStruct_02061AB4 * param0);
-UnkStruct_020216E0 * sub_02067A58(UnkStruct_02061AB4 * param0);
+int sub_02067800(const LocalMapObject * param0);
+void sub_02067834(LocalMapObject * param0);
+void sub_02067840(LocalMapObject * param0);
+void sub_02067850(LocalMapObject * param0);
+void sub_0206786C(LocalMapObject * param0);
+void sub_02067870(LocalMapObject * param0);
+void sub_02067890(LocalMapObject * param0);
+void sub_02067950(LocalMapObject * param0);
+void sub_02067968(LocalMapObject * param0);
+void sub_02067998(LocalMapObject * param0);
+UnkStruct_020216E0 * sub_02067A58(LocalMapObject * param0);
 
 #endif // POKEPLATINUM_UNK_020677F4_H
diff --git a/include/unk_02067A84.h b/include/unk_02067A84.h
index 43dde97b5b..128348d6b9 100644
--- a/include/unk_02067A84.h
+++ b/include/unk_02067A84.h
@@ -7,10 +7,10 @@
 #include "struct_decls/struct_02061AB4_decl.h"
 
 int sub_02067A84(FieldSystem * param0, BOOL param1);
-int sub_02067D58(const UnkStruct_02061AB4 * param0, PlayerAvatar * param1, int param2, int param3);
-int sub_02067F24(UnkStruct_02061AB4 * param0);
-int sub_02067F88(FieldSystem * param0, UnkStruct_02061AB4 * param1);
-SysTask * sub_02067FB8(FieldSystem * param0, UnkStruct_02061AB4 * param1, PlayerAvatar * param2, int param3, int param4, int param5, int param6, int param7);
+int sub_02067D58(const LocalMapObject * param0, PlayerAvatar * param1, int param2, int param3);
+int sub_02067F24(LocalMapObject * param0);
+int sub_02067F88(FieldSystem * param0, LocalMapObject * param1);
+SysTask * sub_02067FB8(FieldSystem * param0, LocalMapObject * param1, PlayerAvatar * param2, int param3, int param4, int param5, int param6, int param7);
 int sub_02067FD4(SysTask * param0);
 void sub_02067FE8(SysTask * param0);
 
diff --git a/include/unk_02069BE0.h b/include/unk_02069BE0.h
index d14957357b..1940ae8388 100644
--- a/include/unk_02069BE0.h
+++ b/include/unk_02069BE0.h
@@ -4,37 +4,37 @@
 #include "struct_decls/struct_02061AB4_decl.h"
 #include "overlay101/struct_ov101_021D5D90_decl.h"
 
-void sub_02069BE0(UnkStruct_02061AB4 * param0);
-void sub_02069C0C(UnkStruct_02061AB4 * param0);
-void sub_02069C44(UnkStruct_02061AB4 * param0);
-void sub_02069DF4(UnkStruct_02061AB4 * param0);
-void sub_02069E1C(UnkStruct_02061AB4 * param0);
-void sub_02069E4C(UnkStruct_02061AB4 * param0);
-void sub_02069E50(UnkStruct_02061AB4 * param0);
-UnkStruct_02061AB4 * sub_02069EB8(UnkStruct_02061AB4 * param0);
-void sub_0206A104(UnkStruct_02061AB4 * param0);
-void sub_0206A110(UnkStruct_02061AB4 * param0);
-void sub_0206A11C(UnkStruct_02061AB4 * param0);
-void sub_0206A128(UnkStruct_02061AB4 * param0);
-void sub_0206A134(UnkStruct_02061AB4 * param0);
-void sub_0206A158(UnkStruct_02061AB4 * param0);
-void sub_0206A168(UnkStruct_02061AB4 * param0);
-void sub_0206A218(UnkStruct_02061AB4 * param0, UnkStruct_ov101_021D5D90 * param1);
-UnkStruct_ov101_021D5D90 * sub_0206A224(UnkStruct_02061AB4 * param0);
-void sub_0206A230(UnkStruct_02061AB4 * param0);
-void sub_0206A25C(UnkStruct_02061AB4 * param0);
-void sub_0206A268(UnkStruct_02061AB4 * param0);
-void sub_0206A274(UnkStruct_02061AB4 * param0);
-void sub_0206A280(UnkStruct_02061AB4 * param0);
-void sub_0206A28C(UnkStruct_02061AB4 * param0);
-void sub_0206A298(UnkStruct_02061AB4 * param0);
-void sub_0206A2A4(UnkStruct_02061AB4 * param0);
-void sub_0206A2B0(UnkStruct_02061AB4 * param0);
-void sub_0206A2BC(UnkStruct_02061AB4 * param0);
-void sub_0206A490(UnkStruct_02061AB4 * param0);
-void sub_0206A49C(UnkStruct_02061AB4 * param0);
-void sub_0206A4A8(UnkStruct_02061AB4 * param0);
-void sub_0206A4B4(UnkStruct_02061AB4 * param0);
-void sub_0206A4C0(UnkStruct_02061AB4 * param0);
+void sub_02069BE0(LocalMapObject * param0);
+void sub_02069C0C(LocalMapObject * param0);
+void sub_02069C44(LocalMapObject * param0);
+void sub_02069DF4(LocalMapObject * param0);
+void sub_02069E1C(LocalMapObject * param0);
+void sub_02069E4C(LocalMapObject * param0);
+void sub_02069E50(LocalMapObject * param0);
+LocalMapObject * sub_02069EB8(LocalMapObject * param0);
+void sub_0206A104(LocalMapObject * param0);
+void sub_0206A110(LocalMapObject * param0);
+void sub_0206A11C(LocalMapObject * param0);
+void sub_0206A128(LocalMapObject * param0);
+void sub_0206A134(LocalMapObject * param0);
+void sub_0206A158(LocalMapObject * param0);
+void sub_0206A168(LocalMapObject * param0);
+void sub_0206A218(LocalMapObject * param0, UnkStruct_ov101_021D5D90 * param1);
+UnkStruct_ov101_021D5D90 * sub_0206A224(LocalMapObject * param0);
+void sub_0206A230(LocalMapObject * param0);
+void sub_0206A25C(LocalMapObject * param0);
+void sub_0206A268(LocalMapObject * param0);
+void sub_0206A274(LocalMapObject * param0);
+void sub_0206A280(LocalMapObject * param0);
+void sub_0206A28C(LocalMapObject * param0);
+void sub_0206A298(LocalMapObject * param0);
+void sub_0206A2A4(LocalMapObject * param0);
+void sub_0206A2B0(LocalMapObject * param0);
+void sub_0206A2BC(LocalMapObject * param0);
+void sub_0206A490(LocalMapObject * param0);
+void sub_0206A49C(LocalMapObject * param0);
+void sub_0206A4A8(LocalMapObject * param0);
+void sub_0206A4B4(LocalMapObject * param0);
+void sub_0206A4C0(LocalMapObject * param0);
 
 #endif // POKEPLATINUM_UNK_02069BE0_H
diff --git a/src/overlay005/ov5_021D1C30.c b/src/overlay005/ov5_021D1C30.c
index 35b35f733b..b26b1a65c8 100644
--- a/src/overlay005/ov5_021D1C30.c
+++ b/src/overlay005/ov5_021D1C30.c
@@ -94,7 +94,7 @@ static u8 ov5_021D2CFC(const FieldSystem * param0);
 static u8 ov5_021D2D18(const FieldSystem * param0);
 static BOOL ov5_021D2D34(const FieldSystem * param0, int param1, int param2, UnkStruct_02049FA8 * param3);
 static void ov5_021D2E14(FieldSystem * param0);
-static BOOL ov5_021D2EA4(FieldSystem * param0, UnkStruct_02061AB4 ** param1);
+static BOOL ov5_021D2EA4(FieldSystem * param0, LocalMapObject ** param1);
 static int ov5_021D2274(void);
 
 static void ov5_021D1C30 (UnkStruct_ov5_021D1CAC * param0)
@@ -257,7 +257,7 @@ int ov5_021D1DA4 (const UnkStruct_ov5_021D1CAC * param0, FieldSystem * param1)
     if (param0->unk_00_0) {
         {
             int v4;
-            UnkStruct_02061AB4 * v5;
+            LocalMapObject * v5;
 
             if (sub_02071CB4(param1, 9) == 1) {
                 v4 = ov5_021D2EA4(param1, &v5);
@@ -361,7 +361,7 @@ int ov5_021D1DA4 (const UnkStruct_ov5_021D1CAC * param0, FieldSystem * param1)
 
 static BOOL ov5_021D20DC (FieldSystem * param0)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
     int v1;
 
     if (sub_0203CBE0(param0, &v0) == 1) {
@@ -425,7 +425,7 @@ BOOL ov5_021D219C (UnkStruct_ov5_021D1CAC * param0, FieldSystem * param1)
 
     if (param0->unk_00_0) {
         {
-            UnkStruct_02061AB4 * v0;
+            LocalMapObject * v0;
 
             if (sub_0203CA40(param1, &v0) == 1) {
                 UnkStruct_ov5_021D219C * v1;
@@ -486,7 +486,7 @@ BOOL ov5_021D2298 (const UnkStruct_ov5_021D1CAC * param0, FieldSystem * param1)
     }
 
     if (param0->unk_00_0) {
-        UnkStruct_02061AB4 * v0;
+        LocalMapObject * v0;
 
         if (sub_0203CA40(param1, &v0) == 1) {
             if (sub_0205F588(param1->playerAvatar) == 1) {
@@ -529,7 +529,7 @@ int ov5_021D2368 (const UnkStruct_ov5_021D1CAC * param0, FieldSystem * param1)
 
     if (param0->unk_00_0) {
         {
-            UnkStruct_02061AB4 * v0;
+            LocalMapObject * v0;
 
             if (sub_0203CA40(param1, &v0) == 1) {
                 UnkStruct_ov5_021D219C * v1;
@@ -1143,7 +1143,7 @@ static void ov5_021D2E14 (FieldSystem * param0)
     }
 }
 
-static BOOL ov5_021D2EA4 (FieldSystem * param0, UnkStruct_02061AB4 ** param1)
+static BOOL ov5_021D2EA4 (FieldSystem * param0, LocalMapObject ** param1)
 {
     int v0 = 0;
     int v1, v2, v3, v4, v5, v6;
diff --git a/src/overlay005/ov5_021D431C.c b/src/overlay005/ov5_021D431C.c
index 481d299a81..2831ca7ba9 100644
--- a/src/overlay005/ov5_021D431C.c
+++ b/src/overlay005/ov5_021D431C.c
@@ -72,7 +72,7 @@ void ov5_021D4334 (const int param0, const int param1, UnkStruct_ov5_021D432C *
 
 BOOL ov5_021D433C (FieldSystem * param0, UnkStruct_ov5_021D432C * param1)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
 
     switch (param1->unk_00) {
     case 0:
@@ -176,12 +176,12 @@ BOOL ov5_021D433C (FieldSystem * param0, UnkStruct_ov5_021D432C * param1)
     }
     break;
     case 3:
-        v0 = sub_0205EB3C(param0->playerAvatar);
+        v0 = Player_LocalMapObject(param0->playerAvatar);
         sub_02065638(v0, 0xc);
         (param1->unk_00)++;
         break;
     case 4:
-        v0 = sub_0205EB3C(param0->playerAvatar);
+        v0 = Player_LocalMapObject(param0->playerAvatar);
 
         if (sub_02065684(v0) == 1) {
             sub_020656AC(v0);
@@ -238,7 +238,7 @@ BOOL ov5_021D433C (FieldSystem * param0, UnkStruct_ov5_021D432C * param1)
 
 BOOL ov5_021D453C (FieldSystem * param0, UnkStruct_ov5_021D432C * param1)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
 
     switch (param1->unk_00) {
     case 0:
@@ -346,19 +346,19 @@ BOOL ov5_021D453C (FieldSystem * param0, UnkStruct_ov5_021D432C * param1)
         v12 = ov5_021D42F0(param0->unk_54, 1);
 
         if (v12) {
-            v0 = sub_0205EB3C(param0->playerAvatar);
+            v0 = Player_LocalMapObject(param0->playerAvatar);
             sub_02062D64(v0, 0);
             (param1->unk_00)++;
         }
     }
     break;
     case 3:
-        v0 = sub_0205EB3C(param0->playerAvatar);
+        v0 = Player_LocalMapObject(param0->playerAvatar);
         sub_02065638(v0, 0xd);
         (param1->unk_00)++;
         break;
     case 4:
-        v0 = sub_0205EB3C(param0->playerAvatar);
+        v0 = Player_LocalMapObject(param0->playerAvatar);
 
         if (sub_02065684(v0) == 1) {
             sub_020656AC(v0);
@@ -493,7 +493,7 @@ static u8 ov5_021D481C (const int param0)
 
 BOOL ov5_021D4858 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const u8 param2)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
 
     switch (param1->unk_00) {
     case 0:
@@ -524,7 +524,7 @@ BOOL ov5_021D4858 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const
             return 1;
         }
 
-        v0 = sub_0205EB3C(param0->playerAvatar);
+        v0 = Player_LocalMapObject(param0->playerAvatar);
 
         if (sub_020655F4(v0) == 1) {
             sub_02065638(v0, 0x49);
@@ -539,7 +539,7 @@ BOOL ov5_021D4858 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const
         ov5_021D1744(1);
         ov5_021D4278(param0->unk_54, 2, 0, 1557);
 
-        v0 = sub_0205EB3C(param0->playerAvatar);
+        v0 = Player_LocalMapObject(param0->playerAvatar);
 
         if (sub_020655F4(v0) == 1) {
             int v8;
@@ -558,7 +558,7 @@ BOOL ov5_021D4858 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const
         (param1->unk_00)++;
         break;
     case 2:
-        v0 = sub_0205EB3C(param0->playerAvatar);
+        v0 = Player_LocalMapObject(param0->playerAvatar);
 
         if (sub_020655F4(v0) == 1) {
             sub_02065638(v0, 0x4a);
@@ -566,7 +566,7 @@ BOOL ov5_021D4858 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const
         }
         break;
     case 3:
-        v0 = sub_0205EB3C(param0->playerAvatar);
+        v0 = Player_LocalMapObject(param0->playerAvatar);
 
         if (sub_020655F4(v0) == 1) {
             int v9;
@@ -582,7 +582,7 @@ BOOL ov5_021D4858 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const
         }
         break;
     case 4:
-        v0 = sub_0205EB3C(param0->playerAvatar);
+        v0 = Player_LocalMapObject(param0->playerAvatar);
 
         if (sub_02065684(v0) == 1) {
             sub_020656AC(v0);
@@ -609,7 +609,7 @@ BOOL ov5_021D4858 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const
 
 BOOL ov5_021D4A24 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const u8 param2)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
 
     switch (param1->unk_00) {
     case 0:
@@ -640,7 +640,7 @@ BOOL ov5_021D4A24 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const
             return 1;
         }
 
-        v0 = sub_0205EB3C(param0->playerAvatar);
+        v0 = Player_LocalMapObject(param0->playerAvatar);
 
         if (sub_020655F4(v0) == 1) {
             sub_02065638(v0, 0x49);
@@ -653,7 +653,7 @@ BOOL ov5_021D4A24 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const
     break;
     case 1:
         ov5_021D4278(param0->unk_54, 2, 0, 1557);
-        v0 = sub_0205EB3C(param0->playerAvatar);
+        v0 = Player_LocalMapObject(param0->playerAvatar);
 
         if (sub_020655F4(v0) == 1) {
             int v8;
@@ -672,7 +672,7 @@ BOOL ov5_021D4A24 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const
         (param1->unk_00)++;
         break;
     case 2:
-        v0 = sub_0205EB3C(param0->playerAvatar);
+        v0 = Player_LocalMapObject(param0->playerAvatar);
 
         if (sub_020655F4(v0) == 1) {
             sub_02065638(v0, 0x4a);
@@ -682,7 +682,7 @@ BOOL ov5_021D4A24 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const
         }
         break;
     case 3:
-        v0 = sub_0205EB3C(param0->playerAvatar);
+        v0 = Player_LocalMapObject(param0->playerAvatar);
 
         if (sub_02065684(v0) == 1) {
             sub_020656AC(v0);
@@ -886,13 +886,13 @@ UnkStruct_ov5_021D4E00 * ov5_021D4E00 (void)
 
 BOOL ov5_021D4E10 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
     FieldSystem * v1 = sub_02050A60(param0);
     UnkStruct_ov5_021D4E00 * v2 = sub_02050A64(param0);
 
     switch (v2->unk_00) {
     case 0:
-        v0 = sub_0205EB3C(v1->playerAvatar);
+        v0 = Player_LocalMapObject(v1->playerAvatar);
 
         if (Player_Dir(v1->playerAvatar) == 1) {
             sub_02062D64(v0, 1);
@@ -914,13 +914,13 @@ BOOL ov5_021D4E10 (UnkStruct_020508D4 * param0)
         v2->unk_08 = 1;
         break;
     case 1:
-        v0 = sub_0205EB3C(v1->playerAvatar);
+        v0 = Player_LocalMapObject(v1->playerAvatar);
         sub_02062D64(v0, 0);
         sub_02065638(v0, 0xd);
         (v2->unk_00)++;
         break;
     case 2:
-        v0 = sub_0205EB3C(v1->playerAvatar);
+        v0 = Player_LocalMapObject(v1->playerAvatar);
 
         if (sub_02065684(v0) == 1) {
             sub_020656AC(v0);
@@ -950,9 +950,9 @@ BOOL ov5_021D4F14 (UnkStruct_020508D4 * param0)
     switch (v1->unk_00) {
     case 0:
     {
-        UnkStruct_02061AB4 * v2;
+        LocalMapObject * v2;
 
-        v2 = sub_0205EB3C(v0->playerAvatar);
+        v2 = Player_LocalMapObject(v0->playerAvatar);
 
         sub_02062D64(v2, 1);
 
@@ -1016,7 +1016,7 @@ BOOL ov5_021D4FA0 (UnkStruct_020508D4 * param0)
 
 BOOL ov5_021D5020 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
     FieldSystem * v1 = sub_02050A60(param0);
     UnkStruct_ov5_021D4E00 * v2 = sub_02050A64(param0);
 
@@ -1026,7 +1026,7 @@ BOOL ov5_021D5020 (UnkStruct_020508D4 * param0)
         u8 v3;
         u8 v4;
 
-        v0 = sub_0205EB3C(v1->playerAvatar);
+        v0 = Player_LocalMapObject(v1->playerAvatar);
         v3 = Player_Dir(v1->playerAvatar);
 
         if (v3 == 1) {
@@ -1067,13 +1067,13 @@ BOOL ov5_021D5020 (UnkStruct_020508D4 * param0)
     }
     break;
     case 1:
-        v0 = sub_0205EB3C(v1->playerAvatar);
+        v0 = Player_LocalMapObject(v1->playerAvatar);
         sub_02062D64(v0, 0);
         sub_02065638(v0, 0xd);
         (v2->unk_00)++;
         break;
     case 2:
-        v0 = sub_0205EB3C(v1->playerAvatar);
+        v0 = Player_LocalMapObject(v1->playerAvatar);
 
         if (sub_02065684(v0) == 1) {
             sub_020656AC(v0);
@@ -1097,7 +1097,7 @@ BOOL ov5_021D5020 (UnkStruct_020508D4 * param0)
 
 BOOL ov5_021D5150 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
     FieldSystem * v1 = sub_02050A60(param0);
     UnkStruct_ov5_021D4E00 * v2 = sub_02050A64(param0);
 
@@ -1107,7 +1107,7 @@ BOOL ov5_021D5150 (UnkStruct_020508D4 * param0)
         u8 v3;
         u8 v4;
 
-        v0 = sub_0205EB3C(v1->playerAvatar);
+        v0 = Player_LocalMapObject(v1->playerAvatar);
         v3 = Player_Dir(v1->playerAvatar);
 
         if (v3 == 1) {
@@ -1122,13 +1122,13 @@ BOOL ov5_021D5150 (UnkStruct_020508D4 * param0)
     }
     break;
     case 1:
-        v0 = sub_0205EB3C(v1->playerAvatar);
+        v0 = Player_LocalMapObject(v1->playerAvatar);
         sub_02062D64(v0, 0);
         sub_02065638(v0, 0xd);
         (v2->unk_00)++;
         break;
     case 2:
-        v0 = sub_0205EB3C(v1->playerAvatar);
+        v0 = Player_LocalMapObject(v1->playerAvatar);
 
         if (sub_02065684(v0) == 1) {
             sub_020656AC(v0);
diff --git a/src/overlay005/ov5_021DB888.c b/src/overlay005/ov5_021DB888.c
index 6cc70c1e05..a13e5ff6ae 100644
--- a/src/overlay005/ov5_021DB888.c
+++ b/src/overlay005/ov5_021DB888.c
@@ -37,7 +37,7 @@ typedef struct {
     FieldSystem * unk_04;
     UnkStruct_020507E4 * unk_08;
     const UnkStruct_ov5_021F8E48 * unk_0C;
-    UnkStruct_02061AB4 * unk_10[64];
+    LocalMapObject * unk_10[64];
     u16 unk_110;
     u16 unk_112;
     u16 * unk_114;
@@ -52,30 +52,30 @@ typedef struct {
 } UnkStruct_ov5_021DBC64;
 
 void ov5_021DB888(UnkStruct_020508D4 * param0, StringFormatter * param1, u16 * param2);
-u16 ov5_021DBD98(FieldSystem * param0, UnkStruct_02061AB4 * param1, u16 param2);
+u16 ov5_021DBD98(FieldSystem * param0, LocalMapObject * param1, u16 param2);
 BOOL ov5_021DBB94(FieldSystem * param0);
 static BOOL ov5_021DBB70(u32 param0);
 static BOOL ov5_021DB8D8(UnkStruct_020508D4 * param0);
 static int ov5_021DBA58(UnkStruct_ov5_021DBA58 * param0);
 static void ov5_021DBA54(UnkStruct_ov5_021DBA58 * param0, u32 param1);
 static void ov5_021DBA7C(UnkStruct_ov5_021DBA58 * param0);
-static void ov5_021DBC40(UnkStruct_ov5_021DBA58 * param0, UnkStruct_02061AB4 * param1, const UnkStruct_ov5_021F8E3C * param2);
+static void ov5_021DBC40(UnkStruct_ov5_021DBA58 * param0, LocalMapObject * param1, const UnkStruct_ov5_021F8E3C * param2);
 static void ov5_021DBC64(UnkStruct_ov5_021DBA58 * param0, SysTask * param1);
 static void ov5_021DBC94(SysTask * param0, void * param1);
 static BOOL ov5_021DBCD4(UnkStruct_ov5_021DBA58 * param0);
 static BOOL ov5_021DBCE0(UnkStruct_ov5_021DBA58 * param0);
-static u16 ov5_021DBD88(UnkStruct_02061AB4 * param0);
+static u16 ov5_021DBD88(LocalMapObject * param0);
 static void ov5_021DBC08(FieldSystem * param0);
 static u16 ov5_021DBDDC(FieldSystem * param0, u16 param1);
 static u16 ov5_021DBDFC(FieldSystem * param0, u16 param1);
 static u16 ov5_021DBE48(FieldSystem * param0, u16 param1, u16 param2);
 static u16 ov5_021DBE70(u16 param0, u16 param1);
 static u16 ov5_021DBEA4(u16 param0, u16 param1);
-static BOOL ov5_021DBEB8(UnkStruct_02061AB4 * param0);
-static void ov5_021DBECC(UnkStruct_02061AB4 * param0, u16 param1);
-void ov5_021DBED4(FieldSystem * param0, UnkStruct_02061AB4 * param1);
+static BOOL ov5_021DBEB8(LocalMapObject * param0);
+static void ov5_021DBECC(LocalMapObject * param0, u16 param1);
+void ov5_021DBED4(FieldSystem * param0, LocalMapObject * param1);
 static BOOL ov5_021DBF20(FieldSystem * param0);
-static UnkStruct_02061AB4 * ov5_021DBF70(FieldSystem * param0, UnkStruct_02061AB4 * param1, int param2);
+static LocalMapObject * ov5_021DBF70(FieldSystem * param0, LocalMapObject * param1, int param2);
 
 const UnkStruct_ov5_021F8E48 Unk_ov5_021F8E48[] = {
 	{ 0xE, 0xE, 0x0, 0x0, 0x0, 0x0 },
@@ -460,7 +460,7 @@ static void ov5_021DBA7C (UnkStruct_ov5_021DBA58 * param0)
     u32 v2;
     int v3, v4, v5, v6;
     int v7, v8, v9, v10;
-    UnkStruct_02061AB4 * v11;
+    LocalMapObject * v11;
     u32 v12 = sub_0203A4B4(param0->unk_04);
 
     v6 = 0;
@@ -561,7 +561,7 @@ BOOL ov5_021DBB94 (FieldSystem * param0)
 static void ov5_021DBC08 (FieldSystem * param0)
 {
     int v0;
-    UnkStruct_02061AB4 * v1;
+    LocalMapObject * v1;
     u32 v2 = sub_0203A4B4(param0);
 
     for (v0 = 0; v0 < v2; v0++) {
@@ -579,7 +579,7 @@ static void ov5_021DBC08 (FieldSystem * param0)
     return;
 }
 
-static void ov5_021DBC40 (UnkStruct_ov5_021DBA58 * param0, UnkStruct_02061AB4 * param1, const UnkStruct_ov5_021F8E3C * param2)
+static void ov5_021DBC40 (UnkStruct_ov5_021DBA58 * param0, LocalMapObject * param1, const UnkStruct_ov5_021F8E3C * param2)
 {
     SysTask * v0;
 
@@ -635,7 +635,7 @@ static BOOL ov5_021DBCD4 (UnkStruct_ov5_021DBA58 * param0)
 static BOOL ov5_021DBCE0 (UnkStruct_ov5_021DBA58 * param0)
 {
     UnkStruct_020507E4 * v0 = SaveData_Events(param0->unk_04->unk_0C);
-    UnkStruct_02061AB4 * v1;
+    LocalMapObject * v1;
     u16 v2;
     int v3, v4;
 
@@ -670,13 +670,13 @@ static BOOL ov5_021DBCE0 (UnkStruct_ov5_021DBA58 * param0)
     return v4;
 }
 
-static u16 ov5_021DBD88 (UnkStruct_02061AB4 * param0)
+static u16 ov5_021DBD88 (LocalMapObject * param0)
 {
     u32 v0 = sub_02062960(param0);
     return sub_0203F254(v0);
 }
 
-u16 ov5_021DBD98 (FieldSystem * param0, UnkStruct_02061AB4 * param1, u16 param2)
+u16 ov5_021DBD98 (FieldSystem * param0, LocalMapObject * param1, u16 param2)
 {
     u16 v0, v1, v2;
 
@@ -772,7 +772,7 @@ static u16 ov5_021DBEA4 (u16 param0, u16 param1)
     return v0[param0].unk_00[param1];
 }
 
-static BOOL ov5_021DBEB8 (UnkStruct_02061AB4 * param0)
+static BOOL ov5_021DBEB8 (LocalMapObject * param0)
 {
     if (sub_02062948(param0) == 0x31) {
         return 1;
@@ -781,15 +781,15 @@ static BOOL ov5_021DBEB8 (UnkStruct_02061AB4 * param0)
     return 0;
 }
 
-static void ov5_021DBECC (UnkStruct_02061AB4 * param0, u16 param1)
+static void ov5_021DBECC (LocalMapObject * param0, u16 param1)
 {
     sub_020633A8(param0, param1);
     return;
 }
 
-void ov5_021DBED4 (FieldSystem * param0, UnkStruct_02061AB4 * param1)
+void ov5_021DBED4 (FieldSystem * param0, LocalMapObject * param1)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
     u32 v1;
     int v2;
 
@@ -822,7 +822,7 @@ void ov5_021DBED4 (FieldSystem * param0, UnkStruct_02061AB4 * param1)
 static BOOL ov5_021DBF20 (FieldSystem * param0)
 {
     int v0, v1;
-    UnkStruct_02061AB4 * v2;
+    LocalMapObject * v2;
     u32 v3 = sub_0203A4B4(param0);
 
     v1 = 0;
@@ -849,9 +849,9 @@ static BOOL ov5_021DBF20 (FieldSystem * param0)
     }
 }
 
-static UnkStruct_02061AB4 * ov5_021DBF70 (FieldSystem * param0, UnkStruct_02061AB4 * param1, int param2)
+static LocalMapObject * ov5_021DBF70 (FieldSystem * param0, LocalMapObject * param1, int param2)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
     u32 v1, v2, v3, v4;
     u32 v5 = sub_0203A4B4(param0);
     u16 v6 = sub_02062960(param1);
diff --git a/src/overlay005/ov5_021DF440.c b/src/overlay005/ov5_021DF440.c
index 28fb74ded3..71027e5cb1 100644
--- a/src/overlay005/ov5_021DF440.c
+++ b/src/overlay005/ov5_021DF440.c
@@ -225,7 +225,7 @@ FieldSystem * ov5_021DF574 (const UnkStruct_ov5_021DF47C * param0)
     return param0->unk_10;
 }
 
-UnkStruct_ov5_021DF47C * ov5_021DF578 (const UnkStruct_02061AB4 * param0)
+UnkStruct_ov5_021DF47C * ov5_021DF578 (const LocalMapObject * param0)
 {
     FieldSystem * v0 = sub_02062C00(param0);
     return (UnkStruct_ov5_021DF47C *)v0->unk_40;
diff --git a/src/overlay005/ov5_021DFB54.c b/src/overlay005/ov5_021DFB54.c
index 2556127cb6..23c62b4326 100644
--- a/src/overlay005/ov5_021DFB54.c
+++ b/src/overlay005/ov5_021DFB54.c
@@ -58,7 +58,7 @@ typedef struct {
     int unk_04;
     FieldSystem * unk_08;
     PlayerAvatar * unk_0C;
-    UnkStruct_02061AB4 * unk_10;
+    LocalMapObject * unk_10;
     UnkStruct_ov9_0224F6EC * unk_14;
 } UnkStruct_ov5_021DFF88;
 
@@ -69,7 +69,7 @@ typedef struct {
     UnkStruct_ov5_021E1050 unk_0C;
     FieldSystem * unk_1C;
     PlayerAvatar * unk_20;
-    UnkStruct_02061AB4 * unk_24;
+    LocalMapObject * unk_24;
     UnkStruct_ov101_021D5D90 * unk_28;
 } UnkStruct_ov5_021E00B0;
 
@@ -78,7 +78,7 @@ typedef struct {
     int unk_04;
     FieldSystem * unk_08;
     PlayerAvatar * unk_0C;
-    UnkStruct_02061AB4 * unk_10;
+    LocalMapObject * unk_10;
     UnkStruct_ov101_021D5D90 * unk_14;
 } UnkStruct_ov5_021E0390;
 
@@ -88,7 +88,7 @@ typedef struct {
     int unk_08;
     FieldSystem * unk_0C;
     PlayerAvatar * unk_10;
-    UnkStruct_02061AB4 * unk_14;
+    LocalMapObject * unk_14;
     UnkStruct_ov101_021D5D90 * unk_18;
     UnkStruct_ov5_021E1050 unk_1C;
     UnkStruct_ov5_021D1BEC * unk_2C;
@@ -106,7 +106,7 @@ typedef struct {
     VecFx32 unk_28;
     FieldSystem * unk_34;
     PlayerAvatar * unk_38;
-    UnkStruct_02061AB4 * unk_3C;
+    LocalMapObject * unk_3C;
     UnkStruct_ov5_021E1050 unk_40;
     UnkStruct_ov5_021D1BEC * unk_50;
 } UnkStruct_ov5_021F9B10;
@@ -121,7 +121,7 @@ typedef struct {
 typedef struct {
     FieldSystem * unk_00;
     PlayerAvatar * unk_04;
-    UnkStruct_02061AB4 * unk_08;
+    LocalMapObject * unk_08;
     int unk_0C;
     int unk_10;
     SysTask * unk_14;
@@ -137,7 +137,7 @@ typedef struct {
 static int ov5_021DFE68(FieldSystem * param0, PlayerAvatar * param1, int param2, int param3);
 static int ov5_021DFEF4(FieldSystem * param0, PlayerAvatar * param1, int param2, int param3);
 static int ov5_021DFF1C(FieldSystem * param0, PlayerAvatar * param1, int param2, int param3);
-static void ov5_021DFF88(int param0, FieldSystem * param1, PlayerAvatar * param2, UnkStruct_02061AB4 * param3);
+static void ov5_021DFF88(int param0, FieldSystem * param1, PlayerAvatar * param2, LocalMapObject * param3);
 static BOOL ov5_021DFFBC(UnkStruct_020508D4 * param0);
 static void ov5_021E00B0(FieldSystem * param0, int param1, const UnkStruct_ov5_021E1050 * param2);
 static BOOL ov5_021E0160(UnkStruct_020508D4 * param0);
@@ -162,7 +162,7 @@ static void ov5_021E103C(FieldSystem * param0, UnkStruct_ov5_021E1050 * param1);
 static int ov5_021E1050(UnkStruct_ov5_021E1050 * param0);
 static void ov5_021E106C(PlayerAvatar * param0, int param1);
 static void ov5_021E10C0(void * param0, const UnkStruct_020216E0 * param1);
-static UnkStruct_02061AB4 * ov5_021E10D4(PlayerAvatar * param0, int param1);
+static LocalMapObject * ov5_021E10D4(PlayerAvatar * param0, int param1);
 static void * ov5_021E1110(int param0);
 static void ov5_021E1134(void * param0);
 static Pokemon * ov5_021E1140(FieldSystem * param0, int param1);
@@ -203,7 +203,7 @@ static void ov5_021DFB90 (PlayerAvatar * param0)
     if (sub_0205F108(param0) != 0) {
         v1 = 0x18;
     } else {
-        UnkStruct_02061AB4 * v2 = sub_0205EB3C(param0);
+        LocalMapObject * v2 = Player_LocalMapObject(param0);
         FieldSystem * v3 = sub_02062C00(v2);
 
         if (sub_02071CB4(v3, 2) == 1) {
@@ -254,7 +254,7 @@ static void ov5_021DFBF4 (PlayerAvatar * param0)
 static void ov5_021DFC3C (PlayerAvatar * param0)
 {
     int v0, v1;
-    UnkStruct_02061AB4 * v2 = sub_0205EB3C(param0);
+    LocalMapObject * v2 = Player_LocalMapObject(param0);
     FieldSystem * v3 = sub_02062C00(v2);
     int v4 = sub_0205F108(param0);
     UnkStruct_ov101_021D5D90 * v5 = sub_0205EC04(param0);
@@ -317,7 +317,7 @@ static void ov5_021DFD28 (PlayerAvatar * param0)
     if (sub_0205F108(param0) != 0) {
         v1 = 0x1b;
     } else {
-        UnkStruct_02061AB4 * v2 = sub_0205EB3C(param0);
+        LocalMapObject * v2 = Player_LocalMapObject(param0);
         FieldSystem * v3 = sub_02062C00(v2);
 
         if (sub_02071CB4(v3, 2) == 1) {
@@ -337,7 +337,7 @@ static void ov5_021DFD68 (PlayerAvatar * param0)
     if (sub_0205F108(param0) != 0) {
         v1 = 0x1a;
     } else {
-        UnkStruct_02061AB4 * v2 = sub_0205EB3C(param0);
+        LocalMapObject * v2 = Player_LocalMapObject(param0);
         FieldSystem * v3 = sub_02062C00(v2);
 
         if (sub_02071CB4(v3, 2) == 1) {
@@ -381,10 +381,10 @@ static void(*const Unk_ov5_021F9B74[10])(PlayerAvatar *) = {
 int ov5_021DFDE0 (FieldSystem * param0, PlayerAvatar * param1, int param2, int param3)
 {
     {
-        UnkStruct_02061AB4 * v0;
+        LocalMapObject * v0;
 
         GF_ASSERT(param1 != NULL);
-        v0 = sub_0205EB3C(param1);
+        v0 = Player_LocalMapObject(param1);
         GF_ASSERT(v0 != NULL);
     }
 
@@ -466,7 +466,7 @@ static int ov5_021DFF1C (FieldSystem * param0, PlayerAvatar * param1, int param2
     }
 
     {
-        UnkStruct_02061AB4 * v0 = ov5_021E10D4(param1, param2);
+        LocalMapObject * v0 = ov5_021E10D4(param1, param2);
 
         if (v0 == NULL) {
             return 0;
@@ -501,7 +501,7 @@ static int ov5_021DFF1C (FieldSystem * param0, PlayerAvatar * param1, int param2
     }
 }
 
-static void ov5_021DFF88 (int param0, FieldSystem * param1, PlayerAvatar * param2, UnkStruct_02061AB4 * param3)
+static void ov5_021DFF88 (int param0, FieldSystem * param1, PlayerAvatar * param2, LocalMapObject * param3)
 {
     UnkStruct_ov5_021DFF88 * v0 = ov5_021E1110((sizeof(UnkStruct_ov5_021DFF88)));
 
@@ -517,8 +517,8 @@ static void ov5_021DFF88 (int param0, FieldSystem * param1, PlayerAvatar * param
 static BOOL ov5_021DFFBC (UnkStruct_020508D4 * param0)
 {
     UnkStruct_ov5_021DFF88 * v0 = sub_02050A64(param0);
-    UnkStruct_02061AB4 * v1 = sub_0205EB3C(v0->unk_0C);
-    UnkStruct_02061AB4 * v2 = v0->unk_10;
+    LocalMapObject * v1 = Player_LocalMapObject(v0->unk_0C);
+    LocalMapObject * v2 = v0->unk_10;
 
     switch (v0->unk_00) {
     case 0:
@@ -586,7 +586,7 @@ static void ov5_021E00B0 (FieldSystem * param0, int param1, const UnkStruct_ov5_
     v0->unk_04 = param1;
     v0->unk_1C = param0;
     v0->unk_20 = param0->playerAvatar;
-    v0->unk_24 = sub_0205EB3C(v0->unk_20);
+    v0->unk_24 = Player_LocalMapObject(v0->unk_20);
     v0->unk_0C = *param2;
 
     sub_02050944(param0->unk_10, ov5_021E0160, v0);
@@ -604,7 +604,7 @@ void ov5_021E00EC (UnkStruct_020508D4 * param0, int param1, int param2)
 
 int ov5_021E0118 (PlayerAvatar * param0, u32 param1, u32 param2)
 {
-    UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0);
+    LocalMapObject * v0 = Player_LocalMapObject(param0);
 
     if (sub_0205DB58(param2) == 1) {
         if ((sub_0205DEFC(param1) == 1) || (sub_0205DEF0(param1) == 1)) {
@@ -716,7 +716,7 @@ static int ov5_021E032C (FieldSystem * param0, PlayerAvatar * param1, int param2
 
     {
         u32 v0;
-        UnkStruct_02061AB4 * v1 = sub_0205EB3C(param1);
+        LocalMapObject * v1 = Player_LocalMapObject(param1);
 
         if (sub_0205F158(param1) == 0) {
             v0 = sub_02060B7C(param1, v1, param2);
@@ -746,7 +746,7 @@ static void ov5_021E0390 (int param0, FieldSystem * param1, PlayerAvatar * param
     v0->unk_04 = param0;
     v0->unk_08 = param1;
     v0->unk_0C = param2;
-    v0->unk_10 = sub_0205EB3C(param2);
+    v0->unk_10 = Player_LocalMapObject(param2);
     v0->unk_14 = sub_0205EC04(param2);
 
     sub_02050904(param1, ov5_021E03C8, v0);
@@ -828,7 +828,7 @@ static int ov5_021E04EC (FieldSystem * param0, PlayerAvatar * param1, int param2
     }
 
     {
-        UnkStruct_02061AB4 * v0 = sub_0205EB3C(param1);
+        LocalMapObject * v0 = Player_LocalMapObject(param1);
         u8 v1 = sub_02062BE8(v0);
 
         if ((sub_0205DCF0(v1) != 1) && (sub_0205DD0C(v1) != 1)) {
@@ -854,7 +854,7 @@ static void ov5_021E0534 (FieldSystem * param0, PlayerAvatar * param1)
 static BOOL ov5_021E0560 (UnkStruct_020508D4 * param0)
 {
     UnkStruct_ov5_021E0534 * v0 = sub_02050A64(param0);
-    UnkStruct_02061AB4 * v1 = sub_0205EB3C(v0->unk_0C);
+    LocalMapObject * v1 = Player_LocalMapObject(v0->unk_0C);
 
     switch (v0->unk_00) {
     case 0:
@@ -922,7 +922,7 @@ static BOOL ov5_021E0560 (UnkStruct_020508D4 * param0)
 
 static int ov5_021E067C (FieldSystem * param0, PlayerAvatar * param1, int param2)
 {
-    UnkStruct_02061AB4 * v0 = sub_0205EB3C(param1);
+    LocalMapObject * v0 = Player_LocalMapObject(param1);
 
     if (sub_020655F4(v0) == 0) {
         return 0;
@@ -943,7 +943,7 @@ static int ov5_021E06A8 (FieldSystem * param0, PlayerAvatar * param1)
 
     {
         int v0 = sub_0205EA94(param1);
-        UnkStruct_02061AB4 * v1 = ov5_021E10D4(param1, v0);
+        LocalMapObject * v1 = ov5_021E10D4(param1, v0);
 
         if (v1 == NULL) {
             return 0;
@@ -972,7 +972,7 @@ static void ov5_021E06F8 (FieldSystem * param0, int param1, const UnkStruct_ov5_
     v0->unk_04 = param1;
     v0->unk_0C = param0;
     v0->unk_10 = param0->playerAvatar;
-    v0->unk_14 = sub_0205EB3C(v0->unk_10);
+    v0->unk_14 = Player_LocalMapObject(v0->unk_10);
     v0->unk_1C = *param2;
 
     sub_02050944(param0->unk_10, ov5_021E07A0, v0);
@@ -1149,7 +1149,7 @@ static UnkStruct_ov5_021F9B10 * ov5_021E0948 (FieldSystem * param0, int param1,
     v0->unk_04 = param1;
     v0->unk_34 = param0;
     v0->unk_38 = param0->playerAvatar;
-    v0->unk_3C = sub_0205EB3C(param0->playerAvatar);
+    v0->unk_3C = Player_LocalMapObject(param0->playerAvatar);
 
     if (param2 != NULL) {
         v0->unk_40 = *param2;
@@ -1307,9 +1307,9 @@ static int ov5_021E0B64 (UnkStruct_ov5_021F9B10 * param0)
     GF_ASSERT(v0.z == param0->unk_28.z);
     GF_ASSERT(v0.y == param0->unk_28.y);
 
-    sub_02063024(param0->unk_3C, param0->unk_0C);
+    LocalMapObj_SetX(param0->unk_3C, param0->unk_0C);
     sub_02063034(param0->unk_3C, param0->unk_10);
-    sub_02063044(param0->unk_3C, param0->unk_14);
+    LocalMapObj_SetZ(param0->unk_3C, param0->unk_14);
     sub_02064208(param0->unk_3C);
 
     ov6_02248608(param0->unk_50);
@@ -1437,9 +1437,9 @@ static int ov5_021E0D40 (UnkStruct_ov5_021F9B10 * param0)
     GF_ASSERT(v0.z == param0->unk_28.z);
     GF_ASSERT(v0.y == param0->unk_28.y);
 
-    sub_02063024(param0->unk_3C, param0->unk_0C);
+    LocalMapObj_SetX(param0->unk_3C, param0->unk_0C);
     sub_02063034(param0->unk_3C, param0->unk_10);
-    sub_02063044(param0->unk_3C, param0->unk_14);
+    LocalMapObj_SetZ(param0->unk_3C, param0->unk_14);
     sub_02064208(param0->unk_3C);
 
     ov6_02248608(param0->unk_50);
@@ -1524,7 +1524,7 @@ static void ov5_021E0DE0 (FieldSystem * param0)
 
     v0->unk_00 = param0;
     v0->unk_04 = param0->playerAvatar;
-    v0->unk_08 = sub_0205EB3C(v0->unk_04);
+    v0->unk_08 = Player_LocalMapObject(v0->unk_04);
     v0->unk_10 = sub_0205EB98(v0->unk_04);
 
     sub_02050944(param0->unk_10, ov5_021E0E10, v0);
@@ -1564,7 +1564,7 @@ static BOOL ov5_021E0E10 (UnkStruct_020508D4 * param0)
 
 void ov5_021E0E94 (PlayerAvatar * param0)
 {
-    UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0);
+    LocalMapObject * v0 = Player_LocalMapObject(param0);
 
     if (sub_02062DFC(v0) == 0) {
         return;
@@ -1597,7 +1597,7 @@ void ov5_021E0E94 (PlayerAvatar * param0)
 
 void ov5_021E0EEC (PlayerAvatar * param0)
 {
-    UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0);
+    LocalMapObject * v0 = Player_LocalMapObject(param0);
 
     if (sub_02062DFC(v0) == 0) {
         return;
@@ -1639,7 +1639,7 @@ static SysTask * ov5_021E0F54 (FieldSystem * param0, u32 param1)
 
     {
         SysTask * v2;
-        UnkStruct_02061AB4 * v3 = sub_0205EB3C(v0);
+        LocalMapObject * v3 = Player_LocalMapObject(v0);
         UnkStruct_ov5_021E0FF0 * v4 = Heap_AllocFromHeapAtEnd(4, (sizeof(UnkStruct_ov5_021E0FF0)));
 
         v4->unk_00 = 0;
@@ -1678,7 +1678,7 @@ static void ov5_021E0FC0 (SysTask * param0)
 static void ov5_021E0FF0 (SysTask * param0, void * param1)
 {
     UnkStruct_ov5_021E0FF0 * v0 = param1;
-    UnkStruct_02061AB4 * v1 = sub_0205EB3C(v0->unk_0C);
+    LocalMapObject * v1 = Player_LocalMapObject(v0->unk_0C);
 
     sub_02062B68(v1);
 }
@@ -1727,7 +1727,7 @@ static int ov5_021E1050 (UnkStruct_ov5_021E1050 * param0)
 
 static void ov5_021E106C (PlayerAvatar * param0, int param1)
 {
-    UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0);
+    LocalMapObject * v0 = Player_LocalMapObject(param0);
 
     if (sub_0205F108(param0) == 0) {
         ov5_021EE3FC(v0, param1, NULL, NULL);
@@ -1749,18 +1749,18 @@ static void ov5_021E106C (PlayerAvatar * param0, int param1)
 static void ov5_021E10C0 (void * param0, const UnkStruct_020216E0 * param1)
 {
     PlayerAvatar * v0 = param0;
-    UnkStruct_02061AB4 * v1 = sub_0205EB3C(v0);
+    LocalMapObject * v1 = Player_LocalMapObject(v0);
     FieldSystem * v2 = sub_02062C00(v1);
 
     ov9_0224A564(v2, param1);
 }
 
-static UnkStruct_02061AB4 * ov5_021E10D4 (PlayerAvatar * param0, int param1)
+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(sub_0205EB3C(param0));
-    UnkStruct_02061AB4 * v3 = sub_0206326C(v2, v0, v1, 0);
+    const UnkStruct_02061830 * v2 = sub_02062A40(Player_LocalMapObject(param0));
+    LocalMapObject * v3 = sub_0206326C(v2, v0, v1, 0);
 
     return v3;
 }
diff --git a/src/overlay005/ov5_021E1154.c b/src/overlay005/ov5_021E1154.c
index f5176a839a..b12193476c 100644
--- a/src/overlay005/ov5_021E1154.c
+++ b/src/overlay005/ov5_021E1154.c
@@ -23,7 +23,7 @@ typedef struct {
     int unk_08;
     FieldSystem * unk_0C;
     PlayerAvatar * unk_10;
-    UnkStruct_02061AB4 * unk_14;
+    LocalMapObject * unk_14;
 } UnkStruct_ov5_021E11B0;
 
 static void ov5_021E11B0(FieldSystem * param0, PlayerAvatar * param1, int param2);
@@ -33,7 +33,7 @@ static void ov5_021E1350(void * param0);
 
 int ov5_021E1154 (FieldSystem * param0, PlayerAvatar * param1, int param2)
 {
-    UnkStruct_02061AB4 * v0 = sub_0205EB3C(param1);
+    LocalMapObject * v0 = Player_LocalMapObject(param1);
     u8 v1 = sub_02062BE8(v0);
     int v2;
 
@@ -84,7 +84,7 @@ static int ov5_021E11E0 (int param0)
 static BOOL ov5_021E120C (UnkStruct_020508D4 * param0)
 {
     UnkStruct_ov5_021E11B0 * v0 = sub_02050A64(param0);
-    UnkStruct_02061AB4 * v1 = sub_0205EB3C(v0->unk_10);
+    LocalMapObject * v1 = Player_LocalMapObject(v0->unk_10);
     u8 v2 = sub_02062BE8(v1);
 
     switch (v0->unk_08) {
diff --git a/src/overlay005/ov5_021E135C.c b/src/overlay005/ov5_021E135C.c
index fd9acae986..5edad286f4 100644
--- a/src/overlay005/ov5_021E135C.c
+++ b/src/overlay005/ov5_021E135C.c
@@ -48,7 +48,7 @@ static void ov5_021E135C (UnkStruct_ov5_021E135C * param0)
 static void ov5_021E139C (SysTask * param0, void * param1)
 {
     UnkStruct_ov5_021E135C * v0 = param1;
-    UnkStruct_02061AB4 * v1 = sub_0205EB3C(v0->unk_00->playerAvatar);
+    LocalMapObject * v1 = Player_LocalMapObject(v0->unk_00->playerAvatar);
     VecFx32 v2;
 
     switch (v0->unk_08) {
@@ -81,7 +81,7 @@ static void ov5_021E139C (SysTask * param0, void * param1)
 static void ov5_021E1470 (SysTask * param0, void * param1)
 {
     UnkStruct_ov5_021E135C * v0 = param1;
-    UnkStruct_02061AB4 * v1 = sub_0205EB3C(v0->unk_00->playerAvatar);
+    LocalMapObject * v1 = Player_LocalMapObject(v0->unk_00->playerAvatar);
     VecFx32 v2;
     int v3;
 
diff --git a/src/overlay005/ov5_021EB1A0.c b/src/overlay005/ov5_021EB1A0.c
index 394d15f27e..5d56bc4a3f 100644
--- a/src/overlay005/ov5_021EB1A0.c
+++ b/src/overlay005/ov5_021EB1A0.c
@@ -69,39 +69,39 @@ typedef struct {
     UnkStruct_ov5_021ED01C unk_0C;
 } UnkStruct_ov5_021EC938;
 
-void ov5_021EB2EC(UnkStruct_02061AB4 * param0);
-void ov5_021EB314(UnkStruct_02061AB4 * param0);
-void ov5_021EB328(UnkStruct_02061AB4 * param0);
-void ov5_021EB354(UnkStruct_02061AB4 * param0);
-void ov5_021EB398(UnkStruct_02061AB4 * param0);
-void ov5_021EB40C(UnkStruct_02061AB4 * param0);
-static void ov5_021EB478(UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3);
-static void ov5_021EB4AC(UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3);
-static void ov5_021EB4E8(UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3);
-static void ov5_021EB524(UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3);
-static void ov5_021EB560(UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3);
-static void ov5_021EB59C(UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3);
-static void ov5_021EB620(UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3);
-static void ov5_021EC068(UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3);
-static void ov5_021EC0E4(UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3);
-void ov5_021EC734(UnkStruct_02061AB4 * param0);
-void ov5_021EC75C(UnkStruct_02061AB4 * param0);
-void ov5_021EC760(UnkStruct_02061AB4 * param0);
-void ov5_021EC778(UnkStruct_02061AB4 * param0);
-void ov5_021EC790(UnkStruct_02061AB4 * param0);
+void ov5_021EB2EC(LocalMapObject * param0);
+void ov5_021EB314(LocalMapObject * param0);
+void ov5_021EB328(LocalMapObject * param0);
+void ov5_021EB354(LocalMapObject * param0);
+void ov5_021EB398(LocalMapObject * param0);
+void ov5_021EB40C(LocalMapObject * param0);
+static void ov5_021EB478(LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3);
+static void ov5_021EB4AC(LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3);
+static void ov5_021EB4E8(LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3);
+static void ov5_021EB524(LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3);
+static void ov5_021EB560(LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3);
+static void ov5_021EB59C(LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3);
+static void ov5_021EB620(LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3);
+static void ov5_021EC068(LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3);
+static void ov5_021EC0E4(LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3);
+void ov5_021EC734(LocalMapObject * param0);
+void ov5_021EC75C(LocalMapObject * param0);
+void ov5_021EC760(LocalMapObject * param0);
+void ov5_021EC778(LocalMapObject * param0);
+void ov5_021EC790(LocalMapObject * param0);
 static void ov5_021EC638(UnkStruct_020216E0 * param0, int param1);
 static void ov5_021EC668(UnkStruct_020216E0 * param0);
 static void ov5_021EC674(UnkStruct_020216E0 * param0, int param1, int param2);
 static void ov5_021EC69C(UnkStruct_020216E0 * param0, int param1);
-static void ov5_021EC6C0(UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * param1);
-static void ov5_021EC374(UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * param1, int param2);
+static void ov5_021EC6C0(LocalMapObject * param0, UnkStruct_020216E0 * param1);
+static void ov5_021EC374(LocalMapObject * param0, UnkStruct_020216E0 * param1, int param2);
 
-void(*const Unk_ov5_021FF3D4[])(UnkStruct_02061AB4 *, UnkStruct_020216E0 *, UnkStruct_ov5_021EB2EC *, int);
-void(*const Unk_ov5_021FF420[])(UnkStruct_02061AB4 *, UnkStruct_020216E0 *, UnkStruct_ov5_021EB2EC *, int);
-void(*const Unk_ov5_021FF3F8[])(UnkStruct_02061AB4 *, UnkStruct_020216E0 *, UnkStruct_ov5_021EBA0C *, int);
-static void(*const Unk_ov5_021FF448[11])(UnkStruct_02061AB4 *, UnkStruct_020216E0 *, UnkStruct_ov5_021EBA0C *, int);
+void(*const Unk_ov5_021FF3D4[])(LocalMapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EB2EC *, int);
+void(*const Unk_ov5_021FF420[])(LocalMapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EB2EC *, int);
+void(*const Unk_ov5_021FF3F8[])(LocalMapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EBA0C *, int);
+static void(*const Unk_ov5_021FF448[11])(LocalMapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EBA0C *, int);
 
-UnkStruct_020216E0 * ov5_021EB1A0 (UnkStruct_02061AB4 * param0)
+UnkStruct_020216E0 * ov5_021EB1A0 (LocalMapObject * param0)
 {
     int v0 = sub_02062920(param0);
 
@@ -186,7 +186,7 @@ UnkStruct_020216E0 * ov5_021EB1A0 (UnkStruct_02061AB4 * param0)
     return NULL;
 }
 
-void ov5_021EB2EC (UnkStruct_02061AB4 * param0)
+void ov5_021EB2EC (LocalMapObject * param0)
 {
     UnkStruct_ov5_021EB2EC * v0;
 
@@ -200,7 +200,7 @@ void ov5_021EB2EC (UnkStruct_02061AB4 * param0)
     }
 }
 
-void ov5_021EB314 (UnkStruct_02061AB4 * param0)
+void ov5_021EB314 (LocalMapObject * param0)
 {
     UnkStruct_ov5_021EB2EC * v0;
 
@@ -208,7 +208,7 @@ void ov5_021EB314 (UnkStruct_02061AB4 * param0)
     ov5_021ECFA4(param0, &v0->unk_04);
 }
 
-void ov5_021EB328 (UnkStruct_02061AB4 * param0)
+void ov5_021EB328 (LocalMapObject * param0)
 {
     UnkStruct_ov5_021EB2EC * v0;
 
@@ -222,7 +222,7 @@ void ov5_021EB328 (UnkStruct_02061AB4 * param0)
     sub_020628BC(param0, (1 << 21));
 }
 
-void ov5_021EB354 (UnkStruct_02061AB4 * param0)
+void ov5_021EB354 (LocalMapObject * param0)
 {
     int v0;
     UnkStruct_ov5_021EB2EC * v1;
@@ -245,7 +245,7 @@ void ov5_021EB354 (UnkStruct_02061AB4 * param0)
     }
 }
 
-void ov5_021EB398 (UnkStruct_02061AB4 * param0)
+void ov5_021EB398 (LocalMapObject * param0)
 {
     int v0, v1;
     UnkStruct_ov5_021EB2EC * v2 = sub_02062AF0(param0);
@@ -274,7 +274,7 @@ void ov5_021EB398 (UnkStruct_02061AB4 * param0)
     ov5_021EC6C0(param0, v3);
 }
 
-void ov5_021EB40C (UnkStruct_02061AB4 * param0)
+void ov5_021EB40C (LocalMapObject * param0)
 {
     int v0, v1;
     UnkStruct_ov5_021EB2EC * v2;
@@ -296,7 +296,7 @@ void ov5_021EB40C (UnkStruct_02061AB4 * param0)
     ov5_021EC6C0(param0, v3);
 }
 
-void ov5_021EB438 (UnkStruct_02061AB4 * param0)
+void ov5_021EB438 (LocalMapObject * param0)
 {
     int v0, v1;
     UnkStruct_ov5_021EB2EC * v2;
@@ -322,7 +322,7 @@ void ov5_021EB438 (UnkStruct_02061AB4 * param0)
     ov5_021EC6C0(param0, v3);
 }
 
-static void ov5_021EB478 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3)
+static void ov5_021EB478 (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3)
 {
     if (param3 != param2->unk_02) {
         int v0 = ov5_021EDF18(param3);
@@ -336,7 +336,7 @@ static void ov5_021EB478 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * para
     sub_02021368(param1, 0);
 }
 
-static void ov5_021EB4AC (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3)
+static void ov5_021EB4AC (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3)
 {
     if (param3 != param2->unk_02) {
         int v0 = ov5_021EDF18(param3);
@@ -350,7 +350,7 @@ static void ov5_021EB4AC (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * para
     }
 }
 
-static void ov5_021EB4E8 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3)
+static void ov5_021EB4E8 (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3)
 {
     if (param3 != param2->unk_02) {
         int v0 = ov5_021EDF18(param3);
@@ -364,7 +364,7 @@ static void ov5_021EB4E8 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * para
     }
 }
 
-static void ov5_021EB524 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3)
+static void ov5_021EB524 (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3)
 {
     if (param3 != param2->unk_02) {
         int v0 = ov5_021EDF18(param3);
@@ -378,7 +378,7 @@ static void ov5_021EB524 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * para
     }
 }
 
-static void ov5_021EB560 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3)
+static void ov5_021EB560 (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3)
 {
     if (param3 != param2->unk_02) {
         int v0 = ov5_021EDF18(param3);
@@ -392,7 +392,7 @@ static void ov5_021EB560 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * para
     }
 }
 
-static void ov5_021EB59C (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3)
+static void ov5_021EB59C (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3)
 {
     if (param3 != param2->unk_02) {
         int v0 = ov5_021EDF18(param3);
@@ -427,7 +427,7 @@ static void ov5_021EB59C (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * para
     }
 }
 
-static void ov5_021EB620 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3)
+static void ov5_021EB620 (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3)
 {
     if (param3 != param2->unk_02) {
         int v0 = ov5_021EDF18(param3);
@@ -459,7 +459,7 @@ static void ov5_021EB620 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * para
     }
 }
 
-static void ov5_021EB69C (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3)
+static void ov5_021EB69C (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3)
 {
     if (param3 != param2->unk_02) {
         int v0 = ov5_021EDF18(param3);
@@ -496,7 +496,7 @@ static void ov5_021EB69C (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * para
 }
 
 static void(*const Unk_ov5_021FF3D4[])(
-    UnkStruct_02061AB4 *, UnkStruct_020216E0 *, UnkStruct_ov5_021EB2EC *, int) = {
+    LocalMapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EB2EC *, int) = {
     ov5_021EB478,
     ov5_021EB4AC,
     ov5_021EB4AC,
@@ -508,7 +508,7 @@ static void(*const Unk_ov5_021FF3D4[])(
     ov5_021EB69C
 };
 
-void ov5_021EB720 (UnkStruct_02061AB4 * param0)
+void ov5_021EB720 (LocalMapObject * param0)
 {
     int v0, v1;
     UnkStruct_ov5_021EB2EC * v2 = sub_02062AF0(param0);
@@ -538,7 +538,7 @@ void ov5_021EB720 (UnkStruct_02061AB4 * param0)
     ov5_021EC6C0(param0, v3);
 }
 
-static void ov5_021EB794 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3)
+static void ov5_021EB794 (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3)
 {
     if ((param3 != param2->unk_02) || (param2->unk_03 == 0x9)) {
         int v0 = ov5_021EDF18(param3);
@@ -552,7 +552,7 @@ static void ov5_021EB794 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * para
     sub_02021368(param1, 0);
 }
 
-static void ov5_021EB7D0 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3)
+static void ov5_021EB7D0 (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EB2EC * param2, int param3)
 {
     if (param2->unk_03 != 0x9) {
         sub_02021344(param1, 4);
@@ -562,7 +562,7 @@ static void ov5_021EB7D0 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * para
     sub_02021368(param1, (FX32_ONE));
 }
 
-static void(*const Unk_ov5_021FF420[])(UnkStruct_02061AB4 *, UnkStruct_020216E0 *, UnkStruct_ov5_021EB2EC *, int) = {
+static void(*const Unk_ov5_021FF420[])(LocalMapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EB2EC *, int) = {
     ov5_021EB794,
     ov5_021EB4AC,
     ov5_021EB4AC,
@@ -575,7 +575,7 @@ static void(*const Unk_ov5_021FF420[])(UnkStruct_02061AB4 *, UnkStruct_020216E0
     ov5_021EB7D0
 };
 
-void ov5_021EB7F8 (UnkStruct_02061AB4 * param0)
+void ov5_021EB7F8 (LocalMapObject * param0)
 {
     UnkStruct_ov5_021EB7F8 * v0;
 
@@ -591,7 +591,7 @@ void ov5_021EB7F8 (UnkStruct_02061AB4 * param0)
     }
 }
 
-void ov5_021EB834 (UnkStruct_02061AB4 * param0)
+void ov5_021EB834 (LocalMapObject * param0)
 {
     UnkStruct_ov5_021EB7F8 * v0;
 
@@ -599,7 +599,7 @@ void ov5_021EB834 (UnkStruct_02061AB4 * param0)
     ov5_021ECFA4(param0, &v0->unk_04);
 }
 
-void ov5_021EB848 (UnkStruct_02061AB4 * param0)
+void ov5_021EB848 (LocalMapObject * param0)
 {
     UnkStruct_ov5_021EB7F8 * v0;
 
@@ -613,7 +613,7 @@ void ov5_021EB848 (UnkStruct_02061AB4 * param0)
     sub_020628BC(param0, (1 << 21));
 }
 
-void ov5_021EB874 (UnkStruct_02061AB4 * param0)
+void ov5_021EB874 (LocalMapObject * param0)
 {
     int v0;
     UnkStruct_ov5_021EB7F8 * v1;
@@ -635,7 +635,7 @@ void ov5_021EB874 (UnkStruct_02061AB4 * param0)
     }
 }
 
-void ov5_021EB8B8 (UnkStruct_02061AB4 * param0)
+void ov5_021EB8B8 (LocalMapObject * param0)
 {
     int v0, v1;
     UnkStruct_ov5_021EB7F8 * v2 = sub_02062AF0(param0);
@@ -674,7 +674,7 @@ void ov5_021EB8B8 (UnkStruct_02061AB4 * param0)
     ov5_021EC6C0(param0, v3);
 }
 
-void ov5_021EB944 (UnkStruct_02061AB4 * param0)
+void ov5_021EB944 (LocalMapObject * param0)
 {
     int v0, v1;
     UnkStruct_ov5_021EB2EC * v2 = sub_02062AF0(param0);
@@ -741,7 +741,7 @@ void ov5_021EB944 (UnkStruct_02061AB4 * param0)
     ov5_021EC6C0(param0, v3);
 }
 
-void ov5_021EBA0C (UnkStruct_02061AB4 * param0)
+void ov5_021EBA0C (LocalMapObject * param0)
 {
     UnkStruct_ov5_021EBA0C * v0;
 
@@ -755,7 +755,7 @@ void ov5_021EBA0C (UnkStruct_02061AB4 * param0)
     }
 }
 
-void ov5_021EBA34 (UnkStruct_02061AB4 * param0)
+void ov5_021EBA34 (LocalMapObject * param0)
 {
     UnkStruct_ov5_021EBA0C * v0;
     VecFx32 v1 = {0, 0, 0};
@@ -766,7 +766,7 @@ void ov5_021EBA34 (UnkStruct_02061AB4 * param0)
     sub_02063088(param0, &v1);
 }
 
-void ov5_021EBA60 (UnkStruct_02061AB4 * param0)
+void ov5_021EBA60 (LocalMapObject * param0)
 {
     UnkStruct_ov5_021EBA0C * v0;
 
@@ -780,7 +780,7 @@ void ov5_021EBA60 (UnkStruct_02061AB4 * param0)
     sub_020628BC(param0, (1 << 21));
 }
 
-void ov5_021EBA8C (UnkStruct_02061AB4 * param0)
+void ov5_021EBA8C (LocalMapObject * param0)
 {
     int v0;
     UnkStruct_ov5_021EBA0C * v1;
@@ -802,7 +802,7 @@ void ov5_021EBA8C (UnkStruct_02061AB4 * param0)
     }
 }
 
-void ov5_021EBAD0 (UnkStruct_02061AB4 * param0)
+void ov5_021EBAD0 (LocalMapObject * param0)
 {
     int v0, v1;
     UnkStruct_ov5_021EBA0C * v2 = sub_02062AF0(param0);
@@ -831,7 +831,7 @@ void ov5_021EBAD0 (UnkStruct_02061AB4 * param0)
     ov5_021EC6C0(param0, v3);
 }
 
-static void ov5_021EBB44 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3)
+static void ov5_021EBB44 (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3)
 {
     if (param3 != param2->unk_00) {
         int v0 = ov5_021EDF18(param3);
@@ -849,7 +849,7 @@ static void ov5_021EBB44 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * para
     }
 }
 
-static void ov5_021EBBB4 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3)
+static void ov5_021EBBB4 (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3)
 {
     int v0;
 
@@ -870,7 +870,7 @@ static void ov5_021EBBB4 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * para
     }
 }
 
-static void ov5_021EBC28 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3)
+static void ov5_021EBC28 (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3)
 {
     int v0;
 
@@ -887,7 +887,7 @@ static void ov5_021EBC28 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * para
     }
 }
 
-static void ov5_021EBC7C (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3)
+static void ov5_021EBC7C (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3)
 {
     if (param3 != param2->unk_00) {
         int v0 = ov5_021EDF18(param3);
@@ -903,7 +903,7 @@ static void ov5_021EBC7C (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * para
     }
 }
 
-static void ov5_021EBCD0 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3)
+static void ov5_021EBCD0 (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3)
 {
     if (param3 != param2->unk_00) {
         int v0 = ov5_021EDF18(param3);
@@ -919,7 +919,7 @@ static void ov5_021EBCD0 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * para
     }
 }
 
-static void ov5_021EBD24 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3)
+static void ov5_021EBD24 (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3)
 {
     if (param3 != param2->unk_00) {
         int v0 = ov5_021EDF18(param3);
@@ -955,7 +955,7 @@ static void ov5_021EBD24 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * para
     }
 }
 
-static void ov5_021EBDC4 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3)
+static void ov5_021EBDC4 (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3)
 {
     if (param3 != param2->unk_00) {
         int v0 = ov5_021EDF18(param3);
@@ -988,7 +988,7 @@ static void ov5_021EBDC4 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * para
     }
 }
 
-static void ov5_021EBE5C (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3)
+static void ov5_021EBE5C (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3)
 {
     if (param3 != param2->unk_00) {
         int v0 = ov5_021EDF18(param3);
@@ -1025,7 +1025,7 @@ static void ov5_021EBE5C (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * para
     }
 }
 
-static void ov5_021EBEFC (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3)
+static void ov5_021EBEFC (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3)
 {
     int v0;
 
@@ -1044,7 +1044,7 @@ static void ov5_021EBEFC (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * para
 }
 
 static void(*const Unk_ov5_021FF3F8[])(
-    UnkStruct_02061AB4 *, UnkStruct_020216E0 *, UnkStruct_ov5_021EBA0C *, int) = {
+    LocalMapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EBA0C *, int) = {
     ov5_021EBB44,
     ov5_021EBBB4,
     ov5_021EBBB4,
@@ -1057,7 +1057,7 @@ static void(*const Unk_ov5_021FF3F8[])(
     ov5_021EBEFC
 };
 
-void ov5_021EBF50 (UnkStruct_02061AB4 * param0)
+void ov5_021EBF50 (LocalMapObject * param0)
 {
     int v0, v1;
     UnkStruct_ov5_021EBA0C * v2 = sub_02062AF0(param0);
@@ -1091,7 +1091,7 @@ void ov5_021EBF50 (UnkStruct_02061AB4 * param0)
     ov5_021EC6C0(param0, v3);
 }
 
-static void ov5_021EBFDC (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3)
+static void ov5_021EBFDC (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3)
 {
     int v0[4] = {6, 7, 8, 9};
     int v1 = v0[param3];
@@ -1111,7 +1111,7 @@ static void ov5_021EBFDC (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * para
     }
 }
 
-static void ov5_021EC068 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3)
+static void ov5_021EC068 (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3)
 {
     int v0;
 
@@ -1133,7 +1133,7 @@ static void ov5_021EC068 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * para
     }
 }
 
-static void ov5_021EC0E4 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3)
+static void ov5_021EC0E4 (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3)
 {
     int v0;
 
@@ -1156,7 +1156,7 @@ static void ov5_021EC0E4 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * para
 }
 
 static void(*const Unk_ov5_021FF448[11])(
-    UnkStruct_02061AB4 *, UnkStruct_020216E0 *, UnkStruct_ov5_021EBA0C *, int) = {
+    LocalMapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EBA0C *, int) = {
     ov5_021EBFDC,
     ov5_021EBBB4,
     ov5_021EBBB4,
@@ -1170,7 +1170,7 @@ static void(*const Unk_ov5_021FF448[11])(
     ov5_021EC0E4
 };
 
-void(*const Unk_ov5_021FF31C[])(UnkStruct_02061AB4 *, UnkStruct_020216E0 *, UnkStruct_ov5_021EBA0C *, int);
+void(*const Unk_ov5_021FF31C[])(LocalMapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EBA0C *, int);
 
 static const int Unk_ov5_021FF34C[] = {
     0x0,
@@ -1179,7 +1179,7 @@ static const int Unk_ov5_021FF34C[] = {
     0x3
 };
 
-void ov5_021EC15C (UnkStruct_02061AB4 * param0)
+void ov5_021EC15C (LocalMapObject * param0)
 {
     int v0, v1;
     UnkStruct_ov5_021EBA0C * v2 = sub_02062AF0(param0);
@@ -1206,7 +1206,7 @@ void ov5_021EC15C (UnkStruct_02061AB4 * param0)
     ov5_021EC6C0(param0, v3);
 }
 
-static void ov5_021EC1D8 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3)
+static void ov5_021EC1D8 (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3)
 {
     fx32 v0;
 
@@ -1226,7 +1226,7 @@ static void ov5_021EC1D8 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * para
     sub_02021368(param1, 0);
 }
 
-static void ov5_021EC228 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3)
+static void ov5_021EC228 (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3)
 {
     fx32 v0;
 
@@ -1238,7 +1238,7 @@ static void ov5_021EC228 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * para
     sub_02021368(param1, (FX32_ONE));
 }
 
-static void ov5_021EC260 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3)
+static void ov5_021EC260 (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3)
 {
     fx32 v0;
 
@@ -1277,7 +1277,7 @@ static void ov5_021EC260 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * para
     sub_02021368(param1, 0);
 }
 
-static void ov5_021EC324 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3)
+static void ov5_021EC324 (LocalMapObject * param0, UnkStruct_020216E0 * param1, UnkStruct_ov5_021EBA0C * param2, int param3)
 {
     fx32 v0;
 
@@ -1296,7 +1296,7 @@ static void ov5_021EC324 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * para
     sub_02021368(param1, 0);
 }
 
-static void ov5_021EC374 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * param1, int param2)
+static void ov5_021EC374 (LocalMapObject * param0, UnkStruct_020216E0 * param1, int param2)
 {
     VecFx32 v0 = {0, 0, 0};
     int v1 = ((sub_02021394(param1) / FX32_ONE));
@@ -1328,14 +1328,14 @@ static void ov5_021EC374 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * para
     sub_02063088(param0, &v0);
 }
 
-static void(*const Unk_ov5_021FF31C[])(UnkStruct_02061AB4 *, UnkStruct_020216E0 *, UnkStruct_ov5_021EBA0C *, int) = {
+static void(*const Unk_ov5_021FF31C[])(LocalMapObject *, UnkStruct_020216E0 *, UnkStruct_ov5_021EBA0C *, int) = {
     ov5_021EC1D8,
     ov5_021EC228,
     ov5_021EC260,
     ov5_021EC324
 };
 
-void ov5_021EC3F0 (UnkStruct_02061AB4 * param0)
+void ov5_021EC3F0 (LocalMapObject * param0)
 {
     int v0;
     UnkStruct_ov5_021EBA0C * v1 = sub_02062AF0(param0);
@@ -1368,7 +1368,7 @@ void ov5_021EC3F0 (UnkStruct_02061AB4 * param0)
     ov5_021EC6C0(param0, v2);
 }
 
-void ov5_021EC454 (UnkStruct_02061AB4 * param0)
+void ov5_021EC454 (LocalMapObject * param0)
 {
     int v0;
     UnkStruct_ov5_021EBA0C * v1 = sub_02062AF0(param0);
@@ -1400,7 +1400,7 @@ void ov5_021EC454 (UnkStruct_02061AB4 * param0)
     ov5_021EC6C0(param0, v2);
 }
 
-void ov5_021EC4BC (UnkStruct_02061AB4 * param0)
+void ov5_021EC4BC (LocalMapObject * param0)
 {
     int v0, v1;
     UnkStruct_ov5_021EBA0C * v2 = sub_02062AF0(param0);
@@ -1444,7 +1444,7 @@ void ov5_021EC4BC (UnkStruct_02061AB4 * param0)
     ov5_021EC6C0(param0, v3);
 }
 
-void ov5_021EC554 (UnkStruct_02061AB4 * param0)
+void ov5_021EC554 (LocalMapObject * param0)
 {
     int v0, v1;
     UnkStruct_ov5_021EBA0C * v2 = sub_02062AF0(param0);
@@ -1476,7 +1476,7 @@ void ov5_021EC554 (UnkStruct_02061AB4 * param0)
     v2->unk_02 = sub_02062A14(param0);
 }
 
-void ov5_021EC5C0 (UnkStruct_02061AB4 * param0)
+void ov5_021EC5C0 (LocalMapObject * param0)
 {
     int v0, v1;
     UnkStruct_ov5_021EBA0C * v2 = sub_02062AF0(param0);
@@ -1555,7 +1555,7 @@ static void ov5_021EC69C (UnkStruct_020216E0 * param0, int param1)
     sub_020213A4(param0, v0);
 }
 
-static void ov5_021EC6C0 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * param1)
+static void ov5_021EC6C0 (LocalMapObject * param0, UnkStruct_020216E0 * param1)
 {
     int v0 = 1;
 
@@ -1588,7 +1588,7 @@ static void ov5_021EC700 (u32 param0, VecFx32 * param1)
     GF_ASSERT(0);
 }
 
-void ov5_021EC734 (UnkStruct_02061AB4 * param0)
+void ov5_021EC734 (LocalMapObject * param0)
 {
     VecFx32 v0;
     UnkStruct_ov5_021EC760 * v1;
@@ -1598,12 +1598,12 @@ void ov5_021EC734 (UnkStruct_02061AB4 * param0)
     v1->unk_00 = ov5_021F121C(param0, &v0);
 }
 
-void ov5_021EC75C (UnkStruct_02061AB4 * param0)
+void ov5_021EC75C (LocalMapObject * param0)
 {
     return;
 }
 
-void ov5_021EC760 (UnkStruct_02061AB4 * param0)
+void ov5_021EC760 (LocalMapObject * param0)
 {
     UnkStruct_ov5_021EC760 * v0;
 
@@ -1615,7 +1615,7 @@ void ov5_021EC760 (UnkStruct_02061AB4 * param0)
     }
 }
 
-void ov5_021EC778 (UnkStruct_02061AB4 * param0)
+void ov5_021EC778 (LocalMapObject * param0)
 {
     UnkStruct_ov5_021EC760 * v0;
 
@@ -1627,7 +1627,7 @@ void ov5_021EC778 (UnkStruct_02061AB4 * param0)
     }
 }
 
-void ov5_021EC790 (UnkStruct_02061AB4 * param0)
+void ov5_021EC790 (LocalMapObject * param0)
 {
     VecFx32 v0;
     UnkStruct_ov5_021EC760 * v1;
@@ -1637,7 +1637,7 @@ void ov5_021EC790 (UnkStruct_02061AB4 * param0)
     v1->unk_00 = ov5_021F121C(param0, &v0);
 }
 
-void ov5_021EC7B8 (UnkStruct_02061AB4 * param0)
+void ov5_021EC7B8 (LocalMapObject * param0)
 {
     UnkStruct_ov5_021EC760 * v0;
 
@@ -1645,7 +1645,7 @@ void ov5_021EC7B8 (UnkStruct_02061AB4 * param0)
     v0->unk_00 = ov5_021F2438(param0);
 }
 
-void ov5_021EC7D0 (UnkStruct_02061AB4 * param0)
+void ov5_021EC7D0 (LocalMapObject * param0)
 {
     UnkStruct_ov5_021EC760 * v0;
 
@@ -1654,7 +1654,7 @@ void ov5_021EC7D0 (UnkStruct_02061AB4 * param0)
     v0->unk_00 = ov5_021F2438(param0);
 }
 
-void ov5_021EC7F0 (UnkStruct_02061AB4 * param0)
+void ov5_021EC7F0 (LocalMapObject * param0)
 {
     UnkStruct_ov5_021EC760 * v0;
 
@@ -1672,7 +1672,7 @@ static void ov5_021EC804 (UnkStruct_020216E0 * param0, void * param1)
     NNS_G3dMdlSetMdlAlphaAll(v1, v0->unk_10);
 }
 
-void ov5_021EC824 (UnkStruct_02061AB4 * param0)
+void ov5_021EC824 (LocalMapObject * param0)
 {
     UnkStruct_ov5_021EC804 * v0;
 
@@ -1687,7 +1687,7 @@ void ov5_021EC824 (UnkStruct_02061AB4 * param0)
     }
 }
 
-void ov5_021EC858 (UnkStruct_02061AB4 * param0)
+void ov5_021EC858 (LocalMapObject * param0)
 {
     UnkStruct_ov5_021EC804 * v0;
 
@@ -1695,7 +1695,7 @@ void ov5_021EC858 (UnkStruct_02061AB4 * param0)
     ov5_021ECFA4(param0, &v0->unk_04);
 }
 
-void ov5_021EC86C (UnkStruct_02061AB4 * param0)
+void ov5_021EC86C (LocalMapObject * param0)
 {
     UnkStruct_ov5_021EC804 * v0;
 
@@ -1709,7 +1709,7 @@ void ov5_021EC86C (UnkStruct_02061AB4 * param0)
     sub_020628BC(param0, (1 << 21));
 }
 
-void ov5_021EC898 (UnkStruct_02061AB4 * param0)
+void ov5_021EC898 (LocalMapObject * param0)
 {
     int v0;
     UnkStruct_ov5_021EB2EC * v1;
@@ -1732,7 +1732,7 @@ void ov5_021EC898 (UnkStruct_02061AB4 * param0)
     }
 }
 
-void ov5_021EC8EC (UnkStruct_02061AB4 * param0)
+void ov5_021EC8EC (LocalMapObject * param0)
 {
     int v0, v1;
     UnkStruct_ov5_021EC804 * v2;
@@ -1762,7 +1762,7 @@ void ov5_021EC8EC (UnkStruct_02061AB4 * param0)
     ov5_021EC6C0(param0, v3);
 }
 
-void ov5_021EC938 (UnkStruct_02061AB4 * param0)
+void ov5_021EC938 (LocalMapObject * param0)
 {
     UnkStruct_ov5_021EC938 * v0;
 
@@ -1774,7 +1774,7 @@ void ov5_021EC938 (UnkStruct_02061AB4 * param0)
     }
 }
 
-void ov5_021EC95C (UnkStruct_02061AB4 * param0)
+void ov5_021EC95C (LocalMapObject * param0)
 {
     UnkStruct_ov5_021EC938 * v0;
 
@@ -1782,7 +1782,7 @@ void ov5_021EC95C (UnkStruct_02061AB4 * param0)
     ov5_021ECFA4(param0, &v0->unk_08);
 }
 
-void ov5_021EC970 (UnkStruct_02061AB4 * param0)
+void ov5_021EC970 (LocalMapObject * param0)
 {
     UnkStruct_ov5_021EC938 * v0;
 
@@ -1796,7 +1796,7 @@ void ov5_021EC970 (UnkStruct_02061AB4 * param0)
     sub_020628BC(param0, (1 << 21));
 }
 
-void ov5_021EC9A0 (UnkStruct_02061AB4 * param0)
+void ov5_021EC9A0 (LocalMapObject * param0)
 {
     int v0;
     UnkStruct_ov5_021EC938 * v1;
@@ -1818,7 +1818,7 @@ void ov5_021EC9A0 (UnkStruct_02061AB4 * param0)
     }
 }
 
-void ov5_021EC9E8 (UnkStruct_02061AB4 * param0)
+void ov5_021EC9E8 (LocalMapObject * param0)
 {
     int v0, v1;
     UnkStruct_ov5_021EC938 * v2;
diff --git a/src/overlay005/ov5_021ECA70.c b/src/overlay005/ov5_021ECA70.c
index e1914d81f0..2da748d65b 100644
--- a/src/overlay005/ov5_021ECA70.c
+++ b/src/overlay005/ov5_021ECA70.c
@@ -17,12 +17,12 @@ typedef struct UnkStruct_ov5_021ECB8C_t {
     UnkStruct_ov5_021ED01C unk_04;
 };
 
-static void ov5_021ECB90(UnkStruct_02061AB4 * param0);
-static void ov5_021ECBA4(UnkStruct_02061AB4 * param0);
-static void ov5_021ECBCC(UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * param1);
-static void ov5_021ECC0C(UnkStruct_02061AB4 * param0);
+static void ov5_021ECB90(LocalMapObject * param0);
+static void ov5_021ECBA4(LocalMapObject * param0);
+static void ov5_021ECBCC(LocalMapObject * param0, UnkStruct_020216E0 * param1);
+static void ov5_021ECC0C(LocalMapObject * param0);
 
-void ov5_021ECA70 (UnkStruct_02061AB4 * param0)
+void ov5_021ECA70 (LocalMapObject * param0)
 {
     VecFx32 v0;
 
@@ -35,7 +35,7 @@ void ov5_021ECA70 (UnkStruct_02061AB4 * param0)
     sub_020630AC(param0, &v0);
 }
 
-void ov5_021ECA90 (UnkStruct_02061AB4 * param0)
+void ov5_021ECA90 (LocalMapObject * param0)
 {
     UnkStruct_ov5_021ECB8C * v0 = sub_02062AF0(param0);
     UnkStruct_020216E0 * v1 = v0->unk_00;
@@ -52,12 +52,12 @@ void ov5_021ECA90 (UnkStruct_02061AB4 * param0)
     sub_02021368(v1, FX32_ONE);
 }
 
-void ov5_021ECABC (UnkStruct_02061AB4 * param0)
+void ov5_021ECABC (LocalMapObject * param0)
 {
     ov5_021ECC0C(param0);
 }
 
-void ov5_021ECAC4 (UnkStruct_02061AB4 * param0)
+void ov5_021ECAC4 (LocalMapObject * param0)
 {
     UnkStruct_ov5_021ECB8C * v0;
 
@@ -71,7 +71,7 @@ void ov5_021ECAC4 (UnkStruct_02061AB4 * param0)
     sub_020628BC(param0, (1 << 21));
 }
 
-void ov5_021ECAF0 (UnkStruct_02061AB4 * param0)
+void ov5_021ECAF0 (LocalMapObject * param0)
 {
     UnkStruct_ov5_021ECB8C * v0;
 
@@ -92,7 +92,7 @@ void ov5_021ECAF0 (UnkStruct_02061AB4 * param0)
     }
 }
 
-void ov5_021ECB34 (UnkStruct_02061AB4 * param0)
+void ov5_021ECB34 (LocalMapObject * param0)
 {
     VecFx32 v0;
 
@@ -105,7 +105,7 @@ void ov5_021ECB34 (UnkStruct_02061AB4 * param0)
     sub_020630AC(param0, &v0);
 }
 
-void ov5_021ECB58 (UnkStruct_02061AB4 * param0)
+void ov5_021ECB58 (LocalMapObject * param0)
 {
     UnkStruct_ov5_021ECB8C * v0 = sub_02062AF0(param0);
     UnkStruct_020216E0 * v1 = v0->unk_00;
@@ -121,12 +121,12 @@ void ov5_021ECB58 (UnkStruct_02061AB4 * param0)
     ov5_021ECBA4(param0);
 }
 
-void ov5_021ECB78 (UnkStruct_02061AB4 * param0)
+void ov5_021ECB78 (LocalMapObject * param0)
 {
     ov5_021ECC0C(param0);
 }
 
-UnkStruct_020216E0 * ov5_021ECB80 (UnkStruct_02061AB4 * param0)
+UnkStruct_020216E0 * ov5_021ECB80 (LocalMapObject * param0)
 {
     UnkStruct_ov5_021ECB8C * v0 = sub_02062AF0(param0);
     return ov5_021ECB8C(v0);
@@ -137,7 +137,7 @@ UnkStruct_020216E0 * ov5_021ECB8C (UnkStruct_ov5_021ECB8C * param0)
     return param0->unk_00;
 }
 
-static void ov5_021ECB90 (UnkStruct_02061AB4 * param0)
+static void ov5_021ECB90 (LocalMapObject * param0)
 {
     UnkStruct_ov5_021ECB8C * v0;
 
@@ -146,7 +146,7 @@ static void ov5_021ECB90 (UnkStruct_02061AB4 * param0)
     ov5_021ECF04(param0, &v0->unk_00);
 }
 
-static void ov5_021ECBA4 (UnkStruct_02061AB4 * param0)
+static void ov5_021ECBA4 (LocalMapObject * param0)
 {
     UnkStruct_ov5_021ECB8C * v0 = sub_02062AF0(param0);
     UnkStruct_020216E0 * v1 = v0->unk_00;
@@ -156,7 +156,7 @@ static void ov5_021ECBA4 (UnkStruct_02061AB4 * param0)
     ov5_021ECBCC(param0, v1);
 }
 
-static void ov5_021ECBCC (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * param1)
+static void ov5_021ECBCC (LocalMapObject * param0, UnkStruct_020216E0 * param1)
 {
     int v0 = 1;
 
@@ -173,7 +173,7 @@ static void ov5_021ECBCC (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * para
     sub_02021320(param1, v0);
 }
 
-static void ov5_021ECC0C (UnkStruct_02061AB4 * param0)
+static void ov5_021ECC0C (LocalMapObject * param0)
 {
     UnkStruct_ov5_021ECB8C * v0;
 
diff --git a/src/overlay005/ov5_021ECC20.c b/src/overlay005/ov5_021ECC20.c
index 0973b1afdd..dc410d18c6 100644
--- a/src/overlay005/ov5_021ECC20.c
+++ b/src/overlay005/ov5_021ECC20.c
@@ -62,7 +62,7 @@ static void ov5_021ECCBC (UnkStruct_02061830 * param0)
     NARC_dtor(v0);
 }
 
-void ov5_021ECCC8 (UnkStruct_02061AB4 * param0)
+void ov5_021ECCC8 (LocalMapObject * param0)
 {
     const UnkStruct_02061830 * v0 = sub_02062A40(param0);
 
@@ -79,7 +79,7 @@ void ov5_021ECCC8 (UnkStruct_02061AB4 * param0)
     }
 }
 
-const UnkStruct_ov5_021ECD10 * ov5_021ECD04 (const UnkStruct_02061AB4 * param0)
+const UnkStruct_ov5_021ECD10 * ov5_021ECD04 (const LocalMapObject * param0)
 {
     int v0 = sub_02062920(param0);
     const UnkStruct_ov5_021ECD10 * v1 = ov5_021ECD10(v0);
@@ -103,7 +103,7 @@ static const UnkStruct_ov5_021ECD10 * ov5_021ECD10 (int param0)
     return NULL;
 }
 
-int ov5_021ECD38 (const UnkStruct_02061AB4 * param0)
+int ov5_021ECD38 (const LocalMapObject * param0)
 {
     if (sub_02062DE8(param0) == 1) {
         if (sub_02062F7C(param0) == 0) {
@@ -135,7 +135,7 @@ void * ov5_021ECD68 (const UnkStruct_02061830 * param0, u32 param1, int param2)
     return v0;
 }
 
-void ov5_021ECDA0 (const UnkStruct_02061AB4 * param0, VecFx32 * param1)
+void ov5_021ECDA0 (const LocalMapObject * param0, VecFx32 * param1)
 {
     VecFx32 v0, v1, v2, v3;
 
@@ -149,7 +149,7 @@ void ov5_021ECDA0 (const UnkStruct_02061AB4 * param0, VecFx32 * param1)
     param1->z = v0.z + v1.z + v2.z + v3.z;
 }
 
-void ov5_021ECDFC (UnkStruct_02061AB4 * param0, int param1)
+void ov5_021ECDFC (LocalMapObject * param0, int param1)
 {
     sub_02062974(param0, param1);
 
@@ -158,28 +158,28 @@ void ov5_021ECDFC (UnkStruct_02061AB4 * param0, int param1)
     }
 }
 
-void ov5_021ECE18 (UnkStruct_02061AB4 * param0)
+void ov5_021ECE18 (LocalMapObject * param0)
 {
     sub_02062D64(param0, 1);
     sub_020628BC(param0, (1 << 20));
 }
 
-void ov5_021ECE30 (UnkStruct_02061AB4 * param0)
+void ov5_021ECE30 (LocalMapObject * param0)
 {
     return;
 }
 
-void ov5_021ECE34 (UnkStruct_02061AB4 * param0)
+void ov5_021ECE34 (LocalMapObject * param0)
 {
     return;
 }
 
-void ov5_021ECE38 (UnkStruct_02061AB4 * param0)
+void ov5_021ECE38 (LocalMapObject * param0)
 {
     return;
 }
 
-void ov5_021ECE3C (UnkStruct_02061AB4 * param0)
+void ov5_021ECE3C (LocalMapObject * param0)
 {
     return;
 }
diff --git a/src/overlay005/ov5_021ECE40.c b/src/overlay005/ov5_021ECE40.c
index be5aa2ea4c..a70b51c961 100644
--- a/src/overlay005/ov5_021ECE40.c
+++ b/src/overlay005/ov5_021ECE40.c
@@ -73,19 +73,19 @@ typedef struct {
     UnkStruct_02024184 unk_14;
     UnkStruct_020216E0 * unk_24;
     UnkStruct_ov5_021DF84C unk_28;
-    UnkStruct_02061AB4 * unk_50;
+    LocalMapObject * unk_50;
     UnkStruct_ov101_021D5D90 * unk_54;
     void * unk_58;
     UnkFuncPtr_ov5_021EE454 unk_5C;
 } UnkStruct_ov5_021EE698;
 
-static void ov5_021ED094(const UnkStruct_02061AB4 * param0);
+static void ov5_021ED094(const LocalMapObject * param0);
 static void ov5_021ED0A4(UnkStruct_ov5_021ED0A4 * param0, int param1);
 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 UnkStruct_02061AB4 * param1, int param2);
+static int ov5_021ED1C8(const UnkStruct_02061830 * 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);
@@ -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 UnkStruct_02061AB4 * param2);
-static int ov5_021EDAB4(const UnkStruct_02061830 * param0, int param1, const UnkStruct_02061AB4 * param2);
-static int ov5_021EDB3C(const UnkStruct_02061830 * param0, int param1, const UnkStruct_02061AB4 * param2);
+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_021EDCB8(UnkStruct_ov5_021ED0A4 * param0);
 static int * ov5_021EDCBC(UnkStruct_ov5_021ED0A4 * param0);
 static int * ov5_021EDCC0(UnkStruct_ov5_021ED0A4 * param0);
@@ -161,7 +161,7 @@ static void ov5_021EDDAC(UnkStruct_ov5_021ED0A4 * param0, int param1);
 static void ov5_021EDDD4(UnkStruct_02020C44 * param0);
 static UnkStruct_020216E0 * ov5_021EDDDC(UnkStruct_02020C44 * param0, const UnkStruct_ov5_021DF84C * param1, const VecFx32 * param2, u32 param3);
 static void ov5_021EDE3C(UnkStruct_ov5_021ED0A4 * param0, u32 param1, UnkStruct_ov5_021DF84C * param2);
-static UnkStruct_ov5_021ED0A4 * ov5_021EDEA8(const UnkStruct_02061AB4 * param0);
+static UnkStruct_ov5_021ED0A4 * ov5_021EDEA8(const LocalMapObject * param0);
 static int ov5_021EDF3C(UnkStruct_ov5_021ED0A4 * param0, int param1, u32 param2, int param3);
 static void ov5_021EDFBC(UnkStruct_ov5_021ED0A4 * param0, int param1);
 static int ov5_021EDFF0(UnkStruct_ov5_021ED0A4 * param0, int param1);
@@ -171,14 +171,14 @@ static void ov5_021EE134(UnkStruct_ov5_021ED0A4 * param0, int param1);
 static void ov5_021EE170(UnkStruct_ov5_021ED0A4 * param0, int param1);
 static void ov5_021EE1AC(SysTask * param0, void * param1);
 static void ov5_021EE1E8(SysTask * param0, void * param1);
-static void ov5_021EE228(UnkStruct_ov5_021ED0A4 * param0, UnkStruct_02061AB4 * param1, UnkStruct_020216E0 ** param2, int param3);
-static void ov5_021EE264(UnkStruct_ov5_021ED0A4 * param0, const UnkStruct_02061AB4 * param1);
+static void ov5_021EE228(UnkStruct_ov5_021ED0A4 * param0, LocalMapObject * param1, UnkStruct_020216E0 ** param2, int param3);
+static void ov5_021EE264(UnkStruct_ov5_021ED0A4 * param0, const LocalMapObject * param1);
 static void ov5_021EE2C4(SysTask * param0, void * param1);
 static void ov5_021EE294(UnkStruct_ov5_021ED0A4 * param0);
 static void ov5_021EE2D0(UnkStruct_ov5_021ED0A4 * param0, UnkStruct_ov5_021EE294 * param1);
 static void ov5_021EE320(UnkStruct_ov5_021ED0A4 * param0, int param1, int param2);
 static void ov5_021EE3C4(UnkStruct_ov5_021ED0A4 * param0);
-static UnkStruct_020216E0 * ov5_021EE454(UnkStruct_02061AB4 * param0, int param1, UnkFuncPtr_ov5_021EE454 param2, void * param3);
+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)
@@ -200,7 +200,7 @@ void ov5_021ECE94 (UnkStruct_ov5_021ED0A4 * param0)
     ov5_021ED2AC(param0);
 }
 
-int ov5_021ECEB4 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 ** param1, int param2)
+int ov5_021ECEB4 (LocalMapObject * param0, UnkStruct_020216E0 ** param1, int param2)
 {
     int v0;
     UnkStruct_ov5_021ED0A4 * v1;
@@ -224,7 +224,7 @@ int ov5_021ECEB4 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 ** param1, int
     return v0;
 }
 
-int ov5_021ECF04 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 ** param1)
+int ov5_021ECF04 (LocalMapObject * param0, UnkStruct_020216E0 ** param1)
 {
     int v0 = sub_02062920(param0);
     int v1 = ov5_021ECEB4(param0, param1, v0);
@@ -232,7 +232,7 @@ int ov5_021ECF04 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 ** param1)
     return v1;
 }
 
-UnkStruct_020216E0 * ov5_021ECF1C (UnkStruct_02061AB4 * param0, int param1)
+UnkStruct_020216E0 * ov5_021ECF1C (LocalMapObject * param0, int param1)
 {
     VecFx32 v0;
     UnkStruct_02020C44 * v1;
@@ -256,7 +256,7 @@ UnkStruct_020216E0 * ov5_021ECF1C (UnkStruct_02061AB4 * param0, int param1)
     return v2;
 }
 
-void ov5_021ECF70 (const UnkStruct_02061AB4 * param0, UnkStruct_020216E0 ** param1, int param2)
+void ov5_021ECF70 (const LocalMapObject * param0, UnkStruct_020216E0 ** param1, int param2)
 {
     int v0;
 
@@ -270,7 +270,7 @@ void ov5_021ECF70 (const UnkStruct_02061AB4 * param0, UnkStruct_020216E0 ** para
     }
 }
 
-void ov5_021ECFA4 (const UnkStruct_02061AB4 * param0, UnkStruct_020216E0 ** param1)
+void ov5_021ECFA4 (const LocalMapObject * param0, UnkStruct_020216E0 ** param1)
 {
     ov5_021ED094(param0);
 
@@ -285,7 +285,7 @@ void ov5_021ECFA4 (const UnkStruct_02061AB4 * param0, UnkStruct_020216E0 ** para
     }
 }
 
-void ov5_021ECFD8 (const UnkStruct_02061AB4 * param0, UnkStruct_020216E0 ** param1, int param2)
+void ov5_021ECFD8 (const LocalMapObject * param0, UnkStruct_020216E0 ** param1, int param2)
 {
     int v0;
 
@@ -319,7 +319,7 @@ void ov5_021ED03C (UnkStruct_020216E0 * param0, UnkStruct_ov5_021ED01C * param1)
     sub_02021380(param0, param1->unk_04);
 }
 
-void ov5_021ED060 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 ** param1, int param2)
+void ov5_021ED060 (LocalMapObject * param0, UnkStruct_020216E0 ** param1, int param2)
 {
     UnkStruct_ov5_021ED0A4 * v0 = ov5_021EDEA8(param0);
 
@@ -330,7 +330,7 @@ void ov5_021ED060 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 ** param1, in
     }
 }
 
-static void ov5_021ED094 (const UnkStruct_02061AB4 * param0)
+static void ov5_021ED094 (const LocalMapObject * param0)
 {
     UnkStruct_ov5_021ED0A4 * v0 = ov5_021EDEA8(param0);
 
@@ -469,10 +469,10 @@ static void ov5_021ED1A4 (UnkStruct_ov5_021ED0A4 * param0)
     } while (v0);
 }
 
-static int ov5_021ED1C8 (const UnkStruct_02061830 * param0, const UnkStruct_02061AB4 * param1, int param2)
+static int ov5_021ED1C8 (const UnkStruct_02061830 * param0, const LocalMapObject * param1, int param2)
 {
     int v0, v1;
-    const UnkStruct_02061AB4 * v2;
+    const LocalMapObject * v2;
 
     v0 = sub_02062824(param0);
     v2 = sub_02062868(param0);
@@ -1101,10 +1101,10 @@ void ov5_021EDA38 (UnkStruct_02061830 * param0, UnkStruct_ov5_021ED0A4 * param1)
     ov5_021ED8B8(param0, param1);
 }
 
-static int ov5_021EDA54 (const UnkStruct_02061830 * param0, int param1, const UnkStruct_02061AB4 * param2)
+static int ov5_021EDA54 (const UnkStruct_02061830 * param0, int param1, const LocalMapObject * param2)
 {
     int v0 = 0, v1;
-    UnkStruct_02061AB4 * v2 = NULL;
+    LocalMapObject * v2 = NULL;
 
     while (sub_020625B0(param0, &v2, &v0, (1 << 0)) == 1) {
         if ((param2 != NULL) && (param2 == v2)) {
@@ -1125,10 +1125,10 @@ static int ov5_021EDA54 (const UnkStruct_02061830 * param0, int param1, const Un
     return 0;
 }
 
-static int ov5_021EDAB4 (const UnkStruct_02061830 * param0, int param1, const UnkStruct_02061AB4 * param2)
+static int ov5_021EDAB4 (const UnkStruct_02061830 * param0, int param1, const LocalMapObject * param2)
 {
     int v0, v1 = 0;
-    UnkStruct_02061AB4 * v2 = NULL;
+    LocalMapObject * v2 = NULL;
 
     while (sub_020625B0(param0, &v2, &v1, (1 << 0)) == 1) {
         if ((param2 != NULL) && (param2 == v2)) {
@@ -1163,10 +1163,10 @@ static int ov5_021EDAB4 (const UnkStruct_02061830 * param0, int param1, const Un
     return 0;
 }
 
-static int ov5_021EDB3C (const UnkStruct_02061830 * param0, int param1, const UnkStruct_02061AB4 * param2)
+static int ov5_021EDB3C (const UnkStruct_02061830 * param0, int param1, const LocalMapObject * param2)
 {
     int v0, v1 = 0;
-    UnkStruct_02061AB4 * v2 = NULL;
+    LocalMapObject * v2 = NULL;
 
     while (sub_020625B0(param0, &v2, &v1, (1 << 0)) == 1) {
         if ((param2 != NULL) && (v2 == param2)) {
@@ -1201,7 +1201,7 @@ static int ov5_021EDB3C (const UnkStruct_02061830 * param0, int param1, const Un
     return 0;
 }
 
-void ov5_021EDBC4 (const UnkStruct_02061830 * param0, int param1, UnkStruct_02061AB4 * param2)
+void ov5_021EDBC4 (const UnkStruct_02061830 * param0, int param1, LocalMapObject * param2)
 {
     int v0;
     UnkStruct_ov5_021ED0A4 * v1 = sub_0206285C(param0);
@@ -1405,7 +1405,7 @@ static u32 ov5_021EDD50 (int param0)
     return 1;
 }
 
-void ov5_021EDD78 (UnkStruct_02061AB4 * param0, int param1)
+void ov5_021EDD78 (LocalMapObject * param0, int param1)
 {
     if (param1 == 1) {
         sub_020628BC(param0, (1 << 22));
@@ -1414,7 +1414,7 @@ void ov5_021EDD78 (UnkStruct_02061AB4 * param0, int param1)
     }
 }
 
-int ov5_021EDD94 (UnkStruct_02061AB4 * param0)
+int ov5_021EDD94 (LocalMapObject * param0)
 {
     if (sub_020628D0(param0, (1 << 22))) {
         return 1;
@@ -1500,7 +1500,7 @@ static void ov5_021EDE3C (UnkStruct_ov5_021ED0A4 * param0, u32 param1, UnkStruct
     }
 }
 
-static UnkStruct_ov5_021ED0A4 * ov5_021EDEA8 (const UnkStruct_02061AB4 * param0)
+static UnkStruct_ov5_021ED0A4 * ov5_021EDEA8 (const LocalMapObject * param0)
 {
     const UnkStruct_02061830 * v0;
 
@@ -1508,7 +1508,7 @@ static UnkStruct_ov5_021ED0A4 * ov5_021EDEA8 (const UnkStruct_02061AB4 * param0)
     return (UnkStruct_ov5_021ED0A4 *)sub_0206285C(v0);
 }
 
-BOOL ov5_021EDEB4 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * param1)
+BOOL ov5_021EDEB4 (LocalMapObject * param0, UnkStruct_020216E0 * param1)
 {
     BOOL v0;
     VecFx32 v1;
@@ -1524,7 +1524,7 @@ BOOL ov5_021EDEB4 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * param1)
     return 0;
 }
 
-void ov5_021EDED8 (UnkStruct_02061AB4 * param0, UnkStruct_020216E0 * param1)
+void ov5_021EDED8 (LocalMapObject * param0, UnkStruct_020216E0 * param1)
 {
     int v0 = 1;
 
@@ -1791,7 +1791,7 @@ static void ov5_021EE1E8 (SysTask * param0, void * param1)
     v2->unk_06 = 0;
 }
 
-static void ov5_021EE228 (UnkStruct_ov5_021ED0A4 * param0, UnkStruct_02061AB4 * param1, UnkStruct_020216E0 ** param2, int param3)
+static void ov5_021EE228 (UnkStruct_ov5_021ED0A4 * param0, LocalMapObject * param1, UnkStruct_020216E0 ** param2, int param3)
 {
     int v0 = 0;
     UnkStruct_ov5_021EDF3C * v1 = param0->unk_100;
@@ -1815,7 +1815,7 @@ static void ov5_021EE228 (UnkStruct_ov5_021ED0A4 * param0, UnkStruct_02061AB4 *
     GF_ASSERT(FALSE);
 }
 
-static void ov5_021EE264 (UnkStruct_ov5_021ED0A4 * param0, const UnkStruct_02061AB4 * param1)
+static void ov5_021EE264 (UnkStruct_ov5_021ED0A4 * param0, const LocalMapObject * param1)
 {
     int v0 = 0;
     UnkStruct_ov5_021EDF3C * v1 = param0->unk_100;
@@ -1925,7 +1925,7 @@ static void ov5_021EE3C4 (UnkStruct_ov5_021ED0A4 * param0)
     param0->unk_100 = NULL;
 }
 
-UnkStruct_020216E0 * ov5_021EE3FC (UnkStruct_02061AB4 * param0, int param1, UnkFuncPtr_ov5_021EE454 param2, void * param3)
+UnkStruct_020216E0 * ov5_021EE3FC (LocalMapObject * param0, int param1, UnkFuncPtr_ov5_021EE454 param2, void * param3)
 {
     if ((ov5_021EDD94(param0) == 1) || (ov5_021EB1A0(param0) == NULL)) {
         int v0 = sub_02062920(param0);
@@ -1940,7 +1940,7 @@ UnkStruct_020216E0 * ov5_021EE3FC (UnkStruct_02061AB4 * param0, int param1, UnkF
     return ov5_021EE454(param0, param1, param2, param3);
 }
 
-static UnkStruct_020216E0 * ov5_021EE454 (UnkStruct_02061AB4 * param0, int param1, UnkFuncPtr_ov5_021EE454 param2, void * param3)
+static UnkStruct_020216E0 * ov5_021EE454 (LocalMapObject * param0, int param1, UnkFuncPtr_ov5_021EE454 param2, void * param3)
 {
     VecFx32 v0;
     int v1, v2, v3, v4;
@@ -2075,7 +2075,7 @@ static UnkStruct_020216E0 * ov5_021EE454 (UnkStruct_02061AB4 * param0, int param
 static void ov5_021EE698 (SysTask * param0, void * param1)
 {
     UnkStruct_ov5_021EE698 * v0 = param1;
-    UnkStruct_02061AB4 * v1 = v0->unk_50;
+    LocalMapObject * v1 = v0->unk_50;
 
     switch (v0->unk_04) {
     case 0:
diff --git a/src/overlay005/ov5_021F08CC.c b/src/overlay005/ov5_021F08CC.c
index 11b6889687..1659b0a3bc 100644
--- a/src/overlay005/ov5_021F08CC.c
+++ b/src/overlay005/ov5_021F08CC.c
@@ -84,7 +84,7 @@ static void ov5_021F0DE8(UnkStruct_ov5_021F0D6C * param0, u32 param1);
 static int ov5_021F0E24(UnkStruct_ov5_021F0D6C * param0);
 static u16 ov5_021F0E58(int param0);
 
-int(*const Unk_ov5_021FFA0C[])(UnkStruct_ov5_021F0D6C *, PlayerAvatar *, UnkStruct_02061AB4 *);
+int(*const Unk_ov5_021FFA0C[])(UnkStruct_ov5_021F0D6C *, PlayerAvatar *, LocalMapObject *);
 const int Unk_ov5_021FFA00[];
 
 void * ov5_021F08CC (FieldSystem * param0, u32 param1, int param2)
@@ -188,14 +188,14 @@ static void ov5_021F0A04 (SysTask * param0, void * param1)
 {
     UnkStruct_ov5_021F0D6C * v0 = param1;
     PlayerAvatar * v1 = v0->unk_20->playerAvatar;
-    UnkStruct_02061AB4 * v2 = sub_0205EB3C(v1);
+    LocalMapObject * v2 = Player_LocalMapObject(v1);
 
     while (Unk_ov5_021FFA0C[v0->unk_0C](v0, v1, v2)) {
         (void)0;
     }
 }
 
-static int ov5_021F0A30 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, UnkStruct_02061AB4 * param2)
+static int ov5_021F0A30 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, LocalMapObject * param2)
 {
     ov5_021F0D6C(param0);
     sub_02062DDC(param2);
@@ -204,7 +204,7 @@ static int ov5_021F0A30 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1,
     return 1;
 }
 
-static int ov5_021F0A48 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, UnkStruct_02061AB4 * param2)
+static int ov5_021F0A48 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, LocalMapObject * param2)
 {
     if (sub_020655F4(param2) == 1) {
         sub_020656AC(param2);
@@ -217,7 +217,7 @@ static int ov5_021F0A48 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1,
     return 0;
 }
 
-static int ov5_021F0A80 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, UnkStruct_02061AB4 * param2)
+static int ov5_021F0A80 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, LocalMapObject * param2)
 {
     param0->unk_10++;
 
@@ -239,7 +239,7 @@ static int ov5_021F0A80 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1,
     return 1;
 }
 
-static int ov5_021F0AB8 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, UnkStruct_02061AB4 * param2)
+static int ov5_021F0AB8 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, LocalMapObject * param2)
 {
     param0->unk_14 = ((LCRNG_Next() % 4) + 1) * 30;
     param0->unk_18 = Unk_ov5_021FFA00[param0->unk_1C];
@@ -248,7 +248,7 @@ static int ov5_021F0AB8 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1,
     return 1;
 }
 
-static int ov5_021F0AEC (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, UnkStruct_02061AB4 * param2)
+static int ov5_021F0AEC (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, LocalMapObject * param2)
 {
     param0->unk_14--;
 
@@ -269,7 +269,7 @@ static int ov5_021F0AEC (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1,
     return 1;
 }
 
-static int ov5_021F0B30 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, UnkStruct_02061AB4 * param2)
+static int ov5_021F0B30 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, LocalMapObject * param2)
 {
     param0->unk_18--;
 
@@ -287,7 +287,7 @@ static int ov5_021F0B30 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1,
     return 0;
 }
 
-static int ov5_021F0B5C (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, UnkStruct_02061AB4 * param2)
+static int ov5_021F0B5C (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, LocalMapObject * param2)
 {
     ov5_021F5C58(param0->unk_24);
     sub_02062A0C(param2, 0x3);
@@ -298,7 +298,7 @@ static int ov5_021F0B5C (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1,
     return 0;
 }
 
-static int ov5_021F0B7C (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, UnkStruct_02061AB4 * param2)
+static int ov5_021F0B7C (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, LocalMapObject * param2)
 {
     param0->unk_10++;
 
@@ -316,7 +316,7 @@ static int ov5_021F0B7C (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1,
     return 0;
 }
 
-static int ov5_021F0BB0 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, UnkStruct_02061AB4 * param2)
+static int ov5_021F0BB0 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, LocalMapObject * param2)
 {
     if (ov5_021F0E24(param0) == 0) {
         return 0;
@@ -326,7 +326,7 @@ static int ov5_021F0BB0 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1,
     return 1;
 }
 
-static int ov5_021F0BC8 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, UnkStruct_02061AB4 * param2)
+static int ov5_021F0BC8 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, LocalMapObject * param2)
 {
     param0->unk_08 = 1;
     param0->unk_0C = 15;
@@ -334,7 +334,7 @@ static int ov5_021F0BC8 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1,
     return 1;
 }
 
-static int ov5_021F0BD4 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, UnkStruct_02061AB4 * param2)
+static int ov5_021F0BD4 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, LocalMapObject * param2)
 {
     sub_02062A0C(param2, 0x0);
     ov5_021F0DE8(param0, 56);
@@ -345,7 +345,7 @@ static int ov5_021F0BD4 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1,
     return 1;
 }
 
-static int ov5_021F0BF4 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, UnkStruct_02061AB4 * param2)
+static int ov5_021F0BF4 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, LocalMapObject * param2)
 {
     sub_02062A0C(param2, 0x0);
     ov5_021F0DE8(param0, 55);
@@ -363,7 +363,7 @@ static int ov5_021F0BF4 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1,
     return 1;
 }
 
-static int ov5_021F0C34 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, UnkStruct_02061AB4 * param2)
+static int ov5_021F0C34 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, LocalMapObject * param2)
 {
     param0->unk_10 = 30 * 4;
     param0->unk_0C = 13;
@@ -371,7 +371,7 @@ static int ov5_021F0C34 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1,
     return 1;
 }
 
-static int ov5_021F0C40 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, UnkStruct_02061AB4 * param2)
+static int ov5_021F0C40 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, LocalMapObject * param2)
 {
     param0->unk_10--;
 
@@ -393,7 +393,7 @@ static int ov5_021F0C40 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1,
     return 0;
 }
 
-static int ov5_021F0C84 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, UnkStruct_02061AB4 * param2)
+static int ov5_021F0C84 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, LocalMapObject * param2)
 {
     param0->unk_10++;
 
@@ -412,7 +412,7 @@ static int ov5_021F0C84 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1,
     return 1;
 }
 
-static int ov5_021F0CB0 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, UnkStruct_02061AB4 * param2)
+static int ov5_021F0CB0 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, LocalMapObject * param2)
 {
     if (param0->unk_24 != NULL) {
         ov5_021F5C58(param0->unk_24);
@@ -434,7 +434,7 @@ static int ov5_021F0CB0 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1,
     return 1;
 }
 
-static int ov5_021F0CEC (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, UnkStruct_02061AB4 * param2)
+static int ov5_021F0CEC (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, LocalMapObject * param2)
 {
     param0->unk_10++;
 
@@ -445,7 +445,7 @@ static int ov5_021F0CEC (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1,
     return 0;
 }
 
-static int ov5_021F0D00 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, UnkStruct_02061AB4 * param2)
+static int ov5_021F0D00 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, LocalMapObject * param2)
 {
     if (param0->unk_24 != NULL) {
         sub_0207136C(param0->unk_24);
@@ -456,7 +456,7 @@ static int ov5_021F0D00 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1,
     return 0;
 }
 
-static int(*const Unk_ov5_021FFA0C[])(UnkStruct_ov5_021F0D6C *, PlayerAvatar *, UnkStruct_02061AB4 *) = {
+static int(*const Unk_ov5_021FFA0C[])(UnkStruct_ov5_021F0D6C *, PlayerAvatar *, LocalMapObject *) = {
     ov5_021F0A30,
     ov5_021F0A48,
     ov5_021F0A80,
diff --git a/src/overlay005/ov5_021F10E8.c b/src/overlay005/ov5_021F10E8.c
index 79f3f5b27a..c4b3b2ff8c 100644
--- a/src/overlay005/ov5_021F10E8.c
+++ b/src/overlay005/ov5_021F10E8.c
@@ -30,7 +30,7 @@ typedef struct {
 typedef struct {
     u32 unk_00;
     UnkStruct_ov5_021DF47C * unk_04;
-    const UnkStruct_02061AB4 * unk_08;
+    const LocalMapObject * unk_08;
 } UnkStruct_021F121C;
 
 typedef struct {
@@ -178,7 +178,7 @@ UnkStruct_02073B50 * ov5_021F11FC (UnkStruct_ov5_021DF47C * param0, u32 param1)
     return &v1->unk_18;
 }
 
-UnkStruct_ov101_021D5D90 * ov5_021F121C (const UnkStruct_02061AB4 * param0, const VecFx32 * param1)
+UnkStruct_ov101_021D5D90 * ov5_021F121C (const LocalMapObject * param0, const VecFx32 * param1)
 {
     int v0;
     UnkStruct_ov101_021D5D90 * v1;
@@ -224,7 +224,7 @@ static void ov5_021F12A8 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 static void ov5_021F12AC (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
     UnkStruct_021F1258 * v0 = param1;
-    const UnkStruct_02061AB4 * v1 = v0->unk_1C.unk_08;
+    const LocalMapObject * v1 = v0->unk_1C.unk_08;
 
     if (sub_02062764(v1, v0->unk_04, v0->unk_08) == 0) {
         ov5_021DF74C(param0);
diff --git a/src/overlay005/ov5_021F134C.c b/src/overlay005/ov5_021F134C.c
index aa2d009f81..7f74850029 100644
--- a/src/overlay005/ov5_021F134C.c
+++ b/src/overlay005/ov5_021F134C.c
@@ -35,7 +35,7 @@ typedef struct {
 typedef struct {
     UnkStruct_ov5_021DF47C * unk_00;
     UnkStruct_ov5_021F1388 * unk_04;
-    UnkStruct_02061AB4 * unk_08;
+    LocalMapObject * unk_08;
 } UnkStruct_ov5_021F1570;
 
 typedef struct {
@@ -198,7 +198,7 @@ static void ov5_021F1554 (UnkStruct_ov5_021F1388 * param0, int param1)
     NNS_G3dMdlSetMdlAlphaAll(param0->unk_28[0].unk_0C, param1);
 }
 
-void ov5_021F1570 (UnkStruct_02061AB4 * param0)
+void ov5_021F1570 (LocalMapObject * param0)
 {
     int v0, v1;
     UnkStruct_ov5_021F1570 v2;
@@ -249,7 +249,7 @@ static void ov5_021F1600 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 static void ov5_021F1604 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
     UnkStruct_ov5_021F15B4 * v0;
-    UnkStruct_02061AB4 * v1;
+    LocalMapObject * v1;
 
     v0 = param1;
     v1 = v0->unk_14.unk_08;
@@ -307,7 +307,7 @@ static const UnkStruct_ov101_021D86B0 Unk_ov5_022002AC = {
     ov5_021F1670
 };
 
-UnkStruct_ov101_021D5D90 * ov5_021F16D4 (UnkStruct_02061AB4 * param0, int param1)
+UnkStruct_ov101_021D5D90 * ov5_021F16D4 (LocalMapObject * param0, int param1)
 {
     int v0;
     UnkStruct_ov5_021F1570 v1;
@@ -329,7 +329,7 @@ UnkStruct_ov101_021D5D90 * ov5_021F16D4 (UnkStruct_02061AB4 * param0, int param1
 static void ov5_021F1718 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
     UnkStruct_ov5_021F15B4 * v0;
-    UnkStruct_02061AB4 * v1;
+    LocalMapObject * v1;
 
     v0 = param1;
     v1 = v0->unk_14.unk_08;
diff --git a/src/overlay005/ov5_021F17B8.c b/src/overlay005/ov5_021F17B8.c
index d5ffc5bdb6..12d46ba16b 100644
--- a/src/overlay005/ov5_021F17B8.c
+++ b/src/overlay005/ov5_021F17B8.c
@@ -29,7 +29,7 @@ typedef struct {
     FieldSystem * unk_00;
     UnkStruct_ov5_021DF47C * unk_04;
     UnkStruct_ov5_021F17E4 * unk_08;
-    UnkStruct_02061AB4 * unk_0C;
+    LocalMapObject * unk_0C;
 } UnkStruct_ov5_021F1800;
 
 typedef struct {
@@ -63,7 +63,7 @@ typedef struct {
 
 static void ov5_021F17E4(UnkStruct_ov5_021F17E4 * param0);
 static void ov5_021F17F4(UnkStruct_ov5_021F17E4 * param0);
-static void ov5_021F1A24(UnkStruct_ov5_021F1A24 * param0, UnkStruct_02061AB4 * param1, VecFx32 * param2);
+static void ov5_021F1A24(UnkStruct_ov5_021F1A24 * param0, LocalMapObject * param1, VecFx32 * param2);
 static void ov5_021F1A8C(UnkStruct_ov101_021D5D90 * param0, UnkStruct_ov5_021F1A24 * param1);
 
 static const UnkStruct_ov101_021D86B0 Unk_ov5_02200338;
@@ -97,7 +97,7 @@ static void ov5_021F17F4 (UnkStruct_ov5_021F17E4 * param0)
     ov5_021DFA08(param0->unk_00, 2);
 }
 
-void ov5_021F1800 (UnkStruct_02061AB4 * param0, int param1)
+void ov5_021F1800 (LocalMapObject * param0, int param1)
 {
     int v0;
     VecFx32 v1;
@@ -165,7 +165,7 @@ static void ov5_021F18E0 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
     int v0;
     UnkStruct_ov5_021F1A24 * v1;
-    UnkStruct_02061AB4 * v2;
+    LocalMapObject * v2;
 
     v1 = param1;
     v2 = v1->unk_14.unk_0C;
@@ -207,7 +207,7 @@ static void ov5_021F18E0 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 static void ov5_021F1978 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
     UnkStruct_ov5_021F1A24 * v0 = param1;
-    UnkStruct_02061AB4 * v1 = v0->unk_14.unk_0C;
+    LocalMapObject * v1 = v0->unk_14.unk_0C;
 
     {
         int v2 = sub_02062920(v1);
@@ -257,7 +257,7 @@ static const UnkStruct_ov101_021D86B0 Unk_ov5_02200338 = {
     ov5_021F1978
 };
 
-static void ov5_021F1A24 (UnkStruct_ov5_021F1A24 * param0, UnkStruct_02061AB4 * param1, VecFx32 * param2)
+static void ov5_021F1A24 (UnkStruct_ov5_021F1A24 * param0, LocalMapObject * param1, VecFx32 * param2)
 {
     int v0;
     fx32 v1, v2;
diff --git a/src/overlay005/ov5_021F1CC8.c b/src/overlay005/ov5_021F1CC8.c
index 38eb3c38fc..1f858c0269 100644
--- a/src/overlay005/ov5_021F1CC8.c
+++ b/src/overlay005/ov5_021F1CC8.c
@@ -44,7 +44,7 @@ static void ov5_021F1CF8(UnkStruct_021F1CF8 * param0);
 static void ov5_021F1D80(UnkStruct_021F1CF8 * param0);
 static UnkStruct_02073B50 * ov5_021F1DA4(UnkStruct_021F1CF8 * param0, int param1, int param2, int param3);
 static UnkStruct_02073838 * ov5_021F1E24(UnkStruct_021F1CF8 * param0, int param1, int param2, int param3);
-static UnkStruct_ov101_021D5D90 * ov5_021F1ECC(const UnkStruct_02061AB4 * param0, int param1);
+static UnkStruct_ov101_021D5D90 * ov5_021F1ECC(const LocalMapObject * param0, int param1);
 
 static const u32 Unk_ov5_0220039C[10];
 static const u32 Unk_ov5_02200374[10];
@@ -153,37 +153,37 @@ static UnkStruct_02073838 * ov5_021F1E24 (UnkStruct_021F1CF8 * param0, int param
     return v1;
 }
 
-UnkStruct_ov101_021D5D90 * ov5_021F1E8C (const UnkStruct_02061AB4 * param0)
+UnkStruct_ov101_021D5D90 * ov5_021F1E8C (const LocalMapObject * param0)
 {
     return ov5_021F1ECC(param0, 0);
 }
 
-UnkStruct_ov101_021D5D90 * ov5_021F1E98 (const UnkStruct_02061AB4 * param0)
+UnkStruct_ov101_021D5D90 * ov5_021F1E98 (const LocalMapObject * param0)
 {
     return ov5_021F1ECC(param0, 1);
 }
 
-UnkStruct_ov101_021D5D90 * ov5_021F1EA4 (const UnkStruct_02061AB4 * param0)
+UnkStruct_ov101_021D5D90 * ov5_021F1EA4 (const LocalMapObject * param0)
 {
     return ov5_021F1ECC(param0, 2);
 }
 
-UnkStruct_ov101_021D5D90 * ov5_021F1EB0 (const UnkStruct_02061AB4 * param0)
+UnkStruct_ov101_021D5D90 * ov5_021F1EB0 (const LocalMapObject * param0)
 {
     return ov5_021F1ECC(param0, 3);
 }
 
-UnkStruct_ov101_021D5D90 * ov5_021F1EBC (const UnkStruct_02061AB4 * param0)
+UnkStruct_ov101_021D5D90 * ov5_021F1EBC (const LocalMapObject * param0)
 {
     return ov5_021F1ECC(param0, 4);
 }
 
-UnkStruct_ov101_021D5D90 * ov5_021F1EC8 (const UnkStruct_02061AB4 * param0)
+UnkStruct_ov101_021D5D90 * ov5_021F1EC8 (const LocalMapObject * param0)
 {
     return NULL;
 }
 
-static UnkStruct_ov101_021D5D90 * ov5_021F1ECC (const UnkStruct_02061AB4 * param0, int param1)
+static UnkStruct_ov101_021D5D90 * ov5_021F1ECC (const LocalMapObject * param0, int param1)
 {
     VecFx32 v0;
     UnkStruct_ov101_021D5D90 * v1;
diff --git a/src/overlay005/ov5_021F204C.c b/src/overlay005/ov5_021F204C.c
index 1131dd8a6b..a9dc4893ee 100644
--- a/src/overlay005/ov5_021F204C.c
+++ b/src/overlay005/ov5_021F204C.c
@@ -29,7 +29,7 @@ typedef struct {
 typedef struct {
     UnkStruct_ov5_021DF47C * unk_00;
     UnkStruct_ov5_021F2078 * unk_04;
-    UnkStruct_02061AB4 * unk_08;
+    LocalMapObject * unk_08;
 } UnkStruct_ov5_021F20D4;
 
 typedef struct {
@@ -49,7 +49,7 @@ typedef struct {
 typedef struct {
     UnkStruct_ov5_021DF47C * unk_00;
     UnkStruct_ov5_021F2204 * unk_04;
-    UnkStruct_02061AB4 * unk_08;
+    LocalMapObject * unk_08;
 } UnkStruct_ov5_021F22BC;
 
 typedef struct {
@@ -115,7 +115,7 @@ static void ov5_021F20B8 (UnkStruct_ov5_021F2078 * param0)
     } while (v0 < (2 + 1));
 }
 
-void ov5_021F20D4 (UnkStruct_02061AB4 * param0)
+void ov5_021F20D4 (LocalMapObject * param0)
 {
     int v0, v1;
     UnkStruct_ov5_021F20D4 v2;
@@ -159,7 +159,7 @@ static void ov5_021F2144 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 static void ov5_021F2148 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
     UnkStruct_ov5_021F2118 * v0;
-    UnkStruct_02061AB4 * v1;
+    LocalMapObject * v1;
 
     v0 = param1;
     v1 = v0->unk_10.unk_08;
@@ -275,7 +275,7 @@ static void ov5_021F22AC (UnkStruct_ov5_021F2204 * param0)
     }
 }
 
-UnkStruct_ov101_021D5D90 * ov5_021F22BC (UnkStruct_02061AB4 * param0)
+UnkStruct_ov101_021D5D90 * ov5_021F22BC (LocalMapObject * param0)
 {
     VecFx32 v0;
     UnkStruct_ov5_021DF47C * v1;
diff --git a/src/overlay005/ov5_021F23D0.c b/src/overlay005/ov5_021F23D0.c
index 1ac43ba606..a63e05675f 100644
--- a/src/overlay005/ov5_021F23D0.c
+++ b/src/overlay005/ov5_021F23D0.c
@@ -25,7 +25,7 @@ typedef struct {
 typedef struct {
     UnkStruct_ov5_021DF47C * unk_00;
     UnkStruct_ov5_021F23FC * unk_04;
-    UnkStruct_02061AB4 * unk_08;
+    LocalMapObject * unk_08;
 } UnkStruct_ov5_021F2438;
 
 typedef struct {
@@ -74,7 +74,7 @@ static void ov5_021F2424 (UnkStruct_ov5_021F23FC * param0)
     sub_02073AA8(&param0->unk_18);
 }
 
-UnkStruct_ov101_021D5D90 * ov5_021F2438 (UnkStruct_02061AB4 * param0)
+UnkStruct_ov101_021D5D90 * ov5_021F2438 (LocalMapObject * param0)
 {
     UnkStruct_ov101_021D5D90 * v0;
     UnkStruct_ov5_021DF47C * v1;
@@ -123,7 +123,7 @@ static int ov5_021F2488 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 
     {
         VecFx32 v2, v3;
-        UnkStruct_02061AB4 * v4 = v0->unk_10.unk_08;
+        LocalMapObject * v4 = v0->unk_10.unk_08;
 
         sub_02063050(v4, &v2);
         sub_02063078(v4, &v3);
@@ -147,7 +147,7 @@ static void ov5_021F2510 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 static void ov5_021F251C (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
     UnkStruct_ov5_021F247C * v0 = param1;
-    UnkStruct_02061AB4 * v1 = v0->unk_10.unk_08;
+    LocalMapObject * v1 = v0->unk_10.unk_08;
 
     if (v0->unk_0C == 0) {
         if (sub_02062764(v1, v0->unk_04, v0->unk_08) == 0) {
diff --git a/src/overlay005/ov5_021F25C0.c b/src/overlay005/ov5_021F25C0.c
index 8fd7001ee5..2559c67844 100644
--- a/src/overlay005/ov5_021F25C0.c
+++ b/src/overlay005/ov5_021F25C0.c
@@ -28,7 +28,7 @@ typedef struct {
     int unk_00;
     UnkStruct_ov5_021DF47C * unk_04;
     UnkStruct_ov5_021F25EC * unk_08;
-    UnkStruct_02061AB4 * unk_0C;
+    LocalMapObject * unk_0C;
 } UnkStruct_ov5_021F26A8;
 
 typedef struct {
@@ -79,7 +79,7 @@ static void ov5_021F2610 (UnkStruct_ov5_021F25EC * param0)
     sub_0207395C(&param0->unk_04);
 }
 
-UnkStruct_ov101_021D5D90 * ov5_021F261C (UnkStruct_02061AB4 * param0, int param1, int param2, int param3, int param4)
+UnkStruct_ov101_021D5D90 * ov5_021F261C (LocalMapObject * param0, int param1, int param2, int param3, int param4)
 {
     UnkStruct_ov5_021F26A8 v0;
     VecFx32 v1 = {0, 0, 0};
@@ -112,7 +112,7 @@ static int ov5_021F26A8 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
     UnkStruct_ov5_021F26F0 * v0 = param1;
     const UnkStruct_ov5_021F26A8 * v1 = sub_020715BC(param0);
-    UnkStruct_02061AB4 * v2 = v1->unk_0C;
+    LocalMapObject * v2 = v1->unk_0C;
 
     v0->unk_24 = *v1;
     v0->unk_0C = sub_02062910(v2);
@@ -128,7 +128,7 @@ static int ov5_021F26A8 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 static void ov5_021F26F0 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
     UnkStruct_ov5_021F26F0 * v0 = param1;
-    UnkStruct_02061AB4 * v1 = v0->unk_24.unk_0C;
+    LocalMapObject * v1 = v0->unk_24.unk_0C;
     VecFx32 v2 = {0, 0, 0};
 
     sub_020630AC(v1, &v2);
@@ -137,7 +137,7 @@ static void ov5_021F26F0 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 static void ov5_021F2708 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
     UnkStruct_ov5_021F26F0 * v0 = param1;
-    UnkStruct_02061AB4 * v1 = v0->unk_24.unk_0C;
+    LocalMapObject * v1 = v0->unk_24.unk_0C;
 
     if (sub_02062764(v1, v0->unk_0C, v0->unk_10) == 0) {
         ov5_021DF74C(param0);
diff --git a/src/overlay005/ov5_021F2850.c b/src/overlay005/ov5_021F2850.c
index 6172115ed6..5286e8374d 100644
--- a/src/overlay005/ov5_021F2850.c
+++ b/src/overlay005/ov5_021F2850.c
@@ -34,7 +34,7 @@ typedef struct {
     UnkStruct_ov5_021DF47C * unk_04;
     FieldSystem * unk_08;
     UnkStruct_ov5_021F2874 * unk_0C;
-    UnkStruct_02061AB4 * unk_10;
+    LocalMapObject * unk_10;
 } UnkStruct_ov5_021F28F4;
 
 typedef struct {
@@ -115,7 +115,7 @@ static void ov5_021F28E4 (UnkStruct_ov5_021F2874 * param0)
     }
 }
 
-UnkStruct_ov101_021D5D90 * ov5_021F28F4 (UnkStruct_02061AB4 * param0, int param1, int param2, int param3, int param4)
+UnkStruct_ov101_021D5D90 * ov5_021F28F4 (LocalMapObject * param0, int param1, int param2, int param3, int param4)
 {
     int v0;
     UnkStruct_ov101_021D5D90 * v1;
@@ -175,7 +175,7 @@ static void ov5_021F29BC (UnkStruct_ov101_021D5D90 * param0, void * param1)
 static void ov5_021F29D0 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
     UnkStruct_ov5_021F2974 * v0 = param1;
-    UnkStruct_02061AB4 * v1 = v0->unk_10.unk_10;
+    LocalMapObject * v1 = v0->unk_10.unk_10;
 
     if (v0->unk_0C == 0) {
         return;
diff --git a/src/overlay005/ov5_021F2A7C.c b/src/overlay005/ov5_021F2A7C.c
index b3e830170a..ee6f544c23 100644
--- a/src/overlay005/ov5_021F2A7C.c
+++ b/src/overlay005/ov5_021F2A7C.c
@@ -70,7 +70,7 @@ static void ov5_021F2AD0 (UnkStruct_ov5_021F2AA8 * param0)
     sub_02073AA8(&param0->unk_18);
 }
 
-void ov5_021F2AE4 (UnkStruct_02061AB4 * param0, int param1, int param2, int param3)
+void ov5_021F2AE4 (LocalMapObject * param0, int param1, int param2, int param3)
 {
     int v0, v1;
     UnkStruct_ov5_021F2AE4 v2;
diff --git a/src/overlay005/ov5_021F2BD0.c b/src/overlay005/ov5_021F2BD0.c
index de3b2de7d4..332245b9ea 100644
--- a/src/overlay005/ov5_021F2BD0.c
+++ b/src/overlay005/ov5_021F2BD0.c
@@ -70,7 +70,7 @@ static void ov5_021F2C24 (UnkStruct_ov5_021F2BFC * param0)
     sub_02073AA8(&param0->unk_18);
 }
 
-void ov5_021F2C38 (UnkStruct_02061AB4 * param0, int param1, int param2, int param3)
+void ov5_021F2C38 (LocalMapObject * param0, int param1, int param2, int param3)
 {
     int v0, v1;
     UnkStruct_ov5_021F2C38 v2;
diff --git a/src/overlay005/ov5_021F2D20.c b/src/overlay005/ov5_021F2D20.c
index 3c8153ea4b..0449fc52e5 100644
--- a/src/overlay005/ov5_021F2D20.c
+++ b/src/overlay005/ov5_021F2D20.c
@@ -28,7 +28,7 @@ typedef struct {
     FieldSystem * unk_0C;
     UnkStruct_ov5_021DF47C * unk_10;
     UnkStruct_ov5_021F2D20 * unk_14;
-    UnkStruct_02061AB4 * unk_18;
+    LocalMapObject * unk_18;
 } UnkStruct_021F2EA4;
 
 typedef struct {
@@ -147,7 +147,7 @@ static void ov5_021F2E2C (UnkStruct_ov5_021F2D20 * param0)
     ov5_021DF9D4(param0->unk_00, 7);
 }
 
-void ov5_021F2EA4 (UnkStruct_02061AB4 * param0, int param1)
+void ov5_021F2EA4 (LocalMapObject * param0, int param1)
 {
     int v0;
     VecFx32 v1;
@@ -217,7 +217,7 @@ static void ov5_021F2FAC (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
     int v0;
     UnkStruct_021F2FA0 * v1;
-    UnkStruct_02061AB4 * v2;
+    LocalMapObject * v2;
 
     v1 = param1;
     v2 = v1->unk_18.unk_18;
@@ -281,7 +281,7 @@ static void ov5_021F308C (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
     VecFx32 v0;
     UnkStruct_021F2FA0 * v1;
-    UnkStruct_02061AB4 * v2;
+    LocalMapObject * v2;
 
     v1 = param1;
     v2 = v1->unk_18.unk_18;
diff --git a/src/overlay005/ov5_021F3284.c b/src/overlay005/ov5_021F3284.c
index 77643875d6..a4c8cd877b 100644
--- a/src/overlay005/ov5_021F3284.c
+++ b/src/overlay005/ov5_021F3284.c
@@ -24,7 +24,7 @@ typedef struct {
     FieldSystem * unk_00;
     UnkStruct_ov5_021DF47C * unk_04;
     UnkStruct_ov5_021F32B0 * unk_08;
-    UnkStruct_02061AB4 * unk_0C;
+    LocalMapObject * unk_0C;
 } UnkStruct_ov5_021F331C;
 
 typedef struct {
@@ -78,7 +78,7 @@ static void ov5_021F32F4 (UnkStruct_ov5_021F32B0 * param0)
     ov5_021DF9D4(param0->unk_00, 3);
 }
 
-void ov5_021F331C (UnkStruct_02061AB4 * param0, int param1)
+void ov5_021F331C (LocalMapObject * param0, int param1)
 {
     UnkStruct_ov5_021F331C v0;
     UnkStruct_ov5_021DF47C * v1;
@@ -131,7 +131,7 @@ static void ov5_021F33D0 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
     int v0, v1;
     UnkStruct_ov5_021F336C * v2;
-    UnkStruct_02061AB4 * v3;
+    LocalMapObject * v3;
 
     v2 = param1;
     v3 = v2->unk_14.unk_0C;
@@ -171,7 +171,7 @@ static void ov5_021F3448 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
     VecFx32 v0;
     UnkStruct_ov5_021F336C * v1;
-    UnkStruct_02061AB4 * v2;
+    LocalMapObject * v2;
 
     v1 = param1;
     v2 = v1->unk_14.unk_0C;
diff --git a/src/overlay005/ov5_021F348C.c b/src/overlay005/ov5_021F348C.c
index c5267a3180..8715e8f414 100644
--- a/src/overlay005/ov5_021F348C.c
+++ b/src/overlay005/ov5_021F348C.c
@@ -26,7 +26,7 @@ typedef struct {
     FieldSystem * unk_00;
     UnkStruct_ov5_021DF47C * unk_04;
     UnkStruct_ov5_021F34D0 * unk_08;
-    UnkStruct_02061AB4 * unk_0C;
+    LocalMapObject * unk_0C;
 } UnkStruct_ov5_021F35E8;
 
 typedef struct {
@@ -112,7 +112,7 @@ static void ov5_021F358C (UnkStruct_ov5_021F34D0 * param0)
     }
 }
 
-static void ov5_021F35E8 (UnkStruct_ov5_021DF47C * param0, UnkStruct_02061AB4 * param1, UnkStruct_ov5_021F35E8 * param2, VecFx32 * param3, int * param4)
+static void ov5_021F35E8 (UnkStruct_ov5_021DF47C * param0, LocalMapObject * param1, UnkStruct_ov5_021F35E8 * param2, VecFx32 * param3, int * param4)
 {
     param2->unk_00 = sub_02062C00(param1);
     param2->unk_04 = param0;
@@ -125,7 +125,7 @@ static void ov5_021F35E8 (UnkStruct_ov5_021DF47C * param0, UnkStruct_02061AB4 *
     *param4 = sub_02062758(param1, 2);
 }
 
-void ov5_021F3638 (UnkStruct_02061AB4 * param0)
+void ov5_021F3638 (LocalMapObject * param0)
 {
     int v0;
     UnkStruct_ov5_021DF47C * v1;
@@ -139,7 +139,7 @@ void ov5_021F3638 (UnkStruct_02061AB4 * param0)
     v2 = ov5_021DF72C(v1, &Unk_ov5_022005C4, &v3, 0, &v4, v0);
 }
 
-void ov5_021F3678 (UnkStruct_02061AB4 * param0, int param1)
+void ov5_021F3678 (LocalMapObject * param0, int param1)
 {
     int v0;
     UnkStruct_ov5_021DF47C * v1;
@@ -219,7 +219,7 @@ static void ov5_021F3760 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
     int v0;
     UnkStruct_ov5_021F36F4 * v1;
-    UnkStruct_02061AB4 * v2;
+    LocalMapObject * v2;
 
     v1 = param1;
     v2 = v1->unk_10.unk_0C;
@@ -241,7 +241,7 @@ static void ov5_021F3790 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
     VecFx32 v0, v1;
     UnkStruct_ov5_021F36F4 * v2;
-    UnkStruct_02061AB4 * v3;
+    LocalMapObject * v3;
 
     v2 = param1;
     v3 = v2->unk_10.unk_0C;
diff --git a/src/overlay005/ov5_021F37A8.c b/src/overlay005/ov5_021F37A8.c
index 326a20c2e8..359711fe0b 100644
--- a/src/overlay005/ov5_021F37A8.c
+++ b/src/overlay005/ov5_021F37A8.c
@@ -28,7 +28,7 @@ typedef struct {
     FieldSystem * unk_0C;
     UnkStruct_ov5_021DF47C * unk_10;
     UnkStruct_ov5_021F37D4 * unk_14;
-    UnkStruct_02061AB4 * unk_18;
+    LocalMapObject * unk_18;
 } UnkStruct_ov5_021F3844;
 
 typedef struct {
@@ -83,7 +83,7 @@ static void ov5_021F381C (UnkStruct_ov5_021F37D4 * param0)
     ov5_021DF9D4(param0->unk_00, 9);
 }
 
-void ov5_021F3844 (UnkStruct_02061AB4 * param0, int param1)
+void ov5_021F3844 (LocalMapObject * param0, int param1)
 {
     int v0;
     VecFx32 v1;
@@ -153,7 +153,7 @@ static void ov5_021F394C (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
     int v0;
     UnkStruct_ov5_021F38AC * v1;
-    UnkStruct_02061AB4 * v2;
+    LocalMapObject * v2;
 
     v1 = param1;
     v2 = v1->unk_18.unk_18;
@@ -211,7 +211,7 @@ static void ov5_021F3A18 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
     VecFx32 v0;
     UnkStruct_ov5_021F38AC * v1;
-    UnkStruct_02061AB4 * v2;
+    LocalMapObject * v2;
 
     v1 = param1;
     v2 = v1->unk_18.unk_18;
diff --git a/src/overlay005/ov5_021F3A50.c b/src/overlay005/ov5_021F3A50.c
index a7ecda6c7b..9f139ccf58 100644
--- a/src/overlay005/ov5_021F3A50.c
+++ b/src/overlay005/ov5_021F3A50.c
@@ -28,7 +28,7 @@ typedef struct {
     FieldSystem * unk_0C;
     UnkStruct_ov5_021DF47C * unk_10;
     UnkStruct_ov5_021F3A7C * unk_14;
-    UnkStruct_02061AB4 * unk_18;
+    LocalMapObject * unk_18;
 } UnkStruct_ov5_021F3AEC;
 
 typedef struct {
@@ -83,7 +83,7 @@ static void ov5_021F3AC4 (UnkStruct_ov5_021F3A7C * param0)
     ov5_021DF9D4(param0->unk_00, 10);
 }
 
-void ov5_021F3AEC (UnkStruct_02061AB4 * param0, int param1)
+void ov5_021F3AEC (LocalMapObject * param0, int param1)
 {
     int v0;
     VecFx32 v1;
@@ -154,7 +154,7 @@ static void ov5_021F3C00 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
     int v0;
     UnkStruct_ov5_021F3B54 * v1;
-    UnkStruct_02061AB4 * v2;
+    LocalMapObject * v2;
 
     v1 = param1;
     v2 = v1->unk_18.unk_18;
@@ -212,7 +212,7 @@ static void ov5_021F3CCC (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
     VecFx32 v0;
     UnkStruct_ov5_021F3B54 * v1;
-    UnkStruct_02061AB4 * v2;
+    LocalMapObject * v2;
 
     v1 = param1;
     v2 = v1->unk_18.unk_18;
diff --git a/src/overlay005/ov5_021F3D00.c b/src/overlay005/ov5_021F3D00.c
index da6adf6645..8dbc8b6ad5 100644
--- a/src/overlay005/ov5_021F3D00.c
+++ b/src/overlay005/ov5_021F3D00.c
@@ -28,7 +28,7 @@ typedef struct {
     int unk_00;
     UnkStruct_ov5_021DF47C * unk_04;
     UnkStruct_ov5_021F3D2C * unk_08;
-    UnkStruct_02061AB4 * unk_0C;
+    LocalMapObject * unk_0C;
     UnkStruct_02073B50 * unk_10;
 } UnkStruct_ov5_021F3D90;
 
@@ -90,7 +90,7 @@ static UnkStruct_02073B50 * ov5_021F3D84 (UnkStruct_ov5_021F3D2C * param0, int p
     return &param0->unk_54[param1];
 }
 
-UnkStruct_ov101_021D5D90 * ov5_021F3D90 (UnkStruct_02061AB4 * param0, int param1)
+UnkStruct_ov101_021D5D90 * ov5_021F3D90 (LocalMapObject * param0, int param1)
 {
     VecFx32 v0;
     UnkStruct_ov101_021D5D90 * v1;
@@ -128,7 +128,7 @@ static int ov5_021F3E00 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
     UnkStruct_ov5_021F3E00 * v0 = param1;
     const UnkStruct_ov5_021F3D90 * v1 = sub_020715BC(param0);
-    UnkStruct_02061AB4 * v2 = v1->unk_0C;
+    LocalMapObject * v2 = v1->unk_0C;
 
     v0->unk_10 = *v1;
     v0->unk_08 = sub_02062910(v2);
@@ -140,7 +140,7 @@ static int ov5_021F3E00 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 static void ov5_021F3E30 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
     UnkStruct_ov5_021F3E00 * v0 = param1;
-    UnkStruct_02061AB4 * v1 = v0->unk_10.unk_0C;
+    LocalMapObject * v1 = v0->unk_10.unk_0C;
 
     if (sub_02062764(v1, v0->unk_08, v0->unk_0C) == 1) {
         sub_0206A218(v1, NULL);
diff --git a/src/overlay005/ov5_021F3E74.c b/src/overlay005/ov5_021F3E74.c
index 205b462a6d..18a4c00ba6 100644
--- a/src/overlay005/ov5_021F3E74.c
+++ b/src/overlay005/ov5_021F3E74.c
@@ -25,7 +25,7 @@ typedef struct {
     FieldSystem * unk_00;
     UnkStruct_ov5_021DF47C * unk_04;
     UnkStruct_ov5_021F3EA0 * unk_08;
-    UnkStruct_02061AB4 * unk_0C;
+    LocalMapObject * unk_0C;
 } UnkStruct_ov5_021F3F10;
 
 typedef struct {
@@ -79,7 +79,7 @@ static void ov5_021F3EE8 (UnkStruct_ov5_021F3EA0 * param0)
     ov5_021DF9D4(param0->unk_00, 11);
 }
 
-void ov5_021F3F10 (UnkStruct_02061AB4 * param0)
+void ov5_021F3F10 (LocalMapObject * param0)
 {
     UnkStruct_ov5_021F3F10 v0;
     UnkStruct_ov5_021DF47C * v1;
@@ -133,7 +133,7 @@ static void ov5_021F3FC4 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
     int v0;
     UnkStruct_ov5_021F3FB8 * v1;
-    UnkStruct_02061AB4 * v2;
+    LocalMapObject * v2;
 
     v1 = param1;
     v2 = v1->unk_10.unk_0C;
@@ -155,7 +155,7 @@ static void ov5_021F3FF4 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
     VecFx32 v0, v1;
     UnkStruct_ov5_021F3FB8 * v2;
-    UnkStruct_02061AB4 * v3;
+    LocalMapObject * v3;
 
     v2 = param1;
     v3 = v2->unk_10.unk_0C;
diff --git a/src/overlay005/ov5_021F47B0.c b/src/overlay005/ov5_021F47B0.c
index ee9bc38bc1..1fdfbea8a9 100644
--- a/src/overlay005/ov5_021F47B0.c
+++ b/src/overlay005/ov5_021F47B0.c
@@ -29,7 +29,7 @@ typedef struct {
     int unk_00;
     UnkStruct_ov5_021DF47C * unk_04;
     UnkStruct_021F47DC * unk_08;
-    const UnkStruct_02061AB4 * unk_0C;
+    const LocalMapObject * unk_0C;
 } UnkStruct_ov5_021F4840;
 
 typedef struct {
@@ -57,7 +57,7 @@ static void ov5_021F4820(UnkStruct_021F47DC * param0);
 static void ov5_021F49D0(UnkStruct_ov101_021D5D90 * param0, UnkStruct_021F487C * param1);
 static void ov5_021F4A24(UnkStruct_ov101_021D5D90 * param0, UnkStruct_021F487C * param1);
 static void ov5_021F4A80(u16 * param0, s16 param1);
-static int ov5_021F4AB4(const UnkStruct_02061AB4 * param0, int param1, VecFx32 * param2);
+static int ov5_021F4AB4(const LocalMapObject * param0, int param1, VecFx32 * param2);
 static void ov5_021F4B6C(int param0, int param1, const VecFx32 * param2, const VecFx32 * param3, VecFx32 * param4, VecFx32 * param5);
 
 static const UnkStruct_ov101_021D86B0 Unk_ov5_02200754;
@@ -115,7 +115,7 @@ static void ov5_021F4820 (UnkStruct_021F47DC * param0)
     }
 }
 
-UnkStruct_ov101_021D5D90 * ov5_021F4840 (UnkStruct_ov5_021DF47C * param0, const UnkStruct_02061AB4 * param1, int param2, int param3)
+UnkStruct_ov101_021D5D90 * ov5_021F4840 (UnkStruct_ov5_021DF47C * param0, const LocalMapObject * param1, int param2, int param3)
 {
     int v0;
     UnkStruct_ov101_021D5D90 * v1;
@@ -163,7 +163,7 @@ static void ov5_021F4908 (UnkStruct_ov101_021D5D90 * param0, void * param1)
     VecFx32 v1, v2;
     const VecFx32 * v3;
     UnkStruct_021F487C * v4 = param1;
-    const UnkStruct_02061AB4 * v5 = v4->unk_24.unk_0C;
+    const LocalMapObject * v5 = v4->unk_24.unk_0C;
     int v6 = sub_0206298C(v5);
 
     sub_02063050(v5, &v2);
@@ -218,7 +218,7 @@ static const UnkStruct_ov101_021D86B0 Unk_ov5_02200754 = {
 static void ov5_021F49D0 (UnkStruct_ov101_021D5D90 * param0, UnkStruct_021F487C * param1)
 {
     VecFx32 v0;
-    const UnkStruct_02061AB4 * v1 = param1->unk_24.unk_0C;
+    const LocalMapObject * v1 = param1->unk_24.unk_0C;
 
     param1->unk_1C = Unk_ov5_0220077C[param1->unk_00];
     sub_02063050(param1->unk_24.unk_0C, &v0);
@@ -233,7 +233,7 @@ static void ov5_021F49D0 (UnkStruct_ov101_021D5D90 * param0, UnkStruct_021F487C
 static void ov5_021F4A24 (UnkStruct_ov101_021D5D90 * param0, UnkStruct_021F487C * param1)
 {
     VecFx32 v0;
-    const UnkStruct_02061AB4 * v1 = param1->unk_24.unk_0C;
+    const LocalMapObject * v1 = param1->unk_24.unk_0C;
 
     param1->unk_10 = Unk_ov5_022007C0[param1->unk_00][param1->unk_01];
     param1->unk_04 = Unk_ov5_022008E0[param1->unk_00][param1->unk_01];
@@ -254,7 +254,7 @@ static void ov5_021F4A80 (u16 * param0, s16 param1)
     }
 }
 
-static int ov5_021F4AB4 (const UnkStruct_02061AB4 * param0, int param1, VecFx32 * param2)
+static int ov5_021F4AB4 (const LocalMapObject * param0, int param1, VecFx32 * param2)
 {
     u32 v0;
     VecFx32 v1;
@@ -277,7 +277,7 @@ static int ov5_021F4AB4 (const UnkStruct_02061AB4 * param0, int param1, VecFx32
 
         if ((v0 != 0) && (v0 != (1 << 0))) {
             if (v0 == (1 << 2)) {
-                UnkStruct_02061AB4 * v7;
+                LocalMapObject * v7;
 
                 v7 = sub_0206326C(sub_02062A40(param0), v4, v6, 1);
                 GF_ASSERT(v7 != NULL);
diff --git a/src/overlay005/ov5_021F50BC.c b/src/overlay005/ov5_021F50BC.c
index 0f5002014e..14fd5434d8 100644
--- a/src/overlay005/ov5_021F50BC.c
+++ b/src/overlay005/ov5_021F50BC.c
@@ -22,13 +22,13 @@ typedef struct {
     UnkStruct_ov5_021DF47C * unk_08;
     UnkStruct_02073838 unk_0C;
     UnkStruct_02073B50 unk_20;
-    UnkStruct_02061AB4 * unk_74;
+    LocalMapObject * unk_74;
 } UnkStruct_021F50E8;
 
 typedef struct {
     UnkStruct_ov5_021DF47C * unk_00;
     UnkStruct_021F50E8 * unk_04;
-    UnkStruct_02061AB4 * unk_08;
+    LocalMapObject * unk_08;
 } UnkStruct_ov5_021F511C;
 
 typedef struct {
@@ -78,7 +78,7 @@ static void ov5_021F5110 (UnkStruct_021F50E8 * param0)
     sub_0207395C(&param0->unk_0C);
 }
 
-UnkStruct_ov101_021D5D90 * ov5_021F511C (UnkStruct_02061AB4 * param0)
+UnkStruct_ov101_021D5D90 * ov5_021F511C (LocalMapObject * param0)
 {
     int v0, v1;
     UnkStruct_ov5_021F511C v2;
@@ -128,7 +128,7 @@ static void ov5_021F51A0 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 static void ov5_021F51A4 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
     UnkStruct_ov5_021F5158 * v0;
-    UnkStruct_02061AB4 * v1;
+    LocalMapObject * v1;
     VecFx32 v2;
 
     v0 = param1;
diff --git a/src/overlay005/ov5_021F5284.c b/src/overlay005/ov5_021F5284.c
index 180a1c09d3..2677b61287 100644
--- a/src/overlay005/ov5_021F5284.c
+++ b/src/overlay005/ov5_021F5284.c
@@ -22,13 +22,13 @@ typedef struct {
     UnkStruct_ov5_021DF47C * unk_08;
     UnkStruct_02073838 unk_0C;
     UnkStruct_02073B50 unk_20;
-    UnkStruct_02061AB4 * unk_74;
+    LocalMapObject * unk_74;
 } UnkStruct_021F52B0;
 
 typedef struct {
     UnkStruct_ov5_021DF47C * unk_00;
     UnkStruct_021F52B0 * unk_04;
-    UnkStruct_02061AB4 * unk_08;
+    LocalMapObject * unk_08;
 } UnkStruct_021F52E4;
 
 typedef struct {
@@ -79,7 +79,7 @@ static void ov5_021F52D8 (UnkStruct_021F52B0 * param0)
     sub_0207395C(&param0->unk_0C);
 }
 
-UnkStruct_ov101_021D5D90 * ov5_021F52E4 (UnkStruct_02061AB4 * param0)
+UnkStruct_ov101_021D5D90 * ov5_021F52E4 (LocalMapObject * param0)
 {
     int v0, v1;
     UnkStruct_021F52E4 v2;
@@ -130,7 +130,7 @@ static void ov5_021F5368 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 static void ov5_021F536C (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
     UnkStruct_021F5320 * v0;
-    UnkStruct_02061AB4 * v1;
+    LocalMapObject * v1;
     VecFx32 v2;
 
     v0 = param1;
diff --git a/src/overlay005/ov5_021F5428.c b/src/overlay005/ov5_021F5428.c
index e81745a886..8081f416e7 100644
--- a/src/overlay005/ov5_021F5428.c
+++ b/src/overlay005/ov5_021F5428.c
@@ -22,13 +22,13 @@ typedef struct {
     UnkStruct_ov5_021DF47C * unk_08;
     UnkStruct_02073838 unk_0C;
     UnkStruct_02073B50 unk_20;
-    UnkStruct_02061AB4 * unk_74;
+    LocalMapObject * unk_74;
 } UnkStruct_ov5_021F5454;
 
 typedef struct {
     UnkStruct_ov5_021DF47C * unk_00;
     UnkStruct_ov5_021F5454 * unk_04;
-    UnkStruct_02061AB4 * unk_08;
+    LocalMapObject * unk_08;
 } UnkStruct_ov5_021F5488;
 
 typedef struct {
@@ -79,7 +79,7 @@ static void ov5_021F547C (UnkStruct_ov5_021F5454 * param0)
     sub_0207395C(&param0->unk_0C);
 }
 
-UnkStruct_ov101_021D5D90 * ov5_021F5488 (UnkStruct_02061AB4 * param0)
+UnkStruct_ov101_021D5D90 * ov5_021F5488 (LocalMapObject * param0)
 {
     int v0, v1;
     UnkStruct_ov5_021F5488 v2;
@@ -132,7 +132,7 @@ static void ov5_021F5510 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 static void ov5_021F5514 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
     UnkStruct_ov5_021F54C4 * v0;
-    UnkStruct_02061AB4 * v1;
+    LocalMapObject * v1;
     VecFx32 v2;
 
     v0 = param1;
diff --git a/src/overlay005/ov5_021F5894.c b/src/overlay005/ov5_021F5894.c
index f4b813ea10..0b87bd476b 100644
--- a/src/overlay005/ov5_021F5894.c
+++ b/src/overlay005/ov5_021F5894.c
@@ -69,7 +69,7 @@ static void ov5_021F58E8 (UnkStruct_021F58C0 * param0)
     sub_02073AA8(&param0->unk_18);
 }
 
-void ov5_021F58FC (UnkStruct_02061AB4 * param0, int param1, int param2, int param3)
+void ov5_021F58FC (LocalMapObject * param0, int param1, int param2, int param3)
 {
     int v0, v1, v2;
     UnkStruct_021F58FC v3;
diff --git a/src/overlay005/ov5_021F5A10.c b/src/overlay005/ov5_021F5A10.c
index 82e8504e7e..ce50b52602 100644
--- a/src/overlay005/ov5_021F5A10.c
+++ b/src/overlay005/ov5_021F5A10.c
@@ -34,7 +34,7 @@ typedef struct {
     int unk_00;
     UnkStruct_ov5_021DF47C * unk_04;
     UnkStruct_ov5_021F5A34 * unk_08;
-    UnkStruct_02061AB4 * unk_0C;
+    LocalMapObject * unk_0C;
 } UnkStruct_ov5_021F5D8C;
 
 typedef struct {
@@ -353,7 +353,7 @@ static void ov5_021F5D54 (UnkStruct_ov101_021D5D90 * param0, void * param1)
     sub_020212A8(v1->unk_40, &v0);
 }
 
-UnkStruct_ov101_021D5D90 * ov5_021F5D8C (UnkStruct_02061AB4 * param0, int param1, int param2, int param3)
+UnkStruct_ov101_021D5D90 * ov5_021F5D8C (LocalMapObject * param0, int param1, int param2, int param3)
 {
     int v0;
     UnkStruct_ov5_021F5D8C v1;
@@ -412,7 +412,7 @@ static int ov5_021F5DE4 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 static void ov5_021F5E58 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
     UnkStruct_ov5_021F5C4C * v0;
-    UnkStruct_02061AB4 * v1;
+    LocalMapObject * v1;
     VecFx32 v2;
 
     v0 = param1;
@@ -475,7 +475,7 @@ static int ov5_021F5EE0 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 static void ov5_021F5F24 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
     UnkStruct_ov5_021F5C4C * v0;
-    UnkStruct_02061AB4 * v1;
+    LocalMapObject * v1;
     VecFx32 v2;
 
     v0 = param1;
diff --git a/src/overlay005/ov5_021F600C.c b/src/overlay005/ov5_021F600C.c
index 468202af59..dcefd4dce0 100644
--- a/src/overlay005/ov5_021F600C.c
+++ b/src/overlay005/ov5_021F600C.c
@@ -24,7 +24,7 @@ typedef struct {
     FieldSystem * unk_00;
     UnkStruct_ov5_021DF47C * unk_04;
     UnkStruct_ov5_021F600C * unk_08;
-    UnkStruct_02061AB4 * unk_0C;
+    LocalMapObject * unk_0C;
 } UnkStruct_ov5_021F6094;
 
 typedef struct {
@@ -75,7 +75,7 @@ static void ov5_021F6074 (UnkStruct_ov5_021F600C * param0)
     ov5_021DF9D4(param0->unk_00, 4);
 }
 
-UnkStruct_ov101_021D5D90 * ov5_021F6094 (UnkStruct_02061AB4 * param0)
+UnkStruct_ov101_021D5D90 * ov5_021F6094 (LocalMapObject * param0)
 {
     UnkStruct_ov5_021F6094 v0;
     UnkStruct_ov5_021DF47C * v1;
@@ -128,7 +128,7 @@ static void ov5_021F6134 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 static void ov5_021F6140 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
     UnkStruct_ov5_021F6134 * v0;
-    UnkStruct_02061AB4 * v1;
+    LocalMapObject * v1;
 
     v0 = param1;
     v1 = v0->unk_10.unk_0C;
@@ -143,7 +143,7 @@ static void ov5_021F615C (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
     VecFx32 v0, v1;
     UnkStruct_ov5_021F6134 * v2;
-    UnkStruct_02061AB4 * v3;
+    LocalMapObject * v3;
 
     v2 = param1;
     v3 = v2->unk_10.unk_0C;
diff --git a/src/overlay005/ov5_021F61BC.c b/src/overlay005/ov5_021F61BC.c
index 0263f9a7c6..a42d236c5c 100644
--- a/src/overlay005/ov5_021F61BC.c
+++ b/src/overlay005/ov5_021F61BC.c
@@ -88,10 +88,10 @@ void ov5_021F6218 (PlayerAvatar * param0)
     int v0 = 0, v1;
     UnkStruct_021F6218 v2;
     UnkStruct_ov5_021DF47C * v3;
-    UnkStruct_02061AB4 * v4;
+    LocalMapObject * v4;
     VecFx32 v5 = {0, 0, 0};
 
-    v4 = sub_0205EB3C(param0);
+    v4 = Player_LocalMapObject(param0);
     v3 = ov5_021DF578(v4);
 
     v2.unk_00 = v3;
@@ -105,13 +105,13 @@ void ov5_021F6218 (PlayerAvatar * param0)
 static int ov5_021F6264 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
     UnkStruct_021F6264 * v0;
-    UnkStruct_02061AB4 * v1;
+    LocalMapObject * v1;
     const UnkStruct_021F6218 * v2;
 
     v0 = param1;
     v2 = sub_020715BC(param0);
     v0->unk_24 = *v2;
-    v1 = sub_0205EB3C(v2->unk_08);
+    v1 = Player_LocalMapObject(v2->unk_08);
 
     v0->unk_04 = -1;
     v0->unk_14 = sub_02062910(v1);
@@ -130,7 +130,7 @@ static void ov5_021F62A0 (UnkStruct_ov101_021D5D90 * param0, void * param1)
     int v0;
     UnkStruct_021F6264 * v1 = param1;
     PlayerAvatar * v2 = v1->unk_24.unk_08;
-    UnkStruct_02061AB4 * v3 = sub_0205EB3C(v2);
+    LocalMapObject * v3 = Player_LocalMapObject(v2);
 
     if (sub_02062764(v3, v1->unk_14, v1->unk_18) == 0) {
         ov5_021DF74C(param0);
diff --git a/src/overlay005/ov5_021F6454.c b/src/overlay005/ov5_021F6454.c
index 1a832ca55c..05a5e28289 100644
--- a/src/overlay005/ov5_021F6454.c
+++ b/src/overlay005/ov5_021F6454.c
@@ -989,8 +989,8 @@ BOOL ov5_021F7538 (UnkStruct_0203E724 * param0)
     int v3 = 0;
     FieldSystem * v4 = param0->unk_34;
     UnkStruct_02061830 * v5 = v4->unk_38;
-    UnkStruct_02061AB4 * v6 = sub_0205EB3C(v4->playerAvatar);
-    UnkStruct_02061AB4 * v7;
+    LocalMapObject * v6 = Player_LocalMapObject(v4->playerAvatar);
+    LocalMapObject * v7;
 
     sub_02063050(v6, &v1);
     v0 = v1.y;
@@ -1030,8 +1030,8 @@ BOOL ov5_021F7604 (UnkStruct_0203E724 * param0)
     int v0 = 0;
     FieldSystem * v1 = param0->unk_34;
     UnkStruct_02061830 * v2 = v1->unk_38;
-    UnkStruct_02061AB4 * v3 = sub_0205EB3C(v1->playerAvatar);
-    UnkStruct_02061AB4 * v4;
+    LocalMapObject * v3 = Player_LocalMapObject(v1->playerAvatar);
+    LocalMapObject * v4;
 
     while (sub_020625B0(v2, &v4, &v0, (1 << 0)) == 1) {
         if (v4 != v3) {
@@ -1042,7 +1042,7 @@ BOOL ov5_021F7604 (UnkStruct_0203E724 * param0)
     return 0;
 }
 
-static void ov5_021F7654 (UnkStruct_02061AB4 * param0, int param1)
+static void ov5_021F7654 (LocalMapObject * param0, int param1)
 {
     VecFx32 v0;
     UnkStruct_020216E0 * v1;
@@ -1065,7 +1065,7 @@ static void ov5_021F7654 (UnkStruct_02061AB4 * param0, int param1)
 
 BOOL ov5_021F76A0 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
     FieldSystem * v1 = param0->unk_34;
     UnkStruct_02061830 * v2 = v1->unk_38;
 
@@ -1086,7 +1086,7 @@ BOOL ov5_021F76A0 (UnkStruct_0203E724 * param0)
 
 BOOL ov5_021F76D0 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
     UnkStruct_02061830 * v1 = param0->unk_34->unk_38;
 
     v0 = sub_0206251C(v1, 32);
@@ -1107,7 +1107,7 @@ BOOL ov5_021F76D0 (UnkStruct_0203E724 * param0)
 BOOL ov5_021F7704 (UnkStruct_0203E724 * param0)
 {    
     int v0;
-    UnkStruct_02061AB4 * v1 = sub_0206251C(param0->unk_34->unk_38, 15);
+    LocalMapObject * v1 = sub_0206251C(param0->unk_34->unk_38, 15);
     if (v1 != NULL)
     {
         switch (sub_02063020(v1))
@@ -1135,7 +1135,7 @@ BOOL ov5_021F7704 (UnkStruct_0203E724 * param0)
 
 BOOL ov5_021F7754 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_02061AB4 * v0 = sub_0206251C(param0->unk_34->unk_38, 15);
+    LocalMapObject * v0 = sub_0206251C(param0->unk_34->unk_38, 15);
     if (v0 != NULL)
         sub_020628C4(v0, 8192);
     return 0;
diff --git a/src/overlay005/ov5_021F8560.c b/src/overlay005/ov5_021F8560.c
index d7784a2843..76adff76cd 100644
--- a/src/overlay005/ov5_021F8560.c
+++ b/src/overlay005/ov5_021F8560.c
@@ -31,7 +31,7 @@ typedef struct {
     int unk_04;
     UnkStruct_ov5_021DF47C * unk_08;
     UnkStruct_ov5_021F858C * unk_0C;
-    UnkStruct_02061AB4 * unk_10;
+    LocalMapObject * unk_10;
     PlayerAvatar * unk_14;
 } UnkStruct_ov5_021F8668;
 
@@ -98,9 +98,9 @@ UnkStruct_ov101_021D5D90 * ov5_021F85BC (PlayerAvatar * param0, int param1, int
     const VecFx32 * v2;
     VecFx32 v3 = {0, 0, 0};
     UnkStruct_ov5_021F8668 v4;
-    UnkStruct_02061AB4 * v5;
+    LocalMapObject * v5;
 
-    v5 = sub_0205EB3C(param0);
+    v5 = Player_LocalMapObject(param0);
 
     v4.unk_00 = param4;
     v4.unk_04 = param6;
@@ -132,7 +132,7 @@ static int ov5_021F8668 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
     UnkStruct_ov5_021F86CC * v0 = param1;
     const UnkStruct_ov5_021F8668 * v1 = sub_020715BC(param0);
-    UnkStruct_02061AB4 * v2 = v1->unk_10;
+    LocalMapObject * v2 = v1->unk_10;
 
     v0->unk_38 = *v1;
     v0->unk_04 = v1->unk_00;
@@ -153,7 +153,7 @@ static int ov5_021F8668 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 static void ov5_021F86CC (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
     UnkStruct_ov5_021F86CC * v0 = param1;
-    UnkStruct_02061AB4 * v1 = v0->unk_38.unk_10;
+    LocalMapObject * v1 = v0->unk_38.unk_10;
     VecFx32 v2 = {0, 0, 0};
 
     sub_020630AC(v1, &v2);
@@ -162,7 +162,7 @@ static void ov5_021F86CC (UnkStruct_ov101_021D5D90 * param0, void * param1)
 static void ov5_021F86E4 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
     UnkStruct_ov5_021F86CC * v0 = param1;
-    UnkStruct_02061AB4 * v1 = v0->unk_38.unk_10;
+    LocalMapObject * v1 = v0->unk_38.unk_10;
     PlayerAvatar * v2 = v0->unk_38.unk_14;
 
     if (((v0)->unk_00 & (1 << 1)) == 0) {
diff --git a/src/overlay006/ov6_0223E140.c b/src/overlay006/ov6_0223E140.c
index 2e2a5b6f2d..8a7f23b110 100644
--- a/src/overlay006/ov6_0223E140.c
+++ b/src/overlay006/ov6_0223E140.c
@@ -140,9 +140,9 @@ typedef struct {
     UnkStruct_ov6_0223FD0C unk_E4;
     UnkStruct_ov6_0223FD0C unk_F4;
     FieldSystem * unk_104;
-    UnkStruct_02061AB4 * unk_108;
-    UnkStruct_02061AB4 * unk_10C;
-    UnkStruct_02061AB4 * unk_110;
+    LocalMapObject * unk_108;
+    LocalMapObject * unk_10C;
+    LocalMapObject * unk_110;
     PlayerAvatar * unk_114;
 } UnkStruct_ov6_0223EA98;
 
@@ -195,7 +195,7 @@ typedef struct UnkStruct_ov6_022400A8_t {
 } UnkStruct_ov6_022400A8;
 
 typedef struct {
-    UnkStruct_02061AB4 * unk_00;
+    LocalMapObject * unk_00;
     UnkStruct_ov6_0223FD0C unk_04;
     UnkStruct_ov6_0223FD0C unk_14;
     int unk_24;
@@ -498,7 +498,7 @@ static void ov6_0223E2FC (SysTask * param0, void * param1)
 
 static void ov6_0223E318 (FieldSystem * param0, u32 param1, BOOL param2)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
 
     v0 = sub_0206251C(param0->unk_38, param1);
 
@@ -836,7 +836,7 @@ static BOOL ov6_0223E71C (UnkStruct_ov6_0223E71C * param0)
 static void ov6_0223E7B4 (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1, void * param2)
 {
     UnkStruct_ov6_0223E7B4 * v0 = param2;
-    UnkStruct_02061AB4 * v1;
+    LocalMapObject * v1;
     u16 v2, v3, v4;
 
     v1 = sub_0206251C(param1->unk_38, 0);
@@ -1092,7 +1092,7 @@ static void ov6_0223EB4C (UnkStruct_ov5_021D1BEC * param0, FieldSystem * param1,
     v0->unk_104 = param1;
     v0->unk_108 = sub_0206251C(v0->unk_104->unk_38, 1);
     v0->unk_10C = sub_0206251C(v0->unk_104->unk_38, 0);
-    v0->unk_110 = sub_0205EB3C(sub_0205EF3C(v0->unk_104));
+    v0->unk_110 = Player_LocalMapObject(sub_0205EF3C(v0->unk_104));
 
     Heap_FndInitAllocatorForExpHeap(&v0->unk_C0, 4, 32);
     ov6_0223EA98(v0);
@@ -2824,7 +2824,7 @@ UnkStruct_ov6_02240C44 * ov6_02240B9C (u32 param0, FieldSystem * param1)
 void ov6_02240C44 (UnkStruct_ov6_02240C44 * param0, u32 param1)
 {
     VecFx32 v0;
-    UnkStruct_02061AB4 * v1;
+    LocalMapObject * v1;
 
     v1 = sub_0206251C(param0->unk_D8->unk_38, param1);
 
diff --git a/src/overlay006/ov6_02242AF0.c b/src/overlay006/ov6_02242AF0.c
index 7e8ee354ea..5140e7eb6b 100644
--- a/src/overlay006/ov6_02242AF0.c
+++ b/src/overlay006/ov6_02242AF0.c
@@ -295,10 +295,10 @@ static BOOL ov6_02242D94 (FieldSystem * param0, UnkStruct_ov6_02242B58 * param1,
 
 static BOOL ov6_02242E60 (FieldSystem * param0, UnkStruct_ov6_02242B58 * param1, const fx32 * param2, VecFx32 * param3)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
     VecFx32 v1;
 
-    v0 = sub_0205EB3C(param0->playerAvatar);
+    v0 = Player_LocalMapObject(param0->playerAvatar);
     sub_0205EAEC(param0->playerAvatar, &v1);
 
     param3->z = v1.z + ((FX32_ONE * 16) / 2);
diff --git a/src/overlay006/ov6_02243258.c b/src/overlay006/ov6_02243258.c
index 081e376b31..838d4443bf 100644
--- a/src/overlay006/ov6_02243258.c
+++ b/src/overlay006/ov6_02243258.c
@@ -246,7 +246,7 @@ typedef struct {
     VecFx32 unk_18;
     fx32 unk_24;
     fx32 unk_28;
-    UnkStruct_02061AB4 * unk_2C;
+    LocalMapObject * unk_2C;
     UnkStruct_ov6_02243FFC * unk_30;
 } UnkStruct_ov100_021D4890;
 
@@ -1026,7 +1026,7 @@ static void ov6_02243F50 (void)
 
 static void ov6_02243F74 (FieldSystem * param0, int param1)
 {
-    UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0->playerAvatar);
+    LocalMapObject * v0 = Player_LocalMapObject(param0->playerAvatar);
     sub_02062D64(v0, param1);
 }
 
@@ -3042,7 +3042,7 @@ static void * ov6_02245F44 (u32 param0, int param1)
 
 static void ov6_02245F64 (UnkStruct_ov6_02243FFC * param0, int param1)
 {
-    UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0->unk_60->playerAvatar);
+    LocalMapObject * v0 = Player_LocalMapObject(param0->unk_60->playerAvatar);
 
     sub_02062DDC(v0);
     sub_02062D64(v0, param1);
diff --git a/src/overlay006/ov6_02247100.c b/src/overlay006/ov6_02247100.c
index 4edbe459c6..12ff5ef423 100644
--- a/src/overlay006/ov6_02247100.c
+++ b/src/overlay006/ov6_02247100.c
@@ -32,7 +32,7 @@ typedef struct {
     SysTask * unk_0C;
     SysTask * unk_10;
     SysTask * unk_14;
-    UnkStruct_02061AB4 * unk_18;
+    LocalMapObject * unk_18;
     FieldSystem * unk_1C;
     Pokemon * unk_20;
 } UnkStruct_ov6_02247100;
@@ -54,7 +54,7 @@ void * ov6_02247100 (FieldSystem * param0, u32 param1)
 
     v0->unk_08 = 0;
     v0->unk_1C = param0;
-    v0->unk_18 = sub_0205EB3C(param0->playerAvatar);
+    v0->unk_18 = Player_LocalMapObject(param0->playerAvatar);
 
     return v0;
 }
@@ -174,7 +174,7 @@ void * ov6_022472C8 (FieldSystem * param0, u32 param1, int param2)
 
     v0->unk_08 = param2;
     v0->unk_1C = param0;
-    v0->unk_18 = sub_0205EB3C(param0->playerAvatar);
+    v0->unk_18 = Player_LocalMapObject(param0->playerAvatar);
 
     return v0;
 }
@@ -293,7 +293,7 @@ void * ov6_02247488 (FieldSystem * param0, Pokemon * param1, u32 param2)
 
     v0->unk_08 = 1;
     v0->unk_1C = param0;
-    v0->unk_18 = sub_0205EB3C(param0->playerAvatar);
+    v0->unk_18 = Player_LocalMapObject(param0->playerAvatar);
     v0->unk_20 = param1;
 
     return v0;
@@ -352,7 +352,7 @@ void * ov6_02247530 (FieldSystem * param0, Pokemon * param1, u32 param2)
 
     v0->unk_08 = 2;
     v0->unk_1C = param0;
-    v0->unk_18 = sub_0205EB3C(param0->playerAvatar);
+    v0->unk_18 = Player_LocalMapObject(param0->playerAvatar);
     v0->unk_20 = param1;
 
     return v0;
diff --git a/src/overlay006/ov6_02248050.c b/src/overlay006/ov6_02248050.c
index 21fb2ccea3..202e3d73da 100644
--- a/src/overlay006/ov6_02248050.c
+++ b/src/overlay006/ov6_02248050.c
@@ -73,7 +73,7 @@ static void ov6_02248050 (UnkStruct_02061830 * param0, u32 param1, UnkStruct_020
     int v0;
     int v1, v2;
     VecFx32 v3;
-    UnkStruct_02061AB4 * v4;
+    LocalMapObject * v4;
 
     v4 = sub_0206251C(param0, param1);
 
diff --git a/src/overlay008/ov8_02249960.c b/src/overlay008/ov8_02249960.c
index b0e3e84d73..744da1c683 100644
--- a/src/overlay008/ov8_02249960.c
+++ b/src/overlay008/ov8_02249960.c
@@ -172,7 +172,7 @@ typedef struct {
     int unk_14;
     int unk_18;
     int unk_1C;
-    UnkStruct_02061AB4 * unk_20;
+    LocalMapObject * unk_20;
 } UnkStruct_ov8_0224B28C;
 
 typedef struct {
@@ -198,7 +198,7 @@ typedef struct {
 typedef struct {
     int unk_00;
     int unk_04;
-    UnkStruct_02061AB4 * unk_08;
+    LocalMapObject * unk_08;
     UnkStruct_ov101_021D5D90 * unk_0C;
 } UnkStruct_ov8_0224B80C;
 
@@ -233,7 +233,7 @@ typedef struct {
     int unk_24;
     int unk_28;
     int unk_2C;
-    UnkStruct_02061AB4 * unk_30;
+    LocalMapObject * unk_30;
     FieldSystem * unk_34;
 } UnkStruct_ov8_0224C0C4;
 
@@ -289,7 +289,7 @@ typedef struct {
     int unk_08;
     SysTask * unk_0C;
     UnkStruct_ov101_021D5D90 * unk_10;
-    UnkStruct_02061AB4 * unk_14;
+    LocalMapObject * unk_14;
     UnkStruct_ov8_0224C444 * unk_18;
 } UnkStruct_ov8_0224C4F8;
 
@@ -1413,13 +1413,13 @@ static BOOL ov8_0224A4FC (UnkStruct_020508D4 * param0)
 static BOOL ov8_0224A620 (UnkStruct_020508D4 * param0)
 {
     UnkStruct_ov5_021E1890 * v0;
-    UnkStruct_02061AB4 * v1;
+    LocalMapObject * v1;
     FieldSystem * v2 = sub_02050A60(param0);
     UnkStruct_ov8_0224997C * v3 = sub_02050A64(param0);
     UnkStruct_ov8_0224A1E4 * v4;
 
     v4 = (UnkStruct_ov8_0224A1E4 *)v2->unk_04->unk_24;
-    v1 = sub_0205EB3C(v2->playerAvatar);
+    v1 = Player_LocalMapObject(v2->playerAvatar);
 
     switch (v3->unk_00) {
     case 0:
@@ -1497,13 +1497,13 @@ static BOOL ov8_0224A620 (UnkStruct_020508D4 * param0)
 static BOOL ov8_0224A770 (UnkStruct_020508D4 * param0)
 {
     UnkStruct_ov5_021E1890 * v0;
-    UnkStruct_02061AB4 * v1;
+    LocalMapObject * v1;
     FieldSystem * v2 = sub_02050A60(param0);
     UnkStruct_ov8_0224997C * v3 = sub_02050A64(param0);
     UnkStruct_ov8_0224A1E4 * v4;
 
     v4 = (UnkStruct_ov8_0224A1E4 *)v2->unk_04->unk_24;
-    v1 = sub_0205EB3C(v2->playerAvatar);
+    v1 = Player_LocalMapObject(v2->playerAvatar);
 
     switch (v3->unk_00) {
     case 0:
@@ -1566,9 +1566,9 @@ static BOOL ov8_0224A770 (UnkStruct_020508D4 * param0)
         break;
     case 3:
     {
-        UnkStruct_02061AB4 * v8;
+        LocalMapObject * v8;
 
-        v8 = sub_0205EB3C(v2->playerAvatar);
+        v8 = Player_LocalMapObject(v2->playerAvatar);
 
         if (sub_02065684(v8) == 1) {
             sub_020656AC(v8);
@@ -2736,7 +2736,7 @@ static void ov8_0224B2C4 (FieldSystem * param0, UnkStruct_ov8_0224B28C * param1)
 
 static BOOL ov8_0224B2E8 (UnkStruct_ov8_0224B28C * param0)
 {
-    UnkStruct_02061AB4 * v0 = param0->unk_20;
+    LocalMapObject * v0 = param0->unk_20;
 
     if (sub_020655F4(param0->unk_20) == 1) {
         int v1 = 0x9a;
@@ -3136,9 +3136,9 @@ BOOL ov8_0224B7D4 (FieldSystem * param0, const int param1, const int param2, con
     return 0;
 }
 
-static UnkStruct_02061AB4 * ov8_0224B7D8 (FieldSystem * param0, int param1, int param2, int param3)
+static LocalMapObject * ov8_0224B7D8 (FieldSystem * param0, int param1, int param2, int param3)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
 
     v0 = sub_020619DC(param0->unk_38, param1, param2, 0, 0x2000, 0x0, param0->unk_1C->unk_00);
 
@@ -3148,7 +3148,7 @@ static UnkStruct_02061AB4 * ov8_0224B7D8 (FieldSystem * param0, int param1, int
     return v0;
 }
 
-static void ov8_0224B80C (UnkStruct_ov8_0224B80C * param0, UnkStruct_02061AB4 * param1, FieldSystem * param2)
+static void ov8_0224B80C (UnkStruct_ov8_0224B80C * param0, LocalMapObject * param1, FieldSystem * param2)
 {
     param0->unk_08 = param1;
     param0->unk_00 = sub_02063020(param1);
@@ -3212,7 +3212,7 @@ static void ov8_0224B8A0 (UnkStruct_ov8_0224B8A0 * param0)
 static void ov8_0224B8D0 (UnkStruct_ov8_0224B8D0 * param0)
 {
     int v0;
-    UnkStruct_02061AB4 * v1;
+    LocalMapObject * v1;
     const UnkStruct_ov8_0224C90C * v2;
     FieldSystem * v3 = param0->unk_00;
     UnkStruct_ov8_0224B8A0 * v4 = param0->unk_04;
@@ -3237,7 +3237,7 @@ static void ov8_0224B8D0 (UnkStruct_ov8_0224B8D0 * param0)
 static void ov8_0224B958 (UnkStruct_ov8_0224B8D0 * param0)
 {
     int v0 = 0, v1 = 0;
-    UnkStruct_02061AB4 * v2;
+    LocalMapObject * v2;
     FieldSystem * v3 = param0->unk_00;
     UnkStruct_02061830 * v4 = v3->unk_38;
     UnkStruct_ov8_0224B8A0 * v5 = param0->unk_04;
@@ -3341,12 +3341,12 @@ static u32 ov8_0224BAA0 (UnkStruct_ov8_0224B8D0 * param0, int param1, int param2
 
 static BOOL ov8_0224BAF4 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
     FieldSystem * v1 = sub_02050A60(param0);
     UnkStruct_ov8_0224C098 * v2 = sub_02050A64(param0);
     UnkStruct_ov8_0224B8D0 * v3 = v2->unk_3C;
 
-    v0 = sub_0205EB3C(v1->playerAvatar);
+    v0 = Player_LocalMapObject(v1->playerAvatar);
 
     switch (v2->unk_00) {
     case 0:
@@ -3404,9 +3404,9 @@ static int ov8_0224BBA0 (UnkStruct_ov8_0224C098 * param0)
 
 static int ov8_0224BBD0 (UnkStruct_ov8_0224C098 * param0)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
 
-    v0 = sub_0205EB3C(param0->unk_3C->unk_00->playerAvatar);
+    v0 = Player_LocalMapObject(param0->unk_3C->unk_00->playerAvatar);
 
     if (sub_020655F4(v0) == 0) {
         return 0;
@@ -3490,8 +3490,8 @@ static int ov8_0224BCA8 (UnkStruct_ov8_0224C098 * param0)
             (void)0;
         } else {
             sub_02064450(v0->unk_08.unk_00, v0->unk_08.unk_04, &param0->unk_20);
-            sub_02063024(v0->unk_08.unk_08, v0->unk_08.unk_00);
-            sub_02063044(v0->unk_08.unk_08, v0->unk_08.unk_04);
+            LocalMapObj_SetX(v0->unk_08.unk_08, v0->unk_08.unk_00);
+            LocalMapObj_SetZ(v0->unk_08.unk_08, v0->unk_08.unk_04);
             sub_02064208(v0->unk_08.unk_08);
             ov5_021F4714(v0->unk_08.unk_0C, FX32_ONE);
             sub_020057A4(1356, 0);
@@ -3584,9 +3584,9 @@ static int ov8_0224BE8C (UnkStruct_ov8_0224C098 * param0)
 
 static int ov8_0224BEA4 (UnkStruct_ov8_0224C098 * param0)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
 
-    v0 = sub_0205EB3C(param0->unk_3C->unk_00->playerAvatar);
+    v0 = Player_LocalMapObject(param0->unk_3C->unk_00->playerAvatar);
 
     if (sub_02065684(v0) == 1) {
         sub_020656AC(v0);
@@ -3897,7 +3897,7 @@ void ov8_0224C198 (FieldSystem * param0)
     {
         int v3 = 0xd2;
         PlayerAvatar * v4 = param0->playerAvatar;
-        UnkStruct_02061AB4 * v5 = sub_0205EB3C(v4);
+        LocalMapObject * v5 = Player_LocalMapObject(v4);
 
         if (sub_0205EB98(param0->playerAvatar) == 1) {
             v3 = 0xd3;
@@ -4020,7 +4020,7 @@ static void ov8_0224C3B4 (UnkStruct_ov8_0224C444 * param0)
 static void ov8_0224C444 (UnkStruct_ov8_0224C444 * param0)
 {
     int v0, v1, v2, v3, v4;
-    UnkStruct_02061AB4 * v5;
+    LocalMapObject * v5;
     UnkStruct_ov8_0224C4F8 * v6 = param0->unk_04;
     const UnkStruct_02061830 * v7 = param0->unk_00->unk_38;
 
@@ -4077,8 +4077,8 @@ BOOL ov8_0224C51C (FieldSystem * param0)
     UnkStruct_02027860 * v4;
     PlayerAvatar * v5;
     UnkStruct_02061830 * v6;
-    UnkStruct_02061AB4 * v7;
-    UnkStruct_02061AB4 * v8;
+    LocalMapObject * v7;
+    LocalMapObject * v8;
 
     v4 = sub_02027860(sub_0203D174(param0));
 
@@ -4090,7 +4090,7 @@ BOOL ov8_0224C51C (FieldSystem * param0)
     v7 = NULL;
     v6 = param0->unk_38;
     v5 = param0->playerAvatar;
-    v8 = sub_0205EB3C(v5);
+    v8 = Player_LocalMapObject(v5);
     v2 = 2;
     v1 = sub_0206447C(sub_0206298C(v8));
 
@@ -4122,7 +4122,7 @@ BOOL ov8_0224C5DC (FieldSystem * param0, void * param1)
     }
 
     {
-        UnkStruct_02061AB4 * v1 = param1;
+        LocalMapObject * v1 = param1;
 
         sub_02062FF4(v1, sub_02063020(v1));
         sub_02063004(v1, sub_02063040(v1));
diff --git a/src/overlay009/ov9_02249960.c b/src/overlay009/ov9_02249960.c
index 3ef1974621..2e5eb32247 100644
--- a/src/overlay009/ov9_02249960.c
+++ b/src/overlay009/ov9_02249960.c
@@ -322,7 +322,7 @@ typedef struct {
     NNSG3dAnmObj * unk_10;
     u16 unk_14;
     u16 unk_16;
-    UnkStruct_02061AB4 * unk_18;
+    LocalMapObject * unk_18;
     UnkStruct_020216E0 * unk_1C;
 } UnkStruct_ov9_0224A294;
 
@@ -443,7 +443,7 @@ typedef struct {
     u8 unk_01;
     u16 unk_02;
     UnkStruct_ov9_0224DF10 unk_04;
-    UnkStruct_02061AB4 * unk_1C;
+    LocalMapObject * unk_1C;
     UnkStruct_ov101_021D5D90 * unk_20;
 } UnkStruct_ov9_0224E0DC;
 
@@ -505,7 +505,7 @@ typedef struct {
 } UnkStruct_ov9_02252EB4;
 
 typedef struct {
-    UnkStruct_02061AB4 * unk_00[19];
+    LocalMapObject * unk_00[19];
 } UnkStruct_ov9_0224EE40;
 
 typedef struct {
@@ -672,7 +672,7 @@ typedef struct {
     fx32 unk_5C;
     u32 unk_60;
     UnkStruct_ov9_0224E0DC * unk_64;
-    UnkStruct_02061AB4 * unk_68;
+    LocalMapObject * unk_68;
     SysTask * unk_6C;
 } UnkStruct_ov9_0224D078;
 
@@ -735,7 +735,7 @@ struct UnkStruct_ov9_0224F6EC_t {
     UnkStruct_ov9_02249B04 * unk_00;
     FieldSystem * unk_04;
     UnkStruct_020508D4 * unk_08;
-    UnkStruct_02061AB4 * unk_0C;
+    LocalMapObject * unk_0C;
     u16 unk_10;
     u16 unk_12;
     u32 unk_14;
@@ -835,7 +835,7 @@ typedef struct {
     fx32 unk_04;
     VecFx32 unk_08;
     int unk_14;
-    UnkStruct_02061AB4 * unk_18;
+    LocalMapObject * unk_18;
     u16 unk_1C[16];
 } UnkStruct_ov9_0225074C;
 
@@ -846,14 +846,14 @@ typedef struct {
     fx32 unk_0C;
     fx32 unk_10;
     VecFx32 unk_14;
-    UnkStruct_02061AB4 * unk_20;
+    LocalMapObject * unk_20;
 } UnkStruct_ov9_02250918;
 
 typedef struct {
     fx32 unk_00;
     VecFx32 unk_04;
     SysTask * unk_10;
-    UnkStruct_02061AB4 * unk_14;
+    LocalMapObject * unk_14;
 } UnkStruct_ov9_02250AFC;
 
 typedef struct {
@@ -861,7 +861,7 @@ typedef struct {
     VecFx32 unk_04;
     SysTask * unk_10;
     SysTask * unk_14;
-    UnkStruct_02061AB4 * unk_18;
+    LocalMapObject * unk_18;
 } UnkStruct_ov9_02250C14;
 
 typedef struct {
@@ -912,12 +912,12 @@ static void ov9_0224A228(UnkStruct_ov9_0224A228 * param0, UnkStruct_ov9_0224A294
 static void ov9_0224A294(UnkStruct_ov9_0224A228 * param0, UnkStruct_ov9_0224A294 * param1);
 static void ov9_0224A2AC(UnkStruct_ov9_0224A228 * param0, UnkStruct_ov9_0224A294 * param1);
 static void ov9_0224A334(UnkStruct_ov9_02249B04 * param0);
-static void ov9_0224A390(UnkStruct_ov9_02249B04 * param0, UnkStruct_02061AB4 * param1, int param2);
+static void ov9_0224A390(UnkStruct_ov9_02249B04 * param0, LocalMapObject * param1, int param2);
 static void ov9_0224A3C4(UnkStruct_ov9_02249B04 * param0, UnkStruct_020216E0 * param1, int param2);
 static void ov9_0224A408(UnkStruct_ov9_02249B04 * param0, const UnkStruct_020216E0 * param1);
 static void ov9_0224A49C(UnkStruct_ov9_02249B04 * param0);
 static void ov9_0224A4C8(UnkStruct_020216E0 * param0, void * param1);
-static void ov9_0224A4D0(UnkStruct_ov9_02249B04 * param0, UnkStruct_02061AB4 * param1, int param2, int param3);
+static void ov9_0224A4D0(UnkStruct_ov9_02249B04 * param0, LocalMapObject * param1, int param2, int param3);
 static void ov9_0224A570(UnkStruct_ov9_02249B04 * param0);
 static void ov9_0224A574(UnkStruct_ov9_02249B04 * param0);
 static void * ov9_0224A578(UnkStruct_ov9_02249B04 * param0, int param1);
@@ -928,7 +928,7 @@ static void ov9_0224A9E8(UnkStruct_ov9_02249B04 * param0);
 static BOOL ov9_0224AA00(UnkStruct_ov9_02249B04 * param0, int param1, int param2, int param3, int param4);
 static void ov9_0224AA34(UnkStruct_ov9_02249B04 * param0, const UnkStruct_ov9_0224AA00 * param1);
 static BOOL ov9_0224AAD4(UnkStruct_020508D4 * param0);
-static BOOL ov9_0224AC58(UnkStruct_ov9_0224AC58 * param0, UnkStruct_02061AB4 * param1);
+static BOOL ov9_0224AC58(UnkStruct_ov9_0224AC58 * param0, LocalMapObject * param1);
 static void ov9_0224ADC0(UnkStruct_ov9_02249B04 * param0);
 static void ov9_0224AED8(UnkStruct_ov9_02249B04 * param0);
 static void ov9_0224AEE4(UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224B064 * param1, NARC * param2);
@@ -1076,8 +1076,8 @@ static UnkStruct_ov9_0224E0DC * ov9_0224DE08(UnkStruct_ov9_02249B04 * param0, u3
 static const UnkStruct_ov9_02252C38 * ov9_0224DE40(u32 param0);
 static const UnkStruct_ov9_0224DF10 * ov9_0224DE60(u32 param0, u32 param1);
 static const UnkStruct_ov9_02253830 * ov9_0224DE70(u32 param0);
-static UnkStruct_02061AB4 * ov9_0224DE94(UnkStruct_ov9_02249B04 * param0, int param1, int param2, int param3, int param4, int param5, u32 param6);
-static void ov9_0224DF10(UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224E0DC * param1, UnkStruct_02061AB4 * param2);
+static LocalMapObject * ov9_0224DE94(UnkStruct_ov9_02249B04 * param0, int param1, int param2, int param3, int param4, int param5, u32 param6);
+static void ov9_0224DF10(UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224E0DC * param1, LocalMapObject * param2);
 static UnkStruct_ov101_021D5D90 * ov9_0224DFA0(UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224E0DC * param1);
 static void ov9_0224DFF4(UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224E0DC * param1, const UnkStruct_ov9_0224DF10 * param2, u32 param3);
 static void ov9_0224E044(UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224E0DC * param1);
@@ -1120,15 +1120,15 @@ static BOOL ov9_0224ECE8(UnkStruct_ov9_02249B04 * param0, u32 param1);
 static BOOL ov9_0224ED20(UnkStruct_ov9_02249B04 * param0, u32 param1);
 static void ov9_0224EE40(UnkStruct_ov9_02249B04 * param0);
 static void ov9_0224EE6C(UnkStruct_ov9_02249B04 * param0);
-static void ov9_0224EE70(UnkStruct_ov9_02249B04 * param0, UnkStruct_02061AB4 * param1);
-static UnkStruct_02061AB4 ** ov9_0224EEA0(UnkStruct_ov9_02249B04 * param0);
+static void ov9_0224EE70(UnkStruct_ov9_02249B04 * param0, LocalMapObject * param1);
+static LocalMapObject ** ov9_0224EEA0(UnkStruct_ov9_02249B04 * param0);
 static BOOL ov9_0224EF30(UnkStruct_ov9_02249B04 * param0, const UnkStruct_ov9_0224EF30 * param1, u16 param2);
-static BOOL ov9_0224EF64(UnkStruct_ov9_02249B04 * param0, UnkStruct_02061AB4 ** param1, const UnkStruct_ov9_0224EF30 * param2, u32 param3, u16 param4);
+static BOOL ov9_0224EF64(UnkStruct_ov9_02249B04 * param0, LocalMapObject ** param1, const UnkStruct_ov9_0224EF30 * param2, u32 param3, u16 param4);
 static BOOL ov9_0224F048(UnkStruct_ov9_02249B04 * param0, const UnkStruct_ov9_0224EF30 ** param1, u32 param2);
 static void ov9_0224F078(UnkStruct_ov9_02249B04 * param0, u32 param1);
 static void ov9_0224F0A4(UnkStruct_ov9_02249B04 * param0, u32 param1);
-static UnkStruct_02061AB4 * ov9_0224F0D4(UnkStruct_ov9_02249B04 * param0, u32 param1, u16 param2);
-static BOOL ov9_0224F1CC(UnkStruct_ov9_02249B04 * param0, UnkStruct_02061AB4 * param1);
+static LocalMapObject * ov9_0224F0D4(UnkStruct_ov9_02249B04 * param0, u32 param1, u16 param2);
+static BOOL ov9_0224F1CC(UnkStruct_ov9_02249B04 * param0, LocalMapObject * param1);
 static void ov9_0224F724(UnkStruct_ov9_02249B04 * param0);
 static void ov9_0224F760(UnkStruct_ov9_02249B04 * param0);
 static void ov9_0224F764(UnkStruct_ov9_02249B04 * param0);
@@ -1145,7 +1145,7 @@ static u32 ov9_022510D0(UnkStruct_ov9_02249B04 * param0);
 static int ov9_022510D8(u32 param0);
 static BOOL ov9_02251104(UnkStruct_ov9_02249B04 * param0, u32 param1, u32 param2);
 static void ov9_022511E0(u16 param0);
-static void ov9_022511F4(UnkStruct_02061AB4 * param0, const VecFx32 * param1);
+static void ov9_022511F4(LocalMapObject * param0, const VecFx32 * param1);
 
 static const UnkStruct_ov101_021D86B0 Unk_ov9_02251508;
 static const UnkStruct_ov101_021D86B0 Unk_ov9_02251468;
@@ -1846,7 +1846,7 @@ static void ov9_0224A334 (UnkStruct_ov9_02249B04 * param0)
     v1->unk_04 = NULL;
 }
 
-static void ov9_0224A374 (UnkStruct_ov9_0224A294 * param0, UnkStruct_02061AB4 * param1, int param2)
+static void ov9_0224A374 (UnkStruct_ov9_0224A294 * param0, LocalMapObject * param1, int param2)
 {
     param0->unk_00 = param2;
     param0->unk_04 = (FX32_ONE * (param2));
@@ -1858,7 +1858,7 @@ static void ov9_0224A374 (UnkStruct_ov9_0224A294 * param0, UnkStruct_02061AB4 *
     }
 }
 
-static void ov9_0224A390 (UnkStruct_ov9_02249B04 * param0, UnkStruct_02061AB4 * param1, int param2)
+static void ov9_0224A390 (UnkStruct_ov9_02249B04 * param0, LocalMapObject * param1, int param2)
 {
     int v0 = 0;
     UnkStruct_ov9_0224A228 * v1 = &param0->unk_188;
@@ -1966,7 +1966,7 @@ static void ov9_0224A4C8 (UnkStruct_020216E0 * param0, void * param1)
     NNS_G3dAnmObjSetFrame(v0->unk_10, v0->unk_0C);
 }
 
-static void ov9_0224A4D0 (UnkStruct_ov9_02249B04 * param0, UnkStruct_02061AB4 * param1, int param2, int param3)
+static void ov9_0224A4D0 (UnkStruct_ov9_02249B04 * param0, LocalMapObject * param1, int param2, int param3)
 {
     int v0 = 0;
     UnkStruct_ov9_0224A228 * v1 = &param0->unk_188;
@@ -1988,7 +1988,7 @@ static void ov9_0224A4D0 (UnkStruct_ov9_02249B04 * param0, UnkStruct_02061AB4 *
     GF_ASSERT(0);
 }
 
-int ov9_0224A520 (FieldSystem * param0, UnkStruct_02061AB4 * param1)
+int ov9_0224A520 (FieldSystem * param0, LocalMapObject * param1)
 {
     int v0 = 0;
     UnkStruct_ov9_02249B04 * v1 = param0->unk_04->unk_24;
@@ -2242,7 +2242,7 @@ static void ov9_0224A8C0 (UnkStruct_ov9_02249B04 * param0)
     int v2, v3, v4, v5;
     int v6[6] = {0, 0, 0, 90, 270, 180};
     PlayerAvatar * v7 = param0->unk_00->playerAvatar;
-    UnkStruct_02061AB4 * v8 = sub_0205EB3C(v7);
+    LocalMapObject * v8 = Player_LocalMapObject(v7);
 
     ov9_02250F44(param0, &v2, &v3, &v4);
 
@@ -2317,7 +2317,7 @@ static BOOL ov9_0224AA00 (UnkStruct_ov9_02249B04 * param0, int param1, int param
         v0 = ov9_0224C69C(param0, param1, param2, param3, param4);
 
         if (v0) {
-            UnkStruct_02061AB4 * v1 = sub_0205EB3C(param0->unk_00->playerAvatar);
+            LocalMapObject * v1 = Player_LocalMapObject(param0->unk_00->playerAvatar);
 
             Unk_ov9_02251224[v0->unk_00](param0, v0);
             return 1;
@@ -2362,7 +2362,7 @@ static BOOL ov9_0224AAD4 (UnkStruct_020508D4 * param0)
     UnkStruct_ov9_02249B04 * v1 = sub_02050A64(param0);
     UnkStruct_ov9_0224AC58 * v2 = ov9_0224A598(v1);
     PlayerAvatar * v3 = v0->playerAvatar;
-    UnkStruct_02061AB4 * v4 = sub_0205EB3C(v3);
+    LocalMapObject * v4 = Player_LocalMapObject(v3);
 
     switch (v2->unk_00) {
     case 0:
@@ -2422,7 +2422,7 @@ static BOOL ov9_0224AAD4 (UnkStruct_020508D4 * param0)
         {
             int v11 = 1;
             int v12 = 0;
-            UnkStruct_02061AB4 * v13 = sub_0205EB3C(v3);
+            LocalMapObject * v13 = Player_LocalMapObject(v3);
 
             ov9_0224C3F8(v1, v2->unk_34.unk_26);
             v11 = ov9_022510D8(v2->unk_34.unk_24);
@@ -2469,7 +2469,7 @@ static BOOL ov9_0224AAD4 (UnkStruct_020508D4 * param0)
     return 0;
 }
 
-static BOOL ov9_0224AC58 (UnkStruct_ov9_0224AC58 * param0, UnkStruct_02061AB4 * param1)
+static BOOL ov9_0224AC58 (UnkStruct_ov9_0224AC58 * param0, LocalMapObject * param1)
 {
     const UnkStruct_ov9_0224AA00 * v0 = &param0->unk_34;
 
@@ -2501,7 +2501,7 @@ static BOOL ov9_0224AC58 (UnkStruct_ov9_0224AC58 * param0, UnkStruct_02061AB4 *
                 v2--;
             }
 
-            sub_02063024(param1, v2);
+            LocalMapObj_SetX(param1, v2);
         }
 
         param0->unk_1C.y += param0->unk_28.y;
@@ -2533,7 +2533,7 @@ static BOOL ov9_0224AC58 (UnkStruct_ov9_0224AC58 * param0, UnkStruct_02061AB4 *
                 v2--;
             }
 
-            sub_02063044(param1, v2);
+            LocalMapObj_SetZ(param1, v2);
         }
     }
 
@@ -3352,7 +3352,7 @@ static void ov9_0224BA6C (UnkStruct_ov101_021D5D90 * param0, void * param1)
         int v6 = 0;
         int v7 = ((v2->unk_08.unk_08) * 2);
         const UnkStruct_02061830 * v8 = v2->unk_14->unk_00->unk_38;
-        UnkStruct_02061AB4 * v9;
+        LocalMapObject * v9;
 
         while (sub_020625B0(
                    v8, &v9, &v6, (1 << 0)) == 1) {
@@ -4424,7 +4424,7 @@ static void ov9_0224C8E8 (UnkStruct_ov9_02249B04 * param0)
 
     if (ov9_02249D38(param0) == 0) {
         VecFx32 v12, v13;
-        UnkStruct_02061AB4 * v14 = sub_0205EB3C(v3->playerAvatar);
+        LocalMapObject * v14 = Player_LocalMapObject(v3->playerAvatar);
 
         sub_02063050(v14, &v13);
         ov5_021EA6BC(v3->unk_28, &v12);
@@ -4949,7 +4949,7 @@ static BOOL ov9_0224D098 (UnkStruct_020508D4 * param0)
 static int ov9_0224D0C8 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078 * param1)
 {
     u32 v0;
-    UnkStruct_02061AB4 * v1;
+    LocalMapObject * v1;
     const UnkStruct_ov9_022530A4 * v2;
     const UnkStruct_ov9_02253830 * v3;
 
@@ -4994,7 +4994,7 @@ static int ov9_0224D0C8 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078
     }
 
     v3 = ov9_0224DE70(param1->unk_02);
-    v1 = sub_0205EB3C(param0->unk_00->playerAvatar);
+    v1 = Player_LocalMapObject(param0->unk_00->playerAvatar);
 
     sub_02063050(v1, &param1->unk_14);
     sub_02062E28(v1, 1);
@@ -5050,7 +5050,7 @@ static int ov9_0224D288 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078
 {
     VecFx32 v0;
     PlayerAvatar * v1 = param0->unk_00->playerAvatar;
-    UnkStruct_02061AB4 * v2 = sub_0205EB3C(v1);
+    LocalMapObject * v2 = Player_LocalMapObject(v1);
     VecFx32 * v3 = ov9_0224E330(param1->unk_64->unk_20);
 
     sub_0206309C(v2, &v0);
@@ -5111,7 +5111,7 @@ static int ov9_0224D374 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078
 {
     int v0;
     PlayerAvatar * v1 = param0->unk_00->playerAvatar;
-    UnkStruct_02061AB4 * v2 = sub_0205EB3C(v1);
+    LocalMapObject * v2 = Player_LocalMapObject(v1);
     VecFx32 * v3 = ov9_0224E330(param1->unk_64->unk_20);
 
     if (param1->unk_44.x != param1->unk_2C.x) {
@@ -5193,7 +5193,7 @@ static int ov9_0224D4C4 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078
 {
     int v0;
     PlayerAvatar * v1 = param0->unk_00->playerAvatar;
-    UnkStruct_02061AB4 * v2 = sub_0205EB3C(v1);
+    LocalMapObject * v2 = Player_LocalMapObject(v1);
     VecFx32 * v3 = ov9_0224E330(param1->unk_64->unk_20);
 
     if (param1->unk_44.x != param1->unk_2C.x) {
@@ -5229,11 +5229,11 @@ static int ov9_0224D4C4 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078
             sub_020057A4(1481, 0);
             param1->unk_04 = 5;
         } else {
-            UnkStruct_02061AB4 * v5 = sub_0205EB3C(param0->unk_00->playerAvatar);
+            LocalMapObject * v5 = Player_LocalMapObject(param0->unk_00->playerAvatar);
 
-            sub_02063024(v5, param1->unk_0A);
+            LocalMapObj_SetX(v5, param1->unk_0A);
             sub_02063034(v5, param1->unk_0C);
-            sub_02063044(v5, param1->unk_0E);
+            LocalMapObj_SetZ(v5, param1->unk_0E);
             sub_02064208(v5);
 
             if (param1->unk_68 != NULL) {
@@ -5260,11 +5260,11 @@ static int ov9_0224D4C4 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078
 static int ov9_0224D5E8 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078 * param1)
 {
     if (ov9_0224CC7C(param0) == 0) {
-        UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0->unk_00->playerAvatar);
+        LocalMapObject * v0 = Player_LocalMapObject(param0->unk_00->playerAvatar);
 
-        sub_02063024(v0, param1->unk_0A);
+        LocalMapObj_SetX(v0, param1->unk_0A);
         sub_02063034(v0, param1->unk_0C);
-        sub_02063044(v0, param1->unk_0E);
+        LocalMapObj_SetZ(v0, param1->unk_0E);
         sub_02064208(v0);
         sub_0205ED48(param0->unk_00->playerAvatar, 1);
 
@@ -5323,7 +5323,7 @@ static const UnkStruct_ov5_021F8E3C * const Unk_ov9_02251384[3] = {
 static int ov9_0224D69C (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078 * param1)
 {
     int v0;
-    UnkStruct_02061AB4 * v1;
+    LocalMapObject * v1;
     const UnkStruct_ov5_021F8E3C * v2;
 
     v1 = sub_0206251C(param0->unk_00->unk_38, (0x80 + 6));
@@ -5343,7 +5343,7 @@ static int ov9_0224D6E0 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078
 {
     if (sub_0206574C(param1->unk_6C) == 1) {
         UnkStruct_020507E4 * v0;
-        UnkStruct_02061AB4 * v1;
+        LocalMapObject * v1;
 
         sub_02065758(param1->unk_6C);
         v1 = sub_0206251C(param0->unk_00->unk_38, (0x80 + 6));
@@ -5711,7 +5711,7 @@ static void ov9_0224DCA8 (UnkStruct_ov9_02249B04 * param0)
     if (ov9_02249D38(param0) == 1) {
         int v0 = 0;
         UnkStruct_ov9_0224E0DC * v1;
-        UnkStruct_02061AB4 * v2;
+        LocalMapObject * v2;
         UnkStruct_02061830 * v3 = param0->unk_00->unk_38;
 
         while (sub_020625B0(v3, &v2, &v0, (1 << 0)) == 1) {
@@ -5852,9 +5852,9 @@ static const UnkStruct_ov9_02253830 * ov9_0224DE70 (u32 param0)
     return NULL;
 }
 
-static UnkStruct_02061AB4 * ov9_0224DE94 (UnkStruct_ov9_02249B04 * param0, int param1, int param2, int param3, int param4, int param5, u32 param6)
+static LocalMapObject * ov9_0224DE94 (UnkStruct_ov9_02249B04 * param0, int param1, int param2, int param3, int param4, int param5, u32 param6)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
 
     v0 = sub_020619DC(param0->unk_00->unk_38, param1, param3, 0, 0x2000, 0x0, ov9_022510D0(param0));
 
@@ -5871,7 +5871,7 @@ static UnkStruct_02061AB4 * ov9_0224DE94 (UnkStruct_ov9_02249B04 * param0, int p
     return v0;
 }
 
-static void ov9_0224DF10 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224E0DC * param1, UnkStruct_02061AB4 * param2)
+static void ov9_0224DF10 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224E0DC * param1, LocalMapObject * param2)
 {
     u32 v0, v1, v2, v3;
     const UnkStruct_ov9_0224DF10 * v4;
@@ -5956,11 +5956,11 @@ static void ov9_0224E07C (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224E0D
     }
 
     {
-        UnkStruct_02061AB4 * v1 = param1->unk_1C;
+        LocalMapObject * v1 = param1->unk_1C;
 
-        sub_02063024(v1, param1->unk_04.unk_02);
+        LocalMapObj_SetX(v1, param1->unk_04.unk_02);
         sub_02063034(v1, param1->unk_04.unk_04);
-        sub_02063044(v1, param1->unk_04.unk_06);
+        LocalMapObj_SetZ(v1, param1->unk_04.unk_06);
         sub_020629B4(v1, param1->unk_04.unk_00, 0);
         sub_020629B4(v1, param2, 1);
         sub_020629B4(v1, param1->unk_04.unk_08, 2);
@@ -6320,7 +6320,7 @@ static int ov9_0224E4D8 (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
 
 static int ov9_0224E4E8 (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * param1, u16 * param2, const void * param3)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
     const UnkStruct_ov9_0224E4E8 * v1 = param3;
     UnkStruct_ov9_0224E4D8 * v2 = ov9_0224E39C(param0);
 
@@ -6337,7 +6337,7 @@ static int ov9_0224E4E8 (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
 
 static int ov9_0224E520 (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * param1, u16 * param2, const void * param3)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
     const UnkStruct_ov9_0224E4E8 * v1 = param3;
     UnkStruct_ov9_0224E4D8 * v2 = ov9_0224E39C(param0);
 
@@ -6380,7 +6380,7 @@ static int ov9_0224E550 (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
 
     if (v0->unk_02 == 1) {
         VecFx32 v3;
-        UnkStruct_02061AB4 * v4 = sub_0205EB3C(param0->unk_00->playerAvatar);
+        LocalMapObject * v4 = Player_LocalMapObject(param0->unk_00->playerAvatar);
 
         sub_02062E28(v4, 1);
         sub_0206309C(v4, &v3);
@@ -6396,13 +6396,13 @@ static int ov9_0224E550 (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
 
 static int ov9_0224E5EC (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * param1, u16 * param2, const void * param3)
 {
-    UnkStruct_02061AB4 * v0 = NULL;
+    LocalMapObject * v0 = NULL;
     const UnkStruct_ov9_0224E550 * v1 = param3;
     UnkStruct_ov9_0224E5EC * v2 = ov9_0224E39C(param0);
     VecFx32 * v3 = ov9_0224E330(v2->unk_24->unk_20);
 
     if (v1->unk_02 == 1) {
-        v0 = sub_0205EB3C(param0->unk_00->playerAvatar);
+        v0 = Player_LocalMapObject(param0->unk_00->playerAvatar);
     }
 
     v3->y = v2->unk_2C + v2->unk_30;
@@ -6488,7 +6488,7 @@ static int ov9_0224E6B0 (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
 
     if (v1->unk_02 == 1) {
         VecFx32 v4;
-        UnkStruct_02061AB4 * v5 = sub_0205EB3C(param0->unk_00->playerAvatar);
+        LocalMapObject * v5 = Player_LocalMapObject(param0->unk_00->playerAvatar);
 
         sub_02063050(v5, &v4);
 
@@ -6511,14 +6511,14 @@ static int ov9_0224E798 (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
     const UnkStruct_ov9_0224E550 * v0 = param3;
 
     if (v0->unk_02 == 1) {
-        UnkStruct_02061AB4 * v1 = sub_0205EB3C(param0->unk_00->playerAvatar);
+        LocalMapObject * v1 = Player_LocalMapObject(param0->unk_00->playerAvatar);
         int v2 = sub_02063020(v1) + v0->unk_06;
         int v3 = sub_02063030(v1) + ((v0->unk_08) * 2);
         int v4 = sub_02063040(v1) + v0->unk_0A;
 
-        sub_02063024(v1, v2);
+        LocalMapObj_SetX(v1, v2);
         sub_02063034(v1, v3);
-        sub_02063044(v1, v4);
+        LocalMapObj_SetZ(v1, v4);
         sub_02064208(v1);
 
         {
@@ -7107,11 +7107,11 @@ static void ov9_0224EE6C (UnkStruct_ov9_02249B04 * param0)
     return;
 }
 
-static void ov9_0224EE70 (UnkStruct_ov9_02249B04 * param0, UnkStruct_02061AB4 * param1)
+static void ov9_0224EE70 (UnkStruct_ov9_02249B04 * param0, LocalMapObject * param1)
 {
     int v0 = 0;
     UnkStruct_ov9_0224EE40 * v1 = &param0->unk_1C64;
-    UnkStruct_02061AB4 ** v2 = v1->unk_00;
+    LocalMapObject ** v2 = v1->unk_00;
 
     for (v0 = 0; v0 < 19; v0++, v2++) {
         if ((*v2 != NULL) && (*v2 == param1)) {
@@ -7124,7 +7124,7 @@ static void ov9_0224EE70 (UnkStruct_ov9_02249B04 * param0, UnkStruct_02061AB4 *
     GF_ASSERT(0);
 }
 
-static UnkStruct_02061AB4 ** ov9_0224EEA0 (UnkStruct_ov9_02249B04 * param0)
+static LocalMapObject ** ov9_0224EEA0 (UnkStruct_ov9_02249B04 * param0)
 {
     int v0;
     UnkStruct_ov9_0224EE40 * v1 = &param0->unk_1C64;
@@ -7139,10 +7139,10 @@ static UnkStruct_02061AB4 ** ov9_0224EEA0 (UnkStruct_ov9_02249B04 * param0)
     return NULL;
 }
 
-static UnkStruct_02061AB4 * ov9_0224EECC (UnkStruct_ov9_02249B04 * param0, const UnkStruct_020619DC * param1, u32 param2)
+static LocalMapObject * ov9_0224EECC (UnkStruct_ov9_02249B04 * param0, const UnkStruct_020619DC * param1, u32 param2)
 {
     int v0 = 0;
-    UnkStruct_02061AB4 * v1;
+    LocalMapObject * v1;
     const UnkStruct_02061830 * v2 = param0->unk_00->unk_38;
 
     while (sub_020625B0(v2, &v1, &v0, (1 << 0))) {
@@ -7174,9 +7174,9 @@ static BOOL ov9_0224EF30 (UnkStruct_ov9_02249B04 * param0, const UnkStruct_ov9_0
     return 1;
 }
 
-static BOOL ov9_0224EF64 (UnkStruct_ov9_02249B04 * param0, UnkStruct_02061AB4 ** param1, const UnkStruct_ov9_0224EF30 * param2, u32 param3, u16 param4)
+static BOOL ov9_0224EF64 (UnkStruct_ov9_02249B04 * param0, LocalMapObject ** param1, const UnkStruct_ov9_0224EF30 * param2, u32 param3, u16 param4)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
 
     v0 = ov9_0224EECC(param0, &param2->unk_08, param3);
 
@@ -7209,7 +7209,7 @@ static BOOL ov9_0224EF64 (UnkStruct_ov9_02249B04 * param0, UnkStruct_02061AB4 **
     if (v0 == NULL) {
         UnkStruct_020216E0 * v1;
 
-        sub_02063340(*param1, param2->unk_08.unk_1A, (((param2->unk_08.unk_1E) >> 3) / FX32_ONE), param2->unk_08.unk_1C, param2->unk_08.unk_0C);
+        LocalMapObj_SetPosDir(*param1, param2->unk_08.unk_1A, (((param2->unk_08.unk_1E) >> 3) / FX32_ONE), param2->unk_08.unk_1C, param2->unk_08.unk_0C);
 
         v1 = ov5_021EB1A0(*param1);
 
@@ -7227,7 +7227,7 @@ static BOOL ov9_0224EF64 (UnkStruct_ov9_02249B04 * param0, UnkStruct_02061AB4 **
 
 static BOOL ov9_0224F048 (UnkStruct_ov9_02249B04 * param0, const UnkStruct_ov9_0224EF30 ** param1, u32 param2)
 {
-    UnkStruct_02061AB4 ** v0;
+    LocalMapObject ** v0;
 
     while ((*param1) != NULL) {
         v0 = ov9_0224EEA0(param0);
@@ -7256,7 +7256,7 @@ static void ov9_0224F0A4 (UnkStruct_ov9_02249B04 * param0, u32 param1)
 {
     int v0 = 0;
     UnkStruct_ov9_0224EE40 * v1 = &param0->unk_1C64;
-    UnkStruct_02061AB4 ** v2 = v1->unk_00;
+    LocalMapObject ** v2 = v1->unk_00;
 
     for (v0 = 0; v0 < 19; v0++, v2++) {
         if ((*v2) != NULL) {
@@ -7268,9 +7268,9 @@ static void ov9_0224F0A4 (UnkStruct_ov9_02249B04 * param0, u32 param1)
     }
 }
 
-static UnkStruct_02061AB4 * ov9_0224F0D4 (UnkStruct_ov9_02249B04 * param0, u32 param1, u16 param2)
+static LocalMapObject * ov9_0224F0D4 (UnkStruct_ov9_02249B04 * param0, u32 param1, u16 param2)
 {
-    UnkStruct_02061AB4 ** v0 = NULL;
+    LocalMapObject ** v0 = NULL;
     const UnkStruct_ov9_02252EB4 * v1 = Unk_ov9_02252EB4;
 
     while (v1->unk_00 != 593) {
@@ -7316,7 +7316,7 @@ void ov9_0224F158 (FieldSystem * param0, u16 param1)
 void ov9_0224F16C (FieldSystem * param0, u16 param1)
 {
     int v0 = 0;
-    UnkStruct_02061AB4 * v1;
+    LocalMapObject * v1;
     u32 v2 = param0->unk_1C->unk_00;
     UnkStruct_02061830 * v3 = param0->unk_38;
     UnkStruct_ov9_02249B04 * v4 = param0->unk_04->unk_24;
@@ -7332,11 +7332,11 @@ void ov9_0224F16C (FieldSystem * param0, u16 param1)
     GF_ASSERT(0);
 }
 
-static BOOL ov9_0224F1CC (UnkStruct_ov9_02249B04 * param0, UnkStruct_02061AB4 * param1)
+static BOOL ov9_0224F1CC (UnkStruct_ov9_02249B04 * param0, LocalMapObject * param1)
 {
     int v0 = 0;
     UnkStruct_ov9_0224EE40 * v1 = &param0->unk_1C64;
-    UnkStruct_02061AB4 ** v2 = v1->unk_00;
+    LocalMapObject ** v2 = v1->unk_00;
 
     GF_ASSERT(param1 != NULL);
 
@@ -7386,7 +7386,7 @@ static BOOL ov9_0224F1F8 (u32 param0, int param1, int param2, u32 * param3)
     return 0;
 }
 
-BOOL ov9_0224F240 (const UnkStruct_02061AB4 * param0, int param1)
+BOOL ov9_0224F240 (const LocalMapObject * param0, int param1)
 {
     int v0, v1;
     u32 v2, v3;
@@ -7402,7 +7402,7 @@ BOOL ov9_0224F240 (const UnkStruct_02061AB4 * param0, int param1)
     return ov9_0224F1F8(v3, v0, v1, &v2);
 }
 
-static BOOL ov9_0224F284 (const UnkStruct_02061AB4 * param0, u32 * param1)
+static BOOL ov9_0224F284 (const LocalMapObject * param0, u32 * param1)
 {
     int v0, v1;
     u32 v2;
@@ -7416,13 +7416,13 @@ static BOOL ov9_0224F284 (const UnkStruct_02061AB4 * param0, u32 * param1)
     return ov9_0224F1F8(v2, v0, v1, param1);
 }
 
-BOOL ov9_0224F2B0 (const UnkStruct_02061AB4 * param0)
+BOOL ov9_0224F2B0 (const LocalMapObject * param0)
 {
     u32 v0;
     return ov9_0224F284(param0, &v0);
 }
 
-UnkStruct_ov9_0224F6EC * ov9_0224F2BC (FieldSystem * param0, UnkStruct_020508D4 * param1, UnkStruct_02061AB4 * param2)
+UnkStruct_ov9_0224F6EC * ov9_0224F2BC (FieldSystem * param0, UnkStruct_020508D4 * param1, LocalMapObject * param2)
 {
     UnkStruct_ov9_0224F6EC * v0;
 
@@ -7460,7 +7460,7 @@ static BOOL ov9_0224F324 (UnkStruct_ov9_0224F6EC * param0)
 {
     int v0;
     VecFx32 v1;
-    UnkStruct_02061AB4 * v2 = param0->unk_0C;
+    LocalMapObject * v2 = param0->unk_0C;
 
     sub_02063050(v2, &v1);
     v1.y -= FX32_ONE * 8;
@@ -7506,7 +7506,7 @@ static BOOL ov9_0224F3BC (UnkStruct_ov9_0224F6EC * param0)
     case 0:
     {
         VecFx32 v0;
-        UnkStruct_02061AB4 * v1 = param0->unk_0C;
+        LocalMapObject * v1 = param0->unk_0C;
 
         sub_02063050(v1, &v0);
         v0.y -= FX32_ONE * 2;
@@ -7526,7 +7526,7 @@ static BOOL ov9_0224F3BC (UnkStruct_ov9_0224F6EC * param0)
     case 1:
     {
         VecFx32 v2;
-        UnkStruct_02061AB4 * v3 = param0->unk_0C;
+        LocalMapObject * v3 = param0->unk_0C;
 
         sub_02063050(v3, &v2);
         v2.y -= FX32_ONE * 4;
@@ -7543,7 +7543,7 @@ static BOOL ov9_0224F3BC (UnkStruct_ov9_0224F6EC * param0)
 
         {
             u32 v4 = 0, v5 = 0;
-            UnkStruct_02061AB4 * v6 = param0->unk_0C;
+            LocalMapObject * v6 = param0->unk_0C;
 
             ov9_02249DC8(param0->unk_00, param0->unk_14);
 
@@ -7577,9 +7577,9 @@ static BOOL ov9_0224F3BC (UnkStruct_ov9_0224F6EC * param0)
                 v9 -= (2 * 2);
                 v10 += sub_020641A8(v7);
 
-                sub_02063024(v6, v8);
+                LocalMapObj_SetX(v6, v8);
                 sub_02063034(v6, v9);
-                sub_02063044(v6, v10);
+                LocalMapObj_SetZ(v6, v10);
                 sub_02064208(v6);
             }
         }
@@ -7600,7 +7600,7 @@ static BOOL ov9_0224F3BC (UnkStruct_ov9_0224F6EC * param0)
     case 2:
     {
         VecFx32 v12;
-        UnkStruct_02061AB4 * v13 = param0->unk_0C;
+        LocalMapObject * v13 = param0->unk_0C;
 
         sub_0206309C(v13, &v12);
         v12.y = param0->unk_1C + param0->unk_20;
@@ -7621,7 +7621,7 @@ static BOOL ov9_0224F3BC (UnkStruct_ov9_0224F6EC * param0)
 
         {
             u32 v14 = 0, v15 = 0;
-            UnkStruct_02061AB4 * v16 = param0->unk_0C;
+            LocalMapObject * v16 = param0->unk_0C;
 
             switch (param0->unk_14) {
             case 6:
@@ -7675,7 +7675,7 @@ static BOOL ov9_0224F5D8 (UnkStruct_ov9_0224F6EC * param0)
     case 0:
     {
         VecFx32 v0;
-        UnkStruct_02061AB4 * v1 = param0->unk_0C;
+        LocalMapObject * v1 = param0->unk_0C;
 
         sub_02063050(v1, &v0);
         v0.y -= FX32_ONE * 2;
@@ -7695,7 +7695,7 @@ static BOOL ov9_0224F5D8 (UnkStruct_ov9_0224F6EC * param0)
     case 1:
     {
         VecFx32 v2;
-        UnkStruct_02061AB4 * v3 = param0->unk_0C;
+        LocalMapObject * v3 = param0->unk_0C;
 
         sub_02063050(v3, &v2);
         v2.y -= FX32_ONE * 4;
@@ -7714,7 +7714,7 @@ static BOOL ov9_0224F5D8 (UnkStruct_ov9_0224F6EC * param0)
     case 2:
     {
         VecFx32 v4;
-        UnkStruct_02061AB4 * v5 = param0->unk_0C;
+        LocalMapObject * v5 = param0->unk_0C;
 
         sub_02063050(v5, &v4);
         v4.y -= FX32_ONE * 8;
@@ -7729,7 +7729,7 @@ static BOOL ov9_0224F5D8 (UnkStruct_ov9_0224F6EC * param0)
 
         {
             u32 v6 = 0, v7 = 0, v8 = 0, v9 = 0;
-            UnkStruct_02061AB4 * v10 = param0->unk_0C;
+            LocalMapObject * v10 = param0->unk_0C;
 
             switch (sub_02062910(v10)) {
             case (0x80 + 0):
@@ -8024,7 +8024,7 @@ static const UnkStruct_ov9_0224A8A0 Unk_ov9_02251888 = {
 
 static void ov9_0224FA94 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224FA94 * param1)
 {
-    UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0->unk_00->playerAvatar);
+    LocalMapObject * v0 = Player_LocalMapObject(param0->unk_00->playerAvatar);
     int v1 = (((param1->unk_40.unk_10.y) >> 4) / FX32_ONE);
 
     if ((param1->unk_04 == 0) && (v1 == -20)) {
@@ -8052,7 +8052,7 @@ static int ov9_0224FB3C (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
 {
     VecFx32 v0;
     UnkStruct_ov9_0224F930 * v1;
-    UnkStruct_02061AB4 * v2;
+    LocalMapObject * v2;
     PlayerAvatar * v3;
     UnkStruct_ov9_0224FA94 * v4;
     const UnkStruct_ov9_02252384 * v5;
@@ -8061,7 +8061,7 @@ static int ov9_0224FB3C (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
     v4 = ov9_0224E37C(param0, sizeof(UnkStruct_ov9_0224FA94));
     v1 = &v4->unk_40;
     v3 = param0->unk_00->playerAvatar;
-    v2 = sub_0205EB3C(v3);
+    v2 = Player_LocalMapObject(v3);
 
     sub_02063050(v2, &v0);
     sub_02062974(v2, 2);
@@ -8113,7 +8113,7 @@ static int ov9_0224FB3C (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
 
 static int ov9_0224FC2C (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * param1, u16 * param2, const void * param3)
 {
-    UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0->unk_00->playerAvatar);
+    LocalMapObject * v0 = Player_LocalMapObject(param0->unk_00->playerAvatar);
     UnkStruct_ov9_0224FA94 * v1 = ov9_0224E39C(param0);
     UnkStruct_ov9_0224F930 * v2 = &v1->unk_40;
 
@@ -8186,7 +8186,7 @@ static int ov9_0224FD74 (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
 {
     int v0;
     UnkStruct_ov101_021D5D90 * v1 = sub_0205EC04(param0->unk_00->playerAvatar);
-    UnkStruct_02061AB4 * v2 = sub_0205EB3C(param0->unk_00->playerAvatar);
+    LocalMapObject * v2 = Player_LocalMapObject(param0->unk_00->playerAvatar);
     UnkStruct_ov9_0224FA94 * v3 = ov9_0224E39C(param0);
     UnkStruct_ov9_0224F930 * v4 = &v3->unk_40;
 
@@ -8262,7 +8262,7 @@ static int ov9_0224FEDC (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
 {
     int v0;
     UnkStruct_ov101_021D5D90 * v1 = sub_0205EC04(param0->unk_00->playerAvatar);
-    UnkStruct_02061AB4 * v2 = sub_0205EB3C(param0->unk_00->playerAvatar);
+    LocalMapObject * v2 = Player_LocalMapObject(param0->unk_00->playerAvatar);
     UnkStruct_ov9_0224FA94 * v3 = ov9_0224E39C(param0);
     UnkStruct_ov9_0224F930 * v4 = &v3->unk_40;
 
@@ -8307,9 +8307,9 @@ static int ov9_0224FEDC (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
         v9 = sub_02063030(v2) + ((v12->unk_08) * 2);
         v10 = sub_02063040(v2) + v12->unk_0A;
 
-        sub_02063024(v2, v8);
+        LocalMapObj_SetX(v2, v8);
         sub_02063034(v2, v9);
-        sub_02063044(v2, v10);
+        LocalMapObj_SetZ(v2, v10);
         sub_02064208(v2);
         sub_02062974(v2, 2);
         sub_02062994(v2, 2);
@@ -8349,7 +8349,7 @@ static int ov9_022500E0 (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
 {
     u32 v0[2] = {0xa, 0x6};
     UnkStruct_ov9_0224FA94 * v1 = ov9_0224E39C(param0);
-    UnkStruct_02061AB4 * v2 = sub_0205EB3C(param0->unk_00->playerAvatar);
+    LocalMapObject * v2 = Player_LocalMapObject(param0->unk_00->playerAvatar);
 
     if (sub_020655F4(v2) == 0) {
         return 0;
@@ -8383,7 +8383,7 @@ static const UnkStruct_ov9_0224A8A0 Unk_ov9_02251C48 = {
 
 static void ov9_02250138 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_02250138 * param1)
 {
-    UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0->unk_00->playerAvatar);
+    LocalMapObject * v0 = Player_LocalMapObject(param0->unk_00->playerAvatar);
     int v1 = (((param1->unk_34.unk_10.y) >> 4) / FX32_ONE);
 
     if ((param1->unk_04 == 0) && (v1 == 20)) {
@@ -8396,7 +8396,7 @@ static int ov9_02250170 (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
 {
     VecFx32 v0;
     UnkStruct_ov9_0224F930 * v1;
-    UnkStruct_02061AB4 * v2;
+    LocalMapObject * v2;
     PlayerAvatar * v3;
     UnkStruct_ov9_02250138 * v4;
     const UnkStruct_ov9_022523F0 * v5;
@@ -8405,7 +8405,7 @@ static int ov9_02250170 (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
     v4 = ov9_0224E37C(param0, sizeof(UnkStruct_ov9_02250138));
     v1 = &v4->unk_34;
     v3 = param0->unk_00->playerAvatar;
-    v2 = sub_0205EB3C(v3);
+    v2 = Player_LocalMapObject(v3);
 
     sub_02063050(v2, &v0);
     sub_02062974(v2, 3);
@@ -8457,7 +8457,7 @@ static int ov9_02250170 (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
 
 static int ov9_02250260 (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * param1, u16 * param2, const void * param3)
 {
-    UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0->unk_00->playerAvatar);
+    LocalMapObject * v0 = Player_LocalMapObject(param0->unk_00->playerAvatar);
     UnkStruct_ov9_02250138 * v1 = ov9_0224E39C(param0);
     UnkStruct_ov9_0224F930 * v2 = &v1->unk_34;
 
@@ -8527,7 +8527,7 @@ static int ov9_02250388 (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
 {
     int v0;
     UnkStruct_ov101_021D5D90 * v1 = sub_0205EC04(param0->unk_00->playerAvatar);
-    UnkStruct_02061AB4 * v2 = sub_0205EB3C(param0->unk_00->playerAvatar);
+    LocalMapObject * v2 = Player_LocalMapObject(param0->unk_00->playerAvatar);
     UnkStruct_ov9_02250138 * v3 = ov9_0224E39C(param0);
     UnkStruct_ov9_0224F930 * v4 = &v3->unk_34;
 
@@ -8580,7 +8580,7 @@ static int ov9_02250468 (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
 {
     int v0;
     UnkStruct_ov101_021D5D90 * v1 = sub_0205EC04(param0->unk_00->playerAvatar);
-    UnkStruct_02061AB4 * v2 = sub_0205EB3C(param0->unk_00->playerAvatar);
+    LocalMapObject * v2 = Player_LocalMapObject(param0->unk_00->playerAvatar);
     UnkStruct_ov9_02250138 * v3 = ov9_0224E39C(param0);
     UnkStruct_ov9_0224F930 * v4 = &v3->unk_34;
 
@@ -8625,9 +8625,9 @@ static int ov9_02250468 (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
         v9 = sub_02063030(v2) + ((v12->unk_08) * 2);
         v10 = sub_02063040(v2) + v12->unk_0A;
 
-        sub_02063024(v2, v8);
+        LocalMapObj_SetX(v2, v8);
         sub_02063034(v2, v9);
-        sub_02063044(v2, v10);
+        LocalMapObj_SetZ(v2, v10);
         sub_02064208(v2);
         sub_02062974(v2, 3);
         sub_02062994(v2, 3);
@@ -8662,7 +8662,7 @@ static int ov9_02250650 (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
 {
     u32 v0[3] = {0x97, 0x93, 0x73};
     UnkStruct_ov9_02250138 * v1 = ov9_0224E39C(param0);
-    UnkStruct_02061AB4 * v2 = sub_0205EB3C(param0->unk_00->playerAvatar);
+    LocalMapObject * v2 = Player_LocalMapObject(param0->unk_00->playerAvatar);
 
     if (sub_020655F4(v2) == 0) {
         return 0;
@@ -9282,7 +9282,7 @@ static int ov9_02250C48 (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
         }
 
         v0->unk_10 = sub_02065700(v0->unk_18, v6);
-        v0->unk_14 = sub_02065700(sub_0205EB3C(param0->unk_00->playerAvatar), v5);
+        v0->unk_14 = sub_02065700(Player_LocalMapObject(param0->unk_00->playerAvatar), v5);
         *param2 = 2;
     }
 
@@ -9497,7 +9497,7 @@ static void ov9_02250F1C (fx32 * param0, fx32 param1)
 
 static void ov9_02250F44 (UnkStruct_ov9_02249B04 * param0, int * param1, int * param2, int * param3)
 {
-    UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0->unk_00->playerAvatar);
+    LocalMapObject * v0 = Player_LocalMapObject(param0->unk_00->playerAvatar);
 
     *param1 = sub_02063020(v0);
     *param2 = sub_02063030(v0);
@@ -9704,7 +9704,7 @@ static void ov9_022511E0 (u16 param0)
     }
 }
 
-static void ov9_022511F4 (UnkStruct_02061AB4 * param0, const VecFx32 * param1)
+static void ov9_022511F4 (LocalMapObject * param0, const VecFx32 * param1)
 {
     UnkStruct_020216E0 * v0;
 
diff --git a/src/overlay023/ov23_02241F74.c b/src/overlay023/ov23_02241F74.c
index 4d9571b0cd..3de16d26c2 100644
--- a/src/overlay023/ov23_02241F74.c
+++ b/src/overlay023/ov23_02241F74.c
@@ -343,7 +343,7 @@ BOOL ov23_0224240C (int param0, int param1)
 BOOL ov23_02242458 (void)
 {
     VecFx32 v0;
-    UnkStruct_02061AB4 * v1;
+    LocalMapObject * v1;
     int v2, v3;
     UnkStruct_ov23_0224271C v4;
 
diff --git a/src/overlay023/ov23_0224A1D0.c b/src/overlay023/ov23_0224A1D0.c
index 7ef8a53025..feefc76c6d 100644
--- a/src/overlay023/ov23_0224A1D0.c
+++ b/src/overlay023/ov23_0224A1D0.c
@@ -841,19 +841,19 @@ void ov23_0224AF7C (int param0)
             switch (v0->unk_FA[param0]) {
             case 3:
                 if (v0->unk_28[param0] == NULL) {
-                    v0->unk_28[param0] = ov5_021F5488(sub_0205EB3C(v0->playerAvatar[param0]));
+                    v0->unk_28[param0] = ov5_021F5488(Player_LocalMapObject(v0->playerAvatar[param0]));
                 }
 
                 v0->unk_FA[param0] = 0;
                 break;
             case 2:
                 if (v0->unk_28[param0] == NULL) {
-                    v0->unk_28[param0] = ov5_021F52E4(sub_0205EB3C(v0->playerAvatar[param0]));
+                    v0->unk_28[param0] = ov5_021F52E4(Player_LocalMapObject(v0->playerAvatar[param0]));
                 }
                 break;
             case 1:
                 if (v0->unk_28[param0] == NULL) {
-                    v0->unk_28[param0] = ov5_021F511C(sub_0205EB3C(v0->playerAvatar[param0]));
+                    v0->unk_28[param0] = ov5_021F511C(Player_LocalMapObject(v0->playerAvatar[param0]));
                 }
                 break;
             case 0:
diff --git a/src/overlay023/ov23_0224B05C.c b/src/overlay023/ov23_0224B05C.c
index 4d0566debe..71a5340b51 100644
--- a/src/overlay023/ov23_0224B05C.c
+++ b/src/overlay023/ov23_0224B05C.c
@@ -1764,7 +1764,7 @@ static void ov23_0224CB1C (SysTask * param0, void * param1)
         ov23_02254098(ov23_0224219C(), 33);
         Sound_PlayEffect(1566);
 
-        ov5_021F58FC(sub_0205EB3C(v1->playerAvatar), 0, 0, 0);
+        ov5_021F58FC(Player_LocalMapObject(v1->playerAvatar), 0, 0, 0);
         ov23_02253F40(ov23_0224219C(), 33, 0, NULL);
 
         v0->unk_0C = 1;
diff --git a/src/overlay023/ov23_022521F0.c b/src/overlay023/ov23_022521F0.c
index 4453409bbc..7ae196c45b 100644
--- a/src/overlay023/ov23_022521F0.c
+++ b/src/overlay023/ov23_022521F0.c
@@ -944,7 +944,7 @@ void ov23_022534A0 (FieldSystem * param0)
     {
         int v8, v9;
         const UnkStruct_020619DC * v10;
-        UnkStruct_02061AB4 * v11;
+        LocalMapObject * v11;
 
         v8 = sub_0203A4B4(v4->unk_0C);
         v10 = sub_0203A4BC(v4->unk_0C);
diff --git a/src/unk_0203C954.c b/src/unk_0203C954.c
index 35e8ea863f..fc30380bbb 100644
--- a/src/unk_0203C954.c
+++ b/src/unk_0203C954.c
@@ -43,9 +43,9 @@ static int sub_0203C954 (FieldSystem * param0, int * param1, int * param2)
     return v0;
 }
 
-static u8 sub_0203C9B0 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1)
+static u8 sub_0203C9B0 (PlayerAvatar * param0, LocalMapObject * param1)
 {
-    UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0);
+    LocalMapObject * v0 = Player_LocalMapObject(param0);
 
     if (sub_020630DC(v0) == sub_020630DC(param1)) {
         return 1;
@@ -54,7 +54,7 @@ static u8 sub_0203C9B0 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1)
     return 0;
 }
 
-void sub_0203C9D4 (FieldSystem * param0, UnkStruct_02061AB4 ** param1)
+void sub_0203C9D4 (FieldSystem * param0, LocalMapObject ** param1)
 {
     int v0, v1;
     int v2;
@@ -83,7 +83,7 @@ void sub_0203C9D4 (FieldSystem * param0, UnkStruct_02061AB4 ** param1)
     *param1 = sub_0206326C(param0->unk_38, v0, v1, 0);
 }
 
-u8 sub_0203CA40 (FieldSystem * param0, UnkStruct_02061AB4 ** param1)
+u8 sub_0203CA40 (FieldSystem * param0, LocalMapObject ** param1)
 {
     sub_0203C9D4(param0, param1);
 
@@ -190,7 +190,7 @@ u16 sub_0203CB80 (FieldSystem * param0, void * param1, int param2)
     return 0xffff;
 }
 
-u8 sub_0203CBE0 (FieldSystem * param0, UnkStruct_02061AB4 ** param1)
+u8 sub_0203CBE0 (FieldSystem * param0, LocalMapObject ** param1)
 {
     if (Player_Dir(param0->playerAvatar) != 0) {
         return 0;
diff --git a/src/unk_0203E880.c b/src/unk_0203E880.c
index f5c5bbb86c..5f375db0fb 100644
--- a/src/unk_0203E880.c
+++ b/src/unk_0203E880.c
@@ -48,7 +48,7 @@ typedef struct {
     int unk_08;
     int unk_0C;
     int unk_10;
-    UnkStruct_02061AB4 * unk_14;
+    LocalMapObject * unk_14;
     SysTask * unk_18;
 } UnkStruct_0203E8B0;
 
@@ -66,8 +66,8 @@ struct UnkStruct_0203EF60_t {
     Window unk_14;
     UIControlData * unk_24;
     int unk_28;
-    UnkStruct_02061AB4 * unk_2C;
-    UnkStruct_02061AB4 * unk_30;
+    LocalMapObject * unk_2C;
+    LocalMapObject * unk_30;
     u16 * unk_34;
     UnkStruct_0203E724 * unk_38[2];
     StringFormatter * unk_40;
@@ -88,12 +88,12 @@ struct UnkStruct_0203EF60_t {
 
 #include "data/field/hidden_items.h"
 
-void sub_0203E880(FieldSystem * param0, u16 param1, UnkStruct_02061AB4 * param2);
-void sub_0203E8E0(UnkStruct_020508D4 * param0, u16 param1, UnkStruct_02061AB4 * param2, void * param3);
+void sub_0203E880(FieldSystem * param0, u16 param1, LocalMapObject * param2);
+void sub_0203E8E0(UnkStruct_020508D4 * param0, u16 param1, LocalMapObject * param2, void * param3);
 static BOOL sub_0203E950(UnkStruct_020508D4 * param0);
 static UnkStruct_0203EF60 * sub_0203EA28();
 static void sub_0203EA50(UnkStruct_0203E724 * param0);
-static void sub_0203EA68(FieldSystem * param0, UnkStruct_0203EF60 * param1, u16 param2, UnkStruct_02061AB4 * param3, void * param4);
+static void sub_0203EA68(FieldSystem * param0, UnkStruct_0203EF60 * param1, u16 param2, LocalMapObject * param3, void * param4);
 UnkStruct_0203E724 * sub_0203EAB8(FieldSystem * param0, u16 param1);
 static void sub_0203EAF4(FieldSystem * param0, UnkStruct_0203E724 * param1, u16 param2, u8 param3);
 static u16 sub_0203EB20(FieldSystem * param0, UnkStruct_0203E724 * param1, u16 param2);
@@ -131,7 +131,7 @@ static u16 sub_0203F610(const u8 * param0, u8 param1);
 static u16 sub_0203F638(FieldSystem * param0, const u8 * param1, u8 param2);
 UnkStruct_0203F478 * sub_0203F478(FieldSystem * param0, int param1);
 
-void sub_0203E880 (FieldSystem * param0, u16 param1, UnkStruct_02061AB4 * param2)
+void sub_0203E880 (FieldSystem * param0, u16 param1, LocalMapObject * param2)
 {
     UnkStruct_0203EF60 * v0 = sub_0203EA28();
 
@@ -141,7 +141,7 @@ void sub_0203E880 (FieldSystem * param0, u16 param1, UnkStruct_02061AB4 * param2
     return;
 }
 
-void sub_0203E8B0 (FieldSystem * param0, UnkStruct_02061AB4 * param1, int param2, int param3, int param4, int param5, int param6, int param7)
+void sub_0203E8B0 (FieldSystem * param0, LocalMapObject * param1, int param2, int param3, int param4, int param5, int param6, int param7)
 {
     UnkStruct_0203EF60 * v0 = sub_02050A64(param0->unk_10);
     UnkStruct_0203E8B0 * v1 = &v0->unk_50[param7];
@@ -154,7 +154,7 @@ void sub_0203E8B0 (FieldSystem * param0, UnkStruct_02061AB4 * param1, int param2
     v1->unk_14 = param1;
 }
 
-void sub_0203E8E0 (UnkStruct_020508D4 * param0, u16 param1, UnkStruct_02061AB4 * param2, void * param3)
+void sub_0203E8E0 (UnkStruct_020508D4 * param0, u16 param1, LocalMapObject * param2, void * param3)
 {
     FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_0203EF60 * v1 = sub_0203EA28();
@@ -165,7 +165,7 @@ void sub_0203E8E0 (UnkStruct_020508D4 * param0, u16 param1, UnkStruct_02061AB4 *
     return;
 }
 
-void sub_0203E918 (UnkStruct_020508D4 * param0, u16 param1, UnkStruct_02061AB4 * param2)
+void sub_0203E918 (UnkStruct_020508D4 * param0, u16 param1, LocalMapObject * param2)
 {
     FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_0203EF60 * v1 = sub_0203EA28();
@@ -257,7 +257,7 @@ static void sub_0203EA50 (UnkStruct_0203E724 * param0)
     return;
 }
 
-static void sub_0203EA68 (FieldSystem * param0, UnkStruct_0203EF60 * param1, u16 param2, UnkStruct_02061AB4 * param3, void * param4)
+static void sub_0203EA68 (FieldSystem * param0, UnkStruct_0203EF60 * param1, u16 param2, LocalMapObject * param3, void * param4)
 {
     u16 * v0 = sub_0203EF60(param1, 54);
 
diff --git a/src/unk_0203F6C4.c b/src/unk_0203F6C4.c
index c63f9301da..560b92af69 100644
--- a/src/unk_0203F6C4.c
+++ b/src/unk_0203F6C4.c
@@ -271,7 +271,7 @@ static BOOL sub_0203F99C(UnkStruct_0203E724 * param0);
 static BOOL sub_0203F9EC(UnkStruct_0203E724 * param0);
 static BOOL sub_0203FA08(UnkStruct_0203E724 * param0);
 static BOOL sub_0203FA1C(UnkStruct_0203E724 * param0);
-static UnkStruct_02061AB4 * sub_02040ED4(FieldSystem * param0, int param1);
+static LocalMapObject * sub_02040ED4(FieldSystem * param0, int param1);
 static BOOL sub_0203FA34(UnkStruct_0203E724 * param0);
 static BOOL sub_0203FA6C(UnkStruct_0203E724 * param0);
 static BOOL sub_0203FA9C(UnkStruct_0203E724 * param0);
@@ -1917,7 +1917,7 @@ static BOOL sub_0203FA34 (UnkStruct_0203E724 * param0)
 {
     u8 v0;
     s32 v1;
-    UnkStruct_02061AB4 ** v2;
+    LocalMapObject ** v2;
     FieldSystem * v3 = param0->unk_34;
 
     v2 = sub_0203F098(v3, 10);
@@ -2313,7 +2313,7 @@ static BOOL sub_020400AC (UnkStruct_0203E724 * param0)
 
 static BOOL sub_020400E8 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_02061AB4 ** v0 = sub_0203F098(param0->unk_34, 10);
+    LocalMapObject ** v0 = sub_0203F098(param0->unk_34, 10);
     u8 v1 = sub_02062950(*v0);
 
     ov5_021DD444(param0, param0->unk_2C, (u8)v1, 1, NULL);
@@ -2549,7 +2549,7 @@ static BOOL sub_020404A4 (UnkStruct_0203E724 * param0)
     v5 = sub_0203E838(param0);
 
     if (v4 == 0) {
-        UnkStruct_02061AB4 ** v8 = sub_0203F098(v0, 10);
+        LocalMapObject ** v8 = sub_0203F098(v0, 10);
 
         v4 = sub_020629D8(*v8, 0);
     }
@@ -3020,8 +3020,8 @@ static BOOL sub_02040D74 (UnkStruct_0203E724 * param0)
     u8 * v0;
     SysTask * v1;
     u8 * v2;
-    UnkStruct_02061AB4 ** v3;
-    UnkStruct_02061AB4 * v4;
+    LocalMapObject ** v3;
+    LocalMapObject * v4;
     u16 v5 = inline_02049538(param0);
     u32 v6 = (s32)sub_0203E850(param0);
 
@@ -3047,8 +3047,8 @@ static BOOL sub_02040DD8 (UnkStruct_0203E724 * param0)
     u8 * v0;
     SysTask * v1;
     u8 * v2;
-    UnkStruct_02061AB4 ** v3;
-    UnkStruct_02061AB4 * v4;
+    LocalMapObject ** v3;
+    LocalMapObject * v4;
     u16 v5 = inline_02049538(param0);
     u16 v6 = inline_02049538(param0);
     u16 v7 = inline_02049538(param0);
@@ -3099,10 +3099,10 @@ static BOOL sub_02040DD8 (UnkStruct_0203E724 * param0)
     return 0;
 }
 
-static UnkStruct_02061AB4 * sub_02040ED4 (FieldSystem * param0, int param1)
+static LocalMapObject * sub_02040ED4 (FieldSystem * param0, int param1)
 {
-    UnkStruct_02061AB4 ** v0;
-    UnkStruct_02061AB4 * v1;
+    LocalMapObject ** v0;
+    LocalMapObject * v1;
 
     if (param1 == 0xf2) {
         v1 = sub_02062570(param0->unk_38, 0x30);
@@ -3186,14 +3186,14 @@ static BOOL sub_02040FA4 (UnkStruct_0203E724 * param0)
 {
     UnkStruct_02061830 * v0;
     FieldSystem * v1 = param0->unk_34;
-    UnkStruct_02061AB4 ** v2 = sub_0203F098(v1, 10);
+    LocalMapObject ** v2 = sub_0203F098(v1, 10);
 
     if (*v2 == NULL) {
         v0 = v1->unk_38;
         sub_02062C48(v0);
 
         {
-            UnkStruct_02061AB4 * v3 = sub_02062570(v1->unk_38, 0x30);
+            LocalMapObject * v3 = sub_02062570(v1->unk_38, 0x30);
 
             if (v3) {
                 if ((sub_0206A984(SaveData_Events(v1->unk_0C)) == 1) && (sub_02062D1C(v3) != 0)) {
@@ -3235,8 +3235,8 @@ static inline void inline_020410F4_3 (int mask)
 static BOOL sub_02041004 (UnkStruct_0203E724 * param0)
 {
     FieldSystem * v0 = param0->unk_34;
-    UnkStruct_02061AB4 ** v1 = sub_0203F098(v0, 10);
-    UnkStruct_02061AB4 * v2 = sub_0205EB3C(v0->playerAvatar);
+    LocalMapObject ** v1 = sub_0203F098(v0, 10);
+    LocalMapObject * v2 = Player_LocalMapObject(v0->playerAvatar);
 
     if (inline_020410F4_1((1 << 0)) && (sub_02065684(v2) == 1)) {
         sub_02062DD0(v2);
@@ -3249,7 +3249,7 @@ static BOOL sub_02041004 (UnkStruct_0203E724 * param0)
     }
 
     if (inline_020410F4_1((1 << 1))) {
-        UnkStruct_02061AB4 * v3 = sub_02062570(v0->unk_38, 0x30);
+        LocalMapObject * v3 = sub_02062570(v0->unk_38, 0x30);
 
         if (sub_02062D1C(v3) == 0) {
             sub_02062DD0(v3);
@@ -3258,7 +3258,7 @@ static BOOL sub_02041004 (UnkStruct_0203E724 * param0)
     }
 
     if (inline_020410F4_1((1 << 3))) {
-        UnkStruct_02061AB4 * v4 = sub_02069EB8(*v1);
+        LocalMapObject * v4 = sub_02069EB8(*v1);
 
         if (sub_02062D1C(v4) == 0) {
             sub_02062DD0(v4);
@@ -3276,7 +3276,7 @@ static BOOL sub_02041004 (UnkStruct_0203E724 * param0)
 static BOOL sub_020410CC (UnkStruct_0203E724 * param0)
 {
     FieldSystem * v0 = param0->unk_34;
-    UnkStruct_02061AB4 * v1 = sub_02062570(v0->unk_38, 0x30);
+    LocalMapObject * v1 = sub_02062570(v0->unk_38, 0x30);
 
     if (sub_02062D1C(v1) == 0) {
         sub_02062DD0(v1);
@@ -3289,10 +3289,10 @@ static BOOL sub_020410CC (UnkStruct_0203E724 * param0)
 static BOOL sub_020410F4 (UnkStruct_0203E724 * param0)
 {
     FieldSystem * v0 = param0->unk_34;
-    UnkStruct_02061AB4 ** v1 = sub_0203F098(v0, 10);
-    UnkStruct_02061AB4 * v2 = sub_0205EB3C(v0->playerAvatar);
-    UnkStruct_02061AB4 * v3 = sub_02062570(v0->unk_38, 0x30);
-    UnkStruct_02061AB4 * v4 = sub_02069EB8(*v1);
+    LocalMapObject ** v1 = sub_0203F098(v0, 10);
+    LocalMapObject * v2 = Player_LocalMapObject(v0->playerAvatar);
+    LocalMapObject * v3 = sub_02062570(v0->unk_38, 0x30);
+    LocalMapObject * v4 = sub_02069EB8(*v1);
     UnkStruct_02061830 * v5;
 
     v5 = v0->unk_38;
@@ -3341,7 +3341,7 @@ static BOOL sub_020411C4 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_020411D4 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
     FieldSystem * v1 = param0->unk_34;
 
     v0 = sub_0206251C(v1->unk_38, sub_0203E838(param0));
@@ -3352,7 +3352,7 @@ static BOOL sub_020411D4 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_020411F0 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
     FieldSystem * v1 = param0->unk_34;
 
     v0 = sub_0206251C(v1->unk_38, sub_0203E838(param0));
@@ -3363,7 +3363,7 @@ static BOOL sub_020411F0 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_0204120C (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
     FieldSystem * v1 = param0->unk_34;
     u16 v2 = inline_02049538(param0);
 
@@ -3378,7 +3378,7 @@ static BOOL sub_0204120C (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02041254 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
     FieldSystem * v1 = param0->unk_34;
 
     v0 = sub_0206251C(v1->unk_38, inline_02049538(param0));
@@ -3396,7 +3396,7 @@ static BOOL sub_02041288 (UnkStruct_0203E724 * param0)
 {
     u16 v0 = inline_02049538(param0);
     u16 v1 = inline_02049538(param0);
-    UnkStruct_02061AB4 ** v2 = sub_0203F098(param0->unk_34, 11);
+    LocalMapObject ** v2 = sub_0203F098(param0->unk_34, 11);
 
     *v2 = sub_020619DC(param0->unk_34->unk_38, v0, v1, 0, 0x2000, 0x0, param0->unk_34->unk_1C->unk_00);
 
@@ -3417,12 +3417,12 @@ static BOOL sub_02041288 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02041320 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_02061AB4 ** v0 = sub_0203F098(param0->unk_34, 11);
+    LocalMapObject ** v0 = sub_0203F098(param0->unk_34, 11);
 
     sub_02061AF4(*v0);
 
     {
-        UnkStruct_02061AB4 * v1;
+        LocalMapObject * v1;
         const VecFx32 * v2;
 
         v1 = sub_0206251C(param0->unk_34->unk_38, 0xff);
@@ -3439,7 +3439,7 @@ static BOOL sub_02041364 (UnkStruct_0203E724 * param0)
 {
     u16 v0 = inline_02049538(param0);
     u16 v1 = inline_02049538(param0);
-    UnkStruct_02061AB4 ** v2 = sub_0203F098(param0->unk_34, 11);
+    LocalMapObject ** v2 = sub_0203F098(param0->unk_34, 11);
 
     *v2 = sub_020619DC(param0->unk_34->unk_38, v0, v1, 0, 0x2000, 0x0, param0->unk_34->unk_1C->unk_00);
 
@@ -3452,7 +3452,7 @@ static BOOL sub_02041364 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_020413D8 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_02061AB4 ** v0 = sub_0203F098(param0->unk_34, 11);
+    LocalMapObject ** v0 = sub_0203F098(param0->unk_34, 11);
 
     sub_02061AF4(*v0);
     return 0;
@@ -3461,7 +3461,7 @@ static BOOL sub_020413D8 (UnkStruct_0203E724 * param0)
 static BOOL sub_020413F0 (UnkStruct_0203E724 * param0)
 {
     int v0;
-    UnkStruct_02061AB4 ** v1;
+    LocalMapObject ** v1;
     FieldSystem * v2 = param0->unk_34;
 
     {
@@ -3500,7 +3500,7 @@ static BOOL sub_02041420 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02041464 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
     u16 * v1, * v2;
     FieldSystem * v3 = param0->unk_34;
 
@@ -3537,7 +3537,7 @@ static BOOL sub_020414EC (UnkStruct_0203E724 * param0)
     v3.y = FX32_CONST(v1);
     v3.z = FX32_CONST(v2);
 
-    sub_020630AC(sub_0205EB3C(param0->unk_34->playerAvatar), &v3);
+    sub_020630AC(Player_LocalMapObject(param0->unk_34->playerAvatar), &v3);
     sub_02020990(&v3, param0->unk_34->unk_24);
 
     return 0;
@@ -3545,7 +3545,7 @@ static BOOL sub_020414EC (UnkStruct_0203E724 * param0)
 
 static BOOL sub_020415D0 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
     u8 v1;
 
     v0 = sub_0206251C(param0->unk_34->unk_38, inline_02049538(param0));
@@ -3557,7 +3557,7 @@ static BOOL sub_020415D0 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02041604 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
     u16 v1;
 
     v0 = sub_0206251C(param0->unk_34->unk_38, inline_02049538(param0));
@@ -3569,7 +3569,7 @@ static BOOL sub_02041604 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_0204163C (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
     u16 * v1 = inline_0204FCAC(param0);
 
     *v1 = 0;
@@ -3584,7 +3584,7 @@ static BOOL sub_0204163C (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02041684 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
 
     v0 = sub_02062570(param0->unk_34->unk_38, 0x30);
 
@@ -3921,7 +3921,7 @@ static BOOL sub_02041C00 (UnkStruct_0203E724 * param0)
 static BOOL sub_02041C40 (UnkStruct_0203E724 * param0)
 {
     u8 v0, v1;
-    UnkStruct_02061AB4 ** v2 = sub_0203F098(param0->unk_34, 10);
+    LocalMapObject ** v2 = sub_0203F098(param0->unk_34, 10);
     u16 v3 = inline_02049538(param0);
     u16 * v4 = inline_0204FCAC(param0);
 
@@ -4198,7 +4198,7 @@ static BOOL sub_02042028 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_0204205C (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_02061AB4 ** v0 = sub_0203F098(param0->unk_34, 10);
+    LocalMapObject ** v0 = sub_0203F098(param0->unk_34, 10);
 
     if (*v0 != NULL) {
         if ((sub_02071CB4(param0->unk_34, 2) == 0) || (ov8_0224C5DC(param0->unk_34, *v0) == 0)) {
@@ -5401,7 +5401,7 @@ static BOOL sub_02043708 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02043748 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_02061AB4 ** v0 = sub_0203F098(param0->unk_34, 10);
+    LocalMapObject ** v0 = sub_0203F098(param0->unk_34, 10);
     StringFormatter ** v1 = sub_0203F098(param0->unk_34, 15);
     u16 v2 = sub_0203E838(param0);
     TrainerInfo * v3 = SaveData_GetTrainerInfo(sub_0203D174(param0->unk_34));
@@ -5442,7 +5442,7 @@ static BOOL sub_020437E8 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_020437FC (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_02061AB4 ** v0 = sub_0203F098(param0->unk_34, 10);
+    LocalMapObject ** v0 = sub_0203F098(param0->unk_34, 10);
     u16 v1 = sub_0203E838(param0);
     u16 * v2 = inline_0204FCAC(param0);
     StringFormatter ** v3 = sub_0203F098(param0->unk_34, 15);
@@ -5471,7 +5471,7 @@ static BOOL sub_02043854 (UnkStruct_0203E724 * param0)
 static BOOL sub_02043894 (UnkStruct_0203E724 * param0)
 {
     FieldSystem * v0 = param0->unk_34;
-    UnkStruct_02061AB4 ** v1 = sub_0203F098(v0, 10);
+    LocalMapObject ** v1 = sub_0203F098(v0, 10);
     u16 * v2 = inline_0204FCAC(param0);
 
     *v2 = sub_0205B780(v0->unk_7C, sub_02062910(*v1));
@@ -5481,7 +5481,7 @@ static BOOL sub_02043894 (UnkStruct_0203E724 * param0)
 static BOOL sub_020438CC (UnkStruct_0203E724 * param0)
 {
     FieldSystem * v0 = param0->unk_34;
-    UnkStruct_02061AB4 ** v1 = sub_0203F098(v0, 10);
+    LocalMapObject ** v1 = sub_0203F098(v0, 10);
     u16 v2 = inline_02049538(param0);
     u16 * v3 = inline_0204FCAC(param0);
 
@@ -5748,7 +5748,7 @@ static BOOL sub_02043D04 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02043D54 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
     u16 v1 = inline_02049538(param0);
     u16 v2 = inline_02049538(param0);
     u16 v3 = inline_02049538(param0);
@@ -5757,7 +5757,7 @@ static BOOL sub_02043D54 (UnkStruct_0203E724 * param0)
 
     v0 = sub_0206251C(param0->unk_34->unk_38, v1);
 
-    sub_02063340(v0, v2, v3, v4, v5);
+    LocalMapObj_SetPosDir(v0, v2, v3, v4, v5);
     sub_020642F8(v0);
 
     return 0;
@@ -5803,7 +5803,7 @@ static BOOL sub_02043EA4 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02043EF4 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
     u16 v1 = inline_02049538(param0);
     u16 v2 = inline_02049538(param0);
 
@@ -5999,7 +5999,7 @@ static BOOL sub_020440EC (UnkStruct_0203E724 * param0)
     v1 = inline_0204FCAC(param0);
 
     {
-        UnkStruct_02061AB4 * v4 = sub_0205EB3C(v3->playerAvatar);
+        LocalMapObject * v4 = Player_LocalMapObject(v3->playerAvatar);
 
         *v0 = sub_02063020(v4);
         *v2 = ((sub_02063030(v4) / 2));
@@ -6018,7 +6018,7 @@ static BOOL sub_02044158 (UnkStruct_0203E724 * param0)
 static BOOL sub_02044168 (UnkStruct_0203E724 * param0)
 {
     void ** v0 = sub_0203F098(param0->unk_34, 20);
-    UnkStruct_02061AB4 ** v1 = sub_0203F098(param0->unk_34, 10);
+    LocalMapObject ** v1 = sub_0203F098(param0->unk_34, 10);
     u16 v2 = inline_02049538(param0);
     u16 v3 = sub_0203E838(param0);
 
@@ -6090,7 +6090,7 @@ static BOOL sub_020442B0 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_020442B4 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
     FieldSystem * v1 = param0->unk_34;
 
     v0 = sub_0206251C(v1->unk_38, inline_02049538(param0));
@@ -6105,7 +6105,7 @@ static BOOL sub_020442B4 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_020442E8 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
     FieldSystem * v1 = param0->unk_34;
 
     v0 = sub_0206251C(v1->unk_38, inline_02049538(param0));
@@ -7107,7 +7107,7 @@ static BOOL sub_0204550C (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02045530 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
     u16 v1 = inline_02049538(param0);
     u16 v2 = inline_02049538(param0);
     u16 v3 = inline_02049538(param0);
@@ -7126,7 +7126,7 @@ static BOOL sub_02045530 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_020455C4 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
     u16 v1 = inline_02049538(param0);
     u16 v2 = inline_02049538(param0);
     u16 v3 = inline_02049538(param0);
@@ -7839,7 +7839,7 @@ static BOOL sub_020460A8 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02046108 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
     u16 v1 = inline_02049538(param0);
     u16 v2 = (*((param0)->unk_08++));
 
diff --git a/src/unk_02048614.c b/src/unk_02048614.c
index ca2ece2093..89e9305cfd 100644
--- a/src/unk_02048614.c
+++ b/src/unk_02048614.c
@@ -55,7 +55,7 @@ BOOL sub_02048614 (UnkStruct_0203E724 * param0)
     int * v3;
     int * v4;
     SysTask ** v5;
-    UnkStruct_02061AB4 ** v6;
+    LocalMapObject ** v6;
     PlayerAvatar * v7;
     FieldSystem * v8 = param0->unk_34;
     u16 v9 = inline_02049538(param0);
@@ -314,7 +314,7 @@ BOOL sub_02048B0C (UnkStruct_0203E724 * param0)
 
 BOOL sub_02048B34 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_02061AB4 ** v0;
+    LocalMapObject ** v0;
     FieldSystem * v1 = param0->unk_34;
 
     v0 = sub_0203F098(v1, 10);
@@ -327,7 +327,7 @@ BOOL sub_02048B60 (UnkStruct_0203E724 * param0)
 {
     int v0;
     s32 v1;
-    UnkStruct_02061AB4 ** v2;
+    LocalMapObject ** v2;
     FieldSystem * v3 = param0->unk_34;
 
     v2 = sub_0203F098(v3, 10);
diff --git a/src/unk_0204B64C.c b/src/unk_0204B64C.c
index a393e49e58..92c9f9cada 100644
--- a/src/unk_0204B64C.c
+++ b/src/unk_0204B64C.c
@@ -17,7 +17,7 @@
 
 BOOL sub_0204B64C (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_02061AB4 ** v0;
+    LocalMapObject ** v0;
     u16 * v1 = inline_0204FCAC(param0);
 
     v0 = sub_0203F098(param0->unk_34, 10);
@@ -28,7 +28,7 @@ BOOL sub_0204B64C (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204B680 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_02061AB4 ** v0 = sub_0203F098(param0->unk_34, 10);
+    LocalMapObject ** v0 = sub_0203F098(param0->unk_34, 10);
     u16 * v1 = inline_0204FCAC(param0);
 
     *v1 = sub_02055F40(param0->unk_34, *v0);
@@ -37,7 +37,7 @@ BOOL sub_0204B680 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204B6B4 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_02061AB4 ** v0 = sub_0203F098(param0->unk_34, 10);
+    LocalMapObject ** v0 = sub_0203F098(param0->unk_34, 10);
     u16 * v1 = inline_0204FCAC(param0);
 
     *v1 = sub_02055F64(param0->unk_34, *v0);
@@ -46,7 +46,7 @@ BOOL sub_0204B6B4 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204B6E8 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_02061AB4 ** v0 = sub_0203F098(param0->unk_34, 10);
+    LocalMapObject ** v0 = sub_0203F098(param0->unk_34, 10);
     u16 * v1 = inline_0204FCAC(param0);
 
     *v1 = sub_02055F88(param0->unk_34, *v0);
@@ -55,7 +55,7 @@ BOOL sub_0204B6E8 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204B71C (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_02061AB4 ** v0 = sub_0203F098(param0->unk_34, 10);
+    LocalMapObject ** v0 = sub_0203F098(param0->unk_34, 10);
     u16 * v1 = inline_0204FCAC(param0);
 
     *v1 = sub_02055FA8(param0->unk_34, *v0);
@@ -64,7 +64,7 @@ BOOL sub_0204B71C (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204B750 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_02061AB4 ** v0 = sub_0203F098(param0->unk_34, 10);
+    LocalMapObject ** v0 = sub_0203F098(param0->unk_34, 10);
     u16 v1 = inline_02049538(param0);
 
     sub_02055E80(param0->unk_34, *v0, v1);
@@ -73,7 +73,7 @@ BOOL sub_0204B750 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204B784 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_02061AB4 ** v0 = sub_0203F098(param0->unk_34, 10);
+    LocalMapObject ** v0 = sub_0203F098(param0->unk_34, 10);
     UnkStruct_0202CD88 * v1 = sub_0202CD88(param0->unk_34->unk_0C);
     u16 v2 = inline_02049538(param0);
 
@@ -103,7 +103,7 @@ BOOL sub_0204B7FC (UnkStruct_0203E724 * param0)
 {
     u16 v0;
     UnkStruct_0202CD88 * v1 = sub_0202CD88(param0->unk_34->unk_0C);
-    UnkStruct_02061AB4 ** v2 = sub_0203F098(param0->unk_34, 10);
+    LocalMapObject ** v2 = sub_0203F098(param0->unk_34, 10);
 
     sub_02055E00(param0->unk_34, *v2);
     sub_0202CFEC(v1, 0);
diff --git a/src/unk_02050568.c b/src/unk_02050568.c
index 7fa47b076a..2b430eb717 100644
--- a/src/unk_02050568.c
+++ b/src/unk_02050568.c
@@ -133,7 +133,7 @@ static BOOL sub_020505A0 (UnkStruct_020508D4 * param0)
 
 static void sub_0205074C (PlayerAvatar * param0, BOOL param1)
 {
-    UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0);
+    LocalMapObject * v0 = Player_LocalMapObject(param0);
     sub_02062D64(v0, param1);
 }
 
diff --git a/src/unk_02055C50.c b/src/unk_02055C50.c
index f0e22948e8..2ad08a659f 100644
--- a/src/unk_02055C50.c
+++ b/src/unk_02055C50.c
@@ -157,7 +157,7 @@ static BOOL sub_02055D54 (FieldSystem * param0, const VecFx32 * param1)
 void sub_02055D94 (FieldSystem * param0)
 {
     int v0 = 0;
-    UnkStruct_02061AB4 * v1;
+    LocalMapObject * v1;
     UnkStruct_02027854 * v2 = sub_02027854(param0->unk_0C);
 
     while (sub_020625B0(param0->unk_38, &v1, &v0, (1 << 0)) == 1) {
@@ -170,7 +170,7 @@ void sub_02055D94 (FieldSystem * param0)
     }
 }
 
-BOOL sub_02055E00 (FieldSystem * param0, UnkStruct_02061AB4 * param1)
+BOOL sub_02055E00 (FieldSystem * param0, LocalMapObject * param1)
 {
     int v0, v1, v2;
     UnkStruct_02027854 * v3 = sub_02027854(param0->unk_0C);
@@ -186,7 +186,7 @@ BOOL sub_02055E00 (FieldSystem * param0, UnkStruct_02061AB4 * param1)
     return sub_0207D570(sub_0207D990(param0->unk_0C), sub_02055C50(v2), v1, 4);
 }
 
-void sub_02055E80 (FieldSystem * param0, UnkStruct_02061AB4 * param1, u16 param2)
+void sub_02055E80 (FieldSystem * param0, LocalMapObject * param1, u16 param2)
 {
     int v0;
     UnkStruct_02027854 * v1 = sub_02027854(param0->unk_0C);
@@ -195,7 +195,7 @@ void sub_02055E80 (FieldSystem * param0, UnkStruct_02061AB4 * param1, u16 param2
     sub_02027DA8(v1, v0, sub_02055C80(param2));
 }
 
-void sub_02055EAC (FieldSystem * param0, UnkStruct_02061AB4 * param1, u16 param2)
+void sub_02055EAC (FieldSystem * param0, LocalMapObject * param1, u16 param2)
 {
     int v0;
     UnkStruct_02027854 * v1 = sub_02027854(param0->unk_0C);
@@ -204,7 +204,7 @@ void sub_02055EAC (FieldSystem * param0, UnkStruct_02061AB4 * param1, u16 param2
     sub_02027D40(v1, v0, param0->unk_04->unk_18->unk_04, sub_02055C60(param2));
 }
 
-void sub_02055EE0 (FieldSystem * param0, UnkStruct_02061AB4 * param1)
+void sub_02055EE0 (FieldSystem * param0, LocalMapObject * param1)
 {
     int v0;
     UnkStruct_02027854 * v1 = sub_02027854(param0->unk_0C);
@@ -213,7 +213,7 @@ void sub_02055EE0 (FieldSystem * param0, UnkStruct_02061AB4 * param1)
     sub_02027D78(v1, v0);
 }
 
-int sub_02055F00 (const FieldSystem * param0, const UnkStruct_02061AB4 * param1)
+int sub_02055F00 (const FieldSystem * param0, const LocalMapObject * param1)
 {
     int v0;
     UnkStruct_02027854 * v1 = sub_02027854(param0->unk_0C);
@@ -222,7 +222,7 @@ int sub_02055F00 (const FieldSystem * param0, const UnkStruct_02061AB4 * param1)
     return sub_02027D04(v1, v0);
 }
 
-int sub_02055F20 (const FieldSystem * param0, const UnkStruct_02061AB4 * param1)
+int sub_02055F20 (const FieldSystem * param0, const LocalMapObject * param1)
 {
     int v0;
     UnkStruct_02027854 * v1 = sub_02027854(param0->unk_0C);
@@ -231,7 +231,7 @@ int sub_02055F20 (const FieldSystem * param0, const UnkStruct_02061AB4 * param1)
     return sub_02027D10(v1, v0);
 }
 
-u16 sub_02055F40 (const FieldSystem * param0, const UnkStruct_02061AB4 * param1)
+u16 sub_02055F40 (const FieldSystem * param0, const LocalMapObject * param1)
 {
     int v0;
     UnkStruct_02027854 * v1 = sub_02027854(param0->unk_0C);
@@ -240,7 +240,7 @@ u16 sub_02055F40 (const FieldSystem * param0, const UnkStruct_02061AB4 * param1)
     return sub_02055C50(sub_02027D10(v1, v0));
 }
 
-u16 sub_02055F64 (const FieldSystem * param0, const UnkStruct_02061AB4 * param1)
+u16 sub_02055F64 (const FieldSystem * param0, const LocalMapObject * param1)
 {
     int v0;
     UnkStruct_02027854 * v1 = sub_02027854(param0->unk_0C);
@@ -249,7 +249,7 @@ u16 sub_02055F64 (const FieldSystem * param0, const UnkStruct_02061AB4 * param1)
     return sub_02055C70(sub_02027D9C(v1, v0));
 }
 
-int sub_02055F88 (const FieldSystem * param0, const UnkStruct_02061AB4 * param1)
+int sub_02055F88 (const FieldSystem * param0, const LocalMapObject * param1)
 {
     int v0;
     UnkStruct_02027854 * v1 = sub_02027854(param0->unk_0C);
@@ -258,7 +258,7 @@ int sub_02055F88 (const FieldSystem * param0, const UnkStruct_02061AB4 * param1)
     return sub_02027D18(v1, v0);
 }
 
-int sub_02055FA8 (const FieldSystem * param0, const UnkStruct_02061AB4 * param1)
+int sub_02055FA8 (const FieldSystem * param0, const LocalMapObject * param1)
 {
     int v0;
     UnkStruct_02027854 * v1 = sub_02027854(param0->unk_0C);
@@ -267,7 +267,7 @@ int sub_02055FA8 (const FieldSystem * param0, const UnkStruct_02061AB4 * param1)
     return sub_02027DB4(v1, v0);
 }
 
-u32 sub_02055FC8 (const FieldSystem * param0, const UnkStruct_02061AB4 * param1)
+u32 sub_02055FC8 (const FieldSystem * param0, const LocalMapObject * param1)
 {
     u32 v0 = 0;
 
@@ -327,7 +327,7 @@ static BOOL sub_02056010 (FieldSystem * param0, UnkStruct_020562AC * param1, int
     return sub_0206326C(param0->unk_38, v0, v1, 0) != NULL;
 }
 
-static UnkStruct_02061AB4 * sub_02056074 (FieldSystem * param0, int param1)
+static LocalMapObject * sub_02056074 (FieldSystem * param0, int param1)
 {
     int v0, v1;
 
@@ -344,7 +344,7 @@ static UnkStruct_02061AB4 * sub_02056074 (FieldSystem * param0, int param1)
     return sub_0206326C(param0->unk_38, v0, v1, 0);
 }
 
-static UnkStruct_02061AB4 * sub_020560A8 (FieldSystem * param0, UnkStruct_020562AC * param1)
+static LocalMapObject * sub_020560A8 (FieldSystem * param0, UnkStruct_020562AC * param1)
 {
     int v0, v1;
 
@@ -362,14 +362,14 @@ static UnkStruct_02061AB4 * sub_020560A8 (FieldSystem * param0, UnkStruct_020562
     return sub_0206326C(param0->unk_38, v0, v1, 0);
 }
 
-static BOOL sub_020560E4 (UnkStruct_02061AB4 * param0)
+static BOOL sub_020560E4 (LocalMapObject * param0)
 {
     return sub_02062920(param0) == 0x64;
 }
 
 static void sub_020560F8 (FieldSystem * param0, UnkStruct_020562AC * param1)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
 
     v0 = sub_020560A8(param0, param1);
 
@@ -380,7 +380,7 @@ static void sub_020560F8 (FieldSystem * param0, UnkStruct_020562AC * param1)
 
 static void sub_0205610C (FieldSystem * param0, UnkStruct_020562AC * param1, const UnkStruct_ov5_021F8E3C * param2)
 {
-    UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0->playerAvatar);
+    LocalMapObject * v0 = Player_LocalMapObject(param0->playerAvatar);
     param1->unk_0C = sub_02065700(v0, param2);
 }
 
@@ -393,7 +393,7 @@ static BOOL sub_02056124 (UnkStruct_020508D4 * param0)
     case 0:
         ov5_021DFB54(v0->playerAvatar, (1 << 4));
         ov5_021DFB5C(v0->playerAvatar);
-        sub_02062DDC(sub_0205EB3C(v0->playerAvatar));
+        sub_02062DDC(Player_LocalMapObject(v0->playerAvatar));
         v1->unk_00 = 1;
         break;
     case 1:
@@ -402,7 +402,7 @@ static BOOL sub_02056124 (UnkStruct_020508D4 * param0)
         v1->unk_00 = 2;
     case 2:
         if (gCoreSys.heldKeys & PAD_KEY_LEFT) {
-            UnkStruct_02061AB4 * v2 = sub_02056074(v0, 2);
+            LocalMapObject * v2 = sub_02056074(v0, 2);
 
             if ((v2 == NULL) || !sub_020560E4(v2)) {
                 v1->unk_00 = 4;
@@ -413,7 +413,7 @@ static BOOL sub_02056124 (UnkStruct_020508D4 * param0)
                 break;
             }
         } else if (gCoreSys.heldKeys & PAD_KEY_RIGHT) {
-            UnkStruct_02061AB4 * v2 = sub_02056074(v0, 3);
+            LocalMapObject * v2 = sub_02056074(v0, 3);
 
             if ((v2 == NULL) || !sub_020560E4(v2)) {
                 v1->unk_00 = 4;
@@ -441,7 +441,7 @@ static BOOL sub_02056124 (UnkStruct_020508D4 * param0)
         break;
     case 3:
         if (sub_0206574C(v1->unk_0C)) {
-            UnkStruct_02061AB4 * v3;
+            LocalMapObject * v3;
 
             sub_02065758(v1->unk_0C);
             v3 = sub_020560A8(v0, v1);
@@ -456,7 +456,7 @@ static BOOL sub_02056124 (UnkStruct_020508D4 * param0)
         break;
     case 4:
         sub_0205EA84(v0->playerAvatar, v1->unk_04);
-        sub_02062DD0(sub_0205EB3C(v0->playerAvatar));
+        sub_02062DD0(Player_LocalMapObject(v0->playerAvatar));
         Heap_FreeToHeap(v1);
         return 1;
     }
diff --git a/src/unk_02056B30.c b/src/unk_02056B30.c
index bedc4fb65d..d35bf5a237 100644
--- a/src/unk_02056B30.c
+++ b/src/unk_02056B30.c
@@ -337,14 +337,14 @@ static BOOL sub_02056F1C (UnkStruct_020508D4 * param0)
 {
     FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_02056BDC * v1 = sub_02050A64(param0);
-    UnkStruct_02061AB4 * v2;
+    LocalMapObject * v2;
 
     switch (v1->unk_04) {
     case 0:
     {
         int v3 = Player_Dir(v0->playerAvatar);
 
-        v2 = sub_0205EB3C(v0->playerAvatar);
+        v2 = Player_LocalMapObject(v0->playerAvatar);
 
         if (v3 == 2) {
             sub_02065638(v2, 0xa);
@@ -357,7 +357,7 @@ static BOOL sub_02056F1C (UnkStruct_020508D4 * param0)
         (v1->unk_04)++;
         break;
     case 1:
-        v2 = sub_0205EB3C(v0->playerAvatar);
+        v2 = Player_LocalMapObject(v0->playerAvatar);
 
         if (sub_02065684(v2) == 1) {
             sub_020656AC(v2);
@@ -383,7 +383,7 @@ static BOOL sub_02056FC0 (UnkStruct_020508D4 * param0)
 {
     FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_02056BDC * v1 = sub_02050A64(param0);
-    UnkStruct_02061AB4 * v2 = sub_0205EB3C(v0->playerAvatar);
+    LocalMapObject * v2 = Player_LocalMapObject(v0->playerAvatar);
 
     switch (v1->unk_04) {
     case 0:
@@ -406,7 +406,7 @@ static BOOL sub_02057008 (UnkStruct_020508D4 * param0)
 {
     FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_02056BDC * v1 = sub_02050A64(param0);
-    UnkStruct_02061AB4 * v2 = sub_0205EB3C(v0->playerAvatar);
+    LocalMapObject * v2 = Player_LocalMapObject(v0->playerAvatar);
 
     switch (v1->unk_04) {
     case 0:
@@ -427,7 +427,7 @@ static BOOL sub_02057008 (UnkStruct_020508D4 * param0)
 
 static BOOL sub_02057050 (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
     FieldSystem * v1 = sub_02050A60(param0);
     UnkStruct_02056BDC * v2 = sub_02050A64(param0);
     UnkStruct_ov5_021D432C * v3;
@@ -436,7 +436,7 @@ static BOOL sub_02057050 (UnkStruct_020508D4 * param0)
     case 0:
     {
         u8 v4;
-        UnkStruct_02061AB4 * v5 = sub_0205EB3C(v1->playerAvatar);
+        LocalMapObject * v5 = Player_LocalMapObject(v1->playerAvatar);
 
         v4 = sub_02054F94(v1, Player_XPos(v1->playerAvatar), Player_ZPos(v1->playerAvatar));
 
@@ -464,7 +464,7 @@ static BOOL sub_02057050 (UnkStruct_020508D4 * param0)
         if (ov5_021D453C(v1, v3)) {
             ov5_021D432C(v3);
             {
-                UnkStruct_02061AB4 * v7 = sub_0205EB3C(v1->playerAvatar);
+                LocalMapObject * v7 = Player_LocalMapObject(v1->playerAvatar);
 
                 sub_02062D64(v7, 0);
             }
@@ -480,7 +480,7 @@ static BOOL sub_02057050 (UnkStruct_020508D4 * param0)
 
 static BOOL sub_0205711C (UnkStruct_020508D4 * param0)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
     FieldSystem * v1 = sub_02050A60(param0);
     UnkStruct_02056BDC * v2 = sub_02050A64(param0);
     UnkStruct_ov5_021D432C * v3;
@@ -489,7 +489,7 @@ static BOOL sub_0205711C (UnkStruct_020508D4 * param0)
     case 0:
     {
         u8 v4;
-        UnkStruct_02061AB4 * v5 = sub_0205EB3C(v1->playerAvatar);
+        LocalMapObject * v5 = Player_LocalMapObject(v1->playerAvatar);
 
         v4 = sub_02054F94(v1, Player_XPos(v1->playerAvatar), Player_ZPos(v1->playerAvatar));
 
@@ -545,13 +545,13 @@ static BOOL sub_02057218 (UnkStruct_020508D4 * param0)
 {
     FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_02056BDC * v1 = sub_02050A64(param0);
-    UnkStruct_02061AB4 * v2;
+    LocalMapObject * v2;
 
     switch (v1->unk_04) {
     case 0:
 
         ov5_021D1744(1);
-        v2 = sub_0205EB3C(v0->playerAvatar);
+        v2 = Player_LocalMapObject(v0->playerAvatar);
 
         if (1) {
             int v3;
@@ -572,7 +572,7 @@ static BOOL sub_02057218 (UnkStruct_020508D4 * param0)
         (v1->unk_04)++;
         break;
     case 1:
-        v2 = sub_0205EB3C(v0->playerAvatar);
+        v2 = Player_LocalMapObject(v0->playerAvatar);
 
         if (sub_02065684(v2) == 1) {
             sub_020656AC(v2);
@@ -595,7 +595,7 @@ static BOOL sub_020572B8 (UnkStruct_020508D4 * param0)
 {
     FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_02056BDC * v1 = sub_02050A64(param0);
-    UnkStruct_02061AB4 * v2 = sub_0205EB3C(v0->playerAvatar);
+    LocalMapObject * v2 = Player_LocalMapObject(v0->playerAvatar);
 
     switch (v1->unk_04) {
     case 0:
diff --git a/src/unk_02057518.c b/src/unk_02057518.c
index 7ee7b79c16..5a6965f8e9 100644
--- a/src/unk_02057518.c
+++ b/src/unk_02057518.c
@@ -408,7 +408,7 @@ static void CommPlayer_Add (u8 param0)
         if (v3) {
             if (!sCommPlayerManager->isUnderground) {
                 if (param0 != CommSys_CurNetId()) {
-                    UnkStruct_02061AB4 * v4 = sub_0206251C(sCommPlayerManager->fieldSys->unk_38, 0xff + param0 + 1);
+                    LocalMapObject * v4 = sub_0206251C(sCommPlayerManager->fieldSys->unk_38, 0xff + param0 + 1);
 
                     if (v4) {
                         sub_02061AF4(v4);
@@ -429,7 +429,7 @@ static void CommPlayer_Add (u8 param0)
             GF_ASSERT(v2);
             sCommPlayerManager->playerAvatar[param0] = v2;
 
-            sub_0206290C(sub_0205EB3C(v2), 0xff + param0 + 1);
+            sub_0206290C(Player_LocalMapObject(v2), 0xff + param0 + 1);
 
             if (sCommPlayerManager->isUnderground) {
                 ov23_02243038(param0);
@@ -977,7 +977,7 @@ static void sub_02058644 (int param0)
 
 static BOOL sub_020586A8 (int param0, int param1, int param2, int param3)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
     int v1, v2;
     u8 v3[] = {
         0x14, 0x15, 0x16, 0x17, 0x10, 0x11, 0x12, 0x13, 0xc, 0xd, 0xe, 0xf
@@ -991,7 +991,7 @@ static BOOL sub_020586A8 (int param0, int param1, int param2, int param3)
         return 1;
     }
 
-    v0 = sub_0205EB3C(sCommPlayerManager->playerAvatar[param0]);
+    v0 = Player_LocalMapObject(sCommPlayerManager->playerAvatar[param0]);
 
     if (Player_Dir(sCommPlayerManager->playerAvatar[param0]) != CommPlayer_GetOppositeDir(sCommPlayerManager->unk_102[param0])) {
         sub_020628C4(v0, (1 << 7));
@@ -1251,13 +1251,13 @@ void sub_02058B94 (int param0)
 
 void sub_02058BA8 (int param0, int param1, BOOL param2)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
 
     if (sCommPlayerManager->playerAvatar[param0] == NULL) {
         return;
     }
 
-    v0 = sub_0205EB3C(sCommPlayerManager->playerAvatar[param0]);
+    v0 = Player_LocalMapObject(sCommPlayerManager->playerAvatar[param0]);
 
     sub_020628BC(v0, (1 << 7));
     sub_020628BC(v0, (1 << 8));
@@ -1267,18 +1267,18 @@ void sub_02058BA8 (int param0, int param1, BOOL param2)
 
 void sub_02058BE8 (int param0)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * obj;
 
     if (sCommPlayerManager->playerAvatar[param0] == NULL) {
         return;
     }
 
     if (sCommPlayerManager->unk_102[param0] != -1) {
-        v0 = sub_0205EB3C(sCommPlayerManager->playerAvatar[param0]);
+        obj = Player_LocalMapObject(sCommPlayerManager->playerAvatar[param0]);
 
-        sub_020656AC(v0);
-        sub_020628C4(v0, (1 << 7));
-        sub_020628C4(v0, (1 << 8));
+        sub_020656AC(obj);
+        sub_020628C4(obj, (1 << 7));
+        sub_020628C4(obj, (1 << 8));
 
         sCommPlayerManager->unk_102[param0] = -1;
     }
@@ -1806,30 +1806,30 @@ void sub_02059570 (void)
 
 void sub_020595A4 (void)
 {
-    int v0, v1, v2, v3;
-    UnkStruct_02061AB4 * v4;
+    int netId, x, z, dir;
+    LocalMapObject * obj;
 
     if (!sCommPlayerManager) {
         return;
     }
 
-    for (v0 = 0; v0 < (7 + 1); v0++) {
-        if (sCommPlayerManager->playerAvatar[v0] == NULL) {
+    for (netId = 0; netId < MAX_CONNECTED_PLAYERS; netId++) {
+        if (sCommPlayerManager->playerAvatar[netId] == NULL) {
             continue;
         }
 
-        if (CommSys_CurNetId() == v0) {
+        if (CommSys_CurNetId() == netId) {
             continue;
         }
 
-        v4 = sub_0205EB3C(sCommPlayerManager->playerAvatar[v0]);
-        v1 = sCommPlayerManager->playerLocation[v0].x;
-        v2 = sCommPlayerManager->playerLocation[v0].z;
-        v3 = sCommPlayerManager->playerLocation[v0].dir;
+        obj = Player_LocalMapObject(sCommPlayerManager->playerAvatar[netId]);
+        x = sCommPlayerManager->playerLocation[netId].x;
+        z = sCommPlayerManager->playerLocation[netId].z;
+        dir = sCommPlayerManager->playerLocation[netId].dir;
 
-        sub_02063024(v4, v1);
-        sub_02063044(v4, v2);
-        sub_02063340(v4, v1, 0, v2, v3);
+        LocalMapObj_SetX(obj, x);
+        LocalMapObj_SetZ(obj, z);
+        LocalMapObj_SetPosDir(obj, x, 0, z, dir);
     }
 }
 
diff --git a/src/unk_0205A0D8.c b/src/unk_0205A0D8.c
index b3f06202ec..4018e838c5 100644
--- a/src/unk_0205A0D8.c
+++ b/src/unk_0205A0D8.c
@@ -333,7 +333,7 @@ static BOOL sub_0205A324 (UnkStruct_020508D4 * param0)
         if (v0->unk_44 != 0) {
             v0->unk_44--;
         } else {
-            if (sub_02065684(sub_0205EB3C(v1->playerAvatar))) {
+            if (sub_02065684(Player_LocalMapObject(v1->playerAvatar))) {
                 v0->unk_34 = 11;
             }
         }
diff --git a/src/unk_0205C22C.c b/src/unk_0205C22C.c
index fb60356cb8..3514c70e54 100644
--- a/src/unk_0205C22C.c
+++ b/src/unk_0205C22C.c
@@ -43,9 +43,9 @@ static int sub_0205C340(UnkStruct_0205C22C * param0, int param1, WMBssDesc * par
 static void sub_0205C51C(UnkStruct_0205C22C * param0, UnkStruct_02061830 * param1);
 static void sub_0205C680(UnkStruct_0205C680 * param0, int param1);
 static void sub_0205C6BC(UnkStruct_0205C680 * param0);
-static void sub_0205C6E0(UnkStruct_0205C680 * param0, UnkStruct_02061AB4 * param1, int param2, int param3);
-static void sub_0205C788(UnkStruct_0205C680 * param0, UnkStruct_02061AB4 * param1);
-static void sub_0205C7BC(UnkStruct_0205C680 * param0, UnkStruct_02061AB4 * param1);
+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_0205C444(UnkStruct_0205C680 param0[], int param1, int param2);
 void sub_0205C970(UnkStruct_0205C95C * param0);
@@ -112,7 +112,7 @@ static void sub_0205C304 (SysTask * param0, void * param1)
 {
     UnkStruct_0205C22C * v0 = (UnkStruct_0205C22C *)param1;
     UnkStruct_0205B43C * v1 = v0->unk_00;
-    UnkStruct_02061AB4 * v2;
+    LocalMapObject * v2;
     int v3;
 
     if (!sub_020509A4(v0->unk_470)) {
@@ -127,7 +127,7 @@ static int sub_0205C340 (UnkStruct_0205C22C * param0, int param1, WMBssDesc * pa
     int v0, v1, v2 = 0;
     UnkStruct_0203330C * v3;
     UnkStruct_0205B4F8 * v4;
-    UnkStruct_02061AB4 * v5;
+    LocalMapObject * v5;
 
     if (param2 == NULL) {
         for (v0 = 0; v0 < 4; v0++) {
@@ -246,7 +246,7 @@ static void sub_0205C44C (UnkStruct_0205C22C * param0, UnkStruct_0205B43C * para
 
 static void sub_0205C51C (UnkStruct_0205C22C * param0, UnkStruct_02061830 * param1)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
     int v1, v2, v3;
 
     GF_ASSERT(param0->unk_08 != NULL);
@@ -323,7 +323,7 @@ static void sub_0205C51C (UnkStruct_0205C22C * param0, UnkStruct_02061830 * para
         }
     }
 
-    sub_0205C7BC(&param0->unk_0C[50], sub_0205EB3C(param0->unk_08));
+    sub_0205C7BC(&param0->unk_0C[50], Player_LocalMapObject(param0->unk_08));
     sub_0205C6BC(&param0->unk_0C[50]);
 }
 
@@ -360,7 +360,7 @@ static void sub_0205C6BC (UnkStruct_0205C680 * param0)
     }
 }
 
-static void sub_0205C6E0 (UnkStruct_0205C680 * param0, UnkStruct_02061AB4 * param1, int param2, int param3)
+static void sub_0205C6E0 (UnkStruct_0205C680 * param0, LocalMapObject * param1, int param2, int param3)
 {
     int v0, v1, v2;
 
@@ -375,7 +375,7 @@ static void sub_0205C6E0 (UnkStruct_0205C680 * param0, UnkStruct_02061AB4 * para
     Sound_PlayEffect(1615);
     sub_02061AD4(param1, param0->unk_08);
     sub_0205C680(param0, 0);
-    sub_02063340(param1, v0, v1, v2, 1);
+    LocalMapObj_SetPosDir(param1, v0, v1, v2, 1);
     sub_0206296C(param1, 1);
     sub_02065638(param1, 0x44);
     sub_02062D64(param1, 0);
@@ -394,7 +394,7 @@ static void sub_0205C6E0 (UnkStruct_0205C680 * param0, UnkStruct_02061AB4 * para
     }
 }
 
-static void sub_0205C788 (UnkStruct_0205C680 * param0, UnkStruct_02061AB4 * param1)
+static void sub_0205C788 (UnkStruct_0205C680 * param0, LocalMapObject * param1)
 {
     sub_02065638(param1, 0x43);
     sub_02062DB4(param1, 1);
@@ -406,7 +406,7 @@ static void sub_0205C788 (UnkStruct_0205C680 * param0, UnkStruct_02061AB4 * para
     param0->unk_01 = 3;
 }
 
-static void sub_0205C7BC (UnkStruct_0205C680 * param0, UnkStruct_02061AB4 * param1)
+static void sub_0205C7BC (UnkStruct_0205C680 * param0, LocalMapObject * param1)
 {
     if (param0->unk_03 == 1) {
         if (param0->unk_04 == 0) {
@@ -421,7 +421,7 @@ static void sub_0205C7BC (UnkStruct_0205C680 * param0, UnkStruct_02061AB4 * para
 static void sub_0205C7E4 (UnkStruct_02061830 * param0, int param1, int param2)
 {
     int v0;
-    UnkStruct_02061AB4 * v1;
+    LocalMapObject * v1;
 
     for (v0 = param1; v0 < param2; v0++) {
         v1 = sub_0206251C(param0, v0);
@@ -438,7 +438,7 @@ static void sub_0205C7E4 (UnkStruct_02061830 * param0, int param1, int param2)
 
 void sub_0205C820 (UnkStruct_02061830 * param0, UnkStruct_0205C22C * param1)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
     UnkStruct_0205C680 * v1;
 
     v0 = sub_0206251C(param0, 0);
diff --git a/src/unk_0205CA94.c b/src/unk_0205CA94.c
index de81480496..ae4ad74022 100644
--- a/src/unk_0205CA94.c
+++ b/src/unk_0205CA94.c
@@ -139,7 +139,7 @@ void sub_0205CA94 (SysTask * param0, void * param1)
 
     switch (v0->unk_1E4) {
     case 0:
-        sub_02062DDC(sub_0205EB3C(v0->unk_00->playerAvatar));
+        sub_02062DDC(Player_LocalMapObject(v0->unk_00->playerAvatar));
         sub_0205EB18(v0->unk_00->playerAvatar, 0);
         v0->unk_1E4++;
         break;
diff --git a/src/unk_0205DFC4.c b/src/unk_0205DFC4.c
index ef92449df6..fc5bb6573a 100644
--- a/src/unk_0205DFC4.c
+++ b/src/unk_0205DFC4.c
@@ -24,7 +24,7 @@
 #include "overlay004/ov4_021D0D80.h"
 
 typedef struct {
-    UnkStruct_02061AB4 * unk_00;
+    LocalMapObject * unk_00;
     fx32 unk_04;
     fx32 unk_08;
     u16 unk_0C;
@@ -33,7 +33,7 @@ typedef struct {
 } UnkStruct_0205E268;
 
 typedef struct {
-    UnkStruct_02061AB4 * unk_00;
+    LocalMapObject * unk_00;
     u16 unk_04;
     u16 unk_06;
     u8 unk_08;
@@ -320,7 +320,7 @@ static BOOL sub_0205E268 (UnkStruct_020508D4 * param0)
     return 0;
 }
 
-void sub_0205E318 (UnkStruct_020508D4 * param0, UnkStruct_02061AB4 * param1, u16 param2, u16 param3, u16 param4, u16 param5)
+void sub_0205E318 (UnkStruct_020508D4 * param0, LocalMapObject * param1, u16 param2, u16 param3, u16 param4, u16 param5)
 {
     FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_0205E268 * v1 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_0205E268));
@@ -356,7 +356,7 @@ static BOOL sub_0205E3AC (UnkStruct_020508D4 * param0)
     return 0;
 }
 
-void sub_0205E3F4 (UnkStruct_020508D4 * param0, UnkStruct_02061AB4 * param1, u16 param2, u16 param3)
+void sub_0205E3F4 (UnkStruct_020508D4 * param0, LocalMapObject * param1, u16 param2, u16 param3)
 {
     FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_0205E3AC * v1 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_0205E3AC));
diff --git a/src/unk_0205E7D0.c b/src/unk_0205E7D0.c
index a809a636f8..a111c2d6cf 100644
--- a/src/unk_0205E7D0.c
+++ b/src/unk_0205E7D0.c
@@ -28,7 +28,7 @@ typedef struct UnkStruct_0205E884_t {
     int unk_24;
     int unk_28;
     int unk_2C;
-    UnkStruct_02061AB4 * unk_30;
+    LocalMapObject * unk_30;
     UnkStruct_ov101_021D5D90 * unk_34;
     UnkStruct_0205EC34 * unk_38;
     const UnkStruct_0205EC34 * unk_3C;
@@ -37,7 +37,7 @@ 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 UnkStruct_02061AB4 * sub_0205EA64(const UnkStruct_02061830 * param0);
+static LocalMapObject * sub_0205EA64(const UnkStruct_02061830 * 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);
@@ -73,7 +73,7 @@ PlayerAvatar * sub_0205E820 (const UnkStruct_02061830 * param0, UnkStruct_0205EC
 {
     int v0;
     PlayerAvatar * v1;
-    UnkStruct_02061AB4 * v2;
+    LocalMapObject * v2;
 
     v1 = sub_0205E8FC();
     v0 = sub_0205EC94(param1);
@@ -93,10 +93,10 @@ PlayerAvatar * sub_0205E820 (const UnkStruct_02061830 * param0, UnkStruct_0205EC
 void sub_0205E884 (PlayerAvatar * param0, int param1)
 {
     int v0, v1;
-    UnkStruct_02061AB4 * v2;
+    LocalMapObject * v2;
     const UnkStruct_02061830 * v3;
 
-    v2 = sub_0205EB3C(param0);
+    v2 = Player_LocalMapObject(param0);
     GF_ASSERT(v2 != NULL);
     v3 = sub_02062A40(v2);
 
@@ -121,7 +121,7 @@ void sub_0205E8E0 (PlayerAvatar * param0)
 
 void sub_0205E8E8 (PlayerAvatar * param0)
 {
-    UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0);
+    LocalMapObject * v0 = Player_LocalMapObject(param0);
 
     sub_02061AF4(v0);
     sub_0205E8E0(param0);
@@ -158,7 +158,7 @@ static void sub_0205E91C (PlayerAvatar * param0, int param1, int param2, UnkStru
 
 static void sub_0205E988 (PlayerAvatar * param0, const UnkStruct_02061830 * param1, int param2, int param3, int param4, int param5)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
 
     v0 = sub_020619DC(param1, param4, param5, param3, param2, 0x1, 1);
     GF_ASSERT(v0 != NULL);
@@ -179,10 +179,10 @@ static void sub_0205E988 (PlayerAvatar * param0, const UnkStruct_02061830 * para
     sub_0205EB38(param0, v0);
 }
 
-UnkStruct_02061AB4 * sub_0205EA24 (const UnkStruct_02061830 * param0)
+LocalMapObject * sub_0205EA24 (const UnkStruct_02061830 * param0)
 {
     int v0 = 0;
-    UnkStruct_02061AB4 * v1 = NULL;
+    LocalMapObject * v1 = NULL;
 
     while (sub_020625B0(param0, &v1, &v0, (1 << 0))) {
         if (sub_02062948(v1) == 0x1) {
@@ -193,9 +193,9 @@ UnkStruct_02061AB4 * sub_0205EA24 (const UnkStruct_02061830 * param0)
     return v1;
 }
 
-static UnkStruct_02061AB4 * sub_0205EA64 (const UnkStruct_02061830 * param0)
+static LocalMapObject * sub_0205EA64 (const UnkStruct_02061830 * param0)
 {
-    UnkStruct_02061AB4 * v0 = sub_0205EA24(param0);
+    LocalMapObject * v0 = sub_0205EA24(param0);
 
     GF_ASSERT(v0 != NULL);
     return v0;
@@ -203,17 +203,17 @@ static UnkStruct_02061AB4 * sub_0205EA64 (const UnkStruct_02061830 * param0)
 
 int Player_Dir (PlayerAvatar * const param0)
 {
-    return sub_0206298C(sub_0205EB3C(param0));
+    return sub_0206298C(Player_LocalMapObject(param0));
 }
 
 void sub_0205EA84 (PlayerAvatar * param0, int param1)
 {
-    sub_02062974(sub_0205EB3C(param0), param1);
+    sub_02062974(Player_LocalMapObject(param0), param1);
 }
 
 int sub_0205EA94 (PlayerAvatar * const param0)
 {
-    return sub_0206299C(sub_0205EB3C(param0));
+    return sub_0206299C(Player_LocalMapObject(param0));
 }
 
 int sub_0205EAA0 (PlayerAvatar * const param0)
@@ -227,27 +227,27 @@ int sub_0205EAA0 (PlayerAvatar * const param0)
 
 int Player_XPos (PlayerAvatar * const param0)
 {
-    return sub_02063020(sub_0205EB3C(param0));
+    return sub_02063020(Player_LocalMapObject(param0));
 }
 
 int Player_ZPos (PlayerAvatar * const param0)
 {
-    return sub_02063040(sub_0205EB3C(param0));
+    return sub_02063040(Player_LocalMapObject(param0));
 }
 
 int sub_0205EAD4 (PlayerAvatar * const param0)
 {
-    return sub_02063008(sub_0205EB3C(param0));
+    return sub_02063008(Player_LocalMapObject(param0));
 }
 
 int sub_0205EAE0 (PlayerAvatar * const param0)
 {
-    return sub_02063018(sub_0205EB3C(param0));
+    return sub_02063018(Player_LocalMapObject(param0));
 }
 
 void sub_0205EAEC (PlayerAvatar * const param0, VecFx32 * param1)
 {
-    sub_02063050(sub_0205EB3C(param0), param1);
+    sub_02063050(Player_LocalMapObject(param0), param1);
 }
 
 const VecFx32 * sub_0205EAFC (PlayerAvatar * const param0)
@@ -277,9 +277,9 @@ int sub_0205EB14 (const PlayerAvatar * param0)
 
 void sub_0205EB18 (PlayerAvatar * param0, int param1)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
 
-    v0 = sub_0205EB3C(param0);
+    v0 = Player_LocalMapObject(param0);
 
     if (param1 == 1) {
         sub_020628C4(v0, (1 << 9));
@@ -288,12 +288,12 @@ void sub_0205EB18 (PlayerAvatar * param0, int param1)
     }
 }
 
-void sub_0205EB38 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1)
+void sub_0205EB38 (PlayerAvatar * param0, LocalMapObject * param1)
 {
     param0->unk_30 = param1;
 }
 
-UnkStruct_02061AB4 * sub_0205EB3C (PlayerAvatar * param0)
+LocalMapObject * Player_LocalMapObject (PlayerAvatar * param0)
 {
     GF_ASSERT(param0 != NULL);
     GF_ASSERT(param0->unk_30 != NULL);
@@ -301,7 +301,7 @@ UnkStruct_02061AB4 * sub_0205EB3C (PlayerAvatar * param0)
     return param0->unk_30;
 }
 
-const UnkStruct_02061AB4 * sub_0205EB54 (const PlayerAvatar * param0)
+const LocalMapObject * sub_0205EB54 (const PlayerAvatar * param0)
 {
     return param0->unk_30;
 }
@@ -538,9 +538,9 @@ void sub_0205ECA8 (PlayerAvatar * param0, u32 param1)
 
 void sub_0205ECB8 (PlayerAvatar * param0, const VecFx32 * param1, int param2)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
 
-    v0 = sub_0205EB3C(param0);
+    v0 = Player_LocalMapObject(param0);
 
     sub_020632D4(v0, param1, param2);
     sub_0205EB08(param0, 0);
@@ -549,11 +549,11 @@ void sub_0205ECB8 (PlayerAvatar * param0, const VecFx32 * param1, int param2)
 
 void sub_0205ECE0 (PlayerAvatar * param0, int param1, int param2, int param3)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
 
-    v0 = sub_0205EB3C(param0);
+    v0 = Player_LocalMapObject(param0);
 
-    sub_02063340(v0, param1, 0, param2, param3);
+    LocalMapObj_SetPosDir(v0, param1, 0, param2, param3);
     sub_0205EB08(param0, 0);
     sub_0205EB10(param0, 0);
 }
@@ -561,7 +561,7 @@ void sub_0205ECE0 (PlayerAvatar * param0, int param1, int param2, int param3)
 void sub_0205ED0C (PlayerAvatar * param0, fx32 param1)
 {
     VecFx32 v0;
-    UnkStruct_02061AB4 * v1 = sub_0205EB3C(param0);
+    LocalMapObject * v1 = Player_LocalMapObject(param0);
 
     sub_02063050(v1, &v0);
     v0.y = param1;
@@ -570,7 +570,7 @@ void sub_0205ED0C (PlayerAvatar * param0, fx32 param1)
 
 void sub_0205ED2C (PlayerAvatar * param0, int param1)
 {
-    UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0);
+    LocalMapObject * v0 = Player_LocalMapObject(param0);
 
     if (param1 == 1) {
         sub_02062E28(v0, 0);
@@ -581,7 +581,7 @@ void sub_0205ED2C (PlayerAvatar * param0, int param1)
 
 void sub_0205ED48 (PlayerAvatar * param0, int param1)
 {
-    UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0);
+    LocalMapObject * v0 = Player_LocalMapObject(param0);
 
     if (param1 == 1) {
         sub_02062E28(v0, 0);
diff --git a/src/unk_0205F180.c b/src/unk_0205F180.c
index 1de8bcde2d..efce12ba5b 100644
--- a/src/unk_0205F180.c
+++ b/src/unk_0205F180.c
@@ -51,60 +51,60 @@ static int sub_0205FAB0(PlayerAvatar * param0, int param1);
 static int sub_0205FB10(PlayerAvatar * param0, int param1);
 static void sub_0205FB40(PlayerAvatar * param0, int param1);
 static void inline_0205F180(PlayerAvatar * param0, const UnkStruct_ov5_021E8F60 * param1, int param2, u16 param3, u16 param4);
-static void inline_0205F180_sub(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5);
+static void inline_0205F180_sub(PlayerAvatar * param0, LocalMapObject * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5);
 static int sub_0205FC48(PlayerAvatar * param0, int param1);
 static int sub_0205FC64(int param0);
-static int sub_0205FC88(UnkStruct_02061AB4 * param0, u8 param1, int param2);
-static int sub_0205FCBC(UnkStruct_02061AB4 * param0, u8 param1, int param2);
+static int sub_0205FC88(LocalMapObject * param0, u8 param1, int param2);
+static int sub_0205FCBC(LocalMapObject * param0, u8 param1, int param2);
 static int sub_0205FCC0(PlayerAvatar * param0, int param1);
-static void sub_0205FD20(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
-static void sub_0205FD40(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
-static void sub_0205FDC8(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
-static void sub_0205FECC(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
-static void sub_020600CC(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
-static void sub_02060150(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
-static void sub_020601D4(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
-static void sub_02060258(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
-static void sub_020602DC(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5);
+static void sub_0205FD20(PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4);
+static void sub_0205FD40(PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4);
+static void sub_0205FDC8(PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4);
+static void sub_0205FECC(PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4);
+static void sub_020600CC(PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4);
+static void sub_02060150(PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4);
+static void sub_020601D4(PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4);
+static void sub_02060258(PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4);
+static void sub_020602DC(PlayerAvatar * param0, LocalMapObject * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5);
 static void sub_02060324(PlayerAvatar * param0, u16 param1);
 int sub_02060390(PlayerAvatar * param0, int param1);
 static int sub_020603BC(PlayerAvatar * param0);
 static int sub_020603EC(PlayerAvatar * param0);
-static void sub_02060420(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5);
+static void sub_02060420(PlayerAvatar * param0, LocalMapObject * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5);
 static int sub_02060494(PlayerAvatar * param0, int param1);
 static int sub_020604B0(int param0);
 static int sub_020604E4(PlayerAvatar * param0, int param1);
-static void sub_02060548(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
-static void sub_02060570(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
-static void sub_02060688(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
-static void sub_020606C8(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
-static void sub_0206078C(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5);
+static void sub_02060548(PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4);
+static void sub_02060570(PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4);
+static void sub_02060688(PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4);
+static void sub_020606C8(PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4);
+static void sub_0206078C(PlayerAvatar * param0, LocalMapObject * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5);
 static int sub_02060800(PlayerAvatar * param0, int param1);
 static int sub_0206081C(int param0);
 static int sub_02060850(PlayerAvatar * param0, int param1);
-static void sub_020608BC(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
-static void sub_020608E4(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
-static void sub_02060A60(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
-static void sub_02060AA0(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4);
-static u32 sub_02060C24(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2);
-static int sub_02060CE4(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2);
-static int sub_02060D98(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2);
-static int sub_02060E40(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2);
-static int sub_02060EE4(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2);
-static int sub_02060F4C(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2);
-static int sub_02060FA8(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2);
-static int sub_02061058(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2);
-static int sub_02061180(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2);
-static int sub_02061100(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2);
-static int sub_02061248(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2);
+static void sub_020608BC(PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4);
+static void sub_020608E4(PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4);
+static void sub_02060A60(PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4);
+static void sub_02060AA0(PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4);
+static u32 sub_02060C24(PlayerAvatar * param0, LocalMapObject * param1, int param2);
+static int sub_02060CE4(PlayerAvatar * param0, LocalMapObject * param1, int param2);
+static int sub_02060D98(PlayerAvatar * param0, LocalMapObject * param1, int param2);
+static int sub_02060E40(PlayerAvatar * param0, LocalMapObject * param1, int param2);
+static int sub_02060EE4(PlayerAvatar * param0, LocalMapObject * param1, int param2);
+static int sub_02060F4C(PlayerAvatar * param0, LocalMapObject * param1, int param2);
+static int sub_02060FA8(PlayerAvatar * param0, LocalMapObject * param1, int param2);
+static int sub_02061058(PlayerAvatar * param0, LocalMapObject * param1, int param2);
+static int sub_02061180(PlayerAvatar * param0, LocalMapObject * param1, int param2);
+static int sub_02061100(PlayerAvatar * param0, LocalMapObject * param1, int param2);
+static int sub_02061248(PlayerAvatar * param0, LocalMapObject * param1, int param2);
 static int sub_02061310(u16 param0);
 static int sub_0206132C(u16 param0);
 static int sub_02061348(PlayerAvatar * param0, u16 param1, u16 param2);
 static int sub_020613D8(int param0);
 static void sub_020615C8(PlayerAvatar * param0);
-static int sub_020615E0(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2);
+static int sub_020615E0(PlayerAvatar * param0, LocalMapObject * param1, int param2);
 static int sub_02061630(PlayerAvatar * param0, u32 param1, int param2);
-static void sub_02060B64(PlayerAvatar * param0, UnkStruct_02061AB4 * param1, u32 param2, int param3);
+static void sub_02060B64(PlayerAvatar * param0, LocalMapObject * param1, u32 param2, int param3);
 
 static const UnkStruct_020EDB04 Unk_020EDB04[4] = {
     {0x0, 0x0, -1},
@@ -181,9 +181,9 @@ int sub_0205F224 (PlayerAvatar * param0, int param1)
 static int sub_0205F22C (PlayerAvatar * param0, int param1)
 {
     int v0;
-    UnkStruct_02061AB4 * v1;
+    LocalMapObject * v1;
 
-    v1 = sub_0205EB3C(param0);
+    v1 = Player_LocalMapObject(param0);
 
     if (sub_020655F4(v1) == 1) {
         return 1;
@@ -253,7 +253,7 @@ static void sub_0205F378 (PlayerAvatar * param0)
 
         if (sub_0205F008(param0) == 1) {
             sub_0205EFF0(param0, 0);
-            sub_02062EE0(sub_0205EB3C(param0), 0);
+            sub_02062EE0(Player_LocalMapObject(param0), 0);
         }
     }
 }
@@ -261,7 +261,7 @@ static void sub_0205F378 (PlayerAvatar * param0)
 static void sub_0205F3B8 (PlayerAvatar * param0)
 {
     if (sub_0205EB0C(param0) == 1) {
-        UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0);
+        LocalMapObject * v0 = Player_LocalMapObject(param0);
         u8 v1, v2 = sub_02062BE8(v0);
 
         {
@@ -310,11 +310,11 @@ static void sub_0205F3B8 (PlayerAvatar * param0)
 void sub_0205F490 (PlayerAvatar * param0)
 {
     int v0, v1, v2;
-    const UnkStruct_02061AB4 * v3;
+    const LocalMapObject * v3;
 
     v0 = sub_0205EB0C(param0);
     v1 = sub_0205EB14(param0);
-    v3 = sub_0205EB3C(param0);
+    v3 = Player_LocalMapObject(param0);
 
     sub_0205EB10(param0, 0);
 
@@ -394,7 +394,7 @@ void sub_0205F56C (PlayerAvatar * param0)
 int sub_0205F588 (PlayerAvatar * param0)
 {
     int v0, v1, v2;
-    const UnkStruct_02061AB4 * v3;
+    const LocalMapObject * v3;
 
     v0 = sub_0205EB0C(param0);
     v1 = sub_0205EB14(param0);
@@ -412,7 +412,7 @@ int sub_0205F588 (PlayerAvatar * param0)
             return 1;
         }
 
-        v3 = sub_0205EB3C(param0);
+        v3 = Player_LocalMapObject(param0);
 
         if (sub_020655F4(v3) == 1) {
             return 1;
@@ -430,12 +430,12 @@ int sub_0205F588 (PlayerAvatar * param0)
 
 void sub_0205F5E4 (PlayerAvatar * param0, int param1)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
 
     sub_0205EB08(param0, 0);
     sub_0205EB10(param0, 0);
 
-    v0 = sub_0205EB3C(param0);
+    v0 = Player_LocalMapObject(param0);
 
     sub_02062974(v0, param1);
     sub_02062A0C(v0, 0x0);
@@ -455,7 +455,7 @@ static int sub_0205F62C (PlayerAvatar * param0, int param1)
 static u32 sub_0205F644 (PlayerAvatar * param0, int param1)
 {
     int v0 = 0;
-    u32 v1 = sub_02062BE8(sub_0205EB3C(param0));
+    u32 v1 = sub_02062BE8(Player_LocalMapObject(param0));
 
     if (sub_02061630(param0, v1, param1) == 1) {
         return 5;
@@ -501,7 +501,7 @@ static int sub_0205F6C4 (PlayerAvatar * param0, int param1)
 
 static int sub_0205F6D0 (PlayerAvatar * param0, int param1)
 {
-    UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0);
+    LocalMapObject * v0 = Player_LocalMapObject(param0);
     int v1 = sub_0206299C(v0);
     int v2 = sub_0205FAB0(param0, v1);
     u32 v3 = sub_02060B7C(param0, v0, v1);
@@ -561,7 +561,7 @@ static int sub_0205F6D0 (PlayerAvatar * param0, int param1)
 static int sub_0205F808 (PlayerAvatar * param0, int param1)
 {
     u32 v0;
-    UnkStruct_02061AB4 * v1 = sub_0205EB3C(param0);
+    LocalMapObject * v1 = Player_LocalMapObject(param0);
     int v2 = sub_0206299C(v1);
 
     Sound_PlayEffect(1620);
@@ -617,7 +617,7 @@ static int sub_0205F808 (PlayerAvatar * param0, int param1)
 
 static int sub_0205F95C (PlayerAvatar * param0, int param1)
 {
-    UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0);
+    LocalMapObject * v0 = Player_LocalMapObject(param0);
     int v1 = sub_0206299C(v0);
 
     if (sub_0205EC88(param0) == 1) {
@@ -635,7 +635,7 @@ static int sub_0205F95C (PlayerAvatar * param0, int param1)
 
 static int sub_0205F9AC (PlayerAvatar * param0, int param1)
 {
-    UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0);
+    LocalMapObject * v0 = Player_LocalMapObject(param0);
     int v1 = sub_0206299C(v0);
 
     if (sub_0205EC88(param0) == 1) {
@@ -654,7 +654,7 @@ static int sub_0205F9AC (PlayerAvatar * param0, int param1)
 static int sub_0205F9FC (PlayerAvatar * param0, int param1)
 {
     int v0 = 1;
-    UnkStruct_02061AB4 * v1 = sub_0205EB3C(param0);
+    LocalMapObject * v1 = Player_LocalMapObject(param0);
     u32 v2 = sub_02060B7C(param0, v1, v0);
 
     if (v2 == 0) {
@@ -685,7 +685,7 @@ static int(*const Unk_020EDAEC[6])(PlayerAvatar *, int) = {
 static void sub_0205FA6C (PlayerAvatar * param0)
 {
     if (sub_0205EF58(param0) == 1) {
-        UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0);
+        LocalMapObject * v0 = Player_LocalMapObject(param0);
 
         sub_020628C4(v0, (1 << 7) | (1 << 8));
 
@@ -703,7 +703,7 @@ static int sub_0205FAB0 (PlayerAvatar * param0, int param1)
 {
     int v0;
     VecFx32 v1, v2;
-    UnkStruct_02061AB4 * v3 = sub_0205EB3C(param0);
+    LocalMapObject * v3 = Player_LocalMapObject(param0);
     FieldSystem * v4 = sub_02062C00(v3);
 
     sub_02063050(v3, &v1);
@@ -747,7 +747,7 @@ static int sub_0205FB10 (PlayerAvatar * param0, int param1)
 
 static void sub_0205FB40 (PlayerAvatar * param0, int param1)
 {
-    UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0);
+    LocalMapObject * v0 = Player_LocalMapObject(param0);
     int v1 = 0x10;
     int v2 = sub_0205EBB8(param0);
     int v3 = 5;
@@ -774,7 +774,7 @@ static void sub_0205FB40 (PlayerAvatar * param0, int param1)
 static void inline_0205F180 (PlayerAvatar * param0, const UnkStruct_ov5_021E8F60 * param1, int param2, u16 param3, u16 param4)
 {
     int v0 = sub_0205EB74(param0);
-    UnkStruct_02061AB4 * v1 = sub_0205EB3C(param0);
+    LocalMapObject * v1 = Player_LocalMapObject(param0);
 
     switch (v0) {
     case 0x0:
@@ -790,7 +790,7 @@ static void inline_0205F180 (PlayerAvatar * param0, const UnkStruct_ov5_021E8F60
     }
 }
 
-static void inline_0205F180_sub (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5)
+static void inline_0205F180_sub (PlayerAvatar * param0, LocalMapObject * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5)
 {
     int v0;
 
@@ -833,7 +833,7 @@ static int sub_0205FC64 (int param0)
     return 0;
 }
 
-static int sub_0205FC88 (UnkStruct_02061AB4 * param0, u8 param1, int param2)
+static int sub_0205FC88 (LocalMapObject * param0, u8 param1, int param2)
 {
     if (sub_0205DD5C(param1) == 1) {
         return 0x4;
@@ -850,7 +850,7 @@ static int sub_0205FC88 (UnkStruct_02061AB4 * param0, u8 param1, int param2)
     return param2;
 }
 
-static int sub_0205FCBC (UnkStruct_02061AB4 * param0, u8 param1, int param2)
+static int sub_0205FCBC (LocalMapObject * param0, u8 param1, int param2)
 {
     return param2;
 }
@@ -883,7 +883,7 @@ static int sub_0205FCC0 (PlayerAvatar * param0, int param1)
     return 1;
 }
 
-static void sub_0205FD20 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
+static void sub_0205FD20 (PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4)
 {
     int v0;
 
@@ -891,7 +891,7 @@ static void sub_0205FD20 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, in
     sub_02060B64(param0, param1, v0, 1);
 }
 
-static void sub_0205FD40 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
+static void sub_0205FD40 (PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4)
 {
     int v0 = sub_0205F108(param0);
 
@@ -913,7 +913,7 @@ static void sub_0205FD40 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, in
     }
 }
 
-static void sub_0205FDC8 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
+static void sub_0205FDC8 (PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4)
 {
     u32 v0;
     int v1;
@@ -981,7 +981,7 @@ static void sub_0205FDC8 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, in
     sub_02060B64(param0, param1, v1, v2);
 }
 
-static void sub_0205FECC (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
+static void sub_0205FECC (PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4)
 {
     u32 v0;
     int v1;
@@ -1050,7 +1050,7 @@ static void sub_0205FECC (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, in
     sub_02060B64(param0, param1, v1, v2);
 }
 
-static void sub_0206000C (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4, const int * param5, const int * param6, const int * param7, const int * param8, const int * param9)
+static void sub_0206000C (PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4, const int * param5, const int * param6, const int * param7, const int * param8, const int * param9)
 {
     u32 v0;
     int v1;
@@ -1097,7 +1097,7 @@ static void sub_0206000C (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, in
     sub_02060B64(param0, param1, v1, v2);
 }
 
-static void sub_020600CC (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
+static void sub_020600CC (PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4)
 {
     int v0[4] = {0x69, 0x6a, 0x6b, 0x6c};
     int v1[4] = {0x79, 0x7a, 0x7b, 0x7c};
@@ -1108,7 +1108,7 @@ static void sub_020600CC (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, in
     sub_0206000C(param0, param1, param2, param3, param4, v0, v1, v2, v3, v4);
 }
 
-static void sub_02060150 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
+static void sub_02060150 (PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4)
 {
     int v0[4] = {0x6d, 0x6e, 0x6f, 0x70};
     int v1[4] = {0x7d, 0x7e, 0x7f, 0x80};
@@ -1119,7 +1119,7 @@ static void sub_02060150 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, in
     sub_0206000C(param0, param1, param2, param3, param4, v0, v1, v2, v3, v4);
 }
 
-static void sub_020601D4 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
+static void sub_020601D4 (PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4)
 {
     int v0[4] = {0x71, 0x72, 0x73, 0x74};
     int v1[4] = {0x81, 0x82, 0x83, 0x84};
@@ -1130,7 +1130,7 @@ static void sub_020601D4 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, in
     sub_0206000C(param0, param1, param2, param3, param4, v0, v1, v2, v3, v4);
 }
 
-static void sub_02060258 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
+static void sub_02060258 (PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4)
 {
     int v0, v1;
     int v2;
@@ -1165,7 +1165,7 @@ static void sub_02060258 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, in
     sub_02062994(param1, param2);
 }
 
-static void sub_020602DC (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5)
+static void sub_020602DC (PlayerAvatar * param0, LocalMapObject * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5)
 {
     int v0;
 
@@ -1183,7 +1183,7 @@ static void sub_02060324 (PlayerAvatar * param0, u16 param1)
     }
 
     if ((param1 & PAD_BUTTON_B)) {
-        u32 v0 = sub_02062BE8(sub_0205EB3C(param0));
+        u32 v0 = sub_02062BE8(Player_LocalMapObject(param0));
 
         if (sub_0205DD90(v0) || sub_0205DD9C(v0)) {
             return;
@@ -1269,7 +1269,7 @@ static int sub_020603EC (PlayerAvatar * param0)
     return v0;
 }
 
-static void sub_02060420 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5)
+static void sub_02060420 (PlayerAvatar * param0, LocalMapObject * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5)
 {
     int v0 = sub_02060494(param0, param3);
 
@@ -1341,7 +1341,7 @@ static int sub_020604E4 (PlayerAvatar * param0, int param1)
     return 1;
 }
 
-static void sub_02060548 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
+static void sub_02060548 (PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4)
 {
     int v0;
 
@@ -1351,7 +1351,7 @@ static void sub_02060548 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, in
     sub_0205EBC0(param0);
 }
 
-static void sub_02060570 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
+static void sub_02060570 (PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4)
 {
     u32 v0;
     int v1;
@@ -1413,7 +1413,7 @@ static void sub_02060570 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, in
     sub_02060B64(param0, param1, v1, v2);
 }
 
-static void sub_02060688 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
+static void sub_02060688 (PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4)
 {
     sub_0205EBC0(param0);
 
@@ -1428,7 +1428,7 @@ static void sub_02060688 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, in
     }
 }
 
-static void sub_020606C8 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
+static void sub_020606C8 (PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4)
 {
     u32 v0;
     int v1;
@@ -1470,7 +1470,7 @@ static void sub_020606C8 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, in
     sub_02060B64(param0, param1, v2, v1);
 }
 
-static void sub_0206078C (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5)
+static void sub_0206078C (PlayerAvatar * param0, LocalMapObject * param1, const UnkStruct_ov5_021E8F60 * param2, int param3, u16 param4, u16 param5)
 {
     int v0 = sub_02060800(param0, param3);
 
@@ -1548,7 +1548,7 @@ static int sub_02060850 (PlayerAvatar * param0, int param1)
     return 1;
 }
 
-static void sub_020608BC (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
+static void sub_020608BC (PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4)
 {
     int v0;
 
@@ -1558,7 +1558,7 @@ static void sub_020608BC (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, in
     sub_0205EBC0(param0);
 }
 
-static void sub_020608E4 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
+static void sub_020608E4 (PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4)
 {
     u32 v0;
     int v1;
@@ -1632,7 +1632,7 @@ static void sub_020608E4 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, in
     sub_02060B64(param0, param1, v1, v2);
 }
 
-static void sub_02060A60 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
+static void sub_02060A60 (PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4)
 {
     sub_0205EBC0(param0);
 
@@ -1647,7 +1647,7 @@ static void sub_02060A60 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, in
     }
 }
 
-static void sub_02060AA0 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2, u16 param3, u16 param4)
+static void sub_02060AA0 (PlayerAvatar * param0, LocalMapObject * param1, int param2, u16 param3, u16 param4)
 {
     u32 v0;
     int v1;
@@ -1689,13 +1689,13 @@ static void sub_02060AA0 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, in
     sub_02060B64(param0, param1, v2, v1);
 }
 
-static void sub_02060B64 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, u32 param2, int param3)
+static void sub_02060B64 (PlayerAvatar * param0, LocalMapObject * param1, u32 param2, int param3)
 {
     sub_0205EC20(param0, param2, param3);
     sub_02065638(param1, param2);
 }
 
-u32 sub_02060B7C (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2)
+u32 sub_02060B7C (PlayerAvatar * param0, LocalMapObject * param1, int param2)
 {
     u32 v0, v1;
 
@@ -1741,7 +1741,7 @@ u32 sub_02060B7C (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2
     return v0;
 }
 
-static u32 sub_02060C24 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2)
+static u32 sub_02060C24 (PlayerAvatar * param0, LocalMapObject * param1, int param2)
 {
     VecFx32 v0;
     u32 v1, v2;
@@ -1781,7 +1781,7 @@ static u32 sub_02060C24 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int
     return v1;
 }
 
-static int sub_02060CE4 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2)
+static int sub_02060CE4 (PlayerAvatar * param0, LocalMapObject * param1, int param2)
 {
     if (param2 != -1) {
         FieldSystem * v0 = sub_02062C00(param1);
@@ -1823,7 +1823,7 @@ static int sub_02060CE4 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int
     return 0;
 }
 
-static int sub_02060D98 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2)
+static int sub_02060D98 (PlayerAvatar * param0, LocalMapObject * param1, int param2)
 {
     BOOL v0 = 0;
 
@@ -1860,7 +1860,7 @@ static int sub_02060D98 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int
     return v0;
 }
 
-static int sub_02060E40 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2)
+static int sub_02060E40 (PlayerAvatar * param0, LocalMapObject * param1, int param2)
 {
     if (param2 != -1) {
         FieldSystem * v0 = sub_02062C00(param1);
@@ -1903,7 +1903,7 @@ static int sub_02060E40 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int
     return 0;
 }
 
-static int sub_02060EE4 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2)
+static int sub_02060EE4 (PlayerAvatar * param0, LocalMapObject * param1, int param2)
 {
     if (param2 != -1) {
         FieldSystem * v0 = sub_02062C00(param1);
@@ -1923,7 +1923,7 @@ static int sub_02060EE4 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int
     return 0;
 }
 
-static int sub_02060F4C (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2)
+static int sub_02060F4C (PlayerAvatar * param0, LocalMapObject * param1, int param2)
 {
     if (param2 != -1) {
         FieldSystem * v0 = sub_02062C00(param1);
@@ -1939,7 +1939,7 @@ static int sub_02060F4C (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int
     return 0;
 }
 
-static int sub_02060FA8 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2)
+static int sub_02060FA8 (PlayerAvatar * param0, LocalMapObject * param1, int param2)
 {
     if (param2 != -1) {
         FieldSystem * v0 = sub_02062C00(param1);
@@ -1973,7 +1973,7 @@ static int sub_02060FA8 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int
     return 0;
 }
 
-static int sub_02061058 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2)
+static int sub_02061058 (PlayerAvatar * param0, LocalMapObject * param1, int param2)
 {
     if ((param2 != -1) && (sub_0205EB74(param0) == 0x1)) {
         FieldSystem * v0 = sub_02062C00(param1);
@@ -2005,7 +2005,7 @@ static int sub_02061058 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int
     return 0;
 }
 
-static int sub_02061100 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2)
+static int sub_02061100 (PlayerAvatar * param0, LocalMapObject * param1, int param2)
 {
     u32 v0 = 0;
     FieldSystem * v1 = sub_02062C00(param1);
@@ -2031,7 +2031,7 @@ static int sub_02061100 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int
     return v0;
 }
 
-static int sub_02061180 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2)
+static int sub_02061180 (PlayerAvatar * param0, LocalMapObject * param1, int param2)
 {
     if (param2 != -1) {
         FieldSystem * v0 = sub_02062C00(param1);
@@ -2056,7 +2056,7 @@ static int sub_02061180 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int
     return 0;
 }
 
-u32 sub_020611FC (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2)
+u32 sub_020611FC (PlayerAvatar * param0, LocalMapObject * param1, int param2)
 {
     u32 v0, v1 = 0;
 
@@ -2081,7 +2081,7 @@ u32 sub_020611FC (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2
     return v1;
 }
 
-static int sub_02061248 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2)
+static int sub_02061248 (PlayerAvatar * param0, LocalMapObject * param1, int param2)
 {
     BOOL v0 = 0;
 
@@ -2187,7 +2187,7 @@ static int sub_02061348 (PlayerAvatar * param0, u16 param1, u16 param2)
 
 int sub_020613AC (PlayerAvatar * param0)
 {
-    UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0);
+    LocalMapObject * v0 = Player_LocalMapObject(param0);
 
     if (sub_020655F4(v0) == 1) {
         return 1;
@@ -2289,7 +2289,7 @@ u32 sub_0206147C (PlayerAvatar * param0, u16 param1, u16 param2, int param3, int
     }
 
     {
-        UnkStruct_02061AB4 * v3 = sub_0205EB3C(param0);
+        LocalMapObject * v3 = Player_LocalMapObject(param0);
         u32 v4 = param5;
 
         if ((v4 & (1 << 2))) {
@@ -2340,19 +2340,19 @@ u32 sub_0206147C (PlayerAvatar * param0, u16 param1, u16 param2, int param3, int
 
 int sub_02061544 (PlayerAvatar * param0)
 {
-    UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0);
+    LocalMapObject * v0 = Player_LocalMapObject(param0);
     return sub_020655F4(v0);
 }
 
 void sub_02061550 (PlayerAvatar * param0, u32 param1, int param2)
 {
-    UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0);
+    LocalMapObject * v0 = Player_LocalMapObject(param0);
     sub_02060B64(param0, v0, param1, param2);
 }
 
 u32 sub_0206156C (PlayerAvatar * param0, int param1)
 {
-    UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0);
+    LocalMapObject * v0 = Player_LocalMapObject(param0);
     return sub_02064238(v0, param1);
 }
 
@@ -2370,14 +2370,14 @@ void sub_020615AC (PlayerAvatar * param0, int * param1, int * param2)
 
 static void sub_020615C8 (PlayerAvatar * param0)
 {
-    UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0);
+    LocalMapObject * v0 = Player_LocalMapObject(param0);
     FieldSystem * v1 = sub_02062C00(v0);
     UnkStruct_0202CD88 * v2 = sub_0202CD88(v1->unk_0C);
 
     sub_0202CF28(v2, (0 + 0));
 }
 
-static int sub_020615E0 (PlayerAvatar * param0, UnkStruct_02061AB4 * param1, int param2)
+static int sub_020615E0 (PlayerAvatar * param0, LocalMapObject * param1, int param2)
 {
     if (param2 != -1) {
         u8 v0 = sub_02062BE8(param1);
@@ -2417,7 +2417,7 @@ static int sub_02061630 (PlayerAvatar * param0, u32 param1, int param2)
     }
 
     {
-        UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0);
+        LocalMapObject * v0 = Player_LocalMapObject(param0);
 
         if (sub_0206413C(v0, param1) == 1) {
             return 1;
@@ -2463,7 +2463,7 @@ u32 sub_020616F0 (PlayerAvatar * param0, int param1)
     if (sub_0205F158(param0) == 0) {
         v0 = sub_0206156C(param0, param1);
     } else {
-        UnkStruct_02061AB4 * v1 = sub_0205EB3C(param0);
+        LocalMapObject * v1 = Player_LocalMapObject(param0);
         FieldSystem * v2 = sub_02062C00(v1);
         int v3 = sub_02063020(v1);
         int v4 = ((sub_02063030(v1) / 2));
@@ -2479,7 +2479,7 @@ u32 sub_020616F0 (PlayerAvatar * param0, int param1)
 u32 sub_02061760 (PlayerAvatar * param0)
 {
     u32 v0;
-    UnkStruct_02061AB4 * v1 = sub_0205EB3C(param0);
+    LocalMapObject * v1 = Player_LocalMapObject(param0);
     FieldSystem * v2 = sub_02062C00(v1);
     int v3 = sub_02063020(v1);
     int v4 = ((sub_02063030(v1) / 2));
@@ -2497,7 +2497,7 @@ u32 sub_02061760 (PlayerAvatar * param0)
 void sub_020617BC (PlayerAvatar * const param0, int * param1, int * param2, int * param3)
 {
     int v0 = sub_0205EAA0(param0);
-    UnkStruct_02061AB4 * v1 = sub_0205EB3C(param0);
+    LocalMapObject * v1 = Player_LocalMapObject(param0);
 
     *param1 = sub_02063020(v1);
     *param2 = ((sub_02063030(v1) / 2));
diff --git a/src/unk_02061804.c b/src/unk_02061804.c
index c1f596e3a5..459e7f8586 100644
--- a/src/unk_02061804.c
+++ b/src/unk_02061804.c
@@ -44,7 +44,7 @@ typedef struct UnkStruct_02061830_t {
     NARC * unk_14;
     UnkStruct_ov5_021ED0A4 unk_18;
     UnkStruct_02061830_sub1 * unk_120;
-    UnkStruct_02061AB4 * unk_124;
+    LocalMapObject * unk_124;
     FieldSystem * unk_128;
 } UnkStruct_02061830;
 
@@ -100,7 +100,7 @@ typedef struct UnkStruct_02061AB4_t {
     u8 unk_E8[16];
     u8 unk_F8[16];
     u8 unk_108[32];
-} UnkStruct_02061AB4;
+} LocalMapObject;
 
 typedef struct {
     int unk_00;
@@ -111,39 +111,39 @@ typedef struct {
 } UnkStruct_020620C4;
 
 static UnkStruct_02061830 * sub_020618C8(int param0);
-static void sub_02061D3C(FieldSystem * param0, UnkStruct_02061AB4 * param1, UnkStruct_02061D3C * param2);
-static void sub_02061E80(UnkStruct_02061AB4 * param0, UnkStruct_02061D3C * param1);
-static void sub_02061FA8(const UnkStruct_02061830 * param0, UnkStruct_02061AB4 * param1);
-static void sub_02061FF0(UnkStruct_02061AB4 * param0);
-static void sub_02062010(UnkStruct_02061AB4 * 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_02061FF0(LocalMapObject * param0);
+static void sub_02062010(LocalMapObject * param0);
 static void sub_020620C4(UnkStruct_020620C4 * param0);
-static UnkStruct_02061AB4 * sub_02062120(const UnkStruct_02061830 * param0);
-static UnkStruct_02061AB4 * sub_02062154(const UnkStruct_02061830 * param0, int param1, int param2);
-static void sub_020621AC(const UnkStruct_02061830 * param0, UnkStruct_02061AB4 * param1);
-static void sub_020621E8(UnkStruct_02061AB4 * param0, const UnkStruct_020619DC * param1, FieldSystem * param2);
-static void sub_020622B8(UnkStruct_02061AB4 * param0, const UnkStruct_020619DC * param1);
-static void sub_0206234C(UnkStruct_02061AB4 * param0, const UnkStruct_02061830 * param1);
-static void sub_0206239C(UnkStruct_02061AB4 * param0);
-static void sub_020623D4(UnkStruct_02061AB4 * param0);
-static void sub_0206243C(UnkStruct_02061AB4 * param0);
-static int sub_0206244C(const UnkStruct_02061AB4 * param0, int param1, int param2, const UnkStruct_020619DC * param3);
-static UnkStruct_02061AB4 * sub_020624CC(const UnkStruct_02061830 * param0, int param1, int param2);
-static void sub_02062604(UnkStruct_02061AB4 * param0);
-static void sub_02062618(UnkStruct_02061AB4 * param0);
-static void sub_02062628(UnkStruct_02061AB4 * 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 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_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 void sub_02062604(LocalMapObject * param0);
+static void sub_02062618(LocalMapObject * param0);
+static void sub_02062628(LocalMapObject * param0);
 static int sub_0206262C(FieldSystem * param0, int param1);
-static void sub_02062648(UnkStruct_02061AB4 * param0);
-static void sub_02062660(UnkStruct_02061AB4 * param0);
-static void sub_02062670(UnkStruct_02061AB4 * param0);
-static void sub_020626D0(UnkStruct_02061AB4 * param0, const UnkStruct_020619DC * param1, int param2);
-static void sub_02062714(UnkStruct_02061AB4 * param0, int param1, const UnkStruct_020619DC * param2);
+static void sub_02062648(LocalMapObject * param0);
+static void sub_02062660(LocalMapObject * param0);
+static void sub_02062670(LocalMapObject * param0);
+static void sub_020626D0(LocalMapObject * param0, const UnkStruct_020619DC * param1, int param2);
+static void sub_02062714(LocalMapObject * param0, int param1, const UnkStruct_020619DC * param2);
 static void sub_020627E8(SysTask * param0, void * param1);
-static void sub_02062804(UnkStruct_02061AB4 * param0);
+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 UnkStruct_02061AB4 * sub_02062870(const UnkStruct_02061830 * param0);
-static UnkStruct_02061830 * sub_02062A48(const UnkStruct_02061AB4 * param0);
+static LocalMapObject * sub_02062870(const UnkStruct_02061830 * param0);
+static UnkStruct_02061830 * 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);
@@ -181,7 +181,7 @@ void sub_02061830 (UnkStruct_02061830 * param0)
 void sub_0206184C (UnkStruct_02061830 * param0, int param1, int param2, int param3, const UnkStruct_020619DC * param4)
 {
     int v0, v1 = sub_02062824(param0);
-    UnkStruct_02061AB4 * v2 = sub_02062878(param0);
+    LocalMapObject * v2 = sub_02062878(param0);
 
     while (v1) {
         if (sub_02062CF8(v2) == 1) {
@@ -213,7 +213,7 @@ void sub_0206184C (UnkStruct_02061830 * param0, int param1, int param2, int para
 static UnkStruct_02061830 * sub_020618C8 (int param0)
 {
     int v0;
-    UnkStruct_02061AB4 * v1;
+    LocalMapObject * v1;
     UnkStruct_02061830 * v2;
 
     v2 = Heap_AllocFromHeap(11, (sizeof(UnkStruct_02061830)));
@@ -221,7 +221,7 @@ static UnkStruct_02061830 * sub_020618C8 (int param0)
     GF_ASSERT(v2 != NULL);
     memset(v2, 0, (sizeof(UnkStruct_02061830)));
 
-    v0 = (sizeof(UnkStruct_02061AB4)) * param0;
+    v0 = (sizeof(LocalMapObject)) * param0;
     v1 = Heap_AllocFromHeap(11, v0);
 
     GF_ASSERT(v1 != NULL);
@@ -232,9 +232,9 @@ static UnkStruct_02061830 * sub_020618C8 (int param0)
     return v2;
 }
 
-UnkStruct_02061AB4 * sub_02061918 (const UnkStruct_02061830 * param0, const UnkStruct_020619DC * param1, int param2)
+LocalMapObject * sub_02061918 (const UnkStruct_02061830 * param0, const UnkStruct_020619DC * param1, int param2)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
     UnkStruct_020619DC v1 = *param1;
     UnkStruct_020619DC * v2 = &v1;
 
@@ -277,10 +277,10 @@ UnkStruct_02061AB4 * sub_02061918 (const UnkStruct_02061830 * param0, const UnkS
     return v0;
 }
 
-UnkStruct_02061AB4 * sub_020619DC (const UnkStruct_02061830 * param0, int param1, int param2, int param3, int param4, int param5, int param6)
+LocalMapObject * sub_020619DC (const UnkStruct_02061830 * param0, int param1, int param2, int param3, int param4, int param5, int param6)
 {
     UnkStruct_020619DC v0;
-    UnkStruct_02061AB4 * v1;
+    LocalMapObject * v1;
 
     sub_020630F0(&v0, 0);
     sub_020630F8(&v0, param4);
@@ -303,9 +303,9 @@ UnkStruct_02061AB4 * sub_020619DC (const UnkStruct_02061830 * param0, int param1
     return v1;
 }
 
-UnkStruct_02061AB4 * sub_02061A74 (const UnkStruct_02061830 * param0, int param1, int param2, int param3, const UnkStruct_020619DC * param4)
+LocalMapObject * sub_02061A74 (const UnkStruct_02061830 * param0, int param1, int param2, int param3, const UnkStruct_020619DC * param4)
 {
-    UnkStruct_02061AB4 * v0 = NULL;
+    LocalMapObject * v0 = NULL;
     const UnkStruct_020619DC * v1 = sub_020631A4(param1, param2, param4);
 
     if (v1 != NULL) {
@@ -320,7 +320,7 @@ UnkStruct_02061AB4 * sub_02061A74 (const UnkStruct_02061830 * param0, int param1
     return v0;
 }
 
-void sub_02061AB4 (UnkStruct_02061AB4 * param0, int param1)
+void sub_02061AB4 (LocalMapObject * param0, int param1)
 {
     sub_0206291C(param0, param1);
     sub_02062604(param0);
@@ -328,7 +328,7 @@ void sub_02061AB4 (UnkStruct_02061AB4 * param0, int param1)
     sub_02062670(param0);
 }
 
-void sub_02061AD4 (UnkStruct_02061AB4 * param0, int param1)
+void sub_02061AD4 (LocalMapObject * param0, int param1)
 {
     if (sub_02062DFC(param0) == 1) {
         sub_02061B48(param0);
@@ -337,7 +337,7 @@ void sub_02061AD4 (UnkStruct_02061AB4 * param0, int param1)
     sub_02061AB4(param0, param1);
 }
 
-void sub_02061AF4 (UnkStruct_02061AB4 * param0)
+void sub_02061AF4 (LocalMapObject * param0)
 {
     const UnkStruct_02061830 * v0;
 
@@ -353,7 +353,7 @@ void sub_02061AF4 (UnkStruct_02061AB4 * param0)
     sub_0206243C(param0);
 }
 
-void sub_02061B28 (UnkStruct_02061AB4 * param0)
+void sub_02061B28 (LocalMapObject * param0)
 {
     int v0;
 
@@ -362,7 +362,7 @@ void sub_02061B28 (UnkStruct_02061AB4 * param0)
     sub_02061AF4(param0);
 }
 
-void sub_02061B48 (UnkStruct_02061AB4 * param0)
+void sub_02061B48 (LocalMapObject * param0)
 {
     const UnkStruct_02061830 * v0;
 
@@ -387,7 +387,7 @@ void sub_02061B48 (UnkStruct_02061AB4 * param0)
 void sub_02061BBC (UnkStruct_02061830 * param0)
 {
     int v0, v1;
-    UnkStruct_02061AB4 * v2;
+    LocalMapObject * v2;
 
     v0 = 0;
     v1 = sub_02062824(param0);
@@ -409,7 +409,7 @@ void sub_02061BF0 (UnkStruct_02061830 * param0)
 
     {
         int v0, v1;
-        UnkStruct_02061AB4 * v2;
+        LocalMapObject * v2;
 
         v0 = 0;
         v1 = sub_02062824(param0);
@@ -436,7 +436,7 @@ void sub_02061C48 (UnkStruct_02061830 * param0)
     {
         int v0 = 0;
         int v1 = sub_02062824(param0);
-        UnkStruct_02061AB4 * v2 = sub_02062878(param0);
+        LocalMapObject * v2 = sub_02062878(param0);
 
         do {
             if (sub_02062CF8(v2) == 1) {
@@ -459,7 +459,7 @@ void sub_02061C48 (UnkStruct_02061830 * param0)
 void sub_02061CA8 (FieldSystem * param0, const UnkStruct_02061830 * param1, UnkStruct_02061D3C * param2, int param3)
 {
     int v0 = 0;
-    UnkStruct_02061AB4 * v1;
+    LocalMapObject * v1;
 
     while (sub_020625B0(param1, &v1, &v0, (1 << 0))) {
         sub_02061D3C(param0, v1, param2);
@@ -475,7 +475,7 @@ void sub_02061CA8 (FieldSystem * param0, const UnkStruct_02061830 * param1, UnkS
 void sub_02061D04 (const UnkStruct_02061830 * param0, UnkStruct_02061D3C * param1, int param2)
 {
     int v0 = 0;
-    UnkStruct_02061AB4 * v1;
+    LocalMapObject * v1;
 
     while (param2) {
         if ((param1->unk_00 & (1 << 0))) {
@@ -491,7 +491,7 @@ void sub_02061D04 (const UnkStruct_02061830 * param0, UnkStruct_02061D3C * param
     }
 }
 
-static void sub_02061D3C (FieldSystem * param0, UnkStruct_02061AB4 * param1, UnkStruct_02061D3C * param2)
+static void sub_02061D3C (FieldSystem * param0, LocalMapObject * param1, UnkStruct_02061D3C * param2)
 {
     param2->unk_00 = sub_020628B8(param1);
     param2->unk_04 = sub_020628EC(param1);
@@ -542,7 +542,7 @@ static void sub_02061D3C (FieldSystem * param0, UnkStruct_02061AB4 * param1, Unk
     memcpy(param2->unk_40, sub_02062AA0(param1), 16);
 }
 
-static void sub_02061E80 (UnkStruct_02061AB4 * param0, UnkStruct_02061D3C * param1)
+static void sub_02061E80 (LocalMapObject * param0, UnkStruct_02061D3C * param1)
 {
     sub_020628B4(param0, param1->unk_00);
     sub_020628E8(param0, param1->unk_04);
@@ -564,9 +564,9 @@ static void sub_02061E80 (UnkStruct_02061AB4 * param0, UnkStruct_02061D3C * para
     sub_02062FF4(param0, param1->unk_20);
     sub_02062FFC(param0, param1->unk_22);
     sub_02063004(param0, param1->unk_24);
-    sub_02063024(param0, param1->unk_26);
+    LocalMapObj_SetX(param0, param1->unk_26);
     sub_02063034(param0, param1->unk_28);
-    sub_02063044(param0, param1->unk_2A);
+    LocalMapObj_SetZ(param0, param1->unk_2A);
 
     {
         VecFx32 v0 = {0, 0, 0};
@@ -579,7 +579,7 @@ static void sub_02061E80 (UnkStruct_02061AB4 * param0, UnkStruct_02061D3C * para
     memcpy(sub_02062AA0(param0), param1->unk_40, 16);
 }
 
-static void sub_02061FA8 (const UnkStruct_02061830 * param0, UnkStruct_02061AB4 * param1)
+static void sub_02061FA8 (const UnkStruct_02061830 * param0, LocalMapObject * param1)
 {
     sub_02061FF0(param1);
     sub_02062010(param1);
@@ -592,14 +592,14 @@ static void sub_02061FA8 (const UnkStruct_02061830 * param0, UnkStruct_02061AB4
     sub_02062828(sub_0206281C(param0));
 }
 
-static void sub_02061FF0 (UnkStruct_02061AB4 * param0)
+static void sub_02061FF0 (LocalMapObject * param0)
 {
     sub_020628BC(param0, (1 << 0) | (1 << 2));
     sub_020628C4(param0, (1 << 6) | (1 << 9) | (1 << 14) | (1 << 16) | (1 << 17) | (1 << 3) | (1 << 18) | (1 << 19) | (1 << 21) | (1 << 22) | (1 << 23));
     sub_02062618(param0);
 }
 
-static void sub_02062010 (UnkStruct_02061AB4 * param0)
+static void sub_02062010 (LocalMapObject * param0)
 {
     int v0;
     VecFx32 v1;
@@ -648,7 +648,7 @@ void sub_02062068 (const UnkStruct_02061830 * param0, int param1, int param2, co
 
 static void sub_020620C4 (UnkStruct_020620C4 * param0)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
     FieldSystem * v1;
     const UnkStruct_020619DC * v2;
 
@@ -669,10 +669,10 @@ static void sub_020620C4 (UnkStruct_020620C4 * param0)
     Heap_FreeToHeapExplicit(11, param0);
 }
 
-static UnkStruct_02061AB4 * sub_02062120 (const UnkStruct_02061830 * param0)
+static LocalMapObject * sub_02062120 (const UnkStruct_02061830 * param0)
 {
     int v0, v1;
-    UnkStruct_02061AB4 * v2;
+    LocalMapObject * v2;
 
     v0 = 0;
     v1 = sub_02062824(param0);
@@ -690,10 +690,10 @@ static UnkStruct_02061AB4 * sub_02062120 (const UnkStruct_02061830 * param0)
     return NULL;
 }
 
-static UnkStruct_02061AB4 * sub_02062154 (const UnkStruct_02061830 * param0, int param1, int param2)
+static LocalMapObject * sub_02062154 (const UnkStruct_02061830 * param0, int param1, int param2)
 {
     int v0 = 0;
-    UnkStruct_02061AB4 * v1;
+    LocalMapObject * v1;
 
     while (sub_020625B0(param0, &v1, &v0, (1 << 0)) == 1) {
         if (sub_02062E94(v1) == 1) {
@@ -708,7 +708,7 @@ static UnkStruct_02061AB4 * sub_02062154 (const UnkStruct_02061830 * param0, int
     return NULL;
 }
 
-static void sub_020621AC (const UnkStruct_02061830 * param0, UnkStruct_02061AB4 * param1)
+static void sub_020621AC (const UnkStruct_02061830 * param0, LocalMapObject * param1)
 {
     int v0, v1;
     SysTask * v2;
@@ -726,7 +726,7 @@ static void sub_020621AC (const UnkStruct_02061830 * param0, UnkStruct_02061AB4
     sub_02062A1C(param1, v2);
 }
 
-static void sub_020621E8 (UnkStruct_02061AB4 * param0, const UnkStruct_020619DC * param1, FieldSystem * param2)
+static void sub_020621E8 (LocalMapObject * param0, const UnkStruct_020619DC * param1, FieldSystem * param2)
 {
     sub_0206290C(param0, sub_020630F4(param1));
     sub_0206291C(param0, sub_0206262C(param2, sub_020630FC(param1)));
@@ -743,7 +743,7 @@ static void sub_020621E8 (UnkStruct_02061AB4 * param0, const UnkStruct_020619DC
     sub_020622B8(param0, param1);
 }
 
-static void sub_020622B8 (UnkStruct_02061AB4 * param0, const UnkStruct_020619DC * param1)
+static void sub_020622B8 (LocalMapObject * param0, const UnkStruct_020619DC * param1)
 {
     int v0;
     VecFx32 v1;
@@ -753,7 +753,7 @@ static void sub_020622B8 (UnkStruct_02061AB4 * param0, const UnkStruct_020619DC
 
     sub_02062FF4(param0, v0);
     sub_0206300C(param0, v0);
-    sub_02063024(param0, v0);
+    LocalMapObj_SetX(param0, v0);
 
     v0 = sub_02063198(param1);
     v1.y = (fx32)v0;
@@ -768,11 +768,11 @@ static void sub_020622B8 (UnkStruct_02061AB4 * param0, const UnkStruct_020619DC
 
     sub_02063004(param0, v0);
     sub_0206301C(param0, v0);
-    sub_02063044(param0, v0);
+    LocalMapObj_SetZ(param0, v0);
     sub_02063060(param0, &v1);
 }
 
-static void sub_0206234C (UnkStruct_02061AB4 * param0, const UnkStruct_02061830 * param1)
+static void sub_0206234C (LocalMapObject * param0, const UnkStruct_02061830 * param1)
 {
     sub_020628BC(param0, (1 << 0) | (1 << 12) | (1 << 11));
 
@@ -786,7 +786,7 @@ static void sub_0206234C (UnkStruct_02061AB4 * param0, const UnkStruct_02061830
     sub_020656DC(param0);
 }
 
-static void sub_0206239C (UnkStruct_02061AB4 * param0)
+static void sub_0206239C (LocalMapObject * param0)
 {
     const UnkStruct_020EDF0C * v0;
 
@@ -797,7 +797,7 @@ static void sub_0206239C (UnkStruct_02061AB4 * param0)
     sub_02062B20(param0, sub_0206322C(v0));
 }
 
-static void sub_020623D4 (UnkStruct_02061AB4 * param0)
+static void sub_020623D4 (LocalMapObject * param0)
 {
     const UnkStruct_ov5_021FB0F0 * v0;
     u32 v1 = sub_02062920(param0);
@@ -815,12 +815,12 @@ static void sub_020623D4 (UnkStruct_02061AB4 * param0)
     sub_02062B9C(param0, sub_02063240(v0));
 }
 
-static void sub_0206243C (UnkStruct_02061AB4 * param0)
+static void sub_0206243C (LocalMapObject * param0)
 {
-    memset(param0, 0, (sizeof(UnkStruct_02061AB4)));
+    memset(param0, 0, (sizeof(LocalMapObject)));
 }
 
-static int sub_0206244C (const UnkStruct_02061AB4 * param0, int param1, int param2, const UnkStruct_020619DC * param3)
+static int sub_0206244C (const LocalMapObject * param0, int param1, int param2, const UnkStruct_020619DC * param3)
 {
     int v0;
     int v1;
@@ -855,10 +855,10 @@ static int sub_0206244C (const UnkStruct_02061AB4 * param0, int param1, int para
     return 0;
 }
 
-static UnkStruct_02061AB4 * sub_020624CC (const UnkStruct_02061830 * param0, int param1, int param2)
+static LocalMapObject * sub_020624CC (const UnkStruct_02061830 * param0, int param1, int param2)
 {
     int v0 = 0;
-    UnkStruct_02061AB4 * v1;
+    LocalMapObject * v1;
 
     while (sub_020625B0(param0, &v1, &v0, (1 << 0)) == 1) {
         if ((sub_02062910(v1) == param1) && (sub_02062918(v1) == param2)) {
@@ -869,10 +869,10 @@ static UnkStruct_02061AB4 * sub_020624CC (const UnkStruct_02061830 * param0, int
     return NULL;
 }
 
-UnkStruct_02061AB4 * sub_0206251C (const UnkStruct_02061830 * param0, int param1)
+LocalMapObject * sub_0206251C (const UnkStruct_02061830 * param0, int param1)
 {
     int v0;
-    UnkStruct_02061AB4 * v1;
+    LocalMapObject * v1;
 
     GF_ASSERT(param0 != NULL);
 
@@ -895,10 +895,10 @@ UnkStruct_02061AB4 * sub_0206251C (const UnkStruct_02061830 * param0, int param1
     return NULL;
 }
 
-UnkStruct_02061AB4 * sub_02062570 (const UnkStruct_02061830 * param0, int param1)
+LocalMapObject * sub_02062570 (const UnkStruct_02061830 * param0, int param1)
 {
     int v0;
-    UnkStruct_02061AB4 * v1;
+    LocalMapObject * v1;
 
     v0 = sub_02062824(param0);
     v1 = sub_02062870(param0);
@@ -917,10 +917,10 @@ UnkStruct_02061AB4 * sub_02062570 (const UnkStruct_02061830 * param0, int param1
     return NULL;
 }
 
-int sub_020625B0 (const UnkStruct_02061830 * param0, UnkStruct_02061AB4 ** param1, int * param2, u32 param3)
+int sub_020625B0 (const UnkStruct_02061830 * param0, LocalMapObject ** param1, int * param2, u32 param3)
 {
     int v0;
-    UnkStruct_02061AB4 * v1;
+    LocalMapObject * v1;
 
     v0 = sub_02062824(param0);
 
@@ -945,18 +945,18 @@ int sub_020625B0 (const UnkStruct_02061830 * param0, UnkStruct_02061AB4 ** param
     return 0;
 }
 
-static void sub_02062604 (UnkStruct_02061AB4 * param0)
+static void sub_02062604 (LocalMapObject * param0)
 {
     sub_020628BC(param0, (1 << 2));
     sub_02062618(param0);
 }
 
-static void sub_02062618 (UnkStruct_02061AB4 * param0)
+static void sub_02062618 (LocalMapObject * param0)
 {
     sub_020628C4(param0, (1 << 15) | (1 << 20) | (1 << 26) | (1 << 24));
 }
 
-static void sub_02062628 (UnkStruct_02061AB4 * param0)
+static void sub_02062628 (LocalMapObject * param0)
 {
     (void)0;
 }
@@ -971,20 +971,20 @@ static int sub_0206262C (FieldSystem * param0, int param1)
     return param1;
 }
 
-static void sub_02062648 (UnkStruct_02061AB4 * param0)
+static void sub_02062648 (LocalMapObject * param0)
 {
     if (sub_020628D0(param0, (1 << 12))) {
         sub_020642F8(param0);
     }
 }
 
-static void sub_02062660 (UnkStruct_02061AB4 * param0)
+static void sub_02062660 (LocalMapObject * param0)
 {
     sub_0206239C(param0);
     sub_02063400(param0);
 }
 
-static void sub_02062670 (UnkStruct_02061AB4 * param0)
+static void sub_02062670 (LocalMapObject * param0)
 {
     const UnkStruct_02061830 * v0 = sub_02062A40(param0);
 
@@ -1003,7 +1003,7 @@ static void sub_02062670 (UnkStruct_02061AB4 * param0)
     }
 }
 
-int sub_020626B4 (const UnkStruct_02061AB4 * param0)
+int sub_020626B4 (const LocalMapObject * param0)
 {
     u16 v0 = (u16)sub_02062960(param0);
 
@@ -1014,7 +1014,7 @@ int sub_020626B4 (const UnkStruct_02061AB4 * param0)
     return 0;
 }
 
-static void sub_020626D0 (UnkStruct_02061AB4 * param0, const UnkStruct_020619DC * param1, int param2)
+static void sub_020626D0 (LocalMapObject * param0, const UnkStruct_020619DC * param1, int param2)
 {
     GF_ASSERT(sub_02062E94(param0) == 1);
 
@@ -1024,7 +1024,7 @@ static void sub_020626D0 (UnkStruct_02061AB4 * param0, const UnkStruct_020619DC
     sub_02062954(param0, sub_02063114(param1));
 }
 
-static void sub_02062714 (UnkStruct_02061AB4 * param0, int param1, const UnkStruct_020619DC * param2)
+static void sub_02062714 (LocalMapObject * param0, int param1, const UnkStruct_020619DC * param2)
 {
     GF_ASSERT(sub_020631D8(param2) == 1);
 
@@ -1034,7 +1034,7 @@ static void sub_02062714 (UnkStruct_02061AB4 * param0, int param1, const UnkStru
     sub_02062914(param0, param1);
 }
 
-int sub_02062758 (const UnkStruct_02061AB4 * param0, int param1)
+int sub_02062758 (const LocalMapObject * param0, int param1)
 {
     int v0;
 
@@ -1044,7 +1044,7 @@ int sub_02062758 (const UnkStruct_02061AB4 * param0, int param1)
     return v0;
 }
 
-int sub_02062764 (const UnkStruct_02061AB4 * param0, int param1, int param2)
+int sub_02062764 (const LocalMapObject * param0, int param1, int param2)
 {
     if (sub_020628D8(param0, (1 << 0)) == 0) {
         return 0;
@@ -1067,7 +1067,7 @@ int sub_02062764 (const UnkStruct_02061AB4 * param0, int param1, int param2)
     return 1;
 }
 
-int sub_020627B4 (const UnkStruct_02061AB4 * param0, int param1, int param2, int param3)
+int sub_020627B4 (const LocalMapObject * param0, int param1, int param2, int param3)
 {
     if (sub_020628D8(param0, (1 << 0)) == 0) {
         return 0;
@@ -1086,7 +1086,7 @@ int sub_020627B4 (const UnkStruct_02061AB4 * param0, int param1, int param2, int
 
 static void sub_020627E8 (SysTask * param0, void * param1)
 {
-    UnkStruct_02061AB4 * v0 = (UnkStruct_02061AB4 *)param1;
+    LocalMapObject * v0 = (LocalMapObject *)param1;
 
     sub_02063410(v0);
 
@@ -1097,7 +1097,7 @@ static void sub_020627E8 (SysTask * param0, void * param1)
     sub_02062804(v0);
 }
 
-static void sub_02062804 (UnkStruct_02061AB4 * param0)
+static void sub_02062804 (LocalMapObject * param0)
 {
     const UnkStruct_02061830 * v0 = sub_02062A40(param0);
 
@@ -1161,27 +1161,27 @@ UnkStruct_ov5_021ED0A4 * sub_0206285C (const UnkStruct_02061830 * param0)
     return &(((UnkStruct_02061830 *)param0)->unk_18);
 }
 
-void sub_02062860 (UnkStruct_02061830 * param0, UnkStruct_02061AB4 * param1)
+void sub_02062860 (UnkStruct_02061830 * param0, LocalMapObject * param1)
 {
     param0->unk_124 = param1;
 }
 
-const UnkStruct_02061AB4 * sub_02062868 (const UnkStruct_02061830 * param0)
+const LocalMapObject * sub_02062868 (const UnkStruct_02061830 * param0)
 {
     return param0->unk_124;
 }
 
-static UnkStruct_02061AB4 * sub_02062870 (const UnkStruct_02061830 * param0)
+static LocalMapObject * sub_02062870 (const UnkStruct_02061830 * param0)
 {
     return param0->unk_124;
 }
 
-UnkStruct_02061AB4 * sub_02062878 (const UnkStruct_02061830 * param0)
+LocalMapObject * sub_02062878 (const UnkStruct_02061830 * param0)
 {
     return param0->unk_124;
 }
 
-void sub_02062880 (const UnkStruct_02061AB4 ** param0)
+void sub_02062880 (const LocalMapObject ** param0)
 {
     (*param0)++;
 }
@@ -1207,32 +1207,32 @@ NARC * sub_020628A0 (const UnkStruct_02061830 * param0)
     return ((UnkStruct_02061830 *)param0)->unk_14;
 }
 
-void sub_020628B4 (UnkStruct_02061AB4 * param0, u32 param1)
+void sub_020628B4 (LocalMapObject * param0, u32 param1)
 {
     param0->unk_00 = param1;
 }
 
-u32 sub_020628B8 (const UnkStruct_02061AB4 * param0)
+u32 sub_020628B8 (const LocalMapObject * param0)
 {
     return param0->unk_00;
 }
 
-void sub_020628BC (UnkStruct_02061AB4 * param0, u32 param1)
+void sub_020628BC (LocalMapObject * param0, u32 param1)
 {
     param0->unk_00 |= param1;
 }
 
-void sub_020628C4 (UnkStruct_02061AB4 * param0, u32 param1)
+void sub_020628C4 (LocalMapObject * param0, u32 param1)
 {
     param0->unk_00 &= ~param1;
 }
 
-u32 sub_020628D0 (const UnkStruct_02061AB4 * param0, u32 param1)
+u32 sub_020628D0 (const LocalMapObject * param0, u32 param1)
 {
     return param0->unk_00 & param1;
 }
 
-u32 sub_020628D8 (const UnkStruct_02061AB4 * param0, u32 param1)
+u32 sub_020628D8 (const LocalMapObject * param0, u32 param1)
 {
     if ((param0->unk_00 & param1)) {
         return 1;
@@ -1241,62 +1241,62 @@ u32 sub_020628D8 (const UnkStruct_02061AB4 * param0, u32 param1)
     return 0;
 }
 
-void sub_020628E8 (UnkStruct_02061AB4 * param0, u32 param1)
+void sub_020628E8 (LocalMapObject * param0, u32 param1)
 {
     param0->unk_04 = param1;
 }
 
-u32 sub_020628EC (const UnkStruct_02061AB4 * param0)
+u32 sub_020628EC (const LocalMapObject * param0)
 {
     return param0->unk_04;
 }
 
-void sub_020628F0 (UnkStruct_02061AB4 * param0, u32 param1)
+void sub_020628F0 (LocalMapObject * param0, u32 param1)
 {
     param0->unk_04 |= param1;
 }
 
-void sub_020628F8 (UnkStruct_02061AB4 * param0, u32 param1)
+void sub_020628F8 (LocalMapObject * param0, u32 param1)
 {
     param0->unk_04 &= ~param1;
 }
 
-u32 sub_02062904 (const UnkStruct_02061AB4 * param0, u32 param1)
+u32 sub_02062904 (const LocalMapObject * param0, u32 param1)
 {
     return(param0->unk_04 & param1);
 }
 
-void sub_0206290C (UnkStruct_02061AB4 * param0, u32 param1)
+void sub_0206290C (LocalMapObject * param0, u32 param1)
 {
     param0->unk_08 = param1;
 }
 
-u32 sub_02062910 (const UnkStruct_02061AB4 * param0)
+u32 sub_02062910 (const LocalMapObject * param0)
 {
     return param0->unk_08;
 }
 
-void sub_02062914 (UnkStruct_02061AB4 * param0, int param1)
+void sub_02062914 (LocalMapObject * param0, int param1)
 {
     param0->unk_0C = param1;
 }
 
-int sub_02062918 (const UnkStruct_02061AB4 * param0)
+int sub_02062918 (const LocalMapObject * param0)
 {
     return param0->unk_0C;
 }
 
-void sub_0206291C (UnkStruct_02061AB4 * param0, u32 param1)
+void sub_0206291C (LocalMapObject * param0, u32 param1)
 {
     param0->unk_10 = param1;
 }
 
-u32 sub_02062920 (const UnkStruct_02061AB4 * param0)
+u32 sub_02062920 (const LocalMapObject * param0)
 {
     return param0->unk_10;
 }
 
-u32 sub_02062924 (const UnkStruct_02061AB4 * param0)
+u32 sub_02062924 (const LocalMapObject * param0)
 {
     u32 v0 = sub_02062920(param0);
 
@@ -1307,63 +1307,63 @@ u32 sub_02062924 (const UnkStruct_02061AB4 * param0)
     return v0;
 }
 
-void sub_02062944 (UnkStruct_02061AB4 * param0, u32 param1)
+void sub_02062944 (LocalMapObject * param0, u32 param1)
 {
     param0->unk_14 = param1;
 }
 
-u32 sub_02062948 (const UnkStruct_02061AB4 * param0)
+u32 sub_02062948 (const LocalMapObject * param0)
 {
     return param0->unk_14;
 }
 
-void sub_0206294C (UnkStruct_02061AB4 * param0, u32 param1)
+void sub_0206294C (LocalMapObject * param0, u32 param1)
 {
     param0->unk_18 = param1;
 }
 
-u32 sub_02062950 (const UnkStruct_02061AB4 * param0)
+u32 sub_02062950 (const LocalMapObject * param0)
 {
     return param0->unk_18;
 }
 
-void sub_02062954 (UnkStruct_02061AB4 * param0, u32 param1)
+void sub_02062954 (LocalMapObject * param0, u32 param1)
 {
     param0->unk_1C = param1;
 }
 
-u32 sub_02062958 (const UnkStruct_02061AB4 * param0)
+u32 sub_02062958 (const LocalMapObject * param0)
 {
     return param0->unk_1C;
 }
 
-void sub_0206295C (UnkStruct_02061AB4 * param0, u32 param1)
+void sub_0206295C (LocalMapObject * param0, u32 param1)
 {
     param0->unk_20 = param1;
 }
 
-u32 sub_02062960 (const UnkStruct_02061AB4 * param0)
+u32 sub_02062960 (const LocalMapObject * param0)
 {
     return param0->unk_20;
 }
 
-void sub_02062964 (UnkStruct_02061AB4 * param0, int param1)
+void sub_02062964 (LocalMapObject * param0, int param1)
 {
     param0->unk_24 = param1;
 }
 
-u32 sub_02062968 (const UnkStruct_02061AB4 * param0)
+u32 sub_02062968 (const LocalMapObject * param0)
 {
     return param0->unk_24;
 }
 
-void sub_0206296C (UnkStruct_02061AB4 * param0, int param1)
+void sub_0206296C (LocalMapObject * param0, int param1)
 {
     param0->unk_30 = param0->unk_28;
     param0->unk_28 = param1;
 }
 
-void sub_02062974 (UnkStruct_02061AB4 * param0, int param1)
+void sub_02062974 (LocalMapObject * param0, int param1)
 {
     if (sub_020628D0(param0, (1 << 7)) == 0) {
         param0->unk_30 = param0->unk_28;
@@ -1371,34 +1371,34 @@ void sub_02062974 (UnkStruct_02061AB4 * param0, int param1)
     }
 }
 
-int sub_0206298C (const UnkStruct_02061AB4 * param0)
+int sub_0206298C (const LocalMapObject * param0)
 {
     return param0->unk_28;
 }
 
-int sub_02062990 (const UnkStruct_02061AB4 * param0)
+int sub_02062990 (const LocalMapObject * param0)
 {
     return param0->unk_30;
 }
 
-void sub_02062994 (UnkStruct_02061AB4 * param0, int param1)
+void sub_02062994 (LocalMapObject * param0, int param1)
 {
     param0->unk_34 = param0->unk_2C;
     param0->unk_2C = param1;
 }
 
-int sub_0206299C (const UnkStruct_02061AB4 * param0)
+int sub_0206299C (const LocalMapObject * param0)
 {
     return param0->unk_2C;
 }
 
-void sub_020629A0 (UnkStruct_02061AB4 * param0, int param1)
+void sub_020629A0 (LocalMapObject * param0, int param1)
 {
     sub_02062974(param0, param1);
     sub_02062994(param0, param1);
 }
 
-void sub_020629B4 (UnkStruct_02061AB4 * param0, int param1, int param2)
+void sub_020629B4 (LocalMapObject * param0, int param1, int param2)
 {
     switch (param2) {
     case 0:
@@ -1415,7 +1415,7 @@ void sub_020629B4 (UnkStruct_02061AB4 * param0, int param1, int param2)
     }
 }
 
-int sub_020629D8 (const UnkStruct_02061AB4 * param0, int param1)
+int sub_020629D8 (const LocalMapObject * param0, int param1)
 {
     switch (param1) {
     case 0:
@@ -1430,67 +1430,67 @@ int sub_020629D8 (const UnkStruct_02061AB4 * param0, int param1)
     return 0;
 }
 
-void sub_020629FC (UnkStruct_02061AB4 * param0, int param1)
+void sub_020629FC (LocalMapObject * param0, int param1)
 {
     param0->unk_44 = param1;
 }
 
-int sub_02062A00 (const UnkStruct_02061AB4 * param0)
+int sub_02062A00 (const LocalMapObject * param0)
 {
     return param0->unk_44;
 }
 
-void sub_02062A04 (UnkStruct_02061AB4 * param0, int param1)
+void sub_02062A04 (LocalMapObject * param0, int param1)
 {
     param0->unk_48 = param1;
 }
 
-int sub_02062A08 (const UnkStruct_02061AB4 * param0)
+int sub_02062A08 (const LocalMapObject * param0)
 {
     return param0->unk_48;
 }
 
-void sub_02062A0C (UnkStruct_02061AB4 * param0, u32 param1)
+void sub_02062A0C (LocalMapObject * param0, u32 param1)
 {
     param0->unk_A0 = param1;
 }
 
-u32 sub_02062A14 (const UnkStruct_02061AB4 * param0)
+u32 sub_02062A14 (const LocalMapObject * param0)
 {
     return param0->unk_A0;
 }
 
-void sub_02062A1C (UnkStruct_02061AB4 * param0, SysTask * param1)
+void sub_02062A1C (LocalMapObject * param0, SysTask * param1)
 {
     param0->unk_B0 = param1;
 }
 
-SysTask * sub_02062A24 (const UnkStruct_02061AB4 * param0)
+SysTask * sub_02062A24 (const LocalMapObject * param0)
 {
     return param0->unk_B0;
 }
 
-void sub_02062A2C (const UnkStruct_02061AB4 * param0)
+void sub_02062A2C (const LocalMapObject * param0)
 {
     SysTask_Done(sub_02062A24(param0));
 }
 
-void sub_02062A38 (UnkStruct_02061AB4 * param0, const UnkStruct_02061830 * param1)
+void sub_02062A38 (LocalMapObject * param0, const UnkStruct_02061830 * param1)
 {
     param0->unk_B4 = param1;
 }
 
-const UnkStruct_02061830 * sub_02062A40 (const UnkStruct_02061AB4 * param0)
+const UnkStruct_02061830 * sub_02062A40 (const LocalMapObject * param0)
 {
     return param0->unk_B4;
 }
 
-static UnkStruct_02061830 * sub_02062A48 (const UnkStruct_02061AB4 * param0)
+static UnkStruct_02061830 * sub_02062A48 (const LocalMapObject * param0)
 {
     return sub_0206281C(param0->unk_B4);
 }
 
-void * sub_02062A54 (UnkStruct_02061AB4 * param0, int param1)
+void * sub_02062A54 (LocalMapObject * param0, int param1)
 {
     void * v0;
 
@@ -1502,12 +1502,12 @@ void * sub_02062A54 (UnkStruct_02061AB4 * param0, int param1)
     return v0;
 }
 
-void * sub_02062A78 (UnkStruct_02061AB4 * param0)
+void * sub_02062A78 (LocalMapObject * param0)
 {
     return param0->unk_D8;
 }
 
-void * sub_02062A7C (UnkStruct_02061AB4 * param0, int param1)
+void * sub_02062A7C (LocalMapObject * param0, int param1)
 {
     u8 * v0;
 
@@ -1519,12 +1519,12 @@ void * sub_02062A7C (UnkStruct_02061AB4 * param0, int param1)
     return v0;
 }
 
-void * sub_02062AA0 (UnkStruct_02061AB4 * param0)
+void * sub_02062AA0 (LocalMapObject * param0)
 {
     return param0->unk_E8;
 }
 
-void * sub_02062AA4 (UnkStruct_02061AB4 * param0, int param1)
+void * sub_02062AA4 (LocalMapObject * param0, int param1)
 {
     u8 * v0;
 
@@ -1536,12 +1536,12 @@ void * sub_02062AA4 (UnkStruct_02061AB4 * param0, int param1)
     return v0;
 }
 
-void * sub_02062AC8 (UnkStruct_02061AB4 * param0)
+void * sub_02062AC8 (LocalMapObject * param0)
 {
     return param0->unk_F8;
 }
 
-void * sub_02062ACC (UnkStruct_02061AB4 * param0, int param1)
+void * sub_02062ACC (LocalMapObject * param0, int param1)
 {
     u8 * v0;
 
@@ -1553,143 +1553,143 @@ void * sub_02062ACC (UnkStruct_02061AB4 * param0, int param1)
     return v0;
 }
 
-void * sub_02062AF0 (UnkStruct_02061AB4 * param0)
+void * sub_02062AF0 (LocalMapObject * param0)
 {
     return param0->unk_108;
 }
 
-void sub_02062AF8 (UnkStruct_02061AB4 * param0, UnkFuncPtr_020EDF0C param1)
+void sub_02062AF8 (LocalMapObject * param0, UnkFuncPtr_020EDF0C param1)
 {
     param0->unk_B8 = param1;
 }
 
-void sub_02062B00 (UnkStruct_02061AB4 * param0)
+void sub_02062B00 (LocalMapObject * param0)
 {
     param0->unk_B8(param0);
 }
 
-void sub_02062B0C (UnkStruct_02061AB4 * param0, UnkFuncPtr_020EDF0C_1 param1)
+void sub_02062B0C (LocalMapObject * param0, UnkFuncPtr_020EDF0C_1 param1)
 {
     param0->unk_BC = param1;
 }
 
-void sub_02062B14 (UnkStruct_02061AB4 * param0)
+void sub_02062B14 (LocalMapObject * param0)
 {
     param0->unk_BC(param0);
 }
 
-void sub_02062B20 (UnkStruct_02061AB4 * param0, UnkFuncPtr_020EDF0C_2 param1)
+void sub_02062B20 (LocalMapObject * param0, UnkFuncPtr_020EDF0C_2 param1)
 {
     param0->unk_C0 = param1;
 }
 
-void sub_02062B28 (UnkStruct_02061AB4 * param0)
+void sub_02062B28 (LocalMapObject * param0)
 {
     param0->unk_C0(param0);
 }
 
-void sub_02062B34 (UnkStruct_02061AB4 * param0)
+void sub_02062B34 (LocalMapObject * param0)
 {
     const UnkStruct_020EDF0C * v0 = sub_0206320C(sub_02062948(param0));
     v0->unk_10(param0);
 }
 
-void sub_02062B4C (UnkStruct_02061AB4 * param0, UnkFuncPtr_ov5_021FB0F0 param1)
+void sub_02062B4C (LocalMapObject * param0, UnkFuncPtr_ov5_021FB0F0 param1)
 {
     param0->unk_C4 = param1;
 }
 
-void sub_02062B54 (UnkStruct_02061AB4 * param0)
+void sub_02062B54 (LocalMapObject * param0)
 {
     param0->unk_C4(param0);
 }
 
-void sub_02062B60 (UnkStruct_02061AB4 * param0, UnkFuncPtr_ov5_021FB0F0_1 param1)
+void sub_02062B60 (LocalMapObject * param0, UnkFuncPtr_ov5_021FB0F0_1 param1)
 {
     param0->unk_C8 = param1;
 }
 
-void sub_02062B68 (UnkStruct_02061AB4 * param0)
+void sub_02062B68 (LocalMapObject * param0)
 {
     param0->unk_C8(param0);
 }
 
-void sub_02062B74 (UnkStruct_02061AB4 * param0, UnkFuncPtr_ov5_021FB0F0_2 param1)
+void sub_02062B74 (LocalMapObject * param0, UnkFuncPtr_ov5_021FB0F0_2 param1)
 {
     param0->unk_CC = param1;
 }
 
-void sub_02062B7C (UnkStruct_02061AB4 * param0)
+void sub_02062B7C (LocalMapObject * param0)
 {
     param0->unk_CC(param0);
 }
 
-void sub_02062B88 (UnkStruct_02061AB4 * param0, UnkFuncPtr_ov5_021FB0F0_3 param1)
+void sub_02062B88 (LocalMapObject * param0, UnkFuncPtr_ov5_021FB0F0_3 param1)
 {
     param0->unk_D0 = param1;
 }
 
-void sub_02062B90 (UnkStruct_02061AB4 * param0)
+void sub_02062B90 (LocalMapObject * param0)
 {
     param0->unk_D0(param0);
 }
 
-void sub_02062B9C (UnkStruct_02061AB4 * param0, UnkFuncPtr_ov5_021FB0F0_4 param1)
+void sub_02062B9C (LocalMapObject * param0, UnkFuncPtr_ov5_021FB0F0_4 param1)
 {
     param0->unk_D4 = param1;
 }
 
-void sub_02062BA4 (UnkStruct_02061AB4 * param0)
+void sub_02062BA4 (LocalMapObject * param0)
 {
     param0->unk_D4(param0);
 }
 
-void sub_02062BB0 (UnkStruct_02061AB4 * param0, int param1)
+void sub_02062BB0 (LocalMapObject * param0, int param1)
 {
     param0->unk_A4 = param1;
 }
 
-int sub_02062BB8 (const UnkStruct_02061AB4 * param0)
+int sub_02062BB8 (const LocalMapObject * param0)
 {
     return param0->unk_A4;
 }
 
-void sub_02062BC0 (UnkStruct_02061AB4 * param0, int param1)
+void sub_02062BC0 (LocalMapObject * param0, int param1)
 {
     param0->unk_A8 = param1;
 }
 
-void sub_02062BC8 (UnkStruct_02061AB4 * param0)
+void sub_02062BC8 (LocalMapObject * param0)
 {
     param0->unk_A8++;
 }
 
-int sub_02062BD8 (const UnkStruct_02061AB4 * param0)
+int sub_02062BD8 (const LocalMapObject * param0)
 {
     return param0->unk_A8;
 }
 
-void sub_02062BE0 (UnkStruct_02061AB4 * param0, u32 param1)
+void sub_02062BE0 (LocalMapObject * param0, u32 param1)
 {
     param0->unk_AC = param1;
 }
 
-u32 sub_02062BE8 (const UnkStruct_02061AB4 * param0)
+u32 sub_02062BE8 (const LocalMapObject * param0)
 {
     return param0->unk_AC;
 }
 
-void sub_02062BF0 (UnkStruct_02061AB4 * param0, u32 param1)
+void sub_02062BF0 (LocalMapObject * param0, u32 param1)
 {
     param0->unk_AE = param1;
 }
 
-u32 sub_02062BF8 (const UnkStruct_02061AB4 * param0)
+u32 sub_02062BF8 (const LocalMapObject * param0)
 {
     return param0->unk_AE;
 }
 
-FieldSystem * sub_02062C00 (const UnkStruct_02061AB4 * param0)
+FieldSystem * sub_02062C00 (const LocalMapObject * param0)
 {
     UnkStruct_02061830 * v0;
 
@@ -1697,12 +1697,12 @@ FieldSystem * sub_02062C00 (const UnkStruct_02061AB4 * param0)
     return sub_02062894(v0);
 }
 
-int sub_02062C0C (const UnkStruct_02061AB4 * param0)
+int sub_02062C0C (const LocalMapObject * param0)
 {
     return sub_02062858(sub_02062A40(param0));
 }
 
-int sub_02062C18 (const UnkStruct_02061AB4 * param0)
+int sub_02062C18 (const LocalMapObject * param0)
 {
     GF_ASSERT(sub_02062E94(param0) == 1);
     return sub_02062958(param0);
@@ -1721,7 +1721,7 @@ void sub_02062C3C (UnkStruct_02061830 * param0)
 void sub_02062C48 (UnkStruct_02061830 * param0)
 {
     int v0 = sub_02062824(param0);
-    UnkStruct_02061AB4 * v1 = sub_02062878(param0);
+    LocalMapObject * v1 = sub_02062878(param0);
 
     do {
         if (sub_02062CF8(v1)) {
@@ -1736,7 +1736,7 @@ void sub_02062C48 (UnkStruct_02061830 * param0)
 void sub_02062C78 (UnkStruct_02061830 * param0)
 {
     int v0 = sub_02062824(param0);
-    UnkStruct_02061AB4 * v1 = sub_02062878(param0);
+    LocalMapObject * v1 = sub_02062878(param0);
 
     do {
         if (sub_02062CF8(v1)) {
@@ -1757,7 +1757,7 @@ int sub_02062CA8 (const UnkStruct_02061830 * param0)
     return 0;
 }
 
-u32 sub_02062CBC (const UnkStruct_02061AB4 * param0, u32 param1)
+u32 sub_02062CBC (const LocalMapObject * param0, u32 param1)
 {
     const UnkStruct_02061830 * v0 = sub_02062A40(param0);
 
@@ -1782,52 +1782,52 @@ int sub_02062CE4 (const UnkStruct_02061830 * param0)
     return 1;
 }
 
-int sub_02062CF8 (const UnkStruct_02061AB4 * param0)
+int sub_02062CF8 (const LocalMapObject * param0)
 {
     return sub_020628D8(param0, (1 << 0));
 }
 
-void sub_02062D04 (UnkStruct_02061AB4 * param0)
+void sub_02062D04 (LocalMapObject * param0)
 {
     sub_020628BC(param0, (1 << 1));
 }
 
-void sub_02062D10 (UnkStruct_02061AB4 * param0)
+void sub_02062D10 (LocalMapObject * param0)
 {
     sub_020628C4(param0, (1 << 1));
 }
 
-int sub_02062D1C (const UnkStruct_02061AB4 * param0)
+int sub_02062D1C (const LocalMapObject * param0)
 {
     return sub_020628D8(param0, (1 << 1));
 }
 
-void sub_02062D28 (UnkStruct_02061AB4 * param0)
+void sub_02062D28 (LocalMapObject * param0)
 {
     sub_020628BC(param0, (1 << 2));
 }
 
-void sub_02062D34 (UnkStruct_02061AB4 * param0)
+void sub_02062D34 (LocalMapObject * param0)
 {
     sub_020628C4(param0, (1 << 3));
 }
 
-void sub_02062D40 (UnkStruct_02061AB4 * param0)
+void sub_02062D40 (LocalMapObject * param0)
 {
     sub_020628BC(param0, (1 << 14));
 }
 
-int sub_02062D4C (const UnkStruct_02061AB4 * param0)
+int sub_02062D4C (const LocalMapObject * param0)
 {
     return sub_020628D8(param0, (1 << 14));
 }
 
-int sub_02062D58 (const UnkStruct_02061AB4 * param0)
+int sub_02062D58 (const LocalMapObject * param0)
 {
     return sub_020628D8(param0, (1 << 9));
 }
 
-void sub_02062D64 (UnkStruct_02061AB4 * param0, int param1)
+void sub_02062D64 (LocalMapObject * param0, int param1)
 {
     if (param1 == 1) {
         sub_020628BC(param0, (1 << 9));
@@ -1836,7 +1836,7 @@ void sub_02062D64 (UnkStruct_02061AB4 * param0, int param1)
     }
 }
 
-void sub_02062D80 (UnkStruct_02061AB4 * param0, int param1)
+void sub_02062D80 (LocalMapObject * param0, int param1)
 {
     if (param1 == 1) {
         sub_020628C4(param0, (1 << 18));
@@ -1845,7 +1845,7 @@ void sub_02062D80 (UnkStruct_02061AB4 * param0, int param1)
     }
 }
 
-int sub_02062D9C (UnkStruct_02061AB4 * param0)
+int sub_02062D9C (LocalMapObject * param0)
 {
     if (sub_020628D8(param0, (1 << 19)) == 1) {
         return 0;
@@ -1854,7 +1854,7 @@ int sub_02062D9C (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-void sub_02062DB4 (UnkStruct_02061AB4 * param0, int param1)
+void sub_02062DB4 (LocalMapObject * param0, int param1)
 {
     if (param1 == 1) {
         sub_020628BC(param0, (1 << 19));
@@ -1863,17 +1863,17 @@ void sub_02062DB4 (UnkStruct_02061AB4 * param0, int param1)
     }
 }
 
-void sub_02062DD0 (UnkStruct_02061AB4 * param0)
+void sub_02062DD0 (LocalMapObject * param0)
 {
     sub_020628BC(param0, (1 << 6));
 }
 
-void sub_02062DDC (UnkStruct_02061AB4 * param0)
+void sub_02062DDC (LocalMapObject * param0)
 {
     sub_020628C4(param0, (1 << 6));
 }
 
-int sub_02062DE8 (const UnkStruct_02061AB4 * param0)
+int sub_02062DE8 (const LocalMapObject * param0)
 {
     if (sub_020628D8(param0, (1 << 6)) == 1) {
         return 1;
@@ -1882,7 +1882,7 @@ int sub_02062DE8 (const UnkStruct_02061AB4 * param0)
     return 0;
 }
 
-int sub_02062DFC (const UnkStruct_02061AB4 * param0)
+int sub_02062DFC (const LocalMapObject * param0)
 {
     const UnkStruct_02061830 * v0;
 
@@ -1899,7 +1899,7 @@ int sub_02062DFC (const UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-void sub_02062E28 (UnkStruct_02061AB4 * param0, int param1)
+void sub_02062E28 (LocalMapObject * param0, int param1)
 {
     if (param1 == 1) {
         sub_020628BC(param0, (1 << 23));
@@ -1908,7 +1908,7 @@ void sub_02062E28 (UnkStruct_02061AB4 * param0, int param1)
     }
 }
 
-int sub_02062E44 (const UnkStruct_02061AB4 * param0)
+int sub_02062E44 (const LocalMapObject * param0)
 {
     if (sub_020628D0(param0, (1 << 23))) {
         return 1;
@@ -1917,7 +1917,7 @@ int sub_02062E44 (const UnkStruct_02061AB4 * param0)
     return 0;
 }
 
-void sub_02062E5C (UnkStruct_02061AB4 * param0, int param1)
+void sub_02062E5C (LocalMapObject * param0, int param1)
 {
     if (param1 == 1) {
         sub_020628BC(param0, (1 << 10));
@@ -1926,7 +1926,7 @@ void sub_02062E5C (UnkStruct_02061AB4 * param0, int param1)
     }
 }
 
-void sub_02062E78 (UnkStruct_02061AB4 * param0, int param1)
+void sub_02062E78 (LocalMapObject * param0, int param1)
 {
     if (param1 == 1) {
         sub_020628BC(param0, (1 << 25));
@@ -1935,7 +1935,7 @@ void sub_02062E78 (UnkStruct_02061AB4 * param0, int param1)
     }
 }
 
-int sub_02062E94 (const UnkStruct_02061AB4 * param0)
+int sub_02062E94 (const LocalMapObject * param0)
 {
     if (sub_020628D0(param0, (1 << 25))) {
         return 1;
@@ -1944,7 +1944,7 @@ int sub_02062E94 (const UnkStruct_02061AB4 * param0)
     return 0;
 }
 
-void sub_02062EAC (UnkStruct_02061AB4 * param0, int param1)
+void sub_02062EAC (LocalMapObject * param0, int param1)
 {
     if (param1 == 1) {
         sub_020628BC(param0, (1 << 26));
@@ -1953,7 +1953,7 @@ void sub_02062EAC (UnkStruct_02061AB4 * param0, int param1)
     }
 }
 
-int sub_02062EC8 (const UnkStruct_02061AB4 * param0)
+int sub_02062EC8 (const LocalMapObject * param0)
 {
     if (sub_020628D0(param0, (1 << 26))) {
         return 1;
@@ -1962,7 +1962,7 @@ int sub_02062EC8 (const UnkStruct_02061AB4 * param0)
     return 0;
 }
 
-void sub_02062EE0 (UnkStruct_02061AB4 * param0, int param1)
+void sub_02062EE0 (LocalMapObject * param0, int param1)
 {
     if (param1 == 1) {
         sub_020628BC(param0, (1 << 27));
@@ -1971,7 +1971,7 @@ void sub_02062EE0 (UnkStruct_02061AB4 * param0, int param1)
     }
 }
 
-int sub_02062EFC (const UnkStruct_02061AB4 * param0)
+int sub_02062EFC (const LocalMapObject * param0)
 {
     if (sub_020628D0(param0, (1 << 27))) {
         return 1;
@@ -1980,7 +1980,7 @@ int sub_02062EFC (const UnkStruct_02061AB4 * param0)
     return 0;
 }
 
-void sub_02062F14 (UnkStruct_02061AB4 * param0, int param1)
+void sub_02062F14 (LocalMapObject * param0, int param1)
 {
     if (param1 == 1) {
         sub_020628BC(param0, (1 << 28));
@@ -1989,7 +1989,7 @@ void sub_02062F14 (UnkStruct_02061AB4 * param0, int param1)
     }
 }
 
-int sub_02062F30 (const UnkStruct_02061AB4 * param0)
+int sub_02062F30 (const LocalMapObject * param0)
 {
     if (sub_020628D0(param0, (1 << 28))) {
         return 1;
@@ -1998,7 +1998,7 @@ int sub_02062F30 (const UnkStruct_02061AB4 * param0)
     return 0;
 }
 
-void sub_02062F48 (UnkStruct_02061AB4 * param0, int param1)
+void sub_02062F48 (LocalMapObject * param0, int param1)
 {
     if (param1 == 1) {
         sub_020628BC(param0, (1 << 24));
@@ -2007,7 +2007,7 @@ void sub_02062F48 (UnkStruct_02061AB4 * param0, int param1)
     }
 }
 
-int sub_02062F64 (const UnkStruct_02061AB4 * param0)
+int sub_02062F64 (const LocalMapObject * param0)
 {
     if (sub_020628D0(param0, (1 << 24))) {
         return 1;
@@ -2016,7 +2016,7 @@ int sub_02062F64 (const UnkStruct_02061AB4 * param0)
     return 0;
 }
 
-int sub_02062F7C (const UnkStruct_02061AB4 * param0)
+int sub_02062F7C (const LocalMapObject * param0)
 {
     if (sub_020628D0(param0, (1 << 4))) {
         return 1;
@@ -2025,7 +2025,7 @@ int sub_02062F7C (const UnkStruct_02061AB4 * param0)
     return 0;
 }
 
-void sub_02062F90 (UnkStruct_02061AB4 * param0, int param1)
+void sub_02062F90 (LocalMapObject * param0, int param1)
 {
     if (param1 == 1) {
         sub_020628BC(param0, (1 << 29));
@@ -2034,7 +2034,7 @@ void sub_02062F90 (UnkStruct_02061AB4 * param0, int param1)
     }
 }
 
-int sub_02062FAC (const UnkStruct_02061AB4 * param0)
+int sub_02062FAC (const LocalMapObject * param0)
 {
     if (sub_020628D0(param0, (1 << 29))) {
         return 1;
@@ -2043,7 +2043,7 @@ int sub_02062FAC (const UnkStruct_02061AB4 * param0)
     return 0;
 }
 
-void sub_02062FC4 (UnkStruct_02061AB4 * param0, int param1)
+void sub_02062FC4 (LocalMapObject * param0, int param1)
 {
     if (param1 == 1) {
         sub_020628F0(param0, (1 << 2));
@@ -2052,7 +2052,7 @@ void sub_02062FC4 (UnkStruct_02061AB4 * param0, int param1)
     }
 }
 
-int sub_02062FDC (const UnkStruct_02061AB4 * param0)
+int sub_02062FDC (const LocalMapObject * param0)
 {
     if (sub_02062904(param0, (1 << 2))) {
         return 1;
@@ -2061,167 +2061,167 @@ int sub_02062FDC (const UnkStruct_02061AB4 * param0)
     return 0;
 }
 
-int sub_02062FF0 (const UnkStruct_02061AB4 * param0)
+int sub_02062FF0 (const LocalMapObject * param0)
 {
     return param0->unk_4C;
 }
 
-void sub_02062FF4 (UnkStruct_02061AB4 * param0, int param1)
+void sub_02062FF4 (LocalMapObject * param0, int param1)
 {
     param0->unk_4C = param1;
 }
 
-int sub_02062FF8 (const UnkStruct_02061AB4 * param0)
+int sub_02062FF8 (const LocalMapObject * param0)
 {
     return param0->unk_50;
 }
 
-void sub_02062FFC (UnkStruct_02061AB4 * param0, int param1)
+void sub_02062FFC (LocalMapObject * param0, int param1)
 {
     param0->unk_50 = param1;
 }
 
-int sub_02063000 (const UnkStruct_02061AB4 * param0)
+int sub_02063000 (const LocalMapObject * param0)
 {
     return param0->unk_54;
 }
 
-void sub_02063004 (UnkStruct_02061AB4 * param0, int param1)
+void sub_02063004 (LocalMapObject * param0, int param1)
 {
     param0->unk_54 = param1;
 }
 
-int sub_02063008 (const UnkStruct_02061AB4 * param0)
+int sub_02063008 (const LocalMapObject * param0)
 {
     return param0->unk_58;
 }
 
-void sub_0206300C (UnkStruct_02061AB4 * param0, int param1)
+void sub_0206300C (LocalMapObject * param0, int param1)
 {
     param0->unk_58 = param1;
 }
 
-int sub_02063010 (const UnkStruct_02061AB4 * param0)
+int sub_02063010 (const LocalMapObject * param0)
 {
     return param0->unk_5C;
 }
 
-void sub_02063014 (UnkStruct_02061AB4 * param0, int param1)
+void sub_02063014 (LocalMapObject * param0, int param1)
 {
     param0->unk_5C = param1;
 }
 
-int sub_02063018 (const UnkStruct_02061AB4 * param0)
+int sub_02063018 (const LocalMapObject * param0)
 {
     return param0->unk_60;
 }
 
-void sub_0206301C (UnkStruct_02061AB4 * param0, int param1)
+void sub_0206301C (LocalMapObject * param0, int param1)
 {
     param0->unk_60 = param1;
 }
 
-int sub_02063020 (const UnkStruct_02061AB4 * param0)
+int sub_02063020 (const LocalMapObject * param0)
 {
     return param0->unk_64;
 }
 
-void sub_02063024 (UnkStruct_02061AB4 * param0, int param1)
+void LocalMapObj_SetX (LocalMapObject * param0, int param1)
 {
     param0->unk_64 = param1;
 }
 
-void sub_02063028 (UnkStruct_02061AB4 * param0, int param1)
+void sub_02063028 (LocalMapObject * param0, int param1)
 {
     param0->unk_64 += param1;
 }
 
-int sub_02063030 (const UnkStruct_02061AB4 * param0)
+int sub_02063030 (const LocalMapObject * param0)
 {
     return param0->unk_68;
 }
 
-void sub_02063034 (UnkStruct_02061AB4 * param0, int param1)
+void sub_02063034 (LocalMapObject * param0, int param1)
 {
     param0->unk_68 = param1;
 }
 
-void sub_02063038 (UnkStruct_02061AB4 * param0, int param1)
+void sub_02063038 (LocalMapObject * param0, int param1)
 {
     param0->unk_68 += param1;
 }
 
-int sub_02063040 (const UnkStruct_02061AB4 * param0)
+int sub_02063040 (const LocalMapObject * param0)
 {
     return param0->unk_6C;
 }
 
-void sub_02063044 (UnkStruct_02061AB4 * param0, int param1)
+void LocalMapObj_SetZ (LocalMapObject * param0, int param1)
 {
     param0->unk_6C = param1;
 }
 
-void sub_02063048 (UnkStruct_02061AB4 * param0, int param1)
+void sub_02063048 (LocalMapObject * param0, int param1)
 {
     param0->unk_6C += param1;
 }
 
-void sub_02063050 (const UnkStruct_02061AB4 * param0, VecFx32 * param1)
+void sub_02063050 (const LocalMapObject * param0, VecFx32 * param1)
 {
     *param1 = param0->unk_70;
 }
 
-void sub_02063060 (UnkStruct_02061AB4 * param0, const VecFx32 * param1)
+void sub_02063060 (LocalMapObject * param0, const VecFx32 * param1)
 {
     param0->unk_70 = *param1;
 }
 
-const VecFx32 * sub_02063070 (const UnkStruct_02061AB4 * param0)
+const VecFx32 * sub_02063070 (const LocalMapObject * param0)
 {
     return &param0->unk_70;
 }
 
-fx32 sub_02063074 (const UnkStruct_02061AB4 * param0)
+fx32 sub_02063074 (const LocalMapObject * param0)
 {
     return param0->unk_70.y;
 }
 
-void sub_02063078 (const UnkStruct_02061AB4 * param0, VecFx32 * param1)
+void sub_02063078 (const LocalMapObject * param0, VecFx32 * param1)
 {
     *param1 = param0->unk_7C;
 }
 
-void sub_02063088 (UnkStruct_02061AB4 * param0, const VecFx32 * param1)
+void sub_02063088 (LocalMapObject * param0, const VecFx32 * param1)
 {
     param0->unk_7C = *param1;
 }
 
-VecFx32 * sub_02063098 (UnkStruct_02061AB4 * param0)
+VecFx32 * sub_02063098 (LocalMapObject * param0)
 {
     return &param0->unk_7C;
 }
 
-void sub_0206309C (const UnkStruct_02061AB4 * param0, VecFx32 * param1)
+void sub_0206309C (const LocalMapObject * param0, VecFx32 * param1)
 {
     *param1 = param0->unk_88;
 }
 
-void sub_020630AC (UnkStruct_02061AB4 * param0, const VecFx32 * param1)
+void sub_020630AC (LocalMapObject * param0, const VecFx32 * param1)
 {
     param0->unk_88 = *param1;
 }
 
-void sub_020630BC (const UnkStruct_02061AB4 * param0, VecFx32 * param1)
+void sub_020630BC (const LocalMapObject * param0, VecFx32 * param1)
 {
     *param1 = param0->unk_94;
 }
 
-void sub_020630CC (UnkStruct_02061AB4 * param0, const VecFx32 * param1)
+void sub_020630CC (LocalMapObject * param0, const VecFx32 * param1)
 {
     param0->unk_94 = *param1;
 }
 
-int sub_020630DC (const UnkStruct_02061AB4 * param0)
+int sub_020630DC (const LocalMapObject * param0)
 {
     fx32 v0 = sub_02063074(param0);
     int v1 = (((v0) >> 3) / FX32_ONE);
@@ -2476,10 +2476,10 @@ static const UnkStruct_ov5_021FB0F0 * sub_02063244 (u32 param0)
     return NULL;
 }
 
-UnkStruct_02061AB4 * sub_0206326C (const UnkStruct_02061830 * param0, int param1, int param2, int param3)
+LocalMapObject * sub_0206326C (const UnkStruct_02061830 * param0, int param1, int param2, int param3)
 {
     int v0;
-    UnkStruct_02061AB4 * v1;
+    LocalMapObject * v1;
 
     v0 = sub_02062824(param0);
     v1 = sub_02062878(param0);
@@ -2504,18 +2504,18 @@ UnkStruct_02061AB4 * sub_0206326C (const UnkStruct_02061830 * param0, int param1
     return NULL;
 }
 
-void sub_020632D4 (UnkStruct_02061AB4 * param0, const VecFx32 * param1, int param2)
+void sub_020632D4 (LocalMapObject * param0, const VecFx32 * param1, int param2)
 {
     int v0, v1, v2;
 
     v0 = (((param1->x) >> 4) / FX32_ONE);
-    sub_02063024(param0, v0);
+    LocalMapObj_SetX(param0, v0);
 
     v1 = (((param1->y) >> 3) / FX32_ONE);
     sub_02063034(param0, v1);
 
     v2 = (((param1->z) >> 4) / FX32_ONE);
-    sub_02063044(param0, v2);
+    LocalMapObj_SetZ(param0, v2);
 
     sub_02063060(param0, param1);
     sub_02064208(param0);
@@ -2527,18 +2527,18 @@ void sub_020632D4 (UnkStruct_02061AB4 * param0, const VecFx32 * param1, int para
     sub_020628C4(param0, (1 << 1) | (1 << 3));
 }
 
-void sub_02063340 (UnkStruct_02061AB4 * param0, int param1, int param2, int param3, int param4)
+void LocalMapObj_SetPosDir (LocalMapObject * param0, int param1, int param2, int param3, int param4)
 {
     VecFx32 v0;
 
     v0.x = (((param1) << 4) * FX32_ONE) + (((16 * FX32_ONE) >> 1));
-    sub_02063024(param0, param1);
+    LocalMapObj_SetX(param0, param1);
 
     v0.y = (((param2) << 3) * FX32_ONE) + 0;
     sub_02063034(param0, param2);
 
     v0.z = (((param3) << 4) * FX32_ONE) + (((16 * FX32_ONE) >> 1));
-    sub_02063044(param0, param3);
+    LocalMapObj_SetZ(param0, param3);
 
     sub_02063060(param0, &v0);
     sub_02064208(param0);
@@ -2551,7 +2551,7 @@ void sub_02063340 (UnkStruct_02061AB4 * param0, int param1, int param2, int para
     sub_020656DC(param0);
 }
 
-void sub_020633A8 (UnkStruct_02061AB4 * param0, u32 param1)
+void sub_020633A8 (LocalMapObject * param0, u32 param1)
 {
     sub_02062B28(param0);
     sub_02062944(param0, param1);
@@ -2559,7 +2559,7 @@ void sub_020633A8 (UnkStruct_02061AB4 * param0, u32 param1)
     sub_02063400(param0);
 }
 
-void sub_020633C8 (UnkStruct_02061AB4 * param0, int param1)
+void sub_020633C8 (LocalMapObject * param0, int param1)
 {
     sub_0206290C(param0, param1);
 
@@ -2567,42 +2567,42 @@ void sub_020633C8 (UnkStruct_02061AB4 * param0, int param1)
     sub_02062618(param0);
 }
 
-void sub_020633E0 (UnkStruct_02061AB4 * param0)
+void sub_020633E0 (LocalMapObject * param0)
 {
     return;
 }
 
-void sub_020633E4 (UnkStruct_02061AB4 * param0)
+void sub_020633E4 (LocalMapObject * param0)
 {
     return;
 }
 
-void sub_020633E8 (UnkStruct_02061AB4 * param0)
+void sub_020633E8 (LocalMapObject * param0)
 {
     return;
 }
 
-void sub_020633EC (UnkStruct_02061AB4 * param0)
+void sub_020633EC (LocalMapObject * param0)
 {
     return;
 }
 
-void sub_020633F0 (UnkStruct_02061AB4 * param0)
+void sub_020633F0 (LocalMapObject * param0)
 {
     return;
 }
 
-void sub_020633F4 (UnkStruct_02061AB4 * param0)
+void sub_020633F4 (LocalMapObject * param0)
 {
     return;
 }
 
-void sub_020633F8 (UnkStruct_02061AB4 * param0)
+void sub_020633F8 (LocalMapObject * param0)
 {
     return;
 }
 
-void sub_020633FC (UnkStruct_02061AB4 * param0)
+void sub_020633FC (LocalMapObject * param0)
 {
     return;
 }
diff --git a/src/unk_02063400.c b/src/unk_02063400.c
index 4995f01799..52fe9a1b8f 100644
--- a/src/unk_02063400.c
+++ b/src/unk_02063400.c
@@ -25,50 +25,50 @@
 #include "overlay005/ov5_021F37A8.h"
 #include "overlay005/ov5_021F3A50.h"
 
-static int sub_02063478(const UnkStruct_02061AB4 * param0);
-static void sub_020634DC(UnkStruct_02061AB4 * param0);
-static void sub_020634F4(UnkStruct_02061AB4 * param0);
-static void sub_02063518(UnkStruct_02061AB4 * param0);
-static void sub_0206353C(UnkStruct_02061AB4 * param0);
-static void sub_02063574(UnkStruct_02061AB4 * param0);
-static void sub_020635AC(UnkStruct_02061AB4 * param0);
-static void sub_0206363C(UnkStruct_02061AB4 * param0);
-static void sub_020636F0(UnkStruct_02061AB4 * param0);
-static void sub_0206375C(UnkStruct_02061AB4 * param0);
-static void sub_020637D4(UnkStruct_02061AB4 * param0);
-static void sub_02063864(UnkStruct_02061AB4 * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3);
-static void sub_02063964(UnkStruct_02061AB4 * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3);
-static void sub_0206397C(UnkStruct_02061AB4 * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3);
-static void sub_02063994(UnkStruct_02061AB4 * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3);
-static void sub_02063A30(UnkStruct_02061AB4 * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3);
-static void sub_02063A64(UnkStruct_02061AB4 * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3);
-static void sub_02063A70(UnkStruct_02061AB4 * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3);
-static void sub_02063A78(UnkStruct_02061AB4 * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3);
-static void sub_02063B20(UnkStruct_02061AB4 * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3);
-static void sub_02063BB4(UnkStruct_02061AB4 * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3);
-static void sub_02063C00(UnkStruct_02061AB4 * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3);
-static void sub_02063C18(UnkStruct_02061AB4 * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3);
-static void sub_02063C30(UnkStruct_02061AB4 * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3);
-static void sub_02063C48(UnkStruct_02061AB4 * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3);
-static void sub_02063C60(UnkStruct_02061AB4 * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3);
-static void sub_02063C94(UnkStruct_02061AB4 * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3);
-static void sub_02063CC8(UnkStruct_02061AB4 * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3);
-static void sub_02063CFC(UnkStruct_02061AB4 * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3);
-static void sub_02063D30(UnkStruct_02061AB4 * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3);
-static void sub_02063DA8(UnkStruct_02061AB4 * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3);
-static void sub_02063DDC(UnkStruct_02061AB4 * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3);
-static void sub_02063E14(UnkStruct_02061AB4 * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3);
+static int sub_02063478(const LocalMapObject * param0);
+static void sub_020634DC(LocalMapObject * param0);
+static void sub_020634F4(LocalMapObject * param0);
+static void sub_02063518(LocalMapObject * param0);
+static void sub_0206353C(LocalMapObject * param0);
+static void sub_02063574(LocalMapObject * param0);
+static void sub_020635AC(LocalMapObject * param0);
+static void sub_0206363C(LocalMapObject * param0);
+static void sub_020636F0(LocalMapObject * param0);
+static void sub_0206375C(LocalMapObject * param0);
+static void sub_020637D4(LocalMapObject * param0);
+static void sub_02063864(LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3);
+static void sub_02063964(LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3);
+static void sub_0206397C(LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3);
+static void sub_02063994(LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3);
+static void sub_02063A30(LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3);
+static void sub_02063A64(LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3);
+static void sub_02063A70(LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3);
+static void sub_02063A78(LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3);
+static void sub_02063B20(LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3);
+static void sub_02063BB4(LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3);
+static void sub_02063C00(LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3);
+static void sub_02063C18(LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3);
+static void sub_02063C30(LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3);
+static void sub_02063C48(LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3);
+static void sub_02063C60(LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3);
+static void sub_02063C94(LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3);
+static void sub_02063CC8(LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3);
+static void sub_02063CFC(LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3);
+static void sub_02063D30(LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3);
+static void sub_02063DA8(LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3);
+static void sub_02063DDC(LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3);
+static void sub_02063E14(LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3);
 
 static BOOL(*const Unk_020EE76C[4])(u8);
 static BOOL(*const Unk_020EE77C[4])(u8);
 
-void sub_02063400 (UnkStruct_02061AB4 * param0)
+void sub_02063400 (LocalMapObject * param0)
 {
     sub_02062B00(param0);
     sub_020673B8(param0);
 }
 
-void sub_02063410 (UnkStruct_02061AB4 * param0)
+void sub_02063410 (LocalMapObject * param0)
 {
     if (sub_02062CBC(param0, (1 << 1))) {
         return;
@@ -92,7 +92,7 @@ void sub_02063410 (UnkStruct_02061AB4 * param0)
     sub_02063574(param0);
 }
 
-static int sub_02063478 (const UnkStruct_02061AB4 * param0)
+static int sub_02063478 (const LocalMapObject * param0)
 {
     if (sub_02062D1C(param0) == 1) {
         return 1;
@@ -119,14 +119,14 @@ static int sub_02063478 (const UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static void sub_020634DC (UnkStruct_02061AB4 * param0)
+static void sub_020634DC (LocalMapObject * param0)
 {
     if (sub_020628D0(param0, (1 << 12))) {
         sub_020642F8(param0);
     }
 }
 
-static void sub_020634F4 (UnkStruct_02061AB4 * param0)
+static void sub_020634F4 (LocalMapObject * param0)
 {
     if (sub_020628D0(param0, (1 << 11))) {
         if (sub_02064390(param0) == 1) {
@@ -135,7 +135,7 @@ static void sub_020634F4 (UnkStruct_02061AB4 * param0)
     }
 }
 
-static void sub_02063518 (UnkStruct_02061AB4 * param0)
+static void sub_02063518 (LocalMapObject * param0)
 {
     if (sub_020628D0(param0, (1 << 2))) {
         sub_020635AC(param0);
@@ -144,7 +144,7 @@ static void sub_02063518 (UnkStruct_02061AB4 * param0)
     sub_020628C4(param0, (1 << 2) | (1 << 16));
 }
 
-static void sub_0206353C (UnkStruct_02061AB4 * param0)
+static void sub_0206353C (LocalMapObject * param0)
 {
     if (sub_020628D0(param0, (1 << 16))) {
         sub_020636F0(param0);
@@ -155,7 +155,7 @@ static void sub_0206353C (UnkStruct_02061AB4 * param0)
     sub_020628C4(param0, (1 << 2) | (1 << 16));
 }
 
-static void sub_02063574 (UnkStruct_02061AB4 * param0)
+static void sub_02063574 (LocalMapObject * param0)
 {
     if (sub_020628D0(param0, (1 << 17))) {
         sub_020637D4(param0);
@@ -166,7 +166,7 @@ static void sub_02063574 (UnkStruct_02061AB4 * param0)
     sub_020628C4(param0, (1 << 3) | (1 << 17));
 }
 
-static void sub_020635AC (UnkStruct_02061AB4 * param0)
+static void sub_020635AC (LocalMapObject * param0)
 {
     sub_02064390(param0);
 
@@ -186,7 +186,7 @@ static void sub_020635AC (UnkStruct_02061AB4 * param0)
     }
 }
 
-static void sub_0206363C (UnkStruct_02061AB4 * param0)
+static void sub_0206363C (LocalMapObject * param0)
 {
     sub_02064390(param0);
 
@@ -210,7 +210,7 @@ static void sub_0206363C (UnkStruct_02061AB4 * param0)
     }
 }
 
-static void sub_020636F0 (UnkStruct_02061AB4 * param0)
+static void sub_020636F0 (LocalMapObject * param0)
 {
     sub_02064390(param0);
 
@@ -227,7 +227,7 @@ static void sub_020636F0 (UnkStruct_02061AB4 * param0)
     }
 }
 
-static void sub_0206375C (UnkStruct_02061AB4 * param0)
+static void sub_0206375C (LocalMapObject * param0)
 {
     sub_02064390(param0);
 
@@ -245,7 +245,7 @@ static void sub_0206375C (UnkStruct_02061AB4 * param0)
     }
 }
 
-static void sub_020637D4 (UnkStruct_02061AB4 * param0)
+static void sub_020637D4 (LocalMapObject * param0)
 {
     sub_02064390(param0);
 
@@ -265,7 +265,7 @@ static void sub_020637D4 (UnkStruct_02061AB4 * param0)
     }
 }
 
-static void sub_02063864 (UnkStruct_02061AB4 * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
+static void sub_02063864 (LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
 {
     if (sub_02062EFC(param0) == 0) {
         if ((sub_0205DCF0(param1) == 1) || (sub_0205DD0C(param1) == 1)) {
@@ -310,21 +310,21 @@ static void sub_02063864 (UnkStruct_02061AB4 * param0, u8 param1, u8 param2, con
     }
 }
 
-static void sub_02063964 (UnkStruct_02061AB4 * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
+static void sub_02063964 (LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
 {
     if (sub_0205DAC8(param1) == 1) {
         ov5_021F2EA4(param0, 0);
     }
 }
 
-static void sub_0206397C (UnkStruct_02061AB4 * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
+static void sub_0206397C (LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
 {
     if (sub_0205DAC8(param1) == 1) {
         ov5_021F2EA4(param0, 1);
     }
 }
 
-static void sub_02063994 (UnkStruct_02061AB4 * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
+static void sub_02063994 (LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
 {
     if (param3->unk_04_6 == 0) {
         return;
@@ -358,7 +358,7 @@ static void sub_02063994 (UnkStruct_02061AB4 * param0, u8 param1, u8 param2, con
     }
 }
 
-static void sub_02063A30 (UnkStruct_02061AB4 * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
+static void sub_02063A30 (LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
 {
     if (sub_0205DB78(param1) == 1) {
         if (sub_02062EC8(param0) == 0) {
@@ -370,17 +370,17 @@ static void sub_02063A30 (UnkStruct_02061AB4 * param0, u8 param1, u8 param2, con
     }
 }
 
-static void sub_02063A64 (UnkStruct_02061AB4 * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
+static void sub_02063A64 (LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
 {
     sub_02062EAC(param0, 0);
 }
 
-static void sub_02063A70 (UnkStruct_02061AB4 * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
+static void sub_02063A70 (LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
 {
     sub_02063A78(param0, param1, param2, param3);
 }
 
-static void sub_02063A78 (UnkStruct_02061AB4 * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
+static void sub_02063A78 (LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
 {
     {
         const UnkStruct_02061830 * v0 = sub_02062A40(param0);
@@ -404,7 +404,7 @@ static void sub_02063A78 (UnkStruct_02061AB4 * param0, u8 param1, u8 param2, con
     }
 }
 
-static void sub_02063B20 (UnkStruct_02061AB4 * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
+static void sub_02063B20 (LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
 {
     {
         const UnkStruct_02061830 * v0 = sub_02062A40(param0);
@@ -425,7 +425,7 @@ static void sub_02063B20 (UnkStruct_02061AB4 * param0, u8 param1, u8 param2, con
     }
 }
 
-static void sub_02063BB4 (UnkStruct_02061AB4 * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
+static void sub_02063BB4 (LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
 {
     if ((sub_0206406C(param0, param1) == 1) || (sub_0205DB78(param1) == 1) || (sub_0205DC5C(param1) == 1) || (sub_0205DCE0(param1) == 1) || (sub_0205DCFC(param1) == 1) || (sub_020640D4(param0, param1) == 1)) {
         return;
@@ -434,63 +434,63 @@ static void sub_02063BB4 (UnkStruct_02061AB4 * param0, u8 param1, u8 param2, con
     ov5_021F3638(param0);
 }
 
-static void sub_02063C00 (UnkStruct_02061AB4 * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
+static void sub_02063C00 (LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
 {
     if (sub_0205DAD4(param1) == 1) {
         ov5_021F3844(param0, 0);
     }
 }
 
-static void sub_02063C18 (UnkStruct_02061AB4 * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
+static void sub_02063C18 (LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
 {
     if (sub_0205DAD4(param1) == 1) {
         ov5_021F3844(param0, 1);
     }
 }
 
-static void sub_02063C30 (UnkStruct_02061AB4 * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
+static void sub_02063C30 (LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
 {
     if (sub_0205DCFC(param1) == 1) {
         ov5_021F3AEC(param0, 0);
     }
 }
 
-static void sub_02063C48 (UnkStruct_02061AB4 * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
+static void sub_02063C48 (LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
 {
     if (sub_0205DCFC(param1) == 1) {
         ov5_021F3AEC(param0, 1);
     }
 }
 
-static void sub_02063C60 (UnkStruct_02061AB4 * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
+static void sub_02063C60 (LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
 {
     if (sub_0205DE5C(param2) == 1) {
         ov5_021F2AE4(param0, sub_02063008(param0), sub_02063010(param0), sub_02063018(param0));
     }
 }
 
-static void sub_02063C94 (UnkStruct_02061AB4 * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
+static void sub_02063C94 (LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
 {
     if (sub_0205DE5C(param1) == 1) {
         ov5_021F2AE4(param0, sub_02063020(param0), sub_02063030(param0), sub_02063040(param0));
     }
 }
 
-static void sub_02063CC8 (UnkStruct_02061AB4 * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
+static void sub_02063CC8 (LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
 {
     if (sub_0205DCE0(param2) == 1) {
         ov5_021F2C38(param0, sub_02063008(param0), sub_02063010(param0), sub_02063018(param0));
     }
 }
 
-static void sub_02063CFC (UnkStruct_02061AB4 * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
+static void sub_02063CFC (LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
 {
     if (sub_0205DCE0(param1) == 1) {
         ov5_021F2C38(param0, sub_02063020(param0), sub_02063030(param0), sub_02063040(param0));
     }
 }
 
-static void sub_02063D30 (UnkStruct_02061AB4 * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
+static void sub_02063D30 (LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
 {
     if (param3->unk_04_10 == 0) {
         return;
@@ -529,7 +529,7 @@ static void sub_02063D30 (UnkStruct_02061AB4 * param0, u8 param1, u8 param2, con
     }
 }
 
-static void sub_02063DA8 (UnkStruct_02061AB4 * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
+static void sub_02063DA8 (LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
 {
     if ((param3->unk_04_10 == 0) || (sub_02062F64(param0) == 0)) {
         return;
@@ -544,7 +544,7 @@ static void sub_02063DA8 (UnkStruct_02061AB4 * param0, u8 param1, u8 param2, con
     }
 }
 
-static void sub_02063DDC (UnkStruct_02061AB4 * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
+static void sub_02063DDC (LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
 {
     if (sub_0205DEF0(param1) == 1) {
         sub_02062F14(param0, 1);
@@ -555,12 +555,12 @@ static void sub_02063DDC (UnkStruct_02061AB4 * param0, u8 param1, u8 param2, con
     }
 }
 
-static void sub_02063E14 (UnkStruct_02061AB4 * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
+static void sub_02063E14 (LocalMapObject * param0, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 * param3)
 {
     return;
 }
 
-u32 sub_02063E18 (const UnkStruct_02061AB4 * param0, const VecFx32 * param1, int param2, int param3, int param4, int param5)
+u32 sub_02063E18 (const LocalMapObject * param0, const VecFx32 * param1, int param2, int param3, int param4, int param5)
 {
     u32 v0;
 
@@ -594,7 +594,7 @@ u32 sub_02063E18 (const UnkStruct_02061AB4 * param0, const VecFx32 * param1, int
     return v0;
 }
 
-u32 sub_02063E94 (const UnkStruct_02061AB4 * param0, int param1, int param2, int param3, int param4)
+u32 sub_02063E94 (const LocalMapObject * param0, int param1, int param2, int param3, int param4)
 {
     VecFx32 v0;
 
@@ -602,7 +602,7 @@ u32 sub_02063E94 (const UnkStruct_02061AB4 * param0, int param1, int param2, int
     return sub_02063E18(param0, &v0, param1, param2, param3, param4);
 }
 
-u32 sub_02063EBC (const UnkStruct_02061AB4 * param0, int param1)
+u32 sub_02063EBC (const LocalMapObject * param0, int param1)
 {
     int v0, v1, v2;
 
@@ -613,11 +613,11 @@ u32 sub_02063EBC (const UnkStruct_02061AB4 * param0, int param1)
     return sub_02063E94(param0, v0, v1, v2, param1);
 }
 
-int sub_02063F00 (const UnkStruct_02061AB4 * param0, int param1, int param2, int param3)
+int sub_02063F00 (const LocalMapObject * param0, int param1, int param2, int param3)
 {
     int v0, v1, v2;
     const UnkStruct_02061830 * v3;
-    const UnkStruct_02061AB4 * v4;
+    const LocalMapObject * v4;
 
     v3 = sub_02062A40(param0);
     v4 = sub_02062868(v3);
@@ -669,7 +669,7 @@ int sub_02063F00 (const UnkStruct_02061AB4 * param0, int param1, int param2, int
     return 0;
 }
 
-int sub_02063FAC (const UnkStruct_02061AB4 * param0, int param1, int param2, int param3)
+int sub_02063FAC (const LocalMapObject * param0, int param1, int param2, int param3)
 {
     int v0, v1, v2, v3;
 
@@ -700,7 +700,7 @@ int sub_02063FAC (const UnkStruct_02061AB4 * param0, int param1, int param2, int
     return 0;
 }
 
-int sub_02064004 (const UnkStruct_02061AB4 * param0, int param1, int param2, int param3)
+int sub_02064004 (const LocalMapObject * param0, int param1, int param2, int param3)
 {
     if (sub_02062FDC(param0) == 0) {
         FieldSystem * v0 = sub_02062C00(param0);
@@ -733,7 +733,7 @@ static BOOL(*const Unk_020EE77C[4])(u8) = {
     sub_0205DE14
 };
 
-int sub_0206406C (UnkStruct_02061AB4 * param0, u32 param1)
+int sub_0206406C (LocalMapObject * param0, u32 param1)
 {
     if (sub_0205DF10(param1)) {
         if (sub_02062F30(param0) == 0) {
@@ -746,7 +746,7 @@ int sub_0206406C (UnkStruct_02061AB4 * param0, u32 param1)
     return 0;
 }
 
-int sub_020640A0 (UnkStruct_02061AB4 * param0, u32 param1)
+int sub_020640A0 (LocalMapObject * param0, u32 param1)
 {
     if (sub_0205DF34(param1)) {
         if (sub_02062F30(param0) == 0) {
@@ -759,7 +759,7 @@ int sub_020640A0 (UnkStruct_02061AB4 * param0, u32 param1)
     return 0;
 }
 
-int sub_020640D4 (UnkStruct_02061AB4 * param0, u32 param1)
+int sub_020640D4 (LocalMapObject * param0, u32 param1)
 {
     if (sub_0205DF58(param1)) {
         if (sub_02062F30(param0) == 0) {
@@ -772,7 +772,7 @@ int sub_020640D4 (UnkStruct_02061AB4 * param0, u32 param1)
     return 0;
 }
 
-int sub_02064108 (UnkStruct_02061AB4 * param0, u32 param1)
+int sub_02064108 (LocalMapObject * param0, u32 param1)
 {
     if (sub_0205DF58(param1)) {
         if (sub_02062F30(param0) == 0) {
@@ -785,7 +785,7 @@ int sub_02064108 (UnkStruct_02061AB4 * param0, u32 param1)
     return 0;
 }
 
-int sub_0206413C (UnkStruct_02061AB4 * param0, u32 param1)
+int sub_0206413C (LocalMapObject * param0, u32 param1)
 {
     if (sub_02062F30(param0) == 1) {
         if (sub_0205DEFC(param1) == 1) {
@@ -796,7 +796,7 @@ int sub_0206413C (UnkStruct_02061AB4 * param0, u32 param1)
     return 0;
 }
 
-int sub_0206415C (UnkStruct_02061AB4 * param0, u32 param1)
+int sub_0206415C (LocalMapObject * param0, u32 param1)
 {
     if (sub_02062F30(param0) == 1) {
         if (sub_0205DF64(param1) == 1) {
@@ -807,7 +807,7 @@ int sub_0206415C (UnkStruct_02061AB4 * param0, u32 param1)
     return 0;
 }
 
-int sub_0206417C (UnkStruct_02061AB4 * param0, u32 param1)
+int sub_0206417C (LocalMapObject * param0, u32 param1)
 {
     if (sub_02062F30(param0) == 1) {
         if (sub_0205DF78(param1) == 1) {
@@ -849,7 +849,7 @@ int sub_020641A8 (int param0)
     return Unk_020EE78C[param0];
 }
 
-void sub_020641B4 (UnkStruct_02061AB4 * param0, int param1)
+void sub_020641B4 (LocalMapObject * param0, int param1)
 {
     sub_0206300C(param0, sub_02063020(param0));
     sub_02063014(param0, sub_02063030(param0));
@@ -860,14 +860,14 @@ void sub_020641B4 (UnkStruct_02061AB4 * param0, int param1)
     sub_02063048(param0, sub_020641A8(param1));
 }
 
-void sub_02064208 (UnkStruct_02061AB4 * param0)
+void sub_02064208 (LocalMapObject * param0)
 {
     sub_0206300C(param0, sub_02063020(param0));
     sub_02063014(param0, sub_02063030(param0));
     sub_0206301C(param0, sub_02063040(param0));
 }
 
-u32 sub_02064238 (UnkStruct_02061AB4 * param0, int param1)
+u32 sub_02064238 (LocalMapObject * param0, int param1)
 {
     int v0 = sub_02063020(param0) + sub_0206419C(param1);
     int v1 = sub_02063040(param0) + sub_020641A8(param1);
@@ -877,7 +877,7 @@ u32 sub_02064238 (UnkStruct_02061AB4 * param0, int param1)
     return v3;
 }
 
-void sub_02064270 (UnkStruct_02061AB4 * param0, const VecFx32 * param1)
+void sub_02064270 (LocalMapObject * param0, const VecFx32 * param1)
 {
     VecFx32 v0;
 
@@ -890,7 +890,7 @@ void sub_02064270 (UnkStruct_02061AB4 * param0, const VecFx32 * param1)
     sub_02063060(param0, &v0);
 }
 
-void sub_020642A4 (UnkStruct_02061AB4 * param0, int param1, fx32 param2)
+void sub_020642A4 (LocalMapObject * param0, int param1, fx32 param2)
 {
     VecFx32 v0;
 
@@ -914,7 +914,7 @@ void sub_020642A4 (UnkStruct_02061AB4 * param0, int param1, fx32 param2)
     sub_02063060(param0, &v0);
 }
 
-int sub_020642F8 (UnkStruct_02061AB4 * param0)
+int sub_020642F8 (LocalMapObject * param0)
 {
     VecFx32 v0, v1;
 
@@ -945,7 +945,7 @@ int sub_020642F8 (UnkStruct_02061AB4 * param0)
     }
 }
 
-int sub_02064390 (UnkStruct_02061AB4 * param0)
+int sub_02064390 (LocalMapObject * param0)
 {
     u8 v0 = sub_0205DF98();
     u8 v1 = v0;
@@ -997,7 +997,7 @@ void sub_02064450 (int param0, int param1, VecFx32 * param2)
     param2->z = (((param1) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1);
 }
 
-void sub_02064464 (UnkStruct_02061AB4 * param0)
+void sub_02064464 (LocalMapObject * param0)
 {
     int v0 = sub_02062948(param0);
 
diff --git a/src/unk_0206450C.c b/src/unk_0206450C.c
index ee4fbc1dd9..dd8bb65040 100644
--- a/src/unk_0206450C.c
+++ b/src/unk_0206450C.c
@@ -88,30 +88,30 @@ typedef struct {
     UnkStruct_02065550 unk_08;
 } UnkStruct_0206502C;
 
-static void sub_0206450C(UnkStruct_02061AB4 * param0, int param1);
-static void sub_02064668(UnkStruct_02061AB4 * param0, int param1, int param2, int param3);
+static void sub_0206450C(LocalMapObject * param0, int param1);
+static void sub_02064668(LocalMapObject * param0, int param1, int param2, int param3);
 static int sub_020652EC(const int * param0, int param1);
 static int sub_0206530C(const int * param0, int param1);
 static int sub_02065330(int param0, int param1);
 static const int * sub_02065358(int param0);
-static int sub_0206537C(UnkStruct_02061AB4 * param0);
-static int sub_02065448(UnkStruct_02061AB4 * param0, int param1, int param2);
-static void sub_020647A0(UnkStruct_02061AB4 * param0, UnkStruct_020647A0 * param1);
-static int sub_0206489C(UnkStruct_02061AB4 * param0, int param1);
-static void sub_020648F4(UnkStruct_02061AB4 * param0, int param1);
-static void sub_0206496C(UnkStruct_02061AB4 * param0, int param1);
-static void sub_02064D98(UnkStruct_02061AB4 * param0, int param1, int param2, int param3);
-static void sub_0206502C(UnkStruct_02061AB4 * param0, int param1, int param2, int param3);
-static int sub_0206553C(UnkStruct_02061AB4 * param0);
-static void sub_02065550(UnkStruct_02061AB4 * param0, UnkStruct_02065550 * param1);
-static void sub_02065568(UnkStruct_02061AB4 * param0, UnkStruct_02065550 * param1);
-static void sub_020655E4(UnkStruct_02061AB4 * param0, UnkStruct_02065550 * param1);
+static int sub_0206537C(LocalMapObject * param0);
+static int sub_02065448(LocalMapObject * param0, int param1, int param2);
+static void sub_020647A0(LocalMapObject * param0, UnkStruct_020647A0 * param1);
+static int sub_0206489C(LocalMapObject * param0, int param1);
+static void sub_020648F4(LocalMapObject * param0, int param1);
+static void sub_0206496C(LocalMapObject * param0, int param1);
+static void sub_02064D98(LocalMapObject * param0, int param1, int param2, int param3);
+static void sub_0206502C(LocalMapObject * param0, int param1, int param2, int param3);
+static int sub_0206553C(LocalMapObject * param0);
+static void sub_02065550(LocalMapObject * param0, UnkStruct_02065550 * param1);
+static void sub_02065568(LocalMapObject * param0, UnkStruct_02065550 * param1);
+static void sub_020655E4(LocalMapObject * param0, UnkStruct_02065550 * param1);
 
-int(*const Unk_020EE900[])(UnkStruct_02061AB4 *, UnkStruct_0206496C *);
-int(*const Unk_020EE870[])(UnkStruct_02061AB4 *, UnkStruct_0206496C *);
-int(*const Unk_020EE814[])(UnkStruct_02061AB4 *, UnkStruct_02064C28 *);
-int(*const Unk_020EE7AC[])(UnkStruct_02061AB4 *, UnkStruct_02064D98 *);
-int(*const Unk_020EE820[])(UnkStruct_02061AB4 *, UnkStruct_0206502C *);
+int(*const Unk_020EE900[])(LocalMapObject *, UnkStruct_0206496C *);
+int(*const Unk_020EE870[])(LocalMapObject *, UnkStruct_0206496C *);
+int(*const Unk_020EE814[])(LocalMapObject *, UnkStruct_02064C28 *);
+int(*const Unk_020EE7AC[])(LocalMapObject *, UnkStruct_02064D98 *);
+int(*const Unk_020EE820[])(LocalMapObject *, UnkStruct_0206502C *);
 static const int Unk_020EEAB0[2][4];
 const int Unk_020EEA88[];
 const int Unk_020EEA9C[];
@@ -155,7 +155,7 @@ const int Unk_020EE9D0[];
 static const UnkStruct_020EEB08 Unk_020EEB08[40];
 const int Unk_020EEAD0[];
 
-static void sub_0206450C (UnkStruct_02061AB4 * param0, int param1)
+static void sub_0206450C (LocalMapObject * param0, int param1)
 {
     UnkStruct_0206450C * v0;
 
@@ -167,62 +167,62 @@ static void sub_0206450C (UnkStruct_02061AB4 * param0, int param1)
     sub_02062D10(param0);
 }
 
-void sub_0206453C (UnkStruct_02061AB4 * param0)
+void sub_0206453C (LocalMapObject * param0)
 {
     sub_0206450C(param0, 0);
 }
 
-void sub_02064548 (UnkStruct_02061AB4 * param0)
+void sub_02064548 (LocalMapObject * param0)
 {
     sub_0206450C(param0, 1);
 }
 
-void sub_02064554 (UnkStruct_02061AB4 * param0)
+void sub_02064554 (LocalMapObject * param0)
 {
     sub_0206450C(param0, 2);
 }
 
-void sub_02064560 (UnkStruct_02061AB4 * param0)
+void sub_02064560 (LocalMapObject * param0)
 {
     sub_0206450C(param0, 3);
 }
 
-void sub_0206456C (UnkStruct_02061AB4 * param0)
+void sub_0206456C (LocalMapObject * param0)
 {
     sub_0206450C(param0, 4);
 }
 
-void sub_02064578 (UnkStruct_02061AB4 * param0)
+void sub_02064578 (LocalMapObject * param0)
 {
     sub_0206450C(param0, 5);
 }
 
-void sub_02064584 (UnkStruct_02061AB4 * param0)
+void sub_02064584 (LocalMapObject * param0)
 {
     sub_0206450C(param0, 6);
 }
 
-void sub_02064590 (UnkStruct_02061AB4 * param0)
+void sub_02064590 (LocalMapObject * param0)
 {
     sub_0206450C(param0, 7);
 }
 
-void sub_0206459C (UnkStruct_02061AB4 * param0)
+void sub_0206459C (LocalMapObject * param0)
 {
     sub_0206450C(param0, 8);
 }
 
-void sub_020645A8 (UnkStruct_02061AB4 * param0)
+void sub_020645A8 (LocalMapObject * param0)
 {
     sub_0206450C(param0, 9);
 }
 
-void sub_020645B4 (UnkStruct_02061AB4 * param0)
+void sub_020645B4 (LocalMapObject * param0)
 {
     sub_0206450C(param0, 10);
 }
 
-void sub_020645C0 (UnkStruct_02061AB4 * param0)
+void sub_020645C0 (LocalMapObject * param0)
 {
     UnkStruct_0206450C * v0 = sub_02062A78(param0);
     int v1 = sub_02065448(param0, v0->unk_04, -1);
@@ -244,32 +244,32 @@ void sub_020645C0 (UnkStruct_02061AB4 * param0)
     sub_02064208(param0);
 }
 
-void sub_02064624 (UnkStruct_02061AB4 * param0)
+void sub_02064624 (LocalMapObject * param0)
 {
     return;
 }
 
-void sub_02064628 (UnkStruct_02061AB4 * param0)
+void sub_02064628 (LocalMapObject * param0)
 {
     sub_02064668(param0, 0xc, 11, 0);
 }
 
-void sub_02064638 (UnkStruct_02061AB4 * param0)
+void sub_02064638 (LocalMapObject * param0)
 {
     sub_02064668(param0, 0xc, 12, 0);
 }
 
-void sub_02064648 (UnkStruct_02061AB4 * param0)
+void sub_02064648 (LocalMapObject * param0)
 {
     sub_02064668(param0, 0xc, 13, 0);
 }
 
-void sub_02064658 (UnkStruct_02061AB4 * param0)
+void sub_02064658 (LocalMapObject * param0)
 {
     sub_02064668(param0, 0xc, 13, 2);
 }
 
-static void sub_02064668 (UnkStruct_02061AB4 * param0, int param1, int param2, int param3)
+static void sub_02064668 (LocalMapObject * param0, int param1, int param2, int param3)
 {
     UnkStruct_02064668 * v0;
 
@@ -283,7 +283,7 @@ static void sub_02064668 (UnkStruct_02061AB4 * param0, int param1, int param2, i
     sub_02062D10(param0);
 }
 
-void sub_02064690 (UnkStruct_02061AB4 * param0)
+void sub_02064690 (LocalMapObject * param0)
 {
     int v0;
     UnkStruct_02064668 * v1;
@@ -360,7 +360,7 @@ void sub_02064690 (UnkStruct_02061AB4 * param0)
     }
 }
 
-static void sub_020647A0 (UnkStruct_02061AB4 * param0, UnkStruct_020647A0 * param1)
+static void sub_020647A0 (LocalMapObject * param0, UnkStruct_020647A0 * param1)
 {
     int v0, v1, v2, v3, v4;
 
@@ -408,7 +408,7 @@ static void sub_020647A0 (UnkStruct_02061AB4 * param0, UnkStruct_020647A0 * para
     }
 }
 
-static int sub_0206489C (UnkStruct_02061AB4 * param0, int param1)
+static int sub_0206489C (LocalMapObject * param0, int param1)
 {
     int v0, v1;
     UnkStruct_020647A0 v2;
@@ -429,7 +429,7 @@ static int sub_0206489C (UnkStruct_02061AB4 * param0, int param1)
     return 1;
 }
 
-static void sub_020648F4 (UnkStruct_02061AB4 * param0, int param1)
+static void sub_020648F4 (LocalMapObject * param0, int param1)
 {
     UnkStruct_020648F4 * v0;
 
@@ -441,7 +441,7 @@ static void sub_020648F4 (UnkStruct_02061AB4 * param0, int param1)
     sub_02064208(param0);
 }
 
-void sub_02064918 (UnkStruct_02061AB4 * param0)
+void sub_02064918 (LocalMapObject * param0)
 {
     UnkStruct_020648F4 * v0;
 
@@ -457,27 +457,27 @@ void sub_02064918 (UnkStruct_02061AB4 * param0)
     }
 }
 
-void sub_0206493C (UnkStruct_02061AB4 * param0)
+void sub_0206493C (LocalMapObject * param0)
 {
     sub_020648F4(param0, 0);
 }
 
-void sub_02064948 (UnkStruct_02061AB4 * param0)
+void sub_02064948 (LocalMapObject * param0)
 {
     sub_020648F4(param0, 1);
 }
 
-void sub_02064954 (UnkStruct_02061AB4 * param0)
+void sub_02064954 (LocalMapObject * param0)
 {
     sub_020648F4(param0, 2);
 }
 
-void sub_02064960 (UnkStruct_02061AB4 * param0)
+void sub_02064960 (LocalMapObject * param0)
 {
     sub_020648F4(param0, 3);
 }
 
-static void sub_0206496C (UnkStruct_02061AB4 * param0, int param1)
+static void sub_0206496C (LocalMapObject * param0, int param1)
 {
     UnkStruct_0206496C * v0;
 
@@ -489,17 +489,17 @@ static void sub_0206496C (UnkStruct_02061AB4 * param0, int param1)
     sub_02064208(param0);
 }
 
-void sub_02064990 (UnkStruct_02061AB4 * param0)
+void sub_02064990 (LocalMapObject * param0)
 {
     sub_0206496C(param0, 2);
 }
 
-void sub_0206499C (UnkStruct_02061AB4 * param0)
+void sub_0206499C (LocalMapObject * param0)
 {
     sub_0206496C(param0, 3);
 }
 
-void sub_020649A8 (UnkStruct_02061AB4 * param0)
+void sub_020649A8 (LocalMapObject * param0)
 {
     UnkStruct_0206496C * v0;
 
@@ -510,7 +510,7 @@ void sub_020649A8 (UnkStruct_02061AB4 * param0)
     }
 }
 
-static int sub_020649CC (UnkStruct_02061AB4 * param0, UnkStruct_0206496C * param1)
+static int sub_020649CC (LocalMapObject * param0, UnkStruct_0206496C * param1)
 {
     int v0 = sub_02065448(param0, 38, -1);
 
@@ -525,7 +525,7 @@ static int sub_020649CC (UnkStruct_02061AB4 * param0, UnkStruct_0206496C * param
     return 1;
 }
 
-static int sub_02064A00 (UnkStruct_02061AB4 * param0, UnkStruct_0206496C * param1)
+static int sub_02064A00 (LocalMapObject * param0, UnkStruct_0206496C * param1)
 {
     if (sub_020658DC(param0) == 0) {
         return 0;
@@ -537,7 +537,7 @@ static int sub_02064A00 (UnkStruct_02061AB4 * param0, UnkStruct_0206496C * param
     return 1;
 }
 
-static int sub_02064A1C (UnkStruct_02061AB4 * param0, UnkStruct_0206496C * param1)
+static int sub_02064A1C (LocalMapObject * param0, UnkStruct_0206496C * param1)
 {
     if (param1->unk_04) {
         if (sub_02065448(param0, 38, -1) != -1) {
@@ -556,7 +556,7 @@ static int sub_02064A1C (UnkStruct_02061AB4 * param0, UnkStruct_0206496C * param
     return 1;
 }
 
-static int sub_02064A58 (UnkStruct_02061AB4 * param0, UnkStruct_0206496C * param1)
+static int sub_02064A58 (LocalMapObject * param0, UnkStruct_0206496C * param1)
 {
     int v0, v1, * v2;
     int v3[5] = {0, 2, 1, 3, -1};
@@ -592,19 +592,19 @@ static int sub_02064A58 (UnkStruct_02061AB4 * param0, UnkStruct_0206496C * param
     return 1;
 }
 
-static int(*const Unk_020EE900[])(UnkStruct_02061AB4 *, UnkStruct_0206496C *) = {
+static int(*const Unk_020EE900[])(LocalMapObject *, UnkStruct_0206496C *) = {
     sub_020649CC,
     sub_02064A00,
     sub_02064A1C,
     sub_02064A58
 };
 
-void sub_02064AF0 (UnkStruct_02061AB4 * param0)
+void sub_02064AF0 (LocalMapObject * param0)
 {
     sub_0206496C(param0, 3);
 }
 
-void sub_02064AFC (UnkStruct_02061AB4 * param0)
+void sub_02064AFC (LocalMapObject * param0)
 {
     UnkStruct_0206496C * v0;
 
@@ -615,7 +615,7 @@ void sub_02064AFC (UnkStruct_02061AB4 * param0)
     }
 }
 
-static int sub_02064B20 (UnkStruct_02061AB4 * param0, UnkStruct_0206496C * param1)
+static int sub_02064B20 (LocalMapObject * param0, UnkStruct_0206496C * param1)
 {
     int v0 = sub_0206298C(param0);
 
@@ -626,7 +626,7 @@ static int sub_02064B20 (UnkStruct_02061AB4 * param0, UnkStruct_0206496C * param
     return 1;
 }
 
-static int sub_02064B40 (UnkStruct_02061AB4 * param0, UnkStruct_0206496C * param1)
+static int sub_02064B40 (LocalMapObject * param0, UnkStruct_0206496C * param1)
 {
     if (sub_020658DC(param0) == 0) {
         return 0;
@@ -638,7 +638,7 @@ static int sub_02064B40 (UnkStruct_02061AB4 * param0, UnkStruct_0206496C * param
     return 1;
 }
 
-static int sub_02064B5C (UnkStruct_02061AB4 * param0, UnkStruct_0206496C * param1)
+static int sub_02064B5C (LocalMapObject * param0, UnkStruct_0206496C * param1)
 {
     param1->unk_04++;
 
@@ -650,7 +650,7 @@ static int sub_02064B5C (UnkStruct_02061AB4 * param0, UnkStruct_0206496C * param
     return 1;
 }
 
-static int sub_02064B74 (UnkStruct_02061AB4 * param0, UnkStruct_0206496C * param1)
+static int sub_02064B74 (LocalMapObject * param0, UnkStruct_0206496C * param1)
 {
     int v0, v1, * v2;
     int v3[5] = {0, 2, 1, 3, -1};
@@ -695,14 +695,14 @@ static int sub_02064B74 (UnkStruct_02061AB4 * param0, UnkStruct_0206496C * param
     return 1;
 }
 
-static int(*const Unk_020EE870[])(UnkStruct_02061AB4 *, UnkStruct_0206496C *) = {
+static int(*const Unk_020EE870[])(LocalMapObject *, UnkStruct_0206496C *) = {
     sub_02064B20,
     sub_02064B40,
     sub_02064B5C,
     sub_02064B74
 };
 
-void sub_02064C28 (UnkStruct_02061AB4 * param0)
+void sub_02064C28 (LocalMapObject * param0)
 {
     UnkStruct_02064C28 * v0;
 
@@ -713,7 +713,7 @@ void sub_02064C28 (UnkStruct_02061AB4 * param0)
     }
 }
 
-void sub_02064C48 (UnkStruct_02061AB4 * param0)
+void sub_02064C48 (LocalMapObject * param0)
 {
     UnkStruct_02064C28 * v0 = sub_02062A78(param0);
 
@@ -722,7 +722,7 @@ void sub_02064C48 (UnkStruct_02061AB4 * param0)
     }
 }
 
-static int sub_02064C6C (UnkStruct_02061AB4 * param0, UnkStruct_02064C28 * param1)
+static int sub_02064C6C (LocalMapObject * param0, UnkStruct_02064C28 * param1)
 {
     int v0;
 
@@ -742,7 +742,7 @@ static int sub_02064C6C (UnkStruct_02061AB4 * param0, UnkStruct_02064C28 * param
     return 1;
 }
 
-static int sub_02064CA8 (UnkStruct_02061AB4 * param0, UnkStruct_02064C28 * param1)
+static int sub_02064CA8 (LocalMapObject * param0, UnkStruct_02064C28 * param1)
 {
     if (param1->unk_02) {
         int v0, v1, v2, v3;
@@ -798,7 +798,7 @@ static int sub_02064CA8 (UnkStruct_02061AB4 * param0, UnkStruct_02064C28 * param
     return 1;
 }
 
-static int sub_02064D68 (UnkStruct_02061AB4 * param0, UnkStruct_02064C28 * param1)
+static int sub_02064D68 (LocalMapObject * param0, UnkStruct_02064C28 * param1)
 {
     if (sub_020658DC(param0) == 1) {
         sub_02062D10(param0);
@@ -813,13 +813,13 @@ static int sub_02064D68 (UnkStruct_02061AB4 * param0, UnkStruct_02064C28 * param
     return 0;
 }
 
-static int(*const Unk_020EE814[])(UnkStruct_02061AB4 *, UnkStruct_02064C28 *) = {
+static int(*const Unk_020EE814[])(LocalMapObject *, UnkStruct_02064C28 *) = {
     sub_02064C6C,
     sub_02064CA8,
     sub_02064D68
 };
 
-static void sub_02064D98 (UnkStruct_02061AB4 * param0, int param1, int param2, int param3)
+static void sub_02064D98 (LocalMapObject * param0, int param1, int param2, int param3)
 {
     UnkStruct_02064D98 * v0;
 
@@ -833,87 +833,87 @@ static void sub_02064D98 (UnkStruct_02061AB4 * param0, int param1, int param2, i
     }
 }
 
-void sub_02064DC8 (UnkStruct_02061AB4 * param0)
+void sub_02064DC8 (LocalMapObject * param0)
 {
     sub_02064D98(param0, 2, 0, 14);
 }
 
-void sub_02064DD8 (UnkStruct_02061AB4 * param0)
+void sub_02064DD8 (LocalMapObject * param0)
 {
     sub_02064D98(param0, 2, 0, 15);
 }
 
-void sub_02064DE8 (UnkStruct_02061AB4 * param0)
+void sub_02064DE8 (LocalMapObject * param0)
 {
     sub_02064D98(param0, 2, 1, 16);
 }
 
-void sub_02064DF8 (UnkStruct_02061AB4 * param0)
+void sub_02064DF8 (LocalMapObject * param0)
 {
     sub_02064D98(param0, 2, 1, 17);
 }
 
-void sub_02064E08 (UnkStruct_02061AB4 * param0)
+void sub_02064E08 (LocalMapObject * param0)
 {
     sub_02064D98(param0, 2, 0, 18);
 }
 
-void sub_02064E18 (UnkStruct_02061AB4 * param0)
+void sub_02064E18 (LocalMapObject * param0)
 {
     sub_02064D98(param0, 2, 0, 19);
 }
 
-void sub_02064E28 (UnkStruct_02061AB4 * param0)
+void sub_02064E28 (LocalMapObject * param0)
 {
     sub_02064D98(param0, 2, 1, 20);
 }
 
-void sub_02064E38 (UnkStruct_02061AB4 * param0)
+void sub_02064E38 (LocalMapObject * param0)
 {
     sub_02064D98(param0, 2, 1, 21);
 }
 
-void sub_02064E48 (UnkStruct_02061AB4 * param0)
+void sub_02064E48 (LocalMapObject * param0)
 {
     sub_02064D98(param0, 2, 1, 22);
 }
 
-void sub_02064E58 (UnkStruct_02061AB4 * param0)
+void sub_02064E58 (LocalMapObject * param0)
 {
     sub_02064D98(param0, 2, 1, 23);
 }
 
-void sub_02064E68 (UnkStruct_02061AB4 * param0)
+void sub_02064E68 (LocalMapObject * param0)
 {
     sub_02064D98(param0, 2, 0, 24);
 }
 
-void sub_02064E78 (UnkStruct_02061AB4 * param0)
+void sub_02064E78 (LocalMapObject * param0)
 {
     sub_02064D98(param0, 2, 0, 25);
 }
 
-void sub_02064E88 (UnkStruct_02061AB4 * param0)
+void sub_02064E88 (LocalMapObject * param0)
 {
     sub_02064D98(param0, 2, 1, 26);
 }
 
-void sub_02064E98 (UnkStruct_02061AB4 * param0)
+void sub_02064E98 (LocalMapObject * param0)
 {
     sub_02064D98(param0, 2, 1, 27);
 }
 
-void sub_02064EA8 (UnkStruct_02061AB4 * param0)
+void sub_02064EA8 (LocalMapObject * param0)
 {
     sub_02064D98(param0, 2, 0, 28);
 }
 
-void sub_02064EB8 (UnkStruct_02061AB4 * param0)
+void sub_02064EB8 (LocalMapObject * param0)
 {
     sub_02064D98(param0, 2, 0, 29);
 }
 
-void sub_02064EC8 (UnkStruct_02061AB4 * param0)
+void sub_02064EC8 (LocalMapObject * param0)
 {
     UnkStruct_02064D98 * v0;
 
@@ -924,7 +924,7 @@ void sub_02064EC8 (UnkStruct_02061AB4 * param0)
     }
 }
 
-static int sub_02064EEC (UnkStruct_02061AB4 * param0, UnkStruct_02064D98 * param1)
+static int sub_02064EEC (LocalMapObject * param0, UnkStruct_02064D98 * param1)
 {
     if (param1->unk_01 == param1->unk_02) {
         if (param1->unk_03 == 0) {
@@ -1004,7 +1004,7 @@ static int sub_02064EEC (UnkStruct_02061AB4 * param0, UnkStruct_02064D98 * param
     return 1;
 }
 
-static int sub_02064FFC (UnkStruct_02061AB4 * param0, UnkStruct_02064D98 * param1)
+static int sub_02064FFC (LocalMapObject * param0, UnkStruct_02064D98 * param1)
 {
     if (sub_020658DC(param0) == 1) {
         sub_02062D10(param0);
@@ -1019,12 +1019,12 @@ static int sub_02064FFC (UnkStruct_02061AB4 * param0, UnkStruct_02064D98 * param
     return 0;
 }
 
-static int(*const Unk_020EE7AC[])(UnkStruct_02061AB4 *, UnkStruct_02064D98 *) = {
+static int(*const Unk_020EE7AC[])(LocalMapObject *, UnkStruct_02064D98 *) = {
     sub_02064EEC,
     sub_02064FFC
 };
 
-static void sub_0206502C (UnkStruct_02061AB4 * param0, int param1, int param2, int param3)
+static void sub_0206502C (LocalMapObject * param0, int param1, int param2, int param3)
 {
     UnkStruct_0206502C * v0;
 
@@ -1039,47 +1039,47 @@ static void sub_0206502C (UnkStruct_02061AB4 * param0, int param1, int param2, i
     }
 }
 
-void sub_0206505C (UnkStruct_02061AB4 * param0)
+void sub_0206505C (LocalMapObject * param0)
 {
     sub_0206502C(param0, 2, 1, 30);
 }
 
-void sub_0206506C (UnkStruct_02061AB4 * param0)
+void sub_0206506C (LocalMapObject * param0)
 {
     sub_0206502C(param0, 2, 1, 31);
 }
 
-void sub_0206507C (UnkStruct_02061AB4 * param0)
+void sub_0206507C (LocalMapObject * param0)
 {
     sub_0206502C(param0, 2, 0, 32);
 }
 
-void sub_0206508C (UnkStruct_02061AB4 * param0)
+void sub_0206508C (LocalMapObject * param0)
 {
     sub_0206502C(param0, 2, 0, 33);
 }
 
-void sub_0206509C (UnkStruct_02061AB4 * param0)
+void sub_0206509C (LocalMapObject * param0)
 {
     sub_0206502C(param0, 2, 1, 34);
 }
 
-void sub_020650AC (UnkStruct_02061AB4 * param0)
+void sub_020650AC (LocalMapObject * param0)
 {
     sub_0206502C(param0, 2, 1, 35);
 }
 
-void sub_020650BC (UnkStruct_02061AB4 * param0)
+void sub_020650BC (LocalMapObject * param0)
 {
     sub_0206502C(param0, 2, 0, 36);
 }
 
-void sub_020650CC (UnkStruct_02061AB4 * param0)
+void sub_020650CC (LocalMapObject * param0)
 {
     sub_0206502C(param0, 2, 0, 37);
 }
 
-void sub_020650DC (UnkStruct_02061AB4 * param0)
+void sub_020650DC (LocalMapObject * param0)
 {
     UnkStruct_0206502C * v0 = sub_02062A78(param0);
 
@@ -1101,7 +1101,7 @@ static void sub_02065100 (UnkStruct_0206502C * param0)
     }
 }
 
-static int sub_02065124 (UnkStruct_02061AB4 * param0, UnkStruct_0206502C * param1)
+static int sub_02065124 (LocalMapObject * param0, UnkStruct_0206502C * param1)
 {
     if (sub_02062950(param0) == 0xa) {
         FieldSystem * v0 = sub_02062C00(param0);
@@ -1125,7 +1125,7 @@ static int sub_02065124 (UnkStruct_02061AB4 * param0, UnkStruct_0206502C * param
     return 1;
 }
 
-static int sub_02065188 (UnkStruct_02061AB4 * param0, UnkStruct_0206502C * param1)
+static int sub_02065188 (LocalMapObject * param0, UnkStruct_0206502C * param1)
 {
     if (sub_020658DC(param0) == 1) {
         sub_02062D10(param0);
@@ -1135,7 +1135,7 @@ static int sub_02065188 (UnkStruct_02061AB4 * param0, UnkStruct_0206502C * param
     return 0;
 }
 
-static int sub_020651A4 (UnkStruct_02061AB4 * param0, UnkStruct_0206502C * param1)
+static int sub_020651A4 (LocalMapObject * param0, UnkStruct_0206502C * param1)
 {
     if (param1->unk_01 == param1->unk_02) {
         if (param1->unk_03 == 0) {
@@ -1215,7 +1215,7 @@ static int sub_020651A4 (UnkStruct_02061AB4 * param0, UnkStruct_0206502C * param
     return 1;
 }
 
-static int sub_020652BC (UnkStruct_02061AB4 * param0, UnkStruct_0206502C * param1)
+static int sub_020652BC (LocalMapObject * param0, UnkStruct_0206502C * param1)
 {
     if (sub_020658DC(param0) == 1) {
         sub_02062D10(param0);
@@ -1230,7 +1230,7 @@ static int sub_020652BC (UnkStruct_02061AB4 * param0, UnkStruct_0206502C * param
     return 0;
 }
 
-static int(*const Unk_020EE820[])(UnkStruct_02061AB4 *, UnkStruct_0206502C *) = {
+static int(*const Unk_020EE820[])(LocalMapObject *, UnkStruct_0206502C *) = {
     sub_02065124,
     sub_02065188,
     sub_020651A4,
@@ -1275,7 +1275,7 @@ static const int * sub_02065358 (int param0)
     return NULL;
 }
 
-static int sub_0206537C (UnkStruct_02061AB4 * param0)
+static int sub_0206537C (LocalMapObject * param0)
 {
     int v0 = sub_02062950(param0);
 
@@ -1310,7 +1310,7 @@ static int sub_0206537C (UnkStruct_02061AB4 * param0)
         }
 
         {
-            const UnkStruct_02061AB4 * v5 = sub_0205EB3C(v2);
+            const LocalMapObject * v5 = Player_LocalMapObject(v2);
             int v6 = sub_020630DC(v5);
             int v7 = sub_020630DC(param0);
 
@@ -1341,7 +1341,7 @@ static int sub_0206537C (UnkStruct_02061AB4 * param0)
     return(-1);
 }
 
-static int sub_02065448 (UnkStruct_02061AB4 * param0, int param1, int param2)
+static int sub_02065448 (LocalMapObject * param0, int param1, int param2)
 {
     const int * v0 = sub_02065358(param1);
     int v1 = sub_020652EC(v0, param2);
@@ -1434,7 +1434,7 @@ static const int Unk_020EEAB0[2][4] = {
     {0x0, 0x3, 0x1, 0x2}
 };
 
-static int sub_0206553C (UnkStruct_02061AB4 * param0)
+static int sub_0206553C (LocalMapObject * param0)
 {
     int v0 = sub_02062950(param0);
 
@@ -1445,7 +1445,7 @@ static int sub_0206553C (UnkStruct_02061AB4 * param0)
     return 0;
 }
 
-static void sub_02065550 (UnkStruct_02061AB4 * param0, UnkStruct_02065550 * param1)
+static void sub_02065550 (LocalMapObject * param0, UnkStruct_02065550 * param1)
 {
     if (sub_02062950(param0) == 0x7) {
         param1->unk_01 = 0;
@@ -1454,7 +1454,7 @@ static void sub_02065550 (UnkStruct_02061AB4 * param0, UnkStruct_02065550 * para
     }
 }
 
-static void sub_02065568 (UnkStruct_02061AB4 * param0, UnkStruct_02065550 * param1)
+static void sub_02065568 (LocalMapObject * param0, UnkStruct_02065550 * param1)
 {
     int v0, v1 = sub_0206298C(param0);
 
@@ -1479,7 +1479,7 @@ static void sub_02065568 (UnkStruct_02061AB4 * param0, UnkStruct_02065550 * para
     sub_020628BC(param0, (1 << 7));
 }
 
-static void sub_020655E4 (UnkStruct_02061AB4 * param0, UnkStruct_02065550 * param1)
+static void sub_020655E4 (LocalMapObject * param0, UnkStruct_02065550 * param1)
 {
     if (param1->unk_02 == 0) {
         sub_020628C4(param0, (1 << 7));
diff --git a/src/unk_020655F4.c b/src/unk_020655F4.c
index b379b1337c..ddf7e269ff 100644
--- a/src/unk_020655F4.c
+++ b/src/unk_020655F4.c
@@ -27,7 +27,7 @@ typedef struct {
     int unk_00;
     int unk_04;
     int unk_08;
-    UnkStruct_02061AB4 * unk_0C;
+    LocalMapObject * unk_0C;
     const UnkStruct_ov5_021F8E3C * unk_10;
 } UnkStruct_020EEE54;
 
@@ -104,15 +104,15 @@ typedef struct {
 } UnkStruct_020667CC;
 
 static void sub_02065788(SysTask * param0, void * param1);
-static int sub_02065910(UnkStruct_02061AB4 * param0, int param1, int param2);
-static int sub_02065924(UnkStruct_02061AB4 * param0);
-static void sub_02065930(UnkStruct_02061AB4 * param0, int param1);
-static void sub_02065980(UnkStruct_02061AB4 * param0, int param1, fx32 param2, s16 param3, u16 param4);
-static int sub_020659C8(UnkStruct_02061AB4 * param0);
-static void sub_02065C64(UnkStruct_02061AB4 * param0, int param1, s16 param2, u16 param3);
-static int sub_02065C98(UnkStruct_02061AB4 * param0);
-static void sub_020664A0(UnkStruct_02061AB4 * param0, int param1, int param2);
-static int sub_020664C8(UnkStruct_02061AB4 * param0);
+static int sub_02065910(LocalMapObject * param0, int param1, int param2);
+static int sub_02065924(LocalMapObject * param0);
+static void sub_02065930(LocalMapObject * param0, int param1);
+static void sub_02065980(LocalMapObject * param0, int param1, fx32 param2, s16 param3, u16 param4);
+static int sub_020659C8(LocalMapObject * param0);
+static void sub_02065C64(LocalMapObject * param0, int param1, s16 param2, u16 param3);
+static int sub_02065C98(LocalMapObject * param0);
+static void sub_020664A0(LocalMapObject * param0, int param1, int param2);
+static int sub_020664C8(LocalMapObject * param0);
 
 int(*const Unk_020EEE54[])(UnkStruct_020EEE54 *);
 const fx32 * Unk_02100B84[];
@@ -120,7 +120,7 @@ static const fx32 Unk_020EEE84[7];
 static const fx32 Unk_020EEE6C[6];
 static const fx32 Unk_020EECEC[3];
 
-int sub_020655F4 (const UnkStruct_02061AB4 * param0)
+int sub_020655F4 (const LocalMapObject * param0)
 {
     if (sub_020628D8(param0, (1 << 0)) == 0) {
         return 0;
@@ -137,7 +137,7 @@ int sub_020655F4 (const UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-void sub_02065638 (UnkStruct_02061AB4 * param0, int param1)
+void sub_02065638 (LocalMapObject * param0, int param1)
 {
     GF_ASSERT(param1 < 0x9a);
 
@@ -147,14 +147,14 @@ void sub_02065638 (UnkStruct_02061AB4 * param0, int param1)
     sub_020628C4(param0, (1 << 5));
 }
 
-void sub_02065668 (UnkStruct_02061AB4 * param0, int param1)
+void sub_02065668 (LocalMapObject * param0, int param1)
 {
     sub_02062BB0(param0, param1);
     sub_02062BC0(param0, 0);
     sub_020628C4(param0, (1 << 5));
 }
 
-int sub_02065684 (const UnkStruct_02061AB4 * param0)
+int sub_02065684 (const LocalMapObject * param0)
 {
     if (sub_020628D8(param0, (1 << 4)) == 0) {
         return 1;
@@ -167,7 +167,7 @@ int sub_02065684 (const UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-int sub_020656AC (UnkStruct_02061AB4 * param0)
+int sub_020656AC (LocalMapObject * param0)
 {
     if (sub_020628D8(param0, (1 << 4)) == 0) {
         return 1;
@@ -182,7 +182,7 @@ int sub_020656AC (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-void sub_020656DC (UnkStruct_02061AB4 * param0)
+void sub_020656DC (LocalMapObject * param0)
 {
     sub_020628C4(param0, (1 << 4));
     sub_020628BC(param0, (1 << 5));
@@ -190,7 +190,7 @@ void sub_020656DC (UnkStruct_02061AB4 * param0)
     sub_02062BC0(param0, 0);
 }
 
-SysTask * sub_02065700 (UnkStruct_02061AB4 * param0, const UnkStruct_ov5_021F8E3C * param1)
+SysTask * sub_02065700 (LocalMapObject * param0, const UnkStruct_ov5_021F8E3C * param1)
 {
     SysTask * v0;
     UnkStruct_020EEE54 * v1;
@@ -382,7 +382,7 @@ int sub_0206587C (int param0)
     return(-1);
 }
 
-void sub_020658B4 (UnkStruct_02061AB4 * param0)
+void sub_020658B4 (LocalMapObject * param0)
 {
     int v0, v1;
 
@@ -397,7 +397,7 @@ void sub_020658B4 (UnkStruct_02061AB4 * param0)
     } while (sub_02065910(param0, v0, v1));
 }
 
-int sub_020658DC (UnkStruct_02061AB4 * param0)
+int sub_020658DC (LocalMapObject * param0)
 {
     sub_020658B4(param0);
 
@@ -412,18 +412,18 @@ int sub_020658DC (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_02065910 (UnkStruct_02061AB4 * param0, int param1, int param2)
+static int sub_02065910 (LocalMapObject * param0, int param1, int param2)
 {
     return Unk_020EE4B8[param1][param2](param0);
 }
 
-static int sub_02065924 (UnkStruct_02061AB4 * param0)
+static int sub_02065924 (LocalMapObject * param0)
 {
     sub_020628BC(param0, (1 << 5));
     return 0;
 }
 
-static void sub_02065930 (UnkStruct_02061AB4 * param0, int param1)
+static void sub_02065930 (LocalMapObject * param0, int param1)
 {
     sub_02062974(param0, param1);
     sub_02062A0C(param0, 0x0);
@@ -431,31 +431,31 @@ static void sub_02065930 (UnkStruct_02061AB4 * param0, int param1)
     sub_02062BC8(param0);
 }
 
-static int sub_02065950 (UnkStruct_02061AB4 * param0)
+static int sub_02065950 (LocalMapObject * param0)
 {
     sub_02065930(param0, 0);
     return 1;
 }
 
-static int sub_0206595C (UnkStruct_02061AB4 * param0)
+static int sub_0206595C (LocalMapObject * param0)
 {
     sub_02065930(param0, 1);
     return 1;
 }
 
-static int sub_02065968 (UnkStruct_02061AB4 * param0)
+static int sub_02065968 (LocalMapObject * param0)
 {
     sub_02065930(param0, 2);
     return 1;
 }
 
-static int sub_02065974 (UnkStruct_02061AB4 * param0)
+static int sub_02065974 (LocalMapObject * param0)
 {
     sub_02065930(param0, 3);
     return 1;
 }
 
-static void sub_02065980 (UnkStruct_02061AB4 * param0, int param1, fx32 param2, s16 param3, u16 param4)
+static void sub_02065980 (LocalMapObject * param0, int param1, fx32 param2, s16 param3, u16 param4)
 {
     UnkStruct_02065980 * v0;
 
@@ -473,7 +473,7 @@ static void sub_02065980 (UnkStruct_02061AB4 * param0, int param1, fx32 param2,
     sub_02062BC8(param0);
 }
 
-static int sub_020659C8 (UnkStruct_02061AB4 * param0)
+static int sub_020659C8 (LocalMapObject * param0)
 {
     UnkStruct_02065980 * v0;
 
@@ -497,175 +497,175 @@ static int sub_020659C8 (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_02065A1C (UnkStruct_02061AB4 * param0)
+static int sub_02065A1C (LocalMapObject * param0)
 {
     sub_02065980(param0, 0, ((16 * FX32_ONE) / 32), 32, 0x1);
     return 1;
 }
 
-static int sub_02065A30 (UnkStruct_02061AB4 * param0)
+static int sub_02065A30 (LocalMapObject * param0)
 {
     sub_02065980(param0, 1, ((16 * FX32_ONE) / 32), 32, 0x1);
     return 1;
 }
 
-static int sub_02065A44 (UnkStruct_02061AB4 * param0)
+static int sub_02065A44 (LocalMapObject * param0)
 {
     sub_02065980(param0, 2, ((16 * FX32_ONE) / 32), 32, 0x1);
     return 1;
 }
 
-static int sub_02065A58 (UnkStruct_02061AB4 * param0)
+static int sub_02065A58 (LocalMapObject * param0)
 {
     sub_02065980(param0, 3, ((16 * FX32_ONE) / 32), 32, 0x1);
     return 1;
 }
 
-static int sub_02065A6C (UnkStruct_02061AB4 * param0)
+static int sub_02065A6C (LocalMapObject * param0)
 {
     sub_02065980(param0, 0, ((16 * FX32_ONE) / 16), 16, 0x2);
     return 1;
 }
 
-static int sub_02065A80 (UnkStruct_02061AB4 * param0)
+static int sub_02065A80 (LocalMapObject * param0)
 {
     sub_02065980(param0, 1, ((16 * FX32_ONE) / 16), 16, 0x2);
     return 1;
 }
 
-static int sub_02065A94 (UnkStruct_02061AB4 * param0)
+static int sub_02065A94 (LocalMapObject * param0)
 {
     sub_02065980(param0, 2, ((16 * FX32_ONE) / 16), 16, 0x2);
     return 1;
 }
 
-static int sub_02065AA8 (UnkStruct_02061AB4 * param0)
+static int sub_02065AA8 (LocalMapObject * param0)
 {
     sub_02065980(param0, 3, ((16 * FX32_ONE) / 16), 16, 0x2);
     return 1;
 }
 
-static int sub_02065ABC (UnkStruct_02061AB4 * param0)
+static int sub_02065ABC (LocalMapObject * param0)
 {
     sub_02065980(param0, 0, ((16 * FX32_ONE) / 8), 8, 0x3);
     return 1;
 }
 
-static int sub_02065AD4 (UnkStruct_02061AB4 * param0)
+static int sub_02065AD4 (LocalMapObject * param0)
 {
     sub_02065980(param0, 1, ((16 * FX32_ONE) / 8), 8, 0x3);
     return 1;
 }
 
-static int sub_02065AE8 (UnkStruct_02061AB4 * param0)
+static int sub_02065AE8 (LocalMapObject * param0)
 {
     sub_02065980(param0, 2, ((16 * FX32_ONE) / 8), 8, 0x3);
     return 1;
 }
 
-static int sub_02065AFC (UnkStruct_02061AB4 * param0)
+static int sub_02065AFC (LocalMapObject * param0)
 {
     sub_02065980(param0, 3, ((16 * FX32_ONE) / 8), 8, 0x3);
     return 1;
 }
 
-static int sub_02065B10 (UnkStruct_02061AB4 * param0)
+static int sub_02065B10 (LocalMapObject * param0)
 {
     sub_02065980(param0, 0, ((16 * FX32_ONE) / 4), 4, 0x4);
     return 1;
 }
 
-static int sub_02065B24 (UnkStruct_02061AB4 * param0)
+static int sub_02065B24 (LocalMapObject * param0)
 {
     sub_02065980(param0, 1, ((16 * FX32_ONE) / 4), 4, 0x4);
     return 1;
 }
 
-static int sub_02065B38 (UnkStruct_02061AB4 * param0)
+static int sub_02065B38 (LocalMapObject * param0)
 {
     sub_02065980(param0, 2, ((16 * FX32_ONE) / 4), 4, 0x4);
     return 1;
 }
 
-static int sub_02065B4C (UnkStruct_02061AB4 * param0)
+static int sub_02065B4C (LocalMapObject * param0)
 {
     sub_02065980(param0, 3, ((16 * FX32_ONE) / 4), 4, 0x4);
     return 1;
 }
 
-static int sub_02065B60 (UnkStruct_02061AB4 * param0)
+static int sub_02065B60 (LocalMapObject * param0)
 {
     sub_02065980(param0, 0, ((16 * FX32_ONE) / 2), 2, 0x5);
     return 1;
 }
 
-static int sub_02065B78 (UnkStruct_02061AB4 * param0)
+static int sub_02065B78 (LocalMapObject * param0)
 {
     sub_02065980(param0, 1, ((16 * FX32_ONE) / 2), 2, 0x5);
     return 1;
 }
 
-static int sub_02065B8C (UnkStruct_02061AB4 * param0)
+static int sub_02065B8C (LocalMapObject * param0)
 {
     sub_02065980(param0, 2, ((16 * FX32_ONE) / 2), 2, 0x5);
     return 1;
 }
 
-static int sub_02065BA0 (UnkStruct_02061AB4 * param0)
+static int sub_02065BA0 (LocalMapObject * param0)
 {
     sub_02065980(param0, 3, ((16 * FX32_ONE) / 2), 2, 0x5);
     return 1;
 }
 
-static int sub_02065BB8 (UnkStruct_02061AB4 * param0)
+static int sub_02065BB8 (LocalMapObject * param0)
 {
     sub_02065980(param0, 0, ((16 * FX32_ONE) / 1), 1, 0x0);
     return 1;
 }
 
-static int sub_02065BCC (UnkStruct_02061AB4 * param0)
+static int sub_02065BCC (LocalMapObject * param0)
 {
     sub_02065980(param0, 1, ((16 * FX32_ONE) / 1), 1, 0x0);
     return 1;
 }
 
-static int sub_02065BE0 (UnkStruct_02061AB4 * param0)
+static int sub_02065BE0 (LocalMapObject * param0)
 {
     sub_02065980(param0, 2, ((16 * FX32_ONE) / 1), 1, 0x0);
     return 1;
 }
 
-static int sub_02065BF4 (UnkStruct_02061AB4 * param0)
+static int sub_02065BF4 (LocalMapObject * param0)
 {
     sub_02065980(param0, 3, ((16 * FX32_ONE) / 1), 1, 0x0);
     return 1;
 }
 
-static int sub_02065C0C (UnkStruct_02061AB4 * param0)
+static int sub_02065C0C (LocalMapObject * param0)
 {
     sub_02065980(param0, 0, ((16 * FX32_ONE) / 4), 4, ((0x8 + 1)));
     return 1;
 }
 
-static int sub_02065C24 (UnkStruct_02061AB4 * param0)
+static int sub_02065C24 (LocalMapObject * param0)
 {
     sub_02065980(param0, 1, ((16 * FX32_ONE) / 4), 4, ((0x8 + 1)));
     return 1;
 }
 
-static int sub_02065C38 (UnkStruct_02061AB4 * param0)
+static int sub_02065C38 (LocalMapObject * param0)
 {
     sub_02065980(param0, 2, ((16 * FX32_ONE) / 4), 4, ((0x8 + 1)));
     return 1;
 }
 
-static int sub_02065C4C (UnkStruct_02061AB4 * param0)
+static int sub_02065C4C (LocalMapObject * param0)
 {
     sub_02065980(param0, 3, ((16 * FX32_ONE) / 4), 4, ((0x8 + 1)));
     return 1;
 }
 
-static void sub_02065C64 (UnkStruct_02061AB4 * param0, int param1, s16 param2, u16 param3)
+static void sub_02065C64 (LocalMapObject * param0, int param1, s16 param2, u16 param3)
 {
     UnkStruct_02065C64 * v0;
 
@@ -680,7 +680,7 @@ static void sub_02065C64 (UnkStruct_02061AB4 * param0, int param1, s16 param2, u
     sub_02062BC8(param0);
 }
 
-static int sub_02065C98 (UnkStruct_02061AB4 * param0)
+static int sub_02065C98 (LocalMapObject * param0)
 {
     UnkStruct_02065C64 * v0;
 
@@ -698,127 +698,127 @@ static int sub_02065C98 (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_02065CCC (UnkStruct_02061AB4 * param0)
+static int sub_02065CCC (LocalMapObject * param0)
 {
     sub_02065C64(param0, 0, 32, 0x1);
     return 1;
 }
 
-static int sub_02065CDC (UnkStruct_02061AB4 * param0)
+static int sub_02065CDC (LocalMapObject * param0)
 {
     sub_02065C64(param0, 1, 32, 0x1);
     return 1;
 }
 
-static int sub_02065CEC (UnkStruct_02061AB4 * param0)
+static int sub_02065CEC (LocalMapObject * param0)
 {
     sub_02065C64(param0, 2, 32, 0x1);
     return 1;
 }
 
-static int sub_02065CFC (UnkStruct_02061AB4 * param0)
+static int sub_02065CFC (LocalMapObject * param0)
 {
     sub_02065C64(param0, 3, 32, 0x1);
     return 1;
 }
 
-static int sub_02065D0C (UnkStruct_02061AB4 * param0)
+static int sub_02065D0C (LocalMapObject * param0)
 {
     sub_02065C64(param0, 0, 16, 0x2);
     return 1;
 }
 
-static int sub_02065D1C (UnkStruct_02061AB4 * param0)
+static int sub_02065D1C (LocalMapObject * param0)
 {
     sub_02065C64(param0, 1, 16, 0x2);
     return 1;
 }
 
-static int sub_02065D2C (UnkStruct_02061AB4 * param0)
+static int sub_02065D2C (LocalMapObject * param0)
 {
     sub_02065C64(param0, 2, 16, 0x2);
     return 1;
 }
 
-static int sub_02065D3C (UnkStruct_02061AB4 * param0)
+static int sub_02065D3C (LocalMapObject * param0)
 {
     sub_02065C64(param0, 3, 16, 0x2);
     return 1;
 }
 
-static int sub_02065D4C (UnkStruct_02061AB4 * param0)
+static int sub_02065D4C (LocalMapObject * param0)
 {
     sub_02065C64(param0, 0, 8, 0x3);
     return 1;
 }
 
-static int sub_02065D5C (UnkStruct_02061AB4 * param0)
+static int sub_02065D5C (LocalMapObject * param0)
 {
     sub_02065C64(param0, 1, 8, 0x3);
     return 1;
 }
 
-static int sub_02065D6C (UnkStruct_02061AB4 * param0)
+static int sub_02065D6C (LocalMapObject * param0)
 {
     sub_02065C64(param0, 2, 8, 0x3);
     return 1;
 }
 
-static int sub_02065D7C (UnkStruct_02061AB4 * param0)
+static int sub_02065D7C (LocalMapObject * param0)
 {
     sub_02065C64(param0, 3, 8, 0x3);
     return 1;
 }
 
-static int sub_02065D8C (UnkStruct_02061AB4 * param0)
+static int sub_02065D8C (LocalMapObject * param0)
 {
     sub_02065C64(param0, 0, 4, 0x4);
     return 1;
 }
 
-static int sub_02065D9C (UnkStruct_02061AB4 * param0)
+static int sub_02065D9C (LocalMapObject * param0)
 {
     sub_02065C64(param0, 1, 4, 0x4);
     return 1;
 }
 
-static int sub_02065DAC (UnkStruct_02061AB4 * param0)
+static int sub_02065DAC (LocalMapObject * param0)
 {
     sub_02065C64(param0, 2, 4, 0x4);
     return 1;
 }
 
-static int sub_02065DBC (UnkStruct_02061AB4 * param0)
+static int sub_02065DBC (LocalMapObject * param0)
 {
     sub_02065C64(param0, 3, 4, 0x4);
     return 1;
 }
 
-static int sub_02065DCC (UnkStruct_02061AB4 * param0)
+static int sub_02065DCC (LocalMapObject * param0)
 {
     sub_02065C64(param0, 0, 2, 0x5);
     return 1;
 }
 
-static int sub_02065DDC (UnkStruct_02061AB4 * param0)
+static int sub_02065DDC (LocalMapObject * param0)
 {
     sub_02065C64(param0, 1, 2, 0x5);
     return 1;
 }
 
-static int sub_02065DEC (UnkStruct_02061AB4 * param0)
+static int sub_02065DEC (LocalMapObject * param0)
 {
     sub_02065C64(param0, 2, 2, 0x5);
     return 1;
 }
 
-static int sub_02065DFC (UnkStruct_02061AB4 * param0)
+static int sub_02065DFC (LocalMapObject * param0)
 {
     sub_02065C64(param0, 3, 2, 0x5);
     return 1;
 }
 
-static void sub_02065E0C (UnkStruct_02061AB4 * param0, int param1, fx32 param2, s16 param3, u16 param4, s16 param5, u16 param6, u32 param7)
+static void sub_02065E0C (LocalMapObject * param0, int param1, fx32 param2, s16 param3, u16 param4, s16 param5, u16 param6, u32 param7)
 {
     UnkStruct_02065E0C * v0;
 
@@ -847,12 +847,12 @@ static void sub_02065E0C (UnkStruct_02061AB4 * param0, int param1, fx32 param2,
     }
 }
 
-static void sub_02065E7C (UnkStruct_02061AB4 * param0, int param1, fx32 param2, s16 param3, u16 param4, s16 param5, u16 param6)
+static void sub_02065E7C (LocalMapObject * param0, int param1, fx32 param2, s16 param3, u16 param4, s16 param5, u16 param6)
 {
     sub_02065E0C(param0, param1, param2, param3, param4, param5, param6, 1547);
 }
 
-static int sub_02065EA0 (UnkStruct_02061AB4 * param0)
+static int sub_02065EA0 (LocalMapObject * param0)
 {
     UnkStruct_02065E0C * v0;
 
@@ -920,152 +920,152 @@ static int sub_02065EA0 (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_02065F88 (UnkStruct_02061AB4 * param0)
+static int sub_02065F88 (LocalMapObject * param0)
 {
     sub_02065E7C(param0, 0, 0, 16, 0x2, 0, (0x100 * 1));
     return 1;
 }
 
-static int sub_02065FA8 (UnkStruct_02061AB4 * param0)
+static int sub_02065FA8 (LocalMapObject * param0)
 {
     sub_02065E7C(param0, 1, 0, 16, 0x2, 0, (0x100 * 1));
     return 1;
 }
 
-static int sub_02065FC8 (UnkStruct_02061AB4 * param0)
+static int sub_02065FC8 (LocalMapObject * param0)
 {
     sub_02065E7C(param0, 2, 0, 16, 0x2, 0, (0x100 * 1));
     return 1;
 }
 
-static int sub_02065FE8 (UnkStruct_02061AB4 * param0)
+static int sub_02065FE8 (LocalMapObject * param0)
 {
     sub_02065E7C(param0, 3, 0, 16, 0x2, 0, (0x100 * 1));
     return 1;
 }
 
-static int sub_02066008 (UnkStruct_02061AB4 * param0)
+static int sub_02066008 (LocalMapObject * param0)
 {
     sub_02065E7C(param0, 0, 0, 8, 0x3, 0, ((0x100 * 2)));
     return 1;
 }
 
-static int sub_02066028 (UnkStruct_02061AB4 * param0)
+static int sub_02066028 (LocalMapObject * param0)
 {
     sub_02065E7C(param0, 1, 0, 8, 0x3, 0, ((0x100 * 2)));
     return 1;
 }
 
-static int sub_02066048 (UnkStruct_02061AB4 * param0)
+static int sub_02066048 (LocalMapObject * param0)
 {
     sub_02065E7C(param0, 2, 0, 8, 0x3, 0, ((0x100 * 2)));
     return 1;
 }
 
-static int sub_02066068 (UnkStruct_02061AB4 * param0)
+static int sub_02066068 (LocalMapObject * param0)
 {
     sub_02065E7C(param0, 3, 0, 8, 0x3, 0, ((0x100 * 2)));
     return 1;
 }
 
-static int sub_02066088 (UnkStruct_02061AB4 * param0)
+static int sub_02066088 (LocalMapObject * param0)
 {
     sub_02065E7C(param0, 0, ((16 * FX32_ONE) / 8), 8, 0x3, 0, ((0x100 * 2)));
     return 1;
 }
 
-static int sub_020660A8 (UnkStruct_02061AB4 * param0)
+static int sub_020660A8 (LocalMapObject * param0)
 {
     sub_02065E7C(param0, 1, ((16 * FX32_ONE) / 8), 8, 0x3, 0, ((0x100 * 2)));
     return 1;
 }
 
-static int sub_020660CC (UnkStruct_02061AB4 * param0)
+static int sub_020660CC (LocalMapObject * param0)
 {
     sub_02065E7C(param0, 2, ((16 * FX32_ONE) / 8), 8, 0x3, 0, ((0x100 * 2)));
     return 1;
 }
 
-static int sub_020660F0 (UnkStruct_02061AB4 * param0)
+static int sub_020660F0 (LocalMapObject * param0)
 {
     sub_02065E7C(param0, 3, ((16 * FX32_ONE) / 8), 8, 0x3, 0, ((0x100 * 2)));
     return 1;
 }
 
-static int sub_02066110 (UnkStruct_02061AB4 * param0)
+static int sub_02066110 (LocalMapObject * param0)
 {
     sub_02065E7C(param0, 0, ((16 * FX32_ONE) / 8), 8 * 2, 0x3, 0, (0x100 * 1));
     return 1;
 }
 
-static int sub_02066130 (UnkStruct_02061AB4 * param0)
+static int sub_02066130 (LocalMapObject * param0)
 {
     sub_02065E7C(param0, 1, ((16 * FX32_ONE) / 8), 16, 0x3, 0, (0x100 * 1));
     return 1;
 }
 
-static int sub_02066150 (UnkStruct_02061AB4 * param0)
+static int sub_02066150 (LocalMapObject * param0)
 {
     sub_02065E7C(param0, 2, ((16 * FX32_ONE) / 8), 16, 0x3, 0, (0x100 * 1));
 
     return 1;
 }
 
-static int sub_02066170 (UnkStruct_02061AB4 * param0)
+static int sub_02066170 (LocalMapObject * param0)
 {
     sub_02065E7C(param0, 3, ((16 * FX32_ONE) / 8), 16, 0x3, 0, (0x100 * 1));
     return 1;
 }
 
-static int sub_02066194 (UnkStruct_02061AB4 * param0)
+static int sub_02066194 (LocalMapObject * param0)
 {
     sub_02065E7C(param0, 2, ((16 * FX32_ONE) / 16), 16, ((0x8 + 1)), 0, (((0x100 * ((16 - 1)))) / 16));
     return 1;
 }
 
-static int sub_020661B4 (UnkStruct_02061AB4 * param0)
+static int sub_020661B4 (LocalMapObject * param0)
 {
     sub_02065E7C(param0, 3, ((16 * FX32_ONE) / 16), 16, ((0x8 + 1)), 0, (((0x100 * ((16 - 1)))) / 16));
     return 1;
 }
 
-static int sub_020661D8 (UnkStruct_02061AB4 * param0)
+static int sub_020661D8 (LocalMapObject * param0)
 {
     sub_02065E7C(param0, 2, ((16 * FX32_ONE) / 4), 12, ((0x8 + 1) + 1), 0, (((0x100 * ((16 - 1)))) / 12));
     return 1;
 }
 
-static int sub_020661F8 (UnkStruct_02061AB4 * param0)
+static int sub_020661F8 (LocalMapObject * param0)
 {
     sub_02065E7C(param0, 3, ((16 * FX32_ONE) / 4), 12, ((0x8 + 1) + 1), 0, (((0x100 * ((16 - 1)))) / 12));
     return 1;
 }
 
-static int sub_0206621C (UnkStruct_02061AB4 * param0)
+static int sub_0206621C (LocalMapObject * param0)
 {
     sub_02065E0C(param0, 0, ((16 * FX32_ONE) / 8), 8 * 3, 0x3, 0, (((0x100 * ((16 - 1)))) / 24), 0);
     return 1;
 }
 
-static int sub_02066240 (UnkStruct_02061AB4 * param0)
+static int sub_02066240 (LocalMapObject * param0)
 {
     sub_02065E0C(param0, 1, ((16 * FX32_ONE) / 8), 8 * 3, 0x3, 0, (((0x100 * ((16 - 1)))) / 24), 0);
     return 1;
 }
 
-static int sub_02066264 (UnkStruct_02061AB4 * param0)
+static int sub_02066264 (LocalMapObject * param0)
 {
     sub_02065E0C(param0, 2, ((16 * FX32_ONE) / 8), 8 * 3, 0x3, 0, (((0x100 * ((16 - 1)))) / 24), 0);
     return 1;
 }
 
-static int sub_02066288 (UnkStruct_02061AB4 * param0)
+static int sub_02066288 (LocalMapObject * param0)
 {
     sub_02065E0C(param0, 3, ((16 * FX32_ONE) / 8), 8 * 3, 0x3, 0, (((0x100 * ((16 - 1)))) / 24), 0);
     return 1;
 }
 
-static void sub_020662AC (UnkStruct_02061AB4 * param0, int param1)
+static void sub_020662AC (LocalMapObject * param0, int param1)
 {
     UnkStruct_020662AC * v0;
 
@@ -1075,7 +1075,7 @@ static void sub_020662AC (UnkStruct_02061AB4 * param0, int param1)
     sub_02062BC8(param0);
 }
 
-static int sub_020662C4 (UnkStruct_02061AB4 * param0)
+static int sub_020662C4 (LocalMapObject * param0)
 {
     UnkStruct_020662AC * v0;
 
@@ -1090,49 +1090,49 @@ static int sub_020662C4 (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_020662E4 (UnkStruct_02061AB4 * param0)
+static int sub_020662E4 (LocalMapObject * param0)
 {
     sub_020662AC(param0, 1);
     return 1;
 }
 
-static int sub_020662F0 (UnkStruct_02061AB4 * param0)
+static int sub_020662F0 (LocalMapObject * param0)
 {
     sub_020662AC(param0, 2);
     return 1;
 }
 
-static int sub_020662FC (UnkStruct_02061AB4 * param0)
+static int sub_020662FC (LocalMapObject * param0)
 {
     sub_020662AC(param0, 4);
     return 1;
 }
 
-static int sub_02066308 (UnkStruct_02061AB4 * param0)
+static int sub_02066308 (LocalMapObject * param0)
 {
     sub_020662AC(param0, 8);
     return 1;
 }
 
-static int sub_02066314 (UnkStruct_02061AB4 * param0)
+static int sub_02066314 (LocalMapObject * param0)
 {
     sub_020662AC(param0, 15);
     return 1;
 }
 
-static int sub_02066320 (UnkStruct_02061AB4 * param0)
+static int sub_02066320 (LocalMapObject * param0)
 {
     sub_020662AC(param0, 16);
     return 1;
 }
 
-static int sub_0206632C (UnkStruct_02061AB4 * param0)
+static int sub_0206632C (LocalMapObject * param0)
 {
     sub_020662AC(param0, 32);
     return 1;
 }
 
-static int sub_02066338 (UnkStruct_02061AB4 * param0)
+static int sub_02066338 (LocalMapObject * param0)
 {
     UnkStruct_02066338 * v0;
 
@@ -1145,7 +1145,7 @@ static int sub_02066338 (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_0206635C (UnkStruct_02061AB4 * param0)
+static int sub_0206635C (LocalMapObject * param0)
 {
     int v0;
     UnkStruct_02066338 * v1;
@@ -1170,7 +1170,7 @@ static int sub_0206635C (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_020663A4 (UnkStruct_02061AB4 * param0)
+static int sub_020663A4 (LocalMapObject * param0)
 {
     UnkStruct_02066338 * v0;
 
@@ -1185,7 +1185,7 @@ static int sub_020663A4 (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_020663D0 (UnkStruct_02061AB4 * param0)
+static int sub_020663D0 (LocalMapObject * param0)
 {
     UnkStruct_02066338 * v0;
 
@@ -1211,7 +1211,7 @@ static int sub_020663D0 (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_02066418 (UnkStruct_02061AB4 * param0)
+static int sub_02066418 (LocalMapObject * param0)
 {
     sub_020628BC(param0, (1 << 9));
     sub_02062BC8(param0);
@@ -1219,7 +1219,7 @@ static int sub_02066418 (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_02066430 (UnkStruct_02061AB4 * param0)
+static int sub_02066430 (LocalMapObject * param0)
 {
     sub_020628C4(param0, (1 << 9));
     sub_02062BC8(param0);
@@ -1227,7 +1227,7 @@ static int sub_02066430 (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_02066448 (UnkStruct_02061AB4 * param0)
+static int sub_02066448 (LocalMapObject * param0)
 {
     sub_020628BC(param0, (1 << 7));
     sub_02062BC8(param0);
@@ -1235,7 +1235,7 @@ static int sub_02066448 (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_0206645C (UnkStruct_02061AB4 * param0)
+static int sub_0206645C (LocalMapObject * param0)
 {
     sub_020628C4(param0, (1 << 7));
     sub_02062BC8(param0);
@@ -1243,7 +1243,7 @@ static int sub_0206645C (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_02066470 (UnkStruct_02061AB4 * param0)
+static int sub_02066470 (LocalMapObject * param0)
 {
     sub_020628BC(param0, (1 << 8));
     sub_02062BC8(param0);
@@ -1251,7 +1251,7 @@ static int sub_02066470 (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_02066488 (UnkStruct_02061AB4 * param0)
+static int sub_02066488 (LocalMapObject * param0)
 {
     sub_020628C4(param0, (1 << 8));
     sub_02062BC8(param0);
@@ -1259,7 +1259,7 @@ static int sub_02066488 (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static void sub_020664A0 (UnkStruct_02061AB4 * param0, int param1, int param2)
+static void sub_020664A0 (LocalMapObject * param0, int param1, int param2)
 {
     UnkStruct_020664A0 * v0;
 
@@ -1271,7 +1271,7 @@ static void sub_020664A0 (UnkStruct_02061AB4 * param0, int param1, int param2)
     sub_02062BC8(param0);
 }
 
-static int sub_020664C8 (UnkStruct_02061AB4 * param0)
+static int sub_020664C8 (LocalMapObject * param0)
 {
     UnkStruct_020664A0 * v0;
 
@@ -1286,25 +1286,25 @@ static int sub_020664C8 (UnkStruct_02061AB4 * param0)
     return 0;
 }
 
-static int sub_020664F0 (UnkStruct_02061AB4 * param0)
+static int sub_020664F0 (LocalMapObject * param0)
 {
     sub_020664A0(param0, 0, 0);
     return 0;
 }
 
-static int sub_02066500 (UnkStruct_02061AB4 * param0)
+static int sub_02066500 (LocalMapObject * param0)
 {
     sub_020664A0(param0, 1, 0);
     return 0;
 }
 
-static int sub_02066510 (UnkStruct_02061AB4 * param0)
+static int sub_02066510 (LocalMapObject * param0)
 {
     sub_020664A0(param0, 0, 1);
     return 0;
 }
 
-static void sub_02066520 (UnkStruct_02061AB4 * param0, int param1, s16 param2, u16 param3)
+static void sub_02066520 (LocalMapObject * param0, int param1, s16 param2, u16 param3)
 {
     UnkStruct_02066520 * v0;
 
@@ -1321,7 +1321,7 @@ static void sub_02066520 (UnkStruct_02061AB4 * param0, int param1, s16 param2, u
     sub_02062BC8(param0);
 }
 
-static int sub_02066560 (UnkStruct_02061AB4 * param0, const fx32 * param1)
+static int sub_02066560 (LocalMapObject * param0, const fx32 * param1)
 {
     UnkStruct_02066520 * v0;
 
@@ -1345,31 +1345,31 @@ static int sub_02066560 (UnkStruct_02061AB4 * param0, const fx32 * param1)
     return 1;
 }
 
-static int sub_020665C0 (UnkStruct_02061AB4 * param0)
+static int sub_020665C0 (LocalMapObject * param0)
 {
     sub_02066520(param0, 0, 6, 0x6);
     return 1;
 }
 
-static int sub_020665D0 (UnkStruct_02061AB4 * param0)
+static int sub_020665D0 (LocalMapObject * param0)
 {
     sub_02066520(param0, 1, 6, 0x6);
     return 1;
 }
 
-static int sub_020665E0 (UnkStruct_02061AB4 * param0)
+static int sub_020665E0 (LocalMapObject * param0)
 {
     sub_02066520(param0, 2, 6, 0x6);
     return 1;
 }
 
-static int sub_020665F0 (UnkStruct_02061AB4 * param0)
+static int sub_020665F0 (LocalMapObject * param0)
 {
     sub_02066520(param0, 3, 6, 0x6);
     return 1;
 }
 
-static int sub_02066600 (UnkStruct_02061AB4 * param0)
+static int sub_02066600 (LocalMapObject * param0)
 {
     if (sub_02066560(param0, Unk_020EEE6C) == 1) {
         return 1;
@@ -1378,31 +1378,31 @@ static int sub_02066600 (UnkStruct_02061AB4 * param0)
     return 0;
 }
 
-static int sub_02066618 (UnkStruct_02061AB4 * param0)
+static int sub_02066618 (LocalMapObject * param0)
 {
     sub_02066520(param0, 0, 3, 0x7);
     return 1;
 }
 
-static int sub_02066628 (UnkStruct_02061AB4 * param0)
+static int sub_02066628 (LocalMapObject * param0)
 {
     sub_02066520(param0, 1, 3, 0x7);
     return 1;
 }
 
-static int sub_02066638 (UnkStruct_02061AB4 * param0)
+static int sub_02066638 (LocalMapObject * param0)
 {
     sub_02066520(param0, 2, 3, 0x7);
     return 1;
 }
 
-static int sub_02066648 (UnkStruct_02061AB4 * param0)
+static int sub_02066648 (LocalMapObject * param0)
 {
     sub_02066520(param0, 3, 3, 0x7);
     return 1;
 }
 
-static int sub_02066658 (UnkStruct_02061AB4 * param0)
+static int sub_02066658 (LocalMapObject * param0)
 {
     if (sub_02066560(param0, Unk_020EECEC) == 1) {
         return 1;
@@ -1411,31 +1411,31 @@ static int sub_02066658 (UnkStruct_02061AB4 * param0)
     return 0;
 }
 
-static int sub_02066670 (UnkStruct_02061AB4 * param0)
+static int sub_02066670 (LocalMapObject * param0)
 {
     sub_02066520(param0, 0, 7, 0x8);
     return 1;
 }
 
-static int sub_02066680 (UnkStruct_02061AB4 * param0)
+static int sub_02066680 (LocalMapObject * param0)
 {
     sub_02066520(param0, 1, 7, 0x8);
     return 1;
 }
 
-static int sub_02066690 (UnkStruct_02061AB4 * param0)
+static int sub_02066690 (LocalMapObject * param0)
 {
     sub_02066520(param0, 2, 7, 0x8);
     return 1;
 }
 
-static int sub_020666A0 (UnkStruct_02061AB4 * param0)
+static int sub_020666A0 (LocalMapObject * param0)
 {
     sub_02066520(param0, 3, 7, 0x8);
     return 1;
 }
 
-static int sub_020666B0 (UnkStruct_02061AB4 * param0)
+static int sub_020666B0 (LocalMapObject * param0)
 {
     if (sub_02066560(param0, Unk_020EEE84) == 1) {
         return 1;
@@ -1444,7 +1444,7 @@ static int sub_020666B0 (UnkStruct_02061AB4 * param0)
     return 0;
 }
 
-static int sub_020666C8 (UnkStruct_02061AB4 * param0)
+static int sub_020666C8 (LocalMapObject * param0)
 {
     UnkStruct_020666C8 * v0 = sub_02062AA4(param0, (sizeof(UnkStruct_020666C8)));
 
@@ -1454,7 +1454,7 @@ static int sub_020666C8 (UnkStruct_02061AB4 * param0)
     return 0;
 }
 
-static int sub_020666E4 (UnkStruct_02061AB4 * param0)
+static int sub_020666E4 (LocalMapObject * param0)
 {
     UnkStruct_020666C8 * v0 = sub_02062AC8(param0);
 
@@ -1469,7 +1469,7 @@ static int sub_020666E4 (UnkStruct_02061AB4 * param0)
     return 0;
 }
 
-static int sub_02066710 (UnkStruct_02061AB4 * param0)
+static int sub_02066710 (LocalMapObject * param0)
 {
     UnkStruct_02066710 * v0 = sub_02062AA4(param0, (sizeof(UnkStruct_02066710)));
 
@@ -1495,7 +1495,7 @@ static int sub_02066710 (UnkStruct_02061AB4 * param0)
     return 0;
 }
 
-static int sub_02066764 (UnkStruct_02061AB4 * param0)
+static int sub_02066764 (LocalMapObject * param0)
 {
     UnkStruct_02066710 * v0 = sub_02062AC8(param0);
     const fx32 * v1 = Unk_02100B84[0];
@@ -1520,7 +1520,7 @@ static int sub_02066764 (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_020667CC (UnkStruct_02061AB4 * param0)
+static int sub_020667CC (LocalMapObject * param0)
 {
     UnkStruct_020667CC * v0 = sub_02062AA4(param0, (sizeof(UnkStruct_020667CC)));
 
@@ -1530,7 +1530,7 @@ static int sub_020667CC (UnkStruct_02061AB4 * param0)
     return 0;
 }
 
-static int sub_020667E8 (UnkStruct_02061AB4 * param0)
+static int sub_020667E8 (LocalMapObject * param0)
 {
     UnkStruct_020667CC * v0 = sub_02062AA4(param0, (sizeof(UnkStruct_020667CC)));
 
@@ -1540,7 +1540,7 @@ static int sub_020667E8 (UnkStruct_02061AB4 * param0)
     return 0;
 }
 
-static int sub_02066804 (UnkStruct_02061AB4 * param0)
+static int sub_02066804 (LocalMapObject * param0)
 {
     UnkStruct_020667CC * v0 = sub_02062AC8(param0);
 
@@ -1554,7 +1554,7 @@ static int sub_02066804 (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static void sub_02066824 (UnkStruct_02061AB4 * param0, const VecFx32 * param1, int param2, int param3, int param4, u8 param5)
+static void sub_02066824 (LocalMapObject * param0, const VecFx32 * param1, int param2, int param3, int param4, u8 param5)
 {
     UnkStruct_02066824 * v0;
 
@@ -1592,7 +1592,7 @@ static void sub_02066824 (UnkStruct_02061AB4 * param0, const VecFx32 * param1, i
     sub_02062BC8(param0);
 }
 
-static int sub_020668EC (UnkStruct_02061AB4 * param0)
+static int sub_020668EC (LocalMapObject * param0)
 {
     UnkStruct_02066824 * v0;
 
@@ -1616,7 +1616,7 @@ static int sub_020668EC (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_02066934 (UnkStruct_02061AB4 * param0)
+static int sub_02066934 (LocalMapObject * param0)
 {
     VecFx32 v0 = {0, ((16 * FX32_ONE) / 8), 0};
 
@@ -1624,7 +1624,7 @@ static int sub_02066934 (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_02066968 (UnkStruct_02061AB4 * param0)
+static int sub_02066968 (LocalMapObject * param0)
 {
     VecFx32 v0 = {0, -((16 * FX32_ONE) / 8), 0};
 
@@ -1632,7 +1632,7 @@ static int sub_02066968 (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_02066998 (UnkStruct_02061AB4 * param0)
+static int sub_02066998 (LocalMapObject * param0)
 {
     VecFx32 v0 = {0, 0, ((16 * FX32_ONE) / 8)};
 
@@ -1640,7 +1640,7 @@ static int sub_02066998 (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_020669CC (UnkStruct_02061AB4 * param0)
+static int sub_020669CC (LocalMapObject * param0)
 {
     VecFx32 v0 = {0, 0, -((16 * FX32_ONE) / 8)};
 
@@ -1648,7 +1648,7 @@ static int sub_020669CC (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_020669FC (UnkStruct_02061AB4 * param0)
+static int sub_020669FC (LocalMapObject * param0)
 {
     VecFx32 v0 = {0, ((16 * FX32_ONE) / 8), 0};
 
@@ -1656,7 +1656,7 @@ static int sub_020669FC (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_02066A2C (UnkStruct_02061AB4 * param0)
+static int sub_02066A2C (LocalMapObject * param0)
 {
     VecFx32 v0 = {0, -((16 * FX32_ONE) / 8), 0};
 
@@ -1664,7 +1664,7 @@ static int sub_02066A2C (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_02066A60 (UnkStruct_02061AB4 * param0)
+static int sub_02066A60 (LocalMapObject * param0)
 {
     VecFx32 v0 = {0, 0, -((16 * FX32_ONE) / 8)};
 
@@ -1672,7 +1672,7 @@ static int sub_02066A60 (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_02066A94 (UnkStruct_02061AB4 * param0)
+static int sub_02066A94 (LocalMapObject * param0)
 {
     VecFx32 v0 = {0, 0, ((16 * FX32_ONE) / 8)};
 
@@ -1680,7 +1680,7 @@ static int sub_02066A94 (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_02066AC8 (UnkStruct_02061AB4 * param0)
+static int sub_02066AC8 (LocalMapObject * param0)
 {
     VecFx32 v0 = {0, 0, ((16 * FX32_ONE) / 8)};
 
@@ -1688,7 +1688,7 @@ static int sub_02066AC8 (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_02066AFC (UnkStruct_02061AB4 * param0)
+static int sub_02066AFC (LocalMapObject * param0)
 {
     VecFx32 v0 = {0, 0, -((16 * FX32_ONE) / 8)};
 
@@ -1696,7 +1696,7 @@ static int sub_02066AFC (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_02066B30 (UnkStruct_02061AB4 * param0)
+static int sub_02066B30 (LocalMapObject * param0)
 {
     VecFx32 v0 = {-((16 * FX32_ONE) / 8), 0, 0};
 
@@ -1704,7 +1704,7 @@ static int sub_02066B30 (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_02066B60 (UnkStruct_02061AB4 * param0)
+static int sub_02066B60 (LocalMapObject * param0)
 {
     VecFx32 v0 = {((16 * FX32_ONE) / 8), 0, 0};
 
@@ -1712,7 +1712,7 @@ static int sub_02066B60 (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_02066B90 (UnkStruct_02061AB4 * param0)
+static int sub_02066B90 (LocalMapObject * param0)
 {
     VecFx32 v0 = {0, 0, ((16 * FX32_ONE) / 4)};
 
@@ -1720,7 +1720,7 @@ static int sub_02066B90 (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_02066BC0 (UnkStruct_02061AB4 * param0)
+static int sub_02066BC0 (LocalMapObject * param0)
 {
     VecFx32 v0 = {0, 0, -((16 * FX32_ONE) / 4)};
 
@@ -1728,7 +1728,7 @@ static int sub_02066BC0 (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_02066BF0 (UnkStruct_02061AB4 * param0)
+static int sub_02066BF0 (LocalMapObject * param0)
 {
     VecFx32 v0 = {-((16 * FX32_ONE) / 4), 0, 0};
 
@@ -1736,7 +1736,7 @@ static int sub_02066BF0 (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_02066C20 (UnkStruct_02061AB4 * param0)
+static int sub_02066C20 (LocalMapObject * param0)
 {
     VecFx32 v0 = {((16 * FX32_ONE) / 4), 0, 0};
 
@@ -1744,7 +1744,7 @@ static int sub_02066C20 (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_02066C50 (UnkStruct_02061AB4 * param0)
+static int sub_02066C50 (LocalMapObject * param0)
 {
     VecFx32 v0 = {0, 0, ((16 * FX32_ONE) / 2)};
 
@@ -1752,7 +1752,7 @@ static int sub_02066C50 (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_02066C84 (UnkStruct_02061AB4 * param0)
+static int sub_02066C84 (LocalMapObject * param0)
 {
     VecFx32 v0 = {0, 0, -((16 * FX32_ONE) / 2)};
 
@@ -1760,7 +1760,7 @@ static int sub_02066C84 (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_02066CB8 (UnkStruct_02061AB4 * param0)
+static int sub_02066CB8 (LocalMapObject * param0)
 {
     VecFx32 v0 = {-((16 * FX32_ONE) / 2), 0, 0};
 
@@ -1768,7 +1768,7 @@ static int sub_02066CB8 (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_02066CE8 (UnkStruct_02061AB4 * param0)
+static int sub_02066CE8 (LocalMapObject * param0)
 {
     VecFx32 v0 = {((16 * FX32_ONE) / 2), 0, 0};
 
@@ -1776,7 +1776,7 @@ static int sub_02066CE8 (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_02066D18 (UnkStruct_02061AB4 * param0)
+static int sub_02066D18 (LocalMapObject * param0)
 {
     VecFx32 v0 = {0, ((16 * FX32_ONE) / 4), 0};
 
@@ -1784,7 +1784,7 @@ static int sub_02066D18 (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_02066D4C (UnkStruct_02061AB4 * param0)
+static int sub_02066D4C (LocalMapObject * param0)
 {
     VecFx32 v0 = {0, -((16 * FX32_ONE) / 4), 0};
 
@@ -1792,7 +1792,7 @@ static int sub_02066D4C (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_02066D80 (UnkStruct_02061AB4 * param0)
+static int sub_02066D80 (LocalMapObject * param0)
 {
     VecFx32 v0 = {0, 0, ((16 * FX32_ONE) / 4)};
 
@@ -1800,7 +1800,7 @@ static int sub_02066D80 (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_02066DB4 (UnkStruct_02061AB4 * param0)
+static int sub_02066DB4 (LocalMapObject * param0)
 {
     VecFx32 v0 = {0, 0, -((16 * FX32_ONE) / 4)};
 
@@ -1808,7 +1808,7 @@ static int sub_02066DB4 (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_02066DE8 (UnkStruct_02061AB4 * param0)
+static int sub_02066DE8 (LocalMapObject * param0)
 {
     VecFx32 v0 = {0, ((16 * FX32_ONE) / 4), 0};
 
@@ -1816,7 +1816,7 @@ static int sub_02066DE8 (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_02066E1C (UnkStruct_02061AB4 * param0)
+static int sub_02066E1C (LocalMapObject * param0)
 {
     VecFx32 v0 = {0, -((16 * FX32_ONE) / 4), 0};
 
@@ -1824,7 +1824,7 @@ static int sub_02066E1C (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_02066E50 (UnkStruct_02061AB4 * param0)
+static int sub_02066E50 (LocalMapObject * param0)
 {
     VecFx32 v0 = {0, 0, -((16 * FX32_ONE) / 4)};
 
@@ -1832,7 +1832,7 @@ static int sub_02066E50 (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_02066E84 (UnkStruct_02061AB4 * param0)
+static int sub_02066E84 (LocalMapObject * param0)
 {
     VecFx32 v0 = {0, 0, ((16 * FX32_ONE) / 4)};
 
@@ -1840,7 +1840,7 @@ static int sub_02066E84 (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_02066EB8 (UnkStruct_02061AB4 * param0)
+static int sub_02066EB8 (LocalMapObject * param0)
 {
     VecFx32 v0 = {0, 0, ((16 * FX32_ONE) / 4)};
 
@@ -1848,7 +1848,7 @@ static int sub_02066EB8 (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_02066EEC (UnkStruct_02061AB4 * param0)
+static int sub_02066EEC (LocalMapObject * param0)
 {
     VecFx32 v0 = {0, 0, -((16 * FX32_ONE) / 4)};
 
@@ -1856,7 +1856,7 @@ static int sub_02066EEC (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_02066F20 (UnkStruct_02061AB4 * param0)
+static int sub_02066F20 (LocalMapObject * param0)
 {
     VecFx32 v0 = {-((16 * FX32_ONE) / 4), 0, 0};
 
@@ -1864,7 +1864,7 @@ static int sub_02066F20 (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_02066F54 (UnkStruct_02061AB4 * param0)
+static int sub_02066F54 (LocalMapObject * param0)
 {
     VecFx32 v0 = {((16 * FX32_ONE) / 4), 0, 0};
 
@@ -1872,7 +1872,7 @@ static int sub_02066F54 (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static void sub_02066F88 (UnkStruct_02061AB4 * param0, fx32 param1, int param2, int param3, u8 param4, u8 param5, u8 param6, u8 param7, u8 param8)
+static void sub_02066F88 (LocalMapObject * param0, fx32 param1, int param2, int param3, u8 param4, u8 param5, u8 param6, u8 param7, u8 param8)
 {
     int v0 = 1;
     UnkStruct_02066F88 * v1;
@@ -1926,7 +1926,7 @@ static void sub_02066F88 (UnkStruct_02061AB4 * param0, fx32 param1, int param2,
     sub_02062BC8(param0);
 }
 
-static int sub_02067068 (UnkStruct_02061AB4 * param0)
+static int sub_02067068 (LocalMapObject * param0)
 {
     fx32 v0;
     VecFx32 v1;
@@ -2044,691 +2044,691 @@ static int sub_02067068 (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static int sub_020671F0 (UnkStruct_02061AB4 * param0)
+static int sub_020671F0 (LocalMapObject * param0)
 {
     sub_02066F88(param0, ((16 * FX32_ONE) / 8), 2, 0, 8, 0x3, 1, 1, 0);
     return 1;
 }
 
-static int sub_02067214 (UnkStruct_02061AB4 * param0)
+static int sub_02067214 (LocalMapObject * param0)
 {
     sub_02066F88(param0, -((16 * FX32_ONE) / 8), 3, 1, 8, 0x3, 1, 1, 0);
     return 1;
 }
 
-static int sub_0206723C (UnkStruct_02061AB4 * param0)
+static int sub_0206723C (LocalMapObject * param0)
 {
     sub_02066F88(param0, ((16 * FX32_ONE) / 8), 1, 2, 8, 0x3, 2, 1, 0);
     return 1;
 }
 
-static int sub_02067260 (UnkStruct_02061AB4 * param0)
+static int sub_02067260 (LocalMapObject * param0)
 {
     sub_02066F88(param0, -((16 * FX32_ONE) / 8), 0, 3, 8, 0x3, 2, 1, 0);
     return 1;
 }
 
-static int sub_02067288 (UnkStruct_02061AB4 * param0)
+static int sub_02067288 (LocalMapObject * param0)
 {
     sub_02066F88(param0, ((16 * FX32_ONE) / 8), 3, 0, 8, 0x3, 1, 1, 0);
     return 1;
 }
 
-static int sub_020672AC (UnkStruct_02061AB4 * param0)
+static int sub_020672AC (LocalMapObject * param0)
 {
     sub_02066F88(param0, -((16 * FX32_ONE) / 8), 2, 1, 8, 0x3, 1, 1, 0);
     return 1;
 }
 
-static int sub_020672D4 (UnkStruct_02061AB4 * param0)
+static int sub_020672D4 (LocalMapObject * param0)
 {
     sub_02066F88(param0, -((16 * FX32_ONE) / 8), 0, 2, 8, 0x3, 2, 1, 0);
     return 1;
 }
 
-static int sub_020672FC (UnkStruct_02061AB4 * param0)
+static int sub_020672FC (LocalMapObject * param0)
 {
     sub_02066F88(param0, ((16 * FX32_ONE) / 8), 1, 2, 8, 0x3, 2, 1, 0);
     return 1;
 }
 
-static int sub_02067320 (UnkStruct_02061AB4 * param0)
+static int sub_02067320 (LocalMapObject * param0)
 {
     sub_02066F88(param0, ((16 * FX32_ONE) / 8), 1, 0, 8, 0x3, 2, 1, 0);
     return 1;
 }
 
-static int sub_02067344 (UnkStruct_02061AB4 * param0)
+static int sub_02067344 (LocalMapObject * param0)
 {
     sub_02066F88(param0, -((16 * FX32_ONE) / 8), 0, 1, 8, 0x3, 2, 1, 0);
     return 1;
 }
 
-static int sub_0206736C (UnkStruct_02061AB4 * param0)
+static int sub_0206736C (LocalMapObject * param0)
 {
     sub_02066F88(param0, -((16 * FX32_ONE) / 8), 3, 2, 8, 0x3, 0, 1, 0);
     return 1;
 }
 
-static int sub_02067394 (UnkStruct_02061AB4 * param0)
+static int sub_02067394 (LocalMapObject * param0)
 {
     sub_02066F88(param0, ((16 * FX32_ONE) / 8), 2, 3, 8, 0x3, 0, 1, 0);
     return 1;
 }
 
-int(*const Unk_020EEC78[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EEC78[])(LocalMapObject *) = {
     sub_02065950, sub_02065924,
 };
 
-int(*const Unk_020EEC48[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EEC48[])(LocalMapObject *) = {
     sub_0206595C, sub_02065924,
 };
 
-int(*const Unk_020EEC88[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EEC88[])(LocalMapObject *) = {
     sub_02065968, sub_02065924,
 };
 
-int(*const Unk_020EEC80[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EEC80[])(LocalMapObject *) = {
     sub_02065974, sub_02065924,
 };
 
-int(*const Unk_020EF59C[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF59C[])(LocalMapObject *) = {
     sub_02065A1C, sub_020659C8, sub_02065924,
 };
 
-int(*const Unk_020EF590[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF590[])(LocalMapObject *) = {
     sub_02065A30, sub_020659C8, sub_02065924,
 };
 
-int(*const Unk_020EF584[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF584[])(LocalMapObject *) = {
     sub_02065A44, sub_020659C8, sub_02065924,
 };
 
-int(*const Unk_020EF578[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF578[])(LocalMapObject *) = {
     sub_02065A58, sub_020659C8, sub_02065924,
 };
 
-int(*const Unk_020EF56C[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF56C[])(LocalMapObject *) = {
     sub_02065A6C, sub_020659C8, sub_02065924,
 };
 
-int(*const Unk_020EF560[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF560[])(LocalMapObject *) = {
     sub_02065A80, sub_020659C8, sub_02065924,
 };
 
-int(*const Unk_020EF554[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF554[])(LocalMapObject *) = {
     sub_02065A94, sub_020659C8, sub_02065924,
 };
 
-int(*const Unk_020EF548[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF548[])(LocalMapObject *) = {
     sub_02065AA8, sub_020659C8, sub_02065924,
 };
 
-int(*const Unk_020EF53C[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF53C[])(LocalMapObject *) = {
     sub_02065ABC, sub_020659C8, sub_02065924,
 };
 
-int(*const Unk_020EF530[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF530[])(LocalMapObject *) = {
     sub_02065AD4, sub_020659C8, sub_02065924,
 };
 
-int(*const Unk_020EF524[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF524[])(LocalMapObject *) = {
     sub_02065AE8, sub_020659C8, sub_02065924,
 };
 
-int(*const Unk_020EF518[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF518[])(LocalMapObject *) = {
     sub_02065AFC, sub_020659C8, sub_02065924,
 };
 
-int(*const Unk_020EF50C[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF50C[])(LocalMapObject *) = {
     sub_02065B10, sub_020659C8, sub_02065924,
 };
 
-int(*const Unk_020EF500[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF500[])(LocalMapObject *) = {
     sub_02065B24, sub_020659C8, sub_02065924,
 };
 
-int(*const Unk_020EF4F4[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF4F4[])(LocalMapObject *) = {
     sub_02065B38, sub_020659C8, sub_02065924,
 };
 
-int(*const Unk_020EF4E8[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF4E8[])(LocalMapObject *) = {
     sub_02065B4C, sub_020659C8, sub_02065924,
 };
 
-int(*const Unk_020EF4DC[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF4DC[])(LocalMapObject *) = {
     sub_02065B60, sub_020659C8, sub_02065924,
 };
 
-int(*const Unk_020EF4D0[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF4D0[])(LocalMapObject *) = {
     sub_02065B78, sub_020659C8, sub_02065924,
 };
 
-int(*const Unk_020EF4C4[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF4C4[])(LocalMapObject *) = {
     sub_02065B8C, sub_020659C8, sub_02065924,
 };
 
-int(*const Unk_020EF4B8[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF4B8[])(LocalMapObject *) = {
     sub_02065BA0, sub_020659C8, sub_02065924,
 };
 
-int(*const Unk_020EF4AC[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF4AC[])(LocalMapObject *) = {
     sub_02065BB8, sub_020659C8, sub_02065924,
 };
 
-int(*const Unk_020EF4A0[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF4A0[])(LocalMapObject *) = {
     sub_02065BCC, sub_020659C8, sub_02065924,
 };
 
-int(*const Unk_020EF494[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF494[])(LocalMapObject *) = {
     sub_02065BE0, sub_020659C8, sub_02065924,
 };
 
-int(*const Unk_020EF488[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF488[])(LocalMapObject *) = {
     sub_02065BF4, sub_020659C8, sub_02065924,
 };
 
-int(*const Unk_020EF47C[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF47C[])(LocalMapObject *) = {
     sub_02065CCC, sub_02065C98, sub_02065924,
 };
 
-int(*const Unk_020EF230[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF230[])(LocalMapObject *) = {
     sub_02065CDC, sub_02065C98, sub_02065924,
 };
 
-int(*const Unk_020EF458[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF458[])(LocalMapObject *) = {
     sub_02065CEC, sub_02065C98, sub_02065924,
 };
 
-int(*const Unk_020EF464[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF464[])(LocalMapObject *) = {
     sub_02065CFC, sub_02065C98, sub_02065924,
 };
 
-int(*const Unk_020EF5A8[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF5A8[])(LocalMapObject *) = {
     sub_02065D0C, sub_02065C98, sub_02065924,
 };
 
-int(*const Unk_020EF5B4[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF5B4[])(LocalMapObject *) = {
     sub_02065D1C, sub_02065C98, sub_02065924,
 };
 
-int(*const Unk_020EF434[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF434[])(LocalMapObject *) = {
     sub_02065D2C, sub_02065C98, sub_02065924,
 };
 
-int(*const Unk_020EF428[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF428[])(LocalMapObject *) = {
     sub_02065D3C, sub_02065C98, sub_02065924,
 };
 
-int(*const Unk_020EF41C[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF41C[])(LocalMapObject *) = {
     sub_02065D4C, sub_02065C98, sub_02065924,
 };
 
-int(*const Unk_020EF410[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF410[])(LocalMapObject *) = {
     sub_02065D5C, sub_02065C98, sub_02065924,
 };
 
-int(*const Unk_020EF404[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF404[])(LocalMapObject *) = {
     sub_02065D6C, sub_02065C98, sub_02065924,
 };
 
-int(*const Unk_020EF3F8[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF3F8[])(LocalMapObject *) = {
     sub_02065D7C, sub_02065C98, sub_02065924,
 };
 
-int(*const Unk_020EF3EC[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF3EC[])(LocalMapObject *) = {
     sub_02065D8C, sub_02065C98, sub_02065924,
 };
 
-int(*const Unk_020EF3E0[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF3E0[])(LocalMapObject *) = {
     sub_02065D9C, sub_02065C98, sub_02065924,
 };
 
-int(*const Unk_020EF3D4[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF3D4[])(LocalMapObject *) = {
     sub_02065DAC, sub_02065C98, sub_02065924,
 };
 
-int(*const Unk_020EF3C8[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF3C8[])(LocalMapObject *) = {
     sub_02065DBC, sub_02065C98, sub_02065924,
 };
 
-int(*const Unk_020EF3BC[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF3BC[])(LocalMapObject *) = {
     sub_02065DCC, sub_02065C98, sub_02065924,
 };
 
-int(*const Unk_020EF3B0[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF3B0[])(LocalMapObject *) = {
     sub_02065DDC, sub_02065C98, sub_02065924,
 };
 
-int(*const Unk_020EF3A4[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF3A4[])(LocalMapObject *) = {
     sub_02065DEC, sub_02065C98, sub_02065924,
 };
 
-int(*const Unk_020EF398[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF398[])(LocalMapObject *) = {
     sub_02065DFC, sub_02065C98, sub_02065924,
 };
 
-int(*const Unk_020EF38C[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF38C[])(LocalMapObject *) = {
     sub_02065F88, sub_02065EA0, sub_02065924,
 };
 
-int(*const Unk_020EF380[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF380[])(LocalMapObject *) = {
     sub_02065FA8, sub_02065EA0, sub_02065924,
 };
 
-int(*const Unk_020EF374[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF374[])(LocalMapObject *) = {
     sub_02065FC8, sub_02065EA0, sub_02065924,
 };
 
-int(*const Unk_020EF368[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF368[])(LocalMapObject *) = {
     sub_02065FE8, sub_02065EA0, sub_02065924,
 };
 
-int(*const Unk_020EF35C[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF35C[])(LocalMapObject *) = {
     sub_02066008, sub_02065EA0, sub_02065924,
 };
 
-int(*const Unk_020EF350[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF350[])(LocalMapObject *) = {
     sub_02066028, sub_02065EA0, sub_02065924,
 };
 
-int(*const Unk_020EF344[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF344[])(LocalMapObject *) = {
     sub_02066048, sub_02065EA0, sub_02065924,
 };
 
-int(*const Unk_020EF338[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF338[])(LocalMapObject *) = {
     sub_02066068, sub_02065EA0, sub_02065924,
 };
 
-int(*const Unk_020EF32C[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF32C[])(LocalMapObject *) = {
     sub_02066088, sub_02065EA0, sub_02065924,
 };
 
-int(*const Unk_020EF320[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF320[])(LocalMapObject *) = {
     sub_020660A8, sub_02065EA0, sub_02065924,
 };
 
-int(*const Unk_020EF314[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF314[])(LocalMapObject *) = {
     sub_020660CC, sub_02065EA0, sub_02065924,
 };
 
-int(*const Unk_020EF308[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF308[])(LocalMapObject *) = {
     sub_020660F0, sub_02065EA0, sub_02065924,
 };
 
-int(*const Unk_020EF2FC[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF2FC[])(LocalMapObject *) = {
     sub_02066110, sub_02065EA0, sub_02065924,
 };
 
-int(*const Unk_020EF2F0[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF2F0[])(LocalMapObject *) = {
     sub_02066130, sub_02065EA0, sub_02065924,
 };
 
-int(*const Unk_020EF2E4[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF2E4[])(LocalMapObject *) = {
     sub_02066150, sub_02065EA0, sub_02065924,
 };
 
-int(*const Unk_020EF2D8[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF2D8[])(LocalMapObject *) = {
     sub_02066170, sub_02065EA0, sub_02065924,
 };
 
-int(*const Unk_020EEC98[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EEC98[])(LocalMapObject *) = {
     sub_02066194, sub_02065EA0, sub_02065924,
 };
 
-int(*const Unk_020EF2C0[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF2C0[])(LocalMapObject *) = {
     sub_020661B4, sub_02065EA0, sub_02065924,
 };
 
-int(*const Unk_020EF2B4[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF2B4[])(LocalMapObject *) = {
     sub_020661D8, sub_02065EA0, sub_02065924,
 };
 
-int(*const Unk_020EF2A8[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF2A8[])(LocalMapObject *) = {
     sub_020661F8, sub_02065EA0, sub_02065924,
 };
 
-int(*const Unk_020EF29C[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF29C[])(LocalMapObject *) = {
     sub_020662E4, sub_020662C4, sub_02065924,
 };
 
-int(*const Unk_020EF290[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF290[])(LocalMapObject *) = {
     sub_020662F0, sub_020662C4, sub_02065924,
 };
 
-int(*const Unk_020EF284[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF284[])(LocalMapObject *) = {
     sub_020662FC, sub_020662C4, sub_02065924,
 };
 
-int(*const Unk_020EF278[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF278[])(LocalMapObject *) = {
     sub_02066308, sub_020662C4, sub_02065924,
 };
 
-int(*const Unk_020EF26C[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF26C[])(LocalMapObject *) = {
     sub_02066314, sub_020662C4, sub_02065924,
 };
 
-int(*const Unk_020EF260[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF260[])(LocalMapObject *) = {
     sub_02066320, sub_020662C4, sub_02065924,
 };
 
-int(*const Unk_020EF254[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF254[])(LocalMapObject *) = {
     sub_0206632C, sub_020662C4, sub_02065924,
 };
 
-int(*const Unk_020EF248[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF248[])(LocalMapObject *) = {
     sub_02066338, sub_0206635C, sub_02065924,
 };
 
-int(*const Unk_020EF23C[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF23C[])(LocalMapObject *) = {
     sub_020663A4, sub_020663D0, sub_02065924,
 };
 
-int(*const Unk_020EEC70[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EEC70[])(LocalMapObject *) = {
     sub_02066418, sub_02065924,
 };
 
-int(*const Unk_020EEC68[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EEC68[])(LocalMapObject *) = {
     sub_02066430, sub_02065924,
 };
 
-int(*const Unk_020EEC50[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EEC50[])(LocalMapObject *) = {
     sub_02066448, sub_02065924,
 };
 
-int(*const Unk_020EEC90[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EEC90[])(LocalMapObject *) = {
     sub_0206645C, sub_02065924,
 };
 
-int(*const Unk_020EEC58[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EEC58[])(LocalMapObject *) = {
     sub_02066470, sub_02065924,
 };
 
-int(*const Unk_020EEC60[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EEC60[])(LocalMapObject *) = {
     sub_02066488, sub_02065924,
 };
 
-int(*const Unk_020EF218[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF218[])(LocalMapObject *) = {
     sub_020664F0, sub_020664C8, sub_02065924,
 };
 
-int(*const Unk_020EF20C[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF20C[])(LocalMapObject *) = {
     sub_02066500, sub_020664C8, sub_02065924,
 };
 
-int(*const Unk_020EF200[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF200[])(LocalMapObject *) = {
     sub_020665C0, sub_02066600, sub_02065924,
 };
 
-int(*const Unk_020EF1F4[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF1F4[])(LocalMapObject *) = {
     sub_020665D0, sub_02066600, sub_02065924,
 };
 
-int(*const Unk_020EF1E8[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF1E8[])(LocalMapObject *) = {
     sub_020665E0, sub_02066600, sub_02065924,
 };
 
-int(*const Unk_020EF1DC[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF1DC[])(LocalMapObject *) = {
     sub_020665F0, sub_02066600, sub_02065924,
 };
 
-int(*const Unk_020EF1D0[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF1D0[])(LocalMapObject *) = {
     sub_02066618, sub_02066658, sub_02065924,
 };
 
-int(*const Unk_020EF1C4[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF1C4[])(LocalMapObject *) = {
     sub_02066628, sub_02066658, sub_02065924,
 };
 
-int(*const Unk_020EF1B8[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF1B8[])(LocalMapObject *) = {
     sub_02066638, sub_02066658, sub_02065924,
 };
 
-int(*const Unk_020EF188[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF188[])(LocalMapObject *) = {
     sub_02066648, sub_02066658, sub_02065924,
 };
 
-int(*const Unk_020EF194[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF194[])(LocalMapObject *) = {
     sub_02065C0C, sub_020659C8, sub_02065924,
 };
 
-int(*const Unk_020EF224[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF224[])(LocalMapObject *) = {
     sub_02065C24, sub_020659C8, sub_02065924,
 };
 
-int(*const Unk_020EF440[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF440[])(LocalMapObject *) = {
     sub_02065C38, sub_020659C8, sub_02065924,
 };
 
-int(*const Unk_020EF470[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF470[])(LocalMapObject *) = {
     sub_02065C4C, sub_020659C8, sub_02065924,
 };
 
-int(*const Unk_020EF5C0[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF5C0[])(LocalMapObject *) = {
     sub_02066670, sub_020666B0, sub_02065924,
 };
 
-int(*const Unk_020EF164[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF164[])(LocalMapObject *) = {
     sub_02066680, sub_020666B0, sub_02065924,
 };
 
-int(*const Unk_020EF158[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF158[])(LocalMapObject *) = {
     sub_02066690, sub_020666B0, sub_02065924,
 };
 
-int(*const Unk_020EF14C[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF14C[])(LocalMapObject *) = {
     sub_020666A0, sub_020666B0, sub_02065924,
 };
 
-int(*const Unk_020EF140[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF140[])(LocalMapObject *) = {
     sub_020666C8, sub_020666E4, sub_02065924,
 };
 
-int(*const Unk_020EF134[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF134[])(LocalMapObject *) = {
     sub_02066710, sub_02066764, sub_02065924,
 };
 
-int(*const Unk_020EF128[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF128[])(LocalMapObject *) = {
     sub_020667CC, sub_02066804, sub_02065924,
 };
 
-int(*const Unk_020EF11C[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF11C[])(LocalMapObject *) = {
     sub_020667E8, sub_02066804, sub_02065924,
 };
 
-int(*const Unk_020EF110[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF110[])(LocalMapObject *) = {
     sub_02066934, sub_020668EC, sub_02065924,
 };
 
-int(*const Unk_020EF104[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF104[])(LocalMapObject *) = {
     sub_02066968, sub_020668EC, sub_02065924,
 };
 
-int(*const Unk_020EF0F8[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF0F8[])(LocalMapObject *) = {
     sub_02066998, sub_020668EC, sub_02065924,
 };
 
-int(*const Unk_020EF0EC[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF0EC[])(LocalMapObject *) = {
     sub_020669CC, sub_020668EC, sub_02065924,
 };
 
-int(*const Unk_020EF0E0[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF0E0[])(LocalMapObject *) = {
     sub_020669FC, sub_020668EC, sub_02065924,
 };
 
-int(*const Unk_020EF0D4[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF0D4[])(LocalMapObject *) = {
     sub_02066A2C, sub_020668EC, sub_02065924,
 };
 
-int(*const Unk_020EF0C8[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF0C8[])(LocalMapObject *) = {
     sub_02066A60, sub_020668EC, sub_02065924,
 };
 
-int(*const Unk_020EF0BC[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF0BC[])(LocalMapObject *) = {
     sub_02066A94, sub_020668EC, sub_02065924,
 };
 
-int(*const Unk_020EF2CC[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF2CC[])(LocalMapObject *) = {
     sub_02066AC8, sub_020668EC, sub_02065924,
 };
 
-int(*const Unk_020EF0A4[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF0A4[])(LocalMapObject *) = {
     sub_02066AFC, sub_020668EC, sub_02065924,
 };
 
-int(*const Unk_020EF098[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF098[])(LocalMapObject *) = {
     sub_02066B30, sub_020668EC, sub_02065924,
 };
 
-int(*const Unk_020EF08C[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF08C[])(LocalMapObject *) = {
     sub_02066B60, sub_020668EC, sub_02065924,
 };
 
-int(*const Unk_020EF080[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF080[])(LocalMapObject *) = {
     sub_02066B90, sub_020668EC, sub_02065924,
 };
 
-int(*const Unk_020EF074[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF074[])(LocalMapObject *) = {
     sub_02066BC0, sub_020668EC, sub_02065924,
 };
 
-int(*const Unk_020EF068[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF068[])(LocalMapObject *) = {
     sub_02066BF0, sub_020668EC, sub_02065924,
 };
 
-int(*const Unk_020EF05C[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF05C[])(LocalMapObject *) = {
     sub_02066C20, sub_020668EC, sub_02065924,
 };
 
-int(*const Unk_020EF050[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF050[])(LocalMapObject *) = {
     sub_02066C50, sub_020668EC, sub_02065924,
 };
 
-int(*const Unk_020EF044[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF044[])(LocalMapObject *) = {
     sub_02066C84, sub_020668EC, sub_02065924,
 };
 
-int(*const Unk_020EF038[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF038[])(LocalMapObject *) = {
     sub_02066CB8, sub_020668EC, sub_02065924,
 };
 
-int(*const Unk_020EF014[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF014[])(LocalMapObject *) = {
     sub_02066CE8, sub_020668EC, sub_02065924,
 };
 
-int(*const Unk_020EF020[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF020[])(LocalMapObject *) = {
     sub_0206621C, sub_02065EA0, sub_02065924,
 };
 
-int(*const Unk_020EF17C[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF17C[])(LocalMapObject *) = {
     sub_02066240, sub_02065EA0, sub_02065924,
 };
 
-int(*const Unk_020EF1A0[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF1A0[])(LocalMapObject *) = {
     sub_02066264, sub_02065EA0, sub_02065924,
 };
 
-int(*const Unk_020EF44C[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF44C[])(LocalMapObject *) = {
     sub_02066288, sub_02065EA0, sub_02065924,
 };
 
-int(*const Unk_020EF5CC[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF5CC[])(LocalMapObject *) = {
     sub_02066D18, sub_020668EC, sub_02065924,
 };
 
-int(*const Unk_020EEFF0[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EEFF0[])(LocalMapObject *) = {
     sub_02066D4C, sub_020668EC, sub_02065924,
 };
 
-int(*const Unk_020EEFE4[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EEFE4[])(LocalMapObject *) = {
     sub_02066D80, sub_020668EC, sub_02065924,
 };
 
-int(*const Unk_020EEFD8[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EEFD8[])(LocalMapObject *) = {
     sub_02066DB4, sub_020668EC, sub_02065924,
 };
 
-int(*const Unk_020EEFCC[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EEFCC[])(LocalMapObject *) = {
     sub_02066DE8, sub_020668EC, sub_02065924,
 };
 
-int(*const Unk_020EEFC0[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EEFC0[])(LocalMapObject *) = {
     sub_02066E1C, sub_020668EC, sub_02065924,
 };
 
-int(*const Unk_020EEFB4[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EEFB4[])(LocalMapObject *) = {
     sub_02066E50, sub_020668EC, sub_02065924,
 };
 
-int(*const Unk_020EEFA8[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EEFA8[])(LocalMapObject *) = {
     sub_02066E84, sub_020668EC, sub_02065924,
 };
 
-int(*const Unk_020EF0B0[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF0B0[])(LocalMapObject *) = {
     sub_02066EB8, sub_020668EC, sub_02065924,
 };
 
-int(*const Unk_020EEF90[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EEF90[])(LocalMapObject *) = {
     sub_02066EEC, sub_020668EC, sub_02065924,
 };
 
-int(*const Unk_020EEF84[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EEF84[])(LocalMapObject *) = {
     sub_02066F20, sub_020668EC, sub_02065924,
 };
 
-int(*const Unk_020EEF6C[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EEF6C[])(LocalMapObject *) = {
     sub_02066F54, sub_020668EC, sub_02065924,
 };
 
-int(*const Unk_020EEF78[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EEF78[])(LocalMapObject *) = {
     sub_020671F0, sub_02067068, sub_02065924,
 };
 
-int(*const Unk_020EF008[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF008[])(LocalMapObject *) = {
     sub_02067214, sub_02067068, sub_02065924,
 };
 
-int(*const Unk_020EF02C[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF02C[])(LocalMapObject *) = {
     sub_0206723C, sub_02067068, sub_02065924,
 };
 
-int(*const Unk_020EF1AC[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF1AC[])(LocalMapObject *) = {
     sub_02067260, sub_02067068, sub_02065924,
 };
 
-int(*const Unk_020EF5D8[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF5D8[])(LocalMapObject *) = {
     sub_02067288, sub_02067068, sub_02065924,
 };
 
-int(*const Unk_020EECBC[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EECBC[])(LocalMapObject *) = {
     sub_020672AC, sub_02067068, sub_02065924,
 };
 
-int(*const Unk_020EECB0[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EECB0[])(LocalMapObject *) = {
     sub_020672D4, sub_02067068, sub_02065924,
 };
 
-int(*const Unk_020EECA4[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EECA4[])(LocalMapObject *) = {
     sub_020672FC, sub_02067068, sub_02065924,
 };
 
-int(*const Unk_020EEF9C[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EEF9C[])(LocalMapObject *) = {
     sub_02067320, sub_02067068, sub_02065924,
 };
 
-int(*const Unk_020EEF60[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EEF60[])(LocalMapObject *) = {
     sub_02067344, sub_02067068, sub_02065924,
 };
 
-int(*const Unk_020EEFFC[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EEFFC[])(LocalMapObject *) = {
     sub_0206736C, sub_02067068, sub_02065924,
 };
 
-int(*const Unk_020EF170[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF170[])(LocalMapObject *) = {
     sub_02067394, sub_02067068, sub_02065924,
 };
 
-int(*const Unk_020EF5E4[])(UnkStruct_02061AB4 *) = {
+int(*const Unk_020EF5E4[])(LocalMapObject *) = {
     sub_02066510, sub_020664C8, sub_02065924,
 };
 
diff --git a/src/unk_020673B8.c b/src/unk_020673B8.c
index c551826f24..b12e7f6754 100644
--- a/src/unk_020673B8.c
+++ b/src/unk_020673B8.c
@@ -31,31 +31,31 @@ typedef struct {
     s8 unk_08;
 } UnkStruct_0206762C;
 
-static void sub_020673E4(UnkStruct_02061AB4 * param0);
-static int sub_02067400(UnkStruct_02061AB4 * param0);
-static int sub_0206741C(UnkStruct_02061AB4 * param0);
-static int sub_02067438(UnkStruct_02061AB4 * param0);
-static int sub_0206746C(UnkStruct_02061AB4 * param0);
-static void sub_020674A0(UnkStruct_02061AB4 * param0);
-static int sub_020674A4(UnkStruct_02061AB4 * param0);
-static int sub_020674A8(UnkStruct_02061AB4 * param0);
-static void sub_020674AC(UnkStruct_02061AB4 * param0);
-static int sub_020674C4(UnkStruct_02061AB4 * param0);
-static int sub_02067540(UnkStruct_02061AB4 * param0);
-static void sub_0206762C(UnkStruct_02061AB4 * param0);
-static int sub_02067658(UnkStruct_02061AB4 * param0);
-static int sub_020676D4(UnkStruct_02061AB4 * param0);
+static void sub_020673E4(LocalMapObject * param0);
+static int sub_02067400(LocalMapObject * param0);
+static int sub_0206741C(LocalMapObject * param0);
+static int sub_02067438(LocalMapObject * param0);
+static int sub_0206746C(LocalMapObject * param0);
+static void sub_020674A0(LocalMapObject * param0);
+static int sub_020674A4(LocalMapObject * param0);
+static int sub_020674A8(LocalMapObject * param0);
+static void sub_020674AC(LocalMapObject * param0);
+static int sub_020674C4(LocalMapObject * param0);
+static int sub_02067540(LocalMapObject * param0);
+static void sub_0206762C(LocalMapObject * param0);
+static int sub_02067658(LocalMapObject * param0);
+static int sub_020676D4(LocalMapObject * param0);
 
-void(*const Unk_020EF630[])(UnkStruct_02061AB4 *);
-int(*const Unk_020EF660[])(UnkStruct_02061AB4 *);
-int(*const Unk_020EF690[])(UnkStruct_02061AB4 *);
+void(*const Unk_020EF630[])(LocalMapObject *);
+int(*const Unk_020EF660[])(LocalMapObject *);
+int(*const Unk_020EF690[])(LocalMapObject *);
 
-void sub_020673B8 (UnkStruct_02061AB4 * param0)
+void sub_020673B8 (LocalMapObject * param0)
 {
     sub_020673E4(param0);
 }
 
-int sub_020673C0 (UnkStruct_02061AB4 * param0)
+int sub_020673C0 (LocalMapObject * param0)
 {
     if (sub_02067400(param0) == 0) {
         return 0;
@@ -68,26 +68,26 @@ int sub_020673C0 (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static void sub_020673E4 (UnkStruct_02061AB4 * param0)
+static void sub_020673E4 (LocalMapObject * param0)
 {
     int v0 = sub_02062950(param0);
 
     Unk_020EF630[v0](param0);
 }
 
-static int sub_02067400 (UnkStruct_02061AB4 * param0)
+static int sub_02067400 (LocalMapObject * param0)
 {
     int v0 = sub_02062950(param0);
     return Unk_020EF660[v0](param0);
 }
 
-static int sub_0206741C (UnkStruct_02061AB4 * param0)
+static int sub_0206741C (LocalMapObject * param0)
 {
     int v0 = sub_02062950(param0);
     return Unk_020EF690[v0](param0);
 }
 
-static int sub_02067438 (UnkStruct_02061AB4 * param0)
+static int sub_02067438 (LocalMapObject * param0)
 {
     int v0 = sub_02063020(param0);
     int v1 = sub_02063008(param0);
@@ -106,7 +106,7 @@ static int sub_02067438 (UnkStruct_02061AB4 * param0)
     return 0;
 }
 
-static int sub_0206746C (UnkStruct_02061AB4 * param0)
+static int sub_0206746C (LocalMapObject * param0)
 {
     int v0 = sub_02063020(param0);
     int v1 = sub_02063008(param0);
@@ -125,22 +125,22 @@ static int sub_0206746C (UnkStruct_02061AB4 * param0)
     return 1;
 }
 
-static void sub_020674A0 (UnkStruct_02061AB4 * param0)
+static void sub_020674A0 (LocalMapObject * param0)
 {
     return;
 }
 
-static int sub_020674A4 (UnkStruct_02061AB4 * param0)
+static int sub_020674A4 (LocalMapObject * param0)
 {
     return 0;
 }
 
-static int sub_020674A8 (UnkStruct_02061AB4 * param0)
+static int sub_020674A8 (LocalMapObject * param0)
 {
     return 0;
 }
 
-static void sub_020674AC (UnkStruct_02061AB4 * param0)
+static void sub_020674AC (LocalMapObject * param0)
 {
     UnkStruct_020674AC * v0;
 
@@ -148,7 +148,7 @@ static void sub_020674AC (UnkStruct_02061AB4 * param0)
     v0->unk_03 = sub_020629D8(param0, 1);
 }
 
-static int sub_020674C4 (UnkStruct_02061AB4 * param0)
+static int sub_020674C4 (LocalMapObject * param0)
 {
     UnkStruct_020674AC * v0;
 
@@ -188,7 +188,7 @@ static int sub_020674C4 (UnkStruct_02061AB4 * param0)
     return 0;
 }
 
-static int sub_02067540 (UnkStruct_02061AB4 * param0)
+static int sub_02067540 (LocalMapObject * param0)
 {
     UnkStruct_020674AC * v0;
 
@@ -249,7 +249,7 @@ static int sub_02067540 (UnkStruct_02061AB4 * param0)
     return 0;
 }
 
-static void sub_0206762C (UnkStruct_02061AB4 * param0)
+static void sub_0206762C (LocalMapObject * param0)
 {
     int v0;
     UnkStruct_0206762C * v1;
@@ -268,7 +268,7 @@ static void sub_0206762C (UnkStruct_02061AB4 * param0)
     v1->unk_05 = v0;
 }
 
-static int sub_02067658 (UnkStruct_02061AB4 * param0)
+static int sub_02067658 (LocalMapObject * param0)
 {
     UnkStruct_0206762C * v0;
 
@@ -309,7 +309,7 @@ static int sub_02067658 (UnkStruct_02061AB4 * param0)
     return 0;
 }
 
-static int sub_020676D4 (UnkStruct_02061AB4 * param0)
+static int sub_020676D4 (LocalMapObject * param0)
 {
     UnkStruct_020674AC * v0;
     int v1[2][4] = {{0, 2, 1, 3}, {0, 3, 1, 2}};
@@ -374,7 +374,7 @@ static int sub_020676D4 (UnkStruct_02061AB4 * param0)
     return 0;
 }
 
-static void(*const Unk_020EF630[])(UnkStruct_02061AB4 *) = {
+static void(*const Unk_020EF630[])(LocalMapObject *) = {
     sub_020674A0,
     sub_020674A0,
     sub_020674A0,
@@ -389,7 +389,7 @@ static void(*const Unk_020EF630[])(UnkStruct_02061AB4 *) = {
     sub_020674A0
 };
 
-static int(*const Unk_020EF660[])(UnkStruct_02061AB4 *) = {
+static int(*const Unk_020EF660[])(LocalMapObject *) = {
     sub_020674A4,
     sub_020674A4,
     sub_020674A4,
@@ -404,7 +404,7 @@ static int(*const Unk_020EF660[])(UnkStruct_02061AB4 *) = {
     sub_020674A4
 };
 
-static int(*const Unk_020EF690[])(UnkStruct_02061AB4 *) = {
+static int(*const Unk_020EF690[])(LocalMapObject *) = {
     sub_020674A8,
     sub_020674A8,
     sub_020674A8,
diff --git a/src/unk_020677F4.c b/src/unk_020677F4.c
index 31ed27566f..2335440a8d 100644
--- a/src/unk_020677F4.c
+++ b/src/unk_020677F4.c
@@ -40,10 +40,10 @@ int sub_020677F4 (int param0)
     return 0;
 }
 
-int sub_02067800 (const UnkStruct_02061AB4 * param0)
+int sub_02067800 (const LocalMapObject * param0)
 {
     {
-        UnkStruct_02067800 * v0 = sub_02062A78((UnkStruct_02061AB4 *)param0);
+        UnkStruct_02067800 * v0 = sub_02062A78((LocalMapObject *)param0);
 
         if (v0->unk_00 == 0) {
             return 0xffff;
@@ -51,7 +51,7 @@ int sub_02067800 (const UnkStruct_02061AB4 * param0)
     }
 
     if (sub_02062DFC(param0) == 1) {
-        UnkStruct_02067870 * v1 = sub_02062AF0((UnkStruct_02061AB4 *)param0);
+        UnkStruct_02067870 * v1 = sub_02062AF0((LocalMapObject *)param0);
 
         if (v1->unk_04 != 0) {
             return v1->unk_00;
@@ -61,13 +61,13 @@ int sub_02067800 (const UnkStruct_02061AB4 * param0)
     return 0xffff;
 }
 
-void sub_02067834 (UnkStruct_02061AB4 * param0)
+void sub_02067834 (LocalMapObject * param0)
 {
     UnkStruct_02067800 * v0 = sub_02062A78(param0);
     v0->unk_02 = 1;
 }
 
-void sub_02067840 (UnkStruct_02061AB4 * param0)
+void sub_02067840 (LocalMapObject * param0)
 {
     UnkStruct_02067800 * v0;
 
@@ -75,7 +75,7 @@ void sub_02067840 (UnkStruct_02061AB4 * param0)
     v0->unk_00 = 0;
 }
 
-void sub_02067850 (UnkStruct_02061AB4 * param0)
+void sub_02067850 (LocalMapObject * param0)
 {
     UnkStruct_02067800 * v0;
 
@@ -83,12 +83,12 @@ void sub_02067850 (UnkStruct_02061AB4 * param0)
     v0->unk_00 = sub_02055F00(sub_02062C00(param0), param0);
 }
 
-void sub_0206786C (UnkStruct_02061AB4 * param0)
+void sub_0206786C (LocalMapObject * param0)
 {
     return;
 }
 
-void sub_02067870 (UnkStruct_02061AB4 * param0)
+void sub_02067870 (LocalMapObject * param0)
 {
     UnkStruct_02067870 * v0 = sub_02062ACC(param0, (sizeof(UnkStruct_02067870)));
 
@@ -98,7 +98,7 @@ void sub_02067870 (UnkStruct_02061AB4 * param0)
     ov5_021F20D4(param0);
 }
 
-void sub_02067890 (UnkStruct_02061AB4 * param0)
+void sub_02067890 (LocalMapObject * param0)
 {
     UnkStruct_02067800 * v0 = sub_02062A78(param0);
     UnkStruct_02067870 * v1 = sub_02062AF0(param0);
@@ -146,13 +146,13 @@ void sub_02067890 (UnkStruct_02061AB4 * param0)
     }
 }
 
-void sub_02067950 (UnkStruct_02061AB4 * param0)
+void sub_02067950 (LocalMapObject * param0)
 {
     UnkStruct_02067870 * v0 = sub_02062AF0(param0);
     ov5_021ECFD8(param0, &v0->unk_08, v0->unk_00);
 }
 
-void sub_02067968 (UnkStruct_02061AB4 * param0)
+void sub_02067968 (LocalMapObject * param0)
 {
     UnkStruct_02067870 * v0 = sub_02062AF0(param0);
 
@@ -164,7 +164,7 @@ void sub_02067968 (UnkStruct_02061AB4 * param0)
     sub_020628BC(param0, (1 << 21));
 }
 
-void sub_02067998 (UnkStruct_02061AB4 * param0)
+void sub_02067998 (LocalMapObject * param0)
 {
     UnkStruct_02067870 * v0 = sub_02062AF0(param0);
 
@@ -221,7 +221,7 @@ static int sub_020679FC (int param0, int param1)
     return 0xffff;
 }
 
-UnkStruct_020216E0 * sub_02067A58 (UnkStruct_02061AB4 * param0)
+UnkStruct_020216E0 * sub_02067A58 (LocalMapObject * param0)
 {
     UnkStruct_020216E0 * v0 = NULL;
 
diff --git a/src/unk_02067A84.c b/src/unk_02067A84.c
index ee7d02938a..8c08e910db 100644
--- a/src/unk_02067A84.c
+++ b/src/unk_02067A84.c
@@ -30,7 +30,7 @@ typedef struct {
     int unk_08;
     int unk_0C;
     int unk_10;
-    UnkStruct_02061AB4 * unk_14;
+    LocalMapObject * unk_14;
 } UnkStruct_02067C28;
 
 typedef struct {
@@ -43,25 +43,25 @@ typedef struct {
     int unk_18;
     int unk_1C;
     UnkStruct_ov101_021D5D90 * unk_20;
-    UnkStruct_02061AB4 * unk_24;
+    LocalMapObject * unk_24;
     PlayerAvatar * unk_28;
     FieldSystem * unk_2C;
 } UnkStruct_020EF6D0;
 
-static int sub_02067BA8(FieldSystem * param0, UnkStruct_02061830 * param1, PlayerAvatar * param2, const UnkStruct_02061AB4 * param3, UnkStruct_02067C28 * param4);
-static void sub_02067C28(UnkStruct_02067C28 * param0, UnkStruct_02061AB4 * param1, int param2, int param3);
-static int sub_02067C54(const UnkStruct_02061AB4 * param0);
-static int sub_02067C80(const UnkStruct_02061AB4 * param0, PlayerAvatar * param1, int * param2);
-static int sub_02067DA8(const UnkStruct_02061AB4 * param0, int param1, int param2, int param3, int param4, int param5);
-static int sub_02067E74(const UnkStruct_02061AB4 * param0, int param1, int param2);
-static int sub_02067F14(UnkStruct_02061AB4 * param0);
-static UnkStruct_02061AB4 * sub_02067F2C(FieldSystem * param0, UnkStruct_02061830 * param1, UnkStruct_02061AB4 * param2, int param3);
-static SysTask * sub_02067FF0(FieldSystem * param0, UnkStruct_02061AB4 * param1, PlayerAvatar * param2, int param3, int param4, int param5, int param6, int param7);
+static int sub_02067BA8(FieldSystem * param0, UnkStruct_02061830 * 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 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);
 static void sub_0206806C(SysTask * param0, void * param1);
 
-int(*const Unk_020EF6C0[])(const UnkStruct_02061AB4 *, int, int, int, int);
+int(*const Unk_020EF6C0[])(const LocalMapObject *, int, int, int, int);
 int(*const Unk_020EF6D0[])(UnkStruct_020EF6D0 *);
 
 int sub_02067A84 (FieldSystem * param0, BOOL param1)
@@ -75,7 +75,7 @@ int sub_02067A84 (FieldSystem * param0, BOOL param1)
     }
 
     if (v0.unk_10 == 0) {
-        UnkStruct_02061AB4 * v3;
+        LocalMapObject * v3;
         UnkStruct_02067C28 v4;
 
         sub_0203E880(param0, 3928, v0.unk_14);
@@ -92,7 +92,7 @@ int sub_02067A84 (FieldSystem * param0, BOOL param1)
     }
 
     if (v0.unk_10 == 1) {
-        UnkStruct_02061AB4 * v5;
+        LocalMapObject * v5;
         UnkStruct_02067C28 v6;
 
         if (param1 == 0) {
@@ -113,10 +113,10 @@ int sub_02067A84 (FieldSystem * param0, BOOL param1)
     return 0;
 }
 
-static int sub_02067BA8 (FieldSystem * param0, UnkStruct_02061830 * param1, PlayerAvatar * param2, const UnkStruct_02061AB4 * param3, UnkStruct_02067C28 * param4)
+static int sub_02067BA8 (FieldSystem * param0, UnkStruct_02061830 * param1, PlayerAvatar * param2, const LocalMapObject * param3, UnkStruct_02067C28 * param4)
 {
     int v0, v1, v2;
-    UnkStruct_02061AB4 * v3;
+    LocalMapObject * v3;
 
     v0 = 0;
     v3 = NULL;
@@ -138,7 +138,7 @@ static int sub_02067BA8 (FieldSystem * param0, UnkStruct_02061830 * param1, Play
     return 0;
 }
 
-static void sub_02067C28 (UnkStruct_02067C28 * param0, UnkStruct_02061AB4 * param1, int param2, int param3)
+static void sub_02067C28 (UnkStruct_02067C28 * param0, LocalMapObject * param1, int param2, int param3)
 {
     param0->unk_00 = param2;
     param0->unk_04 = param3;
@@ -148,7 +148,7 @@ static void sub_02067C28 (UnkStruct_02067C28 * param0, UnkStruct_02061AB4 * para
     param0->unk_14 = param1;
 }
 
-static int sub_02067C54 (const UnkStruct_02061AB4 * param0)
+static int sub_02067C54 (const LocalMapObject * param0)
 {
     int v0 = sub_02062950(param0);
 
@@ -165,7 +165,7 @@ static int sub_02067C54 (const UnkStruct_02061AB4 * param0)
     return v0;
 }
 
-static int sub_02067C80 (const UnkStruct_02061AB4 * param0, PlayerAvatar * param1, int * param2)
+static int sub_02067C80 (const LocalMapObject * param0, PlayerAvatar * param1, int * param2)
 {
     int v0, v1, v2, v3, v4, v5;
 
@@ -213,7 +213,7 @@ static int sub_02067C80 (const UnkStruct_02061AB4 * param0, PlayerAvatar * param
     return(-1);
 }
 
-int sub_02067D58 (const UnkStruct_02061AB4 * param0, PlayerAvatar * param1, int param2, int param3)
+int sub_02067D58 (const LocalMapObject * param0, PlayerAvatar * param1, int param2, int param3)
 {
     int v0 = Player_XPos(param1);
     int v1 = Player_ZPos(param1);
@@ -228,12 +228,12 @@ int sub_02067D58 (const UnkStruct_02061AB4 * param0, PlayerAvatar * param1, int
     return v2;
 }
 
-static int sub_02067DA8 (const UnkStruct_02061AB4 * param0, int param1, int param2, int param3, int param4, int param5)
+static int sub_02067DA8 (const LocalMapObject * param0, int param1, int param2, int param3, int param4, int param5)
 {
     return Unk_020EF6C0[param1](param0, param2, param3, param4, param5);
 }
 
-static int sub_02067DC4 (const UnkStruct_02061AB4 * param0, int param1, int param2, int param3, int param4)
+static int sub_02067DC4 (const LocalMapObject * param0, int param1, int param2, int param3, int param4)
 {
     int v0, v1;
 
@@ -250,7 +250,7 @@ static int sub_02067DC4 (const UnkStruct_02061AB4 * param0, int param1, int para
     return(-1);
 }
 
-static int sub_02067DF0 (const UnkStruct_02061AB4 * param0, int param1, int param2, int param3, int param4)
+static int sub_02067DF0 (const LocalMapObject * param0, int param1, int param2, int param3, int param4)
 {
     int v0, v1;
 
@@ -267,7 +267,7 @@ static int sub_02067DF0 (const UnkStruct_02061AB4 * param0, int param1, int para
     return(-1);
 }
 
-static int sub_02067E1C (const UnkStruct_02061AB4 * param0, int param1, int param2, int param3, int param4)
+static int sub_02067E1C (const LocalMapObject * param0, int param1, int param2, int param3, int param4)
 {
     int v0, v1;
 
@@ -284,7 +284,7 @@ static int sub_02067E1C (const UnkStruct_02061AB4 * param0, int param1, int para
     return(-1);
 }
 
-static int sub_02067E48 (const UnkStruct_02061AB4 * param0, int param1, int param2, int param3, int param4)
+static int sub_02067E48 (const LocalMapObject * param0, int param1, int param2, int param3, int param4)
 {
     int v0, v1;
 
@@ -301,14 +301,14 @@ static int sub_02067E48 (const UnkStruct_02061AB4 * param0, int param1, int para
     return(-1);
 }
 
-static int(*const Unk_020EF6C0[])(const UnkStruct_02061AB4 *, int, int, int, int) = {
+static int(*const Unk_020EF6C0[])(const LocalMapObject *, int, int, int, int) = {
     sub_02067DC4,
     sub_02067DF0,
     sub_02067E1C,
     sub_02067E48
 };
 
-static int sub_02067E74 (const UnkStruct_02061AB4 * param0, int param1, int param2)
+static int sub_02067E74 (const LocalMapObject * param0, int param1, int param2)
 {
     int v0, v1, v2, v3;
     u32 v4;
@@ -345,7 +345,7 @@ static int sub_02067E74 (const UnkStruct_02061AB4 * param0, int param1, int para
     return 1;
 }
 
-static int sub_02067F14 (UnkStruct_02061AB4 * param0)
+static int sub_02067F14 (LocalMapObject * param0)
 {
     int v0;
 
@@ -353,15 +353,15 @@ static int sub_02067F14 (UnkStruct_02061AB4 * param0)
     return sub_0203F254(v0);
 }
 
-int sub_02067F24 (UnkStruct_02061AB4 * param0)
+int sub_02067F24 (LocalMapObject * param0)
 {
     return sub_02067F14(param0);
 }
 
-static UnkStruct_02061AB4 * sub_02067F2C (FieldSystem * param0, UnkStruct_02061830 * param1, UnkStruct_02061AB4 * param2, int param3)
+static LocalMapObject * sub_02067F2C (FieldSystem * param0, UnkStruct_02061830 * param1, LocalMapObject * param2, int param3)
 {
     int v0;
-    UnkStruct_02061AB4 * v1;
+    LocalMapObject * v1;
 
     v0 = 0;
 
@@ -381,7 +381,7 @@ static UnkStruct_02061AB4 * sub_02067F2C (FieldSystem * param0, UnkStruct_020618
     return NULL;
 }
 
-int sub_02067F88 (FieldSystem * param0, UnkStruct_02061AB4 * param1)
+int sub_02067F88 (FieldSystem * param0, LocalMapObject * param1)
 {
     int v0 = sub_02067C54(param1);
 
@@ -394,7 +394,7 @@ int sub_02067F88 (FieldSystem * param0, UnkStruct_02061AB4 * param1)
     return 0;
 }
 
-SysTask * sub_02067FB8 (FieldSystem * param0, UnkStruct_02061AB4 * param1, PlayerAvatar * param2, int param3, int param4, int param5, int param6, int param7)
+SysTask * sub_02067FB8 (FieldSystem * param0, LocalMapObject * param1, PlayerAvatar * param2, int param3, int param4, int param5, int param6, int param7)
 {
     return sub_02067FF0(param0, param1, param2, param3, param4, param5, param6, param7);
 }
@@ -410,7 +410,7 @@ void sub_02067FE8 (SysTask * param0)
     sub_02068054(param0);
 }
 
-static SysTask * sub_02067FF0 (FieldSystem * param0, UnkStruct_02061AB4 * param1, PlayerAvatar * param2, int param3, int param4, int param5, int param6, int param7)
+static SysTask * sub_02067FF0 (FieldSystem * param0, LocalMapObject * param1, PlayerAvatar * param2, int param3, int param4, int param5, int param6, int param7)
 {
     SysTask * v0;
     UnkStruct_020EF6D0 * v1;
@@ -466,7 +466,7 @@ static void sub_0206806C (SysTask * param0, void * param1)
 
 static int sub_02068088 (UnkStruct_020EF6D0 * param0)
 {
-    UnkStruct_02061AB4 * v0 = param0->unk_24;
+    LocalMapObject * v0 = param0->unk_24;
 
     if (sub_02062D1C(v0) == 1) {
         sub_02062DDC(v0);
@@ -478,7 +478,7 @@ static int sub_02068088 (UnkStruct_020EF6D0 * param0)
 
 static int sub_020680A4 (UnkStruct_020EF6D0 * param0)
 {
-    UnkStruct_02061AB4 * v0 = param0->unk_24;
+    LocalMapObject * v0 = param0->unk_24;
 
     if (sub_02062D1C(v0) == 1) {
         return 0;
@@ -493,7 +493,7 @@ static int sub_020680A4 (UnkStruct_020EF6D0 * param0)
 
 static int sub_020680D0 (UnkStruct_020EF6D0 * param0)
 {
-    UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0->unk_28);
+    LocalMapObject * v0 = Player_LocalMapObject(param0->unk_28);
 
     if (sub_02065684(v0) == 0) {
         return 0;
@@ -643,9 +643,9 @@ static int sub_02068248 (UnkStruct_020EF6D0 * param0)
 static int sub_02068264 (UnkStruct_020EF6D0 * param0)
 {
     int v0, v1;
-    UnkStruct_02061AB4 * v2;
+    LocalMapObject * v2;
 
-    v2 = sub_0205EB3C(param0->unk_28);
+    v2 = Player_LocalMapObject(param0->unk_28);
     v1 = sub_02064488(sub_02063020(v2), sub_02063040(v2), sub_02063020(param0->unk_24), sub_02063040(param0->unk_24));
 
     if ((Player_Dir(param0->unk_28) != v1) && ((param0->unk_18 == 0) || (param0->unk_14 == 2))) {
@@ -664,9 +664,9 @@ static int sub_02068264 (UnkStruct_020EF6D0 * param0)
 
 static int sub_020682E0 (UnkStruct_020EF6D0 * param0)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
 
-    v0 = sub_0205EB3C(param0->unk_28);
+    v0 = Player_LocalMapObject(param0->unk_28);
 
     if (sub_02065684(v0) == 0) {
         return 0;
diff --git a/src/unk_020683F4.c b/src/unk_020683F4.c
index 92c1c85b26..844d818c92 100644
--- a/src/unk_020683F4.c
+++ b/src/unk_020683F4.c
@@ -209,7 +209,7 @@ u32 sub_020683F4 (u16 param0, u16 param1)
 void sub_0206842C (FieldSystem * param0, UnkStruct_020684D0 * param1)
 {
     int v0, v1, v2;
-    UnkStruct_02061AB4 * v3;
+    LocalMapObject * v3;
 
     if (sub_0205F158(param0->playerAvatar) == 1) {
         sub_020684D0(param0, param1);
@@ -308,7 +308,7 @@ static BOOL sub_020685AC (UnkStruct_020508D4 * param0)
     FieldSystem * v0 = sub_02050A60(param0);
     UnkStruct_0206851C * v1 = sub_02050A64(param0);
     int * v2 = sub_02050A68(param0);
-    UnkStruct_02061AB4 * v3;
+    LocalMapObject * v3;
 
     switch (*v2) {
     case 0:
@@ -489,7 +489,7 @@ static BOOL sub_02068884 (UnkStruct_020508D4 * param0)
         break;
     case 1:
         if (sub_0205EB74(v0->playerAvatar) == 0x1) {
-            sub_02062DDC(sub_0205EB3C(v0->playerAvatar));
+            sub_02062DDC(Player_LocalMapObject(v0->playerAvatar));
             ov5_021DFB54(v0->playerAvatar, (1 << 0));
             ov5_021DFB5C(v0->playerAvatar);
 
@@ -499,7 +499,7 @@ static BOOL sub_02068884 (UnkStruct_020508D4 * param0)
         } else {
             sub_020553F0(v0, 1152);
             sub_02055554(v0, 1152, 1);
-            sub_02062DDC(sub_0205EB3C(v0->playerAvatar));
+            sub_02062DDC(Player_LocalMapObject(v0->playerAvatar));
 
             ov5_021DFB54(v0->playerAvatar, (1 << 1));
             ov5_021DFB5C(v0->playerAvatar);
@@ -537,7 +537,7 @@ static u32 sub_02068948 (const UnkStruct_020684D0 * param0)
     }
 
     {
-        UnkStruct_02061AB4 * v1 = sub_0205EB3C(param0->unk_14);
+        LocalMapObject * v1 = Player_LocalMapObject(param0->unk_14);
 
         if ((sub_0206415C(v1, param0->unk_0E) == 1) || (sub_0206417C(v1, param0->unk_0E) == 1)) {
             return 1;
@@ -637,7 +637,7 @@ static void sub_02068B1C (UnkStruct_02068630 * param0, const UnkStruct_020684D0
 {
     FieldSystem * v0;
     UnkStruct_020708E0 * v1;
-    UnkStruct_02061AB4 * v2;
+    LocalMapObject * v2;
 
     v0 = sub_02050A60(param0->unk_00);
     v1 = sub_02050A64(param0->unk_00);
@@ -916,7 +916,7 @@ static u32 sub_02068E94 (const UnkStruct_020684D0 * param0)
 
     if (sub_0205DB58(param0->unk_0C) == 1) {
         if ((sub_0205DEFC(param0->unk_0E) == 1) || (sub_0205DEF0(param0->unk_0E) == 1)) {
-            UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0->unk_14);
+            LocalMapObject * v0 = Player_LocalMapObject(param0->unk_14);
 
             if (sub_02062F30(v0) == 1) {
                 return -1;
diff --git a/src/unk_02069BE0.c b/src/unk_02069BE0.c
index 1ad7bd9520..2a395a8719 100644
--- a/src/unk_02069BE0.c
+++ b/src/unk_02069BE0.c
@@ -33,7 +33,7 @@ typedef struct {
     s16 unk_02;
     s16 unk_04;
     u16 unk_06;
-    UnkStruct_02061AB4 * unk_08;
+    LocalMapObject * unk_08;
 } UnkStruct_02069F48;
 
 typedef struct {
@@ -57,23 +57,23 @@ typedef struct {
     int unk_08;
 } UnkStruct_0206A47C;
 
-static int sub_02069CA8(UnkStruct_02061AB4 * param0, UnkStruct_02069CA8 * param1);
-static void sub_02069CD4(UnkStruct_02061AB4 * param0, UnkStruct_02069CA8 * param1);
-static int sub_02069CFC(UnkStruct_02061AB4 * param0, UnkStruct_02069CA8 * param1);
-static void sub_02069D30(UnkStruct_02061AB4 * param0, UnkStruct_02069CA8 * param1);
-static u32 sub_02069D50(UnkStruct_02061AB4 * param0);
-static int sub_02069D8C(UnkStruct_02061AB4 * param0);
-static int sub_02069F48(UnkStruct_02061AB4 * param0, UnkStruct_02069F48 * param1);
-static void sub_02069FC4(UnkStruct_02061AB4 * param0, UnkStruct_02069F48 * param1, UnkStruct_02061AB4 * param2);
-static int sub_02069FE8(UnkStruct_02061AB4 * param0, UnkStruct_02069F48 * param1);
-static int sub_0206A034(UnkStruct_02061AB4 * param0, UnkStruct_02069F48 * param1);
-static int sub_0206A630(UnkStruct_02061AB4 * param0, UnkStruct_0206A47C * param1, int param2);
+static int sub_02069CA8(LocalMapObject * param0, UnkStruct_02069CA8 * param1);
+static void sub_02069CD4(LocalMapObject * param0, UnkStruct_02069CA8 * param1);
+static int sub_02069CFC(LocalMapObject * param0, UnkStruct_02069CA8 * param1);
+static void sub_02069D30(LocalMapObject * param0, UnkStruct_02069CA8 * param1);
+static u32 sub_02069D50(LocalMapObject * param0);
+static int sub_02069D8C(LocalMapObject * param0);
+static int sub_02069F48(LocalMapObject * param0, UnkStruct_02069F48 * param1);
+static void sub_02069FC4(LocalMapObject * param0, UnkStruct_02069F48 * param1, LocalMapObject * param2);
+static int sub_02069FE8(LocalMapObject * param0, UnkStruct_02069F48 * param1);
+static int sub_0206A034(LocalMapObject * param0, UnkStruct_02069F48 * param1);
+static int sub_0206A630(LocalMapObject * param0, UnkStruct_0206A47C * param1, int param2);
 
-int(*const Unk_020EF8D4[])(UnkStruct_02061AB4 *, UnkStruct_02069CA8 *);
-int(*const Unk_020EF8EC[])(UnkStruct_02061AB4 *, UnkStruct_02069F48 *);
-int(*const Unk_020EF8DC[])(UnkStruct_02061AB4 *, UnkStruct_0206A0BC *);
+int(*const Unk_020EF8D4[])(LocalMapObject *, UnkStruct_02069CA8 *);
+int(*const Unk_020EF8EC[])(LocalMapObject *, UnkStruct_02069F48 *);
+int(*const Unk_020EF8DC[])(LocalMapObject *, UnkStruct_0206A0BC *);
 
-void sub_02069BE0 (UnkStruct_02061AB4 * param0)
+void sub_02069BE0 (LocalMapObject * param0)
 {
     UnkStruct_02069CA8 * v0 = sub_02062A54(param0, (sizeof(UnkStruct_02069CA8)));
 
@@ -83,7 +83,7 @@ void sub_02069BE0 (UnkStruct_02061AB4 * param0)
     sub_02062D80(param0, 0);
 }
 
-void sub_02069C0C (UnkStruct_02061AB4 * param0)
+void sub_02069C0C (LocalMapObject * param0)
 {
     UnkStruct_02069CA8 * v0 = sub_02062A78(param0);
 
@@ -98,12 +98,12 @@ void sub_02069C0C (UnkStruct_02061AB4 * param0)
     }
 }
 
-void sub_02069C44 (UnkStruct_02061AB4 * param0)
+void sub_02069C44 (LocalMapObject * param0)
 {
     return;
 }
 
-static int sub_02069C48 (UnkStruct_02061AB4 * param0, UnkStruct_02069CA8 * param1)
+static int sub_02069C48 (LocalMapObject * param0, UnkStruct_02069CA8 * param1)
 {
     sub_02062D10(param0);
     sub_02062D34(param0);
@@ -121,7 +121,7 @@ static int sub_02069C48 (UnkStruct_02061AB4 * param0, UnkStruct_02069CA8 * param
     return 0;
 }
 
-static int sub_02069C8C (UnkStruct_02061AB4 * param0, UnkStruct_02069CA8 * param1)
+static int sub_02069C8C (LocalMapObject * param0, UnkStruct_02069CA8 * param1)
 {
     if (sub_020658DC(param0) == 1) {
         sub_02062D10(param0);
@@ -131,15 +131,15 @@ static int sub_02069C8C (UnkStruct_02061AB4 * param0, UnkStruct_02069CA8 * param
     return 0;
 }
 
-static int(*const Unk_020EF8D4[])(UnkStruct_02061AB4 *, UnkStruct_02069CA8 *) = {
+static int(*const Unk_020EF8D4[])(LocalMapObject *, UnkStruct_02069CA8 *) = {
     sub_02069C48,
     sub_02069C8C
 };
 
-static int sub_02069CA8 (UnkStruct_02061AB4 * param0, UnkStruct_02069CA8 * param1)
+static int sub_02069CA8 (LocalMapObject * param0, UnkStruct_02069CA8 * param1)
 {
     const UnkStruct_02061830 * v0 = sub_02062A40(param0);
-    UnkStruct_02061AB4 * v1 = sub_0205EA24(v0);
+    LocalMapObject * v1 = sub_0205EA24(v0);
 
     if (v1 == NULL) {
         param1->unk_01 = 0;
@@ -153,7 +153,7 @@ static int sub_02069CA8 (UnkStruct_02061AB4 * param0, UnkStruct_02069CA8 * param
     return 1;
 }
 
-static void sub_02069CD4 (UnkStruct_02061AB4 * param0, UnkStruct_02069CA8 * param1)
+static void sub_02069CD4 (LocalMapObject * param0, UnkStruct_02069CA8 * param1)
 {
     FieldSystem * v0 = sub_02062C00(param0);
     PlayerAvatar * v1 = sub_0205EF3C(v0);
@@ -164,7 +164,7 @@ static void sub_02069CD4 (UnkStruct_02061AB4 * param0, UnkStruct_02069CA8 * para
     param1->unk_06 = 0xff;
 }
 
-static int sub_02069CFC (UnkStruct_02061AB4 * param0, UnkStruct_02069CA8 * param1)
+static int sub_02069CFC (LocalMapObject * param0, UnkStruct_02069CA8 * param1)
 {
     FieldSystem * v0 = sub_02062C00(param0);
     PlayerAvatar * v1 = sub_0205EF3C(v0);
@@ -181,7 +181,7 @@ static int sub_02069CFC (UnkStruct_02061AB4 * param0, UnkStruct_02069CA8 * param
     return 0;
 }
 
-static void sub_02069D30 (UnkStruct_02061AB4 * param0, UnkStruct_02069CA8 * param1)
+static void sub_02069D30 (LocalMapObject * param0, UnkStruct_02069CA8 * param1)
 {
     FieldSystem * v0 = sub_02062C00(param0);
     PlayerAvatar * v1 = sub_0205EF3C(v0);
@@ -190,7 +190,7 @@ static void sub_02069D30 (UnkStruct_02061AB4 * param0, UnkStruct_02069CA8 * para
     param1->unk_04 = Player_ZPos(v1);
 }
 
-static u32 sub_02069D50 (UnkStruct_02061AB4 * param0)
+static u32 sub_02069D50 (LocalMapObject * param0)
 {
     u32 v0;
     FieldSystem * v1 = sub_02062C00(param0);
@@ -216,7 +216,7 @@ static u32 sub_02069D50 (UnkStruct_02061AB4 * param0)
     return v0;
 }
 
-static int sub_02069D8C (UnkStruct_02061AB4 * param0)
+static int sub_02069D8C (LocalMapObject * param0)
 {
     FieldSystem * v0 = sub_02062C00(param0);
     PlayerAvatar * v1 = sub_0205EF3C(v0);
@@ -238,7 +238,7 @@ static int sub_02069D8C (UnkStruct_02061AB4 * param0)
     return 0;
 }
 
-void sub_02069DF4 (UnkStruct_02061AB4 * param0)
+void sub_02069DF4 (LocalMapObject * param0)
 {
     UnkStruct_02069F48 * v0 = sub_02062A54(param0, (sizeof(UnkStruct_02069F48)));
 
@@ -249,7 +249,7 @@ void sub_02069DF4 (UnkStruct_02061AB4 * param0)
     v0->unk_01 = 0;
 }
 
-void sub_02069E1C (UnkStruct_02061AB4 * param0)
+void sub_02069E1C (LocalMapObject * param0)
 {
     UnkStruct_02069F48 * v0 = sub_02062A78(param0);
 
@@ -262,18 +262,18 @@ void sub_02069E1C (UnkStruct_02061AB4 * param0)
     }
 }
 
-void sub_02069E4C (UnkStruct_02061AB4 * param0)
+void sub_02069E4C (LocalMapObject * param0)
 {
     return;
 }
 
-void sub_02069E50 (UnkStruct_02061AB4 * param0)
+void sub_02069E50 (LocalMapObject * param0)
 {
     UnkStruct_02069F48 * v0 = sub_02062A78(param0);
     v0->unk_01 = 0;
 }
 
-static int sub_02069E5C (UnkStruct_02061AB4 * param0, UnkStruct_02069F48 * param1)
+static int sub_02069E5C (LocalMapObject * param0, UnkStruct_02069F48 * param1)
 {
     sub_02062D10(param0);
     sub_02062D34(param0);
@@ -289,7 +289,7 @@ static int sub_02069E5C (UnkStruct_02061AB4 * param0, UnkStruct_02069F48 * param
     return 0;
 }
 
-static int sub_02069E98 (UnkStruct_02061AB4 * param0, UnkStruct_02069F48 * param1)
+static int sub_02069E98 (LocalMapObject * param0, UnkStruct_02069F48 * param1)
 {
     if (sub_020658DC(param0) == 0) {
         return 0;
@@ -300,19 +300,19 @@ static int sub_02069E98 (UnkStruct_02061AB4 * param0, UnkStruct_02069F48 * param
     return 0;
 }
 
-static int(*const Unk_020EF8EC[])(UnkStruct_02061AB4 *, UnkStruct_02069F48 *) = {
+static int(*const Unk_020EF8EC[])(LocalMapObject *, UnkStruct_02069F48 *) = {
     sub_02069E5C,
     sub_02069E98
 };
 
-UnkStruct_02061AB4 * sub_02069EB8 (UnkStruct_02061AB4 * param0)
+LocalMapObject * sub_02069EB8 (LocalMapObject * param0)
 {
     int v0 = 0;
     int v1 = sub_02062950(param0);
     int v2 = sub_02062918(param0);
     u32 v3 = sub_02067F24(param0);
     const UnkStruct_02061830 * v4 = sub_02062A40(param0);
-    UnkStruct_02061AB4 * v5;
+    LocalMapObject * v5;
 
     switch (v1) {
     case 0x1:
@@ -335,11 +335,11 @@ UnkStruct_02061AB4 * sub_02069EB8 (UnkStruct_02061AB4 * param0)
     return NULL;
 }
 
-static int sub_02069F48 (UnkStruct_02061AB4 * param0, UnkStruct_02069F48 * param1)
+static int sub_02069F48 (LocalMapObject * param0, UnkStruct_02069F48 * param1)
 {
     int v0, v1;
     u32 v2;
-    UnkStruct_02061AB4 * v3;
+    LocalMapObject * v3;
     const UnkStruct_02061830 * v4 = sub_02062A40(param0);
 
     v0 = 0;
@@ -360,7 +360,7 @@ static int sub_02069F48 (UnkStruct_02061AB4 * param0, UnkStruct_02069F48 * param
     return 0;
 }
 
-static void sub_02069FC4 (UnkStruct_02061AB4 * param0, UnkStruct_02069F48 * param1, UnkStruct_02061AB4 * param2)
+static void sub_02069FC4 (LocalMapObject * param0, UnkStruct_02069F48 * param1, LocalMapObject * param2)
 {
     param1->unk_01 = 1;
     param1->unk_02 = sub_02063020(param2);
@@ -369,9 +369,9 @@ static void sub_02069FC4 (UnkStruct_02061AB4 * param0, UnkStruct_02069F48 * para
     param1->unk_08 = param2;
 }
 
-static int sub_02069FE8 (UnkStruct_02061AB4 * param0, UnkStruct_02069F48 * param1)
+static int sub_02069FE8 (LocalMapObject * param0, UnkStruct_02069F48 * param1)
 {
-    UnkStruct_02061AB4 * v0 = param1->unk_08;
+    LocalMapObject * v0 = param1->unk_08;
     int v1 = sub_02063020(param0);
     int v2 = sub_02063040(param0);
     int v3 = sub_02063008(v0);
@@ -384,7 +384,7 @@ static int sub_02069FE8 (UnkStruct_02061AB4 * param0, UnkStruct_02069F48 * param
     return 0;
 }
 
-static int sub_0206A034 (UnkStruct_02061AB4 * param0, UnkStruct_02069F48 * param1)
+static int sub_0206A034 (LocalMapObject * param0, UnkStruct_02069F48 * param1)
 {
     int v0 = sub_02063020(param0);
     int v1 = sub_02063040(param0);
@@ -413,7 +413,7 @@ static int sub_0206A034 (UnkStruct_02061AB4 * param0, UnkStruct_02069F48 * param
     return 0;
 }
 
-static void sub_0206A0BC (UnkStruct_02061AB4 * param0, int param1)
+static void sub_0206A0BC (LocalMapObject * param0, int param1)
 {
     UnkStruct_0206A0BC * v0 = sub_02062A54(param0, (sizeof(UnkStruct_0206A0BC)));
 
@@ -430,27 +430,27 @@ static void sub_0206A0BC (UnkStruct_02061AB4 * param0, int param1)
     }
 }
 
-void sub_0206A104 (UnkStruct_02061AB4 * param0)
+void sub_0206A104 (LocalMapObject * param0)
 {
     sub_0206A0BC(param0, 0);
 }
 
-void sub_0206A110 (UnkStruct_02061AB4 * param0)
+void sub_0206A110 (LocalMapObject * param0)
 {
     sub_0206A0BC(param0, 1);
 }
 
-void sub_0206A11C (UnkStruct_02061AB4 * param0)
+void sub_0206A11C (LocalMapObject * param0)
 {
     sub_0206A0BC(param0, 2);
 }
 
-void sub_0206A128 (UnkStruct_02061AB4 * param0)
+void sub_0206A128 (LocalMapObject * param0)
 {
     sub_0206A0BC(param0, 3);
 }
 
-void sub_0206A134 (UnkStruct_02061AB4 * param0)
+void sub_0206A134 (LocalMapObject * param0)
 {
     UnkStruct_0206A0BC * v0 = sub_02062A78(param0);
 
@@ -459,7 +459,7 @@ void sub_0206A134 (UnkStruct_02061AB4 * param0)
     }
 }
 
-void sub_0206A158 (UnkStruct_02061AB4 * param0)
+void sub_0206A158 (LocalMapObject * param0)
 {
     UnkStruct_ov101_021D5D90 * v0 = sub_0206A224(param0);
 
@@ -468,7 +468,7 @@ void sub_0206A158 (UnkStruct_02061AB4 * param0)
     }
 }
 
-void sub_0206A168 (UnkStruct_02061AB4 * param0)
+void sub_0206A168 (LocalMapObject * param0)
 {
     UnkStruct_0206A0BC * v0 = sub_02062A78(param0);
 
@@ -483,7 +483,7 @@ void sub_0206A168 (UnkStruct_02061AB4 * param0)
     }
 }
 
-static int sub_0206A1AC (UnkStruct_02061AB4 * param0, UnkStruct_0206A0BC * param1)
+static int sub_0206A1AC (LocalMapObject * param0, UnkStruct_0206A0BC * param1)
 {
     if (param1->unk_02 == 0) {
         UnkStruct_ov101_021D5D90 * v0 = ov5_021F3D90(param0, param1->unk_01);
@@ -498,7 +498,7 @@ static int sub_0206A1AC (UnkStruct_02061AB4 * param0, UnkStruct_0206A0BC * param
     return 0;
 }
 
-static int sub_0206A1DC (UnkStruct_02061AB4 * param0, UnkStruct_0206A0BC * param1)
+static int sub_0206A1DC (LocalMapObject * param0, UnkStruct_0206A0BC * param1)
 {
     if (param1->unk_02 == 0) {
         UnkStruct_ov101_021D5D90 * v0 = sub_0206A224(param0);
@@ -516,32 +516,32 @@ static int sub_0206A1DC (UnkStruct_02061AB4 * param0, UnkStruct_0206A0BC * param
     return 0;
 }
 
-static int(*const Unk_020EF8DC[])(UnkStruct_02061AB4 *, UnkStruct_0206A0BC *) = {
+static int(*const Unk_020EF8DC[])(LocalMapObject *, UnkStruct_0206A0BC *) = {
     sub_0206A1AC,
     sub_0206A1DC
 };
 
-void sub_0206A218 (UnkStruct_02061AB4 * param0, UnkStruct_ov101_021D5D90 * param1)
+void sub_0206A218 (LocalMapObject * param0, UnkStruct_ov101_021D5D90 * param1)
 {
     UnkStruct_0206A0BC * v0 = sub_02062A78(param0);
     v0->unk_04 = param1;
 }
 
-UnkStruct_ov101_021D5D90 * sub_0206A224 (UnkStruct_02061AB4 * param0)
+UnkStruct_ov101_021D5D90 * sub_0206A224 (LocalMapObject * param0)
 {
     UnkStruct_0206A0BC * v0 = sub_02062A78(param0);
     return v0->unk_04;
 }
 
-void sub_0206A230 (UnkStruct_02061AB4 * param0)
+void sub_0206A230 (LocalMapObject * param0)
 {
     UnkStruct_0206A0BC * v0 = sub_02062A78(param0);
     v0->unk_02 = 1;
 }
 
-static int(*const Unk_020EF918[5])(UnkStruct_02061AB4 *, UnkStruct_0206A23C *);
+static int(*const Unk_020EF918[5])(LocalMapObject *, UnkStruct_0206A23C *);
 
-static void sub_0206A23C (UnkStruct_02061AB4 * param0, int param1, u32 param2)
+static void sub_0206A23C (LocalMapObject * param0, int param1, u32 param2)
 {
     UnkStruct_0206A23C * v0 = sub_02062A54(param0, (sizeof(UnkStruct_0206A23C)));
 
@@ -551,47 +551,47 @@ static void sub_0206A23C (UnkStruct_02061AB4 * param0, int param1, u32 param2)
     sub_02062974(param0, 0);
 }
 
-void sub_0206A25C (UnkStruct_02061AB4 * param0)
+void sub_0206A25C (LocalMapObject * param0)
 {
     sub_0206A23C(param0, 0, 0);
 }
 
-void sub_0206A268 (UnkStruct_02061AB4 * param0)
+void sub_0206A268 (LocalMapObject * param0)
 {
     sub_0206A23C(param0, 1, 0);
 }
 
-void sub_0206A274 (UnkStruct_02061AB4 * param0)
+void sub_0206A274 (LocalMapObject * param0)
 {
     sub_0206A23C(param0, 2, 0);
 }
 
-void sub_0206A280 (UnkStruct_02061AB4 * param0)
+void sub_0206A280 (LocalMapObject * param0)
 {
     sub_0206A23C(param0, 3, 0);
 }
 
-void sub_0206A28C (UnkStruct_02061AB4 * param0)
+void sub_0206A28C (LocalMapObject * param0)
 {
     sub_0206A23C(param0, 0, 1);
 }
 
-void sub_0206A298 (UnkStruct_02061AB4 * param0)
+void sub_0206A298 (LocalMapObject * param0)
 {
     sub_0206A23C(param0, 1, 1);
 }
 
-void sub_0206A2A4 (UnkStruct_02061AB4 * param0)
+void sub_0206A2A4 (LocalMapObject * param0)
 {
     sub_0206A23C(param0, 2, 1);
 }
 
-void sub_0206A2B0 (UnkStruct_02061AB4 * param0)
+void sub_0206A2B0 (LocalMapObject * param0)
 {
     sub_0206A23C(param0, 3, 1);
 }
 
-void sub_0206A2BC (UnkStruct_02061AB4 * param0)
+void sub_0206A2BC (LocalMapObject * param0)
 {
     UnkStruct_0206A23C * v0 = sub_02062A78(param0);
 
@@ -600,7 +600,7 @@ void sub_0206A2BC (UnkStruct_02061AB4 * param0)
     }
 }
 
-static int sub_0206A2E0 (UnkStruct_02061AB4 * param0, UnkStruct_0206A23C * param1)
+static int sub_0206A2E0 (LocalMapObject * param0, UnkStruct_0206A23C * param1)
 {
     int v0 = sub_0206298C(param0);
 
@@ -614,7 +614,7 @@ static int sub_0206A2E0 (UnkStruct_02061AB4 * param0, UnkStruct_0206A23C * param
     return 1;
 }
 
-static int sub_0206A30C (UnkStruct_02061AB4 * param0, UnkStruct_0206A23C * param1)
+static int sub_0206A30C (LocalMapObject * param0, UnkStruct_0206A23C * param1)
 {
     if (sub_020658DC(param0) == 1) {
         param1->unk_00 = 2;
@@ -624,7 +624,7 @@ static int sub_0206A30C (UnkStruct_02061AB4 * param0, UnkStruct_0206A23C * param
     return 0;
 }
 
-static int sub_0206A324 (UnkStruct_02061AB4 * param0, UnkStruct_0206A23C * param1)
+static int sub_0206A324 (LocalMapObject * param0, UnkStruct_0206A23C * param1)
 {
     if (param1->unk_01 == -1) {
         FieldSystem * v0 = sub_02062C00(param0);
@@ -639,7 +639,7 @@ static int sub_0206A324 (UnkStruct_02061AB4 * param0, UnkStruct_0206A23C * param
     return 1;
 }
 
-static u32 sub_0206A354 (UnkStruct_02061AB4 * param0, int param1)
+static u32 sub_0206A354 (LocalMapObject * param0, int param1)
 {
     u32 v0 = sub_02064238(param0, param1);
 
@@ -651,7 +651,7 @@ static u32 sub_0206A354 (UnkStruct_02061AB4 * param0, int param1)
     return v0;
 }
 
-static void sub_0206A37C (UnkStruct_02061AB4 * param0, int param1, int param2, u32 param3)
+static void sub_0206A37C (LocalMapObject * param0, int param1, int param2, u32 param3)
 {
     u32 v0;
 
@@ -671,7 +671,7 @@ static void sub_0206A37C (UnkStruct_02061AB4 * param0, int param1, int param2, u
     sub_02065668(param0, param2);
 }
 
-static int sub_0206A3BC (UnkStruct_02061AB4 * param0, UnkStruct_0206A23C * param1)
+static int sub_0206A3BC (LocalMapObject * param0, UnkStruct_0206A23C * param1)
 {
     int v0;
     FieldSystem * v1 = sub_02062C00(param0);
@@ -705,7 +705,7 @@ static int sub_0206A3BC (UnkStruct_02061AB4 * param0, UnkStruct_0206A23C * param
     return 1;
 }
 
-static int sub_0206A454 (UnkStruct_02061AB4 * param0, UnkStruct_0206A23C * param1)
+static int sub_0206A454 (LocalMapObject * param0, UnkStruct_0206A23C * param1)
 {
     if (sub_020658DC(param0) == 0) {
         return 0;
@@ -718,7 +718,7 @@ static int sub_0206A454 (UnkStruct_02061AB4 * param0, UnkStruct_0206A23C * param
     return 0;
 }
 
-static int(*const Unk_020EF918[5])(UnkStruct_02061AB4 *, UnkStruct_0206A23C *) = {
+static int(*const Unk_020EF918[5])(LocalMapObject *, UnkStruct_0206A23C *) = {
     sub_0206A2E0,
     sub_0206A30C,
     sub_0206A324,
@@ -726,9 +726,9 @@ static int(*const Unk_020EF918[5])(UnkStruct_02061AB4 *, UnkStruct_0206A23C *) =
     sub_0206A454
 };
 
-static int(*const Unk_020EF90C[3])(UnkStruct_02061AB4 *, UnkStruct_0206A47C *);
+static int(*const Unk_020EF90C[3])(LocalMapObject *, UnkStruct_0206A47C *);
 
-static void sub_0206A47C (UnkStruct_02061AB4 * param0, int param1, int param2)
+static void sub_0206A47C (LocalMapObject * param0, int param1, int param2)
 {
     UnkStruct_0206A47C * v0 = sub_02062A54(param0, (sizeof(UnkStruct_0206A47C)));
 
@@ -736,27 +736,27 @@ static void sub_0206A47C (UnkStruct_02061AB4 * param0, int param1, int param2)
     v0->unk_08 = param2;
 }
 
-void sub_0206A490 (UnkStruct_02061AB4 * param0)
+void sub_0206A490 (LocalMapObject * param0)
 {
     sub_0206A47C(param0, 0, 0);
 }
 
-void sub_0206A49C (UnkStruct_02061AB4 * param0)
+void sub_0206A49C (LocalMapObject * param0)
 {
     sub_0206A47C(param0, 1, 1);
 }
 
-void sub_0206A4A8 (UnkStruct_02061AB4 * param0)
+void sub_0206A4A8 (LocalMapObject * param0)
 {
     sub_0206A47C(param0, 2, 0);
 }
 
-void sub_0206A4B4 (UnkStruct_02061AB4 * param0)
+void sub_0206A4B4 (LocalMapObject * param0)
 {
     sub_0206A47C(param0, 2, 1);
 }
 
-void sub_0206A4C0 (UnkStruct_02061AB4 * param0)
+void sub_0206A4C0 (LocalMapObject * param0)
 {
     UnkStruct_0206A47C * v0 = sub_02062A78(param0);
 
@@ -765,21 +765,21 @@ void sub_0206A4C0 (UnkStruct_02061AB4 * param0)
     }
 }
 
-static int sub_0206A4E4 (UnkStruct_02061AB4 * param0, UnkStruct_0206A47C * param1)
+static int sub_0206A4E4 (LocalMapObject * param0, UnkStruct_0206A47C * param1)
 {
     sub_02062D10(param0);
     param1->unk_00++;
     return 1;
 }
 
-static int sub_0206A4F8 (UnkStruct_02061AB4 * param0, UnkStruct_0206A47C * param1)
+static int sub_0206A4F8 (LocalMapObject * param0, UnkStruct_0206A47C * param1)
 {
     sub_0206A630(param0, param1, 0xc);
     param1->unk_00++;
     return 1;
 }
 
-static int sub_0206A50C (UnkStruct_02061AB4 * param0, UnkStruct_0206A47C * param1)
+static int sub_0206A50C (LocalMapObject * param0, UnkStruct_0206A47C * param1)
 {
     if (sub_020658DC(param0) == 1) {
         param1->unk_00 = 0;
@@ -789,7 +789,7 @@ static int sub_0206A50C (UnkStruct_02061AB4 * param0, UnkStruct_0206A47C * param
     return 0;
 }
 
-static int(*const Unk_020EF90C[3])(UnkStruct_02061AB4 *, UnkStruct_0206A47C *) = {
+static int(*const Unk_020EF90C[3])(LocalMapObject *, UnkStruct_0206A47C *) = {
     sub_0206A4E4,
     sub_0206A4F8,
     sub_0206A50C
@@ -864,7 +864,7 @@ static BOOL sub_0206A54C (FieldSystem * param0, int param1, int param2, int para
     return v0;
 }
 
-static int sub_0206A574 (UnkStruct_02061AB4 * param0, int param1, int param2)
+static int sub_0206A574 (LocalMapObject * param0, int param1, int param2)
 {
     FieldSystem * v0 = sub_02062C00(param0);
     int v1 = sub_02063020(param0);
@@ -874,7 +874,7 @@ static int sub_0206A574 (UnkStruct_02061AB4 * param0, int param1, int param2)
     return v3;
 }
 
-static int sub_0206A5A4 (UnkStruct_02061AB4 * param0, int param1, int param2)
+static int sub_0206A5A4 (LocalMapObject * param0, int param1, int param2)
 {
     FieldSystem * v0 = sub_02062C00(param0);
     int v1 = sub_02063020(param0);
@@ -884,7 +884,7 @@ static int sub_0206A5A4 (UnkStruct_02061AB4 * param0, int param1, int param2)
     return v3;
 }
 
-static int sub_0206A5D4 (UnkStruct_02061AB4 * param0, int param1, int param2)
+static int sub_0206A5D4 (LocalMapObject * param0, int param1, int param2)
 {
     if (sub_0206A574(param0, param1, param2) == 0) {
         if (sub_0206A5A4(param0, param1, param2) == 0) {
@@ -897,7 +897,7 @@ static int sub_0206A5D4 (UnkStruct_02061AB4 * param0, int param1, int param2)
     return param1;
 }
 
-static u32 sub_0206A60C (UnkStruct_02061AB4 * param0, int * param1, int param2)
+static u32 sub_0206A60C (LocalMapObject * param0, int * param1, int param2)
 {
     u32 v0;
 
@@ -911,7 +911,7 @@ static u32 sub_0206A60C (UnkStruct_02061AB4 * param0, int * param1, int param2)
     return 0;
 }
 
-static int sub_0206A630 (UnkStruct_02061AB4 * param0, UnkStruct_0206A47C * param1, int param2)
+static int sub_0206A630 (LocalMapObject * param0, UnkStruct_0206A47C * param1, int param2)
 {
     u32 v0;
     int v1 = param1->unk_08;
diff --git a/src/unk_0206C0E8.c b/src/unk_0206C0E8.c
index 14e9de6bbb..373a5b9fc7 100644
--- a/src/unk_0206C0E8.c
+++ b/src/unk_0206C0E8.c
@@ -88,7 +88,7 @@ static BOOL sub_0206C120 (UnkStruct_020508D4 * param0)
         break;
     case 4:
     {
-        UnkStruct_02061AB4 * v3 = sub_0205EB3C(v0->playerAvatar);
+        LocalMapObject * v3 = Player_LocalMapObject(v0->playerAvatar);
 
         v1->unk_0D++;
 
diff --git a/src/unk_0207070C.c b/src/unk_0207070C.c
index 63964eff00..e8ca8367d6 100644
--- a/src/unk_0207070C.c
+++ b/src/unk_0207070C.c
@@ -48,7 +48,7 @@ typedef struct {
 
 typedef struct {
     u32 unk_00;
-    UnkStruct_02061AB4 * unk_04;
+    LocalMapObject * unk_04;
     UnkStruct_020709CC unk_08;
 } UnkStruct_0207086C;
 
@@ -164,7 +164,7 @@ u32 sub_0207070C (u16 param0, u16 param1)
 
 void sub_02070728 (FieldSystem * param0, UnkStruct_02070950 * param1)
 {
-    UnkStruct_02061AB4 * v0;
+    LocalMapObject * v0;
     int v1, v2;
     int v3;
     int v4;
diff --git a/src/unk_020EDBAC.c b/src/unk_020EDBAC.c
index 168e483a2b..d23abf85b1 100644
--- a/src/unk_020EDBAC.c
+++ b/src/unk_020EDBAC.c
@@ -15,160 +15,160 @@
 #include "unk_020677F4.h"
 #include "unk_02069BE0.h"
 
-extern int (*const Unk_020EEC78[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EEC48[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EEC88[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EEC80[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF59C[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF590[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF584[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF578[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF56C[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF560[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF554[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF548[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF53C[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF530[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF524[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF518[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF50C[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF500[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF4F4[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF4E8[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF4DC[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF4D0[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF4C4[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF4B8[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF4AC[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF4A0[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF494[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF488[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF194[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF224[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF440[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF470[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF47C[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF230[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF458[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF464[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF5A8[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF5B4[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF434[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF428[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF41C[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF410[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF404[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF3F8[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF3EC[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF3E0[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF3D4[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF3C8[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF3BC[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF3B0[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF3A4[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF398[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF38C[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF380[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF374[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF368[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF35C[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF350[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF344[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF338[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF32C[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF320[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF314[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF308[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF2FC[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF2F0[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF2E4[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF2D8[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EEC98[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF2C0[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF2B4[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF2A8[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF020[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF17C[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF1A0[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF44C[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF29C[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF290[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF284[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF278[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF26C[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF260[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF254[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF248[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF23C[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EEC70[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EEC68[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EEC50[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EEC90[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EEC58[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EEC60[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF218[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF20C[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF200[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF1F4[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF1E8[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF1DC[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF1D0[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF1C4[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF1B8[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF188[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF5C0[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF164[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF158[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF14C[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF140[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF134[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF128[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF11C[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF110[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF104[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF0F8[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF0EC[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF0E0[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF0D4[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF0C8[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF0BC[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF2CC[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF0A4[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF098[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF08C[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF080[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF074[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF068[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF05C[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF050[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF044[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF038[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF014[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF5CC[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EEFF0[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EEFE4[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EEFD8[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EEFCC[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EEFC0[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EEFB4[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EEFA8[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF0B0[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EEF90[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EEF84[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EEF6C[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EEF78[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF008[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF02C[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF1AC[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF5D8[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EECBC[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EECB0[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EECA4[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EEF9C[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EEF60[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EEFFC[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF170[])(UnkStruct_02061AB4 *);
-extern int (*const Unk_020EF5E4[])(UnkStruct_02061AB4 *);
+extern int (*const Unk_020EEC78[])(LocalMapObject *);
+extern int (*const Unk_020EEC48[])(LocalMapObject *);
+extern int (*const Unk_020EEC88[])(LocalMapObject *);
+extern int (*const Unk_020EEC80[])(LocalMapObject *);
+extern int (*const Unk_020EF59C[])(LocalMapObject *);
+extern int (*const Unk_020EF590[])(LocalMapObject *);
+extern int (*const Unk_020EF584[])(LocalMapObject *);
+extern int (*const Unk_020EF578[])(LocalMapObject *);
+extern int (*const Unk_020EF56C[])(LocalMapObject *);
+extern int (*const Unk_020EF560[])(LocalMapObject *);
+extern int (*const Unk_020EF554[])(LocalMapObject *);
+extern int (*const Unk_020EF548[])(LocalMapObject *);
+extern int (*const Unk_020EF53C[])(LocalMapObject *);
+extern int (*const Unk_020EF530[])(LocalMapObject *);
+extern int (*const Unk_020EF524[])(LocalMapObject *);
+extern int (*const Unk_020EF518[])(LocalMapObject *);
+extern int (*const Unk_020EF50C[])(LocalMapObject *);
+extern int (*const Unk_020EF500[])(LocalMapObject *);
+extern int (*const Unk_020EF4F4[])(LocalMapObject *);
+extern int (*const Unk_020EF4E8[])(LocalMapObject *);
+extern int (*const Unk_020EF4DC[])(LocalMapObject *);
+extern int (*const Unk_020EF4D0[])(LocalMapObject *);
+extern int (*const Unk_020EF4C4[])(LocalMapObject *);
+extern int (*const Unk_020EF4B8[])(LocalMapObject *);
+extern int (*const Unk_020EF4AC[])(LocalMapObject *);
+extern int (*const Unk_020EF4A0[])(LocalMapObject *);
+extern int (*const Unk_020EF494[])(LocalMapObject *);
+extern int (*const Unk_020EF488[])(LocalMapObject *);
+extern int (*const Unk_020EF194[])(LocalMapObject *);
+extern int (*const Unk_020EF224[])(LocalMapObject *);
+extern int (*const Unk_020EF440[])(LocalMapObject *);
+extern int (*const Unk_020EF470[])(LocalMapObject *);
+extern int (*const Unk_020EF47C[])(LocalMapObject *);
+extern int (*const Unk_020EF230[])(LocalMapObject *);
+extern int (*const Unk_020EF458[])(LocalMapObject *);
+extern int (*const Unk_020EF464[])(LocalMapObject *);
+extern int (*const Unk_020EF5A8[])(LocalMapObject *);
+extern int (*const Unk_020EF5B4[])(LocalMapObject *);
+extern int (*const Unk_020EF434[])(LocalMapObject *);
+extern int (*const Unk_020EF428[])(LocalMapObject *);
+extern int (*const Unk_020EF41C[])(LocalMapObject *);
+extern int (*const Unk_020EF410[])(LocalMapObject *);
+extern int (*const Unk_020EF404[])(LocalMapObject *);
+extern int (*const Unk_020EF3F8[])(LocalMapObject *);
+extern int (*const Unk_020EF3EC[])(LocalMapObject *);
+extern int (*const Unk_020EF3E0[])(LocalMapObject *);
+extern int (*const Unk_020EF3D4[])(LocalMapObject *);
+extern int (*const Unk_020EF3C8[])(LocalMapObject *);
+extern int (*const Unk_020EF3BC[])(LocalMapObject *);
+extern int (*const Unk_020EF3B0[])(LocalMapObject *);
+extern int (*const Unk_020EF3A4[])(LocalMapObject *);
+extern int (*const Unk_020EF398[])(LocalMapObject *);
+extern int (*const Unk_020EF38C[])(LocalMapObject *);
+extern int (*const Unk_020EF380[])(LocalMapObject *);
+extern int (*const Unk_020EF374[])(LocalMapObject *);
+extern int (*const Unk_020EF368[])(LocalMapObject *);
+extern int (*const Unk_020EF35C[])(LocalMapObject *);
+extern int (*const Unk_020EF350[])(LocalMapObject *);
+extern int (*const Unk_020EF344[])(LocalMapObject *);
+extern int (*const Unk_020EF338[])(LocalMapObject *);
+extern int (*const Unk_020EF32C[])(LocalMapObject *);
+extern int (*const Unk_020EF320[])(LocalMapObject *);
+extern int (*const Unk_020EF314[])(LocalMapObject *);
+extern int (*const Unk_020EF308[])(LocalMapObject *);
+extern int (*const Unk_020EF2FC[])(LocalMapObject *);
+extern int (*const Unk_020EF2F0[])(LocalMapObject *);
+extern int (*const Unk_020EF2E4[])(LocalMapObject *);
+extern int (*const Unk_020EF2D8[])(LocalMapObject *);
+extern int (*const Unk_020EEC98[])(LocalMapObject *);
+extern int (*const Unk_020EF2C0[])(LocalMapObject *);
+extern int (*const Unk_020EF2B4[])(LocalMapObject *);
+extern int (*const Unk_020EF2A8[])(LocalMapObject *);
+extern int (*const Unk_020EF020[])(LocalMapObject *);
+extern int (*const Unk_020EF17C[])(LocalMapObject *);
+extern int (*const Unk_020EF1A0[])(LocalMapObject *);
+extern int (*const Unk_020EF44C[])(LocalMapObject *);
+extern int (*const Unk_020EF29C[])(LocalMapObject *);
+extern int (*const Unk_020EF290[])(LocalMapObject *);
+extern int (*const Unk_020EF284[])(LocalMapObject *);
+extern int (*const Unk_020EF278[])(LocalMapObject *);
+extern int (*const Unk_020EF26C[])(LocalMapObject *);
+extern int (*const Unk_020EF260[])(LocalMapObject *);
+extern int (*const Unk_020EF254[])(LocalMapObject *);
+extern int (*const Unk_020EF248[])(LocalMapObject *);
+extern int (*const Unk_020EF23C[])(LocalMapObject *);
+extern int (*const Unk_020EEC70[])(LocalMapObject *);
+extern int (*const Unk_020EEC68[])(LocalMapObject *);
+extern int (*const Unk_020EEC50[])(LocalMapObject *);
+extern int (*const Unk_020EEC90[])(LocalMapObject *);
+extern int (*const Unk_020EEC58[])(LocalMapObject *);
+extern int (*const Unk_020EEC60[])(LocalMapObject *);
+extern int (*const Unk_020EF218[])(LocalMapObject *);
+extern int (*const Unk_020EF20C[])(LocalMapObject *);
+extern int (*const Unk_020EF200[])(LocalMapObject *);
+extern int (*const Unk_020EF1F4[])(LocalMapObject *);
+extern int (*const Unk_020EF1E8[])(LocalMapObject *);
+extern int (*const Unk_020EF1DC[])(LocalMapObject *);
+extern int (*const Unk_020EF1D0[])(LocalMapObject *);
+extern int (*const Unk_020EF1C4[])(LocalMapObject *);
+extern int (*const Unk_020EF1B8[])(LocalMapObject *);
+extern int (*const Unk_020EF188[])(LocalMapObject *);
+extern int (*const Unk_020EF5C0[])(LocalMapObject *);
+extern int (*const Unk_020EF164[])(LocalMapObject *);
+extern int (*const Unk_020EF158[])(LocalMapObject *);
+extern int (*const Unk_020EF14C[])(LocalMapObject *);
+extern int (*const Unk_020EF140[])(LocalMapObject *);
+extern int (*const Unk_020EF134[])(LocalMapObject *);
+extern int (*const Unk_020EF128[])(LocalMapObject *);
+extern int (*const Unk_020EF11C[])(LocalMapObject *);
+extern int (*const Unk_020EF110[])(LocalMapObject *);
+extern int (*const Unk_020EF104[])(LocalMapObject *);
+extern int (*const Unk_020EF0F8[])(LocalMapObject *);
+extern int (*const Unk_020EF0EC[])(LocalMapObject *);
+extern int (*const Unk_020EF0E0[])(LocalMapObject *);
+extern int (*const Unk_020EF0D4[])(LocalMapObject *);
+extern int (*const Unk_020EF0C8[])(LocalMapObject *);
+extern int (*const Unk_020EF0BC[])(LocalMapObject *);
+extern int (*const Unk_020EF2CC[])(LocalMapObject *);
+extern int (*const Unk_020EF0A4[])(LocalMapObject *);
+extern int (*const Unk_020EF098[])(LocalMapObject *);
+extern int (*const Unk_020EF08C[])(LocalMapObject *);
+extern int (*const Unk_020EF080[])(LocalMapObject *);
+extern int (*const Unk_020EF074[])(LocalMapObject *);
+extern int (*const Unk_020EF068[])(LocalMapObject *);
+extern int (*const Unk_020EF05C[])(LocalMapObject *);
+extern int (*const Unk_020EF050[])(LocalMapObject *);
+extern int (*const Unk_020EF044[])(LocalMapObject *);
+extern int (*const Unk_020EF038[])(LocalMapObject *);
+extern int (*const Unk_020EF014[])(LocalMapObject *);
+extern int (*const Unk_020EF5CC[])(LocalMapObject *);
+extern int (*const Unk_020EEFF0[])(LocalMapObject *);
+extern int (*const Unk_020EEFE4[])(LocalMapObject *);
+extern int (*const Unk_020EEFD8[])(LocalMapObject *);
+extern int (*const Unk_020EEFCC[])(LocalMapObject *);
+extern int (*const Unk_020EEFC0[])(LocalMapObject *);
+extern int (*const Unk_020EEFB4[])(LocalMapObject *);
+extern int (*const Unk_020EEFA8[])(LocalMapObject *);
+extern int (*const Unk_020EF0B0[])(LocalMapObject *);
+extern int (*const Unk_020EEF90[])(LocalMapObject *);
+extern int (*const Unk_020EEF84[])(LocalMapObject *);
+extern int (*const Unk_020EEF6C[])(LocalMapObject *);
+extern int (*const Unk_020EEF78[])(LocalMapObject *);
+extern int (*const Unk_020EF008[])(LocalMapObject *);
+extern int (*const Unk_020EF02C[])(LocalMapObject *);
+extern int (*const Unk_020EF1AC[])(LocalMapObject *);
+extern int (*const Unk_020EF5D8[])(LocalMapObject *);
+extern int (*const Unk_020EECBC[])(LocalMapObject *);
+extern int (*const Unk_020EECB0[])(LocalMapObject *);
+extern int (*const Unk_020EECA4[])(LocalMapObject *);
+extern int (*const Unk_020EEF9C[])(LocalMapObject *);
+extern int (*const Unk_020EEF60[])(LocalMapObject *);
+extern int (*const Unk_020EEFFC[])(LocalMapObject *);
+extern int (*const Unk_020EF170[])(LocalMapObject *);
+extern int (*const Unk_020EF5E4[])(LocalMapObject *);
 
 
 static const UnkStruct_020EDF0C Unk_020EDF0C = {
@@ -786,7 +786,7 @@ const UnkStruct_020EDF0C * const Unk_020EE3A8[] = {
     &Unk_020EE2B8
 };
 
-int (*const * const Unk_020EE4B8[0x9a])(UnkStruct_02061AB4 *) = {
+int (*const * const Unk_020EE4B8[0x9a])(LocalMapObject *) = {
     Unk_020EEC78,
     Unk_020EEC48,
     Unk_020EEC88,

From fdc6be0ae9000f6b4e7ca65435f3894695cd6d51 Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Wed, 3 Apr 2024 14:27:17 -0400
Subject: [PATCH 06/11] Doc v2s

---
 include/overlay023/struct_ov23_0224A294.h |   2 +-
 include/unk_02054D00.h                    |   2 +-
 include/unk_02057518.h                    |  16 +-
 include/unk_0205E7D0.h                    |   2 +-
 src/overlay005/ov5_021D0D80.c             |   2 +-
 src/overlay005/ov5_021D1C30.c             |   2 +-
 src/overlay005/ov5_021E1154.c             |   6 +-
 src/overlay005/ov5_021E135C.c             |   4 +-
 src/overlay008/ov8_02249960.c             |   2 +-
 src/overlay023/ov23_0223E140.c            |  12 +-
 src/overlay023/ov23_022416A8.c            |   2 +-
 src/overlay023/ov23_02241F74.c            |   6 +-
 src/overlay023/ov23_0224340C.c            |  12 +-
 src/overlay023/ov23_0224A1D0.c            |   2 +-
 src/overlay023/ov23_0224B05C.c            |  20 +-
 src/overlay023/ov23_0225128C.c            |   2 +-
 src/unk_0203F6C4.c                        |  14 +-
 src/unk_02054D00.c                        |   6 +-
 src/unk_02055C50.c                        |  10 +-
 src/unk_02057518.c                        | 491 +++++++++++-----------
 src/unk_0205A0D8.c                        |   8 +-
 src/unk_0205E7D0.c                        |   2 +-
 src/unk_02069BE0.c                        |   4 +-
 23 files changed, 314 insertions(+), 315 deletions(-)

diff --git a/include/overlay023/struct_ov23_0224A294.h b/include/overlay023/struct_ov23_0224A294.h
index 295cfdee73..f8e47e70aa 100644
--- a/include/overlay023/struct_ov23_0224A294.h
+++ b/include/overlay023/struct_ov23_0224A294.h
@@ -17,7 +17,7 @@ typedef struct {
     UnkStruct_ov23_0224991C * unk_04;
     PlayerAvatar * playerAvatar[MAX_CONNECTED_PLAYERS];
     UnkStruct_ov101_021D5D90 * unk_28[MAX_CONNECTED_PLAYERS];
-    u8 unk_48[MAX_CONNECTED_PLAYERS];
+    u8 isActive[MAX_CONNECTED_PLAYERS];
     SysTask * task;
     FieldSystem * fieldSys;
     UnkStruct_ov23_0224A294_sub1 unk_58;
diff --git a/include/unk_02054D00.h b/include/unk_02054D00.h
index eabae22e15..90852ac385 100644
--- a/include/unk_02054D00.h
+++ b/include/unk_02054D00.h
@@ -9,7 +9,7 @@
 #include <nitro/fx/fx.h>
 
 void sub_02054F44(const UnkStruct_02054F44 ** param0, int param1);
-BOOL sub_02054F68(const FieldSystem * param0, const int param1, const int param2);
+BOOL FieldSystem_CheckCollision(const FieldSystem * param0, const int param1, const int param2);
 u8 sub_02054F94(const FieldSystem * param0, const int param1, const int param2);
 const fx32 sub_02054FBC(const FieldSystem * param0, const fx32 param1, const fx32 param2, const fx32 param3, u8 * param4);
 BOOL sub_02055024(const FieldSystem * param0, const VecFx32 * param1, const int param2, const int param3, s8 * param4);
diff --git a/include/unk_02057518.h b/include/unk_02057518.h
index d071fb53a5..42993bd2f2 100644
--- a/include/unk_02057518.h
+++ b/include/unk_02057518.h
@@ -45,18 +45,18 @@ int sub_02058DF8(int param0);
 int sub_02058E4C(int param0);
 int sub_02058EA0(int param0);
 int sub_02058EC0(int param0);
-int sub_02058EE0(int param0);
+int CommPlayer_AddXServer(int param0);
 int sub_02058F18(int param0);
 int CommPlayer_Dir(int param0);
-int sub_02058F80(int param0);
-void sub_02058FB0(int param0, int param1);
-void sub_02058FE4(int param0, int param1);
+int CommPlayer_DirServer(int param0);
+void CommPlayer_LookTowardsServer(int param0, int param1);
+void CommPlayer_LookTowards(int param0, int param1);
 int sub_0205900C(int param0, int param1);
 void sub_02059058(int param0, BOOL param1);
 BOOL sub_02059094(int param0);
 BOOL sub_020590C4(void);
 void sub_02059180(int param0, int param1, void * param2, void * param3);
-void sub_02059240(void);
+void CommPlayer_SetBattleDir(void);
 BOOL sub_0205928C(void);
 int CommPlayer_GetOppositeDir(int param0);
 void sub_02059354(int param0, int param1);
@@ -65,8 +65,8 @@ void sub_02059390(int param0, int param1);
 void sub_020593B4(int param0);
 int sub_020593CC(int param0);
 int sub_020593E0(int param0);
-void sub_020593F4(int param0);
-void sub_02059424(int param0, int param1);
+void CommPlayer_SetDir(int param0);
+void CommPlayer_SetDirClient(int param0, int param1);
 int CommPlayer_DirClient(int param0);
 void sub_02059464(int param0);
 void sub_0205948C(int param0);
@@ -75,7 +75,7 @@ void sub_020594FC(void);
 void sub_02059514(void);
 void sub_02059524(void);
 void sub_02059570(void);
-void sub_020595A4(void);
+void CommPlayerManager_ForcePos(void);
 void CommPlayerManager_ForceDir(void);
 void sub_02059638(BOOL param0);
 
diff --git a/include/unk_0205E7D0.h b/include/unk_0205E7D0.h
index 202243d372..09d0dca37e 100644
--- a/include/unk_0205E7D0.h
+++ b/include/unk_0205E7D0.h
@@ -17,7 +17,7 @@ void sub_0205E8E0(PlayerAvatar * param0);
 void sub_0205E8E8(PlayerAvatar * param0);
 LocalMapObject * sub_0205EA24(const UnkStruct_02061830 * param0);
 int Player_Dir(PlayerAvatar * const param0);
-void sub_0205EA84(PlayerAvatar * param0, int param1);
+void Player_SetDir(PlayerAvatar * param0, int param1);
 int sub_0205EA94(PlayerAvatar * const param0);
 int sub_0205EAA0(PlayerAvatar * const param0);
 int Player_XPos(PlayerAvatar * const param0);
diff --git a/src/overlay005/ov5_021D0D80.c b/src/overlay005/ov5_021D0D80.c
index d0ff4c6729..1129f73bff 100644
--- a/src/overlay005/ov5_021D0D80.c
+++ b/src/overlay005/ov5_021D0D80.c
@@ -913,7 +913,7 @@ static void ov5_021D1878 (FieldSystem * param0)
     }
 
     sub_02061C48(param0->unk_38);
-    sub_020595A4();
+    CommPlayerManager_ForcePos();
     sub_02062C3C(param0->unk_38);
     ov5_021E931C(sub_0205EAFC(param0->playerAvatar), param0->unk_28);
 
diff --git a/src/overlay005/ov5_021D1C30.c b/src/overlay005/ov5_021D1C30.c
index b26b1a65c8..446517455f 100644
--- a/src/overlay005/ov5_021D1C30.c
+++ b/src/overlay005/ov5_021D1C30.c
@@ -634,7 +634,7 @@ static BOOL ov5_021D2504 (FieldSystem * param0, const UnkStruct_ov5_021D1CAC * p
 
     ov5_021D2C98(param0, &v1, &v2);
 
-    if (sub_02054F68(param0, v1, v2) == 0) {
+    if (FieldSystem_CheckCollision(param0, v1, v2) == 0) {
         return 0;
     }
 
diff --git a/src/overlay005/ov5_021E1154.c b/src/overlay005/ov5_021E1154.c
index b12193476c..c40e4f73d1 100644
--- a/src/overlay005/ov5_021E1154.c
+++ b/src/overlay005/ov5_021E1154.c
@@ -98,7 +98,7 @@ static BOOL ov5_021E120C (UnkStruct_020508D4 * param0)
 
             v3 = sub_02065838(v0->unk_00, v3);
             sub_02061550(v0->unk_10, v3, 1);
-            sub_0205EA84(v0->unk_10, v0->unk_00);
+            Player_SetDir(v0->unk_10, v0->unk_00);
             v0->unk_08++;
             v0->unk_04 = 7;
         }
@@ -109,7 +109,7 @@ static BOOL ov5_021E120C (UnkStruct_020508D4 * param0)
         case 4:
         case 2:
             v0->unk_00 = ov5_021E11E0(v0->unk_00);
-            sub_0205EA84(v0->unk_10, v0->unk_00);
+            Player_SetDir(v0->unk_10, v0->unk_00);
             break;
         default:
             break;
@@ -138,7 +138,7 @@ static BOOL ov5_021E120C (UnkStruct_020508D4 * param0)
                 } else {
                     sub_020628C4(v1, (1 << 7));
                     sub_020628C4(v1, (1 << 8));
-                    sub_0205EA84(v0->unk_10, v0->unk_00);
+                    Player_SetDir(v0->unk_10, v0->unk_00);
                     ov5_021E1350(v0);
                     sub_020057A4(1624, 0);
                     return 1;
diff --git a/src/overlay005/ov5_021E135C.c b/src/overlay005/ov5_021E135C.c
index 5edad286f4..3e7e4e6a88 100644
--- a/src/overlay005/ov5_021E135C.c
+++ b/src/overlay005/ov5_021E135C.c
@@ -42,7 +42,7 @@ static void ov5_021E135C (UnkStruct_ov5_021E135C * param0)
         break;
     }
 
-    sub_0205EA84(param0->unk_00->playerAvatar, param0->unk_10);
+    Player_SetDir(param0->unk_00->playerAvatar, param0->unk_10);
 }
 
 static void ov5_021E139C (SysTask * param0, void * param1)
@@ -119,7 +119,7 @@ static void ov5_021E1470 (SysTask * param0, void * param1)
         break;
     case 2:
         if (ScreenWipe_Done()) {
-            sub_0205EA84(v0->unk_00->playerAvatar, 1);
+            Player_SetDir(v0->unk_00->playerAvatar, 1);
             *v0->unk_04 = 1;
             Heap_FreeToHeap(v0);
             SysTask_Done(param0);
diff --git a/src/overlay008/ov8_02249960.c b/src/overlay008/ov8_02249960.c
index 744da1c683..794b5e8f9e 100644
--- a/src/overlay008/ov8_02249960.c
+++ b/src/overlay008/ov8_02249960.c
@@ -3946,7 +3946,7 @@ void ov8_0224C198 (FieldSystem * param0)
                 GF_ASSERT(v1->unk_02 < (v8->unk_04 + v8->unk_08));
                 GF_ASSERT(v1->unk_04 < (v8->unk_0C + v8->unk_14));
                 GF_ASSERT(v1->unk_06 < (v8->unk_10 + v8->unk_18));
-                GF_ASSERT(sub_02054F68(param0, v1->unk_04, v1->unk_06) == 0);
+                GF_ASSERT(FieldSystem_CheckCollision(param0, v1->unk_04, v1->unk_06) == 0);
             }
         }
 
diff --git a/src/overlay023/ov23_0223E140.c b/src/overlay023/ov23_0223E140.c
index 1a3acb4a70..f6fa08133e 100644
--- a/src/overlay023/ov23_0223E140.c
+++ b/src/overlay023/ov23_0223E140.c
@@ -743,20 +743,20 @@ static BOOL ov23_0223E3AC (FieldSystem * param0, int param1, int param2)
         return 0;
     }
 
-    if (sub_02054F68(param0, param1, param2)) {
-        if (!sub_02054F68(param0, param1, param2 + 1)) {
+    if (FieldSystem_CheckCollision(param0, param1, param2)) {
+        if (!FieldSystem_CheckCollision(param0, param1, param2 + 1)) {
             return 1;
         }
 
-        if (!sub_02054F68(param0, param1, param2 - 1)) {
+        if (!FieldSystem_CheckCollision(param0, param1, param2 - 1)) {
             return 1;
         }
 
-        if (!sub_02054F68(param0, param1 + 1, param2)) {
+        if (!FieldSystem_CheckCollision(param0, param1 + 1, param2)) {
             return 1;
         }
 
-        if (!sub_02054F68(param0, param1 - 1, param2)) {
+        if (!FieldSystem_CheckCollision(param0, param1 - 1, param2)) {
             return 1;
         }
     }
@@ -814,7 +814,7 @@ static void ov23_0223E434 (MATHRandContext16 * param0, int param1)
             v5 = MATH_Rand16(param0, 20) + v4 - 10;
             v8 = MATH_Rand16(param0, 20) + v7 - 10;
 
-            if (!sub_02054F68(Unk_ov23_02257740->unk_00, v5, v8)) {
+            if (!FieldSystem_CheckCollision(Unk_ov23_02257740->unk_00, v5, v8)) {
                 int v12 = ov23_02243C3C(v5, v8, param0, Unk_ov23_02257740->unk_A30);
 
                 if (0 != v12) {
diff --git a/src/overlay023/ov23_022416A8.c b/src/overlay023/ov23_022416A8.c
index 53f34f725e..d2618a69c4 100644
--- a/src/overlay023/ov23_022416A8.c
+++ b/src/overlay023/ov23_022416A8.c
@@ -365,7 +365,7 @@ void ov23_02241AE8 (int param0, int param1, int param2, int param3)
         return;
     }
 
-    if (sub_02054F68(Unk_ov23_02257744->unk_464, param2, param3)) {
+    if (FieldSystem_CheckCollision(Unk_ov23_02257744->unk_464, param2, param3)) {
         ov23_02253F40(ov23_0224219C(), 60, 0, NULL);
         return;
     }
diff --git a/src/overlay023/ov23_02241F74.c b/src/overlay023/ov23_02241F74.c
index 3de16d26c2..4657c56920 100644
--- a/src/overlay023/ov23_02241F74.c
+++ b/src/overlay023/ov23_02241F74.c
@@ -325,7 +325,7 @@ BOOL ov23_0224240C (int param0, int param1)
     v0.unk_00 = param0;
     v0.unk_02 = param1;
 
-    if (sub_02054F68(Unk_ov23_02257748->unk_0C, param0, param1)) {
+    if (FieldSystem_CheckCollision(Unk_ov23_02257748->unk_0C, param0, param1)) {
         return 1;
     }
 
@@ -621,7 +621,7 @@ void ov23_022428D8 (int param0, int param1, void * param2, void * param3)
     u8 v4;
 
     v4 = param0;
-    v2.unk_00 = sub_02058EE0(param0);
+    v2.unk_00 = CommPlayer_AddXServer(param0);
     v2.unk_02 = sub_02058F18(param0);
 
     if (param0 == 2) {
@@ -683,7 +683,7 @@ void ov23_022428D8 (int param0, int param1, void * param2, void * param3)
                 if (CommSys_SendDataServer(30, &v0, sizeof(v0))) {
                     sub_02059058(param0, 0);
                     sub_02059058(v3, 0);
-                    sub_02058FB0(param0, v3);
+                    CommPlayer_LookTowardsServer(param0, v3);
                 }
             }
         }
diff --git a/src/overlay023/ov23_0224340C.c b/src/overlay023/ov23_0224340C.c
index 84c58240ab..ebe4f91e88 100644
--- a/src/overlay023/ov23_0224340C.c
+++ b/src/overlay023/ov23_0224340C.c
@@ -964,7 +964,7 @@ static UnkStruct_ov23_02243DA8 * ov23_02243A80 (int param0, int param1, UnkStruc
     int v0 = 0;
     UnkStruct_ov23_02243DA8 * v1;
 
-    if (sub_02054F68(Unk_ov23_02257764->unk_40, param0, param1)) {
+    if (FieldSystem_CheckCollision(Unk_ov23_02257764->unk_40, param0, param1)) {
         return NULL;
     }
 
@@ -1019,7 +1019,7 @@ void ov23_02243B0C (int param0, int param1, void * param2, void * param3)
     v4.unk_06 = param0;
     v4.unk_07 = 3;
 
-    v1 = sub_02058EE0(param0);
+    v1 = CommPlayer_AddXServer(param0);
     v2 = sub_02058F18(param0);
 
     if ((sub_02058DF8(param0) == 0xffff) && (sub_02058E4C(param0) == 0xffff)) {
@@ -1046,7 +1046,7 @@ void ov23_02243B0C (int param0, int param1, void * param2, void * param3)
         return;
     }
 
-    if (sub_02054F68(Unk_ov23_02257764->unk_40, v1, v2)) {
+    if (FieldSystem_CheckCollision(Unk_ov23_02257764->unk_40, v1, v2)) {
         v4.unk_07 = 6;
         CommSys_SendDataServer(34, &v4, sizeof(UnkStruct_ov23_02243ED4));
         return;
@@ -1334,7 +1334,7 @@ BOOL ov23_02244080 (int param0, UnkStruct_ov23_0224271C * param1, u8 param2)
     UnkStruct_ov23_02244140 v4;
     UnkStruct_020298B0 * v5 = sub_020298B0(sub_0203D174(Unk_ov23_02257764->unk_40));
 
-    v0 = sub_02058EE0(param0);
+    v0 = CommPlayer_AddXServer(param0);
     v1 = sub_02058F18(param0);
     v3 = ov23_0224429C(v0, v1);
 
@@ -1817,7 +1817,7 @@ static void ov23_022448FC (int param0)
 
     v2 = CommPlayer_GetOppositeDir(param0);
 
-    sub_0205EA84(Unk_ov23_02257764->unk_40->playerAvatar, v2);
+    Player_SetDir(Unk_ov23_02257764->unk_40->playerAvatar, v2);
 
     v0 = Unk_ov23_02257764->unk_B28[CommSys_CurNetId()].unk_00.unk_00;
     v1 = Unk_ov23_02257764->unk_B28[CommSys_CurNetId()].unk_00.unk_02;
@@ -4954,7 +4954,7 @@ static void ov23_02248A6C (SysTask * param0, void * param1)
             break;
         }
 
-        sub_02059424(v3, v2);
+        CommPlayer_SetDirClient(v3, v2);
     }
 }
 
diff --git a/src/overlay023/ov23_0224A1D0.c b/src/overlay023/ov23_0224A1D0.c
index feefc76c6d..1f3073ba6c 100644
--- a/src/overlay023/ov23_0224A1D0.c
+++ b/src/overlay023/ov23_0224A1D0.c
@@ -216,7 +216,7 @@ void ov23_0224A410 (int param0, int param1, void * param2, void * param3)
     }
 
     if (v1->unk_00 == 1) {
-        sub_02058FE4(v1->unk_01, v1->unk_02);
+        CommPlayer_LookTowards(v1->unk_01, v1->unk_02);
     }
 
     if ((v1->unk_00 == 1) && (v1->unk_01 == CommSys_CurNetId())) {
diff --git a/src/overlay023/ov23_0224B05C.c b/src/overlay023/ov23_0224B05C.c
index 71a5340b51..8b8102fe4f 100644
--- a/src/overlay023/ov23_0224B05C.c
+++ b/src/overlay023/ov23_0224B05C.c
@@ -1674,7 +1674,7 @@ static BOOL ov23_0224C790 (UnkStruct_020508D4 * param0)
     case 11:
         CommPlayerManager_ForceDir();
         sub_02061550(v0->playerAvatar, sub_02065838(1, 0x24), 1);
-        sub_020593F4(1);
+        CommPlayer_SetDir(1);
         ov23_02253F40(ov23_0224219C(), 68, 0, NULL);
         Sound_PlayEffect(1540);
         v1->unk_0C = 12;
@@ -1684,7 +1684,7 @@ static BOOL ov23_0224C790 (UnkStruct_020508D4 * param0)
             if (gCoreSys.pressedKeys & (PAD_BUTTON_A | PAD_BUTTON_B)) {
                 v1->unk_0C = 13;
                 ov23_02254044(ov23_0224219C());
-                sub_020593F4(0);
+                CommPlayer_SetDir(0);
             }
         }
         break;
@@ -1891,10 +1891,10 @@ int ov23_0224CD7C (void)
 void ov23_0224CD80 (int param0, int param1, void * param2, void * param3)
 {
     u8 * v0 = param2;
-    int v1 = sub_02058EE0(param0);
+    int v1 = CommPlayer_AddXServer(param0);
     int v2 = sub_02058F18(param0);
     int v3, v4, v5, v6;
-    int v7 = sub_02058F80(param0);
+    int v7 = CommPlayer_DirServer(param0);
     UnkStruct_ov23_0224CF18 v8;
     int v9;
 
@@ -1925,7 +1925,7 @@ void ov23_0224CD80 (int param0, int param1, void * param2, void * param3)
         (void)0;
     } else if (ov23_02242E58(v1, v2)) {
         v8.unk_01 = 6;
-    } else if (sub_02054F68(Unk_ov23_022577AC->unk_00, v1, v2) && sub_02054F68(Unk_ov23_022577AC->unk_00, v3, v4) && sub_02054F68(Unk_ov23_022577AC->unk_00, v5, v6)) {
+    } else if (FieldSystem_CheckCollision(Unk_ov23_022577AC->unk_00, v1, v2) && FieldSystem_CheckCollision(Unk_ov23_022577AC->unk_00, v3, v4) && FieldSystem_CheckCollision(Unk_ov23_022577AC->unk_00, v5, v6)) {
         if (v0[0] == 0) {
             v8.unk_01 = 1;
         } else {
@@ -2160,9 +2160,9 @@ static void ov23_0224D238 (void)
 {
     UnkStruct_02029894 * v0 = sub_02029894(sub_0203D174(Unk_ov23_022577AC->unk_00));
     UnkStruct_020298B0 * v1 = sub_020298B0(sub_0203D174(Unk_ov23_022577AC->unk_00));
-    int v2 = sub_02058EE0(0);
+    int v2 = CommPlayer_AddXServer(0);
     int v3 = sub_02058F18(0);
-    int v4 = sub_02058F80(0);
+    int v4 = CommPlayer_DirServer(0);
     int v5, v6, v7, v8, v9;
     const int v10 = 10, v11 = 18, v12 = 12, v13 = 5, v14 = 6;
     MATHRandContext32 v15;
@@ -2517,7 +2517,7 @@ BOOL ov23_0224D7C8 (int param0)
     UnkStruct_02029894 * v2;
     int v3 = sub_02058DF8(param0);
     int v4 = sub_02058E4C(param0);
-    int v5 = sub_02058F80(param0);
+    int v5 = CommPlayer_DirServer(param0);
 
     if (!ov23_02242E58(v3, v4)) {
         return 0;
@@ -2689,7 +2689,7 @@ void ov23_0224DAD0 (int param0)
     v0 = sub_02058EA0(v3);
     v1 = sub_02058EC0(v3);
 
-    if (!sub_02054F68(Unk_ov23_022577AC->unk_00, v0, v1)) {
+    if (!FieldSystem_CheckCollision(Unk_ov23_022577AC->unk_00, v0, v1)) {
         if (param0 == 0) {
             return;
         }
@@ -2701,7 +2701,7 @@ void ov23_0224DAD0 (int param0)
 
     if ((v0 == 0xffff) && (v1 == 0xffff)) {
         ov23_0224B844(v3, v3, 1);
-    } else if (ov23_02242E58(v0, v1) || sub_02054F68(Unk_ov23_022577AC->unk_00, v0, v1)) {
+    } else if (ov23_02242E58(v0, v1) || FieldSystem_CheckCollision(Unk_ov23_022577AC->unk_00, v0, v1)) {
         ov23_0224B844(v3, v3, 1);
     }
 }
diff --git a/src/overlay023/ov23_0225128C.c b/src/overlay023/ov23_0225128C.c
index deeb35c69d..0ebb3170c6 100644
--- a/src/overlay023/ov23_0225128C.c
+++ b/src/overlay023/ov23_0225128C.c
@@ -155,7 +155,7 @@ BOOL ov23_02251324 (int param0, UnkStruct_ov23_0224271C * param1)
     int v1 = param1->unk_00;
     int v2 = param1->unk_02;
     UnkStruct_ov23_022513B0 v3;
-    int v4 = ov23_022512D4(param1, sub_02058F80(param0));
+    int v4 = ov23_022512D4(param1, CommPlayer_DirServer(param0));
 
     if (CommPlayer_Dir(v4) == -1) {
         v4 = 0xff;
diff --git a/src/unk_0203F6C4.c b/src/unk_0203F6C4.c
index 560b92af69..ded1623f7d 100644
--- a/src/unk_0203F6C4.c
+++ b/src/unk_0203F6C4.c
@@ -2393,13 +2393,13 @@ static BOOL sub_02040204 (UnkStruct_0203E724 * param0)
     }
 
     if (gCoreSys.pressedKeys & PAD_KEY_UP) {
-        sub_0205EA84(param0->unk_34->playerAvatar, 0);
+        Player_SetDir(param0->unk_34->playerAvatar, 0);
     } else if (gCoreSys.pressedKeys & PAD_KEY_DOWN) {
-        sub_0205EA84(param0->unk_34->playerAvatar, 1);
+        Player_SetDir(param0->unk_34->playerAvatar, 1);
     } else if (gCoreSys.pressedKeys & PAD_KEY_LEFT) {
-        sub_0205EA84(param0->unk_34->playerAvatar, 2);
+        Player_SetDir(param0->unk_34->playerAvatar, 2);
     } else if (gCoreSys.pressedKeys & PAD_KEY_RIGHT) {
-        sub_0205EA84(param0->unk_34->playerAvatar, 3);
+        Player_SetDir(param0->unk_34->playerAvatar, 3);
     } else if (gCoreSys.pressedKeys & PAD_BUTTON_X) {
         sub_0203F0C0(param0->unk_34);
     } else {
@@ -2663,7 +2663,7 @@ static BOOL sub_02040670 (UnkStruct_0203E724 * param0)
 
     if (v4 != 0xffff) {
         sub_0201D730(*v1);
-        sub_0205EA84(param0->unk_34->playerAvatar, v4);
+        Player_SetDir(param0->unk_34->playerAvatar, v4);
         *v2 = 0;
         return 1;
     }
@@ -2709,7 +2709,7 @@ static BOOL sub_02040730 (UnkStruct_0203E724 * param0)
     }
 
     if (v2 != 0xffff) {
-        sub_0205EA84(param0->unk_34->playerAvatar, v2);
+        Player_SetDir(param0->unk_34->playerAvatar, v2);
         *v1 = 0;
         return 1;
     }
@@ -5723,7 +5723,7 @@ static BOOL sub_02043CA4 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02043CB4 (UnkStruct_0203E724 * param0)
 {
-    sub_020593F4(sub_0203E838(param0));
+    CommPlayer_SetDir(sub_0203E838(param0));
     return 0;
 }
 
diff --git a/src/unk_02054D00.c b/src/unk_02054D00.c
index 7931291503..1ba6f99438 100644
--- a/src/unk_02054D00.c
+++ b/src/unk_02054D00.c
@@ -271,7 +271,7 @@ void sub_02054F44 (const UnkStruct_02054F44 ** param0, int param1)
     }
 }
 
-BOOL sub_02054F68 (const FieldSystem * param0, const int param1, const int param2)
+BOOL FieldSystem_CheckCollision (const FieldSystem * param0, const int param1, const int param2)
 {
     BOOL v0;
     u16 v1;
@@ -369,7 +369,7 @@ BOOL sub_02055024 (const FieldSystem * param0, const VecFx32 * param1, const int
     if (v0 == 0) {
         BOOL v2;
 
-        v2 = sub_02054F68(param0, param2, param3);
+        v2 = FieldSystem_CheckCollision(param0, param2, param3);
 
         if ((!v2) && (v1 == 2)) {
             u8 v3 = sub_02054F94(param0, param2, param3);
@@ -403,7 +403,7 @@ BOOL sub_0205507C (FieldSystem * param0, const VecFx32 * param1, const int param
         v3 = sub_02068390(param0, param2, param3, param1->y, &v2);
 
         if (!v3) {
-            v2 = sub_02054F68(param0, param2, param3);
+            v2 = FieldSystem_CheckCollision(param0, param2, param3);
 
             if ((!v2) && (v1 == 2)) {
                 u8 v4 = sub_02054F94(param0, param2, param3);
diff --git a/src/unk_02055C50.c b/src/unk_02055C50.c
index 2ad08a659f..7bc3bb1c9a 100644
--- a/src/unk_02055C50.c
+++ b/src/unk_02055C50.c
@@ -320,7 +320,7 @@ static BOOL sub_02056010 (FieldSystem * param0, UnkStruct_020562AC * param1, int
         GF_ASSERT(0);
     }
 
-    if (sub_02054F68(param0, v0, v1)) {
+    if (FieldSystem_CheckCollision(param0, v0, v1)) {
         return 1;
     }
 
@@ -424,7 +424,7 @@ static BOOL sub_02056124 (UnkStruct_020508D4 * param0)
                 break;
             }
         } else if ((gCoreSys.heldKeys & PAD_KEY_UP) && (v1->unk_04 == 1)) {
-            sub_0205EA84(v0->playerAvatar, 0);
+            Player_SetDir(v0->playerAvatar, 0);
             v1->unk_00 = 4;
             break;
         } else if ((gCoreSys.heldKeys & PAD_KEY_DOWN) && (v1->unk_04 == 0)) {
@@ -435,7 +435,7 @@ static BOOL sub_02056124 (UnkStruct_020508D4 * param0)
         v1->unk_08++;
 
         if (v1->unk_08 > 30 * 3) {
-            sub_0205EA84(v0->playerAvatar, v1->unk_04);
+            Player_SetDir(v0->playerAvatar, v1->unk_04);
             v1->unk_00 = 4;
         }
         break;
@@ -449,13 +449,13 @@ static BOOL sub_02056124 (UnkStruct_020508D4 * param0)
             if ((v3 != NULL) && sub_020560E4(v3)) {
                 v1->unk_00 = 1;
             } else {
-                sub_0205EA84(v0->playerAvatar, v1->unk_04);
+                Player_SetDir(v0->playerAvatar, v1->unk_04);
                 v1->unk_00 = 4;
             }
         }
         break;
     case 4:
-        sub_0205EA84(v0->playerAvatar, v1->unk_04);
+        Player_SetDir(v0->playerAvatar, v1->unk_04);
         sub_02062DD0(Player_LocalMapObject(v0->playerAvatar));
         Heap_FreeToHeap(v1);
         return 1;
diff --git a/src/unk_02057518.c b/src/unk_02057518.c
index 5a6965f8e9..b432887bf5 100644
--- a/src/unk_02057518.c
+++ b/src/unk_02057518.c
@@ -54,7 +54,7 @@ static void sub_02057BC4(void * param0);
 static void sub_02057C2C(void * param0);
 static void CommPlayer_Add(u8 param0);
 static void CommPlayer_Move(SysTask * param0, void * param1);
-static void sub_02057E80(SysTask * param0, void * param1);
+static void Task_CommPlayerManagerRun(SysTask * param0, void * param1);
 static void sub_02057EF8(void * param0);
 static void CommPlayer_MoveClient(int param0);
 static void sub_020591A8(void);
@@ -107,7 +107,7 @@ BOOL CommPlayerManager_Init (void * dest, FieldSystem * fieldSys, BOOL isUndergr
 
     sCommPlayerManager->unk_2BC = 0;
     sCommPlayerManager->unk_2BF = 0;
-    sCommPlayerManager->task = SysTask_Start(sub_02057E80, NULL, (100 + 100));
+    sCommPlayerManager->task = SysTask_Start(Task_CommPlayerManagerRun, NULL, (100 + 100));
 
     CommSys_EnableSendMovementData();
     CommPlayer_InitPersonal();
@@ -205,7 +205,7 @@ void CommPlayerMan_Reinit (void)
             sCommPlayerManager->playerAvatar[netId] = NULL;
         }
 
-        sCommPlayerManager->unk_48[netId] = 0;
+        sCommPlayerManager->isActive[netId] = 0;
         sCommPlayerManager->playerLocation[netId].dir = -1;
         sCommPlayerManager->playerLocation[netId].x = 0xffff;
         sCommPlayerManager->playerLocation[netId].z = 0xffff;
@@ -227,14 +227,14 @@ void CommPlayerMan_Reinit (void)
     CommPlayer_InitPersonal();
 
     if (sCommPlayerManager->task == NULL) {
-        sCommPlayerManager->task = SysTask_Start(sub_02057E80, NULL, (100 + 100));
+        sCommPlayerManager->task = SysTask_Start(Task_CommPlayerManagerRun, NULL, (100 + 100));
     }
 }
 
 void CommPlayerMan_Stop (void)
 {
     if (sCommPlayerManager->task) {
-        sub_02057E80(NULL, NULL);
+        Task_CommPlayerManagerRun(NULL, NULL);
         SysTask_Done(sCommPlayerManager->task);
     }
 
@@ -244,7 +244,7 @@ void CommPlayerMan_Stop (void)
 void CommPlayer_InitPersonal (void)
 {
     sCommPlayerManager->playerAvatar[CommSys_CurNetId()] = sCommPlayerManager->fieldSys->playerAvatar;
-    sCommPlayerManager->unk_48[CommSys_CurNetId()] = 1;
+    sCommPlayerManager->isActive[CommSys_CurNetId()] = 1;
     sCommPlayerManager->playerLocation[CommSys_CurNetId()].x = Player_XPos(sCommPlayerManager->fieldSys->playerAvatar);
     sCommPlayerManager->playerLocation[CommSys_CurNetId()].z = Player_ZPos(sCommPlayerManager->fieldSys->playerAvatar);
     sCommPlayerManager->playerLocation[CommSys_CurNetId()].dir = Player_Dir(sCommPlayerManager->fieldSys->playerAvatar);
@@ -261,7 +261,7 @@ void CommPlayer_CopyPersonal (int param0)
     v0 = CommSys_CurNetId();
 
     sCommPlayerManager->playerAvatar[v0] = sCommPlayerManager->fieldSys->playerAvatar;
-    sCommPlayerManager->unk_48[v0] = 1;
+    sCommPlayerManager->isActive[v0] = 1;
     sCommPlayerManager->playerLocation[v0].x = sCommPlayerManager->playerLocation[param0].x;
     sCommPlayerManager->playerLocation[v0].z = sCommPlayerManager->playerLocation[param0].z;
     sCommPlayerManager->playerLocation[v0].dir = sCommPlayerManager->playerLocation[param0].dir;
@@ -316,7 +316,7 @@ void CommPlayer_SendPosServer (BOOL param0)
 static void sub_02057B48 (int param0, const CommPlayerLocation * playerLocation)
 {
     u8 v0[4 + 1];
-    int v1 = playerLocation->x, v2 = playerLocation->z;
+    int v1 = playerLocation->x, z = playerLocation->z;
 
     if (playerLocation->x < 0) {
         v1 = 0;
@@ -325,15 +325,15 @@ static void sub_02057B48 (int param0, const CommPlayerLocation * playerLocation)
     }
 
     if (playerLocation->z < 0) {
-        v2 = 0;
+        z = 0;
     } else if (playerLocation->z >= 0xf000) {
-        v2 = 0xf000 - 1;
+        z = 0xf000 - 1;
     }
 
     v0[0] = param0 & 0xf;
     v0[1] = v1;
-    v0[2] = ((v1 >> 8) & 0x1) + ((v2 >> 7) & 0x2);
-    v0[3] = v2;
+    v0[2] = ((v1 >> 8) & 0x1) + ((z >> 7) & 0x2);
+    v0[3] = z;
 
     if (playerLocation->unk_07) {
         v0[2] |= 0x80;
@@ -367,7 +367,7 @@ static void sub_02057C2C (void * param0)
     int v0;
 
     for (v0 = 0; v0 < (7 + 1); v0++) {
-        if (sCommPlayerManager->unk_48[v0]) {
+        if (sCommPlayerManager->isActive[v0]) {
             CommPlayerLocation * v1 = &sCommPlayerManager->playerLocationServer[v0];
 
             if (sCommPlayerManager->unk_132[v0] || sCommPlayerManager->unk_2BB) {
@@ -388,7 +388,7 @@ u32 CommPlayer_Size (void)
 static void CommPlayer_Add (u8 param0)
 {
     fx32 v0, v1;
-    PlayerAvatar * v2;
+    PlayerAvatar * playerAvatar;
 
     if (sCommPlayerManager->playerAvatar[param0] != NULL) {
         return;
@@ -423,26 +423,26 @@ static void CommPlayer_Add (u8 param0)
                     v5 = 1;
                 }
 
-                v2 = sub_0205E7D0(sCommPlayerManager->fieldSys->unk_38, sCommPlayerManager->playerLocation[param0].x, sCommPlayerManager->playerLocation[param0].z, sCommPlayerManager->playerLocation[param0].dir, 0x0, TrainerInfo_Gender(v3), v5, NULL);
+                playerAvatar = sub_0205E7D0(sCommPlayerManager->fieldSys->unk_38, sCommPlayerManager->playerLocation[param0].x, sCommPlayerManager->playerLocation[param0].z, sCommPlayerManager->playerLocation[param0].dir, 0x0, TrainerInfo_Gender(v3), v5, NULL);
             }
 
-            GF_ASSERT(v2);
-            sCommPlayerManager->playerAvatar[param0] = v2;
+            GF_ASSERT(playerAvatar != NULL);
+            sCommPlayerManager->playerAvatar[param0] = playerAvatar;
 
-            sub_0206290C(Player_LocalMapObject(v2), 0xff + param0 + 1);
+            sub_0206290C(Player_LocalMapObject(playerAvatar), 0xff + param0 + 1);
 
             if (sCommPlayerManager->isUnderground) {
                 ov23_02243038(param0);
             }
 
-            if (sCommPlayerManager->isUnderground && !sCommPlayerManager->unk_48[param0]) {
+            if (sCommPlayerManager->isUnderground && !sCommPlayerManager->isActive[param0]) {
                 if (!sCommPlayerManager->isResetting) {
                     ov5_021F5634(sCommPlayerManager->fieldSys, sCommPlayerManager->playerLocation[param0].x, 0, sCommPlayerManager->playerLocation[param0].z);
                 }
 
-                sCommPlayerManager->unk_48[param0] = 1;
+                sCommPlayerManager->isActive[param0] = 1;
             } else if (!sCommPlayerManager->isUnderground) {
-                sCommPlayerManager->unk_48[param0] = 1;
+                sCommPlayerManager->isActive[param0] = 1;
             }
         }
     }
@@ -474,8 +474,8 @@ void CommPlayer_Destroy (u8 param0, BOOL param1, BOOL param2)
         sCommPlayerManager->playerAvatar[param0] = NULL;
     }
 
-    if ((sCommPlayerManager->unk_48[param0]) && (!param1)) {
-        sCommPlayerManager->unk_48[param0] = 0;
+    if ((sCommPlayerManager->isActive[param0]) && (!param1)) {
+        sCommPlayerManager->isActive[param0] = 0;
     }
 
     sCommPlayerManager->unk_132[param0] = 1;
@@ -504,32 +504,32 @@ static void CommPlayer_SendMoveSpeed ()
     sub_02035E5C(v0);
 }
 
-static void sub_02057E80 (SysTask * param0, void * param1)
+static void Task_CommPlayerManagerRun (SysTask * task, void * data)
 {
-    int v0;
+    int netId;
 
     if (CommSys_IsInitialized()) {
         CommPlayer_SendMoveSpeed();
 
         if (CommSys_CurNetId() == 0) {
-            sub_02057C2C(param1);
-            sub_02057BC4(param1);
+            sub_02057C2C(data);
+            sub_02057BC4(data);
 
             if (sCommPlayerManager->unk_04) {
                 ov23_02249954(sCommPlayerManager->unk_04);
             }
         } else {
-            sub_02057BC4(param1);
+            sub_02057BC4(data);
         }
 
-        sub_02057EF8(param1);
+        sub_02057EF8(data);
     }
 
-    for (v0 = 0; v0 < (7 + 1); v0++) {
+    for (netId = 0; netId < MAX_CONNECTED_PLAYERS; netId++) {
         if (sCommPlayerManager->isUnderground) {
             if (CommSys_CurNetId() == 0) {
-                if (NULL == CommInfo_TrainerInfo(v0)) {
-                    ov23_0224B5CC(v0);
+                if (NULL == CommInfo_TrainerInfo(netId)) {
+                    ov23_0224B5CC(netId);
                 }
             }
         }
@@ -538,33 +538,33 @@ static void sub_02057E80 (SysTask * param0, void * param1)
 
 static void sub_02057EF8 (void * param0)
 {
-    int v0, v1;
+    int netId, v1;
 
-    for (v0 = 0; v0 < (7 + 1); v0++) {
-        if (!CommSys_IsPlayerConnected(v0)) {
-            if (!(sub_02036180() && (v0 == 0))) {
+    for (netId = 0; netId < MAX_CONNECTED_PLAYERS; netId++) {
+        if (!CommSys_IsPlayerConnected(netId)) {
+            if (!(sub_02036180() && (netId == 0))) {
                 if ((CommSys_CurNetId() == 0) && (sCommPlayerManager->isUnderground)) {
-                    ov23_0224D898(v0);
+                    ov23_0224D898(netId);
                 }
             }
         }
 
-        if (CommSys_IsPlayerConnected(v0) || (sub_02036180() && (v0 == 0))) {
-            CommPlayer_MoveClient(v0);
+        if (CommSys_IsPlayerConnected(netId) || (sub_02036180() && (netId == 0))) {
+            CommPlayer_MoveClient(netId);
 
             if (sCommPlayerManager->isUnderground) {
-                ov23_0224AF7C(v0);
+                ov23_0224AF7C(netId);
             }
         } else {
-            if (sCommPlayerManager->unk_48[v0]) {
+            if (sCommPlayerManager->isActive[netId]) {
                 if ((CommSys_CurNetId() == 0) && (sCommPlayerManager->isUnderground)) {
-                    ov23_022436F0(v0);
-                    ov23_02241648(v0);
+                    ov23_022436F0(netId);
+                    ov23_02241648(netId);
                 }
 
                 {
-                    u8 v2 = v0;
-                    CommPlayer_RecvDelete(0, 1, &v2, sCommPlayerManager->fieldSys);
+                    u8 netId_u8 = netId;
+                    CommPlayer_RecvDelete(0, 1, &netId_u8, sCommPlayerManager->fieldSys);
                 }
             }
         }
@@ -601,20 +601,20 @@ static void sub_02057FF0 (BOOL param0)
     }
 }
 
-void sub_02058018 (int param0, int param1, void * param2, void * param3)
+void sub_02058018 (int netId, int param1, void * param2, void * param3)
 {
     u8 * v0 = (u8 *)param2;
 
     if (sCommPlayerManager) {
         GF_ASSERT(param1 == 1);
-        GF_ASSERT(param0 < (7 + 1));
+        GF_ASSERT(netId < MAX_CONNECTED_PLAYERS);
         GF_ASSERT((v0[0] == 1) || (v0[0] == 0));
 
-        sub_02059058(param0, v0[0]);
+        sub_02059058(netId, v0[0]);
     }
 }
 
-void sub_0205805C (FieldSystem * param0, BOOL param1)
+void sub_0205805C (FieldSystem * fieldSys, BOOL param1)
 {
     if (sCommPlayerManager == NULL) {
         return;
@@ -625,8 +625,8 @@ void sub_0205805C (FieldSystem * param0, BOOL param1)
         sCommPlayerManager->unk_2C1 = param1;
     }
 
-    if (param0->playerAvatar) {
-        sCommPlayerManager->playerAvatar[CommSys_CurNetId()] = param0->playerAvatar;
+    if (fieldSys->playerAvatar) {
+        sCommPlayerManager->playerAvatar[CommSys_CurNetId()] = fieldSys->playerAvatar;
     }
 
     if (CommSys_IsInitialized() && (CommSys_CurNetId() == 0)) {
@@ -661,16 +661,16 @@ static int CommPlayer_Direction (u16 unused, u16 keys)
     return(-1);
 }
 
-BOOL CommPlayer_CheckNPCCollision (int param0, int param1)
+BOOL CommPlayer_CheckNPCCollision (int x, int z)
 {
-    int v0, v1;
-    const UnkStruct_020619DC * v2;
+    int v0, i;
+    const UnkStruct_020619DC * npcList;
 
     v0 = sub_0203A4B4(sCommPlayerManager->fieldSys);
-    v2 = sub_0203A4BC(sCommPlayerManager->fieldSys);
+    npcList = sub_0203A4BC(sCommPlayerManager->fieldSys);
 
-    for (v1 = 0; v1 < v0; v1++) {
-        if ((v2[v1].unk_1A == param0) && (v2[v1].unk_1C == param1)) {
+    for (i = 0; i < v0; i++) {
+        if ((npcList[i].unk_1A == x) && (npcList[i].unk_1C == z)) {
             return 1;
         }
     }
@@ -678,33 +678,33 @@ BOOL CommPlayer_CheckNPCCollision (int param0, int param1)
     return 0;
 }
 
-static BOOL sub_0205814C (int param0, int param1, int param2)
+static BOOL CommPlayer_CheckCollision (int x, int z, int netIdTarget)
 {
-    int v0;
+    int netId;
 
-    if ((param0 != 0xffff) && (param1 != 0xffff)) {
-        for (v0 = 0; v0 < (7 + 1); v0++) {
-            if (v0 == param2) {
+    if ((x != 0xffff) && (z != 0xffff)) {
+        for (netId = 0; netId < MAX_CONNECTED_PLAYERS; netId++) {
+            if (netId == netIdTarget) {
                 continue;
             }
 
-            if ((param0 == sub_02058DF8(v0)) && (param1 == sub_02058E4C(v0))) {
-                return 1;
+            if ((x == sub_02058DF8(netId)) && (z == sub_02058E4C(netId))) {
+                return TRUE;
             }
         }
 
-        if (CommPlayer_CheckNPCCollision(param0, param1)) {
-            return 1;
+        if (CommPlayer_CheckNPCCollision(x, z)) {
+            return TRUE;
         }
 
         if (sCommPlayerManager->isUnderground) {
-            if (!ov23_0224D1A0(param0, param1)) {
-                return 1;
+            if (!ov23_0224D1A0(x, z)) {
+                return TRUE;
             }
         }
     }
 
-    return sub_02054F68(sCommPlayerManager->fieldSys, param0, param1);
+    return FieldSystem_CheckCollision(sCommPlayerManager->fieldSys, x, z);
 }
 
 static int sub_020581CC (int param0, int param1)
@@ -732,12 +732,12 @@ static void CommPlayer_Move (SysTask * param0, void * param1)
 {
     u16 v0;
     u8 v1;
-    int v2, v3, v4, v5, v6;
+    int dir, v3, v4, v5, v6;
     CommPlayerLocation * playerLocation;
     UnkStruct_ov23_02249978 * v8 = NULL;
 
-    for (v5 = 0; v5 < (7 + 1); v5++) {
-        if (sCommPlayerManager->unk_48[v5] && sCommPlayerManager->unk_E2[v5] && sCommPlayerManager->unk_EA[v5]) {
+    for (v5 = 0; v5 < MAX_CONNECTED_PLAYERS; v5++) {
+        if (sCommPlayerManager->isActive[v5] && sCommPlayerManager->unk_E2[v5] && sCommPlayerManager->unk_EA[v5]) {
             playerLocation = &sCommPlayerManager->playerLocationServer[v5];
 
             if (sCommPlayerManager->unk_04) {
@@ -808,13 +808,13 @@ static void CommPlayer_Move (SysTask * param0, void * param1)
                 continue;
             }
 
-            v2 = CommPlayer_Direction(v0, v0);
-            v3 = sub_02058EE0(v5);
+            dir = CommPlayer_Direction(v0, v0);
+            v3 = CommPlayer_AddXServer(v5);
             v4 = sub_02058F18(v5);
 
-            if ((v3 != 0xffff) && (v4 != 0xffff) && (v2 != -1)) {
-                if (playerLocation->dir != v2) {
-                    playerLocation->dir = v2;
+            if ((v3 != 0xffff) && (v4 != 0xffff) && (dir != -1)) {
+                if (playerLocation->dir != dir) {
+                    playerLocation->dir = dir;
                     sCommPlayerManager->unk_13A[v5] = 4;
                     sCommPlayerManager->unk_132[v5] = 1;
 
@@ -826,7 +826,7 @@ static void CommPlayer_Move (SysTask * param0, void * param1)
                     continue;
                 } else if (sCommPlayerManager->isUnderground && (ov23_0224B8E0(v5, v3, v4) == 1)) {
                     continue;
-                } else if (sub_0205814C(v3, v4, v5)) {
+                } else if (CommPlayer_CheckCollision(v3, v4, v5)) {
                     playerLocation->unk_07 = 1;
                     sCommPlayerManager->unk_132[v5] = 1;
                     sCommPlayerManager->unk_13A[v5] = 4;
@@ -834,7 +834,7 @@ static void CommPlayer_Move (SysTask * param0, void * param1)
                     sCommPlayerManager->unk_132[v5] = 1;
                     playerLocation->x = v3;
                     playerLocation->z = v4;
-                    playerLocation->dir = v2;
+                    playerLocation->dir = dir;
 
                     sCommPlayerManager->unk_13A[v5] = sub_020581E0(playerLocation->moveSpeed);
 
@@ -869,10 +869,10 @@ void CommPlayer_RecvLocation (int param0, int param1, void * src, void * param3)
     }
 
     if (playerLocation->dir == -1) {
-        int v2;
+        int netId;
 
-        for (v2 = 0; v2 < (7 + 1); v2++) {
-            sCommPlayerManager->unk_132[v2] = 1;
+        for (netId = 0; netId < MAX_CONNECTED_PLAYERS; netId++) {
+            sCommPlayerManager->unk_132[netId] = 1;
         }
     }
 
@@ -884,10 +884,10 @@ void CommPlayer_RecvLocation (int param0, int param1, void * src, void * param3)
     playerLocation->z += ((u32)v0[3] << 8) & 0xff00;
     playerLocation->dir = v0[4] & 0xf;
 
-    sCommPlayerManager->unk_48[param0] = 1;
+    sCommPlayerManager->isActive[param0] = 1;
     sCommPlayerManager->unk_132[param0] = 1;
 
-    if (sub_02054F68(sCommPlayerManager->fieldSys, playerLocation->x, playerLocation->z)) {
+    if (FieldSystem_CheckCollision(sCommPlayerManager->fieldSys, playerLocation->x, playerLocation->z)) {
         GF_ASSERT(0);
     }
 }
@@ -978,7 +978,7 @@ static void sub_02058644 (int param0)
 static BOOL sub_020586A8 (int param0, int param1, int param2, int param3)
 {
     LocalMapObject * v0;
-    int v1, v2;
+    int v1;
     u8 v3[] = {
         0x14, 0x15, 0x16, 0x17, 0x10, 0x11, 0x12, 0x13, 0xc, 0xd, 0xe, 0xf
     };
@@ -995,7 +995,7 @@ static BOOL sub_020586A8 (int param0, int param1, int param2, int param3)
 
     if (Player_Dir(sCommPlayerManager->playerAvatar[param0]) != CommPlayer_GetOppositeDir(sCommPlayerManager->unk_102[param0])) {
         sub_020628C4(v0, (1 << 7));
-        sub_0205EA84(sCommPlayerManager->playerAvatar[param0], CommPlayer_GetOppositeDir(sCommPlayerManager->unk_102[param0]));
+        Player_SetDir(sCommPlayerManager->playerAvatar[param0], CommPlayer_GetOppositeDir(sCommPlayerManager->unk_102[param0]));
         sub_020628BC(v0, (1 << 7));
     }
 
@@ -1024,18 +1024,17 @@ static BOOL sub_020586A8 (int param0, int param1, int param2, int param3)
     return 1;
 }
 
-static void CommPlayer_MoveClient (int param0)
+static void CommPlayer_MoveClient (int netId)
 {
-    BOOL v0 = 0, v1 = 1;
-    u16 v2 = 0;
+    u16 pad = 0;
     CommPlayerLocation * playerLocation;
-    PlayerAvatar * v4;
-    int v5;
+    PlayerAvatar * playerAvatar;
+    int moveSpeed;
 
-    playerLocation = &sCommPlayerManager->playerLocation[param0];
+    playerLocation = &sCommPlayerManager->playerLocation[netId];
 
-    if (sCommPlayerManager->unk_142[param0] != 0) {
-        sCommPlayerManager->unk_142[param0]--;
+    if (sCommPlayerManager->unk_142[netId] != 0) {
+        sCommPlayerManager->unk_142[netId]--;
         return;
     }
 
@@ -1048,41 +1047,41 @@ static void CommPlayer_MoveClient (int param0)
     }
 
     if (!sCommPlayerManager->isUnderground) {
-        if (param0 == CommSys_CurNetId()) {
+        if (netId == CommSys_CurNetId()) {
             if (!sCommPlayerManager->unk_2C1) {
                 return;
             }
         }
     }
 
-    v4 = sCommPlayerManager->playerAvatar[param0];
+    playerAvatar = sCommPlayerManager->playerAvatar[netId];
 
-    if (v4) {
-        int v6 = Player_XPos(v4) - playerLocation->x;
-        int v7 = Player_ZPos(v4) - playerLocation->z;
-        int v8 = Player_Dir(v4);
+    if (playerAvatar) {
+        int dx = Player_XPos(playerAvatar) - playerLocation->x;
+        int dy = Player_ZPos(playerAvatar) - playerLocation->z;
+        int dir = Player_Dir(playerAvatar);
 
-        if ((v6 == 0) && (v7 == 0)) {
-            v2 = 0;
-        } else if (abs(v6) > abs(v7)) {
-            if (v6 > 0) {
-                v2 = PAD_KEY_LEFT;
+        if ((dx == 0) && (dy == 0)) {
+            pad = 0;
+        } else if (abs(dx) > abs(dy)) {
+            if (dx > 0) {
+                pad = PAD_KEY_LEFT;
             } else {
-                v2 = PAD_KEY_RIGHT;
+                pad = PAD_KEY_RIGHT;
             }
         } else {
-            if (v7 > 0) {
-                v2 = PAD_KEY_UP;
+            if (dy > 0) {
+                pad = PAD_KEY_UP;
             } else {
-                v2 = PAD_KEY_DOWN;
+                pad = PAD_KEY_DOWN;
             }
         }
 
-        if (abs(v6) + abs(v7) > 2) {
-            v1 = 0;
+        if (abs(dx) + abs(dy) > 2) {
+            (void)0;
         }
 
-        if (sub_020586A8(param0, v2, v2, playerLocation->moveSpeed)) {
+        if (sub_020586A8(netId, pad, pad, playerLocation->moveSpeed)) {
             return;
         }
 
@@ -1090,7 +1089,7 @@ static void CommPlayer_MoveClient (int param0)
             u32 v9 = 0xff;
             int v10;
 
-            v5 = playerLocation->moveSpeed;
+            moveSpeed = playerLocation->moveSpeed;
 
             switch (playerLocation->moveSpeed) {
             case 0:
@@ -1098,7 +1097,7 @@ static void CommPlayer_MoveClient (int param0)
                 break;
             case 1:
                 v10 = 4;
-                v2 |= PAD_BUTTON_B;
+                pad |= PAD_BUTTON_B;
                 break;
             case 2:
                 v10 = 2;
@@ -1108,13 +1107,13 @@ static void CommPlayer_MoveClient (int param0)
                 break;
             }
 
-            if (sCommPlayerManager->forceDirTimer && (param0 == CommSys_CurNetId())) {
+            if (sCommPlayerManager->forceDirTimer && (netId == CommSys_CurNetId())) {
                 sCommPlayerManager->forceDirTimer--;
-            } else if (!sub_02035EE0() && sCommPlayerManager->isUnderground && (param0 == CommSys_CurNetId())) {
+            } else if (!sub_02035EE0() && sCommPlayerManager->isUnderground && (netId == CommSys_CurNetId())) {
                 v9 = sub_0206147C(
-                    v4, v2, v2, v10, 1, 0);
-            } else if (((v2 & ~PAD_BUTTON_B) == 0) && (playerLocation->unk_07)) {
-                v5 = 3;
+                    playerAvatar, pad, pad, v10, 1, 0);
+            } else if (((pad & ~PAD_BUTTON_B) == 0) && (playerLocation->unk_07)) {
+                moveSpeed = 3;
 
                 switch (playerLocation->dir) {
                 case 0:
@@ -1131,31 +1130,31 @@ static void CommPlayer_MoveClient (int param0)
                     v9 = 0x1f;
                     break;
                 }
-            } else if (((v2 & ~PAD_BUTTON_B) == 0) && (playerLocation->dir != v8)) {
+            } else if (((pad & ~PAD_BUTTON_B) == 0) && (playerLocation->dir != dir)) {
                 v9 = sub_02065838(playerLocation->dir, 0x24);
             } else {
-                v9 = sub_0206147C(v4, v2, v2, v10, 1, 0);
+                v9 = sub_0206147C(playerAvatar, pad, pad, v10, 1, 0);
             }
 
-            if (sub_02061544(v4) == 0) {
-                if (sub_020613AC(v4) == 0) {
+            if (sub_02061544(playerAvatar) == 0) {
+                if (sub_020613AC(playerAvatar) == 0) {
                     return;
                 }
             }
 
             if (v9 != 0xff) {
-                sub_02061550(v4, v9, 1);
+                sub_02061550(playerAvatar, v9, 1);
 
-                if (v2 & ~PAD_BUTTON_B) {
-                    if (sCommPlayerManager->unk_142[param0] == 0) {
-                        sCommPlayerManager->unk_142[param0] = sub_020581E0(v5);
+                if (pad & ~PAD_BUTTON_B) {
+                    if (sCommPlayerManager->unk_142[netId] == 0) {
+                        sCommPlayerManager->unk_142[netId] = sub_020581E0(moveSpeed);
                     }
 
-                    if (sCommPlayerManager->unk_142[param0] != 0) {
-                        sCommPlayerManager->unk_142[param0]--;
+                    if (sCommPlayerManager->unk_142[netId] != 0) {
+                        sCommPlayerManager->unk_142[netId]--;
                     }
 
-                    sub_02058644(param0);
+                    sub_02058644(netId);
                 }
             }
         }
@@ -1187,7 +1186,7 @@ static BOOL sub_02058A18 (int param0, int param1)
     v1 += sub_020641A8(sCommPlayerManager->unk_112[param0]);
 
     if (sCommPlayerManager->unk_10A[param0] != 0) {
-        if (sub_0205814C(v0, v1, param0)) {
+        if (CommPlayer_CheckCollision(v0, v1, param0)) {
             sCommPlayerManager->unk_10A[param0] = 1;
         }
     }
@@ -1312,60 +1311,60 @@ BOOL sub_02058C40 (void)
 
 BOOL CommPlayer_IsActive (int netId)
 {
-    return sCommPlayerManager->unk_48[netId];
+    return sCommPlayerManager->isActive[netId];
 }
 
-int CommPlayer_XPos (int param0)
+int CommPlayer_XPos (int netId)
 {
     if (!sCommPlayerManager) {
         return 0xffff;
-    } else if (CommSys_CurNetId() == param0) {
-        return sCommPlayerManager->playerLocation[param0].x;
-    } else if (!sub_02058C40() || !sCommPlayerManager->unk_48[param0]) {
+    } else if (CommSys_CurNetId() == netId) {
+        return sCommPlayerManager->playerLocation[netId].x;
+    } else if (!sub_02058C40() || !sCommPlayerManager->isActive[netId]) {
         return 0xffff;
     }
 
-    return sCommPlayerManager->playerLocation[param0].x;
+    return sCommPlayerManager->playerLocation[netId].x;
 }
 
-int CommPlayer_ZPos (int param0)
+int CommPlayer_ZPos (int netId)
 {
     if (!sCommPlayerManager) {
         return 0xffff;
-    } else if (CommSys_CurNetId() == param0) {
-        return sCommPlayerManager->playerLocation[param0].z;
-    } else if (!sub_02058C40() || !sCommPlayerManager->unk_48[param0]) {
+    } else if (CommSys_CurNetId() == netId) {
+        return sCommPlayerManager->playerLocation[netId].z;
+    } else if (!sub_02058C40() || !sCommPlayerManager->isActive[netId]) {
         return 0xffff;
     }
 
-    return sCommPlayerManager->playerLocation[param0].z;
+    return sCommPlayerManager->playerLocation[netId].z;
 }
 
-int sub_02058D48 (int param0)
+int sub_02058D48 (int netId)
 {
     if (!sCommPlayerManager) {
         return 0xffff;
     }
 
-    return sCommPlayerManager->playerLocation[param0].x;
+    return sCommPlayerManager->playerLocation[netId].x;
 }
 
-int sub_02058D68 (int param0)
+int sub_02058D68 (int netId)
 {
     if (!sCommPlayerManager) {
         return 0xffff;
     }
 
-    return sCommPlayerManager->playerLocation[param0].z;
+    return sCommPlayerManager->playerLocation[netId].z;
 }
 
-int sub_02058D88 (int param0)
+int sub_02058D88 (int netId)
 {
-    if (CommPlayer_XPos(param0) == 0xffff) {
+    if (CommPlayer_XPos(netId) == 0xffff) {
         return 0xffff;
     }
 
-    return sCommPlayerManager->playerLocation[param0].x + sub_0206419C(sCommPlayerManager->playerLocation[param0].dir);
+    return sCommPlayerManager->playerLocation[netId].x + sub_0206419C(sCommPlayerManager->playerLocation[netId].dir);
 }
 
 int sub_02058DC0 (int param0)
@@ -1383,7 +1382,7 @@ int sub_02058DF8 (int param0)
         return 0xffff;
     } else if (CommSys_CurNetId() == param0) {
         return sCommPlayerManager->playerLocationServer[param0].x;
-    } else if (!sub_02058C40() || !sCommPlayerManager->unk_48[param0]) {
+    } else if (!sub_02058C40() || !sCommPlayerManager->isActive[param0]) {
         return 0xffff;
     }
 
@@ -1396,7 +1395,7 @@ int sub_02058E4C (int param0)
         return 0xffff;
     } else if (CommSys_CurNetId() == param0) {
         return sCommPlayerManager->playerLocationServer[param0].z;
-    } else if (!sub_02058C40() || !sCommPlayerManager->unk_48[param0]) {
+    } else if (!sub_02058C40() || !sCommPlayerManager->isActive[param0]) {
         return 0xffff;
     }
 
@@ -1421,13 +1420,13 @@ int sub_02058EC0 (int param0)
     return sCommPlayerManager->playerLocationServer[param0].z;
 }
 
-int sub_02058EE0 (int param0)
+int CommPlayer_AddXServer (int netId)
 {
-    if (sub_02058DF8(param0) == 0xffff) {
+    if (sub_02058DF8(netId) == 0xffff) {
         return 0xffff;
     }
 
-    return sCommPlayerManager->playerLocationServer[param0].x + sub_0206419C(sCommPlayerManager->playerLocationServer[param0].dir);
+    return sCommPlayerManager->playerLocationServer[netId].x + sub_0206419C(sCommPlayerManager->playerLocationServer[netId].dir);
 }
 
 int sub_02058F18 (int param0)
@@ -1441,81 +1440,81 @@ int sub_02058F18 (int param0)
 
 int CommPlayer_Dir (int param0)
 {
-    if (!sub_02058C40() || !sCommPlayerManager->unk_48[param0]) {
+    if (!sub_02058C40() || !sCommPlayerManager->isActive[param0]) {
         return -1;
     }
 
     return sCommPlayerManager->playerLocation[param0].dir;
 }
 
-int sub_02058F80 (int param0)
+int CommPlayer_DirServer (int param0)
 {
-    if (!sub_02058C40() || !sCommPlayerManager->unk_48[param0]) {
+    if (!sub_02058C40() || !sCommPlayerManager->isActive[param0]) {
         return -1;
     }
 
     return sCommPlayerManager->playerLocationServer[param0].dir;
 }
 
-void sub_02058FB0 (int param0, int param1)
+void CommPlayer_LookTowardsServer (int netIdTarget, int netIdSet)
 {
-    int v0 = CommPlayer_GetOppositeDir(sCommPlayerManager->playerLocationServer[param0].dir);
+    int dir = CommPlayer_GetOppositeDir(sCommPlayerManager->playerLocationServer[netIdTarget].dir);
 
-    sCommPlayerManager->playerLocationServer[param1].dir = v0;
-    sCommPlayerManager->unk_132[param1] = 1;
+    sCommPlayerManager->playerLocationServer[netIdSet].dir = dir;
+    sCommPlayerManager->unk_132[netIdSet] = TRUE;
 }
 
-void sub_02058FE4 (int param0, int param1)
+void CommPlayer_LookTowards (int netIdTarget, int netIdSet)
 {
-    int v0 = CommPlayer_GetOppositeDir(sCommPlayerManager->playerLocation[param0].dir);
-    sCommPlayerManager->playerLocation[param1].dir = v0;
+    int dir = CommPlayer_GetOppositeDir(sCommPlayerManager->playerLocation[netIdTarget].dir);
+    sCommPlayerManager->playerLocation[netIdSet].dir = dir;
 }
 
-int sub_0205900C (int param0, int param1)
+int sub_0205900C (int xPos, int yPos)
 {
-    int v0, v1, v2;
+    int netId, x, y;
 
     if (!sCommPlayerManager) {
         return 0xff;
     }
 
-    for (v0 = 0; v0 < (7 + 1); v0++) {
-        if (sCommPlayerManager->unk_48[v0] == 0) {
+    for (netId = 0; netId < MAX_CONNECTED_PLAYERS; netId++) {
+        if (sCommPlayerManager->isActive[netId] == 0) {
             continue;
         }
 
-        v1 = sCommPlayerManager->playerLocationServer[v0].x;
-        v2 = sCommPlayerManager->playerLocationServer[v0].z;
+        x = sCommPlayerManager->playerLocationServer[netId].x;
+        y = sCommPlayerManager->playerLocationServer[netId].z;
 
-        if ((param0 == v1) && (param1 == v2)) {
-            return v0;
+        if ((xPos == x) && (yPos == y)) {
+            return netId;
         }
     }
 
     return 0xff;
 }
 
-void sub_02059058 (int param0, BOOL param1)
+void sub_02059058 (int netId, BOOL param1)
 {
-    if (sCommPlayerManager->unk_E2[param0] != param1) {
-        sCommPlayerManager->unk_E2[param0] = param1;
-        sCommPlayerManager->playerLocationServer[param0].unk_07 = 0;
-        sCommPlayerManager->unk_132[param0] = 1;
-        sCommPlayerManager->playerLocationServer[param0].moveSpeed = 2;
+    if (sCommPlayerManager->unk_E2[netId] != param1) {
+        sCommPlayerManager->unk_E2[netId] = param1;
+        sCommPlayerManager->playerLocationServer[netId].unk_07 = 0;
+        sCommPlayerManager->unk_132[netId] = 1;
+        sCommPlayerManager->playerLocationServer[netId].moveSpeed = 2;
     }
 }
 
-BOOL sub_02059094 (int param0)
+BOOL sub_02059094 (int netId)
 {
     if (sCommPlayerManager->unk_2C2) {
         return 0;
     }
 
-    if (!sCommPlayerManager->unk_EA[param0]) {
+    if (!sCommPlayerManager->unk_EA[netId]) {
         return 0;
     }
 
-    return sCommPlayerManager->unk_E2[param0];
+    return sCommPlayerManager->unk_E2[netId];
 }
 
 BOOL sub_020590C4 (void)
@@ -1530,22 +1529,22 @@ BOOL sub_020590C4 (void)
         {4, 8},
         {11, 8}
     };
-    int v2 = sub_02036148(sub_0203895C());
-    int v3, v4, v5 = 0, v6[4], v7;
+    int connectedPlayers = sub_02036148(sub_0203895C());
+    int netId, v4, v5 = 0, v6[4], v7;
     int v8 = 0;
     UnkStruct_020590C4 * v9;
 
-    if (v2 == 2) {
+    if (connectedPlayers == 2) {
         v9 = v0;
     } else {
         v9 = v1;
     }
 
-    for (v3 = 0; v3 < v2; v3++) {
-        for (v4 = 0; v4 < v2; v4++) {
-            if ((CommPlayer_XPos(v4) == v9[v3].unk_00) && (CommPlayer_ZPos(v4) == v9[v3].unk_02)) {
+    for (netId = 0; netId < connectedPlayers; netId++) {
+        for (v4 = 0; v4 < connectedPlayers; v4++) {
+            if ((CommPlayer_XPos(v4) == v9[netId].unk_00) && (CommPlayer_ZPos(v4) == v9[netId].unk_02)) {
                 v5++;
-                v6[v4] = v3;
+                v6[v4] = netId;
 
                 if (v4 == CommSys_CurNetId()) {
                     v8 = 1;
@@ -1555,23 +1554,23 @@ BOOL sub_020590C4 (void)
         }
     }
 
-    if (v5 == v2) {
-        for (v3 = 0; v3 < v2; v3++) {
-            sub_020362DC(v6[v3], v3);
+    if (v5 == connectedPlayers) {
+        for (netId = 0; netId < connectedPlayers; netId++) {
+            sub_020362DC(v6[netId], netId);
         }
     }
 
     return v8;
 }
 
-void sub_02059180 (int param0, int param1, void * param2, void * param3)
+void sub_02059180 (int netId, int unused1, void * src, void * unused3)
 {
-    u8 * v0 = param2;
+    u8 * buffer = src;
 
-    if (v0[0] == 3) {
-        sCommPlayerManager->unk_F2[param0] = 0;
+    if (buffer[0] == 3) {
+        sCommPlayerManager->unk_F2[netId] = 0;
     } else {
-        sCommPlayerManager->unk_2B4[param0] = v0[0];
+        sCommPlayerManager->unk_2B4[netId] = buffer[0];
     }
 }
 
@@ -1590,10 +1589,10 @@ static UnkStruct_020590C4 Unk_02100B74[] = {
 static void sub_020591A8 (void)
 {
     int v0 = sub_02036148(sub_0203895C());
-    int v1, v2, v3 = 0, v4[4];
+    int v1, v3 = 0, v4[4];
     int v5 = 0;
     UnkStruct_020590C4 * v6;
-    u8 v7;
+    u8 netId;
 
     if (v0 == 2) {
         v6 = Unk_02100B6C;
@@ -1601,73 +1600,73 @@ static void sub_020591A8 (void)
         v6 = Unk_02100B74;
     }
 
-    for (v7 = 0; v7 < v0; v7++) {
-        if (!sCommPlayerManager->unk_2B4[v7]) {
+    for (netId = 0; netId < v0; netId++) {
+        if (!sCommPlayerManager->unk_2B4[netId]) {
             continue;
         }
 
         for (v1 = 0; v1 < v0; v1++) {
-            if ((sub_02058DF8(v7) == v6[v1].unk_00) && (sub_02058E4C(v7) == v6[v1].unk_02)) {
-                sCommPlayerManager->unk_F2[v7] = 1;
-                sub_02035B48(95, &v7);
+            if ((sub_02058DF8(netId) == v6[v1].unk_00) && (sub_02058E4C(netId) == v6[v1].unk_02)) {
+                sCommPlayerManager->unk_F2[netId] = 1;
+                sub_02035B48(95, &netId);
             }
         }
     }
 }
 
-void sub_02059240 (void)
+void CommPlayer_SetBattleDir (void)
 {
-    int v0 = CommSys_CurNetId();
+    int netId = CommSys_CurNetId();
     int v1;
 
-    if (CommPlayer_XPos(v0) > 8) {
-        sub_020593F4(2);
+    if (CommPlayer_XPos(netId) > 8) {
+        CommPlayer_SetDir(2);
         v1 = sub_02065838(2, 0x24);
     } else {
-        sub_020593F4(3);
+        CommPlayer_SetDir(3);
         v1 = sub_02065838(3, 0x24);
     }
 
-    sub_02061550(sCommPlayerManager->playerAvatar[v0], v1, 1);
+    sub_02061550(sCommPlayerManager->playerAvatar[netId], v1, 1);
     CommPlayerManager_ForceDir();
 }
 
 BOOL sub_0205928C (void)
 {
     int v0 = sub_02036148(sub_0203895C());
-    int v1, v2, v3 = 0, v4[4], v5;
+    int netId, v3 = 0, v4[4], v5;
     int v6 = 0;
 
-    for (v1 = 0; v1 < v0; v1++) {
-        if ((sCommPlayerManager->unk_48[v1] == 0) || (sCommPlayerManager->unk_132[v1] == 1)) {
+    for (netId = 0; netId < v0; netId++) {
+        if ((sCommPlayerManager->isActive[netId] == 0) || (sCommPlayerManager->unk_132[netId] == 1)) {
             return 0;
         }
     }
 
-    for (v1 = 0; v1 < v0; v1++) {
-        CommPlayerLocation * playerLocation = &sCommPlayerManager->playerLocationServer[v1];
+    for (netId = 0; netId < v0; netId++) {
+        CommPlayerLocation * playerLocation = &sCommPlayerManager->playerLocationServer[netId];
 
         v5 = CommPlayer_GetOppositeDir(playerLocation->dir);
         playerLocation->x += sub_0206419C(v5);
         playerLocation->z += sub_020641A8(v5);
         playerLocation->moveSpeed = 2;
 
-        sCommPlayerManager->unk_132[v1] = 1;
-        sub_02059058(v1, 1);
+        sCommPlayerManager->unk_132[netId] = 1;
+        sub_02059058(netId, 1);
     }
 
     return 1;
 }
 
-int CommPlayer_GetOppositeDir (int param0)
+int CommPlayer_GetOppositeDir (int dir)
 {
-    if (param0 == 0) {
+    if (dir == 0) {
         return 1;
-    } else if (param0 == 1) {
+    } else if (dir == 1) {
         return 0;
-    } else if (param0 == 2) {
+    } else if (dir == 2) {
         return 3;
-    } else if (param0 == 3) {
+    } else if (dir == 3) {
         return 2;
     }
 
@@ -1675,58 +1674,58 @@ int CommPlayer_GetOppositeDir (int param0)
     return 2;
 }
 
-void sub_02059354 (int param0, int param1)
+void sub_02059354 (int netId, int param1)
 {
-    sCommPlayerManager->unk_11A[param0] = param1;
-    sCommPlayerManager->unk_13A[param0] = 15;
+    sCommPlayerManager->unk_11A[netId] = param1;
+    sCommPlayerManager->unk_13A[netId] = 15;
 }
 
-void sub_02059378 (int param0)
+void sub_02059378 (int netId)
 {
-    sCommPlayerManager->unk_11A[param0] = 0;
+    sCommPlayerManager->unk_11A[netId] = 0;
 }
 
-void sub_02059390 (int param0, int param1)
+void sub_02059390 (int netId, int param1)
 {
-    sCommPlayerManager->unk_122[param0] = param1;
-    sCommPlayerManager->unk_13A[param0] = 15;
+    sCommPlayerManager->unk_122[netId] = param1;
+    sCommPlayerManager->unk_13A[netId] = 15;
 }
 
-void sub_020593B4 (int param0)
+void sub_020593B4 (int netId)
 {
-    sCommPlayerManager->unk_122[param0] = 0;
+    sCommPlayerManager->unk_122[netId] = 0;
 }
 
-int sub_020593CC (int param0)
+int sub_020593CC (int netId)
 {
-    return sCommPlayerManager->unk_142[param0];
+    return sCommPlayerManager->unk_142[netId];
 }
 
-int sub_020593E0 (int param0)
+int sub_020593E0 (int netId)
 {
-    return sCommPlayerManager->unk_13A[param0];
+    return sCommPlayerManager->unk_13A[netId];
 }
 
-void sub_020593F4 (int param0)
+void CommPlayer_SetDir (int dir)
 {
-    sub_0205EA84(sCommPlayerManager->fieldSys->playerAvatar, param0);
-    sCommPlayerManager->playerLocation[CommSys_CurNetId()].dir = param0;
-    CommPlayer_SendPos(0);
+    Player_SetDir(sCommPlayerManager->fieldSys->playerAvatar, dir);
+    sCommPlayerManager->playerLocation[CommSys_CurNetId()].dir = dir;
+    CommPlayer_SendPos(FALSE);
 }
 
-void sub_02059424 (int param0, int param1)
+void CommPlayer_SetDirClient (int netId, int dir)
 {
-    sCommPlayerManager->playerLocation[param0].dir = param1;
-    sub_0205EA84(sCommPlayerManager->playerAvatar[param0], param1);
+    sCommPlayerManager->playerLocation[netId].dir = dir;
+    Player_SetDir(sCommPlayerManager->playerAvatar[netId], dir);
 }
 
-int CommPlayer_DirClient (int param0)
+int CommPlayer_DirClient (int netId)
 {
-    if (!sCommPlayerManager->playerAvatar[param0]) {
+    if (!sCommPlayerManager->playerAvatar[netId]) {
         return -1;
     }
 
-    return Player_Dir(sCommPlayerManager->playerAvatar[param0]);
+    return Player_Dir(sCommPlayerManager->playerAvatar[netId]);
 }
 
 void sub_02059464 (int param0)
@@ -1804,7 +1803,7 @@ void sub_02059570 (void)
     }
 }
 
-void sub_020595A4 (void)
+void CommPlayerManager_ForcePos (void)
 {
     int netId, x, z, dir;
     LocalMapObject * obj;
diff --git a/src/unk_0205A0D8.c b/src/unk_0205A0D8.c
index 4018e838c5..1f2881e1b2 100644
--- a/src/unk_0205A0D8.c
+++ b/src/unk_0205A0D8.c
@@ -269,7 +269,7 @@ static BOOL sub_0205A324 (UnkStruct_020508D4 * param0)
 
         if (v0->unk_43 == 0) {
             v0->unk_34 = 1;
-            sub_02059240();
+            CommPlayer_SetBattleDir();
         }
         break;
     case 1:
@@ -339,7 +339,7 @@ static BOOL sub_0205A324 (UnkStruct_020508D4 * param0)
         }
         break;
     case 11:
-        sub_02059240();
+        CommPlayer_SetBattleDir();
         MessageLoader_GetStrbuf(v0->unk_2C, 13, v0->unk_0C);
 
         v0->unk_30 = sub_0205AA50(v0, v0->unk_0C);
@@ -358,7 +358,7 @@ static BOOL sub_0205A324 (UnkStruct_020508D4 * param0)
         v0->unk_43--;
 
         if (v0->unk_43 == 0) {
-            sub_02059240();
+            CommPlayer_SetBattleDir();
             v0->unk_34 = 15;
         }
         break;
@@ -431,7 +431,7 @@ static BOOL sub_0205A324 (UnkStruct_020508D4 * param0)
         }
         break;
     case 24:
-        sub_02059240();
+        CommPlayer_SetBattleDir();
         MessageLoader_GetStrbuf(v0->unk_2C, 19, v0->unk_0C);
         v0->unk_30 = sub_0205AA50(v0, v0->unk_0C);
         v0->unk_34 = 25;
diff --git a/src/unk_0205E7D0.c b/src/unk_0205E7D0.c
index a111c2d6cf..084f278464 100644
--- a/src/unk_0205E7D0.c
+++ b/src/unk_0205E7D0.c
@@ -206,7 +206,7 @@ int Player_Dir (PlayerAvatar * const param0)
     return sub_0206298C(Player_LocalMapObject(param0));
 }
 
-void sub_0205EA84 (PlayerAvatar * param0, int param1)
+void Player_SetDir (PlayerAvatar * param0, int param1)
 {
     sub_02062974(Player_LocalMapObject(param0), param1);
 }
diff --git a/src/unk_02069BE0.c b/src/unk_02069BE0.c
index 2a395a8719..28ccddc1e9 100644
--- a/src/unk_02069BE0.c
+++ b/src/unk_02069BE0.c
@@ -849,7 +849,7 @@ static BOOL sub_0206A524 (FieldSystem * param0, int param1, int param2, int para
     param1 += Unk_020EF92C[param3][param4];
     param2 += Unk_020EF94C[param3][param4];
 
-    v0 = sub_02054F68(param0, param1, param2);
+    v0 = FieldSystem_CheckCollision(param0, param1, param2);
     return v0;
 }
 
@@ -860,7 +860,7 @@ static BOOL sub_0206A54C (FieldSystem * param0, int param1, int param2, int para
     param1 += Unk_020EF98C[param3][param4];
     param2 += Unk_020EF9AC[param3][param4];
 
-    v0 = sub_02054F68(param0, param1, param2);
+    v0 = FieldSystem_CheckCollision(param0, param1, param2);
     return v0;
 }
 

From 1e43770d0a3d099e6b7ea22b68d6d0fe6e8490c7 Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Wed, 3 Apr 2024 19:40:34 -0400
Subject: [PATCH 07/11] v0, v1

---
 include/overlay023/funcptr_ov23_02248D20.h  |   2 +-
 include/overlay023/ov23_02248C08.h          |   2 +-
 include/overlay023/ov23_0224F294.h          |   2 +-
 include/overlay023/ov23_02253598.h          |   6 +-
 include/overlay023/struct_ov23_02248D20.h   |   2 +-
 include/struct_decls/struct_0202855C_decl.h |   2 +-
 include/struct_decls/struct_020298B0_decl.h |   2 +-
 include/struct_defs/struct_0202855C.h       |   2 +-
 include/struct_defs/struct_02029894.h       |   2 +-
 include/struct_defs/struct_020298B0.h       |   2 +-
 include/unk_0202854C.h                      | 196 +++++++-------
 include/unk_0203CC84.h                      |   2 +-
 include/unk_0205E7D0.h                      |   2 +-
 src/field_comm_manager.c                    |   4 +-
 src/overlay005/ov5_021D0D80.c               |   6 +-
 src/overlay005/ov5_021D1C30.c               |   2 +-
 src/overlay005/ov5_021F8370.c               |   4 +-
 src/overlay006/ov6_02240C9C.c               |   8 +-
 src/overlay006/ov6_02242984.c               |   2 +-
 src/overlay006/ov6_02242AF0.c               |   6 +-
 src/overlay006/ov6_02247A0C.c               |   2 +-
 src/overlay007/ov7_02249960.c               |   2 +-
 src/overlay008/ov8_02249960.c               |  36 +--
 src/overlay009/ov9_02249960.c               |  12 +-
 src/overlay023/ov23_0223E140.c              |  30 +--
 src/overlay023/ov23_022416A8.c              |   8 +-
 src/overlay023/ov23_02241F74.c              |   6 +-
 src/overlay023/ov23_0224340C.c              |  24 +-
 src/overlay023/ov23_02248C08.c              |   2 +-
 src/overlay023/ov23_022499E4.c              |   2 +-
 src/overlay023/ov23_0224A1D0.c              |  12 +-
 src/overlay023/ov23_0224B05C.c              |  12 +-
 src/overlay023/ov23_0224DC40.c              |   4 +-
 src/overlay023/ov23_0224F294.c              |  32 +--
 src/overlay023/ov23_0225128C.c              |  10 +-
 src/overlay023/ov23_022521F0.c              |  12 +-
 src/overlay023/ov23_02253598.c              |  22 +-
 src/overlay023/ov23_022542CC.c              |   6 +-
 src/overlay023/ov23_02254A14.c              |   8 +-
 src/overlay118/ov118_021D0D80.c             |   2 +-
 src/unk_0202854C.c                          | 238 ++++++++--------
 src/unk_0203CC84.c                          |   2 +-
 src/unk_0203D1B8.c                          |  12 +-
 src/unk_0203F6C4.c                          |  22 +-
 src/unk_02046C7C.c                          |   2 +-
 src/unk_020474B8.c                          |   4 +-
 src/unk_020494DC.c                          |   2 +-
 src/unk_02049D08.c                          |   2 +-
 src/unk_0204C6C8.c                          |   4 +-
 src/unk_0204C8F0.c                          |  10 +-
 src/unk_0204CA84.c                          |   2 +-
 src/unk_0204CFFC.c                          |   2 +-
 src/unk_0204E974.c                          |  10 +-
 src/unk_0204EDA4.c                          |   2 +-
 src/unk_020528D0.c                          |   2 +-
 src/unk_020559DC.c                          |   2 +-
 src/unk_02057518.c                          | 285 ++++++++++----------
 src/unk_0205B33C.c                          |   2 +-
 src/unk_0205E7D0.c                          |   2 +-
 src/unk_0205F180.c                          |   4 +-
 src/unk_02068344.c                          |   6 +-
 src/unk_0206B70C.c                          |   2 +-
 src/unk_0206B9D8.c                          |   2 +-
 src/unk_0206CCB0.c                          |   4 +-
 src/unk_0207160C.c                          |   8 +-
 src/unk_02071B10.c                          |  18 +-
 src/unk_02071CD0.c                          |   2 +-
 src/unk_02071D40.c                          |   8 +-
 src/unk_020722AC.c                          |  10 +-
 src/unk_02098218.c                          |   8 +-
 src/unk_02099604.c                          |   4 +-
 71 files changed, 587 insertions(+), 596 deletions(-)

diff --git a/include/overlay023/funcptr_ov23_02248D20.h b/include/overlay023/funcptr_ov23_02248D20.h
index 29b8b259ca..07467122db 100644
--- a/include/overlay023/funcptr_ov23_02248D20.h
+++ b/include/overlay023/funcptr_ov23_02248D20.h
@@ -3,6 +3,6 @@
 
 #include "struct_decls/struct_020298B0_decl.h"
 
-typedef void (* UnkFuncPtr_ov23_02248D20)(UnkStruct_020298B0 *, int, int);
+typedef void (* UnkFuncPtr_ov23_02248D20)(UndergroundData *, int, int);
 
 #endif // POKEPLATINUM_FUNCPTR_OV23_02248D20_H
diff --git a/include/overlay023/ov23_02248C08.h b/include/overlay023/ov23_02248C08.h
index 27de2f2fcd..f3d12a57cc 100644
--- a/include/overlay023/ov23_02248C08.h
+++ b/include/overlay023/ov23_02248C08.h
@@ -6,7 +6,7 @@
 #include "overlay023/struct_ov23_02248D20.h"
 #include "overlay084/struct_ov84_02240FA8.h"
 
-UnkStruct_ov23_02248D20 * ov23_02248C08(UnkStruct_ov84_02240FA8 * param0, u16 param1, u16 param2, u8 param3, UnkFuncPtr_ov23_02248D20 param4, UnkStruct_020298B0 * param5, BOOL param6);
+UnkStruct_ov23_02248D20 * ov23_02248C08(UnkStruct_ov84_02240FA8 * param0, u16 param1, u16 param2, u8 param3, UnkFuncPtr_ov23_02248D20 param4, UndergroundData * param5, BOOL param6);
 u32 ov23_02248D20(UnkStruct_ov23_02248D20 * param0);
 void ov23_02248EF8(UnkStruct_ov23_02248D20 * param0, u16 * param1, u16 * param2);
 
diff --git a/include/overlay023/ov23_0224F294.h b/include/overlay023/ov23_0224F294.h
index 9749587394..e30fc3f4b8 100644
--- a/include/overlay023/ov23_0224F294.h
+++ b/include/overlay023/ov23_0224F294.h
@@ -8,7 +8,7 @@
 #include "overlay023/funcptr_ov23_0224F758.h"
 #include "overlay023/struct_ov23_02250CD4.h"
 
-void ov23_0224F588(UnkStruct_020298B0 * param0);
+void ov23_0224F588(UndergroundData * param0);
 void ov23_0224F5B8(void);
 int ov23_0224F5F0(int param0, void * param1);
 int ov23_0224F61C(int param0, void * param1);
diff --git a/include/overlay023/ov23_02253598.h b/include/overlay023/ov23_02253598.h
index 93b1b76647..2b261eff6f 100644
--- a/include/overlay023/ov23_02253598.h
+++ b/include/overlay023/ov23_02253598.h
@@ -9,7 +9,7 @@
 #include "overlay023/struct_ov23_02253598_decl.h"
 #include "overlay023/funcptr_ov23_02253834.h"
 
-void ov23_02253598(UnkStruct_ov23_02253598 * param0, UnkStruct_0202855C * param1, SaveData * param2);
+void ov23_02253598(UnkStruct_ov23_02253598 * param0, SecretBaseRecord * param1, SaveData * param2);
 void ov23_022535CC(void);
 void ov23_022535EC(void);
 void ov23_02253604(void);
@@ -21,8 +21,8 @@ void ov23_02253998(int param0, int param1, void * param2, void * param3);
 void ov23_022539A8(int param0, int param1, void * param2, void * param3);
 BOOL ov23_022539D8(void);
 void ov23_022539E8(void);
-void ov23_02253A00(UnkStruct_0202855C * param0, int param1);
-void * ov23_02253C64(BGL * param0, TrainerInfo * param1, UnkStruct_020298B0 * param2, UnkFuncPtr_ov23_02253834 param3, void * param4);
+void ov23_02253A00(SecretBaseRecord * param0, int param1);
+void * ov23_02253C64(BGL * param0, TrainerInfo * param1, UndergroundData * param2, UnkFuncPtr_ov23_02253834 param3, void * param4);
 void ov23_02253D10(void * param0);
 
 #endif // POKEPLATINUM_OV23_02253598_H
diff --git a/include/overlay023/struct_ov23_02248D20.h b/include/overlay023/struct_ov23_02248D20.h
index 38752a354a..b3f6de5e99 100644
--- a/include/overlay023/struct_ov23_02248D20.h
+++ b/include/overlay023/struct_ov23_02248D20.h
@@ -9,7 +9,7 @@
 
 typedef struct {
     UnkFuncPtr_ov23_02248D20 unk_00;
-    UnkStruct_020298B0 * unk_04;
+    UndergroundData * unk_04;
     ResourceMetadata * unk_08;
     UnkStruct_0200112C * unk_0C;
     UnkStruct_020149F0 * unk_10;
diff --git a/include/struct_decls/struct_0202855C_decl.h b/include/struct_decls/struct_0202855C_decl.h
index 22c51a37b1..0aeab3e6f4 100644
--- a/include/struct_decls/struct_0202855C_decl.h
+++ b/include/struct_decls/struct_0202855C_decl.h
@@ -1,6 +1,6 @@
 #ifndef POKEPLATINUM_STRUCT_0202855C_DECL_H
 #define POKEPLATINUM_STRUCT_0202855C_DECL_H
 
-typedef struct UnkStruct_0202855C_t UnkStruct_0202855C;
+typedef struct UnkStruct_0202855C_t SecretBaseRecord;
 
 #endif // POKEPLATINUM_STRUCT_0202855C_DECL_H
diff --git a/include/struct_decls/struct_020298B0_decl.h b/include/struct_decls/struct_020298B0_decl.h
index bdde1dbbef..19b2add53f 100644
--- a/include/struct_decls/struct_020298B0_decl.h
+++ b/include/struct_decls/struct_020298B0_decl.h
@@ -1,6 +1,6 @@
 #ifndef POKEPLATINUM_STRUCT_020298B0_DECL_H
 #define POKEPLATINUM_STRUCT_020298B0_DECL_H
 
-typedef struct UnkStruct_020298B0_t UnkStruct_020298B0;
+typedef struct UnkStruct_020298B0_t UndergroundData;
 
 #endif // POKEPLATINUM_STRUCT_020298B0_DECL_H
diff --git a/include/struct_defs/struct_0202855C.h b/include/struct_defs/struct_0202855C.h
index 472d8e1169..1e029a7cfb 100644
--- a/include/struct_defs/struct_0202855C.h
+++ b/include/struct_defs/struct_0202855C.h
@@ -17,6 +17,6 @@ typedef struct UnkStruct_0202855C_t {
     u32 unk_30_0 : 20;
     u32 unk_34_0 : 20;
     u32 unk_38_0 : 20;
-} UnkStruct_0202855C;
+} SecretBaseRecord;
 
 #endif // POKEPLATINUM_STRUCT_0202855C_H
diff --git a/include/struct_defs/struct_02029894.h b/include/struct_defs/struct_02029894.h
index c2020cd318..fac72a718c 100644
--- a/include/struct_defs/struct_02029894.h
+++ b/include/struct_defs/struct_02029894.h
@@ -8,7 +8,7 @@
 typedef struct UnkStruct_02029894_t {
     UnkStruct_02029894_sub1 unk_00[15];
     UnkStruct_02029894_sub2 unk_2D[16];
-    UnkStruct_0202855C unk_50;
+    SecretBaseRecord unk_50;
     u16 unk_8C;
     u16 unk_8E;
     u8 unk_90;
diff --git a/include/struct_defs/struct_020298B0.h b/include/struct_defs/struct_020298B0.h
index 367be5988a..c1d8da770e 100644
--- a/include/struct_defs/struct_020298B0.h
+++ b/include/struct_defs/struct_020298B0.h
@@ -36,6 +36,6 @@ typedef struct UnkStruct_020298B0_t {
     u8 unk_9AB;
     u8 unk_9AC_0 : 4;
     u8 unk_9AC_4 : 4;
-} UnkStruct_020298B0;
+} UndergroundData;
 
 #endif // POKEPLATINUM_STRUCT_020298B0_H
diff --git a/include/unk_0202854C.h b/include/unk_0202854C.h
index 7ba512ccf6..8be644178a 100644
--- a/include/unk_0202854C.h
+++ b/include/unk_0202854C.h
@@ -10,78 +10,78 @@
 int Underground_SaveSize(void);
 int sub_02028554(void);
 int sub_02028558(void);
-UnkStruct_0202855C * sub_0202855C(u32 param0);
-void Underground_Init(UnkStruct_020298B0 * param0);
+SecretBaseRecord * sub_0202855C(u32 param0);
+void Underground_Init(UndergroundData * param0);
 void sub_02028658(SaveData * param0, int param1);
 void sub_02028758(SaveData * param0, s32 param1, BOOL param2);
 void sub_0202878C(SaveData * param0);
 void sub_020287E0(SaveData * param0);
 void sub_020287F8(SaveData * param0);
 BOOL sub_02028810(SaveData * param0);
-void sub_02028828(UnkStruct_020298B0 * param0);
-void sub_02028830(UnkStruct_020298B0 * param0, const TrainerInfo * param1);
-TrainerInfo * sub_020288C8(const UnkStruct_020298B0 * param0, int param1, int param2);
-u32 sub_02028930(UnkStruct_020298B0 * param0);
+void sub_02028828(UndergroundData * param0);
+void sub_02028830(UndergroundData * param0, const TrainerInfo * param1);
+TrainerInfo * sub_020288C8(const UndergroundData * param0, int param1, int param2);
+u32 sub_02028930(UndergroundData * param0);
 int sub_02028938(int param0);
-BOOL sub_0202895C(UnkStruct_020298B0 * param0, int param1);
-BOOL sub_02028984(UnkStruct_020298B0 * param0, int param1);
-int sub_020289A0(UnkStruct_020298B0 * param0);
-int sub_020289B8(UnkStruct_020298B0 * param0, int param1);
-int sub_020289C4(UnkStruct_020298B0 * param0, int param1);
-void sub_02028A10(UnkStruct_020298B0 * param0, int param1, int param2);
-int sub_02028ACC(UnkStruct_020298B0 * param0, int param1, int param2);
-BOOL sub_02028AFC(UnkStruct_020298B0 * param0, int param1);
-void sub_02028B20(UnkStruct_020298B0 * param0, int param1);
-void sub_02028B34(UnkStruct_020298B0 * param0);
-int sub_02028B70(UnkStruct_020298B0 * param0);
-int sub_02028B88(UnkStruct_020298B0 * param0, int param1);
-int sub_02028B94(UnkStruct_020298B0 * param0, int param1);
-BOOL sub_02028BC8(UnkStruct_020298B0 * param0, int param1);
-void sub_02028BE8(UnkStruct_020298B0 * param0, int param1, int param2);
-int sub_02028C3C(UnkStruct_020298B0 * param0);
-int sub_02028C54(UnkStruct_020298B0 * param0, int param1);
-int sub_02028C60(UnkStruct_020298B0 * param0, int param1);
-int sub_02028C6C(UnkStruct_020298B0 * param0, int param1);
-BOOL sub_02028CB0(UnkStruct_020298B0 * param0, int param1, int param2);
-void sub_02028CD8(UnkStruct_020298B0 * param0, int param1, int param2);
-int sub_02028D58(UnkStruct_020298B0 * param0);
-int sub_02028D74(UnkStruct_020298B0 * param0, int param1);
-int sub_02028D80(UnkStruct_020298B0 * param0, int param1);
-BOOL sub_02028DB4(UnkStruct_020298B0 * param0, int param1);
-void sub_02028DD8(UnkStruct_020298B0 * param0, int param1, int param2);
-int sub_02028E28(UnkStruct_020298B0 * param0);
-int sub_02028E44(UnkStruct_020298B0 * param0, int param1);
-int sub_02028E50(UnkStruct_020298B0 * param0, int param1);
-BOOL sub_02028E84(UnkStruct_020298B0 * param0, int param1);
-void sub_02028EA8(UnkStruct_020298B0 * param0, int param1, int param2);
-void sub_02028EF8(UnkStruct_020298B0 * param0, int param1, int param2, int param3, int param4);
-int sub_02028F40(UnkStruct_020298B0 * param0, int param1);
-int sub_02028F5C(UnkStruct_020298B0 * param0, int param1);
-int sub_02028F88(UnkStruct_020298B0 * param0, int param1);
-void sub_02028FB4(UnkStruct_020298B0 * param0, int param1);
-void sub_02028FE0(UnkStruct_020298B0 * param0, int param1, int param2, int param3, int param4, int param5);
-int sub_02029030(UnkStruct_020298B0 * param0, int param1);
-int sub_0202903C(UnkStruct_020298B0 * param0, int param1);
-int sub_0202905C(UnkStruct_020298B0 * param0, int param1);
-int sub_0202907C(UnkStruct_020298B0 * param0, int param1);
-void sub_02029088(UnkStruct_020298B0 * param0, int param1, int param2, int param3, int param4, int param5, int param6);
-int sub_020290DC(UnkStruct_020298B0 * param0, int param1);
-int sub_020290E8(UnkStruct_020298B0 * param0, int param1);
-int sub_02029108(UnkStruct_020298B0 * param0, int param1);
-int sub_02029128(UnkStruct_020298B0 * param0, int param1);
-int sub_02029134(UnkStruct_020298B0 * param0, int param1);
-int sub_02029140(UnkStruct_020298B0 * param0, int param1, int param2);
-void sub_020291A4(UnkStruct_020298B0 * param0, int param1);
-int sub_020291CC(UnkStruct_020298B0 * param0, int param1);
-int sub_020291EC(UnkStruct_020298B0 * param0, int param1);
-BOOL sub_0202920C(UnkStruct_020298B0 * param0);
-void sub_02029220(UnkStruct_020298B0 * param0);
-BOOL sub_02029234(UnkStruct_020298B0 * param0);
-void sub_02029240(UnkStruct_020298B0 * param0);
-void sub_02029250(UnkStruct_020298B0 * param0, int param1);
-BOOL sub_02029274(UnkStruct_020298B0 * param0, int param1);
-void sub_0202929C(UnkStruct_020298B0 * param0);
-int sub_020292B4(UnkStruct_020298B0 * param0);
+BOOL sub_0202895C(UndergroundData * param0, int param1);
+BOOL sub_02028984(UndergroundData * param0, int param1);
+int sub_020289A0(UndergroundData * param0);
+int sub_020289B8(UndergroundData * param0, int param1);
+int sub_020289C4(UndergroundData * param0, int param1);
+void sub_02028A10(UndergroundData * param0, int param1, int param2);
+int sub_02028ACC(UndergroundData * param0, int param1, int param2);
+BOOL sub_02028AFC(UndergroundData * param0, int param1);
+void sub_02028B20(UndergroundData * param0, int param1);
+void sub_02028B34(UndergroundData * param0);
+int sub_02028B70(UndergroundData * param0);
+int sub_02028B88(UndergroundData * param0, int param1);
+int sub_02028B94(UndergroundData * param0, int param1);
+BOOL sub_02028BC8(UndergroundData * param0, int param1);
+void sub_02028BE8(UndergroundData * param0, int param1, int param2);
+int sub_02028C3C(UndergroundData * param0);
+int sub_02028C54(UndergroundData * param0, int param1);
+int sub_02028C60(UndergroundData * param0, int param1);
+int sub_02028C6C(UndergroundData * param0, int param1);
+BOOL sub_02028CB0(UndergroundData * param0, int param1, int param2);
+void sub_02028CD8(UndergroundData * param0, int param1, int param2);
+int sub_02028D58(UndergroundData * param0);
+int sub_02028D74(UndergroundData * param0, int param1);
+int sub_02028D80(UndergroundData * param0, int param1);
+BOOL sub_02028DB4(UndergroundData * param0, int param1);
+void sub_02028DD8(UndergroundData * param0, int param1, int param2);
+int sub_02028E28(UndergroundData * param0);
+int sub_02028E44(UndergroundData * param0, int param1);
+int sub_02028E50(UndergroundData * param0, int param1);
+BOOL sub_02028E84(UndergroundData * param0, int param1);
+void sub_02028EA8(UndergroundData * param0, int param1, int param2);
+void sub_02028EF8(UndergroundData * param0, int param1, int param2, int param3, int param4);
+int sub_02028F40(UndergroundData * param0, int param1);
+int sub_02028F5C(UndergroundData * param0, int param1);
+int sub_02028F88(UndergroundData * param0, int param1);
+void sub_02028FB4(UndergroundData * param0, int param1);
+void sub_02028FE0(UndergroundData * param0, int param1, int param2, int param3, int param4, int param5);
+int sub_02029030(UndergroundData * param0, int param1);
+int sub_0202903C(UndergroundData * param0, int param1);
+int sub_0202905C(UndergroundData * param0, int param1);
+int sub_0202907C(UndergroundData * param0, int param1);
+void sub_02029088(UndergroundData * param0, int param1, int param2, int param3, int param4, int param5, int param6);
+int sub_020290DC(UndergroundData * param0, int param1);
+int sub_020290E8(UndergroundData * param0, int param1);
+int sub_02029108(UndergroundData * param0, int param1);
+int sub_02029128(UndergroundData * param0, int param1);
+int sub_02029134(UndergroundData * param0, int param1);
+int sub_02029140(UndergroundData * param0, int param1, int param2);
+void sub_020291A4(UndergroundData * param0, int param1);
+int sub_020291CC(UndergroundData * param0, int param1);
+int sub_020291EC(UndergroundData * param0, int param1);
+BOOL sub_0202920C(UndergroundData * param0);
+void sub_02029220(UndergroundData * param0);
+BOOL sub_02029234(UndergroundData * param0);
+void sub_02029240(UndergroundData * param0);
+void sub_02029250(UndergroundData * param0, int param1);
+BOOL sub_02029274(UndergroundData * param0, int param1);
+void sub_0202929C(UndergroundData * param0);
+int sub_020292B4(UndergroundData * param0);
 void sub_020292C0(UnkStruct_02029894 * param0);
 void sub_020292CC(UnkStruct_02029894 * param0);
 void sub_02029300(UnkStruct_02029894 * param0);
@@ -92,44 +92,44 @@ int sub_020293FC(const UnkStruct_02029894 * param0, int param1);
 int sub_0202942C(const UnkStruct_02029894 * param0, int param1);
 int sub_02029460(const UnkStruct_02029894 * param0);
 int sub_0202948C(const UnkStruct_02029894 * param0);
-int sub_020294B8(const UnkStruct_0202855C * param0);
-int sub_020294C0(const UnkStruct_0202855C * param0);
-void sub_020294D4(UnkStruct_0202855C * param0, int param1);
-int sub_020294EC(const UnkStruct_0202855C * param0);
-void sub_020294F4(UnkStruct_0202855C * param0, int param1);
-int sub_02029524(const UnkStruct_0202855C * param0);
-void sub_0202952C(UnkStruct_0202855C * param0);
-void sub_0202955C(UnkStruct_0202855C * param0);
-int sub_0202958C(const UnkStruct_0202855C * param0);
-int sub_020295B8(const UnkStruct_0202855C * param0);
-void sub_020295C0(UnkStruct_0202855C * param0);
-int sub_020295F0(const UnkStruct_0202855C * param0);
-void sub_020295F8(UnkStruct_0202855C * param0, int param1);
-int sub_0202963C(const UnkStruct_0202855C * param0);
-void sub_02029644(UnkStruct_0202855C * param0, int param1);
-void sub_02029688(UnkStruct_0202855C * param0, int param1);
-int sub_020296CC(const UnkStruct_0202855C * param0);
-void sub_020296D4(UnkStruct_0202855C * param0);
-int sub_02029704(const UnkStruct_0202855C * param0);
-void sub_0202970C(UnkStruct_0202855C * param0);
-int sub_0202973C(const UnkStruct_0202855C * param0);
-void sub_02029744(UnkStruct_0202855C * param0);
-int sub_02029774(const UnkStruct_0202855C * param0);
-void sub_0202977C(UnkStruct_0202855C * param0);
-int sub_020297AC(const UnkStruct_0202855C * param0);
-void sub_020297B4(UnkStruct_0202855C * param0);
-int sub_020297E4(const UnkStruct_0202855C * param0);
-void sub_020297EC(UnkStruct_0202855C * param0);
-int sub_0202981C(const UnkStruct_0202855C * param0);
-void sub_02029824(UnkStruct_0202855C * param0);
+int sub_020294B8(const SecretBaseRecord * param0);
+int sub_020294C0(const SecretBaseRecord * param0);
+void sub_020294D4(SecretBaseRecord * param0, int param1);
+int sub_020294EC(const SecretBaseRecord * param0);
+void sub_020294F4(SecretBaseRecord * param0, int param1);
+int sub_02029524(const SecretBaseRecord * param0);
+void sub_0202952C(SecretBaseRecord * param0);
+void sub_0202955C(SecretBaseRecord * param0);
+int sub_0202958C(const SecretBaseRecord * param0);
+int sub_020295B8(const SecretBaseRecord * param0);
+void sub_020295C0(SecretBaseRecord * param0);
+int sub_020295F0(const SecretBaseRecord * param0);
+void sub_020295F8(SecretBaseRecord * param0, int param1);
+int sub_0202963C(const SecretBaseRecord * param0);
+void sub_02029644(SecretBaseRecord * param0, int param1);
+void sub_02029688(SecretBaseRecord * param0, int param1);
+int sub_020296CC(const SecretBaseRecord * param0);
+void sub_020296D4(SecretBaseRecord * param0);
+int sub_02029704(const SecretBaseRecord * param0);
+void sub_0202970C(SecretBaseRecord * param0);
+int sub_0202973C(const SecretBaseRecord * param0);
+void sub_02029744(SecretBaseRecord * param0);
+int sub_02029774(const SecretBaseRecord * param0);
+void sub_0202977C(SecretBaseRecord * param0);
+int sub_020297AC(const SecretBaseRecord * param0);
+void sub_020297B4(SecretBaseRecord * param0);
+int sub_020297E4(const SecretBaseRecord * param0);
+void sub_020297EC(SecretBaseRecord * param0);
+int sub_0202981C(const SecretBaseRecord * param0);
+void sub_02029824(SecretBaseRecord * param0);
 void sub_02029854(UnkStruct_02029894 * param0, int param1, int param2, int param3);
 int sub_02029874(const UnkStruct_02029894 * param0);
 int sub_0202987C(const UnkStruct_02029894 * param0);
 int sub_02029884(const UnkStruct_02029894 * param0);
 BOOL sub_0202988C(const UnkStruct_02029894 * param0);
 UnkStruct_02029894 * sub_02029894(SaveData * param0);
-UnkStruct_0202855C * sub_020298A0(SaveData * param0);
-UnkStruct_0202855C * sub_020298AC(UnkStruct_02029894 * param0);
-UnkStruct_020298B0 * sub_020298B0(SaveData * param0);
+SecretBaseRecord * SaveData_SecretBaseRecord(SaveData * param0);
+SecretBaseRecord * sub_020298AC(UnkStruct_02029894 * param0);
+UndergroundData * sub_020298B0(SaveData * param0);
 
 #endif // POKEPLATINUM_UNK_0202854C_H
diff --git a/include/unk_0203CC84.h b/include/unk_0203CC84.h
index 7a01954e60..34be39a657 100644
--- a/include/unk_0203CC84.h
+++ b/include/unk_0203CC84.h
@@ -17,6 +17,6 @@ void sub_0203D128(void);
 void sub_0203D140(void);
 UnkStruct_ov25_02253CE0 * sub_0203D158(void);
 BGL * sub_0203D170(void * param0);
-SaveData * sub_0203D174(void * param0);
+SaveData * FieldSystem_SaveData(void * param0);
 
 #endif // POKEPLATINUM_UNK_0203CC84_H
diff --git a/include/unk_0205E7D0.h b/include/unk_0205E7D0.h
index 09d0dca37e..28e005d3e8 100644
--- a/include/unk_0205E7D0.h
+++ b/include/unk_0205E7D0.h
@@ -29,7 +29,7 @@ const VecFx32 * sub_0205EAFC(PlayerAvatar * const param0);
 void sub_0205EB08(PlayerAvatar * param0, int param1);
 int sub_0205EB0C(const PlayerAvatar * param0);
 void sub_0205EB10(PlayerAvatar * param0, int param1);
-int sub_0205EB14(const PlayerAvatar * param0);
+int Player_MoveState(const PlayerAvatar * param0);
 void sub_0205EB18(PlayerAvatar * param0, int param1);
 void sub_0205EB38(PlayerAvatar * param0, LocalMapObject * param1);
 LocalMapObject * Player_LocalMapObject(PlayerAvatar * param0);
diff --git a/src/field_comm_manager.c b/src/field_comm_manager.c
index e82d3a2599..adca18272b 100644
--- a/src/field_comm_manager.c
+++ b/src/field_comm_manager.c
@@ -123,7 +123,7 @@ void FieldCommMan_StartBattleServer (FieldSystem * fieldSys, int param1, int par
         return;
     }
 
-    CommMan_StartBattleServer(sub_0203D174(fieldSys), param1, param2, fieldSys->unk_B0, 0);
+    CommMan_StartBattleServer(FieldSystem_SaveData(fieldSys), param1, param2, fieldSys->unk_B0, 0);
     FieldCommMan_Init(fieldSys);
     FieldCommMan_SetTask(Task_StartBattleServer, 0);
 }
@@ -134,7 +134,7 @@ void FieldCommMan_StartBattleClient (FieldSystem * fieldSys, int param1, int par
         return;
     }
 
-    CommMan_StartBattleClient(sub_0203D174(fieldSys), param1, param2, fieldSys->unk_B0, 0);
+    CommMan_StartBattleClient(FieldSystem_SaveData(fieldSys), param1, param2, fieldSys->unk_B0, 0);
     FieldCommMan_Init(fieldSys);
     FieldCommMan_SetTask(Task_StartBattleClient, 0);
 }
diff --git a/src/overlay005/ov5_021D0D80.c b/src/overlay005/ov5_021D0D80.c
index 1129f73bff..a6040d4a4b 100644
--- a/src/overlay005/ov5_021D0D80.c
+++ b/src/overlay005/ov5_021D0D80.c
@@ -382,7 +382,7 @@ const UnkStruct_0208BE5C Unk_ov5_021F89B0 = {
 
 static int ov5_021D1178 (FieldSystem * param0)
 {
-    UnkStruct_02027860 * v0 = sub_02027860(sub_0203D174(param0));
+    UnkStruct_02027860 * v0 = sub_02027860(FieldSystem_SaveData(param0));
     int v1 = sub_02027F80(v0);
 
     if (v1 == 0) {
@@ -906,7 +906,7 @@ static void ov5_021D1878 (FieldSystem * param0)
     ov5_021F1328(param0->unk_40);
 
     {
-        UnkStruct_02027860 * v3 = sub_02027860(sub_0203D174(param0));
+        UnkStruct_02027860 * v3 = sub_02027860(FieldSystem_SaveData(param0));
         int v4 = sub_02027F80(v3);
 
         sub_0205E884(param0->playerAvatar, v4);
@@ -994,7 +994,7 @@ static void ov5_021D1A70 (UnkStruct_ov5_021D1A68 * param0)
 
 static BOOL ov5_021D1A78 (FieldSystem * param0)
 {
-    UnkStruct_02027860 * v0 = sub_02027860(sub_0203D174(param0));
+    UnkStruct_02027860 * v0 = sub_02027860(FieldSystem_SaveData(param0));
     int v1 = sub_02027F80(v0);
 
     if (v1 == 9) {
diff --git a/src/overlay005/ov5_021D1C30.c b/src/overlay005/ov5_021D1C30.c
index 446517455f..f8ba123606 100644
--- a/src/overlay005/ov5_021D1C30.c
+++ b/src/overlay005/ov5_021D1C30.c
@@ -123,7 +123,7 @@ void ov5_021D1CAC (UnkStruct_ov5_021D1CAC * param0, FieldSystem * param1, u16 pa
 
     ov5_021D1C30(param0);
 
-    v0 = sub_0205EB14(param1->playerAvatar);
+    v0 = Player_MoveState(param1->playerAvatar);
     v1 = sub_0205EB0C(param1->playerAvatar);
     v2 = Player_Dir(param1->playerAvatar);
 
diff --git a/src/overlay005/ov5_021F8370.c b/src/overlay005/ov5_021F8370.c
index 0e92fabe5b..6921d2ecea 100644
--- a/src/overlay005/ov5_021F8370.c
+++ b/src/overlay005/ov5_021F8370.c
@@ -66,7 +66,7 @@ void ov5_021F8370 (FieldSystem * param0)
     UnkStruct_02071C34 * v2;
     UnkStruct_ov5_021F8480 * v3;
 
-    v1 = sub_02027860(sub_0203D174(param0));
+    v1 = sub_02027860(FieldSystem_SaveData(param0));
     v2 = sub_02027F6C(v1, 10);
     v3 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021F8480));
 
@@ -115,7 +115,7 @@ BOOL ov5_021F83D4 (FieldSystem * param0, const int param1, const int param2, con
 
 BOOL ov5_021F8410 (FieldSystem * param0, const int param1, const int param2, const int param3)
 {
-    UnkStruct_02027860 * v0 = sub_02027860(sub_0203D174(param0));
+    UnkStruct_02027860 * v0 = sub_02027860(FieldSystem_SaveData(param0));
 
     if (sub_02027F80(v0) == 10) {
         int v1;
diff --git a/src/overlay006/ov6_02240C9C.c b/src/overlay006/ov6_02240C9C.c
index 6dfb15b84e..2b40c1fe92 100644
--- a/src/overlay006/ov6_02240C9C.c
+++ b/src/overlay006/ov6_02240C9C.c
@@ -342,7 +342,7 @@ BOOL ov6_02240D5C (FieldSystem * param0)
             v13[v18].unk_06 = v12->unk_04[v18].unk_00;
         }
 
-        v19 = sub_02027474(sub_02027560(sub_0203D174(param0)));
+        v19 = sub_02027474(sub_02027560(FieldSystem_SaveData(param0)));
 
         ov6_02240C9C(v12, &v13[2].unk_00, &v13[3].unk_00);
         ov6_02240CC8(param0, v12, &v13[0].unk_00, &v13[1].unk_00);
@@ -562,7 +562,7 @@ BOOL ov6_022411C8 (FieldSystem * param0, UnkStruct_020508D4 * param1)
             v12[v16].unk_06 = v11->unk_04[v16].unk_00;
         }
 
-        v17 = sub_02027474(sub_02027560(sub_0203D174(param0)));
+        v17 = sub_02027474(sub_02027560(FieldSystem_SaveData(param0)));
 
         ov6_02240C9C(v11, &v12[2].unk_00, &v12[3].unk_00);
         ov6_02240CC8(param0, v11, &v12[0].unk_00, &v12[1].unk_00);
@@ -710,7 +710,7 @@ BOOL ov6_022413E4 (FieldSystem * param0, BattleParams ** param1)
             v12[v17].unk_06 = v11->unk_04[v17].unk_00;
         }
 
-        v18 = sub_02027474(sub_02027560(sub_0203D174(param0)));
+        v18 = sub_02027474(sub_02027560(FieldSystem_SaveData(param0)));
 
         ov6_02240C9C(v11, &v12[2].unk_00, &v12[3].unk_00);
         ov6_02240CC8(param0, v11, &v12[0].unk_00, &v12[1].unk_00);
@@ -769,7 +769,7 @@ static BOOL ov6_02241674 (FieldSystem * param0, Pokemon * param1, BattleParams *
         if (param6->unk_04 == 1) {
             TrainerInfo * v3;
 
-            v3 = SaveData_GetTrainerInfo(sub_0203D174(param0));
+            v3 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0));
             v0 = ov6_02241F2C(v1, v2, 1, param6->unk_08, TrainerInfo_ID(v3), param5, param1, param2);
         } else {
             v0 = ov6_02241F7C(param0, param1, param5, param4, 1, param2, v1, v2);
diff --git a/src/overlay006/ov6_02242984.c b/src/overlay006/ov6_02242984.c
index 0934e26010..f0323b0b02 100644
--- a/src/overlay006/ov6_02242984.c
+++ b/src/overlay006/ov6_02242984.c
@@ -45,7 +45,7 @@ int ov6_02242984 (FieldSystem * param0)
         v2[v0] = v3->unk_04[v0].unk_04;
     }
 
-    v1 = sub_02027474(sub_02027560(sub_0203D174(param0)));
+    v1 = sub_02027474(sub_02027560(FieldSystem_SaveData(param0)));
 
     ov6_02242F74(sub_0202D814(sub_0202D834(param0->unk_0C), 1), v1, param0->unk_1C->unk_00, &v2[6], &v2[7]);
     ov6_02240C9C(v3, &v2[2], &v2[3]);
diff --git a/src/overlay006/ov6_02242AF0.c b/src/overlay006/ov6_02242AF0.c
index 5140e7eb6b..986dc8e21b 100644
--- a/src/overlay006/ov6_02242AF0.c
+++ b/src/overlay006/ov6_02242AF0.c
@@ -87,7 +87,7 @@ void ov6_02242AF0 (FieldSystem * param0)
     UnkStruct_ov6_02242AF0 * v1;
     VecFx32 v2;
 
-    v0 = sub_02027860(sub_0203D174(param0));
+    v0 = sub_02027860(FieldSystem_SaveData(param0));
     v1 = (UnkStruct_ov6_02242AF0 *)sub_02027F6C(v0, 6);
 
     v2.x = ((FX32_ONE * 16) * (32 * 2 + 2));
@@ -114,7 +114,7 @@ void ov6_02242B58 (FieldSystem * param0, const u16 param1, const u16 param2)
     UnkStruct_ov6_02242AF0 * v1;
     UnkStruct_ov6_02242B58 * v2;
 
-    v0 = sub_02027860(sub_0203D174(param0));
+    v0 = sub_02027860(FieldSystem_SaveData(param0));
     v1 = (UnkStruct_ov6_02242AF0 *)sub_02027F6C(v0, 6);
     v2 = Heap_AllocFromHeapAtEnd(4, sizeof(UnkStruct_ov6_02242B58));
 
@@ -183,7 +183,7 @@ u32 ov6_02242C3C (FieldSystem * param0, const u16 param1)
     UnkStruct_02027860 * v0;
     UnkStruct_ov6_02242AF0 * v1;
 
-    v0 = sub_02027860(sub_0203D174(param0));
+    v0 = sub_02027860(FieldSystem_SaveData(param0));
     v1 = (UnkStruct_ov6_02242AF0 *)sub_02027F6C(v0, 6);
 
     if (v1->unk_00 == param1) {
diff --git a/src/overlay006/ov6_02247A0C.c b/src/overlay006/ov6_02247A0C.c
index 4a5095faa2..1386bd566c 100644
--- a/src/overlay006/ov6_02247A0C.c
+++ b/src/overlay006/ov6_02247A0C.c
@@ -138,7 +138,7 @@ void * ov6_02247A90 (void * param0)
     SaveData * v8;
 
     v1 = sub_0203D170(param0);
-    v8 = sub_0203D174(param0);
+    v8 = FieldSystem_SaveData(param0);
     v0 = Heap_AllocFromHeap(11, sizeof(UnkStruct_ov6_02247A90));
 
     MI_CpuClear8(v0, sizeof(UnkStruct_ov6_02247A90));
diff --git a/src/overlay007/ov7_02249960.c b/src/overlay007/ov7_02249960.c
index c800cf399c..c59054688e 100644
--- a/src/overlay007/ov7_02249960.c
+++ b/src/overlay007/ov7_02249960.c
@@ -198,7 +198,7 @@ static void ov7_02249AB4 (FieldSystem * param0)
     Unk_ov7_0224F5A0->unk_68 = param0;
     Unk_ov7_0224F5A0->unk_97 = 0;
     Unk_ov7_0224F5A0->unk_74 = MessageLoader_Init(1, 26, 353, 4);
-    Unk_ov7_0224F5A0->unk_78 = SaveData_GetTrainerInfo(sub_0203D174(Unk_ov7_0224F5A0->unk_68));
+    Unk_ov7_0224F5A0->unk_78 = SaveData_GetTrainerInfo(FieldSystem_SaveData(Unk_ov7_0224F5A0->unk_68));
     Unk_ov7_0224F5A0->unk_7C = TrainerInfo_New(4);
 
     sub_0201A7A0(&Unk_ov7_0224F5A0->unk_20);
diff --git a/src/overlay008/ov8_02249960.c b/src/overlay008/ov8_02249960.c
index 794b5e8f9e..dc50881d5b 100644
--- a/src/overlay008/ov8_02249960.c
+++ b/src/overlay008/ov8_02249960.c
@@ -363,7 +363,7 @@ void ov8_0224997C (FieldSystem * param0)
         UnkStruct_02027860 * v7;
         UnkStruct_02071B10 * v8;
 
-        v7 = sub_02027860(sub_0203D174(param0));
+        v7 = sub_02027860(FieldSystem_SaveData(param0));
         v8 = (UnkStruct_02071B10 *)sub_02027F6C(v7, 1);
 
         v6 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_ov8_0224997C));
@@ -617,7 +617,7 @@ void ov8_02249DBC (FieldSystem * param0)
     UnkStruct_02027860 * v7;
     UnkStruct_02071B10 * v8;
 
-    v7 = sub_02027860(sub_0203D174(param0));
+    v7 = sub_02027860(FieldSystem_SaveData(param0));
     v8 = (UnkStruct_02071B10 *)sub_02027F6C(v7, 1);
 
     {
@@ -765,7 +765,7 @@ void ov8_02249FB8 (FieldSystem * param0)
         UnkStruct_02027860 * v2;
         UnkStruct_ov8_02249FB8 * v3;
 
-        v2 = sub_02027860(sub_0203D174(param0));
+        v2 = sub_02027860(FieldSystem_SaveData(param0));
         v3 = (UnkStruct_ov8_02249FB8 *)sub_02027F6C(v2, 2);
 
         sub_0205EAEC(param0->playerAvatar, &v1);
@@ -1255,7 +1255,7 @@ static void ov8_0224A254 (UnkStruct_ov8_0224A1E4 * param0, const u8 param1)
     UnkStruct_02027860 * v3;
     UnkStruct_02071B30 * v4;
 
-    v3 = sub_02027860(sub_0203D174(param0->unk_00));
+    v3 = sub_02027860(FieldSystem_SaveData(param0->unk_00));
     v4 = (UnkStruct_02071B30 *)sub_02027F6C(v3, 3);
     v2 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_ov8_0224997C));
 
@@ -1591,7 +1591,7 @@ void ov8_0224A8C8 (FieldSystem * param0)
     UnkStruct_02027860 * v1;
     UnkStruct_02071B30 * v2;
 
-    v1 = sub_02027860(sub_0203D174(param0));
+    v1 = sub_02027860(FieldSystem_SaveData(param0));
     v2 = (UnkStruct_02071B30 *)sub_02027F6C(v1, 3);
 
     param0->unk_04->unk_24 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov8_0224A1E4));
@@ -1674,7 +1674,7 @@ BOOL ov8_0224AAA8 (FieldSystem * param0)
         int v2;
         UnkStruct_02027860 * v3;
 
-        v3 = sub_02027860(sub_0203D174(param0));
+        v3 = sub_02027860(FieldSystem_SaveData(param0));
         v2 = sub_02027F80(v3);
 
         if (v2 != 3) {
@@ -2100,7 +2100,7 @@ void ov8_0224ABD4 (FieldSystem * param0)
     UnkStruct_02027860 * v1;
     UnkStruct_02071B6C * v2;
 
-    v1 = sub_02027860(sub_0203D174(param0));
+    v1 = sub_02027860(FieldSystem_SaveData(param0));
     v2 = (UnkStruct_02071B6C *)sub_02027F6C(v1, 5);
 
     param0->unk_04->unk_24 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov8_0224ABD4));
@@ -2189,7 +2189,7 @@ void ov8_0224AD34 (FieldSystem * param0, const u8 param1)
     UnkStruct_02027860 * v2;
     UnkStruct_02071B6C * v3;
 
-    v2 = sub_02027860(sub_0203D174(param0));
+    v2 = sub_02027860(FieldSystem_SaveData(param0));
     v3 = (UnkStruct_02071B6C *)sub_02027F6C(v2, 5);
     v1 = (UnkStruct_ov8_0224ABD4 *)param0->unk_04->unk_24;
     v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_ov8_0224997C));
@@ -2527,7 +2527,7 @@ void ov8_0224B020 (FieldSystem * param0)
     UnkStruct_02071BD0 * v1;
     UnkStruct_ov8_0224AF00 * v2;
 
-    v0 = sub_02027860(sub_0203D174(param0));
+    v0 = sub_02027860(FieldSystem_SaveData(param0));
     v1 = sub_02027F6C(v0, 8);
     v2 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov8_0224AF00));
 
@@ -2590,7 +2590,7 @@ BOOL ov8_0224B110 (FieldSystem * param0, const int param1, const int param2, con
     UnkStruct_02027860 * v4;
     UnkStruct_02071BD0 * v5;
 
-    v4 = sub_02027860(sub_0203D174(param0));
+    v4 = sub_02027860(FieldSystem_SaveData(param0));
     v5 = sub_02027F6C(v4, 8);
     v1 = v5->unk_00;
     v0 = 0;
@@ -2974,7 +2974,7 @@ BOOL ov8_0224B67C (FieldSystem * param0, Window * param1, MessageLoader * param2
     UnkStruct_02027860 * v0;
     UnkStruct_02071BD0 * v1;
 
-    v0 = sub_02027860(sub_0203D174(param0));
+    v0 = sub_02027860(FieldSystem_SaveData(param0));
     v1 = sub_02027F6C(v0, 8);
 
     if (v1->unk_00 >= 4) {
@@ -3013,7 +3013,7 @@ BOOL ov8_0224B714 (FieldSystem * param0, int param1, int param2, int param3)
     UnkStruct_02071BD0 * v1;
     const UnkStruct_ov8_0224C7F0 * v2;
 
-    v0 = sub_02027860(sub_0203D174(param0));
+    v0 = sub_02027860(FieldSystem_SaveData(param0));
     v1 = sub_02027F6C(v0, 8);
     v2 = &Unk_ov8_0224C7F0[v1->unk_00];
 
@@ -3102,7 +3102,7 @@ void ov8_0224B764 (FieldSystem * param0)
     UnkStruct_02071BF8 * v1;
     UnkStruct_ov8_0224B8D0 * v2;
 
-    v0 = sub_02027860(sub_0203D174(param0));
+    v0 = sub_02027860(FieldSystem_SaveData(param0));
     v1 = sub_02027F6C(v0, 4);
     v2 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov8_0224B8D0));
 
@@ -3650,7 +3650,7 @@ BOOL ov8_0224BF4C (FieldSystem * param0)
 {
     UnkStruct_02027860 * v0;
 
-    v0 = sub_02027860(sub_0203D174(param0));
+    v0 = sub_02027860(FieldSystem_SaveData(param0));
 
     if (sub_02027F80(v0) != 4) {
         return 0;
@@ -3881,7 +3881,7 @@ void ov8_0224C198 (FieldSystem * param0)
     UnkStruct_02071C18 * v1;
     UnkStruct_ov8_0224C444 * v2;
 
-    v0 = sub_02027860(sub_0203D174(param0));
+    v0 = sub_02027860(FieldSystem_SaveData(param0));
     v1 = sub_02027F6C(v0, 2);
     v2 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov8_0224C444));
 
@@ -4080,7 +4080,7 @@ BOOL ov8_0224C51C (FieldSystem * param0)
     LocalMapObject * v7;
     LocalMapObject * v8;
 
-    v4 = sub_02027860(sub_0203D174(param0));
+    v4 = sub_02027860(FieldSystem_SaveData(param0));
 
     if (sub_02027F80(v4) != 2) {
         return 0;
@@ -4115,7 +4115,7 @@ BOOL ov8_0224C5DC (FieldSystem * param0, void * param1)
 {
     UnkStruct_02027860 * v0;
 
-    v0 = sub_02027860(sub_0203D174(param0));
+    v0 = sub_02027860(FieldSystem_SaveData(param0));
 
     if (sub_02027F80(v0) != 2) {
         return 0;
@@ -4145,7 +4145,7 @@ BOOL ov8_0224C62C (FieldSystem * param0, int param1, int param2, int * param3)
     {
         UnkStruct_02027860 * v0;
 
-        v0 = sub_02027860(sub_0203D174(param0));
+        v0 = sub_02027860(FieldSystem_SaveData(param0));
 
         if (sub_02027F80(v0) != 2) {
             return 0;
diff --git a/src/overlay009/ov9_02249960.c b/src/overlay009/ov9_02249960.c
index 2e5eb32247..6a1fa194a9 100644
--- a/src/overlay009/ov9_02249960.c
+++ b/src/overlay009/ov9_02249960.c
@@ -1182,7 +1182,7 @@ void ov9_02249960 (FieldSystem * param0)
     UnkStruct_02071C5C * v1;
     UnkStruct_ov9_02249B04 * v2;
 
-    v0 = sub_02027860(sub_0203D174(param0));
+    v0 = sub_02027860(FieldSystem_SaveData(param0));
     v1 = sub_02027F6C(v0, 9);
     v2 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov9_02249B04));
 
@@ -1614,7 +1614,7 @@ void ov9_02249FD0 (FieldSystem * param0)
 
     GF_ASSERT(param0 != NULL);
 
-    v0 = sub_02027860(sub_0203D174(param0));
+    v0 = sub_02027860(FieldSystem_SaveData(param0));
     v1 = sub_02027F6C(v0, 9);
 
     v1->unk_04 = 0;
@@ -2055,7 +2055,7 @@ BOOL ov9_0224A59C (FieldSystem * param0, int param1)
 {
     UnkStruct_02027860 * v0;
 
-    v0 = sub_02027860(sub_0203D174(param0));
+    v0 = sub_02027860(FieldSystem_SaveData(param0));
 
     if (sub_02027F80(v0) == 9) {
         int v1, v2, v3, v4;
@@ -2139,7 +2139,7 @@ BOOL ov9_0224A71C (FieldSystem * param0)
 {
     UnkStruct_02027860 * v0;
 
-    v0 = sub_02027860(sub_0203D174(param0));
+    v0 = sub_02027860(FieldSystem_SaveData(param0));
 
     if (sub_02027F80(v0) != 9) {
         return 0;
@@ -9509,7 +9509,7 @@ BOOL ov9_02250F74 (FieldSystem * param0)
 {
     UnkStruct_02027860 * v0;
 
-    v0 = sub_02027860(sub_0203D174(param0));
+    v0 = sub_02027860(FieldSystem_SaveData(param0));
 
     if (sub_02027F80(v0) != 9) {
         return 0;
@@ -9577,7 +9577,7 @@ BOOL ov9_02251044 (FieldSystem * param0, int param1, int param2, int param3, u32
 {
     UnkStruct_02027860 * v0;
 
-    v0 = sub_02027860(sub_0203D174(param0));
+    v0 = sub_02027860(FieldSystem_SaveData(param0));
 
     if (sub_02027F80(v0) != 9) {
         GF_ASSERT(0);
diff --git a/src/overlay023/ov23_0223E140.c b/src/overlay023/ov23_0223E140.c
index f6fa08133e..4bc1d3986d 100644
--- a/src/overlay023/ov23_0223E140.c
+++ b/src/overlay023/ov23_0223E140.c
@@ -621,7 +621,7 @@ static void ov23_0223E140 (void)
 void ov23_0223E1E4 (void * param0, FieldSystem * param1)
 {
     int v0, v1;
-    UnkStruct_020298B0 * v2;
+    UndergroundData * v2;
 
     if (Unk_ov23_02257740) {
         return;
@@ -770,7 +770,7 @@ static void ov23_0223E434 (MATHRandContext16 * param0, int param1)
     u16 v4, v5, v6;
     u16 v7, v8, v9;
     UnkStruct_ov23_0223E6F8 * v10;
-    UnkStruct_020298B0 * v11 = sub_020298B0(Unk_ov23_02257740->unk_00->unk_0C);
+    UndergroundData * v11 = sub_020298B0(Unk_ov23_02257740->unk_00->unk_0C);
 
     v6 = (sub_02039E10(Unk_ov23_02257740->unk_00->unk_2C) - 2) * 32;
     v9 = (sub_02039E20(Unk_ov23_02257740->unk_00->unk_2C) - 2) * 32;
@@ -831,7 +831,7 @@ void ov23_0223E650 (int param0, int param1, MATHRandContext16 * param2)
     int v0, v1, v2, v3;
     u16 v4, v5;
     UnkStruct_ov23_0223E6F8 * v6;
-    UnkStruct_020298B0 * v7 = sub_020298B0(Unk_ov23_02257740->unk_00->unk_0C);
+    UndergroundData * v7 = sub_020298B0(Unk_ov23_02257740->unk_00->unk_0C);
 
     v3 = 0;
 
@@ -904,7 +904,7 @@ static UnkStruct_ov23_0223E6F8 * ov23_0223E740 (int param0, int param1)
 
 static void ov23_0223E834 (void)
 {
-    UnkStruct_020298B0 * v0 = sub_020298B0(Unk_ov23_02257740->unk_00->unk_0C);
+    UndergroundData * v0 = sub_020298B0(Unk_ov23_02257740->unk_00->unk_0C);
     int v1;
     int v2, v3;
     UnkStruct_ov23_0223E6F8 * v4;
@@ -1061,7 +1061,7 @@ static void ov23_0223EA38 (SysTask * param0, void * param1)
 
 void ov23_0223EAF8 (int param0, int param1, void * param2, void * param3)
 {
-    UnkStruct_020298B0 * v0 = sub_020298B0(Unk_ov23_02257740->unk_00->unk_0C);
+    UndergroundData * v0 = sub_020298B0(Unk_ov23_02257740->unk_00->unk_0C);
     UnkStruct_ov23_0223E6F8 * v1 = Unk_ov23_02257740->unk_84C[param0];
     u8 v2 = param0;
     u8 * v3 = param2;
@@ -1486,7 +1486,7 @@ static void ov23_0223F118 (SysTask * param0, void * param1)
         v0->unk_08++;
 
         if (v0->unk_08 > 80) {
-            UnkStruct_020298B0 * v2 = sub_020298B0(sub_0203D174(Unk_ov23_02257740->unk_00));
+            UndergroundData * v2 = sub_020298B0(FieldSystem_SaveData(Unk_ov23_02257740->unk_00));
 
             ov23_02254044(ov23_0224219C());
 
@@ -1789,8 +1789,8 @@ static BOOL ov23_0223F838 (int param0, int param1, int param2)
 
 static int ov23_0223F970 (UnkStruct_ov23_02256EB0 * param0)
 {
-    SaveData * v0 = sub_0203D174(Unk_ov23_02257740->unk_00);
-    UnkStruct_020298B0 * v1 = sub_020298B0(v0);
+    SaveData * v0 = FieldSystem_SaveData(Unk_ov23_02257740->unk_00);
+    UndergroundData * v1 = sub_020298B0(v0);
     BOOL v2 = TrainerInfo_ID(SaveData_GetTrainerInfo(v0)) % 2;
     BOOL v3 = sub_02027474(sub_02027560(v0));
     int v4 = 0;
@@ -1862,7 +1862,7 @@ static int ov23_0223FA20 (void)
 
 static void ov23_0223FA3C (BGL * param0, int param1, UnkStruct_ov23_0223EE80 * param2)
 {
-    UnkStruct_020298B0 * v0 = sub_020298B0(sub_0203D174(Unk_ov23_02257740->unk_00));
+    UndergroundData * v0 = sub_020298B0(FieldSystem_SaveData(Unk_ov23_02257740->unk_00));
     int v1, v2, v3 = ov23_0223F9C8();
     int v4, v5, v6, v7, v8 = 0, v9, v10;
     int v11 = ov23_0223FA20();
@@ -2509,8 +2509,8 @@ static int ov23_0224080C (int param0)
 static void ov23_022408A0 (int param0, int param1)
 {
     int v0 = param0;
-    UnkStruct_0202855C * v1 = sub_020298A0(sub_0203D174(Unk_ov23_02257740->unk_00));
-    UnkStruct_020298B0 * v2 = sub_020298B0(sub_0203D174(Unk_ov23_02257740->unk_00));
+    SecretBaseRecord * v1 = SaveData_SecretBaseRecord(FieldSystem_SaveData(Unk_ov23_02257740->unk_00));
+    UndergroundData * v2 = sub_020298B0(FieldSystem_SaveData(Unk_ov23_02257740->unk_00));
 
     if (ov23_02241CF4(v0)) {
         ov23_0224F6E0(v0, param1);
@@ -2522,7 +2522,7 @@ static void ov23_022408A0 (int param0, int param1)
 
 static BOOL ov23_022408EC (int param0)
 {
-    UnkStruct_020298B0 * v0 = sub_020298B0(sub_0203D174(Unk_ov23_02257740->unk_00));
+    UndergroundData * v0 = sub_020298B0(FieldSystem_SaveData(Unk_ov23_02257740->unk_00));
 
     if (ov23_02241CF4(param0)) {
         if (40 == sub_02028C3C(v0)) {
@@ -2602,8 +2602,8 @@ static BOOL ov23_022409F0 (UnkStruct_ov23_0223EE80 * param0)
 static BOOL ov23_02240A90 (UnkStruct_ov23_0223EE80 * param0)
 {
     int v0, v1, v2;
-    UnkStruct_0202855C * v3 = sub_020298A0((Unk_ov23_02257740->unk_00->unk_0C));
-    UnkStruct_020298B0 * v4 = sub_020298B0((Unk_ov23_02257740->unk_00->unk_0C));
+    SecretBaseRecord * v3 = SaveData_SecretBaseRecord((Unk_ov23_02257740->unk_00->unk_0C));
+    UndergroundData * v4 = sub_020298B0((Unk_ov23_02257740->unk_00->unk_0C));
 
     for (v0 = 0; v0 < param0->unk_0C; v0++) {
         if (Unk_ov23_02257740->unk_874[v0].unk_08 == 1) {
@@ -2695,7 +2695,7 @@ static BOOL ov23_02240CFC (UnkStruct_ov23_0223EE80 * param0)
 {
     u8 v0[2];
     int v1;
-    UnkStruct_020298B0 * v2 = sub_020298B0(sub_0203D174(Unk_ov23_02257740->unk_00));
+    UndergroundData * v2 = sub_020298B0(FieldSystem_SaveData(Unk_ov23_02257740->unk_00));
 
     if (Unk_ov23_02257740->unk_A29 == 1) {
         Unk_ov23_02257740->unk_A29 = 0;
diff --git a/src/overlay023/ov23_022416A8.c b/src/overlay023/ov23_022416A8.c
index d2618a69c4..c117f39673 100644
--- a/src/overlay023/ov23_022416A8.c
+++ b/src/overlay023/ov23_022416A8.c
@@ -86,7 +86,7 @@ static void ov23_022416B0 (int param0)
 void ov23_022416E0 (void * param0, FieldSystem * param1)
 {
     int v0;
-    UnkStruct_020298B0 * v1;
+    UndergroundData * v1;
 
     if (Unk_ov23_02257744) {
         return;
@@ -96,7 +96,7 @@ void ov23_022416E0 (void * param0, FieldSystem * param1)
     MI_CpuFill8(Unk_ov23_02257744, 0, sizeof(UnkStruct_ov23_02257744));
     Unk_ov23_02257744->unk_464 = param1;
 
-    v1 = sub_020298B0(sub_0203D174(param1));
+    v1 = sub_020298B0(FieldSystem_SaveData(param1));
 
     for (v0 = 0; v0 < 100; v0++) {
         Unk_ov23_02257744->unk_00[v0].unk_06 = sub_020290DC(v1, v0);
@@ -113,7 +113,7 @@ void ov23_022416E0 (void * param0, FieldSystem * param1)
 
 static void ov23_02241778 (void)
 {
-    UnkStruct_020298B0 * v0 = sub_020298B0(sub_0203D174(Unk_ov23_02257744->unk_464));
+    UndergroundData * v0 = sub_020298B0(FieldSystem_SaveData(Unk_ov23_02257744->unk_464));
     int v1;
 
     for (v1 = 0; v1 < 100; v1++) {
@@ -526,7 +526,7 @@ BOOL ov23_02241D58 (Strbuf *param0)
 
 int ov23_02241DF8 (MATHRandContext16 * param0)
 {
-    UnkStruct_020298B0 * v0 = sub_020298B0(sub_0203D174(Unk_ov23_02257744->unk_464));
+    UndergroundData * v0 = sub_020298B0(FieldSystem_SaveData(Unk_ov23_02257744->unk_464));
     int v1, v2, v3;
 
     for (v3 = 0; v3 < 100; v3++) {
diff --git a/src/overlay023/ov23_02241F74.c b/src/overlay023/ov23_02241F74.c
index 4657c56920..16b241fd3f 100644
--- a/src/overlay023/ov23_02241F74.c
+++ b/src/overlay023/ov23_02241F74.c
@@ -577,7 +577,7 @@ void ov23_02242830 (u8 param0)
     u8 v0 = param0;
     UnkStruct_ov23_02242830 v1;
     int v2, v3;
-    UnkStruct_020298B0 * v4 = sub_020298B0(Unk_ov23_02257748->unk_0C->unk_0C);
+    UndergroundData * v4 = sub_020298B0(Unk_ov23_02257748->unk_0C->unk_0C);
 
     if ((Unk_ov23_02257748->unk_146 != 0) && (Unk_ov23_02257748->unk_134 != 0)) {
         return;
@@ -795,8 +795,8 @@ void ov23_02242BC0 (FieldSystem * param0)
         ov23_0223E1E4(v0, param0);
 
         v0 = Heap_AllocFromHeap(15, ov23_02253608());
-        ov23_02253598(v0, sub_020298A0(sub_0203D174(param0)), sub_0203D174(param0));
-        ov23_0224F588(sub_020298B0(sub_0203D174(param0)));
+        ov23_02253598(v0, SaveData_SecretBaseRecord(FieldSystem_SaveData(param0)), FieldSystem_SaveData(param0));
+        ov23_0224F588(sub_020298B0(FieldSystem_SaveData(param0)));
     }
 }
 
diff --git a/src/overlay023/ov23_0224340C.c b/src/overlay023/ov23_0224340C.c
index ebe4f91e88..54d32a85c0 100644
--- a/src/overlay023/ov23_0224340C.c
+++ b/src/overlay023/ov23_0224340C.c
@@ -624,7 +624,7 @@ static const UnkFuncPtr_ov23_022564CC Unk_ov23_022565E4[] = {
 static void ov23_0224340C (void)
 {
     int v0;
-    UnkStruct_020298B0 * v1 = sub_020298B0(sub_0203D174(Unk_ov23_02257764->unk_40));
+    UndergroundData * v1 = sub_020298B0(FieldSystem_SaveData(Unk_ov23_02257764->unk_40));
 
     for (v0 = 0; v0 < 16; v0++) {
         Unk_ov23_02257764->unk_308[v0].unk_04 = sub_02029030(v1, v0);
@@ -643,7 +643,7 @@ static void ov23_0224340C (void)
 void ov23_022434BC (void * param0, FieldSystem * param1)
 {
     int v0;
-    UnkStruct_020298B0 * v1;
+    UndergroundData * v1;
 
     if (Unk_ov23_02257764) {
         return;
@@ -653,7 +653,7 @@ void ov23_022434BC (void * param0, FieldSystem * param1)
     MI_CpuFill8(Unk_ov23_02257764, 0, sizeof(UnkStruct_ov23_02257764));
     Unk_ov23_02257764->unk_40 = param1;
 
-    v1 = sub_020298B0(sub_0203D174(param1));
+    v1 = sub_020298B0(FieldSystem_SaveData(param1));
 
     Unk_ov23_02257764->unk_2F0 = NULL;
 
@@ -740,7 +740,7 @@ void ov23_022435DC (void)
 void ov23_02243670 (FieldSystem * param0)
 {
     int v0;
-    UnkStruct_020298B0 * v1;
+    UndergroundData * v1;
 
     for (v0 = 0; v0 < 16; v0++) {
         if (Unk_ov23_02257764->unk_368[v0]) {
@@ -1103,7 +1103,7 @@ int ov23_02243C3C (int param0, int param1, MATHRandContext16 * param2, int param
     int v2, v3;
     UnkStruct_ov23_02243DA8 * v4;
     UnkStruct_ov23_02243DA8 * v5;
-    UnkStruct_020298B0 * v6 = sub_020298B0(Unk_ov23_02257764->unk_40->unk_0C);
+    UndergroundData * v6 = sub_020298B0(Unk_ov23_02257764->unk_40->unk_0C);
 
     if (param3 >= (16 * 4)) {
         return 0;
@@ -1136,7 +1136,7 @@ int ov23_02243C3C (int param0, int param1, MATHRandContext16 * param2, int param
 void ov23_02243CE8 (void)
 {
     int v0;
-    UnkStruct_020298B0 * v1 = sub_020298B0(Unk_ov23_02257764->unk_40->unk_0C);
+    UndergroundData * v1 = sub_020298B0(Unk_ov23_02257764->unk_40->unk_0C);
 
     for (v0 = 0; v0 < (16 * 4); v0++) {
         int v2 = sub_02028F40(v1, v0);
@@ -1158,7 +1158,7 @@ void ov23_02243CE8 (void)
 
 static void ov23_02243D50 (void)
 {
-    UnkStruct_020298B0 * v0 = sub_020298B0(sub_0203D174(Unk_ov23_02257764->unk_40));
+    UndergroundData * v0 = sub_020298B0(FieldSystem_SaveData(Unk_ov23_02257764->unk_40));
     int v1;
 
     for (v1 = 0; v1 < 16; v1++) {
@@ -1332,7 +1332,7 @@ BOOL ov23_02244080 (int param0, UnkStruct_ov23_0224271C * param1, u8 param2)
     u8 v2 = param0;
     UnkStruct_ov23_02243DA8 * v3;
     UnkStruct_ov23_02244140 v4;
-    UnkStruct_020298B0 * v5 = sub_020298B0(sub_0203D174(Unk_ov23_02257764->unk_40));
+    UndergroundData * v5 = sub_020298B0(FieldSystem_SaveData(Unk_ov23_02257764->unk_40));
 
     v0 = CommPlayer_AddXServer(param0);
     v1 = sub_02058F18(param0);
@@ -1473,7 +1473,7 @@ static BOOL ov23_022442F0 (int param0)
 {
     UnkStruct_ov23_02244140 v0;
     UnkStruct_ov23_02243DA8 * v1;
-    UnkStruct_020298B0 * v2 = sub_020298B0(Unk_ov23_02257764->unk_40->unk_0C);
+    UndergroundData * v2 = sub_020298B0(Unk_ov23_02257764->unk_40->unk_0C);
 
     if (ov23_0224162C(param0)) {
         return 0;
@@ -1550,13 +1550,13 @@ BOOL ov23_02244470 (int param0)
 void ov23_0224448C (int param0, int param1, void * param2, void * param3)
 {
     UnkStruct_ov23_02244140 * v0 = (UnkStruct_ov23_02244140 *)param2;
-    UnkStruct_0202855C * v1;
+    SecretBaseRecord * v1;
 
     if (!Unk_ov23_02257764) {
         return;
     }
 
-    v1 = sub_020298A0(sub_0203D174(Unk_ov23_02257764->unk_40));
+    v1 = SaveData_SecretBaseRecord(FieldSystem_SaveData(Unk_ov23_02257764->unk_40));
 
     Sound_PlayEffect(1570);
     MI_CpuCopy8(v0, &Unk_ov23_02257764->unk_B28[v0->unk_07_0], sizeof(UnkStruct_ov23_02244140));
@@ -2554,7 +2554,7 @@ void ov23_02245560 (int param0, int param1)
 void ov23_022455B4 (int param0, int param1, void * param2, void * param3)
 {
     UnkStruct_ov23_02245560 * v0 = param2;
-    UnkStruct_0202855C * v1 = sub_020298A0(sub_0203D174(Unk_ov23_02257764->unk_40));
+    SecretBaseRecord * v1 = SaveData_SecretBaseRecord(FieldSystem_SaveData(Unk_ov23_02257764->unk_40));
 
     ov23_0224B024(v0->unk_01);
 
diff --git a/src/overlay023/ov23_02248C08.c b/src/overlay023/ov23_02248C08.c
index d8d1463591..f850097382 100644
--- a/src/overlay023/ov23_02248C08.c
+++ b/src/overlay023/ov23_02248C08.c
@@ -21,7 +21,7 @@
 #include "unk_0202854C.h"
 #include "overlay023/ov23_02248C08.h"
 
-UnkStruct_ov23_02248D20 * ov23_02248C08 (UnkStruct_ov84_02240FA8 * param0, u16 param1, u16 param2, u8 param3, UnkFuncPtr_ov23_02248D20 param4, UnkStruct_020298B0 * param5, BOOL param6)
+UnkStruct_ov23_02248D20 * ov23_02248C08 (UnkStruct_ov84_02240FA8 * param0, u16 param1, u16 param2, u8 param3, UnkFuncPtr_ov23_02248D20 param4, UndergroundData * param5, BOOL param6)
 {
     UnkStruct_ov23_02248D20 * v0 = (UnkStruct_ov23_02248D20 *)Heap_AllocFromHeap(param3, sizeof(UnkStruct_ov23_02248D20));
 
diff --git a/src/overlay023/ov23_022499E4.c b/src/overlay023/ov23_022499E4.c
index 20b367219d..78b71713db 100644
--- a/src/overlay023/ov23_022499E4.c
+++ b/src/overlay023/ov23_022499E4.c
@@ -72,7 +72,7 @@ void ov23_022499E8 (FieldSystem * param0)
         return;
     }
 
-    sub_02036794(sub_0203D174(param0));
+    sub_02036794(FieldSystem_SaveData(param0));
     FieldCommMan_Init(param0);
 
     v0 = FieldCommMan_Get();
diff --git a/src/overlay023/ov23_0224A1D0.c b/src/overlay023/ov23_0224A1D0.c
index 1f3073ba6c..87d7b1ce19 100644
--- a/src/overlay023/ov23_0224A1D0.c
+++ b/src/overlay023/ov23_0224A1D0.c
@@ -94,7 +94,7 @@ static void ov23_0224A204 (int param0)
             }
 
             v1->unk_27C[0] = v1->unk_290[param0];
-            sub_02028830(sub_020298B0(sub_0203D174(v1->fieldSys)), v1->unk_290[param0]);
+            sub_02028830(sub_020298B0(FieldSystem_SaveData(v1->fieldSys)), v1->unk_290[param0]);
 
             v1->unk_290[param0] = NULL;
             v1->unk_14A[param0].unk_20 = 0xff;
@@ -228,7 +228,7 @@ void ov23_0224A410 (int param0, int param1, void * param2, void * param3)
         v0->unk_58.unk_00_9 = 0;
 
         if (v0->unk_5A[v1->unk_02] == 0) {
-            sub_020294F4(sub_020298A0(sub_0203D174(v0->fieldSys)), v1->unk_02);
+            sub_020294F4(SaveData_SecretBaseRecord(FieldSystem_SaveData(v0->fieldSys)), v1->unk_02);
             sub_0206B364(v2, sub_0206B354(v2) + 1);
             sub_0206B384(v2, sub_0206B374(v2) + 1);
 
@@ -366,7 +366,7 @@ BOOL ov23_0224A6B8 (int param0)
     return 1;
 }
 
-static void ov23_0224A6E4 (UnkStruct_ov23_0224A570 * param0, BOOL param1, UnkStruct_0202855C * param2)
+static void ov23_0224A6E4 (UnkStruct_ov23_0224A570 * param0, BOOL param1, SecretBaseRecord * param2)
 {
     CommPlayer * v0 = CommPlayerData_Get();
 
@@ -396,7 +396,7 @@ void ov23_0224A77C (int param0, int param1, void * param2, void * param3)
     UnkStruct_ov23_0224A570 * v1 = param2;
     BOOL v2;
     int v3 = 0;
-    UnkStruct_0202855C * v4 = sub_020298A0(sub_0203D174(v0->fieldSys));
+    SecretBaseRecord * v4 = SaveData_SecretBaseRecord(FieldSystem_SaveData(v0->fieldSys));
 
     switch (v1->unk_00) {
     case 0:
@@ -470,7 +470,7 @@ void ov23_0224A77C (int param0, int param1, void * param2, void * param3)
         ov23_0224B040(v1->unk_01);
 
         if (v1->unk_01 == CommSys_CurNetId()) {
-            UnkStruct_0202855C * v5 = sub_020298A0(sub_0203D174(v0->fieldSys));
+            SecretBaseRecord * v5 = SaveData_SecretBaseRecord(FieldSystem_SaveData(v0->fieldSys));
             u8 v6 = sub_0202958C(v5);
 
             sub_020295C0(v5);
@@ -806,7 +806,7 @@ BOOL ov23_0224AEC4 (int param0, int param1)
             TrainerInfo_Copy(v1, (TrainerInfo *)&v0->unk_14A[param0].unk_00);
 
             if (param1 == CommSys_CurNetId()) {
-                UnkStruct_0202855C * v2 = sub_020298A0(v0->fieldSys->unk_0C);
+                SecretBaseRecord * v2 = SaveData_SecretBaseRecord(v0->fieldSys->unk_0C);
                 sub_020297B4(v2);
             }
 
diff --git a/src/overlay023/ov23_0224B05C.c b/src/overlay023/ov23_0224B05C.c
index 8b8102fe4f..60b42ff284 100644
--- a/src/overlay023/ov23_0224B05C.c
+++ b/src/overlay023/ov23_0224B05C.c
@@ -379,9 +379,9 @@ void ov23_0224B144 (void * param0, FieldSystem * param1)
 void ov23_0224B2C8 (FieldSystem * param0)
 {
     UnkStruct_02029894 * v0;
-    UnkStruct_0202855C * v1;
+    SecretBaseRecord * v1;
 
-    v0 = sub_02029894(sub_0203D174(param0));
+    v0 = sub_02029894(FieldSystem_SaveData(param0));
     v1 = sub_020298AC(v0);
 
     sub_020294D4(v1, sub_0202D034(sub_0202CD88(param0->unk_0C)));
@@ -1988,7 +1988,7 @@ static void ov23_0224CEC8 (void)
 void ov23_0224CF18 (int param0, int param1, void * param2, void * param3)
 {
     UnkStruct_ov23_0224CF18 * v0 = param2;
-    UnkStruct_0202855C * v1 = sub_020298A0(sub_0203D174(Unk_ov23_022577AC->unk_00));
+    SecretBaseRecord * v1 = SaveData_SecretBaseRecord(FieldSystem_SaveData(Unk_ov23_022577AC->unk_00));
 
     if (v0->unk_00 != CommSys_CurNetId()) {
         return;
@@ -2158,8 +2158,8 @@ BOOL ov23_0224D1A0 (int param0, int param1)
 
 static void ov23_0224D238 (void)
 {
-    UnkStruct_02029894 * v0 = sub_02029894(sub_0203D174(Unk_ov23_022577AC->unk_00));
-    UnkStruct_020298B0 * v1 = sub_020298B0(sub_0203D174(Unk_ov23_022577AC->unk_00));
+    UnkStruct_02029894 * v0 = sub_02029894(FieldSystem_SaveData(Unk_ov23_022577AC->unk_00));
+    UndergroundData * v1 = sub_020298B0(FieldSystem_SaveData(Unk_ov23_022577AC->unk_00));
     int v2 = CommPlayer_AddXServer(0);
     int v3 = sub_02058F18(0);
     int v4 = CommPlayer_DirServer(0);
@@ -2308,7 +2308,7 @@ void ov23_0224D4CC (int param0, int param1, void * param2, void * param3)
 {
     u8 * v0 = param2;
     UnkStruct_02029894 * v1 = (UnkStruct_02029894 *)Unk_ov23_022577AC->unk_A00->unk_02;
-    UnkStruct_0202855C * v2 = sub_020298AC(v1);
+    SecretBaseRecord * v2 = sub_020298AC(v1);
 
     if (v0[0] == CommSys_CurNetId()) {
         ov23_02253A00(v2, v0[1]);
diff --git a/src/overlay023/ov23_0224DC40.c b/src/overlay023/ov23_0224DC40.c
index ec65761ff3..1ab435b181 100644
--- a/src/overlay023/ov23_0224DC40.c
+++ b/src/overlay023/ov23_0224DC40.c
@@ -468,7 +468,7 @@ static void ov23_0224E124 (UnkStruct_ov23_0224E280 * param0)
     ov23_022540F4(ov23_0224219C(), param0->unk_28.unk_02);
     ov23_02253F40(ov23_0224219C(), 14, 0, NULL);
 
-    sub_0202952C(sub_020298A0(sub_0203D174(param0->unk_08)));
+    sub_0202952C(SaveData_SecretBaseRecord(FieldSystem_SaveData(param0->unk_08)));
     ov23_0224F634(param0->unk_28.unk_02);
     Sound_PlayEffect(1507);
 }
@@ -911,7 +911,7 @@ static void ov23_0224E93C (SysTask * param0, UnkStruct_ov23_022577B0 * param1)
 
     if (v0 == 0) {
         if (ov23_0224F744(param1->unk_24.unk_02)) {
-            sub_0202977C(sub_020298A0(sub_0203D174(param1->unk_04)));
+            sub_0202977C(SaveData_SecretBaseRecord(FieldSystem_SaveData(param1->unk_04)));
             Sound_PlayEffect(1507);
             ov23_0224DC40(param1, 22);
 
diff --git a/src/overlay023/ov23_0224F294.c b/src/overlay023/ov23_0224F294.c
index 070d4421c1..36827c982d 100644
--- a/src/overlay023/ov23_0224F294.c
+++ b/src/overlay023/ov23_0224F294.c
@@ -70,7 +70,7 @@
 typedef void (* UnkFuncPtr_ov23_0224FA58)(UnkStruct_ov23_02250CD4 *);
 
 typedef struct {
-    UnkStruct_020298B0 * unk_00;
+    UndergroundData * unk_00;
     u8 unk_04;
     u8 unk_05;
 } UnkStruct_ov23_022577B8;
@@ -285,7 +285,7 @@ static void ov23_0224F560 (GraphicElementData * param0)
     }
 }
 
-void ov23_0224F588 (UnkStruct_020298B0 * param0)
+void ov23_0224F588 (UndergroundData * param0)
 {
     Unk_ov23_022577B8 = Heap_AllocFromHeap(15, sizeof(UnkStruct_ov23_022577B8));
     MI_CpuClear8(Unk_ov23_022577B8, sizeof(UnkStruct_ov23_022577B8));
@@ -302,7 +302,7 @@ void ov23_0224F5B8 (void)
 static int ov23_0224F5C8 (void * param0)
 {
     UnkStruct_ov23_02250CD4 * v0 = param0;
-    UnkStruct_020298B0 * v1 = sub_020298B0(sub_0203D174(v0->unk_0C));
+    UndergroundData * v1 = sub_020298B0(FieldSystem_SaveData(v0->unk_0C));
 
     return sub_02028E28(v1);
 }
@@ -310,7 +310,7 @@ static int ov23_0224F5C8 (void * param0)
 static int ov23_0224F5DC (void * param0)
 {
     UnkStruct_ov23_02250CD4 * v0 = param0;
-    UnkStruct_020298B0 * v1 = sub_020298B0(sub_0203D174(v0->unk_0C));
+    UndergroundData * v1 = sub_020298B0(FieldSystem_SaveData(v0->unk_0C));
 
     return sub_020289A0(v1);
 }
@@ -318,7 +318,7 @@ static int ov23_0224F5DC (void * param0)
 int ov23_0224F5F0 (int param0, void * param1)
 {
     UnkStruct_ov23_02250CD4 * v0 = param1;
-    UnkStruct_020298B0 * v1 = sub_020298B0(sub_0203D174(v0->unk_0C));
+    UndergroundData * v1 = sub_020298B0(FieldSystem_SaveData(v0->unk_0C));
 
     return sub_020289B8(v1, param0);
 }
@@ -326,7 +326,7 @@ int ov23_0224F5F0 (int param0, void * param1)
 static int ov23_0224F608 (void * param0)
 {
     UnkStruct_ov23_02250CD4 * v0 = param0;
-    UnkStruct_020298B0 * v1 = sub_020298B0(sub_0203D174(v0->unk_0C));
+    UndergroundData * v1 = sub_020298B0(FieldSystem_SaveData(v0->unk_0C));
 
     return sub_02028B70(v1);
 }
@@ -334,7 +334,7 @@ static int ov23_0224F608 (void * param0)
 int ov23_0224F61C (int param0, void * param1)
 {
     UnkStruct_ov23_02250CD4 * v0 = param1;
-    UnkStruct_020298B0 * v1 = sub_020298B0(sub_0203D174(v0->unk_0C));
+    UndergroundData * v1 = sub_020298B0(FieldSystem_SaveData(v0->unk_0C));
 
     return sub_02028B88(v1, param0);
 }
@@ -348,7 +348,7 @@ void ov23_0224F634 (int param0)
 static int ov23_0224F658 (void * param0)
 {
     UnkStruct_ov23_02250CD4 * v0 = param0;
-    UnkStruct_020298B0 * v1 = sub_020298B0(sub_0203D174(v0->unk_0C));
+    UndergroundData * v1 = sub_020298B0(FieldSystem_SaveData(v0->unk_0C));
 
     return sub_02028C3C(v1);
 }
@@ -356,7 +356,7 @@ static int ov23_0224F658 (void * param0)
 int ov23_0224F66C (int param0, void * param1)
 {
     UnkStruct_ov23_02250CD4 * v0 = param1;
-    UnkStruct_020298B0 * v1 = sub_020298B0(sub_0203D174(v0->unk_0C));
+    UndergroundData * v1 = sub_020298B0(FieldSystem_SaveData(v0->unk_0C));
 
     return sub_02028E44(v1, param0);
 }
@@ -364,7 +364,7 @@ int ov23_0224F66C (int param0, void * param1)
 int ov23_0224F684 (int param0, void * param1)
 {
     UnkStruct_ov23_02250CD4 * v0 = param1;
-    UnkStruct_020298B0 * v1 = sub_020298B0(sub_0203D174(v0->unk_0C));
+    UndergroundData * v1 = sub_020298B0(FieldSystem_SaveData(v0->unk_0C));
 
     return sub_02028C54(v1, param0);
 }
@@ -372,7 +372,7 @@ int ov23_0224F684 (int param0, void * param1)
 int ov23_0224F69C (int param0, void * param1)
 {
     UnkStruct_ov23_02250CD4 * v0 = param1;
-    UnkStruct_020298B0 * v1 = sub_020298B0(sub_0203D174(v0->unk_0C));
+    UndergroundData * v1 = sub_020298B0(FieldSystem_SaveData(v0->unk_0C));
 
     return sub_02028C60(v1, param0);
 }
@@ -380,7 +380,7 @@ int ov23_0224F69C (int param0, void * param1)
 static int ov23_0224F6B4 (void * param0)
 {
     UnkStruct_ov23_02250CD4 * v0 = param0;
-    UnkStruct_020298B0 * v1 = sub_020298B0(sub_0203D174(v0->unk_0C));
+    UndergroundData * v1 = sub_020298B0(FieldSystem_SaveData(v0->unk_0C));
 
     return sub_02028D58(v1);
 }
@@ -388,7 +388,7 @@ static int ov23_0224F6B4 (void * param0)
 int ov23_0224F6C8 (int param0, void * param1)
 {
     UnkStruct_ov23_02250CD4 * v0 = param1;
-    UnkStruct_020298B0 * v1 = sub_020298B0(sub_0203D174(v0->unk_0C));
+    UndergroundData * v1 = sub_020298B0(FieldSystem_SaveData(v0->unk_0C));
 
     return sub_02028D74(v1, param0);
 }
@@ -498,7 +498,7 @@ static void ov23_0224F7F4 (UnkStruct_ov23_02250CD4 * param0)
 
         for (v4 = 0; v4 < NELEMS(Unk_ov23_02256924); v4++) {
             if (v4 == v1) {
-                const TrainerInfo * v5 = SaveData_GetTrainerInfo(sub_0203D174(param0->unk_0C));
+                const TrainerInfo * v5 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_0C));
                 Strbuf* v6 = TrainerInfo_NameNewStrbuf(v5, 4);
 
                 sub_02013A6C(param0->unk_40, v6, Unk_ov23_02256924[v4].unk_04);
@@ -1419,7 +1419,7 @@ static void ov23_02250A14 (UnkStruct_ov23_02250CD4 * param0)
 {
     ov23_0224FB7C(param0);
     ov23_02253968();
-    ov23_02253834(param0->unk_0C->unk_08, SaveData_GetTrainerInfo(sub_0203D174(param0->unk_0C)), ov23_02250A0C, param0, 1);
+    ov23_02253834(param0->unk_0C->unk_08, SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_0C)), ov23_02250A0C, param0, 1);
     param0->unk_2AA = 10;
 }
 
@@ -1561,7 +1561,7 @@ static void ov23_02250C74 (UnkStruct_0200112C * param0, u32 param1, u8 param2)
 {
     UnkStruct_ov23_02250CD4 * v0 = (UnkStruct_ov23_02250CD4 *)sub_02001504(param0, 19);
     int v1 = param1;
-    UnkStruct_020298B0 * v2 = sub_020298B0(sub_0203D174(v0->unk_0C));
+    UndergroundData * v2 = sub_020298B0(FieldSystem_SaveData(v0->unk_0C));
 
     if (!sub_02028AFC(v2, v1)) {
         sub_0200147C(param0, 1, 15, 2);
diff --git a/src/overlay023/ov23_0225128C.c b/src/overlay023/ov23_0225128C.c
index 0ebb3170c6..437fcc31bc 100644
--- a/src/overlay023/ov23_0225128C.c
+++ b/src/overlay023/ov23_0225128C.c
@@ -235,7 +235,7 @@ int ov23_02251414 (void)
 
 static BOOL ov23_02251418 (int param0, UnkStruct_ov23_02250CD4 * param1)
 {
-    UnkStruct_020298B0 * v0 = sub_020298B0(sub_0203D174(param1->unk_0C));
+    UndergroundData * v0 = sub_020298B0(FieldSystem_SaveData(param1->unk_0C));
     int v1;
 
     v1 = sub_02028B88(v0, param0);
@@ -250,7 +250,7 @@ static BOOL ov23_02251418 (int param0, UnkStruct_ov23_02250CD4 * param1)
 
 static int ov23_0225144C (int param0, UnkStruct_ov23_02250CD4 * param1)
 {
-    UnkStruct_020298B0 * v0 = sub_020298B0(sub_0203D174(param1->unk_0C));
+    UndergroundData * v0 = sub_020298B0(FieldSystem_SaveData(param1->unk_0C));
     int v1;
 
     if (sub_02028AFC(v0, param0)) {
@@ -312,7 +312,7 @@ static BOOL ov23_022514D8 (SysTask * param0, void * param1)
         break;
     case 0:
     {
-        UnkStruct_020298B0 * v4 = sub_020298B0(v0->unk_0C->unk_0C);
+        UndergroundData * v4 = sub_020298B0(v0->unk_0C->unk_0C);
 
         if (0 == sub_020289A0(v4)) {
             ov23_02253F40(ov23_022421BC(), 60, 0, NULL);
@@ -355,7 +355,7 @@ static void ov23_022515D8 (UnkStruct_ov23_02250CD4 * param0, int param1, int par
     int v1 = param2 + 1;
     BOOL v2 = 1;
 
-    if (3 > sub_0202958C(sub_020298A0(param0->unk_0C->unk_0C))) {
+    if (3 > sub_0202958C(SaveData_SecretBaseRecord(param0->unk_0C->unk_0C))) {
         v2 = 0;
         v1 -= 1;
     }
@@ -711,7 +711,7 @@ static void ov23_02251C04 (SysTask * param0, void * param1)
     case 6:
         ov23_0224FB7C(param1);
         ov23_02254044(ov23_022421BC());
-        v0->unk_270 = ov23_02253C64(v0->unk_0C->unk_08, SaveData_GetTrainerInfo(sub_0203D174(v0->unk_0C)), sub_020298B0(sub_0203D174(v0->unk_0C)), NULL, NULL);
+        v0->unk_270 = ov23_02253C64(v0->unk_0C->unk_08, SaveData_GetTrainerInfo(FieldSystem_SaveData(v0->unk_0C)), sub_020298B0(FieldSystem_SaveData(v0->unk_0C)), NULL, NULL);
         v0->unk_2AA = 7;
         break;
     case 7:
diff --git a/src/overlay023/ov23_022521F0.c b/src/overlay023/ov23_022521F0.c
index 7ae196c45b..da099e9dec 100644
--- a/src/overlay023/ov23_022521F0.c
+++ b/src/overlay023/ov23_022521F0.c
@@ -91,7 +91,7 @@ static void ov23_022521F0 (UnkStruct_ov23_02250CD4 * param0, int param1)
 {
     MATHRandContext16 v0;
     int v1, v2, v3, v4, v5;
-    UnkStruct_020298B0 * v6 = sub_020298B0(sub_0203D174(param0->unk_0C));
+    UndergroundData * v6 = sub_020298B0(FieldSystem_SaveData(param0->unk_0C));
 
     MATH_InitRand16(&v0, sub_02028930(v6) + param1);
 
@@ -136,8 +136,8 @@ static void ov23_022522F0 (UnkStruct_ov23_02250CD4 * param0, int param1)
 {
     MATHRandContext16 v0;
     int v1, v2, v3, v4, v5;
-    SaveData * v6 = sub_0203D174(param0->unk_0C);
-    UnkStruct_020298B0 * v7 = sub_020298B0(v6);
+    SaveData * v6 = FieldSystem_SaveData(param0->unk_0C);
+    UndergroundData * v7 = sub_020298B0(v6);
     BOOL v8 = sub_02027474(sub_02027560(v6));
 
     MATH_InitRand16(&v0, sub_02028930(v7) + param1);
@@ -181,7 +181,7 @@ static void ov23_022522F0 (UnkStruct_ov23_02250CD4 * param0, int param1)
 static int ov23_02252404 (UnkStruct_ov23_02250CD4 * param0, int param1, int param2)
 {
     BOOL v0 = 0;
-    UnkStruct_020298B0 * v1 = sub_020298B0(sub_0203D174(param0->unk_0C));
+    UndergroundData * v1 = sub_020298B0(FieldSystem_SaveData(param0->unk_0C));
 
     if (param0->unk_279[param1] != ov23_0224F684(param2, param0)) {
         return 0xfffd;
@@ -304,7 +304,7 @@ static void ov23_02252754 (UnkStruct_0200112C * param0, u32 param1, u8 param2)
 {
     MATHRandContext16 v0;
     UnkStruct_ov23_02250CD4 * v1 = (UnkStruct_ov23_02250CD4 *)sub_02001504(param0, 19);
-    UnkStruct_020298B0 * v2 = sub_020298B0(sub_0203D174(v1->unk_0C));
+    UndergroundData * v2 = sub_020298B0(FieldSystem_SaveData(v1->unk_0C));
     int v3 = param1, v4, v5;
     int v6, v7 = 0, v8;
 
@@ -479,7 +479,7 @@ static void ov23_02252BB8 (int param0, UnkStruct_ov23_02250CD4 * param1)
 
 static u32 ov23_02252C08 (UnkStruct_ov23_02250CD4 * param0)
 {
-    UnkStruct_020298B0 * v0 = sub_020298B0(sub_0203D174(param0->unk_0C));
+    UndergroundData * v0 = sub_020298B0(FieldSystem_SaveData(param0->unk_0C));
 
     if (ov23_0224F6E0(param0->unk_279[0], param0->unk_27E[0])) {
         if (param0->unk_2AC == 1) {
diff --git a/src/overlay023/ov23_02253598.c b/src/overlay023/ov23_02253598.c
index 1a5674b086..fc53824c87 100644
--- a/src/overlay023/ov23_02253598.c
+++ b/src/overlay023/ov23_02253598.c
@@ -40,7 +40,7 @@
 #include "overlay023/ov23_02253598.h"
 #include "overlay023/ov23_02253D40.h"
 
-typedef int (* UnkFuncPtr_ov23_022576EC)(const UnkStruct_0202855C *);
+typedef int (* UnkFuncPtr_ov23_022576EC)(const SecretBaseRecord *);
 
 typedef struct {
     UnkFuncPtr_ov23_02253834 unk_00;
@@ -57,8 +57,8 @@ typedef struct UnkStruct_ov23_02253598_t {
     UnkStruct_ov23_022537D4 * unk_00;
     SysTask * unk_04;
     SaveData * unk_08;
-    UnkStruct_0202855C * unk_0C;
-    UnkStruct_0202855C * unk_10;
+    SecretBaseRecord * unk_0C;
+    SecretBaseRecord * unk_10;
     MATHRandContext32 unk_14;
     u8 unk_2C;
 };
@@ -66,7 +66,7 @@ typedef struct UnkStruct_ov23_02253598_t {
 static UnkStruct_ov23_02253598 * Unk_ov23_022577BC = NULL;
 static void ov23_022537D4(SysTask * param0, void * param1);
 
-void ov23_02253598 (UnkStruct_ov23_02253598 * param0, UnkStruct_0202855C * param1, SaveData * param2)
+void ov23_02253598 (UnkStruct_ov23_02253598 * param0, SecretBaseRecord * param1, SaveData * param2)
 {
     MI_CpuFill8(param0, 0, sizeof(UnkStruct_ov23_02253598));
 
@@ -120,7 +120,7 @@ static UnkFuncPtr_ov23_022576EC Unk_ov23_022576EC[] = {
     sub_020295B8
 };
 
-asm static void ov23_0225360C (Window * param0, MessageLoader * param1, TrainerInfo * param2, const UnkStruct_0202855C * param3)
+asm static void ov23_0225360C (Window * param0, MessageLoader * param1, TrainerInfo * param2, const SecretBaseRecord * param3)
 {
     push {r3, r4, r5, r6, r7, lr}
     sub sp, #0x20
@@ -356,7 +356,7 @@ static void ov23_0225381C (SysTask * param0, void * param1)
 
 void ov23_02253834 (BGL * param0, TrainerInfo * param1, UnkFuncPtr_ov23_02253834 param2, void * param3, BOOL param4)
 {
-    UnkStruct_0202855C * v0;
+    SecretBaseRecord * v0;
     MessageLoader * v1;
     UnkStruct_ov84_02240FA8 v2;
     int v3 = 10;
@@ -452,10 +452,10 @@ static void ov23_022539F8 (int param0)
     sub_02059514();
 }
 
-void ov23_02253A00 (UnkStruct_0202855C * param0, int param1)
+void ov23_02253A00 (SecretBaseRecord * param0, int param1)
 {
     s32 v0;
-    UnkStruct_0202855C * v1;
+    SecretBaseRecord * v1;
     UnkFuncPtr_ov23_022576EC v2 = Unk_ov23_022576EC[param1 - 32];
 
     GF_ASSERT(param1 >= 32);
@@ -474,7 +474,7 @@ void ov23_02253A00 (UnkStruct_0202855C * param0, int param1)
     ov23_02253F40(ov23_022421BC(), param1, 1, ov23_022539F8);
 }
 
-static void ov23_02253A78 (Window * param0, MessageLoader * param1, TrainerInfo * param2, const UnkStruct_0202855C * param3, const UnkStruct_020298B0 * param4)
+static void ov23_02253A78 (Window * param0, MessageLoader * param1, TrainerInfo * param2, const SecretBaseRecord * param3, const UndergroundData * param4)
 {
     StringFormatter * v0;
     Strbuf* v1;
@@ -537,9 +537,9 @@ static void ov23_02253A78 (Window * param0, MessageLoader * param1, TrainerInfo
     sub_0200B3F0(v0);
 }
 
-void * ov23_02253C64 (BGL * param0, TrainerInfo * param1, UnkStruct_020298B0 * param2, UnkFuncPtr_ov23_02253834 param3, void * param4)
+void * ov23_02253C64 (BGL * param0, TrainerInfo * param1, UndergroundData * param2, UnkFuncPtr_ov23_02253834 param3, void * param4)
 {
-    UnkStruct_0202855C * v0;
+    SecretBaseRecord * v0;
     MessageLoader * v1;
     UnkStruct_ov84_02240FA8 v2;
     int v3 = 10;
diff --git a/src/overlay023/ov23_022542CC.c b/src/overlay023/ov23_022542CC.c
index 4c0263df0d..b64007b03e 100644
--- a/src/overlay023/ov23_022542CC.c
+++ b/src/overlay023/ov23_022542CC.c
@@ -368,11 +368,11 @@ static void ov23_0225461C (UnkStruct_ov23_02254594 * param0)
 static void ov23_022546A0 (UnkStruct_0200112C * param0, u32 param1, u8 param2)
 {
     int v0;
-    UnkStruct_020298B0 * v1;
+    UndergroundData * v1;
     u32 v2;
     u32 v3;
 
-    v1 = (UnkStruct_020298B0 *)sub_02001504(param0, 19);
+    v1 = (UndergroundData *)sub_02001504(param0, 19);
     v3 = sub_02001504(param0, 2);
     v2 = (param1 >> 1);
 
@@ -388,7 +388,7 @@ static void ov23_022546A0 (UnkStruct_0200112C * param0, u32 param1, u8 param2)
 
 static void ov23_022546E0 (UnkStruct_ov23_02254594 * param0)
 {
-    UnkStruct_020298B0 * v0;
+    UndergroundData * v0;
     UnkStruct_ov84_02240FA8 v1;
     int v2, v3;
     int v4;
diff --git a/src/overlay023/ov23_02254A14.c b/src/overlay023/ov23_02254A14.c
index 6966d3a6ab..8f4f221458 100644
--- a/src/overlay023/ov23_02254A14.c
+++ b/src/overlay023/ov23_02254A14.c
@@ -286,7 +286,7 @@ static BOOL ov23_02254C84 (UnkStruct_020508D4 * param0)
         switch (ov23_02254314(v2->unk_504)) {
         case 0:
         {
-            UnkStruct_020298B0 * v3;
+            UndergroundData * v3;
             int v4;
 
             v3 = sub_020298B0(v1->unk_0C);
@@ -369,7 +369,7 @@ static BOOL ov23_02254DF8 (UnkStruct_020508D4 * param0)
         if (v7) {
             u32 v8;
             int v9;
-            UnkStruct_020298B0 * v10;
+            UndergroundData * v10;
 
             v10 = sub_020298B0(v6->unk_500->unk_0C);
             v8 = ov23_022545D8(v6->unk_508);
@@ -473,7 +473,7 @@ static BOOL ov23_02254DF8 (UnkStruct_020508D4 * param0)
             if (v15) {
                 u32 v16;
                 int v17;
-                UnkStruct_020298B0 * v18;
+                UndergroundData * v18;
 
                 v18 = sub_020298B0(v6->unk_500->unk_0C);
                 v17 = ov23_02255B78(&v6->unk_3C, v6->unk_5C);
@@ -671,7 +671,7 @@ static BOOL ov23_02255100 (UnkStruct_020508D4 * param0)
                             v7->unk_04 = 2;
                         }
                     } else {
-                        UnkStruct_020298B0 * v17;
+                        UndergroundData * v17;
 
                         v17 = sub_020298B0(v7->unk_500->unk_0C);
 
diff --git a/src/overlay118/ov118_021D0D80.c b/src/overlay118/ov118_021D0D80.c
index c6b753c408..6481bebffa 100644
--- a/src/overlay118/ov118_021D0D80.c
+++ b/src/overlay118/ov118_021D0D80.c
@@ -97,7 +97,7 @@ int ov118_021D0DBC (GameWindowLayout * param0)
             break;
         }
 
-        sub_0202736C(sub_02027560(sub_0203D174(param0->unk_5A4->unk_1C)), v1);
+        sub_0202736C(sub_02027560(FieldSystem_SaveData(param0->unk_5A4->unk_1C)), v1);
     }
         v0->unk_00++;
         break;
diff --git a/src/unk_0202854C.c b/src/unk_0202854C.c
index 388d3d5cb7..6a8149b031 100644
--- a/src/unk_0202854C.c
+++ b/src/unk_0202854C.c
@@ -19,7 +19,7 @@
 #include "trainer_info.h"
 #include "unk_0202854C.h"
 
-static void sub_02028B48(UnkStruct_020298B0 * param0, int param1, int param2);
+static void sub_02028B48(UndergroundData * param0, int param1, int param2);
 
 u16 Unk_02100920[] = {
     0x6E,
@@ -75,7 +75,7 @@ u16 Unk_02100920[] = {
 
 int Underground_SaveSize (void)
 {
-    return sizeof(UnkStruct_020298B0);
+    return sizeof(UndergroundData);
 }
 
 int sub_02028554 (void)
@@ -85,19 +85,19 @@ int sub_02028554 (void)
 
 int sub_02028558 (void)
 {
-    return sizeof(UnkStruct_0202855C);
+    return sizeof(SecretBaseRecord);
 }
 
-UnkStruct_0202855C * sub_0202855C (u32 param0)
+SecretBaseRecord * sub_0202855C (u32 param0)
 {
-    UnkStruct_0202855C * v0;
+    SecretBaseRecord * v0;
 
-    v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_0202855C));
-    MI_CpuFill8(v0, 0, sizeof(UnkStruct_0202855C));
+    v0 = Heap_AllocFromHeap(param0, sizeof(SecretBaseRecord));
+    MI_CpuFill8(v0, 0, sizeof(SecretBaseRecord));
     return v0;
 }
 
-void Underground_Init (UnkStruct_020298B0 * param0)
+void Underground_Init (UndergroundData * param0)
 {
     u32 v0 = 0;
     RTCDate v1;
@@ -106,13 +106,13 @@ void Underground_Init (UnkStruct_020298B0 * param0)
     GetCurrentDateTime(&v1, &v2);
     v0 = (((((((u32)v1.year * 32ULL + v1.month) * 32ULL) + v1.day) * 32ULL + v2.hour) * 32ULL + v2.minute) * 32ULL + (v2.second + gCoreSys.frameCounter));
 
-    MI_CpuFill8(param0, 0, sizeof(UnkStruct_020298B0));
+    MI_CpuFill8(param0, 0, sizeof(UndergroundData));
 
     param0->unk_90 = v0;
     param0->unk_9AC_0 = 1;
 }
 
-static int sub_020285D8 (UnkStruct_020298B0 * param0)
+static int sub_020285D8 (UndergroundData * param0)
 {
     int v0;
 
@@ -125,7 +125,7 @@ static int sub_020285D8 (UnkStruct_020298B0 * param0)
     return -1;
 }
 
-static int sub_020285F8 (UnkStruct_020298B0 * param0)
+static int sub_020285F8 (UndergroundData * param0)
 {
     int v0;
 
@@ -138,7 +138,7 @@ static int sub_020285F8 (UnkStruct_020298B0 * param0)
     return -1;
 }
 
-static int sub_02028618 (UnkStruct_020298B0 * param0)
+static int sub_02028618 (UndergroundData * param0)
 {
     int v0;
 
@@ -151,7 +151,7 @@ static int sub_02028618 (UnkStruct_020298B0 * param0)
     return -1;
 }
 
-static int sub_02028638 (UnkStruct_020298B0 * param0)
+static int sub_02028638 (UndergroundData * param0)
 {
     int v0;
 
@@ -166,7 +166,7 @@ static int sub_02028638 (UnkStruct_020298B0 * param0)
 
 void sub_02028658 (SaveData * param0, int param1)
 {
-    UnkStruct_020298B0 * v0 = sub_020298B0(param0);
+    UndergroundData * v0 = sub_020298B0(param0);
     MATHRandContext16 v1;
     u8 v2[] = {0, 2, 2, 4, 4, 5};
     u8 v3[] = {0, 1, 1, 3, 3, 5};
@@ -205,7 +205,7 @@ void sub_02028658 (SaveData * param0, int param1)
 
 void sub_02028758 (SaveData * param0, s32 param1, BOOL param2)
 {
-    UnkStruct_020298B0 * v0 = sub_020298B0(param0);
+    UndergroundData * v0 = sub_020298B0(param0);
 
     if ((param1 < 0) || (param2)) {
         return;
@@ -220,7 +220,7 @@ void sub_02028758 (SaveData * param0, s32 param1, BOOL param2)
 
 void sub_0202878C (SaveData * param0)
 {
-    UnkStruct_020298B0 * v0 = sub_020298B0(param0);
+    UndergroundData * v0 = sub_020298B0(param0);
 
     if ((v0->unk_94 == 0) && (v0->unk_98 == 2)) {
         v0->unk_98 = 0;
@@ -237,7 +237,7 @@ void sub_0202878C (SaveData * param0)
 
 void sub_020287E0 (SaveData * param0)
 {
-    UnkStruct_020298B0 * v0 = sub_020298B0(param0);
+    UndergroundData * v0 = sub_020298B0(param0);
 
     if (v0->unk_98 == 0) {
         v0->unk_98 = 1;
@@ -246,7 +246,7 @@ void sub_020287E0 (SaveData * param0)
 
 void sub_020287F8 (SaveData * param0)
 {
-    UnkStruct_020298B0 * v0 = sub_020298B0(param0);
+    UndergroundData * v0 = sub_020298B0(param0);
 
     if (v0->unk_98 == 1) {
         v0->unk_98 = 0;
@@ -255,7 +255,7 @@ void sub_020287F8 (SaveData * param0)
 
 BOOL sub_02028810 (SaveData * param0)
 {
-    UnkStruct_020298B0 * v0 = sub_020298B0(param0);
+    UndergroundData * v0 = sub_020298B0(param0);
 
     if (v0->unk_98 == 2) {
         return 0;
@@ -264,12 +264,12 @@ BOOL sub_02028810 (SaveData * param0)
     return 1;
 }
 
-void sub_02028828 (UnkStruct_020298B0 * param0)
+void sub_02028828 (UndergroundData * param0)
 {
     param0->unk_99 = 1;
 }
 
-void sub_02028830 (UnkStruct_020298B0 * param0, const TrainerInfo * param1)
+void sub_02028830 (UndergroundData * param0, const TrainerInfo * param1)
 {
     int v0 = param0->unk_10A;
     int v1;
@@ -293,7 +293,7 @@ void sub_02028830 (UnkStruct_020298B0 * param0, const TrainerInfo * param1)
     }
 }
 
-TrainerInfo * sub_020288C8 (const UnkStruct_020298B0 * param0, int param1, int param2)
+TrainerInfo * sub_020288C8 (const UndergroundData * param0, int param1, int param2)
 {
     int v0 = (sizeof(u16) * (7 + 1));
     int v1;
@@ -318,7 +318,7 @@ TrainerInfo * sub_020288C8 (const UnkStruct_020298B0 * param0, int param1, int p
     return NULL;
 }
 
-u32 sub_02028930 (UnkStruct_020298B0 * param0)
+u32 sub_02028930 (UndergroundData * param0)
 {
     return param0->unk_90;
 }
@@ -332,7 +332,7 @@ int sub_02028938 (int param0)
     return Unk_02100920[param0];
 }
 
-BOOL sub_0202895C (UnkStruct_020298B0 * param0, int param1)
+BOOL sub_0202895C (UndergroundData * param0, int param1)
 {
     int v0;
     BOOL v1 = 0;
@@ -348,7 +348,7 @@ BOOL sub_0202895C (UnkStruct_020298B0 * param0, int param1)
     return v1;
 }
 
-BOOL sub_02028984 (UnkStruct_020298B0 * param0, int param1)
+BOOL sub_02028984 (UndergroundData * param0, int param1)
 {
     int v0;
 
@@ -361,7 +361,7 @@ BOOL sub_02028984 (UnkStruct_020298B0 * param0, int param1)
     return 0;
 }
 
-int sub_020289A0 (UnkStruct_020298B0 * param0)
+int sub_020289A0 (UndergroundData * param0)
 {
     int v0;
 
@@ -374,12 +374,12 @@ int sub_020289A0 (UnkStruct_020298B0 * param0)
     return v0;
 }
 
-int sub_020289B8 (UnkStruct_020298B0 * param0, int param1)
+int sub_020289B8 (UndergroundData * param0, int param1)
 {
     return param0->unk_80C[param1];
 }
 
-int sub_020289C4 (UnkStruct_020298B0 * param0, int param1)
+int sub_020289C4 (UndergroundData * param0, int param1)
 {
     int v0, v1, v2;
 
@@ -398,7 +398,7 @@ int sub_020289C4 (UnkStruct_020298B0 * param0, int param1)
     return v2;
 }
 
-void sub_02028A10 (UnkStruct_020298B0 * param0, int param1, int param2)
+void sub_02028A10 (UndergroundData * param0, int param1, int param2)
 {
     int v0, v1 = 0, v2 = 0, v3 = -1;
     u8 v4[200];
@@ -436,7 +436,7 @@ void sub_02028A10 (UnkStruct_020298B0 * param0, int param1, int param2)
     }
 }
 
-int sub_02028ACC (UnkStruct_020298B0 * param0, int param1, int param2)
+int sub_02028ACC (UndergroundData * param0, int param1, int param2)
 {
     int v0, v1;
 
@@ -447,7 +447,7 @@ int sub_02028ACC (UnkStruct_020298B0 * param0, int param1, int param2)
     return param0->unk_80C[param1];
 }
 
-BOOL sub_02028AFC (UnkStruct_020298B0 * param0, int param1)
+BOOL sub_02028AFC (UndergroundData * param0, int param1)
 {
     int v0;
 
@@ -460,7 +460,7 @@ BOOL sub_02028AFC (UnkStruct_020298B0 * param0, int param1)
     return 0;
 }
 
-void sub_02028B20 (UnkStruct_020298B0 * param0, int param1)
+void sub_02028B20 (UndergroundData * param0, int param1)
 {
     if ((param1 - 1) >= 15) {
         return;
@@ -469,12 +469,12 @@ void sub_02028B20 (UnkStruct_020298B0 * param0, int param1)
     param0->unk_99C[param1 - 1] = 0;
 }
 
-void sub_02028B34 (UnkStruct_020298B0 * param0)
+void sub_02028B34 (UndergroundData * param0)
 {
     MI_CpuFill8(param0->unk_99C, 0, 15);
 }
 
-static void sub_02028B48 (UnkStruct_020298B0 * param0, int param1, int param2)
+static void sub_02028B48 (UndergroundData * param0, int param1, int param2)
 {
     int v0;
 
@@ -485,7 +485,7 @@ static void sub_02028B48 (UnkStruct_020298B0 * param0, int param1, int param2)
     }
 }
 
-int sub_02028B70 (UnkStruct_020298B0 * param0)
+int sub_02028B70 (UndergroundData * param0)
 {
     int v0;
 
@@ -498,12 +498,12 @@ int sub_02028B70 (UnkStruct_020298B0 * param0)
     return v0;
 }
 
-int sub_02028B88 (UnkStruct_020298B0 * param0, int param1)
+int sub_02028B88 (UndergroundData * param0, int param1)
 {
     return param0->unk_8FC[param1];
 }
 
-int sub_02028B94 (UnkStruct_020298B0 * param0, int param1)
+int sub_02028B94 (UndergroundData * param0, int param1)
 {
     int v0, v1, v2;
 
@@ -518,7 +518,7 @@ int sub_02028B94 (UnkStruct_020298B0 * param0, int param1)
     return v2;
 }
 
-BOOL sub_02028BC8 (UnkStruct_020298B0 * param0, int param1)
+BOOL sub_02028BC8 (UndergroundData * param0, int param1)
 {
     int v0;
     BOOL v1 = 0;
@@ -533,7 +533,7 @@ BOOL sub_02028BC8 (UnkStruct_020298B0 * param0, int param1)
     return v1;
 }
 
-void sub_02028BE8 (UnkStruct_020298B0 * param0, int param1, int param2)
+void sub_02028BE8 (UndergroundData * param0, int param1, int param2)
 {
     int v0, v1 = 0, v2 = 0;
     u8 v3[40];
@@ -553,7 +553,7 @@ void sub_02028BE8 (UnkStruct_020298B0 * param0, int param1, int param2)
     }
 }
 
-int sub_02028C3C (UnkStruct_020298B0 * param0)
+int sub_02028C3C (UndergroundData * param0)
 {
     int v0;
 
@@ -566,17 +566,17 @@ int sub_02028C3C (UnkStruct_020298B0 * param0)
     return v0;
 }
 
-int sub_02028C54 (UnkStruct_020298B0 * param0, int param1)
+int sub_02028C54 (UndergroundData * param0, int param1)
 {
     return param0->unk_94C[param1];
 }
 
-int sub_02028C60 (UnkStruct_020298B0 * param0, int param1)
+int sub_02028C60 (UndergroundData * param0, int param1)
 {
     return param0->unk_974[param1];
 }
 
-int sub_02028C6C (UnkStruct_020298B0 * param0, int param1)
+int sub_02028C6C (UndergroundData * param0, int param1)
 {
     int v0, v1, v2;
 
@@ -593,7 +593,7 @@ int sub_02028C6C (UnkStruct_020298B0 * param0, int param1)
     return v2;
 }
 
-BOOL sub_02028CB0 (UnkStruct_020298B0 * param0, int param1, int param2)
+BOOL sub_02028CB0 (UndergroundData * param0, int param1, int param2)
 {
     int v0;
     BOOL v1 = 0;
@@ -609,7 +609,7 @@ BOOL sub_02028CB0 (UnkStruct_020298B0 * param0, int param1, int param2)
     return v1;
 }
 
-void sub_02028CD8 (UnkStruct_020298B0 * param0, int param1, int param2)
+void sub_02028CD8 (UndergroundData * param0, int param1, int param2)
 {
     int v0, v1 = 0, v2 = 0;
     u8 v3[40];
@@ -633,7 +633,7 @@ void sub_02028CD8 (UnkStruct_020298B0 * param0, int param1, int param2)
     }
 }
 
-int sub_02028D58 (UnkStruct_020298B0 * param0)
+int sub_02028D58 (UndergroundData * param0)
 {
     int v0;
 
@@ -646,12 +646,12 @@ int sub_02028D58 (UnkStruct_020298B0 * param0)
     return v0;
 }
 
-int sub_02028D74 (UnkStruct_020298B0 * param0, int param1)
+int sub_02028D74 (UndergroundData * param0, int param1)
 {
     return param0->unk_924[param1];
 }
 
-int sub_02028D80 (UnkStruct_020298B0 * param0, int param1)
+int sub_02028D80 (UndergroundData * param0, int param1)
 {
     int v0, v1, v2;
 
@@ -667,7 +667,7 @@ int sub_02028D80 (UnkStruct_020298B0 * param0, int param1)
     return v2;
 }
 
-BOOL sub_02028DB4 (UnkStruct_020298B0 * param0, int param1)
+BOOL sub_02028DB4 (UndergroundData * param0, int param1)
 {
     int v0;
     BOOL v1 = 0;
@@ -682,7 +682,7 @@ BOOL sub_02028DB4 (UnkStruct_020298B0 * param0, int param1)
     return v1;
 }
 
-void sub_02028DD8 (UnkStruct_020298B0 * param0, int param1, int param2)
+void sub_02028DD8 (UndergroundData * param0, int param1, int param2)
 {
     int v0, v1 = 0, v2 = 0;
     u8 v3[40];
@@ -702,7 +702,7 @@ void sub_02028DD8 (UnkStruct_020298B0 * param0, int param1, int param2)
     }
 }
 
-int sub_02028E28 (UnkStruct_020298B0 * param0)
+int sub_02028E28 (UndergroundData * param0)
 {
     int v0;
 
@@ -715,14 +715,14 @@ int sub_02028E28 (UnkStruct_020298B0 * param0)
     return v0;
 }
 
-int sub_02028E44 (UnkStruct_020298B0 * param0, int param1)
+int sub_02028E44 (UndergroundData * param0, int param1)
 {
     int v0;
 
     return param0->unk_8D4[param1];
 }
 
-int sub_02028E50 (UnkStruct_020298B0 * param0, int param1)
+int sub_02028E50 (UndergroundData * param0, int param1)
 {
     int v0, v1, v2;
 
@@ -738,7 +738,7 @@ int sub_02028E50 (UnkStruct_020298B0 * param0, int param1)
     return v2;
 }
 
-BOOL sub_02028E84 (UnkStruct_020298B0 * param0, int param1)
+BOOL sub_02028E84 (UndergroundData * param0, int param1)
 {
     int v0;
     BOOL v1 = 0;
@@ -753,7 +753,7 @@ BOOL sub_02028E84 (UnkStruct_020298B0 * param0, int param1)
     return v1;
 }
 
-void sub_02028EA8 (UnkStruct_020298B0 * param0, int param1, int param2)
+void sub_02028EA8 (UndergroundData * param0, int param1, int param2)
 {
     int v0, v1 = 0, v2 = 0;
     u8 v3[40];
@@ -773,7 +773,7 @@ void sub_02028EA8 (UnkStruct_020298B0 * param0, int param1, int param2)
     }
 }
 
-void sub_02028EF8 (UnkStruct_020298B0 * param0, int param1, int param2, int param3, int param4)
+void sub_02028EF8 (UndergroundData * param0, int param1, int param2, int param3, int param4)
 {
     GF_ASSERT(param2 < (16 * 4));
 
@@ -783,13 +783,13 @@ void sub_02028EF8 (UnkStruct_020298B0 * param0, int param1, int param2, int para
     param0->unk_14B[param2][2] = param4;
 }
 
-int sub_02028F40 (UnkStruct_020298B0 * param0, int param1)
+int sub_02028F40 (UndergroundData * param0, int param1)
 {
     GF_ASSERT(param1 < (16 * 4));
     return param0->unk_10B[param1];
 }
 
-int sub_02028F5C (UnkStruct_020298B0 * param0, int param1)
+int sub_02028F5C (UndergroundData * param0, int param1)
 {
     int v0;
 
@@ -801,7 +801,7 @@ int sub_02028F5C (UnkStruct_020298B0 * param0, int param1)
     return v0;
 }
 
-int sub_02028F88 (UnkStruct_020298B0 * param0, int param1)
+int sub_02028F88 (UndergroundData * param0, int param1)
 {
     int v0;
 
@@ -813,7 +813,7 @@ int sub_02028F88 (UnkStruct_020298B0 * param0, int param1)
     return v0;
 }
 
-void sub_02028FB4 (UnkStruct_020298B0 * param0, int param1)
+void sub_02028FB4 (UndergroundData * param0, int param1)
 {
     GF_ASSERT(param1 < (16 * 4));
 
@@ -821,7 +821,7 @@ void sub_02028FB4 (UnkStruct_020298B0 * param0, int param1)
     MI_CpuClear8(param0->unk_14B[param1], 3);
 }
 
-void sub_02028FE0 (UnkStruct_020298B0 * param0, int param1, int param2, int param3, int param4, int param5)
+void sub_02028FE0 (UndergroundData * param0, int param1, int param2, int param3, int param4, int param5)
 {
     GF_ASSERT(param2 < 16);
 
@@ -832,12 +832,12 @@ void sub_02028FE0 (UnkStruct_020298B0 * param0, int param1, int param2, int para
     param0->unk_548[param2] = param5;
 }
 
-int sub_02029030 (UnkStruct_020298B0 * param0, int param1)
+int sub_02029030 (UndergroundData * param0, int param1)
 {
     return param0->unk_508[param1];
 }
 
-int sub_0202903C (UnkStruct_020298B0 * param0, int param1)
+int sub_0202903C (UndergroundData * param0, int param1)
 {
     int v0 = param0->unk_518[param1][0];
 
@@ -845,7 +845,7 @@ int sub_0202903C (UnkStruct_020298B0 * param0, int param1)
     return v0;
 }
 
-int sub_0202905C (UnkStruct_020298B0 * param0, int param1)
+int sub_0202905C (UndergroundData * param0, int param1)
 {
     int v0 = param0->unk_518[param1][2];
 
@@ -853,12 +853,12 @@ int sub_0202905C (UnkStruct_020298B0 * param0, int param1)
     return v0;
 }
 
-int sub_0202907C (UnkStruct_020298B0 * param0, int param1)
+int sub_0202907C (UndergroundData * param0, int param1)
 {
     return param0->unk_548[param1];
 }
 
-void sub_02029088 (UnkStruct_020298B0 * param0, int param1, int param2, int param3, int param4, int param5, int param6)
+void sub_02029088 (UndergroundData * param0, int param1, int param2, int param3, int param4, int param5, int param6)
 {
     GF_ASSERT(param2 < 100);
 
@@ -870,12 +870,12 @@ void sub_02029088 (UnkStruct_020298B0 * param0, int param1, int param2, int para
     param0->unk_5BC[param2] = param6;
 }
 
-int sub_020290DC (UnkStruct_020298B0 * param0, int param1)
+int sub_020290DC (UndergroundData * param0, int param1)
 {
     return param0->unk_558[param1];
 }
 
-int sub_020290E8 (UnkStruct_020298B0 * param0, int param1)
+int sub_020290E8 (UndergroundData * param0, int param1)
 {
     int v0 = param0->unk_684[param1][0];
 
@@ -883,7 +883,7 @@ int sub_020290E8 (UnkStruct_020298B0 * param0, int param1)
     return v0;
 }
 
-int sub_02029108 (UnkStruct_020298B0 * param0, int param1)
+int sub_02029108 (UndergroundData * param0, int param1)
 {
     int v0 = param0->unk_684[param1][2];
 
@@ -891,17 +891,17 @@ int sub_02029108 (UnkStruct_020298B0 * param0, int param1)
     return v0;
 }
 
-int sub_02029128 (UnkStruct_020298B0 * param0, int param1)
+int sub_02029128 (UndergroundData * param0, int param1)
 {
     return param0->unk_620[param1];
 }
 
-int sub_02029134 (UnkStruct_020298B0 * param0, int param1)
+int sub_02029134 (UndergroundData * param0, int param1)
 {
     return param0->unk_5BC[param1];
 }
 
-int sub_02029140 (UnkStruct_020298B0 * param0, int param1, int param2)
+int sub_02029140 (UndergroundData * param0, int param1, int param2)
 {
     int v0;
 
@@ -921,13 +921,13 @@ int sub_02029140 (UnkStruct_020298B0 * param0, int param1, int param2)
     return v0;
 }
 
-void sub_020291A4 (UnkStruct_020298B0 * param0, int param1)
+void sub_020291A4 (UndergroundData * param0, int param1)
 {
     GF_ASSERT(param1 < 255);
     MI_CpuFill8(param0->unk_20B[param1], 0, 3);
 }
 
-int sub_020291CC (UnkStruct_020298B0 * param0, int param1)
+int sub_020291CC (UndergroundData * param0, int param1)
 {
     int v0 = param0->unk_20B[param1][0];
 
@@ -935,7 +935,7 @@ int sub_020291CC (UnkStruct_020298B0 * param0, int param1)
     return v0;
 }
 
-int sub_020291EC (UnkStruct_020298B0 * param0, int param1)
+int sub_020291EC (UndergroundData * param0, int param1)
 {
     int v0 = param0->unk_20B[param1][2];
 
@@ -943,27 +943,27 @@ int sub_020291EC (UnkStruct_020298B0 * param0, int param1)
     return v0;
 }
 
-BOOL sub_0202920C (UnkStruct_020298B0 * param0)
+BOOL sub_0202920C (UndergroundData * param0)
 {
     return param0->unk_9AC_4 == 0;
 }
 
-void sub_02029220 (UnkStruct_020298B0 * param0)
+void sub_02029220 (UndergroundData * param0)
 {
     param0->unk_9AC_4 = 1;
 }
 
-BOOL sub_02029234 (UnkStruct_020298B0 * param0)
+BOOL sub_02029234 (UndergroundData * param0)
 {
     return param0->unk_9AC_0;
 }
 
-void sub_02029240 (UnkStruct_020298B0 * param0)
+void sub_02029240 (UndergroundData * param0)
 {
     param0->unk_9AC_0 = 0;
 }
 
-void sub_02029250 (UnkStruct_020298B0 * param0, int param1)
+void sub_02029250 (UndergroundData * param0, int param1)
 {
     if ((44 > param1) || (param1 > 59)) {
         return;
@@ -972,7 +972,7 @@ void sub_02029250 (UnkStruct_020298B0 * param0, int param1)
     param0->unk_808 |= (0x1 << (param1 - 44));
 }
 
-BOOL sub_02029274 (UnkStruct_020298B0 * param0, int param1)
+BOOL sub_02029274 (UndergroundData * param0, int param1)
 {
     if ((44 > param1) || (param1 > 59)) {
         return 1;
@@ -985,7 +985,7 @@ BOOL sub_02029274 (UnkStruct_020298B0 * param0, int param1)
     return 1;
 }
 
-void sub_0202929C (UnkStruct_020298B0 * param0)
+void sub_0202929C (UndergroundData * param0)
 {
     if (param0->unk_9AB >= (100 - 1)) {
         param0->unk_9AB = 0;
@@ -994,7 +994,7 @@ void sub_0202929C (UnkStruct_020298B0 * param0)
     }
 }
 
-int sub_020292B4 (UnkStruct_020298B0 * param0)
+int sub_020292B4 (UndergroundData * param0)
 {
     return param0->unk_9AB;
 }
@@ -1133,12 +1133,12 @@ int sub_0202948C (const UnkStruct_02029894 * param0)
     return 10;
 }
 
-int sub_020294B8 (const UnkStruct_0202855C * param0)
+int sub_020294B8 (const SecretBaseRecord * param0)
 {
     return param0->unk_00_0;
 }
 
-int sub_020294C0 (const UnkStruct_0202855C * param0)
+int sub_020294C0 (const SecretBaseRecord * param0)
 {
     if (4 == sub_0202958C(param0)) {
         return 1;
@@ -1147,43 +1147,43 @@ int sub_020294C0 (const UnkStruct_0202855C * param0)
     return 0;
 }
 
-void sub_020294D4 (UnkStruct_0202855C * param0, int param1)
+void sub_020294D4 (SecretBaseRecord * param0, int param1)
 {
     param0->unk_00_0 = param1;
 }
 
-int sub_020294EC (const UnkStruct_0202855C * param0)
+int sub_020294EC (const SecretBaseRecord * param0)
 {
     return param0->unk_04_0;
 }
 
-void sub_020294F4 (UnkStruct_0202855C * param0, int param1)
+void sub_020294F4 (SecretBaseRecord * param0, int param1)
 {
     if (param0->unk_04_0 < 999999) {
         param0->unk_04_0++;
     }
 }
 
-int sub_02029524 (const UnkStruct_0202855C * param0)
+int sub_02029524 (const SecretBaseRecord * param0)
 {
     return param0->unk_08_0;
 }
 
-void sub_0202952C (UnkStruct_0202855C * param0)
+void sub_0202952C (SecretBaseRecord * param0)
 {
     if (param0->unk_08_0 < 999999) {
         param0->unk_08_0++;
     }
 }
 
-void sub_0202955C (UnkStruct_0202855C * param0)
+void sub_0202955C (SecretBaseRecord * param0)
 {
     if (param0->unk_0C_0 < 999999) {
         param0->unk_0C_0++;
     }
 }
 
-int sub_0202958C (const UnkStruct_0202855C * param0)
+int sub_0202958C (const SecretBaseRecord * param0)
 {
     int v0 = param0->unk_38_0;
 
@@ -1200,24 +1200,24 @@ int sub_0202958C (const UnkStruct_0202855C * param0)
     return 0;
 }
 
-int sub_020295B8 (const UnkStruct_0202855C * param0)
+int sub_020295B8 (const SecretBaseRecord * param0)
 {
     return param0->unk_38_0;
 }
 
-void sub_020295C0 (UnkStruct_0202855C * param0)
+void sub_020295C0 (SecretBaseRecord * param0)
 {
     if (param0->unk_38_0 < 999999) {
         param0->unk_38_0++;
     }
 }
 
-int sub_020295F0 (const UnkStruct_0202855C * param0)
+int sub_020295F0 (const SecretBaseRecord * param0)
 {
     return param0->unk_10_0;
 }
 
-void sub_020295F8 (UnkStruct_0202855C * param0, int param1)
+void sub_020295F8 (SecretBaseRecord * param0, int param1)
 {
     if ((param1 > 0) && (param0->unk_10_0 > (999999 - param1))) {
         param0->unk_10_0 = 999999;
@@ -1226,12 +1226,12 @@ void sub_020295F8 (UnkStruct_0202855C * param0, int param1)
     }
 }
 
-int sub_0202963C (const UnkStruct_0202855C * param0)
+int sub_0202963C (const SecretBaseRecord * param0)
 {
     return param0->unk_14_0;
 }
 
-void sub_02029644 (UnkStruct_0202855C * param0, int param1)
+void sub_02029644 (SecretBaseRecord * param0, int param1)
 {
     if ((param1 > 0) && (param0->unk_14_0 > (999999 - param1))) {
         param0->unk_14_0 = 999999;
@@ -1240,7 +1240,7 @@ void sub_02029644 (UnkStruct_0202855C * param0, int param1)
     }
 }
 
-void sub_02029688 (UnkStruct_0202855C * param0, int param1)
+void sub_02029688 (SecretBaseRecord * param0, int param1)
 {
     if ((param1 > 0) && (param0->unk_18_0 > (999999 - param1))) {
         param0->unk_18_0 = 999999;
@@ -1249,84 +1249,84 @@ void sub_02029688 (UnkStruct_0202855C * param0, int param1)
     }
 }
 
-int sub_020296CC (const UnkStruct_0202855C * param0)
+int sub_020296CC (const SecretBaseRecord * param0)
 {
     return param0->unk_1C_0;
 }
 
-void sub_020296D4 (UnkStruct_0202855C * param0)
+void sub_020296D4 (SecretBaseRecord * param0)
 {
     if (param0->unk_1C_0 < 999999) {
         param0->unk_1C_0++;
     }
 }
 
-int sub_02029704 (const UnkStruct_0202855C * param0)
+int sub_02029704 (const SecretBaseRecord * param0)
 {
     return param0->unk_20_0;
 }
 
-void sub_0202970C (UnkStruct_0202855C * param0)
+void sub_0202970C (SecretBaseRecord * param0)
 {
     if (param0->unk_20_0 < 999999) {
         param0->unk_20_0++;
     }
 }
 
-int sub_0202973C (const UnkStruct_0202855C * param0)
+int sub_0202973C (const SecretBaseRecord * param0)
 {
     return param0->unk_24_0;
 }
 
-void sub_02029744 (UnkStruct_0202855C * param0)
+void sub_02029744 (SecretBaseRecord * param0)
 {
     if (param0->unk_24_0 < 999999) {
         param0->unk_24_0++;
     }
 }
 
-int sub_02029774 (const UnkStruct_0202855C * param0)
+int sub_02029774 (const SecretBaseRecord * param0)
 {
     return param0->unk_28_0;
 }
 
-void sub_0202977C (UnkStruct_0202855C * param0)
+void sub_0202977C (SecretBaseRecord * param0)
 {
     if (param0->unk_28_0 < 999999) {
         param0->unk_28_0++;
     }
 }
 
-int sub_020297AC (const UnkStruct_0202855C * param0)
+int sub_020297AC (const SecretBaseRecord * param0)
 {
     return param0->unk_2C_0;
 }
 
-void sub_020297B4 (UnkStruct_0202855C * param0)
+void sub_020297B4 (SecretBaseRecord * param0)
 {
     if (param0->unk_2C_0 < 999999) {
         param0->unk_2C_0++;
     }
 }
 
-int sub_020297E4 (const UnkStruct_0202855C * param0)
+int sub_020297E4 (const SecretBaseRecord * param0)
 {
     return param0->unk_30_0;
 }
 
-void sub_020297EC (UnkStruct_0202855C * param0)
+void sub_020297EC (SecretBaseRecord * param0)
 {
     if (param0->unk_30_0 < 999999) {
         param0->unk_30_0++;
     }
 }
 
-int sub_0202981C (const UnkStruct_0202855C * param0)
+int sub_0202981C (const SecretBaseRecord * param0)
 {
     return param0->unk_34_0;
 }
 
-void sub_02029824 (UnkStruct_0202855C * param0)
+void sub_02029824 (SecretBaseRecord * param0)
 {
     if (param0->unk_34_0 < 999999) {
         param0->unk_34_0++;
@@ -1363,28 +1363,28 @@ BOOL sub_0202988C (const UnkStruct_02029894 * param0)
 
 UnkStruct_02029894 * sub_02029894 (SaveData * param0)
 {
-    UnkStruct_020298B0 * v0;
+    UndergroundData * v0;
 
     v0 = SaveData_SaveTable(param0, 12);
     return &v0->unk_00;
 }
 
-UnkStruct_0202855C * sub_020298A0 (SaveData * param0)
+SecretBaseRecord * SaveData_SecretBaseRecord (SaveData * param0)
 {
-    UnkStruct_020298B0 * v0;
+    UndergroundData * v0;
 
     v0 = SaveData_SaveTable(param0, 12);
     return &v0->unk_00.unk_50;
 }
 
-UnkStruct_0202855C * sub_020298AC (UnkStruct_02029894 * param0)
+SecretBaseRecord * sub_020298AC (UnkStruct_02029894 * param0)
 {
     return &param0->unk_50;
 }
 
-UnkStruct_020298B0 * sub_020298B0 (SaveData * param0)
+UndergroundData * sub_020298B0 (SaveData * param0)
 {
-    UnkStruct_020298B0 * v0;
+    UndergroundData * v0;
 
     v0 = SaveData_SaveTable(param0, 12);
     return v0;
diff --git a/src/unk_0203CC84.c b/src/unk_0203CC84.c
index b10784ea5a..0a68eb1979 100644
--- a/src/unk_0203CC84.c
+++ b/src/unk_0203CC84.c
@@ -386,7 +386,7 @@ BGL * sub_0203D170 (void * param0)
     return v0->unk_08;
 }
 
-SaveData * sub_0203D174 (void * param0)
+SaveData * FieldSystem_SaveData (void * param0)
 {
     return ((FieldSystem *)param0)->unk_0C;
 }
diff --git a/src/unk_0203D1B8.c b/src/unk_0203D1B8.c
index a85b9e94a2..0411ae6c3f 100644
--- a/src/unk_0203D1B8.c
+++ b/src/unk_0203D1B8.c
@@ -793,7 +793,7 @@ void * sub_0203D8EC (FieldSystem * param0)
     Options * v1;
 
     v0 = Heap_AllocFromHeapAtEnd(11, sizeof(UnkStruct_0203D8EC));
-    v1 = sub_02025E44(sub_0203D174(param0));
+    v1 = sub_02025E44(FieldSystem_SaveData(param0));
 
     sub_0203D8DC(param0, v1);
 
@@ -811,7 +811,7 @@ UnkStruct_02097728 * sub_0203D920 (FieldSystem * param0, int param1, u8 param2,
 {
     UnkStruct_02097728 * v0;
 
-    v0 = sub_02097624(sub_0203D174(param0), param1, param2, param3, 11);
+    v0 = sub_02097624(FieldSystem_SaveData(param0), param1, param2, param3, 11);
     sub_0203D910(param0, v0);
 
     return v0;
@@ -822,9 +822,9 @@ UnkStruct_02097728 * sub_0203D94C (FieldSystem * param0, int param1, u8 param2,
     UnkStruct_02097728 * v0;
 
     if (param1 == 3) {
-        v0 = sub_020976F4(sub_0203D174(param0), param2, param3);
+        v0 = sub_020976F4(FieldSystem_SaveData(param0), param2, param3);
     } else {
-        v0 = sub_0209767C(sub_0203D174(param0), param1, param2, param3);
+        v0 = sub_0209767C(FieldSystem_SaveData(param0), param1, param2, param3);
     }
 
     sub_0203D910(param0, v0);
@@ -836,7 +836,7 @@ UnkStruct_02097728 * sub_0203D984 (FieldSystem * param0, Pokemon * param1, int p
 {
     UnkStruct_02097728 * v0;
 
-    v0 = sub_020976BC(sub_0203D174(param0), param1, param2);
+    v0 = sub_020976BC(FieldSystem_SaveData(param0), param1, param2);
     sub_0203D910(param0, v0);
 
     return v0;
@@ -851,7 +851,7 @@ UnkStruct_0203D9B8 * sub_0203D9B8 (FieldSystem * param0, int param1)
 {
     UnkStruct_0203D9B8 * v0;
 
-    v0 = sub_020989DC(sub_0203D174(param0), param1);
+    v0 = sub_020989DC(FieldSystem_SaveData(param0), param1);
     sub_0203D9A8(param0, v0);
 
     return v0;
diff --git a/src/unk_0203F6C4.c b/src/unk_0203F6C4.c
index ded1623f7d..98d912fb31 100644
--- a/src/unk_0203F6C4.c
+++ b/src/unk_0203F6C4.c
@@ -5404,8 +5404,8 @@ static BOOL sub_02043748 (UnkStruct_0203E724 * param0)
     LocalMapObject ** v0 = sub_0203F098(param0->unk_34, 10);
     StringFormatter ** v1 = sub_0203F098(param0->unk_34, 15);
     u16 v2 = sub_0203E838(param0);
-    TrainerInfo * v3 = SaveData_GetTrainerInfo(sub_0203D174(param0->unk_34));
-    UnkStruct_02014EC4 * v4 = sub_02014EC4(sub_0203D174(param0->unk_34));
+    TrainerInfo * v3 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34));
+    UnkStruct_02014EC4 * v4 = sub_02014EC4(FieldSystem_SaveData(param0->unk_34));
     u16 v5;
 
     if (v2 == 0) {
@@ -5614,7 +5614,7 @@ static BOOL sub_02043A94 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02043AA4 (UnkStruct_0203E724 * param0)
 {
-    TrainerInfo * v0 = SaveData_GetTrainerInfo(sub_0203D174(param0->unk_34));
+    TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34));
     StringFormatter ** v1 = sub_0203F098(param0->unk_34, 15);
 
     sub_0205C980(TrainerInfo_ID(v0), TrainerInfo_Gender(v0), *v1);
@@ -5623,7 +5623,7 @@ static BOOL sub_02043AA4 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02043AE0 (UnkStruct_0203E724 * param0)
 {
-    TrainerInfo * v0 = SaveData_GetTrainerInfo(sub_0203D174(param0->unk_34));
+    TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34));
     u16 v1 = inline_02049538(param0);
     u16 * v2 = inline_0204FCAC(param0);
 
@@ -5635,7 +5635,7 @@ static BOOL sub_02043AE0 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02043B48 (UnkStruct_0203E724 * param0)
 {
-    TrainerInfo * v0 = SaveData_GetTrainerInfo(sub_0203D174(param0->unk_34));
+    TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34));
     u16 v1 = inline_02049538(param0);
     u16 * v2 = inline_0204FCAC(param0);
 
@@ -5646,7 +5646,7 @@ static BOOL sub_02043B48 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02043BA0 (UnkStruct_0203E724 * param0)
 {
-    TrainerInfo * v0 = SaveData_GetTrainerInfo(sub_0203D174(param0->unk_34));
+    TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34));
     u16 v1 = inline_02049538(param0);
 
     TrainerInfo_SetAppearance(v0, v1);
@@ -5670,7 +5670,7 @@ static BOOL sub_02043BE0 (UnkStruct_0203E724 * param0)
 
 static BOOL sub_02043C0C (UnkStruct_0203E724 * param0)
 {
-    TrainerInfo * v0 = SaveData_GetTrainerInfo(sub_0203D174(param0->unk_34));
+    TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34));
     u16 * v1 = inline_0204FCAC(param0);
 
     *v1 = TrainerInfo_Gender(v0);
@@ -6821,7 +6821,7 @@ static BOOL sub_0204504C (UnkStruct_0203E724 * param0)
 static BOOL sub_02045068 (UnkStruct_0203E724 * param0)
 {
     FieldSystem * v0 = param0->unk_34;
-    TrainerInfo * v1 = SaveData_GetTrainerInfo(sub_0203D174(param0->unk_34));
+    TrainerInfo * v1 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34));
     u16 * v2 = inline_0204FCAC(param0);
     PCBoxes * v3 = SaveData_PCBoxes(v0->unk_0C);
     u16 v4 = inline_02049538(param0);
@@ -6851,10 +6851,10 @@ static BOOL sub_02045134 (UnkStruct_0203E724 * param0)
 {
     FieldSystem * v0 = param0->unk_34;
     SaveData * v1 = v0->unk_0C;
-    UnkStruct_0202855C * v2;
+    SecretBaseRecord * v2;
     u16 * v3 = inline_0204FCAC(param0);
 
-    v2 = sub_020298A0(v1);
+    v2 = SaveData_SecretBaseRecord(v1);
     *v3 = sub_020295B8(v2);
 
     return 0;
@@ -7728,7 +7728,7 @@ static BOOL sub_02045EA0 (UnkStruct_0203E724 * param0)
 static BOOL sub_02045ECC (UnkStruct_0203E724 * param0)
 {
     u16 v0 = inline_02049538(param0);
-    UnkStruct_020298B0 * v1 = sub_020298B0(param0->unk_34->unk_0C);
+    UndergroundData * v1 = sub_020298B0(param0->unk_34->unk_0C);
 
     if ((v0 == 135) || (v0 == 136)) {
         sub_02028828(v1);
diff --git a/src/unk_02046C7C.c b/src/unk_02046C7C.c
index 0906ca6583..0a1a20d308 100644
--- a/src/unk_02046C7C.c
+++ b/src/unk_02046C7C.c
@@ -99,7 +99,7 @@ BOOL sub_02046CFC (UnkStruct_0203E724 * param0)
     Strbuf* v0;
     Pokemon * v1;
     void ** v2 = sub_0203F098(param0->unk_34, 20);
-    TrainerInfo * v3 = SaveData_GetTrainerInfo(sub_0203D174(param0->unk_34));
+    TrainerInfo * v3 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34));
     u16 v4 = inline_02049538(param0);
     u16 v5 = inline_02049538(param0);
     u16 v6 = inline_02049538(param0);
diff --git a/src/unk_020474B8.c b/src/unk_020474B8.c
index c04b33991c..be92b37622 100644
--- a/src/unk_020474B8.c
+++ b/src/unk_020474B8.c
@@ -58,7 +58,7 @@ BOOL sub_020474F4 (UnkStruct_0203E724 * param0)
     StringFormatter ** v1 = sub_0203F098(v0, 15);
     u8 v2 = (*((param0)->unk_08++));
 
-    sub_0200B498(*v1, v2, SaveData_GetTrainerInfo(sub_0203D174(v0)));
+    sub_0200B498(*v1, v2, SaveData_GetTrainerInfo(FieldSystem_SaveData(v0)));
     return 0;
 }
 
@@ -259,7 +259,7 @@ BOOL sub_020478E4 (UnkStruct_0203E724 * param0)
 {
     int v0;
     FieldSystem * v1 = param0->unk_34;
-    TrainerInfo * v2 = SaveData_GetTrainerInfo(sub_0203D174(param0->unk_34));
+    TrainerInfo * v2 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34));
     StringFormatter ** v3 = sub_0203F098(v1, 15);
     u8 v4 = (*((param0)->unk_08++));
 
diff --git a/src/unk_020494DC.c b/src/unk_020494DC.c
index e8708cd50d..7d3e322158 100644
--- a/src/unk_020494DC.c
+++ b/src/unk_020494DC.c
@@ -37,7 +37,7 @@ BOOL sub_020494DC (UnkStruct_0203E724 * param0)
     v0 = sub_0203E838(param0);
     v1 = sub_0203E838(param0);
 
-    param0->unk_34->unk_AC = sub_0204A124(sub_0203D174(param0->unk_34), v0, v1);
+    param0->unk_34->unk_AC = sub_0204A124(FieldSystem_SaveData(param0->unk_34), v0, v1);
     return 0;
 }
 
diff --git a/src/unk_02049D08.c b/src/unk_02049D08.c
index 0aa08f9e7f..c852c32541 100644
--- a/src/unk_02049D08.c
+++ b/src/unk_02049D08.c
@@ -895,7 +895,7 @@ u16 sub_0204ABA0 (UnkStruct_0204AFC4 * param0, SaveData * param1)
 {
     u8 v0, v1;
     u16 v2, v3, v4;
-    UnkStruct_020298B0 * v5;
+    UndergroundData * v5;
 
     if (param0->unk_0F == 5) {
         return 0;
diff --git a/src/unk_0204C6C8.c b/src/unk_0204C6C8.c
index 9ea186a05d..bce4a1443a 100644
--- a/src/unk_0204C6C8.c
+++ b/src/unk_0204C6C8.c
@@ -108,7 +108,7 @@ BOOL sub_0204C7D8 (UnkStruct_0203E724 * param0)
 BOOL sub_0204C808 (UnkStruct_0203E724 * param0)
 {
     FieldSystem * v0 = param0->unk_34;
-    TrainerInfo * v1 = SaveData_GetTrainerInfo(sub_0203D174(param0->unk_34));
+    TrainerInfo * v1 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34));
     SaveData * v2 = v0->unk_0C;
     u16 * v3 = sub_02025E50(v2);
     u32 v4, v5;
@@ -129,7 +129,7 @@ BOOL sub_0204C808 (UnkStruct_0203E724 * param0)
 BOOL sub_0204C854 (UnkStruct_0203E724 * param0)
 {
     FieldSystem * v0 = param0->unk_34;
-    TrainerInfo * v1 = SaveData_GetTrainerInfo(sub_0203D174(param0->unk_34));
+    TrainerInfo * v1 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34));
     SaveData * v2 = v0->unk_0C;
     u16 * v3 = sub_02025E50(v2);
     u16 * v4 = inline_0204FCAC(param0);
diff --git a/src/unk_0204C8F0.c b/src/unk_0204C8F0.c
index 8f09b9727e..d854efc83c 100644
--- a/src/unk_0204C8F0.c
+++ b/src/unk_0204C8F0.c
@@ -21,7 +21,7 @@
 
 BOOL sub_0204C8F0 (UnkStruct_0203E724 * param0)
 {
-    TrainerInfo * v0 = SaveData_GetTrainerInfo(sub_0203D174(param0->unk_34));
+    TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34));
     u32 v1;
 
     v1 = sub_0203E850(param0);
@@ -32,7 +32,7 @@ BOOL sub_0204C8F0 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204C914 (UnkStruct_0203E724 * param0)
 {
-    TrainerInfo * v0 = SaveData_GetTrainerInfo(sub_0203D174(param0->unk_34));
+    TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34));
     u32 v1;
 
     v1 = sub_0203E850(param0);
@@ -43,7 +43,7 @@ BOOL sub_0204C914 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204C938 (UnkStruct_0203E724 * param0)
 {
-    TrainerInfo * v0 = SaveData_GetTrainerInfo(sub_0203D174(param0->unk_34));
+    TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34));
     u32 v1;
 
     v1 = inline_02049538(param0);
@@ -54,7 +54,7 @@ BOOL sub_0204C938 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204C968 (UnkStruct_0203E724 * param0)
 {
-    TrainerInfo * v0 = SaveData_GetTrainerInfo(sub_0203D174(param0->unk_34));
+    TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34));
     u16 * v1;
     u32 v2, v3;
 
@@ -73,7 +73,7 @@ BOOL sub_0204C968 (UnkStruct_0203E724 * param0)
 
 BOOL sub_0204C9AC (UnkStruct_0203E724 * param0)
 {
-    TrainerInfo * v0 = SaveData_GetTrainerInfo(sub_0203D174(param0->unk_34));
+    TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34));
     u16 * v1;
     u32 v2, v3;
 
diff --git a/src/unk_0204CA84.c b/src/unk_0204CA84.c
index 524102aa85..00a56cce7f 100644
--- a/src/unk_0204CA84.c
+++ b/src/unk_0204CA84.c
@@ -66,7 +66,7 @@ BOOL sub_0204CAEC (UnkStruct_0203E724 * param0)
     SaveData * v1 = v0->unk_0C;
     UnkStruct_02026310 * v2 = (UnkStruct_02026310 *)(SaveData_SaveTable(v1, 8));
     Party * v3 = Party_GetFromSavedata(v0->unk_0C);
-    TrainerInfo * v4 = SaveData_GetTrainerInfo(sub_0203D174(param0->unk_34));
+    TrainerInfo * v4 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34));
 
     ov5_021E6EA8(v2, v3, v4);
     return 0;
diff --git a/src/unk_0204CFFC.c b/src/unk_0204CFFC.c
index 1aab43d453..7a4168288f 100644
--- a/src/unk_0204CFFC.c
+++ b/src/unk_0204CFFC.c
@@ -69,7 +69,7 @@ BOOL sub_0204D0E8 (UnkStruct_0203E724 * param0)
 {
     FieldSystem * v0 = param0->unk_34;
     Pokemon * v1;
-    TrainerInfo * v2 = SaveData_GetTrainerInfo(sub_0203D174(param0->unk_34));
+    TrainerInfo * v2 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34));
     u16 * v3 = inline_0204FCAC(param0);
     u16 * v4 = inline_0204FCAC(param0);
     u16 v5, v6;
diff --git a/src/unk_0204E974.c b/src/unk_0204E974.c
index 600c4c0d48..8e932c6017 100644
--- a/src/unk_0204E974.c
+++ b/src/unk_0204E974.c
@@ -17,7 +17,7 @@ BOOL sub_0204E974 (UnkStruct_0203E724 * param0)
 {
     FieldSystem * v0 = param0->unk_34;
     SaveData * v1 = v0->unk_0C;
-    UnkStruct_020298B0 * v2;
+    UndergroundData * v2;
     u16 v3 = inline_02049538(param0);
     u16 v4 = inline_02049538(param0);
     u16 * v5 = inline_0204FCAC(param0);
@@ -42,7 +42,7 @@ BOOL sub_0204EA04 (UnkStruct_0203E724 * param0)
 {
     FieldSystem * v0 = param0->unk_34;
     SaveData * v1 = v0->unk_0C;
-    UnkStruct_020298B0 * v2;
+    UndergroundData * v2;
     u16 v3 = inline_02049538(param0);
     u16 v4 = inline_02049538(param0);
     u16 * v5 = inline_0204FCAC(param0);
@@ -67,7 +67,7 @@ BOOL sub_0204EA94 (UnkStruct_0203E724 * param0)
 {
     FieldSystem * v0 = param0->unk_34;
     SaveData * v1 = v0->unk_0C;
-    UnkStruct_020298B0 * v2;
+    UndergroundData * v2;
     u16 v3 = inline_02049538(param0);
     u16 v4 = inline_02049538(param0);
     u16 * v5 = inline_0204FCAC(param0);
@@ -112,7 +112,7 @@ BOOL sub_0204EB9C (UnkStruct_0203E724 * param0)
 {
     FieldSystem * v0 = param0->unk_34;
     SaveData * v1 = v0->unk_0C;
-    UnkStruct_020298B0 * v2;
+    UndergroundData * v2;
     u16 v3 = inline_02049538(param0);
     u16 v4 = inline_02049538(param0);
     u16 * v5 = inline_0204FCAC(param0);
@@ -156,7 +156,7 @@ BOOL sub_0204EC98 (UnkStruct_0203E724 * param0)
 {
     FieldSystem * v0 = param0->unk_34;
     SaveData * v1 = v0->unk_0C;
-    UnkStruct_020298B0 * v2;
+    UndergroundData * v2;
     u16 v3 = inline_02049538(param0);
     u16 v4 = inline_02049538(param0);
     u16 * v5 = inline_0204FCAC(param0);
diff --git a/src/unk_0204EDA4.c b/src/unk_0204EDA4.c
index 1a533df228..42a5738d5b 100644
--- a/src/unk_0204EDA4.c
+++ b/src/unk_0204EDA4.c
@@ -83,7 +83,7 @@ static void sub_0204EE90 (UnkStruct_0203E724 * param0, u16 param1, Pokemon * par
     *v0 = v1;
 
     v1->unk_00 = param2;
-    v1->unk_04 = SaveData_GetTrainerInfo(sub_0203D174(param0->unk_34));
+    v1->unk_04 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0->unk_34));
     v1->unk_08 = sub_02025E44(param0->unk_34->unk_0C);
     v1->unk_0C = param3;
     v1->unk_15 = param1;
diff --git a/src/unk_020528D0.c b/src/unk_020528D0.c
index b67861847c..5e7ccb6146 100644
--- a/src/unk_020528D0.c
+++ b/src/unk_020528D0.c
@@ -132,7 +132,7 @@ static void sub_02052914 (FieldSystem * param0, UnkStruct_020508D4 * param1)
     v0->unk_20 = sub_0200B358(11);
 
     sub_0201A8D4(v0->unk_08, &v0->unk_0C, &Unk_020EC2F0);
-    sub_0200B498(v0->unk_20, 0, SaveData_GetTrainerInfo(sub_0203D174(param0)));
+    sub_0200B498(v0->unk_20, 0, SaveData_GetTrainerInfo(FieldSystem_SaveData(param0)));
 
     if (param0->unk_1C->unk_00 == 414) {
         sub_02052AA4(v0, 4, 0, 0);
diff --git a/src/unk_020559DC.c b/src/unk_020559DC.c
index 7c069162d2..253ffc0429 100644
--- a/src/unk_020559DC.c
+++ b/src/unk_020559DC.c
@@ -91,7 +91,7 @@ static void inline_020559DC (FieldSystem * param0, UnkStruct_02055BA8 * param1,
 
 static void sub_02055AC0 (FieldSystem * param0, s32 param1)
 {
-    sub_02028658(sub_0203D174(param0), param1);
+    sub_02028658(FieldSystem_SaveData(param0), param1);
     sub_0203F1FC(param0);
     sub_0206C2D0(param0->unk_0C, param1);
     sub_0202B3D8(sub_0202B4A0(param0->unk_0C), param1);
diff --git a/src/unk_02057518.c b/src/unk_02057518.c
index b432887bf5..da48cf26b8 100644
--- a/src/unk_02057518.c
+++ b/src/unk_02057518.c
@@ -151,13 +151,13 @@ void CommPlayerMan_Restart (void)
 
 void CommPlayerMan_Delete (BOOL deletePlayerData)
 {
-    int netId, v1;
+    int netId, netJd;
 
     if (sCommPlayerManager != NULL) {
-        for (v1 = 0; v1 < 5; v1++) {
-            if (sCommPlayerManager->unk_27C[v1]) {
-                Heap_FreeToHeap(sCommPlayerManager->unk_27C[v1]);
-                sCommPlayerManager->unk_27C[v1] = NULL;
+        for (netJd = 0; netJd < 5; netJd++) {
+            if (sCommPlayerManager->unk_27C[netJd]) {
+                Heap_FreeToHeap(sCommPlayerManager->unk_27C[netJd]);
+                sCommPlayerManager->unk_27C[netJd] = NULL;
             }
         }
 
@@ -183,7 +183,7 @@ void CommPlayerMan_Delete (BOOL deletePlayerData)
 
 void CommPlayerMan_Reinit (void)
 {
-    int netId, v1;
+    int netId;
 
     for (netId = 0; netId < MAX_CONNECTED_PLAYERS; netId++) {
         if (sCommPlayerManager->isUnderground) {
@@ -255,24 +255,24 @@ void CommPlayer_InitPersonal (void)
 
 void CommPlayer_CopyPersonal (int param0)
 {
-    int v0;
+    int netId;
 
     sCommPlayerManager->unk_2BF = 0;
-    v0 = CommSys_CurNetId();
+    netId = CommSys_CurNetId();
 
-    sCommPlayerManager->playerAvatar[v0] = sCommPlayerManager->fieldSys->playerAvatar;
-    sCommPlayerManager->isActive[v0] = 1;
-    sCommPlayerManager->playerLocation[v0].x = sCommPlayerManager->playerLocation[param0].x;
-    sCommPlayerManager->playerLocation[v0].z = sCommPlayerManager->playerLocation[param0].z;
-    sCommPlayerManager->playerLocation[v0].dir = sCommPlayerManager->playerLocation[param0].dir;
-    sCommPlayerManager->playerLocationServer[v0].x = sCommPlayerManager->playerLocationServer[param0].x;
-    sCommPlayerManager->playerLocationServer[v0].z = sCommPlayerManager->playerLocationServer[param0].z;
-    sCommPlayerManager->playerLocationServer[v0].dir = sCommPlayerManager->playerLocationServer[param0].dir;
-    sCommPlayerManager->unk_290[v0] = sCommPlayerManager->unk_290[param0];
+    sCommPlayerManager->playerAvatar[netId] = sCommPlayerManager->fieldSys->playerAvatar;
+    sCommPlayerManager->isActive[netId] = 1;
+    sCommPlayerManager->playerLocation[netId].x = sCommPlayerManager->playerLocation[param0].x;
+    sCommPlayerManager->playerLocation[netId].z = sCommPlayerManager->playerLocation[param0].z;
+    sCommPlayerManager->playerLocation[netId].dir = sCommPlayerManager->playerLocation[param0].dir;
+    sCommPlayerManager->playerLocationServer[netId].x = sCommPlayerManager->playerLocationServer[param0].x;
+    sCommPlayerManager->playerLocationServer[netId].z = sCommPlayerManager->playerLocationServer[param0].z;
+    sCommPlayerManager->playerLocationServer[netId].dir = sCommPlayerManager->playerLocationServer[param0].dir;
+    sCommPlayerManager->unk_290[netId] = sCommPlayerManager->unk_290[param0];
     sCommPlayerManager->unk_290[param0] = NULL;
 
-    if (sCommPlayerManager->unk_290[v0]) {
-        TrainerInfo_Copy(sCommPlayerManager->unk_290[v0], (TrainerInfo *)&sCommPlayerManager->unk_14A[v0].unk_00);
+    if (sCommPlayerManager->unk_290[netId]) {
+        TrainerInfo_Copy(sCommPlayerManager->unk_290[netId], (TrainerInfo *)&sCommPlayerManager->unk_14A[netId].unk_00);
     }
 
     sCommPlayerManager->unk_14A[param0].unk_20 = 0xff;
@@ -280,48 +280,48 @@ void CommPlayer_CopyPersonal (int param0)
 
 void CommPlayer_SendXZPos (BOOL param0, int param1, int param2)
 {
-    u8 v0[5 + 1];
-    int v1 = Player_Dir(sCommPlayerManager->fieldSys->playerAvatar);
+    u8 data[5 + 1];
+    int dir = Player_Dir(sCommPlayerManager->fieldSys->playerAvatar);
 
-    v0[0] = param1;
-    v0[1] = param1 >> 8;
-    v0[2] = param2;
-    v0[3] = param2 >> 8;
-    v0[4] = v1;
+    data[0] = param1;
+    data[1] = param1 >> 8;
+    data[2] = param2;
+    data[3] = param2 >> 8;
+    data[4] = dir;
 
     if (param0) {
-        v0[4] = v0[4] | 0x80;
+        data[4] = data[4] | 0x80;
     }
 
-    sub_020360D0(22, v0);
+    sub_020360D0(22, data);
     sCommPlayerManager->unk_2BB = 1;
 }
 
 void CommPlayer_SendPos (BOOL param0)
 {
-    int v0 = Player_XPos(sCommPlayerManager->fieldSys->playerAvatar);
-    int v1 = Player_ZPos(sCommPlayerManager->fieldSys->playerAvatar);
+    int x = Player_XPos(sCommPlayerManager->fieldSys->playerAvatar);
+    int z = Player_ZPos(sCommPlayerManager->fieldSys->playerAvatar);
 
-    CommPlayer_SendXZPos(param0, v0, v1);
+    CommPlayer_SendXZPos(param0, x, z);
 }
 
 void CommPlayer_SendPosServer (BOOL param0)
 {
-    int v0 = sCommPlayerManager->playerLocationServer[CommSys_CurNetId()].x;
-    int v1 = sCommPlayerManager->playerLocationServer[CommSys_CurNetId()].z;
+    int x = sCommPlayerManager->playerLocationServer[CommSys_CurNetId()].x;
+    int z = sCommPlayerManager->playerLocationServer[CommSys_CurNetId()].z;
 
-    CommPlayer_SendXZPos(param0, v0, v1);
+    CommPlayer_SendXZPos(param0, x, z);
 }
 
-static void sub_02057B48 (int param0, const CommPlayerLocation * playerLocation)
+static void sub_02057B48 (int netId, const CommPlayerLocation * playerLocation)
 {
-    u8 v0[4 + 1];
-    int v1 = playerLocation->x, z = playerLocation->z;
+    u8 data[4 + 1];
+    int x = playerLocation->x, z = playerLocation->z;
 
     if (playerLocation->x < 0) {
-        v1 = 0;
+        x = 0;
     } else if (playerLocation->x >= 0xf000) {
-        v1 = 0xf000 - 1;
+        x = 0xf000 - 1;
     }
 
     if (playerLocation->z < 0) {
@@ -330,25 +330,25 @@ static void sub_02057B48 (int param0, const CommPlayerLocation * playerLocation)
         z = 0xf000 - 1;
     }
 
-    v0[0] = param0 & 0xf;
-    v0[1] = v1;
-    v0[2] = ((v1 >> 8) & 0x1) + ((z >> 7) & 0x2);
-    v0[3] = z;
+    data[0] = netId & 0xf;
+    data[1] = x;
+    data[2] = ((x >> 8) & 0x1) + ((z >> 7) & 0x2);
+    data[3] = z;
 
     if (playerLocation->unk_07) {
-        v0[2] |= 0x80;
+        data[2] |= 0x80;
     }
 
-    v0[0] += ((playerLocation->dir % 4) << 4);
-    v0[0] += (playerLocation->moveSpeed << 6);
+    data[0] += ((playerLocation->dir % 4) << 4);
+    data[0] += (playerLocation->moveSpeed << 6);
 
-    CommSys_SendDataServer(23, v0, 0);
+    CommSys_SendDataServer(23, data, 0);
 }
 
 void sub_02057BC4 (void * param0)
 {
     int v0 = sub_0205EB0C(sCommPlayerManager->fieldSys->playerAvatar);
-    int v1 = sub_0205EB14(sCommPlayerManager->fieldSys->playerAvatar);
+    int moveState = Player_MoveState(sCommPlayerManager->fieldSys->playerAvatar);
 
     if ((0 == v0) && CommSys_IsPlayerConnected(CommSys_CurNetId())) {
         if (!sCommPlayerManager->unk_2BA) {
@@ -357,22 +357,22 @@ void sub_02057BC4 (void * param0)
         }
     }
 
-    if ((1 == v0) && (1 == v1)) {
+    if ((1 == v0) && (1 == moveState)) {
         sCommPlayerManager->unk_2BA = 0;
     }
 }
 
 static void sub_02057C2C (void * param0)
 {
-    int v0;
+    int netId;
 
-    for (v0 = 0; v0 < (7 + 1); v0++) {
-        if (sCommPlayerManager->isActive[v0]) {
-            CommPlayerLocation * v1 = &sCommPlayerManager->playerLocationServer[v0];
+    for (netId = 0; netId < MAX_CONNECTED_PLAYERS; netId++) {
+        if (sCommPlayerManager->isActive[netId]) {
+            CommPlayerLocation * location = &sCommPlayerManager->playerLocationServer[netId];
 
-            if (sCommPlayerManager->unk_132[v0] || sCommPlayerManager->unk_2BB) {
-                sCommPlayerManager->unk_132[v0] = 0;
-                sub_02057B48(v0, v1);
+            if (sCommPlayerManager->unk_132[netId] || sCommPlayerManager->unk_2BB) {
+                sCommPlayerManager->unk_132[netId] = 0;
+                sub_02057B48(netId, location);
             }
         }
     }
@@ -387,7 +387,6 @@ u32 CommPlayer_Size (void)
 
 static void CommPlayer_Add (u8 param0)
 {
-    fx32 v0, v1;
     PlayerAvatar * playerAvatar;
 
     if (sCommPlayerManager->playerAvatar[param0] != NULL) {
@@ -450,8 +449,6 @@ static void CommPlayer_Add (u8 param0)
 
 void CommPlayer_Destroy (u8 param0, BOOL param1, BOOL param2)
 {
-    int v0;
-
     if (sCommPlayerManager == NULL) {
         return;
     }
@@ -495,13 +492,13 @@ void CommPlayer_Destroy (u8 param0, BOOL param1, BOOL param2)
 
 static void CommPlayer_SendMoveSpeed ()
 {
-    u8 v0 = 2;
+    u8 moveSpeed = 2;
 
     if (PAD_BUTTON_B & gCoreSys.heldKeys) {
-        v0 = 1;
+        moveSpeed = 1;
     }
 
-    sub_02035E5C(v0);
+    sub_02035E5C(moveSpeed);
 }
 
 static void Task_CommPlayerManagerRun (SysTask * task, void * data)
@@ -538,7 +535,7 @@ static void Task_CommPlayerManagerRun (SysTask * task, void * data)
 
 static void sub_02057EF8 (void * param0)
 {
-    int netId, v1;
+    int netId;
 
     for (netId = 0; netId < MAX_CONNECTED_PLAYERS; netId++) {
         if (!CommSys_IsPlayerConnected(netId)) {
@@ -603,14 +600,14 @@ static void sub_02057FF0 (BOOL param0)
 
 void sub_02058018 (int netId, int param1, void * param2, void * param3)
 {
-    u8 * v0 = (u8 *)param2;
+    u8 * buffer = (u8 *)param2;
 
     if (sCommPlayerManager) {
         GF_ASSERT(param1 == 1);
         GF_ASSERT(netId < MAX_CONNECTED_PLAYERS);
-        GF_ASSERT((v0[0] == 1) || (v0[0] == 0));
+        GF_ASSERT((buffer[0] == 1) || (buffer[0] == 0));
 
-        sub_02059058(netId, v0[0]);
+        sub_02059058(netId, buffer[0]);
     }
 }
 
@@ -663,13 +660,13 @@ static int CommPlayer_Direction (u16 unused, u16 keys)
 
 BOOL CommPlayer_CheckNPCCollision (int x, int z)
 {
-    int v0, i;
+    int npcCnt, i;
     const UnkStruct_020619DC * npcList;
 
-    v0 = sub_0203A4B4(sCommPlayerManager->fieldSys);
+    npcCnt = sub_0203A4B4(sCommPlayerManager->fieldSys);
     npcList = sub_0203A4BC(sCommPlayerManager->fieldSys);
 
-    for (i = 0; i < v0; i++) {
+    for (i = 0; i < npcCnt; i++) {
         if ((npcList[i].unk_1A == x) && (npcList[i].unk_1C == z)) {
             return 1;
         }
@@ -709,8 +706,6 @@ static BOOL CommPlayer_CheckCollision (int x, int z, int netIdTarget)
 
 static int sub_020581CC (int param0, int param1)
 {
-    int v0;
-
     if (param0 < 5) {
         return 8;
     } else if (param0 < 10) {
@@ -730,8 +725,7 @@ static int sub_020581E0 (int param0)
 
 static void CommPlayer_Move (SysTask * param0, void * param1)
 {
-    u16 v0;
-    u8 v1;
+    u16 keys;
     int dir, v3, v4, v5, v6;
     CommPlayerLocation * playerLocation;
     UnkStruct_ov23_02249978 * v8 = NULL;
@@ -775,9 +769,9 @@ static void CommPlayer_Move (SysTask * param0, void * param1)
             }
 
             if (!sCommPlayerManager->unk_F2[v5]) {
-                v0 = sub_02035E84(v5);
+                keys = sub_02035E84(v5);
             } else {
-                v0 = 0;
+                keys = 0;
             }
 
             playerLocation->moveSpeed = sub_02035E70(v5);
@@ -808,7 +802,7 @@ static void CommPlayer_Move (SysTask * param0, void * param1)
                 continue;
             }
 
-            dir = CommPlayer_Direction(v0, v0);
+            dir = CommPlayer_Direction(keys, keys);
             v3 = CommPlayer_AddXServer(v5);
             v4 = sub_02058F18(v5);
 
@@ -854,7 +848,7 @@ static void CommPlayer_Move (SysTask * param0, void * param1)
 
 void CommPlayer_RecvLocation (int param0, int param1, void * src, void * param3)
 {
-    u8 * v0 = (u8 *)src;
+    u8 * buffer = (u8 *)src;
     CommPlayerLocation * playerLocation;
 
     if (sCommPlayerManager == NULL) {
@@ -863,7 +857,7 @@ void CommPlayer_RecvLocation (int param0, int param1, void * src, void * param3)
 
     playerLocation = &sCommPlayerManager->playerLocationServer[param0];
 
-    if (v0[4] & 0x80) {
+    if (buffer[4] & 0x80) {
         sCommPlayerManager->unk_2BB = 1;
         return;
     }
@@ -878,11 +872,11 @@ void CommPlayer_RecvLocation (int param0, int param1, void * src, void * param3)
 
     playerLocation->x = 0;
     playerLocation->z = 0;
-    playerLocation->x += ((u32)v0[0]) & 0xff;
-    playerLocation->x += ((u32)v0[1] << 8) & 0xff00;
-    playerLocation->z += ((u32)v0[2]) & 0xff;
-    playerLocation->z += ((u32)v0[3] << 8) & 0xff00;
-    playerLocation->dir = v0[4] & 0xf;
+    playerLocation->x += ((u32)buffer[0]) & 0xff;
+    playerLocation->x += ((u32)buffer[1] << 8) & 0xff00;
+    playerLocation->z += ((u32)buffer[2]) & 0xff;
+    playerLocation->z += ((u32)buffer[3] << 8) & 0xff00;
+    playerLocation->dir = buffer[4] & 0xf;
 
     sCommPlayerManager->isActive[param0] = 1;
     sCommPlayerManager->unk_132[param0] = 1;
@@ -894,27 +888,27 @@ void CommPlayer_RecvLocation (int param0, int param1, void * src, void * param3)
 
 void CommPlayer_RecvDelete (int param0, int param1, void * param2, void * param3)
 {
-    u8 * v0 = (u8 *)param2;
-    u8 v1 = v0[0];
+    u8 * buffer = (u8 *)param2;
+    u8 netId = buffer[0];
 
     if (sCommPlayerManager == NULL) {
         return;
     }
 
-    if (v1 == CommSys_CurNetId()) {
+    if (netId == CommSys_CurNetId()) {
         return;
     }
 
     if (sCommPlayerManager->isUnderground) {
-        ov23_022430B8(v1);
+        ov23_022430B8(netId);
 
         if (!sCommPlayerManager->isResetting) {
-            ov5_021F5634(sCommPlayerManager->fieldSys, sCommPlayerManager->playerLocation[v1].x, 0, sCommPlayerManager->playerLocation[v1].z);
+            ov5_021F5634(sCommPlayerManager->fieldSys, sCommPlayerManager->playerLocation[netId].x, 0, sCommPlayerManager->playerLocation[netId].z);
         }
     }
 
-    CommPlayer_Destroy(v1, 0, 0);
-    CommInfo_InitPlayer(v1);
+    CommPlayer_Destroy(netId, 0, 0);
+    CommInfo_InitPlayer(netId);
 }
 
 int sub_020585A4 (void)
@@ -922,14 +916,13 @@ int sub_020585A4 (void)
     return 5;
 }
 
-void sub_020585A8 (int param0, int param1, void * param2, void * param3)
+void sub_020585A8 (int param0, int param1, void * src, void * param3)
 {
-    u16 v0;
-    u8 * v1 = (u8 *)param2;
+    u8 * buffer = (u8 *)src;
     CommPlayerLocation * playerLocation;
     int v3;
 
-    v3 = v1[0] & 0xf;
+    v3 = buffer[0] & 0xf;
 
     if (sCommPlayerManager == NULL) {
         return;
@@ -941,7 +934,7 @@ void sub_020585A8 (int param0, int param1, void * param2, void * param3)
 
     playerLocation = &sCommPlayerManager->playerLocation[v3];
 
-    if (v1[2] & 0x80) {
+    if (buffer[2] & 0x80) {
         playerLocation->unk_07 = 1;
     } else {
         playerLocation->unk_07 = 0;
@@ -949,26 +942,26 @@ void sub_020585A8 (int param0, int param1, void * param2, void * param3)
 
     playerLocation->x = 0;
     playerLocation->z = 0;
-    playerLocation->x += ((u32)v1[1]) & 0xff;
-    playerLocation->x += ((u32)v1[2] << 8) & 0x100;
-    playerLocation->z += ((u32)v1[3]) & 0xff;
-    playerLocation->z += ((u32)v1[2] << 7) & 0x100;
-    playerLocation->dir = ((v1[0] >> 4) & 0x3);
-    playerLocation->moveSpeed = ((v1[0] >> 6) & 0x3);
+    playerLocation->x += ((u32)buffer[1]) & 0xff;
+    playerLocation->x += ((u32)buffer[2] << 8) & 0x100;
+    playerLocation->z += ((u32)buffer[3]) & 0xff;
+    playerLocation->z += ((u32)buffer[2] << 7) & 0x100;
+    playerLocation->dir = ((buffer[0] >> 4) & 0x3);
+    playerLocation->moveSpeed = ((buffer[0] >> 6) & 0x3);
 
     CommPlayer_Add(v3);
 }
 
 static void sub_02058644 (int param0)
 {
-    UnkStruct_020298B0 * v0 = sub_020298B0(sub_0203D174(sCommPlayerManager->fieldSys));
-    UnkStruct_0202855C * v1 = sub_020298A0(sub_0203D174(sCommPlayerManager->fieldSys));
+    UndergroundData * underground = sub_020298B0(FieldSystem_SaveData(sCommPlayerManager->fieldSys));
+    SaveData_SecretBaseRecord(FieldSystem_SaveData(sCommPlayerManager->fieldSys));
 
     if (sCommPlayerManager->isUnderground) {
         if (param0 == CommSys_CurNetId()) {
-            sub_0202929C(v0);
+            sub_0202929C(underground);
 
-            if (sub_020292B4(v0) == 50) {
+            if (sub_020292B4(underground) == 50) {
                 sub_0202CFEC(sub_0202CD88(sCommPlayerManager->fieldSys->unk_0C), 37);
             }
         }
@@ -977,8 +970,7 @@ static void sub_02058644 (int param0)
 
 static BOOL sub_020586A8 (int param0, int param1, int param2, int param3)
 {
-    LocalMapObject * v0;
-    int v1;
+    LocalMapObject * obj;
     u8 v3[] = {
         0x14, 0x15, 0x16, 0x17, 0x10, 0x11, 0x12, 0x13, 0xc, 0xd, 0xe, 0xf
     };
@@ -991,30 +983,30 @@ static BOOL sub_020586A8 (int param0, int param1, int param2, int param3)
         return 1;
     }
 
-    v0 = Player_LocalMapObject(sCommPlayerManager->playerAvatar[param0]);
+    obj = Player_LocalMapObject(sCommPlayerManager->playerAvatar[param0]);
 
     if (Player_Dir(sCommPlayerManager->playerAvatar[param0]) != CommPlayer_GetOppositeDir(sCommPlayerManager->unk_102[param0])) {
-        sub_020628C4(v0, (1 << 7));
+        sub_020628C4(obj, (1 << 7));
         Player_SetDir(sCommPlayerManager->playerAvatar[param0], CommPlayer_GetOppositeDir(sCommPlayerManager->unk_102[param0]));
-        sub_020628BC(v0, (1 << 7));
+        sub_020628BC(obj, (1 << 7));
     }
 
-    if (sub_02065684(v0) == 1) {
+    if (sub_02065684(obj) == 1) {
         (void)0;
     }
 
-    if (sub_020655F4(v0) == 1) {
+    if (sub_020655F4(obj) == 1) {
         sub_02058644(param0);
 
         switch (param3) {
         case 0:
-            sub_02065638(v0, v3[sCommPlayerManager->unk_102[param0]]);
+            sub_02065638(obj, v3[sCommPlayerManager->unk_102[param0]]);
             break;
         case 1:
-            sub_02065638(v0, v3[sCommPlayerManager->unk_102[param0] + 4]);
+            sub_02065638(obj, v3[sCommPlayerManager->unk_102[param0] + 4]);
             break;
         case 2:
-            sub_02065638(v0, v3[sCommPlayerManager->unk_102[param0] + 8]);
+            sub_02065638(obj, v3[sCommPlayerManager->unk_102[param0] + 8]);
             break;
         }
     } else {
@@ -1163,7 +1155,7 @@ static void CommPlayer_MoveClient (int netId)
 
 static BOOL sub_02058A18 (int param0, int param1)
 {
-    int v0, v1;
+    int x, z;
     CommPlayerLocation * playerLocation;
 
     if (sCommPlayerManager->unk_10A[param0] == 0) {
@@ -1180,13 +1172,13 @@ static BOOL sub_02058A18 (int param0, int param1)
         return 1;
     }
 
-    v0 = sub_02058DF8(param0);
-    v1 = sub_02058E4C(param0);
-    v0 += sub_0206419C(sCommPlayerManager->unk_112[param0]);
-    v1 += sub_020641A8(sCommPlayerManager->unk_112[param0]);
+    x = sub_02058DF8(param0);
+    z = sub_02058E4C(param0);
+    x += sub_0206419C(sCommPlayerManager->unk_112[param0]);
+    z += sub_020641A8(sCommPlayerManager->unk_112[param0]);
 
     if (sCommPlayerManager->unk_10A[param0] != 0) {
-        if (CommPlayer_CheckCollision(v0, v1, param0)) {
+        if (CommPlayer_CheckCollision(x, z, param0)) {
             sCommPlayerManager->unk_10A[param0] = 1;
         }
     }
@@ -1201,8 +1193,8 @@ static BOOL sub_02058A18 (int param0, int param1)
     }
 
     playerLocation = &sCommPlayerManager->playerLocationServer[param0];
-    playerLocation->x = v0;
-    playerLocation->z = v1;
+    playerLocation->x = x;
+    playerLocation->z = z;
 
     switch (param1) {
     case 2:
@@ -1222,7 +1214,6 @@ static BOOL sub_02058A18 (int param0, int param1)
 void sub_02058B0C (int param0, int param1, BOOL param2)
 {
     CommPlayerLocation * playerLocation = &sCommPlayerManager->playerLocationServer[param0];
-    u8 v1[3];
 
     playerLocation->dir = CommPlayer_GetOppositeDir(param1);
     sCommPlayerManager->unk_112[param0] = param1;
@@ -1250,16 +1241,16 @@ void sub_02058B94 (int param0)
 
 void sub_02058BA8 (int param0, int param1, BOOL param2)
 {
-    LocalMapObject * v0;
+    LocalMapObject * obj;
 
     if (sCommPlayerManager->playerAvatar[param0] == NULL) {
         return;
     }
 
-    v0 = Player_LocalMapObject(sCommPlayerManager->playerAvatar[param0]);
+    obj = Player_LocalMapObject(sCommPlayerManager->playerAvatar[param0]);
 
-    sub_020628BC(v0, (1 << 7));
-    sub_020628BC(v0, (1 << 8));
+    sub_020628BC(obj, (1 << 7));
+    sub_020628BC(obj, (1 << 8));
 
     sCommPlayerManager->unk_102[param0] = param1;
 }
@@ -1519,11 +1510,11 @@ BOOL sub_02059094 (int netId)
 
 BOOL sub_020590C4 (void)
 {
-    UnkStruct_020590C4 v0[] = {
+    UnkStruct_020590C4 batleGrid1v1[] = {
         {4, 7},
         {11, 7}
     };
-    UnkStruct_020590C4 v1[] = {
+    UnkStruct_020590C4 battleGrid2v2[] = {
         {4, 6},
         {11, 6},
         {4, 8},
@@ -1535,9 +1526,9 @@ BOOL sub_020590C4 (void)
     UnkStruct_020590C4 * v9;
 
     if (connectedPlayers == 2) {
-        v9 = v0;
+        v9 = batleGrid1v1;
     } else {
-        v9 = v1;
+        v9 = battleGrid2v2;
     }
 
     for (netId = 0; netId < connectedPlayers; netId++) {
@@ -1588,25 +1579,25 @@ static UnkStruct_020590C4 Unk_02100B74[] = {
 
 static void sub_020591A8 (void)
 {
-    int v0 = sub_02036148(sub_0203895C());
-    int v1, v3 = 0, v4[4];
+    int connectedPlayers = sub_02036148(sub_0203895C());
+    int netJd, v3 = 0, v4[4];
     int v5 = 0;
     UnkStruct_020590C4 * v6;
     u8 netId;
 
-    if (v0 == 2) {
+    if (connectedPlayers == 2) {
         v6 = Unk_02100B6C;
     } else {
         v6 = Unk_02100B74;
     }
 
-    for (netId = 0; netId < v0; netId++) {
+    for (netId = 0; netId < connectedPlayers; netId++) {
         if (!sCommPlayerManager->unk_2B4[netId]) {
             continue;
         }
 
-        for (v1 = 0; v1 < v0; v1++) {
-            if ((sub_02058DF8(netId) == v6[v1].unk_00) && (sub_02058E4C(netId) == v6[v1].unk_02)) {
+        for (netJd = 0; netJd < connectedPlayers; netJd++) {
+            if ((sub_02058DF8(netId) == v6[netJd].unk_00) && (sub_02058E4C(netId) == v6[netJd].unk_02)) {
                 sCommPlayerManager->unk_F2[netId] = 1;
                 sub_02035B48(95, &netId);
             }
@@ -1617,33 +1608,33 @@ static void sub_020591A8 (void)
 void CommPlayer_SetBattleDir (void)
 {
     int netId = CommSys_CurNetId();
-    int v1;
+    int code;
 
     if (CommPlayer_XPos(netId) > 8) {
         CommPlayer_SetDir(2);
-        v1 = sub_02065838(2, 0x24);
+        code = sub_02065838(2, 0x24);
     } else {
         CommPlayer_SetDir(3);
-        v1 = sub_02065838(3, 0x24);
+        code = sub_02065838(3, 0x24);
     }
 
-    sub_02061550(sCommPlayerManager->playerAvatar[netId], v1, 1);
+    sub_02061550(sCommPlayerManager->playerAvatar[netId], code, 1);
     CommPlayerManager_ForceDir();
 }
 
 BOOL sub_0205928C (void)
 {
-    int v0 = sub_02036148(sub_0203895C());
+    int connectedPlayers = sub_02036148(sub_0203895C());
     int netId, v3 = 0, v4[4], v5;
     int v6 = 0;
 
-    for (netId = 0; netId < v0; netId++) {
+    for (netId = 0; netId < connectedPlayers; netId++) {
         if ((sCommPlayerManager->isActive[netId] == 0) || (sCommPlayerManager->unk_132[netId] == 1)) {
             return 0;
         }
     }
 
-    for (netId = 0; netId < v0; netId++) {
+    for (netId = 0; netId < connectedPlayers; netId++) {
         CommPlayerLocation * playerLocation = &sCommPlayerManager->playerLocationServer[netId];
 
         v5 = CommPlayer_GetOppositeDir(playerLocation->dir);
@@ -1745,8 +1736,8 @@ void sub_0205948C (int param0)
     }
 
     if (sCommPlayerManager->unk_00 == 0x10) {
-        u8 v0 = 1;
-        sub_020360D0(62, &v0);
+        u8 data = 1;
+        sub_020360D0(62, &data);
     }
 
     if (sCommPlayerManager->unk_00 == 0) {
diff --git a/src/unk_0205B33C.c b/src/unk_0205B33C.c
index 4c4be659fd..d8b4ec09df 100644
--- a/src/unk_0205B33C.c
+++ b/src/unk_0205B33C.c
@@ -152,7 +152,7 @@ static UnkStruct_0205B43C * sub_0205B3A0 (FieldSystem * param0)
         return NULL;
     }
 
-    v1 = sub_0203D174(param0);
+    v1 = FieldSystem_SaveData(param0);
     sub_020369EC(v1);
 
     v2 = (UnkStruct_0205B43C *)Heap_AllocFromHeap(31, sizeof(UnkStruct_0205B43C));
diff --git a/src/unk_0205E7D0.c b/src/unk_0205E7D0.c
index 084f278464..082c04d161 100644
--- a/src/unk_0205E7D0.c
+++ b/src/unk_0205E7D0.c
@@ -270,7 +270,7 @@ void sub_0205EB10 (PlayerAvatar * param0, int param1)
     param0->unk_18 = param1;
 }
 
-int sub_0205EB14 (const PlayerAvatar * param0)
+int Player_MoveState (const PlayerAvatar * param0)
 {
     return param0->unk_18;
 }
diff --git a/src/unk_0205F180.c b/src/unk_0205F180.c
index efce12ba5b..9b2a6d0236 100644
--- a/src/unk_0205F180.c
+++ b/src/unk_0205F180.c
@@ -313,7 +313,7 @@ void sub_0205F490 (PlayerAvatar * param0)
     const LocalMapObject * v3;
 
     v0 = sub_0205EB0C(param0);
-    v1 = sub_0205EB14(param0);
+    v1 = Player_MoveState(param0);
     v3 = Player_LocalMapObject(param0);
 
     sub_0205EB10(param0, 0);
@@ -397,7 +397,7 @@ int sub_0205F588 (PlayerAvatar * param0)
     const LocalMapObject * v3;
 
     v0 = sub_0205EB0C(param0);
-    v1 = sub_0205EB14(param0);
+    v1 = Player_MoveState(param0);
 
     if (v0 == 0) {
         return 1;
diff --git a/src/unk_02068344.c b/src/unk_02068344.c
index f16928f3c8..381e47b4f1 100644
--- a/src/unk_02068344.c
+++ b/src/unk_02068344.c
@@ -66,7 +66,7 @@ void sub_02068344 (FieldSystem * param0)
     int v0;
     UnkStruct_02027860 * v1;
 
-    v1 = sub_02027860(sub_0203D174(param0));
+    v1 = sub_02027860(FieldSystem_SaveData(param0));
     v0 = sub_02027F80(v1);
 
     if (v0 == 0) {
@@ -81,7 +81,7 @@ void sub_02068368 (FieldSystem * param0)
     int v0;
     UnkStruct_02027860 * v1;
 
-    v1 = sub_02027860(sub_0203D174(param0));
+    v1 = sub_02027860(FieldSystem_SaveData(param0));
     v0 = sub_02027F80(v1);
 
     if (v0 == 0) {
@@ -98,7 +98,7 @@ BOOL sub_02068390 (FieldSystem * param0, const int param1, const int param2, con
     int v0;
     UnkStruct_02027860 * v1;
 
-    v1 = sub_02027860(sub_0203D174(param0));
+    v1 = sub_02027860(FieldSystem_SaveData(param0));
     v0 = sub_02027F80(v1);
 
     if (v0 == 0) {
diff --git a/src/unk_0206B70C.c b/src/unk_0206B70C.c
index 43517c570b..d96b9e22c3 100644
--- a/src/unk_0206B70C.c
+++ b/src/unk_0206B70C.c
@@ -114,7 +114,7 @@ void sub_0206B70C (FieldSystem * param0, UnkStruct_0203D8AC * param1, int param2
         param1->unk_04 = v10->unk_0C;
     }
 
-    v0 = SaveData_GetTrainerInfo(sub_0203D174(param0));
+    v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0));
     param1->unk_0C = TrainerInfo_Gender(v0);
     v7 = sub_0203A76C(sub_0203A790(param0->unk_0C));
     v2 = (v7->unk_00 - 2 + 6) % 6;
diff --git a/src/unk_0206B9D8.c b/src/unk_0206B9D8.c
index 6b776075a2..a1e160aef3 100644
--- a/src/unk_0206B9D8.c
+++ b/src/unk_0206B9D8.c
@@ -329,7 +329,7 @@ u16 sub_0206BDBC (SaveData * param0)
 {
     UnkStruct_0203068C * v0;
     UnkStruct_0202D750 * v1;
-    UnkStruct_020298B0 * v2;
+    UndergroundData * v2;
     u16 v3;
     u8 v4, v5, v6, v7, v8, v9;
 
diff --git a/src/unk_0206CCB0.c b/src/unk_0206CCB0.c
index 10c69f49e4..c4777219cc 100644
--- a/src/unk_0206CCB0.c
+++ b/src/unk_0206CCB0.c
@@ -2172,7 +2172,7 @@ static BOOL sub_0206EA0C (FieldSystem * param0, UnkStruct_ov6_022465F4 * param1)
 
 static int sub_0206EA10 (FieldSystem * param0, StringFormatter * param1, UnkStruct_ov6_022465F4 * param2)
 {
-    TrainerInfo * v0 = SaveData_GetTrainerInfo(sub_0203D174(param0));
+    TrainerInfo * v0 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0));
     int v1 = param0->unk_1C->unk_00;
 
     if ((v1 == 411) || ((v1 >= 412) && (v1 <= 417))) {
@@ -2629,7 +2629,7 @@ static int sub_0206EDAC (FieldSystem * param0, StringFormatter * param1, UnkStru
     u16 v2, v3;
     u32 v4, v5;
     Strbuf* v6 = Strbuf_Init(22, 4);
-    TrainerInfo * v7 = SaveData_GetTrainerInfo(sub_0203D174(param0));
+    TrainerInfo * v7 = SaveData_GetTrainerInfo(FieldSystem_SaveData(param0));
 
     v1 = sub_0202D834(param0->unk_0C);
     v2 = (LCRNG_Next() % 29);
diff --git a/src/unk_0207160C.c b/src/unk_0207160C.c
index e44c65cebe..ba91de4d7c 100644
--- a/src/unk_0207160C.c
+++ b/src/unk_0207160C.c
@@ -123,7 +123,7 @@ void sub_0207160C (FieldSystem * param0)
     const UnkStruct_020F03F4 * v4;
     fx32 v5;
 
-    v2 = sub_02027860(sub_0203D174(param0));
+    v2 = sub_02027860(FieldSystem_SaveData(param0));
     v3 = (UnkStruct_020716D4 *)sub_02027F6C(v2, 7);
     v4 = &Unk_020F03F4[v3->unk_02];
     v5 = v4->unk_00[v3->unk_00];
@@ -162,7 +162,7 @@ void sub_020716D4 (FieldSystem * param0)
     UnkStruct_02027860 * v0;
     UnkStruct_020716D4 * v1;
 
-    v0 = sub_02027860(sub_0203D174(param0));
+    v0 = sub_02027860(FieldSystem_SaveData(param0));
     sub_02027F5C(v0, 7);
 
     v1 = (UnkStruct_020716D4 *)sub_02027F6C(v0, 7);
@@ -274,7 +274,7 @@ u8 sub_02071818 (FieldSystem * param0)
     UnkStruct_02027860 * v0;
     UnkStruct_020716D4 * v1;
 
-    v0 = sub_02027860(sub_0203D174(param0));
+    v0 = sub_02027860(FieldSystem_SaveData(param0));
     v1 = (UnkStruct_020716D4 *)sub_02027F6C(v0, 7);
 
     if (v1->unk_04) {
@@ -290,7 +290,7 @@ void sub_0207183C (FieldSystem * param0)
     UnkStruct_020716D4 * v1;
     UnkStruct_020718D8 * v2;
 
-    v0 = sub_02027860(sub_0203D174(param0));
+    v0 = sub_02027860(FieldSystem_SaveData(param0));
     v1 = (UnkStruct_020716D4 *)sub_02027F6C(v0, 7);
 
     if ((Unk_020F03F4[v1->unk_02].unk_10) && (v1->unk_00 == 1)) {
diff --git a/src/unk_02071B10.c b/src/unk_02071B10.c
index dc62fef696..fed7e2de8a 100644
--- a/src/unk_02071B10.c
+++ b/src/unk_02071B10.c
@@ -53,7 +53,7 @@ void sub_02071B10 (FieldSystem * param0)
     UnkStruct_02027860 * v0;
     UnkStruct_02071B10 * v1;
 
-    v0 = sub_02027860(sub_0203D174(param0));
+    v0 = sub_02027860(FieldSystem_SaveData(param0));
     sub_02027F5C(v0, 1);
 
     v1 = (UnkStruct_02071B10 *)sub_02027F6C(v0, 1);
@@ -65,7 +65,7 @@ void sub_02071B30 (FieldSystem * param0)
     UnkStruct_02027860 * v0;
     UnkStruct_02071B30 * v1;
 
-    v0 = sub_02027860(sub_0203D174(param0));
+    v0 = sub_02027860(FieldSystem_SaveData(param0));
     sub_02027F5C(v0, 3);
 
     v1 = (UnkStruct_02071B30 *)sub_02027F6C(v0, 3);
@@ -87,7 +87,7 @@ void sub_02071B6C (FieldSystem * param0, const u8 param1)
 
     GF_ASSERT(param1 < 3);
 
-    v0 = sub_02027860(sub_0203D174(param0));
+    v0 = sub_02027860(FieldSystem_SaveData(param0));
     sub_02027F5C(v0, 5);
 
     v1 = (UnkStruct_02071B6C *)sub_02027F6C(v0, 5);
@@ -120,7 +120,7 @@ void sub_02071BD0 (FieldSystem * param0)
     UnkStruct_02027860 * v0;
     UnkStruct_02071BD0 * v1;
 
-    v0 = sub_02027860(sub_0203D174(param0));
+    v0 = sub_02027860(FieldSystem_SaveData(param0));
     sub_02027F5C(v0, 8);
 
     v1 = sub_02027F6C(v0, 8);
@@ -132,7 +132,7 @@ void sub_02071BF8 (FieldSystem * param0)
     UnkStruct_02027860 * v0;
     UnkStruct_02071BF8 * v1;
 
-    v0 = sub_02027860(sub_0203D174(param0));
+    v0 = sub_02027860(FieldSystem_SaveData(param0));
     sub_02027F5C(v0, 4);
     v1 = (UnkStruct_02071BF8 *)sub_02027F6C(v0, 4);
 
@@ -144,7 +144,7 @@ void sub_02071C18 (FieldSystem * param0)
     UnkStruct_02027860 * v0;
     UnkStruct_02071C18 * v1;
 
-    v0 = sub_02027860(sub_0203D174(param0));
+    v0 = sub_02027860(FieldSystem_SaveData(param0));
     sub_02027F5C(v0, 2);
     v1 = (UnkStruct_02071C18 *)sub_02027F6C(v0, 2);
 }
@@ -154,7 +154,7 @@ void sub_02071C34 (FieldSystem * param0)
     UnkStruct_02027860 * v0;
     UnkStruct_02071C34 * v1;
 
-    v0 = sub_02027860(sub_0203D174(param0));
+    v0 = sub_02027860(FieldSystem_SaveData(param0));
     sub_02027F5C(v0, 10);
     v1 = sub_02027F6C(v0, 10);
 
@@ -166,7 +166,7 @@ void sub_02071C5C (FieldSystem * param0)
     UnkStruct_02027860 * v0;
     UnkStruct_02071C5C * v1;
 
-    v0 = sub_02027860(sub_0203D174(param0));
+    v0 = sub_02027860(FieldSystem_SaveData(param0));
     sub_02027F5C(v0, 9);
 
     v1 = sub_02027F6C(v0, 9);
@@ -190,7 +190,7 @@ BOOL sub_02071CB4 (FieldSystem * param0, int param1)
 {
     UnkStruct_02027860 * v0;
 
-    v0 = sub_02027860(sub_0203D174(param0));
+    v0 = sub_02027860(FieldSystem_SaveData(param0));
 
     if (param1 == sub_02027F80(v0)) {
         return 1;
diff --git a/src/unk_02071CD0.c b/src/unk_02071CD0.c
index ec5d08bcf1..23961e6a80 100644
--- a/src/unk_02071CD0.c
+++ b/src/unk_02071CD0.c
@@ -18,7 +18,7 @@ void sub_02071CD0 (FieldSystem * param0)
     UnkStruct_02027860 * v1;
     UnkStruct_ov6_02242AF0 * v2;
 
-    v1 = sub_02027860(sub_0203D174(param0));
+    v1 = sub_02027860(FieldSystem_SaveData(param0));
     v0 = sub_02027F80(v1);
 
     if (v0 != 6) {
diff --git a/src/unk_02071D40.c b/src/unk_02071D40.c
index 6271d219a5..46322b9fd6 100644
--- a/src/unk_02071D40.c
+++ b/src/unk_02071D40.c
@@ -52,7 +52,7 @@ void sub_02071D40 (const u8 param0, const u8 param1, const u8 param2, const u8 p
     UnkStruct_0202CD88 * v1;
     SaveData * v2;
 
-    v2 = sub_0203D174(param4);
+    v2 = FieldSystem_SaveData(param4);
     v0 = SaveData_GetTrainerInfo(v2);
     v1 = sub_0202CD88(v2);
 
@@ -128,13 +128,13 @@ u8 sub_02071F28 (FieldSystem * param0)
     SaveData * v1;
     UnkStruct_0202CD88 * v2;
     UnkStruct_020507E4 * v3;
-    UnkStruct_0202855C * v4;
+    SecretBaseRecord * v4;
     UnkStruct_0203068C * v5;
 
-    v1 = sub_0203D174(param0);
+    v1 = FieldSystem_SaveData(param0);
     v2 = sub_0202CD88(v1);
     v3 = SaveData_Events(v1);
-    v4 = sub_020298A0(v1);
+    v4 = SaveData_SecretBaseRecord(v1);
     v5 = sub_0203068C(v1);
     v0 = 0;
 
diff --git a/src/unk_020722AC.c b/src/unk_020722AC.c
index 317e0a58b5..829a86b204 100644
--- a/src/unk_020722AC.c
+++ b/src/unk_020722AC.c
@@ -218,7 +218,7 @@ void sub_020722AC (void * param0, int * param1)
     MI_CpuClear8(v0, sizeof(UnkStruct_02072334));
     v0->unk_04 = param1;
 
-    v1 = sub_0203D174(param0);
+    v1 = FieldSystem_SaveData(param0);
 
     v0->unk_16C = (FieldSystem *)param0;
     v0->unk_00 = 43;
@@ -1012,7 +1012,7 @@ static void sub_020730B8 (UnkStruct_02072334 * param0, u8 param1, BOOL param2)
         return;
     }
 
-    v1 = Party_GetFromSavedata(sub_0203D174(param0->unk_16C));
+    v1 = Party_GetFromSavedata(FieldSystem_SaveData(param0->unk_16C));
     v2 = Party_GetPokemonBySlotIndex(v1, param1);
 
     sub_020977E4(param0->unk_1AC, param0->unk_18, v2, param0->unk_00);
@@ -1225,9 +1225,9 @@ static int sub_02073524 (UnkStruct_02072334 * param0, int param1)
         v0 = Heap_AllocFromHeap(param0->unk_00, sizeof(PartyManagementData));
         MI_CpuClear8(v0, sizeof(PartyManagementData));
 
-        v0->unk_00 = Party_GetFromSavedata(sub_0203D174(param0->unk_16C));
-        v0->unk_04 = sub_0207D990(sub_0203D174(param0->unk_16C));
-        v0->unk_0C = sub_02025E44(sub_0203D174(param0->unk_16C));
+        v0->unk_00 = Party_GetFromSavedata(FieldSystem_SaveData(param0->unk_16C));
+        v0->unk_04 = sub_0207D990(FieldSystem_SaveData(param0->unk_16C));
+        v0->unk_0C = sub_02025E44(FieldSystem_SaveData(param0->unk_16C));
         v0->unk_08 = sub_02028430(param0->unk_16C->unk_0C);
         v0->unk_21 = 0;
         v0->unk_20 = param1;
diff --git a/src/unk_02098218.c b/src/unk_02098218.c
index 47e2f30f40..1c0fa47ed4 100644
--- a/src/unk_02098218.c
+++ b/src/unk_02098218.c
@@ -218,7 +218,7 @@ static BOOL sub_0209843C (UnkStruct_020508D4 * param0)
 
         {
             Pokemon * v2 = v0->unk_0C.unk_00;
-            TrainerInfo * v3 = SaveData_GetTrainerInfo(sub_0203D174(v1));
+            TrainerInfo * v3 = SaveData_GetTrainerInfo(FieldSystem_SaveData(v1));
             int v4 = 6;
             int v5 = MapHeader_GetMapLabelTextID(v1->unk_1C->unk_00);
             int v6 = 11;
@@ -230,7 +230,7 @@ static BOOL sub_0209843C (UnkStruct_020508D4 * param0)
         }
 
         {
-            sub_0202F180(sub_0203D174(v1), v0->unk_0C.unk_00);
+            sub_0202F180(FieldSystem_SaveData(v1), v0->unk_0C.unk_00);
         }
 
         if (v0->unk_04 == 1) {
@@ -247,7 +247,7 @@ static BOOL sub_0209843C (UnkStruct_020508D4 * param0)
 
         v9 = Pokemon_GetValue(v0->unk_0C.unk_00, MON_DATA_SPECIES, 0);
 
-        v0->unk_08 = sub_0208712C(11, 1, v9, 10, sub_02025E44(sub_0203D174(v8)));
+        v0->unk_08 = sub_0208712C(11, 1, v9, 10, sub_02025E44(FieldSystem_SaveData(v8)));
         v0->unk_08->unk_10 = Pokemon_GetValue(v0->unk_0C.unk_00, MON_DATA_GENDER, NULL);
         v0->unk_08->unk_08 = Pokemon_GetValue(v0->unk_0C.unk_00, MON_DATA_FORM, NULL);
         sub_02050A38(param0, &Unk_020F2DAC, v0->unk_08);
@@ -260,7 +260,7 @@ static BOOL sub_0209843C (UnkStruct_020508D4 * param0)
 
             {
                 FieldSystem * v10 = sub_02050A60(param0);
-                UnkStruct_0202CD88 * v11 = sub_0202CD88(sub_0203D174(v10));
+                UnkStruct_0202CD88 * v11 = sub_0202CD88(FieldSystem_SaveData(v10));
 
                 sub_0202CF28(v11, (1 + 48));
             }
diff --git a/src/unk_02099604.c b/src/unk_02099604.c
index b0e3bfc524..fce12dd5bd 100644
--- a/src/unk_02099604.c
+++ b/src/unk_02099604.c
@@ -60,7 +60,7 @@ UnkStruct_ov82_0223B164 * sub_02099674 (FieldSystem * param0, int param1, int pa
 {
     UnkStruct_ov82_0223B164 * v0;
 
-    v0 = sub_02099604(param1, sub_0203D174(param0), param2, param0->unk_9C);
+    v0 = sub_02099604(param1, FieldSystem_SaveData(param0), param2, param0->unk_9C);
     sub_0209964C(param0, v0);
 
     return v0;
@@ -70,7 +70,7 @@ UnkStruct_ov82_0223B164 * sub_020996A0 (FieldSystem * param0, int param1, BOOL p
 {
     UnkStruct_ov82_0223B164 * v0;
 
-    v0 = sub_02099604(1, sub_0203D174(param0), param1, param0->unk_9C);
+    v0 = sub_02099604(1, FieldSystem_SaveData(param0), param1, param0->unk_9C);
     v0->unk_20 = 1;
     v0->unk_24 = param2;
 

From 81530e0dbb544608834813d4c92abbc1b59f707b Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Wed, 3 Apr 2024 22:37:08 -0400
Subject: [PATCH 08/11] More docing

---
 include/overlay023/struct_ov23_0224A294.h |   6 +-
 include/struct_defs/struct_02057B48.h     |   2 +-
 include/unk_02057518.h                    |   4 +-
 include/unk_0205E7D0.h                    |   2 +-
 include/unk_020655F4.h                    |   6 +-
 src/overlay005/ov5_021D431C.c             |  52 ++---
 src/overlay005/ov5_021DFB54.c             |  44 ++--
 src/overlay005/ov5_021F08CC.c             |   2 +-
 src/overlay006/ov6_0223E140.c             |   8 +-
 src/overlay006/ov6_02242AF0.c             |   8 +-
 src/overlay008/ov8_02249960.c             |  56 ++---
 src/overlay009/ov9_02249960.c             |  20 +-
 src/overlay023/ov23_02241F74.c            |   2 +-
 src/overlay023/ov23_0224340C.c            |   4 +-
 src/overlay023/ov23_0224A1D0.c            |  70 +++---
 src/overlay023/ov23_0224B05C.c            |   4 +-
 src/unk_0203F6C4.c                        |   4 +-
 src/unk_02056B30.c                        |  12 +-
 src/unk_02057518.c                        | 255 +++++++++++-----------
 src/unk_0205A0D8.c                        |   2 +-
 src/unk_0205C22C.c                        |  16 +-
 src/unk_0205E7D0.c                        |   2 +-
 src/unk_0205F180.c                        |  16 +-
 src/unk_020655F4.c                        |  14 +-
 src/unk_02067A84.c                        |  24 +-
 25 files changed, 313 insertions(+), 322 deletions(-)

diff --git a/include/overlay023/struct_ov23_0224A294.h b/include/overlay023/struct_ov23_0224A294.h
index f8e47e70aa..dee18143cd 100644
--- a/include/overlay023/struct_ov23_0224A294.h
+++ b/include/overlay023/struct_ov23_0224A294.h
@@ -12,7 +12,7 @@
 #include "overlay023/struct_ov23_0224ABC4.h"
 #include "overlay101/struct_ov101_021D5D90_decl.h"
 
-typedef struct {
+typedef struct CommPlayerManager {
     u32 unk_00;
     UnkStruct_ov23_0224991C * unk_04;
     PlayerAvatar * playerAvatar[MAX_CONNECTED_PLAYERS];
@@ -28,7 +28,7 @@ typedef struct {
     u8 unk_EA[MAX_CONNECTED_PLAYERS];
     u8 unk_F2[MAX_CONNECTED_PLAYERS];
     u8 unk_FA[MAX_CONNECTED_PLAYERS];
-    s8 unk_102[MAX_CONNECTED_PLAYERS];
+    s8 blowDir[MAX_CONNECTED_PLAYERS];
     u8 unk_10A[MAX_CONNECTED_PLAYERS];
     u8 unk_112[MAX_CONNECTED_PLAYERS];
     u8 unk_11A[MAX_CONNECTED_PLAYERS];
@@ -55,6 +55,6 @@ typedef struct {
     u8 unk_2C1;
     u8 unk_2C2;
     u8 unk_2C3;
-} CommPlayer;
+} CommPlayerManager;
 
 #endif // POKEPLATINUM_STRUCT_OV23_0224A294_H
diff --git a/include/struct_defs/struct_02057B48.h b/include/struct_defs/struct_02057B48.h
index 7b8b0c020f..72f2c71521 100644
--- a/include/struct_defs/struct_02057B48.h
+++ b/include/struct_defs/struct_02057B48.h
@@ -7,7 +7,7 @@ typedef struct {
     s8 dir;
     u8 moveSpeed;
     u8 unk_06;
-    u8 unk_07;
+    u8 collisionFlag;
 } CommPlayerLocation;
 
 #endif // POKEPLATINUM_STRUCT_02057B48_H
diff --git a/include/unk_02057518.h b/include/unk_02057518.h
index 42993bd2f2..06ed38b38b 100644
--- a/include/unk_02057518.h
+++ b/include/unk_02057518.h
@@ -4,7 +4,7 @@
 #include "field/field_system_decl.h"
 #include "overlay023/struct_ov23_0224A294.h"
 
-CommPlayer * CommPlayerData_Get(void);
+CommPlayerManager * CommPlayerData_Get(void);
 BOOL CommPlayerManager_Init(void * param0, FieldSystem * param1, BOOL param2);
 void CommPlayerMan_Reset(void);
 void CommPlayerMan_Restart(void);
@@ -46,7 +46,7 @@ int sub_02058E4C(int param0);
 int sub_02058EA0(int param0);
 int sub_02058EC0(int param0);
 int CommPlayer_AddXServer(int param0);
-int sub_02058F18(int param0);
+int CommPlayer_AddZServer(int param0);
 int CommPlayer_Dir(int param0);
 int CommPlayer_DirServer(int param0);
 void CommPlayer_LookTowardsServer(int param0, int param1);
diff --git a/include/unk_0205E7D0.h b/include/unk_0205E7D0.h
index 28e005d3e8..eb3b7a0910 100644
--- a/include/unk_0205E7D0.h
+++ b/include/unk_0205E7D0.h
@@ -14,7 +14,7 @@ PlayerAvatar * sub_0205E7D0(const UnkStruct_02061830 * param0, int param1, int p
 PlayerAvatar * sub_0205E820(const UnkStruct_02061830 * param0, UnkStruct_0205EC34 * param1, int param2);
 void sub_0205E884(PlayerAvatar * param0, int param1);
 void sub_0205E8E0(PlayerAvatar * param0);
-void sub_0205E8E8(PlayerAvatar * param0);
+void Player_Delete(PlayerAvatar * param0);
 LocalMapObject * sub_0205EA24(const UnkStruct_02061830 * param0);
 int Player_Dir(PlayerAvatar * const param0);
 void Player_SetDir(PlayerAvatar * param0, int param1);
diff --git a/include/unk_020655F4.h b/include/unk_020655F4.h
index 0ac93dd067..b2866138f4 100644
--- a/include/unk_020655F4.h
+++ b/include/unk_020655F4.h
@@ -5,10 +5,10 @@
 #include "struct_decls/struct_02061AB4_decl.h"
 #include "overlay005/struct_ov5_021F8E3C.h"
 
-int sub_020655F4(const LocalMapObject * param0);
-void sub_02065638(LocalMapObject * param0, int param1);
+int LocalMapObj_IsAnimationSet(const LocalMapObject * param0);
+void LocalMapObj_SetAnimationCode(LocalMapObject * param0, int param1);
 void sub_02065668(LocalMapObject * param0, int param1);
-int sub_02065684(const LocalMapObject * param0);
+int LocalMapObj_CheckAnimationFinished(const LocalMapObject * param0);
 int sub_020656AC(LocalMapObject * param0);
 void sub_020656DC(LocalMapObject * param0);
 SysTask * sub_02065700(LocalMapObject * param0, const UnkStruct_ov5_021F8E3C * param1);
diff --git a/src/overlay005/ov5_021D431C.c b/src/overlay005/ov5_021D431C.c
index 2831ca7ba9..5aa76c699e 100644
--- a/src/overlay005/ov5_021D431C.c
+++ b/src/overlay005/ov5_021D431C.c
@@ -177,13 +177,13 @@ BOOL ov5_021D433C (FieldSystem * param0, UnkStruct_ov5_021D432C * param1)
     break;
     case 3:
         v0 = Player_LocalMapObject(param0->playerAvatar);
-        sub_02065638(v0, 0xc);
+        LocalMapObj_SetAnimationCode(v0, 0xc);
         (param1->unk_00)++;
         break;
     case 4:
         v0 = Player_LocalMapObject(param0->playerAvatar);
 
-        if (sub_02065684(v0) == 1) {
+        if (LocalMapObj_CheckAnimationFinished(v0) == 1) {
             sub_020656AC(v0);
             sub_02062D64(v0, 1);
             {
@@ -354,13 +354,13 @@ BOOL ov5_021D453C (FieldSystem * param0, UnkStruct_ov5_021D432C * param1)
     break;
     case 3:
         v0 = Player_LocalMapObject(param0->playerAvatar);
-        sub_02065638(v0, 0xd);
+        LocalMapObj_SetAnimationCode(v0, 0xd);
         (param1->unk_00)++;
         break;
     case 4:
         v0 = Player_LocalMapObject(param0->playerAvatar);
 
-        if (sub_02065684(v0) == 1) {
+        if (LocalMapObj_CheckAnimationFinished(v0) == 1) {
             sub_020656AC(v0);
 
             {
@@ -526,8 +526,8 @@ BOOL ov5_021D4858 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const
 
         v0 = Player_LocalMapObject(param0->playerAvatar);
 
-        if (sub_020655F4(v0) == 1) {
-            sub_02065638(v0, 0x49);
+        if (LocalMapObj_IsAnimationSet(v0) == 1) {
+            LocalMapObj_SetAnimationCode(v0, 0x49);
         } else {
             GF_ASSERT(FALSE);
         }
@@ -541,7 +541,7 @@ BOOL ov5_021D4858 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const
 
         v0 = Player_LocalMapObject(param0->playerAvatar);
 
-        if (sub_020655F4(v0) == 1) {
+        if (LocalMapObj_IsAnimationSet(v0) == 1) {
             int v8;
 
             if (param2 == 3) {
@@ -550,7 +550,7 @@ BOOL ov5_021D4858 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const
                 v8 = 0xa;
             }
 
-            sub_02065638(v0, v8);
+            LocalMapObj_SetAnimationCode(v0, v8);
         } else {
             GF_ASSERT(FALSE);
         }
@@ -560,15 +560,15 @@ BOOL ov5_021D4858 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const
     case 2:
         v0 = Player_LocalMapObject(param0->playerAvatar);
 
-        if (sub_020655F4(v0) == 1) {
-            sub_02065638(v0, 0x4a);
+        if (LocalMapObj_IsAnimationSet(v0) == 1) {
+            LocalMapObj_SetAnimationCode(v0, 0x4a);
             (param1->unk_00)++;
         }
         break;
     case 3:
         v0 = Player_LocalMapObject(param0->playerAvatar);
 
-        if (sub_020655F4(v0) == 1) {
+        if (LocalMapObj_IsAnimationSet(v0) == 1) {
             int v9;
 
             if (param2 == 3) {
@@ -577,14 +577,14 @@ BOOL ov5_021D4858 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const
                 v9 = 0xa;
             }
 
-            sub_02065638(v0, v9);
+            LocalMapObj_SetAnimationCode(v0, v9);
             (param1->unk_00)++;
         }
         break;
     case 4:
         v0 = Player_LocalMapObject(param0->playerAvatar);
 
-        if (sub_02065684(v0) == 1) {
+        if (LocalMapObj_CheckAnimationFinished(v0) == 1) {
             sub_020656AC(v0);
             (param1->unk_00)++;
         }
@@ -642,8 +642,8 @@ BOOL ov5_021D4A24 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const
 
         v0 = Player_LocalMapObject(param0->playerAvatar);
 
-        if (sub_020655F4(v0) == 1) {
-            sub_02065638(v0, 0x49);
+        if (LocalMapObj_IsAnimationSet(v0) == 1) {
+            LocalMapObj_SetAnimationCode(v0, 0x49);
         } else {
             GF_ASSERT(FALSE);
         }
@@ -655,7 +655,7 @@ BOOL ov5_021D4A24 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const
         ov5_021D4278(param0->unk_54, 2, 0, 1557);
         v0 = Player_LocalMapObject(param0->playerAvatar);
 
-        if (sub_020655F4(v0) == 1) {
+        if (LocalMapObj_IsAnimationSet(v0) == 1) {
             int v8;
 
             if (param2 == 2) {
@@ -664,7 +664,7 @@ BOOL ov5_021D4A24 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const
                 v8 = 0xb;
             }
 
-            sub_02065638(v0, v8);
+            LocalMapObj_SetAnimationCode(v0, v8);
         } else {
             GF_ASSERT(FALSE);
         }
@@ -674,8 +674,8 @@ BOOL ov5_021D4A24 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const
     case 2:
         v0 = Player_LocalMapObject(param0->playerAvatar);
 
-        if (sub_020655F4(v0) == 1) {
-            sub_02065638(v0, 0x4a);
+        if (LocalMapObj_IsAnimationSet(v0) == 1) {
+            LocalMapObj_SetAnimationCode(v0, 0x4a);
 
             ov5_021D1744(0);
             (param1->unk_00)++;
@@ -684,7 +684,7 @@ BOOL ov5_021D4A24 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const
     case 3:
         v0 = Player_LocalMapObject(param0->playerAvatar);
 
-        if (sub_02065684(v0) == 1) {
+        if (LocalMapObj_CheckAnimationFinished(v0) == 1) {
             sub_020656AC(v0);
             (param1->unk_00)++;
         }
@@ -916,13 +916,13 @@ BOOL ov5_021D4E10 (UnkStruct_020508D4 * param0)
     case 1:
         v0 = Player_LocalMapObject(v1->playerAvatar);
         sub_02062D64(v0, 0);
-        sub_02065638(v0, 0xd);
+        LocalMapObj_SetAnimationCode(v0, 0xd);
         (v2->unk_00)++;
         break;
     case 2:
         v0 = Player_LocalMapObject(v1->playerAvatar);
 
-        if (sub_02065684(v0) == 1) {
+        if (LocalMapObj_CheckAnimationFinished(v0) == 1) {
             sub_020656AC(v0);
             (v2->unk_00)++;
         }
@@ -1069,13 +1069,13 @@ BOOL ov5_021D5020 (UnkStruct_020508D4 * param0)
     case 1:
         v0 = Player_LocalMapObject(v1->playerAvatar);
         sub_02062D64(v0, 0);
-        sub_02065638(v0, 0xd);
+        LocalMapObj_SetAnimationCode(v0, 0xd);
         (v2->unk_00)++;
         break;
     case 2:
         v0 = Player_LocalMapObject(v1->playerAvatar);
 
-        if (sub_02065684(v0) == 1) {
+        if (LocalMapObj_CheckAnimationFinished(v0) == 1) {
             sub_020656AC(v0);
             (v2->unk_00)++;
         }
@@ -1124,13 +1124,13 @@ BOOL ov5_021D5150 (UnkStruct_020508D4 * param0)
     case 1:
         v0 = Player_LocalMapObject(v1->playerAvatar);
         sub_02062D64(v0, 0);
-        sub_02065638(v0, 0xd);
+        LocalMapObj_SetAnimationCode(v0, 0xd);
         (v2->unk_00)++;
         break;
     case 2:
         v0 = Player_LocalMapObject(v1->playerAvatar);
 
-        if (sub_02065684(v0) == 1) {
+        if (LocalMapObj_CheckAnimationFinished(v0) == 1) {
             sub_020656AC(v0);
             (v2->unk_00)++;
         }
diff --git a/src/overlay005/ov5_021DFB54.c b/src/overlay005/ov5_021DFB54.c
index 23c62b4326..519592df9f 100644
--- a/src/overlay005/ov5_021DFB54.c
+++ b/src/overlay005/ov5_021DFB54.c
@@ -522,11 +522,11 @@ static BOOL ov5_021DFFBC (UnkStruct_020508D4 * param0)
 
     switch (v0->unk_00) {
     case 0:
-        if (sub_020655F4(v2) == 0) {
+        if (LocalMapObj_IsAnimationSet(v2) == 0) {
             break;
         }
 
-        if (sub_020655F4(v1) == 0) {
+        if (LocalMapObj_IsAnimationSet(v1) == 0) {
             if (sub_020613AC(v0->unk_0C) == 0) {
                 break;
             }
@@ -535,21 +535,21 @@ static BOOL ov5_021DFFBC (UnkStruct_020508D4 * param0)
         {
             int v3 = sub_02065838(v0->unk_04, 0x8);
 
-            sub_02065638(v2, v3);
+            LocalMapObj_SetAnimationCode(v2, v3);
 
             v3 = sub_02065838(v0->unk_04, 0x20);
-            sub_02065638(v1, v3);
+            LocalMapObj_SetAnimationCode(v1, v3);
             Sound_PlayEffect(1575);
         }
 
         v0->unk_00++;
         break;
     case 1:
-        if (sub_02065684(v2) == 0) {
+        if (LocalMapObj_CheckAnimationFinished(v2) == 0) {
             break;
         }
 
-        if (sub_02065684(v1) == 0) {
+        if (LocalMapObj_CheckAnimationFinished(v1) == 0) {
             break;
         }
 
@@ -668,7 +668,7 @@ static BOOL ov5_021E0160 (UnkStruct_020508D4 * param0)
     case 3:
         v0->unk_00++;
     case 4:
-        if (sub_020655F4(v0->unk_24) == 1) {
+        if (LocalMapObj_IsAnimationSet(v0->unk_24) == 1) {
             int v7;
             int v8[6] = {
                 0x34, 0x34, 0x34, 0x85, 0x89, 0x8d
@@ -676,12 +676,12 @@ static BOOL ov5_021E0160 (UnkStruct_020508D4 * param0)
             int v9 = sub_0205F108(v0->unk_20);
 
             v7 = sub_02065838(v0->unk_04, v8[v9]);
-            sub_02065638(v0->unk_24, v7);
+            LocalMapObj_SetAnimationCode(v0->unk_24, v7);
             v0->unk_00++;
         }
         break;
     case 5:
-        if (sub_02065684(v0->unk_24) == 0) {
+        if (LocalMapObj_CheckAnimationFinished(v0->unk_24) == 0) {
             break;
         }
 
@@ -758,7 +758,7 @@ static BOOL ov5_021E03C8 (UnkStruct_020508D4 * param0)
 
     switch (v0->unk_00) {
     case 0:
-        if (sub_020655F4(v0->unk_10) == 1) {
+        if (LocalMapObj_IsAnimationSet(v0->unk_10) == 1) {
             int v1;
             int v2;
             int v3[6] = {
@@ -778,12 +778,12 @@ static BOOL ov5_021E03C8 (UnkStruct_020508D4 * param0)
             ov5_021E106C(v0->unk_0C, v1);
 
             v1 = sub_02065838(v0->unk_04, v3[v2]);
-            sub_02065638(v0->unk_10, v1);
+            LocalMapObj_SetAnimationCode(v0->unk_10, v1);
             v0->unk_00++;
         }
         break;
     case 1:
-        if (sub_02065684(v0->unk_10) == 0) {
+        if (LocalMapObj_CheckAnimationFinished(v0->unk_10) == 0) {
             break;
         }
 
@@ -861,7 +861,7 @@ static BOOL ov5_021E0560 (UnkStruct_020508D4 * param0)
         Sound_PlayEffect(1617);
         v0->unk_00++;
     case 1:
-        if (sub_020655F4(v1) == 0) {
+        if (LocalMapObj_IsAnimationSet(v1) == 0) {
             if (sub_020613AC(v0->unk_0C) == 0) {
                 break;
             }
@@ -924,7 +924,7 @@ static int ov5_021E067C (FieldSystem * param0, PlayerAvatar * param1, int param2
 {
     LocalMapObject * v0 = Player_LocalMapObject(param1);
 
-    if (sub_020655F4(v0) == 0) {
+    if (LocalMapObj_IsAnimationSet(v0) == 0) {
         return 0;
     }
 
@@ -1057,10 +1057,10 @@ static int ov5_021E07FC (UnkStruct_ov5_021F9B54 * param0)
 
 static int ov5_021E0850 (UnkStruct_ov5_021F9B54 * param0)
 {
-    if (sub_020655F4(param0->unk_14) == 1) {
+    if (LocalMapObj_IsAnimationSet(param0->unk_14) == 1) {
         int v0 = sub_02065838(param0->unk_04, 0x34);
 
-        sub_02065638(param0->unk_14, v0);
+        LocalMapObj_SetAnimationCode(param0->unk_14, v0);
         param0->unk_00++;
     }
 
@@ -1069,7 +1069,7 @@ static int ov5_021E0850 (UnkStruct_ov5_021F9B54 * param0)
 
 static int ov5_021E0878 (UnkStruct_ov5_021F9B54 * param0)
 {
-    if (sub_02065684(param0->unk_14) == 1) {
+    if (LocalMapObj_CheckAnimationFinished(param0->unk_14) == 1) {
         param0->unk_00++;
         ov5_021F2974(param0->unk_18, 1);
     }
@@ -1079,10 +1079,10 @@ static int ov5_021E0878 (UnkStruct_ov5_021F9B54 * param0)
 
 static int ov5_021E0898 (UnkStruct_ov5_021F9B54 * param0)
 {
-    if (sub_020655F4(param0->unk_14) == 1) {
+    if (LocalMapObj_IsAnimationSet(param0->unk_14) == 1) {
         int v0 = sub_02065838(param0->unk_04, 0x10);
 
-        sub_02065638(param0->unk_14, v0);
+        LocalMapObj_SetAnimationCode(param0->unk_14, v0);
         param0->unk_00++;
     }
 
@@ -1091,7 +1091,7 @@ static int ov5_021E0898 (UnkStruct_ov5_021F9B54 * param0)
 
 static int ov5_021E08C0 (UnkStruct_ov5_021F9B54 * param0)
 {
-    if (sub_02065684(param0->unk_14) == 0) {
+    if (LocalMapObj_CheckAnimationFinished(param0->unk_14) == 0) {
         return(0);
     }
 
@@ -1108,7 +1108,7 @@ static int ov5_021E08C0 (UnkStruct_ov5_021F9B54 * param0)
     {
         int v2 = sub_02065838(param0->unk_04, 0x34);
 
-        sub_02065638(param0->unk_14, v2);
+        LocalMapObj_SetAnimationCode(param0->unk_14, v2);
         param0->unk_08 = 0;
         param0->unk_00++;
         ov5_021F2974(param0->unk_18, 0);
@@ -1122,7 +1122,7 @@ static int ov5_021E08C0 (UnkStruct_ov5_021F9B54 * param0)
 
 static int ov5_021E0924 (UnkStruct_ov5_021F9B54 * param0)
 {
-    if (sub_02065684(param0->unk_14) == 0) {
+    if (LocalMapObj_CheckAnimationFinished(param0->unk_14) == 0) {
         return(0);
     }
 
diff --git a/src/overlay005/ov5_021F08CC.c b/src/overlay005/ov5_021F08CC.c
index 1659b0a3bc..9e81ea47c6 100644
--- a/src/overlay005/ov5_021F08CC.c
+++ b/src/overlay005/ov5_021F08CC.c
@@ -206,7 +206,7 @@ static int ov5_021F0A30 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1,
 
 static int ov5_021F0A48 (UnkStruct_ov5_021F0D6C * param0, PlayerAvatar * param1, LocalMapObject * param2)
 {
-    if (sub_020655F4(param2) == 1) {
+    if (LocalMapObj_IsAnimationSet(param2) == 1) {
         sub_020656AC(param2);
         ov5_021DFB54(param1, (1 << 5));
         ov5_021DFB5C(param1);
diff --git a/src/overlay006/ov6_0223E140.c b/src/overlay006/ov6_0223E140.c
index 8a7f23b110..d73d0b0bf8 100644
--- a/src/overlay006/ov6_0223E140.c
+++ b/src/overlay006/ov6_0223E140.c
@@ -1275,7 +1275,7 @@ static BOOL ov6_0223EE5C (UnkStruct_ov6_0223EA98 * param0)
     case 8:
         param0->unk_D0 = 0;
         sub_0206296C(param0->unk_10C, 2);
-        sub_02065638(param0->unk_110, 0x2);
+        LocalMapObj_SetAnimationCode(param0->unk_110, 0x2);
         sub_02017358(&param0->unk_24, &v1, &v2, &param0->unk_D8);
         param0->unk_18++;
     case 9:
@@ -1438,17 +1438,17 @@ static BOOL ov6_0223EE5C (UnkStruct_ov6_0223EA98 * param0)
     if (param0->unk_1C != 0) {
         if (param0->unk_1C == 20) {
             sub_0206296C(param0->unk_10C, 1);
-            sub_02065638(param0->unk_110, 0x1);
+            LocalMapObj_SetAnimationCode(param0->unk_110, 0x1);
         }
 
         if (param0->unk_1C == 40) {
             sub_0206296C(param0->unk_10C, 2);
-            sub_02065638(param0->unk_110, 0x3);
+            LocalMapObj_SetAnimationCode(param0->unk_110, 0x3);
         }
 
         if (param0->unk_1C == 50) {
             sub_0206296C(param0->unk_10C, 0);
-            sub_02065638(param0->unk_110, 0x0);
+            LocalMapObj_SetAnimationCode(param0->unk_110, 0x0);
         }
 
         param0->unk_1C++;
diff --git a/src/overlay006/ov6_02242AF0.c b/src/overlay006/ov6_02242AF0.c
index 986dc8e21b..acf0fbeaff 100644
--- a/src/overlay006/ov6_02242AF0.c
+++ b/src/overlay006/ov6_02242AF0.c
@@ -307,8 +307,8 @@ static BOOL ov6_02242E60 (FieldSystem * param0, UnkStruct_ov6_02242B58 * param1,
         return 1;
     } else {
         if (param1->unk_04 == 0) {
-            if (sub_020655F4(v0) == 1) {
-                sub_02065638(v0, Unk_ov6_02249058[param1->unk_06]);
+            if (LocalMapObj_IsAnimationSet(v0) == 1) {
+                LocalMapObj_SetAnimationCode(v0, Unk_ov6_02249058[param1->unk_06]);
 
                 if ((param1->unk_06 < 7 - 1) && (Player_ZPos(param0->playerAvatar) > param1->unk_10)) {
                     if (param1->unk_06 == 0) {
@@ -327,8 +327,8 @@ static BOOL ov6_02242E60 (FieldSystem * param0, UnkStruct_ov6_02242B58 * param1,
                 }
             }
         } else {
-            if (sub_020655F4(v0) == 1) {
-                sub_02065638(v0, Unk_ov6_0224903C[param1->unk_06]);
+            if (LocalMapObj_IsAnimationSet(v0) == 1) {
+                LocalMapObj_SetAnimationCode(v0, Unk_ov6_0224903C[param1->unk_06]);
 
                 if ((param1->unk_06 < 7 - 1) && (Player_ZPos(param0->playerAvatar) < param1->unk_10)) {
                     if (param1->unk_06 == 0) {
diff --git a/src/overlay008/ov8_02249960.c b/src/overlay008/ov8_02249960.c
index dc50881d5b..50deb04732 100644
--- a/src/overlay008/ov8_02249960.c
+++ b/src/overlay008/ov8_02249960.c
@@ -1423,8 +1423,8 @@ static BOOL ov8_0224A620 (UnkStruct_020508D4 * param0)
 
     switch (v3->unk_00) {
     case 0:
-        if (sub_020655F4(v1) == 1) {
-            sub_02065638(v1, 0x49);
+        if (LocalMapObj_IsAnimationSet(v1) == 1) {
+            LocalMapObj_SetAnimationCode(v1, 0x49);
 
             Sound_PlayEffect(1553);
             (v3->unk_00)++;
@@ -1451,8 +1451,8 @@ static BOOL ov8_0224A620 (UnkStruct_020508D4 * param0)
                     sub_020057A4(1553, 0);
                     (v3->unk_00)++;
                 } else {
-                    if (sub_020655F4(v1) == 1) {
-                        sub_02065638(v1, 0x17);
+                    if (LocalMapObj_IsAnimationSet(v1) == 1) {
+                        LocalMapObj_SetAnimationCode(v1, 0x17);
                     }
                 }
             } else if (v4->unk_F0 == 5) {
@@ -1462,8 +1462,8 @@ static BOOL ov8_0224A620 (UnkStruct_020508D4 * param0)
                     sub_020057A4(1553, 0);
                     (v3->unk_00)++;
                 } else {
-                    if (sub_020655F4(v1) == 1) {
-                        sub_02065638(v1, 0x16);
+                    if (LocalMapObj_IsAnimationSet(v1) == 1) {
+                        LocalMapObj_SetAnimationCode(v1, 0x16);
                     }
                 }
             } else {
@@ -1475,12 +1475,12 @@ static BOOL ov8_0224A620 (UnkStruct_020508D4 * param0)
     }
     break;
     case 2:
-        if (sub_020655F4(v1) == 1) {
-            sub_02065638(v1, 0x4a);
+        if (LocalMapObj_IsAnimationSet(v1) == 1) {
+            LocalMapObj_SetAnimationCode(v1, 0x4a);
             (v3->unk_00)++;
         }
     case 3:
-        if (sub_02065684(v1) == 1) {
+        if (LocalMapObj_CheckAnimationFinished(v1) == 1) {
             sub_020656AC(v1);
             Sound_PlayEffect(1562);
             (v3->unk_00)++;
@@ -1507,8 +1507,8 @@ static BOOL ov8_0224A770 (UnkStruct_020508D4 * param0)
 
     switch (v3->unk_00) {
     case 0:
-        if (sub_020655F4(v1) == 1) {
-            sub_02065638(v1, 0x49);
+        if (LocalMapObj_IsAnimationSet(v1) == 1) {
+            LocalMapObj_SetAnimationCode(v1, 0x49);
 
             Sound_PlayEffect(1553);
             (v3->unk_00)++;
@@ -1535,8 +1535,8 @@ static BOOL ov8_0224A770 (UnkStruct_020508D4 * param0)
                     sub_020057A4(1553, 0);
                     (v3->unk_00)++;
                 } else {
-                    if (sub_020655F4(v1) == 1) {
-                        sub_02065638(v1, 0x15);
+                    if (LocalMapObj_IsAnimationSet(v1) == 1) {
+                        LocalMapObj_SetAnimationCode(v1, 0x15);
                     }
                 }
             } else if (v4->unk_F0 == 2) {
@@ -1546,8 +1546,8 @@ static BOOL ov8_0224A770 (UnkStruct_020508D4 * param0)
                     sub_020057A4(1553, 0);
                     (v3->unk_00)++;
                 } else {
-                    if (sub_020655F4(v1) == 1) {
-                        sub_02065638(v1, 0x14);
+                    if (LocalMapObj_IsAnimationSet(v1) == 1) {
+                        LocalMapObj_SetAnimationCode(v1, 0x14);
                     }
                 }
             } else {
@@ -1559,8 +1559,8 @@ static BOOL ov8_0224A770 (UnkStruct_020508D4 * param0)
     }
     break;
     case 2:
-        if (sub_020655F4(v1) == 1) {
-            sub_02065638(v1, 0x4a);
+        if (LocalMapObj_IsAnimationSet(v1) == 1) {
+            LocalMapObj_SetAnimationCode(v1, 0x4a);
             (v3->unk_00)++;
         }
         break;
@@ -1570,7 +1570,7 @@ static BOOL ov8_0224A770 (UnkStruct_020508D4 * param0)
 
         v8 = Player_LocalMapObject(v2->playerAvatar);
 
-        if (sub_02065684(v8) == 1) {
+        if (LocalMapObj_CheckAnimationFinished(v8) == 1) {
             sub_020656AC(v8);
             Sound_PlayEffect(1562);
             (v3->unk_00)++;
@@ -2738,7 +2738,7 @@ static BOOL ov8_0224B2E8 (UnkStruct_ov8_0224B28C * param0)
 {
     LocalMapObject * v0 = param0->unk_20;
 
-    if (sub_020655F4(param0->unk_20) == 1) {
+    if (LocalMapObj_IsAnimationSet(param0->unk_20) == 1) {
         int v1 = 0x9a;
         int v2 = sub_02063020(v0);
         int v3 = sub_02063040(v0);
@@ -2762,7 +2762,7 @@ static BOOL ov8_0224B2E8 (UnkStruct_ov8_0224B28C * param0)
         }
 
         if (v1 != 0x9a) {
-            sub_02065638(v0, v1);
+            LocalMapObj_SetAnimationCode(v0, v1);
         }
     }
 
@@ -3350,15 +3350,15 @@ static BOOL ov8_0224BAF4 (UnkStruct_020508D4 * param0)
 
     switch (v2->unk_00) {
     case 0:
-        if (sub_020655F4(v0) == 1) {
-            sub_02065638(v0, sub_02065838(v2->unk_08, 0x28));
+        if (LocalMapObj_IsAnimationSet(v0) == 1) {
+            LocalMapObj_SetAnimationCode(v0, sub_02065838(v2->unk_08, 0x28));
             ov5_021F4698(v2->unk_34->unk_08.unk_0C, v2->unk_08, 0);
             Sound_PlayEffect(1367);
             v2->unk_00++;
         }
         break;
     case 1:
-        if ((sub_02065684(v0) == 1) && (ov5_021F4720(v2->unk_34->unk_08.unk_0C) == 1)) {
+        if ((LocalMapObj_CheckAnimationFinished(v0) == 1) && (ov5_021F4720(v2->unk_34->unk_08.unk_0C) == 1)) {
             sub_020656AC(v0);
             Heap_FreeToHeap(v2);
             return 1;
@@ -3408,11 +3408,11 @@ static int ov8_0224BBD0 (UnkStruct_ov8_0224C098 * param0)
 
     v0 = Player_LocalMapObject(param0->unk_3C->unk_00->playerAvatar);
 
-    if (sub_020655F4(v0) == 0) {
+    if (LocalMapObj_IsAnimationSet(v0) == 0) {
         return 0;
     }
 
-    sub_02065638(v0, sub_02065838(param0->unk_08, 0x1c));
+    LocalMapObj_SetAnimationCode(v0, sub_02065838(param0->unk_08, 0x1c));
 
     {
         UnkStruct_ov8_0224BCA8 * v1 = param0->unk_34;
@@ -3588,7 +3588,7 @@ static int ov8_0224BEA4 (UnkStruct_ov8_0224C098 * param0)
 
     v0 = Player_LocalMapObject(param0->unk_3C->unk_00->playerAvatar);
 
-    if (sub_02065684(v0) == 1) {
+    if (LocalMapObj_CheckAnimationFinished(v0) == 1) {
         sub_020656AC(v0);
         param0->unk_00 = 10;
     }
@@ -3774,12 +3774,12 @@ static void ov8_0224C11C (UnkStruct_ov8_0224C098 * param0, int param1)
     case 0:
         break;
     case 1:
-        if (sub_020655F4(v0->unk_30) == 1) {
+        if (LocalMapObj_IsAnimationSet(v0->unk_30) == 1) {
             if (v0->unk_28 >= v0->unk_24) {
                 v0->unk_00++;
             } else {
                 param1 = sub_02065838(v0->unk_20, param1);
-                sub_02065638(v0->unk_30, param1);
+                LocalMapObj_SetAnimationCode(v0->unk_30, param1);
                 v0->unk_28++;
             }
         }
diff --git a/src/overlay009/ov9_02249960.c b/src/overlay009/ov9_02249960.c
index 6a1fa194a9..082c44f9d9 100644
--- a/src/overlay009/ov9_02249960.c
+++ b/src/overlay009/ov9_02249960.c
@@ -2371,7 +2371,7 @@ static BOOL ov9_0224AAD4 (UnkStruct_020508D4 * param0)
     }
     break;
     case 1:
-        if (sub_020655F4(v4) == 0) {
+        if (LocalMapObj_IsAnimationSet(v4) == 0) {
             break;
         } else {
             int v5, v6, v7;
@@ -2408,7 +2408,7 @@ static BOOL ov9_0224AAD4 (UnkStruct_020508D4 * param0)
 
             v6 = sub_02065838(v5, 0x0);
 
-            sub_02065638(v4, v6);
+            LocalMapObj_SetAnimationCode(v4, v6);
             sub_02062974(v4, v5);
 
             ov9_0224A4D0(v1, v4, v2->unk_34.unk_1A, v2->unk_34.unk_1C);
@@ -2455,13 +2455,13 @@ static BOOL ov9_0224AAD4 (UnkStruct_020508D4 * param0)
         }
         break;
     case 3:
-        if (sub_020655F4(v4) == 0) {
+        if (LocalMapObj_IsAnimationSet(v4) == 0) {
             break;
         } else {
             int v14 = sub_02065838(
                 v2->unk_34.unk_22, 0x0);
 
-            sub_02065638(v4, v14);
+            LocalMapObj_SetAnimationCode(v4, v14);
             return 1;
         }
     }
@@ -6327,8 +6327,8 @@ static int ov9_0224E4E8 (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
     v0 = sub_0206251C(param0->unk_00->unk_38, v1->unk_00);
     GF_ASSERT(v0 != NULL);
 
-    if (sub_020655F4(v0) == 1) {
-        sub_02065638(v0, v1->unk_04);
+    if (LocalMapObj_IsAnimationSet(v0) == 1) {
+        LocalMapObj_SetAnimationCode(v0, v1->unk_04);
         *param2 = 2;
     }
 
@@ -8351,7 +8351,7 @@ static int ov9_022500E0 (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
     UnkStruct_ov9_0224FA94 * v1 = ov9_0224E39C(param0);
     LocalMapObject * v2 = Player_LocalMapObject(param0->unk_00->playerAvatar);
 
-    if (sub_020655F4(v2) == 0) {
+    if (LocalMapObj_IsAnimationSet(v2) == 0) {
         return 0;
     }
 
@@ -8359,7 +8359,7 @@ static int ov9_022500E0 (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
         return 2;
     }
 
-    sub_02065638(v2, v0[v1->unk_02]);
+    LocalMapObj_SetAnimationCode(v2, v0[v1->unk_02]);
     v1->unk_02++;
     return 0;
 }
@@ -8664,7 +8664,7 @@ static int ov9_02250650 (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
     UnkStruct_ov9_02250138 * v1 = ov9_0224E39C(param0);
     LocalMapObject * v2 = Player_LocalMapObject(param0->unk_00->playerAvatar);
 
-    if (sub_020655F4(v2) == 0) {
+    if (LocalMapObj_IsAnimationSet(v2) == 0) {
         return 0;
     }
 
@@ -8672,7 +8672,7 @@ static int ov9_02250650 (UnkStruct_ov9_02249B04 * param0, UnkStruct_020508D4 * p
         return 2;
     }
 
-    sub_02065638(v2, v0[v1->unk_02]);
+    LocalMapObj_SetAnimationCode(v2, v0[v1->unk_02]);
     v1->unk_02++;
     return 0;
 }
diff --git a/src/overlay023/ov23_02241F74.c b/src/overlay023/ov23_02241F74.c
index 16b241fd3f..14a1bff6e4 100644
--- a/src/overlay023/ov23_02241F74.c
+++ b/src/overlay023/ov23_02241F74.c
@@ -622,7 +622,7 @@ void ov23_022428D8 (int param0, int param1, void * param2, void * param3)
 
     v4 = param0;
     v2.unk_00 = CommPlayer_AddXServer(param0);
-    v2.unk_02 = sub_02058F18(param0);
+    v2.unk_02 = CommPlayer_AddZServer(param0);
 
     if (param0 == 2) {
         (void)0;
diff --git a/src/overlay023/ov23_0224340C.c b/src/overlay023/ov23_0224340C.c
index 54d32a85c0..2a613da83f 100644
--- a/src/overlay023/ov23_0224340C.c
+++ b/src/overlay023/ov23_0224340C.c
@@ -1020,7 +1020,7 @@ void ov23_02243B0C (int param0, int param1, void * param2, void * param3)
     v4.unk_07 = 3;
 
     v1 = CommPlayer_AddXServer(param0);
-    v2 = sub_02058F18(param0);
+    v2 = CommPlayer_AddZServer(param0);
 
     if ((sub_02058DF8(param0) == 0xffff) && (sub_02058E4C(param0) == 0xffff)) {
         v4.unk_07 = 7;
@@ -1335,7 +1335,7 @@ BOOL ov23_02244080 (int param0, UnkStruct_ov23_0224271C * param1, u8 param2)
     UndergroundData * v5 = sub_020298B0(FieldSystem_SaveData(Unk_ov23_02257764->unk_40));
 
     v0 = CommPlayer_AddXServer(param0);
-    v1 = sub_02058F18(param0);
+    v1 = CommPlayer_AddZServer(param0);
     v3 = ov23_0224429C(v0, v1);
 
     if (v3) {
diff --git a/src/overlay023/ov23_0224A1D0.c b/src/overlay023/ov23_0224A1D0.c
index 87d7b1ce19..d413986a46 100644
--- a/src/overlay023/ov23_0224A1D0.c
+++ b/src/overlay023/ov23_0224A1D0.c
@@ -57,12 +57,12 @@ typedef struct {
     u8 unk_02;
 } UnkStruct_ov23_0224A570;
 
-CommPlayer * CommPlayerData_Get(void);
+CommPlayerManager * CommPlayerData_Get(void);
 
 void ov23_0224A1D0 (void)
 {
     int v0;
-    CommPlayer * v1 = CommPlayerData_Get();
+    CommPlayerManager * v1 = CommPlayerData_Get();
 
     if (v1 == NULL) {
         return;
@@ -79,7 +79,7 @@ void ov23_0224A1D0 (void)
 static void ov23_0224A204 (int param0)
 {
     int v0;
-    CommPlayer * v1 = CommPlayerData_Get();
+    CommPlayerManager * v1 = CommPlayerData_Get();
 
     if (param0 == CommSys_CurNetId()) {
         if (v1->unk_290[param0] != NULL) {
@@ -106,7 +106,7 @@ static void ov23_0224A204 (int param0)
 
 static BOOL ov23_0224A294 (int param0, int param1)
 {
-    CommPlayer * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerData_Get();
 
     if ((v0->unk_290[param0] == NULL) && (v0->unk_290[param1] != NULL)) {
         v0->unk_290[param0] = v0->unk_290[param1];
@@ -149,7 +149,7 @@ static void ov23_0224A328 (int param0)
 
 static void ov23_0224A334 (int param0)
 {
-    CommPlayer * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerData_Get();
 
     if (v0) {
         v0->unk_2B8 = 0;
@@ -159,7 +159,7 @@ static void ov23_0224A334 (int param0)
 void ov23_0224A348 (int param0, int param1, void * param2, void * param3)
 {
     UnkStruct_ov23_0224A348 v0;
-    CommPlayer * v1 = CommPlayerData_Get();
+    CommPlayerManager * v1 = CommPlayerData_Get();
 
     v0.unk_00 = 2;
     v0.unk_01 = param0;
@@ -181,7 +181,7 @@ void ov23_0224A348 (int param0, int param1, void * param2, void * param3)
 
 void ov23_0224A3A8 (int param0, int param1, void * param2, void * param3)
 {
-    CommPlayer * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerData_Get();
     UnkStruct_ov23_0224A348 * v1 = param2;
 
     if (!sub_02035EE0()) {
@@ -204,7 +204,7 @@ void ov23_0224A3A8 (int param0, int param1, void * param2, void * param3)
 
 void ov23_0224A410 (int param0, int param1, void * param2, void * param3)
 {
-    CommPlayer * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerData_Get();
     UnkStruct_ov23_0224A348 * v1 = param2;
     UnkStruct_020507E4 * v2 = SaveData_Events(v0->fieldSys->unk_0C);
 
@@ -285,7 +285,7 @@ static void ov23_0224A5B0 (int param0)
 
 static void ov23_0224A5CC (SysTask * param0, void * param1)
 {
-    CommPlayer * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerData_Get();
     UnkStruct_ov23_0224A5CC * v1 = param1;
     u8 v2 = v1->unk_04;
     u8 v3 = 0;
@@ -311,7 +311,7 @@ static void ov23_0224A5CC (SysTask * param0, void * param1)
 
 static void ov23_0224A620 (int param0)
 {
-    CommPlayer * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerData_Get();
     UnkStruct_ov23_0224A5CC * v1 = Heap_AllocFromHeap(11, sizeof(UnkStruct_ov23_0224A5CC));
 
     v1->unk_00 = 0;
@@ -368,7 +368,7 @@ BOOL ov23_0224A6B8 (int param0)
 
 static void ov23_0224A6E4 (UnkStruct_ov23_0224A570 * param0, BOOL param1, SecretBaseRecord * param2)
 {
-    CommPlayer * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerData_Get();
 
     ov23_0224321C();
 
@@ -392,7 +392,7 @@ static void ov23_0224A6E4 (UnkStruct_ov23_0224A570 * param0, BOOL param1, Secret
 
 void ov23_0224A77C (int param0, int param1, void * param2, void * param3)
 {
-    CommPlayer * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerData_Get();
     UnkStruct_ov23_0224A570 * v1 = param2;
     BOOL v2;
     int v3 = 0;
@@ -510,7 +510,7 @@ void ov23_0224A77C (int param0, int param1, void * param2, void * param3)
 void ov23_0224AA84 (void)
 {
     int v0;
-    CommPlayer * v1 = CommPlayerData_Get();
+    CommPlayerManager * v1 = CommPlayerData_Get();
 
     for (v0 = 0; v0 < (7 + 1); v0++) {
         v1->unk_14A[v0].unk_20 = 0xff;
@@ -519,13 +519,13 @@ void ov23_0224AA84 (void)
 
 u8 * ov23_0224AAA0 (int param0, void * param1, int param2)
 {
-    CommPlayer * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerData_Get();
     return (u8 *)&v0->unk_14A[(7 + 1)];
 }
 
 void ov23_0224AAB0 (void)
 {
-    CommPlayer * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerData_Get();
 
     v0->unk_2B9 = 0;
 
@@ -552,7 +552,7 @@ int ov23_0224AB2C (void)
 
 void ov23_0224AB30 (int param0, int param1, void * param2, void * param3)
 {
-    CommPlayer * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerData_Get();
     int v1;
     const TrainerInfo * v2 = param2;
     Strbuf* v3;
@@ -585,7 +585,7 @@ void ov23_0224AB30 (int param0, int param1, void * param2, void * param3)
 
 void ov23_0224ABC4 (int param0, int param1, void * param2, void * param3)
 {
-    CommPlayer * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerData_Get();
     UnkStruct_ov23_0224ABC4 * v1 = param2;
     int v2, v3;
 
@@ -610,7 +610,7 @@ int ov23_0224AC0C (void)
 void ov23_0224AC10 (int param0, int param1, void * param2, void * param3)
 {
     u8 * v0 = param2;
-    CommPlayer * v1 = CommPlayerData_Get();
+    CommPlayerManager * v1 = CommPlayerData_Get();
 
     if (v0[0] == CommSys_CurNetId()) {
         v1->unk_2B9 = 1;
@@ -621,7 +621,7 @@ void ov23_0224AC10 (int param0, int param1, void * param2, void * param3)
 
 BOOL ov23_0224AC3C (void)
 {
-    CommPlayer * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerData_Get();
     return v0->unk_2B9;
 }
 
@@ -630,7 +630,7 @@ void ov23_0224AC4C (void)
     TrainerInfo * v0 = NULL;
     int v1, v2;
     int v3 = CommSys_CurNetId();
-    CommPlayer * v4 = CommPlayerData_Get();
+    CommPlayerManager * v4 = CommPlayerData_Get();
 
     if (v4->unk_290[v3]) {
         v0 = v4->unk_290[v3];
@@ -655,7 +655,7 @@ void ov23_0224AC4C (void)
 
 BOOL ov23_0224ACC0 (int param0)
 {
-    CommPlayer * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerData_Get();
 
     if (v0->unk_04) {
         return !ov23_0224999C(
@@ -679,7 +679,7 @@ void ov23_0224ACF8 (int param0, int param1, void * param2, void * param3)
 
 int ov23_0224AD04 (int param0)
 {
-    CommPlayer * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerData_Get();
 
     if (!v0) {
         return 0xffff;
@@ -694,7 +694,7 @@ int ov23_0224AD04 (int param0)
 
 int ov23_0224AD40 (int param0)
 {
-    CommPlayer * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerData_Get();
 
     if (!v0) {
         return 0xffff;
@@ -709,19 +709,19 @@ int ov23_0224AD40 (int param0)
 
 void ov23_0224AD7C (int param0, int param1)
 {
-    CommPlayer * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerData_Get();
     ov23_02249994(ov23_0224993C(v0->unk_04, param0), param1);
 }
 
 void ov23_0224AD98 (int param0)
 {
-    CommPlayer * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerData_Get();
     ov23_02249994(ov23_0224993C(v0->unk_04, param0), 0);
 }
 
 void ov23_0224ADB0 (int param0, int param1, int param2, int param3)
 {
-    CommPlayer * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerData_Get();
     CommPlayerLocation * v1 = &v0->playerLocationServer[param0];
 
     v1->x = param1 + sub_0206419C(param3);
@@ -731,7 +731,7 @@ void ov23_0224ADB0 (int param0, int param1, int param2, int param3)
 
 void ov23_0224ADE8 (int param0, int param1, int param2, int param3)
 {
-    CommPlayer * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerData_Get();
     CommPlayerLocation * v1;
 
     if (!v0) {
@@ -763,7 +763,7 @@ void ov23_0224ADE8 (int param0, int param1, int param2, int param3)
 
 BOOL ov23_0224AE60 (int param0)
 {
-    CommPlayer * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerData_Get();
 
     if (v0->unk_290[param0] != NULL) {
         Heap_FreeToHeap(v0->unk_290[param0]);
@@ -780,7 +780,7 @@ BOOL ov23_0224AE60 (int param0)
 
 BOOL ov23_0224AEA4 (int param0)
 {
-    CommPlayer * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerData_Get();
 
     if (v0->unk_290[param0] != NULL) {
         return 1;
@@ -791,7 +791,7 @@ BOOL ov23_0224AEA4 (int param0)
 
 BOOL ov23_0224AEC4 (int param0, int param1)
 {
-    CommPlayer * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerData_Get();
 
     if (v0->unk_290[param0] == NULL) {
         TrainerInfo * v1 = CommInfo_TrainerInfo(param1);
@@ -819,7 +819,7 @@ BOOL ov23_0224AEC4 (int param0, int param1)
 
 void ov23_0224AF4C (int param0)
 {
-    CommPlayer * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerData_Get();
 
     if (v0->unk_28[param0] != NULL) {
         if (sub_020714F0(v0->unk_28[param0])) {
@@ -834,7 +834,7 @@ void ov23_0224AF4C (int param0)
 
 void ov23_0224AF7C (int param0)
 {
-    CommPlayer * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerData_Get();
 
     if (!v0->isResetting) {
         if (v0->playerAvatar[param0]) {
@@ -866,7 +866,7 @@ void ov23_0224AF7C (int param0)
 
 void ov23_0224B00C (int param0)
 {
-    CommPlayer * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerData_Get();
 
     if (v0->unk_FA[param0] != 1) {
         v0->unk_FA[param0] = 2;
@@ -875,7 +875,7 @@ void ov23_0224B00C (int param0)
 
 void ov23_0224B024 (int param0)
 {
-    CommPlayer * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerData_Get();
 
     if (v0->unk_FA[param0] != 1) {
         v0->unk_FA[param0] = 3;
@@ -886,7 +886,7 @@ void ov23_0224B024 (int param0)
 
 void ov23_0224B040 (int param0)
 {
-    CommPlayer * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerData_Get();
 
     if (v0->unk_FA[param0] != 1) {
         v0->unk_FA[param0] = 0;
diff --git a/src/overlay023/ov23_0224B05C.c b/src/overlay023/ov23_0224B05C.c
index 60b42ff284..0c376084cd 100644
--- a/src/overlay023/ov23_0224B05C.c
+++ b/src/overlay023/ov23_0224B05C.c
@@ -1892,7 +1892,7 @@ void ov23_0224CD80 (int param0, int param1, void * param2, void * param3)
 {
     u8 * v0 = param2;
     int v1 = CommPlayer_AddXServer(param0);
-    int v2 = sub_02058F18(param0);
+    int v2 = CommPlayer_AddZServer(param0);
     int v3, v4, v5, v6;
     int v7 = CommPlayer_DirServer(param0);
     UnkStruct_ov23_0224CF18 v8;
@@ -2161,7 +2161,7 @@ static void ov23_0224D238 (void)
     UnkStruct_02029894 * v0 = sub_02029894(FieldSystem_SaveData(Unk_ov23_022577AC->unk_00));
     UndergroundData * v1 = sub_020298B0(FieldSystem_SaveData(Unk_ov23_022577AC->unk_00));
     int v2 = CommPlayer_AddXServer(0);
-    int v3 = sub_02058F18(0);
+    int v3 = CommPlayer_AddZServer(0);
     int v4 = CommPlayer_DirServer(0);
     int v5, v6, v7, v8, v9;
     const int v10 = 10, v11 = 18, v12 = 12, v13 = 5, v14 = 6;
diff --git a/src/unk_0203F6C4.c b/src/unk_0203F6C4.c
index 2866587ddd..3af1bbc731 100644
--- a/src/unk_0203F6C4.c
+++ b/src/unk_0203F6C4.c
@@ -3238,7 +3238,7 @@ static BOOL sub_02041004 (UnkStruct_0203E724 * param0)
     LocalMapObject ** v1 = sub_0203F098(v0, 10);
     LocalMapObject * v2 = Player_LocalMapObject(v0->playerAvatar);
 
-    if (inline_020410F4_1((1 << 0)) && (sub_02065684(v2) == 1)) {
+    if (inline_020410F4_1((1 << 0)) && (LocalMapObj_CheckAnimationFinished(v2) == 1)) {
         sub_02062DD0(v2);
         inline_020410F4_3((1 << 0));
     }
@@ -3300,7 +3300,7 @@ static BOOL sub_020410F4 (UnkStruct_0203E724 * param0)
     inline_020410F4();
     sub_02062C48(v5);
 
-    if (sub_02065684(v2) == 0) {
+    if (LocalMapObj_CheckAnimationFinished(v2) == 0) {
         inline_020410F4_2((1 << 0));
         sub_02062DDC(v2);
     }
diff --git a/src/unk_02056B30.c b/src/unk_02056B30.c
index d35bf5a237..d42d2118da 100644
--- a/src/unk_02056B30.c
+++ b/src/unk_02056B30.c
@@ -347,9 +347,9 @@ static BOOL sub_02056F1C (UnkStruct_020508D4 * param0)
         v2 = Player_LocalMapObject(v0->playerAvatar);
 
         if (v3 == 2) {
-            sub_02065638(v2, 0xa);
+            LocalMapObj_SetAnimationCode(v2, 0xa);
         } else if (v3 == 3) {
-            sub_02065638(v2, 0xb);
+            LocalMapObj_SetAnimationCode(v2, 0xb);
         } else {
             GF_ASSERT(FALSE);
         }
@@ -359,7 +359,7 @@ static BOOL sub_02056F1C (UnkStruct_020508D4 * param0)
     case 1:
         v2 = Player_LocalMapObject(v0->playerAvatar);
 
-        if (sub_02065684(v2) == 1) {
+        if (LocalMapObj_CheckAnimationFinished(v2) == 1) {
             sub_020656AC(v2);
             (v1->unk_04)++;
         }
@@ -559,9 +559,9 @@ static BOOL sub_02057218 (UnkStruct_020508D4 * param0)
             v3 = Player_Dir(v0->playerAvatar);
 
             if (v3 == 2) {
-                sub_02065638(v2, 0xa);
+                LocalMapObj_SetAnimationCode(v2, 0xa);
             } else if (v3 == 3) {
-                sub_02065638(v2, 0xb);
+                LocalMapObj_SetAnimationCode(v2, 0xb);
             } else {
                 GF_ASSERT(FALSE);
             }
@@ -574,7 +574,7 @@ static BOOL sub_02057218 (UnkStruct_020508D4 * param0)
     case 1:
         v2 = Player_LocalMapObject(v0->playerAvatar);
 
-        if (sub_02065684(v2) == 1) {
+        if (LocalMapObj_CheckAnimationFinished(v2) == 1) {
             sub_020656AC(v2);
             (v1->unk_04)++;
         }
diff --git a/src/unk_02057518.c b/src/unk_02057518.c
index da48cf26b8..56aedb6a06 100644
--- a/src/unk_02057518.c
+++ b/src/unk_02057518.c
@@ -59,9 +59,9 @@ static void sub_02057EF8(void * param0);
 static void CommPlayer_MoveClient(int param0);
 static void sub_020591A8(void);
 
-static CommPlayer * sCommPlayerManager = NULL;
+static CommPlayerManager * sCommPlayerManager = NULL;
 
-CommPlayer * CommPlayerData_Get (void)
+CommPlayerManager * CommPlayerData_Get (void)
 {
     return sCommPlayerManager;
 }
@@ -70,13 +70,13 @@ BOOL CommPlayerManager_Init (void * dest, FieldSystem * fieldSys, BOOL isUndergr
 {
     int netId;
 
-    if (sCommPlayerManager) {
-        return 0;
+    if (sCommPlayerManager != NULL) {
+        return FALSE;
     }
 
     if (sCommPlayerManager == NULL) {
         sCommPlayerManager = dest;
-        MI_CpuFill8(sCommPlayerManager, 0, sizeof(CommPlayer));
+        MI_CpuFill8(sCommPlayerManager, 0, sizeof(CommPlayerManager));
     }
 
     sCommPlayerManager->isUnderground = isUnderground;
@@ -98,7 +98,7 @@ BOOL CommPlayerManager_Init (void * dest, FieldSystem * fieldSys, BOOL isUndergr
         sCommPlayerManager->playerLocationServer[netId].x = 0xffff;
         sCommPlayerManager->playerLocationServer[netId].z = 0xffff;
         sCommPlayerManager->playerLocationServer[netId].moveSpeed = 2;
-        sCommPlayerManager->unk_102[netId] = -1;
+        sCommPlayerManager->blowDir[netId] = -1;
         sCommPlayerManager->unk_E2[netId] = 0;
         sCommPlayerManager->unk_EA[netId] = 1;
         sCommPlayerManager->unk_F2[netId] = 0;
@@ -112,7 +112,7 @@ BOOL CommPlayerManager_Init (void * dest, FieldSystem * fieldSys, BOOL isUndergr
     CommSys_EnableSendMovementData();
     CommPlayer_InitPersonal();
 
-    return 1;
+    return TRUE;
 }
 
 void CommPlayerMan_Reset (void)
@@ -142,11 +142,11 @@ void CommPlayerMan_Restart (void)
         return;
     }
 
-    sCommPlayerManager->unk_2BB = 1;
-    sCommPlayerManager->isResetting = 0;
+    sCommPlayerManager->unk_2BB = TRUE;
+    sCommPlayerManager->isResetting = FALSE;
 
     CommPlayer_InitPersonal();
-    CommPlayer_SendPos(1);
+    CommPlayer_SendPos(TRUE);
 }
 
 void CommPlayerMan_Delete (BOOL deletePlayerData)
@@ -198,14 +198,14 @@ void CommPlayerMan_Reinit (void)
         if (sCommPlayerManager->playerAvatar[netId] != NULL) {
             if (sCommPlayerManager->fieldSys->playerAvatar != sCommPlayerManager->playerAvatar[netId]) {
                 if (sCommPlayerManager->isUnderground) {
-                    sub_0205E8E8(sCommPlayerManager->playerAvatar[netId]);
+                    Player_Delete(sCommPlayerManager->playerAvatar[netId]);
                 }
             }
 
             sCommPlayerManager->playerAvatar[netId] = NULL;
         }
 
-        sCommPlayerManager->isActive[netId] = 0;
+        sCommPlayerManager->isActive[netId] = FALSE;
         sCommPlayerManager->playerLocation[netId].dir = -1;
         sCommPlayerManager->playerLocation[netId].x = 0xffff;
         sCommPlayerManager->playerLocation[netId].z = 0xffff;
@@ -214,7 +214,7 @@ void CommPlayerMan_Reinit (void)
         sCommPlayerManager->playerLocationServer[netId].x = 0xffff;
         sCommPlayerManager->playerLocationServer[netId].z = 0xffff;
         sCommPlayerManager->playerLocationServer[netId].moveSpeed = 2;
-        sCommPlayerManager->unk_102[netId] = -1;
+        sCommPlayerManager->blowDir[netId] = -1;
         sCommPlayerManager->unk_10A[netId] = 0;
         sCommPlayerManager->unk_E2[netId] = 0;
         sCommPlayerManager->unk_EA[netId] = 1;
@@ -294,7 +294,7 @@ void CommPlayer_SendXZPos (BOOL param0, int param1, int param2)
     }
 
     sub_020360D0(22, data);
-    sCommPlayerManager->unk_2BB = 1;
+    sCommPlayerManager->unk_2BB = TRUE;
 }
 
 void CommPlayer_SendPos (BOOL param0)
@@ -335,7 +335,7 @@ static void sub_02057B48 (int netId, const CommPlayerLocation * playerLocation)
     data[2] = ((x >> 8) & 0x1) + ((z >> 7) & 0x2);
     data[3] = z;
 
-    if (playerLocation->unk_07) {
+    if (playerLocation->collisionFlag) {
         data[2] |= 0x80;
     }
 
@@ -377,12 +377,12 @@ static void sub_02057C2C (void * param0)
         }
     }
 
-    sCommPlayerManager->unk_2BB = 0;
+    sCommPlayerManager->unk_2BB = FALSE;
 }
 
 u32 CommPlayer_Size (void)
 {
-    return sizeof(CommPlayer);
+    return sizeof(CommPlayerManager);
 }
 
 static void CommPlayer_Add (u8 param0)
@@ -398,31 +398,27 @@ static void CommPlayer_Add (u8 param0)
     }
 
     {
-        TrainerInfo * v3 = CommInfo_TrainerInfo(param0);
+        TrainerInfo * trainerInfo = CommInfo_TrainerInfo(param0);
 
-        if (v3 == NULL) {
-            (void)0;
-        }
-
-        if (v3) {
+        if (trainerInfo) {
             if (!sCommPlayerManager->isUnderground) {
                 if (param0 != CommSys_CurNetId()) {
-                    LocalMapObject * v4 = sub_0206251C(sCommPlayerManager->fieldSys->unk_38, 0xff + param0 + 1);
+                    LocalMapObject * obj = sub_0206251C(sCommPlayerManager->fieldSys->unk_38, 0xff + param0 + 1);
 
-                    if (v4) {
-                        sub_02061AF4(v4);
+                    if (obj != 0) {
+                        sub_02061AF4(obj);
                     }
                 }
             }
 
             {
-                int v5 = 0;
+                int version = 0;
 
-                if (0 == TrainerInfo_GameCode(v3)) {
-                    v5 = 1;
+                if (0 == TrainerInfo_GameCode(trainerInfo)) {
+                    version = 1;
                 }
 
-                playerAvatar = sub_0205E7D0(sCommPlayerManager->fieldSys->unk_38, sCommPlayerManager->playerLocation[param0].x, sCommPlayerManager->playerLocation[param0].z, sCommPlayerManager->playerLocation[param0].dir, 0x0, TrainerInfo_Gender(v3), v5, NULL);
+                playerAvatar = sub_0205E7D0(sCommPlayerManager->fieldSys->unk_38, sCommPlayerManager->playerLocation[param0].x, sCommPlayerManager->playerLocation[param0].z, sCommPlayerManager->playerLocation[param0].dir, 0x0, TrainerInfo_Gender(trainerInfo), version, NULL);
             }
 
             GF_ASSERT(playerAvatar != NULL);
@@ -462,7 +458,7 @@ void CommPlayer_Destroy (u8 param0, BOOL param1, BOOL param2)
     if (sCommPlayerManager->playerAvatar[param0] != NULL) {
         if (sCommPlayerManager->fieldSys->playerAvatar != sCommPlayerManager->playerAvatar[param0]) {
             if (sCommPlayerManager->isUnderground || param2) {
-                sub_0205E8E8(sCommPlayerManager->playerAvatar[param0]);
+                Player_Delete(sCommPlayerManager->playerAvatar[param0]);
             } else {
                 sub_0205E8E0(sCommPlayerManager->playerAvatar[param0]);
             }
@@ -726,36 +722,36 @@ static int sub_020581E0 (int param0)
 static void CommPlayer_Move (SysTask * param0, void * param1)
 {
     u16 keys;
-    int dir, v3, v4, v5, v6;
+    int dir, x, z, netId, v6;
     CommPlayerLocation * playerLocation;
     UnkStruct_ov23_02249978 * v8 = NULL;
 
-    for (v5 = 0; v5 < MAX_CONNECTED_PLAYERS; v5++) {
-        if (sCommPlayerManager->isActive[v5] && sCommPlayerManager->unk_E2[v5] && sCommPlayerManager->unk_EA[v5]) {
-            playerLocation = &sCommPlayerManager->playerLocationServer[v5];
+    for (netId = 0; netId < MAX_CONNECTED_PLAYERS; netId++) {
+        if (sCommPlayerManager->isActive[netId] && sCommPlayerManager->unk_E2[netId] && sCommPlayerManager->unk_EA[netId]) {
+            playerLocation = &sCommPlayerManager->playerLocationServer[netId];
 
             if (sCommPlayerManager->unk_04) {
-                v8 = ov23_0224993C(sCommPlayerManager->unk_04, v5);
+                v8 = ov23_0224993C(sCommPlayerManager->unk_04, netId);
             }
 
             if (sCommPlayerManager->isUnderground) {
-                if (ov23_0224C1C8(v5)) {
+                if (ov23_0224C1C8(netId)) {
                     continue;
                 }
             }
 
-            if (sCommPlayerManager->unk_13A[v5] != 0) {
-                sCommPlayerManager->unk_13A[v5]--;
+            if (sCommPlayerManager->unk_13A[netId] != 0) {
+                sCommPlayerManager->unk_13A[netId]--;
             }
 
-            if (sCommPlayerManager->unk_13A[v5] == 0) {
+            if (sCommPlayerManager->unk_13A[netId] == 0) {
                 if (sCommPlayerManager->isUnderground) {
-                    if (ov23_0224444C(v5)) {
+                    if (ov23_0224444C(netId)) {
                         continue;
                     }
 
-                    if (!ov23_0224ACC0(v5)) {
-                        if (ov23_0224D7C8(v5)) {
+                    if (!ov23_0224ACC0(netId)) {
+                        if (ov23_0224D7C8(netId)) {
                             continue;
                         }
                     }
@@ -768,76 +764,76 @@ static void CommPlayer_Move (SysTask * param0, void * param1)
                 }
             }
 
-            if (!sCommPlayerManager->unk_F2[v5]) {
-                keys = sub_02035E84(v5);
+            if (!sCommPlayerManager->unk_F2[netId]) {
+                keys = sub_02035E84(netId);
             } else {
                 keys = 0;
             }
 
-            playerLocation->moveSpeed = sub_02035E70(v5);
+            playerLocation->moveSpeed = sub_02035E70(netId);
 
-            if (sCommPlayerManager->unk_13A[v5] != 0) {
+            if (sCommPlayerManager->unk_13A[netId] != 0) {
                 continue;
             }
 
-            v6 = sub_020581CC(sCommPlayerManager->unk_10A[v5], sCommPlayerManager->unk_12A[v5]);
+            v6 = sub_020581CC(sCommPlayerManager->unk_10A[netId], sCommPlayerManager->unk_12A[netId]);
 
-            if (sub_02058A18(v5, v6)) {
-                sCommPlayerManager->unk_13A[v5] = v6;
-                sCommPlayerManager->unk_132[v5] = 1;
+            if (sub_02058A18(netId, v6)) {
+                sCommPlayerManager->unk_13A[netId] = v6;
+                sCommPlayerManager->unk_132[netId] = 1;
                 continue;
             }
 
-            if (playerLocation->unk_07 == 1) {
-                sCommPlayerManager->unk_132[v5] = 1;
+            if (playerLocation->collisionFlag == 1) {
+                sCommPlayerManager->unk_132[netId] = 1;
             }
 
-            playerLocation->unk_07 = 0;
+            playerLocation->collisionFlag = 0;
 
-            if (sCommPlayerManager->unk_122[v5] == 2) {
-                u8 v9 = v5;
+            if (sCommPlayerManager->unk_122[netId] == 2) {
+                u8 v9 = netId;
 
-                sCommPlayerManager->unk_122[v5] = 1;
+                sCommPlayerManager->unk_122[netId] = 1;
                 sub_02035B48(40, &v9);
                 continue;
             }
 
             dir = CommPlayer_Direction(keys, keys);
-            v3 = CommPlayer_AddXServer(v5);
-            v4 = sub_02058F18(v5);
+            x = CommPlayer_AddXServer(netId);
+            z = CommPlayer_AddZServer(netId);
 
-            if ((v3 != 0xffff) && (v4 != 0xffff) && (dir != -1)) {
+            if ((x != 0xffff) && (z != 0xffff) && (dir != -1)) {
                 if (playerLocation->dir != dir) {
                     playerLocation->dir = dir;
-                    sCommPlayerManager->unk_13A[v5] = 4;
-                    sCommPlayerManager->unk_132[v5] = 1;
+                    sCommPlayerManager->unk_13A[netId] = 4;
+                    sCommPlayerManager->unk_132[netId] = 1;
 
-                    if (sCommPlayerManager->unk_122[v5] > 2) {
-                        sCommPlayerManager->unk_122[v5]--;
+                    if (sCommPlayerManager->unk_122[netId] > 2) {
+                        sCommPlayerManager->unk_122[netId]--;
                         continue;
                     }
-                } else if (sCommPlayerManager->unk_122[v5] != 0) {
+                } else if (sCommPlayerManager->unk_122[netId] != 0) {
                     continue;
-                } else if (sCommPlayerManager->isUnderground && (ov23_0224B8E0(v5, v3, v4) == 1)) {
+                } else if (sCommPlayerManager->isUnderground && (ov23_0224B8E0(netId, x, z) == 1)) {
                     continue;
-                } else if (CommPlayer_CheckCollision(v3, v4, v5)) {
-                    playerLocation->unk_07 = 1;
-                    sCommPlayerManager->unk_132[v5] = 1;
-                    sCommPlayerManager->unk_13A[v5] = 4;
+                } else if (CommPlayer_CheckCollision(x, z, netId)) {
+                    playerLocation->collisionFlag = 1;
+                    sCommPlayerManager->unk_132[netId] = 1;
+                    sCommPlayerManager->unk_13A[netId] = 4;
                 } else {
-                    sCommPlayerManager->unk_132[v5] = 1;
-                    playerLocation->x = v3;
-                    playerLocation->z = v4;
+                    sCommPlayerManager->unk_132[netId] = 1;
+                    playerLocation->x = x;
+                    playerLocation->z = z;
                     playerLocation->dir = dir;
 
-                    sCommPlayerManager->unk_13A[v5] = sub_020581E0(playerLocation->moveSpeed);
+                    sCommPlayerManager->unk_13A[netId] = sub_020581E0(playerLocation->moveSpeed);
 
-                    if (sCommPlayerManager->unk_11A[v5] != 0) {
-                        sCommPlayerManager->unk_11A[v5]--;
+                    if (sCommPlayerManager->unk_11A[netId] != 0) {
+                        sCommPlayerManager->unk_11A[netId]--;
 
-                        if (sCommPlayerManager->unk_11A[v5] == 0) {
+                        if (sCommPlayerManager->unk_11A[netId] == 0) {
                             u8 v10 = 1;
-                            ov23_0224540C(v5, 1, &v10, NULL);
+                            ov23_0224540C(netId, 1, &v10, NULL);
                         }
                     }
                 }
@@ -846,7 +842,7 @@ static void CommPlayer_Move (SysTask * param0, void * param1)
     }
 }
 
-void CommPlayer_RecvLocation (int param0, int param1, void * src, void * param3)
+void CommPlayer_RecvLocation (int netId, int param1, void * src, void * param3)
 {
     u8 * buffer = (u8 *)src;
     CommPlayerLocation * playerLocation;
@@ -855,10 +851,10 @@ void CommPlayer_RecvLocation (int param0, int param1, void * src, void * param3)
         return;
     }
 
-    playerLocation = &sCommPlayerManager->playerLocationServer[param0];
+    playerLocation = &sCommPlayerManager->playerLocationServer[netId];
 
     if (buffer[4] & 0x80) {
-        sCommPlayerManager->unk_2BB = 1;
+        sCommPlayerManager->unk_2BB = TRUE;
         return;
     }
 
@@ -878,17 +874,17 @@ void CommPlayer_RecvLocation (int param0, int param1, void * src, void * param3)
     playerLocation->z += ((u32)buffer[3] << 8) & 0xff00;
     playerLocation->dir = buffer[4] & 0xf;
 
-    sCommPlayerManager->isActive[param0] = 1;
-    sCommPlayerManager->unk_132[param0] = 1;
+    sCommPlayerManager->isActive[netId] = 1;
+    sCommPlayerManager->unk_132[netId] = 1;
 
     if (FieldSystem_CheckCollision(sCommPlayerManager->fieldSys, playerLocation->x, playerLocation->z)) {
         GF_ASSERT(0);
     }
 }
 
-void CommPlayer_RecvDelete (int param0, int param1, void * param2, void * param3)
+void CommPlayer_RecvDelete (int unused0, int unused2, void * src, void * param3)
 {
-    u8 * buffer = (u8 *)param2;
+    u8 * buffer = (u8 *)src;
     u8 netId = buffer[0];
 
     if (sCommPlayerManager == NULL) {
@@ -920,9 +916,9 @@ void sub_020585A8 (int param0, int param1, void * src, void * param3)
 {
     u8 * buffer = (u8 *)src;
     CommPlayerLocation * playerLocation;
-    int v3;
+    int netJd;
 
-    v3 = buffer[0] & 0xf;
+    netJd = buffer[0] & 0xf;
 
     if (sCommPlayerManager == NULL) {
         return;
@@ -932,12 +928,12 @@ void sub_020585A8 (int param0, int param1, void * src, void * param3)
         return;
     }
 
-    playerLocation = &sCommPlayerManager->playerLocation[v3];
+    playerLocation = &sCommPlayerManager->playerLocation[netJd];
 
     if (buffer[2] & 0x80) {
-        playerLocation->unk_07 = 1;
+        playerLocation->collisionFlag = 1;
     } else {
-        playerLocation->unk_07 = 0;
+        playerLocation->collisionFlag = 0;
     }
 
     playerLocation->x = 0;
@@ -949,7 +945,7 @@ void sub_020585A8 (int param0, int param1, void * src, void * param3)
     playerLocation->dir = ((buffer[0] >> 4) & 0x3);
     playerLocation->moveSpeed = ((buffer[0] >> 6) & 0x3);
 
-    CommPlayer_Add(v3);
+    CommPlayer_Add(netJd);
 }
 
 static void sub_02058644 (int param0)
@@ -968,52 +964,48 @@ static void sub_02058644 (int param0)
     }
 }
 
-static BOOL sub_020586A8 (int param0, int param1, int param2, int param3)
+static BOOL sub_020586A8 (int netId, int param1, int param2, int animSpeed)
 {
     LocalMapObject * obj;
-    u8 v3[] = {
+    u8 walkAnimationCode[] = {
         0x14, 0x15, 0x16, 0x17, 0x10, 0x11, 0x12, 0x13, 0xc, 0xd, 0xe, 0xf
     };
 
-    if ((sCommPlayerManager->unk_102[param0] == -1) || (sCommPlayerManager->playerAvatar[param0] == NULL)) {
-        return 0;
+    if ((sCommPlayerManager->blowDir[netId] == -1) || (sCommPlayerManager->playerAvatar[netId] == NULL)) {
+        return FALSE;
     }
 
     if (param1 == 0) {
-        return 1;
+        return TRUE;
     }
 
-    obj = Player_LocalMapObject(sCommPlayerManager->playerAvatar[param0]);
+    obj = Player_LocalMapObject(sCommPlayerManager->playerAvatar[netId]);
 
-    if (Player_Dir(sCommPlayerManager->playerAvatar[param0]) != CommPlayer_GetOppositeDir(sCommPlayerManager->unk_102[param0])) {
+    if (Player_Dir(sCommPlayerManager->playerAvatar[netId]) != CommPlayer_GetOppositeDir(sCommPlayerManager->blowDir[netId])) {
         sub_020628C4(obj, (1 << 7));
-        Player_SetDir(sCommPlayerManager->playerAvatar[param0], CommPlayer_GetOppositeDir(sCommPlayerManager->unk_102[param0]));
+        Player_SetDir(sCommPlayerManager->playerAvatar[netId], CommPlayer_GetOppositeDir(sCommPlayerManager->blowDir[netId]));
         sub_020628BC(obj, (1 << 7));
     }
 
-    if (sub_02065684(obj) == 1) {
-        (void)0;
-    }
+    LocalMapObj_CheckAnimationFinished(obj);
 
-    if (sub_020655F4(obj) == 1) {
-        sub_02058644(param0);
+    if (LocalMapObj_IsAnimationSet(obj) == 1) {
+        sub_02058644(netId);
 
-        switch (param3) {
+        switch (animSpeed) {
         case 0:
-            sub_02065638(obj, v3[sCommPlayerManager->unk_102[param0]]);
+            LocalMapObj_SetAnimationCode(obj, walkAnimationCode[sCommPlayerManager->blowDir[netId]]);
             break;
         case 1:
-            sub_02065638(obj, v3[sCommPlayerManager->unk_102[param0] + 4]);
+            LocalMapObj_SetAnimationCode(obj, walkAnimationCode[sCommPlayerManager->blowDir[netId] + 4]);
             break;
         case 2:
-            sub_02065638(obj, v3[sCommPlayerManager->unk_102[param0] + 8]);
+            LocalMapObj_SetAnimationCode(obj, walkAnimationCode[sCommPlayerManager->blowDir[netId] + 8]);
             break;
         }
-    } else {
-        (void)0;
     }
 
-    return 1;
+    return TRUE;
 }
 
 static void CommPlayer_MoveClient (int netId)
@@ -1104,7 +1096,7 @@ static void CommPlayer_MoveClient (int netId)
             } else if (!sub_02035EE0() && sCommPlayerManager->isUnderground && (netId == CommSys_CurNetId())) {
                 v9 = sub_0206147C(
                     playerAvatar, pad, pad, v10, 1, 0);
-            } else if (((pad & ~PAD_BUTTON_B) == 0) && (playerLocation->unk_07)) {
+            } else if (((pad & ~PAD_BUTTON_B) == 0) && (playerLocation->collisionFlag)) {
                 moveSpeed = 3;
 
                 switch (playerLocation->dir) {
@@ -1186,9 +1178,9 @@ static BOOL sub_02058A18 (int param0, int param1)
     if (sCommPlayerManager->unk_10A[param0] == 1) {
         return 1;
     } else if (sCommPlayerManager->unk_10A[param0] == 0) {
-        u8 v3 = 1;
+        u8 data = 1;
 
-        ov23_0224540C(param0, 1, &v3, NULL);
+        ov23_0224540C(param0, 1, &data, NULL);
         return 1;
     }
 
@@ -1252,7 +1244,7 @@ void sub_02058BA8 (int param0, int param1, BOOL param2)
     sub_020628BC(obj, (1 << 7));
     sub_020628BC(obj, (1 << 8));
 
-    sCommPlayerManager->unk_102[param0] = param1;
+    sCommPlayerManager->blowDir[param0] = param1;
 }
 
 void sub_02058BE8 (int param0)
@@ -1263,14 +1255,14 @@ void sub_02058BE8 (int param0)
         return;
     }
 
-    if (sCommPlayerManager->unk_102[param0] != -1) {
+    if (sCommPlayerManager->blowDir[param0] != -1) {
         obj = Player_LocalMapObject(sCommPlayerManager->playerAvatar[param0]);
 
         sub_020656AC(obj);
         sub_020628C4(obj, (1 << 7));
         sub_020628C4(obj, (1 << 8));
 
-        sCommPlayerManager->unk_102[param0] = -1;
+        sCommPlayerManager->blowDir[param0] = -1;
     }
 }
 
@@ -1420,7 +1412,7 @@ int CommPlayer_AddXServer (int netId)
     return sCommPlayerManager->playerLocationServer[netId].x + sub_0206419C(sCommPlayerManager->playerLocationServer[netId].dir);
 }
 
-int sub_02058F18 (int param0)
+int CommPlayer_AddZServer (int param0)
 {
     if (sub_02058E4C(param0) == 0xffff) {
         return 0xffff;
@@ -1489,7 +1481,7 @@ void sub_02059058 (int netId, BOOL param1)
 {
     if (sCommPlayerManager->unk_E2[netId] != param1) {
         sCommPlayerManager->unk_E2[netId] = param1;
-        sCommPlayerManager->playerLocationServer[netId].unk_07 = 0;
+        sCommPlayerManager->playerLocationServer[netId].collisionFlag = 0;
         sCommPlayerManager->unk_132[netId] = 1;
         sCommPlayerManager->playerLocationServer[netId].moveSpeed = 2;
     }
@@ -1521,7 +1513,7 @@ BOOL sub_020590C4 (void)
         {11, 8}
     };
     int connectedPlayers = sub_02036148(sub_0203895C());
-    int netId, v4, v5 = 0, v6[4], v7;
+    int netId, netJd, playerCnt = 0, v6[4], v7;
     int v8 = 0;
     UnkStruct_020590C4 * v9;
 
@@ -1532,12 +1524,12 @@ BOOL sub_020590C4 (void)
     }
 
     for (netId = 0; netId < connectedPlayers; netId++) {
-        for (v4 = 0; v4 < connectedPlayers; v4++) {
-            if ((CommPlayer_XPos(v4) == v9[netId].unk_00) && (CommPlayer_ZPos(v4) == v9[netId].unk_02)) {
-                v5++;
-                v6[v4] = netId;
+        for (netJd = 0; netJd < connectedPlayers; netJd++) {
+            if ((CommPlayer_XPos(netJd) == v9[netId].unk_00) && (CommPlayer_ZPos(netJd) == v9[netId].unk_02)) {
+                playerCnt++;
+                v6[netJd] = netId;
 
-                if (v4 == CommSys_CurNetId()) {
+                if (netJd == CommSys_CurNetId()) {
                     v8 = 1;
                 }
                 break;
@@ -1545,7 +1537,7 @@ BOOL sub_020590C4 (void)
         }
     }
 
-    if (v5 == connectedPlayers) {
+    if (playerCnt == connectedPlayers) {
         for (netId = 0; netId < connectedPlayers; netId++) {
             sub_020362DC(v6[netId], netId);
         }
@@ -1580,8 +1572,7 @@ static UnkStruct_020590C4 Unk_02100B74[] = {
 static void sub_020591A8 (void)
 {
     int connectedPlayers = sub_02036148(sub_0203895C());
-    int netJd, v3 = 0, v4[4];
-    int v5 = 0;
+    int netJd = 0;
     UnkStruct_020590C4 * v6;
     u8 netId;
 
@@ -1625,7 +1616,7 @@ void CommPlayer_SetBattleDir (void)
 BOOL sub_0205928C (void)
 {
     int connectedPlayers = sub_02036148(sub_0203895C());
-    int netId, v3 = 0, v4[4], v5;
+    int netId = 0, dir;
     int v6 = 0;
 
     for (netId = 0; netId < connectedPlayers; netId++) {
@@ -1637,9 +1628,9 @@ BOOL sub_0205928C (void)
     for (netId = 0; netId < connectedPlayers; netId++) {
         CommPlayerLocation * playerLocation = &sCommPlayerManager->playerLocationServer[netId];
 
-        v5 = CommPlayer_GetOppositeDir(playerLocation->dir);
-        playerLocation->x += sub_0206419C(v5);
-        playerLocation->z += sub_020641A8(v5);
+        dir = CommPlayer_GetOppositeDir(playerLocation->dir);
+        playerLocation->x += sub_0206419C(dir);
+        playerLocation->z += sub_020641A8(dir);
         playerLocation->moveSpeed = 2;
 
         sCommPlayerManager->unk_132[netId] = 1;
diff --git a/src/unk_0205A0D8.c b/src/unk_0205A0D8.c
index 1f2881e1b2..c1c78a0671 100644
--- a/src/unk_0205A0D8.c
+++ b/src/unk_0205A0D8.c
@@ -333,7 +333,7 @@ static BOOL sub_0205A324 (UnkStruct_020508D4 * param0)
         if (v0->unk_44 != 0) {
             v0->unk_44--;
         } else {
-            if (sub_02065684(Player_LocalMapObject(v1->playerAvatar))) {
+            if (LocalMapObj_CheckAnimationFinished(Player_LocalMapObject(v1->playerAvatar))) {
                 v0->unk_34 = 11;
             }
         }
diff --git a/src/unk_0205C22C.c b/src/unk_0205C22C.c
index 3514c70e54..bc241760ce 100644
--- a/src/unk_0205C22C.c
+++ b/src/unk_0205C22C.c
@@ -263,7 +263,7 @@ static void sub_0205C51C (UnkStruct_0205C22C * param0, UnkStruct_02061830 * para
 
         switch (param0->unk_0C[v1].unk_01) {
         case 0:
-            if (sub_020655F4(v0) == 1) {
+            if (LocalMapObj_IsAnimationSet(v0) == 1) {
                 int v4 = param0->unk_0C[v1].unk_00;
 
                 if ((v4 == 1) || (v4 == 2)) {
@@ -272,7 +272,7 @@ static void sub_0205C51C (UnkStruct_0205C22C * param0, UnkStruct_02061830 * para
             }
             break;
         case 1:
-            if (sub_020655F4(v0) == 1) {
+            if (LocalMapObj_IsAnimationSet(v0) == 1) {
                 if (param0->unk_0C[v1].unk_00 == 3) {
                     param0->unk_0C[v1].unk_01 = 0;
                     param0->unk_0C[v1].unk_00 = 0;
@@ -295,7 +295,7 @@ static void sub_0205C51C (UnkStruct_0205C22C * param0, UnkStruct_02061830 * para
             }
             break;
         case 2:
-            if (sub_020655F4(v0) == 1) {
+            if (LocalMapObj_IsAnimationSet(v0) == 1) {
                 sub_0205C7BC(&param0->unk_0C[v1], v0);
 
                 if (param0->unk_0C[v1].unk_00 == 3) {
@@ -306,7 +306,7 @@ static void sub_0205C51C (UnkStruct_0205C22C * param0, UnkStruct_02061830 * para
             }
             break;
         case 3:
-            if (sub_020655F4(v0) == 1) {
+            if (LocalMapObj_IsAnimationSet(v0) == 1) {
                 sub_020656AC(v0);
 
                 param0->unk_0C[v1].unk_01 = 4;
@@ -377,7 +377,7 @@ static void sub_0205C6E0 (UnkStruct_0205C680 * param0, LocalMapObject * param1,
     sub_0205C680(param0, 0);
     LocalMapObj_SetPosDir(param1, v0, v1, v2, 1);
     sub_0206296C(param1, 1);
-    sub_02065638(param1, 0x44);
+    LocalMapObj_SetAnimationCode(param1, 0x44);
     sub_02062D64(param1, 0);
     sub_02062D80(param1, 1);
 
@@ -396,7 +396,7 @@ static void sub_0205C6E0 (UnkStruct_0205C680 * param0, LocalMapObject * param1,
 
 static void sub_0205C788 (UnkStruct_0205C680 * param0, LocalMapObject * param1)
 {
-    sub_02065638(param1, 0x43);
+    LocalMapObj_SetAnimationCode(param1, 0x43);
     sub_02062DB4(param1, 1);
     sub_020633A8(param1, 0x0);
     sub_0205C680(param0, 1);
@@ -447,7 +447,7 @@ void sub_0205C820 (UnkStruct_02061830 * param0, UnkStruct_0205C22C * param1)
         GF_ASSERT(0);
     }
 
-    if (sub_020655F4(v0) == 1) {
+    if (LocalMapObj_IsAnimationSet(v0) == 1) {
         if (sub_02036AA0() || sub_02036A68()) {
             int v2;
 
@@ -466,7 +466,7 @@ void sub_0205C820 (UnkStruct_02061830 * param0, UnkStruct_0205C22C * param1)
 
                 sub_02061AD4(v0, v1->unk_08);
                 sub_0206296C(v0, 1);
-                sub_02065638(v0, 0x44);
+                LocalMapObj_SetAnimationCode(v0, 0x44);
                 sub_02062D64(v0, 0);
                 sub_02062D80(v0, 1);
 
diff --git a/src/unk_0205E7D0.c b/src/unk_0205E7D0.c
index 082c04d161..67fa2679f7 100644
--- a/src/unk_0205E7D0.c
+++ b/src/unk_0205E7D0.c
@@ -119,7 +119,7 @@ void sub_0205E8E0 (PlayerAvatar * param0)
     Heap_FreeToHeap(param0);
 }
 
-void sub_0205E8E8 (PlayerAvatar * param0)
+void Player_Delete (PlayerAvatar * param0)
 {
     LocalMapObject * v0 = Player_LocalMapObject(param0);
 
diff --git a/src/unk_0205F180.c b/src/unk_0205F180.c
index 9b2a6d0236..f9d811a87e 100644
--- a/src/unk_0205F180.c
+++ b/src/unk_0205F180.c
@@ -185,7 +185,7 @@ static int sub_0205F22C (PlayerAvatar * param0, int param1)
 
     v1 = Player_LocalMapObject(param0);
 
-    if (sub_020655F4(v1) == 1) {
+    if (LocalMapObj_IsAnimationSet(v1) == 1) {
         return 1;
     }
 
@@ -327,7 +327,7 @@ void sub_0205F490 (PlayerAvatar * param0)
         }
     }
 
-    if (sub_020655F4(v3) == 0) {
+    if (LocalMapObj_IsAnimationSet(v3) == 0) {
         switch (v0) {
         case 0:
             break;
@@ -352,7 +352,7 @@ void sub_0205F490 (PlayerAvatar * param0)
         return;
     }
 
-    if (sub_02065684(v3) == 1) {
+    if (LocalMapObj_CheckAnimationFinished(v3) == 1) {
         switch (v0) {
         case 0:
             break;
@@ -414,7 +414,7 @@ int sub_0205F588 (PlayerAvatar * param0)
 
         v3 = Player_LocalMapObject(param0);
 
-        if (sub_020655F4(v3) == 1) {
+        if (LocalMapObj_IsAnimationSet(v3) == 1) {
             return 1;
         }
 
@@ -441,7 +441,7 @@ void sub_0205F5E4 (PlayerAvatar * param0, int param1)
     sub_02062A0C(v0, 0x0);
     sub_02064208(v0);
     sub_020656DC(v0);
-    sub_02065638(v0, sub_02065838(param1, 0x0));
+    LocalMapObj_SetAnimationCode(v0, sub_02065838(param1, 0x0));
 }
 
 static int sub_0205F62C (PlayerAvatar * param0, int param1)
@@ -1692,7 +1692,7 @@ static void sub_02060AA0 (PlayerAvatar * param0, LocalMapObject * param1, int pa
 static void sub_02060B64 (PlayerAvatar * param0, LocalMapObject * param1, u32 param2, int param3)
 {
     sub_0205EC20(param0, param2, param3);
-    sub_02065638(param1, param2);
+    LocalMapObj_SetAnimationCode(param1, param2);
 }
 
 u32 sub_02060B7C (PlayerAvatar * param0, LocalMapObject * param1, int param2)
@@ -2189,7 +2189,7 @@ int sub_020613AC (PlayerAvatar * param0)
 {
     LocalMapObject * v0 = Player_LocalMapObject(param0);
 
-    if (sub_020655F4(v0) == 1) {
+    if (LocalMapObj_IsAnimationSet(v0) == 1) {
         return 1;
     }
 
@@ -2341,7 +2341,7 @@ u32 sub_0206147C (PlayerAvatar * param0, u16 param1, u16 param2, int param3, int
 int sub_02061544 (PlayerAvatar * param0)
 {
     LocalMapObject * v0 = Player_LocalMapObject(param0);
-    return sub_020655F4(v0);
+    return LocalMapObj_IsAnimationSet(v0);
 }
 
 void sub_02061550 (PlayerAvatar * param0, u32 param1, int param2)
diff --git a/src/unk_020655F4.c b/src/unk_020655F4.c
index ddf7e269ff..2c8b54f2c1 100644
--- a/src/unk_020655F4.c
+++ b/src/unk_020655F4.c
@@ -120,7 +120,7 @@ static const fx32 Unk_020EEE84[7];
 static const fx32 Unk_020EEE6C[6];
 static const fx32 Unk_020EECEC[3];
 
-int sub_020655F4 (const LocalMapObject * param0)
+int LocalMapObj_IsAnimationSet (const LocalMapObject * param0)
 {
     if (sub_020628D8(param0, (1 << 0)) == 0) {
         return 0;
@@ -137,7 +137,7 @@ int sub_020655F4 (const LocalMapObject * param0)
     return 1;
 }
 
-void sub_02065638 (LocalMapObject * param0, int param1)
+void LocalMapObj_SetAnimationCode (LocalMapObject * param0, int param1)
 {
     GF_ASSERT(param1 < 0x9a);
 
@@ -154,7 +154,7 @@ void sub_02065668 (LocalMapObject * param0, int param1)
     sub_020628C4(param0, (1 << 5));
 }
 
-int sub_02065684 (const LocalMapObject * param0)
+int LocalMapObj_CheckAnimationFinished (const LocalMapObject * param0)
 {
     if (sub_020628D8(param0, (1 << 4)) == 0) {
         return 1;
@@ -228,7 +228,7 @@ void sub_02065758 (SysTask * param0)
 
     v0 = sub_0201CED0(param0);
 
-    GF_ASSERT(sub_02065684(v0->unk_0C) == 1);
+    GF_ASSERT(LocalMapObj_CheckAnimationFinished(v0->unk_0C) == 1);
 
     sub_020656AC(v0->unk_0C);
     Heap_FreeToHeapExplicit(4, v0);
@@ -256,7 +256,7 @@ static int sub_020657A4 (UnkStruct_020EEE54 * param0)
 
 static int sub_020657B0 (UnkStruct_020EEE54 * param0)
 {
-    if (sub_020655F4(param0->unk_0C) == 0) {
+    if (LocalMapObj_IsAnimationSet(param0->unk_0C) == 0) {
         return 0;
     }
 
@@ -269,7 +269,7 @@ static int sub_020657CC (UnkStruct_020EEE54 * param0)
     const UnkStruct_ov5_021F8E3C * v0;
 
     v0 = param0->unk_10;
-    sub_02065638(param0->unk_0C, v0->unk_00);
+    LocalMapObj_SetAnimationCode(param0->unk_0C, v0->unk_00);
 
     param0->unk_00 = 3;
 
@@ -278,7 +278,7 @@ static int sub_020657CC (UnkStruct_020EEE54 * param0)
 
 static int sub_020657E4 (UnkStruct_020EEE54 * param0)
 {
-    if (sub_02065684(param0->unk_0C) == 0) {
+    if (LocalMapObj_CheckAnimationFinished(param0->unk_0C) == 0) {
         return 0;
     }
 
diff --git a/src/unk_02067A84.c b/src/unk_02067A84.c
index 8c08e910db..199aa24c5b 100644
--- a/src/unk_02067A84.c
+++ b/src/unk_02067A84.c
@@ -495,7 +495,7 @@ static int sub_020680D0 (UnkStruct_020EF6D0 * param0)
 {
     LocalMapObject * v0 = Player_LocalMapObject(param0->unk_28);
 
-    if (sub_02065684(v0) == 0) {
+    if (LocalMapObj_CheckAnimationFinished(v0) == 0) {
         return 0;
     }
 
@@ -520,14 +520,14 @@ static int sub_02068118 (UnkStruct_020EF6D0 * param0)
 {
     int v0;
 
-    if (sub_020655F4(param0->unk_24) == 0) {
+    if (LocalMapObj_IsAnimationSet(param0->unk_24) == 0) {
         return 0;
     }
 
     GF_ASSERT(param0->unk_08 != -1);
 
     v0 = sub_02065838(param0->unk_08, 0x0);
-    sub_02065638(param0->unk_24, v0);
+    LocalMapObj_SetAnimationCode(param0->unk_24, v0);
     param0->unk_00 = 4;
 
     return 0;
@@ -535,7 +535,7 @@ static int sub_02068118 (UnkStruct_020EF6D0 * param0)
 
 static int sub_02068150 (UnkStruct_020EF6D0 * param0)
 {
-    if (sub_02065684(param0->unk_24) == 0) {
+    if (LocalMapObj_CheckAnimationFinished(param0->unk_24) == 0) {
         return 0;
     }
 
@@ -563,7 +563,7 @@ static int sub_02068188 (UnkStruct_020EF6D0 * param0)
 
 static int sub_020681A4 (UnkStruct_020EF6D0 * param0)
 {
-    sub_02065638(param0->unk_24, 0x65);
+    LocalMapObj_SetAnimationCode(param0->unk_24, 0x65);
     param0->unk_00 = 8;
 
     return 0;
@@ -571,7 +571,7 @@ static int sub_020681A4 (UnkStruct_020EF6D0 * param0)
 
 static int sub_020681B8 (UnkStruct_020EF6D0 * param0)
 {
-    if (sub_02065684(param0->unk_24) == 1) {
+    if (LocalMapObj_CheckAnimationFinished(param0->unk_24) == 1) {
         param0->unk_00 = 9;
     }
 
@@ -605,9 +605,9 @@ static int sub_02068200 (UnkStruct_020EF6D0 * param0)
 {
     int v0;
 
-    if (sub_020655F4(param0->unk_24) == 1) {
+    if (LocalMapObj_IsAnimationSet(param0->unk_24) == 1) {
         v0 = sub_02065838(param0->unk_08, 0xc);
-        sub_02065638(param0->unk_24, v0);
+        LocalMapObj_SetAnimationCode(param0->unk_24, v0);
         param0->unk_00 = 12;
     }
 
@@ -616,7 +616,7 @@ static int sub_02068200 (UnkStruct_020EF6D0 * param0)
 
 static int sub_02068228 (UnkStruct_020EF6D0 * param0)
 {
-    if (sub_02065684(param0->unk_24) == 0) {
+    if (LocalMapObj_CheckAnimationFinished(param0->unk_24) == 0) {
         return 0;
     }
 
@@ -649,10 +649,10 @@ static int sub_02068264 (UnkStruct_020EF6D0 * param0)
     v1 = sub_02064488(sub_02063020(v2), sub_02063040(v2), sub_02063020(param0->unk_24), sub_02063040(param0->unk_24));
 
     if ((Player_Dir(param0->unk_28) != v1) && ((param0->unk_18 == 0) || (param0->unk_14 == 2))) {
-        if (sub_020655F4(v2) == 1) {
+        if (LocalMapObj_IsAnimationSet(v2) == 1) {
             sub_020628C4(v2, (1 << 7));
             v0 = sub_02065838(v1, 0x0);
-            sub_02065638(v2, v0);
+            LocalMapObj_SetAnimationCode(v2, v0);
             param0->unk_00 = 15;
         }
     } else {
@@ -668,7 +668,7 @@ static int sub_020682E0 (UnkStruct_020EF6D0 * param0)
 
     v0 = Player_LocalMapObject(param0->unk_28);
 
-    if (sub_02065684(v0) == 0) {
+    if (LocalMapObj_CheckAnimationFinished(v0) == 0) {
         return 0;
     }
 

From b84b8bdc8f5f6e9d739629ef4bd3e9405afd4620 Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Wed, 3 Apr 2024 23:03:34 -0400
Subject: [PATCH 09/11] Rename file

---
 include/{unk_02057518.h => comm_player_manager.h} | 0
 platinum.us/main.lsf                              | 2 +-
 src/{unk_02057518.c => comm_player_manager.c}     | 2 +-
 src/field_comm_manager.c                          | 2 +-
 src/meson.build                                   | 2 +-
 src/overlay005/ov5_021D0D80.c                     | 2 +-
 src/overlay005/ov5_021D1C30.c                     | 2 +-
 src/overlay023/ov23_0223E140.c                    | 2 +-
 src/overlay023/ov23_022416A8.c                    | 2 +-
 src/overlay023/ov23_02241F74.c                    | 2 +-
 src/overlay023/ov23_0224340C.c                    | 2 +-
 src/overlay023/ov23_02248F1C.c                    | 2 +-
 src/overlay023/ov23_022499E4.c                    | 2 +-
 src/overlay023/ov23_0224A1D0.c                    | 2 +-
 src/overlay023/ov23_0224B05C.c                    | 2 +-
 src/overlay023/ov23_0224DC40.c                    | 2 +-
 src/overlay023/ov23_0224F294.c                    | 2 +-
 src/overlay023/ov23_0225128C.c                    | 2 +-
 src/overlay023/ov23_022521F0.c                    | 2 +-
 src/overlay023/ov23_02253598.c                    | 2 +-
 src/unk_0203CC84.c                                | 2 +-
 src/unk_0203F6C4.c                                | 2 +-
 src/unk_0205A0D8.c                                | 2 +-
 src/unk_02099500.c                                | 2 +-
 24 files changed, 23 insertions(+), 23 deletions(-)
 rename include/{unk_02057518.h => comm_player_manager.h} (100%)
 rename src/{unk_02057518.c => comm_player_manager.c} (99%)

diff --git a/include/unk_02057518.h b/include/comm_player_manager.h
similarity index 100%
rename from include/unk_02057518.h
rename to include/comm_player_manager.h
diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf
index 6a2920285c..764a0f2807 100644
--- a/platinum.us/main.lsf
+++ b/platinum.us/main.lsf
@@ -238,7 +238,7 @@ Static main
 	Object main.nef.p/src_unk_02056B30.c.o
 	Object main.nef.p/src_unk_020573FC.c.o
 	Object main.nef.p/src_unk_0205749C.c.o
-	Object main.nef.p/src_unk_02057518.c.o
+	Object main.nef.p/src_comm_player_manager.c.o
 	Object main.nef.p/src_field_comm_manager.c.o
 	Object main.nef.p/src_unk_0205A0D8.c.o
 	Object main.nef.p/src_unk_0205B33C.c.o
diff --git a/src/unk_02057518.c b/src/comm_player_manager.c
similarity index 99%
rename from src/unk_02057518.c
rename to src/comm_player_manager.c
index 56aedb6a06..231d745fd3 100644
--- a/src/unk_02057518.c
+++ b/src/comm_player_manager.c
@@ -31,7 +31,7 @@
 #include "unk_0203A378.h"
 #include "unk_0203CC84.h"
 #include "unk_02054D00.h"
-#include "unk_02057518.h"
+#include "comm_player_manager.h"
 #include "unk_0205E7D0.h"
 #include "unk_0205F180.h"
 #include "unk_02061804.h"
diff --git a/src/field_comm_manager.c b/src/field_comm_manager.c
index adca18272b..b2e82a67f9 100644
--- a/src/field_comm_manager.c
+++ b/src/field_comm_manager.c
@@ -24,7 +24,7 @@
 #include "unk_0203CC84.h"
 #include "unk_0203E880.h"
 #include "unk_02050A74.h"
-#include "unk_02057518.h"
+#include "comm_player_manager.h"
 #include "field_comm_manager.h"
 #include "unk_0205A0D8.h"
 #include "unk_02071D40.h"
diff --git a/src/meson.build b/src/meson.build
index c4a5e7fcc3..a76af914af 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -226,7 +226,7 @@ pokeplatinum_c = files(
     'unk_02056B30.c',
     'unk_020573FC.c',
     'unk_0205749C.c',
-    'unk_02057518.c',
+    'comm_player_manager.c',
     'field_comm_manager.c',
     'unk_0205A0D8.c',
     'unk_0205B33C.c',
diff --git a/src/overlay005/ov5_021D0D80.c b/src/overlay005/ov5_021D0D80.c
index a6040d4a4b..4d6a363bb4 100644
--- a/src/overlay005/ov5_021D0D80.c
+++ b/src/overlay005/ov5_021D0D80.c
@@ -60,7 +60,7 @@
 #include "unk_020556C4.h"
 #include "unk_020559DC.h"
 #include "unk_02055C50.h"
-#include "unk_02057518.h"
+#include "comm_player_manager.h"
 #include "unk_0205D8CC.h"
 #include "unk_0205E7D0.h"
 #include "unk_02061804.h"
diff --git a/src/overlay005/ov5_021D1C30.c b/src/overlay005/ov5_021D1C30.c
index f8ba123606..0f72775a8f 100644
--- a/src/overlay005/ov5_021D1C30.c
+++ b/src/overlay005/ov5_021D1C30.c
@@ -41,7 +41,7 @@
 #include "unk_02054D00.h"
 #include "unk_020562F8.h"
 #include "unk_02056B30.h"
-#include "unk_02057518.h"
+#include "comm_player_manager.h"
 #include "field_comm_manager.h"
 #include "unk_0205A0D8.h"
 #include "unk_0205B33C.h"
diff --git a/src/overlay023/ov23_0223E140.c b/src/overlay023/ov23_0223E140.c
index 4bc1d3986d..f6c000386a 100644
--- a/src/overlay023/ov23_0223E140.c
+++ b/src/overlay023/ov23_0223E140.c
@@ -68,7 +68,7 @@
 #include "unk_020507CC.h"
 #include "unk_020508D4.h"
 #include "unk_02054D00.h"
-#include "unk_02057518.h"
+#include "comm_player_manager.h"
 #include "unk_0206A8DC.h"
 #include "unk_0206AFE0.h"
 #include "unk_0206CCB0.h"
diff --git a/src/overlay023/ov23_022416A8.c b/src/overlay023/ov23_022416A8.c
index c117f39673..0eefe3bc52 100644
--- a/src/overlay023/ov23_022416A8.c
+++ b/src/overlay023/ov23_022416A8.c
@@ -23,7 +23,7 @@
 #include "unk_0203CC84.h"
 #include "unk_020507CC.h"
 #include "unk_02054D00.h"
-#include "unk_02057518.h"
+#include "comm_player_manager.h"
 #include "unk_0206A8DC.h"
 #include "overlay005/ov5_021F575C.h"
 #include "overlay023/ov23_0223E140.h"
diff --git a/src/overlay023/ov23_02241F74.c b/src/overlay023/ov23_02241F74.c
index 14a1bff6e4..96c05028b1 100644
--- a/src/overlay023/ov23_02241F74.c
+++ b/src/overlay023/ov23_02241F74.c
@@ -38,7 +38,7 @@
 #include "unk_0203CC84.h"
 #include "unk_020507CC.h"
 #include "unk_02054D00.h"
-#include "unk_02057518.h"
+#include "comm_player_manager.h"
 #include "unk_0206A8DC.h"
 #include "overlay005/ov5_021E779C.h"
 #include "overlay005/ov5_021EAFA4.h"
diff --git a/src/overlay023/ov23_0224340C.c b/src/overlay023/ov23_0224340C.c
index 2a613da83f..7b4451736c 100644
--- a/src/overlay023/ov23_0224340C.c
+++ b/src/overlay023/ov23_0224340C.c
@@ -49,7 +49,7 @@
 #include "unk_0203CC84.h"
 #include "unk_020507CC.h"
 #include "unk_02054D00.h"
-#include "unk_02057518.h"
+#include "comm_player_manager.h"
 #include "unk_0205E7D0.h"
 #include "unk_02063400.h"
 #include "unk_0206AFE0.h"
diff --git a/src/overlay023/ov23_02248F1C.c b/src/overlay023/ov23_02248F1C.c
index aa9882b569..529033cb54 100644
--- a/src/overlay023/ov23_02248F1C.c
+++ b/src/overlay023/ov23_02248F1C.c
@@ -35,7 +35,7 @@
 #include "unk_020218BC.h"
 #include "strbuf.h"
 #include "communication_system.h"
-#include "unk_02057518.h"
+#include "comm_player_manager.h"
 #include "unk_0205D8CC.h"
 #include "unk_0205E7D0.h"
 #include "overlay023/ov23_02241F74.h"
diff --git a/src/overlay023/ov23_022499E4.c b/src/overlay023/ov23_022499E4.c
index 78b71713db..65aea22884 100644
--- a/src/overlay023/ov23_022499E4.c
+++ b/src/overlay023/ov23_022499E4.c
@@ -16,7 +16,7 @@
 #include "unk_020366A0.h"
 #include "unk_0203CC84.h"
 #include "unk_020507CC.h"
-#include "unk_02057518.h"
+#include "comm_player_manager.h"
 #include "field_comm_manager.h"
 #include "unk_0206A8DC.h"
 #include "overlay023/ov23_0223E140.h"
diff --git a/src/overlay023/ov23_0224A1D0.c b/src/overlay023/ov23_0224A1D0.c
index d413986a46..d3d0c1ca07 100644
--- a/src/overlay023/ov23_0224A1D0.c
+++ b/src/overlay023/ov23_0224A1D0.c
@@ -26,7 +26,7 @@
 #include "communication_system.h"
 #include "unk_0203CC84.h"
 #include "unk_020507CC.h"
-#include "unk_02057518.h"
+#include "comm_player_manager.h"
 #include "unk_0205E7D0.h"
 #include "unk_02063400.h"
 #include "unk_0206A8DC.h"
diff --git a/src/overlay023/ov23_0224B05C.c b/src/overlay023/ov23_0224B05C.c
index 0c376084cd..5b97179c2e 100644
--- a/src/overlay023/ov23_0224B05C.c
+++ b/src/overlay023/ov23_0224B05C.c
@@ -47,7 +47,7 @@
 #include "unk_020530C8.h"
 #include "unk_02054D00.h"
 #include "unk_020573FC.h"
-#include "unk_02057518.h"
+#include "comm_player_manager.h"
 #include "unk_0205E7D0.h"
 #include "unk_0205F180.h"
 #include "unk_02063400.h"
diff --git a/src/overlay023/ov23_0224DC40.c b/src/overlay023/ov23_0224DC40.c
index 1ab435b181..7bd77bf882 100644
--- a/src/overlay023/ov23_0224DC40.c
+++ b/src/overlay023/ov23_0224DC40.c
@@ -37,7 +37,7 @@
 #include "unk_0203CC84.h"
 #include "unk_020507CC.h"
 #include "unk_020573FC.h"
-#include "unk_02057518.h"
+#include "comm_player_manager.h"
 #include "unk_0206AFE0.h"
 #include "overlay023/ov23_02241F74.h"
 #include "overlay023/ov23_0224DC40.h"
diff --git a/src/overlay023/ov23_0224F294.c b/src/overlay023/ov23_0224F294.c
index 36827c982d..48e315ac85 100644
--- a/src/overlay023/ov23_0224F294.c
+++ b/src/overlay023/ov23_0224F294.c
@@ -49,7 +49,7 @@
 #include "communication_system.h"
 #include "unk_0203CC84.h"
 #include "unk_020530C8.h"
-#include "unk_02057518.h"
+#include "comm_player_manager.h"
 #include "unk_0205E7D0.h"
 #include "unk_0206A780.h"
 #include "unk_0207D3B8.h"
diff --git a/src/overlay023/ov23_0225128C.c b/src/overlay023/ov23_0225128C.c
index 437fcc31bc..a9178377d7 100644
--- a/src/overlay023/ov23_0225128C.c
+++ b/src/overlay023/ov23_0225128C.c
@@ -40,7 +40,7 @@
 #include "unk_0203CC84.h"
 #include "unk_020507CC.h"
 #include "unk_020508D4.h"
-#include "unk_02057518.h"
+#include "comm_player_manager.h"
 #include "unk_0205E7D0.h"
 #include "unk_0206A780.h"
 #include "unk_0206A8DC.h"
diff --git a/src/overlay023/ov23_022521F0.c b/src/overlay023/ov23_022521F0.c
index da099e9dec..33ef870c58 100644
--- a/src/overlay023/ov23_022521F0.c
+++ b/src/overlay023/ov23_022521F0.c
@@ -35,7 +35,7 @@
 #include "unk_0203A378.h"
 #include "unk_0203CC84.h"
 #include "unk_020573FC.h"
-#include "unk_02057518.h"
+#include "comm_player_manager.h"
 #include "unk_02061804.h"
 #include "overlay023/ov23_02241F74.h"
 #include "overlay023/ov23_02248C08.h"
diff --git a/src/overlay023/ov23_02253598.c b/src/overlay023/ov23_02253598.c
index fc53824c87..aea278e727 100644
--- a/src/overlay023/ov23_02253598.c
+++ b/src/overlay023/ov23_02253598.c
@@ -35,7 +35,7 @@
 #include "unk_0202854C.h"
 #include "unk_0202CD50.h"
 #include "communication_system.h"
-#include "unk_02057518.h"
+#include "comm_player_manager.h"
 #include "overlay023/ov23_02241F74.h"
 #include "overlay023/ov23_02253598.h"
 #include "overlay023/ov23_02253D40.h"
diff --git a/src/unk_0203CC84.c b/src/unk_0203CC84.c
index 0a68eb1979..9f3704500c 100644
--- a/src/unk_0203CC84.c
+++ b/src/unk_0203CC84.c
@@ -29,7 +29,7 @@
 #include "unk_0203CC84.h"
 #include "unk_020508D4.h"
 #include "unk_020530C8.h"
-#include "unk_02057518.h"
+#include "comm_player_manager.h"
 #include "unk_0205F180.h"
 #include "pokeradar.h"
 #include "unk_0207D3B8.h"
diff --git a/src/unk_0203F6C4.c b/src/unk_0203F6C4.c
index 3af1bbc731..8f4d692065 100644
--- a/src/unk_0203F6C4.c
+++ b/src/unk_0203F6C4.c
@@ -155,7 +155,7 @@
 #include "unk_020559DC.h"
 #include "poketch_data.h"
 #include "unk_0205749C.h"
-#include "unk_02057518.h"
+#include "comm_player_manager.h"
 #include "field_comm_manager.h"
 #include "unk_0205B33C.h"
 #include "unk_0205C22C.h"
diff --git a/src/unk_0205A0D8.c b/src/unk_0205A0D8.c
index c1c78a0671..3f1aa16a5f 100644
--- a/src/unk_0205A0D8.c
+++ b/src/unk_0205A0D8.c
@@ -43,7 +43,7 @@
 #include "unk_0203CC84.h"
 #include "unk_0203D1B8.h"
 #include "unk_020508D4.h"
-#include "unk_02057518.h"
+#include "comm_player_manager.h"
 #include "field_comm_manager.h"
 #include "unk_0205A0D8.h"
 #include "unk_0205D8CC.h"
diff --git a/src/unk_02099500.c b/src/unk_02099500.c
index 716e13e0b1..9bd3157753 100644
--- a/src/unk_02099500.c
+++ b/src/unk_02099500.c
@@ -9,7 +9,7 @@
 #include "unk_0204FA34.h"
 #include "unk_0205001C.h"
 #include "unk_02050548.h"
-#include "unk_02057518.h"
+#include "comm_player_manager.h"
 #include "field_comm_manager.h"
 #include "unk_0205A0D8.h"
 #include "unk_0205B33C.h"

From f15a347dd09b282da284a752add7c9cbed491bfa Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Thu, 4 Apr 2024 12:08:26 -0400
Subject: [PATCH 10/11] Requested changes

---
 include/comm_player_manager.h             | 70 +++++++++++++++++++---
 include/overlay023/struct_ov23_0224A294.h | 60 -------------------
 include/struct_defs/struct_02057B48.h     |  2 +-
 src/comm_player_manager.c                 | 13 ++---
 src/field_comm_manager.c                  |  4 +-
 src/overlay005/ov5_021D0D80.c             |  2 +-
 src/overlay023/ov23_02241F74.c            |  2 +-
 src/overlay023/ov23_0224A1D0.c            | 71 +++++++++++------------
 src/overlay023/ov23_0224B05C.c            |  2 +-
 src/overlay023/ov23_0224DC40.c            |  2 +-
 10 files changed, 110 insertions(+), 118 deletions(-)
 delete mode 100644 include/overlay023/struct_ov23_0224A294.h

diff --git a/include/comm_player_manager.h b/include/comm_player_manager.h
index 06ed38b38b..9f7bfaace8 100644
--- a/include/comm_player_manager.h
+++ b/include/comm_player_manager.h
@@ -1,11 +1,65 @@
-#ifndef POKEPLATINUM_UNK_02057518_H
-#define POKEPLATINUM_UNK_02057518_H
+#ifndef POKEPLATINUM_COMM_PLAYER_MANAGER_H
+#define POKEPLATINUM_COMM_PLAYER_MANAGER_H
 
 #include "field/field_system_decl.h"
-#include "overlay023/struct_ov23_0224A294.h"
+#include "struct_decls/sys_task.h"
+#include "trainer_info.h"
+#include "field/field_system_decl.h"
+#include "struct_defs/struct_02057B48.h"
+#include "struct_decls/struct_0205E884_decl.h"
+#include "communication_system.h"
+#include "overlay023/struct_ov23_0224991C_decl.h"
+#include "overlay023/struct_ov23_0224A294_sub1.h"
+#include "overlay023/struct_ov23_0224ABC4.h"
+#include "overlay101/struct_ov101_021D5D90_decl.h"
 
-CommPlayerManager * CommPlayerData_Get(void);
-BOOL CommPlayerManager_Init(void * param0, FieldSystem * param1, BOOL param2);
+typedef struct CommPlayerManager {
+    u32 unk_00;
+    UnkStruct_ov23_0224991C * unk_04;
+    PlayerAvatar * playerAvatar[MAX_CONNECTED_PLAYERS];
+    UnkStruct_ov101_021D5D90 * unk_28[MAX_CONNECTED_PLAYERS];
+    u8 isActive[MAX_CONNECTED_PLAYERS];
+    SysTask * task;
+    FieldSystem * fieldSys;
+    UnkStruct_ov23_0224A294_sub1 unk_58;
+    u8 unk_5A[MAX_CONNECTED_PLAYERS];
+    CommPlayerLocation playerLocationServer[MAX_CONNECTED_PLAYERS];
+    CommPlayerLocation playerLocation[MAX_CONNECTED_PLAYERS];
+    u8 unk_E2[MAX_CONNECTED_PLAYERS];
+    u8 unk_EA[MAX_CONNECTED_PLAYERS];
+    u8 unk_F2[MAX_CONNECTED_PLAYERS];
+    u8 unk_FA[MAX_CONNECTED_PLAYERS];
+    s8 blowDir[MAX_CONNECTED_PLAYERS];
+    u8 unk_10A[MAX_CONNECTED_PLAYERS];
+    u8 unk_112[MAX_CONNECTED_PLAYERS];
+    u8 unk_11A[MAX_CONNECTED_PLAYERS];
+    u8 unk_122[MAX_CONNECTED_PLAYERS];
+    u8 unk_12A[MAX_CONNECTED_PLAYERS];
+    u8 unk_132[MAX_CONNECTED_PLAYERS];
+    u8 unk_13A[MAX_CONNECTED_PLAYERS];
+    u8 unk_142[MAX_CONNECTED_PLAYERS];
+    UnkStruct_ov23_0224ABC4 unk_14A[8 + 1];
+    TrainerInfo * unk_27C[5];
+    TrainerInfo * unk_290[MAX_CONNECTED_PLAYERS];
+    u16 unk_2B0;
+    u16 unk_2B2;
+    u8 unk_2B4[4];
+    u8 unk_2B8;
+    u8 unk_2B9;
+    u8 unk_2BA;
+    u8 unk_2BB;
+    u8 unk_2BC;
+    u8 isResetting;
+    u8 isUnderground;
+    u8 unk_2BF;
+    u8 forceDirTimer;
+    u8 unk_2C1;
+    u8 unk_2C2;
+    u8 unk_2C3;
+} CommPlayerManager;
+
+CommPlayerManager * CommPlayerMan_Get(void);
+BOOL CommPlayerMan_Init(void * param0, FieldSystem * param1, BOOL param2);
 void CommPlayerMan_Reset(void);
 void CommPlayerMan_Restart(void);
 void CommPlayerMan_Delete(BOOL param0);
@@ -75,8 +129,8 @@ void sub_020594FC(void);
 void sub_02059514(void);
 void sub_02059524(void);
 void sub_02059570(void);
-void CommPlayerManager_ForcePos(void);
-void CommPlayerManager_ForceDir(void);
+void CommPlayerMan_ForcePos(void);
+void CommPlayerMan_ForceDir(void);
 void sub_02059638(BOOL param0);
 
-#endif // POKEPLATINUM_UNK_02057518_H
+#endif // POKEPLATINUM_COMM_PLAYER_MANAGER_H
diff --git a/include/overlay023/struct_ov23_0224A294.h b/include/overlay023/struct_ov23_0224A294.h
deleted file mode 100644
index dee18143cd..0000000000
--- a/include/overlay023/struct_ov23_0224A294.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#ifndef POKEPLATINUM_STRUCT_OV23_0224A294_H
-#define POKEPLATINUM_STRUCT_OV23_0224A294_H
-
-#include "struct_decls/sys_task.h"
-#include "trainer_info.h"
-#include "field/field_system_decl.h"
-#include "struct_defs/struct_02057B48.h"
-#include "struct_decls/struct_0205E884_decl.h"
-#include "communication_system.h"
-#include "overlay023/struct_ov23_0224991C_decl.h"
-#include "overlay023/struct_ov23_0224A294_sub1.h"
-#include "overlay023/struct_ov23_0224ABC4.h"
-#include "overlay101/struct_ov101_021D5D90_decl.h"
-
-typedef struct CommPlayerManager {
-    u32 unk_00;
-    UnkStruct_ov23_0224991C * unk_04;
-    PlayerAvatar * playerAvatar[MAX_CONNECTED_PLAYERS];
-    UnkStruct_ov101_021D5D90 * unk_28[MAX_CONNECTED_PLAYERS];
-    u8 isActive[MAX_CONNECTED_PLAYERS];
-    SysTask * task;
-    FieldSystem * fieldSys;
-    UnkStruct_ov23_0224A294_sub1 unk_58;
-    u8 unk_5A[MAX_CONNECTED_PLAYERS];
-    CommPlayerLocation playerLocationServer[MAX_CONNECTED_PLAYERS];
-    CommPlayerLocation playerLocation[MAX_CONNECTED_PLAYERS];
-    u8 unk_E2[MAX_CONNECTED_PLAYERS];
-    u8 unk_EA[MAX_CONNECTED_PLAYERS];
-    u8 unk_F2[MAX_CONNECTED_PLAYERS];
-    u8 unk_FA[MAX_CONNECTED_PLAYERS];
-    s8 blowDir[MAX_CONNECTED_PLAYERS];
-    u8 unk_10A[MAX_CONNECTED_PLAYERS];
-    u8 unk_112[MAX_CONNECTED_PLAYERS];
-    u8 unk_11A[MAX_CONNECTED_PLAYERS];
-    u8 unk_122[MAX_CONNECTED_PLAYERS];
-    u8 unk_12A[MAX_CONNECTED_PLAYERS];
-    u8 unk_132[MAX_CONNECTED_PLAYERS];
-    u8 unk_13A[MAX_CONNECTED_PLAYERS];
-    u8 unk_142[MAX_CONNECTED_PLAYERS];
-    UnkStruct_ov23_0224ABC4 unk_14A[8 + 1];
-    TrainerInfo * unk_27C[5];
-    TrainerInfo * unk_290[MAX_CONNECTED_PLAYERS];
-    u16 unk_2B0;
-    u16 unk_2B2;
-    u8 unk_2B4[4];
-    u8 unk_2B8;
-    u8 unk_2B9;
-    u8 unk_2BA;
-    u8 unk_2BB;
-    u8 unk_2BC;
-    u8 isResetting;
-    u8 isUnderground;
-    u8 unk_2BF;
-    u8 forceDirTimer;
-    u8 unk_2C1;
-    u8 unk_2C2;
-    u8 unk_2C3;
-} CommPlayerManager;
-
-#endif // POKEPLATINUM_STRUCT_OV23_0224A294_H
diff --git a/include/struct_defs/struct_02057B48.h b/include/struct_defs/struct_02057B48.h
index 72f2c71521..c2461b7bc8 100644
--- a/include/struct_defs/struct_02057B48.h
+++ b/include/struct_defs/struct_02057B48.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_02057B48_H
 #define POKEPLATINUM_STRUCT_02057B48_H
 
-typedef struct {
+typedef struct CommPlayerLocation {
     u16 x;
     u16 z;
     s8 dir;
diff --git a/src/comm_player_manager.c b/src/comm_player_manager.c
index 231d745fd3..d4c5edf9cb 100644
--- a/src/comm_player_manager.c
+++ b/src/comm_player_manager.c
@@ -17,7 +17,6 @@
 #include "struct_defs/struct_02057B48.h"
 #include "struct_defs/struct_020590C4.h"
 #include "struct_defs/struct_020619DC.h"
-#include "overlay023/struct_ov23_0224A294.h"
 
 #include "unk_0200D9E8.h"
 #include "heap.h"
@@ -61,12 +60,12 @@ static void sub_020591A8(void);
 
 static CommPlayerManager * sCommPlayerManager = NULL;
 
-CommPlayerManager * CommPlayerData_Get (void)
+CommPlayerManager * CommPlayerMan_Get (void)
 {
     return sCommPlayerManager;
 }
 
-BOOL CommPlayerManager_Init (void * dest, FieldSystem * fieldSys, BOOL isUnderground)
+BOOL CommPlayerMan_Init (void * dest, FieldSystem * fieldSys, BOOL isUnderground)
 {
     int netId;
 
@@ -651,7 +650,7 @@ static int CommPlayer_Direction (u16 unused, u16 keys)
         return 1;
     }
 
-    return(-1);
+    return -1;
 }
 
 BOOL CommPlayer_CheckNPCCollision (int x, int z)
@@ -1610,7 +1609,7 @@ void CommPlayer_SetBattleDir (void)
     }
 
     sub_02061550(sCommPlayerManager->playerAvatar[netId], code, 1);
-    CommPlayerManager_ForceDir();
+    CommPlayerMan_ForceDir();
 }
 
 BOOL sub_0205928C (void)
@@ -1785,7 +1784,7 @@ void sub_02059570 (void)
     }
 }
 
-void CommPlayerManager_ForcePos (void)
+void CommPlayerMan_ForcePos (void)
 {
     int netId, x, z, dir;
     LocalMapObject * obj;
@@ -1814,7 +1813,7 @@ void CommPlayerManager_ForcePos (void)
     }
 }
 
-void CommPlayerManager_ForceDir (void)
+void CommPlayerMan_ForceDir (void)
 {
     sCommPlayerManager->forceDirTimer = 8;
 }
diff --git a/src/field_comm_manager.c b/src/field_comm_manager.c
index b2e82a67f9..22e85fd948 100644
--- a/src/field_comm_manager.c
+++ b/src/field_comm_manager.c
@@ -286,7 +286,7 @@ static void sub_02059984 (void)
 
     if (sub_02036540(98)) {
         v0 = Heap_AllocFromHeap(HEAP_ID_COMMUNICATION, CommPlayer_Size());
-        CommPlayerManager_Init(v0, sFieldCommMan->fieldSys, 0);
+        CommPlayerMan_Init(v0, sFieldCommMan->fieldSys, 0);
         sub_02059524();
         sub_02035EC8();
         sub_020364F0(92);
@@ -357,7 +357,7 @@ static void sub_02059AB4 (void)
 
     if (sub_02036540(98)) {
         v0 = Heap_AllocFromHeap(HEAP_ID_COMMUNICATION, CommPlayer_Size());
-        CommPlayerManager_Init(v0, sFieldCommMan->fieldSys, 0);
+        CommPlayerMan_Init(v0, sFieldCommMan->fieldSys, 0);
         sub_02059524();
         sub_020364F0(92);
         FieldCommMan_SetTask(sub_02059B10, 0);
diff --git a/src/overlay005/ov5_021D0D80.c b/src/overlay005/ov5_021D0D80.c
index 4d6a363bb4..ac52d1d0f2 100644
--- a/src/overlay005/ov5_021D0D80.c
+++ b/src/overlay005/ov5_021D0D80.c
@@ -913,7 +913,7 @@ static void ov5_021D1878 (FieldSystem * param0)
     }
 
     sub_02061C48(param0->unk_38);
-    CommPlayerManager_ForcePos();
+    CommPlayerMan_ForcePos();
     sub_02062C3C(param0->unk_38);
     ov5_021E931C(sub_0205EAFC(param0->playerAvatar), param0->unk_28);
 
diff --git a/src/overlay023/ov23_02241F74.c b/src/overlay023/ov23_02241F74.c
index 96c05028b1..4290934283 100644
--- a/src/overlay023/ov23_02241F74.c
+++ b/src/overlay023/ov23_02241F74.c
@@ -780,7 +780,7 @@ void ov23_02242BC0 (FieldSystem * param0)
         ov23_02241F74(v0, param0);
 
         v0 = Heap_AllocFromHeap(15, CommPlayer_Size());
-        CommPlayerManager_Init(v0, param0, 1);
+        CommPlayerMan_Init(v0, param0, 1);
 
         v0 = Heap_AllocFromHeap(15, ov23_02243858());
         ov23_022434BC(v0, param0);
diff --git a/src/overlay023/ov23_0224A1D0.c b/src/overlay023/ov23_0224A1D0.c
index d3d0c1ca07..d68e63fc01 100644
--- a/src/overlay023/ov23_0224A1D0.c
+++ b/src/overlay023/ov23_0224A1D0.c
@@ -10,7 +10,6 @@
 
 #include "field/field_system.h"
 #include "struct_defs/struct_02057B48.h"
-#include "overlay023/struct_ov23_0224A294.h"
 #include "overlay023/struct_ov23_0224A5CC.h"
 #include "overlay023/struct_ov23_0224ABC4.h"
 
@@ -57,12 +56,12 @@ typedef struct {
     u8 unk_02;
 } UnkStruct_ov23_0224A570;
 
-CommPlayerManager * CommPlayerData_Get(void);
+CommPlayerManager * CommPlayerMan_Get(void);
 
 void ov23_0224A1D0 (void)
 {
     int v0;
-    CommPlayerManager * v1 = CommPlayerData_Get();
+    CommPlayerManager * v1 = CommPlayerMan_Get();
 
     if (v1 == NULL) {
         return;
@@ -79,7 +78,7 @@ void ov23_0224A1D0 (void)
 static void ov23_0224A204 (int param0)
 {
     int v0;
-    CommPlayerManager * v1 = CommPlayerData_Get();
+    CommPlayerManager * v1 = CommPlayerMan_Get();
 
     if (param0 == CommSys_CurNetId()) {
         if (v1->unk_290[param0] != NULL) {
@@ -106,7 +105,7 @@ static void ov23_0224A204 (int param0)
 
 static BOOL ov23_0224A294 (int param0, int param1)
 {
-    CommPlayerManager * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerMan_Get();
 
     if ((v0->unk_290[param0] == NULL) && (v0->unk_290[param1] != NULL)) {
         v0->unk_290[param0] = v0->unk_290[param1];
@@ -149,7 +148,7 @@ static void ov23_0224A328 (int param0)
 
 static void ov23_0224A334 (int param0)
 {
-    CommPlayerManager * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerMan_Get();
 
     if (v0) {
         v0->unk_2B8 = 0;
@@ -159,7 +158,7 @@ static void ov23_0224A334 (int param0)
 void ov23_0224A348 (int param0, int param1, void * param2, void * param3)
 {
     UnkStruct_ov23_0224A348 v0;
-    CommPlayerManager * v1 = CommPlayerData_Get();
+    CommPlayerManager * v1 = CommPlayerMan_Get();
 
     v0.unk_00 = 2;
     v0.unk_01 = param0;
@@ -181,7 +180,7 @@ void ov23_0224A348 (int param0, int param1, void * param2, void * param3)
 
 void ov23_0224A3A8 (int param0, int param1, void * param2, void * param3)
 {
-    CommPlayerManager * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerMan_Get();
     UnkStruct_ov23_0224A348 * v1 = param2;
 
     if (!sub_02035EE0()) {
@@ -204,7 +203,7 @@ void ov23_0224A3A8 (int param0, int param1, void * param2, void * param3)
 
 void ov23_0224A410 (int param0, int param1, void * param2, void * param3)
 {
-    CommPlayerManager * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerMan_Get();
     UnkStruct_ov23_0224A348 * v1 = param2;
     UnkStruct_020507E4 * v2 = SaveData_Events(v0->fieldSys->unk_0C);
 
@@ -285,7 +284,7 @@ static void ov23_0224A5B0 (int param0)
 
 static void ov23_0224A5CC (SysTask * param0, void * param1)
 {
-    CommPlayerManager * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerMan_Get();
     UnkStruct_ov23_0224A5CC * v1 = param1;
     u8 v2 = v1->unk_04;
     u8 v3 = 0;
@@ -311,7 +310,7 @@ static void ov23_0224A5CC (SysTask * param0, void * param1)
 
 static void ov23_0224A620 (int param0)
 {
-    CommPlayerManager * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerMan_Get();
     UnkStruct_ov23_0224A5CC * v1 = Heap_AllocFromHeap(11, sizeof(UnkStruct_ov23_0224A5CC));
 
     v1->unk_00 = 0;
@@ -368,7 +367,7 @@ BOOL ov23_0224A6B8 (int param0)
 
 static void ov23_0224A6E4 (UnkStruct_ov23_0224A570 * param0, BOOL param1, SecretBaseRecord * param2)
 {
-    CommPlayerManager * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerMan_Get();
 
     ov23_0224321C();
 
@@ -392,7 +391,7 @@ static void ov23_0224A6E4 (UnkStruct_ov23_0224A570 * param0, BOOL param1, Secret
 
 void ov23_0224A77C (int param0, int param1, void * param2, void * param3)
 {
-    CommPlayerManager * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerMan_Get();
     UnkStruct_ov23_0224A570 * v1 = param2;
     BOOL v2;
     int v3 = 0;
@@ -510,7 +509,7 @@ void ov23_0224A77C (int param0, int param1, void * param2, void * param3)
 void ov23_0224AA84 (void)
 {
     int v0;
-    CommPlayerManager * v1 = CommPlayerData_Get();
+    CommPlayerManager * v1 = CommPlayerMan_Get();
 
     for (v0 = 0; v0 < (7 + 1); v0++) {
         v1->unk_14A[v0].unk_20 = 0xff;
@@ -519,13 +518,13 @@ void ov23_0224AA84 (void)
 
 u8 * ov23_0224AAA0 (int param0, void * param1, int param2)
 {
-    CommPlayerManager * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerMan_Get();
     return (u8 *)&v0->unk_14A[(7 + 1)];
 }
 
 void ov23_0224AAB0 (void)
 {
-    CommPlayerManager * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerMan_Get();
 
     v0->unk_2B9 = 0;
 
@@ -552,7 +551,7 @@ int ov23_0224AB2C (void)
 
 void ov23_0224AB30 (int param0, int param1, void * param2, void * param3)
 {
-    CommPlayerManager * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerMan_Get();
     int v1;
     const TrainerInfo * v2 = param2;
     Strbuf* v3;
@@ -585,7 +584,7 @@ void ov23_0224AB30 (int param0, int param1, void * param2, void * param3)
 
 void ov23_0224ABC4 (int param0, int param1, void * param2, void * param3)
 {
-    CommPlayerManager * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerMan_Get();
     UnkStruct_ov23_0224ABC4 * v1 = param2;
     int v2, v3;
 
@@ -610,7 +609,7 @@ int ov23_0224AC0C (void)
 void ov23_0224AC10 (int param0, int param1, void * param2, void * param3)
 {
     u8 * v0 = param2;
-    CommPlayerManager * v1 = CommPlayerData_Get();
+    CommPlayerManager * v1 = CommPlayerMan_Get();
 
     if (v0[0] == CommSys_CurNetId()) {
         v1->unk_2B9 = 1;
@@ -621,7 +620,7 @@ void ov23_0224AC10 (int param0, int param1, void * param2, void * param3)
 
 BOOL ov23_0224AC3C (void)
 {
-    CommPlayerManager * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerMan_Get();
     return v0->unk_2B9;
 }
 
@@ -630,7 +629,7 @@ void ov23_0224AC4C (void)
     TrainerInfo * v0 = NULL;
     int v1, v2;
     int v3 = CommSys_CurNetId();
-    CommPlayerManager * v4 = CommPlayerData_Get();
+    CommPlayerManager * v4 = CommPlayerMan_Get();
 
     if (v4->unk_290[v3]) {
         v0 = v4->unk_290[v3];
@@ -655,7 +654,7 @@ void ov23_0224AC4C (void)
 
 BOOL ov23_0224ACC0 (int param0)
 {
-    CommPlayerManager * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerMan_Get();
 
     if (v0->unk_04) {
         return !ov23_0224999C(
@@ -679,7 +678,7 @@ void ov23_0224ACF8 (int param0, int param1, void * param2, void * param3)
 
 int ov23_0224AD04 (int param0)
 {
-    CommPlayerManager * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerMan_Get();
 
     if (!v0) {
         return 0xffff;
@@ -694,7 +693,7 @@ int ov23_0224AD04 (int param0)
 
 int ov23_0224AD40 (int param0)
 {
-    CommPlayerManager * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerMan_Get();
 
     if (!v0) {
         return 0xffff;
@@ -709,19 +708,19 @@ int ov23_0224AD40 (int param0)
 
 void ov23_0224AD7C (int param0, int param1)
 {
-    CommPlayerManager * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerMan_Get();
     ov23_02249994(ov23_0224993C(v0->unk_04, param0), param1);
 }
 
 void ov23_0224AD98 (int param0)
 {
-    CommPlayerManager * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerMan_Get();
     ov23_02249994(ov23_0224993C(v0->unk_04, param0), 0);
 }
 
 void ov23_0224ADB0 (int param0, int param1, int param2, int param3)
 {
-    CommPlayerManager * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerMan_Get();
     CommPlayerLocation * v1 = &v0->playerLocationServer[param0];
 
     v1->x = param1 + sub_0206419C(param3);
@@ -731,7 +730,7 @@ void ov23_0224ADB0 (int param0, int param1, int param2, int param3)
 
 void ov23_0224ADE8 (int param0, int param1, int param2, int param3)
 {
-    CommPlayerManager * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerMan_Get();
     CommPlayerLocation * v1;
 
     if (!v0) {
@@ -763,7 +762,7 @@ void ov23_0224ADE8 (int param0, int param1, int param2, int param3)
 
 BOOL ov23_0224AE60 (int param0)
 {
-    CommPlayerManager * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerMan_Get();
 
     if (v0->unk_290[param0] != NULL) {
         Heap_FreeToHeap(v0->unk_290[param0]);
@@ -780,7 +779,7 @@ BOOL ov23_0224AE60 (int param0)
 
 BOOL ov23_0224AEA4 (int param0)
 {
-    CommPlayerManager * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerMan_Get();
 
     if (v0->unk_290[param0] != NULL) {
         return 1;
@@ -791,7 +790,7 @@ BOOL ov23_0224AEA4 (int param0)
 
 BOOL ov23_0224AEC4 (int param0, int param1)
 {
-    CommPlayerManager * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerMan_Get();
 
     if (v0->unk_290[param0] == NULL) {
         TrainerInfo * v1 = CommInfo_TrainerInfo(param1);
@@ -819,7 +818,7 @@ BOOL ov23_0224AEC4 (int param0, int param1)
 
 void ov23_0224AF4C (int param0)
 {
-    CommPlayerManager * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerMan_Get();
 
     if (v0->unk_28[param0] != NULL) {
         if (sub_020714F0(v0->unk_28[param0])) {
@@ -834,7 +833,7 @@ void ov23_0224AF4C (int param0)
 
 void ov23_0224AF7C (int param0)
 {
-    CommPlayerManager * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerMan_Get();
 
     if (!v0->isResetting) {
         if (v0->playerAvatar[param0]) {
@@ -866,7 +865,7 @@ void ov23_0224AF7C (int param0)
 
 void ov23_0224B00C (int param0)
 {
-    CommPlayerManager * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerMan_Get();
 
     if (v0->unk_FA[param0] != 1) {
         v0->unk_FA[param0] = 2;
@@ -875,7 +874,7 @@ void ov23_0224B00C (int param0)
 
 void ov23_0224B024 (int param0)
 {
-    CommPlayerManager * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerMan_Get();
 
     if (v0->unk_FA[param0] != 1) {
         v0->unk_FA[param0] = 3;
@@ -886,7 +885,7 @@ void ov23_0224B024 (int param0)
 
 void ov23_0224B040 (int param0)
 {
-    CommPlayerManager * v0 = CommPlayerData_Get();
+    CommPlayerManager * v0 = CommPlayerMan_Get();
 
     if (v0->unk_FA[param0] != 1) {
         v0->unk_FA[param0] = 0;
diff --git a/src/overlay023/ov23_0224B05C.c b/src/overlay023/ov23_0224B05C.c
index 5b97179c2e..51b569a26c 100644
--- a/src/overlay023/ov23_0224B05C.c
+++ b/src/overlay023/ov23_0224B05C.c
@@ -1672,7 +1672,7 @@ static BOOL ov23_0224C790 (UnkStruct_020508D4 * param0)
         }
         break;
     case 11:
-        CommPlayerManager_ForceDir();
+        CommPlayerMan_ForceDir();
         sub_02061550(v0->playerAvatar, sub_02065838(1, 0x24), 1);
         CommPlayer_SetDir(1);
         ov23_02253F40(ov23_0224219C(), 68, 0, NULL);
diff --git a/src/overlay023/ov23_0224DC40.c b/src/overlay023/ov23_0224DC40.c
index 7bd77bf882..613847fe93 100644
--- a/src/overlay023/ov23_0224DC40.c
+++ b/src/overlay023/ov23_0224DC40.c
@@ -1296,7 +1296,7 @@ void ov23_0224F07C (int param0, int param1, FieldSystem * param2)
     v0->unk_2E = 12;
 
     ov23_02253F40(ov23_0224219C(), 22, 0, NULL);
-    CommPlayerManager_ForceDir();
+    CommPlayerMan_ForceDir();
 
     v0->unk_00 = SysTask_Start(ov23_0224EC50, v0, 10000);
 }

From b786be09b0e283c8dfb53c99e2287bca9eae060c Mon Sep 17 00:00:00 2001
From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com>
Date: Sat, 6 Apr 2024 11:33:20 -0400
Subject: [PATCH 11/11] inline iterators

---
 src/comm_player_manager.c | 28 +++++++---------------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/src/comm_player_manager.c b/src/comm_player_manager.c
index d4c5edf9cb..96e292b461 100644
--- a/src/comm_player_manager.c
+++ b/src/comm_player_manager.c
@@ -67,8 +67,6 @@ CommPlayerManager * CommPlayerMan_Get (void)
 
 BOOL CommPlayerMan_Init (void * dest, FieldSystem * fieldSys, BOOL isUnderground)
 {
-    int netId;
-
     if (sCommPlayerManager != NULL) {
         return FALSE;
     }
@@ -88,7 +86,7 @@ BOOL CommPlayerMan_Init (void * dest, FieldSystem * fieldSys, BOOL isUnderground
 
     sCommPlayerManager->fieldSys = fieldSys;
 
-    for (netId = 0; netId < MAX_CONNECTED_PLAYERS; netId++) {
+    for (int netId = 0; netId < MAX_CONNECTED_PLAYERS; netId++) {
         sCommPlayerManager->playerLocation[netId].dir = -1;
         sCommPlayerManager->playerLocation[netId].x = 0xffff;
         sCommPlayerManager->playerLocation[netId].z = 0xffff;
@@ -116,13 +114,11 @@ BOOL CommPlayerMan_Init (void * dest, FieldSystem * fieldSys, BOOL isUnderground
 
 void CommPlayerMan_Reset (void)
 {
-    int netId;
-
     if (sCommPlayerManager == NULL) {
         return;
     }
 
-    for (netId = 0; netId < MAX_CONNECTED_PLAYERS; netId++) {
+    for (int netId = 0; netId < MAX_CONNECTED_PLAYERS; netId++) {
         if (sCommPlayerManager->isUnderground) {
             CommPlayer_Destroy(netId, TRUE, FALSE);
         } else {
@@ -182,9 +178,7 @@ void CommPlayerMan_Delete (BOOL deletePlayerData)
 
 void CommPlayerMan_Reinit (void)
 {
-    int netId;
-
-    for (netId = 0; netId < MAX_CONNECTED_PLAYERS; netId++) {
+    for (int netId = 0; netId < MAX_CONNECTED_PLAYERS; netId++) {
         if (sCommPlayerManager->isUnderground) {
             ov23_0224AF4C(netId);
             ov23_0224AD98(netId);
@@ -363,9 +357,7 @@ void sub_02057BC4 (void * param0)
 
 static void sub_02057C2C (void * param0)
 {
-    int netId;
-
-    for (netId = 0; netId < MAX_CONNECTED_PLAYERS; netId++) {
+    for (int netId = 0; netId < MAX_CONNECTED_PLAYERS; netId++) {
         if (sCommPlayerManager->isActive[netId]) {
             CommPlayerLocation * location = &sCommPlayerManager->playerLocationServer[netId];
 
@@ -498,8 +490,6 @@ static void CommPlayer_SendMoveSpeed ()
 
 static void Task_CommPlayerManagerRun (SysTask * task, void * data)
 {
-    int netId;
-
     if (CommSys_IsInitialized()) {
         CommPlayer_SendMoveSpeed();
 
@@ -517,7 +507,7 @@ static void Task_CommPlayerManagerRun (SysTask * task, void * data)
         sub_02057EF8(data);
     }
 
-    for (netId = 0; netId < MAX_CONNECTED_PLAYERS; netId++) {
+    for (int netId = 0; netId < MAX_CONNECTED_PLAYERS; netId++) {
         if (sCommPlayerManager->isUnderground) {
             if (CommSys_CurNetId() == 0) {
                 if (NULL == CommInfo_TrainerInfo(netId)) {
@@ -530,9 +520,7 @@ static void Task_CommPlayerManagerRun (SysTask * task, void * data)
 
 static void sub_02057EF8 (void * param0)
 {
-    int netId;
-
-    for (netId = 0; netId < MAX_CONNECTED_PLAYERS; netId++) {
+    for (int netId = 0; netId < MAX_CONNECTED_PLAYERS; netId++) {
         if (!CommSys_IsPlayerConnected(netId)) {
             if (!(sub_02036180() && (netId == 0))) {
                 if ((CommSys_CurNetId() == 0) && (sCommPlayerManager->isUnderground)) {
@@ -672,10 +660,8 @@ BOOL CommPlayer_CheckNPCCollision (int x, int z)
 
 static BOOL CommPlayer_CheckCollision (int x, int z, int netIdTarget)
 {
-    int netId;
-
     if ((x != 0xffff) && (z != 0xffff)) {
-        for (netId = 0; netId < MAX_CONNECTED_PLAYERS; netId++) {
+        for (int netId = 0; netId < MAX_CONNECTED_PLAYERS; netId++) {
             if (netId == netIdTarget) {
                 continue;
             }