From 87e381ab822452225fccd36e101d61da815eebd4 Mon Sep 17 00:00:00 2001 From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com> Date: Thu, 23 May 2024 21:00:41 -0400 Subject: [PATCH] Name all instances of PlayerAvatar --- include/overlay005/ov5_021DFB54.h | 10 +- include/overlay005/ov5_021E1154.h | 2 +- include/overlay005/ov5_021F61BC.h | 2 +- include/overlay005/ov5_021F8560.h | 2 +- include/player_avatar.h | 148 +++--- include/struct_defs/struct_0205C22C.h | 2 +- include/struct_defs/struct_020684D0.h | 2 +- include/unk_0205F180.h | 46 +- include/unk_02067A84.h | 4 +- src/overlay005/ov5_021DFB54.c | 212 ++++----- src/overlay005/ov5_021E1154.c | 28 +- src/overlay005/ov5_021F08CC.c | 6 +- src/overlay005/ov5_021F61BC.c | 16 +- src/overlay005/ov5_021F8560.c | 12 +- src/overlay006/ov6_0223E140.c | 2 +- src/overlay006/ov6_02248050.c | 14 +- src/overlay008/ov8_02249960.c | 12 +- src/overlay009/ov9_02249960.c | 60 +-- src/overlay023/ov23_02248F1C.c | 8 +- src/unk_0203F6C4.c | 8 +- src/unk_02048614.c | 6 +- src/unk_020553DC.c | 12 +- src/unk_0205C22C.c | 12 +- src/unk_0206450C.c | 658 +++++++++++++------------- src/unk_02067A84.c | 126 ++--- src/unk_020683F4.c | 14 +- src/unk_02069BE0.c | 518 ++++++++++---------- 27 files changed, 971 insertions(+), 971 deletions(-) diff --git a/include/overlay005/ov5_021DFB54.h b/include/overlay005/ov5_021DFB54.h index 9eda762640..d3295ff47a 100644 --- a/include/overlay005/ov5_021DFB54.h +++ b/include/overlay005/ov5_021DFB54.h @@ -6,18 +6,18 @@ #include "struct_decls/struct_020508D4_decl.h" #include "struct_decls/struct_0205E884_decl.h" -void 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); diff --git a/include/overlay005/ov5_021E1154.h b/include/overlay005/ov5_021E1154.h index f455feff49..9cda1398eb 100644 --- a/include/overlay005/ov5_021E1154.h +++ b/include/overlay005/ov5_021E1154.h @@ -4,6 +4,6 @@ #include "field/field_system_decl.h" #include "struct_decls/struct_0205E884_decl.h" -int ov5_021E1154(FieldSystem * param0, PlayerAvatar * param1, int param2); +int ov5_021E1154(FieldSystem * param0, PlayerAvatar * playerAvatar, int param2); #endif // POKEPLATINUM_OV5_021E1154_H diff --git a/include/overlay005/ov5_021F61BC.h b/include/overlay005/ov5_021F61BC.h index 0b77e33365..724bf0e383 100644 --- a/include/overlay005/ov5_021F61BC.h +++ b/include/overlay005/ov5_021F61BC.h @@ -6,6 +6,6 @@ void * ov5_021F61BC(UnkStruct_ov5_021DF47C * param0); void ov5_021F61D8(void * param0); -void ov5_021F6218(PlayerAvatar * param0); +void ov5_021F6218(PlayerAvatar * playerAvatar); #endif // POKEPLATINUM_OV5_021F61BC_H diff --git a/include/overlay005/ov5_021F8560.h b/include/overlay005/ov5_021F8560.h index d23c25298c..40405dd7a9 100644 --- a/include/overlay005/ov5_021F8560.h +++ b/include/overlay005/ov5_021F8560.h @@ -10,7 +10,7 @@ void * ov5_021F8560(UnkStruct_ov5_021DF47C * param0); void ov5_021F857C(void * param0); -UnkStruct_ov101_021D5D90 * ov5_021F85BC(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); diff --git a/include/player_avatar.h b/include/player_avatar.h index f72aef35e9..143ffa8b9f 100644 --- 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 diff --git a/include/struct_defs/struct_0205C22C.h b/include/struct_defs/struct_0205C22C.h index 9d0fc35e3c..a74bc6dc11 100644 --- a/include/struct_defs/struct_0205C22C.h +++ b/include/struct_defs/struct_0205C22C.h @@ -12,7 +12,7 @@ typedef struct UnkStruct_0205C22C_t { UnkStruct_0205B43C * unk_00; SysTask * unk_04; - PlayerAvatar * unk_08; + PlayerAvatar * playerAvatar; UnkStruct_0205C680 unk_0C[50 + 1]; FieldSystem * unk_470; UnkStruct_02027F8C * unk_474; diff --git a/include/struct_defs/struct_020684D0.h b/include/struct_defs/struct_020684D0.h index 21047e6b88..9431d3cea0 100644 --- a/include/struct_defs/struct_020684D0.h +++ b/include/struct_defs/struct_020684D0.h @@ -12,7 +12,7 @@ typedef struct { u16 unk_0E; u16 unk_10; u8 padding_12[2]; - PlayerAvatar * unk_14; + PlayerAvatar * playerAvatar; FieldSystem * unk_18; } UnkStruct_020684D0; diff --git a/include/unk_0205F180.h b/include/unk_0205F180.h index 27b088597f..2bebfb72eb 100644 --- a/include/unk_0205F180.h +++ b/include/unk_0205F180.h @@ -5,28 +5,28 @@ #include "struct_decls/struct_02061AB4_decl.h" #include "overlay005/struct_ov5_021E8F60_decl.h" -void 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 diff --git a/include/unk_02067A84.h b/include/unk_02067A84.h index f331fb9a24..180230f000 100644 --- a/include/unk_02067A84.h +++ b/include/unk_02067A84.h @@ -7,10 +7,10 @@ #include "struct_decls/struct_02061AB4_decl.h" int sub_02067A84(FieldSystem * param0, BOOL param1); -int sub_02067D58(const 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); diff --git a/src/overlay005/ov5_021DFB54.c b/src/overlay005/ov5_021DFB54.c index af8773523e..c658cd7673 100644 --- a/src/overlay005/ov5_021DFB54.c +++ b/src/overlay005/ov5_021DFB54.c @@ -57,7 +57,7 @@ typedef struct { int unk_00; int unk_04; FieldSystem * unk_08; - 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; diff --git a/src/overlay005/ov5_021E1154.c b/src/overlay005/ov5_021E1154.c index 460396b19d..19e787052c 100644 --- 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; diff --git a/src/overlay005/ov5_021F08CC.c b/src/overlay005/ov5_021F08CC.c index e8840afd66..96c352adac 100644 --- 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; } } diff --git a/src/overlay005/ov5_021F61BC.c b/src/overlay005/ov5_021F61BC.c index 44f5efa09c..d2807767f2 100644 --- a/src/overlay005/ov5_021F61BC.c +++ b/src/overlay005/ov5_021F61BC.c @@ -29,7 +29,7 @@ typedef struct { typedef struct { UnkStruct_ov5_021DF47C * unk_00; UnkStruct_021F61E8 * unk_04; - PlayerAvatar * unk_08; + PlayerAvatar * playerAvatar; } UnkStruct_021F6218; typedef struct { @@ -83,7 +83,7 @@ static void ov5_021F620C (UnkStruct_021F61E8 * param0) sub_0207395C(¶m0->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; diff --git a/src/overlay005/ov5_021F8560.c b/src/overlay005/ov5_021F8560.c index 01fb885e26..9ec63a5f00 100644 --- a/src/overlay005/ov5_021F8560.c +++ b/src/overlay005/ov5_021F8560.c @@ -32,7 +32,7 @@ typedef struct { UnkStruct_ov5_021DF47C * unk_08; UnkStruct_ov5_021F858C * unk_0C; 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(¶m0->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); diff --git a/src/overlay006/ov6_0223E140.c b/src/overlay006/ov6_0223E140.c index a2a904c034..46bf240865 100644 --- 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 { diff --git a/src/overlay006/ov6_02248050.c b/src/overlay006/ov6_02248050.c index 1368a40913..1eeadd5717 100644 --- 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); } diff --git a/src/overlay008/ov8_02249960.c b/src/overlay008/ov8_02249960.c index 2f48e5d84b..2d57198f0f 100644 --- 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); diff --git a/src/overlay009/ov9_02249960.c b/src/overlay009/ov9_02249960.c index 9e1ad6fc49..070468551e 100644 --- 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 = ¶m0->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); diff --git a/src/overlay023/ov23_02248F1C.c b/src/overlay023/ov23_02248F1C.c index 8adcd596d3..e6dfabe7fa 100644 --- a/src/overlay023/ov23_02248F1C.c +++ b/src/overlay023/ov23_02248F1C.c @@ -75,7 +75,7 @@ int Unk_ov23_0225776C[8][2]; static void ov23_0224944C(BGL * param0, Window * param1); static void ov23_02249584(UnkStruct_ov23_0224942C * param0); -static void ov23_02249214(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]; diff --git a/src/unk_0203F6C4.c b/src/unk_0203F6C4.c index 344a5a871c..93f769f46a 100644 --- 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); diff --git a/src/unk_02048614.c b/src/unk_02048614.c index d57d9ffa12..55111c3b4b 100644 --- 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; } diff --git a/src/unk_020553DC.c b/src/unk_020553DC.c index be2a5b89af..90878c351b 100644 --- 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; diff --git a/src/unk_0205C22C.c b/src/unk_0205C22C.c index a678a9b5fe..e6223f7e81 100644 --- 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(¶m0->unk_0C[50], Player_MapObject(param0->unk_08)); + sub_0205C7BC(¶m0->unk_0C[50], Player_MapObject(param0->playerAvatar)); sub_0205C6BC(¶m0->unk_0C[50]); } diff --git a/src/unk_0206450C.c b/src/unk_0206450C.c index cc5d1a9182..666f457270 100644 --- a/src/unk_0206450C.c +++ b/src/unk_0206450C.c @@ -88,24 +88,24 @@ typedef struct { UnkStruct_02065550 unk_08; } UnkStruct_0206502C; -static void sub_0206450C(MapObject * param0, int param1); -static void sub_02064668(MapObject * param0, int param1, int param2, int param3); +static void sub_0206450C(MapObject * mapObj, int param1); +static void sub_02064668(MapObject * mapObj, int param1, int param2, int param3); static int sub_020652EC(const int * param0, int param1); static int sub_0206530C(const int * param0, int param1); static int sub_02065330(int param0, int param1); static const int * sub_02065358(int param0); -static int sub_0206537C(MapObject * param0); -static int sub_02065448(MapObject * param0, int param1, int param2); -static void sub_020647A0(MapObject * param0, UnkStruct_020647A0 * param1); -static int sub_0206489C(MapObject * param0, int param1); -static void sub_020648F4(MapObject * param0, int param1); -static void sub_0206496C(MapObject * param0, int param1); -static void sub_02064D98(MapObject * param0, int param1, int param2, int param3); -static void sub_0206502C(MapObject * param0, int param1, int param2, int param3); -static int sub_0206553C(MapObject * param0); -static void sub_02065550(MapObject * param0, UnkStruct_02065550 * param1); -static void sub_02065568(MapObject * param0, UnkStruct_02065550 * param1); -static void sub_020655E4(MapObject * param0, UnkStruct_02065550 * param1); +static int sub_0206537C(MapObject * mapObj); +static int sub_02065448(MapObject * mapObj, int param1, int param2); +static void sub_020647A0(MapObject * mapObj, UnkStruct_020647A0 * param1); +static int sub_0206489C(MapObject * mapObj, int param1); +static void sub_020648F4(MapObject * mapObj, int param1); +static void sub_0206496C(MapObject * mapObj, int param1); +static void sub_02064D98(MapObject * mapObj, int param1, int param2, int param3); +static void sub_0206502C(MapObject * mapObj, int param1, int param2, int param3); +static int sub_0206553C(MapObject * mapObj); +static void sub_02065550(MapObject * mapObj, UnkStruct_02065550 * param1); +static void sub_02065568(MapObject * mapObj, UnkStruct_02065550 * param1); +static void sub_020655E4(MapObject * mapObj, UnkStruct_02065550 * param1); int(*const Unk_020EE900[])(MapObject *, UnkStruct_0206496C *); int(*const Unk_020EE870[])(MapObject *, UnkStruct_0206496C *); @@ -155,80 +155,80 @@ const int Unk_020EE9D0[]; static const UnkStruct_020EEB08 Unk_020EEB08[40]; const int Unk_020EEAD0[]; -static void sub_0206450C (MapObject * param0, int param1) +static void sub_0206450C (MapObject * mapObj, int param1) { UnkStruct_0206450C * v0; - v0 = sub_02062A54(param0, (sizeof(UnkStruct_0206450C))); + v0 = sub_02062A54(mapObj, (sizeof(UnkStruct_0206450C))); v0->unk_02 = sub_0206530C(Unk_020EEA88, -1); v0->unk_04 = param1; - sub_02062A0C(param0, 0x0); - sub_02062D10(param0); + sub_02062A0C(mapObj, 0x0); + sub_02062D10(mapObj); } -void sub_0206453C (MapObject * param0) +void sub_0206453C (MapObject * mapObj) { - sub_0206450C(param0, 0); + sub_0206450C(mapObj, 0); } -void sub_02064548 (MapObject * param0) +void sub_02064548 (MapObject * mapObj) { - sub_0206450C(param0, 1); + sub_0206450C(mapObj, 1); } -void sub_02064554 (MapObject * param0) +void sub_02064554 (MapObject * mapObj) { - sub_0206450C(param0, 2); + sub_0206450C(mapObj, 2); } -void sub_02064560 (MapObject * param0) +void sub_02064560 (MapObject * mapObj) { - sub_0206450C(param0, 3); + sub_0206450C(mapObj, 3); } -void sub_0206456C (MapObject * param0) +void sub_0206456C (MapObject * mapObj) { - sub_0206450C(param0, 4); + sub_0206450C(mapObj, 4); } -void sub_02064578 (MapObject * param0) +void sub_02064578 (MapObject * mapObj) { - sub_0206450C(param0, 5); + sub_0206450C(mapObj, 5); } -void sub_02064584 (MapObject * param0) +void sub_02064584 (MapObject * mapObj) { - sub_0206450C(param0, 6); + sub_0206450C(mapObj, 6); } -void sub_02064590 (MapObject * param0) +void sub_02064590 (MapObject * mapObj) { - sub_0206450C(param0, 7); + sub_0206450C(mapObj, 7); } -void sub_0206459C (MapObject * param0) +void sub_0206459C (MapObject * mapObj) { - sub_0206450C(param0, 8); + sub_0206450C(mapObj, 8); } -void sub_020645A8 (MapObject * param0) +void sub_020645A8 (MapObject * mapObj) { - sub_0206450C(param0, 9); + sub_0206450C(mapObj, 9); } -void sub_020645B4 (MapObject * param0) +void sub_020645B4 (MapObject * mapObj) { - sub_0206450C(param0, 10); + sub_0206450C(mapObj, 10); } -void sub_020645C0 (MapObject * param0) +void sub_020645C0 (MapObject * mapObj) { - UnkStruct_0206450C * v0 = sub_02062A78(param0); - int v1 = sub_02065448(param0, v0->unk_04, -1); + UnkStruct_0206450C * v0 = sub_02062A78(mapObj); + int v1 = sub_02065448(mapObj, v0->unk_04, -1); if (v1 != -1) { - MapObject_SetDir(param0, v1); + MapObject_SetDir(mapObj, v1); } else { switch (v0->unk_00) { case 0: @@ -236,74 +236,74 @@ void sub_020645C0 (MapObject * param0) if (v0->unk_02 <= 0) { v0->unk_02 = sub_0206530C(Unk_020EEA88, -1); - MapObject_SetDir(param0, sub_02065330(v0->unk_04, -1)); + MapObject_SetDir(mapObj, sub_02065330(v0->unk_04, -1)); } } } - sub_02064208(param0); + sub_02064208(mapObj); } -void sub_02064624 (MapObject * param0) +void sub_02064624 (MapObject * mapObj) { return; } -void sub_02064628 (MapObject * param0) +void sub_02064628 (MapObject * mapObj) { - sub_02064668(param0, 0xc, 11, 0); + sub_02064668(mapObj, 0xc, 11, 0); } -void sub_02064638 (MapObject * param0) +void sub_02064638 (MapObject * mapObj) { - sub_02064668(param0, 0xc, 12, 0); + sub_02064668(mapObj, 0xc, 12, 0); } -void sub_02064648 (MapObject * param0) +void sub_02064648 (MapObject * mapObj) { - sub_02064668(param0, 0xc, 13, 0); + sub_02064668(mapObj, 0xc, 13, 0); } -void sub_02064658 (MapObject * param0) +void sub_02064658 (MapObject * mapObj) { - sub_02064668(param0, 0xc, 13, 2); + sub_02064668(mapObj, 0xc, 13, 2); } -static void sub_02064668 (MapObject * param0, int param1, int param2, int param3) +static void sub_02064668 (MapObject * mapObj, int param1, int param2, int param3) { UnkStruct_02064668 * v0; - v0 = sub_02062A54(param0, (sizeof(UnkStruct_02064668))); + v0 = sub_02062A54(mapObj, (sizeof(UnkStruct_02064668))); v0->unk_04 = param3; v0->unk_08 = param1; v0->unk_0C = param2; - sub_02062A0C(param0, 0x0); - sub_02062D10(param0); + sub_02062A0C(mapObj, 0x0); + sub_02062D10(mapObj); } -void sub_02064690 (MapObject * param0) +void sub_02064690 (MapObject * mapObj) { int v0; UnkStruct_02064668 * v1; - v1 = sub_02062A78(param0); + v1 = sub_02062A78(mapObj); switch (v1->unk_00) { case 0: - sub_02062D10(param0); - sub_02062D34(param0); + sub_02062D10(mapObj); + sub_02062D34(mapObj); - v0 = MapObject_Dir(param0); + v0 = MapObject_Dir(mapObj); v0 = sub_02065838(v0, 0x0); - sub_02065668(param0, v0); + sub_02065668(mapObj, v0); v1->unk_00++; break; case 1: - if (sub_020658DC(param0) == 0) { + if (sub_020658DC(mapObj) == 0) { break; } @@ -319,17 +319,17 @@ void sub_02064690 (MapObject * param0) v1->unk_00++; case 3: v0 = sub_02065330(v1->unk_0C, -1); - sub_020629A0(param0, v0); + sub_020629A0(mapObj, v0); if (v1->unk_04 == 1) { - if (sub_0206489C(param0, v0) == 0) { + if (sub_0206489C(mapObj, v0) == 0) { v1->unk_00 = 0; break; } } { - u32 v2 = sub_02063EBC(param0, v0); + u32 v2 = sub_02063EBC(mapObj, v0); if (v2 != 0) { if (v1->unk_04 == 2) { @@ -346,29 +346,29 @@ void sub_02064690 (MapObject * param0) v0 = sub_02065838(v0, v1->unk_08); - sub_02065668(param0, v0); - sub_02062D04(param0); + sub_02065668(mapObj, v0); + sub_02062D04(mapObj); v1->unk_00++; case 4: - if (sub_020658DC(param0) == 0) { + if (sub_020658DC(mapObj) == 0) { break; } - sub_02062D10(param0); + sub_02062D10(mapObj); v1->unk_00 = 0; } } -static void sub_020647A0 (MapObject * param0, UnkStruct_020647A0 * param1) +static void sub_020647A0 (MapObject * mapObj, UnkStruct_020647A0 * param1) { int v0, v1, v2, v3, v4; - v1 = MapObject_XInitial(param0); - v2 = MapObject_ZInitial(param0); - v3 = MapObject_MaxXOffset(param0); - v4 = MapObject_MaxZOffset(param0); - v0 = MapObject_GetMoveCode(param0); + v1 = MapObject_XInitial(mapObj); + v2 = MapObject_ZInitial(mapObj); + v3 = MapObject_MaxXOffset(mapObj); + v4 = MapObject_MaxZOffset(mapObj); + v0 = MapObject_GetMoveCode(mapObj); switch (v0) { case 0x6: @@ -408,15 +408,15 @@ static void sub_020647A0 (MapObject * param0, UnkStruct_020647A0 * param1) } } -static int sub_0206489C (MapObject * param0, int param1) +static int sub_0206489C (MapObject * mapObj, int param1) { int v0, v1; UnkStruct_020647A0 v2; - sub_020647A0(param0, &v2); + sub_020647A0(mapObj, &v2); - v0 = MapObject_GetXPos(param0) + sub_0206419C(param1); - v1 = MapObject_GetZPos(param0) + sub_020641A8(param1); + v0 = MapObject_GetXPos(mapObj) + sub_0206419C(param1); + v1 = MapObject_GetZPos(mapObj) + sub_020641A8(param1); if ((v2.unk_00 > v0) || (v2.unk_08 < v0)) { return 0; @@ -429,27 +429,27 @@ static int sub_0206489C (MapObject * param0, int param1) return 1; } -static void sub_020648F4 (MapObject * param0, int param1) +static void sub_020648F4 (MapObject * mapObj, int param1) { UnkStruct_020648F4 * v0; - v0 = sub_02062A54(param0, (sizeof(UnkStruct_020648F4))); + v0 = sub_02062A54(mapObj, (sizeof(UnkStruct_020648F4))); v0->unk_00 = param1; - sub_02062A0C(param0, 0x0); - sub_02062D10(param0); - sub_02064208(param0); + sub_02062A0C(mapObj, 0x0); + sub_02062D10(mapObj); + sub_02064208(mapObj); } -void sub_02064918 (MapObject * param0) +void sub_02064918 (MapObject * mapObj) { UnkStruct_020648F4 * v0; - v0 = sub_02062A78(param0); + v0 = sub_02062A78(mapObj); switch (v0->unk_04) { case 0: - MapObject_SetDir(param0, v0->unk_00); + MapObject_SetDir(mapObj, v0->unk_00); v0->unk_04++; break; case 1: @@ -457,77 +457,77 @@ void sub_02064918 (MapObject * param0) } } -void sub_0206493C (MapObject * param0) +void sub_0206493C (MapObject * mapObj) { - sub_020648F4(param0, 0); + sub_020648F4(mapObj, 0); } -void sub_02064948 (MapObject * param0) +void sub_02064948 (MapObject * mapObj) { - sub_020648F4(param0, 1); + sub_020648F4(mapObj, 1); } -void sub_02064954 (MapObject * param0) +void sub_02064954 (MapObject * mapObj) { - sub_020648F4(param0, 2); + sub_020648F4(mapObj, 2); } -void sub_02064960 (MapObject * param0) +void sub_02064960 (MapObject * mapObj) { - sub_020648F4(param0, 3); + sub_020648F4(mapObj, 3); } -static void sub_0206496C (MapObject * param0, int param1) +static void sub_0206496C (MapObject * mapObj, int param1) { UnkStruct_0206496C * v0; - v0 = sub_02062A54(param0, (sizeof(UnkStruct_0206496C))); + v0 = sub_02062A54(mapObj, (sizeof(UnkStruct_0206496C))); v0->unk_00 = param1; - sub_02062A0C(param0, 0x0); - sub_02062D10(param0); - sub_02064208(param0); + sub_02062A0C(mapObj, 0x0); + sub_02062D10(mapObj); + sub_02064208(mapObj); } -void sub_02064990 (MapObject * param0) +void sub_02064990 (MapObject * mapObj) { - sub_0206496C(param0, 2); + sub_0206496C(mapObj, 2); } -void sub_0206499C (MapObject * param0) +void sub_0206499C (MapObject * mapObj) { - sub_0206496C(param0, 3); + sub_0206496C(mapObj, 3); } -void sub_020649A8 (MapObject * param0) +void sub_020649A8 (MapObject * mapObj) { UnkStruct_0206496C * v0; - v0 = sub_02062A78(param0); + v0 = sub_02062A78(mapObj); - while (Unk_020EE900[v0->unk_02](param0, v0) == 1) { + while (Unk_020EE900[v0->unk_02](mapObj, v0) == 1) { (void)0; } } -static int sub_020649CC (MapObject * param0, UnkStruct_0206496C * param1) +static int sub_020649CC (MapObject * mapObj, UnkStruct_0206496C * param1) { - int v0 = sub_02065448(param0, 38, -1); + int v0 = sub_02065448(mapObj, 38, -1); if (v0 == -1) { - v0 = MapObject_Dir(param0); + v0 = MapObject_Dir(mapObj); } v0 = sub_02065838(v0, 0x0); - sub_02065668(param0, v0); + sub_02065668(mapObj, v0); param1->unk_02 = 1; return 1; } -static int sub_02064A00 (MapObject * param0, UnkStruct_0206496C * param1) +static int sub_02064A00 (MapObject * mapObj, UnkStruct_0206496C * param1) { - if (sub_020658DC(param0) == 0) { + if (sub_020658DC(mapObj) == 0) { return 0; } @@ -537,10 +537,10 @@ static int sub_02064A00 (MapObject * param0, UnkStruct_0206496C * param1) return 1; } -static int sub_02064A1C (MapObject * param0, UnkStruct_0206496C * param1) +static int sub_02064A1C (MapObject * mapObj, UnkStruct_0206496C * param1) { if (param1->unk_04) { - if (sub_02065448(param0, 38, -1) != -1) { + if (sub_02065448(mapObj, 38, -1) != -1) { param1->unk_02 = 0; return 1; } @@ -556,7 +556,7 @@ static int sub_02064A1C (MapObject * param0, UnkStruct_0206496C * param1) return 1; } -static int sub_02064A58 (MapObject * param0, UnkStruct_0206496C * param1) +static int sub_02064A58 (MapObject * mapObj, UnkStruct_0206496C * param1) { int v0, v1, * v2; int v3[5] = {0, 2, 1, 3, -1}; @@ -568,7 +568,7 @@ static int sub_02064A58 (MapObject * param0, UnkStruct_0206496C * param1) v2 = v4; } - v1 = MapObject_Dir(param0); + v1 = MapObject_Dir(mapObj); for (v0 = 0; v2[v0] != -1; v0++) { if (v1 == v2[v0]) { @@ -586,7 +586,7 @@ static int sub_02064A58 (MapObject * param0, UnkStruct_0206496C * param1) v1 = v2[v0]; - MapObject_SetDir(param0, v1); + MapObject_SetDir(mapObj, v1); param1->unk_02 = 0; return 1; @@ -599,36 +599,36 @@ static int(*const Unk_020EE900[])(MapObject *, UnkStruct_0206496C *) = { sub_02064A58 }; -void sub_02064AF0 (MapObject * param0) +void sub_02064AF0 (MapObject * mapObj) { - sub_0206496C(param0, 3); + sub_0206496C(mapObj, 3); } -void sub_02064AFC (MapObject * param0) +void sub_02064AFC (MapObject * mapObj) { UnkStruct_0206496C * v0; - v0 = sub_02062A78(param0); + v0 = sub_02062A78(mapObj); - while (Unk_020EE870[v0->unk_02](param0, v0) == 1) { + while (Unk_020EE870[v0->unk_02](mapObj, v0) == 1) { (void)0; } } -static int sub_02064B20 (MapObject * param0, UnkStruct_0206496C * param1) +static int sub_02064B20 (MapObject * mapObj, UnkStruct_0206496C * param1) { - int v0 = MapObject_Dir(param0); + int v0 = MapObject_Dir(mapObj); v0 = sub_02065838(v0, 0x0); - sub_02065668(param0, v0); + sub_02065668(mapObj, v0); param1->unk_02 = 1; return 1; } -static int sub_02064B40 (MapObject * param0, UnkStruct_0206496C * param1) +static int sub_02064B40 (MapObject * mapObj, UnkStruct_0206496C * param1) { - if (sub_020658DC(param0) == 0) { + if (sub_020658DC(mapObj) == 0) { return 0; } @@ -638,7 +638,7 @@ static int sub_02064B40 (MapObject * param0, UnkStruct_0206496C * param1) return 1; } -static int sub_02064B5C (MapObject * param0, UnkStruct_0206496C * param1) +static int sub_02064B5C (MapObject * mapObj, UnkStruct_0206496C * param1) { param1->unk_04++; @@ -650,7 +650,7 @@ static int sub_02064B5C (MapObject * param0, UnkStruct_0206496C * param1) return 1; } -static int sub_02064B74 (MapObject * param0, UnkStruct_0206496C * param1) +static int sub_02064B74 (MapObject * mapObj, UnkStruct_0206496C * param1) { int v0, v1, * v2; int v3[5] = {0, 2, 1, 3, -1}; @@ -662,7 +662,7 @@ static int sub_02064B74 (MapObject * param0, UnkStruct_0206496C * param1) v2 = v4; } - v1 = MapObject_Dir(param0); + v1 = MapObject_Dir(mapObj); for (v0 = 0; v2[v0] != -1; v0++) { if (v1 == v2[v0]) { @@ -680,11 +680,11 @@ static int sub_02064B74 (MapObject * param0, UnkStruct_0206496C * param1) v1 = v2[v0]; - MapObject_SetDir(param0, v1); + MapObject_SetDir(mapObj, v1); { - int v5 = MapObject_Dir(param0); - int v6 = sub_02062968(param0); + int v5 = MapObject_Dir(mapObj); + int v6 = sub_02062968(mapObj); if (v5 == v6) { param1->unk_00 = Direction_GetOpposite(param1->unk_00); @@ -702,63 +702,63 @@ static int(*const Unk_020EE870[])(MapObject *, UnkStruct_0206496C *) = { sub_02064B74 }; -void sub_02064C28 (MapObject * param0) +void sub_02064C28 (MapObject * mapObj) { UnkStruct_02064C28 * v0; - v0 = sub_02062A54(param0, (sizeof(UnkStruct_02064C28))); + v0 = sub_02062A54(mapObj, (sizeof(UnkStruct_02064C28))); - if (sub_0206553C(param0) == 1) { - sub_02065550(param0, &v0->unk_04); + if (sub_0206553C(mapObj) == 1) { + sub_02065550(mapObj, &v0->unk_04); } } -void sub_02064C48 (MapObject * param0) +void sub_02064C48 (MapObject * mapObj) { - UnkStruct_02064C28 * v0 = sub_02062A78(param0); + UnkStruct_02064C28 * v0 = sub_02062A78(mapObj); - while (Unk_020EE814[v0->unk_00](param0, v0) == 1) { + while (Unk_020EE814[v0->unk_00](mapObj, v0) == 1) { (void)0; } } -static int sub_02064C6C (MapObject * param0, UnkStruct_02064C28 * param1) +static int sub_02064C6C (MapObject * mapObj, UnkStruct_02064C28 * param1) { int v0; - v0 = sub_02062968(param0); + v0 = sub_02062968(mapObj); if (param1->unk_02 == 1) { v0 = Direction_GetOpposite(v0); } - sub_02062994(param0, v0); + sub_02062994(mapObj, v0); - if (sub_0206553C(param0) == 0) { - MapObject_SetDir(param0, v0); + if (sub_0206553C(mapObj) == 0) { + MapObject_SetDir(mapObj, v0); } param1->unk_00 = 1; return 1; } -static int sub_02064CA8 (MapObject * param0, UnkStruct_02064C28 * param1) +static int sub_02064CA8 (MapObject * mapObj, UnkStruct_02064C28 * param1) { if (param1->unk_02) { int v0, v1, v2, v3; - v0 = MapObject_XInitial(param0); - v1 = MapObject_ZInitial(param0); - v2 = MapObject_GetXPos(param0); - v3 = MapObject_GetZPos(param0); + v0 = MapObject_XInitial(mapObj); + v1 = MapObject_ZInitial(mapObj); + v2 = MapObject_GetXPos(mapObj); + v3 = MapObject_GetZPos(mapObj); if ((v0 == v2) && (v1 == v3)) { - int v4 = Direction_GetOpposite(MapObject_GetMoveDir(param0)); + int v4 = Direction_GetOpposite(MapObject_GetMoveDir(mapObj)); - sub_02062994(param0, v4); + sub_02062994(mapObj, v4); - if (sub_0206553C(param0) == 0) { - MapObject_SetDir(param0, v4); + if (sub_0206553C(mapObj) == 0) { + MapObject_SetDir(mapObj, v4); } param1->unk_02 = 0; @@ -769,13 +769,13 @@ static int sub_02064CA8 (MapObject * param0, UnkStruct_02064C28 * param1) int v5, v6; u32 v7; - v5 = MapObject_GetMoveDir(param0); - v7 = sub_02063EBC(param0, v5); + v5 = MapObject_GetMoveDir(mapObj); + v7 = sub_02063EBC(mapObj, v5); if ((v7 & (1 << 0))) { param1->unk_02 = 1; v5 = Direction_GetOpposite(v5); - v7 = sub_02063EBC(param0, v5); + v7 = sub_02063EBC(mapObj, v5); } v6 = 0xc; @@ -785,26 +785,26 @@ static int sub_02064CA8 (MapObject * param0, UnkStruct_02064C28 * param1) } v6 = sub_02065838(v5, v6); - sub_02065668(param0, v6); + sub_02065668(mapObj, v6); - if (sub_0206553C(param0) == 1) { - sub_02065568(param0, ¶m1->unk_04); + if (sub_0206553C(mapObj) == 1) { + sub_02065568(mapObj, ¶m1->unk_04); } } - sub_02062D04(param0); + sub_02062D04(mapObj); param1->unk_00 = 2; return 1; } -static int sub_02064D68 (MapObject * param0, UnkStruct_02064C28 * param1) +static int sub_02064D68 (MapObject * mapObj, UnkStruct_02064C28 * param1) { - if (sub_020658DC(param0) == 1) { - sub_02062D10(param0); + if (sub_020658DC(mapObj) == 1) { + sub_02062D10(mapObj); - if (sub_0206553C(param0) == 1) { - sub_020655E4(param0, ¶m1->unk_04); + if (sub_0206553C(mapObj) == 1) { + sub_020655E4(mapObj, ¶m1->unk_04); } param1->unk_00 = 0; @@ -819,124 +819,124 @@ static int(*const Unk_020EE814[])(MapObject *, UnkStruct_02064C28 *) = { sub_02064D68 }; -static void sub_02064D98 (MapObject * param0, int param1, int param2, int param3) +static void sub_02064D98 (MapObject * mapObj, int param1, int param2, int param3) { UnkStruct_02064D98 * v0; - v0 = sub_02062A54(param0, (sizeof(UnkStruct_02064D98))); + v0 = sub_02062A54(mapObj, (sizeof(UnkStruct_02064D98))); v0->unk_02 = param1; v0->unk_03 = param2; v0->unk_04 = param3; - if (sub_0206553C(param0) == 1) { - sub_02065550(param0, &v0->unk_08); + if (sub_0206553C(mapObj) == 1) { + sub_02065550(mapObj, &v0->unk_08); } } -void sub_02064DC8 (MapObject * param0) +void sub_02064DC8 (MapObject * mapObj) { - sub_02064D98(param0, 2, 0, 14); + sub_02064D98(mapObj, 2, 0, 14); } -void sub_02064DD8 (MapObject * param0) +void sub_02064DD8 (MapObject * mapObj) { - sub_02064D98(param0, 2, 0, 15); + sub_02064D98(mapObj, 2, 0, 15); } -void sub_02064DE8 (MapObject * param0) +void sub_02064DE8 (MapObject * mapObj) { - sub_02064D98(param0, 2, 1, 16); + sub_02064D98(mapObj, 2, 1, 16); } -void sub_02064DF8 (MapObject * param0) +void sub_02064DF8 (MapObject * mapObj) { - sub_02064D98(param0, 2, 1, 17); + sub_02064D98(mapObj, 2, 1, 17); } -void sub_02064E08 (MapObject * param0) +void sub_02064E08 (MapObject * mapObj) { - sub_02064D98(param0, 2, 0, 18); + sub_02064D98(mapObj, 2, 0, 18); } -void sub_02064E18 (MapObject * param0) +void sub_02064E18 (MapObject * mapObj) { - sub_02064D98(param0, 2, 0, 19); + sub_02064D98(mapObj, 2, 0, 19); } -void sub_02064E28 (MapObject * param0) +void sub_02064E28 (MapObject * mapObj) { - sub_02064D98(param0, 2, 1, 20); + sub_02064D98(mapObj, 2, 1, 20); } -void sub_02064E38 (MapObject * param0) +void sub_02064E38 (MapObject * mapObj) { - sub_02064D98(param0, 2, 1, 21); + sub_02064D98(mapObj, 2, 1, 21); } -void sub_02064E48 (MapObject * param0) +void sub_02064E48 (MapObject * mapObj) { - sub_02064D98(param0, 2, 1, 22); + sub_02064D98(mapObj, 2, 1, 22); } -void sub_02064E58 (MapObject * param0) +void sub_02064E58 (MapObject * mapObj) { - sub_02064D98(param0, 2, 1, 23); + sub_02064D98(mapObj, 2, 1, 23); } -void sub_02064E68 (MapObject * param0) +void sub_02064E68 (MapObject * mapObj) { - sub_02064D98(param0, 2, 0, 24); + sub_02064D98(mapObj, 2, 0, 24); } -void sub_02064E78 (MapObject * param0) +void sub_02064E78 (MapObject * mapObj) { - sub_02064D98(param0, 2, 0, 25); + sub_02064D98(mapObj, 2, 0, 25); } -void sub_02064E88 (MapObject * param0) +void sub_02064E88 (MapObject * mapObj) { - sub_02064D98(param0, 2, 1, 26); + sub_02064D98(mapObj, 2, 1, 26); } -void sub_02064E98 (MapObject * param0) +void sub_02064E98 (MapObject * mapObj) { - sub_02064D98(param0, 2, 1, 27); + sub_02064D98(mapObj, 2, 1, 27); } -void sub_02064EA8 (MapObject * param0) +void sub_02064EA8 (MapObject * mapObj) { - sub_02064D98(param0, 2, 0, 28); + sub_02064D98(mapObj, 2, 0, 28); } -void sub_02064EB8 (MapObject * param0) +void sub_02064EB8 (MapObject * mapObj) { - sub_02064D98(param0, 2, 0, 29); + sub_02064D98(mapObj, 2, 0, 29); } -void sub_02064EC8 (MapObject * param0) +void sub_02064EC8 (MapObject * mapObj) { UnkStruct_02064D98 * v0; - v0 = sub_02062A78(param0); + v0 = sub_02062A78(mapObj); - while (Unk_020EE7AC[v0->unk_00](param0, v0) == 1) { + while (Unk_020EE7AC[v0->unk_00](mapObj, v0) == 1) { (void)0; } } -static int sub_02064EEC (MapObject * param0, UnkStruct_02064D98 * param1) +static int sub_02064EEC (MapObject * mapObj, UnkStruct_02064D98 * param1) { if (param1->unk_01 == param1->unk_02) { if (param1->unk_03 == 0) { - int v0 = MapObject_XInitial(param0); - int v1 = MapObject_GetXPos(param0); + int v0 = MapObject_XInitial(mapObj); + int v1 = MapObject_GetXPos(mapObj); if (v0 == v1) { param1->unk_01++; } } else { - int v2 = MapObject_ZInitial(param0); - int v3 = MapObject_GetZPos(param0); + int v2 = MapObject_ZInitial(mapObj); + int v3 = MapObject_GetZPos(mapObj); if (v2 == v3) { param1->unk_01++; @@ -945,10 +945,10 @@ static int sub_02064EEC (MapObject * param0, UnkStruct_02064D98 * param1) } if (param1->unk_01 == 3) { - int v4 = MapObject_XInitial(param0); - int v5 = MapObject_ZInitial(param0); - int v6 = MapObject_GetXPos(param0); - int v7 = MapObject_GetZPos(param0); + int v4 = MapObject_XInitial(mapObj); + int v5 = MapObject_ZInitial(mapObj); + int v6 = MapObject_GetXPos(mapObj); + int v7 = MapObject_GetZPos(mapObj); if ((v4 == v6) && (v5 == v7)) { param1->unk_01 = 0; @@ -963,25 +963,25 @@ static int sub_02064EEC (MapObject * param0, UnkStruct_02064D98 * param1) v8 = sub_02065358(param1->unk_04); v9 = v8[param1->unk_01]; - sub_02062994(param0, v9); + sub_02062994(mapObj, v9); - if (sub_0206553C(param0) == 0) { - MapObject_SetDir(param0, v9); + if (sub_0206553C(mapObj) == 0) { + MapObject_SetDir(mapObj, v9); } - v11 = sub_02063EBC(param0, v9); + v11 = sub_02063EBC(mapObj, v9); if ((v11 & (1 << 0))) { param1->unk_01++; v9 = v8[param1->unk_01]; - sub_02062994(param0, v9); + sub_02062994(mapObj, v9); - if (sub_0206553C(param0) == 0) { - MapObject_SetDir(param0, v9); + if (sub_0206553C(mapObj) == 0) { + MapObject_SetDir(mapObj, v9); } - v11 = sub_02063EBC(param0, v9); + v11 = sub_02063EBC(mapObj, v9); } v10 = 0xc; @@ -991,26 +991,26 @@ static int sub_02064EEC (MapObject * param0, UnkStruct_02064D98 * param1) } v10 = sub_02065838(v9, v10); - sub_02065668(param0, v10); + sub_02065668(mapObj, v10); - if (sub_0206553C(param0) == 1) { - sub_02065568(param0, ¶m1->unk_08); + if (sub_0206553C(mapObj) == 1) { + sub_02065568(mapObj, ¶m1->unk_08); } } - sub_02062D04(param0); + sub_02062D04(mapObj); param1->unk_00 = 1; return 1; } -static int sub_02064FFC (MapObject * param0, UnkStruct_02064D98 * param1) +static int sub_02064FFC (MapObject * mapObj, UnkStruct_02064D98 * param1) { - if (sub_020658DC(param0) == 1) { - sub_02062D10(param0); + if (sub_020658DC(mapObj) == 1) { + sub_02062D10(mapObj); - if (sub_0206553C(param0) == 1) { - sub_020655E4(param0, ¶m1->unk_08); + if (sub_0206553C(mapObj) == 1) { + sub_020655E4(mapObj, ¶m1->unk_08); } param1->unk_00 = 0; @@ -1024,66 +1024,66 @@ static int(*const Unk_020EE7AC[])(MapObject *, UnkStruct_02064D98 *) = { sub_02064FFC }; -static void sub_0206502C (MapObject * param0, int param1, int param2, int param3) +static void sub_0206502C (MapObject * mapObj, int param1, int param2, int param3) { UnkStruct_0206502C * v0; - v0 = sub_02062A54(param0, (sizeof(UnkStruct_0206502C))); + v0 = sub_02062A54(mapObj, (sizeof(UnkStruct_0206502C))); v0->unk_02 = param1; v0->unk_03 = param2; v0->unk_04 = param3; - if (sub_0206553C(param0) == 1) { - sub_02065550(param0, &v0->unk_08); + if (sub_0206553C(mapObj) == 1) { + sub_02065550(mapObj, &v0->unk_08); } } -void sub_0206505C (MapObject * param0) +void sub_0206505C (MapObject * mapObj) { - sub_0206502C(param0, 2, 1, 30); + sub_0206502C(mapObj, 2, 1, 30); } -void sub_0206506C (MapObject * param0) +void sub_0206506C (MapObject * mapObj) { - sub_0206502C(param0, 2, 1, 31); + sub_0206502C(mapObj, 2, 1, 31); } -void sub_0206507C (MapObject * param0) +void sub_0206507C (MapObject * mapObj) { - sub_0206502C(param0, 2, 0, 32); + sub_0206502C(mapObj, 2, 0, 32); } -void sub_0206508C (MapObject * param0) +void sub_0206508C (MapObject * mapObj) { - sub_0206502C(param0, 2, 0, 33); + sub_0206502C(mapObj, 2, 0, 33); } -void sub_0206509C (MapObject * param0) +void sub_0206509C (MapObject * mapObj) { - sub_0206502C(param0, 2, 1, 34); + sub_0206502C(mapObj, 2, 1, 34); } -void sub_020650AC (MapObject * param0) +void sub_020650AC (MapObject * mapObj) { - sub_0206502C(param0, 2, 1, 35); + sub_0206502C(mapObj, 2, 1, 35); } -void sub_020650BC (MapObject * param0) +void sub_020650BC (MapObject * mapObj) { - sub_0206502C(param0, 2, 0, 36); + sub_0206502C(mapObj, 2, 0, 36); } -void sub_020650CC (MapObject * param0) +void sub_020650CC (MapObject * mapObj) { - sub_0206502C(param0, 2, 0, 37); + sub_0206502C(mapObj, 2, 0, 37); } -void sub_020650DC (MapObject * param0) +void sub_020650DC (MapObject * mapObj) { - UnkStruct_0206502C * v0 = sub_02062A78(param0); + UnkStruct_0206502C * v0 = sub_02062A78(mapObj); - while (Unk_020EE820[v0->unk_00](param0, v0) == 1) { + while (Unk_020EE820[v0->unk_00](mapObj, v0) == 1) { (void)0; } } @@ -1101,20 +1101,20 @@ static void sub_02065100 (UnkStruct_0206502C * param0) } } -static int sub_02065124 (MapObject * param0, UnkStruct_0206502C * param1) +static int sub_02065124 (MapObject * mapObj, UnkStruct_0206502C * param1) { - if (sub_02062950(param0) == 0xa) { - FieldSystem * v0 = MapObject_FieldSystem(param0); - PlayerAvatar * v1 = sub_0205EF3C(v0); - int v2 = MapObject_Dir(param0); - int v3 = sub_020629D8(param0, 0); - int v4 = sub_02067D58(param0, v1, v2, v3); + if (sub_02062950(mapObj) == 0xa) { + FieldSystem * fieldSystem = MapObject_FieldSystem(mapObj); + PlayerAvatar * playerAvatar = sub_0205EF3C(fieldSystem); + int v2 = MapObject_Dir(mapObj); + int v3 = sub_020629D8(mapObj, 0); + int v4 = sub_02067D58(mapObj, playerAvatar, v2, v3); if (v4 != -1) { int v5 = sub_02065838(v2, 0x30); - sub_02065668(param0, v4); - sub_02062D04(param0); + sub_02065668(mapObj, v4); + sub_02062D04(mapObj); param1->unk_00 = 1; return 1; } @@ -1125,29 +1125,29 @@ static int sub_02065124 (MapObject * param0, UnkStruct_0206502C * param1) return 1; } -static int sub_02065188 (MapObject * param0, UnkStruct_0206502C * param1) +static int sub_02065188 (MapObject * mapObj, UnkStruct_0206502C * param1) { - if (sub_020658DC(param0) == 1) { - sub_02062D10(param0); + if (sub_020658DC(mapObj) == 1) { + sub_02062D10(mapObj); param1->unk_00 = 2; } return 0; } -static int sub_020651A4 (MapObject * param0, UnkStruct_0206502C * param1) +static int sub_020651A4 (MapObject * mapObj, UnkStruct_0206502C * param1) { if (param1->unk_01 == param1->unk_02) { if (param1->unk_03 == 0) { - int v0 = MapObject_XInitial(param0); - int v1 = MapObject_GetXPos(param0); + int v0 = MapObject_XInitial(mapObj); + int v1 = MapObject_GetXPos(mapObj); if (v0 == v1) { sub_02065100(param1); } } else { - int v2 = MapObject_ZInitial(param0); - int v3 = MapObject_GetZPos(param0); + int v2 = MapObject_ZInitial(mapObj); + int v3 = MapObject_GetZPos(mapObj); if (v2 == v3) { sub_02065100(param1); @@ -1156,10 +1156,10 @@ static int sub_020651A4 (MapObject * param0, UnkStruct_0206502C * param1) } if (param1->unk_01 == 3) { - int v4 = MapObject_XInitial(param0); - int v5 = MapObject_ZInitial(param0); - int v6 = MapObject_GetXPos(param0); - int v7 = MapObject_GetZPos(param0); + int v4 = MapObject_XInitial(mapObj); + int v5 = MapObject_ZInitial(mapObj); + int v6 = MapObject_GetXPos(mapObj); + int v7 = MapObject_GetZPos(mapObj); if ((v4 == v6) && (v5 == v7)) { param1->unk_01 = 0; @@ -1174,25 +1174,25 @@ static int sub_020651A4 (MapObject * param0, UnkStruct_0206502C * param1) v8 = sub_02065358(param1->unk_04); v9 = v8[param1->unk_01]; - sub_02062994(param0, v9); + sub_02062994(mapObj, v9); - if (sub_0206553C(param0) == 0) { - MapObject_SetDir(param0, v9); + if (sub_0206553C(mapObj) == 0) { + MapObject_SetDir(mapObj, v9); } - v11 = sub_02063EBC(param0, v9); + v11 = sub_02063EBC(mapObj, v9); if ((v11 & (1 << 0))) { sub_02065100(param1); v9 = v8[param1->unk_01]; - sub_02062994(param0, v9); + sub_02062994(mapObj, v9); - if (sub_0206553C(param0) == 0) { - MapObject_SetDir(param0, v9); + if (sub_0206553C(mapObj) == 0) { + MapObject_SetDir(mapObj, v9); } - v11 = sub_02063EBC(param0, v9); + v11 = sub_02063EBC(mapObj, v9); } v10 = 0xc; @@ -1202,26 +1202,26 @@ static int sub_020651A4 (MapObject * param0, UnkStruct_0206502C * param1) } v10 = sub_02065838(v9, v10); - sub_02065668(param0, v10); + sub_02065668(mapObj, v10); - if (sub_0206553C(param0) == 1) { - sub_02065568(param0, ¶m1->unk_08); + if (sub_0206553C(mapObj) == 1) { + sub_02065568(mapObj, ¶m1->unk_08); } } - sub_02062D04(param0); + sub_02062D04(mapObj); param1->unk_00 = 3; return 1; } -static int sub_020652BC (MapObject * param0, UnkStruct_0206502C * param1) +static int sub_020652BC (MapObject * mapObj, UnkStruct_0206502C * param1) { - if (sub_020658DC(param0) == 1) { - sub_02062D10(param0); + if (sub_020658DC(mapObj) == 1) { + sub_02062D10(mapObj); - if (sub_0206553C(param0) == 1) { - sub_020655E4(param0, ¶m1->unk_08); + if (sub_0206553C(mapObj) == 1) { + sub_020655E4(mapObj, ¶m1->unk_08); } param1->unk_00 = 0; @@ -1275,26 +1275,26 @@ static const int * sub_02065358 (int param0) return NULL; } -static int sub_0206537C (MapObject * param0) +static int sub_0206537C (MapObject * mapObj) { - int v0 = sub_02062950(param0); + int v0 = sub_02062950(mapObj); if ((v0 != 0x1) && (v0 != 0x2)) { return(-1); } { - FieldSystem * v1 = MapObject_FieldSystem(param0); - PlayerAvatar * v2 = sub_0205EF3C(v1); + FieldSystem * v1 = MapObject_FieldSystem(mapObj); + PlayerAvatar * playerAvatar = sub_0205EF3C(v1); - if (sub_0206140C(v2) == 0) { + if (sub_0206140C(playerAvatar) == 0) { return(-1); } { int v3, v4 = 0; - v0 = MapObject_GetMoveCode(param0); + v0 = MapObject_GetMoveCode(mapObj); do { v3 = Unk_020EEAD0[v4++]; @@ -1310,9 +1310,9 @@ static int sub_0206537C (MapObject * param0) } { - const MapObject * v5 = Player_MapObject(v2); + const MapObject * v5 = Player_MapObject(playerAvatar); int v6 = sub_020630DC(v5); - int v7 = sub_020630DC(param0); + int v7 = sub_020630DC(mapObj); if (v6 != v7) { return(-1); @@ -1320,11 +1320,11 @@ static int sub_0206537C (MapObject * param0) } { - int v8 = Player_GetXPos(v2); - int v9 = Player_GetZPos(v2); - int v10 = sub_020629D8(param0, 0); - int v11 = MapObject_GetXPos(param0); - int v12 = MapObject_GetZPos(param0); + int v8 = Player_GetXPos(playerAvatar); + int v9 = Player_GetZPos(playerAvatar); + int v10 = sub_020629D8(mapObj, 0); + int v11 = MapObject_GetXPos(mapObj); + int v12 = MapObject_GetZPos(mapObj); int v13 = v11 - v10; int v14 = v11 + v10; int v15 = v12 - v10; @@ -1341,7 +1341,7 @@ static int sub_0206537C (MapObject * param0) return(-1); } -static int sub_02065448 (MapObject * param0, int param1, int param2) +static int sub_02065448 (MapObject * mapObj, int param1, int param2) { const int * v0 = sub_02065358(param1); int v1 = sub_020652EC(v0, param2); @@ -1353,7 +1353,7 @@ static int sub_02065448 (MapObject * param0, int param1, int param2) { int v2; - v2 = sub_0206537C(param0); + v2 = sub_0206537C(mapObj); if (v2 == -1) { return v2; @@ -1372,12 +1372,12 @@ static int sub_02065448 (MapObject * param0, int param1, int param2) { int v4 = -1, v5 = -1; - int v6 = MapObject_GetXPos(param0); - int v7 = MapObject_GetZPos(param0); - FieldSystem * v8 = MapObject_FieldSystem(param0); - PlayerAvatar * v9 = sub_0205EF3C(v8); - int v10 = Player_GetXPos(v9); - int v11 = Player_GetZPos(v9); + int v6 = MapObject_GetXPos(mapObj); + int v7 = MapObject_GetZPos(mapObj); + FieldSystem * v8 = MapObject_FieldSystem(mapObj); + PlayerAvatar * playerAvatar = sub_0205EF3C(v8); + int v10 = Player_GetXPos(playerAvatar); + int v11 = Player_GetZPos(playerAvatar); if (v6 > v10) { v4 = 2; @@ -1434,9 +1434,9 @@ static const int Unk_020EEAB0[2][4] = { {0x0, 0x3, 0x1, 0x2} }; -static int sub_0206553C (MapObject * param0) +static int sub_0206553C (MapObject * mapObj) { - int v0 = sub_02062950(param0); + int v0 = sub_02062950(mapObj); if ((v0 == 0x7) || (v0 == 0x8)) { return 1; @@ -1445,18 +1445,18 @@ static int sub_0206553C (MapObject * param0) return 0; } -static void sub_02065550 (MapObject * param0, UnkStruct_02065550 * param1) +static void sub_02065550 (MapObject * mapObj, UnkStruct_02065550 * param1) { - if (sub_02062950(param0) == 0x7) { + if (sub_02062950(mapObj) == 0x7) { param1->unk_01 = 0; } else { param1->unk_01 = 1; } } -static void sub_02065568 (MapObject * param0, UnkStruct_02065550 * param1) +static void sub_02065568 (MapObject * mapObj, UnkStruct_02065550 * param1) { - int v0, v1 = MapObject_Dir(param0); + int v0, v1 = MapObject_Dir(mapObj); for (v0 = 0; (v0 < 4 && v1 != Unk_020EEAB0[param1->unk_01][v0]); v0++) { (void)0; @@ -1469,20 +1469,20 @@ static void sub_02065568 (MapObject * param0, UnkStruct_02065550 * param1) v0 = (v0 + 1) % 4; v1 = Unk_020EEAB0[param1->unk_01][v0]; - if (MapObject_CheckStatus(param0, (1 << 7))) { + if (MapObject_CheckStatus(mapObj, (1 << 7))) { param1->unk_02 = 1; } else { param1->unk_02 = 0; } - MapObject_SetDir(param0, v1); - MapObject_SetStatusFlagOn(param0, (1 << 7)); + MapObject_SetDir(mapObj, v1); + MapObject_SetStatusFlagOn(mapObj, (1 << 7)); } -static void sub_020655E4 (MapObject * param0, UnkStruct_02065550 * param1) +static void sub_020655E4 (MapObject * mapObj, UnkStruct_02065550 * param1) { if (param1->unk_02 == 0) { - MapObject_SetStatusFlagOff(param0, (1 << 7)); + MapObject_SetStatusFlagOff(mapObj, (1 << 7)); } } diff --git a/src/unk_02067A84.c b/src/unk_02067A84.c index f28d48b237..fa71ff9bf8 100644 --- a/src/unk_02067A84.c +++ b/src/unk_02067A84.c @@ -44,19 +44,19 @@ typedef struct { int unk_1C; UnkStruct_ov101_021D5D90 * unk_20; 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; diff --git a/src/unk_020683F4.c b/src/unk_020683F4.c index fcf52aa80a..b3427e84aa 100644 --- 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; diff --git a/src/unk_02069BE0.c b/src/unk_02069BE0.c index 3308d8a58b..c6cbd0e53c 100644 --- a/src/unk_02069BE0.c +++ b/src/unk_02069BE0.c @@ -57,62 +57,62 @@ typedef struct { int unk_08; } UnkStruct_0206A47C; -static int sub_02069CA8(MapObject * param0, UnkStruct_02069CA8 * param1); -static void sub_02069CD4(MapObject * param0, UnkStruct_02069CA8 * param1); -static int sub_02069CFC(MapObject * param0, UnkStruct_02069CA8 * param1); -static void sub_02069D30(MapObject * param0, UnkStruct_02069CA8 * param1); -static u32 sub_02069D50(MapObject * param0); -static int sub_02069D8C(MapObject * param0); -static int sub_02069F48(MapObject * param0, UnkStruct_02069F48 * param1); -static void sub_02069FC4(MapObject * param0, UnkStruct_02069F48 * param1, MapObject * param2); -static int sub_02069FE8(MapObject * param0, UnkStruct_02069F48 * param1); -static int sub_0206A034(MapObject * param0, UnkStruct_02069F48 * param1); -static int sub_0206A630(MapObject * param0, UnkStruct_0206A47C * param1, int param2); +static int sub_02069CA8(MapObject * mapObj, UnkStruct_02069CA8 * param1); +static void sub_02069CD4(MapObject * mapObj, UnkStruct_02069CA8 * param1); +static int sub_02069CFC(MapObject * mapObj, UnkStruct_02069CA8 * param1); +static void sub_02069D30(MapObject * mapObj, UnkStruct_02069CA8 * param1); +static u32 sub_02069D50(MapObject * mapObj); +static int sub_02069D8C(MapObject * mapObj); +static int sub_02069F48(MapObject * mapObj, UnkStruct_02069F48 * param1); +static void sub_02069FC4(MapObject * mapObj, UnkStruct_02069F48 * param1, MapObject * param2); +static int sub_02069FE8(MapObject * mapObj, UnkStruct_02069F48 * param1); +static int sub_0206A034(MapObject * mapObj, UnkStruct_02069F48 * param1); +static int sub_0206A630(MapObject * mapObj, UnkStruct_0206A47C * param1, int param2); int(*const Unk_020EF8D4[])(MapObject *, UnkStruct_02069CA8 *); int(*const Unk_020EF8EC[])(MapObject *, UnkStruct_02069F48 *); int(*const Unk_020EF8DC[])(MapObject *, UnkStruct_0206A0BC *); -void sub_02069BE0 (MapObject * param0) +void sub_02069BE0 (MapObject * mapObj) { - UnkStruct_02069CA8 * v0 = sub_02062A54(param0, (sizeof(UnkStruct_02069CA8))); + UnkStruct_02069CA8 * v0 = sub_02062A54(mapObj, (sizeof(UnkStruct_02069CA8))); - sub_02069CA8(param0, v0); - sub_02062A0C(param0, 0x0); - sub_02062D10(param0); - sub_02062D80(param0, 0); + sub_02069CA8(mapObj, v0); + sub_02062A0C(mapObj, 0x0); + sub_02062D10(mapObj); + sub_02062D80(mapObj, 0); } -void sub_02069C0C (MapObject * param0) +void sub_02069C0C (MapObject * mapObj) { - UnkStruct_02069CA8 * v0 = sub_02062A78(param0); + UnkStruct_02069CA8 * v0 = sub_02062A78(mapObj); - if (sub_02069CA8(param0, v0) == 0) { + if (sub_02069CA8(mapObj, v0) == 0) { return; } - sub_02062D80(param0, 0); + sub_02062D80(mapObj, 0); - while (Unk_020EF8D4[v0->unk_00](param0, v0) == 1) { + while (Unk_020EF8D4[v0->unk_00](mapObj, v0) == 1) { (void)0; } } -void sub_02069C44 (MapObject * param0) +void sub_02069C44 (MapObject * mapObj) { return; } -static int sub_02069C48 (MapObject * param0, UnkStruct_02069CA8 * param1) +static int sub_02069C48 (MapObject * mapObj, UnkStruct_02069CA8 * param1) { - sub_02062D10(param0); - sub_02062D34(param0); + sub_02062D10(mapObj); + sub_02062D34(mapObj); - if (sub_02069CFC(param0, param1) == 1) { - sub_02069D30(param0, param1); + if (sub_02069CFC(mapObj, param1) == 1) { + sub_02069D30(mapObj, param1); - if (sub_02069D8C(param0) == 1) { - sub_02062D04(param0); + if (sub_02069D8C(mapObj) == 1) { + sub_02062D04(mapObj); param1->unk_00++; return 1; } @@ -121,10 +121,10 @@ static int sub_02069C48 (MapObject * param0, UnkStruct_02069CA8 * param1) return 0; } -static int sub_02069C8C (MapObject * param0, UnkStruct_02069CA8 * param1) +static int sub_02069C8C (MapObject * mapObj, UnkStruct_02069CA8 * param1) { - if (sub_020658DC(param0) == 1) { - sub_02062D10(param0); + if (sub_020658DC(mapObj) == 1) { + sub_02062D10(mapObj); param1->unk_00 = 0; } @@ -136,9 +136,9 @@ static int(*const Unk_020EF8D4[])(MapObject *, UnkStruct_02069CA8 *) = { sub_02069C8C }; -static int sub_02069CA8 (MapObject * param0, UnkStruct_02069CA8 * param1) +static int sub_02069CA8 (MapObject * mapObj, UnkStruct_02069CA8 * param1) { - const MapObjectManager * v0 = MapObject_MapObjectManager(param0); + const MapObjectManager * v0 = MapObject_MapObjectManager(mapObj); MapObject * v1 = sub_0205EA24(v0); if (v1 == NULL) { @@ -147,31 +147,31 @@ static int sub_02069CA8 (MapObject * param0, UnkStruct_02069CA8 * param1) } if (param1->unk_01 == 0) { - sub_02069CD4(param0, param1); + sub_02069CD4(mapObj, param1); } return 1; } -static void sub_02069CD4 (MapObject * param0, UnkStruct_02069CA8 * param1) +static void sub_02069CD4 (MapObject * mapObj, UnkStruct_02069CA8 * param1) { - FieldSystem * v0 = MapObject_FieldSystem(param0); - PlayerAvatar * v1 = sub_0205EF3C(v0); + FieldSystem * v0 = MapObject_FieldSystem(mapObj); + PlayerAvatar * playerAvatar = sub_0205EF3C(v0); param1->unk_01 = 1; - param1->unk_02 = Player_GetXPos(v1); - param1->unk_04 = Player_GetZPos(v1); + param1->unk_02 = Player_GetXPos(playerAvatar); + param1->unk_04 = Player_GetZPos(playerAvatar); param1->unk_06 = 0xff; } -static int sub_02069CFC (MapObject * param0, UnkStruct_02069CA8 * param1) +static int sub_02069CFC (MapObject * mapObj, UnkStruct_02069CA8 * param1) { - FieldSystem * v0 = MapObject_FieldSystem(param0); - PlayerAvatar * v1 = sub_0205EF3C(v0); + FieldSystem * v0 = MapObject_FieldSystem(mapObj); + PlayerAvatar * playerAvatar = sub_0205EF3C(v0); - if (v1 != NULL) { - int v2 = Player_GetXPos(v1); - int v3 = Player_GetZPos(v1); + if (playerAvatar != NULL) { + int v2 = Player_GetXPos(playerAvatar); + int v3 = Player_GetZPos(playerAvatar); if ((v2 != param1->unk_02) || (v3 != param1->unk_04)) { return 1; @@ -181,22 +181,22 @@ static int sub_02069CFC (MapObject * param0, UnkStruct_02069CA8 * param1) return 0; } -static void sub_02069D30 (MapObject * param0, UnkStruct_02069CA8 * param1) +static void sub_02069D30 (MapObject * mapObj, UnkStruct_02069CA8 * param1) { - FieldSystem * v0 = MapObject_FieldSystem(param0); - PlayerAvatar * v1 = sub_0205EF3C(v0); + FieldSystem * v0 = MapObject_FieldSystem(mapObj); + PlayerAvatar * playerAvatar = sub_0205EF3C(v0); - param1->unk_02 = Player_GetXPos(v1); - param1->unk_04 = Player_GetZPos(v1); + param1->unk_02 = Player_GetXPos(playerAvatar); + param1->unk_04 = Player_GetZPos(playerAvatar); } -static u32 sub_02069D50 (MapObject * param0) +static u32 sub_02069D50 (MapObject * mapObj) { u32 v0; - FieldSystem * v1 = MapObject_FieldSystem(param0); - PlayerAvatar * v2 = sub_0205EF3C(v1); + FieldSystem * v1 = MapObject_FieldSystem(mapObj); + PlayerAvatar * playerAvatar = sub_0205EF3C(v1); - v0 = sub_0205EC14(v2); + v0 = sub_0205EC14(playerAvatar); switch (v0) { case 0x58: @@ -216,21 +216,21 @@ static u32 sub_02069D50 (MapObject * param0) return v0; } -static int sub_02069D8C (MapObject * param0) +static int sub_02069D8C (MapObject * mapObj) { - FieldSystem * v0 = MapObject_FieldSystem(param0); - PlayerAvatar * v1 = sub_0205EF3C(v0); - int v2 = MapObject_GetXPos(param0); - int v3 = MapObject_GetZPos(param0); - int v4 = PlayerAvatar_XPosPrev(v1); - int v5 = PlayerAvatar_ZPosPrev(v1); + FieldSystem * v0 = MapObject_FieldSystem(mapObj); + PlayerAvatar * playerAvatar = sub_0205EF3C(v0); + int v2 = MapObject_GetXPos(mapObj); + int v3 = MapObject_GetZPos(mapObj); + int v4 = PlayerAvatar_XPosPrev(playerAvatar); + int v5 = PlayerAvatar_ZPosPrev(playerAvatar); if ((v2 != v4) || (v3 != v5)) { - u32 v6 = sub_02069D50(param0); + u32 v6 = sub_02069D50(mapObj); int v7 = sub_02064488(v2, v3, v4, v5); v6 = sub_02065838(v7, v6); - sub_02065668(param0, v6); + sub_02065668(mapObj, v6); return 1; } @@ -238,49 +238,49 @@ static int sub_02069D8C (MapObject * param0) return 0; } -void sub_02069DF4 (MapObject * param0) +void sub_02069DF4 (MapObject * mapObj) { - UnkStruct_02069F48 * v0 = sub_02062A54(param0, (sizeof(UnkStruct_02069F48))); + UnkStruct_02069F48 * v0 = sub_02062A54(mapObj, (sizeof(UnkStruct_02069F48))); - sub_02069F48(param0, v0); - sub_02062A0C(param0, 0x0); - sub_02062D10(param0); + sub_02069F48(mapObj, v0); + sub_02062A0C(mapObj, 0x0); + sub_02062D10(mapObj); v0->unk_01 = 0; } -void sub_02069E1C (MapObject * param0) +void sub_02069E1C (MapObject * mapObj) { - UnkStruct_02069F48 * v0 = sub_02062A78(param0); + UnkStruct_02069F48 * v0 = sub_02062A78(mapObj); - if (sub_02069F48(param0, v0) == 0) { + if (sub_02069F48(mapObj, v0) == 0) { return; } - while (Unk_020EF8EC[v0->unk_00](param0, v0) == 1) { + while (Unk_020EF8EC[v0->unk_00](mapObj, v0) == 1) { (void)0; } } -void sub_02069E4C (MapObject * param0) +void sub_02069E4C (MapObject * mapObj) { return; } -void sub_02069E50 (MapObject * param0) +void sub_02069E50 (MapObject * mapObj) { - UnkStruct_02069F48 * v0 = sub_02062A78(param0); + UnkStruct_02069F48 * v0 = sub_02062A78(mapObj); v0->unk_01 = 0; } -static int sub_02069E5C (MapObject * param0, UnkStruct_02069F48 * param1) +static int sub_02069E5C (MapObject * mapObj, UnkStruct_02069F48 * param1) { - sub_02062D10(param0); - sub_02062D34(param0); + sub_02062D10(mapObj); + sub_02062D34(mapObj); - if (sub_02069FE8(param0, param1) == 1) { - if (sub_0206A034(param0, param1) == 1) { - sub_02062D04(param0); + if (sub_02069FE8(mapObj, param1) == 1) { + if (sub_0206A034(mapObj, param1) == 1) { + sub_02062D04(mapObj); param1->unk_00++; return 1; } @@ -289,13 +289,13 @@ static int sub_02069E5C (MapObject * param0, UnkStruct_02069F48 * param1) return 0; } -static int sub_02069E98 (MapObject * param0, UnkStruct_02069F48 * param1) +static int sub_02069E98 (MapObject * mapObj, UnkStruct_02069F48 * param1) { - if (sub_020658DC(param0) == 0) { + if (sub_020658DC(mapObj) == 0) { return 0; } - sub_02062D10(param0); + sub_02062D10(mapObj); param1->unk_00 = 0; return 0; } @@ -305,13 +305,13 @@ static int(*const Unk_020EF8EC[])(MapObject *, UnkStruct_02069F48 *) = { sub_02069E98 }; -MapObject * sub_02069EB8 (MapObject * param0) +MapObject * sub_02069EB8 (MapObject * mapObj) { int v0 = 0; - int v1 = sub_02062950(param0); - int v2 = sub_02062918(param0); - u32 v3 = sub_02067F24(param0); - const MapObjectManager * v4 = MapObject_MapObjectManager(param0); + int v1 = sub_02062950(mapObj); + int v2 = sub_02062918(mapObj); + u32 v3 = sub_02067F24(mapObj); + const MapObjectManager * mapObjMan = MapObject_MapObjectManager(mapObj); MapObject * v5; switch (v1) { @@ -323,8 +323,8 @@ MapObject * sub_02069EB8 (MapObject * param0) case 0x6: case 0x7: case 0x8: - while (sub_020625B0(v4, &v5, &v0, (1 << 0)) == 1) { - if ((param0 != v5) && (sub_02062918(v5) == v2)) { + while (sub_020625B0(mapObjMan, &v5, &v0, (1 << 0)) == 1) { + if ((mapObj != v5) && (sub_02062918(v5) == v2)) { if (sub_02067F24(v5) == v3) { return v5; } @@ -335,21 +335,21 @@ MapObject * sub_02069EB8 (MapObject * param0) return NULL; } -static int sub_02069F48 (MapObject * param0, UnkStruct_02069F48 * param1) +static int sub_02069F48 (MapObject * mapObj, UnkStruct_02069F48 * param1) { int v0, v1; u32 v2; MapObject * v3; - const MapObjectManager * v4 = MapObject_MapObjectManager(param0); + const MapObjectManager * mapObjMan = MapObject_MapObjectManager(mapObj); v0 = 0; - v1 = sub_02062918(param0); - v2 = sub_02067F24(param0); + v1 = sub_02062918(mapObj); + v2 = sub_02067F24(mapObj); - while (sub_020625B0(v4, &v3, &v0, (1 << 0)) == 1) { - if ((param0 != v3) && (sub_02062918(v3) == v1) && (sub_02067F24(v3) == v2)) { + while (sub_020625B0(mapObjMan, &v3, &v0, (1 << 0)) == 1) { + if ((mapObj != v3) && (sub_02062918(v3) == v1) && (sub_02067F24(v3) == v2)) { if (param1->unk_01 == 0) { - sub_02069FC4(param0, param1, v3); + sub_02069FC4(mapObj, param1, v3); } return 1; @@ -360,7 +360,7 @@ static int sub_02069F48 (MapObject * param0, UnkStruct_02069F48 * param1) return 0; } -static void sub_02069FC4 (MapObject * param0, UnkStruct_02069F48 * param1, MapObject * param2) +static void sub_02069FC4 (MapObject * mapObj, UnkStruct_02069F48 * param1, MapObject * param2) { param1->unk_01 = 1; param1->unk_02 = MapObject_GetXPos(param2); @@ -369,11 +369,11 @@ static void sub_02069FC4 (MapObject * param0, UnkStruct_02069F48 * param1, MapOb param1->unk_08 = param2; } -static int sub_02069FE8 (MapObject * param0, UnkStruct_02069F48 * param1) +static int sub_02069FE8 (MapObject * mapObj, UnkStruct_02069F48 * param1) { MapObject * v0 = param1->unk_08; - int v1 = MapObject_GetXPos(param0); - int v2 = MapObject_GetZPos(param0); + int v1 = MapObject_GetXPos(mapObj); + int v2 = MapObject_GetZPos(mapObj); int v3 = MapObject_XPosPrev(v0); int v4 = MapObject_ZPosPrev(v0); @@ -384,10 +384,10 @@ static int sub_02069FE8 (MapObject * param0, UnkStruct_02069F48 * param1) return 0; } -static int sub_0206A034 (MapObject * param0, UnkStruct_02069F48 * param1) +static int sub_0206A034 (MapObject * mapObj, UnkStruct_02069F48 * param1) { - int v0 = MapObject_GetXPos(param0); - int v1 = MapObject_GetZPos(param0); + int v0 = MapObject_GetXPos(mapObj); + int v1 = MapObject_GetZPos(mapObj); int v2 = MapObject_GetXPos(param1->unk_08); int v3 = MapObject_GetZPos(param1->unk_08); int v4 = MapObject_XPosPrev(param1->unk_08); @@ -406,111 +406,111 @@ static int sub_0206A034 (MapObject * param0, UnkStruct_02069F48 * param1) u32 v7 = 0xc; v7 = sub_02065838(v6, v7); - sub_02065668(param0, v7); + sub_02065668(mapObj, v7); return 1; } return 0; } -static void sub_0206A0BC (MapObject * param0, int param1) +static void sub_0206A0BC (MapObject * mapObj, int param1) { - UnkStruct_0206A0BC * v0 = sub_02062A54(param0, (sizeof(UnkStruct_0206A0BC))); + UnkStruct_0206A0BC * v0 = sub_02062A54(mapObj, (sizeof(UnkStruct_0206A0BC))); v0->unk_01 = param1; - sub_02062A0C(param0, 0x0); - sub_02062D10(param0); - MapObject_SetStatusFlagOn(param0, MAP_OBJ_STATUS_HIDE_SHADOW); + sub_02062A0C(mapObj, 0x0); + sub_02062D10(mapObj); + MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_HIDE_SHADOW); { VecFx32 v1 = {0, (FX32_ONE * -32), 0}; - sub_02063088(param0, &v1); + sub_02063088(mapObj, &v1); } } -void sub_0206A104 (MapObject * param0) +void sub_0206A104 (MapObject * mapObj) { - sub_0206A0BC(param0, 0); + sub_0206A0BC(mapObj, 0); } -void sub_0206A110 (MapObject * param0) +void sub_0206A110 (MapObject * mapObj) { - sub_0206A0BC(param0, 1); + sub_0206A0BC(mapObj, 1); } -void sub_0206A11C (MapObject * param0) +void sub_0206A11C (MapObject * mapObj) { - sub_0206A0BC(param0, 2); + sub_0206A0BC(mapObj, 2); } -void sub_0206A128 (MapObject * param0) +void sub_0206A128 (MapObject * mapObj) { - sub_0206A0BC(param0, 3); + sub_0206A0BC(mapObj, 3); } -void sub_0206A134 (MapObject * param0) +void sub_0206A134 (MapObject * mapObj) { - UnkStruct_0206A0BC * v0 = sub_02062A78(param0); + UnkStruct_0206A0BC * v0 = sub_02062A78(mapObj); - while (Unk_020EF8DC[v0->unk_00](param0, v0) == 1) { + while (Unk_020EF8DC[v0->unk_00](mapObj, v0) == 1) { (void)0; } } -void sub_0206A158 (MapObject * param0) +void sub_0206A158 (MapObject * mapObj) { - UnkStruct_ov101_021D5D90 * v0 = sub_0206A224(param0); + UnkStruct_ov101_021D5D90 * v0 = sub_0206A224(mapObj); if (v0 != NULL) { ov5_021DF74C(v0); } } -void sub_0206A168 (MapObject * param0) +void sub_0206A168 (MapObject * mapObj) { - UnkStruct_0206A0BC * v0 = sub_02062A78(param0); + UnkStruct_0206A0BC * v0 = sub_02062A78(mapObj); v0->unk_00 = 0; - sub_0206A218(param0, NULL); + sub_0206A218(mapObj, NULL); if (v0->unk_02 == 0) { VecFx32 v1 = {0, (FX32_ONE * -32), 0}; - sub_02063088(param0, &v1); - MapObject_SetStatusFlagOn(param0, MAP_OBJ_STATUS_HIDE_SHADOW); + sub_02063088(mapObj, &v1); + MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_HIDE_SHADOW); } } -static int sub_0206A1AC (MapObject * param0, UnkStruct_0206A0BC * param1) +static int sub_0206A1AC (MapObject * mapObj, UnkStruct_0206A0BC * param1) { if (param1->unk_02 == 0) { - UnkStruct_ov101_021D5D90 * v0 = ov5_021F3D90(param0, param1->unk_01); + UnkStruct_ov101_021D5D90 * v0 = ov5_021F3D90(mapObj, param1->unk_01); - sub_0206A218(param0, v0); + sub_0206A218(mapObj, v0); } - sub_02062D10(param0); - sub_02062D34(param0); + sub_02062D10(mapObj); + sub_02062D34(mapObj); param1->unk_00++; return 0; } -static int sub_0206A1DC (MapObject * param0, UnkStruct_0206A0BC * param1) +static int sub_0206A1DC (MapObject * mapObj, UnkStruct_0206A0BC * param1) { if (param1->unk_02 == 0) { - UnkStruct_ov101_021D5D90 * v0 = sub_0206A224(param0); + UnkStruct_ov101_021D5D90 * v0 = sub_0206A224(mapObj); if (v0 == NULL) { - if (sub_02062DFC(param0) == 1) { - v0 = ov5_021F3D90(param0, param1->unk_01); - sub_0206A218(param0, v0); + if (sub_02062DFC(mapObj) == 1) { + v0 = ov5_021F3D90(mapObj, param1->unk_01); + sub_0206A218(mapObj, v0); } } - MapObject_SetStatusFlagOn(param0, MAP_OBJ_STATUS_HIDE_SHADOW); + MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_HIDE_SHADOW); } return 0; @@ -521,102 +521,102 @@ static int(*const Unk_020EF8DC[])(MapObject *, UnkStruct_0206A0BC *) = { sub_0206A1DC }; -void sub_0206A218 (MapObject * param0, UnkStruct_ov101_021D5D90 * param1) +void sub_0206A218 (MapObject * mapObj, UnkStruct_ov101_021D5D90 * param1) { - UnkStruct_0206A0BC * v0 = sub_02062A78(param0); + UnkStruct_0206A0BC * v0 = sub_02062A78(mapObj); v0->unk_04 = param1; } -UnkStruct_ov101_021D5D90 * sub_0206A224 (MapObject * param0) +UnkStruct_ov101_021D5D90 * sub_0206A224 (MapObject * mapObj) { - UnkStruct_0206A0BC * v0 = sub_02062A78(param0); + UnkStruct_0206A0BC * v0 = sub_02062A78(mapObj); return v0->unk_04; } -void sub_0206A230 (MapObject * param0) +void sub_0206A230 (MapObject * mapObj) { - UnkStruct_0206A0BC * v0 = sub_02062A78(param0); + UnkStruct_0206A0BC * v0 = sub_02062A78(mapObj); v0->unk_02 = 1; } static int(*const Unk_020EF918[5])(MapObject *, UnkStruct_0206A23C *); -static void sub_0206A23C (MapObject * param0, int param1, u32 param2) +static void sub_0206A23C (MapObject * mapObj, int param1, u32 param2) { - UnkStruct_0206A23C * v0 = sub_02062A54(param0, (sizeof(UnkStruct_0206A23C))); + UnkStruct_0206A23C * v0 = sub_02062A54(mapObj, (sizeof(UnkStruct_0206A23C))); v0->unk_01 = -1; v0->unk_02 = param2; - MapObject_SetDir(param0, 0); + MapObject_SetDir(mapObj, 0); } -void sub_0206A25C (MapObject * param0) +void sub_0206A25C (MapObject * mapObj) { - sub_0206A23C(param0, 0, 0); + sub_0206A23C(mapObj, 0, 0); } -void sub_0206A268 (MapObject * param0) +void sub_0206A268 (MapObject * mapObj) { - sub_0206A23C(param0, 1, 0); + sub_0206A23C(mapObj, 1, 0); } -void sub_0206A274 (MapObject * param0) +void sub_0206A274 (MapObject * mapObj) { - sub_0206A23C(param0, 2, 0); + sub_0206A23C(mapObj, 2, 0); } -void sub_0206A280 (MapObject * param0) +void sub_0206A280 (MapObject * mapObj) { - sub_0206A23C(param0, 3, 0); + sub_0206A23C(mapObj, 3, 0); } -void sub_0206A28C (MapObject * param0) +void sub_0206A28C (MapObject * mapObj) { - sub_0206A23C(param0, 0, 1); + sub_0206A23C(mapObj, 0, 1); } -void sub_0206A298 (MapObject * param0) +void sub_0206A298 (MapObject * mapObj) { - sub_0206A23C(param0, 1, 1); + sub_0206A23C(mapObj, 1, 1); } -void sub_0206A2A4 (MapObject * param0) +void sub_0206A2A4 (MapObject * mapObj) { - sub_0206A23C(param0, 2, 1); + sub_0206A23C(mapObj, 2, 1); } -void sub_0206A2B0 (MapObject * param0) +void sub_0206A2B0 (MapObject * mapObj) { - sub_0206A23C(param0, 3, 1); + sub_0206A23C(mapObj, 3, 1); } -void sub_0206A2BC (MapObject * param0) +void sub_0206A2BC (MapObject * mapObj) { - UnkStruct_0206A23C * v0 = sub_02062A78(param0); + UnkStruct_0206A23C * v0 = sub_02062A78(mapObj); - while (Unk_020EF918[v0->unk_00](param0, v0) == 1) { + while (Unk_020EF918[v0->unk_00](mapObj, v0) == 1) { (void)0; } } -static int sub_0206A2E0 (MapObject * param0, UnkStruct_0206A23C * param1) +static int sub_0206A2E0 (MapObject * mapObj, UnkStruct_0206A23C * param1) { - int v0 = MapObject_Dir(param0); + int v0 = MapObject_Dir(mapObj); v0 = sub_02065838(v0, 0x0); - sub_02065668(param0, v0); - sub_02062D10(param0); - sub_02062D34(param0); + sub_02065668(mapObj, v0); + sub_02062D10(mapObj); + sub_02062D34(mapObj); param1->unk_00 = 1; return 1; } -static int sub_0206A30C (MapObject * param0, UnkStruct_0206A23C * param1) +static int sub_0206A30C (MapObject * mapObj, UnkStruct_0206A23C * param1) { - if (sub_020658DC(param0) == 1) { + if (sub_020658DC(mapObj) == 1) { param1->unk_00 = 2; return 1; } @@ -624,57 +624,57 @@ static int sub_0206A30C (MapObject * param0, UnkStruct_0206A23C * param1) return 0; } -static int sub_0206A324 (MapObject * param0, UnkStruct_0206A23C * param1) +static int sub_0206A324 (MapObject * mapObj, UnkStruct_0206A23C * param1) { if (param1->unk_01 == -1) { - FieldSystem * v0 = MapObject_FieldSystem(param0); + FieldSystem * v0 = MapObject_FieldSystem(mapObj); param1->unk_01 = PlayerAvatar_GetDir(v0->playerAvatar); } - sub_02062D10(param0); - sub_02062D34(param0); + sub_02062D10(mapObj); + sub_02062D34(mapObj); param1->unk_00 = 3; return 1; } -static u32 sub_0206A354 (MapObject * param0, int param1) +static u32 sub_0206A354 (MapObject * mapObj, int param1) { - u32 v0 = sub_02064238(param0, param1); + u32 v0 = sub_02064238(mapObj, param1); if (sub_0205DAD4(v0) == 0) { v0 = (1 << 1); } - v0 |= sub_02063EBC(param0, param1); + v0 |= sub_02063EBC(mapObj, param1); return v0; } -static void sub_0206A37C (MapObject * param0, int param1, int param2, u32 param3) +static void sub_0206A37C (MapObject * mapObj, int param1, int param2, u32 param3) { u32 v0; if (param3 == 0) { - v0 = sub_02063EBC(param0, param1); + v0 = sub_02063EBC(mapObj, param1); } else { - v0 = sub_0206A354(param0, param1); + v0 = sub_0206A354(mapObj, param1); } if (v0 != 0) { param2 = sub_02065838(param1, 0x0); } else { param2 = sub_02065838(param1, param2); - sub_02062D04(param0); + sub_02062D04(mapObj); } - sub_02065668(param0, param2); + sub_02065668(mapObj, param2); } -static int sub_0206A3BC (MapObject * param0, UnkStruct_0206A23C * param1) +static int sub_0206A3BC (MapObject * mapObj, UnkStruct_0206A23C * param1) { int v0; - FieldSystem * v1 = MapObject_FieldSystem(param0); + FieldSystem * v1 = MapObject_FieldSystem(mapObj); int v2 = PlayerAvatar_GetDir(v1->playerAvatar); u32 v3 = sub_0205EC1C(v1->playerAvatar); @@ -682,22 +682,22 @@ static int sub_0206A3BC (MapObject * param0, UnkStruct_0206A23C * param1) case 0: case 1: v0 = sub_02065838(v2, 0x0); - sub_02065668(param0, v0); + sub_02065668(mapObj, v0); break; case 2: - sub_0206A37C(param0, v2, 0x4, param1->unk_02); + sub_0206A37C(mapObj, v2, 0x4, param1->unk_02); break; case 3: - sub_0206A37C(param0, v2, 0x8, param1->unk_02); + sub_0206A37C(mapObj, v2, 0x8, param1->unk_02); break; case 4: - sub_0206A37C(param0, v2, 0xc, param1->unk_02); + sub_0206A37C(mapObj, v2, 0xc, param1->unk_02); break; case 5: - sub_0206A37C(param0, v2, 0x10, param1->unk_02); + sub_0206A37C(mapObj, v2, 0x10, param1->unk_02); break; case 6: - sub_0206A37C(param0, v2, 0x14, param1->unk_02); + sub_0206A37C(mapObj, v2, 0x14, param1->unk_02); break; } @@ -705,14 +705,14 @@ static int sub_0206A3BC (MapObject * param0, UnkStruct_0206A23C * param1) return 1; } -static int sub_0206A454 (MapObject * param0, UnkStruct_0206A23C * param1) +static int sub_0206A454 (MapObject * mapObj, UnkStruct_0206A23C * param1) { - if (sub_020658DC(param0) == 0) { + if (sub_020658DC(mapObj) == 0) { return 0; } - sub_02062D10(param0); - sub_02062D34(param0); + sub_02062D10(mapObj); + sub_02062D34(mapObj); param1->unk_00 = 2; return 0; @@ -728,60 +728,60 @@ static int(*const Unk_020EF918[5])(MapObject *, UnkStruct_0206A23C *) = { static int(*const Unk_020EF90C[3])(MapObject *, UnkStruct_0206A47C *); -static void sub_0206A47C (MapObject * param0, int param1, int param2) +static void sub_0206A47C (MapObject * mapObj, int param1, int param2) { - UnkStruct_0206A47C * v0 = sub_02062A54(param0, (sizeof(UnkStruct_0206A47C))); + UnkStruct_0206A47C * v0 = sub_02062A54(mapObj, (sizeof(UnkStruct_0206A47C))); v0->unk_04 = param1; v0->unk_08 = param2; } -void sub_0206A490 (MapObject * param0) +void sub_0206A490 (MapObject * mapObj) { - sub_0206A47C(param0, 0, 0); + sub_0206A47C(mapObj, 0, 0); } -void sub_0206A49C (MapObject * param0) +void sub_0206A49C (MapObject * mapObj) { - sub_0206A47C(param0, 1, 1); + sub_0206A47C(mapObj, 1, 1); } -void sub_0206A4A8 (MapObject * param0) +void sub_0206A4A8 (MapObject * mapObj) { - sub_0206A47C(param0, 2, 0); + sub_0206A47C(mapObj, 2, 0); } -void sub_0206A4B4 (MapObject * param0) +void sub_0206A4B4 (MapObject * mapObj) { - sub_0206A47C(param0, 2, 1); + sub_0206A47C(mapObj, 2, 1); } -void sub_0206A4C0 (MapObject * param0) +void sub_0206A4C0 (MapObject * mapObj) { - UnkStruct_0206A47C * v0 = sub_02062A78(param0); + UnkStruct_0206A47C * v0 = sub_02062A78(mapObj); - while (Unk_020EF90C[v0->unk_00](param0, v0) == 1) { + while (Unk_020EF90C[v0->unk_00](mapObj, v0) == 1) { (void)0; } } -static int sub_0206A4E4 (MapObject * param0, UnkStruct_0206A47C * param1) +static int sub_0206A4E4 (MapObject * mapObj, UnkStruct_0206A47C * param1) { - sub_02062D10(param0); + sub_02062D10(mapObj); param1->unk_00++; return 1; } -static int sub_0206A4F8 (MapObject * param0, UnkStruct_0206A47C * param1) +static int sub_0206A4F8 (MapObject * mapObj, UnkStruct_0206A47C * param1) { - sub_0206A630(param0, param1, 0xc); + sub_0206A630(mapObj, param1, 0xc); param1->unk_00++; return 1; } -static int sub_0206A50C (MapObject * param0, UnkStruct_0206A47C * param1) +static int sub_0206A50C (MapObject * mapObj, UnkStruct_0206A47C * param1) { - if (sub_020658DC(param0) == 1) { + if (sub_020658DC(mapObj) == 1) { param1->unk_00 = 0; return 1; } @@ -842,52 +842,52 @@ static const int Unk_020EF8E4[2] = { 0x0 }; -static BOOL sub_0206A524 (FieldSystem * param0, int param1, int param2, int param3, int param4) +static BOOL sub_0206A524 (FieldSystem * fieldSystem, int param1, int param2, int param3, int param4) { BOOL v0; param1 += Unk_020EF92C[param3][param4]; param2 += Unk_020EF94C[param3][param4]; - v0 = FieldSystem_CheckCollision(param0, param1, param2); + v0 = FieldSystem_CheckCollision(fieldSystem, param1, param2); return v0; } -static BOOL sub_0206A54C (FieldSystem * param0, int param1, int param2, int param3, int param4) +static BOOL sub_0206A54C (FieldSystem * fieldSystem, int param1, int param2, int param3, int param4) { BOOL v0; param1 += Unk_020EF98C[param3][param4]; param2 += Unk_020EF9AC[param3][param4]; - v0 = FieldSystem_CheckCollision(param0, param1, param2); + v0 = FieldSystem_CheckCollision(fieldSystem, param1, param2); return v0; } -static int sub_0206A574 (MapObject * param0, int param1, int param2) +static int sub_0206A574 (MapObject * mapObj, int param1, int param2) { - FieldSystem * v0 = MapObject_FieldSystem(param0); - int v1 = MapObject_GetXPos(param0); - int v2 = MapObject_GetZPos(param0); + FieldSystem * v0 = MapObject_FieldSystem(mapObj); + int v1 = MapObject_GetXPos(mapObj); + int v2 = MapObject_GetZPos(mapObj); BOOL v3 = sub_0206A524(v0, v1, v2, param1, param2); return v3; } -static int sub_0206A5A4 (MapObject * param0, int param1, int param2) +static int sub_0206A5A4 (MapObject * mapObj, int param1, int param2) { - FieldSystem * v0 = MapObject_FieldSystem(param0); - int v1 = MapObject_GetXPos(param0); - int v2 = MapObject_GetZPos(param0); + FieldSystem * v0 = MapObject_FieldSystem(mapObj); + int v1 = MapObject_GetXPos(mapObj); + int v2 = MapObject_GetZPos(mapObj); BOOL v3 = sub_0206A54C(v0, v1, v2, param1, param2); return v3; } -static int sub_0206A5D4 (MapObject * param0, int param1, int param2) +static int sub_0206A5D4 (MapObject * mapObj, int param1, int param2) { - if (sub_0206A574(param0, param1, param2) == 0) { - if (sub_0206A5A4(param0, param1, param2) == 0) { + if (sub_0206A574(mapObj, param1, param2) == 0) { + if (sub_0206A5A4(mapObj, param1, param2) == 0) { return(-1); } @@ -897,86 +897,86 @@ static int sub_0206A5D4 (MapObject * param0, int param1, int param2) return param1; } -static u32 sub_0206A60C (MapObject * param0, int * param1, int param2) +static u32 sub_0206A60C (MapObject * mapObj, int * param1, int param2) { u32 v0; - *param1 = sub_0206A5D4(param0, *param1, param2); + *param1 = sub_0206A5D4(mapObj, *param1, param2); if (*param1 != -1) { - v0 = sub_02063EBC(param0, *param1); + v0 = sub_02063EBC(mapObj, *param1); return v0; } return 0; } -static int sub_0206A630 (MapObject * param0, UnkStruct_0206A47C * param1, int param2) +static int sub_0206A630 (MapObject * mapObj, UnkStruct_0206A47C * param1, int param2) { u32 v0; int v1 = param1->unk_08; - int v2 = MapObject_Dir(param0); + int v2 = MapObject_Dir(mapObj); - v0 = sub_0206A60C(param0, &v2, v1); + v0 = sub_0206A60C(mapObj, &v2, v1); if (v2 == -1) { - v2 = MapObject_Dir(param0); + v2 = MapObject_Dir(mapObj); param2 = sub_02065838(v2, 0x1c); - sub_02065668(param0, param2); + sub_02065668(mapObj, param2); return 0; } if (v0 == 0) { param2 = sub_02065838(v2, param2); - sub_02062D04(param0); - sub_02065668(param0, param2); + sub_02062D04(mapObj); + sub_02065668(mapObj, param2); return 1; } if ((v0 & (1 << 0)) && (param1->unk_04 == 2)) { - v2 = Direction_GetOpposite(MapObject_Dir(param0)); + v2 = Direction_GetOpposite(MapObject_Dir(mapObj)); v1 = Unk_020EF8E4[v1]; param1->unk_08 = v1; - v0 = sub_0206A60C(param0, &v2, v1); + v0 = sub_0206A60C(mapObj, &v2, v1); if (v2 == -1) { - v2 = MapObject_Dir(param0); + v2 = MapObject_Dir(mapObj); param2 = sub_02065838(v2, 0x1c); - sub_02065668(param0, param2); + sub_02065668(mapObj, param2); return 0; } if (v0 == 0) { param2 = sub_02065838(v2, param2); - sub_02062D04(param0); - sub_02065668(param0, param2); + sub_02062D04(mapObj); + sub_02065668(mapObj, param2); return 1; } } if ((v0 & (1 << 1))) { v2 = Unk_020EF9CC[v2][v1]; - v0 = sub_0206A60C(param0, &v2, v1); + v0 = sub_0206A60C(mapObj, &v2, v1); if (v2 == -1) { - v2 = MapObject_Dir(param0); + v2 = MapObject_Dir(mapObj); param2 = sub_02065838(v2, 0x1c); - sub_02065668(param0, param2); + sub_02065668(mapObj, param2); return 0; } if (v0 == 0) { param2 = sub_02065838(v2, param2); - sub_02062D04(param0); - sub_02065668(param0, param2); + sub_02062D04(mapObj); + sub_02065668(mapObj, param2); return 1; } } - v2 = MapObject_Dir(param0); + v2 = MapObject_Dir(mapObj); param2 = sub_02065838(v2, 0x1c); - sub_02065668(param0, param2); + sub_02065668(mapObj, param2); return 0; }