Dma macro cleanup and cleanup sub_8076034 and sub_8076464

7 files changed, 43 insertions, 153 deletions

diff --git a/src/battle/anim/love_bg.c b/src/battle/anim/love_bg.c
index bd3d22ca6..ef524e4be 100644
--- a/src/battle/anim/love_bg.c
+++ b/src/battle/anim/love_bg.c
@@ -90,21 +90,7 @@ void sub_80D21F0(u8 taskId)
         break;
     case 3:
         sub_8078914(&subStruct);
-        {
-            u8 *addr = subStruct.field_0;
-            u32 size = 0x2000;
-            while (1)
-            {
-                DmaFill32(3, 0, addr, 0x1000);
-                addr += 0x1000;
-                size -= 0x1000;
-                if (size <= 0x1000)
-                {
-                    DmaFill32(3, 0, addr, size);
-                    break;
-                }
-            }
-        }
+        DmaFill32Large(3, 0, subStruct.field_0, 0x2000, 0x1000);
         DmaClear32(3, subStruct.field_4, 0x800);
         if (!IsContest())
             REG_BG1CNT_BITFIELD.charBaseBlock = 0;
diff --git a/src/battle/anim/scary_face.c b/src/battle/anim/scary_face.c
index 47776a3cb..65b9637c0 100644
--- a/src/battle/anim/scary_face.c
+++ b/src/battle/anim/scary_face.c
@@ -98,21 +98,7 @@ void sub_80D24E0(u8 taskId)
         break;
     case 3:
         sub_8078914(&subStruct);
-        {
-            u8 *addr = subStruct.field_0;
-            u32 size = 0x2000;
-            while (1)
-            {
-                DmaFill32(3, 0, addr, 0x1000);
-                addr += 0x1000;
-                size -= 0x1000;
-                if (size <= 0x1000)
-                {
-                    DmaFill32(3, 0, addr, size);
-                    break;
-                }
-            }
-        }
+        DmaFill32Large(3, 0, subStruct.field_0, 0x2000, 0x1000);
         DmaClear32(3, subStruct.field_4, 0x800);
         if (!IsContest())
             REG_BG1CNT_BITFIELD.charBaseBlock = 0;
