resolve merge conflicts and make it compile

1 files changed, 1 insertions, 19 deletions

diff --git a/src/engine/reset_rtc_screen.c b/src/engine/reset_rtc_screen.c
index cda73f96b..45cde2cc0 100644
--- a/src/engine/reset_rtc_screen.c
+++ b/src/engine/reset_rtc_screen.c
@@ -421,28 +421,10 @@ void Task_ResetRtc_0(u8 taskId)
 
 void CB2_InitResetRtcScreen(void)
 {
-    u8 *addr;
-    u32 size;
-
     REG_DISPCNT = 0;
     SetVBlankCallback(NULL);
-
     DmaClear16(3, PLTT, PLTT_SIZE);
-
-    addr = (u8 *)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, (u8 *)VRAM, 0x18000, 0x1000);
     ResetOamRange(0, 128);
     LoadOam();
     ScanlineEffect_Stop();