Fixed glitch when follower goes in/out of pokeball a lot
Before this fix, if the follower went into/out of their pokeball enough times, both the follower and the sparkles would start glitching out whenever the into/out of animation played. This fixes that.
This commit is contained in:
1 parent
04a4cc0987
commit
01ab4280f3
1 file changed
+2
-1
@@ -10339,6 +10339,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]++;
|
||||
@@ -10465,8 +10466,8 @@ u8 MovementAction_FollowingPokemon_Grow_Step1(struct ObjectEvent *objectEvent, s
|
||||
sprite->y2 = 0;
|
||||
}
|
||||
|
||||
FreeSpriteOamMatrix(sprite);
|
||||
sprite->data[2]++;
|
||||
sprite->oam.affineMode = 0;
|
||||
}
|
||||
|
||||
return FALSE;
|
||||
|
||||
Reference in new issue
Block a user