diff options
Diffstat (limited to 'src/field_effect.c')
| -rw-r--r-- | src/field_effect.c | 376 |
1 files changed, 188 insertions, 188 deletions
diff --git a/src/field_effect.c b/src/field_effect.c index 5ce8028ca..5c26b647c 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -269,7 +269,7 @@ bool8 (*const gUnknown_0839F300[])(struct Task *) = { sub_8086ED4 }; -bool8 (*const gUnknown_0839F31C[])(struct Task *, struct EventObject *) = { +bool8 (*const gUnknown_0839F31C[])(struct Task *, struct ObjectEvent *) = { sub_8086FB0, waterfall_1_do_anim_probably, waterfall_2_wait_anim_finish_probably, @@ -283,7 +283,7 @@ bool8 (*const gUnknown_0839F330[])(struct Task *) = { dive_3_unknown }; -bool8 (*const gUnknown_0839F33C[])(struct Task *, struct EventObject *, struct Sprite *) = { +bool8 (*const gUnknown_0839F33C[])(struct Task *, struct ObjectEvent *, struct Sprite *) = { sub_808722C, sub_8087264, sub_8087298, @@ -292,14 +292,14 @@ bool8 (*const gUnknown_0839F33C[])(struct Task *, struct EventObject *, struct S sub_80873F4 }; -bool8 (*const gUnknown_0839F354[])(struct Task *, struct EventObject *, struct Sprite *) = { +bool8 (*const gUnknown_0839F354[])(struct Task *, struct ObjectEvent *, struct Sprite *) = { sub_80874CC, sub_80874FC, sub_8087548, sub_808759C }; -bool8 (*const gUnknown_0839F364[])(struct Task *, struct EventObject *, struct Sprite *) = { +bool8 (*const gUnknown_0839F364[])(struct Task *, struct ObjectEvent *, struct Sprite *) = { sub_80876C8, sub_80876F8, sub_8087774, @@ -1085,7 +1085,7 @@ void mapldr_080842E8(void) pal_fill_black(); CreateTask(task00_8084310, 0); ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); gFieldCallback = NULL; } @@ -1122,13 +1122,13 @@ void mapldr_08084390(void) Overworld_PlaySpecialMapMusic(); pal_fill_black(); CreateTask(c3_080843F8, 0); - gEventObjects[gPlayerAvatar.eventObjectId].invisible = 1; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = 1; if (gPlayerAvatar.flags & 0x08) { - EventObjectTurn(&gEventObjects[gPlayerAvatar.eventObjectId], DIR_WEST); + ObjectEventTurn(&gObjectEvents[gPlayerAvatar.objectEventId], DIR_WEST); } ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); gFieldCallback = NULL; } @@ -1148,7 +1148,7 @@ void c3_080843F8(u8 taskId) if (!FieldEffectActiveListContains(FLDEFF_FLY_IN)) { ScriptContext2_Disable(); - UnfreezeEventObjects(); + UnfreezeObjectEvents(); DestroyTask(taskId); } } @@ -1162,7 +1162,7 @@ void sub_8086748(void) Overworld_PlaySpecialMapMusic(); pal_fill_for_map_transition(); ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); CreateTask(sub_8086774, 0); gFieldCallback = NULL; } @@ -1176,14 +1176,14 @@ void sub_8086774(u8 taskId) bool8 sub_80867AC(struct Task *task) // gUnknown_0839F2CC[0] { - struct EventObject *playerObject; + struct ObjectEvent *playerObject; struct Sprite *playerSprite; - playerObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + playerObject = &gObjectEvents[gPlayerAvatar.objectEventId]; playerSprite = &gSprites[gPlayerAvatar.spriteId]; CameraObjectReset2(); - gEventObjects[gPlayerAvatar.eventObjectId].invisible = 1; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = 1; gPlayerAvatar.preventStep = TRUE; - EventObjectSetHeldMovement(playerObject, GetFaceDirectionMovementAction(GetPlayerFacingDirection())); + ObjectEventSetHeldMovement(playerObject, GetFaceDirectionMovementAction(GetPlayerFacingDirection())); task->data[4] = playerSprite->subspriteMode; playerObject->fixedPriority = 1; playerSprite->oam.priority = 1; @@ -1210,7 +1210,7 @@ bool8 sub_8086870(struct Task *task) // gUnknown_0839F2CC[2] sprite->pos2.y = -(sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY); task->data[1] = 1; task->data[2] = 0; - gEventObjects[gPlayerAvatar.eventObjectId].invisible = 0; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = 0; PlaySE(SE_RU_HYUU); task->data[0]++; return FALSE; @@ -1218,10 +1218,10 @@ bool8 sub_8086870(struct Task *task) // gUnknown_0839F2CC[2] bool8 sub_80868E4(struct Task *task) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; struct Sprite *sprite; - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; sprite = &gSprites[gPlayerAvatar.spriteId]; sprite->pos2.y += task->data[1]; if (task->data[1] < 8) @@ -1235,15 +1235,15 @@ bool8 sub_80868E4(struct Task *task) if (task->data[3] == 0 && sprite->pos2.y >= -16) { task->data[3]++; - eventObject->fixedPriority = 0; + objectEvent->fixedPriority = 0; sprite->subspriteMode = task->data[4]; - eventObject->triggerGroundEffectsOnMove = 1; + objectEvent->triggerGroundEffectsOnMove = 1; } if (sprite->pos2.y >= 0) { PlaySE(SE_W070); - eventObject->triggerGroundEffectsOnStop = 1; - eventObject->landingJump = 1; + objectEvent->triggerGroundEffectsOnStop = 1; + objectEvent->landingJump = 1; sprite->pos2.y = 0; task->data[0]++; } @@ -1280,7 +1280,7 @@ bool8 sub_80869F8(struct Task *task) gPlayerAvatar.preventStep = FALSE; ScriptContext2_Disable(); CameraObjectReset1(); - UnfreezeEventObjects(); + UnfreezeObjectEvents(); InstallCameraPanAheadCallback(); DestroyTask(FindTaskIdByFunc(sub_8086774)); return FALSE; @@ -1319,7 +1319,7 @@ void sub_8086A68(u8 taskId) bool8 sub_8086AA0(struct Task *task) { - FreezeEventObjects(); + FreezeObjectEvents(); CameraObjectReset2(); sub_80B4824(task->data[1]); task->data[0]++; @@ -1328,11 +1328,11 @@ bool8 sub_8086AA0(struct Task *task) bool8 sub_8086AC0(struct Task *task) { - struct EventObject *eventObject; - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject)) + struct ObjectEvent *objectEvent; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (!ObjectEventIsMovementOverridden(objectEvent) || ObjectEventClearHeldMovementIfFinished(objectEvent)) { - EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(GetPlayerFacingDirection())); + ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(GetPlayerFacingDirection())); task->data[0]++; task->data[2] = 0; task->data[3] = 0; @@ -1443,13 +1443,13 @@ void sub_8086CBC(u8 taskId) bool8 sub_8086CF4(struct Task *task) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; s16 x; s16 y; u8 behavior; CameraObjectReset2(); - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(DIR_EAST)); + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(DIR_EAST)); PlayerGetDestCoords(&x, &y); behavior = MapGridGetMetatileBehaviorAt(x, y); task->data[0]++; @@ -1541,13 +1541,13 @@ bool8 sub_8086EB0(struct Task *task) bool8 sub_8086ED4(struct Task *task) { - struct EventObject *eventObject; - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (EventObjectClearHeldMovementIfFinished(eventObject)) + struct ObjectEvent *objectEvent; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { CameraObjectReset1(); ScriptContext2_Disable(); - EventObjectSetHeldMovement(eventObject, GetWalkNormalMovementAction(DIR_EAST)); + ObjectEventSetHeldMovement(objectEvent, GetWalkNormalMovementAction(DIR_EAST)); DestroyTask(FindTaskIdByFunc(sub_8086CBC)); } return FALSE; @@ -1566,10 +1566,10 @@ bool8 FldEff_UseWaterfall(void) void sub_8086F64(u8 taskId) { - while (gUnknown_0839F31C[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId])); + while (gUnknown_0839F31C[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId])); } -bool8 sub_8086FB0(struct Task *task, struct EventObject *eventObject) +bool8 sub_8086FB0(struct Task *task, struct ObjectEvent *objectEvent) { ScriptContext2_Enable(); gPlayerAvatar.preventStep = TRUE; @@ -1577,12 +1577,12 @@ bool8 sub_8086FB0(struct Task *task, struct EventObject *eventObject) return FALSE; } -bool8 waterfall_1_do_anim_probably(struct Task *task, struct EventObject *eventObject) +bool8 waterfall_1_do_anim_probably(struct Task *task, struct ObjectEvent *objectEvent) { ScriptContext2_Enable(); - if (!EventObjectIsMovementOverridden(eventObject)) + if (!ObjectEventIsMovementOverridden(objectEvent)) { - EventObjectClearHeldMovementIfFinished(eventObject); + ObjectEventClearHeldMovementIfFinished(objectEvent); gFieldEffectArguments[0] = task->data[1]; FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT); task->data[0]++; @@ -1590,7 +1590,7 @@ bool8 waterfall_1_do_anim_probably(struct Task *task, struct EventObject *eventO return FALSE; } -bool8 waterfall_2_wait_anim_finish_probably(struct Task *task, struct EventObject *eventObject) +bool8 waterfall_2_wait_anim_finish_probably(struct Task *task, struct ObjectEvent *objectEvent) { if (FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON)) { @@ -1600,20 +1600,20 @@ bool8 waterfall_2_wait_anim_finish_probably(struct Task *task, struct EventObjec return TRUE; } -bool8 sub_8087030(struct Task *task, struct EventObject *eventObject) +bool8 sub_8087030(struct Task *task, struct ObjectEvent *objectEvent) { - EventObjectSetHeldMovement(eventObject, GetWalkSlowMovementAction(DIR_NORTH)); + ObjectEventSetHeldMovement(objectEvent, GetWalkSlowMovementAction(DIR_NORTH)); task->data[0]++; return FALSE; } -bool8 sub_8087058(struct Task *task, struct EventObject *eventObject) +bool8 sub_8087058(struct Task *task, struct ObjectEvent *objectEvent) { - if (!EventObjectClearHeldMovementIfFinished(eventObject)) + if (!ObjectEventClearHeldMovementIfFinished(objectEvent)) { return FALSE; } - if (MetatileBehavior_IsWaterfall(eventObject->currentMetatileBehavior)) + if (MetatileBehavior_IsWaterfall(objectEvent->currentMetatileBehavior)) { task->data[0] = 3; return TRUE; @@ -1664,7 +1664,7 @@ bool8 dive_3_unknown(struct Task *task) PlayerGetDestCoords(&mapPosition.x, &mapPosition.y); if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON)) { - dive_warp(&mapPosition, gEventObjects[gPlayerAvatar.eventObjectId].currentMetatileBehavior); + dive_warp(&mapPosition, gObjectEvents[gPlayerAvatar.objectEventId].currentMetatileBehavior); DestroyTask(FindTaskIdByFunc(Task_Dive)); FieldEffectActiveListRemove(FLDEFF_USE_DIVE); } @@ -1681,22 +1681,22 @@ void sub_80871B8(u8 priority) void sub_80871D0(u8 taskId) { - while (gUnknown_0839F33C[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId], &gSprites[gPlayerAvatar.spriteId])); + while (gUnknown_0839F33C[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId], &gSprites[gPlayerAvatar.spriteId])); } -bool8 sub_808722C(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_808722C(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { - FreezeEventObjects(); + FreezeObjectEvents(); CameraObjectReset2(); SetCameraPanningCallback(NULL); gPlayerAvatar.preventStep = TRUE; - eventObject->fixedPriority = 1; + objectEvent->fixedPriority = 1; task->data[1] = 1; task->data[0]++; return TRUE; } -bool8 sub_8087264(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_8087264(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { SetCameraPanning(0, task->data[1]); task->data[1] = -task->data[1]; @@ -1709,12 +1709,12 @@ bool8 sub_8087264(struct Task *task, struct EventObject *eventObject, struct Spr return FALSE; } -bool8 sub_8087298(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_8087298(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite->pos2.y = 0; task->data[3] = 1; - gFieldEffectArguments[0] = eventObject->currentCoords.x; - gFieldEffectArguments[1] = eventObject->currentCoords.y; + gFieldEffectArguments[0] = objectEvent->currentCoords.x; + gFieldEffectArguments[1] = objectEvent->currentCoords.y; gFieldEffectArguments[2] = sprite->subpriority - 1; gFieldEffectArguments[3] = sprite->oam.priority; FieldEffectStart(FLDEFF_LAVARIDGE_GYM_WARP); @@ -1723,7 +1723,7 @@ bool8 sub_8087298(struct Task *task, struct EventObject *eventObject, struct Spr return TRUE; } -bool8 sub_80872E4(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_80872E4(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { s16 centerToCornerVecY; SetCameraPanning(0, task->data[1]); @@ -1755,7 +1755,7 @@ bool8 sub_80872E4(struct Task *task, struct EventObject *eventObject, struct Spr if (task->data[5] == 0 && sprite->pos2.y < -0x10) { task->data[5]++; - eventObject->fixedPriority = 1; + objectEvent->fixedPriority = 1; sprite->oam.priority = 1; sprite->subspriteMode = 2; } @@ -1766,7 +1766,7 @@ bool8 sub_80872E4(struct Task *task, struct EventObject *eventObject, struct Spr return FALSE; } -bool8 sub_80873D8(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_80873D8(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { TryFadeOutOldMapMusic(); WarpFadeScreen(); @@ -1774,7 +1774,7 @@ bool8 sub_80873D8(struct Task *task, struct EventObject *eventObject, struct Spr return FALSE; } -bool8 sub_80873F4(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_80873F4(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (!gPaletteFade.active && BGMusicStopped() == TRUE) { @@ -1799,25 +1799,25 @@ void mapldr_080851BC(void) void sub_8087470(u8 taskId) { - while (gUnknown_0839F354[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId], &gSprites[gPlayerAvatar.spriteId])); + while (gUnknown_0839F354[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId], &gSprites[gPlayerAvatar.spriteId])); } -bool8 sub_80874CC(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_80874CC(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { CameraObjectReset2(); - FreezeEventObjects(); + FreezeObjectEvents(); gPlayerAvatar.preventStep = TRUE; - eventObject->invisible = 1; + objectEvent->invisible = 1; task->data[0]++; return FALSE; } -bool8 sub_80874FC(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_80874FC(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (IsWeatherNotFadingIn()) { - gFieldEffectArguments[0] = eventObject->currentCoords.x; - gFieldEffectArguments[1] = eventObject->currentCoords.y; + gFieldEffectArguments[0] = objectEvent->currentCoords.x; + gFieldEffectArguments[1] = objectEvent->currentCoords.y; gFieldEffectArguments[2] = sprite->subpriority - 1; gFieldEffectArguments[3] = sprite->oam.priority; task->data[1] = FieldEffectStart(FLDEFF_POP_OUT_OF_ASH); @@ -1826,27 +1826,27 @@ bool8 sub_80874FC(struct Task *task, struct EventObject *eventObject, struct Spr return FALSE; } -bool8 sub_8087548(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_8087548(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { sprite = &gSprites[task->data[1]]; if (sprite->animCmdIndex > 1) { task->data[0]++; - eventObject->invisible = 0; + objectEvent->invisible = 0; CameraObjectReset1(); PlaySE(SE_W091); - EventObjectSetHeldMovement(eventObject, GetJumpMovementAction(DIR_EAST)); + ObjectEventSetHeldMovement(objectEvent, GetJumpMovementAction(DIR_EAST)); } return FALSE; } -bool8 sub_808759C(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_808759C(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectClearHeldMovementIfFinished(eventObject)) + if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { gPlayerAvatar.preventStep = FALSE; ScriptContext2_Disable(); - UnfreezeEventObjects(); + UnfreezeObjectEvents(); DestroyTask(FindTaskIdByFunc(sub_8087470)); } return FALSE; @@ -1882,27 +1882,27 @@ void sub_8087654(u8 priority) void sub_808766C(u8 taskId) { - while(gUnknown_0839F364[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId], &gSprites[gPlayerAvatar.spriteId])); + while(gUnknown_0839F364[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId], &gSprites[gPlayerAvatar.spriteId])); } -bool8 sub_80876C8(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_80876C8(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { - FreezeEventObjects(); + FreezeObjectEvents(); CameraObjectReset2(); gPlayerAvatar.preventStep = TRUE; - eventObject->fixedPriority = 1; + objectEvent->fixedPriority = 1; task->data[0]++; return FALSE; } -bool8 sub_80876F8(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_80876F8(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { - if (EventObjectClearHeldMovementIfFinished(eventObject)) + if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { if (task->data[1] > 3) { - gFieldEffectArguments[0] = eventObject->currentCoords.x; - gFieldEffectArguments[1] = eventObject->currentCoords.y; + gFieldEffectArguments[0] = objectEvent->currentCoords.x; + gFieldEffectArguments[1] = objectEvent->currentCoords.y; gFieldEffectArguments[2] = sprite->subpriority - 1; gFieldEffectArguments[3] = sprite->oam.priority; task->data[1] = FieldEffectStart(FLDEFF_POP_OUT_OF_ASH); @@ -1910,24 +1910,24 @@ bool8 sub_80876F8(struct Task *task, struct EventObject *eventObject, struct Spr } else { task->data[1]++; - EventObjectSetHeldMovement(eventObject, GetWalkInPlaceFastestMovementAction(eventObject->facingDirection)); + ObjectEventSetHeldMovement(objectEvent, GetWalkInPlaceFastestMovementAction(objectEvent->facingDirection)); PlaySE(SE_FU_ZUZUZU); } } return FALSE; } -bool8 sub_8087774(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_8087774(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (gSprites[task->data[1]].animCmdIndex == 2) { - eventObject->invisible = 1; + objectEvent->invisible = 1; task->data[0]++; } return FALSE; } -bool8 sub_80877AC(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_80877AC(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (!FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH)) { @@ -1941,7 +1941,7 @@ bool8 sub_80877AC(struct Task *task, struct EventObject *eventObject, struct Spr static void DoEscapeRopeFieldEffect(u8); void mapldr_080859D4(void); -bool8 sub_80877D4(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite) +bool8 sub_80877D4(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite) { if (!gPaletteFade.active && BGMusicStopped() == TRUE) { @@ -1974,7 +1974,7 @@ void sub_808788C(struct Sprite *sprite) void StartEscapeRopeFieldEffect(void) { ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); CreateTask(DoEscapeRopeFieldEffect, 0x50); } @@ -1992,7 +1992,7 @@ static void EscapeRopeFieldEffect_Step0(struct Task *task) static void EscapeRopeFieldEffect_Step1(struct Task *task) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; u8 clockwiseDirections[5] = { DIR_SOUTH, DIR_WEST, @@ -2007,12 +2007,12 @@ static void EscapeRopeFieldEffect_Step1(struct Task *task) WarpFadeScreen(); } - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject)) + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (!ObjectEventIsMovementOverridden(objectEvent) || ObjectEventClearHeldMovementIfFinished(objectEvent)) { if (task->data[14] == 0 && !gPaletteFade.active && BGMusicStopped() == TRUE) { - SetEventObjectDirection(eventObject, task->data[15]); + SetObjectEventDirection(objectEvent, task->data[15]); sub_8053678(); WarpIntoMap(); gFieldCallback = mapldr_080859D4; @@ -2021,7 +2021,7 @@ static void EscapeRopeFieldEffect_Step1(struct Task *task) } else if (task->data[1] == 0 || (--task->data[1]) == 0) { - EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(clockwiseDirections[eventObject->facingDirection])); + ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(clockwiseDirections[objectEvent->facingDirection])); if (task->data[2] < 12) task->data[2]++; @@ -2042,9 +2042,9 @@ void mapldr_080859D4(void) Overworld_PlaySpecialMapMusic(); pal_fill_for_map_transition(); ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); gFieldCallback = NULL; - gEventObjects[gPlayerAvatar.eventObjectId].invisible = 1; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = 1; CreateTask(sub_8087A74, 0); } @@ -2065,29 +2065,29 @@ void sub_8087AA4(struct Task *task) void sub_8087AC8(struct Task *task) { u8 spinDirections[5] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; - struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; if (task->data[1] == 0 || (--task->data[1]) == 0) { - if (EventObjectIsMovementOverridden(eventObject) && !EventObjectClearHeldMovementIfFinished(eventObject)) + if (ObjectEventIsMovementOverridden(objectEvent) && !ObjectEventClearHeldMovementIfFinished(objectEvent)) { return; } if (task->data[2] >= 32 && task->data[15] == GetPlayerFacingDirection()) { - eventObject->invisible = 0; + objectEvent->invisible = 0; ScriptContext2_Disable(); - UnfreezeEventObjects(); + UnfreezeObjectEvents(); DestroyTask(FindTaskIdByFunc(sub_8087A74)); return; } - EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(spinDirections[eventObject->facingDirection])); + ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(spinDirections[objectEvent->facingDirection])); if (task->data[2] < 32) { task->data[2]++; } task->data[1] = task->data[2] >> 2; } - eventObject->invisible ^= 1; + objectEvent->invisible ^= 1; } static void ExecuteTeleportFieldEffectTask(u8); @@ -2117,7 +2117,7 @@ static void ExecuteTeleportFieldEffectTask(u8 taskId) static void TeleportFieldEffectTask1(struct Task *task) { ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); CameraObjectReset2(); task->data[15] = GetPlayerFacingDirection(); task->data[0]++; @@ -2126,14 +2126,14 @@ static void TeleportFieldEffectTask1(struct Task *task) static void TeleportFieldEffectTask2(struct Task *task) { u8 spinDirections[5] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; - struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; if (task->data[1] == 0 || (--task->data[1]) == 0) { - EventObjectTurn(eventObject, spinDirections[eventObject->facingDirection]); + ObjectEventTurn(objectEvent, spinDirections[objectEvent->facingDirection]); task->data[1] = 8; task->data[2]++; } - if (task->data[2] > 7 && task->data[15] == eventObject->facingDirection) + if (task->data[2] > 7 && task->data[15] == objectEvent->facingDirection) { task->data[0]++; task->data[1] = 4; @@ -2146,12 +2146,12 @@ static void TeleportFieldEffectTask2(struct Task *task) static void TeleportFieldEffectTask3(struct Task *task) { u8 spinDirections[5] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; - struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; struct Sprite *sprite = &gSprites[gPlayerAvatar.spriteId]; if ((--task->data[1]) <= 0) { task->data[1] = 4; - EventObjectTurn(eventObject, spinDirections[eventObject->facingDirection]); + ObjectEventTurn(objectEvent, spinDirections[objectEvent->facingDirection]); } sprite->pos1.y -= task->data[3]; task->data[4] += task->data[3]; @@ -2190,9 +2190,9 @@ static void mapldr_08085D88(void) Overworld_PlaySpecialMapMusic(); pal_fill_for_map_transition(); ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); gFieldCallback = NULL; - gEventObjects[gPlayerAvatar.eventObjectId].invisible = 1; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = 1; CameraObjectReset2(); CreateTask(sub_8087E1C, 0); } @@ -2217,7 +2217,7 @@ void sub_8087E4C(struct Task *task) sprite = &gSprites[gPlayerAvatar.spriteId]; centerToCornerVecY = -(sprite->centerToCornerVecY << 1); sprite->pos2.y = -(sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY); - gEventObjects[gPlayerAvatar.eventObjectId].invisible = 0; + gObjectEvents[gPlayerAvatar.objectEventId].invisible = 0; task->data[0]++; task->data[1] = 8; task->data[2] = 1; @@ -2230,14 +2230,14 @@ void sub_8087E4C(struct Task *task) void sub_8087ED8(struct Task *task) { u8 spinDirections[5] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; - struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; struct Sprite *sprite = &gSprites[gPlayerAvatar.spriteId]; if ((sprite->pos2.y += task->data[1]) >= -8) { if (task->data[13] == 0) { task->data[13]++; - eventObject->triggerGroundEffectsOnMove = 1; + objectEvent->triggerGroundEffectsOnMove = 1; sprite->subspriteMode = task->data[14]; } } else @@ -2255,7 +2255,7 @@ void sub_8087ED8(struct Task *task) if ((--task->data[2]) == 0) { task->data[2] = 4; - EventObjectTurn(eventObject, spinDirections[eventObject->facingDirection]); + ObjectEventTurn(objectEvent, spinDirections[objectEvent->facingDirection]); } if (sprite->pos2.y >= 0) { @@ -2269,16 +2269,16 @@ void sub_8087ED8(struct Task *task) void sub_8087FDC(struct Task *task) { u8 spinDirections[5] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; - struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; if ((--task->data[1]) == 0) { - EventObjectTurn(eventObject, spinDirections[eventObject->facingDirection]); + ObjectEventTurn(objectEvent, spinDirections[objectEvent->facingDirection]); task->data[1] = 8; - if ((++task->data[2]) > 4 && task->data[14] == eventObject->facingDirection) + if ((++task->data[2]) > 4 && task->data[14] == objectEvent->facingDirection) { ScriptContext2_Disable(); CameraObjectReset1(); - UnfreezeEventObjects(); + UnfreezeObjectEvents(); DestroyTask(FindTaskIdByFunc(sub_8087E1C)); } } @@ -2830,31 +2830,31 @@ void sub_8088954(u8 taskId) void sub_8088984(struct Task *task) { ScriptContext2_Enable(); - FreezeEventObjects(); + FreezeObjectEvents(); gPlayerAvatar.preventStep = TRUE; SetPlayerAvatarStateMask(8); PlayerGetDestCoords(&task->data[1], &task->data[2]); - MoveCoords(gEventObjects[gPlayerAvatar.eventObjectId].movementDirection, &task->data[1], &task->data[2]); + MoveCoords(gObjectEvents[gPlayerAvatar.objectEventId].movementDirection, &task->data[1], &task->data[2]); task->data[0]++; } void sub_80889E4(struct Task *task) { - struct EventObject *eventObject; - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject)) + struct ObjectEvent *objectEvent; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (!ObjectEventIsMovementOverridden(objectEvent) || ObjectEventClearHeldMovementIfFinished(objectEvent)) { sub_8059BF4(); - EventObjectSetHeldMovement(eventObject, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); + ObjectEventSetHeldMovement(objectEvent, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); task->data[0]++; } } void sub_8088A30(struct Task *task) { - struct EventObject *eventObject; - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (EventObjectCheckHeldMovementStatus(eventObject)) + struct ObjectEvent *objectEvent; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (ObjectEventCheckHeldMovementStatus(objectEvent)) { gFieldEffectArguments[0] = task->data[15] | 0x80000000; FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT); @@ -2864,32 +2864,32 @@ void sub_8088A30(struct Task *task) void sub_8088A78(struct Task *task) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON)) { - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - EventObjectSetGraphicsId(eventObject, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING)); - EventObjectClearHeldMovementIfFinished(eventObject); - EventObjectSetHeldMovement(eventObject, GetJumpSpecialMovementAction(eventObject->movementDirection)); + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING)); + ObjectEventClearHeldMovementIfFinished(objectEvent); + ObjectEventSetHeldMovement(objectEvent, GetJumpSpecialMovementAction(objectEvent->movementDirection)); gFieldEffectArguments[0] = task->data[1]; gFieldEffectArguments[1] = task->data[2]; - gFieldEffectArguments[2] = gPlayerAvatar.eventObjectId; - eventObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_SURF_BLOB); + gFieldEffectArguments[2] = gPlayerAvatar.objectEventId; + objectEvent->fieldEffectSpriteId = FieldEffectStart(FLDEFF_SURF_BLOB); task->data[0]++; } } void sub_8088AF4(struct Task *task) { - struct EventObject *eventObject; - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (EventObjectClearHeldMovementIfFinished(eventObject)) + struct ObjectEvent *objectEvent; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { gPlayerAvatar.preventStep = FALSE; gPlayerAvatar.flags &= 0xdf; - EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(eventObject->movementDirection)); - sub_8127ED0(eventObject->fieldEffectSpriteId, 1); - UnfreezeEventObjects(); + ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(objectEvent->movementDirection)); + sub_8127ED0(objectEvent->fieldEffectSpriteId, 1); + UnfreezeObjectEvents(); ScriptContext2_Disable(); FieldEffectActiveListRemove(FLDEFF_USE_SURF); DestroyTask(FindTaskIdByFunc(sub_8088954)); @@ -2969,24 +2969,24 @@ void sub_8088C70(u8 taskId) void sub_8088CA0(struct Task *task) { - struct EventObject *eventObject; - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject)) + struct ObjectEvent *objectEvent; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (!ObjectEventIsMovementOverridden(objectEvent) || ObjectEventClearHeldMovementIfFinished(objectEvent)) { task->data[15] = gPlayerAvatar.flags; gPlayerAvatar.preventStep = TRUE; SetPlayerAvatarStateMask(1); sub_8059BF4(); - EventObjectSetHeldMovement(eventObject, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); + ObjectEventSetHeldMovement(objectEvent, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); task->data[0]++; } } void sub_8088CF8(struct Task *task) { - struct EventObject *eventObject; - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (EventObjectClearHeldMovementIfFinished(eventObject)) + struct ObjectEvent *objectEvent; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { task->data[0]++; gFieldEffectArguments[0] = task->data[1]; @@ -2996,14 +2996,14 @@ void sub_8088CF8(struct Task *task) void sub_8088D3C(struct Task *task) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON)) { - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; if (task->data[15] & 0x08) { - sub_8127ED0(eventObject->fieldEffectSpriteId, 2); - sub_8127EFC(eventObject->fieldEffectSpriteId, 0); + sub_8127ED0(objectEvent->fieldEffectSpriteId, 2); + sub_8127EFC(objectEvent->fieldEffectSpriteId, 0); } task->data[1] = sub_8088F60(); task->data[0]++; @@ -3017,15 +3017,15 @@ void sub_8088D94(struct Task *task) task->data[0]++; task->data[2] = 16; SetPlayerAvatarTransitionFlags(PLAYER_AVATAR_FLAG_ON_FOOT); - EventObjectSetHeldMovement(&gEventObjects[gPlayerAvatar.eventObjectId], MOVEMENT_ACTION_FACE_LEFT); + ObjectEventSetHeldMovement(&gObjectEvents[gPlayerAvatar.objectEventId], MOVEMENT_ACTION_FACE_LEFT); } } void sub_8088DD8(struct Task *task) { - struct EventObject *eventObject; - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if ((task->data[2] == 0 || (--task->data[2]) == 0) && EventObjectClearHeldMovementIfFinished(eventObject)) + struct ObjectEvent *objectEvent; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if ((task->data[2] == 0 || (--task->data[2]) == 0) && ObjectEventClearHeldMovementIfFinished(objectEvent)) { task->data[0]++; PlaySE(SE_W019); @@ -3035,17 +3035,17 @@ void sub_8088DD8(struct Task *task) void sub_8088E2C(struct Task *task) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; if ((++task->data[2]) >= 8) { - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - EventObjectSetGraphicsId(eventObject, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING)); - StartSpriteAnim(&gSprites[eventObject->spriteId], 0x16); - eventObject->inanimate = 1; - EventObjectSetHeldMovement(eventObject, MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT); + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING)); + StartSpriteAnim(&gSprites[objectEvent->spriteId], 0x16); + objectEvent->inanimate = 1; + ObjectEventSetHeldMovement(objectEvent, MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT); if (task->data[15] & 0x08) { - DestroySprite(&gSprites[eventObject->fieldEffectSpriteId]); + DestroySprite(&gSprites[objectEvent->fieldEffectSpriteId]); } task->data[0]++; task->data[2] = 0; @@ -3054,14 +3054,14 @@ void sub_8088E2C(struct Task *task) void sub_8088EB4(struct Task *task) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; if ((++task->data[2]) >= 10) { - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - EventObjectClearHeldMovementIfActive(eventObject); - eventObject->inanimate = 0; - eventObject->hasShadow = 0; - sub_8088FFC(task->data[1], eventObject->spriteId); + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + ObjectEventClearHeldMovementIfActive(objectEvent); + objectEvent->inanimate = 0; + objectEvent->hasShadow = 0; + sub_8088FFC(task->data[1], objectEvent->spriteId); CameraObjectReset2(); task->data[0]++; } @@ -3266,9 +3266,9 @@ void sub_8089270(u8 taskId) void sub_80892A0(struct Task *task) { - struct EventObject *eventObject; - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject)) + struct ObjectEvent *objectEvent; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (!ObjectEventIsMovementOverridden(objectEvent) || ObjectEventClearHeldMovementIfFinished(objectEvent)) { task->data[0]++; task->data[2] = 17; @@ -3277,27 +3277,27 @@ void sub_80892A0(struct Task *task) SetPlayerAvatarStateMask(0x01); if (task->data[15] & 0x08) { - sub_8127ED0(eventObject->fieldEffectSpriteId, 0); + sub_8127ED0(objectEvent->fieldEffectSpriteId, 0); } - EventObjectSetGraphicsId(eventObject, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING)); + ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING)); CameraObjectReset2(); - EventObjectTurn(eventObject, DIR_WEST); - StartSpriteAnim(&gSprites[eventObject->spriteId], 0x16); - eventObject->invisible = 0; + ObjectEventTurn(objectEvent, DIR_WEST); + StartSpriteAnim(&gSprites[objectEvent->spriteId], 0x16); + objectEvent->invisible = 0; task->data[1] = sub_8088F60(); sub_8088FC0(task->data[1]); - sub_8088FFC(task->data[1], eventObject->spriteId); + sub_8088FFC(task->data[1], objectEvent->spriteId); } } void sub_8089354(struct Task *task) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; struct Sprite *sprite; if (task->data[2] == 0 || (--task->data[2]) == 0) { - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - sprite = &gSprites[eventObject->spriteId]; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + sprite = &gSprites[objectEvent->spriteId]; sub_8088FFC(task->data[1], 0x40); sprite->pos1.x += sprite->pos2.x; sprite->pos1.y += sprite->pos2.y; @@ -3340,26 +3340,26 @@ void sub_80893C0(struct Task *task) void sub_8089414(struct Task *task) { - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; struct Sprite *sprite; if (sub_8088FA4(task->data[1])) { - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - sprite = &gSprites[eventObject->spriteId]; - eventObject->inanimate = 0; - sub_805C058(eventObject, eventObject->currentCoords.x, eventObject->currentCoords.y); + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + sprite = &gSprites[objectEvent->spriteId]; + objectEvent->inanimate = 0; + sub_805C058(objectEvent, objectEvent->currentCoords.x, objectEvent->currentCoords.y); sprite->pos2.x = 0; sprite->pos2.y = 0; sprite->coordOffsetEnabled = 1; sub_8059BF4(); - EventObjectSetHeldMovement(eventObject, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); + ObjectEventSetHeldMovement(objectEvent, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); task->data[0]++; } } void sub_808948C(struct Task *task) { - if (EventObjectClearHeldMovementIfFinished(&gEventObjects[gPlayerAvatar.eventObjectId])) + if (ObjectEventClearHeldMovementIfFinished(&gObjectEvents[gPlayerAvatar.objectEventId])) { task->data[0]++; sub_8089230(task->data[1]); @@ -3379,18 +3379,18 @@ void sub_80894C4(struct Task *task) void fishE(struct Task *task) { u8 state; - struct EventObject *eventObject; + struct ObjectEvent *objectEvent; if ((--task->data[1]) == 0) { - eventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; + objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; state = PLAYER_AVATAR_STATE_NORMAL; if (task->data[15] & 0x08) { state = PLAYER_AVATAR_STATE_SURFING; - sub_8127ED0(eventObject->fieldEffectSpriteId, 1); + sub_8127ED0(objectEvent->fieldEffectSpriteId, 1); } - EventObjectSetGraphicsId(eventObject, GetPlayerAvatarGraphicsIdByStateId(state)); - EventObjectTurn(eventObject, DIR_SOUTH); + ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(state)); + ObjectEventTurn(objectEvent, DIR_SOUTH); gPlayerAvatar.flags = task->data[15]; gPlayerAvatar.preventStep = FALSE; FieldEffectActiveListRemove(FLDEFF_FLY_IN); |