diff options
Diffstat (limited to 'src/battle/anim/flying_path.c')
| -rw-r--r-- | src/battle/anim/flying_path.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/battle/anim/flying_path.c b/src/battle/anim/flying_path.c index b190e9e8c..d2f85ad35 100644 --- a/src/battle/anim/flying_path.c +++ b/src/battle/anim/flying_path.c @@ -102,7 +102,7 @@ void sub_80CBDF4(u8 taskId) gSprites[task->data[2]].data[3] = task->data[9]; gSprites[task->data[2]].data[4] = task->data[7] + (task->data[11] / 2 + 10) * task->data[5]; gSprites[task->data[2]].data[5] = sub_80CC338(&gSprites[task->data[2]]); - InitAnimSpriteTranslationOverDuration(&gSprites[task->data[2]]); + InitAnimArcTranslation(&gSprites[task->data[2]]); task->func = sub_80CBF5C; } @@ -115,7 +115,7 @@ static void sub_80CBF5C(u8 taskId) { case 4: sub_80CC358(task, taskId); - if (TranslateAnimSpriteLinearAndSine(sprite) == 0) + if (TranslateAnimArc(sprite) == 0) { break; } @@ -127,7 +127,7 @@ static void sub_80CBF5C(u8 taskId) break; case 8: sub_80CC358(task, taskId); - if (TranslateAnimSpriteLinearAndSine(sprite) == 0) + if (TranslateAnimArc(sprite) == 0) { break; } @@ -139,7 +139,7 @@ static void sub_80CBF5C(u8 taskId) break; case 0: sub_80CC358(task, taskId); - if (TranslateAnimSpriteLinearAndSine(sprite) == 0) + if (TranslateAnimArc(sprite) == 0) break; task->data[15] = 1; @@ -160,12 +160,12 @@ static void sub_80CBF5C(u8 taskId) task->data[3] = a; sprite->subpriority = task->data[4]; StartSpriteAnim(sprite, task->data[3]); - InitAnimSpriteTranslationOverDuration(sprite); + InitAnimArcTranslation(sprite); task->data[0]++; break; case 2: sub_80CC358(task, taskId); - if (TranslateAnimSpriteLinearAndSine(sprite) == 0) + if (TranslateAnimArc(sprite) == 0) break; task->data[15] = 3; @@ -185,7 +185,7 @@ static void sub_80CBF5C(u8 taskId) task->data[3] = 2; sprite->subpriority = task->data[4]; StartSpriteAnim(sprite, task->data[3]); - InitAnimSpriteTranslationOverDuration(sprite); + InitAnimArcTranslation(sprite); task->data[0]++; break; case 5: @@ -203,12 +203,12 @@ static void sub_80CBF5C(u8 taskId) task->data[3] = 3; sprite->subpriority = task->data[4]; StartSpriteAnim(sprite, task->data[3]); - InitAnimSpriteTranslationOverDuration(sprite); + InitAnimArcTranslation(sprite); task->data[0]++; break; case 6: sub_80CC358(task, taskId); - if (TranslateAnimSpriteLinearAndSine(sprite) == 0) + if (TranslateAnimArc(sprite) == 0) break; task->data[15] = 7; @@ -229,7 +229,7 @@ static void sub_80CBF5C(u8 taskId) task->data[3] = 4; sprite->subpriority = task->data[4]; StartSpriteAnim(sprite, task->data[3]); - InitAnimSpriteTranslationOverDuration(sprite); + InitAnimArcTranslation(sprite); task->data[0]++; break; case 9: @@ -246,12 +246,12 @@ static void sub_80CBF5C(u8 taskId) task->data[3] = 5; sprite->subpriority = task->data[4]; StartSpriteAnim(sprite, task->data[3]); - InitAnimSpriteTranslationOverDuration(sprite); + InitAnimArcTranslation(sprite); task->data[0]++; break; case 10: sub_80CC358(task, taskId); - if (TranslateAnimSpriteLinearAndSine(sprite) == 0) + if (TranslateAnimArc(sprite) == 0) { break; } @@ -277,13 +277,13 @@ static void sub_80CBF5C(u8 taskId) task->data[3] = 6; sprite->subpriority = task->data[4]; StartSpriteAnim(sprite, task->data[3]); - InitAnimSpriteTranslationOverDuration(sprite); + InitAnimArcTranslation(sprite); task->data[0]++; break; } case 12: sub_80CC358(task, taskId); - if (TranslateAnimSpriteLinearAndSine(sprite) != 0) + if (TranslateAnimArc(sprite) != 0) { DestroySprite(sprite); task->data[0]++; |