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/overworld.c | |
parent | d69b05190e3edb03e7cbc50360c70d1501e9ad0e (diff) | |
parent | a0cb6c72b6ba7c1b2d2464f3c1ac04354d5d05de (diff) |
Merge pull request #535 from ProjectRevoTPP/fixes
fixes
Diffstat (limited to 'src/field/overworld.c')
-rw-r--r-- | src/field/overworld.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/src/field/overworld.c b/src/field/overworld.c index 86b0a5dac..a6d34e103 100644 --- a/src/field/overworld.c +++ b/src/field/overworld.c @@ -1664,29 +1664,12 @@ void do_load_map_stuff_loop(u8 *a1) void sub_8054BA8(void) { - u8 *addr; - u32 size; - REG_DISPCNT = 0; ScanlineEffect_Stop(); DmaClear16(3, PLTT + 2, PLTT_SIZE - 2); - - addr = (void *)VRAM; - size = 0x18000; - 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), 0x18000, 0x1000); ResetOamRange(0, 128); LoadOam(); } |