From 4f18a3fa89cd40a6cbfa9c1c0b5c812fa2885363 Mon Sep 17 00:00:00 2001 From: W1serV1ser <1prefertheaircauseimanairnomad@gmail.com> Date: Sun, 27 Mar 2022 22:13:59 -0700 Subject: [PATCH] Fixed glitch when going in/out of pokeball a lot Before this fix, if the follower did their into/out of pokeball animation enough times without the map being reloaded, both the follower and the sparkle sprites would start to glitch out a lot. This fixes that. --- src/event_object_movement.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 25aeff76b..956a15770 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -10445,6 +10445,7 @@ u8 MovementAction_FollowingPokemon_Shrink_Step1(struct ObjectEvent *objectEvent, if (sprite->data[7] >= 11) { + FreeSpriteOamMatrix(sprite); gObjectEvents[gPlayerAvatar.objectEventId].fixedPriority = FALSE; objectEvent->invisible = TRUE; sprite->data[2]++; @@ -10571,8 +10572,8 @@ u8 MovementAction_FollowingPokemon_Grow_Step1(struct ObjectEvent *objectEvent, s sprite->y2 = 0; } + FreeSpriteOamMatrix(sprite); sprite->data[2]++; - sprite->oam.affineMode = 0; } return FALSE;