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/ghost.c | |
| parent | 78535eea89e8b71f37e188289793e3e18c9bb985 (diff) | |
| parent | f89f80daec6d1e9ec85fdc898f1b7914a126612e (diff) | |
Merge branch 'master' into modern_gcc
Diffstat (limited to 'src/battle/anim/ghost.c')
| -rw-r--r-- | src/battle/anim/ghost.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle/anim/ghost.c b/src/battle/anim/ghost.c index d2db76975..4dea1ed1d 100644 --- a/src/battle/anim/ghost.c +++ b/src/battle/anim/ghost.c @@ -11,7 +11,7 @@ #include "constants/songs.h" extern s16 gBattleAnimArgs[]; -extern u8 gBankSpriteIds[]; +extern u8 gBattlerSpriteIds[]; extern u8 gBattleAnimAttacker; extern u8 gBattleAnimTarget; extern u8 gUnknown_0202F7D2; @@ -1302,7 +1302,7 @@ static void sub_80DF3D8(struct Sprite *sprite) static void sub_80DF49C(struct Sprite *sprite) { sprite->invisible = 1; - sprite->data[5] = gBankSpriteIds[gBattleAnimAttacker]; + sprite->data[5] = gBattlerSpriteIds[gBattleAnimAttacker]; sprite->data[0] = 128; sprite->data[1] = 10; sprite->data[2] = gBattleAnimArgs[0]; |