Merge pull request #177 from adrienntindall/main

Comm Player Manager

include/comm_player_manager.h

@@ -0,0 +1,136 @@
+#ifndef POKEPLATINUM_COMM_PLAYER_MANAGER_H
+#define POKEPLATINUM_COMM_PLAYER_MANAGER_H
+
+#include "field/field_system_decl.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;
+
+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);
+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_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 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);
+void sub_02058B7C(int param0);
+void sub_02058B94(int param0);
+void sub_02058BA8(int param0, int param1, BOOL param2);
+void sub_02058BE8(int param0);
+int sub_02058C3C(void);
+BOOL sub_02058C40(void);
+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);
+int sub_02058DC0(int param0);
+int sub_02058DF8(int param0);
+int sub_02058E4C(int param0);
+int sub_02058EA0(int param0);
+int sub_02058EC0(int param0);
+int CommPlayer_AddXServer(int param0);
+int CommPlayer_AddZServer(int param0);
+int CommPlayer_Dir(int param0);
+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 CommPlayer_SetBattleDir(void);
+BOOL sub_0205928C(void);
+int CommPlayer_GetOppositeDir(int param0);
+void sub_02059354(int param0, int param1);
+void sub_02059378(int param0);
+void sub_02059390(int param0, int param1);
+void sub_020593B4(int param0);
+int sub_020593CC(int param0);
+int sub_020593E0(int param0);
+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);
+void sub_020594EC(void);
+void sub_020594FC(void);
+void sub_02059514(void);
+void sub_02059524(void);
+void sub_02059570(void);
+void CommPlayerMan_ForcePos(void);
+void CommPlayerMan_ForceDir(void);
+void sub_02059638(BOOL param0);
+
+#endif // POKEPLATINUM_COMM_PLAYER_MANAGER_H

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);

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);
@@ -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);

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

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;

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

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

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

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

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

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

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

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

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

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

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);

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);

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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);
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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);

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;
 

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);

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

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);
 

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);

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

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;

include/overlay023/struct_ov23_0224A294.h

@@ -1,59 +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 "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 {
-    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;
-    FieldSystem * unk_54;
-    UnkStruct_ov23_0224A294_sub1 unk_58;
-    u8 unk_5A[8];
-    UnkStruct_02057B48 unk_62[8];
-    UnkStruct_02057B48 unk_A2[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];
-    UnkStruct_ov23_0224ABC4 unk_14A[8 + 1];
-    TrainerInfo * unk_27C[5];
-    TrainerInfo * unk_290[8];
-    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 unk_2BD;
-    u8 unk_2BE;
-    u8 unk_2BF;
-    u8 unk_2C0;
-    u8 unk_2C1;
-    u8 unk_2C2;
-    u8 unk_2C3;
-} UnkStruct_ov23_0224A294;
-
-#endif // POKEPLATINUM_STRUCT_OV23_0224A294_H

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

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

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

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

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

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;

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

include/struct_defs/struct_02057B48.h

@@ -1,13 +1,13 @@
 #ifndef POKEPLATINUM_STRUCT_02057B48_H
 #define POKEPLATINUM_STRUCT_02057B48_H
 
-typedef struct {
-    u16 unk_00;
-    u16 unk_02;
-    s8 unk_04;
-    u8 unk_05;
+typedef struct CommPlayerLocation {
+    u16 x;
+    u16 z;
+    s8 dir;
+    u8 moveSpeed;
     u8 unk_06;
-    u8 unk_07;
-} UnkStruct_02057B48;
+    u8 collisionFlag;
+} CommPlayerLocation;
 
 #endif // POKEPLATINUM_STRUCT_02057B48_H

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;

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;
 

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;
 

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

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

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

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);

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);

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);
 

include/unk_02057518.h

