diff options
author | garakmon <thomastaps194@comcast.net> | 2018-07-07 21:29:11 -0400 |
---|---|---|
committer | garakmon <thomastaps194@comcast.net> | 2018-07-07 21:29:11 -0400 |
commit | 864a69f9bf050eaaa062c8346cd6a5032e617139 (patch) | |
tree | bd8b133710c813b11becf602067495526c849b6a /src/battle/anim/seed.c | |
parent | 47bcba3e1b5140cef7f04edcda3759818408726a (diff) |
merge conflicts are soooooooooo fun
Diffstat (limited to 'src/battle/anim/seed.c')
-rw-r--r-- | src/battle/anim/seed.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle/anim/seed.c b/src/battle/anim/seed.c index 11eebada0..bf8142a49 100644 --- a/src/battle/anim/seed.c +++ b/src/battle/anim/seed.c @@ -61,13 +61,13 @@ void AnimLeechSeed(struct Sprite* sprite) sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 0) + gBattleAnimArgs[2]; sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 1) + gBattleAnimArgs[3]; sprite->data[5] = gBattleAnimArgs[5]; - InitAnimSpriteTranslationOverDuration(sprite); + InitAnimArcTranslation(sprite); sprite->callback = AnimLeechSeedStep; } static void AnimLeechSeedStep(struct Sprite* sprite) { - if (TranslateAnimSpriteLinearAndSine(sprite)) + if (TranslateAnimArc(sprite)) { sprite->invisible = 1; sprite->data[0] = 10; |