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_status_effects.c | |
| parent | 78535eea89e8b71f37e188289793e3e18c9bb985 (diff) | |
| parent | f89f80daec6d1e9ec85fdc898f1b7914a126612e (diff) | |
Merge branch 'master' into modern_gcc
Diffstat (limited to 'src/battle_anim_status_effects.c')
| -rw-r--r-- | src/battle_anim_status_effects.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_anim_status_effects.c b/src/battle_anim_status_effects.c index 90e6ce38c..c51c0f8d3 100644 --- a/src/battle_anim_status_effects.c +++ b/src/battle_anim_status_effects.c @@ -15,7 +15,7 @@ extern bool8 gAnimScriptActive; extern void (*gAnimScriptCallback)(void); extern s16 gBattleAnimArgs[]; extern u8 gBattleAnimTarget; -extern u8 gBankSpriteIds[]; +extern u8 gBattlerSpriteIds[]; extern const struct CompressedSpriteSheet gBattleAnimPicTable[]; extern const struct CompressedSpritePalette gBattleAnimPaletteTable[]; extern const u8 *const gBattleAnims_StatusConditions[]; @@ -72,7 +72,7 @@ static void sub_807BDAC(u8); u8 unref_sub_807B69C(u8 a, u8 b) { - u8 spriteId1 = gBankSpriteIds[a]; + u8 spriteId1 = gBattlerSpriteIds[a]; u8 taskId = CreateTask(sub_807B7E0, 10); u8 spriteId2; u8 i; |