diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-04-04 18:27:50 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-04-04 18:27:50 -0700 |
| commit | 3a7f68151e0f0fa71ddb35bd96439c25ffd61576 (patch) | |
| tree | c8297d41af868eac80642c1f811bc009fa142099 /src/battle/anim/withdraw.c | |
| parent | 2c4d7844e48864d962573eb66fe4b9e68b9631f0 (diff) | |
| parent | ce75a3895c73f25d6dc7b019ed06e4193965ab35 (diff) | |
Merge remote-tracking branch 'upstream/master' into battle-1
Diffstat (limited to 'src/battle/anim/withdraw.c')
| -rw-r--r-- | src/battle/anim/withdraw.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle/anim/withdraw.c b/src/battle/anim/withdraw.c index e67248b9f..933c97fa9 100644 --- a/src/battle/anim/withdraw.c +++ b/src/battle/anim/withdraw.c @@ -8,7 +8,7 @@ extern s16 gBattleAnimArgs[]; extern u8 gAnimBankAttacker; extern u8 gAnimBankTarget; -extern u8 gObjectBankIDs[]; +extern u8 gBankSpriteIds[]; static void sub_80CF514(u8 taskId); @@ -17,13 +17,13 @@ static void sub_80CF514(u8 taskId); void sub_80CF4D8(u8 taskId) { - sub_8078E70(gObjectBankIDs[gAnimBankAttacker], 0); + sub_8078E70(gBankSpriteIds[gAnimBankAttacker], 0); gTasks[taskId].func = sub_80CF514; } void sub_80CF514(u8 taskId) { - u8 a = gObjectBankIDs[gAnimBankAttacker]; + u8 a = gBankSpriteIds[gAnimBankAttacker]; s16 b; if (GetBankSide(gAnimBankAttacker) == 0) { |