diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-12-17 22:22:27 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-17 22:22:27 -0600 |
| commit | 747a3b4b3e76db3a8f94bafcbe8d38e740850d59 (patch) | |
| tree | 2e9f0cad82e7b8d8968db0d7fa750636eee470ed /src/battle/anim/scary_face.c | |
| parent | fa6429eaf842ea1db6122bc049de0c4efdd645a5 (diff) | |
| parent | 00be991c66d37d090792db8bc1e4c1b9f9e88536 (diff) | |
Merge pull request #715 from shinny456/master
gAnimBankAttacker/Target to gBattleAnimAttacker/Target
Diffstat (limited to 'src/battle/anim/scary_face.c')
| -rw-r--r-- | src/battle/anim/scary_face.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle/anim/scary_face.c b/src/battle/anim/scary_face.c index 5a2c52825..2fe58ce26 100644 --- a/src/battle/anim/scary_face.c +++ b/src/battle/anim/scary_face.c @@ -7,8 +7,8 @@ #include "palette.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; extern const u8 gBattleAnimBackgroundTilemap_ScaryFaceContest[]; extern const u8 gBattleAnimBackgroundTilemap_ScaryFacePlayer[]; @@ -43,7 +43,7 @@ void sub_80D23B4(u8 taskId) DmaFill32Defvars(3, 0, subStruct.field_4, 0x1000); if (IsContest()) LZDecompressVram(&gBattleAnimBackgroundTilemap_ScaryFaceContest, subStruct.field_4); - else if (GetBattlerSide(gAnimBankTarget) == 1) + else if (GetBattlerSide(gBattleAnimTarget) == 1) LZDecompressVram(&gBattleAnimBackgroundTilemap_ScaryFacePlayer, subStruct.field_4); else LZDecompressVram(&gBattleAnimBackgroundTilemap_ScaryFaceOpponent, subStruct.field_4); |