@@ -1,82 +0,0 @@
-#ifndef POKEPLATINUM_UNK_02057518_H
-#define POKEPLATINUM_UNK_02057518_H
-
-#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);
-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);
-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);
-int sub_020585A4(void);
-void sub_020585A8(int param0, int param1, void * param2, void * param3);
-void sub_02058B0C(int param0, int param1, BOOL param2);
-void sub_02058B7C(int param0);
-void sub_02058B94(int param0);
-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);
-int sub_02058D48(int param0);
-int sub_02058D68(int param0);
-int sub_02058D88(int param0);
-int sub_02058DC0(int param0);
-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 sub_02058F18(int param0);
-int sub_02058F50(int param0);
-int sub_02058F80(int param0);
-void sub_02058FB0(int param0, int param1);
-void sub_02058FE4(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);
-BOOL sub_0205928C(void);
-int sub_02059328(int param0);
-void sub_02059354(int param0, int param1);
-void sub_02059378(int param0);
-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);
-int sub_02059444(int param0);
-void sub_02059464(int param0);
-void sub_0205948C(int param0);
-void sub_020594EC(void);
-void sub_020594FC(void);
-void sub_02059514(void);
-void sub_02059524(void);
-void sub_02059570(void);
-void sub_020595A4(void);
-void sub_02059624(void);
-void sub_02059638(BOOL param0);
-
-#endif // POKEPLATINUM_UNK_02057518_H

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);

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);
-UnkStruct_02061AB4 * sub_0205EA24(const UnkStruct_02061830 * param0);
-int sub_0205EA78(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 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);
+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 Player_Delete(PlayerAvatar * param0);
+LocalMapObject * sub_0205EA24(const UnkStruct_02061830 * param0);
+int Player_Dir(PlayerAvatar * const param0);
+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);
+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 Player_MoveState(const PlayerAvatar * param0);
+void sub_0205EB18(PlayerAvatar * param0, int param1);
+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);
+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

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, 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);
+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

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

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);

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

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 LocalMapObj_IsAnimationSet(const LocalMapObject * param0);
+void LocalMapObj_SetAnimationCode(LocalMapObject * param0, int param1);
+void sub_02065668(LocalMapObject * param0, int param1);
+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);
 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

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

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

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_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);
+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);
 

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

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

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;
                     }
                 }

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)
@@ -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;
@@ -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) {

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"
@@ -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);
 }
@@ -285,8 +285,8 @@ static void sub_02059984 (void)
     void * v0;
 
     if (sub_02036540(98)) {
-        v0 = Heap_AllocFromHeap(HEAP_ID_COMMUNICATION, sub_02057C84());
-        sub_02057524(v0, sFieldCommMan->fieldSys, 0);
+        v0 = Heap_AllocFromHeap(HEAP_ID_COMMUNICATION, CommPlayer_Size());
+        CommPlayerMan_Init(v0, sFieldCommMan->fieldSys, 0);
         sub_02059524();
         sub_02035EC8();
         sub_020364F0(92);
@@ -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,8 +356,8 @@ static void sub_02059AB4 (void)
     void * v0;
 
     if (sub_02036540(98)) {
-        v0 = Heap_AllocFromHeap(HEAP_ID_COMMUNICATION, sub_02057C84());
-        sub_02057524(v0, sFieldCommMan->fieldSys, 0);
+        v0 = Heap_AllocFromHeap(HEAP_ID_COMMUNICATION, CommPlayer_Size());
+        CommPlayerMan_Init(v0, sFieldCommMan->fieldSys, 0);
         sub_02059524();
         sub_020364F0(92);
         FieldCommMan_SetTask(sub_02059B10, 0);
@@ -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);
 }
 

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',

src/overlay005/ov5_021D0D80.c

@@ -58,7 +58,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"
@@ -285,9 +285,9 @@ static int ov5_021D0FB4 (OverlayManager * 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->playerAvatar);
+        v0->unk_1C->unk_0C = Player_ZPos(v0->playerAvatar);
+        v0->unk_1C->unk_10 = Player_Dir(v0->playerAvatar);
 
         ov5_021EF300(v0->unk_A0);
 
@@ -380,7 +380,7 @@ const OverlayManagerTemplate 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) {
@@ -398,8 +398,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->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;
@@ -421,8 +421,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->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;
 
@@ -552,9 +552,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->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);
 }
@@ -904,16 +904,16 @@ 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->unk_3C, v4);
+        sub_0205E884(param0->playerAvatar, v4);
     }
 
     sub_02061C48(param0->unk_38);
-    sub_020595A4();
+    CommPlayerMan_ForcePos();
     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);
 }
