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/wisp_fire.c | |
| parent | 78535eea89e8b71f37e188289793e3e18c9bb985 (diff) | |
| parent | f89f80daec6d1e9ec85fdc898f1b7914a126612e (diff) | |
Merge branch 'master' into modern_gcc
Diffstat (limited to 'src/battle/anim/wisp_fire.c')
| -rw-r--r-- | src/battle/anim/wisp_fire.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle/anim/wisp_fire.c b/src/battle/anim/wisp_fire.c index f089c799a..9c7f62c12 100644 --- a/src/battle/anim/wisp_fire.c +++ b/src/battle/anim/wisp_fire.c @@ -9,7 +9,7 @@ extern s16 gBattleAnimArgs[]; extern u8 gBattleAnimTarget; extern u8 gBattleAnimAttacker; -extern u8 gBankSpriteIds[]; +extern u8 gBattlerSpriteIds[]; void sub_80D5CC0(struct Sprite *sprite); static void sub_80D5E4C(u8 taskId); @@ -211,7 +211,7 @@ void sub_80D60B4(u8 taskId) } gTasks[taskId].data[0]++; - spriteId = gBankSpriteIds[gBattleAnimTarget]; + spriteId = gBattlerSpriteIds[gBattleAnimTarget]; if (!gTasks[taskId].data[4]) unk = gUnknown_083D9794[gTasks[taskId].data[0] % 10]; |