summaryrefslogtreecommitdiff
path: root/src/field/wallclock.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/field/wallclock.c
parent05ab3f96218b58001aa2d90cef951f7e4087c4ae (diff)
parent1d8798203e86b61e889ea1c0fba851cbdbdd03d7 (diff)
Merge remote-tracking branch 'upstream/master' into various_data
Diffstat (limited to 'src/field/wallclock.c')
-rw-r--r--src/field/wallclock.c19
1 files changed, 2 insertions, 17 deletions
diff --git a/src/field/wallclock.c b/src/field/wallclock.c
index aaa7f9ae8..1f743a61a 100644
--- a/src/field/wallclock.c
+++ b/src/field/wallclock.c
@@ -190,10 +190,7 @@ static void WallClockVblankCallback(void)
static void LoadWallClockGraphics(void)
{
- u8 *addr;
- u32 size;
-
- SetVBlankCallback(0);
+ SetVBlankCallback(NULL);
REG_DISPCNT = 0;
REG_BG3CNT = 0;
REG_BG2CNT = 0;
@@ -208,19 +205,7 @@ static void LoadWallClockGraphics(void)
REG_BG0HOFS = 0;
REG_BG0VOFS = 0;
- 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);
DmaClear32(3, OAM, OAM_SIZE);
DmaClear16(3, PLTT, PLTT_SIZE);