Name all instances of PlayerAvatar

2026-10-01 05:51:03 -05:00 · 2024-05-23 21:00:41 -04:00
parent 70e4bdfb57
commit 87e381ab82
27 changed files with 971 additions and 971 deletions
--- a/include/overlay005/ov5_021DFB54.h
+++ b/include/overlay005/ov5_021DFB54.h
@@ -6,18 +6,18 @@
 #include "struct_decls/struct_020508D4_decl.h"
 #include "struct_decls/struct_0205E884_decl.h"

-void PlayerAvatar_SetRequestStateBit(PlayerAvatar * param0, u32 param1);
-void PlayerAvatar_RequestChangeState(PlayerAvatar * param0);
+void PlayerAvatar_SetRequestStateBit(PlayerAvatar * playerAvatar, u32 param1);
+void PlayerAvatar_RequestChangeState(PlayerAvatar * playerAvatar);
 int ov5_021DFDE0(FieldSystem * param0, PlayerAvatar * param1, int param2, int param3);
 void ov5_021E00EC(TaskManager * param0, int param1, int param2);
-int ov5_021E0118(PlayerAvatar * param0, u32 param1, u32 param2);
+int ov5_021E0118(PlayerAvatar * playerAvatar, u32 param1, u32 param2);
 void ov5_021E0734(TaskManager * param0, int param1, int param2);
 int ov5_021E0760(u32 param0, int param1);
 void ov5_021E097C(FieldSystem * param0, int param1);
 void ov5_021E0998(TaskManager * param0, int param1, int param2);
 void ov5_021E0DD4(TaskManager * param0);
-void ov5_021E0E94(PlayerAvatar * param0);
-void ov5_021E0EEC(PlayerAvatar * param0);
+void ov5_021E0E94(PlayerAvatar * playerAvatar);
+void ov5_021E0EEC(PlayerAvatar * playerAvatar);
 SysTask * ov5_021E1000(FieldSystem * param0);
 void ov5_021E100C(SysTask * param0);
 SysTask * ov5_021E1014(FieldSystem * param0);
--- a/include/overlay005/ov5_021E1154.h
+++ b/include/overlay005/ov5_021E1154.h
@@ -4,6 +4,6 @@
 #include "field/field_system_decl.h"
 #include "struct_decls/struct_0205E884_decl.h"

-int ov5_021E1154(FieldSystem * param0, PlayerAvatar * param1, int param2);
+int ov5_021E1154(FieldSystem * param0, PlayerAvatar * playerAvatar, int param2);

 #endif // POKEPLATINUM_OV5_021E1154_H
--- a/include/overlay005/ov5_021F61BC.h
+++ b/include/overlay005/ov5_021F61BC.h
@@ -6,6 +6,6 @@

 void * ov5_021F61BC(UnkStruct_ov5_021DF47C * param0);
 void ov5_021F61D8(void * param0);
-void ov5_021F6218(PlayerAvatar * param0);
+void ov5_021F6218(PlayerAvatar * playerAvatar);

 #endif // POKEPLATINUM_OV5_021F61BC_H
--- a/include/overlay005/ov5_021F8560.h
+++ b/include/overlay005/ov5_021F8560.h
@@ -10,7 +10,7 @@

 void * ov5_021F8560(UnkStruct_ov5_021DF47C * param0);
 void ov5_021F857C(void * param0);
-UnkStruct_ov101_021D5D90 * ov5_021F85BC(PlayerAvatar * param0, int param1, int param2, int param3, int param4, int param5, int param6);
+UnkStruct_ov101_021D5D90 * ov5_021F85BC(PlayerAvatar * playerAvatar, 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);
--- a/include/player_avatar.h
+++ b/include/player_avatar.h
@@ -14,90 +14,90 @@

 PlayerAvatar * PlayerAvatar_Init(const MapObjectManager * param0, int param1, int param2, int param3, int param4, int param5, int param6, PlayerData * param7);
 PlayerAvatar * sub_0205E820(const MapObjectManager * param0, PlayerData * param1, int param2);
-void PlayerAvatar_InitDraw(PlayerAvatar * param0, int param1);
-void Player_Delete(PlayerAvatar * param0);
-void Player_DeleteAll(PlayerAvatar * param0);
+void PlayerAvatar_InitDraw(PlayerAvatar * playerAvatar, int param1);
+void Player_Delete(PlayerAvatar * playerAvatar);
+void Player_DeleteAll(PlayerAvatar * playerAvatar);
 MapObject * sub_0205EA24(const MapObjectManager * param0);
-int PlayerAvatar_GetDir(PlayerAvatar * const param0);
-void Player_SetDir(PlayerAvatar * param0, int param1);
-int PlayerAvatar_GetMoveDir(PlayerAvatar * const param0);
-int sub_0205EAA0(PlayerAvatar * const param0);
-int Player_GetXPos(PlayerAvatar * const param0);
-int Player_GetZPos(PlayerAvatar * const param0);
-int PlayerAvatar_XPosPrev(PlayerAvatar * const param0);
-int PlayerAvatar_ZPosPrev(PlayerAvatar * const param0);
-void PlayerAvatar_PosVectorOut(PlayerAvatar * const param0, VecFx32 * param1);
-const VecFx32 * PlayerAvatar_PosVector(PlayerAvatar * const param0);
-void sub_0205EB08(PlayerAvatar * param0, int param1);
-int PlayerAvatar_MoveState(const PlayerAvatar * param0);
-void sub_0205EB10(PlayerAvatar * param0, int param1);
-int Player_MoveState(const PlayerAvatar * param0);
-void PlayerAvatar_SetHidden(PlayerAvatar * param0, int param1);
-void PlayerAvatar_SetMapObject(PlayerAvatar * param0, MapObject * param1);
-MapObject * Player_MapObject(PlayerAvatar * param0);
-const MapObject * PlayerAvatar_ConstMapObject(const PlayerAvatar * param0);
-void PlayerAvatar_SetPlayerState(PlayerAvatar * param0, int param1);
-int PlayerAvatar_GetPlayerState(PlayerAvatar * param0);
-void PlayerAvatar_TurnOnRequestStateBit(PlayerAvatar * param0, u32 param1);
-void PlayerAvatar_SetRequestStateFlag(PlayerAvatar * param0, u32 param1);
-u32 PlayerAvatar_RequestStateFlag(PlayerAvatar * param0);
-void PlayerAvatar_SetGender(PlayerAvatar * param0, int param1);
-int PlayerAvatar_Gender(PlayerAvatar * param0);
-int PlayerAvatar_Speed(PlayerAvatar * param0);
-void PlayerAvatar_SetSpeed(PlayerAvatar * param0, int param1);
-void PlayerAvatar_ClearSpeed(PlayerAvatar * param0);
-int PlayerAvatar_AddMoveSpeed(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);
-PlayerData * PlayerAvatar_PlayerData(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);
+int PlayerAvatar_GetDir(PlayerAvatar * const playerAvatar);
+void Player_SetDir(PlayerAvatar * playerAvatar, int param1);
+int PlayerAvatar_GetMoveDir(PlayerAvatar * const playerAvatar);
+int sub_0205EAA0(PlayerAvatar * const playerAvatar);
+int Player_GetXPos(PlayerAvatar * const playerAvatar);
+int Player_GetZPos(PlayerAvatar * const playerAvatar);
+int PlayerAvatar_XPosPrev(PlayerAvatar * const playerAvatar);
+int PlayerAvatar_ZPosPrev(PlayerAvatar * const playerAvatar);
+void PlayerAvatar_PosVectorOut(PlayerAvatar * const playerAvatar, VecFx32 * param1);
+const VecFx32 * PlayerAvatar_PosVector(PlayerAvatar * const playerAvatar);
+void sub_0205EB08(PlayerAvatar * playerAvatar, int param1);
+int PlayerAvatar_MoveState(const PlayerAvatar * playerAvatar);
+void sub_0205EB10(PlayerAvatar * playerAvatar, int param1);
+int Player_MoveState(const PlayerAvatar * playerAvatar);
+void PlayerAvatar_SetHidden(PlayerAvatar * playerAvatar, int param1);
+void PlayerAvatar_SetMapObject(PlayerAvatar * playerAvatar, MapObject * param1);
+MapObject * Player_MapObject(PlayerAvatar * playerAvatar);
+const MapObject * PlayerAvatar_ConstMapObject(const PlayerAvatar * playerAvatar);
+void PlayerAvatar_SetPlayerState(PlayerAvatar * playerAvatar, int param1);
+int PlayerAvatar_GetPlayerState(PlayerAvatar * playerAvatar);
+void PlayerAvatar_TurnOnRequestStateBit(PlayerAvatar * playerAvatar, u32 param1);
+void PlayerAvatar_SetRequestStateFlag(PlayerAvatar * playerAvatar, u32 param1);
+u32 PlayerAvatar_RequestStateFlag(PlayerAvatar * playerAvatar);
+void PlayerAvatar_SetGender(PlayerAvatar * playerAvatar, int param1);
+int PlayerAvatar_Gender(PlayerAvatar * playerAvatar);
+int PlayerAvatar_Speed(PlayerAvatar * playerAvatar);
+void PlayerAvatar_SetSpeed(PlayerAvatar * playerAvatar, int param1);
+void PlayerAvatar_ClearSpeed(PlayerAvatar * playerAvatar);
+int PlayerAvatar_AddMoveSpeed(PlayerAvatar * playerAvatar, int param1, int param2);
+void sub_0205EBDC(PlayerAvatar * playerAvatar, int param1);
+int sub_0205EBE0(PlayerAvatar * playerAvatar);
+void sub_0205EBE4(PlayerAvatar * playerAvatar, int param1);
+int sub_0205EBE8(PlayerAvatar * playerAvatar);
+void sub_0205EBEC(PlayerAvatar * playerAvatar, int param1, int param2);
+void sub_0205EC00(PlayerAvatar * playerAvatar, UnkStruct_ov101_021D5D90 * param1);
+UnkStruct_ov101_021D5D90 * sub_0205EC04(PlayerAvatar * playerAvatar);
+PlayerData * PlayerAvatar_PlayerData(PlayerAvatar * playerAvatar);
+void sub_0205EC10(PlayerAvatar * playerAvatar, u32 param1);
+u32 sub_0205EC14(PlayerAvatar * playerAvatar);
+void sub_0205EC18(PlayerAvatar * playerAvatar, int param1);
+int sub_0205EC1C(PlayerAvatar * playerAvatar);
+void sub_0205EC20(PlayerAvatar * playerAvatar, u32 param1, int param2);
 void PlayerData_Init(PlayerData * param0);
 int PlayerData_HasRunningShoes(PlayerData * param0);
 void PlayerData_SetRunningShoes(PlayerData * param0, int param1);
 int PlayerData_CyclingGear(PlayerData * param0);
 void PlayerData_SetCyclingGear(PlayerData * param0, int param1);
-void PlayerAvatar_SetCyclingGear(PlayerAvatar * param0, int param1);
-int PlayerAvatar_CyclingGear(PlayerAvatar * param0);
+void PlayerAvatar_SetCyclingGear(PlayerAvatar * playerAvatar, int param1);
+int PlayerAvatar_CyclingGear(PlayerAvatar * playerAvatar);
 u32 sub_0205EC94(PlayerData * param0);
 void sub_0205ECA0(PlayerData * param0, u32 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);
