summaryrefslogtreecommitdiff
path: root/src/battle/battle_7.c
diff options
context:
space:
mode:
authorMarco Willems (M17.1) <progreon@gmail.com>2018-01-19 13:23:17 +0100
committerMarco Willems (M17.1) <progreon@gmail.com>2018-01-19 13:23:17 +0100
commitd4cd912eb85411a4be1ea97441f929a16f455f34 (patch)
tree31f54c8322ac4a7be5f2509b0903248cf993e24b /src/battle/battle_7.c
parent05ab3f96218b58001aa2d90cef951f7e4087c4ae (diff)
parent1d8798203e86b61e889ea1c0fba851cbdbdd03d7 (diff)
Merge remote-tracking branch 'upstream/master' into various_data
Diffstat (limited to 'src/battle/battle_7.c')
-rw-r--r--src/battle/battle_7.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/battle/battle_7.c b/src/battle/battle_7.c
index 3d34a8ee9..96bdc5cbf 100644
--- a/src/battle/battle_7.c
+++ b/src/battle/battle_7.c
@@ -653,9 +653,6 @@ void sub_8031FC4(u8 a, u8 b, bool8 c)
}
else
{
- const void *src;
- void *dst;
-
if (IsContest())
{
r10 = 0;
@@ -705,9 +702,7 @@ void sub_8031FC4(u8 a, u8 b, bool8 c)
gTransformedPersonalities[a]);
}
}
- src = gUnknown_081FAF4C[r10];
- dst = (void *)(VRAM + 0x10000 + gSprites[gObjectBankIDs[a]].oam.tileNum * 32);
- DmaCopy32(3, src, dst, 0x800);
+ DmaCopy32Defvars(3, gUnknown_081FAF4C[r10], (void *)(VRAM + 0x10000 + gSprites[gObjectBankIDs[a]].oam.tileNum * 32), 0x800);
paletteOffset = 0x100 + a * 16;
lzPaletteData = GetMonSpritePalFromOtIdPersonality(species, otId, personalityValue);
LZDecompressWram(lzPaletteData, gSharedMem);