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/ground.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/ground.c')
| -rw-r--r-- | src/battle/anim/ground.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle/anim/ground.c b/src/battle/anim/ground.c index 2828be7be..8d342a2f6 100644 --- a/src/battle/anim/ground.c +++ b/src/battle/anim/ground.c @@ -17,7 +17,7 @@ extern u16 gBattle_BG2_Y; extern u16 gBattle_BG3_X; extern u16 gBattle_BG3_Y; extern u16 gAnimMovePower; -extern u8 gBankSpriteIds[]; +extern u8 gBattlerSpriteIds[]; static void AnimBonemerangProjectile(struct Sprite *sprite); static void AnimBonemerangProjectileStep(struct Sprite *sprite); @@ -593,7 +593,7 @@ void sub_80E1864(u8 taskId) { if (IsAnimBankSpriteVisible(i)) { - task->data[task->data[13] + 9] = gBankSpriteIds[i]; + task->data[task->data[13] + 9] = gBattlerSpriteIds[i]; task->data[13]++; } } |