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/espeed.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/espeed.c')
| -rw-r--r-- | src/battle/anim/espeed.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle/anim/espeed.c b/src/battle/anim/espeed.c index 17d0b383f..143510f3f 100644 --- a/src/battle/anim/espeed.c +++ b/src/battle/anim/espeed.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_80D1A70(struct Sprite* sprite); static void sub_80D15E0(u8 taskId); @@ -87,7 +87,7 @@ void sub_80D1638(u8 taskId) task->data[2] = 0; task->data[3] = 0; task->data[12] = 3; - if (GetBattlerSide(gAnimBankTarget) == 0) + if (GetBattlerSide(gBattleAnimTarget) == 0) { task->data[13] = 0xFFFF; task->data[14] = 8; @@ -205,8 +205,8 @@ void sub_80D18D4(u8 taskId) task->data[7] = 0; task->data[8] = 0; task->data[13] = 0; - task->data[14] = GetBattlerSpriteCoord(gAnimBankAttacker, 0); - task->data[15] = GetBattlerSpriteCoord(gAnimBankAttacker, 1); + task->data[14] = GetBattlerSpriteCoord(gBattleAnimAttacker, 0); + task->data[15] = GetBattlerSpriteCoord(gBattleAnimAttacker, 1); task->func = sub_80D1930; } |