From e1a9ee5a4f2b5eacc94ce4fd66ec8c25c5a51e86 Mon Sep 17 00:00:00 2001 From: Viperio19 Date: Thu, 19 Dec 2024 14:23:33 +0100 Subject: [PATCH 1/7] Initial round of documentation for `map_object` and `map_object_move` (naming variables/functions, removing unnecessary params, combining if statements) --- include/map_object.h | 298 +++++++++--------- include/map_object_move.h | 40 +-- src/map_object.c | 559 ++++++++++++++++------------------ src/map_object_move.c | 440 +++++++++++++------------- src/overlay005/ov5_021DFB54.c | 6 +- src/overlay005/ov5_021E1154.c | 4 +- src/overlay005/ov5_021ECC20.c | 2 +- src/overlay005/ov5_021ECE40.c | 4 +- src/overlay005/ov5_021F61BC.c | 2 +- src/unk_0205F180.c | 20 +- src/unk_02069BE0.c | 2 +- 11 files changed, 662 insertions(+), 715 deletions(-) diff --git a/include/map_object.h b/include/map_object.h index 7fe12249d5..31c3853a93 100644 --- a/include/map_object.h +++ b/include/map_object.h @@ -25,63 +25,63 @@ #include "sys_task_manager.h" MapObjectManager *MapObjectMan_New(FieldSystem *fieldSystem, int param1, int param2); -void MapObjectMan_Delete(MapObjectManager *param0); -void sub_0206184C(MapObjectManager *param0, int param1, int param2, int param3, const ObjectEvent *param4); -MapObject *MapObjectMan_AddMapObjectFromHeader(const MapObjectManager *param0, const ObjectEvent *param1, int param2); -MapObject *MapObjectMan_AddMapObject(const MapObjectManager *param0, int param1, int param2, int param3, int param4, int param5, int param6); -MapObject *sub_02061A74(const MapObjectManager *param0, int param1, int param2, int param3, const ObjectEvent *param4); -void sub_02061AB4(MapObject *param0, int param1); -void sub_02061AD4(MapObject *param0, int param1); -void MapObject_Delete(MapObject *param0); -void sub_02061B28(MapObject *param0); -void sub_02061B48(MapObject *param0); -void MapObjectMan_DeleteAll(MapObjectManager *param0); -void sub_02061BF0(MapObjectManager *param0); -void sub_02061C48(MapObjectManager *param0); -void MapObjectMan_SaveAll(FieldSystem *fieldSystem, const MapObjectManager *param1, MapObjectSave *param2, int param3); -void MapObjectMan_LoadAllObjects(const MapObjectManager *param0, MapObjectSave *param1, int param2); -void sub_02062068(const MapObjectManager *param0, int param1, int param2, const ObjectEvent *param3); -MapObject *MapObjMan_LocalMapObjByIndex(const MapObjectManager *param0, int param1); -MapObject *sub_02062570(const MapObjectManager *param0, int param1); -int sub_020625B0(const MapObjectManager *param0, MapObject **param1, int *param2, u32 param3); -int sub_020626B4(const MapObject *param0); -int sub_02062758(const MapObject *param0, int param1); -int sub_02062764(const MapObject *param0, int param1, int param2); -int sub_020627B4(const MapObject *param0, int param1, int param2, int param3); -void MapObjectMan_SetMaxObjects(MapObjectManager *param0, int param1); -int MapObjectMan_GetMaxObjects(const MapObjectManager *param0); -void sub_02062838(MapObjectManager *param0, u32 param1); -void sub_02062840(MapObjectManager *param0, u32 param1); -u32 sub_0206284C(const MapObjectManager *param0, u32 param1); -void sub_02062854(MapObjectManager *param0, int param1); -int sub_02062858(const MapObjectManager *param0); -UnkStruct_ov5_021ED0A4 *sub_0206285C(const MapObjectManager *param0); -void sub_02062860(MapObjectManager *param0, MapObject *param1); -const MapObject *sub_02062868(const MapObjectManager *param0); -MapObject *sub_02062878(const MapObjectManager *param0); -void sub_02062880(const MapObject **param0); -void MapObjectMan_SetFieldSystem(MapObjectManager *param0, FieldSystem *fieldSystem); -FieldSystem *MapObjectMan_FieldSystem(const MapObjectManager *param0); -void sub_0206289C(MapObjectManager *param0, NARC *param1); -NARC *sub_020628A0(const MapObjectManager *param0); +void MapObjectMan_Delete(MapObjectManager *mapObjMan); +void sub_0206184C(MapObjectManager *mapObjMan, int param1, int param2, int param3, const ObjectEvent *objectEvent); +MapObject *MapObjectMan_AddMapObjectFromHeader(const MapObjectManager *mapObjMan, const ObjectEvent *objectEvent, int param2); +MapObject *MapObjectMan_AddMapObject(const MapObjectManager *mapObjMan, int param1, int param2, int param3, int param4, int param5, int param6); +MapObject *sub_02061A74(const MapObjectManager *mapObjMan, int param1, int param2, int param3, const ObjectEvent *objectEvent); +void sub_02061AB4(MapObject *mapObj, int param1); +void sub_02061AD4(MapObject *mapObj, int param1); +void MapObject_Delete(MapObject *mapObj); +void sub_02061B28(MapObject *mapObj); +void sub_02061B48(MapObject *mapObj); +void MapObjectMan_DeleteAll(MapObjectManager *mapObjMan); +void sub_02061BF0(MapObjectManager *mapObjMan); +void sub_02061C48(MapObjectManager *mapObjMan); +void MapObjectMan_SaveAll(FieldSystem *fieldSystem, const MapObjectManager *mapObjMan, MapObjectSave *mapObjSave, int param3); +void MapObjectMan_LoadAllObjects(const MapObjectManager *mapObjMan, MapObjectSave *mapObjSave, int param2); +void sub_02062068(const MapObjectManager *mapObjMan, int param1, int param2, const ObjectEvent *objectEvent); +MapObject *MapObjMan_LocalMapObjByIndex(const MapObjectManager *mapObjMan, int param1); +MapObject *sub_02062570(const MapObjectManager *mapObjMan, int param1); +int sub_020625B0(const MapObjectManager *mapObjMan, MapObject **mapObj, int *param2, u32 param3); +int sub_020626B4(const MapObject *mapObj); +int sub_02062758(const MapObject *mapObj, int param1); +int sub_02062764(const MapObject *mapObj, int param1, int param2); +int sub_020627B4(const MapObject *mapObj, int param1, int param2, int param3); +void MapObjectMan_SetMaxObjects(MapObjectManager *mapObjMan, int param1); +int MapObjectMan_GetMaxObjects(const MapObjectManager *mapObjMan); +void sub_02062838(MapObjectManager *mapObjMan, u32 param1); +void sub_02062840(MapObjectManager *mapObjMan, u32 param1); +u32 sub_0206284C(const MapObjectManager *mapObjMan, u32 param1); +void sub_02062854(MapObjectManager *mapObjMan, int param1); +int sub_02062858(const MapObjectManager *mapObjMan); +UnkStruct_ov5_021ED0A4 *sub_0206285C(const MapObjectManager *mapObjMan); +void MapObjectMan_SetMapObject(MapObjectManager *mapObjMan, MapObject *mapObj); +const MapObject *MapObjectMan_GetMapObjectConst(const MapObjectManager *mapObjMan); +MapObject *MapObjectMan_GetMapObject(const MapObjectManager *mapObjMan); +void sub_02062880(const MapObject **mapObj); +void MapObjectMan_SetFieldSystem(MapObjectManager *mapObjMan, FieldSystem *fieldSystem); +FieldSystem *MapObjectMan_FieldSystem(const MapObjectManager *mapObjMan); +void MapObjectMan_GetNARC(MapObjectManager *mapObjMan, NARC *narc); +NARC *sub_020628A0(const MapObjectManager *mapObjMan); void MapObject_SetStatus(MapObject *mapObj, u32 status); u32 MapObject_GetStatus(const MapObject *mapObj); void MapObject_SetStatusFlagOn(MapObject *mapObj, u32 flag); void MapObject_SetStatusFlagOff(MapObject *mapObj, u32 flag); u32 MapObject_CheckStatus(const MapObject *mapObj, u32 flag); BOOL MapObject_CheckStatusFlag(const MapObject *mapObj, u32 flag); -void sub_020628E8(MapObject *param0, u32 param1); -u32 sub_020628EC(const MapObject *param0); -void sub_020628F0(MapObject *param0, u32 param1); -void sub_020628F8(MapObject *param0, u32 param1); -u32 sub_02062904(const MapObject *param0, u32 param1); +void sub_020628E8(MapObject *mapObj, u32 param1); +u32 sub_020628EC(const MapObject *mapObj); +void sub_020628F0(MapObject *mapObj, u32 param1); +void sub_020628F8(MapObject *mapObj, u32 param1); +u32 sub_02062904(const MapObject *mapObj, u32 param1); void MapObject_SetLocalID(MapObject *mapObj, u32 localID); u32 MapObject_GetLocalID(const MapObject *mapObj); -void sub_02062914(MapObject *param0, int param1); -int sub_02062918(const MapObject *param0); +void sub_02062914(MapObject *mapObj, int param1); +int sub_02062918(const MapObject *mapObj); void MapObject_SetGraphicsID(MapObject *mapObj, u32 graphicsID); u32 MapObject_GetGraphicsID(const MapObject *mapObj); -u32 sub_02062924(const MapObject *param0); +u32 sub_02062924(const MapObject *mapObj); void MapObject_SetMovementType(MapObject *mapObj, u32 movementType); u32 MapObject_GetMovementType(const MapObject *mapObj); void MapObject_SetTrainerType(MapObject *mapObj, u32 trainerType); @@ -98,100 +98,100 @@ int MapObject_GetFacingDir(const MapObject *mapObj); int MapObject_GetPrevFacingDir(const MapObject *mapObj); void MapObject_Turn(MapObject *mapObj, int dir); int MapObject_GetMovingDir(const MapObject *mapObj); -void MapObject_TryFaceAndTurn(MapObject *param0, int dir); +void MapObject_TryFaceAndTurn(MapObject *mapObj, int dir); void MapObject_SetDataAt(MapObject *mapObj, int value, int index); int MapObject_GetDataAt(const MapObject *mapObj, int index); void MapObject_SetMovementRangeX(MapObject *mapObj, int movementRangeX); int MapObject_GetMovementRangeX(const MapObject *mapObj); void MapObject_SetMovementRangeZ(MapObject *mapObj, int movementRangeZ); int MapObject_GetMovementRangeZ(const MapObject *mapObj); -void sub_02062A0C(MapObject *param0, u32 param1); -u32 sub_02062A14(const MapObject *param0); -void sub_02062A1C(MapObject *param0, SysTask *param1); -SysTask *sub_02062A24(const MapObject *param0); -void sub_02062A2C(const MapObject *param0); -void MapObject_SetMapObjectManager(MapObject *param0, const MapObjectManager *param1); -const MapObjectManager *MapObject_MapObjectManager(const MapObject *param0); -void *sub_02062A54(MapObject *param0, int param1); -void *sub_02062A78(MapObject *param0); -void *sub_02062A7C(MapObject *param0, int param1); -void *sub_02062AA0(MapObject *param0); +void sub_02062A0C(MapObject *mapObj, u32 param1); +u32 sub_02062A14(const MapObject *mapObj); +void sub_02062A1C(MapObject *mapObj, SysTask *task); +SysTask *sub_02062A24(const MapObject *mapObj); +void sub_02062A2C(const MapObject *mapObj); +void MapObject_SetMapObjectManager(MapObject *mapObj, const MapObjectManager *mapObjMan); +const MapObjectManager *MapObject_MapObjectManager(const MapObject *mapObj); +void *sub_02062A54(MapObject *mapObj, int param1); +void *sub_02062A78(MapObject *mapObj); +void *sub_02062A7C(MapObject *mapObj, int param1); +void *sub_02062AA0(MapObject *mapObj); void *MapObject_InitMovementData(MapObject *mapObj, int size); void *MapObject_GetMovementData(MapObject *mapObj); -void *sub_02062ACC(MapObject *param0, int param1); -void *sub_02062AF0(MapObject *param0); -void sub_02062AF8(MapObject *param0, UnkFuncPtr_020EDF0C param1); -void sub_02062B00(MapObject *param0); -void sub_02062B0C(MapObject *param0, UnkFuncPtr_020EDF0C_1 param1); -void sub_02062B14(MapObject *param0); -void sub_02062B20(MapObject *param0, UnkFuncPtr_020EDF0C_2 param1); -void sub_02062B28(MapObject *param0); -void sub_02062B34(MapObject *param0); -void sub_02062B4C(MapObject *param0, UnkFuncPtr_ov5_021FB0F0 param1); -void sub_02062B54(MapObject *param0); -void sub_02062B60(MapObject *param0, UnkFuncPtr_ov5_021FB0F0_1 param1); -void sub_02062B68(MapObject *param0); -void sub_02062B74(MapObject *param0, UnkFuncPtr_ov5_021FB0F0_2 param1); -void sub_02062B7C(MapObject *param0); -void sub_02062B88(MapObject *param0, UnkFuncPtr_ov5_021FB0F0_3 param1); -void sub_02062B90(MapObject *param0); -void sub_02062B9C(MapObject *param0, UnkFuncPtr_ov5_021FB0F0_4 param1); -void sub_02062BA4(MapObject *param0); +void *sub_02062ACC(MapObject *mapObj, int param1); +void *sub_02062AF0(MapObject *mapObj); +void sub_02062AF8(MapObject *mapObj, UnkFuncPtr_020EDF0C param1); +void sub_02062B00(MapObject *mapObj); +void sub_02062B0C(MapObject *mapObj, UnkFuncPtr_020EDF0C_1 param1); +void sub_02062B14(MapObject *mapObj); +void sub_02062B20(MapObject *mapObj, UnkFuncPtr_020EDF0C_2 param1); +void sub_02062B28(MapObject *mapObj); +void sub_02062B34(MapObject *mapObj); +void sub_02062B4C(MapObject *mapObj, UnkFuncPtr_ov5_021FB0F0 param1); +void sub_02062B54(MapObject *mapObj); +void sub_02062B60(MapObject *mapObj, UnkFuncPtr_ov5_021FB0F0_1 param1); +void sub_02062B68(MapObject *mapObj); +void sub_02062B74(MapObject *mapObj, UnkFuncPtr_ov5_021FB0F0_2 param1); +void sub_02062B7C(MapObject *mapObj); +void sub_02062B88(MapObject *mapObj, UnkFuncPtr_ov5_021FB0F0_3 param1); +void sub_02062B90(MapObject *mapObj); +void sub_02062B9C(MapObject *mapObj, UnkFuncPtr_ov5_021FB0F0_4 param1); +void sub_02062BA4(MapObject *mapObj); void MapObject_SetMovementAction(MapObject *mapObj, int movementAction); int MapObject_GetMovementAction(const MapObject *mapObj); void MapObject_SetMovementStep(MapObject *mapObj, int movementStep); void MapObject_AdvanceMovementStep(MapObject *mapObj); int MapObject_GetMovementStep(const MapObject *mapObj); -void sub_02062BE0(MapObject *param0, u32 param1); -u32 sub_02062BE8(const MapObject *param0); -void sub_02062BF0(MapObject *param0, u32 param1); -u32 sub_02062BF8(const MapObject *param0); -FieldSystem *MapObject_FieldSystem(const MapObject *param0); -int sub_02062C0C(const MapObject *param0); -int sub_02062C18(const MapObject *param0); -void MapObjectMan_StopAllMovement(MapObjectManager *param0); -void sub_02062C3C(MapObjectManager *param0); -void MapObjectMan_PauseAllMovement(MapObjectManager *param0); -void MapObjectMan_UnpauseAllMovement(MapObjectManager *param0); -int MapObjectMan_IsDrawInitialized(const MapObjectManager *param0); -u32 sub_02062CBC(const MapObject *param0, u32 param1); -void sub_02062CCC(MapObjectManager *param0, int param1); -int sub_02062CE4(const MapObjectManager *param0); -int sub_02062CF8(const MapObject *param0); -void sub_02062D04(MapObject *param0); -void sub_02062D10(MapObject *param0); -int MapObject_IsMoving(const MapObject *param0); -void sub_02062D28(MapObject *param0); -void sub_02062D34(MapObject *param0); -void sub_02062D40(MapObject *param0); -int sub_02062D4C(const MapObject *param0); -int sub_02062D58(const MapObject *param0); -void MapObject_SetHidden(MapObject *param0, int param1); -void sub_02062D80(MapObject *param0, int param1); -int sub_02062D9C(MapObject *param0); -void sub_02062DB4(MapObject *param0, int param1); -void sub_02062DD0(MapObject *param0); -void sub_02062DDC(MapObject *param0); -int MapObject_IsMovementPaused(const MapObject *param0); -int sub_02062DFC(const MapObject *param0); -void sub_02062E28(MapObject *param0, int param1); -int sub_02062E44(const MapObject *param0); -void sub_02062E5C(MapObject *param0, int param1); -void sub_02062E78(MapObject *param0, int param1); -int sub_02062E94(const MapObject *param0); -void sub_02062EAC(MapObject *param0, int param1); -int sub_02062EC8(const MapObject *param0); -void sub_02062EE0(MapObject *param0, int param1); -int sub_02062EFC(const MapObject *param0); -void sub_02062F14(MapObject *param0, int param1); -int sub_02062F30(const MapObject *param0); -void sub_02062F48(MapObject *param0, int param1); -int sub_02062F64(const MapObject *param0); -int sub_02062F7C(const MapObject *param0); -void sub_02062F90(MapObject *param0, int param1); -int sub_02062FAC(const MapObject *param0); -void sub_02062FC4(MapObject *param0, int param1); -int sub_02062FDC(const MapObject *param0); +void MapObject_SetCurrTileBehavior(MapObject *mapObj, u32 param1); +u32 MapObject_GetCurrTileBehavior(const MapObject *mapObj); +void MapObject_SetPrevTileBehavior(MapObject *mapObj, u32 param1); +u32 MapObject_GetPrevTileBehavior(const MapObject *mapObj); +FieldSystem *MapObject_FieldSystem(const MapObject *mapObj); +int sub_02062C0C(const MapObject *mapObj); +int sub_02062C18(const MapObject *mapObj); +void MapObjectMan_StopAllMovement(MapObjectManager *mapObjMan); +void sub_02062C3C(MapObjectManager *mapObjMan); +void MapObjectMan_PauseAllMovement(MapObjectManager *mapObjMan); +void MapObjectMan_UnpauseAllMovement(MapObjectManager *mapObjMan); +int MapObjectMan_IsDrawInitialized(const MapObjectManager *mapObjMan); +u32 sub_02062CBC(const MapObject *mapObj, u32 param1); +void sub_02062CCC(MapObjectManager *mapObjMan, int param1); +int sub_02062CE4(const MapObjectManager *mapObjMan); +int sub_02062CF8(const MapObject *mapObj); +void sub_02062D04(MapObject *mapObj); +void sub_02062D10(MapObject *mapObj); +int MapObject_IsMoving(const MapObject *mapObj); +void sub_02062D28(MapObject *mapObj); +void sub_02062D34(MapObject *mapObj); +void sub_02062D40(MapObject *mapObj); +int sub_02062D4C(const MapObject *mapObj); +int sub_02062D58(const MapObject *mapObj); +void MapObject_SetHidden(MapObject *mapObj, int param1); +void sub_02062D80(MapObject *mapObj, int param1); +int sub_02062D9C(MapObject *mapObj); +void sub_02062DB4(MapObject *mapObj, int param1); +void sub_02062DD0(MapObject *mapObj); +void sub_02062DDC(MapObject *mapObj); +int MapObject_IsMovementPaused(const MapObject *mapObj); +int sub_02062DFC(const MapObject *mapObj); +void sub_02062E28(MapObject *mapObj, int param1); +int sub_02062E44(const MapObject *mapObj); +void sub_02062E5C(MapObject *mapObj, int param1); +void sub_02062E78(MapObject *mapObj, int param1); +int sub_02062E94(const MapObject *mapObj); +void sub_02062EAC(MapObject *mapObj, int param1); +int sub_02062EC8(const MapObject *mapObj); +void sub_02062EE0(MapObject *mapObj, int param1); +int sub_02062EFC(const MapObject *mapObj); +void sub_02062F14(MapObject *mapObj, int param1); +int sub_02062F30(const MapObject *mapObj); +void sub_02062F48(MapObject *mapObj, int param1); +int sub_02062F64(const MapObject *mapObj); +int sub_02062F7C(const MapObject *mapObj); +void sub_02062F90(MapObject *mapObj, int param1); +int sub_02062FAC(const MapObject *mapObj); +void sub_02062FC4(MapObject *mapObj, int param1); +int sub_02062FDC(const MapObject *mapObj); int MapObject_GetXInitial(const MapObject *mapObj); void MapObject_SetXInitial(MapObject *mapObj, int x); int MapObject_GetYInitial(const MapObject *mapObj); @@ -217,14 +217,14 @@ void MapObject_GetPosPtr(const MapObject *mapObj, VecFx32 *pos); void MapObject_SetPos(MapObject *mapObj, const VecFx32 *pos); const VecFx32 *MapObject_GetPos(const MapObject *mapObj); fx32 MapObject_GetPosY(const MapObject *mapObj); -void sub_02063078(const MapObject *param0, VecFx32 *param1); -void sub_02063088(MapObject *param0, const VecFx32 *param1); -VecFx32 *sub_02063098(MapObject *param0); -void sub_0206309C(const MapObject *param0, VecFx32 *param1); -void sub_020630AC(MapObject *param0, const VecFx32 *param1); -void sub_020630BC(const MapObject *param0, VecFx32 *param1); -void sub_020630CC(MapObject *param0, const VecFx32 *param1); -int sub_020630DC(const MapObject *param0); +void sub_02063078(const MapObject *mapObj, VecFx32 *param1); +void sub_02063088(MapObject *mapObj, const VecFx32 *param1); +VecFx32 *sub_02063098(MapObject *mapObj); +void sub_0206309C(const MapObject *mapObj, VecFx32 *param1); +void sub_020630AC(MapObject *mapObj, const VecFx32 *param1); +void sub_020630BC(const MapObject *mapObj, VecFx32 *param1); +void sub_020630CC(MapObject *mapObj, const VecFx32 *param1); +int sub_020630DC(const MapObject *mapObj); void ObjectEvent_SetLocalID(ObjectEvent *objectEvent, int localID); int ObjectEvent_GetLocalID(const ObjectEvent *objectEvent); void ObjectEvent_SetGraphicsID(ObjectEvent *objectEvent, int graphicsID); @@ -251,18 +251,18 @@ void ObjectEvent_SetY(ObjectEvent *objectEvent, int y); int ObjectEvent_GetY(const ObjectEvent *objectEvent); void ObjectEvent_SetZ(ObjectEvent *objectEvent, int z); int ObjectEvent_GetZ(const ObjectEvent *objectEvent); -MapObject *sub_0206326C(const MapObjectManager *param0, int param1, int param2, int param3); -void sub_020632D4(MapObject *param0, const VecFx32 *param1, int param2); -void MapObject_SetPosDir(MapObject *param0, int param1, int param2, int param3, int param4); -void MapObject_SetMoveCode(MapObject *param0, u32 param1); -void sub_020633C8(MapObject *param0, int param1); -void sub_020633E0(MapObject *param0); -void sub_020633E4(MapObject *param0); -void sub_020633E8(MapObject *param0); -void sub_020633EC(MapObject *param0); -void sub_020633F0(MapObject *param0); -void sub_020633F4(MapObject *param0); -void sub_020633F8(MapObject *param0); -void sub_020633FC(MapObject *param0); +MapObject *sub_0206326C(const MapObjectManager *mapObjMan, int param1, int param2, int param3); +void sub_020632D4(MapObject *mapObj, const VecFx32 *param1, int param2); +void MapObject_SetPosDir(MapObject *mapObj, int param1, int param2, int param3, int param4); +void MapObject_SetMoveCode(MapObject *mapObj, u32 param1); +void sub_020633C8(MapObject *mapObj, int param1); +void sub_020633E0(MapObject *mapObj); +void sub_020633E4(MapObject *mapObj); +void sub_020633E8(MapObject *mapObj); +void sub_020633EC(MapObject *mapObj); +void sub_020633F0(MapObject *mapObj); +void sub_020633F4(MapObject *mapObj); +void sub_020633F8(MapObject *mapObj); +void sub_020633FC(MapObject *mapObj); #endif // POKEPLATINUM_UNK_02061804_H diff --git a/include/map_object_move.h b/include/map_object_move.h index f6a998c370..feba7525b5 100644 --- a/include/map_object_move.h +++ b/include/map_object_move.h @@ -7,33 +7,33 @@ #include "field/field_system_decl.h" -void MapObject_InitMove(MapObject *param0); -void MapObject_Move(MapObject *param0); -u32 sub_02063E18(const MapObject *param0, const VecFx32 *param1, int param2, int param3, int param4, int param5); -u32 sub_02063E94(const MapObject *param0, int param1, int param2, int param3, int param4); -u32 sub_02063EBC(const MapObject *param0, int param1); -int sub_02063F00(const MapObject *param0, int param1, int param2, int param3); -int sub_02063FAC(const MapObject *param0, int param1, int param2, int param3); -int sub_02064004(const MapObject *param0, int param1, int param2, int param3); -int sub_0206406C(MapObject *param0, u32 param1); -int sub_020640A0(MapObject *param0, u32 param1); -int MapObject_IsOnSnow(MapObject *param0, u32 param1); -int sub_02064108(MapObject *param0, u32 param1); -int sub_0206413C(MapObject *param0, u32 param1); -int sub_0206415C(MapObject *param0, u32 param1); -int sub_0206417C(MapObject *param0, u32 param1); +void MapObject_InitMove(MapObject *mapObj); +void MapObject_Move(MapObject *mapObj); +u32 sub_02063E18(const MapObject *mapObj, const VecFx32 *param1, int param2, int param3, int param4, int param5); +u32 sub_02063E94(const MapObject *mapObj, int param1, int param2, int param3, int param4); +u32 sub_02063EBC(const MapObject *mapObj, int param1); +int sub_02063F00(const MapObject *mapObj, int param1, int param2, int param3); +int sub_02063FAC(const MapObject *mapObj, int param1, int param2, int param3); +int sub_02064004(const MapObject *mapObj, int param1, int param2, int param3); +int MapObject_IsOnWater(MapObject *mapObj, u32 param1); +int MapObject_IsOnSand(MapObject *mapObj, u32 param1); +int MapObject_IsOnSnow(MapObject *mapObj, u32 param1); +int MapObject_IsOnShallowSnow(MapObject *mapObj, u32 param1); +int sub_0206413C(MapObject *mapObj, u32 param1); +int sub_0206415C(MapObject *mapObj, u32 param1); +int sub_0206417C(MapObject *mapObj, u32 param1); int MapObject_GetDxFromDir(int param0); int MapObject_GetDyFromDir(int param0); void MapObject_StepDir(MapObject *mapObj, int dir); void MapObject_UpdateCoords(MapObject *mapObj); -u32 sub_02064238(MapObject *param0, int param1); -void MapObject_AddVecToPos(MapObject *param0, const VecFx32 *param1); +u32 MapObject_GetTileBehaviorFromDir(MapObject *mapObj, int param1); +void MapObject_AddVecToPos(MapObject *mapObj, const VecFx32 *param1); void MapObject_MovePosInDir(MapObject *mapObj, int dir, fx32 distance); -int sub_020642F8(MapObject *param0); -int sub_02064390(MapObject *param0); +int sub_020642F8(MapObject *mapObj); +int MapObject_SetTileBehaviors(MapObject *mapObj); void VecFx32_StepDirection(int param0, VecFx32 *param1, fx32 param2); void sub_02064450(int param0, int param1, VecFx32 *param2); -void sub_02064464(MapObject *param0); +void sub_02064464(MapObject *mapObj); int Direction_GetOpposite(int param0); int sub_02064488(int param0, int param1, int param2, int param3); int sub_020644A4(FieldSystem *fieldSystem, VecFx32 *param1); diff --git a/src/map_object.c b/src/map_object.c index a248aac2d3..c1746f6703 100644 --- a/src/map_object.c +++ b/src/map_object.c @@ -41,10 +41,10 @@ typedef struct MapObjectMan { int objectCnt; int unk_0C; int unk_10; - NARC *unk_14; + NARC *narc; UnkStruct_ov5_021ED0A4 unk_18; UnkStruct_02061830_sub1 *unk_120; - MapObject *unk_124; + MapObject *mapObj; FieldSystem *fieldSystem; } MapObjectManager; @@ -82,9 +82,9 @@ typedef struct MapObject { u32 unk_A0; int movementAction; int movementStep; - u16 unk_AC; - u16 unk_AE; - SysTask *unk_B0; + u16 currTileBehavior; + u16 prevTileBehavior; + SysTask *task; const MapObjectManager *mapObjMan; UnkFuncPtr_020EDF0C unk_B8; UnkFuncPtr_020EDF0C_1 unk_BC; @@ -104,47 +104,47 @@ typedef struct { int unk_00; int unk_04; int unk_08; - const MapObjectManager *unk_0C; - ObjectEvent *unk_10; + const MapObjectManager *mapObjMan; + ObjectEvent *objectEvent; } UnkStruct_020620C4; static MapObjectManager *MapObjectMan_Alloc(int param0); -static void MapObject_Save(FieldSystem *fieldSystem, MapObject *param1, MapObjectSave *param2); -static void MapObject_LoadSave(MapObject *mapObj, MapObjectSave *param1); -static void sub_02061FA8(const MapObjectManager *param0, MapObject *param1); +static void MapObject_Save(FieldSystem *fieldSystem, MapObject *mapObj, MapObjectSave *mapObjSave); +static void MapObject_LoadSave(MapObject *mapObj, MapObjectSave *mapObjSave); +static void sub_02061FA8(const MapObjectManager *mapObjMan, MapObject *mapObj); static void sub_02061FF0(MapObject *mapObj); static void sub_02062010(MapObject *mapObj); static void sub_020620C4(UnkStruct_020620C4 *param0); -static MapObject *sub_02062120(const MapObjectManager *param0); -static MapObject *sub_02062154(const MapObjectManager *param0, int param1, int param2); -static void MapObjectMan_AddMoveTask(const MapObjectManager *param0, MapObject *param1); -static void sub_020621E8(MapObject *param0, const ObjectEvent *param1, FieldSystem *fieldSystem); -static void sub_020622B8(MapObject *param0, const ObjectEvent *param1); -static void sub_0206234C(MapObject *param0, const MapObjectManager *param1); -static void sub_0206239C(MapObject *param0); -static void sub_020623D4(MapObject *param0); -static void sub_0206243C(MapObject *param0); -static int sub_0206244C(const MapObject *param0, int param1, int param2, const ObjectEvent *param3); -static MapObject *sub_020624CC(const MapObjectManager *param0, int param1, int param2); -static void sub_02062604(MapObject *param0); -static void sub_02062618(MapObject *param0); -static void sub_02062628(MapObject *param0); +static MapObject *sub_02062120(const MapObjectManager *mapObjMan); +static MapObject *sub_02062154(const MapObjectManager *mapObjMan, int param1, int param2); +static void MapObjectMan_AddMoveTask(const MapObjectManager *mapObjMan, MapObject *mapObj); +static void sub_020621E8(MapObject *mapObj, const ObjectEvent *objectEvent, FieldSystem *fieldSystem); +static void sub_020622B8(MapObject *mapObj, const ObjectEvent *objectEvent); +static void sub_0206234C(MapObject *mapObj, const MapObjectManager *mapObjMan); +static void sub_0206239C(MapObject *mapObj); +static void sub_020623D4(MapObject *mapObj); +static void sub_0206243C(MapObject *mapObj); +static int sub_0206244C(const MapObject *mapObj, int param1, int param2, const ObjectEvent *objectEvent); +static MapObject *sub_020624CC(const MapObjectManager *mapObjMan, int param1, int param2); +static void sub_02062604(MapObject *mapObj); +static void sub_02062618(MapObject *mapObj); +static void sub_02062628(MapObject *mapObj); static int sub_0206262C(FieldSystem *fieldSystem, int param1); -static void sub_02062648(MapObject *param0); -static void sub_02062660(MapObject *param0); -static void sub_02062670(MapObject *param0); -static void sub_020626D0(MapObject *param0, const ObjectEvent *param1, int param2); -static void sub_02062714(MapObject *param0, int param1, const ObjectEvent *param2); -static void MapObjectTask_Move(SysTask *param0, void *param1); -static void MapObjectTask_Draw(MapObject *param0); -static MapObjectManager *MapObjectMan_Deconst(const MapObjectManager *param0); -static void MapObjectMan_IncObjectCount(MapObjectManager *param0); -static void MapObjectMan_DecObjectCount(MapObjectManager *param0); -static MapObject *sub_02062870(const MapObjectManager *param0); -static MapObjectManager *sub_02062A48(const MapObject *param0); -static const ObjectEvent *sub_020631A4(int param0, int param1, const ObjectEvent *param2); -static int sub_020631D8(const ObjectEvent *param0); -static int sub_020631F4(const ObjectEvent *param0); +static void sub_02062648(MapObject *mapObj); +static void sub_02062660(MapObject *mapObj); +static void sub_02062670(MapObject *mapObj); +static void sub_020626D0(MapObject *mapObj, const ObjectEvent *objectEvent, int param2); +static void sub_02062714(MapObject *mapObj, int param1, const ObjectEvent *objectEvent); +static void MapObjectTask_Move(SysTask *task, void *param1); +static void MapObjectTask_Draw(MapObject *mapObj); +static MapObjectManager *MapObjectMan_Deconst(const MapObjectManager *mapObjMan); +static void MapObjectMan_IncObjectCount(MapObjectManager *mapObjMan); +static void MapObjectMan_DecObjectCount(MapObjectManager *mapObjMan); +static MapObject *MapObjectMan_GetMapObjectStatic(const MapObjectManager *mapObjMan); +static MapObjectManager *sub_02062A48(const MapObject *mapObj); +static const ObjectEvent *sub_020631A4(int param0, int param1, const ObjectEvent *objectEvent); +static int sub_020631D8(const ObjectEvent *objectEvent); +static int sub_020631F4(const ObjectEvent *objectEvent); static const UnkStruct_020EDF0C *sub_0206320C(u32 param0); static UnkFuncPtr_020EDF0C sub_02063224(const UnkStruct_020EDF0C *param0); @@ -170,25 +170,23 @@ MapObjectManager *MapObjectMan_New(FieldSystem *fieldSystem, int maxObjs, int pa void MapObjectMan_Delete(MapObjectManager *mapObjMan) { - Heap_FreeToHeapExplicit(11, sub_02062878(mapObjMan)); + Heap_FreeToHeapExplicit(11, MapObjectMan_GetMapObject(mapObjMan)); Heap_FreeToHeapExplicit(11, mapObjMan); } -void sub_0206184C(MapObjectManager *mapObjMan, int param1, int param2, int param3, const ObjectEvent *param4) +void sub_0206184C(MapObjectManager *mapObjMan, int param1, int param2, int param3, const ObjectEvent *objectEvent) { - int v0, v1 = MapObjectMan_GetMaxObjects(mapObjMan); - MapObject *mapObj = sub_02062878(mapObjMan); + int v0, maxObjects = MapObjectMan_GetMaxObjects(mapObjMan); + MapObject *mapObj = MapObjectMan_GetMapObject(mapObjMan); - while (v1) { - if (sub_02062CF8(mapObj) == 1) { - v0 = sub_0206244C(mapObj, param2, param3, param4); + while (maxObjects) { + if (sub_02062CF8(mapObj) == TRUE) { + v0 = sub_0206244C(mapObj, param2, param3, objectEvent); switch (v0) { case 0: - if (sub_02062918(mapObj) != param2) { - if (!MapObject_CheckStatusFlag(mapObj, MAP_OBJ_STATUS_10)) { - MapObject_Delete(mapObj); - } + if (sub_02062918(mapObj) != param2 && !MapObject_CheckStatusFlag(mapObj, MAP_OBJ_STATUS_10)) { + MapObject_Delete(mapObj); } break; case 2: @@ -199,7 +197,7 @@ void sub_0206184C(MapObjectManager *mapObjMan, int param1, int param2, int param } mapObj++; - v1--; + maxObjects--; } ov5_021EDA38(mapObjMan, sub_0206285C(mapObjMan)); @@ -209,9 +207,7 @@ static MapObjectManager *MapObjectMan_Alloc(int maxObjs) { int size; MapObject *mapObj; - MapObjectManager *mapObjMan; - - mapObjMan = Heap_AllocFromHeap(11, (sizeof(MapObjectManager))); + MapObjectManager *mapObjMan = Heap_AllocFromHeap(11, (sizeof(MapObjectManager))); GF_ASSERT(mapObjMan != NULL); memset(mapObjMan, 0, (sizeof(MapObjectManager))); @@ -222,15 +218,15 @@ static MapObjectManager *MapObjectMan_Alloc(int maxObjs) GF_ASSERT(mapObj != NULL); memset(mapObj, 0, size); - sub_02062860(mapObjMan, mapObj); + MapObjectMan_SetMapObject(mapObjMan, mapObj); return mapObjMan; } -MapObject *MapObjectMan_AddMapObjectFromHeader(const MapObjectManager *mapObjMan, const ObjectEvent *param1, int param2) +MapObject *MapObjectMan_AddMapObjectFromHeader(const MapObjectManager *mapObjMan, const ObjectEvent *objectEvent, int param2) { MapObject *mapObj; - ObjectEvent v1 = *param1; + ObjectEvent v1 = *objectEvent; ObjectEvent *v2 = &v1; int v3 = ObjectEvent_GetLocalID(v2); @@ -296,10 +292,10 @@ MapObject *MapObjectMan_AddMapObject(const MapObjectManager *mapObjMan, int x, i return mapObj; } -MapObject *sub_02061A74(const MapObjectManager *mapObjMan, int param1, int param2, int param3, const ObjectEvent *param4) +MapObject *sub_02061A74(const MapObjectManager *mapObjMan, int param1, int param2, int param3, const ObjectEvent *objectEvent) { MapObject *mapObj = NULL; - const ObjectEvent *v1 = sub_020631A4(param1, param2, param4); + const ObjectEvent *v1 = sub_020631A4(param1, param2, objectEvent); if (v1 != NULL) { int flag = ObjectEvent_GetFlag(v1); @@ -332,11 +328,9 @@ void sub_02061AD4(MapObject *mapObj, int param1) void MapObject_Delete(MapObject *mapObj) { - const MapObjectManager *mapObjMan; - - mapObjMan = MapObject_MapObjectManager(mapObj); + const MapObjectManager *mapObjMan = MapObject_MapObjectManager(mapObj); - if (MapObjectMan_IsDrawInitialized(mapObjMan) == 1) { + if (MapObjectMan_IsDrawInitialized(mapObjMan) == TRUE) { sub_02062B7C(mapObj); } @@ -357,7 +351,7 @@ void sub_02061B48(MapObject *mapObj) { const MapObjectManager *mapObjMan = MapObject_MapObjectManager(mapObj); - if (MapObjectMan_IsDrawInitialized(mapObjMan) == 1) { + if (MapObjectMan_IsDrawInitialized(mapObjMan) == TRUE) { if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_14)) { sub_02062B7C(mapObj); } @@ -375,12 +369,9 @@ void sub_02061B48(MapObject *mapObj) void MapObjectMan_DeleteAll(MapObjectManager *mapObjMan) { - int v0, v1; - MapObject *mapObj; - - v0 = 0; - v1 = MapObjectMan_GetMaxObjects(mapObjMan); - mapObj = sub_02062878(mapObjMan); + int i = 0; + int maxObjects = MapObjectMan_GetMaxObjects(mapObjMan); + MapObject *mapObj = MapObjectMan_GetMapObject(mapObjMan); do { if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_0)) { @@ -388,45 +379,40 @@ void MapObjectMan_DeleteAll(MapObjectManager *mapObjMan) } mapObj++; - v0++; - } while (v0 < v1); + i++; + } while (i < maxObjects); } void sub_02061BF0(MapObjectManager *mapObjMan) { - GF_ASSERT(MapObjectMan_IsDrawInitialized(mapObjMan) == 1); - - int v0, maxObjects; - MapObject *mapObj; + GF_ASSERT(MapObjectMan_IsDrawInitialized(mapObjMan) == TRUE); - v0 = 0; - maxObjects = MapObjectMan_GetMaxObjects(mapObjMan); - mapObj = sub_02062878(mapObjMan); + int i = 0; + int maxObjects = MapObjectMan_GetMaxObjects(mapObjMan); + MapObject *mapObj = MapObjectMan_GetMapObject(mapObjMan); do { - if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_0)) { - if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_14)) { - sub_02062B90(mapObj); - sub_02062628(mapObj); - } + if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_0) && MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_14)) { + sub_02062B90(mapObj); + sub_02062628(mapObj); } mapObj++; - v0++; - } while (v0 < maxObjects); + i++; + } while (i < maxObjects); } void sub_02061C48(MapObjectManager *mapObjMan) { - GF_ASSERT(MapObjectMan_IsDrawInitialized(mapObjMan) == 1); + GF_ASSERT(MapObjectMan_IsDrawInitialized(mapObjMan) == TRUE); - int v0 = 0; + int i = 0; int maxObjects = MapObjectMan_GetMaxObjects(mapObjMan); - MapObject *mapObj = sub_02062878(mapObjMan); + MapObject *mapObj = MapObjectMan_GetMapObject(mapObjMan); do { - if (sub_02062CF8(mapObj) == 1) { - if (sub_02062D4C(mapObj) == 1) { + if (sub_02062CF8(mapObj) == TRUE) { + if (sub_02062D4C(mapObj) == TRUE) { sub_02062BA4(mapObj); } else { sub_02062670(mapObj); @@ -437,16 +423,16 @@ void sub_02061C48(MapObjectManager *mapObjMan) } mapObj++; - v0++; - } while (v0 < maxObjects); + i++; + } while (i < maxObjects); } -void MapObjectMan_SaveAll(FieldSystem *fieldSystem, const MapObjectManager *param1, MapObjectSave *mapObjSave, int param3) +void MapObjectMan_SaveAll(FieldSystem *fieldSystem, const MapObjectManager *mapObjMan, MapObjectSave *mapObjSave, int param3) { int v0 = 0; MapObject *mapObj; - while (sub_020625B0(param1, &mapObj, &v0, MAP_OBJ_STATUS_0)) { + while (sub_020625B0(mapObjMan, &mapObj, &v0, MAP_OBJ_STATUS_0)) { MapObject_Save(fieldSystem, mapObj, mapObjSave); mapObjSave++; param3--; @@ -602,7 +588,7 @@ static void sub_02062010(MapObject *mapObj) MapObject_SetPos(mapObj, &v1); } -void sub_02062068(const MapObjectManager *mapObjMan, int param1, int param2, const ObjectEvent *param3) +void sub_02062068(const MapObjectManager *mapObjMan, int param1, int param2, const ObjectEvent *objectEvent) { int v0; ObjectEvent *v1; @@ -614,7 +600,7 @@ void sub_02062068(const MapObjectManager *mapObjMan, int param1, int param2, con v1 = Heap_AllocFromHeapAtEnd(11, v0); GF_ASSERT(v1 != NULL); - memcpy(v1, param3, v0); + memcpy(v1, objectEvent, v0); v2 = Heap_AllocFromHeapAtEnd(11, (sizeof(UnkStruct_020620C4))); GF_ASSERT(v2 != NULL); @@ -622,8 +608,8 @@ void sub_02062068(const MapObjectManager *mapObjMan, int param1, int param2, con v2->unk_00 = param1; v2->unk_04 = param2; v2->unk_08 = 0; - v2->unk_0C = mapObjMan; - v2->unk_10 = v1; + v2->mapObjMan = mapObjMan; + v2->objectEvent = v1; sub_020620C4(v2); } @@ -632,33 +618,30 @@ static void sub_020620C4(UnkStruct_020620C4 *param0) { MapObject *mapObj; FieldSystem *fieldSystem; - const ObjectEvent *v2; + const ObjectEvent *objectEvent; - fieldSystem = MapObjectMan_FieldSystem(param0->unk_0C); - v2 = param0->unk_10; + fieldSystem = MapObjectMan_FieldSystem(param0->mapObjMan); + objectEvent = param0->objectEvent; do { - if ((sub_020631D8(v2) == 1) || (FieldSystem_CheckFlag(fieldSystem, v2->flag) == 0)) { - mapObj = MapObjectMan_AddMapObjectFromHeader(param0->unk_0C, v2, param0->unk_00); + if (sub_020631D8(objectEvent) == 1 || FieldSystem_CheckFlag(fieldSystem, objectEvent->flag) == 0) { + mapObj = MapObjectMan_AddMapObjectFromHeader(param0->mapObjMan, objectEvent, param0->unk_00); GF_ASSERT(mapObj != NULL); } - v2++; + objectEvent++; param0->unk_08++; } while (param0->unk_08 < param0->unk_04); - Heap_FreeToHeapExplicit(11, param0->unk_10); - Heap_FreeToHeapExplicit(11, param0); + Heap_FreeToHeapExplicit(HEAP_ID_FIELDMAP, param0->objectEvent); + Heap_FreeToHeapExplicit(HEAP_ID_FIELDMAP, param0); } static MapObject *sub_02062120(const MapObjectManager *mapObjMan) { - int v0, v1; - MapObject *mapObj; - - v0 = 0; - v1 = MapObjectMan_GetMaxObjects(mapObjMan); - mapObj = sub_02062878(mapObjMan); + int i = 0; + int maxObjects = MapObjectMan_GetMaxObjects(mapObjMan); + MapObject *mapObj = MapObjectMan_GetMapObject(mapObjMan); do { if (!MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_0)) { @@ -666,8 +649,8 @@ static MapObject *sub_02062120(const MapObjectManager *mapObjMan) } mapObj++; - v0++; - } while (v0 < v1); + i++; + } while (i < maxObjects); return NULL; } @@ -675,13 +658,13 @@ static MapObject *sub_02062120(const MapObjectManager *mapObjMan) static MapObject *sub_02062154(const MapObjectManager *mapObjMan, int param1, int param2) { int v0 = 0; - MapObject *v1; + MapObject *mapObj; - while (sub_020625B0(mapObjMan, &v1, &v0, MAP_OBJ_STATUS_0) == 1) { - if (sub_02062E94(v1) == 1 - && MapObject_GetLocalID(v1) == param1 - && sub_02062C18(v1) == param2) { - return v1; + while (sub_020625B0(mapObjMan, &mapObj, &v0, MAP_OBJ_STATUS_0) == 1) { + if (sub_02062E94(mapObj) == 1 + && MapObject_GetLocalID(mapObj) == param1 + && sub_02062C18(mapObj) == param2) { + return mapObj; } } @@ -690,12 +673,10 @@ static MapObject *sub_02062154(const MapObjectManager *mapObjMan, int param1, in static void MapObjectMan_AddMoveTask(const MapObjectManager *mapObjMan, MapObject *mapObj) { - int v0, movementType; + int v0 = sub_02062858(mapObjMan); + int movementType = MapObject_GetMovementType(mapObj); SysTask *task; - v0 = sub_02062858(mapObjMan); - movementType = MapObject_GetMovementType(mapObj); - if (movementType == 48 || movementType == 50) { v0 += 2; } @@ -725,10 +706,9 @@ static void sub_020621E8(MapObject *mapObj, const ObjectEvent *objectEvent, Fiel static void sub_020622B8(MapObject *mapObj, const ObjectEvent *objectEvent) { - int v0; + int v0 = ObjectEvent_GetX(objectEvent); VecFx32 v1; - v0 = ObjectEvent_GetX(objectEvent); v1.x = (((v0) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1); MapObject_SetXInitial(mapObj, v0); @@ -752,7 +732,7 @@ static void sub_020622B8(MapObject *mapObj, const ObjectEvent *objectEvent) MapObject_SetPos(mapObj, &v1); } -static void sub_0206234C(MapObject *mapObj, const MapObjectManager *param1) +static void sub_0206234C(MapObject *mapObj, const MapObjectManager *mapObjMan) { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_0 | MAP_OBJ_STATUS_12 | MAP_OBJ_STATUS_11); @@ -760,7 +740,7 @@ static void sub_0206234C(MapObject *mapObj, const MapObjectManager *param1) sub_02062E78(mapObj, 1); } - MapObject_SetMapObjectManager(mapObj, param1); + MapObject_SetMapObjectManager(mapObj, mapObjMan); MapObject_Face(mapObj, MapObject_GetInitialDir(mapObj)); MapObject_Turn(mapObj, MapObject_GetInitialDir(mapObj)); sub_020656DC(mapObj); @@ -768,9 +748,7 @@ static void sub_0206234C(MapObject *mapObj, const MapObjectManager *param1) static void sub_0206239C(MapObject *mapObj) { - const UnkStruct_020EDF0C *v0; - - v0 = sub_0206320C(MapObject_GetMovementType(mapObj)); + const UnkStruct_020EDF0C *v0 = sub_0206320C(MapObject_GetMovementType(mapObj)); sub_02062AF8(mapObj, sub_02063224(v0)); sub_02062B0C(mapObj, sub_02063228(v0)); @@ -800,17 +778,17 @@ static void sub_0206243C(MapObject *mapObj) memset(mapObj, 0, (sizeof(MapObject))); } -static int sub_0206244C(const MapObject *mapObj, int param1, int param2, const ObjectEvent *param3) +static int sub_0206244C(const MapObject *mapObj, int param1, int param2, const ObjectEvent *objectEvent) { int v0; int v1; while (param2) { - v0 = ObjectEvent_GetLocalID(param3); + v0 = ObjectEvent_GetLocalID(objectEvent); if (MapObject_GetLocalID(mapObj) == v0) { - if (sub_020631D8(param3) == 1) { - v1 = sub_020631F4(param3); + if (sub_020631D8(objectEvent) == 1) { + v1 = sub_020631F4(objectEvent); if (sub_02062E94(mapObj) == 1) { if (sub_02062C18(mapObj) == v1) { @@ -819,17 +797,13 @@ static int sub_0206244C(const MapObject *mapObj, int param1, int param2, const O } else if (sub_02062918(mapObj) == v1) { return 2; } - } else { - if (sub_02062E94(mapObj) == 1) { - if (sub_02062C18(mapObj) == param1) { - return 2; - } - } + } else if (sub_02062E94(mapObj) == 1 && sub_02062C18(mapObj) == param1) { + return 2; } } param2--; - param3++; + objectEvent++; } return 0; @@ -838,11 +812,11 @@ static int sub_0206244C(const MapObject *mapObj, int param1, int param2, const O static MapObject *sub_020624CC(const MapObjectManager *mapObjMan, int param1, int param2) { int v0 = 0; - MapObject *v1; + MapObject *mapObj; - while (sub_020625B0(mapObjMan, &v1, &v0, MAP_OBJ_STATUS_0) == 1) { - if ((MapObject_GetLocalID(v1) == param1) && (sub_02062918(v1) == param2)) { - return v1; + while (sub_020625B0(mapObjMan, &mapObj, &v0, MAP_OBJ_STATUS_0) == 1) { + if ((MapObject_GetLocalID(mapObj) == param1) && (sub_02062918(mapObj) == param2)) { + return mapObj; } } @@ -851,76 +825,66 @@ static MapObject *sub_020624CC(const MapObjectManager *mapObjMan, int param1, in MapObject *MapObjMan_LocalMapObjByIndex(const MapObjectManager *mapObjMan, int param1) { - int v0; - MapObject *v1; + int maxObjects; + MapObject *mapObj; GF_ASSERT(mapObjMan != NULL); - v0 = MapObjectMan_GetMaxObjects(mapObjMan); - v1 = sub_02062870(mapObjMan); + maxObjects = MapObjectMan_GetMaxObjects(mapObjMan); + mapObj = MapObjectMan_GetMapObjectStatic(mapObjMan); do { - if (MapObject_CheckStatusFlag(v1, MAP_OBJ_STATUS_0) == 1) { - if (sub_02062E94(v1) == 0) { - if (MapObject_GetLocalID(v1) == param1) { - return v1; - } - } + if (MapObject_CheckStatusFlag(mapObj, MAP_OBJ_STATUS_0) == TRUE && sub_02062E94(mapObj) == 0 + && MapObject_GetLocalID(mapObj) == param1) { + return mapObj; } - v1++; - v0--; - } while (v0 > 0); + mapObj++; + maxObjects--; + } while (maxObjects > 0); return NULL; } MapObject *sub_02062570(const MapObjectManager *mapObjMan, int param1) { - int v0; - MapObject *v1; - - v0 = MapObjectMan_GetMaxObjects(mapObjMan); - v1 = sub_02062870(mapObjMan); + int maxObjects = MapObjectMan_GetMaxObjects(mapObjMan); + MapObject *mapObj = MapObjectMan_GetMapObjectStatic(mapObjMan); do { - if (MapObject_CheckStatusFlag(v1, MAP_OBJ_STATUS_0) == 1) { - if (MapObject_GetMovementType(v1) == param1) { - return v1; - } + if (MapObject_CheckStatusFlag(mapObj, MAP_OBJ_STATUS_0) == TRUE && MapObject_GetMovementType(mapObj) == param1) { + return mapObj; } - v1++; - v0--; - } while (v0 > 0); + mapObj++; + maxObjects--; + } while (maxObjects > 0); return NULL; } -int sub_020625B0(const MapObjectManager *mapObjMan, MapObject **param1, int *param2, u32 param3) +int sub_020625B0(const MapObjectManager *mapObjMan, MapObject **mapObj, int *param2, u32 param3) { - int v0; + int maxObjects = MapObjectMan_GetMaxObjects(mapObjMan); MapObject *v1; - v0 = MapObjectMan_GetMaxObjects(mapObjMan); - - if ((*param2) >= v0) { + if ((*param2) >= maxObjects) { return 0; } - v1 = sub_02062870(mapObjMan); + v1 = MapObjectMan_GetMapObjectStatic(mapObjMan); v1 = &v1[(*param2)]; do { (*param2)++; if (MapObject_CheckStatus(v1, param3) == param3) { - *param1 = v1; + *mapObj = v1; return 1; } v1++; - } while ((*param2) < v0); + } while ((*param2) < maxObjects); return 0; } @@ -943,7 +907,7 @@ static void sub_02062628(MapObject *mapObj) static int sub_0206262C(FieldSystem *fieldSystem, int param1) { - if ((param1 >= 0x65) && (param1 <= 0x74)) { + if (param1 >= 0x65 && param1 <= 0x74) { param1 -= 0x65; param1 = sub_0203F164(fieldSystem, param1); } @@ -966,9 +930,9 @@ static void sub_02062660(MapObject *mapObj) static void sub_02062670(MapObject *mapObj) { - const MapObjectManager *v0 = MapObject_MapObjectManager(mapObj); + const MapObjectManager *mapObjMan = MapObject_MapObjectManager(mapObj); - if (MapObjectMan_IsDrawInitialized(v0) == 0) { + if (MapObjectMan_IsDrawInitialized(mapObjMan) == FALSE) { return; } @@ -976,7 +940,7 @@ static void sub_02062670(MapObject *mapObj) sub_02062A0C(mapObj, 0); ov5_021EDD78(mapObj, 0); - if (sub_02062D4C(mapObj) == 0) { + if (sub_02062D4C(mapObj) == FALSE) { sub_020623D4(mapObj); sub_02062B54(mapObj); sub_02062D40(mapObj); @@ -994,31 +958,29 @@ int sub_020626B4(const MapObject *mapObj) return 0; } -static void sub_020626D0(MapObject *mapObj, const ObjectEvent *param1, int param2) +static void sub_020626D0(MapObject *mapObj, const ObjectEvent *objectEvent, int param2) { GF_ASSERT(sub_02062E94(mapObj) == 1); sub_02062E78(mapObj, 0); sub_02062914(mapObj, param2); - MapObject_SetScript(mapObj, ObjectEvent_GetScript(param1)); - MapObject_SetFlag(mapObj, ObjectEvent_GetFlag(param1)); + MapObject_SetScript(mapObj, ObjectEvent_GetScript(objectEvent)); + MapObject_SetFlag(mapObj, ObjectEvent_GetFlag(objectEvent)); } -static void sub_02062714(MapObject *mapObj, int param1, const ObjectEvent *param2) +static void sub_02062714(MapObject *mapObj, int param1, const ObjectEvent *objectEvent) { - GF_ASSERT(sub_020631D8(param2) == 1); + GF_ASSERT(sub_020631D8(objectEvent) == 1); sub_02062E78(mapObj, 1); - MapObject_SetScript(mapObj, ObjectEvent_GetScript(param2)); - MapObject_SetFlag(mapObj, sub_020631F4(param2)); + MapObject_SetScript(mapObj, ObjectEvent_GetScript(objectEvent)); + MapObject_SetFlag(mapObj, sub_020631F4(objectEvent)); sub_02062914(mapObj, param1); } int sub_02062758(const MapObject *mapObj, int param1) { - int v0; - - v0 = sub_02062C0C(mapObj); + int v0 = sub_02062C0C(mapObj); v0 += param1; return v0; @@ -1053,12 +1015,10 @@ int sub_020627B4(const MapObject *mapObj, int param1, int param2, int param3) return 0; } - { - int v0 = sub_02062924(mapObj); + int v0 = sub_02062924(mapObj); - if (v0 != param1) { - return 0; - } + if (v0 != param1) { + return 0; } return sub_02062764(mapObj, param2, param3); @@ -1141,24 +1101,24 @@ UnkStruct_ov5_021ED0A4 *sub_0206285C(const MapObjectManager *mapObjMan) return &(((MapObjectManager *)mapObjMan)->unk_18); } -void sub_02062860(MapObjectManager *mapObjMan, MapObject *param1) +void MapObjectMan_SetMapObject(MapObjectManager *mapObjMan, MapObject *mapObj) { - mapObjMan->unk_124 = param1; + mapObjMan->mapObj = mapObj; } -const MapObject *sub_02062868(const MapObjectManager *mapObjMan) +const MapObject *MapObjectMan_GetMapObjectConst(const MapObjectManager *mapObjMan) { - return mapObjMan->unk_124; + return mapObjMan->mapObj; } -static MapObject *sub_02062870(const MapObjectManager *mapObjMan) +static MapObject *MapObjectMan_GetMapObjectStatic(const MapObjectManager *mapObjMan) { - return mapObjMan->unk_124; + return mapObjMan->mapObj; } -MapObject *sub_02062878(const MapObjectManager *mapObjMan) +MapObject *MapObjectMan_GetMapObject(const MapObjectManager *mapObjMan) { - return mapObjMan->unk_124; + return mapObjMan->mapObj; } void sub_02062880(const MapObject **mapObj) @@ -1176,15 +1136,15 @@ FieldSystem *MapObjectMan_FieldSystem(const MapObjectManager *mapObjMan) return mapObjMan->fieldSystem; } -void sub_0206289C(MapObjectManager *mapObjMan, NARC *param1) +void MapObjectMan_GetNARC(MapObjectManager *mapObjMan, NARC *narc) { - mapObjMan->unk_14 = param1; + mapObjMan->narc = narc; } NARC *sub_020628A0(const MapObjectManager *mapObjMan) { - GF_ASSERT(mapObjMan->unk_14 != NULL); - return ((MapObjectManager *)mapObjMan)->unk_14; + GF_ASSERT(mapObjMan->narc != NULL); + return ((MapObjectManager *)mapObjMan)->narc; } void MapObject_SetStatus(MapObject *mapObj, u32 status) @@ -1438,14 +1398,14 @@ u32 sub_02062A14(const MapObject *mapObj) return mapObj->unk_A0; } -void sub_02062A1C(MapObject *mapObj, SysTask *param1) +void sub_02062A1C(MapObject *mapObj, SysTask *task) { - mapObj->unk_B0 = param1; + mapObj->task = task; } SysTask *sub_02062A24(const MapObject *mapObj) { - return mapObj->unk_B0; + return mapObj->task; } void sub_02062A2C(const MapObject *mapObj) @@ -1645,32 +1605,30 @@ int MapObject_GetMovementStep(const MapObject *mapObj) return mapObj->movementStep; } -void sub_02062BE0(MapObject *mapObj, u32 param1) +void MapObject_SetCurrTileBehavior(MapObject *mapObj, u32 tileBehavior) { - mapObj->unk_AC = param1; + mapObj->currTileBehavior = tileBehavior; } -u32 sub_02062BE8(const MapObject *mapObj) +u32 MapObject_GetCurrTileBehavior(const MapObject *mapObj) { - return mapObj->unk_AC; + return mapObj->currTileBehavior; } -void sub_02062BF0(MapObject *mapObj, u32 param1) +void MapObject_SetPrevTileBehavior(MapObject *mapObj, u32 tileBehavior) { - mapObj->unk_AE = param1; + mapObj->prevTileBehavior = tileBehavior; } -u32 sub_02062BF8(const MapObject *mapObj) +u32 MapObject_GetPrevTileBehavior(const MapObject *mapObj) { - return mapObj->unk_AE; + return mapObj->prevTileBehavior; } FieldSystem *MapObject_FieldSystem(const MapObject *mapObj) { - MapObjectManager *v0; - - v0 = sub_02062A48(mapObj); - return MapObjectMan_FieldSystem(v0); + MapObjectManager *mapObjMan = sub_02062A48(mapObj); + return MapObjectMan_FieldSystem(mapObjMan); } int sub_02062C0C(const MapObject *mapObj) @@ -1696,48 +1654,48 @@ void sub_02062C3C(MapObjectManager *mapObjMan) void MapObjectMan_PauseAllMovement(MapObjectManager *mapObjMan) { - int v0 = MapObjectMan_GetMaxObjects(mapObjMan); - MapObject *v1 = sub_02062878(mapObjMan); + int maxObjects = MapObjectMan_GetMaxObjects(mapObjMan); + MapObject *mapObj = MapObjectMan_GetMapObject(mapObjMan); do { - if (sub_02062CF8(v1)) { - sub_02062DD0(v1); + if (sub_02062CF8(mapObj)) { + sub_02062DD0(mapObj); } - v1++; - v0--; - } while (v0); + mapObj++; + maxObjects--; + } while (maxObjects); } void MapObjectMan_UnpauseAllMovement(MapObjectManager *mapObjMan) { - int v0 = MapObjectMan_GetMaxObjects(mapObjMan); - MapObject *v1 = sub_02062878(mapObjMan); + int maxObjects = MapObjectMan_GetMaxObjects(mapObjMan); + MapObject *mapObj = MapObjectMan_GetMapObject(mapObjMan); do { - if (sub_02062CF8(v1)) { - sub_02062DDC(v1); + if (sub_02062CF8(mapObj)) { + sub_02062DDC(mapObj); } - v1++; - v0--; - } while (v0); + mapObj++; + maxObjects--; + } while (maxObjects); } int MapObjectMan_IsDrawInitialized(const MapObjectManager *mapObjMan) { if (sub_0206284C(mapObjMan, MAP_OBJ_STATUS_0)) { - return 1; + return TRUE; } - return 0; + return FALSE; } u32 sub_02062CBC(const MapObject *mapObj, u32 param1) { - const MapObjectManager *v0 = MapObject_MapObjectManager(mapObj); + const MapObjectManager *mapObjMan = MapObject_MapObjectManager(mapObj); - return sub_0206284C(v0, param1); + return sub_0206284C(mapObjMan, param1); } void sub_02062CCC(MapObjectManager *mapObjMan, int param1) @@ -1823,11 +1781,11 @@ void sub_02062D80(MapObject *mapObj, int param1) int sub_02062D9C(MapObject *mapObj) { - if (MapObject_CheckStatusFlag(mapObj, MAP_OBJ_STATUS_19) == 1) { - return 0; + if (MapObject_CheckStatusFlag(mapObj, MAP_OBJ_STATUS_19) == TRUE) { + return FALSE; } - return 1; + return TRUE; } void sub_02062DB4(MapObject *mapObj, int param1) @@ -1851,20 +1809,18 @@ void sub_02062DDC(MapObject *mapObj) int MapObject_IsMovementPaused(const MapObject *mapObj) { - if (MapObject_CheckStatusFlag(mapObj, MAP_OBJ_STATUS_PAUSE_MOVEMENT) == 1) { - return 1; + if (MapObject_CheckStatusFlag(mapObj, MAP_OBJ_STATUS_PAUSE_MOVEMENT) == TRUE) { + return TRUE; } - return 0; + return FALSE; } int sub_02062DFC(const MapObject *mapObj) { - const MapObjectManager *v0; - - v0 = MapObject_MapObjectManager(mapObj); + const MapObjectManager *mapObjMan = MapObject_MapObjectManager(mapObj); - if (MapObjectMan_IsDrawInitialized(v0) == 0) { + if (MapObjectMan_IsDrawInitialized(mapObjMan) == FALSE) { return 0; } @@ -1887,10 +1843,10 @@ void sub_02062E28(MapObject *mapObj, int param1) int sub_02062E44(const MapObject *mapObj) { if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_23)) { - return 1; + return TRUE; } - return 0; + return FALSE; } void sub_02062E5C(MapObject *mapObj, int param1) @@ -1914,10 +1870,10 @@ void sub_02062E78(MapObject *mapObj, int param1) int sub_02062E94(const MapObject *mapObj) { if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_25)) { - return 1; + return TRUE; } - return 0; + return FALSE; } void sub_02062EAC(MapObject *mapObj, int param1) @@ -1932,10 +1888,10 @@ void sub_02062EAC(MapObject *mapObj, int param1) int sub_02062EC8(const MapObject *mapObj) { if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_26)) { - return 1; + return TRUE; } - return 0; + return FALSE; } void sub_02062EE0(MapObject *mapObj, int param1) @@ -1950,10 +1906,10 @@ void sub_02062EE0(MapObject *mapObj, int param1) int sub_02062EFC(const MapObject *mapObj) { if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_27)) { - return 1; + return TRUE; } - return 0; + return FALSE; } void sub_02062F14(MapObject *mapObj, int param1) @@ -1968,10 +1924,10 @@ void sub_02062F14(MapObject *mapObj, int param1) int sub_02062F30(const MapObject *mapObj) { if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_28)) { - return 1; + return TRUE; } - return 0; + return FALSE; } void sub_02062F48(MapObject *mapObj, int param1) @@ -1986,19 +1942,19 @@ void sub_02062F48(MapObject *mapObj, int param1) int sub_02062F64(const MapObject *mapObj) { if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_24)) { - return 1; + return TRUE; } - return 0; + return FALSE; } int sub_02062F7C(const MapObject *mapObj) { if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_4)) { - return 1; + return TRUE; } - return 0; + return FALSE; } void sub_02062F90(MapObject *mapObj, int param1) @@ -2013,10 +1969,10 @@ void sub_02062F90(MapObject *mapObj, int param1) int sub_02062FAC(const MapObject *mapObj) { if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_29)) { - return 1; + return TRUE; } - return 0; + return FALSE; } void sub_02062FC4(MapObject *mapObj, int param1) @@ -2357,19 +2313,17 @@ int ObjectEvent_GetZ(const ObjectEvent *objectEvent) return objectEvent->z; } -static const ObjectEvent *sub_020631A4(int param0, int param1, const ObjectEvent *param2) +static const ObjectEvent *sub_020631A4(int param0, int param1, const ObjectEvent *objectEvent) { - int v0 = 0; + int i = 0; do { - if (sub_020631D8(¶m2[v0]) == 0) { - if (ObjectEvent_GetLocalID(¶m2[v0]) == param0) { - return ¶m2[v0]; - } + if (sub_020631D8(&objectEvent[i]) == 0 && ObjectEvent_GetLocalID(&objectEvent[i]) == param0) { + return &objectEvent[i]; } - v0++; - } while (v0 < param1); + i++; + } while (i < param1); return NULL; } @@ -2453,46 +2407,43 @@ static const UnkStruct_ov5_021FB0F0 *sub_02063244(u32 param0) return NULL; } -MapObject *sub_0206326C(const MapObjectManager *param0, int param1, int param2, int param3) +MapObject *sub_0206326C(const MapObjectManager *mapObjMan, int param1, int param2, int param3) { - int v0; - MapObject *v1; - - v0 = MapObjectMan_GetMaxObjects(param0); - v1 = sub_02062878(param0); + int maxObjects = MapObjectMan_GetMaxObjects(mapObjMan); + MapObject *mapObj = MapObjectMan_GetMapObject(mapObjMan); do { - if (MapObject_CheckStatus(v1, MAP_OBJ_STATUS_0)) { + if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_0)) { if (param3) { - if (MapObject_GetXPrev(v1) == param1 && MapObject_GetZPrev(v1) == param2) { - return v1; + if (MapObject_GetXPrev(mapObj) == param1 && MapObject_GetZPrev(mapObj) == param2) { + return mapObj; } } - if (MapObject_GetX(v1) == param1 && MapObject_GetZ(v1) == param2) { - return v1; + if (MapObject_GetX(mapObj) == param1 && MapObject_GetZ(mapObj) == param2) { + return mapObj; } } - v1++; - v0--; - } while (v0); + mapObj++; + maxObjects--; + } while (maxObjects); return NULL; } void sub_020632D4(MapObject *mapObj, const VecFx32 *param1, int param2) { - int v0, v1, v2; + int x, y, z; - v0 = (((param1->x) >> 4) / FX32_ONE); - MapObject_SetX(mapObj, v0); + x = ((param1->x) >> 4) / FX32_ONE; + MapObject_SetX(mapObj, x); - v1 = (((param1->y) >> 3) / FX32_ONE); - MapObject_SetY(mapObj, v1); + y = ((param1->y) >> 3) / FX32_ONE; + MapObject_SetY(mapObj, y); - v2 = (((param1->z) >> 4) / FX32_ONE); - MapObject_SetZ(mapObj, v2); + z = ((param1->z) >> 4) / FX32_ONE; + MapObject_SetZ(mapObj, z); MapObject_SetPos(mapObj, param1); MapObject_UpdateCoords(mapObj); @@ -2506,18 +2457,18 @@ void sub_020632D4(MapObject *mapObj, const VecFx32 *param1, int param2) void MapObject_SetPosDir(MapObject *mapObj, int param1, int param2, int param3, int param4) { - VecFx32 v0; + VecFx32 pos; - v0.x = (((param1) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1); + pos.x = (((param1) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1); MapObject_SetX(mapObj, param1); - v0.y = (((param2) << 3) * FX32_ONE) + 0; + pos.y = (((param2) << 3) * FX32_ONE) + 0; MapObject_SetY(mapObj, param2); - v0.z = (((param3) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1); + pos.z = (((param3) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1); MapObject_SetZ(mapObj, param3); - MapObject_SetPos(mapObj, &v0); + MapObject_SetPos(mapObj, &pos); MapObject_UpdateCoords(mapObj); MapObject_Face(mapObj, param4); diff --git a/src/map_object_move.c b/src/map_object_move.c index df842928e0..77c21a3ec2 100644 --- a/src/map_object_move.c +++ b/src/map_object_move.c @@ -37,28 +37,28 @@ static void sub_0206363C(MapObject *mapObj); static void sub_020636F0(MapObject *mapObj); static void sub_0206375C(MapObject *mapObj); static void sub_020637D4(MapObject *mapObj); -static void sub_02063864(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); -static void sub_02063964(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); -static void sub_0206397C(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); -static void sub_02063994(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); -static void sub_02063A30(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); -static void sub_02063A64(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); -static void sub_02063A70(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); -static void sub_02063A78(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); -static void sub_02063B20(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); -static void sub_02063BB4(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); -static void sub_02063C00(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); -static void sub_02063C18(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); -static void sub_02063C30(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); -static void sub_02063C48(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); -static void sub_02063C60(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); -static void sub_02063C94(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); -static void sub_02063CC8(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); -static void sub_02063CFC(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); -static void sub_02063D30(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); -static void sub_02063DA8(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); -static void sub_02063DDC(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); -static void sub_02063E14(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063864(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063964(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3); +static void sub_0206397C(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063994(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063A30(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063A64(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063A70(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063A78(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063B20(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063BB4(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063C00(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063C18(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063C30(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063C48(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063C60(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063C94(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063CC8(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063CFC(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063D30(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063DA8(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063DDC(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3); +static void sub_02063E14(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3); static BOOL (*const Unk_020EE76C[4])(u8); static BOOL (*const Unk_020EE77C[4])(u8); @@ -81,7 +81,7 @@ void MapObject_Move(MapObject *mapObj) if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_4)) { MapObject_DoMovementAction(mapObj); - } else if (MapObject_IsMovementPaused(mapObj) == FALSE && sub_02063478(mapObj) == 1 && sub_020673C0(mapObj) == 0) { + } else if (MapObject_IsMovementPaused(mapObj) == FALSE && sub_02063478(mapObj) == TRUE && sub_020673C0(mapObj) == FALSE) { sub_02062B14(mapObj); } @@ -91,7 +91,7 @@ void MapObject_Move(MapObject *mapObj) static BOOL sub_02063478(const MapObject *mapObj) { - if (MapObject_IsMoving(mapObj) == 1) { + if (MapObject_IsMoving(mapObj) == TRUE) { return TRUE; } @@ -101,13 +101,13 @@ static BOOL sub_02063478(const MapObject *mapObj) return TRUE; } - u32 v0 = MapObject_GetStatus(mapObj); + u32 status = MapObject_GetStatus(mapObj); - if ((v0 & (1 << 12)) && ((v0 & (1 << 23)) == 0)) { + if (status & (1 << 12) && (status & (1 << 23)) == 0) { return FALSE; } - if ((v0 & (1 << 11)) && (sub_02062FDC(mapObj) == 0)) { + if (status & (1 << 11) && sub_02062FDC(mapObj) == 0) { return FALSE; } @@ -123,10 +123,8 @@ static void sub_020634DC(MapObject *mapObj) static void sub_020634F4(MapObject *mapObj) { - if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_11)) { - if (sub_02064390(mapObj) == 1) { - sub_02062D28(mapObj); - } + if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_11) && MapObject_SetTileBehaviors(mapObj) == 1) { + sub_02062D28(mapObj); } } @@ -163,135 +161,135 @@ static void MapObject_EndMove(MapObject *mapObj) static void sub_020635AC(MapObject *mapObj) { - sub_02064390(mapObj); + MapObject_SetTileBehaviors(mapObj); if (sub_02062DFC(mapObj) == 1) { - u8 v0 = sub_02062BE8(mapObj); - u8 v1 = sub_02062BF8(mapObj); + u8 currTileBehavior = MapObject_GetCurrTileBehavior(mapObj); + u8 prevTileBehavior = MapObject_GetPrevTileBehavior(mapObj); const UnkStruct_ov5_021ECD10 *v2 = ov5_021ECD04(mapObj); - sub_02063DDC(mapObj, v0, v1, v2); - sub_02063964(mapObj, v0, v1, v2); - sub_02063A30(mapObj, v0, v1, v2); - sub_02063A70(mapObj, v0, v1, v2); - sub_02063864(mapObj, v0, v1, v2); - sub_02063C00(mapObj, v0, v1, v2); - sub_02063C30(mapObj, v0, v1, v2); - sub_02063D30(mapObj, v0, v1, v2); + sub_02063DDC(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063964(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063A30(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063A70(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063864(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063C00(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063C30(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063D30(mapObj, currTileBehavior, prevTileBehavior, v2); } } static void sub_0206363C(MapObject *mapObj) { - sub_02064390(mapObj); + MapObject_SetTileBehaviors(mapObj); if (sub_02062DFC(mapObj) == 1) { - u8 v0 = sub_02062BE8(mapObj); - u8 v1 = sub_02062BF8(mapObj); + u8 currTileBehavior = MapObject_GetCurrTileBehavior(mapObj); + u8 prevTileBehavior = MapObject_GetPrevTileBehavior(mapObj); const UnkStruct_ov5_021ECD10 *v2 = ov5_021ECD04(mapObj); - sub_02063DDC(mapObj, v0, v1, v2); - sub_0206397C(mapObj, v0, v1, v2); - sub_02063994(mapObj, v0, v1, v2); - sub_02063A30(mapObj, v0, v1, v2); - sub_02063A78(mapObj, v0, v1, v2); - sub_02063C18(mapObj, v0, v1, v2); - sub_02063C48(mapObj, v0, v1, v2); - sub_02063C60(mapObj, v0, v1, v2); - sub_02063CC8(mapObj, v0, v1, v2); - sub_02063D30(mapObj, v0, v1, v2); + sub_02063DDC(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_0206397C(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063994(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063A30(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063A78(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063C18(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063C48(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063C60(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063CC8(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063D30(mapObj, currTileBehavior, prevTileBehavior, v2); - sub_02063E14(mapObj, v0, v1, v2); + sub_02063E14(mapObj, currTileBehavior, prevTileBehavior, v2); } } static void sub_020636F0(MapObject *mapObj) { - sub_02064390(mapObj); + MapObject_SetTileBehaviors(mapObj); if (sub_02062DFC(mapObj) == 1) { - u8 v0 = sub_02062BE8(mapObj); - u8 v1 = sub_02062BF8(mapObj); + u8 currTileBehavior = MapObject_GetCurrTileBehavior(mapObj); + u8 prevTileBehavior = MapObject_GetPrevTileBehavior(mapObj); const UnkStruct_ov5_021ECD10 *v2 = ov5_021ECD04(mapObj); - sub_02063DDC(mapObj, v0, v1, v2); - sub_02063A78(mapObj, v0, v1, v2); - sub_02063D30(mapObj, v0, v1, v2); - sub_02063A64(mapObj, v0, v1, v2); - sub_02063E14(mapObj, v0, v1, v2); + sub_02063DDC(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063A78(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063D30(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063A64(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063E14(mapObj, currTileBehavior, prevTileBehavior, v2); } } static void sub_0206375C(MapObject *mapObj) { - sub_02064390(mapObj); + MapObject_SetTileBehaviors(mapObj); if (sub_02062DFC(mapObj) == 1) { - u8 v0 = sub_02062BE8(mapObj); - u8 v1 = sub_02062BF8(mapObj); + u8 currTileBehavior = MapObject_GetCurrTileBehavior(mapObj); + u8 prevTileBehavior = MapObject_GetPrevTileBehavior(mapObj); const UnkStruct_ov5_021ECD10 *v2 = ov5_021ECD04(mapObj); - sub_02063864(mapObj, v0, v1, v2); - sub_02063C94(mapObj, v0, v1, v2); - sub_02063CFC(mapObj, v0, v1, v2); - sub_02063A30(mapObj, v0, v1, v2); - sub_02063DA8(mapObj, v0, v1, v2); - sub_02063B20(mapObj, v0, v1, v2); + sub_02063864(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063C94(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063CFC(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063A30(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063DA8(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063B20(mapObj, currTileBehavior, prevTileBehavior, v2); } } static void sub_020637D4(MapObject *mapObj) { - sub_02064390(mapObj); + MapObject_SetTileBehaviors(mapObj); if (sub_02062DFC(mapObj) == 1) { - u8 v0 = sub_02062BE8(mapObj); - u8 v1 = sub_02062BF8(mapObj); + u8 currTileBehavior = MapObject_GetCurrTileBehavior(mapObj); + u8 prevTileBehavior = MapObject_GetPrevTileBehavior(mapObj); const UnkStruct_ov5_021ECD10 *v2 = ov5_021ECD04(mapObj); - sub_02063864(mapObj, v0, v1, v2); - sub_02063C94(mapObj, v0, v1, v2); - sub_02063CFC(mapObj, v0, v1, v2); - sub_02063A30(mapObj, v0, v1, v2); - sub_02063DA8(mapObj, v0, v1, v2); - sub_02063B20(mapObj, v0, v1, v2); - sub_0206397C(mapObj, v0, v1, v2); - sub_02063BB4(mapObj, v0, v1, v2); + sub_02063864(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063C94(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063CFC(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063A30(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063DA8(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063B20(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_0206397C(mapObj, currTileBehavior, prevTileBehavior, v2); + sub_02063BB4(mapObj, currTileBehavior, prevTileBehavior, v2); } } -static void sub_02063864(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) +static void sub_02063864(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { if (sub_02062EFC(mapObj) == 0) { - if ((TileBehavior_IsDeepMud(param1) == 1) || (TileBehavior_IsDeepMudWithGrass(param1) == 1)) { + if (TileBehavior_IsDeepMud(currTileBehavior) == TRUE || TileBehavior_IsDeepMudWithGrass(currTileBehavior) == TRUE) { VecFx32 v0 = { 0, (FX32_ONE * -14), 0 }; sub_020630CC(mapObj, &v0); return; } - if ((TileBehavior_IsMud(param1) == 1) || (TileBehavior_IsMudWithGrass(param1) == 1)) { + if (TileBehavior_IsMud(currTileBehavior) == TRUE || TileBehavior_IsMudWithGrass(currTileBehavior) == TRUE) { VecFx32 v1 = { 0, (FX32_ONE * -12), 0 }; sub_020630CC(mapObj, &v1); return; } - if (TileBehavior_IsDeepestSnow(param1) == 1) { + if (TileBehavior_IsDeepestSnow(currTileBehavior) == TRUE) { VecFx32 v2 = { 0, (FX32_ONE * -16), 0 }; sub_020630CC(mapObj, &v2); return; } - if (TileBehavior_IsDeeperSnow(param1) == 1) { + if (TileBehavior_IsDeeperSnow(currTileBehavior) == TRUE) { VecFx32 v3 = { 0, (FX32_ONE * -14), 0 }; sub_020630CC(mapObj, &v3); return; } - if (TileBehavior_IsDeepSnow(param1) == 1) { + if (TileBehavior_IsDeepSnow(currTileBehavior) == TRUE) { VecFx32 v4 = { 0, (FX32_ONE * -12), 0 }; sub_020630CC(mapObj, &v4); @@ -303,27 +301,27 @@ static void sub_02063864(MapObject *mapObj, u8 param1, u8 param2, const UnkStruc sub_020630CC(mapObj, &v5); } -static void sub_02063964(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) +static void sub_02063964(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { - if (TileBehavior_IsTallGrass(param1) == 1) { + if (TileBehavior_IsTallGrass(currTileBehavior) == TRUE) { ov5_021F2EA4(mapObj, 0); } } -static void sub_0206397C(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) +static void sub_0206397C(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { - if (TileBehavior_IsTallGrass(param1) == 1) { + if (TileBehavior_IsTallGrass(currTileBehavior) == TRUE) { ov5_021F2EA4(mapObj, 1); } } -static void sub_02063994(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) +static void sub_02063994(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { if (param3->unk_04_6 == 0) { return; } - if (TileBehavior_IsSnowWithShadows(param2) == 1) { + if (TileBehavior_IsSnowWithShadows(prevTileBehavior) == TRUE) { if (param3->unk_04_6 == 1) { ov5_021F1EBC(mapObj); } else if (param3->unk_04_6 == 2) { @@ -331,7 +329,7 @@ static void sub_02063994(MapObject *mapObj, u8 param1, u8 param2, const UnkStruc } } - if (sub_020640A0(mapObj, param2) == 1) { + if (MapObject_IsOnSand(mapObj, prevTileBehavior) == TRUE) { if (param3->unk_04_6 == 1) { ov5_021F1E8C(mapObj); } else if (param3->unk_04_6 == 2) { @@ -340,20 +338,22 @@ static void sub_02063994(MapObject *mapObj, u8 param1, u8 param2, const UnkStruc return; } - if ((TileBehavior_IsDeeperSnow(param2) == 1) || (TileBehavior_IsDeepestSnow(param2) == 1) || TileBehavior_IsDeepSnow(param2)) { + if (TileBehavior_IsDeeperSnow(prevTileBehavior) == TRUE + || TileBehavior_IsDeepestSnow(prevTileBehavior) == TRUE + || TileBehavior_IsDeepSnow(prevTileBehavior)) { ov5_021F1EB0(mapObj); return; } - if (sub_02064108(mapObj, param2) == 1) { + if (MapObject_IsOnShallowSnow(mapObj, prevTileBehavior) == TRUE) { ov5_021F1EA4(mapObj); return; } } -static void sub_02063A30(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) +static void sub_02063A30(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { - if (TileBehavior_IsShallowWater(param1) == 1) { + if (TileBehavior_IsShallowWater(currTileBehavior) == TRUE) { if (sub_02062EC8(mapObj) == 0) { ov5_021F331C(mapObj, 1); sub_02062EAC(mapObj, 1); @@ -363,17 +363,17 @@ static void sub_02063A30(MapObject *mapObj, u8 param1, u8 param2, const UnkStruc } } -static void sub_02063A64(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) +static void sub_02063A64(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { sub_02062EAC(mapObj, 0); } -static void sub_02063A70(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) +static void sub_02063A70(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { - sub_02063A78(mapObj, param1, param2, param3); + sub_02063A78(mapObj, currTileBehavior, prevTileBehavior, param3); } -static void sub_02063A78(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) +static void sub_02063A78(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { const MapObjectManager *mapObjMan = MapObject_MapObjectManager(mapObj); @@ -385,7 +385,11 @@ static void sub_02063A78(MapObject *mapObj, u8 param1, u8 param2, const UnkStruc return; } - if ((TileBehavior_IsTallGrass(param1) == 1) || (TileBehavior_IsVeryTallGrass(param1) == 1) || (sub_0206406C(mapObj, param1) == 1) || (TileBehavior_IsPuddle(param1) == 1) || (TileBehavior_IsShallowWater(param1) == 1) || (MapObject_IsOnSnow(mapObj, param1) == 1) || (TileBehavior_IsMud(param1) == 1) || (TileBehavior_IsMudWithGrass(param1) == 1) || TileBehavior_IsReflective(param1)) { + if (TileBehavior_IsTallGrass(currTileBehavior) == TRUE || TileBehavior_IsVeryTallGrass(currTileBehavior) == TRUE + || MapObject_IsOnWater(mapObj, currTileBehavior) == TRUE || TileBehavior_IsPuddle(currTileBehavior) == TRUE + || TileBehavior_IsShallowWater(currTileBehavior) == TRUE || MapObject_IsOnSnow(mapObj, currTileBehavior) == TRUE + || TileBehavior_IsMud(currTileBehavior) == TRUE || TileBehavior_IsMudWithGrass(currTileBehavior) == TRUE + || TileBehavior_IsReflective(currTileBehavior)) { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_HIDE_SHADOW); } else { if (!MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_15)) { @@ -395,7 +399,7 @@ static void sub_02063A78(MapObject *mapObj, u8 param1, u8 param2, const UnkStruc } } -static void sub_02063B20(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) +static void sub_02063B20(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { const MapObjectManager *mapObjMan = MapObject_MapObjectManager(mapObj); @@ -407,105 +411,111 @@ static void sub_02063B20(MapObject *mapObj, u8 param1, u8 param2, const UnkStruc return; } - if ((TileBehavior_IsTallGrass(param1) == 1) || (TileBehavior_IsVeryTallGrass(param1) == 1) || (sub_0206406C(mapObj, param1) == 1) || (TileBehavior_IsPuddle(param1) == 1) || (TileBehavior_IsShallowWater(param1) == 1) || (MapObject_IsOnSnow(mapObj, param1) == 1) || (TileBehavior_IsMud(param1) == 1) || (TileBehavior_IsMudWithGrass(param1) == 1) || TileBehavior_IsReflective(param1)) { + if (TileBehavior_IsTallGrass(currTileBehavior) == TRUE || TileBehavior_IsVeryTallGrass(currTileBehavior) == TRUE + || MapObject_IsOnWater(mapObj, currTileBehavior) == TRUE || TileBehavior_IsPuddle(currTileBehavior) == TRUE + || TileBehavior_IsShallowWater(currTileBehavior) == TRUE || MapObject_IsOnSnow(mapObj, currTileBehavior) == TRUE + || TileBehavior_IsMud(currTileBehavior) == TRUE || TileBehavior_IsMudWithGrass(currTileBehavior) == TRUE + || TileBehavior_IsReflective(currTileBehavior)) { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_HIDE_SHADOW); } else { MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_HIDE_SHADOW); } } -static void sub_02063BB4(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) +static void sub_02063BB4(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { - if ((sub_0206406C(mapObj, param1) == 1) || (TileBehavior_IsShallowWater(param1) == 1) || (TileBehavior_IsIce(param1) == 1) || (TileBehavior_IsMud(param1) == 1) || (TileBehavior_IsMudWithGrass(param1) == 1) || (MapObject_IsOnSnow(mapObj, param1) == 1)) { + if (MapObject_IsOnWater(mapObj, currTileBehavior) == TRUE || TileBehavior_IsShallowWater(currTileBehavior) == TRUE + || TileBehavior_IsIce(currTileBehavior) == TRUE || TileBehavior_IsMud(currTileBehavior) == TRUE + || TileBehavior_IsMudWithGrass(currTileBehavior) == TRUE || MapObject_IsOnSnow(mapObj, currTileBehavior) == TRUE) { return; } ov5_021F3638(mapObj); } -static void sub_02063C00(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) +static void sub_02063C00(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { - if (TileBehavior_IsVeryTallGrass(param1) == 1) { + if (TileBehavior_IsVeryTallGrass(currTileBehavior) == TRUE) { ov5_021F3844(mapObj, 0); } } -static void sub_02063C18(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) +static void sub_02063C18(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { - if (TileBehavior_IsVeryTallGrass(param1) == 1) { + if (TileBehavior_IsVeryTallGrass(currTileBehavior) == TRUE) { ov5_021F3844(mapObj, 1); } } -static void sub_02063C30(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) +static void sub_02063C30(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { - if (TileBehavior_IsMudWithGrass(param1) == 1) { + if (TileBehavior_IsMudWithGrass(currTileBehavior) == TRUE) { ov5_021F3AEC(mapObj, 0); } } -static void sub_02063C48(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) +static void sub_02063C48(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { - if (TileBehavior_IsMudWithGrass(param1) == 1) { + if (TileBehavior_IsMudWithGrass(currTileBehavior) == TRUE) { ov5_021F3AEC(mapObj, 1); } } -static void sub_02063C60(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) +static void sub_02063C60(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { - if (TileBehavior_IsPuddle(param2) == 1) { + if (TileBehavior_IsPuddle(prevTileBehavior) == TRUE) { ov5_021F2AE4(mapObj, MapObject_GetXPrev(mapObj), MapObject_GetYPrev(mapObj), MapObject_GetZPrev(mapObj)); } } -static void sub_02063C94(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) +static void sub_02063C94(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { - if (TileBehavior_IsPuddle(param1) == 1) { + if (TileBehavior_IsPuddle(currTileBehavior) == TRUE) { ov5_021F2AE4(mapObj, MapObject_GetX(mapObj), MapObject_GetY(mapObj), MapObject_GetZ(mapObj)); } } -static void sub_02063CC8(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) +static void sub_02063CC8(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { - if (TileBehavior_IsMud(param2) == 1) { + if (TileBehavior_IsMud(prevTileBehavior) == TRUE) { ov5_021F2C38(mapObj, MapObject_GetXPrev(mapObj), MapObject_GetYPrev(mapObj), MapObject_GetZPrev(mapObj)); } } -static void sub_02063CFC(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) +static void sub_02063CFC(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { - if (TileBehavior_IsMud(param1) == 1) { + if (TileBehavior_IsMud(currTileBehavior) == TRUE) { ov5_021F2C38(mapObj, MapObject_GetX(mapObj), MapObject_GetY(mapObj), MapObject_GetZ(mapObj)); } } -static void sub_02063D30(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) +static void sub_02063D30(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { if (param3->unk_04_10 == 0) { return; } if (sub_02062F64(mapObj) == 0) { - u8 v0 = GetNullTileBehaviorID(); + u8 tileBehavior = GetNullTileBehaviorID(); - if (TileBehavior_HasReflectiveSurface(param1) == 1) { - v0 = param1; + if (TileBehavior_HasReflectiveSurface(currTileBehavior) == TRUE) { + tileBehavior = currTileBehavior; } else { - u8 v1 = sub_02064238(mapObj, 1); + u8 southTileBehavior = MapObject_GetTileBehaviorFromDir(mapObj, DIR_SOUTH); - if (TileBehavior_HasReflectiveSurface(v1) == 1) { - v0 = v1; + if (TileBehavior_HasReflectiveSurface(southTileBehavior) == TRUE) { + tileBehavior = southTileBehavior; } } - if (v0 != GetNullTileBehaviorID()) { + if (tileBehavior != GetNullTileBehaviorID()) { int v2; sub_02062F48(mapObj, 1); - if (TileBehavior_IsReflective(v0) == 1) { + if (TileBehavior_IsReflective(tileBehavior) == TRUE) { v2 = 2; - } else if (TileBehavior_IsPuddle(v0) == 1) { + } else if (TileBehavior_IsPuddle(tileBehavior) == TRUE) { v2 = 0; } else { v2 = 1; @@ -516,40 +526,36 @@ static void sub_02063D30(MapObject *mapObj, u8 param1, u8 param2, const UnkStruc } } -static void sub_02063DA8(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) +static void sub_02063DA8(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { - if ((param3->unk_04_10 == 0) || (sub_02062F64(mapObj) == 0)) { + if (param3->unk_04_10 == 0 || sub_02062F64(mapObj) == 0) { return; } - u8 v0 = sub_02064238(mapObj, 1); + u8 southTileBehavior = MapObject_GetTileBehaviorFromDir(mapObj, DIR_SOUTH); - if (TileBehavior_HasReflectiveSurface(v0) == 0) { + if (TileBehavior_HasReflectiveSurface(southTileBehavior) == FALSE) { sub_02062F48(mapObj, 0); } } -static void sub_02063DDC(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) +static void sub_02063DDC(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { - if (TileBehavior_IsBridgeStart(param1) == 1) { + if (TileBehavior_IsBridgeStart(currTileBehavior) == TRUE) { sub_02062F14(mapObj, 1); - } else if (sub_02062F30(mapObj) == 1) { - if (TileBehavior_IsBridge(param1) == 0) { - sub_02062F14(mapObj, 0); - } + } else if (sub_02062F30(mapObj) == 1 && TileBehavior_IsBridge(currTileBehavior) == FALSE) { + sub_02062F14(mapObj, 0); } } -static void sub_02063E14(MapObject *mapObj, u8 param1, u8 param2, const UnkStruct_ov5_021ECD10 *param3) +static void sub_02063E14(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { return; } u32 sub_02063E18(const MapObject *mapObj, const VecFx32 *param1, int param2, int param3, int param4, int param5) { - u32 v0; - - v0 = 0; + u32 v0 = 0; if (sub_02063FAC(mapObj, param2, param3, param4) == 1) { v0 |= (1 << 0); @@ -587,33 +593,29 @@ u32 sub_02063E94(const MapObject *mapObj, int param1, int param2, int param3, in u32 sub_02063EBC(const MapObject *mapObj, int param1) { - int x, y, z; - - x = MapObject_GetX(mapObj) + MapObject_GetDxFromDir(param1); - y = MapObject_GetY(mapObj); - z = MapObject_GetZ(mapObj) + MapObject_GetDyFromDir(param1); + int x = MapObject_GetX(mapObj) + MapObject_GetDxFromDir(param1); + int y = MapObject_GetY(mapObj); + int z = MapObject_GetZ(mapObj) + MapObject_GetDyFromDir(param1); return sub_02063E94(mapObj, x, y, z, param1); } int sub_02063F00(const MapObject *mapObj, int param1, int param2, int param3) { - int v0, v1, v2; - const MapObjectManager *mapObjMan; - const MapObject *v4; + int maxObjects, x, z; + const MapObjectManager *mapObjMan = MapObject_MapObjectManager(mapObj); + const MapObject *v4 = MapObjectMan_GetMapObjectConst(mapObjMan); - mapObjMan = MapObject_MapObjectManager(mapObj); - v4 = sub_02062868(mapObjMan); - v0 = MapObjectMan_GetMaxObjects(mapObjMan); + maxObjects = MapObjectMan_GetMaxObjects(mapObjMan); do { if (v4 != mapObj && MapObject_CheckStatus(v4, MAP_OBJ_STATUS_0) && !MapObject_CheckStatus(v4, MAP_OBJ_STATUS_18)) { - v1 = MapObject_GetX(v4); - v2 = MapObject_GetZ(v4); + x = MapObject_GetX(v4); + z = MapObject_GetZ(v4); - if ((v1 == param1) && (v2 == param3)) { + if ((x == param1) && (z == param3)) { int v5 = MapObject_GetY(v4); int v6 = v5 - param2; @@ -626,10 +628,10 @@ int sub_02063F00(const MapObject *mapObj, int param1, int param2, int param3) } } - v1 = MapObject_GetXPrev(v4); - v2 = MapObject_GetZPrev(v4); + x = MapObject_GetXPrev(v4); + z = MapObject_GetZPrev(v4); - if ((v1 == param1) && (v2 == param3)) { + if (x == param1 && z == param3) { int v7 = MapObject_GetY(v4); int v8 = v7 - param2; @@ -644,8 +646,8 @@ int sub_02063F00(const MapObject *mapObj, int param1, int param2, int param3) } sub_02062880(&v4); - v0--; - } while (v0); + maxObjects--; + } while (maxObjects); return 0; } @@ -661,7 +663,7 @@ int sub_02063FAC(const MapObject *mapObj, int param1, int param2, int param3) v2 = v0 - v1; v3 = v0 + v1; - if ((v2 > param1) || (v3 < param1)) { + if (v2 > param1 || v3 < param1) { return 1; } } @@ -673,7 +675,7 @@ int sub_02063FAC(const MapObject *mapObj, int param1, int param2, int param3) v2 = v0 - v1; v3 = v0 + v1; - if ((v2 > param3) || (v3 < param3)) { + if (v2 > param3 || v3 < param3) { return 1; } } @@ -685,14 +687,14 @@ int sub_02064004(const MapObject *mapObj, int param1, int param2, int param3) { if (sub_02062FDC(mapObj) == 0) { FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); - u8 v1 = sub_02062BE8(mapObj); + u8 v1 = MapObject_GetCurrTileBehavior(mapObj); u8 v2 = FieldSystem_GetTileBehavior(fieldSystem, param1, param2); if (v2 == GetNullTileBehaviorID()) { return 1; } - if ((Unk_020EE76C[param3](v1) == 1) || (Unk_020EE77C[param3](v2) == 1)) { + if (Unk_020EE76C[param3](v1) == 1 || Unk_020EE77C[param3](v2) == 1) { return 1; } } @@ -714,89 +716,83 @@ static BOOL (*const Unk_020EE77C[4])(u8) = { TileBehavior_BlocksMovementWestward }; -int sub_0206406C(MapObject *mapObj, u32 param1) +int MapObject_IsOnWater(MapObject *mapObj, u32 param1) { if (TileBehavior_IsBridgeOverWater(param1)) { - if (sub_02062F30(mapObj) == 0) { - return 1; + if (sub_02062F30(mapObj) == FALSE) { + return TRUE; } } else if (TileBehavior_IsSurfable(param1)) { - return 1; + return TRUE; } - return 0; + return FALSE; } -int sub_020640A0(MapObject *mapObj, u32 param1) +int MapObject_IsOnSand(MapObject *mapObj, u32 param1) { if (TileBehavior_IsBridgeOverSand(param1)) { - if (sub_02062F30(mapObj) == 0) { - return 1; + if (sub_02062F30(mapObj) == FALSE) { + return TRUE; } } else if (TileBehavior_IsSand(param1)) { - return 1; + return TRUE; } - return 0; + return FALSE; } int MapObject_IsOnSnow(MapObject *mapObj, u32 param1) { if (TileBehavior_IsBridgeOverSnow(param1)) { - if (sub_02062F30(mapObj) == 0) { - return 1; + if (sub_02062F30(mapObj) == FALSE) { + return TRUE; } } else if (TileBehavior_IsSnow(param1)) { - return 1; + return TRUE; } - return 0; + return FALSE; } -int sub_02064108(MapObject *mapObj, u32 param1) +int MapObject_IsOnShallowSnow(MapObject *mapObj, u32 param1) { if (TileBehavior_IsBridgeOverSnow(param1)) { - if (sub_02062F30(mapObj) == 0) { - return 1; + if (sub_02062F30(mapObj) == FALSE) { + return TRUE; } } else if (TileBehavior_IsShallowSnow(param1)) { - return 1; + return TRUE; } - return 0; + return FALSE; } int sub_0206413C(MapObject *mapObj, u32 param1) { - if (sub_02062F30(mapObj) == 1) { - if (TileBehavior_IsBridge(param1) == 1) { - return 1; - } + if (sub_02062F30(mapObj) == TRUE && TileBehavior_IsBridge(param1) == TRUE) { + return TRUE; } - return 0; + return FALSE; } int sub_0206415C(MapObject *mapObj, u32 param1) { - if (sub_02062F30(mapObj) == 1) { - if (TileBehavior_IsBikeBridgeNorthSouth(param1) == 1) { - return 1; - } + if (sub_02062F30(mapObj) == TRUE && TileBehavior_IsBikeBridgeNorthSouth(param1) == TRUE) { + return TRUE; } - return 0; + return FALSE; } int sub_0206417C(MapObject *mapObj, u32 param1) { - if (sub_02062F30(mapObj) == 1) { - if (TileBehavior_IsBikeBridgeEastWest(param1) == 1) { - return 1; - } + if (sub_02062F30(mapObj) == TRUE && TileBehavior_IsBikeBridgeEastWest(param1) == TRUE) { + return TRUE; } - return 0; + return FALSE; } static const int sMapObjectDxDir[] = { @@ -848,7 +844,7 @@ void MapObject_UpdateCoords(MapObject *mapObj) MapObject_SetZPrev(mapObj, MapObject_GetZ(mapObj)); } -u32 sub_02064238(MapObject *mapObj, int param1) +u32 MapObject_GetTileBehaviorFromDir(MapObject *mapObj, int param1) { int v0 = MapObject_GetX(mapObj) + MapObject_GetDxFromDir(param1); int v1 = MapObject_GetZ(mapObj) + MapObject_GetDyFromDir(param1); @@ -924,26 +920,26 @@ int sub_020642F8(MapObject *mapObj) return v4; } -int sub_02064390(MapObject *mapObj) +int MapObject_SetTileBehaviors(MapObject *mapObj) { - u8 v0 = GetNullTileBehaviorID(); - u8 v1 = v0; + u8 prevTileBehavior = GetNullTileBehaviorID(); + u8 currTileBehavior = prevTileBehavior; if (sub_02062FDC(mapObj) == 0) { - int v2 = MapObject_GetXPrev(mapObj); + int x = MapObject_GetXPrev(mapObj); int z = MapObject_GetZPrev(mapObj); FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); - v0 = FieldSystem_GetTileBehavior(fieldSystem, v2, z); - v2 = MapObject_GetX(mapObj); + prevTileBehavior = FieldSystem_GetTileBehavior(fieldSystem, x, z); + x = MapObject_GetX(mapObj); z = MapObject_GetZ(mapObj); - v1 = FieldSystem_GetTileBehavior(fieldSystem, v2, z); + currTileBehavior = FieldSystem_GetTileBehavior(fieldSystem, x, z); } - sub_02062BF0(mapObj, v0); - sub_02062BE0(mapObj, v1); + MapObject_SetPrevTileBehavior(mapObj, prevTileBehavior); + MapObject_SetCurrTileBehavior(mapObj, currTileBehavior); - if (TileBehavior_IsNull(v1) == 1) { + if (TileBehavior_IsNull(currTileBehavior) == TRUE) { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_11); return 0; } @@ -980,12 +976,12 @@ void sub_02064464(MapObject *mapObj) { int v0 = MapObject_GetMovementType(mapObj); - if ((v0 == 0x33) || (v0 == 0x34) || (v0 == 0x35) || (v0 == 0x36)) { + if (v0 == 0x33 || v0 == 0x34 || v0 == 0x35 || v0 == 0x36) { sub_02062B14(mapObj); } } -static const int Unk_020EE79C[] = { +static const int sOppositeDirections[] = { DIR_SOUTH, DIR_NORTH, DIR_EAST, @@ -994,7 +990,7 @@ static const int Unk_020EE79C[] = { int Direction_GetOpposite(int dir) { - return Unk_020EE79C[dir]; + return sOppositeDirections[dir]; } int sub_02064488(int param0, int param1, int param2, int param3) @@ -1040,7 +1036,7 @@ int sub_020644D0(FieldSystem *fieldSystem, VecFx32 *param1, int param2) return 0; } - if ((v1 == 2) && (param2 == 0)) { + if (v1 == 2 && param2 == 0) { return 0; } diff --git a/src/overlay005/ov5_021DFB54.c b/src/overlay005/ov5_021DFB54.c index 5e354c6b73..5adc0372d4 100644 --- a/src/overlay005/ov5_021DFB54.c +++ b/src/overlay005/ov5_021DFB54.c @@ -824,7 +824,7 @@ static int ov5_021E04EC(FieldSystem *fieldSystem, PlayerAvatar *playerAvatar, in { MapObject *v0 = Player_MapObject(playerAvatar); - u8 v1 = sub_02062BE8(v0); + u8 v1 = MapObject_GetCurrTileBehavior(v0); if ((TileBehavior_IsDeepMud(v1) != 1) && (TileBehavior_IsDeepMudWithGrass(v1) != 1)) { return 0; @@ -883,7 +883,7 @@ static BOOL ov5_021E0560(FieldTask *param0) v0->unk_04++; { - u8 v7 = sub_02062BE8(v1); + u8 v7 = MapObject_GetCurrTileBehavior(v1); if (TileBehavior_IsDeepMudWithGrass(v7) == 1) { FieldSystem *fieldSystem = FieldTask_GetFieldSystem(param0); @@ -1090,7 +1090,7 @@ static int ov5_021E08C0(UnkStruct_ov5_021F9B54 *param0) { int v0 = MapObject_GetMovingDir(param0->unk_14); - u8 v1 = sub_02064238(param0->unk_14, v0); + u8 v1 = MapObject_GetTileBehaviorFromDir(param0->unk_14, v0); if (ov5_021E0760(v1, v0) == 1) { param0->unk_00 = 5; diff --git a/src/overlay005/ov5_021E1154.c b/src/overlay005/ov5_021E1154.c index b40e055f9e..ed66677bbd 100644 --- a/src/overlay005/ov5_021E1154.c +++ b/src/overlay005/ov5_021E1154.c @@ -34,7 +34,7 @@ static void ov5_021E1350(void *param0); int ov5_021E1154(FieldSystem *fieldSystem, PlayerAvatar *playerAvatar, int param2) { MapObject *v0 = Player_MapObject(playerAvatar); - u8 v1 = sub_02062BE8(v0); + u8 v1 = MapObject_GetCurrTileBehavior(v0); int v2; if (TileBehavior_IsSlideEastward(v1) == 1) { @@ -85,7 +85,7 @@ static BOOL ov5_021E120C(FieldTask *param0) { UnkStruct_ov5_021E11B0 *v0 = FieldTask_GetEnv(param0); MapObject *v1 = Player_MapObject(v0->playerAvatar); - u8 v2 = sub_02062BE8(v1); + u8 v2 = MapObject_GetCurrTileBehavior(v1); switch (v0->unk_08) { case 0: diff --git a/src/overlay005/ov5_021ECC20.c b/src/overlay005/ov5_021ECC20.c index af65cb9407..595aeae4d4 100644 --- a/src/overlay005/ov5_021ECC20.c +++ b/src/overlay005/ov5_021ECC20.c @@ -52,7 +52,7 @@ void ov5_021ECC78(MapObjectManager *param0) static void ov5_021ECCA4(MapObjectManager *param0) { NARC *v0 = NARC_ctor(NARC_INDEX_DATA__MMODEL__MMODEL, 4); - sub_0206289C(param0, v0); + MapObjectMan_GetNARC(param0, v0); } static void ov5_021ECCBC(MapObjectManager *param0) diff --git a/src/overlay005/ov5_021ECE40.c b/src/overlay005/ov5_021ECE40.c index 202bd482df..4c641cfd31 100644 --- a/src/overlay005/ov5_021ECE40.c +++ b/src/overlay005/ov5_021ECE40.c @@ -471,7 +471,7 @@ static int ov5_021ED1C8(const MapObjectManager *param0, const MapObject *param1, const MapObject *v2; v0 = MapObjectMan_GetMaxObjects(param0); - v2 = sub_02062868(param0); + v2 = MapObjectMan_GetMapObjectConst(param0); do { if (v2 != param1) { @@ -2034,7 +2034,7 @@ static UnkStruct_020216E0 *ov5_021EE454(MapObject *param0, int param1, UnkFuncPt VecFx32 v12; int v13; int v14 = sub_02062758(param0, 2); - u8 v15 = sub_02064238(param0, 1); + u8 v15 = MapObject_GetTileBehaviorFromDir(param0, 1); if (TileBehavior_IsReflective(v15) == 1) { v13 = 2; diff --git a/src/overlay005/ov5_021F61BC.c b/src/overlay005/ov5_021F61BC.c index dc6f55e21b..58a91a9d88 100644 --- a/src/overlay005/ov5_021F61BC.c +++ b/src/overlay005/ov5_021F61BC.c @@ -140,7 +140,7 @@ static void ov5_021F62A0(UnkStruct_ov101_021D5D90 *param0, void *param1) v0 = v1->unk_04; - v1->unk_08 = sub_02062BE8(v3); + v1->unk_08 = MapObject_GetCurrTileBehavior(v3); v1->unk_04 = ov5_021F6414(v1->unk_08); v1->unk_00 = 0; diff --git a/src/unk_0205F180.c b/src/unk_0205F180.c index eb3e9d2159..dfe2123d9c 100644 --- a/src/unk_0205F180.c +++ b/src/unk_0205F180.c @@ -261,7 +261,7 @@ static void PlayerAvatar_PlayWalkSE(PlayerAvatar *playerAvatar) { if (PlayerAvatar_MoveState(playerAvatar) == 1) { MapObject *mapObj = Player_MapObject(playerAvatar); - u8 v1, v2 = sub_02062BE8(mapObj); + u8 v1, v2 = MapObject_GetCurrTileBehavior(mapObj); { int animationCode = MapObject_GetMovementAction(mapObj); @@ -270,7 +270,7 @@ static void PlayerAvatar_PlayWalkSE(PlayerAvatar *playerAvatar) if (v4 == -1) { v1 = v2; } else { - v1 = sub_02064238(mapObj, v4); + v1 = MapObject_GetTileBehaviorFromDir(mapObj, v4); } } @@ -449,7 +449,7 @@ static int sub_0205F62C(PlayerAvatar *playerAvatar, int param1) static u32 sub_0205F644(PlayerAvatar *playerAvatar, int param1) { int v0 = 0; - u32 v1 = sub_02062BE8(Player_MapObject(playerAvatar)); + u32 v1 = MapObject_GetCurrTileBehavior(Player_MapObject(playerAvatar)); if (PlayerAvatar_IsUnderCyclingRoad(playerAvatar, v1, param1) == 1) { return 5; @@ -946,7 +946,7 @@ static void sub_0205FDC8(PlayerAvatar *playerAvatar, MapObject *param1, int para } } - v1 = sub_0205FC88(param1, sub_02062BE8(param1), v1); + v1 = sub_0205FC88(param1, MapObject_GetCurrTileBehavior(param1), v1); sub_020615C8(playerAvatar); sub_0205F048(playerAvatar); @@ -955,7 +955,7 @@ static void sub_0205FDC8(PlayerAvatar *playerAvatar, MapObject *param1, int para if ((v0 == 0) || (v0 == (1 << 5))) { v2 = 5; v1 = 0x10; - v1 = sub_0205FCBC(param1, sub_02062BE8(param1), v1); + v1 = sub_0205FCBC(param1, MapObject_GetCurrTileBehavior(param1), v1); sub_020615C8(playerAvatar); sub_0205F048(playerAvatar); @@ -1170,7 +1170,7 @@ static void PlayerAvatar_TryCyclingGearChange(PlayerAvatar *playerAvatar, u16 pa } if (pad & PAD_BUTTON_B) { - u32 v0 = sub_02062BE8(Player_MapObject(playerAvatar)); + u32 v0 = MapObject_GetCurrTileBehavior(Player_MapObject(playerAvatar)); if (TileBehavior_IsBikeRampEastward(v0) || TileBehavior_IsBikeRampWestward(v0)) { return; @@ -1916,7 +1916,7 @@ static int sub_02060F4C(PlayerAvatar *playerAvatar, MapObject *mapObj, int param int v2 = MapObject_GetZ(mapObj) + MapObject_GetDyFromDir(param2); u8 v3 = FieldSystem_GetTileBehavior(fieldSystem, v1, v2); - if (sub_0206406C(mapObj, v3)) { + if (MapObject_IsOnWater(mapObj, v3)) { return 1; } } @@ -1966,7 +1966,7 @@ static int sub_02061058(PlayerAvatar *playerAvatar, MapObject *mapObj, int param int v2 = MapObject_GetZ(mapObj) + MapObject_GetDyFromDir(param2); u8 v3 = FieldSystem_GetTileBehavior(fieldSystem, v1, v2); - if (sub_0206406C(mapObj, v3)) { + if (MapObject_IsOnWater(mapObj, v3)) { return 1; } @@ -2337,7 +2337,7 @@ void PlayerAvatar_SetAnimationCode(PlayerAvatar *playerAvatar, u32 param1, int p u32 sub_0206156C(PlayerAvatar *playerAvatar, int param1) { MapObject *v0 = Player_MapObject(playerAvatar); - return sub_02064238(v0, param1); + return MapObject_GetTileBehaviorFromDir(v0, param1); } void sub_0206157C(PlayerAvatar *playerAvatar, int param1, int *param2, int *param3) @@ -2364,7 +2364,7 @@ static void sub_020615C8(PlayerAvatar *playerAvatar) static int sub_020615E0(PlayerAvatar *playerAvatar, MapObject *mapObj, int param2) { if (param2 != -1) { - u8 v0 = sub_02062BE8(mapObj); + u8 v0 = MapObject_GetCurrTileBehavior(mapObj); if (sub_0206415C(mapObj, v0) == 1) { if ((param2 == 0) || (param2 == 1)) { diff --git a/src/unk_02069BE0.c b/src/unk_02069BE0.c index 2abb7bafed..39040389df 100644 --- a/src/unk_02069BE0.c +++ b/src/unk_02069BE0.c @@ -642,7 +642,7 @@ static int sub_0206A324(MapObject *mapObj, UnkStruct_0206A23C *param1) static u32 sub_0206A354(MapObject *mapObj, int param1) { - u32 v0 = sub_02064238(mapObj, param1); + u32 v0 = MapObject_GetTileBehaviorFromDir(mapObj, param1); if (TileBehavior_IsVeryTallGrass(v0) == 0) { v0 = (1 << 1); From 0fa801b6702742ba30d9745ae23ce993a1ea1caa Mon Sep 17 00:00:00 2001 From: Viperio19 Date: Sun, 29 Dec 2024 16:37:02 +0100 Subject: [PATCH 2/7] More documentation centered around `map_object.c` and `map_object_move.c` --- include/constants/map_object.h | 6 +- include/map_object.h | 32 +- include/map_object_move.h | 6 +- include/struct_defs/struct_02061D3C.h | 36 +-- src/comm_player_manager.c | 8 +- src/map_object.c | 424 +++++++++++++------------- src/map_object_move.c | 262 ++++++++-------- src/overlay005/fieldmap.c | 2 +- src/overlay005/ov5_021DFB54.c | 12 +- src/overlay005/ov5_021E135C.c | 2 +- src/overlay005/ov5_021ECC20.c | 8 +- src/overlay005/ov5_021F08CC.c | 2 +- src/overlay005/ov5_021F134C.c | 2 +- src/overlay005/ov5_021F17B8.c | 2 +- src/overlay005/ov5_021F47B0.c | 2 +- src/overlay005/ov5_021F61BC.c | 2 +- src/overlay005/vs_seeker.c | 4 +- src/overlay006/ov6_02243258.c | 2 +- src/overlay008/ov8_02249960.c | 12 +- src/overlay009/ov9_02249960.c | 6 +- src/overlay023/ov23_0224340C.c | 4 +- src/overlay023/ov23_0224A1D0.c | 2 +- src/overlay023/ov23_0224B05C.c | 4 +- src/scrcmd.c | 30 +- src/unk_02054D00.c | 12 +- src/unk_02055C50.c | 4 +- src/unk_0205CA94.c | 2 +- src/unk_0205F180.c | 20 +- src/unk_0206450C.c | 4 +- src/unk_020655F4.c | 26 +- src/unk_02067A84.c | 6 +- src/unk_020683F4.c | 4 +- src/unk_02069BE0.c | 14 +- 33 files changed, 481 insertions(+), 483 deletions(-) diff --git a/include/constants/map_object.h b/include/constants/map_object.h index f3bcc40803..e2a1035b35 100644 --- a/include/constants/map_object.h +++ b/include/constants/map_object.h @@ -24,9 +24,9 @@ #define MAP_OBJ_STATUS_12 (1 << 12) #define MAP_OBJ_STATUS_13 (1 << 13) #define MAP_OBJ_STATUS_14 (1 << 14) -#define MAP_OBJ_STATUS_15 (1 << 15) -#define MAP_OBJ_STATUS_16 (1 << 16) -#define MAP_OBJ_STATUS_17 (1 << 17) +#define MAP_OBJ_STATUS_SHOW_SHADOW (1 << 15) +#define MAP_OBJ_STATUS_START_JUMP (1 << 16) +#define MAP_OBJ_STATUS_END_JUMP (1 << 17) #define MAP_OBJ_STATUS_18 (1 << 18) #define MAP_OBJ_STATUS_19 (1 << 19) #define MAP_OBJ_STATUS_HIDE_SHADOW (1 << 20) diff --git a/include/map_object.h b/include/map_object.h index 31c3853a93..213f32a559 100644 --- a/include/map_object.h +++ b/include/map_object.h @@ -29,7 +29,7 @@ void MapObjectMan_Delete(MapObjectManager *mapObjMan); void sub_0206184C(MapObjectManager *mapObjMan, int param1, int param2, int param3, const ObjectEvent *objectEvent); MapObject *MapObjectMan_AddMapObjectFromHeader(const MapObjectManager *mapObjMan, const ObjectEvent *objectEvent, int param2); MapObject *MapObjectMan_AddMapObject(const MapObjectManager *mapObjMan, int param1, int param2, int param3, int param4, int param5, int param6); -MapObject *sub_02061A74(const MapObjectManager *mapObjMan, int param1, int param2, int param3, const ObjectEvent *objectEvent); +MapObject *sub_02061A74(const MapObjectManager *mapObjMan, int param1, int objEventCount, int param3, const ObjectEvent *objectEvent); void sub_02061AB4(MapObject *mapObj, int param1); void sub_02061AD4(MapObject *mapObj, int param1); void MapObject_Delete(MapObject *mapObj); @@ -41,18 +41,18 @@ void sub_02061C48(MapObjectManager *mapObjMan); void MapObjectMan_SaveAll(FieldSystem *fieldSystem, const MapObjectManager *mapObjMan, MapObjectSave *mapObjSave, int param3); void MapObjectMan_LoadAllObjects(const MapObjectManager *mapObjMan, MapObjectSave *mapObjSave, int param2); void sub_02062068(const MapObjectManager *mapObjMan, int param1, int param2, const ObjectEvent *objectEvent); -MapObject *MapObjMan_LocalMapObjByIndex(const MapObjectManager *mapObjMan, int param1); -MapObject *sub_02062570(const MapObjectManager *mapObjMan, int param1); +MapObject *MapObjMan_LocalMapObjByIndex(const MapObjectManager *mapObjMan, int index); +MapObject *sub_02062570(const MapObjectManager *mapObjMan, int movementType); int sub_020625B0(const MapObjectManager *mapObjMan, MapObject **mapObj, int *param2, u32 param3); -int sub_020626B4(const MapObject *mapObj); +int MapObject_HasNoScript(const MapObject *mapObj); int sub_02062758(const MapObject *mapObj, int param1); int sub_02062764(const MapObject *mapObj, int param1, int param2); int sub_020627B4(const MapObject *mapObj, int param1, int param2, int param3); -void MapObjectMan_SetMaxObjects(MapObjectManager *mapObjMan, int param1); +void MapObjectMan_SetMaxObjects(MapObjectManager *mapObjMan, int maxObjs); int MapObjectMan_GetMaxObjects(const MapObjectManager *mapObjMan); -void sub_02062838(MapObjectManager *mapObjMan, u32 param1); -void sub_02062840(MapObjectManager *mapObjMan, u32 param1); -u32 sub_0206284C(const MapObjectManager *mapObjMan, u32 param1); +void MapObjectMan_SetStatusFlagOn(MapObjectManager *mapObjMan, u32 flag); +void MapObjectMan_SetStatusFlagOff(MapObjectManager *mapObjMan, u32 flag); +u32 MapObjectMan_CheckStatus(const MapObjectManager *mapObjMan, u32 flag); void sub_02062854(MapObjectManager *mapObjMan, int param1); int sub_02062858(const MapObjectManager *mapObjMan); UnkStruct_ov5_021ED0A4 *sub_0206285C(const MapObjectManager *mapObjMan); @@ -154,24 +154,24 @@ void sub_02062C3C(MapObjectManager *mapObjMan); void MapObjectMan_PauseAllMovement(MapObjectManager *mapObjMan); void MapObjectMan_UnpauseAllMovement(MapObjectManager *mapObjMan); int MapObjectMan_IsDrawInitialized(const MapObjectManager *mapObjMan); -u32 sub_02062CBC(const MapObject *mapObj, u32 param1); -void sub_02062CCC(MapObjectManager *mapObjMan, int param1); +u32 MapObject_CheckManagerStatus(const MapObject *mapObj, u32 param1); +void MapObjectMan_SetEndMovement(MapObjectManager *mapObjMan, int param1); int sub_02062CE4(const MapObjectManager *mapObjMan); int sub_02062CF8(const MapObject *mapObj); void sub_02062D04(MapObject *mapObj); void sub_02062D10(MapObject *mapObj); int MapObject_IsMoving(const MapObject *mapObj); -void sub_02062D28(MapObject *mapObj); -void sub_02062D34(MapObject *mapObj); +void MapObject_SetStartMovement(MapObject *mapObj); +void MapObject_SetEndMovementOff(MapObject *mapObj); void sub_02062D40(MapObject *mapObj); int sub_02062D4C(const MapObject *mapObj); -int sub_02062D58(const MapObject *mapObj); -void MapObject_SetHidden(MapObject *mapObj, int param1); +int MapObject_IsHidden(const MapObject *mapObj); +void MapObject_SetHidden(MapObject *mapObj, int hidden); void sub_02062D80(MapObject *mapObj, int param1); int sub_02062D9C(MapObject *mapObj); void sub_02062DB4(MapObject *mapObj, int param1); -void sub_02062DD0(MapObject *mapObj); -void sub_02062DDC(MapObject *mapObj); +void MapObject_SetPauseMovementOn(MapObject *mapObj); +void MapObject_SetPauseMovementOff(MapObject *mapObj); int MapObject_IsMovementPaused(const MapObject *mapObj); int sub_02062DFC(const MapObject *mapObj); void sub_02062E28(MapObject *mapObj, int param1); diff --git a/include/map_object_move.h b/include/map_object_move.h index feba7525b5..21cde8b622 100644 --- a/include/map_object_move.h +++ b/include/map_object_move.h @@ -13,7 +13,7 @@ u32 sub_02063E18(const MapObject *mapObj, const VecFx32 *param1, int param2, int u32 sub_02063E94(const MapObject *mapObj, int param1, int param2, int param3, int param4); u32 sub_02063EBC(const MapObject *mapObj, int param1); int sub_02063F00(const MapObject *mapObj, int param1, int param2, int param3); -int sub_02063FAC(const MapObject *mapObj, int param1, int param2, int param3); +int MapObject_IsOutOfRange(const MapObject *mapObj, int x, int y, int z); int sub_02064004(const MapObject *mapObj, int param1, int param2, int param3); int MapObject_IsOnWater(MapObject *mapObj, u32 param1); int MapObject_IsOnSand(MapObject *mapObj, u32 param1); @@ -23,7 +23,7 @@ int sub_0206413C(MapObject *mapObj, u32 param1); int sub_0206415C(MapObject *mapObj, u32 param1); int sub_0206417C(MapObject *mapObj, u32 param1); int MapObject_GetDxFromDir(int param0); -int MapObject_GetDyFromDir(int param0); +int MapObject_GetDzFromDir(int param0); void MapObject_StepDir(MapObject *mapObj, int dir); void MapObject_UpdateCoords(MapObject *mapObj); u32 MapObject_GetTileBehaviorFromDir(MapObject *mapObj, int param1); @@ -35,7 +35,7 @@ void VecFx32_StepDirection(int param0, VecFx32 *param1, fx32 param2); void sub_02064450(int param0, int param1, VecFx32 *param2); void sub_02064464(MapObject *mapObj); int Direction_GetOpposite(int param0); -int sub_02064488(int param0, int param1, int param2, int param3); +int sub_02064488(int x, int z, int xPrev, int zPrev); int sub_020644A4(FieldSystem *fieldSystem, VecFx32 *param1); int sub_020644D0(FieldSystem *fieldSystem, VecFx32 *param1, int param2); diff --git a/include/struct_defs/struct_02061D3C.h b/include/struct_defs/struct_02061D3C.h index 1fdfa949ad..a3e74ca9c0 100644 --- a/include/struct_defs/struct_02061D3C.h +++ b/include/struct_defs/struct_02061D3C.h @@ -2,30 +2,30 @@ #define POKEPLATINUM_STRUCT_02061D3C_H typedef struct UnkStruct_02061D3C_t { - u32 unk_00; + u32 status; u32 unk_04; - u8 unk_08; - u8 unk_09; - s8 unk_0A; - s8 unk_0B; - s8 unk_0C; - s8 unk_0D; - s8 unk_0E; + u8 localID; + u8 movementType; + s8 movementRangeX; + s8 movementRangeZ; + s8 initialDir; + s8 facingDir; + s8 movingDir; u8 padding_0F; u16 unk_10; - u16 unk_12; - u16 unk_14; - u16 unk_16; - u16 unk_18; + u16 graphicsID; + u16 trainerType; + u16 flag; + u16 script; s16 unk_1A; s16 unk_1C; s16 unk_1E; - s16 unk_20; - s16 unk_22; - s16 unk_24; - s16 unk_26; - s16 unk_28; - s16 unk_2A; + s16 xInitial; + s16 yInitial; + s16 zInitial; + s16 x; + s16 y; + s16 z; fx32 unk_2C; u8 unk_30[16]; u8 unk_40[16]; diff --git a/src/comm_player_manager.c b/src/comm_player_manager.c index 7fa3884742..d8dc53893d 100644 --- a/src/comm_player_manager.c +++ b/src/comm_player_manager.c @@ -1129,7 +1129,7 @@ static BOOL CommPlayer_MoveBlow(int netId, int param1) x = CommPlayer_GetXServer(netId); z = CommPlayer_GetZServer(netId); x += MapObject_GetDxFromDir(sCommPlayerManager->unk_112[netId]); - z += MapObject_GetDyFromDir(sCommPlayerManager->unk_112[netId]); + z += MapObject_GetDzFromDir(sCommPlayerManager->unk_112[netId]); if (sCommPlayerManager->unk_10A[netId] != 0) { if (CommPlayer_CheckCollision(x, z, netId)) { @@ -1318,7 +1318,7 @@ int sub_02058DC0(int netId) return 0xffff; } - return sCommPlayerManager->playerLocation[netId].z + MapObject_GetDyFromDir(sCommPlayerManager->playerLocation[netId].dir); + return sCommPlayerManager->playerLocation[netId].z + MapObject_GetDzFromDir(sCommPlayerManager->playerLocation[netId].dir); } int CommPlayer_GetXServer(int netId) @@ -1380,7 +1380,7 @@ int CommPlayer_AddZServer(int netId) return 0xffff; } - return sCommPlayerManager->playerLocationServer[netId].z + MapObject_GetDyFromDir(sCommPlayerManager->playerLocationServer[netId].dir); + return sCommPlayerManager->playerLocationServer[netId].z + MapObject_GetDzFromDir(sCommPlayerManager->playerLocationServer[netId].dir); } int CommPlayer_Dir(int netId) @@ -1591,7 +1591,7 @@ BOOL sub_0205928C(void) dir = CommPlayer_GetOppositeDir(playerLocation->dir); playerLocation->x += MapObject_GetDxFromDir(dir); - playerLocation->z += MapObject_GetDyFromDir(dir); + playerLocation->z += MapObject_GetDzFromDir(dir); playerLocation->moveSpeed = 2; sCommPlayerManager->movementChanged[netId] = 1; diff --git a/src/map_object.c b/src/map_object.c index c1746f6703..65c9631c47 100644 --- a/src/map_object.c +++ b/src/map_object.c @@ -36,7 +36,7 @@ #include "unk_020EDBAC.h" typedef struct MapObjectMan { - u32 unk_00; + u32 status; int maxObjects; int objectCnt; int unk_0C; @@ -124,17 +124,17 @@ static void sub_0206234C(MapObject *mapObj, const MapObjectManager *mapObjMan); static void sub_0206239C(MapObject *mapObj); static void sub_020623D4(MapObject *mapObj); static void sub_0206243C(MapObject *mapObj); -static int sub_0206244C(const MapObject *mapObj, int param1, int param2, const ObjectEvent *objectEvent); -static MapObject *sub_020624CC(const MapObjectManager *mapObjMan, int param1, int param2); +static int sub_0206244C(const MapObject *mapObj, int param1, int objEventCount, const ObjectEvent *objectEvent); +static MapObject *sub_020624CC(const MapObjectManager *mapObjMan, int localID, int flag); static void sub_02062604(MapObject *mapObj); static void sub_02062618(MapObject *mapObj); static void sub_02062628(MapObject *mapObj); -static int sub_0206262C(FieldSystem *fieldSystem, int param1); +static int FieldSystem_GetGraphicsID(FieldSystem *fieldSystem, int param1); static void sub_02062648(MapObject *mapObj); static void sub_02062660(MapObject *mapObj); static void sub_02062670(MapObject *mapObj); -static void sub_020626D0(MapObject *mapObj, const ObjectEvent *objectEvent, int param2); -static void sub_02062714(MapObject *mapObj, int param1, const ObjectEvent *objectEvent); +static void sub_020626D0(MapObject *mapObj, const ObjectEvent *objectEvent, int mapID); +static void sub_02062714(MapObject *mapObj, int mapID, const ObjectEvent *objectEvent); static void MapObjectTask_Move(SysTask *task, void *param1); static void MapObjectTask_Draw(MapObject *mapObj); static MapObjectManager *MapObjectMan_Deconst(const MapObjectManager *mapObjMan); @@ -143,8 +143,8 @@ static void MapObjectMan_DecObjectCount(MapObjectManager *mapObjMan); static MapObject *MapObjectMan_GetMapObjectStatic(const MapObjectManager *mapObjMan); static MapObjectManager *sub_02062A48(const MapObject *mapObj); static const ObjectEvent *sub_020631A4(int param0, int param1, const ObjectEvent *objectEvent); -static int sub_020631D8(const ObjectEvent *objectEvent); -static int sub_020631F4(const ObjectEvent *objectEvent); +static int ObjectEvent_HasNoScript(const ObjectEvent *objectEvent); +static int ObjectEvent_GetFlagNoScript(const ObjectEvent *objectEvent); static const UnkStruct_020EDF0C *sub_0206320C(u32 param0); static UnkFuncPtr_020EDF0C sub_02063224(const UnkStruct_020EDF0C *param0); @@ -170,18 +170,18 @@ MapObjectManager *MapObjectMan_New(FieldSystem *fieldSystem, int maxObjs, int pa void MapObjectMan_Delete(MapObjectManager *mapObjMan) { - Heap_FreeToHeapExplicit(11, MapObjectMan_GetMapObject(mapObjMan)); - Heap_FreeToHeapExplicit(11, mapObjMan); + Heap_FreeToHeapExplicit(HEAP_ID_FIELDMAP, MapObjectMan_GetMapObject(mapObjMan)); + Heap_FreeToHeapExplicit(HEAP_ID_FIELDMAP, mapObjMan); } -void sub_0206184C(MapObjectManager *mapObjMan, int param1, int param2, int param3, const ObjectEvent *objectEvent) +void sub_0206184C(MapObjectManager *mapObjMan, int mapID, int param2, int objEventCount, const ObjectEvent *objectEvent) { int v0, maxObjects = MapObjectMan_GetMaxObjects(mapObjMan); MapObject *mapObj = MapObjectMan_GetMapObject(mapObjMan); while (maxObjects) { if (sub_02062CF8(mapObj) == TRUE) { - v0 = sub_0206244C(mapObj, param2, param3, objectEvent); + v0 = sub_0206244C(mapObj, param2, objEventCount, objectEvent); switch (v0) { case 0: @@ -207,7 +207,7 @@ static MapObjectManager *MapObjectMan_Alloc(int maxObjs) { int size; MapObject *mapObj; - MapObjectManager *mapObjMan = Heap_AllocFromHeap(11, (sizeof(MapObjectManager))); + MapObjectManager *mapObjMan = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, (sizeof(MapObjectManager))); GF_ASSERT(mapObjMan != NULL); memset(mapObjMan, 0, (sizeof(MapObjectManager))); @@ -223,27 +223,27 @@ static MapObjectManager *MapObjectMan_Alloc(int maxObjs) return mapObjMan; } -MapObject *MapObjectMan_AddMapObjectFromHeader(const MapObjectManager *mapObjMan, const ObjectEvent *objectEvent, int param2) +MapObject *MapObjectMan_AddMapObjectFromHeader(const MapObjectManager *mapObjMan, const ObjectEvent *objectEvent, int mapID) { MapObject *mapObj; ObjectEvent v1 = *objectEvent; ObjectEvent *v2 = &v1; - int v3 = ObjectEvent_GetLocalID(v2); + int localID = ObjectEvent_GetLocalID(v2); - if (sub_020631D8(v2) == 0) { - mapObj = sub_02062154(mapObjMan, v3, param2); + if (ObjectEvent_HasNoScript(v2) == FALSE) { + mapObj = sub_02062154(mapObjMan, localID, mapID); if (mapObj != NULL) { - sub_020626D0(mapObj, v2, param2); + sub_020626D0(mapObj, v2, mapID); return mapObj; } } else { - mapObj = sub_020624CC(mapObjMan, v3, sub_020631F4(v2)); + mapObj = sub_020624CC(mapObjMan, localID, ObjectEvent_GetFlagNoScript(v2)); if (mapObj != NULL) { - sub_02062714(mapObj, param2, v2); + sub_02062714(mapObj, mapID, v2); return mapObj; } } @@ -256,7 +256,7 @@ MapObject *MapObjectMan_AddMapObjectFromHeader(const MapObjectManager *mapObjMan sub_020621E8(mapObj, v2, MapObjectMan_FieldSystem(mapObjMan)); sub_0206234C(mapObj, mapObjMan); - sub_02062914(mapObj, param2); + sub_02062914(mapObj, mapID); sub_02062660(mapObj); sub_02062670(mapObj); MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_START_MOVEMENT); @@ -266,7 +266,7 @@ MapObject *MapObjectMan_AddMapObjectFromHeader(const MapObjectManager *mapObjMan return mapObj; } -MapObject *MapObjectMan_AddMapObject(const MapObjectManager *mapObjMan, int x, int z, int initialDir, int graphicsID, int movementType, int param6) +MapObject *MapObjectMan_AddMapObject(const MapObjectManager *mapObjMan, int x, int z, int initialDir, int graphicsID, int movementType, int mapID) { ObjectEvent objectEvent; MapObject *mapObj; @@ -287,22 +287,22 @@ MapObject *MapObjectMan_AddMapObject(const MapObjectManager *mapObjMan, int x, i ObjectEvent_SetZ(&objectEvent, z); ObjectEvent_SetY(&objectEvent, 0); - mapObj = MapObjectMan_AddMapObjectFromHeader(mapObjMan, &objectEvent, param6); + mapObj = MapObjectMan_AddMapObjectFromHeader(mapObjMan, &objectEvent, mapID); return mapObj; } -MapObject *sub_02061A74(const MapObjectManager *mapObjMan, int param1, int param2, int param3, const ObjectEvent *objectEvent) +MapObject *sub_02061A74(const MapObjectManager *mapObjMan, int param1, int objEventCount, int mapID, const ObjectEvent *objectEvent) { MapObject *mapObj = NULL; - const ObjectEvent *v1 = sub_020631A4(param1, param2, objectEvent); + const ObjectEvent *v1 = sub_020631A4(param1, objEventCount, objectEvent); if (v1 != NULL) { int flag = ObjectEvent_GetFlag(v1); FieldSystem *fieldSystem = MapObjectMan_FieldSystem(mapObjMan); if (!FieldSystem_CheckFlag(fieldSystem, flag)) { - mapObj = MapObjectMan_AddMapObjectFromHeader(mapObjMan, v1, param3); + mapObj = MapObjectMan_AddMapObjectFromHeader(mapObjMan, v1, mapID); } } @@ -319,7 +319,7 @@ void sub_02061AB4(MapObject *mapObj, int graphicsID) void sub_02061AD4(MapObject *mapObj, int param1) { - if (sub_02062DFC(mapObj) == 1) { + if (sub_02062DFC(mapObj) == TRUE) { sub_02061B48(mapObj); } @@ -342,8 +342,8 @@ void MapObject_Delete(MapObject *mapObj) void sub_02061B28(MapObject *mapObj) { - int v0 = MapObject_GetFlag(mapObj); - FieldSystem_SetFlag(MapObject_FieldSystem(mapObj), v0); + int flag = MapObject_GetFlag(mapObj); + FieldSystem_SetFlag(MapObject_FieldSystem(mapObj), flag); MapObject_Delete(mapObj); } @@ -450,7 +450,7 @@ void MapObjectMan_LoadAllObjects(const MapObjectManager *mapObjMan, MapObjectSav MapObject *mapObj; while (size) { - if (mapObjSave->unk_00 & MAP_OBJ_STATUS_0) { + if (mapObjSave->status & MAP_OBJ_STATUS_0) { mapObj = sub_02062120(mapObjMan); GF_ASSERT(mapObj != NULL); @@ -465,34 +465,34 @@ void MapObjectMan_LoadAllObjects(const MapObjectManager *mapObjMan, MapObjectSav static void MapObject_Save(FieldSystem *fieldSystem, MapObject *mapObj, MapObjectSave *mapObjSave) { - mapObjSave->unk_00 = MapObject_GetStatus(mapObj); + mapObjSave->status = MapObject_GetStatus(mapObj); mapObjSave->unk_04 = sub_020628EC(mapObj); - mapObjSave->unk_08 = MapObject_GetLocalID(mapObj); + mapObjSave->localID = MapObject_GetLocalID(mapObj); mapObjSave->unk_10 = sub_02062918(mapObj); - mapObjSave->unk_12 = MapObject_GetGraphicsID(mapObj); - mapObjSave->unk_09 = MapObject_GetMovementType(mapObj); - mapObjSave->unk_14 = MapObject_GetTrainerType(mapObj); - mapObjSave->unk_16 = MapObject_GetFlag(mapObj); - mapObjSave->unk_18 = MapObject_GetScript(mapObj); - mapObjSave->unk_0C = MapObject_GetInitialDir(mapObj); - mapObjSave->unk_0D = MapObject_GetFacingDir(mapObj); - mapObjSave->unk_0E = MapObject_GetMovingDir(mapObj); + mapObjSave->graphicsID = MapObject_GetGraphicsID(mapObj); + mapObjSave->movementType = MapObject_GetMovementType(mapObj); + mapObjSave->trainerType = MapObject_GetTrainerType(mapObj); + mapObjSave->flag = MapObject_GetFlag(mapObj); + mapObjSave->script = MapObject_GetScript(mapObj); + mapObjSave->initialDir = MapObject_GetInitialDir(mapObj); + mapObjSave->facingDir = MapObject_GetFacingDir(mapObj); + mapObjSave->movingDir = MapObject_GetMovingDir(mapObj); mapObjSave->unk_1A = MapObject_GetDataAt(mapObj, 0); mapObjSave->unk_1C = MapObject_GetDataAt(mapObj, 1); mapObjSave->unk_1E = MapObject_GetDataAt(mapObj, 2); - mapObjSave->unk_0A = MapObject_GetMovementRangeX(mapObj); - mapObjSave->unk_0B = MapObject_GetMovementRangeZ(mapObj); - mapObjSave->unk_20 = MapObject_GetXInitial(mapObj); - mapObjSave->unk_22 = MapObject_GetYInitial(mapObj); - mapObjSave->unk_24 = MapObject_GetZInitial(mapObj); - mapObjSave->unk_26 = MapObject_GetX(mapObj); - mapObjSave->unk_28 = MapObject_GetY(mapObj); - mapObjSave->unk_2A = MapObject_GetZ(mapObj); + mapObjSave->movementRangeX = MapObject_GetMovementRangeX(mapObj); + mapObjSave->movementRangeZ = MapObject_GetMovementRangeZ(mapObj); + mapObjSave->xInitial = MapObject_GetXInitial(mapObj); + mapObjSave->yInitial = MapObject_GetYInitial(mapObj); + mapObjSave->zInitial = MapObject_GetZInitial(mapObj); + mapObjSave->x = MapObject_GetX(mapObj); + mapObjSave->y = MapObject_GetY(mapObj); + mapObjSave->z = MapObject_GetZ(mapObj); VecFx32 v0; int v1, v2; - sub_02064450(mapObjSave->unk_26, mapObjSave->unk_2A, &v0); + sub_02064450(mapObjSave->x, mapObjSave->z, &v0); v0.y = MapObject_GetPosY(mapObj); v2 = sub_02062FAC(mapObj); @@ -514,29 +514,29 @@ static void MapObject_Save(FieldSystem *fieldSystem, MapObject *mapObj, MapObjec static void MapObject_LoadSave(MapObject *mapObj, MapObjectSave *mapObjSave) { - MapObject_SetStatus(mapObj, mapObjSave->unk_00); + MapObject_SetStatus(mapObj, mapObjSave->status); sub_020628E8(mapObj, mapObjSave->unk_04); - MapObject_SetLocalID(mapObj, mapObjSave->unk_08); + MapObject_SetLocalID(mapObj, mapObjSave->localID); sub_02062914(mapObj, mapObjSave->unk_10); - MapObject_SetGraphicsID(mapObj, mapObjSave->unk_12); - MapObject_SetMovementType(mapObj, mapObjSave->unk_09); - MapObject_SetTrainerType(mapObj, mapObjSave->unk_14); - MapObject_SetFlag(mapObj, mapObjSave->unk_16); - MapObject_SetScript(mapObj, mapObjSave->unk_18); - MapObject_SetInitialDir(mapObj, mapObjSave->unk_0C); - MapObject_Face(mapObj, mapObjSave->unk_0D); - MapObject_Turn(mapObj, mapObjSave->unk_0E); + MapObject_SetGraphicsID(mapObj, mapObjSave->graphicsID); + MapObject_SetMovementType(mapObj, mapObjSave->movementType); + MapObject_SetTrainerType(mapObj, mapObjSave->trainerType); + MapObject_SetFlag(mapObj, mapObjSave->flag); + MapObject_SetScript(mapObj, mapObjSave->script); + MapObject_SetInitialDir(mapObj, mapObjSave->initialDir); + MapObject_Face(mapObj, mapObjSave->facingDir); + MapObject_Turn(mapObj, mapObjSave->movingDir); MapObject_SetDataAt(mapObj, mapObjSave->unk_1A, 0); MapObject_SetDataAt(mapObj, mapObjSave->unk_1C, 1); MapObject_SetDataAt(mapObj, mapObjSave->unk_1E, 2); - MapObject_SetMovementRangeX(mapObj, mapObjSave->unk_0A); - MapObject_SetMovementRangeZ(mapObj, mapObjSave->unk_0B); - MapObject_SetXInitial(mapObj, mapObjSave->unk_20); - MapObject_SetYInitial(mapObj, mapObjSave->unk_22); - MapObject_SetZInitial(mapObj, mapObjSave->unk_24); - MapObject_SetX(mapObj, mapObjSave->unk_26); - MapObject_SetY(mapObj, mapObjSave->unk_28); - MapObject_SetZ(mapObj, mapObjSave->unk_2A); + MapObject_SetMovementRangeX(mapObj, mapObjSave->movementRangeX); + MapObject_SetMovementRangeZ(mapObj, mapObjSave->movementRangeZ); + MapObject_SetXInitial(mapObj, mapObjSave->xInitial); + MapObject_SetYInitial(mapObj, mapObjSave->yInitial); + MapObject_SetZInitial(mapObj, mapObjSave->zInitial); + MapObject_SetX(mapObj, mapObjSave->x); + MapObject_SetY(mapObj, mapObjSave->y); + MapObject_SetZ(mapObj, mapObjSave->z); VecFx32 v0 = { 0, 0, 0 }; @@ -563,7 +563,7 @@ static void sub_02061FA8(const MapObjectManager *mapObjMan, MapObject *mapObj) static void sub_02061FF0(MapObject *mapObj) { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_0 | MAP_OBJ_STATUS_START_MOVEMENT); - MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_PAUSE_MOVEMENT | MAP_OBJ_STATUS_HIDE | MAP_OBJ_STATUS_14 | MAP_OBJ_STATUS_16 | MAP_OBJ_STATUS_17 | MAP_OBJ_STATUS_END_MOVEMENT | MAP_OBJ_STATUS_18 | MAP_OBJ_STATUS_19 | MAP_OBJ_STATUS_21 | MAP_OBJ_STATUS_22 | MAP_OBJ_STATUS_23); + MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_PAUSE_MOVEMENT | MAP_OBJ_STATUS_HIDE | MAP_OBJ_STATUS_14 | MAP_OBJ_STATUS_START_JUMP | MAP_OBJ_STATUS_END_JUMP | MAP_OBJ_STATUS_END_MOVEMENT | MAP_OBJ_STATUS_18 | MAP_OBJ_STATUS_19 | MAP_OBJ_STATUS_21 | MAP_OBJ_STATUS_22 | MAP_OBJ_STATUS_23); sub_02062618(mapObj); } @@ -624,7 +624,7 @@ static void sub_020620C4(UnkStruct_020620C4 *param0) objectEvent = param0->objectEvent; do { - if (sub_020631D8(objectEvent) == 1 || FieldSystem_CheckFlag(fieldSystem, objectEvent->flag) == 0) { + if (ObjectEvent_HasNoScript(objectEvent) == TRUE || FieldSystem_CheckFlag(fieldSystem, objectEvent->flag) == FALSE) { mapObj = MapObjectMan_AddMapObjectFromHeader(param0->mapObjMan, objectEvent, param0->unk_00); GF_ASSERT(mapObj != NULL); } @@ -660,8 +660,8 @@ static MapObject *sub_02062154(const MapObjectManager *mapObjMan, int param1, in int v0 = 0; MapObject *mapObj; - while (sub_020625B0(mapObjMan, &mapObj, &v0, MAP_OBJ_STATUS_0) == 1) { - if (sub_02062E94(mapObj) == 1 + while (sub_020625B0(mapObjMan, &mapObj, &v0, MAP_OBJ_STATUS_0) == TRUE) { + if (sub_02062E94(mapObj) == TRUE && MapObject_GetLocalID(mapObj) == param1 && sub_02062C18(mapObj) == param2) { return mapObj; @@ -690,7 +690,7 @@ static void MapObjectMan_AddMoveTask(const MapObjectManager *mapObjMan, MapObjec static void sub_020621E8(MapObject *mapObj, const ObjectEvent *objectEvent, FieldSystem *fieldSystem) { MapObject_SetLocalID(mapObj, ObjectEvent_GetLocalID(objectEvent)); - MapObject_SetGraphicsID(mapObj, sub_0206262C(fieldSystem, ObjectEvent_GetGraphicsID(objectEvent))); + MapObject_SetGraphicsID(mapObj, FieldSystem_GetGraphicsID(fieldSystem, ObjectEvent_GetGraphicsID(objectEvent))); MapObject_SetMovementType(mapObj, ObjectEvent_GetMovementType(objectEvent)); MapObject_SetTrainerType(mapObj, ObjectEvent_GetTrainerType(objectEvent)); MapObject_SetFlag(mapObj, ObjectEvent_GetFlag(objectEvent)); @@ -736,7 +736,7 @@ static void sub_0206234C(MapObject *mapObj, const MapObjectManager *mapObjMan) { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_0 | MAP_OBJ_STATUS_12 | MAP_OBJ_STATUS_11); - if (sub_020626B4(mapObj) == 1) { + if (MapObject_HasNoScript(mapObj) == TRUE) { sub_02062E78(mapObj, 1); } @@ -778,44 +778,44 @@ static void sub_0206243C(MapObject *mapObj) memset(mapObj, 0, (sizeof(MapObject))); } -static int sub_0206244C(const MapObject *mapObj, int param1, int param2, const ObjectEvent *objectEvent) +static int sub_0206244C(const MapObject *mapObj, int param1, int objEventCount, const ObjectEvent *objectEvent) { - int v0; - int v1; + int localID; + int flag; - while (param2) { - v0 = ObjectEvent_GetLocalID(objectEvent); + while (objEventCount) { + localID = ObjectEvent_GetLocalID(objectEvent); - if (MapObject_GetLocalID(mapObj) == v0) { - if (sub_020631D8(objectEvent) == 1) { - v1 = sub_020631F4(objectEvent); + if (MapObject_GetLocalID(mapObj) == localID) { + if (ObjectEvent_HasNoScript(objectEvent) == TRUE) { + flag = ObjectEvent_GetFlagNoScript(objectEvent); - if (sub_02062E94(mapObj) == 1) { - if (sub_02062C18(mapObj) == v1) { + if (sub_02062E94(mapObj) == TRUE) { + if (sub_02062C18(mapObj) == flag) { return 1; } - } else if (sub_02062918(mapObj) == v1) { + } else if (sub_02062918(mapObj) == flag) { return 2; } - } else if (sub_02062E94(mapObj) == 1 && sub_02062C18(mapObj) == param1) { + } else if (sub_02062E94(mapObj) == TRUE && sub_02062C18(mapObj) == param1) { return 2; } } - param2--; + objEventCount--; objectEvent++; } return 0; } -static MapObject *sub_020624CC(const MapObjectManager *mapObjMan, int param1, int param2) +static MapObject *sub_020624CC(const MapObjectManager *mapObjMan, int localID, int flag) { int v0 = 0; MapObject *mapObj; - while (sub_020625B0(mapObjMan, &mapObj, &v0, MAP_OBJ_STATUS_0) == 1) { - if ((MapObject_GetLocalID(mapObj) == param1) && (sub_02062918(mapObj) == param2)) { + while (sub_020625B0(mapObjMan, &mapObj, &v0, MAP_OBJ_STATUS_0) == TRUE) { + if (MapObject_GetLocalID(mapObj) == localID && sub_02062918(mapObj) == flag) { return mapObj; } } @@ -823,7 +823,7 @@ static MapObject *sub_020624CC(const MapObjectManager *mapObjMan, int param1, in return NULL; } -MapObject *MapObjMan_LocalMapObjByIndex(const MapObjectManager *mapObjMan, int param1) +MapObject *MapObjMan_LocalMapObjByIndex(const MapObjectManager *mapObjMan, int index) { int maxObjects; MapObject *mapObj; @@ -834,8 +834,8 @@ MapObject *MapObjMan_LocalMapObjByIndex(const MapObjectManager *mapObjMan, int p mapObj = MapObjectMan_GetMapObjectStatic(mapObjMan); do { - if (MapObject_CheckStatusFlag(mapObj, MAP_OBJ_STATUS_0) == TRUE && sub_02062E94(mapObj) == 0 - && MapObject_GetLocalID(mapObj) == param1) { + if (MapObject_CheckStatusFlag(mapObj, MAP_OBJ_STATUS_0) == TRUE && sub_02062E94(mapObj) == FALSE + && MapObject_GetLocalID(mapObj) == index) { return mapObj; } @@ -846,13 +846,13 @@ MapObject *MapObjMan_LocalMapObjByIndex(const MapObjectManager *mapObjMan, int p return NULL; } -MapObject *sub_02062570(const MapObjectManager *mapObjMan, int param1) +MapObject *sub_02062570(const MapObjectManager *mapObjMan, int movementType) { int maxObjects = MapObjectMan_GetMaxObjects(mapObjMan); MapObject *mapObj = MapObjectMan_GetMapObjectStatic(mapObjMan); do { - if (MapObject_CheckStatusFlag(mapObj, MAP_OBJ_STATUS_0) == TRUE && MapObject_GetMovementType(mapObj) == param1) { + if (MapObject_CheckStatusFlag(mapObj, MAP_OBJ_STATUS_0) == TRUE && MapObject_GetMovementType(mapObj) == movementType) { return mapObj; } @@ -863,7 +863,7 @@ MapObject *sub_02062570(const MapObjectManager *mapObjMan, int param1) return NULL; } -int sub_020625B0(const MapObjectManager *mapObjMan, MapObject **mapObj, int *param2, u32 param3) +int sub_020625B0(const MapObjectManager *mapObjMan, MapObject **mapObj, int *param2, u32 status) { int maxObjects = MapObjectMan_GetMaxObjects(mapObjMan); MapObject *v1; @@ -878,15 +878,15 @@ int sub_020625B0(const MapObjectManager *mapObjMan, MapObject **mapObj, int *par do { (*param2)++; - if (MapObject_CheckStatus(v1, param3) == param3) { + if (MapObject_CheckStatus(v1, status) == status) { *mapObj = v1; - return 1; + return TRUE; } v1++; } while ((*param2) < maxObjects); - return 0; + return FALSE; } static void sub_02062604(MapObject *mapObj) @@ -897,7 +897,7 @@ static void sub_02062604(MapObject *mapObj) static void sub_02062618(MapObject *mapObj) { - MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_15 | MAP_OBJ_STATUS_HIDE_SHADOW | MAP_OBJ_STATUS_26 | MAP_OBJ_STATUS_24); + MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_SHOW_SHADOW | MAP_OBJ_STATUS_HIDE_SHADOW | MAP_OBJ_STATUS_26 | MAP_OBJ_STATUS_24); } static void sub_02062628(MapObject *mapObj) @@ -905,14 +905,14 @@ static void sub_02062628(MapObject *mapObj) (void)0; } -static int sub_0206262C(FieldSystem *fieldSystem, int param1) +static int FieldSystem_GetGraphicsID(FieldSystem *fieldSystem, int graphicsID) { - if (param1 >= 0x65 && param1 <= 0x74) { - param1 -= 0x65; - param1 = sub_0203F164(fieldSystem, param1); + if (graphicsID >= 0x65 && graphicsID <= 0x74) { + graphicsID -= 0x65; + graphicsID = sub_0203F164(fieldSystem, graphicsID); } - return param1; + return graphicsID; } static void sub_02062648(MapObject *mapObj) @@ -947,35 +947,35 @@ static void sub_02062670(MapObject *mapObj) } } -int sub_020626B4(const MapObject *mapObj) +int MapObject_HasNoScript(const MapObject *mapObj) { - u16 v0 = (u16)MapObject_GetScript(mapObj); + u16 script = (u16)MapObject_GetScript(mapObj); - if (v0 == 0xffff) { - return 1; + if (script == 0xffff) { + return TRUE; } - return 0; + return FALSE; } -static void sub_020626D0(MapObject *mapObj, const ObjectEvent *objectEvent, int param2) +static void sub_020626D0(MapObject *mapObj, const ObjectEvent *objectEvent, int mapID) { - GF_ASSERT(sub_02062E94(mapObj) == 1); + GF_ASSERT(sub_02062E94(mapObj) == TRUE); sub_02062E78(mapObj, 0); - sub_02062914(mapObj, param2); + sub_02062914(mapObj, mapID); MapObject_SetScript(mapObj, ObjectEvent_GetScript(objectEvent)); MapObject_SetFlag(mapObj, ObjectEvent_GetFlag(objectEvent)); } -static void sub_02062714(MapObject *mapObj, int param1, const ObjectEvent *objectEvent) +static void sub_02062714(MapObject *mapObj, int mapID, const ObjectEvent *objectEvent) { - GF_ASSERT(sub_020631D8(objectEvent) == 1); + GF_ASSERT(ObjectEvent_HasNoScript(objectEvent) == TRUE); sub_02062E78(mapObj, 1); MapObject_SetScript(mapObj, ObjectEvent_GetScript(objectEvent)); - MapObject_SetFlag(mapObj, sub_020631F4(objectEvent)); - sub_02062914(mapObj, param1); + MapObject_SetFlag(mapObj, ObjectEvent_GetFlagNoScript(objectEvent)); + sub_02062914(mapObj, mapID); } int sub_02062758(const MapObject *mapObj, int param1) @@ -989,24 +989,24 @@ int sub_02062758(const MapObject *mapObj, int param1) int sub_02062764(const MapObject *mapObj, int param1, int param2) { if (!MapObject_CheckStatusFlag(mapObj, MAP_OBJ_STATUS_0)) { - return 0; + return FALSE; } if (MapObject_GetLocalID(mapObj) != param1) { - return 0; + return FALSE; } if (sub_02062918(mapObj) != param2) { - if (sub_02062E94(mapObj) == 0) { - return 0; + if (sub_02062E94(mapObj) == FALSE) { + return FALSE; } if (sub_02062C18(mapObj) != param2) { - return 0; + return FALSE; } } - return 1; + return TRUE; } int sub_020627B4(const MapObject *mapObj, int param1, int param2, int param3) @@ -1071,19 +1071,19 @@ static void MapObjectMan_DecObjectCount(MapObjectManager *mapObjMan) mapObjMan->objectCnt--; } -void sub_02062838(MapObjectManager *mapObjMan, u32 param1) +void MapObjectMan_SetStatusFlagOn(MapObjectManager *mapObjMan, u32 flag) { - mapObjMan->unk_00 |= param1; + mapObjMan->status |= flag; } -void sub_02062840(MapObjectManager *mapObjMan, u32 param1) +void MapObjectMan_SetStatusFlagOff(MapObjectManager *mapObjMan, u32 flag) { - mapObjMan->unk_00 &= ~param1; + mapObjMan->status &= ~flag; } -u32 sub_0206284C(const MapObjectManager *mapObjMan, u32 param1) +u32 MapObjectMan_CheckStatus(const MapObjectManager *mapObjMan, u32 flag) { - return mapObjMan->unk_00 & param1; + return mapObjMan->status & flag; } void sub_02062854(MapObjectManager *mapObjMan, int param1) @@ -1236,13 +1236,13 @@ u32 MapObject_GetGraphicsID(const MapObject *mapObj) u32 sub_02062924(const MapObject *mapObj) { - u32 v0 = MapObject_GetGraphicsID(mapObj); + u32 graphicsID = MapObject_GetGraphicsID(mapObj); - if (sub_020677F4(v0) == 1) { - v0 = sub_02067800(mapObj); + if (sub_020677F4(graphicsID) == TRUE) { + graphicsID = sub_02067800(mapObj); } - return v0; + return graphicsID; } void MapObject_SetMovementType(MapObject *mapObj, u32 movementType) @@ -1365,7 +1365,7 @@ int MapObject_GetDataAt(const MapObject *mapObj, int index) } GF_ASSERT(FALSE); - return 0; + return FALSE; } void MapObject_SetMovementRangeX(MapObject *mapObj, int movementRangeX) @@ -1428,14 +1428,14 @@ static MapObjectManager *sub_02062A48(const MapObject *mapObj) return MapObjectMan_Deconst(mapObj->mapObjMan); } -void *sub_02062A54(MapObject *mapObj, int param1) +void *sub_02062A54(MapObject *mapObj, int size) { void *v0; - GF_ASSERT(param1 <= 16); + GF_ASSERT(size <= 16); v0 = sub_02062A78(mapObj); - memset(v0, 0, param1); + memset(v0, 0, size); return v0; } @@ -1445,14 +1445,14 @@ void *sub_02062A78(MapObject *mapObj) return mapObj->unk_D8; } -void *sub_02062A7C(MapObject *mapObj, int param1) +void *sub_02062A7C(MapObject *mapObj, int size) { u8 *v0; - GF_ASSERT(param1 <= 16); + GF_ASSERT(size <= 16); v0 = sub_02062AA0(mapObj); - memset(v0, 0, param1); + memset(v0, 0, size); return v0; } @@ -1477,14 +1477,14 @@ void *MapObject_GetMovementData(MapObject *mapObj) return mapObj->movementData; } -void *sub_02062ACC(MapObject *mapObj, int param1) +void *sub_02062ACC(MapObject *mapObj, int size) { u8 *v0; - GF_ASSERT(param1 <= 32); + GF_ASSERT(size <= 32); v0 = sub_02062AF0(mapObj); - memset(v0, 0, param1); + memset(v0, 0, size); return v0; } @@ -1638,18 +1638,18 @@ int sub_02062C0C(const MapObject *mapObj) int sub_02062C18(const MapObject *mapObj) { - GF_ASSERT(sub_02062E94(mapObj) == 1); + GF_ASSERT(sub_02062E94(mapObj) == TRUE); return MapObject_GetFlag(mapObj); } void MapObjectMan_StopAllMovement(MapObjectManager *mapObjMan) { - sub_02062838(mapObjMan, MAP_OBJ_STATUS_1 | MAP_OBJ_STATUS_START_MOVEMENT); + MapObjectMan_SetStatusFlagOn(mapObjMan, MAP_OBJ_STATUS_1 | MAP_OBJ_STATUS_START_MOVEMENT); } void sub_02062C3C(MapObjectManager *mapObjMan) { - sub_02062840(mapObjMan, MAP_OBJ_STATUS_1 | MAP_OBJ_STATUS_START_MOVEMENT); + MapObjectMan_SetStatusFlagOff(mapObjMan, MAP_OBJ_STATUS_1 | MAP_OBJ_STATUS_START_MOVEMENT); } void MapObjectMan_PauseAllMovement(MapObjectManager *mapObjMan) @@ -1659,7 +1659,7 @@ void MapObjectMan_PauseAllMovement(MapObjectManager *mapObjMan) do { if (sub_02062CF8(mapObj)) { - sub_02062DD0(mapObj); + MapObject_SetPauseMovementOn(mapObj); } mapObj++; @@ -1674,7 +1674,7 @@ void MapObjectMan_UnpauseAllMovement(MapObjectManager *mapObjMan) do { if (sub_02062CF8(mapObj)) { - sub_02062DDC(mapObj); + MapObject_SetPauseMovementOff(mapObj); } mapObj++; @@ -1684,36 +1684,36 @@ void MapObjectMan_UnpauseAllMovement(MapObjectManager *mapObjMan) int MapObjectMan_IsDrawInitialized(const MapObjectManager *mapObjMan) { - if (sub_0206284C(mapObjMan, MAP_OBJ_STATUS_0)) { + if (MapObjectMan_CheckStatus(mapObjMan, MAP_OBJ_STATUS_0)) { return TRUE; } return FALSE; } -u32 sub_02062CBC(const MapObject *mapObj, u32 param1) +u32 MapObject_CheckManagerStatus(const MapObject *mapObj, u32 param1) { const MapObjectManager *mapObjMan = MapObject_MapObjectManager(mapObj); - return sub_0206284C(mapObjMan, param1); + return MapObjectMan_CheckStatus(mapObjMan, param1); } -void sub_02062CCC(MapObjectManager *mapObjMan, int param1) +void MapObjectMan_SetEndMovement(MapObjectManager *mapObjMan, int param1) { if (param1 == 0) { - sub_02062838(mapObjMan, MAP_OBJ_STATUS_END_MOVEMENT); + MapObjectMan_SetStatusFlagOn(mapObjMan, MAP_OBJ_STATUS_END_MOVEMENT); } else { - sub_02062840(mapObjMan, MAP_OBJ_STATUS_END_MOVEMENT); + MapObjectMan_SetStatusFlagOff(mapObjMan, MAP_OBJ_STATUS_END_MOVEMENT); } } int sub_02062CE4(const MapObjectManager *mapObjMan) { - if (sub_0206284C(mapObjMan, MAP_OBJ_STATUS_END_MOVEMENT)) { - return 0; + if (MapObjectMan_CheckStatus(mapObjMan, MAP_OBJ_STATUS_END_MOVEMENT)) { + return FALSE; } - return 1; + return TRUE; } int sub_02062CF8(const MapObject *mapObj) @@ -1736,12 +1736,12 @@ int MapObject_IsMoving(const MapObject *mapObj) return MapObject_CheckStatusFlag(mapObj, MAP_OBJ_STATUS_1); } -void sub_02062D28(MapObject *mapObj) +void MapObject_SetStartMovement(MapObject *mapObj) { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_START_MOVEMENT); } -void sub_02062D34(MapObject *mapObj) +void MapObject_SetEndMovementOff(MapObject *mapObj) { MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_END_MOVEMENT); } @@ -1756,14 +1756,14 @@ int sub_02062D4C(const MapObject *mapObj) return MapObject_CheckStatusFlag(mapObj, MAP_OBJ_STATUS_14); } -int sub_02062D58(const MapObject *mapObj) +int MapObject_IsHidden(const MapObject *mapObj) { return MapObject_CheckStatusFlag(mapObj, MAP_OBJ_STATUS_HIDE); } -void MapObject_SetHidden(MapObject *mapObj, int param1) +void MapObject_SetHidden(MapObject *mapObj, int hidden) { - if (param1 == 1) { + if (hidden == TRUE) { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_HIDE); } else { MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_HIDE); @@ -1772,7 +1772,7 @@ void MapObject_SetHidden(MapObject *mapObj, int param1) void sub_02062D80(MapObject *mapObj, int param1) { - if (param1 == 1) { + if (param1 == TRUE) { MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_18); } else { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_18); @@ -1790,19 +1790,19 @@ int sub_02062D9C(MapObject *mapObj) void sub_02062DB4(MapObject *mapObj, int param1) { - if (param1 == 1) { + if (param1 == TRUE) { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_19); } else { MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_19); } } -void sub_02062DD0(MapObject *mapObj) +void MapObject_SetPauseMovementOn(MapObject *mapObj) { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_PAUSE_MOVEMENT); } -void sub_02062DDC(MapObject *mapObj) +void MapObject_SetPauseMovementOff(MapObject *mapObj) { MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_PAUSE_MOVEMENT); } @@ -1821,19 +1821,19 @@ int sub_02062DFC(const MapObject *mapObj) const MapObjectManager *mapObjMan = MapObject_MapObjectManager(mapObj); if (MapObjectMan_IsDrawInitialized(mapObjMan) == FALSE) { - return 0; + return FALSE; } if (!MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_14)) { - return 0; + return FALSE; } - return 1; + return TRUE; } void sub_02062E28(MapObject *mapObj, int param1) { - if (param1 == 1) { + if (param1 == TRUE) { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_23); } else { MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_23); @@ -1851,7 +1851,7 @@ int sub_02062E44(const MapObject *mapObj) void sub_02062E5C(MapObject *mapObj, int param1) { - if (param1 == 1) { + if (param1 == TRUE) { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_10); } else { MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_10); @@ -1860,7 +1860,7 @@ void sub_02062E5C(MapObject *mapObj, int param1) void sub_02062E78(MapObject *mapObj, int param1) { - if (param1 == 1) { + if (param1 == TRUE) { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_25); } else { MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_25); @@ -1878,7 +1878,7 @@ int sub_02062E94(const MapObject *mapObj) void sub_02062EAC(MapObject *mapObj, int param1) { - if (param1 == 1) { + if (param1 == TRUE) { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_26); } else { MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_26); @@ -1896,7 +1896,7 @@ int sub_02062EC8(const MapObject *mapObj) void sub_02062EE0(MapObject *mapObj, int param1) { - if (param1 == 1) { + if (param1 == TRUE) { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_27); } else { MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_27); @@ -1914,7 +1914,7 @@ int sub_02062EFC(const MapObject *mapObj) void sub_02062F14(MapObject *mapObj, int param1) { - if (param1 == 1) { + if (param1 == TRUE) { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_28); } else { MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_28); @@ -1932,7 +1932,7 @@ int sub_02062F30(const MapObject *mapObj) void sub_02062F48(MapObject *mapObj, int param1) { - if (param1 == 1) { + if (param1 == TRUE) { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_24); } else { MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_24); @@ -1959,7 +1959,7 @@ int sub_02062F7C(const MapObject *mapObj) void sub_02062F90(MapObject *mapObj, int param1) { - if (param1 == 1) { + if (param1 == TRUE) { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_29); } else { MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_29); @@ -1977,7 +1977,7 @@ int sub_02062FAC(const MapObject *mapObj) void sub_02062FC4(MapObject *mapObj, int param1) { - if (param1 == 1) { + if (param1 == TRUE) { sub_020628F0(mapObj, (1 << 2)); } else { sub_020628F8(mapObj, (1 << 2)); @@ -1987,10 +1987,10 @@ void sub_02062FC4(MapObject *mapObj, int param1) int sub_02062FDC(const MapObject *mapObj) { if (sub_02062904(mapObj, (1 << 2))) { - return 1; + return TRUE; } - return 0; + return FALSE; } int MapObject_GetXInitial(const MapObject *mapObj) @@ -2156,7 +2156,7 @@ void sub_020630CC(MapObject *mapObj, const VecFx32 *vec) int sub_020630DC(const MapObject *mapObj) { fx32 v0 = MapObject_GetPosY(mapObj); - int v1 = (((v0) >> 3) / FX32_ONE); + int v1 = ((v0) >> 3) / FX32_ONE; return v1; } @@ -2260,7 +2260,7 @@ int ObjectEvent_GetDataAt(const ObjectEvent *objectEvent, int index) } GF_ASSERT(FALSE); - return 0; + return FALSE; } void ObjectEvent_SetMovementRangeX(ObjectEvent *objectEvent, int movementRangeX) @@ -2313,35 +2313,35 @@ int ObjectEvent_GetZ(const ObjectEvent *objectEvent) return objectEvent->z; } -static const ObjectEvent *sub_020631A4(int param0, int param1, const ObjectEvent *objectEvent) +static const ObjectEvent *sub_020631A4(int param0, int objEventCount, const ObjectEvent *objectEvent) { int i = 0; do { - if (sub_020631D8(&objectEvent[i]) == 0 && ObjectEvent_GetLocalID(&objectEvent[i]) == param0) { + if (ObjectEvent_HasNoScript(&objectEvent[i]) == FALSE && ObjectEvent_GetLocalID(&objectEvent[i]) == param0) { return &objectEvent[i]; } i++; - } while (i < param1); + } while (i < objEventCount); return NULL; } -static int sub_020631D8(const ObjectEvent *objectEvent) +static int ObjectEvent_HasNoScript(const ObjectEvent *objectEvent) { - u16 v0 = (u16)ObjectEvent_GetScript(objectEvent); + u16 script = (u16)ObjectEvent_GetScript(objectEvent); - if (v0 == 0xffff) { - return 1; + if (script == 0xffff) { + return TRUE; } - return 0; + return FALSE; } -static int sub_020631F4(const ObjectEvent *objectEvent) +static int ObjectEvent_GetFlagNoScript(const ObjectEvent *objectEvent) { - GF_ASSERT(sub_020631D8(objectEvent) == 1); + GF_ASSERT(ObjectEvent_HasNoScript(objectEvent) == TRUE); return ObjectEvent_GetFlag(objectEvent); } @@ -2407,20 +2407,18 @@ static const UnkStruct_ov5_021FB0F0 *sub_02063244(u32 param0) return NULL; } -MapObject *sub_0206326C(const MapObjectManager *mapObjMan, int param1, int param2, int param3) +MapObject *sub_0206326C(const MapObjectManager *mapObjMan, int x, int z, int param3) { int maxObjects = MapObjectMan_GetMaxObjects(mapObjMan); MapObject *mapObj = MapObjectMan_GetMapObject(mapObjMan); do { if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_0)) { - if (param3) { - if (MapObject_GetXPrev(mapObj) == param1 && MapObject_GetZPrev(mapObj) == param2) { - return mapObj; - } + if (param3 && MapObject_GetXPrev(mapObj) == x && MapObject_GetZPrev(mapObj) == z) { + return mapObj; } - if (MapObject_GetX(mapObj) == param1 && MapObject_GetZ(mapObj) == param2) { + if (MapObject_GetX(mapObj) == x && MapObject_GetZ(mapObj) == z) { return mapObj; } } @@ -2432,20 +2430,20 @@ MapObject *sub_0206326C(const MapObjectManager *mapObjMan, int param1, int param return NULL; } -void sub_020632D4(MapObject *mapObj, const VecFx32 *param1, int param2) +void sub_020632D4(MapObject *mapObj, const VecFx32 *pos, int param2) { int x, y, z; - x = ((param1->x) >> 4) / FX32_ONE; + x = ((pos->x) >> 4) / FX32_ONE; MapObject_SetX(mapObj, x); - y = ((param1->y) >> 3) / FX32_ONE; + y = ((pos->y) >> 3) / FX32_ONE; MapObject_SetY(mapObj, y); - z = ((param1->z) >> 4) / FX32_ONE; + z = ((pos->z) >> 4) / FX32_ONE; MapObject_SetZ(mapObj, z); - MapObject_SetPos(mapObj, param1); + MapObject_SetPos(mapObj, pos); MapObject_UpdateCoords(mapObj); MapObject_Face(mapObj, param2); @@ -2455,23 +2453,23 @@ void sub_020632D4(MapObject *mapObj, const VecFx32 *param1, int param2) MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_1 | MAP_OBJ_STATUS_END_MOVEMENT); } -void MapObject_SetPosDir(MapObject *mapObj, int param1, int param2, int param3, int param4) +void MapObject_SetPosDir(MapObject *mapObj, int x, int y, int z, int dir) { VecFx32 pos; - pos.x = (((param1) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1); - MapObject_SetX(mapObj, param1); + pos.x = ((x << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1); + MapObject_SetX(mapObj, x); - pos.y = (((param2) << 3) * FX32_ONE) + 0; - MapObject_SetY(mapObj, param2); + pos.y = ((y << 3) * FX32_ONE) + 0; + MapObject_SetY(mapObj, y); - pos.z = (((param3) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1); - MapObject_SetZ(mapObj, param3); + pos.z = ((z << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1); + MapObject_SetZ(mapObj, z); MapObject_SetPos(mapObj, &pos); MapObject_UpdateCoords(mapObj); - MapObject_Face(mapObj, param4); + MapObject_Face(mapObj, dir); MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_START_MOVEMENT); MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_1 | MAP_OBJ_STATUS_END_MOVEMENT); @@ -2487,11 +2485,11 @@ void MapObject_SetMoveCode(MapObject *mapObj, u32 param1) MapObject_InitMove(mapObj); } -void sub_020633C8(MapObject *mapObj, int param1) +void sub_020633C8(MapObject *mapObj, int localID) { - MapObject_SetLocalID(mapObj, param1); + MapObject_SetLocalID(mapObj, localID); - sub_02062D28(mapObj); + MapObject_SetStartMovement(mapObj); sub_02062618(mapObj); } diff --git a/src/map_object_move.c b/src/map_object_move.c index 77c21a3ec2..4611f03a83 100644 --- a/src/map_object_move.c +++ b/src/map_object_move.c @@ -29,7 +29,7 @@ static int sub_02063478(const MapObject *mapObj); static void sub_020634DC(MapObject *mapObj); static void sub_020634F4(MapObject *mapObj); -static void sub_02063518(MapObject *mapObj); +static void MapObject_StartMove(MapObject *mapObj); static void sub_0206353C(MapObject *mapObj); static void MapObject_EndMove(MapObject *mapObj); static void sub_020635AC(MapObject *mapObj); @@ -71,13 +71,13 @@ void MapObject_InitMove(MapObject *mapObj) void MapObject_Move(MapObject *mapObj) { - if (sub_02062CBC(mapObj, (1 << 1))) { + if (MapObject_CheckManagerStatus(mapObj, (1 << 1))) { return; } sub_020634DC(mapObj); sub_020634F4(mapObj); - sub_02063518(mapObj); + MapObject_StartMove(mapObj); if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_4)) { MapObject_DoMovementAction(mapObj); @@ -103,11 +103,11 @@ static BOOL sub_02063478(const MapObject *mapObj) u32 status = MapObject_GetStatus(mapObj); - if (status & (1 << 12) && (status & (1 << 23)) == 0) { + if (status & (1 << 12) && (status & (1 << 23)) == FALSE) { return FALSE; } - if (status & (1 << 11) && sub_02062FDC(mapObj) == 0) { + if (status & (1 << 11) && sub_02062FDC(mapObj) == FALSE) { return FALSE; } @@ -123,47 +123,47 @@ static void sub_020634DC(MapObject *mapObj) static void sub_020634F4(MapObject *mapObj) { - if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_11) && MapObject_SetTileBehaviors(mapObj) == 1) { - sub_02062D28(mapObj); + if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_11) && MapObject_SetTileBehaviors(mapObj) == TRUE) { + MapObject_SetStartMovement(mapObj); } } -static void sub_02063518(MapObject *mapObj) +static void MapObject_StartMove(MapObject *mapObj) { if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_START_MOVEMENT)) { sub_020635AC(mapObj); } - MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_START_MOVEMENT | MAP_OBJ_STATUS_16); + MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_START_MOVEMENT | MAP_OBJ_STATUS_START_JUMP); } static void sub_0206353C(MapObject *mapObj) { - if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_16)) { + if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_START_JUMP)) { sub_020636F0(mapObj); } else if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_START_MOVEMENT)) { sub_0206363C(mapObj); } - MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_START_MOVEMENT | MAP_OBJ_STATUS_16); + MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_START_MOVEMENT | MAP_OBJ_STATUS_START_JUMP); } static void MapObject_EndMove(MapObject *mapObj) { - if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_17)) { + if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_END_JUMP)) { sub_020637D4(mapObj); } else if (MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_END_MOVEMENT)) { sub_0206375C(mapObj); } - MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_END_MOVEMENT | MAP_OBJ_STATUS_17); + MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_END_MOVEMENT | MAP_OBJ_STATUS_END_JUMP); } static void sub_020635AC(MapObject *mapObj) { MapObject_SetTileBehaviors(mapObj); - if (sub_02062DFC(mapObj) == 1) { + if (sub_02062DFC(mapObj) == TRUE) { u8 currTileBehavior = MapObject_GetCurrTileBehavior(mapObj); u8 prevTileBehavior = MapObject_GetPrevTileBehavior(mapObj); const UnkStruct_ov5_021ECD10 *v2 = ov5_021ECD04(mapObj); @@ -183,7 +183,7 @@ static void sub_0206363C(MapObject *mapObj) { MapObject_SetTileBehaviors(mapObj); - if (sub_02062DFC(mapObj) == 1) { + if (sub_02062DFC(mapObj) == TRUE) { u8 currTileBehavior = MapObject_GetCurrTileBehavior(mapObj); u8 prevTileBehavior = MapObject_GetPrevTileBehavior(mapObj); const UnkStruct_ov5_021ECD10 *v2 = ov5_021ECD04(mapObj); @@ -207,7 +207,7 @@ static void sub_020636F0(MapObject *mapObj) { MapObject_SetTileBehaviors(mapObj); - if (sub_02062DFC(mapObj) == 1) { + if (sub_02062DFC(mapObj) == TRUE) { u8 currTileBehavior = MapObject_GetCurrTileBehavior(mapObj); u8 prevTileBehavior = MapObject_GetPrevTileBehavior(mapObj); const UnkStruct_ov5_021ECD10 *v2 = ov5_021ECD04(mapObj); @@ -224,7 +224,7 @@ static void sub_0206375C(MapObject *mapObj) { MapObject_SetTileBehaviors(mapObj); - if (sub_02062DFC(mapObj) == 1) { + if (sub_02062DFC(mapObj) == TRUE) { u8 currTileBehavior = MapObject_GetCurrTileBehavior(mapObj); u8 prevTileBehavior = MapObject_GetPrevTileBehavior(mapObj); const UnkStruct_ov5_021ECD10 *v2 = ov5_021ECD04(mapObj); @@ -242,7 +242,7 @@ static void sub_020637D4(MapObject *mapObj) { MapObject_SetTileBehaviors(mapObj); - if (sub_02062DFC(mapObj) == 1) { + if (sub_02062DFC(mapObj) == TRUE) { u8 currTileBehavior = MapObject_GetCurrTileBehavior(mapObj); u8 prevTileBehavior = MapObject_GetPrevTileBehavior(mapObj); const UnkStruct_ov5_021ECD10 *v2 = ov5_021ECD04(mapObj); @@ -260,7 +260,7 @@ static void sub_020637D4(MapObject *mapObj) static void sub_02063864(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { - if (sub_02062EFC(mapObj) == 0) { + if (sub_02062EFC(mapObj) == FALSE) { if (TileBehavior_IsDeepMud(currTileBehavior) == TRUE || TileBehavior_IsDeepMudWithGrass(currTileBehavior) == TRUE) { VecFx32 v0 = { 0, (FX32_ONE * -14), 0 }; @@ -354,7 +354,7 @@ static void sub_02063994(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBeha static void sub_02063A30(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { if (TileBehavior_IsShallowWater(currTileBehavior) == TRUE) { - if (sub_02062EC8(mapObj) == 0) { + if (sub_02062EC8(mapObj) == FALSE) { ov5_021F331C(mapObj, 1); sub_02062EAC(mapObj, 1); } @@ -377,7 +377,7 @@ static void sub_02063A78(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBeha { const MapObjectManager *mapObjMan = MapObject_MapObjectManager(mapObj); - if (sub_02062CE4(mapObjMan) == 0) { + if (sub_02062CE4(mapObjMan) == FALSE) { return; } @@ -392,9 +392,9 @@ static void sub_02063A78(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBeha || TileBehavior_IsReflective(currTileBehavior)) { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_HIDE_SHADOW); } else { - if (!MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_15)) { + if (!MapObject_CheckStatus(mapObj, MAP_OBJ_STATUS_SHOW_SHADOW)) { ov5_021F1570(mapObj); - MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_15); + MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_SHOW_SHADOW); } } } @@ -403,7 +403,7 @@ static void sub_02063B20(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBeha { const MapObjectManager *mapObjMan = MapObject_MapObjectManager(mapObj); - if (sub_02062CE4(mapObjMan) == 0) { + if (sub_02062CE4(mapObjMan) == FALSE) { return; } @@ -495,7 +495,7 @@ static void sub_02063D30(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBeha return; } - if (sub_02062F64(mapObj) == 0) { + if (sub_02062F64(mapObj) == FALSE) { u8 tileBehavior = GetNullTileBehaviorID(); if (TileBehavior_HasReflectiveSurface(currTileBehavior) == TRUE) { @@ -528,7 +528,7 @@ static void sub_02063D30(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBeha static void sub_02063DA8(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { - if (param3->unk_04_10 == 0 || sub_02062F64(mapObj) == 0) { + if (param3->unk_04_10 == 0 || sub_02062F64(mapObj) == FALSE) { return; } @@ -543,7 +543,7 @@ static void sub_02063DDC(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBeha { if (TileBehavior_IsBridgeStart(currTileBehavior) == TRUE) { sub_02062F14(mapObj, 1); - } else if (sub_02062F30(mapObj) == 1 && TileBehavior_IsBridge(currTileBehavior) == FALSE) { + } else if (sub_02062F30(mapObj) == TRUE && TileBehavior_IsBridge(currTileBehavior) == FALSE) { sub_02062F14(mapObj, 0); } } @@ -553,18 +553,18 @@ static void sub_02063E14(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBeha return; } -u32 sub_02063E18(const MapObject *mapObj, const VecFx32 *param1, int param2, int param3, int param4, int param5) +u32 sub_02063E18(const MapObject *mapObj, const VecFx32 *pos, int x, int y, int z, int dir) { u32 v0 = 0; - if (sub_02063FAC(mapObj, param2, param3, param4) == 1) { + if (MapObject_IsOutOfRange(mapObj, x, y, z) == TRUE) { v0 |= (1 << 0); } s8 v1; FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); - if (sub_02055024(fieldSystem, param1, param2, param4, &v1) == 1) { + if (sub_02055024(fieldSystem, pos, x, z, &v1) == TRUE) { v0 |= (1 << 1); if (v1 != 0) { @@ -572,37 +572,37 @@ u32 sub_02063E18(const MapObject *mapObj, const VecFx32 *param1, int param2, int } } - if (sub_02064004(mapObj, param2, param4, param5) == 1) { + if (sub_02064004(mapObj, x, z, dir) == TRUE) { v0 |= (1 << 1); } - if (sub_02063F00(mapObj, param2, param3, param4) == 1) { + if (sub_02063F00(mapObj, x, y, z) == TRUE) { v0 |= (1 << 2); } return v0; } -u32 sub_02063E94(const MapObject *mapObj, int param1, int param2, int param3, int param4) +u32 sub_02063E94(const MapObject *mapObj, int x, int y, int z, int dir) { - VecFx32 v0; + VecFx32 pos; - MapObject_GetPosPtr(mapObj, &v0); - return sub_02063E18(mapObj, &v0, param1, param2, param3, param4); + MapObject_GetPosPtr(mapObj, &pos); + return sub_02063E18(mapObj, &pos, x, y, z, dir); } -u32 sub_02063EBC(const MapObject *mapObj, int param1) +u32 sub_02063EBC(const MapObject *mapObj, int dir) { - int x = MapObject_GetX(mapObj) + MapObject_GetDxFromDir(param1); + int x = MapObject_GetX(mapObj) + MapObject_GetDxFromDir(dir); int y = MapObject_GetY(mapObj); - int z = MapObject_GetZ(mapObj) + MapObject_GetDyFromDir(param1); + int z = MapObject_GetZ(mapObj) + MapObject_GetDzFromDir(dir); - return sub_02063E94(mapObj, x, y, z, param1); + return sub_02063E94(mapObj, x, y, z, dir); } -int sub_02063F00(const MapObject *mapObj, int param1, int param2, int param3) +int sub_02063F00(const MapObject *mapObj, int x, int y, int z) { - int maxObjects, x, z; + int maxObjects, objX, objZ; const MapObjectManager *mapObjMan = MapObject_MapObjectManager(mapObj); const MapObject *v4 = MapObjectMan_GetMapObjectConst(mapObjMan); @@ -612,35 +612,35 @@ int sub_02063F00(const MapObject *mapObj, int param1, int param2, int param3) if (v4 != mapObj && MapObject_CheckStatus(v4, MAP_OBJ_STATUS_0) && !MapObject_CheckStatus(v4, MAP_OBJ_STATUS_18)) { - x = MapObject_GetX(v4); - z = MapObject_GetZ(v4); + objX = MapObject_GetX(v4); + objZ = MapObject_GetZ(v4); - if ((x == param1) && (z == param3)) { - int v5 = MapObject_GetY(v4); - int v6 = v5 - param2; + if (objX == x && objZ == z) { + int objY = MapObject_GetY(v4); + int v6 = objY - y; if (v6 < 0) { v6 = -v6; } if (v6 < (1 * 2)) { - return 1; + return TRUE; } } - x = MapObject_GetXPrev(v4); - z = MapObject_GetZPrev(v4); + objX = MapObject_GetXPrev(v4); + objZ = MapObject_GetZPrev(v4); - if (x == param1 && z == param3) { - int v7 = MapObject_GetY(v4); - int v8 = v7 - param2; + if (objX == x && objZ == z) { + int objY = MapObject_GetY(v4); + int v8 = objY - y; if (v8 < 0) { v8 = -v8; } if (v8 < (1 * 2)) { - return 1; + return TRUE; } } } @@ -649,57 +649,57 @@ int sub_02063F00(const MapObject *mapObj, int param1, int param2, int param3) maxObjects--; } while (maxObjects); - return 0; + return FALSE; } -int sub_02063FAC(const MapObject *mapObj, int param1, int param2, int param3) +int MapObject_IsOutOfRange(const MapObject *mapObj, int x, int y, int z) { - int v0, v1, v2, v3; + int initialPos, movementRange, minPos, maxPos; - v0 = MapObject_GetXInitial(mapObj); - v1 = MapObject_GetMovementRangeX(mapObj); + initialPos = MapObject_GetXInitial(mapObj); + movementRange = MapObject_GetMovementRangeX(mapObj); - if (v1 != -1) { - v2 = v0 - v1; - v3 = v0 + v1; + if (movementRange != -1) { + minPos = initialPos - movementRange; + maxPos = initialPos + movementRange; - if (v2 > param1 || v3 < param1) { - return 1; + if (minPos > x || maxPos < x) { + return TRUE; } } - v0 = MapObject_GetZInitial(mapObj); - v1 = MapObject_GetMovementRangeZ(mapObj); + initialPos = MapObject_GetZInitial(mapObj); + movementRange = MapObject_GetMovementRangeZ(mapObj); - if (v1 != -1) { - v2 = v0 - v1; - v3 = v0 + v1; + if (movementRange != -1) { + minPos = initialPos - movementRange; + maxPos = initialPos + movementRange; - if (v2 > param3 || v3 < param3) { - return 1; + if (minPos > z || maxPos < z) { + return TRUE; } } - return 0; + return FALSE; } -int sub_02064004(const MapObject *mapObj, int param1, int param2, int param3) +int sub_02064004(const MapObject *mapObj, int x, int z, int dir) { - if (sub_02062FDC(mapObj) == 0) { + if (sub_02062FDC(mapObj) == FALSE) { FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); u8 v1 = MapObject_GetCurrTileBehavior(mapObj); - u8 v2 = FieldSystem_GetTileBehavior(fieldSystem, param1, param2); + u8 v2 = FieldSystem_GetTileBehavior(fieldSystem, x, z); if (v2 == GetNullTileBehaviorID()) { - return 1; + return TRUE; } - if (Unk_020EE76C[param3](v1) == 1 || Unk_020EE77C[param3](v2) == 1) { - return 1; + if (Unk_020EE76C[dir](v1) == TRUE || Unk_020EE77C[dir](v2) == TRUE) { + return TRUE; } } - return 0; + return FALSE; } static BOOL (*const Unk_020EE76C[4])(u8) = { @@ -716,79 +716,79 @@ static BOOL (*const Unk_020EE77C[4])(u8) = { TileBehavior_BlocksMovementWestward }; -int MapObject_IsOnWater(MapObject *mapObj, u32 param1) +int MapObject_IsOnWater(MapObject *mapObj, u32 tileBehavior) { - if (TileBehavior_IsBridgeOverWater(param1)) { + if (TileBehavior_IsBridgeOverWater(tileBehavior)) { if (sub_02062F30(mapObj) == FALSE) { return TRUE; } - } else if (TileBehavior_IsSurfable(param1)) { + } else if (TileBehavior_IsSurfable(tileBehavior)) { return TRUE; } return FALSE; } -int MapObject_IsOnSand(MapObject *mapObj, u32 param1) +int MapObject_IsOnSand(MapObject *mapObj, u32 tileBehavior) { - if (TileBehavior_IsBridgeOverSand(param1)) { + if (TileBehavior_IsBridgeOverSand(tileBehavior)) { if (sub_02062F30(mapObj) == FALSE) { return TRUE; } - } else if (TileBehavior_IsSand(param1)) { + } else if (TileBehavior_IsSand(tileBehavior)) { return TRUE; } return FALSE; } -int MapObject_IsOnSnow(MapObject *mapObj, u32 param1) +int MapObject_IsOnSnow(MapObject *mapObj, u32 tileBehavior) { - if (TileBehavior_IsBridgeOverSnow(param1)) { + if (TileBehavior_IsBridgeOverSnow(tileBehavior)) { if (sub_02062F30(mapObj) == FALSE) { return TRUE; } - } else if (TileBehavior_IsSnow(param1)) { + } else if (TileBehavior_IsSnow(tileBehavior)) { return TRUE; } return FALSE; } -int MapObject_IsOnShallowSnow(MapObject *mapObj, u32 param1) +int MapObject_IsOnShallowSnow(MapObject *mapObj, u32 tileBehavior) { - if (TileBehavior_IsBridgeOverSnow(param1)) { + if (TileBehavior_IsBridgeOverSnow(tileBehavior)) { if (sub_02062F30(mapObj) == FALSE) { return TRUE; } - } else if (TileBehavior_IsShallowSnow(param1)) { + } else if (TileBehavior_IsShallowSnow(tileBehavior)) { return TRUE; } return FALSE; } -int sub_0206413C(MapObject *mapObj, u32 param1) +int sub_0206413C(MapObject *mapObj, u32 tileBehavior) { - if (sub_02062F30(mapObj) == TRUE && TileBehavior_IsBridge(param1) == TRUE) { + if (sub_02062F30(mapObj) == TRUE && TileBehavior_IsBridge(tileBehavior) == TRUE) { return TRUE; } return FALSE; } -int sub_0206415C(MapObject *mapObj, u32 param1) +int sub_0206415C(MapObject *mapObj, u32 tileBehavior) { - if (sub_02062F30(mapObj) == TRUE && TileBehavior_IsBikeBridgeNorthSouth(param1) == TRUE) { + if (sub_02062F30(mapObj) == TRUE && TileBehavior_IsBikeBridgeNorthSouth(tileBehavior) == TRUE) { return TRUE; } return FALSE; } -int sub_0206417C(MapObject *mapObj, u32 param1) +int sub_0206417C(MapObject *mapObj, u32 tileBehavior) { - if (sub_02062F30(mapObj) == TRUE && TileBehavior_IsBikeBridgeEastWest(param1) == TRUE) { + if (sub_02062F30(mapObj) == TRUE && TileBehavior_IsBikeBridgeEastWest(tileBehavior) == TRUE) { return TRUE; } @@ -816,14 +816,14 @@ static const int sMapObjectDyDir[] = { 0x0 }; -int MapObject_GetDxFromDir(int param0) +int MapObject_GetDxFromDir(int dir) { - return sMapObjectDxDir[param0]; + return sMapObjectDxDir[dir]; } -int MapObject_GetDyFromDir(int param0) +int MapObject_GetDzFromDir(int dir) { - return sMapObjectDyDir[param0]; + return sMapObjectDyDir[dir]; } void MapObject_StepDir(MapObject *mapObj, int dir) @@ -834,7 +834,7 @@ void MapObject_StepDir(MapObject *mapObj, int dir) MapObject_AddX(mapObj, MapObject_GetDxFromDir(dir)); MapObject_AddY(mapObj, 0); - MapObject_AddZ(mapObj, MapObject_GetDyFromDir(dir)); + MapObject_AddZ(mapObj, MapObject_GetDzFromDir(dir)); } void MapObject_UpdateCoords(MapObject *mapObj) @@ -844,14 +844,14 @@ void MapObject_UpdateCoords(MapObject *mapObj) MapObject_SetZPrev(mapObj, MapObject_GetZ(mapObj)); } -u32 MapObject_GetTileBehaviorFromDir(MapObject *mapObj, int param1) +u32 MapObject_GetTileBehaviorFromDir(MapObject *mapObj, int dir) { - int v0 = MapObject_GetX(mapObj) + MapObject_GetDxFromDir(param1); - int v1 = MapObject_GetZ(mapObj) + MapObject_GetDyFromDir(param1); + int x = MapObject_GetX(mapObj) + MapObject_GetDxFromDir(dir); + int z = MapObject_GetZ(mapObj) + MapObject_GetDzFromDir(dir); FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); - u8 v3 = FieldSystem_GetTileBehavior(fieldSystem, v0, v1); + u8 tileBehavior = FieldSystem_GetTileBehavior(fieldSystem, x, z); - return v3; + return tileBehavior; } void MapObject_AddVecToPos(MapObject *mapObj, const VecFx32 *vec) @@ -907,7 +907,7 @@ int sub_020642F8(MapObject *mapObj) FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); int v4 = sub_020644D0(fieldSystem, &v1, v2); - if (v4 == 1) { + if (v4 == TRUE) { pos.y = v1.y; MapObject_SetPos(mapObj, &pos); MapObject_SetYPrev(mapObj, MapObject_GetY(mapObj)); @@ -925,7 +925,7 @@ int MapObject_SetTileBehaviors(MapObject *mapObj) u8 prevTileBehavior = GetNullTileBehaviorID(); u8 currTileBehavior = prevTileBehavior; - if (sub_02062FDC(mapObj) == 0) { + if (sub_02062FDC(mapObj) == FALSE) { int x = MapObject_GetXPrev(mapObj); int z = MapObject_GetZPrev(mapObj); FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); @@ -941,11 +941,11 @@ int MapObject_SetTileBehaviors(MapObject *mapObj) if (TileBehavior_IsNull(currTileBehavior) == TRUE) { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_11); - return 0; + return FALSE; } MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_11); - return 1; + return TRUE; } void VecFx32_StepDirection(int dir, VecFx32 *vec, fx32 val) @@ -966,17 +966,17 @@ void VecFx32_StepDirection(int dir, VecFx32 *vec, fx32 val) } } -void sub_02064450(int param0, int param1, VecFx32 *param2) +void sub_02064450(int x, int z, VecFx32 *pos) { - param2->x = (((param0) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1); - param2->z = (((param1) << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1); + pos->x = ((x << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1); + pos->z = ((z << 4) * FX32_ONE) + ((16 * FX32_ONE) >> 1); } void sub_02064464(MapObject *mapObj) { - int v0 = MapObject_GetMovementType(mapObj); + int movementType = MapObject_GetMovementType(mapObj); - if (v0 == 0x33 || v0 == 0x34 || v0 == 0x35 || v0 == 0x36) { + if (movementType == 0x33 || movementType == 0x34 || movementType == 0x35 || movementType == 0x36) { sub_02062B14(mapObj); } } @@ -993,53 +993,53 @@ int Direction_GetOpposite(int dir) return sOppositeDirections[dir]; } -int sub_02064488(int param0, int param1, int param2, int param3) +int sub_02064488(int x, int z, int xPrev, int zPrev) { - if (param0 > param2) { + if (x > xPrev) { return DIR_WEST; } - if (param0 < param2) { + if (x < xPrev) { return DIR_EAST; } - if (param1 > param3) { + if (z > zPrev) { return DIR_NORTH; } return DIR_SOUTH; } -int sub_020644A4(FieldSystem *fieldSystem, VecFx32 *param1) +int sub_020644A4(FieldSystem *fieldSystem, VecFx32 *pos) { fx32 v0; u8 v1; - v0 = sub_02054FBC(fieldSystem, param1->y, param1->x, param1->z, &v1); + v0 = sub_02054FBC(fieldSystem, pos->y, pos->x, pos->z, &v1); if (v1 == 0) { - return 0; + return FALSE; } - param1->y = v0; - return 1; + pos->y = v0; + return TRUE; } -int sub_020644D0(FieldSystem *fieldSystem, VecFx32 *param1, int param2) +int sub_020644D0(FieldSystem *fieldSystem, VecFx32 *pos, int param2) { fx32 v0; u8 v1; - v0 = sub_02054FBC(fieldSystem, param1->y, param1->x, param1->z, &v1); + v0 = sub_02054FBC(fieldSystem, pos->y, pos->x, pos->z, &v1); if (v1 == 0) { - return 0; + return FALSE; } if (v1 == 2 && param2 == 0) { - return 0; + return FALSE; } - param1->y = v0; - return 1; + pos->y = v0; + return TRUE; } diff --git a/src/overlay005/fieldmap.c b/src/overlay005/fieldmap.c index d9f99f78f7..e438ac5e54 100644 --- a/src/overlay005/fieldmap.c +++ b/src/overlay005/fieldmap.c @@ -842,7 +842,7 @@ static void ov5_021D1878(FieldSystem *fieldSystem) ov5_021DF488(fieldSystem->unk_40, 4, 32, 32, 32, 32, (0x500 * (32 / 2)), (0x80 * (32 / 2)), (0x800 * 32)); if ((fieldSystem->mapLoadType == MAP_LOAD_TYPE_UNDERGROUND) || (fieldSystem->mapLoadType == MAP_LOAD_TYPE_UNION)) { - sub_02062CCC(fieldSystem->mapObjMan, 0); + MapObjectMan_SetEndMovement(fieldSystem->mapObjMan, 0); } { diff --git a/src/overlay005/ov5_021DFB54.c b/src/overlay005/ov5_021DFB54.c index 5adc0372d4..b63f1c50bf 100644 --- a/src/overlay005/ov5_021DFB54.c +++ b/src/overlay005/ov5_021DFB54.c @@ -643,7 +643,7 @@ static BOOL ov5_021E0160(FieldTask *taskMan) case 2: { if (PlayerAvatar_MapDistortionState(v0->playerAvatar) == AVATAR_DISTORTION_STATE_NONE) { int v1 = Player_GetXPos(v0->playerAvatar) + MapObject_GetDxFromDir(v0->unk_04); - int v2 = Player_GetZPos(v0->playerAvatar) + MapObject_GetDyFromDir(v0->unk_04); + int v2 = Player_GetZPos(v0->playerAvatar) + MapObject_GetDzFromDir(v0->unk_04); v0->unk_28 = ov5_021F261C(v0->unk_24, v1, v2, v0->unk_04, 0); } else { int v3 = MapObject_GetX(v0->unk_24); @@ -1037,7 +1037,7 @@ static int ov5_021E07E4(UnkStruct_ov5_021F9B54 *param0) static int ov5_021E07FC(UnkStruct_ov5_021F9B54 *param0) { int v0 = Player_GetXPos(param0->playerAvatar) + MapObject_GetDxFromDir(param0->unk_04); - int v1 = Player_GetZPos(param0->playerAvatar) + MapObject_GetDyFromDir(param0->unk_04); + int v1 = Player_GetZPos(param0->playerAvatar) + MapObject_GetDzFromDir(param0->unk_04); param0->unk_18 = ov5_021F28F4(param0->unk_14, v0, v1, param0->unk_04, 0); param0->unk_2C = ov6_0224892C(param0->fieldSystem); @@ -1220,7 +1220,7 @@ static int ov5_021E0A68(UnkStruct_ov5_021F9B10 *param0) VecFx32 v2, v3; v0 = MapObject_GetX(param0->unk_3C) + (MapObject_GetDxFromDir(0) << 1); - v1 = MapObject_GetZ(param0->unk_3C) + (MapObject_GetDyFromDir(0) << 1); + v1 = MapObject_GetZ(param0->unk_3C) + (MapObject_GetDzFromDir(0) << 1); sub_02064450(v0, v1, ¶m0->unk_28); sub_020644A4(param0->fieldSystem, ¶m0->unk_28); @@ -1345,7 +1345,7 @@ static int ov5_021E0C34(UnkStruct_ov5_021F9B10 *param0) VecFx32 v2, v3; v0 = MapObject_GetX(param0->unk_3C) + (MapObject_GetDxFromDir(1) << 1); - v1 = MapObject_GetZ(param0->unk_3C) + (MapObject_GetDyFromDir(1) << 1); + v1 = MapObject_GetZ(param0->unk_3C) + (MapObject_GetDzFromDir(1) << 1); sub_02064450(v0, v1, ¶m0->unk_28); sub_020644A4(param0->fieldSystem, ¶m0->unk_28); @@ -1640,7 +1640,7 @@ static SysTask *ov5_021E0F54(FieldSystem *fieldSystem, u32 param1) v4->playerAvatar = playerAvatar; v4->unk_04 = v1; - sub_02062DDC(v3); + MapObject_SetPauseMovementOff(v3); PlayerAvatar_SetRequestStateBit(playerAvatar, param1); PlayerAvatar_RequestChangeState(playerAvatar); @@ -1750,7 +1750,7 @@ static void ov5_021E10C0(void *param0, const UnkStruct_020216E0 *param1) static MapObject *ov5_021E10D4(PlayerAvatar *playerAvatar, int param1) { int v0 = Player_GetXPos(playerAvatar) + MapObject_GetDxFromDir(param1); - int v1 = Player_GetZPos(playerAvatar) + MapObject_GetDyFromDir(param1); + int v1 = Player_GetZPos(playerAvatar) + MapObject_GetDzFromDir(param1); const MapObjectManager *v2 = MapObject_MapObjectManager(Player_MapObject(playerAvatar)); MapObject *v3 = sub_0206326C(v2, v0, v1, 0); diff --git a/src/overlay005/ov5_021E135C.c b/src/overlay005/ov5_021E135C.c index e9dbea711b..a212bb4510 100644 --- a/src/overlay005/ov5_021E135C.c +++ b/src/overlay005/ov5_021E135C.c @@ -87,7 +87,7 @@ static void ov5_021E1470(SysTask *param0, void *param1) switch (v0->unk_08) { case 0: { - sub_02062DDC(v1); + MapObject_SetPauseMovementOff(v1); sub_0206309C(v1, &v2); v3 = (20 - v0->unk_0C); v2.y = ((FX32_ONE * 2.2) + ((FX32_ONE / 2) * v3)) * v3; diff --git a/src/overlay005/ov5_021ECC20.c b/src/overlay005/ov5_021ECC20.c index 595aeae4d4..1eb9f48f3e 100644 --- a/src/overlay005/ov5_021ECC20.c +++ b/src/overlay005/ov5_021ECC20.c @@ -24,7 +24,7 @@ void ov5_021ECC20(MapObjectManager *param0, int param1, int param2, const int *p int v0, v1; UnkStruct_ov5_021ED0A4 *v2; - GF_ASSERT(sub_0206284C(param0, (1 << 0)) == 0); + GF_ASSERT(MapObjectMan_CheckStatus(param0, (1 << 0)) == 0); ov5_021ECCA4(param0); @@ -33,7 +33,7 @@ void ov5_021ECC20(MapObjectManager *param0, int param1, int param2, const int *p v2 = sub_0206285C(param0); ov5_021ECE40(v2, param0, v0, v1, param1, param2, param3, param4); - sub_02062838(param0, (1 << 0)); + MapObjectMan_SetStatusFlagOn(param0, (1 << 0)); } void ov5_021ECC78(MapObjectManager *param0) @@ -45,7 +45,7 @@ void ov5_021ECC78(MapObjectManager *param0) ov5_021ECE94(sub_0206285C(param0)); - sub_02062840(param0, (1 << 0)); + MapObjectMan_SetStatusFlagOff(param0, (1 << 0)); ov5_021ECCBC(param0); } @@ -65,7 +65,7 @@ void MapObject_Draw(MapObject *param0) { const MapObjectManager *v0 = MapObject_MapObjectManager(param0); - if (sub_0206284C(v0, (1 << 2))) { + if (MapObjectMan_CheckStatus(v0, (1 << 2))) { return; } diff --git a/src/overlay005/ov5_021F08CC.c b/src/overlay005/ov5_021F08CC.c index 74d1a53ed0..6893ad805c 100644 --- a/src/overlay005/ov5_021F08CC.c +++ b/src/overlay005/ov5_021F08CC.c @@ -192,7 +192,7 @@ static void ov5_021F0A04(SysTask *task, void *param1) static int ov5_021F0A30(UnkStruct_ov5_021F0D6C *param0, PlayerAvatar *playerAvatar, MapObject *param2) { ov5_021F0D6C(param0); - sub_02062DDC(param2); + MapObject_SetPauseMovementOff(param2); param0->unk_0C = 1; return 1; diff --git a/src/overlay005/ov5_021F134C.c b/src/overlay005/ov5_021F134C.c index d57142d568..b792d54a9c 100644 --- a/src/overlay005/ov5_021F134C.c +++ b/src/overlay005/ov5_021F134C.c @@ -258,7 +258,7 @@ static void ov5_021F1604(UnkStruct_ov101_021D5D90 *param0, void *param1) return; } - if (sub_02062CBC(v1, (1 << 3))) { + if (MapObject_CheckManagerStatus(v1, (1 << 3))) { ov5_021DF74C(param0); return; } diff --git a/src/overlay005/ov5_021F17B8.c b/src/overlay005/ov5_021F17B8.c index 926675b689..045528c1be 100644 --- a/src/overlay005/ov5_021F17B8.c +++ b/src/overlay005/ov5_021F17B8.c @@ -227,7 +227,7 @@ static void ov5_021F1978(UnkStruct_ov101_021D5D90 *param0, void *param1) return; } - if (sub_02062D58(v1) == 1) { + if (MapObject_IsHidden(v1) == 1) { sub_02021320(v0->unk_24, 0); } else { sub_02021320(v0->unk_24, 1); diff --git a/src/overlay005/ov5_021F47B0.c b/src/overlay005/ov5_021F47B0.c index 2d8d44fd0b..b060540dae 100644 --- a/src/overlay005/ov5_021F47B0.c +++ b/src/overlay005/ov5_021F47B0.c @@ -272,7 +272,7 @@ static int ov5_021F4AB4(const MapObject *param0, int param1, VecFx32 *param2) for (v2 = 0; v2 < param1; v2++) { v4 += MapObject_GetDxFromDir(v3); - v6 += MapObject_GetDyFromDir(v3); + v6 += MapObject_GetDzFromDir(v3); v0 = sub_02063E18(param0, &v1, v4, v5, v6, v3); diff --git a/src/overlay005/ov5_021F61BC.c b/src/overlay005/ov5_021F61BC.c index 58a91a9d88..6e69b368be 100644 --- a/src/overlay005/ov5_021F61BC.c +++ b/src/overlay005/ov5_021F61BC.c @@ -159,7 +159,7 @@ static void ov5_021F62A0(UnkStruct_ov101_021D5D90 *param0, void *param1) { VecFx32 v4, v5; int v6 = MapObject_GetX(v3) + MapObject_GetDxFromDir(v1->unk_04); - int v7 = MapObject_GetZ(v3) + MapObject_GetDyFromDir(v1->unk_04); + int v7 = MapObject_GetZ(v3) + MapObject_GetDzFromDir(v1->unk_04); sub_02064450(v6, v7, &v5); MapObject_GetPosPtr(v3, &v4); diff --git a/src/overlay005/vs_seeker.c b/src/overlay005/vs_seeker.c index 0606370a78..d2339d0d68 100644 --- a/src/overlay005/vs_seeker.c +++ b/src/overlay005/vs_seeker.c @@ -820,10 +820,10 @@ static BOOL VsSeeker_WaitForNpcsToPause(FieldSystem *fieldSystem) } if (MapObject_IsMoving(mapObj) == TRUE) { - sub_02062DDC(mapObj); + MapObject_SetPauseMovementOff(mapObj); anyMoving = TRUE; } else { - sub_02062DD0(mapObj); + MapObject_SetPauseMovementOn(mapObj); } } diff --git a/src/overlay006/ov6_02243258.c b/src/overlay006/ov6_02243258.c index 44a7057746..3891f47c35 100644 --- a/src/overlay006/ov6_02243258.c +++ b/src/overlay006/ov6_02243258.c @@ -3053,7 +3053,7 @@ static void ov6_02245F64(UnkStruct_ov6_02243FFC *param0, int param1) { MapObject *v0 = Player_MapObject(param0->fieldSystem->playerAvatar); - sub_02062DDC(v0); + MapObject_SetPauseMovementOff(v0); MapObject_SetHidden(v0, param1); } diff --git a/src/overlay008/ov8_02249960.c b/src/overlay008/ov8_02249960.c index af7cb1334a..3b36cfe4c9 100644 --- a/src/overlay008/ov8_02249960.c +++ b/src/overlay008/ov8_02249960.c @@ -3176,7 +3176,7 @@ static u32 ov8_0224BA0C(UnkStruct_ov8_0224B8D0 *param0, int param1, int param2, } param1 += MapObject_GetDxFromDir(param3); - param2 += MapObject_GetDyFromDir(param3); + param2 += MapObject_GetDzFromDir(param3); v2 = ov8_0224B9D8(param1, param2); @@ -3204,7 +3204,7 @@ static u32 ov8_0224BAA0(UnkStruct_ov8_0224B8D0 *param0, int param1, int param2, do { param1 += MapObject_GetDxFromDir(param3); - param2 += MapObject_GetDyFromDir(param3); + param2 += MapObject_GetDzFromDir(param3); (*param4)++; v0 = ov8_0224BA0C(param0, param1, param2, param3); } while (v0 == 0); @@ -3355,7 +3355,7 @@ static int ov8_0224BCA8(UnkStruct_ov8_0224C098 *param0) param0->unk_14 = (((param0->unk_30) >> 4) / FX32_ONE); v0->unk_08.unk_00 += MapObject_GetDxFromDir(param0->unk_08); - v0->unk_08.unk_04 += MapObject_GetDyFromDir(param0->unk_08); + v0->unk_08.unk_04 += MapObject_GetDzFromDir(param0->unk_08); v1 = ov8_0224BA0C(param0->unk_3C, v0->unk_08.unk_00, v0->unk_08.unk_04, param0->unk_08); @@ -3378,7 +3378,7 @@ static int ov8_0224BCA8(UnkStruct_ov8_0224C098 *param0) param0->unk_00 = 8; } } else { - param0->unk_38 = ov8_0224B878(param0->unk_3C, v0->unk_08.unk_00 + MapObject_GetDxFromDir(param0->unk_08), v0->unk_08.unk_04 + MapObject_GetDyFromDir(param0->unk_08)); + param0->unk_38 = ov8_0224B878(param0->unk_3C, v0->unk_08.unk_00 + MapObject_GetDxFromDir(param0->unk_08), v0->unk_08.unk_04 + MapObject_GetDzFromDir(param0->unk_08)); GF_ASSERT(param0->unk_38 != NULL); param0->unk_04 = 0; param0->unk_00 = 4; @@ -3575,7 +3575,7 @@ static void ov8_0224BFCC(FieldSystem *fieldSystem, UnkStruct_ov8_0224C098 *param GF_ASSERT(v3->unk_24); v3->unk_18 = v0 + (MapObject_GetDxFromDir(param3) * v3->unk_24); - v3->unk_1C = v1 + (MapObject_GetDyFromDir(param3) * v3->unk_24); + v3->unk_1C = v1 + (MapObject_GetDzFromDir(param3) * v3->unk_24); v0 = Player_GetXPos(fieldSystem->playerAvatar); v1 = Player_GetZPos(fieldSystem->playerAvatar); @@ -3739,7 +3739,7 @@ void ov8_0224C198(FieldSystem *fieldSystem) ov8_0224C3B4(v2); ov5_021DF4A8(fieldSystem->unk_40, 32); - sub_02062CCC(fieldSystem->mapObjMan, 0); + MapObjectMan_SetEndMovement(fieldSystem->mapObjMan, 0); { int v3 = 0xd2; diff --git a/src/overlay009/ov9_02249960.c b/src/overlay009/ov9_02249960.c index e2335bb253..fe0c96f456 100644 --- a/src/overlay009/ov9_02249960.c +++ b/src/overlay009/ov9_02249960.c @@ -1575,7 +1575,7 @@ static void ov9_02249F84(UnkStruct_ov9_02249B04 *param0) static void ov9_02249F88(UnkStruct_ov9_02249B04 *param0) { - sub_02062CCC(param0->fieldSystem->mapObjMan, 0); + MapObjectMan_SetEndMovement(param0->fieldSystem->mapObjMan, 0); } static void ov9_02249F98(UnkStruct_ov9_02249B04 *param0) @@ -7380,7 +7380,7 @@ BOOL ov9_0224F240(const MapObject *param0, int param1) v0 = MapObject_GetX(param0); v1 = MapObject_GetZ(param0); v0 += MapObject_GetDxFromDir(param1); - v1 += MapObject_GetDyFromDir(param1); + v1 += MapObject_GetDzFromDir(param1); return ov9_0224F1F8(v3, v0, v1, &v2); } @@ -7556,7 +7556,7 @@ static BOOL ov9_0224F3BC(UnkStruct_ov9_0224F6EC *param0) v8 += MapObject_GetDxFromDir(v7); v9 -= (2 * 2); - v10 += MapObject_GetDyFromDir(v7); + v10 += MapObject_GetDzFromDir(v7); MapObject_SetX(v6, v8); MapObject_SetY(v6, v9); diff --git a/src/overlay023/ov23_0224340C.c b/src/overlay023/ov23_0224340C.c index 59ee8b8cf5..ec2a6ff8bd 100644 --- a/src/overlay023/ov23_0224340C.c +++ b/src/overlay023/ov23_0224340C.c @@ -1815,7 +1815,7 @@ static void ov23_022448FC(int param0) v0 = Unk_ov23_02257764->unk_B28[CommSys_CurNetId()].unk_00.unk_00; v1 = Unk_ov23_02257764->unk_B28[CommSys_CurNetId()].unk_00.unk_02; v0 = v0 + MapObject_GetDxFromDir(v2); - v1 = v1 + MapObject_GetDyFromDir(v2); + v1 = v1 + MapObject_GetDzFromDir(v2); CommPlayer_SendXZPos(0, v0, v1); } @@ -1832,7 +1832,7 @@ static BOOL ov23_0224495C(int param0, BOOL param1) if (!param1) { v2 = v2 + MapObject_GetDxFromDir(v4); - v3 = v3 + MapObject_GetDyFromDir(v4); + v3 = v3 + MapObject_GetDzFromDir(v4); } if ((v0 == v2) && (v1 == v3)) { diff --git a/src/overlay023/ov23_0224A1D0.c b/src/overlay023/ov23_0224A1D0.c index d14b48f7d8..5de6e38a23 100644 --- a/src/overlay023/ov23_0224A1D0.c +++ b/src/overlay023/ov23_0224A1D0.c @@ -724,7 +724,7 @@ void ov23_0224ADB0(int param0, int param1, int param2, int param3) CommPlayerLocation *v1 = &v0->playerLocationServer[param0]; v1->x = param1 + MapObject_GetDxFromDir(param3); - v1->z = param2 + MapObject_GetDyFromDir(param3); + v1->z = param2 + MapObject_GetDzFromDir(param3); v1->dir = param3; } diff --git a/src/overlay023/ov23_0224B05C.c b/src/overlay023/ov23_0224B05C.c index 33541dc683..022022aa35 100644 --- a/src/overlay023/ov23_0224B05C.c +++ b/src/overlay023/ov23_0224B05C.c @@ -702,7 +702,7 @@ static void ov23_0224B844(int param0, int param1, BOOL param2) ov23_0224ADB0(param1, v2, v3, v4); v2 += MapObject_GetDxFromDir(v4); - v3 += MapObject_GetDyFromDir(v4); + v3 += MapObject_GetDzFromDir(v4); v0.unk_00 = v2; v0.unk_02 = v3; @@ -2645,7 +2645,7 @@ BOOL ov23_0224D9AC(int param0, BOOL param1) GF_ASSERT((v2 != 0) && (v3 != 0)); v2 += MapObject_GetDxFromDir(v4); - v3 += MapObject_GetDyFromDir(v4); + v3 += MapObject_GetDzFromDir(v4); Unk_ov23_022577AC->unk_13D6 = 0; diff --git a/src/scrcmd.c b/src/scrcmd.c index 765ea9b49c..6dace8745a 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -3108,7 +3108,7 @@ static BOOL ScrCmd_LockAll(ScriptContext *ctx) && SystemFlag_CheckHasPartner(SaveData_GetVarsFlags(fieldSystem->saveData)) == 1 && MapObject_IsMoving(object) != FALSE) { - sub_02062DDC(object); + MapObject_SetPauseMovementOff(object); ScriptContext_Pause(ctx, sub_020410CC); return TRUE; } @@ -3148,12 +3148,12 @@ static BOOL sub_02041004(ScriptContext *ctx) MapObject *v2 = Player_MapObject(fieldSystem->playerAvatar); if (inline_020410F4_1(1 << 0) && (LocalMapObj_CheckAnimationFinished(v2) == 1)) { - sub_02062DD0(v2); + MapObject_SetPauseMovementOn(v2); inline_020410F4_3(1 << 0); } if (inline_020410F4_1(1 << 2) && (MapObject_IsMoving(*v1) == 0)) { - sub_02062DD0(*v1); + MapObject_SetPauseMovementOn(*v1); inline_020410F4_3(1 << 2); } @@ -3161,7 +3161,7 @@ static BOOL sub_02041004(ScriptContext *ctx) MapObject *v3 = sub_02062570(fieldSystem->mapObjMan, 0x30); if (MapObject_IsMoving(v3) == 0) { - sub_02062DD0(v3); + MapObject_SetPauseMovementOn(v3); inline_020410F4_3(1 << 1); } } @@ -3170,7 +3170,7 @@ static BOOL sub_02041004(ScriptContext *ctx) MapObject *v4 = sub_02069EB8(*v1); if (MapObject_IsMoving(v4) == 0) { - sub_02062DD0(v4); + MapObject_SetPauseMovementOn(v4); inline_020410F4_3(1 << 3); } } @@ -3188,7 +3188,7 @@ static BOOL sub_020410CC(ScriptContext *ctx) MapObject *v1 = sub_02062570(fieldSystem->mapObjMan, 0x30); if (MapObject_IsMoving(v1) == 0) { - sub_02062DD0(v1); + MapObject_SetPauseMovementOn(v1); return 1; } @@ -3209,25 +3209,25 @@ static BOOL ScrCmd_LockLastTalked(ScriptContext *ctx) if (LocalMapObj_CheckAnimationFinished(player) == FALSE) { inline_020410F4_2(1 << 0); - sub_02062DDC(player); + MapObject_SetPauseMovementOff(player); } if (MapObject_IsMoving(*v1) != FALSE) { inline_020410F4_2(1 << 2); - sub_02062DDC(*v1); + MapObject_SetPauseMovementOff(*v1); } if (v3) { if (SystemFlag_CheckHasPartner(SaveData_GetVarsFlags(fieldSystem->saveData)) == 1 && MapObject_IsMoving(v3) != FALSE) { inline_020410F4_2(1 << 1); - sub_02062DDC(v3); + MapObject_SetPauseMovementOff(v3); } } if (v4) { if (MapObject_IsMoving(v4) != FALSE) { inline_020410F4_2(1 << 3); - sub_02062DDC(v4); + MapObject_SetPauseMovementOff(v4); } } @@ -3250,9 +3250,9 @@ static BOOL ScrCmd_062(ScriptContext *ctx) FieldSystem *fieldSystem = ctx->fieldSystem; mapObj = MapObjMan_LocalMapObjByIndex(fieldSystem->mapObjMan, ScriptContext_ReadHalfWord(ctx)); - sub_02062DD0(mapObj); + MapObject_SetPauseMovementOn(mapObj); - return 0; + return FALSE; } static BOOL ScrCmd_063(ScriptContext *ctx) @@ -3261,9 +3261,9 @@ static BOOL ScrCmd_063(ScriptContext *ctx) FieldSystem *fieldSystem = ctx->fieldSystem; mapObj = MapObjMan_LocalMapObjByIndex(fieldSystem->mapObjMan, ScriptContext_ReadHalfWord(ctx)); - sub_02062DDC(mapObj); + MapObject_SetPauseMovementOff(mapObj); - return 0; + return FALSE; } static BOOL ScrCmd_064(ScriptContext *ctx) @@ -3278,7 +3278,7 @@ static BOOL ScrCmd_064(ScriptContext *ctx) GF_ASSERT(FALSE); } - return 0; + return FALSE; } static BOOL ScrCmd_065(ScriptContext *ctx) diff --git a/src/unk_02054D00.c b/src/unk_02054D00.c index 05d92f5912..8eb34a28fd 100644 --- a/src/unk_02054D00.c +++ b/src/unk_02054D00.c @@ -341,12 +341,12 @@ static int sub_02054FD0(const FieldSystem *fieldSystem, const VecFx32 *param1, c return v0; } -BOOL sub_02055024(const FieldSystem *fieldSystem, const VecFx32 *param1, const int param2, const int param3, s8 *param4) +BOOL sub_02055024(const FieldSystem *fieldSystem, const VecFx32 *pos, const int x, const int z, s8 *param4) { int v0; u8 v1; - v0 = sub_02054FD0(fieldSystem, param1, param2, param3, &v1); + v0 = sub_02054FD0(fieldSystem, pos, x, z, &v1); if (param4 != NULL) { *param4 = v0; @@ -355,19 +355,19 @@ BOOL sub_02055024(const FieldSystem *fieldSystem, const VecFx32 *param1, const i if (v0 == 0) { BOOL v2; - v2 = FieldSystem_CheckCollision(fieldSystem, param2, param3); + v2 = FieldSystem_CheckCollision(fieldSystem, x, z); if ((!v2) && (v1 == 2)) { - u8 v3 = FieldSystem_GetTileBehavior(fieldSystem, param2, param3); + u8 v3 = FieldSystem_GetTileBehavior(fieldSystem, x, z); if (TileBehavior_IsPastoriaGymWater(v3)) { - return 1; + return TRUE; } } return v2; } else { - return 1; + return TRUE; } } diff --git a/src/unk_02055C50.c b/src/unk_02055C50.c index 7e03046178..8c714fa892 100644 --- a/src/unk_02055C50.c +++ b/src/unk_02055C50.c @@ -390,7 +390,7 @@ static BOOL sub_02056124(FieldTask *taskMan) case 0: PlayerAvatar_SetRequestStateBit(v0->playerAvatar, (1 << 4)); PlayerAvatar_RequestChangeState(v0->playerAvatar); - sub_02062DDC(Player_MapObject(v0->playerAvatar)); + MapObject_SetPauseMovementOff(Player_MapObject(v0->playerAvatar)); v1->unk_00 = 1; break; case 1: @@ -453,7 +453,7 @@ static BOOL sub_02056124(FieldTask *taskMan) break; case 4: Player_SetDir(v0->playerAvatar, v1->unk_04); - sub_02062DD0(Player_MapObject(v0->playerAvatar)); + MapObject_SetPauseMovementOn(Player_MapObject(v0->playerAvatar)); Heap_FreeToHeap(v1); return 1; } diff --git a/src/unk_0205CA94.c b/src/unk_0205CA94.c index 9679b38cd6..8b7f573459 100644 --- a/src/unk_0205CA94.c +++ b/src/unk_0205CA94.c @@ -131,7 +131,7 @@ void sub_0205CA94(SysTask *param0, void *param1) switch (v0->unk_1E4) { case 0: - sub_02062DDC(Player_MapObject(v0->fieldSystem->playerAvatar)); + MapObject_SetPauseMovementOff(Player_MapObject(v0->fieldSystem->playerAvatar)); PlayerAvatar_SetHidden(v0->fieldSystem->playerAvatar, 0); v0->unk_1E4++; break; diff --git a/src/unk_0205F180.c b/src/unk_0205F180.c index dfe2123d9c..82c534af3b 100644 --- a/src/unk_0205F180.c +++ b/src/unk_0205F180.c @@ -1732,13 +1732,13 @@ static u32 sub_02060C24(PlayerAvatar *playerAvatar, MapObject *mapObj, int param u32 v1, v2; int x = MapObject_GetX(mapObj) + MapObject_GetDxFromDir(param2); int y = MapObject_GetY(mapObj); - int z = MapObject_GetZ(mapObj) + MapObject_GetDyFromDir(param2); + int z = MapObject_GetZ(mapObj) + MapObject_GetDzFromDir(param2); MapObject_GetPosPtr(mapObj, &v0); v1 = 0; - if (sub_02063FAC(mapObj, x, y, z) == 1) { + if (MapObject_IsOutOfRange(mapObj, x, y, z) == 1) { v1 |= (1 << 0); } @@ -1771,7 +1771,7 @@ static int sub_02060CE4(PlayerAvatar *playerAvatar, MapObject *mapObj, int param if (param2 != -1) { FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); int v1 = MapObject_GetX(mapObj) + MapObject_GetDxFromDir(param2); - int v2 = MapObject_GetZ(mapObj) + MapObject_GetDyFromDir(param2); + int v2 = MapObject_GetZ(mapObj) + MapObject_GetDzFromDir(param2); if (sub_020683D8(fieldSystem, v1, v2, 0, param2) == 1) { return 1; @@ -1815,7 +1815,7 @@ static int sub_02060D98(PlayerAvatar *playerAvatar, MapObject *mapObj, int param if (param2 != -1) { FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); int v2 = MapObject_GetX(mapObj) + MapObject_GetDxFromDir(param2); - int v3 = MapObject_GetZ(mapObj) + MapObject_GetDyFromDir(param2); + int v3 = MapObject_GetZ(mapObj) + MapObject_GetDzFromDir(param2); u8 v4 = FieldSystem_GetTileBehavior(fieldSystem, v2, v3); switch (param2) { @@ -1877,7 +1877,7 @@ static int sub_02060E40(PlayerAvatar *playerAvatar, MapObject *mapObj, int param } v1 += MapObject_GetDxFromDir(param2); - v2 += MapObject_GetDyFromDir(param2); + v2 += MapObject_GetDzFromDir(param2); v3 = FieldSystem_GetTileBehavior(fieldSystem, v1, v2); if (TileBehavior_IsDoor(v3) == 1) { @@ -1893,7 +1893,7 @@ static int sub_02060EE4(PlayerAvatar *playerAvatar, MapObject *mapObj, int param if (param2 != -1) { FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); int v1 = MapObject_GetX(mapObj) + MapObject_GetDxFromDir(param2); - int v2 = MapObject_GetZ(mapObj) + MapObject_GetDyFromDir(param2); + int v2 = MapObject_GetZ(mapObj) + MapObject_GetDzFromDir(param2); u8 v3 = FieldSystem_GetTileBehavior(fieldSystem, v1, v2); if ((param2 == 3) && TileBehavior_IsBikeRampEastward(v3)) { @@ -1913,7 +1913,7 @@ static int sub_02060F4C(PlayerAvatar *playerAvatar, MapObject *mapObj, int param if (param2 != -1) { FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); int v1 = MapObject_GetX(mapObj) + MapObject_GetDxFromDir(param2); - int v2 = MapObject_GetZ(mapObj) + MapObject_GetDyFromDir(param2); + int v2 = MapObject_GetZ(mapObj) + MapObject_GetDzFromDir(param2); u8 v3 = FieldSystem_GetTileBehavior(fieldSystem, v1, v2); if (MapObject_IsOnWater(mapObj, v3)) { @@ -1929,7 +1929,7 @@ static int sub_02060FA8(PlayerAvatar *playerAvatar, MapObject *mapObj, int param if (param2 != -1) { FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); int v1 = MapObject_GetX(mapObj) + MapObject_GetDxFromDir(param2); - int v2 = MapObject_GetZ(mapObj) + MapObject_GetDyFromDir(param2); + int v2 = MapObject_GetZ(mapObj) + MapObject_GetDzFromDir(param2); u8 v3 = FieldSystem_GetTileBehavior(fieldSystem, v1, v2); if (PlayerAvatar_GetPlayerState(playerAvatar) == PLAYER_STATE_CYCLING) { @@ -1963,7 +1963,7 @@ static int sub_02061058(PlayerAvatar *playerAvatar, MapObject *mapObj, int param if ((param2 != -1) && PlayerAvatar_GetPlayerState(playerAvatar) == PLAYER_STATE_CYCLING) { FieldSystem *fieldSystem = MapObject_FieldSystem(mapObj); int v1 = MapObject_GetX(mapObj) + MapObject_GetDxFromDir(param2); - int v2 = MapObject_GetZ(mapObj) + MapObject_GetDyFromDir(param2); + int v2 = MapObject_GetZ(mapObj) + MapObject_GetDzFromDir(param2); u8 v3 = FieldSystem_GetTileBehavior(fieldSystem, v1, v2); if (MapObject_IsOnWater(mapObj, v3)) { @@ -2343,7 +2343,7 @@ u32 sub_0206156C(PlayerAvatar *playerAvatar, int param1) void sub_0206157C(PlayerAvatar *playerAvatar, int param1, int *param2, int *param3) { *param2 = Player_GetXPos(playerAvatar) + MapObject_GetDxFromDir(param1); - *param3 = Player_GetZPos(playerAvatar) + MapObject_GetDyFromDir(param1); + *param3 = Player_GetZPos(playerAvatar) + MapObject_GetDzFromDir(param1); } void sub_020615AC(PlayerAvatar *playerAvatar, int *param1, int *param2) diff --git a/src/unk_0206450C.c b/src/unk_0206450C.c index 4e3ec0f2a5..6693ccaaa7 100644 --- a/src/unk_0206450C.c +++ b/src/unk_0206450C.c @@ -294,7 +294,7 @@ void sub_02064690(MapObject *mapObj) switch (v1->unk_00) { case 0: sub_02062D10(mapObj); - sub_02062D34(mapObj); + MapObject_SetEndMovementOff(mapObj); v0 = MapObject_GetFacingDir(mapObj); v0 = sub_02065838(v0, 0x0); @@ -433,7 +433,7 @@ static int sub_0206489C(MapObject *mapObj, int param1) sub_020647A0(mapObj, &v2); v0 = MapObject_GetX(mapObj) + MapObject_GetDxFromDir(param1); - v1 = MapObject_GetZ(mapObj) + MapObject_GetDyFromDir(param1); + v1 = MapObject_GetZ(mapObj) + MapObject_GetDzFromDir(param1); if ((v2.unk_00 > v0) || (v2.unk_08 < v0)) { return 0; diff --git a/src/unk_020655F4.c b/src/unk_020655F4.c index 972192bd16..818d4446e7 100644 --- a/src/unk_020655F4.c +++ b/src/unk_020655F4.c @@ -116,18 +116,18 @@ static const fx32 Unk_020EECEC[3]; int LocalMapObj_IsAnimationSet(const MapObject *mapObj) { if (!MapObject_CheckStatusFlag(mapObj, MAP_OBJ_STATUS_0)) { - return 0; + return FALSE; } - if (MapObject_CheckStatusFlag(mapObj, MAP_OBJ_STATUS_1) == 1) { - return 0; + if (MapObject_CheckStatusFlag(mapObj, MAP_OBJ_STATUS_1) == TRUE) { + return FALSE; } - if (MapObject_CheckStatusFlag(mapObj, MAP_OBJ_STATUS_4) == 1 && !MapObject_CheckStatusFlag(mapObj, MAP_OBJ_STATUS_5)) { - return 0; + if (MapObject_CheckStatusFlag(mapObj, MAP_OBJ_STATUS_4) == TRUE && !MapObject_CheckStatusFlag(mapObj, MAP_OBJ_STATUS_5)) { + return FALSE; } - return 1; + return TRUE; } void LocalMapObj_SetAnimationCode(MapObject *mapObj, int param1) @@ -814,7 +814,7 @@ static void MovementAction_InitJumpCustomSound(MapObject *mapObj, int dir, fx32 MapObject_StepDir(mapObj, dir); } - MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_START_MOVEMENT | MAP_OBJ_STATUS_16); + MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_START_MOVEMENT | MAP_OBJ_STATUS_START_JUMP); MapObject_TryFaceAndTurn(mapObj, dir); sub_02062A0C(mapObj, param4); MapObject_AdvanceMovementStep(mapObj); @@ -875,7 +875,7 @@ static int MovementAction_Jump_Step1(MapObject *mapObj) VecFx32 v5 = { 0, 0, 0 }; sub_02063088(mapObj, &v5); - MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_END_MOVEMENT | MAP_OBJ_STATUS_17 | MAP_OBJ_STATUS_5); + MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_END_MOVEMENT | MAP_OBJ_STATUS_END_JUMP | MAP_OBJ_STATUS_5); MapObject_UpdateCoords(mapObj); sub_02062B68(mapObj); sub_02062A0C(mapObj, 0x0); @@ -1418,7 +1418,7 @@ static int sub_02066710(MapObject *mapObj) ov5_021F3F10(mapObj); - MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_START_MOVEMENT | MAP_OBJ_STATUS_16); + MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_START_MOVEMENT | MAP_OBJ_STATUS_START_JUMP); MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_HIDE_SHADOW); MapObject_AdvanceMovementStep(mapObj); @@ -1443,7 +1443,7 @@ static int sub_02066764(MapObject *mapObj) v2.y = 0; sub_02063088(mapObj, &v2); - MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_END_MOVEMENT | MAP_OBJ_STATUS_17 | MAP_OBJ_STATUS_5); + MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_END_MOVEMENT | MAP_OBJ_STATUS_END_JUMP | MAP_OBJ_STATUS_5); sub_0206A230(mapObj); MapObject_AdvanceMovementStep(mapObj); @@ -1491,7 +1491,7 @@ static void sub_02066824(MapObject *mapObj, const VecFx32 *param1, int param2, i MapObject_TryFace(mapObj, param2); MapObject_Turn(mapObj, param3); sub_02062A0C(mapObj, param5); - sub_02062D28(mapObj); + MapObject_SetStartMovement(mapObj); MapObject_SetXPrev(mapObj, MapObject_GetX(mapObj)); MapObject_SetYPrev(mapObj, MapObject_GetY(mapObj)); @@ -1808,7 +1808,7 @@ static void sub_02066F88(MapObject *mapObj, fx32 distance, int facingDir, int mo MapObject_TryFace(mapObj, facingDir); MapObject_Turn(mapObj, movingDir); sub_02062A0C(mapObj, param5); - sub_02062D28(mapObj); + MapObject_SetStartMovement(mapObj); MapObject_SetXPrev(mapObj, MapObject_GetX(mapObj)); MapObject_SetYPrev(mapObj, MapObject_GetY(mapObj)); @@ -1946,7 +1946,7 @@ static int sub_02067068(MapObject *mapObj) VecFx32 v7 = { 0, 0, 0 }; sub_02063088(mapObj, &v7); - MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_END_MOVEMENT | MAP_OBJ_STATUS_17 | MAP_OBJ_STATUS_5); + MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_END_MOVEMENT | MAP_OBJ_STATUS_END_JUMP | MAP_OBJ_STATUS_5); MapObject_UpdateCoords(mapObj); sub_02062B68(mapObj); sub_02062A0C(mapObj, 0x0); diff --git a/src/unk_02067A84.c b/src/unk_02067A84.c index e322a4e7f8..fc394741fd 100644 --- a/src/unk_02067A84.c +++ b/src/unk_02067A84.c @@ -321,7 +321,7 @@ static int sub_02067E74(const MapObject *mapObj, int param1, int param2) v2 = MapObject_GetZ(mapObj); v3 = MapObject_GetY(mapObj); v1 += MapObject_GetDxFromDir(param1); - v2 += MapObject_GetDyFromDir(param1); + v2 += MapObject_GetDzFromDir(param1); for (v0 = 0; v0 < (param2 - 1); v0++) { v4 = sub_02063E94(mapObj, v1, v3, v2, param1); @@ -332,7 +332,7 @@ static int sub_02067E74(const MapObject *mapObj, int param1, int param2) } v1 += MapObject_GetDxFromDir(param1); - v2 += MapObject_GetDyFromDir(param1); + v2 += MapObject_GetDzFromDir(param1); } v4 = sub_02063E94(mapObj, v1, v3, v2, param1); @@ -466,7 +466,7 @@ static int sub_02068088(UnkStruct_020EF6D0 *param0) MapObject *v0 = param0->unk_24; if (MapObject_IsMoving(v0) == 1) { - sub_02062DDC(v0); + MapObject_SetPauseMovementOff(v0); } param0->unk_00 = 1; diff --git a/src/unk_020683F4.c b/src/unk_020683F4.c index 29b68334d0..57a9f0ac08 100644 --- a/src/unk_020683F4.c +++ b/src/unk_020683F4.c @@ -484,7 +484,7 @@ static BOOL sub_02068884(FieldTask *task) break; case 1: if (PlayerAvatar_GetPlayerState(fieldSystem->playerAvatar) == 0x1) { - sub_02062DDC(Player_MapObject(fieldSystem->playerAvatar)); + MapObject_SetPauseMovementOff(Player_MapObject(fieldSystem->playerAvatar)); PlayerAvatar_SetRequestStateBit(fieldSystem->playerAvatar, (1 << 0)); PlayerAvatar_RequestChangeState(fieldSystem->playerAvatar); @@ -494,7 +494,7 @@ static BOOL sub_02068884(FieldTask *task) } else { Sound_SetSpecialBGM(fieldSystem, 1152); sub_02055554(fieldSystem, 1152, 1); - sub_02062DDC(Player_MapObject(fieldSystem->playerAvatar)); + MapObject_SetPauseMovementOff(Player_MapObject(fieldSystem->playerAvatar)); PlayerAvatar_SetRequestStateBit(fieldSystem->playerAvatar, (1 << 1)); PlayerAvatar_RequestChangeState(fieldSystem->playerAvatar); diff --git a/src/unk_02069BE0.c b/src/unk_02069BE0.c index 39040389df..e78f14af62 100644 --- a/src/unk_02069BE0.c +++ b/src/unk_02069BE0.c @@ -107,7 +107,7 @@ void sub_02069C44(MapObject *mapObj) static int sub_02069C48(MapObject *mapObj, UnkStruct_02069CA8 *param1) { sub_02062D10(mapObj); - sub_02062D34(mapObj); + MapObject_SetEndMovementOff(mapObj); if (sub_02069CFC(mapObj, param1) == 1) { sub_02069D30(mapObj, param1); @@ -277,7 +277,7 @@ void sub_02069E50(MapObject *mapObj) static int sub_02069E5C(MapObject *mapObj, UnkStruct_02069F48 *param1) { sub_02062D10(mapObj); - sub_02062D34(mapObj); + MapObject_SetEndMovementOff(mapObj); if (sub_02069FE8(mapObj, param1) == 1) { if (sub_0206A034(mapObj, param1) == 1) { @@ -401,7 +401,7 @@ static int sub_0206A034(MapObject *mapObj, UnkStruct_02069F48 *param1) v6 = sub_02064488(v0, v1, v4, v5); v0 += MapObject_GetDxFromDir(v6); - v1 += MapObject_GetDyFromDir(v6); + v1 += MapObject_GetDzFromDir(v6); if ((v0 != v2) || (v1 != v3)) { u32 v7 = 0xc; @@ -493,7 +493,7 @@ static int sub_0206A1AC(MapObject *mapObj, UnkStruct_0206A0BC *param1) } sub_02062D10(mapObj); - sub_02062D34(mapObj); + MapObject_SetEndMovementOff(mapObj); param1->unk_00++; return 0; @@ -609,7 +609,7 @@ static int sub_0206A2E0(MapObject *mapObj, UnkStruct_0206A23C *param1) sub_02065668(mapObj, v0); sub_02062D10(mapObj); - sub_02062D34(mapObj); + MapObject_SetEndMovementOff(mapObj); param1->unk_00 = 1; return 1; @@ -634,7 +634,7 @@ static int sub_0206A324(MapObject *mapObj, UnkStruct_0206A23C *param1) } sub_02062D10(mapObj); - sub_02062D34(mapObj); + MapObject_SetEndMovementOff(mapObj); param1->unk_00 = 3; return 1; @@ -713,7 +713,7 @@ static int sub_0206A454(MapObject *mapObj, UnkStruct_0206A23C *param1) } sub_02062D10(mapObj); - sub_02062D34(mapObj); + MapObject_SetEndMovementOff(mapObj); param1->unk_00 = 2; return 0; From b6f615f95c581d58cdd7dfdf2947d9cd7058ca93 Mon Sep 17 00:00:00 2001 From: Viperio19 Date: Sun, 29 Dec 2024 23:57:28 +0100 Subject: [PATCH 3/7] Updating function definitions in header files and doing some final renaming --- include/map_object.h | 48 +++++++++++++++++++-------------------- include/map_object_move.h | 40 ++++++++++++++++---------------- src/map_object.c | 6 ++--- src/map_object_move.c | 10 ++++---- src/unk_0205F180.c | 12 +++++----- src/unk_020683F4.c | 2 +- 6 files changed, 59 insertions(+), 59 deletions(-) diff --git a/include/map_object.h b/include/map_object.h index 213f32a559..e63bc859c9 100644 --- a/include/map_object.h +++ b/include/map_object.h @@ -24,13 +24,13 @@ #include "narc.h" #include "sys_task_manager.h" -MapObjectManager *MapObjectMan_New(FieldSystem *fieldSystem, int param1, int param2); +MapObjectManager *MapObjectMan_New(FieldSystem *fieldSystem, int maxObjs, int param2); void MapObjectMan_Delete(MapObjectManager *mapObjMan); -void sub_0206184C(MapObjectManager *mapObjMan, int param1, int param2, int param3, const ObjectEvent *objectEvent); -MapObject *MapObjectMan_AddMapObjectFromHeader(const MapObjectManager *mapObjMan, const ObjectEvent *objectEvent, int param2); -MapObject *MapObjectMan_AddMapObject(const MapObjectManager *mapObjMan, int param1, int param2, int param3, int param4, int param5, int param6); -MapObject *sub_02061A74(const MapObjectManager *mapObjMan, int param1, int objEventCount, int param3, const ObjectEvent *objectEvent); -void sub_02061AB4(MapObject *mapObj, int param1); +void sub_0206184C(MapObjectManager *mapObjMan, int mapID, int param2, int objEventCount, const ObjectEvent *objectEvent); +MapObject *MapObjectMan_AddMapObjectFromHeader(const MapObjectManager *mapObjMan, const ObjectEvent *objectEvent, int mapID); +MapObject *MapObjectMan_AddMapObject(const MapObjectManager *mapObjMan, int x, int z, int initialDir, int graphicsID, int movementType, int mapID); +MapObject *sub_02061A74(const MapObjectManager *mapObjMan, int param1, int objEventCount, int mapID, const ObjectEvent *objectEvent); +void sub_02061AB4(MapObject *mapObj, int graphicsID); void sub_02061AD4(MapObject *mapObj, int param1); void MapObject_Delete(MapObject *mapObj); void sub_02061B28(MapObject *mapObj); @@ -39,11 +39,11 @@ void MapObjectMan_DeleteAll(MapObjectManager *mapObjMan); void sub_02061BF0(MapObjectManager *mapObjMan); void sub_02061C48(MapObjectManager *mapObjMan); void MapObjectMan_SaveAll(FieldSystem *fieldSystem, const MapObjectManager *mapObjMan, MapObjectSave *mapObjSave, int param3); -void MapObjectMan_LoadAllObjects(const MapObjectManager *mapObjMan, MapObjectSave *mapObjSave, int param2); +void MapObjectMan_LoadAllObjects(const MapObjectManager *mapObjMan, MapObjectSave *mapObjSave, int size); void sub_02062068(const MapObjectManager *mapObjMan, int param1, int param2, const ObjectEvent *objectEvent); MapObject *MapObjMan_LocalMapObjByIndex(const MapObjectManager *mapObjMan, int index); MapObject *sub_02062570(const MapObjectManager *mapObjMan, int movementType); -int sub_020625B0(const MapObjectManager *mapObjMan, MapObject **mapObj, int *param2, u32 param3); +int sub_020625B0(const MapObjectManager *mapObjMan, MapObject **mapObj, int *param2, u32 status); int MapObject_HasNoScript(const MapObject *mapObj); int sub_02062758(const MapObject *mapObj, int param1); int sub_02062764(const MapObject *mapObj, int param1, int param2); @@ -112,13 +112,13 @@ SysTask *sub_02062A24(const MapObject *mapObj); void sub_02062A2C(const MapObject *mapObj); void MapObject_SetMapObjectManager(MapObject *mapObj, const MapObjectManager *mapObjMan); const MapObjectManager *MapObject_MapObjectManager(const MapObject *mapObj); -void *sub_02062A54(MapObject *mapObj, int param1); +void *sub_02062A54(MapObject *mapObj, int size); void *sub_02062A78(MapObject *mapObj); -void *sub_02062A7C(MapObject *mapObj, int param1); +void *sub_02062A7C(MapObject *mapObj, int size); void *sub_02062AA0(MapObject *mapObj); void *MapObject_InitMovementData(MapObject *mapObj, int size); void *MapObject_GetMovementData(MapObject *mapObj); -void *sub_02062ACC(MapObject *mapObj, int param1); +void *sub_02062ACC(MapObject *mapObj, int size); void *sub_02062AF0(MapObject *mapObj); void sub_02062AF8(MapObject *mapObj, UnkFuncPtr_020EDF0C param1); void sub_02062B00(MapObject *mapObj); @@ -142,9 +142,9 @@ int MapObject_GetMovementAction(const MapObject *mapObj); void MapObject_SetMovementStep(MapObject *mapObj, int movementStep); void MapObject_AdvanceMovementStep(MapObject *mapObj); int MapObject_GetMovementStep(const MapObject *mapObj); -void MapObject_SetCurrTileBehavior(MapObject *mapObj, u32 param1); +void MapObject_SetCurrTileBehavior(MapObject *mapObj, u32 tileBehavior); u32 MapObject_GetCurrTileBehavior(const MapObject *mapObj); -void MapObject_SetPrevTileBehavior(MapObject *mapObj, u32 param1); +void MapObject_SetPrevTileBehavior(MapObject *mapObj, u32 tileBehavior); u32 MapObject_GetPrevTileBehavior(const MapObject *mapObj); FieldSystem *MapObject_FieldSystem(const MapObject *mapObj); int sub_02062C0C(const MapObject *mapObj); @@ -154,7 +154,7 @@ void sub_02062C3C(MapObjectManager *mapObjMan); void MapObjectMan_PauseAllMovement(MapObjectManager *mapObjMan); void MapObjectMan_UnpauseAllMovement(MapObjectManager *mapObjMan); int MapObjectMan_IsDrawInitialized(const MapObjectManager *mapObjMan); -u32 MapObject_CheckManagerStatus(const MapObject *mapObj, u32 param1); +u32 MapObject_CheckManagerStatus(const MapObject *mapObj, u32 flag); void MapObjectMan_SetEndMovement(MapObjectManager *mapObjMan, int param1); int sub_02062CE4(const MapObjectManager *mapObjMan); int sub_02062CF8(const MapObject *mapObj); @@ -217,13 +217,13 @@ void MapObject_GetPosPtr(const MapObject *mapObj, VecFx32 *pos); void MapObject_SetPos(MapObject *mapObj, const VecFx32 *pos); const VecFx32 *MapObject_GetPos(const MapObject *mapObj); fx32 MapObject_GetPosY(const MapObject *mapObj); -void sub_02063078(const MapObject *mapObj, VecFx32 *param1); -void sub_02063088(MapObject *mapObj, const VecFx32 *param1); +void sub_02063078(const MapObject *mapObj, VecFx32 *vec); +void sub_02063088(MapObject *mapObj, const VecFx32 *vec); VecFx32 *sub_02063098(MapObject *mapObj); -void sub_0206309C(const MapObject *mapObj, VecFx32 *param1); -void sub_020630AC(MapObject *mapObj, const VecFx32 *param1); -void sub_020630BC(const MapObject *mapObj, VecFx32 *param1); -void sub_020630CC(MapObject *mapObj, const VecFx32 *param1); +void sub_0206309C(const MapObject *mapObj, VecFx32 *vec); +void sub_020630AC(MapObject *mapObj, const VecFx32 *vec); +void sub_020630BC(const MapObject *mapObj, VecFx32 *vec); +void sub_020630CC(MapObject *mapObj, const VecFx32 *vec); int sub_020630DC(const MapObject *mapObj); void ObjectEvent_SetLocalID(ObjectEvent *objectEvent, int localID); int ObjectEvent_GetLocalID(const ObjectEvent *objectEvent); @@ -251,11 +251,11 @@ void ObjectEvent_SetY(ObjectEvent *objectEvent, int y); int ObjectEvent_GetY(const ObjectEvent *objectEvent); void ObjectEvent_SetZ(ObjectEvent *objectEvent, int z); int ObjectEvent_GetZ(const ObjectEvent *objectEvent); -MapObject *sub_0206326C(const MapObjectManager *mapObjMan, int param1, int param2, int param3); -void sub_020632D4(MapObject *mapObj, const VecFx32 *param1, int param2); -void MapObject_SetPosDir(MapObject *mapObj, int param1, int param2, int param3, int param4); +MapObject *sub_0206326C(const MapObjectManager *mapObjMan, int x, int z, int param3); +void sub_020632D4(MapObject *mapObj, const VecFx32 *pos, int param2); +void MapObject_SetPosDir(MapObject *mapObj, int x, int y, int z, int dir); void MapObject_SetMoveCode(MapObject *mapObj, u32 param1); -void sub_020633C8(MapObject *mapObj, int param1); +void sub_020633C8(MapObject *mapObj, int localID); void sub_020633E0(MapObject *mapObj); void sub_020633E4(MapObject *mapObj); void sub_020633E8(MapObject *mapObj); diff --git a/include/map_object_move.h b/include/map_object_move.h index 21cde8b622..b746488647 100644 --- a/include/map_object_move.h +++ b/include/map_object_move.h @@ -9,34 +9,34 @@ void MapObject_InitMove(MapObject *mapObj); void MapObject_Move(MapObject *mapObj); -u32 sub_02063E18(const MapObject *mapObj, const VecFx32 *param1, int param2, int param3, int param4, int param5); -u32 sub_02063E94(const MapObject *mapObj, int param1, int param2, int param3, int param4); -u32 sub_02063EBC(const MapObject *mapObj, int param1); -int sub_02063F00(const MapObject *mapObj, int param1, int param2, int param3); +u32 sub_02063E18(const MapObject *mapObj, const VecFx32 *pos, int x, int y, int z, int dir); +u32 sub_02063E94(const MapObject *mapObj, int x, int y, int z, int dir); +u32 sub_02063EBC(const MapObject *mapObj, int dir); +int sub_02063F00(const MapObject *mapObj, int x, int y, int z); int MapObject_IsOutOfRange(const MapObject *mapObj, int x, int y, int z); -int sub_02064004(const MapObject *mapObj, int param1, int param2, int param3); -int MapObject_IsOnWater(MapObject *mapObj, u32 param1); -int MapObject_IsOnSand(MapObject *mapObj, u32 param1); -int MapObject_IsOnSnow(MapObject *mapObj, u32 param1); -int MapObject_IsOnShallowSnow(MapObject *mapObj, u32 param1); -int sub_0206413C(MapObject *mapObj, u32 param1); -int sub_0206415C(MapObject *mapObj, u32 param1); -int sub_0206417C(MapObject *mapObj, u32 param1); -int MapObject_GetDxFromDir(int param0); -int MapObject_GetDzFromDir(int param0); +int sub_02064004(const MapObject *mapObj, int x, int z, int dir); +int MapObject_IsOnWater(MapObject *mapObj, u32 tileBehavior); +int MapObject_IsOnSand(MapObject *mapObj, u32 tileBehavior); +int MapObject_IsOnSnow(MapObject *mapObj, u32 tileBehavior); +int MapObject_IsOnShallowSnow(MapObject *mapObj, u32 tileBehavior); +int MapObject_IsOnBridge(MapObject *mapObj, u32 tileBehavior); +int MapObject_IsOnBikeBridgeNorthSouth(MapObject *mapObj, u32 tileBehavior); +int MapObject_IsOnBikeBridgeEastWest(MapObject *mapObj, u32 tileBehavior); +int MapObject_GetDxFromDir(int dir); +int MapObject_GetDzFromDir(int dir); void MapObject_StepDir(MapObject *mapObj, int dir); void MapObject_UpdateCoords(MapObject *mapObj); -u32 MapObject_GetTileBehaviorFromDir(MapObject *mapObj, int param1); -void MapObject_AddVecToPos(MapObject *mapObj, const VecFx32 *param1); +u32 MapObject_GetTileBehaviorFromDir(MapObject *mapObj, int dir); +void MapObject_AddVecToPos(MapObject *mapObj, const VecFx32 *vec); void MapObject_MovePosInDir(MapObject *mapObj, int dir, fx32 distance); int sub_020642F8(MapObject *mapObj); int MapObject_SetTileBehaviors(MapObject *mapObj); -void VecFx32_StepDirection(int param0, VecFx32 *param1, fx32 param2); -void sub_02064450(int param0, int param1, VecFx32 *param2); +void VecFx32_StepDirection(int param0, VecFx32 *vec, fx32 val); +void sub_02064450(int x, int z, VecFx32 *pos); void sub_02064464(MapObject *mapObj); int Direction_GetOpposite(int param0); int sub_02064488(int x, int z, int xPrev, int zPrev); -int sub_020644A4(FieldSystem *fieldSystem, VecFx32 *param1); -int sub_020644D0(FieldSystem *fieldSystem, VecFx32 *param1, int param2); +int sub_020644A4(FieldSystem *fieldSystem, VecFx32 *pos); +int sub_020644D0(FieldSystem *fieldSystem, VecFx32 *pos, int param2); #endif // POKEPLATINUM_MAP_OBJECT_MOVE_H diff --git a/src/map_object.c b/src/map_object.c index 65c9631c47..a4dec7a04a 100644 --- a/src/map_object.c +++ b/src/map_object.c @@ -1691,16 +1691,16 @@ int MapObjectMan_IsDrawInitialized(const MapObjectManager *mapObjMan) return FALSE; } -u32 MapObject_CheckManagerStatus(const MapObject *mapObj, u32 param1) +u32 MapObject_CheckManagerStatus(const MapObject *mapObj, u32 flag) { const MapObjectManager *mapObjMan = MapObject_MapObjectManager(mapObj); - return MapObjectMan_CheckStatus(mapObjMan, param1); + return MapObjectMan_CheckStatus(mapObjMan, flag); } void MapObjectMan_SetEndMovement(MapObjectManager *mapObjMan, int param1) { - if (param1 == 0) { + if (param1 == FALSE) { MapObjectMan_SetStatusFlagOn(mapObjMan, MAP_OBJ_STATUS_END_MOVEMENT); } else { MapObjectMan_SetStatusFlagOff(mapObjMan, MAP_OBJ_STATUS_END_MOVEMENT); diff --git a/src/map_object_move.c b/src/map_object_move.c index 4611f03a83..915784971a 100644 --- a/src/map_object_move.c +++ b/src/map_object_move.c @@ -768,7 +768,7 @@ int MapObject_IsOnShallowSnow(MapObject *mapObj, u32 tileBehavior) return FALSE; } -int sub_0206413C(MapObject *mapObj, u32 tileBehavior) +int MapObject_IsOnBridge(MapObject *mapObj, u32 tileBehavior) { if (sub_02062F30(mapObj) == TRUE && TileBehavior_IsBridge(tileBehavior) == TRUE) { return TRUE; @@ -777,7 +777,7 @@ int sub_0206413C(MapObject *mapObj, u32 tileBehavior) return FALSE; } -int sub_0206415C(MapObject *mapObj, u32 tileBehavior) +int MapObject_IsOnBikeBridgeNorthSouth(MapObject *mapObj, u32 tileBehavior) { if (sub_02062F30(mapObj) == TRUE && TileBehavior_IsBikeBridgeNorthSouth(tileBehavior) == TRUE) { return TRUE; @@ -786,7 +786,7 @@ int sub_0206415C(MapObject *mapObj, u32 tileBehavior) return FALSE; } -int sub_0206417C(MapObject *mapObj, u32 tileBehavior) +int MapObject_IsOnBikeBridgeEastWest(MapObject *mapObj, u32 tileBehavior) { if (sub_02062F30(mapObj) == TRUE && TileBehavior_IsBikeBridgeEastWest(tileBehavior) == TRUE) { return TRUE; @@ -809,7 +809,7 @@ static const int DATA_GPosY_Dir4AddTbl[] = { 0 }; -static const int sMapObjectDyDir[] = { +static const int sMapObjectDzDir[] = { -1, 0x1, 0x0, @@ -823,7 +823,7 @@ int MapObject_GetDxFromDir(int dir) int MapObject_GetDzFromDir(int dir) { - return sMapObjectDyDir[dir]; + return sMapObjectDzDir[dir]; } void MapObject_StepDir(MapObject *mapObj, int dir) diff --git a/src/unk_0205F180.c b/src/unk_0205F180.c index 82c534af3b..731eadd002 100644 --- a/src/unk_0205F180.c +++ b/src/unk_0205F180.c @@ -1933,7 +1933,7 @@ static int sub_02060FA8(PlayerAvatar *playerAvatar, MapObject *mapObj, int param u8 v3 = FieldSystem_GetTileBehavior(fieldSystem, v1, v2); if (PlayerAvatar_GetPlayerState(playerAvatar) == PLAYER_STATE_CYCLING) { - if (sub_0206415C(mapObj, v3) == 1) { + if (MapObject_IsOnBikeBridgeNorthSouth(mapObj, v3) == 1) { if ((param2 == 0) || (param2 == 1)) { return 0; } @@ -1941,7 +1941,7 @@ static int sub_02060FA8(PlayerAvatar *playerAvatar, MapObject *mapObj, int param return 1; } - if (sub_0206417C(mapObj, v3) == 1) { + if (MapObject_IsOnBikeBridgeEastWest(mapObj, v3) == 1) { if ((param2 == 2) || (param2 == 3)) { return 0; } @@ -1949,7 +1949,7 @@ static int sub_02060FA8(PlayerAvatar *playerAvatar, MapObject *mapObj, int param return 1; } } else { - if ((sub_0206415C(mapObj, v3) == 1) || (sub_0206417C(mapObj, v3) == 1)) { + if ((MapObject_IsOnBikeBridgeNorthSouth(mapObj, v3) == 1) || (MapObject_IsOnBikeBridgeEastWest(mapObj, v3) == 1)) { return 1; } } @@ -2366,7 +2366,7 @@ static int sub_020615E0(PlayerAvatar *playerAvatar, MapObject *mapObj, int param if (param2 != -1) { u8 v0 = MapObject_GetCurrTileBehavior(mapObj); - if (sub_0206415C(mapObj, v0) == 1) { + if (MapObject_IsOnBikeBridgeNorthSouth(mapObj, v0) == 1) { if ((param2 == 0) || (param2 == 1)) { return 0; } @@ -2374,7 +2374,7 @@ static int sub_020615E0(PlayerAvatar *playerAvatar, MapObject *mapObj, int param return 1; } - if (sub_0206417C(mapObj, v0) == 1) { + if (MapObject_IsOnBikeBridgeEastWest(mapObj, v0) == 1) { if ((param2 == 2) || (param2 == 3)) { return 0; } @@ -2402,7 +2402,7 @@ static int PlayerAvatar_IsUnderCyclingRoad(PlayerAvatar *playerAvatar, u32 param MapObject *mapObj = Player_MapObject(playerAvatar); - if (sub_0206413C(mapObj, param1) == 1) { + if (MapObject_IsOnBridge(mapObj, param1) == 1) { return TRUE; } diff --git a/src/unk_020683F4.c b/src/unk_020683F4.c index 57a9f0ac08..329ced50b6 100644 --- a/src/unk_020683F4.c +++ b/src/unk_020683F4.c @@ -534,7 +534,7 @@ static u32 sub_02068948(const UnkStruct_020684D0 *param0) { MapObject *v1 = Player_MapObject(param0->playerAvatar); - if ((sub_0206415C(v1, param0->unk_0E) == 1) || (sub_0206417C(v1, param0->unk_0E) == 1)) { + if ((MapObject_IsOnBikeBridgeNorthSouth(v1, param0->unk_0E) == 1) || (MapObject_IsOnBikeBridgeEastWest(v1, param0->unk_0E) == 1)) { return 1; } } From 4a4d0c8297b4315b1e66334363b9b44da80a309e Mon Sep 17 00:00:00 2001 From: Viperio19 Date: Tue, 7 Jan 2025 13:42:04 +0100 Subject: [PATCH 4/7] Moving `MapObjectSave` to `map_object.h` --- include/map_object.h | 31 +++++++++++++++++++++++- include/struct_defs/struct_02061D3C.h | 34 --------------------------- src/field_overworld_state.c | 1 - src/map_object.c | 1 - 4 files changed, 30 insertions(+), 37 deletions(-) delete mode 100644 include/struct_defs/struct_02061D3C.h diff --git a/include/map_object.h b/include/map_object.h index e63bc859c9..7c231a7dad 100644 --- a/include/map_object.h +++ b/include/map_object.h @@ -7,7 +7,6 @@ #include "struct_decls/struct_02061830_decl.h" #include "struct_decls/struct_02061AB4_decl.h" -#include "struct_defs/struct_02061D3C.h" #include "field/field_system_decl.h" #include "functypes/funcptr_020EDF0C.h" @@ -24,6 +23,36 @@ #include "narc.h" #include "sys_task_manager.h" +typedef struct MapObjectSave { + u32 status; + u32 unk_04; + u8 localID; + u8 movementType; + s8 movementRangeX; + s8 movementRangeZ; + s8 initialDir; + s8 facingDir; + s8 movingDir; + u8 padding_0F; + u16 unk_10; + u16 graphicsID; + u16 trainerType; + u16 flag; + u16 script; + s16 unk_1A; + s16 unk_1C; + s16 unk_1E; + s16 xInitial; + s16 yInitial; + s16 zInitial; + s16 x; + s16 y; + s16 z; + fx32 unk_2C; + u8 unk_30[16]; + u8 unk_40[16]; +} MapObjectSave; + MapObjectManager *MapObjectMan_New(FieldSystem *fieldSystem, int maxObjs, int param2); void MapObjectMan_Delete(MapObjectManager *mapObjMan); void sub_0206184C(MapObjectManager *mapObjMan, int mapID, int param2, int objEventCount, const ObjectEvent *objectEvent); diff --git a/include/struct_defs/struct_02061D3C.h b/include/struct_defs/struct_02061D3C.h deleted file mode 100644 index a3e74ca9c0..0000000000 --- a/include/struct_defs/struct_02061D3C.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_02061D3C_H -#define POKEPLATINUM_STRUCT_02061D3C_H - -typedef struct UnkStruct_02061D3C_t { - u32 status; - u32 unk_04; - u8 localID; - u8 movementType; - s8 movementRangeX; - s8 movementRangeZ; - s8 initialDir; - s8 facingDir; - s8 movingDir; - u8 padding_0F; - u16 unk_10; - u16 graphicsID; - u16 trainerType; - u16 flag; - u16 script; - s16 unk_1A; - s16 unk_1C; - s16 unk_1E; - s16 xInitial; - s16 yInitial; - s16 zInitial; - s16 x; - s16 y; - s16 z; - fx32 unk_2C; - u8 unk_30[16]; - u8 unk_40[16]; -} MapObjectSave; - -#endif // POKEPLATINUM_STRUCT_02061D3C_H diff --git a/src/field_overworld_state.c b/src/field_overworld_state.c index 2c808f524b..1e0d36b3fd 100644 --- a/src/field_overworld_state.c +++ b/src/field_overworld_state.c @@ -5,7 +5,6 @@ #include "struct_defs/struct_020556C4.h" #include "struct_defs/struct_0205EC34.h" -#include "struct_defs/struct_02061D3C.h" #include "field/field_system.h" diff --git a/src/map_object.c b/src/map_object.c index a4dec7a04a..d295eabda8 100644 --- a/src/map_object.c +++ b/src/map_object.c @@ -4,7 +4,6 @@ #include #include "struct_decls/struct_02061830_sub1_decl.h" -#include "struct_defs/struct_02061D3C.h" #include "struct_defs/struct_020EDF0C.h" #include "field/field_system.h" From c19d32da278204b3731c168a1b8f2a3554200f26 Mon Sep 17 00:00:00 2001 From: Viperio19 Date: Tue, 7 Jan 2025 13:48:27 +0100 Subject: [PATCH 5/7] Final touchups in `map_object.c` (using constants and removing unnecessary brackets) --- src/map_object.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/map_object.c b/src/map_object.c index d295eabda8..1d4ab029d1 100644 --- a/src/map_object.c +++ b/src/map_object.c @@ -206,13 +206,13 @@ static MapObjectManager *MapObjectMan_Alloc(int maxObjs) { int size; MapObject *mapObj; - MapObjectManager *mapObjMan = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, (sizeof(MapObjectManager))); + MapObjectManager *mapObjMan = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, sizeof(MapObjectManager)); GF_ASSERT(mapObjMan != NULL); - memset(mapObjMan, 0, (sizeof(MapObjectManager))); + memset(mapObjMan, 0, sizeof(MapObjectManager)); size = sizeof(MapObject) * maxObjs; - mapObj = Heap_AllocFromHeap(11, size); + mapObj = Heap_AllocFromHeap(HEAP_ID_FIELDMAP, size); GF_ASSERT(mapObj != NULL); memset(mapObj, 0, size); @@ -439,7 +439,7 @@ void MapObjectMan_SaveAll(FieldSystem *fieldSystem, const MapObjectManager *mapO } if (param3) { - memset(mapObjSave, 0, param3 * (sizeof(MapObjectSave))); + memset(mapObjSave, 0, param3 * sizeof(MapObjectSave)); } } @@ -595,13 +595,13 @@ void sub_02062068(const MapObjectManager *mapObjMan, int param1, int param2, con GF_ASSERT(param2); - v0 = (sizeof(ObjectEvent)) * param2; - v1 = Heap_AllocFromHeapAtEnd(11, v0); + v0 = sizeof(ObjectEvent) * param2; + v1 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, v0); GF_ASSERT(v1 != NULL); memcpy(v1, objectEvent, v0); - v2 = Heap_AllocFromHeapAtEnd(11, (sizeof(UnkStruct_020620C4))); + v2 = Heap_AllocFromHeapAtEnd(HEAP_ID_FIELDMAP, sizeof(UnkStruct_020620C4)); GF_ASSERT(v2 != NULL); v2->unk_00 = param1; @@ -716,7 +716,7 @@ static void sub_020622B8(MapObject *mapObj, const ObjectEvent *objectEvent) v0 = ObjectEvent_GetY(objectEvent); v1.y = (fx32)v0; - v0 = (((v0) >> 3) / FX32_ONE); + v0 = ((v0) >> 3) / FX32_ONE; MapObject_SetYInitial(mapObj, v0); MapObject_SetYPrev(mapObj, v0); @@ -774,7 +774,7 @@ static void sub_020623D4(MapObject *mapObj) static void sub_0206243C(MapObject *mapObj) { - memset(mapObj, 0, (sizeof(MapObject))); + memset(mapObj, 0, sizeof(MapObject)); } static int sub_0206244C(const MapObject *mapObj, int param1, int objEventCount, const ObjectEvent *objectEvent) From c1add84e0254e5bcab10574a6b1334013fb2ba77 Mon Sep 17 00:00:00 2001 From: Viperio19 Date: Wed, 8 Jan 2025 17:26:55 +0100 Subject: [PATCH 6/7] Renaming functions and some small changes in `map_object_move.c` --- include/map_object.h | 4 ++-- src/map_object.c | 10 +++++----- src/map_object_move.c | 16 ++++++++-------- src/overlay005/ov5_021ECC20.c | 6 +++--- src/overlay005/ov5_021ECE40.c | 2 +- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/include/map_object.h b/include/map_object.h index 7c231a7dad..eaefa7223e 100644 --- a/include/map_object.h +++ b/include/map_object.h @@ -91,8 +91,8 @@ MapObject *MapObjectMan_GetMapObject(const MapObjectManager *mapObjMan); void sub_02062880(const MapObject **mapObj); void MapObjectMan_SetFieldSystem(MapObjectManager *mapObjMan, FieldSystem *fieldSystem); FieldSystem *MapObjectMan_FieldSystem(const MapObjectManager *mapObjMan); -void MapObjectMan_GetNARC(MapObjectManager *mapObjMan, NARC *narc); -NARC *sub_020628A0(const MapObjectManager *mapObjMan); +void MapObjectMan_SetNARC(MapObjectManager *mapObjMan, NARC *narc); +NARC *MapObjectMan_GetNARC(const MapObjectManager *mapObjMan); void MapObject_SetStatus(MapObject *mapObj, u32 status); u32 MapObject_GetStatus(const MapObject *mapObj); void MapObject_SetStatusFlagOn(MapObject *mapObj, u32 flag); diff --git a/src/map_object.c b/src/map_object.c index 1d4ab029d1..1bc5cf55fa 100644 --- a/src/map_object.c +++ b/src/map_object.c @@ -128,7 +128,7 @@ static MapObject *sub_020624CC(const MapObjectManager *mapObjMan, int localID, i static void sub_02062604(MapObject *mapObj); static void sub_02062618(MapObject *mapObj); static void sub_02062628(MapObject *mapObj); -static int FieldSystem_GetGraphicsID(FieldSystem *fieldSystem, int param1); +static int sub_0206262C(FieldSystem *fieldSystem, int param1); static void sub_02062648(MapObject *mapObj); static void sub_02062660(MapObject *mapObj); static void sub_02062670(MapObject *mapObj); @@ -689,7 +689,7 @@ static void MapObjectMan_AddMoveTask(const MapObjectManager *mapObjMan, MapObjec static void sub_020621E8(MapObject *mapObj, const ObjectEvent *objectEvent, FieldSystem *fieldSystem) { MapObject_SetLocalID(mapObj, ObjectEvent_GetLocalID(objectEvent)); - MapObject_SetGraphicsID(mapObj, FieldSystem_GetGraphicsID(fieldSystem, ObjectEvent_GetGraphicsID(objectEvent))); + MapObject_SetGraphicsID(mapObj, sub_0206262C(fieldSystem, ObjectEvent_GetGraphicsID(objectEvent))); MapObject_SetMovementType(mapObj, ObjectEvent_GetMovementType(objectEvent)); MapObject_SetTrainerType(mapObj, ObjectEvent_GetTrainerType(objectEvent)); MapObject_SetFlag(mapObj, ObjectEvent_GetFlag(objectEvent)); @@ -904,7 +904,7 @@ static void sub_02062628(MapObject *mapObj) (void)0; } -static int FieldSystem_GetGraphicsID(FieldSystem *fieldSystem, int graphicsID) +static int sub_0206262C(FieldSystem *fieldSystem, int graphicsID) { if (graphicsID >= 0x65 && graphicsID <= 0x74) { graphicsID -= 0x65; @@ -1135,12 +1135,12 @@ FieldSystem *MapObjectMan_FieldSystem(const MapObjectManager *mapObjMan) return mapObjMan->fieldSystem; } -void MapObjectMan_GetNARC(MapObjectManager *mapObjMan, NARC *narc) +void MapObjectMan_SetNARC(MapObjectManager *mapObjMan, NARC *narc) { mapObjMan->narc = narc; } -NARC *sub_020628A0(const MapObjectManager *mapObjMan) +NARC *MapObjectMan_GetNARC(const MapObjectManager *mapObjMan) { GF_ASSERT(mapObjMan->narc != NULL); return ((MapObjectManager *)mapObjMan)->narc; diff --git a/src/map_object_move.c b/src/map_object_move.c index 915784971a..568b196017 100644 --- a/src/map_object_move.c +++ b/src/map_object_move.c @@ -982,10 +982,10 @@ void sub_02064464(MapObject *mapObj) } static const int sOppositeDirections[] = { - DIR_SOUTH, - DIR_NORTH, - DIR_EAST, - DIR_WEST + [DIR_NORTH] = DIR_SOUTH, + [DIR_SOUTH] = DIR_NORTH, + [DIR_WEST] = DIR_EAST, + [DIR_EAST] = DIR_WEST }; int Direction_GetOpposite(int dir) @@ -993,17 +993,17 @@ int Direction_GetOpposite(int dir) return sOppositeDirections[dir]; } -int sub_02064488(int x, int z, int xPrev, int zPrev) +int sub_02064488(int param0, int param1, int param2, int param3) { - if (x > xPrev) { + if (param0 > param2) { return DIR_WEST; } - if (x < xPrev) { + if (param0 < param2) { return DIR_EAST; } - if (z > zPrev) { + if (param1 > param3) { return DIR_NORTH; } diff --git a/src/overlay005/ov5_021ECC20.c b/src/overlay005/ov5_021ECC20.c index 1eb9f48f3e..5d6470c193 100644 --- a/src/overlay005/ov5_021ECC20.c +++ b/src/overlay005/ov5_021ECC20.c @@ -52,12 +52,12 @@ void ov5_021ECC78(MapObjectManager *param0) static void ov5_021ECCA4(MapObjectManager *param0) { NARC *v0 = NARC_ctor(NARC_INDEX_DATA__MMODEL__MMODEL, 4); - MapObjectMan_GetNARC(param0, v0); + MapObjectMan_SetNARC(param0, v0); } static void ov5_021ECCBC(MapObjectManager *param0) { - NARC *v0 = sub_020628A0(param0); + NARC *v0 = MapObjectMan_GetNARC(param0); NARC_dtor(v0); } @@ -120,7 +120,7 @@ int ov5_021ECD38(const MapObject *param0) void *ov5_021ECD68(const MapObjectManager *param0, u32 param1, int param2) { void *v0; - NARC *v1 = sub_020628A0(param0); + NARC *v1 = MapObjectMan_GetNARC(param0); u32 v2 = NARC_GetMemberSize(v1, param1); if (param2 == 1) { diff --git a/src/overlay005/ov5_021ECE40.c b/src/overlay005/ov5_021ECE40.c index 4c641cfd31..d9f01b9a37 100644 --- a/src/overlay005/ov5_021ECE40.c +++ b/src/overlay005/ov5_021ECE40.c @@ -555,7 +555,7 @@ static int ov5_021ED2E8(UnkStruct_ov5_021ED0A4 *param0, UnkStruct_ov5_021F06D8 * GF_ASSERT(v0 != NULL); { - NARC *v1 = sub_020628A0(param0->unk_104); + NARC *v1 = MapObjectMan_GetNARC(param0->unk_104); ov5_021F0784(param1, param2, v1, v0->unk_04, 0); } From 3cd9699165c709b5ab3243072f03da9f4061883e Mon Sep 17 00:00:00 2001 From: Viperio19 Date: Fri, 17 Jan 2025 18:00:54 +0100 Subject: [PATCH 7/7] Renaming functions and data + rearranging if statements --- include/map_object.h | 4 +-- src/comm_player_manager.c | 2 +- src/map_object.c | 6 ++--- src/map_object_move.c | 51 +++++++++++++++++++++-------------- src/overlay009/ov9_02249960.c | 4 +-- src/player_avatar.c | 4 +-- src/scrcmd.c | 2 +- src/unk_0205C22C.c | 2 +- 8 files changed, 43 insertions(+), 32 deletions(-) diff --git a/include/map_object.h b/include/map_object.h index eaefa7223e..7a8d78858f 100644 --- a/include/map_object.h +++ b/include/map_object.h @@ -281,8 +281,8 @@ int ObjectEvent_GetY(const ObjectEvent *objectEvent); void ObjectEvent_SetZ(ObjectEvent *objectEvent, int z); int ObjectEvent_GetZ(const ObjectEvent *objectEvent); MapObject *sub_0206326C(const MapObjectManager *mapObjMan, int x, int z, int param3); -void sub_020632D4(MapObject *mapObj, const VecFx32 *pos, int param2); -void MapObject_SetPosDir(MapObject *mapObj, int x, int y, int z, int dir); +void MapObject_SetPosDirFromVec(MapObject *mapObj, const VecFx32 *pos, int dir); +void MapObject_SetPosDirFromCoords(MapObject *mapObj, int x, int y, int z, int dir); void MapObject_SetMoveCode(MapObject *mapObj, u32 param1); void sub_020633C8(MapObject *mapObj, int localID); void sub_020633E0(MapObject *mapObj); diff --git a/src/comm_player_manager.c b/src/comm_player_manager.c index d8dc53893d..b97c41cf7a 100644 --- a/src/comm_player_manager.c +++ b/src/comm_player_manager.c @@ -1771,7 +1771,7 @@ void CommPlayerMan_ForcePos(void) MapObject_SetX(obj, x); MapObject_SetZ(obj, z); - MapObject_SetPosDir(obj, x, 0, z, dir); + MapObject_SetPosDirFromCoords(obj, x, 0, z, dir); } } diff --git a/src/map_object.c b/src/map_object.c index 1bc5cf55fa..bbb3e033c6 100644 --- a/src/map_object.c +++ b/src/map_object.c @@ -2429,7 +2429,7 @@ MapObject *sub_0206326C(const MapObjectManager *mapObjMan, int x, int z, int par return NULL; } -void sub_020632D4(MapObject *mapObj, const VecFx32 *pos, int param2) +void MapObject_SetPosDirFromVec(MapObject *mapObj, const VecFx32 *pos, int dir) { int x, y, z; @@ -2445,14 +2445,14 @@ void sub_020632D4(MapObject *mapObj, const VecFx32 *pos, int param2) MapObject_SetPos(mapObj, pos); MapObject_UpdateCoords(mapObj); - MapObject_Face(mapObj, param2); + MapObject_Face(mapObj, dir); sub_020656DC(mapObj); MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_START_MOVEMENT); MapObject_SetStatusFlagOff(mapObj, MAP_OBJ_STATUS_1 | MAP_OBJ_STATUS_END_MOVEMENT); } -void MapObject_SetPosDir(MapObject *mapObj, int x, int y, int z, int dir) +void MapObject_SetPosDirFromCoords(MapObject *mapObj, int x, int y, int z, int dir) { VecFx32 pos; diff --git a/src/map_object_move.c b/src/map_object_move.c index 568b196017..9933f2d224 100644 --- a/src/map_object_move.c +++ b/src/map_object_move.c @@ -385,10 +385,14 @@ static void sub_02063A78(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBeha return; } - if (TileBehavior_IsTallGrass(currTileBehavior) == TRUE || TileBehavior_IsVeryTallGrass(currTileBehavior) == TRUE - || MapObject_IsOnWater(mapObj, currTileBehavior) == TRUE || TileBehavior_IsPuddle(currTileBehavior) == TRUE - || TileBehavior_IsShallowWater(currTileBehavior) == TRUE || MapObject_IsOnSnow(mapObj, currTileBehavior) == TRUE - || TileBehavior_IsMud(currTileBehavior) == TRUE || TileBehavior_IsMudWithGrass(currTileBehavior) == TRUE + if (TileBehavior_IsTallGrass(currTileBehavior) == TRUE + || TileBehavior_IsVeryTallGrass(currTileBehavior) == TRUE + || MapObject_IsOnWater(mapObj, currTileBehavior) == TRUE + || TileBehavior_IsPuddle(currTileBehavior) == TRUE + || TileBehavior_IsShallowWater(currTileBehavior) == TRUE + || MapObject_IsOnSnow(mapObj, currTileBehavior) == TRUE + || TileBehavior_IsMud(currTileBehavior) == TRUE + || TileBehavior_IsMudWithGrass(currTileBehavior) == TRUE || TileBehavior_IsReflective(currTileBehavior)) { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_HIDE_SHADOW); } else { @@ -411,10 +415,14 @@ static void sub_02063B20(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBeha return; } - if (TileBehavior_IsTallGrass(currTileBehavior) == TRUE || TileBehavior_IsVeryTallGrass(currTileBehavior) == TRUE - || MapObject_IsOnWater(mapObj, currTileBehavior) == TRUE || TileBehavior_IsPuddle(currTileBehavior) == TRUE - || TileBehavior_IsShallowWater(currTileBehavior) == TRUE || MapObject_IsOnSnow(mapObj, currTileBehavior) == TRUE - || TileBehavior_IsMud(currTileBehavior) == TRUE || TileBehavior_IsMudWithGrass(currTileBehavior) == TRUE + if (TileBehavior_IsTallGrass(currTileBehavior) == TRUE + || TileBehavior_IsVeryTallGrass(currTileBehavior) == TRUE + || MapObject_IsOnWater(mapObj, currTileBehavior) == TRUE + || TileBehavior_IsPuddle(currTileBehavior) == TRUE + || TileBehavior_IsShallowWater(currTileBehavior) == TRUE + || MapObject_IsOnSnow(mapObj, currTileBehavior) == TRUE + || TileBehavior_IsMud(currTileBehavior) == TRUE + || TileBehavior_IsMudWithGrass(currTileBehavior) == TRUE || TileBehavior_IsReflective(currTileBehavior)) { MapObject_SetStatusFlagOn(mapObj, MAP_OBJ_STATUS_HIDE_SHADOW); } else { @@ -424,9 +432,12 @@ static void sub_02063B20(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBeha static void sub_02063BB4(MapObject *mapObj, u8 currTileBehavior, u8 prevTileBehavior, const UnkStruct_ov5_021ECD10 *param3) { - if (MapObject_IsOnWater(mapObj, currTileBehavior) == TRUE || TileBehavior_IsShallowWater(currTileBehavior) == TRUE - || TileBehavior_IsIce(currTileBehavior) == TRUE || TileBehavior_IsMud(currTileBehavior) == TRUE - || TileBehavior_IsMudWithGrass(currTileBehavior) == TRUE || MapObject_IsOnSnow(mapObj, currTileBehavior) == TRUE) { + if (MapObject_IsOnWater(mapObj, currTileBehavior) == TRUE + || TileBehavior_IsShallowWater(currTileBehavior) == TRUE + || TileBehavior_IsIce(currTileBehavior) == TRUE + || TileBehavior_IsMud(currTileBehavior) == TRUE + || TileBehavior_IsMudWithGrass(currTileBehavior) == TRUE + || MapObject_IsOnSnow(mapObj, currTileBehavior) == TRUE) { return; } @@ -796,13 +807,13 @@ int MapObject_IsOnBikeBridgeEastWest(MapObject *mapObj, u32 tileBehavior) } static const int sMapObjectDxDir[] = { - 0x0, - 0x0, - -1, - 0x1 + [DIR_NORTH] = 0, + [DIR_SOUTH] = 0, + [DIR_WEST] = -1, + [DIR_EAST] = 1 }; -static const int DATA_GPosY_Dir4AddTbl[] = { +static const int UNUSED_GPosY_Dir4AddTbl[] = { 0, 0, 0, @@ -810,10 +821,10 @@ static const int DATA_GPosY_Dir4AddTbl[] = { }; static const int sMapObjectDzDir[] = { - -1, - 0x1, - 0x0, - 0x0 + [DIR_NORTH] = -1, + [DIR_SOUTH] = 1, + [DIR_WEST] = 0, + [DIR_EAST] = 0 }; int MapObject_GetDxFromDir(int dir) diff --git a/src/overlay009/ov9_02249960.c b/src/overlay009/ov9_02249960.c index fe0c96f456..f6ebe4cda9 100644 --- a/src/overlay009/ov9_02249960.c +++ b/src/overlay009/ov9_02249960.c @@ -7191,7 +7191,7 @@ static BOOL ov9_0224EF64(UnkStruct_ov9_02249B04 *param0, MapObject **param1, con if (v0 == NULL) { UnkStruct_020216E0 *v1; - MapObject_SetPosDir(*param1, param2->unk_08.x, (((param2->unk_08.y) >> 3) / FX32_ONE), param2->unk_08.z, param2->unk_08.dir); + MapObject_SetPosDirFromCoords(*param1, param2->unk_08.x, (((param2->unk_08.y) >> 3) / FX32_ONE), param2->unk_08.z, param2->unk_08.dir); v1 = ov5_021EB1A0(*param1); @@ -7455,7 +7455,7 @@ static BOOL ov9_0224F324(UnkStruct_ov9_0224F6EC *param0) Sound_PlayEffect(1571); v1.y = ((115 << 4) * FX32_ONE); - sub_020632D4(v2, &v1, MapObject_GetFacingDir(v2)); + MapObject_SetPosDirFromVec(v2, &v1, MapObject_GetFacingDir(v2)); sub_02062914(v2, 580); { diff --git a/src/player_avatar.c b/src/player_avatar.c index 0ec6ba3f12..5f2a13401b 100644 --- a/src/player_avatar.c +++ b/src/player_avatar.c @@ -530,7 +530,7 @@ void sub_0205ECB8(PlayerAvatar *playerAvatar, const VecFx32 *param1, int param2) { MapObject *mapObj = Player_MapObject(playerAvatar); - sub_020632D4(mapObj, param1, param2); + MapObject_SetPosDirFromVec(mapObj, param1, param2); sub_0205EB08(playerAvatar, 0); sub_0205EB10(playerAvatar, 0); } @@ -539,7 +539,7 @@ void sub_0205ECE0(PlayerAvatar *playerAvatar, int param1, int param2, int param3 { MapObject *mapObj = Player_MapObject(playerAvatar); - MapObject_SetPosDir(mapObj, param1, 0, param2, param3); + MapObject_SetPosDirFromCoords(mapObj, param1, 0, param2, param3); sub_0205EB08(playerAvatar, 0); sub_0205EB10(playerAvatar, 0); } diff --git a/src/scrcmd.c b/src/scrcmd.c index 6dace8745a..94614742e6 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -5632,7 +5632,7 @@ static BOOL ScrCmd_187(ScriptContext *ctx) v0 = MapObjMan_LocalMapObjByIndex(ctx->fieldSystem->mapObjMan, v1); - MapObject_SetPosDir(v0, v2, v3, v4, v5); + MapObject_SetPosDirFromCoords(v0, v2, v3, v4, v5); sub_020642F8(v0); return 0; diff --git a/src/unk_0205C22C.c b/src/unk_0205C22C.c index 93f4f2ad8b..0c7cc90306 100644 --- a/src/unk_0205C22C.c +++ b/src/unk_0205C22C.c @@ -371,7 +371,7 @@ static void sub_0205C6E0(UnkStruct_0205C680 *param0, MapObject *param1, int para Sound_PlayEffect(1615); sub_02061AD4(param1, param0->unk_08); sub_0205C680(param0, 0); - MapObject_SetPosDir(param1, v0, v1, v2, 1); + MapObject_SetPosDirFromCoords(param1, v0, v1, v2, 1); MapObject_Face(param1, 1); LocalMapObj_SetAnimationCode(param1, 0x44); MapObject_SetHidden(param1, 0);