+void sub_0205ECA8(PlayerAvatar * playerAvatar, u32 param1);
+void sub_0205ECB8(PlayerAvatar * playerAvatar, const VecFx32 * param1, int param2);
+void sub_0205ECE0(PlayerAvatar * playerAvatar, int param1, int param2, int param3);
+void sub_0205ED0C(PlayerAvatar * playerAvatar, fx32 param1);
+void sub_0205ED2C(PlayerAvatar * playerAvatar, int param1);
+void sub_0205ED48(PlayerAvatar * playerAvatar, int param1);
 int Player_MoveStateFromGender(int param0, int param1);
 u32 sub_0205EED8(int 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 PlayerAvatar_SetInDeepSwamp(PlayerAvatar * param0, int param1);
-int PlayerAvatar_IsNotInDeepSwamp(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);
+void sub_0205EF40(PlayerAvatar * playerAvatar, int param1);
+int sub_0205EF58(PlayerAvatar * playerAvatar);
+void sub_0205EF6C(PlayerAvatar * playerAvatar, int param1);
+int sub_0205EF84(PlayerAvatar * playerAvatar);
+void sub_0205EF98(PlayerAvatar * playerAvatar, int param1);
+int sub_0205EFB0(PlayerAvatar * playerAvatar);
+void sub_0205EFC4(PlayerAvatar * playerAvatar, int param1);
+int sub_0205EFDC(PlayerAvatar * playerAvatar);
+void PlayerAvatar_SetInDeepSwamp(PlayerAvatar * playerAvatar, int param1);
+int PlayerAvatar_IsNotInDeepSwamp(PlayerAvatar * playerAvatar);
+void sub_0205F01C(PlayerAvatar * playerAvatar, int param1);
+int sub_0205F034(PlayerAvatar * playerAvatar);
+void sub_0205F048(PlayerAvatar * playerAvatar);
+void sub_0205F054(PlayerAvatar * playerAvatar);
+int sub_0205F060(PlayerAvatar * playerAvatar);
+void sub_0205F074(PlayerAvatar * playerAvatar, int param1);
+int sub_0205F08C(PlayerAvatar * playerAvatar);
+void sub_0205F098(PlayerAvatar * playerAvatar, int param1);
+int sub_0205F108(PlayerAvatar * const playerAvatar);
+BOOL sub_0205F158(PlayerAvatar * const playerAvatar);
+BOOL sub_0205F16C(PlayerAvatar * const playerAvatar);

 #endif // POKEPLATINUM_UNK_0205E7D0_H
--- a/include/struct_defs/struct_0205C22C.h
+++ b/include/struct_defs/struct_0205C22C.h
@@ -12,7 +12,7 @@
 typedef struct UnkStruct_0205C22C_t {
    UnkStruct_0205B43C * unk_00;
    SysTask * unk_04;
-    PlayerAvatar * unk_08;
+    PlayerAvatar * playerAvatar;
    UnkStruct_0205C680 unk_0C[50 + 1];
    FieldSystem * unk_470;
    UnkStruct_02027F8C * unk_474;
--- a/include/struct_defs/struct_020684D0.h
+++ b/include/struct_defs/struct_020684D0.h
@@ -12,7 +12,7 @@ typedef struct {
    u16 unk_0E;
    u16 unk_10;
    u8 padding_12[2];
-    PlayerAvatar * unk_14;
+    PlayerAvatar * playerAvatar;
    FieldSystem * unk_18;
 } UnkStruct_020684D0;

--- a/include/unk_0205F180.h
+++ b/include/unk_0205F180.h
@@ -5,28 +5,28 @@
 #include "struct_decls/struct_02061AB4_decl.h"
 #include "overlay005/struct_ov5_021E8F60_decl.h"

-void PlayerAvatar_MoveControl(PlayerAvatar * param0, const UnkStruct_ov5_021E8F60 * param1, int param2, u16 param3, u16 param4, BOOL param5);
-int PlayerAvatar_CheckStartMove(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, MapObject * param1, int param2);
-u32 sub_020611FC(PlayerAvatar * param0, MapObject * 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 PlayerAvatar_SetAnimationCode(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);
+void PlayerAvatar_MoveControl(PlayerAvatar * playerAvatar, const UnkStruct_ov5_021E8F60 * param1, int param2, u16 param3, u16 param4, BOOL param5);
+int PlayerAvatar_CheckStartMove(PlayerAvatar * playerAvatar, int param1);
+void sub_0205F490(PlayerAvatar * playerAvatar);
+void sub_0205F56C(PlayerAvatar * playerAvatar);
+int sub_0205F588(PlayerAvatar * playerAvatar);
+void sub_0205F5E4(PlayerAvatar * playerAvatar, int param1);
+u32 sub_02060B7C(PlayerAvatar * playerAvatar, MapObject * param1, int param2);
+u32 sub_020611FC(PlayerAvatar * playerAvatar, MapObject * param1, int param2);
+int sub_02061308(PlayerAvatar * playerAvatar, u16 param1, u16 param2);
+int sub_020613AC(PlayerAvatar * playerAvatar);
+int sub_020613FC(PlayerAvatar * playerAvatar, u16 param1);
+int sub_0206140C(PlayerAvatar * playerAvatar);
+int sub_02061434(PlayerAvatar * playerAvatar, int param1);
+u32 sub_0206147C(PlayerAvatar * playerAvatar, u16 param1, u16 param2, int param3, int param4, int param5);
+int sub_02061544(PlayerAvatar * playerAvatar);
+void PlayerAvatar_SetAnimationCode(PlayerAvatar * playerAvatar, u32 param1, int param2);
+u32 sub_0206156C(PlayerAvatar * playerAvatar, int param1);
+void sub_0206157C(PlayerAvatar * playerAvatar, int param1, int * param2, int * param3);
+void sub_020615AC(PlayerAvatar * playerAvatar, int * param1, int * param2);
+void sub_02061674(PlayerAvatar * playerAvatar, int param1, int * param2, int * param3, int * param4);
+u32 sub_020616F0(PlayerAvatar * playerAvatar, int param1);
+u32 sub_02061760(PlayerAvatar * playerAvatar);
+void sub_020617BC(PlayerAvatar * const playerAvatar, int * param1, int * param2, int * param3);

 #endif // POKEPLATINUM_UNK_0205F180_H
--- a/include/unk_02067A84.h
+++ b/include/unk_02067A84.h
@@ -7,10 +7,10 @@
 #include "struct_decls/struct_02061AB4_decl.h"

 int sub_02067A84(FieldSystem * param0, BOOL param1);
-int sub_02067D58(const MapObject * param0, PlayerAvatar * param1, int param2, int param3);
+int sub_02067D58(const MapObject * param0, PlayerAvatar * playerAvatar, int param2, int param3);
 int sub_02067F24(MapObject * param0);
 int sub_02067F88(FieldSystem * param0, MapObject * param1);
-SysTask * sub_02067FB8(FieldSystem * param0, MapObject * param1, PlayerAvatar * param2, int param3, int param4, int param5, int param6, int param7);
+SysTask * sub_02067FB8(FieldSystem * param0, MapObject * param1, PlayerAvatar * playerAvatar, int param3, int param4, int param5, int param6, int param7);
 int sub_02067FD4(SysTask * param0);
 void sub_02067FE8(SysTask * param0);

--- a/src/overlay005/ov5_021DFB54.c
+++ b/src/overlay005/ov5_021DFB54.c
@@ -57,7 +57,7 @@ typedef struct {
    int unk_00;
    int unk_04;
    FieldSystem * unk_08;
-    PlayerAvatar * unk_0C;
+    PlayerAvatar * playerAvatar;
    MapObject * unk_10;
    UnkStruct_ov9_0224F6EC * unk_14;
 } UnkStruct_ov5_021DFF88;
@@ -68,7 +68,7 @@ typedef struct {
    int unk_08;
    UnkStruct_ov5_021E1050 unk_0C;
    FieldSystem * unk_1C;
-    PlayerAvatar * unk_20;
+    PlayerAvatar * playerAvatar;
    MapObject * unk_24;
    UnkStruct_ov101_021D5D90 * unk_28;
 } UnkStruct_ov5_021E00B0;
@@ -77,7 +77,7 @@ typedef struct {
    int unk_00;
    int unk_04;
    FieldSystem * unk_08;
-    PlayerAvatar * unk_0C;
+    PlayerAvatar * playerAvatar;
    MapObject * unk_10;
    UnkStruct_ov101_021D5D90 * unk_14;
 } UnkStruct_ov5_021E0390;
@@ -87,7 +87,7 @@ typedef struct {
    int unk_04;
    int unk_08;
    FieldSystem * unk_0C;
-    PlayerAvatar * unk_10;
+    PlayerAvatar * playerAvatar;
    MapObject * unk_14;
    UnkStruct_ov101_021D5D90 * unk_18;
    UnkStruct_ov5_021E1050 unk_1C;
@@ -105,7 +105,7 @@ typedef struct {
    VecFx32 unk_1C;
    VecFx32 unk_28;
    FieldSystem * unk_34;
-    PlayerAvatar * unk_38;
+    PlayerAvatar * playerAvatar;
    MapObject * unk_3C;
    UnkStruct_ov5_021E1050 unk_40;
    UnkStruct_ov5_021D1BEC * unk_50;
@@ -115,12 +115,12 @@ typedef struct {
    int unk_00;
    int unk_04;
    FieldSystem * unk_08;
-    PlayerAvatar * unk_0C;
+    PlayerAvatar * playerAvatar;
 } UnkStruct_ov5_021E0534;

 typedef struct {
    FieldSystem * unk_00;
-    PlayerAvatar * unk_04;
+    PlayerAvatar * playerAvatar;
    MapObject * unk_08;
    int unk_0C;
    int unk_10;
@@ -131,25 +131,25 @@ typedef struct {
    int unk_00;
    int unk_04;
    FieldSystem * unk_08;
-    PlayerAvatar * unk_0C;
+    PlayerAvatar * playerAvatar;
 } UnkStruct_ov5_021E0FF0;

-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, MapObject * param3);
+static int ov5_021DFE68(FieldSystem * param0, PlayerAvatar * playerAvatar, int param2, int param3);
+static int ov5_021DFEF4(FieldSystem * param0, PlayerAvatar * playerAvatar, int param2, int param3);
+static int ov5_021DFF1C(FieldSystem * param0, PlayerAvatar * playerAvatar, int param2, int param3);
+static void ov5_021DFF88(int param0, FieldSystem * param1, PlayerAvatar * playerAvatar, MapObject * param3);
 static BOOL ov5_021DFFBC(TaskManager * param0);
 static void ov5_021E00B0(FieldSystem * param0, int param1, const UnkStruct_ov5_021E1050 * param2);
 static BOOL ov5_021E0160(TaskManager * param0);
-static int ov5_021E032C(FieldSystem * param0, PlayerAvatar * param1, int param2, int param3);
-static void ov5_021E0390(int param0, FieldSystem * param1, PlayerAvatar * param2);
+static int ov5_021E032C(FieldSystem * param0, PlayerAvatar * playerAvatar, int param2, int param3);
+static void ov5_021E0390(int param0, FieldSystem * param1, PlayerAvatar * playerAvatar);
 static BOOL ov5_021E03C8(TaskManager * param0);
-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 int ov5_021E04A8(FieldSystem * param0, PlayerAvatar * playerAvatar, int param2, int param3);
+static int ov5_021E04EC(FieldSystem * param0, PlayerAvatar * playerAvatar, int param2, int param3);
+static void ov5_021E0534(FieldSystem * param0, PlayerAvatar * playerAvatar);
 static BOOL ov5_021E0560(TaskManager * param0);
-static int ov5_021E067C(FieldSystem * param0, PlayerAvatar * param1, int param2);
-static int ov5_021E06A8(FieldSystem * param0, PlayerAvatar * param1);
+static int ov5_021E067C(FieldSystem * param0, PlayerAvatar * playerAvatar, int param2);
+static int ov5_021E06A8(FieldSystem * param0, PlayerAvatar * playerAvatar);
 static void ov5_021E06F8(FieldSystem * param0, int param1, const UnkStruct_ov5_021E1050 * param2);
 static BOOL ov5_021E07A0(TaskManager * param0);
 static UnkStruct_ov5_021F9B10 * ov5_021E0948(FieldSystem * param0, int param1, const UnkStruct_ov5_021E1050 * param2);
@@ -160,9 +160,9 @@ 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 PlayerAvatar_Redraw(PlayerAvatar * param0, int param1);
+static void PlayerAvatar_Redraw(PlayerAvatar * playerAvatar, int param1);
 static void ov5_021E10C0(void * param0, const UnkStruct_020216E0 * param1);
-static MapObject * ov5_021E10D4(PlayerAvatar * param0, int param1);
+static MapObject * ov5_021E10D4(PlayerAvatar * playerAvatar, int param1);
 static void * ov5_021E1110(int param0);
 static void ov5_021E1134(void * param0);
 static Pokemon * ov5_021E1140(FieldSystem * param0, int param1);
@@ -506,7 +506,7 @@ static void ov5_021DFF88 (int param0, FieldSystem * fieldSystem, PlayerAvatar *
    v0->unk_04 = param0;
    v0->unk_08 = fieldSystem;
    v0->unk_10 = param3;
-    v0->unk_0C = playerAvatar;
+    v0->playerAvatar = playerAvatar;

    sub_02050904(fieldSystem, ov5_021DFFBC, v0);
    sub_0202CF28(sub_0202CD88(fieldSystem->saveData), (1 + 54));
@@ -515,7 +515,7 @@ static void ov5_021DFF88 (int param0, FieldSystem * fieldSystem, PlayerAvatar *
 static BOOL ov5_021DFFBC (TaskManager * param0)
 {
    UnkStruct_ov5_021DFF88 * v0 = TaskManager_Environment(param0);
-    MapObject * v1 = Player_MapObject(v0->unk_0C);
+    MapObject * v1 = Player_MapObject(v0->playerAvatar);
    MapObject * v2 = v0->unk_10;

    switch (v0->unk_00) {
@@ -525,7 +525,7 @@ static BOOL ov5_021DFFBC (TaskManager * param0)
        }

        if (LocalMapObj_IsAnimationSet(v1) == 0) {
-            if (sub_020613AC(v0->unk_0C) == 0) {
+            if (sub_020613AC(v0->playerAvatar) == 0) {
                break;
            }
        }
@@ -583,8 +583,8 @@ static void ov5_021E00B0 (FieldSystem * fieldSystem, int param1, const UnkStruct

    v0->unk_04 = param1;
    v0->unk_1C = fieldSystem;
-    v0->unk_20 = fieldSystem->playerAvatar;
-    v0->unk_24 = Player_MapObject(v0->unk_20);
+    v0->playerAvatar = fieldSystem->playerAvatar;
+    v0->unk_24 = Player_MapObject(v0->playerAvatar);
    v0->unk_0C = *param2;

    sub_02050944(fieldSystem->unk_10, ov5_021E0160, v0);
@@ -623,7 +623,7 @@ static BOOL ov5_021E0160 (TaskManager * taskMan)

    switch (v0->unk_00) {
    case 0:
-        if (sub_0205F108(v0->unk_20) == 0) {
+        if (sub_0205F108(v0->playerAvatar) == 0) {
            sub_020553F0(v0->unk_1C, 0);
            sub_02055554(v0->unk_1C, 1151, 1);
        }
@@ -642,23 +642,23 @@ static BOOL ov5_021E0160 (TaskManager * taskMan)
        break;
    case 2:
    {
-        if (sub_0205F108(v0->unk_20) == 0) {
-            int v1 = Player_GetXPos(v0->unk_20) + sub_0206419C(v0->unk_04);
-            int v2 = Player_GetZPos(v0->unk_20) + sub_020641A8(v0->unk_04);
+        if (sub_0205F108(v0->playerAvatar) == 0) {
+            int v1 = Player_GetXPos(v0->playerAvatar) + sub_0206419C(v0->unk_04);
+            int v2 = Player_GetZPos(v0->playerAvatar) + sub_020641A8(v0->unk_04);

            v0->unk_28 = ov5_021F261C(v0->unk_24, v1, v2, v0->unk_04, 0);
        } else {
            int v3 = MapObject_GetXPos(v0->unk_24);
            int v4 = ((MapObject_GetYPos(v0->unk_24) / 2));
            int v5 = MapObject_GetZPos(v0->unk_24);
-            int v6 = sub_0205F108(v0->unk_20);
+            int v6 = sub_0205F108(v0->playerAvatar);

-            sub_02061674(v0->unk_20, v0->unk_04, &v3, &v4, &v5);
-            v0->unk_28 = ov5_021F85BC(v0->unk_20, v3, v4, v5, v0->unk_04, 0, v6);
+            sub_02061674(v0->playerAvatar, v0->unk_04, &v3, &v4, &v5);
+            v0->unk_28 = ov5_021F85BC(v0->playerAvatar, v3, v4, v5, v0->unk_04, 0, v6);
        }

-        sub_0205EC00(v0->unk_20, v0->unk_28);
-        PlayerAvatar_SetPlayerState(v0->unk_20, 0x2);
+        sub_0205EC00(v0->playerAvatar, v0->unk_28);
+        PlayerAvatar_SetPlayerState(v0->playerAvatar, 0x2);
    }

        v0->unk_00++;
@@ -671,7 +671,7 @@ static BOOL ov5_021E0160 (TaskManager * taskMan)
            int v8[6] = {
                0x34, 0x34, 0x34, 0x85, 0x89, 0x8d
            };
-            int v9 = sub_0205F108(v0->unk_20);
+            int v9 = sub_0205F108(v0->playerAvatar);

            v7 = sub_02065838(v0->unk_04, v8[v9]);
            LocalMapObj_SetAnimationCode(v0->unk_24, v7);
@@ -685,18 +685,18 @@ static BOOL ov5_021E0160 (TaskManager * taskMan)

        sub_020656AC(v0->unk_24);

-        if (sub_0205F108(v0->unk_20) == 0) {
+        if (sub_0205F108(v0->playerAvatar) == 0) {
            int v10;

            ov5_021F2838(v0->unk_28, 1);
-            v10 = Player_MoveStateFromGender(0x2, PlayerAvatar_Gender(v0->unk_20));
-            PlayerAvatar_Redraw(v0->unk_20, v10);
+            v10 = Player_MoveStateFromGender(0x2, PlayerAvatar_Gender(v0->playerAvatar));
+            PlayerAvatar_Redraw(v0->playerAvatar, v10);
        } else {
            int v11;

            ov5_021F88CC(v0->unk_28, 1 << 1);
-            v11 = Player_MoveStateFromGender(0x19, PlayerAvatar_Gender(v0->unk_20));
-            PlayerAvatar_Redraw(v0->unk_20, v11);
+            v11 = Player_MoveStateFromGender(0x19, PlayerAvatar_Gender(v0->playerAvatar));
+            PlayerAvatar_Redraw(v0->playerAvatar, v11);
        }

        ov5_021E1134(v0);
@@ -706,20 +706,20 @@ static BOOL ov5_021E0160 (TaskManager * taskMan)
    return 0;
 }

-static int ov5_021E032C (FieldSystem * fieldSystem, PlayerAvatar * param1, int param2, int param3)
+static int ov5_021E032C (FieldSystem * fieldSystem, PlayerAvatar * playerAvatar, int param2, int param3)
 {
-    if ((param3 != 1) || (PlayerAvatar_GetPlayerState(param1) != 0x2)) {
+    if ((param3 != 1) || (PlayerAvatar_GetPlayerState(playerAvatar) != 0x2)) {
        return 0;
    }

    {
        u32 v0;
-        MapObject * v1 = Player_MapObject(param1);
+        MapObject * v1 = Player_MapObject(playerAvatar);

-        if (sub_0205F158(param1) == 0) {
-            v0 = sub_02060B7C(param1, v1, param2);
+        if (sub_0205F158(playerAvatar) == 0) {
+            v0 = sub_02060B7C(playerAvatar, v1, param2);
        } else {
-            v0 = sub_020611FC(param1, v1, param2);
+            v0 = sub_020611FC(playerAvatar, v1, param2);
        }

        if (v0 == (1 << 5)) {
@@ -733,7 +733,7 @@ static int ov5_021E032C (FieldSystem * fieldSystem, PlayerAvatar * param1, int p
        }
    }

-    ov5_021E0390(param2, fieldSystem, param1);
+    ov5_021E0390(param2, fieldSystem, playerAvatar);
    return 1;
 }

@@ -743,7 +743,7 @@ static void ov5_021E0390 (int param0, FieldSystem * fieldSystem, PlayerAvatar *

    v0->unk_04 = param0;
    v0->unk_08 = fieldSystem;
-    v0->unk_0C = param2;
+    v0->playerAvatar = param2;
    v0->unk_10 = Player_MapObject(param2);
    v0->unk_14 = sub_0205EC04(param2);

@@ -763,17 +763,17 @@ static BOOL ov5_021E03C8 (TaskManager * param0)
                0x34, 0x34, 0x34, 0x85, 0x89, 0x8d
            };

-            v2 = sub_0205F108(v0->unk_0C);
+            v2 = sub_0205F108(v0->playerAvatar);

            if (v2 == 0) {
                ov5_021F2838(v0->unk_14, 0);
-                v1 = Player_MoveStateFromGender(0x0, PlayerAvatar_Gender(v0->unk_0C));
+                v1 = Player_MoveStateFromGender(0x0, PlayerAvatar_Gender(v0->playerAvatar));
            } else {
                ov5_021F88DC(v0->unk_14, 1 << 1);
-                v1 = Player_MoveStateFromGender(0x18, PlayerAvatar_Gender(v0->unk_0C));
+                v1 = Player_MoveStateFromGender(0x18, PlayerAvatar_Gender(v0->playerAvatar));
            }

-            PlayerAvatar_Redraw(v0->unk_0C, v1);
+            PlayerAvatar_Redraw(v0->playerAvatar, v1);

            v1 = sub_02065838(v0->unk_04, v3[v2]);
            LocalMapObj_SetAnimationCode(v0->unk_10, v1);
@@ -791,8 +791,8 @@ static BOOL ov5_021E03C8 (TaskManager * param0)
            ov5_021DF74C(v0->unk_14);
        }

-        sub_0205EC00(v0->unk_0C, NULL);
-        PlayerAvatar_SetPlayerState(v0->unk_0C, 0x0);
+        sub_0205EC00(v0->playerAvatar, NULL);
+        PlayerAvatar_SetPlayerState(v0->playerAvatar, 0x0);
        sub_02055554(v0->unk_08, sub_020554A4(v0->unk_08, v0->unk_08->unk_1C->unk_00), 1);
        ov5_021E1134(v0);
        return 1;
@@ -843,7 +843,7 @@ static void ov5_021E0534 (FieldSystem * param0, PlayerAvatar * playerAvatar)
    UnkStruct_ov5_021E0534 * v0 = ov5_021E1110((sizeof(UnkStruct_ov5_021E0534)));

    v0->unk_08 = param0;
-    v0->unk_0C = playerAvatar;
+    v0->playerAvatar = playerAvatar;

    sub_02050904(param0, ov5_021E0560, v0);
    sub_0202CF28(sub_0202CD88(param0->saveData), (1 + 55));
@@ -852,7 +852,7 @@ static void ov5_021E0534 (FieldSystem * param0, PlayerAvatar * playerAvatar)
 static BOOL ov5_021E0560 (TaskManager * param0)
 {
    UnkStruct_ov5_021E0534 * v0 = TaskManager_Environment(param0);
-    MapObject * v1 = Player_MapObject(v0->unk_0C);
+    MapObject * v1 = Player_MapObject(v0->playerAvatar);

    switch (v0->unk_00) {
    case 0:
@@ -860,14 +860,14 @@ static BOOL ov5_021E0560 (TaskManager * param0)
        v0->unk_00++;
    case 1:
        if (LocalMapObj_IsAnimationSet(v1) == 0) {
-            if (sub_020613AC(v0->unk_0C) == 0) {
+            if (sub_020613AC(v0->playerAvatar) == 0) {
                break;
            }
        }

        if (v0->unk_04 >= 5) {
            Sound_PlayEffect(1618);
-            PlayerAvatar_SetInDeepSwamp(v0->unk_0C, 1);
+            PlayerAvatar_SetInDeepSwamp(v0->playerAvatar, 1);
            ov5_021E1134(v0);
            return 1;
        }
@@ -875,9 +875,9 @@ static BOOL ov5_021E0560 (TaskManager * param0)
        v0->unk_00++;
    case 2:
    {
-        int v2 = PlayerAvatar_GetDir(v0->unk_0C);
+        int v2 = PlayerAvatar_GetDir(v0->playerAvatar);
        u32 v3, v4 = gCoreSys.pressedKeys, v5 = gCoreSys.heldKeys;
-        int v6 = sub_02061308(v0->unk_0C, v4, v5);
+        int v6 = sub_02061308(v0->playerAvatar, v4, v5);

        if ((v6 == -1) || (v6 == v2)) {
            break;
@@ -894,7 +894,7 @@ static BOOL ov5_021E0560 (TaskManager * param0)
                BattleParams * v9;

                if (ov6_022413E4(v8, &v9) == 1) {
-                    PlayerAvatar_SetInDeepSwamp(v0->unk_0C, 1);
+                    PlayerAvatar_SetInDeepSwamp(v0->playerAvatar, 1);
                    ov5_021E1134(v0);
                    sub_02050E78(v8, param0, v9);
                    return 0;
@@ -910,7 +910,7 @@ static BOOL ov5_021E0560 (TaskManager * param0)
        }

        v3 = sub_02065838(v6, v3);
-        PlayerAvatar_SetAnimationCode(v0->unk_0C, v3, 1);
+        PlayerAvatar_SetAnimationCode(v0->playerAvatar, v3, 1);
    }
    break;
    }
@@ -969,8 +969,8 @@ static void ov5_021E06F8 (FieldSystem * param0, int param1, const UnkStruct_ov5_

    v0->unk_04 = param1;
    v0->unk_0C = param0;
-    v0->unk_10 = param0->playerAvatar;
-    v0->unk_14 = Player_MapObject(v0->unk_10);
+    v0->playerAvatar = param0->playerAvatar;
+    v0->unk_14 = Player_MapObject(v0->playerAvatar);
    v0->unk_1C = *param2;

    sub_02050944(param0->unk_10, ov5_021E07A0, v0);
@@ -1041,8 +1041,8 @@ static int ov5_021E07E4 (UnkStruct_ov5_021F9B54 * param0)

 static int ov5_021E07FC (UnkStruct_ov5_021F9B54 * param0)
 {
-    int v0 = Player_GetXPos(param0->unk_10) + sub_0206419C(param0->unk_04);
-    int v1 = Player_GetZPos(param0->unk_10) + sub_020641A8(param0->unk_04);
+    int v0 = Player_GetXPos(param0->playerAvatar) + sub_0206419C(param0->unk_04);
+    int v1 = Player_GetZPos(param0->playerAvatar) + 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);
@@ -1146,7 +1146,7 @@ static UnkStruct_ov5_021F9B10 * ov5_021E0948 (FieldSystem * param0, int param1,

    v0->unk_04 = param1;
    v0->unk_34 = param0;
-    v0->unk_38 = param0->playerAvatar;
+    v0->playerAvatar = param0->playerAvatar;
    v0->unk_3C = Player_MapObject(param0->playerAvatar);

    if (param2 != NULL) {
@@ -1521,9 +1521,9 @@ static void ov5_021E0DE0 (FieldSystem * param0)
    UnkStruct_ov5_021E0DE0 * v0 = ov5_021E1110((sizeof(UnkStruct_ov5_021E0DE0)));

    v0->unk_00 = param0;
-    v0->unk_04 = param0->playerAvatar;
-    v0->unk_08 = Player_MapObject(v0->unk_04);
-    v0->unk_10 = PlayerAvatar_Gender(v0->unk_04);
+    v0->playerAvatar = param0->playerAvatar;
+    v0->unk_08 = Player_MapObject(v0->playerAvatar);
+    v0->unk_10 = PlayerAvatar_Gender(v0->playerAvatar);

    sub_02050944(param0->unk_10, ov5_021E0E10, v0);
 }
@@ -1541,7 +1541,7 @@ static BOOL ov5_021E0E10 (TaskManager * param0)
        if (sub_0206574C(v0->unk_14) == 1) {
            int v1 = Player_MoveStateFromGender(0x12, v0->unk_10);

-            PlayerAvatar_Redraw(v0->unk_04, v1);
+            PlayerAvatar_Redraw(v0->playerAvatar, v1);
            sub_02065758(v0->unk_14);

            v0->unk_14 = sub_02065700(v0->unk_08, Unk_ov5_021F9C00);
@@ -1560,16 +1560,16 @@ static BOOL ov5_021E0E10 (TaskManager * param0)
    return 0;
 }

-void ov5_021E0E94 (PlayerAvatar * param0)
+void ov5_021E0E94 (PlayerAvatar * playerAvatar)
 {
-    MapObject * v0 = Player_MapObject(param0);
+    MapObject * v0 = Player_MapObject(playerAvatar);

    if (sub_02062DFC(v0) == 0) {
        return;
    }

    {
-        int v1 = PlayerAvatar_GetPlayerState(param0);
+        int v1 = PlayerAvatar_GetPlayerState(playerAvatar);

        if (v1 != 0x0) {
            return;
@@ -1585,24 +1585,24 @@ void ov5_021E0E94 (PlayerAvatar * param0)
    }

    {
-        u32 v3 = PlayerAvatar_RequestStateFlag(param0);
+        u32 v3 = PlayerAvatar_RequestStateFlag(playerAvatar);

-        PlayerAvatar_SetRequestStateBit(param0, (1 << 6));
-        PlayerAvatar_RequestChangeState(param0);
-        PlayerAvatar_SetRequestStateBit(param0, v3);
+        PlayerAvatar_SetRequestStateBit(playerAvatar, (1 << 6));
+        PlayerAvatar_RequestChangeState(playerAvatar);
+        PlayerAvatar_SetRequestStateBit(playerAvatar, v3);
    }
 }

-void ov5_021E0EEC (PlayerAvatar * param0)
+void ov5_021E0EEC (PlayerAvatar * playerAvatar)
 {
-    MapObject * v0 = Player_MapObject(param0);
+    MapObject * v0 = Player_MapObject(playerAvatar);

    if (sub_02062DFC(v0) == 0) {
        return;
    }

    {
-        int v1 = PlayerAvatar_GetPlayerState(param0);
+        int v1 = PlayerAvatar_GetPlayerState(playerAvatar);

        if (v1 != 0x0) {
            return;
@@ -1618,18 +1618,18 @@ void ov5_021E0EEC (PlayerAvatar * param0)
    }

    {
-        u32 v3 = PlayerAvatar_RequestStateFlag(param0);
+        u32 v3 = PlayerAvatar_RequestStateFlag(playerAvatar);

-        PlayerAvatar_SetRequestStateBit(param0, (1 << 0));
-        PlayerAvatar_RequestChangeState(param0);
-        PlayerAvatar_SetRequestStateBit(param0, v3);
+        PlayerAvatar_SetRequestStateBit(playerAvatar, (1 << 0));
+        PlayerAvatar_RequestChangeState(playerAvatar);
+        PlayerAvatar_SetRequestStateBit(playerAvatar, v3);
    }
 }

 static SysTask * ov5_021E0F54 (FieldSystem * param0, u32 param1)
 {
-    PlayerAvatar * v0 = param0->playerAvatar;
-    int v1 = PlayerAvatar_GetPlayerState(v0);
+    PlayerAvatar * playerAvatar = param0->playerAvatar;
+    int v1 = PlayerAvatar_GetPlayerState(playerAvatar);

    if (v1 != 0x0) {
        return NULL;
@@ -1637,17 +1637,17 @@ static SysTask * ov5_021E0F54 (FieldSystem * param0, u32 param1)

    {
        SysTask * v2;
-        MapObject * v3 = Player_MapObject(v0);
+        MapObject * v3 = Player_MapObject(playerAvatar);
        UnkStruct_ov5_021E0FF0 * v4 = Heap_AllocFromHeapAtEnd(4, (sizeof(UnkStruct_ov5_021E0FF0)));

        v4->unk_00 = 0;
        v4->unk_08 = param0;
-        v4->unk_0C = v0;
+        v4->playerAvatar = playerAvatar;
        v4->unk_04 = v1;

        sub_02062DDC(v3);
-        PlayerAvatar_SetRequestStateBit(v0, param1);
-        PlayerAvatar_RequestChangeState(v0);
+        PlayerAvatar_SetRequestStateBit(playerAvatar, param1);
+        PlayerAvatar_RequestChangeState(playerAvatar);

        v2 = SysTask_Start(ov5_021E0FF0, v4, 0xffff);
        GF_ASSERT(v2 != NULL);
@@ -1664,10 +1664,10 @@ static void ov5_021E0FC0 (SysTask * param0)

    {
        UnkStruct_ov5_021E0FF0 * v0 = sub_0201CED0(param0);
-        PlayerAvatar * v1 = v0->unk_0C;
-        int v2 = Player_MoveStateFromGender(0x0, PlayerAvatar_Gender(v1));
+        PlayerAvatar * playerAvatar = v0->playerAvatar;
+        int v2 = Player_MoveStateFromGender(0x0, PlayerAvatar_Gender(playerAvatar));

-        PlayerAvatar_RequestStateWalking(v1);
+        PlayerAvatar_RequestStateWalking(playerAvatar);
        Heap_FreeToHeap(v0);
        SysTask_Done(param0);
    }
@@ -1676,7 +1676,7 @@ static void ov5_021E0FC0 (SysTask * param0)
 static void ov5_021E0FF0 (SysTask * param0, void * param1)
 {
    UnkStruct_ov5_021E0FF0 * v0 = param1;
-    MapObject * v1 = Player_MapObject(v0->unk_0C);
+    MapObject * v1 = Player_MapObject(v0->playerAvatar);

    sub_02062B68(v1);
 }
@@ -1723,11 +1723,11 @@ static int ov5_021E1050 (UnkStruct_ov5_021E1050 * param0)
    return 0;
 }

-static void PlayerAvatar_Redraw (PlayerAvatar * param0, int param1)
+static void PlayerAvatar_Redraw (PlayerAvatar * playerAvatar, int param1)
 {
-    MapObject * v0 = Player_MapObject(param0);
+    MapObject * v0 = Player_MapObject(playerAvatar);

-    if (sub_0205F108(param0) == 0) {
+    if (sub_0205F108(playerAvatar) == 0) {
        ov5_021EE3FC(v0, param1, NULL, NULL);
    } else {
        int v1;
@@ -1736,7 +1736,7 @@ static void PlayerAvatar_Redraw (PlayerAvatar * param0, int param1)

        v2 = MapObject_FieldSystem(v0);
        v1 = ov9_0224A520(v2, v0);
-        v3 = ov5_021EE3FC(v0, param1, ov5_021E10C0, param0);
+        v3 = ov5_021EE3FC(v0, param1, ov5_021E10C0, playerAvatar);

        if (v3 != NULL) {
            ov9_0224A558(v2, v3, v1);
@@ -1746,18 +1746,18 @@ static void PlayerAvatar_Redraw (PlayerAvatar * param0, int param1)

 static void ov5_021E10C0 (void * param0, const UnkStruct_020216E0 * param1)
 {
-    PlayerAvatar * v0 = param0;
-    MapObject * v1 = Player_MapObject(v0);
+    PlayerAvatar * playerAvatar = param0;
+    MapObject * v1 = Player_MapObject(playerAvatar);
    FieldSystem * v2 = MapObject_FieldSystem(v1);

    ov9_0224A564(v2, param1);
 }

-static MapObject * ov5_021E10D4 (PlayerAvatar * param0, int param1)
+static MapObject * ov5_021E10D4 (PlayerAvatar * playerAvatar, int param1)
 {
-    int v0 = Player_GetXPos(param0) + sub_0206419C(param1);
-    int v1 = Player_GetZPos(param0) + sub_020641A8(param1);
-    const MapObjectManager * v2 = MapObject_MapObjectManager(Player_MapObject(param0));
+    int v0 = Player_GetXPos(playerAvatar) + sub_0206419C(param1);
+    int v1 = Player_GetZPos(playerAvatar) + sub_020641A8(param1);
+    const MapObjectManager * v2 = MapObject_MapObjectManager(Player_MapObject(playerAvatar));
    MapObject * v3 = sub_0206326C(v2, v0, v1, 0);

    return v3;
--- a/src/overlay005/ov5_021E1154.c
+++ b/src/overlay005/ov5_021E1154.c
@@ -22,18 +22,18 @@ typedef struct {
    int unk_04;
    int unk_08;
    FieldSystem * unk_0C;
-    PlayerAvatar * unk_10;
+    PlayerAvatar * playerAvatar;
    MapObject * unk_14;
 } UnkStruct_ov5_021E11B0;

-static void ov5_021E11B0(FieldSystem * param0, PlayerAvatar * param1, int param2);
+static void ov5_021E11B0(FieldSystem * param0, PlayerAvatar * playerAvatar, int param2);
 static BOOL ov5_021E120C(TaskManager * param0);
 static void * ov5_021E132C(int param0);
 static void ov5_021E1350(void * param0);

-int ov5_021E1154 (FieldSystem * param0, PlayerAvatar * param1, int param2)
+int ov5_021E1154 (FieldSystem * param0, PlayerAvatar * playerAvatar, int param2)
 {
-    MapObject * v0 = Player_MapObject(param1);
+    MapObject * v0 = Player_MapObject(playerAvatar);
    u8 v1 = sub_02062BE8(v0);
    int v2;

@@ -49,16 +49,16 @@ int ov5_021E1154 (FieldSystem * param0, PlayerAvatar * param1, int param2)
        return 0;
    }

-    ov5_021E11B0(param0, param1, v2);
+    ov5_021E11B0(param0, playerAvatar, v2);
    return 1;
 }

-static void ov5_021E11B0 (FieldSystem * param0, PlayerAvatar * param1, int param2)
+static void ov5_021E11B0 (FieldSystem * param0, PlayerAvatar * playerAvatar, int param2)
 {
    UnkStruct_ov5_021E11B0 * v0 = ov5_021E132C((sizeof(UnkStruct_ov5_021E11B0)));

    v0->unk_0C = param0;
-    v0->unk_10 = param1;
+    v0->playerAvatar = playerAvatar;
    v0->unk_00 = param2;

    Sound_PlayEffect(1624);
@@ -84,7 +84,7 @@ static int ov5_021E11E0 (int param0)
 static BOOL ov5_021E120C (TaskManager * param0)
 {
    UnkStruct_ov5_021E11B0 * v0 = TaskManager_Environment(param0);
-    MapObject * v1 = Player_MapObject(v0->unk_10);
+    MapObject * v1 = Player_MapObject(v0->playerAvatar);
    u8 v2 = sub_02062BE8(v1);

    switch (v0->unk_08) {
@@ -93,12 +93,12 @@ static BOOL ov5_021E120C (TaskManager * param0)
        v0->unk_08++;
        break;
    case 1:
-        if (sub_02061544(v0->unk_10)) {
+        if (sub_02061544(v0->playerAvatar)) {
            int v3 = 0xc;

            v3 = sub_02065838(v0->unk_00, v3);
-            PlayerAvatar_SetAnimationCode(v0->unk_10, v3, 1);
-            Player_SetDir(v0->unk_10, v0->unk_00);
+            PlayerAvatar_SetAnimationCode(v0->playerAvatar, v3, 1);
+            Player_SetDir(v0->playerAvatar, v0->unk_00);
            v0->unk_08++;
            v0->unk_04 = 7;
        }
@@ -109,7 +109,7 @@ static BOOL ov5_021E120C (TaskManager * param0)
        case 4:
        case 2:
            v0->unk_00 = ov5_021E11E0(v0->unk_00);
-            Player_SetDir(v0->unk_10, v0->unk_00);
+            Player_SetDir(v0->playerAvatar, v0->unk_00);
            break;
        default:
            break;
@@ -131,14 +131,14 @@ static BOOL ov5_021E120C (TaskManager * param0)
            }

            {
-                u32 v4 = sub_02060B7C(v0->unk_10, v1, v0->unk_00);
+                u32 v4 = sub_02060B7C(v0->playerAvatar, v1, v0->unk_00);

                if (v4 == 0) {
                    v0->unk_08 = 1;
                } else {
                    MapObject_SetStatusFlagOff(v1, (1 << 7));
                    MapObject_SetStatusFlagOff(v1, (1 << 8));
-                    Player_SetDir(v0->unk_10, v0->unk_00);
+                    Player_SetDir(v0->playerAvatar, v0->unk_00);
                    ov5_021E1350(v0);
                    sub_020057A4(1624, 0);
                    return 1;
--- a/src/overlay005/ov5_021F08CC.c
+++ b/src/overlay005/ov5_021F08CC.c
@@ -186,10 +186,10 @@ void ov5_021F09F0 (SysTask * task)
 static void ov5_021F0A04 (SysTask * task, void * param1)
 {
    UnkStruct_ov5_021F0D6C * v0 = param1;
-    PlayerAvatar * v1 = v0->fieldSystem->playerAvatar;
-    MapObject * v2 = Player_MapObject(v1);
+    PlayerAvatar * playerAvatar = v0->fieldSystem->playerAvatar;
+    MapObject * v2 = Player_MapObject(playerAvatar);

-    while (Unk_ov5_021FFA0C[v0->unk_0C](v0, v1, v2)) {
+    while (Unk_ov5_021FFA0C[v0->unk_0C](v0, playerAvatar, v2)) {
        (void)0;
    }
 }
--- a/src/overlay005/ov5_021F61BC.c
+++ b/src/overlay005/ov5_021F61BC.c
@@ -29,7 +29,7 @@ typedef struct {
 typedef struct {
    UnkStruct_ov5_021DF47C * unk_00;
    UnkStruct_021F61E8 * unk_04;
-    PlayerAvatar * unk_08;
+    PlayerAvatar * playerAvatar;
 } UnkStruct_021F6218;

 typedef struct {
@@ -83,7 +83,7 @@ static void ov5_021F620C (UnkStruct_021F61E8 * param0)
    sub_0207395C(&param0->unk_04);
 }

-void ov5_021F6218 (PlayerAvatar * param0)
+void ov5_021F6218 (PlayerAvatar * playerAvatar)
 {
    int v0 = 0, v1;
    UnkStruct_021F6218 v2;
@@ -91,12 +91,12 @@ void ov5_021F6218 (PlayerAvatar * param0)
    MapObject * v4;
    VecFx32 v5 = {0, 0, 0};

-    v4 = Player_MapObject(param0);
+    v4 = Player_MapObject(playerAvatar);
    v3 = ov5_021DF578(v4);

    v2.unk_00 = v3;
    v2.unk_04 = ov5_021DF55C(v3, 14);
-    v2.unk_08 = param0;
+    v2.playerAvatar = playerAvatar;

    v1 = sub_02062758(v4, 2);
    ov5_021DF72C(v3, &Unk_ov5_02200C10, &v5, v0, &v2, v1);
@@ -111,7 +111,7 @@ static int ov5_021F6264 (UnkStruct_ov101_021D5D90 * param0, void * param1)
    v0 = param1;
    v2 = sub_020715BC(param0);
    v0->unk_24 = *v2;
-    v1 = Player_MapObject(v2->unk_08);
+    v1 = Player_MapObject(v2->playerAvatar);

    v0->unk_04 = -1;
    v0->unk_14 = MapObject_Id(v1);
@@ -129,8 +129,8 @@ static void ov5_021F62A0 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
    int v0;
    UnkStruct_021F6264 * v1 = param1;
-    PlayerAvatar * v2 = v1->unk_24.unk_08;
-    MapObject * v3 = Player_MapObject(v2);
+    PlayerAvatar * playerAvatar = v1->unk_24.playerAvatar;
+    MapObject * v3 = Player_MapObject(playerAvatar);

    if (sub_02062764(v3, v1->unk_14, v1->unk_18) == 0) {
        ov5_021DF74C(param0);
@@ -143,7 +143,7 @@ static void ov5_021F62A0 (UnkStruct_ov101_021D5D90 * param0, void * param1)
    v1->unk_04 = ov5_021F6414(v1->unk_08);
    v1->unk_00 = 0;

-    if ((v1->unk_04 == -1) || (v1->unk_04 != PlayerAvatar_GetDir(v2))) {
+    if ((v1->unk_04 == -1) || (v1->unk_04 != PlayerAvatar_GetDir(playerAvatar))) {
        v1->unk_1C = 0;
        v1->unk_20 = 0;
        v1->unk_00 = 1;
--- a/src/overlay005/ov5_021F8560.c
+++ b/src/overlay005/ov5_021F8560.c
@@ -32,7 +32,7 @@ typedef struct {
    UnkStruct_ov5_021DF47C * unk_08;
    UnkStruct_ov5_021F858C * unk_0C;
    MapObject * unk_10;
-    PlayerAvatar * unk_14;
+    PlayerAvatar * playerAvatar;
 } UnkStruct_ov5_021F8668;

 typedef struct {
@@ -91,7 +91,7 @@ static void ov5_021F85B0 (UnkStruct_ov5_021F858C * param0)
    sub_0207395C(&param0->unk_04);
 }

-UnkStruct_ov101_021D5D90 * ov5_021F85BC (PlayerAvatar * param0, int param1, int param2, int param3, int param4, int param5, int param6)
+UnkStruct_ov101_021D5D90 * ov5_021F85BC (PlayerAvatar * playerAvatar, int param1, int param2, int param3, int param4, int param5, int param6)
 {
    int v0;
    UnkStruct_ov101_021D5D90 * v1;
@@ -100,14 +100,14 @@ UnkStruct_ov101_021D5D90 * ov5_021F85BC (PlayerAvatar * param0, int param1, int
    UnkStruct_ov5_021F8668 v4;
    MapObject * v5;

-    v5 = Player_MapObject(param0);
+    v5 = Player_MapObject(playerAvatar);

    v4.unk_00 = param4;
    v4.unk_04 = param6;
    v4.unk_08 = ov5_021DF578(v5);
    v4.unk_0C = ov5_021DF55C(v4.unk_08, 33);
    v4.unk_10 = v5;
-    v4.unk_14 = param0;
+    v4.playerAvatar = playerAvatar;

    if (param5 == 0) {
        FieldSystem * v6 = MapObject_FieldSystem(v5);
@@ -163,14 +163,14 @@ static void ov5_021F86E4 (UnkStruct_ov101_021D5D90 * param0, void * param1)
 {
    UnkStruct_ov5_021F86CC * v0 = param1;
    MapObject * v1 = v0->unk_38.unk_10;
-    PlayerAvatar * v2 = v0->unk_38.unk_14;
+    PlayerAvatar * playerAvatar = v0->unk_38.playerAvatar;

    if (((v0)->unk_00 & (1 << 1)) == 0) {
        return;
    }

    v0->unk_04 = MapObject_GetMoveDir(v1);
-    v0->unk_34 = sub_0205F108(v2);
+    v0->unk_34 = sub_0205F108(playerAvatar);

    GF_ASSERT(v0->unk_04 != -1);

--- a/src/overlay006/ov6_0223E140.c
+++ b/src/overlay006/ov6_0223E140.c
@@ -143,7 +143,7 @@ typedef struct {
    MapObject * unk_108;
    MapObject * unk_10C;
    MapObject * unk_110;
-    PlayerAvatar * unk_114;
+    PlayerAvatar * playerAvatar;
 } UnkStruct_ov6_0223EA98;

 typedef struct UnkStruct_ov6_0223FDE4_t {
--- a/src/overlay006/ov6_02248050.c
+++ b/src/overlay006/ov6_02248050.c
@@ -104,17 +104,17 @@ static void ov6_02248050 (MapObjectManager * param0, u32 param1, UnkStruct_02017
    sub_02017350(param2, (((v1) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1), v3.y, (((v2) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1));
 }

-static void ov6_022480BC (PlayerAvatar * const param0, UnkStruct_02017294 * param1)
+static void ov6_022480BC (PlayerAvatar * const playerAvatar, UnkStruct_02017294 * param1)
 {
    int v0;
    int v1, v2;
    VecFx32 v3;

-    PlayerAvatar_PosVectorOut(param0, &v3);
+    PlayerAvatar_PosVectorOut(playerAvatar, &v3);

-    v1 = Player_GetXPos(param0);
-    v2 = Player_GetZPos(param0);
-    v0 = PlayerAvatar_GetDir(param0);
+    v1 = Player_GetXPos(playerAvatar);
+    v2 = Player_GetZPos(playerAvatar);
+    v0 = PlayerAvatar_GetDir(playerAvatar);

    switch (v0) {
    case 0:
@@ -137,11 +137,11 @@ static void ov6_022480BC (PlayerAvatar * const param0, UnkStruct_02017294 * para
    sub_02017350(param1, (((v1) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1), v3.y, (((v2) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1));
 }

-static void ov6_02248124 (PlayerAvatar * const param0, UnkStruct_02017294 * param1)
+static void ov6_02248124 (PlayerAvatar * const playerAvatar, UnkStruct_02017294 * param1)
 {
    VecFx32 v0;

-    PlayerAvatar_PosVectorOut(param0, &v0);
+    PlayerAvatar_PosVectorOut(playerAvatar, &v0);
    sub_02017350(param1, v0.x, v0.y, v0.z);
 }

--- a/src/overlay008/ov8_02249960.c
+++ b/src/overlay008/ov8_02249960.c
@@ -3896,8 +3896,8 @@ void ov8_0224C198 (FieldSystem * fieldSystem)

    {
        int v3 = 0xd2;
-        PlayerAvatar * v4 = fieldSystem->playerAvatar;
-        MapObject * v5 = Player_MapObject(v4);
+        PlayerAvatar * playerAvatar = fieldSystem->playerAvatar;
+        MapObject * v5 = Player_MapObject(playerAvatar);

        if (PlayerAvatar_Gender(fieldSystem->playerAvatar) == 1) {
            v3 = 0xd3;
@@ -4075,7 +4075,7 @@ BOOL ov8_0224C51C (FieldSystem * fieldSystem)
 {
    int v0, v1, v2, v3;
    UnkStruct_02027860 * v4;
-    PlayerAvatar * v5;
+    PlayerAvatar * playerAvatar;
    MapObjectManager * mapObjMan;
    MapObject * v7;
    MapObject * v8;
@@ -4089,14 +4089,14 @@ BOOL ov8_0224C51C (FieldSystem * fieldSystem)
    v0 = 0;
    v7 = NULL;
    mapObjMan = fieldSystem->mapObjMan;
-    v5 = fieldSystem->playerAvatar;
-    v8 = Player_MapObject(v5);
+    playerAvatar = fieldSystem->playerAvatar;
+    v8 = Player_MapObject(playerAvatar);
    v2 = 2;
    v1 = Direction_GetOpposite(MapObject_Dir(v8));

    while (sub_020625B0(mapObjMan, &v7, &v0, (1 << 0))) {
        if ((v7 != v8) && (sub_02067F88(fieldSystem, v7) == 1)) {
-            v3 = sub_02067D58(v7, v5, v1, v2);
+            v3 = sub_02067D58(v7, playerAvatar, v1, v2);

            if (v3 != -1) {
                int v9 = sub_02062960(v7);
--- a/src/overlay009/ov9_02249960.c
+++ b/src/overlay009/ov9_02249960.c
@@ -2241,8 +2241,8 @@ static void ov9_0224A8C0 (UnkStruct_ov9_02249B04 * param0)
    u32 v0, v1;
    int v2, v3, v4, v5;
    int v6[6] = {0, 0, 0, 90, 270, 180};
-    PlayerAvatar * v7 = param0->unk_00->playerAvatar;
-    MapObject * v8 = Player_MapObject(v7);
+    PlayerAvatar * playerAvatar = param0->unk_00->playerAvatar;
+    MapObject * v8 = Player_MapObject(playerAvatar);

    ov9_02250F44(param0, &v2, &v3, &v4);

@@ -2255,7 +2255,7 @@ static void ov9_0224A8C0 (UnkStruct_ov9_02249B04 * param0)
        sub_02062E28(v8, 1);
    }

-    sub_0205F098(v7, v0);
+    sub_0205F098(playerAvatar, v0);

    v5 = 0x0;
    v1 = sub_02062920(v8);
@@ -2283,7 +2283,7 @@ static void ov9_0224A8C0 (UnkStruct_ov9_02249B04 * param0)
        GF_ASSERT(0);
    }

-    PlayerAvatar_SetPlayerState(v7, v5);
+    PlayerAvatar_SetPlayerState(playerAvatar, v5);
    sub_02061AD4(v8, v1);

    if (v0 != 1) {
@@ -2292,10 +2292,10 @@ static void ov9_0224A8C0 (UnkStruct_ov9_02249B04 * param0)

    if (v5 == 0x2) {
        UnkStruct_ov101_021D5D90 * v9;
-        int v10 = PlayerAvatar_GetDir(v7);
+        int v10 = PlayerAvatar_GetDir(playerAvatar);

-        v9 = ov5_021F85BC(v7, v2, v3, v4, v10, 1, v0);
-        sub_0205EC00(v7, v9);
+        v9 = ov5_021F85BC(playerAvatar, v2, v3, v4, v10, 1, v0);
+        sub_0205EC00(playerAvatar, v9);
    }

    ov9_0224A390(param0, v8, v6[v0]);
@@ -2361,8 +2361,8 @@ static BOOL ov9_0224AAD4 (TaskManager * param0)
    FieldSystem * v0 = TaskManager_FieldSystem(param0);
    UnkStruct_ov9_02249B04 * v1 = TaskManager_Environment(param0);
    UnkStruct_ov9_0224AC58 * v2 = ov9_0224A598(v1);
-    PlayerAvatar * v3 = v0->playerAvatar;
-    MapObject * v4 = Player_MapObject(v3);
+    PlayerAvatar * playerAvatar = v0->playerAvatar;
+    MapObject * v4 = Player_MapObject(playerAvatar);

    switch (v2->unk_00) {
    case 0:
@@ -2422,13 +2422,13 @@ static BOOL ov9_0224AAD4 (TaskManager * param0)
        {
            int v11 = 1;
            int v12 = 0;
-            MapObject * v13 = Player_MapObject(v3);
+            MapObject * v13 = Player_MapObject(playerAvatar);

            ov9_0224C3F8(v1, v2->unk_34.unk_26);
            v11 = ov9_022510D8(v2->unk_34.unk_24);

-            sub_0205F098(v3, v11);
-            PlayerAvatar_ClearSpeed(v3);
+            sub_0205F098(playerAvatar, v11);
+            PlayerAvatar_ClearSpeed(playerAvatar);

            if (v2->unk_34.unk_26 < 0) {
                sub_02062E28(v13, 0);
@@ -5049,8 +5049,8 @@ static int ov9_0224D0C8 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078
 static int ov9_0224D288 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078 * param1)
 {
    VecFx32 v0;
-    PlayerAvatar * v1 = param0->unk_00->playerAvatar;
-    MapObject * v2 = Player_MapObject(v1);
+    PlayerAvatar * playerAvatar = param0->unk_00->playerAvatar;
+    MapObject * v2 = Player_MapObject(playerAvatar);
    VecFx32 * v3 = ov9_0224E330(param1->unk_64->unk_20);

    sub_0206309C(v2, &v0);
@@ -5110,8 +5110,8 @@ static int ov9_0224D288 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078
 static int ov9_0224D374 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078 * param1)
 {
    int v0;
-    PlayerAvatar * v1 = param0->unk_00->playerAvatar;
-    MapObject * v2 = Player_MapObject(v1);
+    PlayerAvatar * playerAvatar = param0->unk_00->playerAvatar;
+    MapObject * v2 = Player_MapObject(playerAvatar);
    VecFx32 * v3 = ov9_0224E330(param1->unk_64->unk_20);

    if (param1->unk_44.x != param1->unk_2C.x) {
@@ -5192,8 +5192,8 @@ static int ov9_0224D430 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078
 static int ov9_0224D4C4 (UnkStruct_ov9_02249B04 * param0, UnkStruct_ov9_0224D078 * param1)
 {
    int v0;
-    PlayerAvatar * v1 = param0->unk_00->playerAvatar;
-    MapObject * v2 = Player_MapObject(v1);
+    PlayerAvatar * playerAvatar = param0->unk_00->playerAvatar;
+    MapObject * v2 = Player_MapObject(playerAvatar);
    VecFx32 * v3 = ov9_0224E330(param1->unk_64->unk_20);

    if (param1->unk_44.x != param1->unk_2C.x) {
@@ -6523,13 +6523,13 @@ static int ov9_0224E798 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1,

        {
            u32 v5;
-            PlayerAvatar * v6 = param0->unk_00->playerAvatar;
+            PlayerAvatar * playerAvatar = param0->unk_00->playerAvatar;

            v3 = ((v3) / 2);
            ov9_0224C378(param0, v2, v3, v4, 4);
            v5 = ov9_0224C4B8(param0, v2, v3, v4);
            v5 = ov9_022510D8(v5);
-            sub_0205F098(v6, v5);
+            sub_0205F098(playerAvatar, v5);

            if (v5 == 1) {
                sub_02062E28(v1, 0);
@@ -7807,8 +7807,8 @@ static void ov9_0224F760 (UnkStruct_ov9_02249B04 * param0)
 static void ov9_0224F764 (UnkStruct_ov9_02249B04 * param0)
 {
    UnkStruct_ov9_0224ADC0 * v0 = &param0->unk_1D00;
-    PlayerAvatar * v1 = param0->unk_00->playerAvatar;
-    const VecFx32 * v2 = PlayerAvatar_PosVector(v1);
+    PlayerAvatar * playerAvatar = param0->unk_00->playerAvatar;
+    const VecFx32 * v2 = PlayerAvatar_PosVector(playerAvatar);

    if (v0->unk_06 == 0) {
        v0->unk_00 = (v2->y - (((65 << 4) * FX32_ONE))) / ((((((289 - 65)) << 4) * FX32_ONE)) / 12);
@@ -8053,15 +8053,15 @@ static int ov9_0224FB3C (UnkStruct_ov9_02249B04 * param0, TaskManager * param1,
    VecFx32 v0;
    UnkStruct_ov9_0224F930 * v1;
    MapObject * v2;
-    PlayerAvatar * v3;
+    PlayerAvatar * playerAvatar;
    UnkStruct_ov9_0224FA94 * v4;
    const UnkStruct_ov9_02252384 * v5;

    v5 = param3;
    v4 = ov9_0224E37C(param0, sizeof(UnkStruct_ov9_0224FA94));
    v1 = &v4->unk_40;
-    v3 = param0->unk_00->playerAvatar;
-    v2 = Player_MapObject(v3);
+    playerAvatar = param0->unk_00->playerAvatar;
+    v2 = Player_MapObject(playerAvatar);

    MapObject_PosVectorOut(v2, &v0);
    MapObject_SetDir(v2, 2);
@@ -8081,7 +8081,7 @@ static int ov9_0224FB3C (UnkStruct_ov9_02249B04 * param0, TaskManager * param1,

    {
        VecFx32 * v7;
-        UnkStruct_ov101_021D5D90 * v8 = sub_0205EC04(v3);
+        UnkStruct_ov101_021D5D90 * v8 = sub_0205EC04(playerAvatar);
        UnkStruct_ov5_02201C58 * v9 = ov5_021F88A8(v8);

        ov5_021F88B4(v8, 2, 5);
@@ -8397,15 +8397,15 @@ static int ov9_02250170 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1,
    VecFx32 v0;
    UnkStruct_ov9_0224F930 * v1;
    MapObject * v2;
-    PlayerAvatar * v3;
+    PlayerAvatar * playerAvatar;
    UnkStruct_ov9_02250138 * v4;
    const UnkStruct_ov9_022523F0 * v5;

    v5 = param3;
    v4 = ov9_0224E37C(param0, sizeof(UnkStruct_ov9_02250138));
    v1 = &v4->unk_34;
-    v3 = param0->unk_00->playerAvatar;
-    v2 = Player_MapObject(v3);
+    playerAvatar = param0->unk_00->playerAvatar;
+    v2 = Player_MapObject(playerAvatar);

    MapObject_PosVectorOut(v2, &v0);
    MapObject_SetDir(v2, 3);
@@ -8425,7 +8425,7 @@ static int ov9_02250170 (UnkStruct_ov9_02249B04 * param0, TaskManager * param1,

    {
        VecFx32 * v7;
-        UnkStruct_ov101_021D5D90 * v8 = sub_0205EC04(v3);
+        UnkStruct_ov101_021D5D90 * v8 = sub_0205EC04(playerAvatar);
        UnkStruct_ov5_02201C58 * v9 = ov5_021F88A8(v8);

        ov5_021F88B4(v8, 3, 1);
--- a/src/overlay023/ov23_02248F1C.c
+++ b/src/overlay023/ov23_02248F1C.c
@@ -75,7 +75,7 @@ int Unk_ov23_0225776C[8][2];

 static void ov23_0224944C(BGL * param0, Window * param1);
 static void ov23_02249584(UnkStruct_ov23_0224942C * param0);
-static void ov23_02249214(PlayerAvatar * const param0, int param1[][2], int param2[][3]);
+static void ov23_02249214(PlayerAvatar * const playerAvatar, int param1[][2], int param2[][3]);
 static void ov23_022491CC(int param0[][2], int param1[][3]);
 static void ov23_022492C8(int param0[][3], GraphicElementData * param1[]);
 static void ov23_0224944C(BGL * param0, Window * param1);
@@ -215,7 +215,7 @@ static void ov23_022491CC (int param0[][2], int param1[][3])
    }
 }

-static void ov23_02249214 (PlayerAvatar * const param0, int param1[][2], int param2[][3])
+static void ov23_02249214 (PlayerAvatar * const playerAvatar, int param1[][2], int param2[][3])
 {
    int v0;

@@ -226,8 +226,8 @@ static void ov23_02249214 (PlayerAvatar * const param0, int param1[][2], int par

    if (CommSys_IsInitialized()) {
        if (CommSys_IsPlayerConnected(CommSys_CurNetId()) == 0) {
-            param1[0][0] = Player_GetXPos(param0);
-            param1[0][1] = Player_GetZPos(param0);
+            param1[0][0] = Player_GetXPos(playerAvatar);
+            param1[0][1] = Player_GetZPos(playerAvatar);
        } else {
            int v1 = param1[0][0];
            int v2 = param1[0][1];
--- a/src/unk_0203F6C4.c
+++ b/src/unk_0203F6C4.c
@@ -3407,11 +3407,11 @@ static BOOL ScrCmd_068 (ScriptContext * ctx)

    {
        FieldSystem * v3;
-        PlayerAvatar * v4;
+        PlayerAvatar * playerAvatar;

        v3 = ctx->fieldSys;
-        v4 = v3->playerAvatar;
-        v0 = PlayerAvatar_GetDir(v4);
+        playerAvatar = v3->playerAvatar;
+        v0 = PlayerAvatar_GetDir(playerAvatar);
    }

    v0 = Direction_GetOpposite(v0);
@@ -3468,7 +3468,7 @@ static BOOL ScrCmd_06B (ScriptContext * ctx)
 {
    u16 v0, v1, v2;
    VecFx32 v3;
-    FieldSystem * v4 = ctx->fieldSys;
+    FieldSystem * fieldSystem = ctx->fieldSys;

    v0 = ScriptContext_GetVar(ctx);
    v1 = ScriptContext_GetVar(ctx);
--- a/src/unk_02048614.c
+++ b/src/unk_02048614.c
@@ -54,7 +54,7 @@ BOOL ScrCmd_0B6 (ScriptContext * param0)
    int * v4;
    SysTask ** v5;
    MapObject ** v6;
-    PlayerAvatar * v7;
+    PlayerAvatar * playerAvatar;
    FieldSystem * v8 = param0->fieldSys;
    u16 v9 = ScriptContext_GetVar(param0);

@@ -76,8 +76,8 @@ BOOL ScrCmd_0B6 (ScriptContext * param0)
        v5 = sub_0203F098(v8, 37);
    }

-    v7 = v8->playerAvatar;
-    *v5 = sub_02067FB8(v8, *v6, v7, *v4, *v0, 0, *v3, v9);
+    playerAvatar = v8->playerAvatar;
+    *v5 = sub_02067FB8(v8, *v6, playerAvatar, *v4, *v0, 0, *v3, v9);

    return 0;
 }
--- a/src/unk_020553DC.c
+++ b/src/unk_020553DC.c
@@ -143,12 +143,12 @@ void sub_02055414 (FieldSystem * fieldSystem)

 u16 sub_02055428 (FieldSystem * fieldSystem, int param1)
 {
-    PlayerAvatar * v0;
+    PlayerAvatar * playerAvatar;
    int v1;
    u16 v2, v3;

-    v0 = fieldSystem->playerAvatar;
-    v1 = PlayerAvatar_GetPlayerState(v0);
+    playerAvatar = fieldSystem->playerAvatar;
+    v1 = PlayerAvatar_GetPlayerState(playerAvatar);

    if (v1 == 0x2) {
        switch (param1) {
@@ -238,11 +238,11 @@ static u16 sub_020554E8 (FieldSystem * fieldSystem, int param1)

 BOOL sub_02055554 (FieldSystem * fieldSystem, u16 param1, int param2)
 {
-    PlayerAvatar * v0;
+    PlayerAvatar * playerAvatar;
    int v1, v2, v3;

-    v0 = fieldSystem->playerAvatar;
-    v3 = PlayerAvatar_GetPlayerState(v0);
+    playerAvatar = fieldSystem->playerAvatar;
+    v3 = PlayerAvatar_GetPlayerState(playerAvatar);

    if (sub_020041DC() == 1) {
        return 0;
--- a/src/unk_0205C22C.c
+++ b/src/unk_0205C22C.c
@@ -66,7 +66,7 @@ UnkStruct_0205C22C * sub_0205C22C (UnkStruct_0205B43C * param0)
    v0->unk_04 = SysTask_Start(sub_0205C304, v0, 11);
    v0->unk_470 = sub_0205B770(param0);
    v0->unk_474 = SaveData_SaveTable(v0->unk_470->saveData, 9);
-    v0->unk_08 = v0->unk_470->playerAvatar;
+    v0->playerAvatar = v0->unk_470->playerAvatar;

    Heap_CreateAtEnd(11, 89, 10000);
    v0->unk_478 = sub_0205C95C(89);
@@ -112,7 +112,7 @@ static void sub_0205C304 (SysTask * task, void * param1)
    UnkStruct_0205B43C * v1 = v0->unk_00;

    if (!sub_020509A4(v0->unk_470)) {
-        v0->unk_08 = v0->unk_470->playerAvatar;
+        v0->playerAvatar = v0->unk_470->playerAvatar;
        sub_0205C44C(v0, v1, v0->unk_470->mapObjMan, v0->unk_474);
        sub_0205C51C(v0, v0->unk_470->mapObjMan);
    }
@@ -245,10 +245,10 @@ static void sub_0205C51C (UnkStruct_0205C22C * param0, MapObjectManager * param1
    MapObject * v0;
    int v1, v2, v3;

-    GF_ASSERT(param0->unk_08 != NULL);
+    GF_ASSERT(param0->playerAvatar != NULL);

-    v2 = Player_GetXPos(param0->unk_08);
-    v3 = Player_GetZPos(param0->unk_08);
+    v2 = Player_GetXPos(param0->playerAvatar);
+    v3 = Player_GetZPos(param0->playerAvatar);

    for (v1 = 0; v1 < 50; v1++) {
        v0 = MapObjMan_LocalMapObjByIndex(param1, v1 + 1);
@@ -319,7 +319,7 @@ static void sub_0205C51C (UnkStruct_0205C22C * param0, MapObjectManager * param1
        }
    }

-    sub_0205C7BC(&param0->unk_0C[50], Player_MapObject(param0->unk_08));
+    sub_0205C7BC(&param0->unk_0C[50], Player_MapObject(param0->playerAvatar));
    sub_0205C6BC(&param0->unk_0C[50]);
 }

--- a/src/unk_0206450C.c
+++ b/src/unk_0206450C.c
--- a/src/unk_02067A84.c
+++ b/src/unk_02067A84.c
@@ -44,19 +44,19 @@ typedef struct {
    int unk_1C;
    UnkStruct_ov101_021D5D90 * unk_20;
    MapObject * unk_24;
-    PlayerAvatar * unk_28;
+    PlayerAvatar * playerAvatar;
    FieldSystem * unk_2C;
 } UnkStruct_020EF6D0;

-static int sub_02067BA8(FieldSystem * param0, MapObjectManager * param1, PlayerAvatar * param2, const MapObject * param3, UnkStruct_02067C28 * param4);
+static int sub_02067BA8(FieldSystem * param0, MapObjectManager * param1, PlayerAvatar * playerAvatar, const MapObject * param3, UnkStruct_02067C28 * param4);
 static void sub_02067C28(UnkStruct_02067C28 * param0, MapObject * param1, int param2, int param3);
 static int sub_02067C54(const MapObject * param0);
-static int sub_02067C80(const MapObject * param0, PlayerAvatar * param1, int * param2);
+static int sub_02067C80(const MapObject * param0, PlayerAvatar * playerAvatar, int * param2);
 static int sub_02067DA8(const MapObject * param0, int param1, int param2, int param3, int param4, int param5);
 static int sub_02067E74(const MapObject * param0, int param1, int param2);
 static int sub_02067F14(MapObject * param0);
 static MapObject * sub_02067F2C(FieldSystem * param0, MapObjectManager * param1, MapObject * param2, int param3);
-static SysTask * sub_02067FF0(FieldSystem * param0, MapObject * param1, PlayerAvatar * param2, int param3, int param4, int param5, int param6, int param7);
+static SysTask * sub_02067FF0(FieldSystem * param0, MapObject * param1, PlayerAvatar * playerAvatar, int param3, int param4, int param5, int param6, int param7);
 static int sub_02068048(SysTask * param0);
 static void sub_02068054(SysTask * param0);
 static void sub_0206806C(SysTask * param0, void * param1);
@@ -113,7 +113,7 @@ int sub_02067A84 (FieldSystem * fieldSystem, BOOL param1)
    return 0;
 }

-static int sub_02067BA8 (FieldSystem * fieldSystem, MapObjectManager * param1, PlayerAvatar * param2, const MapObject * param3, UnkStruct_02067C28 * param4)
+static int sub_02067BA8 (FieldSystem * fieldSystem, MapObjectManager * param1, PlayerAvatar * playerAvatar, const MapObject * param3, UnkStruct_02067C28 * param4)
 {
    int v0, v1, v2;
    MapObject * v3;
@@ -124,7 +124,7 @@ static int sub_02067BA8 (FieldSystem * fieldSystem, MapObjectManager * param1, P

    while (sub_020625B0(param1, &v3, &v0, (1 << 0))) {
        if ((param3 == NULL) || (param3 != v3)) {
-            v1 = sub_02067C80(v3, param2, &v2);
+            v1 = sub_02067C80(v3, playerAvatar, &v2);

            if (v1 != -1) {
                if (sub_0203F2A0(fieldSystem, sub_02067F14(v3)) == 0) {
@@ -165,15 +165,15 @@ static int sub_02067C54 (const MapObject * param0)
    return v0;
 }

-static int sub_02067C80 (const MapObject * param0, PlayerAvatar * param1, int * param2)
+static int sub_02067C80 (const MapObject * param0, PlayerAvatar * playerAvatar, int * param2)
 {
    int v0, v1, v2, v3, v4, v5;

    v0 = sub_02067C54(param0);

    if (v0 == 0x1) {
-        v3 = Player_GetXPos(param1);
-        v4 = Player_GetZPos(param1);
+        v3 = Player_GetXPos(playerAvatar);
+        v4 = Player_GetZPos(playerAvatar);
        v2 = MapObject_Dir(param0);
        v1 = sub_020629D8(param0, 0);
        v5 = sub_02067DA8(param0, v2, v1, v3, v4, 0);
@@ -189,8 +189,8 @@ static int sub_02067C80 (const MapObject * param0, PlayerAvatar * param1, int *
    }

    if (v0 == 0x2) {
-        v3 = Player_GetXPos(param1);
-        v4 = Player_GetZPos(param1);
+        v3 = Player_GetXPos(playerAvatar);
+        v4 = Player_GetZPos(playerAvatar);
        v1 = sub_020629D8(param0, 0);
        v2 = 0;

@@ -213,14 +213,14 @@ static int sub_02067C80 (const MapObject * param0, PlayerAvatar * param1, int *
    return(-1);
 }

-int sub_02067D58 (const MapObject * param0, PlayerAvatar * param1, int param2, int param3)
+int sub_02067D58 (const MapObject * mapObj, PlayerAvatar * playerAvatar, int param2, int param3)
 {
-    int v0 = Player_GetXPos(param1);
-    int v1 = Player_GetZPos(param1);
-    int v2 = sub_02067DA8(param0, param2, param3, v0, v1, 0);
+    int v0 = Player_GetXPos(playerAvatar);
+    int v1 = Player_GetZPos(playerAvatar);
+    int v2 = sub_02067DA8(mapObj, param2, param3, v0, v1, 0);

    if (v2 != -1) {
-        if (sub_02067E74(param0, param2, v2) == 1) {
+        if (sub_02067E74(mapObj, param2, v2) == 1) {
            v2 = -1;
        }
    }
@@ -228,19 +228,19 @@ int sub_02067D58 (const MapObject * param0, PlayerAvatar * param1, int param2, i
    return v2;
 }

-static int sub_02067DA8 (const MapObject * param0, int param1, int param2, int param3, int param4, int param5)
+static int sub_02067DA8 (const MapObject * mapObj, int param1, int param2, int param3, int param4, int param5)
 {
-    return Unk_020EF6C0[param1](param0, param2, param3, param4, param5);
+    return Unk_020EF6C0[param1](mapObj, param2, param3, param4, param5);
 }

-static int sub_02067DC4 (const MapObject * param0, int param1, int param2, int param3, int param4)
+static int sub_02067DC4 (const MapObject * mapObj, int param1, int param2, int param3, int param4)
 {
    int v0, v1;

-    v0 = MapObject_GetXPos(param0);
+    v0 = MapObject_GetXPos(mapObj);

    if (v0 == param2) {
-        v1 = MapObject_GetZPos(param0);
+        v1 = MapObject_GetZPos(mapObj);

        if ((param3 < v1) && (param3 >= (v1 - param1))) {
            return v1 - param3;
@@ -250,14 +250,14 @@ static int sub_02067DC4 (const MapObject * param0, int param1, int param2, int p
    return(-1);
 }

-static int sub_02067DF0 (const MapObject * param0, int param1, int param2, int param3, int param4)
+static int sub_02067DF0 (const MapObject * mapObj, int param1, int param2, int param3, int param4)
 {
    int v0, v1;

-    v0 = MapObject_GetXPos(param0);
+    v0 = MapObject_GetXPos(mapObj);

    if (v0 == param2) {
-        v1 = MapObject_GetZPos(param0);
+        v1 = MapObject_GetZPos(mapObj);

        if ((param3 > v1) && (param3 <= (v1 + param1))) {
            return param3 - v1;
@@ -267,14 +267,14 @@ static int sub_02067DF0 (const MapObject * param0, int param1, int param2, int p
    return(-1);
 }

-static int sub_02067E1C (const MapObject * param0, int param1, int param2, int param3, int param4)
+static int sub_02067E1C (const MapObject * mapObj, int param1, int param2, int param3, int param4)
 {
    int v0, v1;

-    v1 = MapObject_GetZPos(param0);
+    v1 = MapObject_GetZPos(mapObj);

    if (v1 == param3) {
-        v0 = MapObject_GetXPos(param0);
+        v0 = MapObject_GetXPos(mapObj);

        if ((param2 < v0) && (param2 >= (v0 - param1))) {
            return v0 - param2;
@@ -284,14 +284,14 @@ static int sub_02067E1C (const MapObject * param0, int param1, int param2, int p
    return(-1);
 }

-static int sub_02067E48 (const MapObject * param0, int param1, int param2, int param3, int param4)
+static int sub_02067E48 (const MapObject * mapObj, int param1, int param2, int param3, int param4)
 {
    int v0, v1;

-    v1 = MapObject_GetZPos(param0);
+    v1 = MapObject_GetZPos(mapObj);

    if (v1 == param3) {
-        v0 = MapObject_GetXPos(param0);
+        v0 = MapObject_GetXPos(mapObj);

        if ((param2 > v0) && (param2 <= (v0 + param1))) {
            return param2 - v0;
@@ -308,7 +308,7 @@ static int(*const Unk_020EF6C0[])(const MapObject *, int, int, int, int) = {
    sub_02067E48
 };

-static int sub_02067E74 (const MapObject * param0, int param1, int param2)
+static int sub_02067E74 (const MapObject * mapObj, int param1, int param2)
 {
    int v0, v1, v2, v3;
    u32 v4;
@@ -317,14 +317,14 @@ static int sub_02067E74 (const MapObject * param0, int param1, int param2)
        return 1;
    }

-    v1 = MapObject_GetXPos(param0);
-    v2 = MapObject_GetZPos(param0);
-    v3 = MapObject_GetYPos(param0);
+    v1 = MapObject_GetXPos(mapObj);
+    v2 = MapObject_GetZPos(mapObj);
+    v3 = MapObject_GetYPos(mapObj);
    v1 += sub_0206419C(param1);
    v2 += sub_020641A8(param1);

    for (v0 = 0; v0 < (param2 - 1); v0++) {
-        v4 = sub_02063E94(param0, v1, v3, v2, param1);
+        v4 = sub_02063E94(mapObj, v1, v3, v2, param1);
        v4 &= ~(1 << 0);

        if (v4) {
@@ -335,7 +335,7 @@ static int sub_02067E74 (const MapObject * param0, int param1, int param2)
        v2 += sub_020641A8(param1);
    }

-    v4 = sub_02063E94(param0, v1, v3, v2, param1);
+    v4 = sub_02063E94(mapObj, v1, v3, v2, param1);
    v4 &= ~(1 << 0);

    if (v4 == (1 << 2)) {
@@ -345,20 +345,20 @@ static int sub_02067E74 (const MapObject * param0, int param1, int param2)
    return 1;
 }

-static int sub_02067F14 (MapObject * param0)
+static int sub_02067F14 (MapObject * mapObj)
 {
    int v0;

-    v0 = sub_02062960(param0);
+    v0 = sub_02062960(mapObj);
    return sub_0203F254(v0);
 }

-int sub_02067F24 (MapObject * param0)
+int sub_02067F24 (MapObject * mapObj)
 {
-    return sub_02067F14(param0);
+    return sub_02067F14(mapObj);
 }

-static MapObject * sub_02067F2C (FieldSystem * param0, MapObjectManager * param1, MapObject * param2, int param3)
+static MapObject * sub_02067F2C (FieldSystem * fieldSystem, MapObjectManager * param1, MapObject * param2, int param3)
 {
    int v0;
    MapObject * v1;
@@ -381,12 +381,12 @@ static MapObject * sub_02067F2C (FieldSystem * param0, MapObjectManager * param1
    return NULL;
 }

-int sub_02067F88 (FieldSystem * param0, MapObject * param1)
+int sub_02067F88 (FieldSystem * fieldSystem, MapObject * param1)
 {
    int v0 = sub_02067C54(param1);

    if ((v0 == 0x1) || (v0 == 0x2)) {
-        if (sub_0203F2A0(param0, sub_02067F14(param1)) == 0) {
+        if (sub_0203F2A0(fieldSystem, sub_02067F14(param1)) == 0) {
            return 1;
        }
    }
@@ -394,23 +394,23 @@ int sub_02067F88 (FieldSystem * param0, MapObject * param1)
    return 0;
 }

-SysTask * sub_02067FB8 (FieldSystem * param0, MapObject * param1, PlayerAvatar * param2, int param3, int param4, int param5, int param6, int param7)
+SysTask * sub_02067FB8 (FieldSystem * fieldSystem, MapObject * param1, PlayerAvatar * playerAvatar, int param3, int param4, int param5, int param6, int param7)
 {
-    return sub_02067FF0(param0, param1, param2, param3, param4, param5, param6, param7);
+    return sub_02067FF0(fieldSystem, param1, playerAvatar, param3, param4, param5, param6, param7);
 }

-int sub_02067FD4 (SysTask * param0)
+int sub_02067FD4 (SysTask * task)
 {
-    GF_ASSERT(param0 != NULL);
-    return sub_02068048(param0);
+    GF_ASSERT(task != NULL);
+    return sub_02068048(task);
 }

-void sub_02067FE8 (SysTask * param0)
+void sub_02067FE8 (SysTask * task)
 {
-    sub_02068054(param0);
+    sub_02068054(task);
 }

-static SysTask * sub_02067FF0 (FieldSystem * param0, MapObject * param1, PlayerAvatar * param2, int param3, int param4, int param5, int param6, int param7)
+static SysTask * sub_02067FF0 (FieldSystem * fieldSystem, MapObject * param1, PlayerAvatar * playerAvatar, int param3, int param4, int param5, int param6, int param7)
 {
    SysTask * v0;
    UnkStruct_020EF6D0 * v1;
@@ -425,9 +425,9 @@ static SysTask * sub_02067FF0 (FieldSystem * param0, MapObject * param1, PlayerA
    v1->unk_10 = param5;
    v1->unk_14 = param6;
    v1->unk_18 = param7;
-    v1->unk_2C = param0;
+    v1->unk_2C = fieldSystem;
    v1->unk_24 = param1;
-    v1->unk_28 = param2;
+    v1->playerAvatar = playerAvatar;

    v0 = SysTask_Start(sub_0206806C, v1, 0xff);
    GF_ASSERT(v0 != NULL);
@@ -435,25 +435,25 @@ static SysTask * sub_02067FF0 (FieldSystem * param0, MapObject * param1, PlayerA
    return v0;
 }

-static int sub_02068048 (SysTask * param0)
+static int sub_02068048 (SysTask * task)
 {
    UnkStruct_020EF6D0 * v0;

-    v0 = sub_0201CED0(param0);
+    v0 = sub_0201CED0(task);
    return v0->unk_04;
 }

-static void sub_02068054 (SysTask * param0)
+static void sub_02068054 (SysTask * task)
 {
    UnkStruct_020EF6D0 * v0;

-    v0 = sub_0201CED0(param0);
+    v0 = sub_0201CED0(task);

    Heap_FreeToHeapExplicit(4, v0);
-    SysTask_Done(param0);
+    SysTask_Done(task);
 }

-static void sub_0206806C (SysTask * param0, void * param1)
+static void sub_0206806C (SysTask * task, void * param1)
 {
    UnkStruct_020EF6D0 * v0;

@@ -493,7 +493,7 @@ static int sub_020680A4 (UnkStruct_020EF6D0 * param0)

 static int sub_020680D0 (UnkStruct_020EF6D0 * param0)
 {
-    MapObject * v0 = Player_MapObject(param0->unk_28);
+    MapObject * v0 = Player_MapObject(param0->playerAvatar);

    if (LocalMapObj_CheckAnimationFinished(v0) == 0) {
        return 0;
@@ -645,10 +645,10 @@ static int sub_02068264 (UnkStruct_020EF6D0 * param0)
    int v0, v1;
    MapObject * v2;

-    v2 = Player_MapObject(param0->unk_28);
+    v2 = Player_MapObject(param0->playerAvatar);
    v1 = sub_02064488(MapObject_GetXPos(v2), MapObject_GetZPos(v2), MapObject_GetXPos(param0->unk_24), MapObject_GetZPos(param0->unk_24));

-    if ((PlayerAvatar_GetDir(param0->unk_28) != v1) && ((param0->unk_18 == 0) || (param0->unk_14 == 2))) {
+    if ((PlayerAvatar_GetDir(param0->playerAvatar) != v1) && ((param0->unk_18 == 0) || (param0->unk_14 == 2))) {
        if (LocalMapObj_IsAnimationSet(v2) == 1) {
            MapObject_SetStatusFlagOff(v2, (1 << 7));
            v0 = sub_02065838(v1, 0x0);
@@ -666,7 +666,7 @@ static int sub_020682E0 (UnkStruct_020EF6D0 * param0)
 {
    MapObject * v0;

-    v0 = Player_MapObject(param0->unk_28);
+    v0 = Player_MapObject(param0->playerAvatar);

    if (LocalMapObj_CheckAnimationFinished(v0) == 0) {
        return 0;
--- a/src/unk_020683F4.c
+++ b/src/unk_020683F4.c
@@ -247,7 +247,7 @@ void sub_0206842C (FieldSystem * fieldSystem, UnkStruct_020684D0 * param1)
    sub_0203C9D4(fieldSystem, &v3);

    param1->unk_10 = sub_02055FC8(fieldSystem, v3);
-    param1->unk_14 = fieldSystem->playerAvatar;
+    param1->playerAvatar = fieldSystem->playerAvatar;
 }

 static void sub_020684D0 (FieldSystem * fieldSystem, UnkStruct_020684D0 * param1)
@@ -264,7 +264,7 @@ static void sub_020684D0 (FieldSystem * fieldSystem, UnkStruct_020684D0 * param1
    }

    param1->unk_10 = sub_02055FC8(fieldSystem, NULL);
-    param1->unk_14 = fieldSystem->playerAvatar;
+    param1->playerAvatar = fieldSystem->playerAvatar;
 }

 static UnkStruct_0206851C * sub_0206851C (u32 param0, u16 param1, u16 param2, u16 param3, u16 param4)
@@ -420,7 +420,7 @@ static u32 sub_0206877C (const UnkStruct_020684D0 * param0)
        return -1;
    }

-    if (sub_0205EFDC(param0->unk_14) == 1) {
+    if (sub_0205EFDC(param0->playerAvatar) == 1) {
        return -1;
    }

@@ -428,7 +428,7 @@ static u32 sub_0206877C (const UnkStruct_020684D0 * param0)
        return -1;
    }

-    if (PlayerAvatar_GetPlayerState(param0->unk_14) == 0x2) {
+    if (PlayerAvatar_GetPlayerState(param0->playerAvatar) == 0x2) {
        return -1;
    }

@@ -532,12 +532,12 @@ static u32 sub_02068948 (const UnkStruct_020684D0 * param0)
        return 1;
    }

-    if (sub_0205EFDC(param0->unk_14) == 1) {
+    if (sub_0205EFDC(param0->playerAvatar) == 1) {
        return 1;
    }

    {
-        MapObject * v1 = Player_MapObject(param0->unk_14);
+        MapObject * v1 = Player_MapObject(param0->playerAvatar);

        if ((sub_0206415C(v1, param0->unk_0E) == 1) || (sub_0206417C(v1, param0->unk_0E) == 1)) {
            return 1;
@@ -916,7 +916,7 @@ static u32 sub_02068E94 (const UnkStruct_020684D0 * param0)

    if (sub_0205DB58(param0->unk_0C) == 1) {
        if ((sub_0205DEFC(param0->unk_0E) == 1) || (sub_0205DEF0(param0->unk_0E) == 1)) {
-            MapObject * v0 = Player_MapObject(param0->unk_14);
+            MapObject * v0 = Player_MapObject(param0->playerAvatar);

            if (sub_02062F30(v0) == 1) {
                return -1;
--- a/src/unk_02069BE0.c
+++ b/src/unk_02069BE0.c