diff --git a/src/battle/battle_anim.c b/src/battle/battle_anim.c
index 4549d1fcb..059b8df1f 100644
--- a/src/battle/battle_anim.c
+++ b/src/battle/battle_anim.c
@@ -1910,36 +1910,19 @@ bool8 IsAnimBankSpriteVisible(u8 bank)
 
 void sub_8076034(u8 a, u8 b)
 {
-    volatile u8 pointlessZero;
-    u16 *addr2;
     u8 spriteId;
 
     if (b == 0)
     {
+        volatile u8 pointlessZero;
         struct UnknownStruct2 s;
-        u8 *addr;
-        u32 size;
         u8 r2;
-        u16 *addr3;
 
         sub_8078914(&s);
-        addr = s.unk0;
-        size = 0x2000;
-        while (1)
-        {
-            DmaFill32(3, 0, addr, 0x1000);
-            addr += 0x1000;
-            size -= 0x1000;
-            if (size <= 0x1000)
-            {
-                DmaFill32(3, 0, addr, size);
-                break;
-            }
-        }
-        pointlessZero = 0;
-        pointlessZero = 0;
-        addr2 = (void *)s.unk4;
-        DmaFill16(3, 0xFF, addr2, 0x1000);
+        DmaFill32Large(3, 0, s.unk0, 0x2000, 0x1000);
+        pointlessZero = 0; // is there a stubbed out Dma macro here that left the 0 load in?
+        pointlessZero = 0; // is there a stubbed out Dma macro here that left the 0 load in?
+        DmaFill16Defvars(3, 0xFF, (void *)s.unk4, 0x1000);
 
         REG_BG1CNT_BITFIELD.priority = 2;
         REG_BG1CNT_BITFIELD.screenSize = 1;
@@ -1956,8 +1939,7 @@ void sub_8076034(u8 a, u8 b)
         REG_BG1VOFS = gBattle_BG1_Y;
 
         LoadPalette(gPlttBufferUnfaded + 0x100 + a * 16, s.unk8 * 16, 32);
-        addr3 = (u16 *)PLTT + s.unk8 * 16;
-        DmaCopy32(3, gPlttBufferUnfaded + 0x100 + a * 16, addr3, 32);
+        DmaCopy32Defvars(3, gPlttBufferUnfaded + 0x100 + a * 16, (u16 *)PLTT + s.unk8 * 16, 32);
 
         if (IsContest() != 0)
             r2 = 0;
@@ -1969,27 +1951,12 @@ void sub_8076034(u8 a, u8 b)
     }
     else
     {
-        u8 *addr;
-        u32 size;
-        u16 *addr3;
+        volatile u8 pointlessZero;
 
-        addr = (void *)(VRAM + 0x6000);
-        size = 0x2000;
-        while (1)
-        {
-            DmaFill32(3, 0, addr, 0x1000);
-            addr += 0x1000;
-            size -= 0x1000;
-            if (size <= 0x1000)
-            {
-                DmaFill32(3, 0, addr, size);
-                break;
-            }
-        }
-        pointlessZero = 0;
-        pointlessZero = 0;
-        addr2 = (void *)(VRAM + 0xF000);
-        DmaFill32(3, 0, addr2, 0x800);
+        DmaFill32Large(3, 0, (void *)(VRAM + 0x6000), 0x2000, 0x1000);
+        pointlessZero = 0; // is there a stubbed out Dma macro here that left the 0 load in?
+        pointlessZero = 0; // is there a stubbed out Dma macro here that left the 0 load in?
+        DmaFill32Defvars(3, 0, (void *)(VRAM + 0xF000), 0x800);
 
         REG_BG2CNT_BITFIELD.priority = 2;
         REG_BG2CNT_BITFIELD.screenSize = 1;
@@ -2004,8 +1971,7 @@ void sub_8076034(u8 a, u8 b)
         REG_BG2VOFS = gBattle_BG2_Y;
 
         LoadPalette(gPlttBufferUnfaded + 0x100 + a * 16, 0x90, 32);
-        addr3 = (void *)(PLTT + 0x120);
-        DmaCopy32(3, gPlttBufferUnfaded + 0x100 + a * 16, addr3, 32);
+        DmaCopy32Defvars(3, gPlttBufferUnfaded + 0x100 + a * 16, (void *)(PLTT + 0x120), 32);
 
         sub_80E4EF8(0, 0, GetBankIdentity(a), 9, 0x6000, 0x1E, REG_BG2CNT_BITFIELD.charBaseBlock);
     }
@@ -2060,57 +2026,25 @@ void sub_80763FC(u16 a, u16 *b, u32 c, u8 d)
 
 void sub_8076464(u8 a)
 {
-    u8 *addr;
-    u32 size;
     volatile u8 pointlessZero;
     struct UnknownStruct2 s;
 
     sub_8078914(&s);
     if (a == 0 || IsContest() != 0)
     {
-        u16 *addr2;
-
-        addr = s.unk0;
-        size = 0x2000;
-        while (1)
-        {
-            DmaFill32(3, 0, addr, 0x1000);
-            addr += 0x1000;
-            size -= 0x1000;
-            if (size <= 0x1000)
-            {
-                DmaFill32(3, 0, addr, size);
-                break;
-            }
-        }
-        pointlessZero = 0;
-        pointlessZero = 0;
-        addr2 = s.unk4;
-        DmaFill32(3, 0, addr2, 0x800);
+        DmaFill32Large(3, 0, s.unk0, 0x2000, 0x1000);
+        pointlessZero = 0; // is there a stubbed out Dma macro here that left the 0 load in?
+        pointlessZero = 0; // is there a stubbed out Dma macro here that left the 0 load in?
+        DmaFill32Defvars(3, 0, s.unk4, 0x800);
         gBattle_BG1_X = 0;
         gBattle_BG1_Y = 0;
     }
     else
     {
-        u16 *addr2;
-
-        addr = (void *)(VRAM + 0x6000);
-        size = 0x2000;
-        while (1)
-        {
-            DmaFill32(3, 0, addr, 0x1000);
-            addr += 0x1000;
-            size -= 0x1000;
-            if (size <= 0x1000)
-            {
-                DmaFill32(3, 0, addr, size);
-                break;
-            }
-        }
-        pointlessZero = 0;
-        pointlessZero = 0;
-        addr2 = (void *)(VRAM + 0xF000);
-        DmaFill32(3, 0, addr2, 0x800);
+        DmaFill32Large(3, 0, (void *)(VRAM + 0x6000), 0x2000, 0x1000);
+        pointlessZero = 0; // is there a stubbed out Dma macro here that left the 0 load in?
+        pointlessZero = 0; // is there a stubbed out Dma macro here that left the 0 load in?
+        DmaFill32Defvars(3, 0, (void *)(VRAM + 0xF000), 0x800);
         gBattle_BG2_X = 0;
         gBattle_BG2_Y = 0;
     }
diff --git a/src/debug/matsuda_debug_menu.c b/src/debug/matsuda_debug_menu.c
index b879584dd..da1937adb 100644
--- a/src/debug/matsuda_debug_menu.c
+++ b/src/debug/matsuda_debug_menu.c
@@ -38,7 +38,7 @@ extern u16 gBattle_BG2_Y;
 extern u16 gBattle_BG3_X;
 extern u16 gBattle_BG3_Y;
 
-extern u8 (*gCallback_03004AE8)(void);
+extern u8 (*gMenuCallback)(void);
 
 extern bool8 gReceivedRemoteLinkPlayers;
 
@@ -251,7 +251,7 @@ u8 unref_sub_80A9B28(void)
     Menu_DrawStdWindowFrame(0, 0, 17, 18);
     Menu_PrintItems(1, 1, 7, gMatsudaDebugMenuActions);
     InitMenu(0, 1, 1, 7, 0, 16);
-    gCallback_03004AE8 = sub_80A9B78;
+    gMenuCallback = sub_80A9B78;
     return 0;
 }
 
@@ -264,7 +264,7 @@ static bool8 sub_80A9B78(void)
     case -2:
         return FALSE;
     default:
-        gCallback_03004AE8 = gMatsudaDebugMenuActions[choice].func;
+        gMenuCallback = gMatsudaDebugMenuActions[choice].func;
         return FALSE;
     case -1:
         CloseMenu();
@@ -469,26 +469,10 @@ static void sub_80A9F50(void)
 
 static void sub_80A9FE4(void)
 {
-    u8 *addr;
-    u32 i;
     u8 ptr[5];
 
     memcpy(ptr, gMatsudaDebugMenu_UnknownByteArray, 5);
-
-    addr = (void *)VRAM;
-    i = VRAM_SIZE;
-
-    while (1)
-    {
-        DmaFill32(3, 0, addr, 0x1000);
-        addr += 0x1000;
-        i -= 0x1000;
-        if (i <= 0x1000)
-        {
-            DmaFill32(3, 0, addr, i);
-            break;
-        }
-    }
+    DmaFill32Large(3, 0, (void *)VRAM, VRAM_SIZE, 0x1000);
     sub_80034D4((void *)VRAM, ptr);
     LoadFontDefaultPalette(&gWindowTemplate_81E6C3C);
 }
diff --git a/src/debug/mori_debug_menu.c b/src/debug/mori_debug_menu.c
index 7b9a579a7..767f4cda0 100644
--- a/src/debug/mori_debug_menu.c
+++ b/src/debug/mori_debug_menu.c
@@ -12,7 +12,7 @@
 
 #define SIO_MULTI_CNT ((struct SioMultiCnt *)REG_ADDR_SIOCNT)
 
-extern u8 (*gCallback_03004AE8)(void);
+extern u8 (*gMenuCallback)(void);
 
 u8 gUnknown_03004DA0[0x20];
 
@@ -98,7 +98,7 @@ u8 MoriDebugMenu_SearchChild(u8 a1, u8 a2, u8 *ptr)
     Menu_EraseScreen();
     Menu_DrawStdWindowFrame(0, 14, 30, 19);
     Menu_PrintText(localPtr, 1, 15);
-    gCallback_03004AE8 = sub_8083D4C;
+    gMenuCallback = sub_8083D4C;
     return 0;
 }
 
