diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-07-05 20:53:40 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-07-05 19:12:20 -0700 |
| commit | 99c98097753008b1f824a676b36f34ac2857effe (patch) | |
| tree | cff85e4c569e337f087d62314122209929195d92 /src/battle/anim/orbit.c | |
| parent | c63e00f47a5d3388a149fdbd8b6cbd8c138e8494 (diff) | |
Decompile battle_anim_813F0f4.s
Diffstat (limited to 'src/battle/anim/orbit.c')
| -rw-r--r-- | src/battle/anim/orbit.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle/anim/orbit.c b/src/battle/anim/orbit.c index e76e0923e..f938a2707 100644 --- a/src/battle/anim/orbit.c +++ b/src/battle/anim/orbit.c @@ -158,7 +158,7 @@ void sub_80CAD54(struct Sprite* sprite) sprite->data[2] = sprite->pos1.x; sprite->data[3] = sprite->pos1.y; sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + gBattleAnimArgs[2]; - InitAnimSpriteTranslationDeltas(sprite); + InitAnimLinearTranslation(sprite); sprite->data[5] = 0x40; sprite->callback = sub_80CADA8; sub_80CADA8(sprite); @@ -166,7 +166,7 @@ void sub_80CAD54(struct Sprite* sprite) static void sub_80CADA8(struct Sprite* sprite) { - if (!TranslateAnimSpriteByDeltas(sprite)) + if (!TranslateAnimLinear(sprite)) { sprite->pos2.x += Sin(sprite->data[5], 32); sprite->pos2.y += Cos(sprite->data[5], -5); @@ -195,7 +195,7 @@ void sub_80CAE20(struct Sprite* sprite) sprite->data[2] = sprite->pos1.x; sprite->data[3] = sprite->pos1.y; sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 3) + gBattleAnimArgs[2]; - InitAnimSpriteTranslationDeltas(sprite); + InitAnimLinearTranslation(sprite); sprite->data[5] = 0x40; sprite->callback = sub_80CAE74; sub_80CAE74(sprite); @@ -203,7 +203,7 @@ void sub_80CAE20(struct Sprite* sprite) static void sub_80CAE74(struct Sprite* sprite) { - if (!TranslateAnimSpriteByDeltas(sprite)) + if (!TranslateAnimLinear(sprite)) { sprite->pos2.x += Sin(sprite->data[5], 8); if ((u16)(sprite->data[5] - 0x3B) < 5 || (u16)(sprite->data[5] - 0xBB) < 5) |