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/field/party_menu.c | |
| parent | d69b05190e3edb03e7cbc50360c70d1501e9ad0e (diff) | |
| parent | a0cb6c72b6ba7c1b2d2464f3c1ac04354d5d05de (diff) | |
Merge pull request #535 from ProjectRevoTPP/fixes
fixes
Diffstat (limited to 'src/field/party_menu.c')
| -rw-r--r-- | src/field/party_menu.c | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/src/field/party_menu.c b/src/field/party_menu.c index 32986fae9..f55ed669d 100644 --- a/src/field/party_menu.c +++ b/src/field/party_menu.c @@ -623,27 +623,11 @@ bool8 SetupDefaultPartyMenu(void) bool8 InitPartyMenu(void) { - u8 *addr; - u32 size; - switch (gMain.state) { case 0: SetVBlankCallback(NULL); - addr = (u8 *)VRAM; - size = VRAM_SIZE; - while (1) - { - DmaFill16(3, 0, addr, 0x1000); - addr += 0x1000; - size -= 0x1000; - if (size <= 0x1000) - { - DmaFill16(3, 0, addr, size); - break; - } - } - + DmaFill16Large(3, 0, (void *)(VRAM + 0x0), VRAM_SIZE, 0x1000); DmaClear32(3, OAM, OAM_SIZE); DmaClear16(3, PLTT, PLTT_SIZE); @@ -796,9 +780,7 @@ void ReDrawPartyMonBackgrounds(void) { if (ewram1B000.unk261) { - const void *src = gBGTilemapBuffers[2]; - void *dest = (void *)(BG_VRAM + 0x3000); - DmaCopy16(3, src, dest, 0x800); + DmaCopy16Defvars(3, gBGTilemapBuffers[2], (void *)(BG_VRAM + 0x3000), 0x800); if (ewram1B000.unk261 == 2) { |