diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2019-07-30 21:31:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-30 21:31:27 -0500 |
| commit | bc159dbb03735db55e6a09bb7947dccc70d0532b (patch) | |
| tree | 5b27866fe839d0f2f7ae76e0f13580ecea2dd863 /src/battle/anim/ghost.c | |
| parent | b8393b3a799f92e7064c266600607d98f6baf4d9 (diff) | |
| parent | cf0da4c3bb5658908275068591fe51fb6f2ce49d (diff) | |
Merge pull request #752 from camthesaxman/emerald_diff
resolve some Emerald differences
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 c4bbe8458..2b7ff8d95 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; @@ -1301,7 +1301,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]; |