From 093422f3065ed47db9a475b0c9d67e9c5bc2c364 Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Wed, 17 Jan 2018 18:10:16 -0500
Subject: use dma macros for remaining missing dma while(1) loops

---
 src/scene/egg_hatch.c | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

(limited to 'src/scene/egg_hatch.c')

diff --git a/src/scene/egg_hatch.c b/src/scene/egg_hatch.c
index e0b798aea..8c585e067 100644
--- a/src/scene/egg_hatch.c
+++ b/src/scene/egg_hatch.c
@@ -505,28 +505,11 @@ static void CB2_EggHatch_0(void)
         break;
     case 7:
         {
-            u32 offsetRead, offsetWrite;
             u32 offsetRead2, offsetWrite2;
-            u32 size;
 
             REG_BG2CNT = 0x4C06;
             LoadPalette(gUnknown_0820C9F8, 0x10, 0xA0);
-
-            offsetRead = (u32)(&gUnknown_0820CA98);
-            offsetWrite = (VRAM + 0x4000);
-            size = 0x1300;
-            while (TRUE)
-            {
-                DmaCopy16(3, offsetRead, (void *) (offsetWrite), 0x1000);
-                offsetRead += 0x1000;
-                offsetWrite += 0x1000;
-                size -= 0x1000;
-                if (size <= 0x1000)
-                {
-                    DmaCopy16(3, offsetRead, (void *) (offsetWrite), size);
-                    break;
-                }
-            }
+            DmaCopyLarge16(3, gUnknown_0820CA98, (void *)(VRAM + 0x4000), 0x1300, 0x1000);
 
             offsetRead2 = (u32)(&gUnknown_0820F798);
             offsetWrite2 = (u32)(VRAM + 0x6000);
-- 
cgit v1.2.3


From 2869160d630f569110ca895ff924070d626fd54b Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Wed, 17 Jan 2018 19:31:23 -0500
Subject: use Defvars instead of some Dma macros and hopefully last while(1)s

---
 src/scene/egg_hatch.c | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

(limited to 'src/scene/egg_hatch.c')

diff --git a/src/scene/egg_hatch.c b/src/scene/egg_hatch.c
index 8c585e067..282ad31fb 100644
--- a/src/scene/egg_hatch.c
+++ b/src/scene/egg_hatch.c
@@ -504,18 +504,11 @@ static void CB2_EggHatch_0(void)
         gMain.state++;
         break;
     case 7:
-        {
-            u32 offsetRead2, offsetWrite2;
-
-            REG_BG2CNT = 0x4C06;
-            LoadPalette(gUnknown_0820C9F8, 0x10, 0xA0);
-            DmaCopyLarge16(3, gUnknown_0820CA98, (void *)(VRAM + 0x4000), 0x1300, 0x1000);
-
-            offsetRead2 = (u32)(&gUnknown_0820F798);
-            offsetWrite2 = (u32)(VRAM + 0x6000);
-            DmaCopy16(3, offsetRead2, (void*)(offsetWrite2), 0x1000);
-            gMain.state++;
-        }
+        REG_BG2CNT = 0x4C06;
+        LoadPalette(gUnknown_0820C9F8, 0x10, 0xA0);
+        DmaCopyLarge16(3, gUnknown_0820CA98, (void *)(VRAM + 0x4000), 0x1300, 0x1000);
+        DmaCopy16Defvars(3, gUnknown_0820F798, (void *)(VRAM + 0x6000), 0x1000);
+        gMain.state++;
         break;
     case 8:
         REG_BG1CNT = 0x501;
-- 
cgit v1.2.3