@@ -928,7 +928,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));
@@ -992,7 +992,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) {

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"
@@ -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)
@@ -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 = sub_0205EA78(param1->unk_3C);
+    v0 = Player_MoveState(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 = sub_0205EA78(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 && (sub_0205EA78(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;
         }
@@ -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);
@@ -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, sub_0205EA78(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 = sub_0205EA78(param1->unk_3C);
+            v15 = Player_Dir(param1->playerAvatar);
             ov5_021D2C98(param1, &v13, &v14);
 
             if (ov5_021F8410(param1, v13, v14, v15) == 1) {
@@ -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,14 +425,14 @@ 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;
 
                 if (0x1 != sub_02062948(v0)) {
-                    if (sub_0205F588(param1->unk_3C) == 1) {
-                        sub_0205F5E4(param1->unk_3C, sub_0205EA78(param1->unk_3C));
+                    if (sub_0205F588(param1->playerAvatar) == 1) {
+                        sub_0205F5E4(param1->playerAvatar, Player_Dir(param1->playerAvatar));
                     }
 
                     sub_0203E880(param1, sub_02062960(v0), v0);
@@ -486,11 +486,11 @@ 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->unk_3C) == 1) {
-                sub_0205F5E4(param1->unk_3C, sub_0205EA78(param1->unk_3C));
+            if (sub_0205F588(param1->playerAvatar) == 1) {
+                sub_0205F5E4(param1->playerAvatar, Player_Dir(param1->playerAvatar));
             }
 
             sub_02036B84();
@@ -529,13 +529,13 @@ 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;
 
-                if (sub_0205F588(param1->unk_3C) == 1) {
-                    sub_0205F5E4(param1->unk_3C, sub_0205EA78(param1->unk_3C));
+                if (sub_0205F588(param1->playerAvatar) == 1) {
+                    sub_0205F5E4(param1->playerAvatar, Player_Dir(param1->playerAvatar));
                 }
 
                 if (sub_02062950(v0) != 0x9) {
@@ -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;
     }
 
@@ -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->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 = sub_0205EA78(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 = sub_0205EABC(param0->unk_3C);
-    v2 = sub_0205EAC8(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 = sub_0205EA78(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 = sub_0205EA78(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 = sub_0205EABC(param0->unk_3C);
-    *param2 = sub_0205EAC8(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 = sub_0205EA78(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, sub_0205EA78(param0->unk_3C));
+        inline_02049FA8(v2, param0->unk_1C->unk_00, v1, param1, param2, Player_Dir(param0->playerAvatar));
     }
 
     return 1;
@@ -1130,25 +1130,25 @@ 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->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, sub_0205EA78(param0->unk_3C));
+                ov5_021D2DCC(param0, v0, v1, Player_Dir(param0->playerAvatar));
             }
         }
     }
 }
 
-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;
 
-    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);

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,14 +176,14 @@ BOOL ov5_021D433C (FieldSystem * param0, UnkStruct_ov5_021D432C * param1)
     }
     break;
     case 3:
-        v0 = sub_0205EB3C(param0->unk_3C);
-        sub_02065638(v0, 0xc);
+        v0 = Player_LocalMapObject(param0->playerAvatar);
+        LocalMapObj_SetAnimationCode(v0, 0xc);
         (param1->unk_00)++;
         break;
     case 4:
-        v0 = sub_0205EB3C(param0->unk_3C);
+        v0 = Player_LocalMapObject(param0->playerAvatar);
 
-        if (sub_02065684(v0) == 1) {
+        if (LocalMapObj_CheckAnimationFinished(v0) == 1) {
             sub_020656AC(v0);
             sub_02062D64(v0, 1);
             {
@@ -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,21 +346,21 @@ 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 = Player_LocalMapObject(param0->playerAvatar);
             sub_02062D64(v0, 0);
             (param1->unk_00)++;
         }
     }
     break;
     case 3:
-        v0 = sub_0205EB3C(param0->unk_3C);
-        sub_02065638(v0, 0xd);
+        v0 = Player_LocalMapObject(param0->playerAvatar);
+        LocalMapObj_SetAnimationCode(v0, 0xd);
         (param1->unk_00)++;
         break;
     case 4:
-        v0 = sub_0205EB3C(param0->unk_3C);
+        v0 = Player_LocalMapObject(param0->playerAvatar);
 
-        if (sub_02065684(v0) == 1) {
+        if (LocalMapObj_CheckAnimationFinished(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,10 +524,10 @@ BOOL ov5_021D4858 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const
             return 1;
         }
 
-        v0 = sub_0205EB3C(param0->unk_3C);
+        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);
         }
@@ -539,9 +539,9 @@ 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 = 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);
         }
@@ -558,17 +558,17 @@ BOOL ov5_021D4858 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const
         (param1->unk_00)++;
         break;
     case 2:
-        v0 = sub_0205EB3C(param0->unk_3C);
+        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 = sub_0205EB3C(param0->unk_3C);
+        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 = sub_0205EB3C(param0->unk_3C);
+        v0 = Player_LocalMapObject(param0->playerAvatar);
 
-        if (sub_02065684(v0) == 1) {
+        if (LocalMapObj_CheckAnimationFinished(v0) == 1) {
             sub_020656AC(v0);
             (param1->unk_00)++;
         }
@@ -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,10 +640,10 @@ BOOL ov5_021D4A24 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const
             return 1;
         }
 
-        v0 = sub_0205EB3C(param0->unk_3C);
+        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);
         }
