Dma macro cleanup and cleanup sub_8076034 and sub_8076464

1 files changed, 10 insertions, 10 deletions

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: