From b6f615f95c581d58cdd7dfdf2947d9cd7058ca93 Mon Sep 17 00:00:00 2001 From: Viperio19 Date: Sun, 29 Dec 2024 23:57:28 +0100 Subject: [PATCH] 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; } }