ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-09 23:03:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1282 from Sierraffinity/master

Browse Source 
Change how mon affine transform fix is handled
This commit is contained in:
GriffinR 2020-12-30 21:21:12 -05:00 committed by GitHub
commit 0c74e2097f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pokeball.c
View File

@ -1133,6 +1133,11 @@ static void sub_80767D4(struct Sprite *sprite)
AnimateBallOpenParticlesForPokeball(sprite->pos1.x, sprite->pos1.y - 5, sprite->oam.priority, r6); AnimateBallOpenParticlesForPokeball(sprite->pos1.x, sprite->pos1.y - 5, sprite->oam.priority, r6);
sprite->data[1] = LaunchBallFadeMonTaskForPokeball(1, r8, r5); sprite->data[1] = LaunchBallFadeMonTaskForPokeball(1, r8, r5);
sprite->callback = sub_807687C; sprite->callback = sub_807687C;
#ifdef BUGFIX
// FIX: If this is used on a sprite that has previously had an affine animation, it will not
// play the shrink anim properly due to being paused. Works together with the fix to `sub_817F77C`.
gSprites[r7].affineAnimPaused = FALSE;
#endif // BUGFIX
StartSpriteAffineAnim(&gSprites[r7], 2); StartSpriteAffineAnim(&gSprites[r7], 2);
AnimateSprite(&gSprites[r7]); AnimateSprite(&gSprites[r7]);
gSprites[r7].data[1] = 0; gSprites[r7].data[1] = 0;

1
src/pokemon_animation.c
View File

@ -1046,7 +1046,6 @@ static void sub_817F77C(struct Sprite *sprite)
{ {
// FIX: Reset these back to normal after they were changed so Poké Ball catch/release // 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 // animations without a screen transition in between don't break
sprite->affineAnimPaused = FALSE;
sprite->affineAnims = gUnknown_082FF694; sprite->affineAnims = gUnknown_082FF694;
} }
#endif // BUGFIX #endif // BUGFIX