@@ -653,9 +653,9 @@ 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 = 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);
         }
@@ -672,19 +672,19 @@ BOOL ov5_021D4A24 (FieldSystem * param0, UnkStruct_ov5_021D432C * param1, const
         (param1->unk_00)++;
         break;
     case 2:
-        v0 = sub_0205EB3C(param0->unk_3C);
+        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)++;
         }
         break;
     case 3:
-        v0 = sub_0205EB3C(param0->unk_3C);
+        v0 = Player_LocalMapObject(param0->playerAvatar);
 
-        if (sub_02065684(v0) == 1) {
+        if (LocalMapObj_CheckAnimationFinished(v0) == 1) {
             sub_020656AC(v0);
             (param1->unk_00)++;
         }
@@ -886,15 +886,15 @@ 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->unk_3C);
+        v0 = Player_LocalMapObject(v1->playerAvatar);
 
-        if (sub_0205EA78(v1->unk_3C) == 1) {
+        if (Player_Dir(v1->playerAvatar) == 1) {
             sub_02062D64(v0, 1);
             (v2->unk_00) = 1;
         } else {
@@ -914,15 +914,15 @@ BOOL ov5_021D4E10 (UnkStruct_020508D4 * param0)
         v2->unk_08 = 1;
         break;
     case 1:
-        v0 = sub_0205EB3C(v1->unk_3C);
+        v0 = Player_LocalMapObject(v1->playerAvatar);
         sub_02062D64(v0, 0);
-        sub_02065638(v0, 0xd);
+        LocalMapObj_SetAnimationCode(v0, 0xd);
         (v2->unk_00)++;
         break;
     case 2:
-        v0 = sub_0205EB3C(v1->unk_3C);
+        v0 = Player_LocalMapObject(v1->playerAvatar);
 
-        if (sub_02065684(v0) == 1) {
+        if (LocalMapObj_CheckAnimationFinished(v0) == 1) {
             sub_020656AC(v0);
             (v2->unk_00)++;
         }
@@ -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->unk_3C);
+        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,8 +1026,8 @@ BOOL ov5_021D5020 (UnkStruct_020508D4 * param0)
         u8 v3;
         u8 v4;
 
-        v0 = sub_0205EB3C(v1->unk_3C);
-        v3 = sub_0205EA78(v1->unk_3C);
+        v0 = Player_LocalMapObject(v1->playerAvatar);
+        v3 = Player_Dir(v1->playerAvatar);
 
         if (v3 == 1) {
             sub_02062D64(v0, 1);
@@ -1067,15 +1067,15 @@ BOOL ov5_021D5020 (UnkStruct_020508D4 * param0)
     }
     break;
     case 1:
-        v0 = sub_0205EB3C(v1->unk_3C);
+        v0 = Player_LocalMapObject(v1->playerAvatar);
         sub_02062D64(v0, 0);
-        sub_02065638(v0, 0xd);
+        LocalMapObj_SetAnimationCode(v0, 0xd);
         (v2->unk_00)++;
         break;
     case 2:
-        v0 = sub_0205EB3C(v1->unk_3C);
+        v0 = Player_LocalMapObject(v1->playerAvatar);
 
-        if (sub_02065684(v0) == 1) {
+        if (LocalMapObj_CheckAnimationFinished(v0) == 1) {
             sub_020656AC(v0);
             (v2->unk_00)++;
         }
@@ -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,8 +1107,8 @@ BOOL ov5_021D5150 (UnkStruct_020508D4 * param0)
         u8 v3;
         u8 v4;
 
-        v0 = sub_0205EB3C(v1->unk_3C);
-        v3 = sub_0205EA78(v1->unk_3C);
+        v0 = Player_LocalMapObject(v1->playerAvatar);
+        v3 = Player_Dir(v1->playerAvatar);
 
         if (v3 == 1) {
             sub_02062D64(v0, 1);
@@ -1122,15 +1122,15 @@ BOOL ov5_021D5150 (UnkStruct_020508D4 * param0)
     }
     break;
     case 1:
-        v0 = sub_0205EB3C(v1->unk_3C);
+        v0 = Player_LocalMapObject(v1->playerAvatar);
         sub_02062D64(v0, 0);
-        sub_02065638(v0, 0xd);
+        LocalMapObj_SetAnimationCode(v0, 0xd);
         (v2->unk_00)++;
         break;
     case 2:
-        v0 = sub_0205EB3C(v1->unk_3C);
+        v0 = Player_LocalMapObject(v1->playerAvatar);
 
-        if (sub_02065684(v0) == 1) {
+        if (LocalMapObj_CheckAnimationFinished(v0) == 1) {
             sub_020656AC(v0);
             (v2->unk_00)++;
         }

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;
@@ -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->playerAvatar);
+    v4 = Player_ZPos(param0->unk_04->playerAvatar);
     v7 = v3 - 7;
     v8 = v3 + 7;
     v9 = v4 - 7;
@@ -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);

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;

src/overlay005/ov5_021DFB54.c

@@ -57,8 +57,8 @@ typedef struct {
     int unk_00;
     int unk_04;
     FieldSystem * unk_08;
-    UnkStruct_0205E884 * unk_0C;
-    UnkStruct_02061AB4 * unk_10;
+    PlayerAvatar * unk_0C;
+    LocalMapObject * unk_10;
     UnkStruct_ov9_0224F6EC * unk_14;
 } UnkStruct_ov5_021DFF88;
 
@@ -68,8 +68,8 @@ typedef struct {
     int unk_08;
     UnkStruct_ov5_021E1050 unk_0C;
     FieldSystem * unk_1C;
-    UnkStruct_0205E884 * unk_20;
-    UnkStruct_02061AB4 * unk_24;
+    PlayerAvatar * unk_20;
+    LocalMapObject * unk_24;
     UnkStruct_ov101_021D5D90 * unk_28;
 } UnkStruct_ov5_021E00B0;
 
@@ -77,8 +77,8 @@ typedef struct {
     int unk_00;
     int unk_04;
     FieldSystem * unk_08;
-    UnkStruct_0205E884 * unk_0C;
-    UnkStruct_02061AB4 * unk_10;
+    PlayerAvatar * unk_0C;
+    LocalMapObject * unk_10;
     UnkStruct_ov101_021D5D90 * unk_14;
 } UnkStruct_ov5_021E0390;
 
@@ -87,8 +87,8 @@ typedef struct {
     int unk_04;
     int unk_08;
     FieldSystem * unk_0C;
-    UnkStruct_0205E884 * unk_10;
-    UnkStruct_02061AB4 * unk_14;
+    PlayerAvatar * unk_10;
+    LocalMapObject * unk_14;
     UnkStruct_ov101_021D5D90 * unk_18;
     UnkStruct_ov5_021E1050 unk_1C;
     UnkStruct_ov5_021D1BEC * unk_2C;
@@ -105,8 +105,8 @@ typedef struct {
     VecFx32 unk_1C;
     VecFx32 unk_28;
     FieldSystem * unk_34;
-    UnkStruct_0205E884 * unk_38;
-    UnkStruct_02061AB4 * unk_3C;
+    PlayerAvatar * unk_38;
+    LocalMapObject * unk_3C;
     UnkStruct_ov5_021E1050 unk_40;
     UnkStruct_ov5_021D1BEC * unk_50;
 } UnkStruct_ov5_021F9B10;
@@ -115,13 +115,13 @@ 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;
-    UnkStruct_02061AB4 * unk_08;
+    PlayerAvatar * unk_04;
+    LocalMapObject * unk_08;
     int unk_0C;
     int unk_10;
     SysTask * unk_14;
@@ -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, 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);
-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 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);
 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;
@@ -203,7 +203,7 @@ static void ov5_021DFB90 (UnkStruct_0205E884 * 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) {
@@ -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,10 +251,10 @@ 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);
+    LocalMapObject * v2 = Player_LocalMapObject(param0);
     FieldSystem * v3 = sub_02062C00(v2);
     int v4 = sub_0205F108(param0);
     UnkStruct_ov101_021D5D90 * v5 = sub_0205EC04(param0);
@@ -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);
     }
