diff options
| -rw-r--r-- | include/gba/macro.h | 10 | ||||
| -rw-r--r-- | src/wallclock.c | 14 |
2 files changed, 12 insertions, 12 deletions
diff --git a/include/gba/macro.h b/include/gba/macro.h index 21e6ea22e..c8139eb97 100644 --- a/include/gba/macro.h +++ b/include/gba/macro.h @@ -49,6 +49,16 @@ #define DmaFill16(dmaNum, value, dest, size) DMA_FILL(dmaNum, value, dest, size, 16) #define DmaFill32(dmaNum, value, dest, size) DMA_FILL(dmaNum, value, dest, size, 32) +#define DMA_CLEAR(dmaNum, dest, size, bit) \ +{ \ + vu##bit *_dest = (vu##bit *)(dest); \ + u32 _size = size; \ + DmaFill##bit(dmaNum, 0, _dest, _size); \ +} + +#define DmaClear16(dmaNum, dest, size) DMA_CLEAR(dmaNum, dest, size, 16) +#define DmaClear32(dmaNum, dest, size) DMA_CLEAR(dmaNum, dest, size, 32) + #define DMA_COPY(dmaNum, src, dest, size, bit) \ DmaSet(dmaNum, \ src, \ diff --git a/src/wallclock.c b/src/wallclock.c index 56ace1c27..f24db0ca1 100644 --- a/src/wallclock.c +++ b/src/wallclock.c @@ -119,18 +119,8 @@ static void LoadWallClockGraphics(void) break; } } - - { - void *oam = (void *)OAM; - u32 oamSize = OAM_SIZE; - DmaFill32(3, 0, oam, oamSize); - } - - { - void *pltt = (void *)PLTT; - u32 plttSize = PLTT_SIZE; - DmaFill16(3, 0, pltt, plttSize); - } + DmaClear32(3, OAM, OAM_SIZE); + DmaClear16(3, PLTT, PLTT_SIZE); LZ77UnCompVram(gMiscClock_Gfx, (void *)VRAM); if(gUnknown_0202E8CC == MALE) |