Skip to content

Commit

Permalink
Implemented clear animation for also ow pokemon sprites
Browse files Browse the repository at this point in the history
  • Loading branch information
lordraindance2 committed Dec 18, 2024
1 parent 99ba36b commit b580dec
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions src/scrcmd.c
Original file line number Diff line number Diff line change
Expand Up @@ -1007,8 +1007,13 @@ bool8 ScrCmd_applymovement(struct ScriptContext *ctx)
// When applying script movements to follower, it may have frozen animation that must be cleared
if (localId == OBJ_EVENT_ID_FOLLOWER && (objEvent = GetFollowerObject()) && objEvent->frozen)
{
ClearObjectEventMovement(objEvent, &gSprites[objEvent->spriteId]);
gSprites[objEvent->spriteId].animCmdIndex = 0; // Reset start frame of animation
goto clear_animation;
}
if ((objEvent = &gObjectEvents[GetObjectEventIdByLocalId(localId)]) && IS_OW_MON_OBJ(objEvent))
{
clear_animation:
ClearObjectEventMovement(objEvent, &gSprites[objEvent->spriteId]);
gSprites[objEvent->spriteId].animCmdIndex = 0; // Reset start frame of animation
}

gObjectEvents[GetObjectEventIdByLocalId(localId)].directionOverwrite = DIR_NONE;
Expand Down

0 comments on commit b580dec

Please sign in to comment.