Merge pull request #518 from camthesaxman/menu_refactor

re-label some window and text code

1 files changed, 22 insertions, 22 deletions

diff --git a/src/field/start_menu.c b/src/field/start_menu.c
index dccf1714e..5b2276d1b 100644
--- a/src/field/start_menu.c
+++ b/src/field/start_menu.c
@@ -193,8 +193,8 @@ static void BuildStartMenuActions_Link(void)
 static void DisplaySafariBallsWindow(void)
 {
     sub_8072C44(gStringVar1, gNumSafariBalls, 12, 1);
-    MenuDrawTextWindow(0, 0, 10, 5);
-    MenuPrint(gOtherText_SafariStock, 1, 1);
+    Menu_DrawStdWindowFrame(0, 0, 10, 5);
+    Menu_PrintText(gOtherText_SafariStock, 1, 1);
 }
 
 //Prints n menu items starting at *index
@@ -204,7 +204,7 @@ static bool32 PrintStartMenuItemsMultistep(s16 *index, u32 n)
 
     do
     {
-        MenuPrint(sStartMenuItems[sCurrentStartMenuActions[_index]].text, 23, 2 + _index * 2);
+        Menu_PrintText(sStartMenuItems[sCurrentStartMenuActions[_index]].text, 23, 2 + _index * 2);
         _index++;
         if (_index >= sNumStartMenuActions)
         {
@@ -226,7 +226,7 @@ static bool32 InitStartMenuMultistep(s16 *step, s16 *index)
         (*step)++;
         break;
     case 2:
-        MenuDrawTextWindow(22, 0, 29, sNumStartMenuActions * 2 + 3);
+        Menu_DrawStdWindowFrame(22, 0, 29, sNumStartMenuActions * 2 + 3);
         *index = 0;
         (*step)++;
         break;
@@ -271,7 +271,7 @@ void CreateStartMenuTask(void (*func)(u8))
 {
     u8 taskId;
 
-    InitMenuWindow(&gWindowConfig_81E6CE4);
+    InitMenuWindow(&gWindowTemplate_81E6CE4);
     taskId = CreateTask(Task_StartMenu, 0x50);
     SetTaskFuncWithFollowupFunc(taskId, Task_StartMenu, func);
 }
@@ -310,12 +310,12 @@ static u8 StartMenu_InputProcessCallback(void)
     if (gMain.newKeys & DPAD_UP)
     {
         PlaySE(SE_SELECT);
-        sStartMenuCursorPos = MoveMenuCursor(-1);
+        sStartMenuCursorPos = Menu_MoveCursor(-1);
     }
     if (gMain.newKeys & DPAD_DOWN)
     {
         PlaySE(SE_SELECT);
-        sStartMenuCursorPos = MoveMenuCursor(1);
+        sStartMenuCursorPos = Menu_MoveCursor(1);
     }
     if (gMain.newKeys & A_BUTTON)
     {
@@ -404,7 +404,7 @@ static u8 StartMenu_PlayerCallback(void)
 //When player selects SAVE
 static u8 StartMenu_SaveCallback(void)
 {
-    HandleDestroyMenuCursors();
+    Menu_DestroyCursor();
     gCallback_03004AE8 = SaveCallback1;
     return 0;
 }
@@ -473,13 +473,13 @@ static u8 SaveCallback2(void)
         return FALSE;
     case SAVE_CANCELED:
         //Go back to start menu
-        MenuZeroFillScreen();
+        Menu_EraseScreen();
         InitStartMenu();
         gCallback_03004AE8 = StartMenu_InputProcessCallback;
         return FALSE;
     case SAVE_SUCCESS:
     case SAVE_ERROR:
-        MenuZeroFillScreen();
+        Menu_EraseScreen();
         sub_8064E2C();
         ScriptContext2_Disable();
         return TRUE;
@@ -498,7 +498,7 @@ static u8 RunSaveDialogCallback(void)
 {
     if (savingComplete)
     {
-        if (!MenuUpdateWindowText())
+        if (!Menu_UpdateWindowText())
             return 0;
     }
     savingComplete = FALSE;
@@ -514,7 +514,7 @@ void ScrSpecial_DoSaveDialog(void)
 static void DisplaySaveMessageWithCallback(const u8 *ptr, u8 (*func)(void))
 {
     StringExpandPlaceholders(gStringVar4, ptr);
-    MenuDisplayMessageBox();
+    Menu_DisplayDialogueFrame();
     MenuPrintMessageDefaultCoords(gStringVar4);
     savingComplete = TRUE;
     saveDialogCallback = func;
@@ -547,7 +547,7 @@ static void sub_8071700(void)
 
 static void HideSaveDialog(void)
 {
-    MenuZeroFillWindowRect(20, 8, 26, 13);
+    Menu_EraseWindowRect(20, 8, 26, 13);
 }
 
 static void SaveDialogStartTimeout(void)
@@ -579,7 +579,7 @@ static bool8 SaveDialogCheckForTimeoutAndKeypress(void)
 
 static u8 SaveDialogCB_DisplayConfirmMessage(void)
 {
-    MenuZeroFillScreen();
+    Menu_EraseScreen();
     HandleDrawSaveWindowInfo(0, 0);
     DisplaySaveMessageWithCallback(gSaveText_WouldYouLikeToSave, SaveDialogCB_DisplayConfirmYesNoMenu);
     return SAVE_IN_PROGRESS;
@@ -594,7 +594,7 @@ static u8 SaveDialogCB_DisplayConfirmYesNoMenu(void)
 
 static u8 SaveDialogCB_ProcessConfirmYesNoMenu(void)
 {
-    switch (ProcessMenuInputNoWrap_())
+    switch (Menu_ProcessInputNoWrap_())
     {
     case 0:     //YES
         HideSaveDialog();
@@ -640,7 +640,7 @@ static u8 SaveDialogCB_DisplayOverwriteYesNoMenu(void)
 
 static u8 SaveDialogCB_ProcessOverwriteYesNoMenu(void)
 {
-    switch (ProcessMenuInputNoWrap_())
+    switch (Menu_ProcessInputNoWrap_())
     {
     case 0:     //YES
         HideSaveDialog();
@@ -694,7 +694,7 @@ static u8 SaveDialogCB_DoSave(void)
 
 static u8 SaveDialogCB_SaveSuccess(void)
 {
-    if (MenuUpdateWindowText())
+    if (Menu_UpdateWindowText())
     {
         PlaySE(SE_SAVE);
         saveDialogCallback = SaveDialogCB_ReturnSuccess;
@@ -715,7 +715,7 @@ static u8 SaveDialogCB_ReturnSuccess(void)
 
 static u8 SaveDialogCB_SaveError(void)
 {
-    if (MenuUpdateWindowText())
+    if (Menu_UpdateWindowText())
     {
         PlaySE(SE_BOO);
         saveDialogCallback = SaveDialogCB_ReturnError;
@@ -774,8 +774,8 @@ static bool32 sub_80719FC(u8 *step)
         dp12_8087EA4();
         break;
     case 2:
-        SetUpWindowConfig(&gWindowConfig_81E6CE4);
-        InitMenuWindow(&gWindowConfig_81E6CE4);
+        Text_LoadWindowTemplate(&gWindowTemplate_81E6CE4);
+        InitMenuWindow(&gWindowTemplate_81E6CE4);
         REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_BG0_ON;
         break;
     case 3:
@@ -821,8 +821,8 @@ static void Task_8071B64(u8 taskId)
         switch (*step)
         {
         case 0:
-            MenuDisplayMessageBox();
-            MenuPrint(gSystemText_Saving, 2, 15);
+            Menu_DisplayDialogueFrame();
+            Menu_PrintText(gSystemText_Saving, 2, 15);
             BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
             (*step)++;
             break;