summaryrefslogtreecommitdiff
path: root/src/battle/battle_7.c
diff options
context:
space:
mode:
authorProjectRevoTPP <projectrevotpp@hotmail.com>2018-01-17 19:31:23 -0500
committerProjectRevoTPP <projectrevotpp@hotmail.com>2018-01-17 19:31:23 -0500
commit2869160d630f569110ca895ff924070d626fd54b (patch)
tree3599a6c1a5de390a852828d6f918f643e2befa8b /src/battle/battle_7.c
parent093422f3065ed47db9a475b0c9d67e9c5bc2c364 (diff)
use Defvars instead of some Dma macros and hopefully last while(1)s
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 00216ce05..b4c71b9c2 100644
--- a/src/battle/battle_7.c
+++ b/src/battle/battle_7.c
@@ -624,9 +624,6 @@ void sub_8031FC4(u8 a, u8 b, bool8 c)
}
else
{
- const void *src;
- void *dst;
-
if (IsContest())
{
r10 = 0;
@@ -676,9 +673,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);