diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2019-07-30 21:31:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-30 21:31:27 -0500 |
| commit | bc159dbb03735db55e6a09bb7947dccc70d0532b (patch) | |
| tree | 5b27866fe839d0f2f7ae76e0f13580ecea2dd863 /src/battle/anim/withdraw.c | |
| parent | b8393b3a799f92e7064c266600607d98f6baf4d9 (diff) | |
| parent | cf0da4c3bb5658908275068591fe51fb6f2ce49d (diff) | |
Merge pull request #752 from camthesaxman/emerald_diff
resolve some Emerald differences
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 f5babd361..6c26fb891 100644 --- a/src/battle/anim/withdraw.c +++ b/src/battle/anim/withdraw.c @@ -8,7 +8,7 @@ extern s16 gBattleAnimArgs[]; extern u8 gBattleAnimAttacker; extern u8 gBattleAnimTarget; -extern u8 gBankSpriteIds[]; +extern u8 gBattlerSpriteIds[]; static void sub_80CF514(u8 taskId); @@ -17,13 +17,13 @@ static void sub_80CF514(u8 taskId); void sub_80CF4D8(u8 taskId) { - PrepareBattlerSpriteForRotScale(gBankSpriteIds[gBattleAnimAttacker], 0); + PrepareBattlerSpriteForRotScale(gBattlerSpriteIds[gBattleAnimAttacker], 0); gTasks[taskId].func = sub_80CF514; } void sub_80CF514(u8 taskId) { - u8 a = gBankSpriteIds[gBattleAnimAttacker]; + u8 a = gBattlerSpriteIds[gBattleAnimAttacker]; s16 b; if (GetBattlerSide(gBattleAnimAttacker) == 0) { |