@@ -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;
@@ -317,7 +317,7 @@ static void ov5_021DFD28 (UnkStruct_0205E884 * 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) {
@@ -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;
@@ -337,7 +337,7 @@ static void ov5_021DFD68 (UnkStruct_0205E884 * 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) {
@@ -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,13 +378,13 @@ 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;
+        LocalMapObject * v0;
 
         GF_ASSERT(param1 != NULL);
-        v0 = sub_0205EB3C(param1);
+        v0 = Player_LocalMapObject(param1);
         GF_ASSERT(v0 != NULL);
     }
 
@@ -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,14 +459,14 @@ 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;
     }
 
     {
-        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, 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, LocalMapObject * param3)
 {
     UnkStruct_ov5_021DFF88 * v0 = ov5_021E1110((sizeof(UnkStruct_ov5_021DFF88)));
 
@@ -517,16 +517,16 @@ static void ov5_021DFF88 (int param0, FieldSystem * param1, UnkStruct_0205E884 *
 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:
-        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;
         }
 
@@ -585,8 +585,8 @@ 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_24 = sub_0205EB3C(v0->unk_20);
+    v0->unk_20 = param0->playerAvatar;
+    v0->unk_24 = Player_LocalMapObject(v0->unk_20);
     v0->unk_0C = *param2;
 
     sub_02050944(param0->unk_10, ov5_021E0160, v0);
@@ -602,9 +602,9 @@ 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);
+    LocalMapObject * v0 = Player_LocalMapObject(param0);
 
     if (sub_0205DB58(param2) == 1) {
         if ((sub_0205DEFC(param1) == 1) || (sub_0205DEF0(param1) == 1)) {
@@ -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 {
@@ -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;
         }
 
@@ -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;
@@ -716,7 +716,7 @@ static int ov5_021E032C (FieldSystem * param0, UnkStruct_0205E884 * param1, int
 
     {
         u32 v0;
-        UnkStruct_02061AB4 * v1 = sub_0205EB3C(param1);
+        LocalMapObject * v1 = Player_LocalMapObject(param1);
 
         if (sub_0205F158(param1) == 0) {
             v0 = sub_02060B7C(param1, v1, param2);
@@ -739,14 +739,14 @@ 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)));
 
     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);
@@ -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;
         }
 
