diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-04-28 13:56:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-28 13:56:42 -0400 |
| commit | 6c38837b266c0dd36ccdd04559199282daa7a8a0 (patch) | |
| tree | 6c63ce12a739da34a2a86fb886da7c9b43953c76 /src/battle_anim_throw.c | |
| parent | 58cef0ae52b9655f4ad121218933b1e7c23fca9c (diff) | |
| parent | e40f89b175189bcfca33285ee5a98de1b7ff74a6 (diff) | |
Merge pull request #1420 from GriffinRichards/doc-dataanims
Document battler affine anims, default pokeball throw
Diffstat (limited to 'src/battle_anim_throw.c')
| -rwxr-xr-x | src/battle_anim_throw.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/battle_anim_throw.c b/src/battle_anim_throw.c index f6a48cf69..83768b476 100755 --- a/src/battle_anim_throw.c +++ b/src/battle_anim_throw.c @@ -16,6 +16,7 @@ #include "task.h" #include "trig.h" #include "util.h" +#include "data.h" #include "constants/items.h" #include "constants/moves.h" #include "constants/songs.h" @@ -1471,7 +1472,7 @@ static void SpriteCB_Ball_Release_Step(struct Sprite *sprite) // Animate Pokémon emerging from Poké Ball gSprites[gBattlerSpriteIds[gBattleAnimTarget]].invisible = FALSE; - StartSpriteAffineAnim(&gSprites[gBattlerSpriteIds[gBattleAnimTarget]], 1); + StartSpriteAffineAnim(&gSprites[gBattlerSpriteIds[gBattleAnimTarget]], BATTLER_AFFINE_EMERGE); AnimateSprite(&gSprites[gBattlerSpriteIds[gBattleAnimTarget]]); gSprites[gBattlerSpriteIds[gBattleAnimTarget]].sOffsetY = 4096; } @@ -1485,7 +1486,7 @@ static void SpriteCB_Ball_Release_Wait(struct Sprite *sprite) if (gSprites[gBattlerSpriteIds[gBattleAnimTarget]].affineAnimEnded) { - StartSpriteAffineAnim(&gSprites[gBattlerSpriteIds[gBattleAnimTarget]], 0); + StartSpriteAffineAnim(&gSprites[gBattlerSpriteIds[gBattleAnimTarget]], BATTLER_AFFINE_NORMAL); released = TRUE; } else |