diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-04-05 18:28:16 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-04-05 18:28:16 -0700 |
| commit | d975a85c84616155e226b2d5120aee9adcae16b5 (patch) | |
| tree | 0668eb03388e9404e134e24b3dcd753f7bc47050 /src/battle/anim/wisp_fire.c | |
| parent | 37396ce835e702248b9e8fa1bbaec07b8b64ab4f (diff) | |
| parent | 62388f3bfd5b1abd9fa369628b805e683e64c302 (diff) | |
Merge remote-tracking branch 'upstream/master' into various_data
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 348ce6426..24cecb60c 100644 --- a/src/battle/anim/wisp_fire.c +++ b/src/battle/anim/wisp_fire.c @@ -10,7 +10,7 @@ extern s16 gBattleAnimArgs[]; extern u8 gAnimBankTarget; extern u8 gAnimBankAttacker; -extern u8 gObjectBankIDs[]; +extern u8 gBankSpriteIds[]; extern s8 gUnknown_083D9794[16]; extern s8 gUnknown_083D97A4[16]; @@ -175,7 +175,7 @@ void sub_80D60B4(u8 taskId) } gTasks[taskId].data[0]++; - spriteId = gObjectBankIDs[gAnimBankTarget]; + spriteId = gBankSpriteIds[gAnimBankTarget]; if (!gTasks[taskId].data[4]) unk = gUnknown_083D9794[gTasks[taskId].data[0] % 10]; |