use Defvars instead of some Dma macros and hopefully last while(1)s

3 files changed, 6 insertions, 23 deletions

diff --git a/src/engine/naming_screen.c b/src/engine/naming_screen.c
index d54b84720..97819322c 100644
--- a/src/engine/naming_screen.c
+++ b/src/engine/naming_screen.c
@@ -1616,16 +1616,8 @@ static void sub_80B7558(void)
 
 static void sub_80B7568(void)
 {
-    const void *src;
-    void *dst;
-
-    src = gNamingScreenMenu_Gfx;
-    dst = (void *)(VRAM + gMenuMessageBoxContentTileOffset * 32);
-    DmaCopy16(3, src, dst, 0x800);
-
-    src = gNamingScreenMenu_Gfx;
-    dst = (void *)(VRAM + 0x8000 + gMenuMessageBoxContentTileOffset * 32);
-    DmaCopy16(3, src, dst, 0x800);
+    DmaCopy16Defvars(3, gNamingScreenMenu_Gfx, (void *)(VRAM + gMenuMessageBoxContentTileOffset * 32), 0x800);
+    DmaCopy16Defvars(3, gNamingScreenMenu_Gfx, (void *)(VRAM + 0x8000 + gMenuMessageBoxContentTileOffset * 32), 0x800);
 }
 
 static void sub_80B75B0(void)
diff --git a/src/engine/palette.c b/src/engine/palette.c
index 17e9ca178..2a6602503 100644
--- a/src/engine/palette.c
+++ b/src/engine/palette.c
@@ -827,8 +827,6 @@ void BlendPalettes(u32 selectedPalettes, u8 coeff, u16 color)
 
 void BlendPalettesUnfaded(u32 selectedPalettes, u8 coeff, u16 color)
 {
-    void *src = gPlttBufferUnfaded;
-    void *dest = gPlttBufferFaded;
-    DmaCopy32(3, src, dest, PLTT_SIZE);
+    DmaCopy32Defvars(3, gPlttBufferUnfaded, gPlttBufferFaded, PLTT_SIZE);
     BlendPalettes(selectedPalettes, coeff, color);
 }
diff --git a/src/engine/trade.c b/src/engine/trade.c
index 81485d3f6..c271649c1 100644
--- a/src/engine/trade.c
+++ b/src/engine/trade.c
@@ -1465,13 +1465,10 @@ static void sub_8048B0C(u8 a0)
 			DmaCopyLarge16(3, gUnknown_08EA0348, (void *)BG_VRAM, 0x1280, 0x1000);
             for (i = 0; i < 0x400; i ++)
                 gUnknown_03004824->unk_00c8.unk_12[i] = gUnknown_08EA15C8[i];
-            dest = BG_SCREEN_ADDR(6);
-            DmaCopy16(3, gTradeStripesBG2Tilemap, dest, 0x800);
+            DmaCopy16Defvars(3, gTradeStripesBG2Tilemap, BG_SCREEN_ADDR(6), 0x800);
             break;
         case 1:
-            src = gTradeStripesBG3Tilemap;
-            dest = BG_SCREEN_ADDR(7);
-            DmaCopy16(3, src, dest, 0x800);
+            DmaCopy16Defvars(3, gTradeStripesBG3Tilemap, BG_SCREEN_ADDR(7), 0x800);
             sub_804A6DC(0);
             sub_804A6DC(1);
             sub_804A938(&gUnknown_03004824->unk_00c8);
@@ -5685,13 +5682,9 @@ static void sub_804E1DC(void)
 
 void sub_804E22C(void)
 {
-    const u16 *src;
-    u16 *dest;
     LZDecompressVram(gUnknown_08D00000, (void *)VRAM);
     CpuCopy16(gUnknown_08D00524, gSharedMem, 0x1000);
-    src = (const u16 *)gSharedMem;
-    dest = BG_SCREEN_ADDR(5);
-    DmaCopy16(3, src, dest, 0x500)
+    DmaCopy16Defvars(3, gSharedMem, BG_SCREEN_ADDR(5), 0x500);
     LoadCompressedPalette(gUnknown_08D004E0, 0, 32);
     REG_BG1CNT = BGCNT_PRIORITY(2) | BGCNT_SCREENBASE(5);
 }