@@ -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,14 +821,14 @@ 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;
     }
 
     {
-        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)) {
@@ -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)));
 
@@ -854,14 +854,14 @@ static void ov5_021E0534 (FieldSystem * param0, UnkStruct_0205E884 * 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:
         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;
             }
@@ -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);
 
@@ -920,11 +920,11 @@ 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);
+    LocalMapObject * v0 = Player_LocalMapObject(param1);
 
-    if (sub_020655F4(v0) == 0) {
+    if (LocalMapObj_IsAnimationSet(v0) == 0) {
         return 0;
     }
 
@@ -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;
@@ -943,7 +943,7 @@ static int ov5_021E06A8 (FieldSystem * param0, UnkStruct_0205E884 * param1)
 
     {
         int v0 = sub_0205EA94(param1);
-        UnkStruct_02061AB4 * v1 = ov5_021E10D4(param1, v0);
+        LocalMapObject * v1 = ov5_021E10D4(param1, v0);
 
         if (v1 == NULL) {
             return 0;
@@ -971,8 +971,8 @@ 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_14 = sub_0205EB3C(v0->unk_10);
+    v0->unk_10 = param0->playerAvatar;
+    v0->unk_14 = Player_LocalMapObject(v0->unk_10);
     v0->unk_1C = *param2;
 
     sub_02050944(param0->unk_10, ov5_021E07A0, v0);
@@ -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);
@@ -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);
     }
 
