diff options
Diffstat (limited to 'src/battle/anim/glow.c')
-rwxr-xr-x | src/battle/anim/glow.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle/anim/glow.c b/src/battle/anim/glow.c index 6038825af..63466c0ff 100755 --- a/src/battle/anim/glow.c +++ b/src/battle/anim/glow.c @@ -8,8 +8,8 @@ #include "decompress.h" extern s16 gBattleAnimArgs[]; -extern u8 gBattleAnimBankAttacker; -extern u8 gBattleAnimBankTarget; +extern u8 gAnimBankAttacker; +extern u8 gAnimBankTarget; extern u16 gUnknown_083D7A5C[5]; @@ -32,11 +32,11 @@ void sub_80D1ADC(u8 taskId) } src = &gBattleAnimSpritePalette_206; - dest = (NotInBattle()) ? gSharedMem + 0x18000 - 0x3800: gSharedMem + 0x18000; + dest = (IsContest()) ? gSharedMem + 0x18000 - 0x3800: gSharedMem + 0x18000; LZDecompressWram(src, dest); for (i = 0; i <= 4; i++) { - what = ((NotInBattle()) ? gSharedMem + 0x14800 : gSharedMem + 0x18000) + (i << 5); + what = ((IsContest()) ? gSharedMem + 0x14800 : gSharedMem + 0x18000) + (i << 5); LoadPalette(what, (u16)((sp[i] << 4) + 0x100), 32); } |