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/thought.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/thought.c')
| -rw-r--r-- | src/battle/anim/thought.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle/anim/thought.c b/src/battle/anim/thought.c index fcaf6a9a8..ee387040f 100644 --- a/src/battle/anim/thought.c +++ b/src/battle/anim/thought.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_80CEF9C(struct Sprite* sprite); static void sub_80CF008(struct Sprite* sprite); @@ -84,9 +84,9 @@ void sub_80CEF9C(struct Sprite* sprite) u8 a; u8 bank; if (gBattleAnimArgs[0] == 0) - bank = gAnimBankAttacker; + bank = gBattleAnimAttacker; else - bank = gAnimBankTarget; + bank = gBattleAnimTarget; sub_80CEF44(bank, sprite); a = (GetBattlerSide(bank) == 0) ? 0 : 1; |