diff options
author | Marcus Huderle <huderlem@gmail.com> | 2018-12-17 22:22:27 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-17 22:22:27 -0600 |
commit | 747a3b4b3e76db3a8f94bafcbe8d38e740850d59 (patch) | |
tree | 2e9f0cad82e7b8d8968db0d7fa750636eee470ed /src/battle/anim/seed.c | |
parent | fa6429eaf842ea1db6122bc049de0c4efdd645a5 (diff) | |
parent | 00be991c66d37d090792db8bc1e4c1b9f9e88536 (diff) |
Merge pull request #715 from shinny456/master
gAnimBankAttacker/Target to gBattleAnimAttacker/Target
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; |