From 392a16651bce00efa50bc74f0258d7567320fbc1 Mon Sep 17 00:00:00 2001 From: lordraindance2 <47706100+lordraindance2@users.noreply.github.com> Date: Tue, 28 Jan 2025 18:04:16 -0500 Subject: [PATCH] Implemented clear animation for also overworld pokemon (#5825) --- src/scrcmd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/scrcmd.c b/src/scrcmd.c index 399562f9a0..87e79745bd 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1005,7 +1005,8 @@ bool8 ScrCmd_applymovement(struct ScriptContext *ctx) struct ObjectEvent *objEvent; // 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) + if ((localId == OBJ_EVENT_ID_FOLLOWER && (objEvent = GetFollowerObject()) && objEvent->frozen) + || ((objEvent = &gObjectEvents[GetObjectEventIdByLocalId(localId)]) && IS_OW_MON_OBJ(objEvent))) { ClearObjectEventMovement(objEvent, &gSprites[objEvent->spriteId]); gSprites[objEvent->spriteId].animCmdIndex = 0; // Reset start frame of animation