1 files changed, 14 insertions, 38 deletions

diff --git a/src/scene/egg_hatch.c b/src/scene/egg_hatch.c
index c0111de7d..282ad31fb 100644
--- a/src/scene/egg_hatch.c
+++ b/src/scene/egg_hatch.c
@@ -471,10 +471,10 @@ static void CB2_EggHatch_0(void)
         gSpecialVar_0x8005 = GetCurrentMapMusic();
         break;
     case 1:
-        SetUpWindowConfig(&gWindowConfig_81E6F84);
-        InitWindowFromConfig(&gEggHatchData->window, &gWindowConfig_81E6F84);
-        gEggHatchData->tileDataStartOffset = SetTextWindowBaseTileNum(20);
-        LoadTextWindowGraphics(&gEggHatchData->window);
+        Text_LoadWindowTemplate(&gWindowTemplate_81E6F84);
+        Text_InitWindowWithTemplate(&gEggHatchData->window, &gWindowTemplate_81E6F84);
+        gEggHatchData->tileDataStartOffset = TextWindow_SetBaseTileNum(20);
+        TextWindow_LoadStdFrameGraphics(&gEggHatchData->window);
         gMain.state++;
         break;
     case 2:
@@ -504,35 +504,11 @@ static void CB2_EggHatch_0(void)
         gMain.state++;
         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;
-                }
-            }
-
-            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;
@@ -625,7 +601,7 @@ static void CB2_EggHatch_1(void)
     case 8:
         if (EggHatchUpdateWindowText())
         {
-            MenuDrawTextWindow(22, 8, 27, 13);
+            Menu_DrawStdWindowFrame(22, 8, 27, 13);
             InitYesNoMenu(22, 8, 4);
             gEggHatchData->CB2_state++;
         }
@@ -633,7 +609,7 @@ static void CB2_EggHatch_1(void)
     case 9:
         {
             s8 menuInput;
-            if ((menuInput = ProcessMenuInputNoWrap_()) != -2)
+            if ((menuInput = Menu_ProcessInputNoWrap_()) != -2)
             {
                 if (menuInput != -1 && menuInput != 1)
                 {
@@ -848,15 +824,15 @@ static void CreateEggShardSprite(u8 x, u8 y, s16 data1, s16 data2, s16 data3, u8
 
 static void EggHatchPrintMessage1(u8* src)
 {
-    sub_8002EB0(&gEggHatchData->window, src, gEggHatchData->tileDataStartOffset, 3, 15);
+    Text_InitWindow8002EB0(&gEggHatchData->window, src, gEggHatchData->tileDataStartOffset, 3, 15);
 }
 
 static void EggHatchPrintMessage2(u8* src)
 {
-    sub_8003460(&gEggHatchData->window, src, gEggHatchData->tileDataStartOffset, 3, 15);
+    Text_InitWindowAndPrintText(&gEggHatchData->window, src, gEggHatchData->tileDataStartOffset, 3, 15);
 }
 
 static bool8 EggHatchUpdateWindowText(void)
 {
-    return sub_80035AC(&gEggHatchData->window);
+    return Text_UpdateWindow(&gEggHatchData->window);
 }