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_effects_3.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_effects_3.c')
| -rwxr-xr-x | src/battle_anim_effects_3.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c index 800431c6a..5aaf45f19 100755 --- a/src/battle_anim_effects_3.c +++ b/src/battle_anim_effects_3.c @@ -2319,11 +2319,11 @@ void AnimTask_TransformMon(u8 taskId) } if (IsSpeciesNotUnown(gContestResources->moveAnim->targetSpecies)) - gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].affineAnims = gUnknown_082FF6C0; + gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].affineAnims = gAffineAnims_BattleSpriteContest; else gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].affineAnims = gAffineAnims_BattleSpriteOpponentSide; - StartSpriteAffineAnim(&gSprites[gBattlerSpriteIds[gBattleAnimAttacker]], 0); + StartSpriteAffineAnim(&gSprites[gBattlerSpriteIds[gBattleAnimAttacker]], BATTLER_AFFINE_NORMAL); } gTasks[taskId].data[0]++; @@ -4733,8 +4733,8 @@ void AnimTask_MonToSubstitute(u8 taskId) LoadBattleMonGfxAndAnimate(gBattleAnimAttacker, 0, spriteId); if (IsContest()) { - gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].affineAnims = gUnknown_082FF6C0; - StartSpriteAffineAnim(&gSprites[gBattlerSpriteIds[gBattleAnimAttacker]], 0); + gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].affineAnims = gAffineAnims_BattleSpriteContest; + StartSpriteAffineAnim(&gSprites[gBattlerSpriteIds[gBattleAnimAttacker]], BATTLER_AFFINE_NORMAL); } for (i = 0; i < NUM_TASK_DATA; i++) |