diff options
| author | garak <garakmon@gmail.com> | 2018-12-17 23:34:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-17 23:34:16 -0500 |
| commit | 2fb6c5bb7f81c285d973d602dbbe4bbf8fc8aba1 (patch) | |
| tree | 003c2daccebd740c288e537216afed0265bfbc59 /src/battle/anim/scary_face.c | |
| parent | 32c7ec313deaccb4e3dcef5f9da7d9062d09fc27 (diff) | |
| parent | 5f202c744b92dcde829c1d24ad323d824c769fec (diff) | |
Merge branch 'master' into createsprite
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); |