diff options
author | Marcus Huderle <huderlem@gmail.com> | 2018-01-18 18:33:37 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-18 18:33:37 -0800 |
commit | 1d8798203e86b61e889ea1c0fba851cbdbdd03d7 (patch) | |
tree | 129a2f696f5f35f1f13a0fd11b421b822b401d93 /src/battle/battle_controller_player.c | |
parent | d69b05190e3edb03e7cbc50360c70d1501e9ad0e (diff) | |
parent | a0cb6c72b6ba7c1b2d2464f3c1ac04354d5d05de (diff) |
Merge pull request #535 from ProjectRevoTPP/fixes
fixes
Diffstat (limited to 'src/battle/battle_controller_player.c')
-rw-r--r-- | src/battle/battle_controller_player.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c index 0d05b7aed..f036e841f 100644 --- a/src/battle/battle_controller_player.c +++ b/src/battle/battle_controller_player.c @@ -2749,22 +2749,7 @@ void PlayerHandleDMATransfer(void) | (gBattleBufferA[gActiveBank][4] << 24); u16 val2 = gBattleBufferA[gActiveBank][5] | (gBattleBufferA[gActiveBank][6] << 8); - const u8 *src = &gBattleBufferA[gActiveBank][7]; - u8 *dst = (u8 *)val1; - u32 size = val2; - - while (1) - { - if (size <= 0x1000) - { - DmaCopy16(3, src, dst, size); - break; - } - DmaCopy16(3, src, dst, 0x1000); - src += 0x1000; - dst += 0x1000; - size -= 0x1000; - } + Dma3CopyLarge16_(&gBattleBufferA[gActiveBank][7], (u8 *)val1, val2); PlayerBufferExecCompleted(); } |