diff options
Diffstat (limited to 'src/field_screen_effect.c')
| -rw-r--r-- | src/field_screen_effect.c | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c index 076859c28..05922e98c 100644 --- a/src/field_screen_effect.c +++ b/src/field_screen_effect.c @@ -327,7 +327,7 @@ static void sub_80AF438(u8 taskId) { case 0: sub_80AF0F4(0); - FreezeEventObjects(); + FreezeObjectEvents(); PlayerGetDestCoords(x, y); FieldSetDoorOpened(*x, *y); task->data[0] = 1; @@ -335,27 +335,27 @@ static void sub_80AF438(u8 taskId) case 1: if (WaitForWeatherFadeIn()) { - u8 eventObjId; + u8 objEventId; sub_80AF0F4(1); - eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectSetHeldMovement(&gEventObjects[eventObjId], MOVEMENT_ACTION_WALK_NORMAL_DOWN); + objEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventSetHeldMovement(&gObjectEvents[objEventId], MOVEMENT_ACTION_WALK_NORMAL_DOWN); task->data[0] = 2; } break; case 2: if (walkrun_is_standing_still()) { - u8 eventObjId; + u8 objEventId; task->data[1] = FieldAnimateDoorClose(*x, *y); - eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectClearHeldMovementIfFinished(&gEventObjects[eventObjId]); + objEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objEventId]); task->data[0] = 3; } break; case 3: if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE) { - UnfreezeEventObjects(); + UnfreezeObjectEvents(); task->data[0] = 4; } break; @@ -376,24 +376,24 @@ static void task_map_chg_seq_0807E20C(u8 taskId) { case 0: sub_80AF0F4(0); - FreezeEventObjects(); + FreezeObjectEvents(); PlayerGetDestCoords(x, y); task->data[0] = 1; break; case 1: if (WaitForWeatherFadeIn()) { - u8 eventObjId; + u8 objEventId; sub_80AF0F4(1); - eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectSetHeldMovement(&gEventObjects[eventObjId], GetWalkNormalMovementAction(GetPlayerFacingDirection())); + objEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventSetHeldMovement(&gObjectEvents[objEventId], GetWalkNormalMovementAction(GetPlayerFacingDirection())); task->data[0] = 2; } break; case 2: if (walkrun_is_standing_still()) { - UnfreezeEventObjects(); + UnfreezeObjectEvents(); task->data[0] = 3; } break; @@ -409,14 +409,14 @@ static void task_map_chg_seq_0807E2CC(u8 taskId) switch (gTasks[taskId].data[0]) { case 0: - FreezeEventObjects(); + FreezeObjectEvents(); ScriptContext2_Enable(); gTasks[taskId].data[0]++; break; case 1: if (WaitForWeatherFadeIn()) { - UnfreezeEventObjects(); + UnfreezeObjectEvents(); ScriptContext2_Disable(); DestroyTask(taskId); } @@ -452,7 +452,7 @@ static void task_mpl_807E3C8(u8 taskId) { ScriptContext2_Disable(); DestroyTask(taskId); - ScriptUnfreezeEventObjects(); + ScriptUnfreezeObjectEvents(); } } @@ -560,7 +560,7 @@ void DoMossdeepGymWarp(void) { sub_8085540(1); ScriptContext2_Enable(); - SaveEventObjects(); + SaveObjectEvents(); TryFadeOutOldMapMusic(); WarpFadeScreen(); PlaySE(SE_TK_WARPIN); @@ -650,7 +650,7 @@ static void sub_80AFA0C(u8 taskId) switch (task->data[0]) { case 0: - FreezeEventObjects(); + FreezeObjectEvents(); ScriptContext2_Enable(); task->data[0]++; break; @@ -683,7 +683,7 @@ static void sub_80AFA88(u8 taskId) switch (task->data[0]) { case 0: - FreezeEventObjects(); + FreezeObjectEvents(); PlayerGetDestCoords(x, y); PlaySE(GetDoorSoundEffect(*x, *y - 1)); task->data[1] = FieldAnimateDoorOpen(*x, *y - 1); @@ -692,21 +692,21 @@ static void sub_80AFA88(u8 taskId) case 1: if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE) { - u8 eventObjId; - eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectClearHeldMovementIfActive(&gEventObjects[eventObjId]); - eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectSetHeldMovement(&gEventObjects[eventObjId], MOVEMENT_ACTION_WALK_NORMAL_UP); + u8 objEventId; + objEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventClearHeldMovementIfActive(&gObjectEvents[objEventId]); + objEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventSetHeldMovement(&gObjectEvents[objEventId], MOVEMENT_ACTION_WALK_NORMAL_UP); task->data[0] = 2; } break; case 2: if (walkrun_is_standing_still()) { - u8 eventObjId; + u8 objEventId; task->data[1] = FieldAnimateDoorClose(*x, *y - 1); - eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0); - EventObjectClearHeldMovementIfFinished(&gEventObjects[eventObjId]); + objEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0); + ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objEventId]); sub_80AF0F4(0); task->data[0] = 3; } @@ -734,7 +734,7 @@ static void task0A_fade_n_map_maybe(u8 taskId) switch (task->data[0]) { case 0: - FreezeEventObjects(); + FreezeObjectEvents(); ScriptContext2_Enable(); task->data[0]++; break; @@ -1001,7 +1001,7 @@ static void task0A_mpl_807E31C(u8 taskId) switch (gTasks[taskId].data[0]) { case 0: - FreezeEventObjects(); + FreezeObjectEvents(); ScriptContext2_Enable(); sub_808D194(); gTasks[taskId].data[0]++; @@ -1009,7 +1009,7 @@ static void task0A_mpl_807E31C(u8 taskId) case 1: if (WaitForWeatherFadeIn() && sub_808D1B4() != TRUE) { - UnfreezeEventObjects(); + UnfreezeObjectEvents(); ScriptContext2_Disable(); DestroyTask(taskId); } @@ -1024,7 +1024,7 @@ static void sub_80B01BC(u8 taskId) switch (task->data[0]) { case 0: - FreezeEventObjects(); + FreezeObjectEvents(); ScriptContext2_Enable(); PlaySE(SE_TK_WARPIN); sub_808D1C8(); |