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/brace.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/brace.c')
-rw-r--r-- | src/battle/anim/brace.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/battle/anim/brace.c b/src/battle/anim/brace.c index acf31e121..b57a2596e 100644 --- a/src/battle/anim/brace.c +++ b/src/battle/anim/brace.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80CDF0C(struct Sprite* sprite); static void sub_80CDF70(struct Sprite* sprite); @@ -43,13 +43,13 @@ void sub_80CDF0C(struct Sprite* sprite) { if (gBattleAnimArgs[0] == 0) { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankAttacker, 0) + gBattleAnimArgs[1]; - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankAttacker, 1) + gBattleAnimArgs[2]; + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0) + gBattleAnimArgs[1]; + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + gBattleAnimArgs[2]; } else { - sprite->pos1.x = GetBattlerSpriteCoord(gAnimBankTarget, 0) + gBattleAnimArgs[1]; - sprite->pos1.y = GetBattlerSpriteCoord(gAnimBankTarget, 1) + gBattleAnimArgs[2]; + sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[1]; + sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[2]; } sprite->data[0] = 0; |