Merge pull request #1271 from Sierraffinity/pkmn_affine_anim_bugfix

Add bugfix for Pokémon with affine transforms as part of their entry animation glitching when being sent out/put back in ball

1 files changed, 9 insertions, 0 deletions

diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c
index bfcf77b5c..58c174263 100644
--- a/src/pokemon_animation.c
+++ b/src/pokemon_animation.c
@@ -1041,6 +1041,15 @@ static void sub_817F77C(struct Sprite *sprite)
         sprite->oam.matrixNum |= (sprite->hFlip << 3);
         sprite->oam.affineMode = ST_OAM_AFFINE_OFF;
     }
+#ifdef BUGFIX
+    else
+    {
+        // FIX: Reset these back to normal after they were changed so Poké Ball catch/release
+        // animations without a screen transition in between don't break
+        sprite->affineAnimPaused = FALSE;
+        sprite->affineAnims = gUnknown_082FF694;
+    }
+#endif // BUGFIX
 }
 
 static void pokemonanimfunc_01(struct Sprite *sprite)