diff options
Diffstat (limited to 'src/battle_anim_effects_1.c')
-rw-r--r-- | src/battle_anim_effects_1.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c index 25eb14637..f14e502f3 100644 --- a/src/battle_anim_effects_1.c +++ b/src/battle_anim_effects_1.c @@ -2326,7 +2326,7 @@ void AnimAbsorptionOrb(struct Sprite* sprite) static void AnimAbsorptionOrbStep(struct Sprite* sprite) { - if (TranslateAnimArc(sprite)) + if (TranslateAnimHorizontalArc(sprite)) DestroyAnimSprite(sprite); } @@ -2401,7 +2401,7 @@ void AnimLeechSeed(struct Sprite* sprite) static void AnimLeechSeedStep(struct Sprite* sprite) { - if (TranslateAnimArc(sprite)) + if (TranslateAnimHorizontalArc(sprite)) { sprite->invisible = 1; sprite->data[0] = 10; @@ -2662,7 +2662,7 @@ static void AnimTranslateLinearSingleSineWaveStep(struct Sprite* sprite) s16 r0; sprite->data[0] = 1; - TranslateAnimArc(sprite); + TranslateAnimHorizontalArc(sprite); r0 = sprite->data[7]; sprite->data[0] = a; if (b > 200 && r0 < 56 && sprite->oam.affineParam == 0) @@ -3325,7 +3325,7 @@ static void sub_8100128(u8 taskId) { case 4: sub_8100524(task, taskId); - if (TranslateAnimArc(sprite)) + if (TranslateAnimHorizontalArc(sprite)) { task->data[15] = 5; task->data[0] = 0xFF; @@ -3333,7 +3333,7 @@ static void sub_8100128(u8 taskId) break; case 8: sub_8100524(task, taskId); - if (TranslateAnimArc(sprite)) + if (TranslateAnimHorizontalArc(sprite)) { task->data[15] = 9; task->data[0] = 0xFF; @@ -3341,7 +3341,7 @@ static void sub_8100128(u8 taskId) break; case 0: sub_8100524(task, taskId); - if (TranslateAnimArc(sprite)) + if (TranslateAnimHorizontalArc(sprite)) { task->data[15] = 1; task->data[0] = 0xFF; @@ -3367,7 +3367,7 @@ static void sub_8100128(u8 taskId) break; case 2: sub_8100524(task, taskId); - if (TranslateAnimArc(sprite)) + if (TranslateAnimHorizontalArc(sprite)) { task->data[15] = 3; task->data[0] = 0xFF; @@ -3410,7 +3410,7 @@ static void sub_8100128(u8 taskId) break; case 6: sub_8100524(task, taskId); - if (TranslateAnimArc(sprite)) + if (TranslateAnimHorizontalArc(sprite)) { task->data[15] = 7; task->data[0] = 0xFF; @@ -3453,7 +3453,7 @@ static void sub_8100128(u8 taskId) break; case 10: sub_8100524(task, taskId); - if (TranslateAnimArc(sprite)) + if (TranslateAnimHorizontalArc(sprite)) { task->data[15] = 11; task->data[0] = 0xFF; @@ -3481,7 +3481,7 @@ static void sub_8100128(u8 taskId) } case 12: sub_8100524(task, taskId); - if (TranslateAnimArc(sprite)) + if (TranslateAnimHorizontalArc(sprite)) { DestroySprite(sprite); task->data[0]++; @@ -3766,7 +3766,7 @@ void sub_8100A94(struct Sprite* sprite) sprite->data[5] = gBattleAnimArgs[5]; StartSpriteAffineAnim(sprite, gBattleAnimArgs[6]); StoreSpriteCallbackInData6(sprite, DestroySpriteAndMatrix); - sprite->callback = sub_80A66DC; + sprite->callback = TranslateSpriteLinearAndFlicker; } // Moves the sprite in a diagonally slashing motion across the target mon. @@ -3995,7 +3995,7 @@ static void sub_8100FD4(struct Sprite *sprite) if (sprite->data[7] == 16) { sprite->invisible = 1; - sprite->callback = sub_80A67F4; + sprite->callback = DestroyAnimSpriteAndDisableBlend; } } } @@ -4121,7 +4121,7 @@ void sub_810130C(struct Sprite* sprite) sprite->data[1] = gBattleAnimArgs[3]; sprite->data[2] = gBattleAnimArgs[4]; StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); - sprite->callback = AnimTranslateLinearSimple; + sprite->callback = TranslateSpriteLinearFixedPoint; } void sub_810135C(struct Sprite* sprite) @@ -4158,7 +4158,7 @@ void sub_810135C(struct Sprite* sprite) sprite->data[1] = gBattleAnimArgs[3]; sprite->data[2] = gBattleAnimArgs[4]; StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); - sprite->callback = AnimTranslateLinearSimple; + sprite->callback = TranslateSpriteLinearFixedPoint; } void sub_8101440(struct Sprite* sprite) @@ -4428,7 +4428,7 @@ static void sub_8101998(struct Sprite* sprite) sprite->data[2] = 0; sprite->data[3] = gBattlerSpriteIds[gBattleAnimAttacker]; StoreSpriteCallbackInData6(sprite, sub_81019E8); - sprite->callback = TranslateMonBGUntil; + sprite->callback = TranslateMonSpriteLinear; } static void sub_81019E8(struct Sprite* sprite) @@ -4458,7 +4458,7 @@ static void sub_8101A74(struct Sprite* sprite) sprite->data[2] = 0; sprite->data[3] = gBattlerSpriteIds[gBattleAnimAttacker]; StoreSpriteCallbackInData6(sprite, sub_8101B84); - sprite->callback = TranslateMonBGUntil; + sprite->callback = TranslateMonSpriteLinear; } static void sub_8101AC4(struct Sprite* sprite) @@ -4737,7 +4737,7 @@ static void sub_8102044(struct Sprite* sprite) sprite->data[1] = 8; sprite->data[2] = 0; StoreSpriteCallbackInData6(sprite, sub_810207C); - sprite->callback = TranslateSpriteOverDuration; + sprite->callback = TranslateSpriteLinear; } } |