use Dma Large loops for every while(1) Dma loop

4 files changed, 5 insertions, 70 deletions

diff --git a/src/field/menu_helpers.c b/src/field/menu_helpers.c
index 54668addb..388d98ec7 100644
--- a/src/field/menu_helpers.c
+++ b/src/field/menu_helpers.c
@@ -296,9 +296,6 @@ bool8 sub_80F9344(void)
 
 void sub_80F9368(void)
 {
-    u8 *addr;
-    u32 size;
-
     REG_DISPCNT = 0;
     REG_BG3CNT = 0;
     REG_BG2CNT = 0;
@@ -312,21 +309,7 @@ void sub_80F9368(void)
     REG_BG1VOFS = 0;
     REG_BG0HOFS = 0;
     REG_BG0VOFS = 0;
-
-    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);
     DmaClear32(3, OAM, OAM_SIZE);
     DmaClear16(3, PLTT, PLTT_SIZE);
 }
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();
 }
diff --git a/src/field/party_menu.c b/src/field/party_menu.c
index 48275435e..53bad9618 100644
--- a/src/field/party_menu.c
+++ b/src/field/party_menu.c
@@ -620,27 +620,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);
 
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);