From da15089bc31f0cdb616bbe02c8e91e1c3997f5ae Mon Sep 17 00:00:00 2001 From: Viperio19 Date: Thu, 21 Nov 2024 08:07:02 +0100 Subject: [PATCH] Remove more unnecessary scope blocks and replace `taskMan` in files from this PR with `task` --- include/field_map_change.h | 24 +-- include/overlay006/ov6_02247100.h | 8 +- include/unk_020528D0.h | 4 +- src/field_map_change.c | 338 +++++++++++++++--------------- src/overlay005/fieldmap.c | 56 ++--- src/overlay006/ov6_02247100.c | 56 ++--- src/unk_020528D0.c | 32 +-- src/unk_020683F4.c | 44 ++-- 8 files changed, 276 insertions(+), 286 deletions(-) diff --git a/include/field_map_change.h b/include/field_map_change.h index 99dc5ff9c5..314bab79b0 100644 --- a/include/field_map_change.h +++ b/include/field_map_change.h @@ -13,23 +13,23 @@ void sub_02053494(FieldSystem *fieldSystem); void FieldSystem_SetLoadNewGameSpawnTask(FieldSystem *fieldSystem); void FieldSystem_SetLoadSavedGameMapTask(FieldSystem *fieldSystem); void FieldSystem_StartLoadMapFromErrorTask(FieldSystem *fieldSystem); -void FieldSystem_StartChangeMapTask(FieldTask *taskMan, const Location *param1); -void FieldTask_ChangeMapByLocation(FieldTask *taskMan, const Location *param1); -void FieldTask_ChangeMapToLocation(FieldTask *taskMan, int param1, int param2, int param3, int param4, int param5); -void FieldTask_StartMapChangeFull(FieldTask *taskMan, int param1, int param2, int param3, int param4, int param5); +void FieldSystem_StartChangeMapTask(FieldTask *task, const Location *param1); +void FieldTask_ChangeMapByLocation(FieldTask *task, const Location *param1); +void FieldTask_ChangeMapToLocation(FieldTask *task, int param1, int param2, int param3, int param4, int param5); +void FieldTask_StartMapChangeFull(FieldTask *task, int param1, int param2, int param3, int param4, int param5); void FieldTask_StartMapChangeFly(FieldSystem *fieldSystem, int param1, int param2, int param3, int param4, int param5); -void FieldTask_ChangeMapChangeFly(FieldTask *taskMan, int param1, int param2, int param3, int param4, int param5); -void FieldTask_ChangeMapChangeByDig(FieldTask *taskMan, const Location *location, u32 param2); +void FieldTask_ChangeMapChangeFly(FieldTask *task, int param1, int param2, int param3, int param4, int param5); +void FieldTask_ChangeMapChangeByDig(FieldTask *task, const Location *location, u32 param2); void FieldSystem_StartMapChangeWarpTask(FieldSystem *fieldSystem, int param1, int param2); void *sub_02053FAC(FieldSystem *fieldSystem); void FieldTask_SetUndergroundMapChange(FieldSystem *fieldSystem); -BOOL FieldTask_MapChangeToUnderground(FieldTask *taskMan); -BOOL sub_0205430C(FieldTask *taskMan); +BOOL FieldTask_MapChangeToUnderground(FieldTask *task); +BOOL sub_0205430C(FieldTask *task); FieldTaskFunc FieldMapChange_GetMapChangeUndergroundTask(const FieldSystem *fieldSystem); -void sub_020544F0(FieldTask *taskMan, const Location *param1); +void sub_020544F0(FieldTask *task, const Location *param1); void sub_020545EC(FieldSystem *fieldSystem); -void sub_02054708(FieldTask *taskMan); -void sub_02054800(FieldTask *taskMan, int param1, int param2, int param3, int param4, int param5); -void sub_02054864(FieldTask *taskMan); +void sub_02054708(FieldTask *task); +void sub_02054800(FieldTask *task, int param1, int param2, int param3, int param4, int param5); +void sub_02054864(FieldTask *task); #endif // POKEPLATINUM_FIELD_MAP_CHANGE_H diff --git a/include/overlay006/ov6_02247100.h b/include/overlay006/ov6_02247100.h index 2735c4e8cd..0f88a0e4d4 100644 --- a/include/overlay006/ov6_02247100.h +++ b/include/overlay006/ov6_02247100.h @@ -7,12 +7,12 @@ #include "pokemon.h" void *ov6_02247100(FieldSystem *fieldSystem, u32 param1); -BOOL ov6_02247120(FieldTask *param0); +BOOL ov6_02247120(FieldTask *task); void *ov6_022472C8(FieldSystem *fieldSystem, u32 param1, int param2); -BOOL ov6_022472E8(FieldTask *param0); +BOOL ov6_022472E8(FieldTask *task); void *ov6_02247488(FieldSystem *, Pokemon *, u32 param0); -BOOL ov6_022474AC(FieldTask *param0); +BOOL ov6_022474AC(FieldTask *task); void *ov6_02247530(FieldSystem *fieldSystem, Pokemon *param1, u32 param2); -BOOL ov6_02247554(FieldTask *param0); +BOOL ov6_02247554(FieldTask *task); #endif // POKEPLATINUM_OV6_02247100_H diff --git a/include/unk_020528D0.h b/include/unk_020528D0.h index df61e031f0..5d9afb1a8a 100644 --- a/include/unk_020528D0.h +++ b/include/unk_020528D0.h @@ -3,7 +3,7 @@ #include "field_task.h" -BOOL sub_02052B2C(FieldTask *taskMan); -void sub_02052C5C(FieldTask *taskMan); +BOOL sub_02052B2C(FieldTask *task); +void sub_02052C5C(FieldTask *task); #endif // POKEPLATINUM_UNK_020528D0_H diff --git a/src/field_map_change.c b/src/field_map_change.c index 63137851a4..8c4784e393 100644 --- a/src/field_map_change.c +++ b/src/field_map_change.c @@ -132,28 +132,28 @@ typedef struct MapChangeUnionData { Location location; } MapChangeUnionData; -static BOOL FieldTask_ChangeMap(FieldTask *taskMan); -static BOOL FieldTask_LoadNewGameSpawn(FieldTask *taskMan); +static BOOL FieldTask_ChangeMap(FieldTask *task); +static BOOL FieldTask_LoadNewGameSpawn(FieldTask *task); static void FieldMapChange_SetNewLocation(FieldSystem *fieldSystem, const Location *param1); static void FieldMapChange_InitTerrainCollisionManager(FieldSystem *fieldSystem); static void FieldMapChange_RemoveTerrainCollisionManager(FieldSystem *fieldSystem); static void FieldMapChange_CreatePlayerObject(FieldSystem *fieldSystem); static void sub_02053374(FieldSystem *fieldSystem); static void sub_020534BC(FieldSystem *fieldSystem); -static BOOL FieldTask_MapChangeFly(FieldTask *taskMan); -static void FieldTask_FinishFly(FieldTask *taskMan); -static BOOL FieldTransition_FinishMapFly(FieldTask *taskMan); -static void FieldTransition_StartMapAndFadeInFly(FieldTask *taskMan); -static BOOL FieldTransition_StartMapAndFadeInFlySub(FieldTask *taskMan); -static void FieldTask_FadeInFly(FieldTask *taskMan); -static BOOL FieldTask_WaitFadeInFly(FieldTask *taskMan); -static BOOL FieldTask_MapChangeByDig(FieldTask *taskMan); -static void FieldTask_StartFinishFieldMapDig(FieldTask *taskMan); -static BOOL FieldTransition_FinishMapDig(FieldTask *taskMan); -static void FieldTransition_StartMapAndFadeInDig(FieldTask *taskMan); -static BOOL FieldTask_FadeInDig(FieldTask *taskMan); -static void sub_02053E5C(FieldTask *taskMan); -static BOOL sub_0205444C(FieldTask *taskMan, int param1); +static BOOL FieldTask_MapChangeFly(FieldTask *task); +static void FieldTask_FinishFly(FieldTask *task); +static BOOL FieldTransition_FinishMapFly(FieldTask *task); +static void FieldTransition_StartMapAndFadeInFly(FieldTask *task); +static BOOL FieldTransition_StartMapAndFadeInFlySub(FieldTask *task); +static void FieldTask_FadeInFly(FieldTask *task); +static BOOL FieldTask_WaitFadeInFly(FieldTask *task); +static BOOL FieldTask_MapChangeByDig(FieldTask *task); +static void FieldTask_StartFinishFieldMapDig(FieldTask *task); +static BOOL FieldTransition_FinishMapDig(FieldTask *task); +static void FieldTransition_StartMapAndFadeInDig(FieldTask *task); +static BOOL FieldTask_FadeInDig(FieldTask *task); +static void sub_02053E5C(FieldTask *task); +static BOOL sub_0205444C(FieldTask *task, int param1); static const MapLoadMode sMapLoadMode[] = { { 0x1, 0x0, 0x0, 0x0, 0x0, 0x1, 0x0, 0xC4000 }, @@ -445,10 +445,10 @@ static void FieldSystem_SetLocationToUnionRoomExit(FieldSystem *fieldSystem) Location_Set(exit, fieldSystem->location->mapId, -1, 8, 2, 1); } -static BOOL FieldTask_LoadNewGameSpawn(FieldTask *taskMan) +static BOOL FieldTask_LoadNewGameSpawn(FieldTask *task) { - FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); - int *state = FieldTask_GetState(taskMan); + FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task); + int *state = FieldTask_GetState(task); switch (*state) { case 0: @@ -459,7 +459,7 @@ static BOOL FieldTask_LoadNewGameSpawn(FieldTask *taskMan) (*state)++; break; case 1: - FieldTransition_StartMapAndFadeIn(taskMan); + FieldTransition_StartMapAndFadeIn(task); (*state)++; break; case 2: @@ -481,11 +481,11 @@ static inline BOOL CheckJournalAcquired(VarsFlags *varsFlags) return SystemFlag_HandleJournalAcquired(varsFlags, HANDLE_FLAG_CHECK); } -static BOOL FieldTask_LoadSavedGameMap(FieldTask *taskMan) +static BOOL FieldTask_LoadSavedGameMap(FieldTask *task) { - FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); + FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task); VarsFlags *varsFlags = SaveData_GetVarsFlags(fieldSystem->saveData); - int *state = FieldTask_GetState(taskMan); + int *state = FieldTask_GetState(task); switch (*state) { case 0: @@ -523,7 +523,7 @@ static BOOL FieldTask_LoadSavedGameMap(FieldTask *taskMan) (*state) = 2; break; case 2: - FieldTransition_StartMapAndFadeIn(taskMan); + FieldTransition_StartMapAndFadeIn(task); (*state) = 3; break; case 3: @@ -544,12 +544,12 @@ void FieldSystem_SetLoadSavedGameMapTask(FieldSystem *fieldSystem) FieldSystem_CreateTask(fieldSystem, FieldTask_LoadSavedGameMap, NULL); } -static BOOL FieldTask_LoadMapFromError(FieldTask *taskMan) +static BOOL FieldTask_LoadMapFromError(FieldTask *task) { - FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); - MapChangeFromErrorData *errorData = FieldTask_GetEnv(taskMan); + FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task); + MapChangeFromErrorData *errorData = FieldTask_GetEnv(task); VarsFlags *varsFlags = SaveData_GetVarsFlags(fieldSystem->saveData); - int *state = FieldTask_GetState(taskMan); + int *state = FieldTask_GetState(task); switch (*state) { case 0: @@ -570,7 +570,7 @@ static BOOL FieldTask_LoadMapFromError(FieldTask *taskMan) case 2: fieldSystem->unk_7C = FieldSystem_InitCommUnionRoom(fieldSystem); fieldSystem->unk_80 = sub_0205C22C(fieldSystem->unk_7C); - FieldTransition_StartMap(taskMan); + FieldTransition_StartMap(task); (*state)++; break; case 3: @@ -615,21 +615,21 @@ void FieldSystem_StartLoadMapFromErrorTask(FieldSystem *fieldSystem) FieldSystem_CreateTask(fieldSystem, FieldTask_LoadMapFromError, errorData); } -static BOOL FieldTask_ChangeMap(FieldTask *taskMan) +static BOOL FieldTask_ChangeMap(FieldTask *task) { - FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); - MapChangeData *mapChangeData = FieldTask_GetEnv(taskMan); + FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task); + MapChangeData *mapChangeData = FieldTask_GetEnv(task); Location *location = &mapChangeData->nextLocation; switch (mapChangeData->state) { case 0: Sound_PlayEffect(1539); Sound_TryFadeInBGM(fieldSystem, location->mapId); - FieldTransition_FadeOutAndFinishMap(taskMan); + FieldTransition_FadeOutAndFinishMap(task); mapChangeData->state++; break; case 1: - FieldTask_ChangeMapByLocation(taskMan, &mapChangeData->nextLocation); + FieldTask_ChangeMapByLocation(task, &mapChangeData->nextLocation); mapChangeData->state++; break; case 2: @@ -638,7 +638,7 @@ static BOOL FieldTask_ChangeMap(FieldTask *taskMan) } Sound_PlayMapBGM(fieldSystem, location->mapId); - FieldTransition_StartMapAndFadeIn(taskMan); + FieldTransition_StartMapAndFadeIn(task); mapChangeData->state++; break; case 3: @@ -649,20 +649,20 @@ static BOOL FieldTask_ChangeMap(FieldTask *taskMan) return FALSE; } -void FieldSystem_StartChangeMapTask(FieldTask *taskMan, const Location *nextLocation) +void FieldSystem_StartChangeMapTask(FieldTask *task, const Location *nextLocation) { MapChangeData *mapChangeData = Heap_AllocFromHeapAtEnd(11, sizeof(MapChangeData)); mapChangeData->state = 0; mapChangeData->nextLocation = *nextLocation; - FieldTask_InitCall(taskMan, FieldTask_ChangeMap, mapChangeData); + FieldTask_InitCall(task, FieldTask_ChangeMap, mapChangeData); } -static BOOL FieldTask_ChangeMapSub(FieldTask *taskMan) +static BOOL FieldTask_ChangeMapSub(FieldTask *task) { - FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); - MapChangeSubData *mapChangeSub = FieldTask_GetEnv(taskMan); + FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task); + MapChangeSubData *mapChangeSub = FieldTask_GetEnv(task); switch (mapChangeSub->state) { case 0: @@ -686,9 +686,9 @@ static BOOL FieldTask_ChangeMapSub(FieldTask *taskMan) return 0; } -void FieldTask_ChangeMapByLocation(FieldTask *taskMan, const Location *nextLocation) +void FieldTask_ChangeMapByLocation(FieldTask *task, const Location *nextLocation) { - FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); + FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task); MapChangeSubData *mapChangeSub = Heap_AllocFromHeapAtEnd(11, sizeof(MapChangeSubData)); if (FieldSystem_HasParentProcess(fieldSystem)) { @@ -699,31 +699,31 @@ void FieldTask_ChangeMapByLocation(FieldTask *taskMan, const Location *nextLocat mapChangeSub->state = 0; mapChangeSub->nextLocation = *nextLocation; - FieldTask_InitCall(taskMan, FieldTask_ChangeMapSub, mapChangeSub); + FieldTask_InitCall(task, FieldTask_ChangeMapSub, mapChangeSub); } -void FieldTask_ChangeMapToLocation(FieldTask *taskMan, int param1, int param2, int param3, int param4, int param5) +void FieldTask_ChangeMapToLocation(FieldTask *task, int param1, int param2, int param3, int param4, int param5) { Location location; Location_Set(&location, param1, param2, param3, param4, param5); - FieldTask_ChangeMapByLocation(taskMan, &location); + FieldTask_ChangeMapByLocation(task, &location); } -static BOOL FieldTask_ChangeMapFull(FieldTask *taskMan) +static BOOL FieldTask_ChangeMapFull(FieldTask *task) { - FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); - MapChangeSubData *mapChangeSub = FieldTask_GetEnv(taskMan); + FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task); + MapChangeSubData *mapChangeSub = FieldTask_GetEnv(task); Location *nextLocation = &mapChangeSub->nextLocation; switch (mapChangeSub->state) { case 0: Sound_TryFadeInBGM(fieldSystem, nextLocation->mapId); - FieldTransition_FinishMap(taskMan); + FieldTransition_FinishMap(task); mapChangeSub->state++; break; case 1: - FieldTask_ChangeMapByLocation(taskMan, &mapChangeSub->nextLocation); + FieldTask_ChangeMapByLocation(task, &mapChangeSub->nextLocation); mapChangeSub->state++; break; case 2: @@ -732,7 +732,7 @@ static BOOL FieldTask_ChangeMapFull(FieldTask *taskMan) } Sound_PlayMapBGM(fieldSystem, nextLocation->mapId); - FieldTransition_StartMap(taskMan); + FieldTransition_StartMap(task); mapChangeSub->state++; break; case 3: @@ -743,14 +743,14 @@ static BOOL FieldTask_ChangeMapFull(FieldTask *taskMan) return FALSE; } -void FieldTask_StartMapChangeFull(FieldTask *taskMan, int mapId, int param2, int x, int z, int dir) +void FieldTask_StartMapChangeFull(FieldTask *task, int mapId, int param2, int x, int z, int dir) { MapChangeSubData *mapChangeSub = Heap_AllocFromHeapAtEnd(11, sizeof(MapChangeSubData)); mapChangeSub->state = 0; Location_Set(&mapChangeSub->nextLocation, mapId, param2, x, z, dir); - FieldTask_InitCall(taskMan, FieldTask_ChangeMapFull, mapChangeSub); + FieldTask_InitCall(task, FieldTask_ChangeMapFull, mapChangeSub); } void FieldTask_StartMapChangeFly(FieldSystem *fieldSystem, int param1, int param2, int param3, int param4, int param5) @@ -768,7 +768,7 @@ void FieldTask_StartMapChangeFly(FieldSystem *fieldSystem, int param1, int param FieldSystem_CreateTask(fieldSystem, FieldTask_MapChangeFly, mapChangeData); } -void FieldTask_ChangeMapChangeFly(FieldTask *taskMan, int param1, int param2, int param3, int param4, int param5) +void FieldTask_ChangeMapChangeFly(FieldTask *task, int param1, int param2, int param3, int param4, int param5) { Location location; @@ -780,24 +780,24 @@ void FieldTask_ChangeMapChangeFly(FieldTask *taskMan, int param1, int param2, in mapChangeData->task = NULL; mapChangeData->location = location; - FieldTask_InitJump(taskMan, FieldTask_MapChangeFly, mapChangeData); + FieldTask_InitJump(task, FieldTask_MapChangeFly, mapChangeData); } -static BOOL FieldTask_MapChangeFly(FieldTask *taskMan) +static BOOL FieldTask_MapChangeFly(FieldTask *task) { - FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); - MapChangeFlyData *mapChangeData = FieldTask_GetEnv(taskMan); + FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task); + MapChangeFlyData *mapChangeData = FieldTask_GetEnv(task); Location *location = &mapChangeData->location; switch (mapChangeData->state) { case 0: Sound_TryFadeInBGM(fieldSystem, location->mapId); - FieldTask_FinishFly(taskMan); + FieldTask_FinishFly(task); mapChangeData->state++; break; case 1: PlayerAvatar_SetPlayerState(fieldSystem->playerAvatar, 0x0); - FieldTask_ChangeMapByLocation(taskMan, &mapChangeData->location); + FieldTask_ChangeMapByLocation(task, &mapChangeData->location); mapChangeData->state++; break; case 2: @@ -807,7 +807,7 @@ static BOOL FieldTask_MapChangeFly(FieldTask *taskMan) Sound_PlayMapBGM(fieldSystem, location->mapId); sub_0207056C(fieldSystem); - FieldTransition_StartMapAndFadeInFly(taskMan); + FieldTransition_StartMapAndFadeInFly(task); mapChangeData->state++; break; case 3: @@ -818,18 +818,18 @@ static BOOL FieldTask_MapChangeFly(FieldTask *taskMan) return 0; } -static void FieldTask_FinishFly(FieldTask *taskMan) +static void FieldTask_FinishFly(FieldTask *task) { - FieldTask_InitCall(taskMan, FieldTransition_FinishMapFly, NULL); + FieldTask_InitCall(task, FieldTransition_FinishMapFly, NULL); } -static BOOL FieldTransition_FinishMapFly(FieldTask *taskMan) +static BOOL FieldTransition_FinishMapFly(FieldTask *task) { - int *state = FieldTask_GetState(taskMan); + int *state = FieldTask_GetState(task); switch (*state) { case 0: - FieldTransition_FinishMap(taskMan); + FieldTransition_FinishMap(task); (*state)++; break; case 1: @@ -839,25 +839,25 @@ static BOOL FieldTransition_FinishMapFly(FieldTask *taskMan) return FALSE; } -static void FieldTransition_StartMapAndFadeInFly(FieldTask *taskMan) +static void FieldTransition_StartMapAndFadeInFly(FieldTask *task) { - MapChangeFlyData *mapChangeData = FieldTask_GetEnv(taskMan); - FieldTask_InitCall(taskMan, FieldTransition_StartMapAndFadeInFlySub, mapChangeData); + MapChangeFlyData *mapChangeData = FieldTask_GetEnv(task); + FieldTask_InitCall(task, FieldTransition_StartMapAndFadeInFlySub, mapChangeData); } -static BOOL FieldTransition_StartMapAndFadeInFlySub(FieldTask *taskMan) +static BOOL FieldTransition_StartMapAndFadeInFlySub(FieldTask *task) { - int *state = FieldTask_GetState(taskMan); - FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); + int *state = FieldTask_GetState(task); + FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task); switch (*state) { case 0: - FieldTransition_StartMap(taskMan); + FieldTransition_StartMap(task); (*state)++; break; case 1: FieldSystem_RequestLocationName(fieldSystem); - FieldTask_FadeInFly(taskMan); + FieldTask_FadeInFly(task); (*state)++; break; case 2: @@ -867,10 +867,10 @@ static BOOL FieldTransition_StartMapAndFadeInFlySub(FieldTask *taskMan) return FALSE; } -static void FieldTask_FadeInFly(FieldTask *taskMan) +static void FieldTask_FadeInFly(FieldTask *task) { - FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); - MapChangeFlyData *mapChangeData = FieldTask_GetEnv(taskMan); + FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task); + MapChangeFlyData *mapChangeData = FieldTask_GetEnv(task); if (!FieldSystem_HasParentProcess(fieldSystem)) { GF_ASSERT(FALSE); @@ -878,12 +878,12 @@ static void FieldTask_FadeInFly(FieldTask *taskMan) } mapChangeData->task = FieldTask_InitFlyLandingTask(fieldSystem, PlayerAvatar_Gender(fieldSystem->playerAvatar)); - FieldTask_InitCall(taskMan, FieldTask_WaitFadeInFly, mapChangeData); + FieldTask_InitCall(task, FieldTask_WaitFadeInFly, mapChangeData); } -static BOOL FieldTask_WaitFadeInFly(FieldTask *taskMan) +static BOOL FieldTask_WaitFadeInFly(FieldTask *task) { - MapChangeFlyData *mapChangeData = FieldTask_GetEnv(taskMan); + MapChangeFlyData *mapChangeData = FieldTask_GetEnv(task); if (ov6_02245CF0(mapChangeData->task) == 1) { ov6_02245CFC(mapChangeData->task); @@ -893,7 +893,7 @@ static BOOL FieldTask_WaitFadeInFly(FieldTask *taskMan) return FALSE; } -void FieldTask_ChangeMapChangeByDig(FieldTask *taskMan, const Location *location, u32 param2) +void FieldTask_ChangeMapChangeByDig(FieldTask *task, const Location *location, u32 param2) { MapChangeDigData *mapChangeData = Heap_AllocFromHeapAtEnd(11, sizeof(MapChangeDigData)); @@ -902,24 +902,24 @@ void FieldTask_ChangeMapChangeByDig(FieldTask *taskMan, const Location *location mapChangeData->task = NULL; mapChangeData->location = *location; - FieldTask_InitJump(taskMan, FieldTask_MapChangeByDig, mapChangeData); + FieldTask_InitJump(task, FieldTask_MapChangeByDig, mapChangeData); } -static BOOL FieldTask_MapChangeByDig(FieldTask *taskMan) +static BOOL FieldTask_MapChangeByDig(FieldTask *task) { - FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); - MapChangeDigData *mapChangeData = FieldTask_GetEnv(taskMan); + FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task); + MapChangeDigData *mapChangeData = FieldTask_GetEnv(task); Location *location = &mapChangeData->location; switch (mapChangeData->state) { case 0: Sound_TryFadeInBGM(fieldSystem, location->mapId); - FieldTask_StartFinishFieldMapDig(taskMan); + FieldTask_StartFinishFieldMapDig(task); mapChangeData->state++; break; case 1: PlayerAvatar_SetPlayerState(fieldSystem->playerAvatar, 0x0); - FieldTask_ChangeMapByLocation(taskMan, &mapChangeData->location); + FieldTask_ChangeMapByLocation(task, &mapChangeData->location); mapChangeData->state++; break; case 2: @@ -937,7 +937,7 @@ static BOOL FieldTask_MapChangeByDig(FieldTask *taskMan) GF_ASSERT(FALSE); } - FieldTransition_StartMapAndFadeInDig(taskMan); + FieldTransition_StartMapAndFadeInDig(task); mapChangeData->state++; break; case 3: @@ -948,18 +948,18 @@ static BOOL FieldTask_MapChangeByDig(FieldTask *taskMan) return FALSE; } -static void FieldTask_StartFinishFieldMapDig(FieldTask *taskMan) +static void FieldTask_StartFinishFieldMapDig(FieldTask *task) { - FieldTask_InitCall(taskMan, FieldTransition_FinishMapDig, NULL); + FieldTask_InitCall(task, FieldTransition_FinishMapDig, NULL); } -static BOOL FieldTransition_FinishMapDig(FieldTask *taskMan) +static BOOL FieldTransition_FinishMapDig(FieldTask *task) { - int *state = FieldTask_GetState(taskMan); + int *state = FieldTask_GetState(task); switch (*state) { case 0: - FieldTransition_FinishMap(taskMan); + FieldTransition_FinishMap(task); (*state)++; break; case 1: @@ -969,26 +969,26 @@ static BOOL FieldTransition_FinishMapDig(FieldTask *taskMan) return FALSE; } -static void FieldTransition_StartMapAndFadeInDig(FieldTask *taskMan) +static void FieldTransition_StartMapAndFadeInDig(FieldTask *task) { - MapChangeDigData *mapChangeData = FieldTask_GetEnv(taskMan); - FieldTask_InitCall(taskMan, FieldTask_FadeInDig, mapChangeData); + MapChangeDigData *mapChangeData = FieldTask_GetEnv(task); + FieldTask_InitCall(task, FieldTask_FadeInDig, mapChangeData); } -static BOOL FieldTask_FadeInDig(FieldTask *taskMan) +static BOOL FieldTask_FadeInDig(FieldTask *task) { - int *state = FieldTask_GetState(taskMan); - FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); - MapChangeDigData *mapChangeData = FieldTask_GetEnv(taskMan); + int *state = FieldTask_GetState(task); + FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task); + MapChangeDigData *mapChangeData = FieldTask_GetEnv(task); switch (*state) { case 0: - FieldTransition_StartMap(taskMan); + FieldTransition_StartMap(task); (*state)++; break; case 1: FieldSystem_RequestLocationName(fieldSystem); - sub_02053E5C(taskMan); + sub_02053E5C(task); (*state)++; break; case 2: @@ -998,10 +998,10 @@ static BOOL FieldTask_FadeInDig(FieldTask *taskMan) return FALSE; } -static void sub_02053E5C(FieldTask *taskMan) +static void sub_02053E5C(FieldTask *task) { - FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); - MapChangeDigData *mapChangeData = FieldTask_GetEnv(taskMan); + FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task); + MapChangeDigData *mapChangeData = FieldTask_GetEnv(task); if (!FieldSystem_HasParentProcess(fieldSystem)) { GF_ASSERT(FALSE); @@ -1009,13 +1009,13 @@ static void sub_02053E5C(FieldTask *taskMan) } void *v2 = ov6_022472C8(fieldSystem, 4, mapChangeData->unk_04); - FieldTask_InitCall(taskMan, ov6_022472E8, v2); + FieldTask_InitCall(task, ov6_022472E8, v2); } -static BOOL FieldTask_MapChangeWarp(FieldTask *taskMan) +static BOOL FieldTask_MapChangeWarp(FieldTask *task) { - FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); - MapChangeWarpData *mapChangeWarpData = FieldTask_GetEnv(taskMan); + FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task); + MapChangeWarpData *mapChangeWarpData = FieldTask_GetEnv(task); Location *nextLocation = &mapChangeWarpData->nextLocation; switch (mapChangeWarpData->state) { @@ -1026,12 +1026,12 @@ static BOOL FieldTask_MapChangeWarp(FieldTask *taskMan) case 1: if (mapChangeWarpData->warpFinished) { Sound_TryFadeInBGM(fieldSystem, nextLocation->mapId); - FieldTransition_FinishMap(taskMan); + FieldTransition_FinishMap(task); mapChangeWarpData->state++; } break; case 2: - FieldTask_ChangeMapByLocation(taskMan, &mapChangeWarpData->nextLocation); + FieldTask_ChangeMapByLocation(task, &mapChangeWarpData->nextLocation); mapChangeWarpData->state++; break; case 3: @@ -1040,7 +1040,7 @@ static BOOL FieldTask_MapChangeWarp(FieldTask *taskMan) } Sound_PlayMapBGM(fieldSystem, nextLocation->mapId); - FieldTransition_StartMap(taskMan); + FieldTransition_StartMap(task); mapChangeWarpData->state++; break; case 4: @@ -1135,10 +1135,10 @@ void FieldTask_SetUndergroundMapChange(FieldSystem *fieldSystem) FieldSystem_CreateTask(fieldSystem, FieldMapChange_GetMapChangeUndergroundTask(fieldSystem), mapChangeUndergroundData); } -BOOL FieldTask_MapChangeToUnderground(FieldTask *taskMan) +BOOL FieldTask_MapChangeToUnderground(FieldTask *task) { - FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); - MapChangeUndergroundData *mapChangeUndergroundData = FieldTask_GetEnv(taskMan); + FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task); + MapChangeUndergroundData *mapChangeUndergroundData = FieldTask_GetEnv(task); switch (mapChangeUndergroundData->state) { case 0: @@ -1175,13 +1175,13 @@ BOOL FieldTask_MapChangeToUnderground(FieldTask *taskMan) break; case 3: if (SaveData_OverwriteCheck(fieldSystem->saveData)) { - ScriptManager_Start(taskMan, 2034, NULL, NULL); + ScriptManager_Start(task, 2034, NULL, NULL); } else { sub_020287E0(fieldSystem->saveData); mapChangeUndergroundData->saveInfoWin = SaveInfoWindow_New(fieldSystem, 11, BG_LAYER_MAIN_3); SaveInfoWindow_Draw(mapChangeUndergroundData->saveInfoWin); mapChangeUndergroundData->unk_1C = 0; - ScriptManager_Start(taskMan, 2005, NULL, &mapChangeUndergroundData->unk_1C); + ScriptManager_Start(task, 2005, NULL, &mapChangeUndergroundData->unk_1C); } mapChangeUndergroundData->state = 4; @@ -1209,19 +1209,19 @@ BOOL FieldTask_MapChangeToUnderground(FieldTask *taskMan) mapChangeUndergroundData->state++; break; case 7: - if (sub_0205444C(taskMan, 0)) { + if (sub_0205444C(task, 0)) { mapChangeUndergroundData->state++; } break; case 8: - FieldTransition_FinishMap(taskMan); + FieldTransition_FinishMap(task); mapChangeUndergroundData->state++; break; case 9: fieldSystem->mapLoadType = MAP_LOAD_TYPE_UNDERGROUND; Overlay_LoadByID(FS_OVERLAY_ID(overlay23), 2); ov23_022499E8(fieldSystem); - FieldTask_ChangeMapToLocation(taskMan, mapChangeUndergroundData->mapId, -1, mapChangeUndergroundData->unk_10, mapChangeUndergroundData->unk_14, 1); + FieldTask_ChangeMapToLocation(task, mapChangeUndergroundData->mapId, -1, mapChangeUndergroundData->unk_10, mapChangeUndergroundData->unk_14, 1); mapChangeUndergroundData->state++; break; case 10: @@ -1231,11 +1231,11 @@ BOOL FieldTask_MapChangeToUnderground(FieldTask *taskMan) sub_02004234(0); Sound_ClearSpecialBGM(fieldSystem); - FieldTransition_StartMap(taskMan); + FieldTransition_StartMap(task); mapChangeUndergroundData->state++; break; case 11: - if (sub_0205444C(taskMan, 1)) { + if (sub_0205444C(task, 1)) { ov23_02249A2C(); fieldSystem->unk_6C = ov23_02249404(fieldSystem); sub_0200AAE0(30, 0, -16, GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_OBJ, 2); @@ -1254,10 +1254,10 @@ BOOL FieldTask_MapChangeToUnderground(FieldTask *taskMan) return 0; } -BOOL FieldTask_MapChangeFromUnderground(FieldTask *taskMan) +BOOL FieldTask_MapChangeFromUnderground(FieldTask *task) { - FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); - MapChangeUndergroundData *mapChangeUndergroundData = FieldTask_GetEnv(taskMan); + FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task); + MapChangeUndergroundData *mapChangeUndergroundData = FieldTask_GetEnv(task); int v2 = 0; switch (mapChangeUndergroundData->state) { @@ -1277,18 +1277,18 @@ BOOL FieldTask_MapChangeFromUnderground(FieldTask *taskMan) } break; case 2: - if (sub_0205444C(taskMan, 2)) { + if (sub_0205444C(task, 2)) { mapChangeUndergroundData->state++; } break; case 3: - FieldTransition_FinishMap(taskMan); + FieldTransition_FinishMap(task); mapChangeUndergroundData->state++; break; case 4: fieldSystem->mapLoadType = MAP_LOAD_TYPE_OVERWORLD; Overlay_UnloadByID(FS_OVERLAY_ID(overlay23)); - FieldTask_ChangeMapToLocation(taskMan, mapChangeUndergroundData->mapId, -1, mapChangeUndergroundData->unk_10, mapChangeUndergroundData->unk_14, 1); + FieldTask_ChangeMapToLocation(task, mapChangeUndergroundData->mapId, -1, mapChangeUndergroundData->unk_10, mapChangeUndergroundData->unk_14, 1); mapChangeUndergroundData->state++; break; case 5: @@ -1298,11 +1298,11 @@ BOOL FieldTask_MapChangeFromUnderground(FieldTask *taskMan) sub_02004234(0); Sound_ClearSpecialBGM(fieldSystem); - FieldTransition_StartMap(taskMan); + FieldTransition_StartMap(task); mapChangeUndergroundData->state++; break; case 6: - if (sub_0205444C(taskMan, 3)) { + if (sub_0205444C(task, 3)) { mapChangeUndergroundData->state++; } break; @@ -1327,10 +1327,10 @@ FieldTaskFunc FieldMapChange_GetMapChangeUndergroundTask(const FieldSystem *fiel } } -static BOOL sub_0205444C(FieldTask *taskMan, int param1) +static BOOL sub_0205444C(FieldTask *task, int param1) { - FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); - MapChangeUndergroundData *mapChangeUndergroundData = FieldTask_GetEnv(taskMan); + FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task); + MapChangeUndergroundData *mapChangeUndergroundData = FieldTask_GetEnv(task); BOOL ret = 0; switch (mapChangeUndergroundData->unk_04) { @@ -1350,10 +1350,10 @@ static BOOL sub_0205444C(FieldTask *taskMan, int param1) return ret; } -static BOOL sub_02054494(FieldTask *taskMan) +static BOOL sub_02054494(FieldTask *task) { - FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); - MapChangeSubData *mapChangeSub = FieldTask_GetEnv(taskMan); + FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task); + MapChangeSubData *mapChangeSub = FieldTask_GetEnv(task); switch (mapChangeSub->state) { case 0: @@ -1374,9 +1374,9 @@ static BOOL sub_02054494(FieldTask *taskMan) return 0; } -void sub_020544F0(FieldTask *taskMan, const Location *nextLocation) +void sub_020544F0(FieldTask *task, const Location *nextLocation) { - FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); + FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task); MapChangeSubData *mapChangeData = Heap_AllocFromHeapAtEnd(11, sizeof(MapChangeSubData)); if (FieldSystem_HasParentProcess(fieldSystem)) { @@ -1387,14 +1387,14 @@ void sub_020544F0(FieldTask *taskMan, const Location *nextLocation) mapChangeData->state = 0; mapChangeData->nextLocation = *nextLocation; - FieldTask_InitCall(taskMan, sub_02054494, mapChangeData); + FieldTask_InitCall(task, sub_02054494, mapChangeData); } -static BOOL sub_02054538(FieldTask *taskMan) +static BOOL sub_02054538(FieldTask *task) { - FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); - MapChangeUnionData *mapChangeData = FieldTask_GetEnv(taskMan); - int *state = FieldTask_GetState(taskMan); + FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task); + MapChangeUnionData *mapChangeData = FieldTask_GetEnv(task); + int *state = FieldTask_GetState(task); Location *v3 = &mapChangeData->location; switch (*state) { @@ -1405,12 +1405,12 @@ static BOOL sub_02054538(FieldTask *taskMan) break; case 1: if (mapChangeData->unk_04) { - FieldTransition_FinishMap(taskMan); + FieldTransition_FinishMap(task); (*state)++; } break; case 2: - FieldTask_ChangeMapByLocation(taskMan, &mapChangeData->location); + FieldTask_ChangeMapByLocation(task, &mapChangeData->location); (*state)++; break; case 3: @@ -1419,11 +1419,11 @@ static BOOL sub_02054538(FieldTask *taskMan) } Sound_PlayMapBGM(fieldSystem, v3->mapId); - FieldTransition_StartMap(taskMan); + FieldTransition_StartMap(task); (*state)++; break; case 4: - FieldTransition_FadeIn(taskMan); + FieldTransition_FadeIn(task); (*state)++; break; case 5: @@ -1450,25 +1450,25 @@ void sub_020545EC(FieldSystem *fieldSystem) fieldSystem->unk_7C = NULL; } -static BOOL sub_02054648(FieldTask *taskMan) +static BOOL sub_02054648(FieldTask *task) { - FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); - MapChangeUnionData *mapChangeData = FieldTask_GetEnv(taskMan); - int *state = FieldTask_GetState(taskMan); + FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task); + MapChangeUnionData *mapChangeData = FieldTask_GetEnv(task); + int *state = FieldTask_GetState(task); Location *v3 = &mapChangeData->location; switch (*state) { case 0: Sound_TryFadeInBGM(fieldSystem, v3->mapId); - FieldTransition_FadeOut(taskMan); + FieldTransition_FadeOut(task); (*state)++; break; case 1: - FieldTransition_FinishMap(taskMan); + FieldTransition_FinishMap(task); (*state)++; break; case 2: - FieldTask_ChangeMapByLocation(taskMan, &mapChangeData->location); + FieldTask_ChangeMapByLocation(task, &mapChangeData->location); (*state)++; break; case 3: @@ -1477,7 +1477,7 @@ static BOOL sub_02054648(FieldTask *taskMan) } Sound_PlayMapBGM(fieldSystem, v3->mapId); - FieldTransition_StartMap(taskMan); + FieldTransition_StartMap(task); (*state)++; break; case 4: @@ -1498,9 +1498,9 @@ static BOOL sub_02054648(FieldTask *taskMan) return FALSE; } -void sub_02054708(FieldTask *taskMan) +void sub_02054708(FieldTask *task) { - FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); + FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task); Location *location = FieldOverworldState_GetSpecialLocation(SaveData_GetFieldOverworldState(fieldSystem->saveData)); MapChangeUnionData *mapChangeData = Heap_AllocFromHeapAtEnd(11, sizeof(MapChangeUnionData)); @@ -1513,24 +1513,24 @@ void sub_02054708(FieldTask *taskMan) fieldSystem->unk_80 = sub_0205C22C(fieldSystem->unk_7C); fieldSystem->mapLoadType = MAP_LOAD_TYPE_UNION; - FieldTask_InitCall(taskMan, sub_02054648, mapChangeData); + FieldTask_InitCall(task, sub_02054648, mapChangeData); } -static BOOL FieldTask_ChangeMapColosseum(FieldTask *taskMan) +static BOOL FieldTask_ChangeMapColosseum(FieldTask *task) { - FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); - MapChangeData *mapChangeData = FieldTask_GetEnv(taskMan); + FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task); + MapChangeData *mapChangeData = FieldTask_GetEnv(task); Location *location = &mapChangeData->nextLocation; switch (mapChangeData->state) { case 0: Sound_PlayEffect(1539); Sound_TryFadeInBGM(fieldSystem, location->mapId); - FieldTransition_FadeOutAndFinishMap(taskMan); + FieldTransition_FadeOutAndFinishMap(task); mapChangeData->state++; break; case 1: - FieldTask_ChangeMapByLocation(taskMan, &mapChangeData->nextLocation); + FieldTask_ChangeMapByLocation(task, &mapChangeData->nextLocation); mapChangeData->state++; break; case 2: @@ -1539,7 +1539,7 @@ static BOOL FieldTask_ChangeMapColosseum(FieldTask *taskMan) } Sound_PlayMapBGM(fieldSystem, location->mapId); - FieldTransition_StartMap(taskMan); + FieldTransition_StartMap(task); mapChangeData->state++; break; case 3: @@ -1550,10 +1550,10 @@ static BOOL FieldTask_ChangeMapColosseum(FieldTask *taskMan) return FALSE; } -void sub_02054800(FieldTask *taskMan, int mapId, int param2, int x, int z, int param5) +void sub_02054800(FieldTask *task, int mapId, int param2, int x, int z, int param5) { Location nextLocation; - FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); + FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task); Location *location = FieldOverworldState_GetSpecialLocation(SaveData_GetFieldOverworldState(fieldSystem->saveData)); Location_SetToPlayerLocation(location, fieldSystem); @@ -1567,12 +1567,12 @@ void sub_02054800(FieldTask *taskMan, int mapId, int param2, int x, int z, int p mapChangeData->state = 0; mapChangeData->nextLocation = nextLocation; - FieldTask_InitCall(taskMan, FieldTask_ChangeMapColosseum, mapChangeData); + FieldTask_InitCall(task, FieldTask_ChangeMapColosseum, mapChangeData); } -void sub_02054864(FieldTask *taskMan) +void sub_02054864(FieldTask *task) { - FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); + FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task); Location *location = FieldOverworldState_GetSpecialLocation(SaveData_GetFieldOverworldState(fieldSystem->saveData)); fieldSystem->mapLoadType = MAP_LOAD_TYPE_OVERWORLD; diff --git a/src/overlay005/fieldmap.c b/src/overlay005/fieldmap.c index 6096bb6b07..d9f99f78f7 100644 --- a/src/overlay005/fieldmap.c +++ b/src/overlay005/fieldmap.c @@ -424,12 +424,10 @@ static BOOL FieldMap_ChangeZone(FieldSystem *fieldSystem) MapHeaderData_Load(fieldSystem, v0); FieldMapChange_UpdateGameData(fieldSystem, 1); - { - int objEventCount = MapHeaderData_GetNumObjectEvents(fieldSystem); - const ObjectEvent *objEventList = MapHeaderData_GetObjectEvents(fieldSystem); + int objEventCount = MapHeaderData_GetNumObjectEvents(fieldSystem); + const ObjectEvent *objEventList = MapHeaderData_GetObjectEvents(fieldSystem); - sub_0206184C(fieldSystem->mapObjMan, mapId, v0, objEventCount, objEventList); - } + sub_0206184C(fieldSystem->mapObjMan, mapId, v0, objEventCount, objEventList); RadarChain_Clear(fieldSystem->chain); sub_02055554(fieldSystem, sub_02055428(fieldSystem, fieldSystem->location->mapId), 1); @@ -440,21 +438,19 @@ static BOOL FieldMap_ChangeZone(FieldSystem *fieldSystem) fieldSystem->unk_04->unk_0C, FieldOverworldState_GetWeather(fieldState)); } - { - int v7, v8; - int v9; + int v7, v8; + int v9; - v7 = MapHeader_GetMapLabelTextID(mapId); - v8 = MapHeader_GetMapLabelTextID(v0); - v9 = MapHeader_GetMapLabelWindowID(v0); + v7 = MapHeader_GetMapLabelTextID(mapId); + v8 = MapHeader_GetMapLabelTextID(v0); + v9 = MapHeader_GetMapLabelWindowID(v0); - if (v7 != v8) { - if (v9 != 0) { - v9--; - } - - ov5_021DD9E8(fieldSystem->unk_04->unk_08, v8, v9); + if (v7 != v8) { + if (v9 != 0) { + v9--; } + + ov5_021DD9E8(fieldSystem->unk_04->unk_08, v8, v9); } return TRUE; @@ -468,27 +464,21 @@ void ov5_021D12D0(FieldSystem *fieldSystem, u32 param1) mapId = fieldSystem->location->mapId; fieldState = SaveData_GetFieldOverworldState(fieldSystem->saveData); - { - fieldSystem->location->mapId = param1; + fieldSystem->location->mapId = param1; - MapHeaderData_Load(fieldSystem, param1); - FieldMapChange_UpdateGameDataDistortionWorld(fieldSystem, 1); - } + MapHeaderData_Load(fieldSystem, param1); + FieldMapChange_UpdateGameDataDistortionWorld(fieldSystem, 1); - { - int objEventCount = MapHeaderData_GetNumObjectEvents(fieldSystem); - const ObjectEvent *objEventList = MapHeaderData_GetObjectEvents(fieldSystem); + int objEventCount = MapHeaderData_GetNumObjectEvents(fieldSystem); + const ObjectEvent *objEventList = MapHeaderData_GetObjectEvents(fieldSystem); - sub_0206184C(fieldSystem->mapObjMan, mapId, param1, objEventCount, objEventList); - } + sub_0206184C(fieldSystem->mapObjMan, mapId, param1, objEventCount, objEventList); - { - sub_02055554(fieldSystem, sub_02055428(fieldSystem, fieldSystem->location->mapId), 1); - sub_0203A418(fieldSystem); + sub_02055554(fieldSystem, sub_02055428(fieldSystem, fieldSystem->location->mapId), 1); + sub_0203A418(fieldSystem); - if (fieldSystem->unk_04->unk_0C != NULL) { - ov5_021D5F7C(fieldSystem->unk_04->unk_0C, FieldOverworldState_GetWeather(fieldState)); - } + if (fieldSystem->unk_04->unk_0C != NULL) { + ov5_021D5F7C(fieldSystem->unk_04->unk_0C, FieldOverworldState_GetWeather(fieldState)); } } diff --git a/src/overlay006/ov6_02247100.c b/src/overlay006/ov6_02247100.c index 9987835fdf..01e6a81201 100644 --- a/src/overlay006/ov6_02247100.c +++ b/src/overlay006/ov6_02247100.c @@ -59,14 +59,14 @@ void *ov6_02247100(FieldSystem *fieldSystem, u32 param1) return v0; } -BOOL ov6_02247120(FieldTask *taskMan) +BOOL ov6_02247120(FieldTask *task) { int v0; - FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); - UnkStruct_ov6_02247100 *v2 = FieldTask_GetEnv(taskMan); + FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task); + UnkStruct_ov6_02247100 *v2 = FieldTask_GetEnv(task); do { - v0 = Unk_ov6_022495CC[v2->unk_00](taskMan, fieldSystem, v2); + v0 = Unk_ov6_022495CC[v2->unk_00](task, fieldSystem, v2); if (v0 == 2) { Heap_FreeToHeap(v2); @@ -76,7 +76,7 @@ BOOL ov6_02247120(FieldTask *taskMan) return 0; } -static int ov6_0224715C(FieldTask *taskMan, FieldSystem *fieldSystem, UnkStruct_ov6_02247100 *param2) +static int ov6_0224715C(FieldTask *task, FieldSystem *fieldSystem, UnkStruct_ov6_02247100 *param2) { param2->unk_14 = ov5_021F0EB0(fieldSystem, 4); ov5_021F0F10(param2->unk_14, 1, (FX32_ONE * -150), 15); @@ -98,7 +98,7 @@ static int ov6_0224715C(FieldTask *taskMan, FieldSystem *fieldSystem, UnkStruct_ return 0; } -static int ov6_022471C0(FieldTask *taskMan, FieldSystem *fieldSystem, UnkStruct_ov6_02247100 *param2) +static int ov6_022471C0(FieldTask *task, FieldSystem *fieldSystem, UnkStruct_ov6_02247100 *param2) { if (MapObject_HasAnimationEnded(param2->unk_0C) == 0) { return 0; @@ -123,7 +123,7 @@ static int ov6_022471C0(FieldTask *taskMan, FieldSystem *fieldSystem, UnkStruct_ return 0; } -static int ov6_02247244(FieldTask *taskMan, FieldSystem *fieldSystem, UnkStruct_ov6_02247100 *param2) +static int ov6_02247244(FieldTask *task, FieldSystem *fieldSystem, UnkStruct_ov6_02247100 *param2) { if (MapObject_HasAnimationEnded(param2->unk_0C) == 1) { MapObject_FinishAnimation(param2->unk_0C); @@ -142,7 +142,7 @@ static int ov6_02247244(FieldTask *taskMan, FieldSystem *fieldSystem, UnkStruct_ return 1; } -static int ov6_02247288(FieldTask *taskMan, FieldSystem *fieldSystem, UnkStruct_ov6_02247100 *param2) +static int ov6_02247288(FieldTask *task, FieldSystem *fieldSystem, UnkStruct_ov6_02247100 *param2) { FieldOverworldState *fieldState = SaveData_GetFieldOverworldState(fieldSystem->saveData); @@ -152,10 +152,10 @@ static int ov6_02247288(FieldTask *taskMan, FieldSystem *fieldSystem, UnkStruct_ warpId = FieldOverworldState_GetWarpId(fieldState); sub_0203A7F0(warpId, &location); - FieldTask_ChangeMapChangeByDig(taskMan, &location, param2->unk_08); + FieldTask_ChangeMapChangeByDig(task, &location, param2->unk_08); } else { Location *location = FieldOverworldState_GetExitLocation(fieldState); - FieldTask_ChangeMapChangeByDig(taskMan, location, param2->unk_08); + FieldTask_ChangeMapChangeByDig(task, location, param2->unk_08); } return 2; @@ -179,14 +179,14 @@ void *ov6_022472C8(FieldSystem *fieldSystem, u32 param1, int param2) return v0; } -BOOL ov6_022472E8(FieldTask *taskMan) +BOOL ov6_022472E8(FieldTask *task) { int v0; - FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); - UnkStruct_ov6_02247100 *v2 = FieldTask_GetEnv(taskMan); + FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task); + UnkStruct_ov6_02247100 *v2 = FieldTask_GetEnv(task); do { - v0 = Unk_ov6_022495BC[v2->unk_00](taskMan, fieldSystem, v2); + v0 = Unk_ov6_022495BC[v2->unk_00](task, fieldSystem, v2); if (v0 == 2) { ov6_0224732C(fieldSystem, v2); @@ -211,7 +211,7 @@ static void ov6_0224732C(FieldSystem *fieldSystem, UnkStruct_ov6_02247100 *param Journal_SaveData(fieldSystem->journal, v0, 1); } -static int ov6_02247354(FieldTask *taskMan, FieldSystem *fieldSystem, UnkStruct_ov6_02247100 *param2) +static int ov6_02247354(FieldTask *task, FieldSystem *fieldSystem, UnkStruct_ov6_02247100 *param2) { if (param2->unk_08 == 2) { StartScreenTransition(0, 1, 1, 0x0, 6, 1, 4); @@ -227,7 +227,7 @@ static int ov6_02247354(FieldTask *taskMan, FieldSystem *fieldSystem, UnkStruct_ return 0; } -static int ov6_022473C8(FieldTask *taskMan, FieldSystem *fieldSystem, UnkStruct_ov6_02247100 *param2) +static int ov6_022473C8(FieldTask *task, FieldSystem *fieldSystem, UnkStruct_ov6_02247100 *param2) { if (MapObject_HasAnimationEnded(param2->unk_0C) == 1) { MapObject_FinishAnimation(param2->unk_0C); @@ -244,7 +244,7 @@ static int ov6_022473C8(FieldTask *taskMan, FieldSystem *fieldSystem, UnkStruct_ return 1; } -static int ov6_0224740C(FieldTask *taskMan, FieldSystem *fieldSystem, UnkStruct_ov6_02247100 *param2) +static int ov6_0224740C(FieldTask *task, FieldSystem *fieldSystem, UnkStruct_ov6_02247100 *param2) { if (MapObject_HasAnimationEnded(param2->unk_0C) == 0) { return 0; @@ -264,7 +264,7 @@ static int ov6_0224740C(FieldTask *taskMan, FieldSystem *fieldSystem, UnkStruct_ return 0; } -static int ov6_02247458(FieldTask *taskMan, FieldSystem *fieldSystem, UnkStruct_ov6_02247100 *param2) +static int ov6_02247458(FieldTask *task, FieldSystem *fieldSystem, UnkStruct_ov6_02247100 *param2) { if (MapObject_HasAnimationEnded(param2->unk_0C) == 0) { return 0; @@ -299,14 +299,14 @@ void *ov6_02247488(FieldSystem *fieldSystem, Pokemon *param1, u32 param2) return v0; } -BOOL ov6_022474AC(FieldTask *taskMan) +BOOL ov6_022474AC(FieldTask *task) { int v0; - FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); - UnkStruct_ov6_02247100 *v2 = FieldTask_GetEnv(taskMan); + FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task); + UnkStruct_ov6_02247100 *v2 = FieldTask_GetEnv(task); do { - v0 = Unk_ov6_022495F0[v2->unk_00](taskMan, fieldSystem, v2); + v0 = Unk_ov6_022495F0[v2->unk_00](task, fieldSystem, v2); if (v0 == 2) { Heap_FreeToHeap(v2); @@ -316,7 +316,7 @@ BOOL ov6_022474AC(FieldTask *taskMan) return 0; } -static int ov6_022474E8(FieldTask *taskMan, FieldSystem *fieldSystem, UnkStruct_ov6_02247100 *param2) +static int ov6_022474E8(FieldTask *task, FieldSystem *fieldSystem, UnkStruct_ov6_02247100 *param2) { int v0 = PlayerAvatar_Gender(fieldSystem->playerAvatar); @@ -326,7 +326,7 @@ static int ov6_022474E8(FieldTask *taskMan, FieldSystem *fieldSystem, UnkStruct_ return 0; } -static int ov6_0224750C(FieldTask *taskMan, FieldSystem *fieldSystem, UnkStruct_ov6_02247100 *param2) +static int ov6_0224750C(FieldTask *task, FieldSystem *fieldSystem, UnkStruct_ov6_02247100 *param2) { if (ov6_02243FBC(param2->unk_10) == 0) { return 0; @@ -358,14 +358,14 @@ void *ov6_02247530(FieldSystem *fieldSystem, Pokemon *param1, u32 param2) return v0; } -BOOL ov6_02247554(FieldTask *taskMan) +BOOL ov6_02247554(FieldTask *task) { int v0; - FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); - UnkStruct_ov6_02247100 *v2 = FieldTask_GetEnv(taskMan); + FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task); + UnkStruct_ov6_02247100 *v2 = FieldTask_GetEnv(task); do { - v0 = Unk_ov6_022495F0[v2->unk_00](taskMan, fieldSystem, v2); + v0 = Unk_ov6_022495F0[v2->unk_00](task, fieldSystem, v2); if (v0 == 2) { Heap_FreeToHeap(v2); diff --git a/src/unk_020528D0.c b/src/unk_020528D0.c index 7f9096f696..ef8b236703 100644 --- a/src/unk_020528D0.c +++ b/src/unk_020528D0.c @@ -45,8 +45,8 @@ typedef struct { StringTemplate *unk_20; } UnkStruct_02052AA4; -static void sub_02052914(FieldSystem *fieldSystem, FieldTask *taskMan); -static BOOL sub_020529C4(FieldTask *taskMan); +static void sub_02052914(FieldSystem *fieldSystem, FieldTask *task); +static BOOL sub_020529C4(FieldTask *task); static void sub_02052AA4(UnkStruct_02052AA4 *param0, u16 param1, u8 param2, u8 param3); static const WindowTemplate Unk_020EC2F0 = { @@ -101,7 +101,7 @@ static void sub_020528D0(BgConfig *param0) Graphics_LoadPalette(14, 6, 0, 13 * 0x20, 0x20, 11); } -static void sub_02052914(FieldSystem *fieldSystem, FieldTask *taskMan) +static void sub_02052914(FieldSystem *fieldSystem, FieldTask *task) { UnkStruct_02052AA4 *v0 = Heap_AllocFromHeap(11, sizeof(UnkStruct_02052AA4)); @@ -130,14 +130,14 @@ static void sub_02052914(FieldSystem *fieldSystem, FieldTask *taskMan) } Window_CopyToVRAM(&v0->unk_0C); - FieldTask_InitCall(taskMan, sub_020529C4, v0); + FieldTask_InitCall(task, sub_020529C4, v0); return; } -static BOOL sub_020529C4(FieldTask *taskMan) +static BOOL sub_020529C4(FieldTask *task) { - UnkStruct_02052AA4 *v0 = FieldTask_GetEnv(taskMan); + UnkStruct_02052AA4 *v0 = FieldTask_GetEnv(task); switch (v0->unk_00) { case 0: @@ -197,10 +197,10 @@ static void sub_02052AA4(UnkStruct_02052AA4 *param0, u16 param1, u8 param2, u8 p return; } -BOOL sub_02052B2C(FieldTask *taskMan) +BOOL sub_02052B2C(FieldTask *task) { - FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); - int *state = FieldTask_GetState(taskMan); + FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task); + int *state = FieldTask_GetState(task); switch (*state) { case 0: { @@ -216,7 +216,7 @@ BOOL sub_02052B2C(FieldTask *taskMan) sub_0203A824(warpId, &location); sub_0203A7F0(warpId, FieldOverworldState_GetExitLocation(fieldState)); - FieldTask_ChangeMapByLocation(taskMan, &location); + FieldTask_ChangeMapByLocation(task, &location); sub_020705B4(fieldSystem); } (*state)++; @@ -234,11 +234,11 @@ BOOL sub_02052B2C(FieldTask *taskMan) case 3: sub_0200AB4C(-16, ((GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_OBJ | GX_BLEND_PLANEMASK_BD) ^ GX_BLEND_PLANEMASK_BG3), 1); sub_0200AB4C(-16, (GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_OBJ | GX_BLEND_PLANEMASK_BD), 2); - sub_02052914(fieldSystem, taskMan); + sub_02052914(fieldSystem, task); (*state)++; break; case 4: - FieldTransition_StartMap(taskMan); + FieldTransition_StartMap(task); (*state)++; break; case 5: @@ -246,9 +246,9 @@ BOOL sub_02052B2C(FieldTask *taskMan) if (sub_0203A7EC() == FieldOverworldState_GetWarpId(SaveData_GetFieldOverworldState(fieldSystem->saveData))) { - ScriptManager_Start(taskMan, 2020, NULL, NULL); + ScriptManager_Start(task, 2020, NULL, NULL); } else { - ScriptManager_Start(taskMan, 2021, NULL, NULL); + ScriptManager_Start(task, 2021, NULL, NULL); } (*state)++; @@ -260,7 +260,7 @@ BOOL sub_02052B2C(FieldTask *taskMan) return 0; } -void sub_02052C5C(FieldTask *taskMan) +void sub_02052C5C(FieldTask *task) { - FieldTask_InitCall(taskMan, sub_02052B2C, NULL); + FieldTask_InitCall(task, sub_02052B2C, NULL); } diff --git a/src/unk_020683F4.c b/src/unk_020683F4.c index 5598ccf05e..29b68334d0 100644 --- a/src/unk_020683F4.c +++ b/src/unk_020683F4.c @@ -157,12 +157,12 @@ static u32 sub_02068D68(const UnkStruct_020684D0 *param0); static u32 sub_02068E94(const UnkStruct_020684D0 *param0); static u32 sub_020690C4(const UnkStruct_020684D0 *param0); static u32 sub_02069130(const UnkStruct_020684D0 *param0); -static BOOL sub_02068884(FieldTask *taskMan); -static BOOL sub_02068F48(FieldTask *taskMan); +static BOOL sub_02068884(FieldTask *task); +static BOOL sub_02068F48(FieldTask *task); static void sub_020693F8(UnkStruct_02068870 *param0, UnkFuncPtr_02068870 param1); -static BOOL sub_0206932C(FieldTask *taskMan); -static BOOL sub_020690F0(FieldTask *taskMan); -static BOOL sub_020685AC(FieldTask *taskMan); +static BOOL sub_0206932C(FieldTask *task); +static BOOL sub_020690F0(FieldTask *task); +static BOOL sub_020685AC(FieldTask *task); static void sub_020692E4(UnkStruct_02068870 *param0, u32 param1); static const UnkStruct_020EF79C Unk_020EF79C[] = { @@ -301,17 +301,17 @@ static void sub_02068584(UnkStruct_02068870 *param0, u32 param1) FieldSystem_CreateTask(param0->fieldSystem, sub_020685AC, v0); } -static BOOL sub_020685AC(FieldTask *taskMan) +static BOOL sub_020685AC(FieldTask *task) { - FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); - UnkStruct_0206851C *v1 = FieldTask_GetEnv(taskMan); - int *v2 = FieldTask_GetState(taskMan); + FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task); + UnkStruct_0206851C *v1 = FieldTask_GetEnv(task); + int *v2 = FieldTask_GetState(task); MapObject *v3; switch (*v2) { case 0: sub_0203C9D4(fieldSystem, &v3); - ScriptManager_Start(taskMan, v1->unk_00, v3, NULL); + ScriptManager_Start(task, v1->unk_00, v3, NULL); *(u16 *)FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_DATA_PARAMETER_0) = v1->unk_04; *(u16 *)FieldSystem_GetScriptMemberPtr(fieldSystem, SCRIPT_DATA_PARAMETER_1) = v1->unk_06; @@ -473,10 +473,10 @@ static BOOL sub_02068870(UnkStruct_02068870 *param0) return 0; } -static BOOL sub_02068884(FieldTask *taskMan) +static BOOL sub_02068884(FieldTask *task) { - FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); - int *state = FieldTask_GetState(taskMan); + FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task); + int *state = FieldTask_GetState(task); switch (*state) { case 0: @@ -937,10 +937,10 @@ static BOOL sub_02068EFC(UnkStruct_02068870 *param0) return 0; } -static BOOL sub_02068F48(FieldTask *taskMan) +static BOOL sub_02068F48(FieldTask *task) { - FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); - UnkStruct_02068EFC *v1 = FieldTask_GetEnv(taskMan); + FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task); + UnkStruct_02068EFC *v1 = FieldTask_GetEnv(task); switch (v1->unk_16) { case 0: @@ -1033,12 +1033,12 @@ static u32 sub_020690C4(const UnkStruct_020684D0 *param0) return -1; } -static BOOL sub_020690F0(FieldTask *taskMan) +static BOOL sub_020690F0(FieldTask *task) { - FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); + FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task); void *v1 = ov6_02247100(fieldSystem, 11); - FieldTask_InitJump(taskMan, ov6_02247120, v1); + FieldTask_InitJump(task, ov6_02247120, v1); return 0; } @@ -1194,10 +1194,10 @@ static void sub_020692E4(UnkStruct_02068870 *param0, u32 param1) FieldSystem_CreateTask(param0->fieldSystem, sub_02068F48, v0); } -static BOOL sub_0206932C(FieldTask *taskMan) +static BOOL sub_0206932C(FieldTask *task) { - FieldSystem *fieldSystem = FieldTask_GetFieldSystem(taskMan); - UnkStruct_02068870 *v1 = FieldTask_GetEnv(taskMan); + FieldSystem *fieldSystem = FieldTask_GetFieldSystem(task); + UnkStruct_02068870 *v1 = FieldTask_GetEnv(task); switch (v1->unk_2A) { case 0: