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/scan.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/scan.c')
-rw-r--r-- | src/battle/anim/scan.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle/anim/scan.c b/src/battle/anim/scan.c index 792e832cb..329e28f71 100644 --- a/src/battle/anim/scan.c +++ b/src/battle/anim/scan.c @@ -6,8 +6,8 @@ #include "palette.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80CD3E0(struct Sprite* sprite); void sub_80CD6CC(struct Sprite* sprite); @@ -140,8 +140,8 @@ static void sub_80CD4EC(struct Sprite* sprite) sprite->pos2.y = 0; sprite->pos2.x = 0; sprite->data[0] = 6; - sprite->data[2] = GetBattlerSpriteCoord(gAnimBankTarget, 2) + a; - sprite->data[4] = GetBattlerSpriteCoord(gAnimBankTarget, 3) + b; + sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + a; + sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + b; sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData(sprite, sub_80CD654); } |