diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-03-31 14:37:24 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-03-31 14:37:24 -0400 |
| commit | 0015d6fe2c6a53c5f757599122ae9fd1a156a69f (patch) | |
| tree | 81b7269c767da1ad4a5a9ac01e58ead5e92f0983 /src/battle/anim/wisp_fire.c | |
| parent | 46bc01f0dd1a3435b3c6ce71e1be0d19b7aaa5bd (diff) | |
| parent | 59f81c5f2a25ec77baf4a30c3da9ccb7675d1562 (diff) | |
Merge branch 'master' into contest_link_80C2020
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]; |