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/noise.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/noise.c')
| -rw-r--r-- | src/battle/anim/noise.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle/anim/noise.c b/src/battle/anim/noise.c index f4ea10bf9..65d962ace 100644 --- a/src/battle/anim/noise.c +++ b/src/battle/anim/noise.c @@ -3,8 +3,8 @@ #include "battle_anim.h" extern s16 gBattleAnimArgs[8]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80D2D68(struct Sprite* sprite); static void sub_80D2E30(struct Sprite *); @@ -26,7 +26,7 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D7CC8 = void sub_80D2D68(struct Sprite* sprite) { int var1; - u8 slot = gBattleAnimArgs[0] == 0 ? gAnimBankAttacker : gAnimBankTarget; + u8 slot = gBattleAnimArgs[0] == 0 ? gBattleAnimAttacker : gBattleAnimTarget; if (GetBattlerSide(slot) == 1) { |