@@ -184,7 +184,7 @@ bool8 MoriDebugMenuProcessInput(void)
     switch (choice)
     {
     default:
-        gCallback_03004AE8 = gMoriDebugMenuActions[choice].func;
+        gMenuCallback = gMoriDebugMenuActions[choice].func;
         return FALSE;
     case -2:
         return FALSE;
@@ -200,6 +200,6 @@ s8 InitMoriDebugMenu(void)
     Menu_DrawStdWindowFrame(0, 0, 10, 19);
     Menu_PrintItems(1, 1, 9, gMoriDebugMenuActions);
     InitMenu(0, 1, 1, 9, 0, 9);
-    gCallback_03004AE8 = MoriDebugMenuProcessInput;
+    gMenuCallback = MoriDebugMenuProcessInput;
     return 0;
 }
diff --git a/src/debug/unknown_debug_menu.c b/src/debug/unknown_debug_menu.c
index 9cece924d..ef3e0e66c 100644
--- a/src/debug/unknown_debug_menu.c
+++ b/src/debug/unknown_debug_menu.c
@@ -4,7 +4,7 @@
 
 extern u8 gBattleCommunication[];
 
-extern u8 (*gCallback_03004AE8)(void);
+extern u8 (*gMenuCallback)(void);
 
 static u8 sub_814A4B8(void);
 static u8 sub_814A464(void);
