diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-09-05 09:38:27 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-09-05 09:38:27 -0400 |
| commit | 3d3ec3150a7d297efe8b1dffe28a28275692f819 (patch) | |
| tree | e86983f4601dc74a8113dae471fa12315effb02f /src/battle/anim/ground.c | |
| parent | 78535eea89e8b71f37e188289793e3e18c9bb985 (diff) | |
| parent | f89f80daec6d1e9ec85fdc898f1b7914a126612e (diff) | |
Merge branch 'master' into modern_gcc
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]++; } } |