summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSierraffinity <sierra@domoreaweso.me>2020-12-12 20:29:20 -0800
committerSierraffinity <sierra@domoreaweso.me>2020-12-12 20:29:20 -0800
commitabef3065d0c6f61607161d6a88a42f93824c6f77 (patch)
treead7240d63574145b6008f7d9fad3cce02b06c988 /src
parentba3021db64bd9518f324c1ad89e63e90278f0eb4 (diff)
Fix affine anim bug with Pokémon going in and out of balls without an intermediate screen transition
Diffstat (limited to 'src')
-rw-r--r--src/pokemon_animation.c9
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)