@@ -36,7 +36,7 @@ int unref_sub_814A414(void)
     Menu_DrawStdWindowFrame(0, 0, 16, 18);
     Menu_PrintItems(2, 1, 8, gUnknown_0842C29C);
     InitMenu(0, 1, 1, 8, 0, 15);
-    gCallback_03004AE8 = sub_814A464;
+    gMenuCallback = sub_814A464;
     return 0;
 }
 
@@ -55,7 +55,7 @@ static u8 sub_814A464(void)
     else
     {
         gBattleCommunication[0] = result;
-        gCallback_03004AE8 = gUnknown_0842C29C[result].func;
+        gMenuCallback = gUnknown_0842C29C[result].func;
         return 0;
     }
 }
diff --git a/src/field/start_menu.c b/src/field/start_menu.c
index 110351016..95aa9c79e 100644
--- a/src/field/start_menu.c
+++ b/src/field/start_menu.c
@@ -54,7 +54,7 @@ extern u16 gSpecialVar_Result;
 
 extern u8 gUnknown_03004860;
 
-u8 (*gCallback_03004AE8)(void);
+u8 (*gMenuCallback)(void);
 
 EWRAM_DATA static u8 sStartMenuCursorPos = 0;
 EWRAM_DATA static u8 sNumStartMenuActions = 0;
@@ -283,11 +283,11 @@ void sub_80712B4(u8 taskId)
     switch (task->data[0])
     {
     case 0:
-        gCallback_03004AE8 = StartMenu_InputProcessCallback;
+        gMenuCallback = StartMenu_InputProcessCallback;
         task->data[0]++;
         break;
     case 1:
-        if (gCallback_03004AE8() == 1)
+        if (gMenuCallback() == 1)
             DestroyTask(taskId);
         break;
     }
@@ -325,10 +325,10 @@ static u8 StartMenu_InputProcessCallback(void)
             if (GetNationalPokedexCount(0) == 0)
                 return 0;
         }
-        gCallback_03004AE8 = sStartMenuItems[sCurrentStartMenuActions[sStartMenuCursorPos]].func;
-        if (gCallback_03004AE8 != StartMenu_SaveCallback &&
-           gCallback_03004AE8 != StartMenu_ExitCallback &&
-           gCallback_03004AE8 != StartMenu_RetireCallback)
+        gMenuCallback = sStartMenuItems[sCurrentStartMenuActions[sStartMenuCursorPos]].func;
+        if (gMenuCallback != StartMenu_SaveCallback &&
+           gMenuCallback != StartMenu_ExitCallback &&
+           gMenuCallback != StartMenu_RetireCallback)
             fade_screen(1, 0);
         return 0;
     }
@@ -405,7 +405,7 @@ static u8 StartMenu_PlayerCallback(void)
 static u8 StartMenu_SaveCallback(void)
 {
     Menu_DestroyCursor();
-    gCallback_03004AE8 = SaveCallback1;
+    gMenuCallback = SaveCallback1;
     return 0;
 }
 
@@ -461,7 +461,7 @@ enum
 static u8 SaveCallback1(void)
 {
     sub_807160C();
-    gCallback_03004AE8 = SaveCallback2;
+    gMenuCallback = SaveCallback2;
     return FALSE;
 }
 
@@ -475,7 +475,7 @@ static u8 SaveCallback2(void)
         //Go back to start menu
         Menu_EraseScreen();
         InitStartMenu();
-        gCallback_03004AE8 = StartMenu_InputProcessCallback;
+        gMenuCallback = StartMenu_InputProcessCallback;
         return FALSE;
     case SAVE_SUCCESS:
     case SAVE_ERROR: