diff options
author | garak <garakmon@gmail.com> | 2018-12-17 23:34:16 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-17 23:34:16 -0500 |
commit | 2fb6c5bb7f81c285d973d602dbbe4bbf8fc8aba1 (patch) | |
tree | 003c2daccebd740c288e537216afed0265bfbc59 /src/battle/anim/seed.c | |
parent | 32c7ec313deaccb4e3dcef5f9da7d9062d09fc27 (diff) | |
parent | 5f202c744b92dcde829c1d24ad323d824c769fec (diff) |
Merge branch 'master' into createsprite
Diffstat (limited to 'src/battle/anim/seed.c')
-rw-r--r-- | src/battle/anim/seed.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle/anim/seed.c b/src/battle/anim/seed.c index 8065c9a38..9b0d87eca 100644 --- a/src/battle/anim/seed.c +++ b/src/battle/anim/seed.c @@ -4,8 +4,8 @@ #include "battle_anim.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void AnimLeechSeed(struct Sprite* sprite); static void AnimLeechSeedStep(struct Sprite* sprite); @@ -52,14 +52,14 @@ const struct SpriteTemplate gLeechSeedSpriteTemplate = void AnimLeechSeed(struct Sprite* sprite) { InitAnimSpritePos(sprite, 1); - if (GetBattlerSide(gAnimBankAttacker)) + if (GetBattlerSide(gBattleAnimAttacker)) { gBattleAnimArgs[2] = -gBattleAnimArgs[2]; } sprite->data[0] = gBattleAnimArgs[4]; - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 0) + gBattleAnimArgs[2]; - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 1) + gBattleAnimArgs[3]; + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[2]; + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[3]; sprite->data[5] = gBattleAnimArgs[5]; InitAnimArcTranslation(sprite); sprite->callback = AnimLeechSeedStep; |