summaryrefslogtreecommitdiff
path: root/src/battle_anim.c
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2021-06-30 16:49:31 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2021-06-30 16:49:31 -0400
commitd7018c11494561eecd94c93b98a7980a063d7bf8 (patch)
tree9e9590ee66d6f82f015e0ffb7d3fcbc95ed63d67 /src/battle_anim.c
parent628a4e6bf8290a8c29c0b1f9dc67797e30ccbfbf (diff)
Tidy up ewram.h; yeet some more redundant definitions
Diffstat (limited to 'src/battle_anim.c')
-rw-r--r--src/battle_anim.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_anim.c b/src/battle_anim.c
index 5ee83571b..15883c502 100644
--- a/src/battle_anim.c
+++ b/src/battle_anim.c
@@ -2451,9 +2451,9 @@ static void LoadMoveBg(u16 bgId)
{
void *tilemap = gBattleAnimBackgroundTable[bgId].tilemap;
- LZDecompressWram(tilemap, IsContest() ? EWRAM_14800 : ewram18000);
- sub_80763FC(sub_80789BC(), IsContest() ? EWRAM_14800 : ewram18000, 0x100, 0);
- DmaCopy32Defvars(3, IsContest() ? EWRAM_14800 : ewram18000, (void *)(VRAM + 0xD000), 0x800);
+ LZDecompressWram(tilemap, IsContest() ? eBattleAnimPalBackup_Contest : eBattleAnimPalBackup_Battle);
+ sub_80763FC(sub_80789BC(), IsContest() ? eBattleAnimPalBackup_Contest : eBattleAnimPalBackup_Battle, 0x100, 0);
+ DmaCopy32Defvars(3, IsContest() ? eBattleAnimPalBackup_Contest : eBattleAnimPalBackup_Battle, (void *)(VRAM + 0xD000), 0x800);
LZDecompressVram(gBattleAnimBackgroundTable[bgId].image, (void *)(VRAM + 0x2000));
LoadCompressedPalette(gBattleAnimBackgroundTable[bgId].palette, sub_80789BC() * 16, 32);
}