diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-04 18:50:53 -0500 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-04 18:50:53 -0500 |
commit | eff6795887cc27f2c5139df9a6da70f4f02338b4 (patch) | |
tree | f91be2b0b7194b4ddff13f4935a0edafc4284a43 /src/battle/anim/espeed.c | |
parent | 3ea9cff2c67b3db195c3326afc56fa0662c2327a (diff) | |
parent | b1a7733c1cead8ed3d4a58c42d638afd0ead8ab0 (diff) |
Merge branch 'master' into unk_text_8095904
Diffstat (limited to 'src/battle/anim/espeed.c')
-rwxr-xr-x | 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 621d386e1..469522092 100755 --- a/src/battle/anim/espeed.c +++ b/src/battle/anim/espeed.c @@ -5,8 +5,8 @@ #include "sound.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern s8 gUnknown_083D7A00[4][2]; @@ -51,7 +51,7 @@ void sub_80D1638(u8 taskId) task->data[2] = 0; task->data[3] = 0; task->data[12] = 3; - if (GetBankSide(gBattleAnimBankTarget) == 0) + if (GetBankSide(gAnimBankTarget) == 0) { task->data[13] = 0xFFFF; task->data[14] = 8; @@ -169,8 +169,8 @@ void sub_80D18D4(u8 taskId) task->data[7] = 0; task->data[8] = 0; task->data[13] = 0; - task->data[14] = sub_8077ABC(gBattleAnimBankAttacker, 0); - task->data[15] = sub_8077ABC(gBattleAnimBankAttacker, 1); + task->data[14] = GetBankPosition(gAnimBankAttacker, 0); + task->data[15] = GetBankPosition(gAnimBankAttacker, 1); task->func = sub_80D1930; } |