@@ -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 = 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);
@@ -1523,8 +1523,8 @@ 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_08 = sub_0205EB3C(v0->unk_04);
+    v0->unk_04 = param0->playerAvatar;
+    v0->unk_08 = Player_LocalMapObject(v0->unk_04);
     v0->unk_10 = sub_0205EB98(v0->unk_04);
 
     sub_02050944(param0->unk_10, ov5_021E0E10, v0);
@@ -1562,9 +1562,9 @@ 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);
+    LocalMapObject * v0 = Player_LocalMapObject(param0);
 
     if (sub_02062DFC(v0) == 0) {
         return;
@@ -1595,9 +1595,9 @@ void ov5_021E0E94 (UnkStruct_0205E884 * param0)
     }
 }
 
-void ov5_021E0EEC (UnkStruct_0205E884 * param0)
+void ov5_021E0EEC (PlayerAvatar * param0)
 {
-    UnkStruct_02061AB4 * v0 = sub_0205EB3C(param0);
+    LocalMapObject * v0 = Player_LocalMapObject(param0);
 
     if (sub_02062DFC(v0) == 0) {
         return;
@@ -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) {
@@ -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;
@@ -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);
@@ -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);
 }
@@ -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,9 +1725,9 @@ 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);
+    LocalMapObject * v0 = Player_LocalMapObject(param0);
 
     if (sub_0205F108(param0) == 0) {
         ov5_021EE3FC(v0, param1, NULL, NULL);
@@ -1748,19 +1748,19 @@ static void ov5_021E106C (UnkStruct_0205E884 * param0, int param1)
 
 static void ov5_021E10C0 (void * param0, const UnkStruct_020216E0 * param1)
 {
-    UnkStruct_0205E884 * v0 = param0;
-    UnkStruct_02061AB4 * v1 = sub_0205EB3C(v0);
+    PlayerAvatar * v0 = param0;
+    LocalMapObject * v1 = Player_LocalMapObject(v0);
     FieldSystem * v2 = sub_02062C00(v1);
 
     ov9_0224A564(v2, param1);
 }
 
-static UnkStruct_02061AB4 * ov5_021E10D4 (UnkStruct_0205E884 * param0, int param1)
+static LocalMapObject * ov5_021E10D4 (PlayerAvatar * param0, int param1)
 {
-    int v0 = sub_0205EABC(param0) + sub_0206419C(param1);
-    int v1 = sub_0205EAC8(param0) + sub_020641A8(param1);
-    const UnkStruct_02061830 * v2 = sub_02062A40(sub_0205EB3C(param0));
-    UnkStruct_02061AB4 * v3 = sub_0206326C(v2, v0, v1, 0);
+    int v0 = Player_XPos(param0) + sub_0206419C(param1);
+    int v1 = Player_ZPos(param0) + sub_020641A8(param1);
+    const UnkStruct_02061830 * v2 = sub_02062A40(Player_LocalMapObject(param0));
+    LocalMapObject * v3 = sub_0206326C(v2, v0, v1, 0);
 
     return v3;
 }

src/overlay005/ov5_021E1154.c

@@ -22,18 +22,18 @@ typedef struct {
     int unk_04;
     int unk_08;
     FieldSystem * unk_0C;
-    UnkStruct_0205E884 * unk_10;
-    UnkStruct_02061AB4 * unk_14;
+    PlayerAvatar * unk_10;
+    LocalMapObject * 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);
+    LocalMapObject * v0 = Player_LocalMapObject(param1);
     u8 v1 = sub_02062BE8(v0);
     int v2;
 
@@ -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)));
 
@@ -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) {
@@ -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;

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);
+    Player_SetDir(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);
+    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->unk_3C);
+    LocalMapObject * v1 = Player_LocalMapObject(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);
+            Player_SetDir(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 = sub_0205EA78(param0->unk_3C);
+    v0->unk_10 = Player_Dir(param0->playerAvatar);
 
     if (param1) {
         SysTask_Start(ov5_021E139C, v0, 100);

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->playerAvatar);
+    param0->unk_1C->unk_0C = Player_ZPos(param0->playerAvatar);
     param0->unk_1C->unk_04 = -1;
-    param0->unk_1C->unk_10 = sub_0205EA78(param0->unk_3C);
+    param0->unk_1C->unk_10 = Player_Dir(param0->playerAvatar);
 }
 
 void ov5_021E2064 (FieldSystem * param0)