1 files changed, 18 insertions, 18 deletions

diff --git a/src/field/choose_party.c b/src/field/choose_party.c
index d278eda4a..3ba04e489 100644
--- a/src/field/choose_party.c
+++ b/src/field/choose_party.c
@@ -318,19 +318,19 @@ static void sub_812238C(u8 taskId)
     {
         if (gMain.newAndRepeatedKeys & 0x40)
         {
-            if (GetMenuCursorPos() != 0)
+            if (Menu_GetCursorPos() != 0)
             {
                 PlaySE(SE_SELECT);
-                MoveMenuCursor(-1);
+                Menu_MoveCursor(-1);
             }
             return;
         }
         if (gMain.newAndRepeatedKeys & 0x80)
         {
-            if (GetMenuCursorPos() != 3)
+            if (Menu_GetCursorPos() != 3)
             {
                 PlaySE(SE_SELECT);
-                MoveMenuCursor(1);
+                Menu_MoveCursor(1);
             }
             return;
         }
@@ -343,7 +343,7 @@ static void sub_812238C(u8 taskId)
               gTasks[taskId].data[4],
               sBattleTowerEntryMenu,
               sBattleTowerEntryMenuItems,
-              GetMenuCursorPos());
+              Menu_GetCursorPos());
             popupMenuFunc(taskId);
             return;
         }
@@ -461,8 +461,8 @@ static void BattleTowerEntryMenuCallback_Enter(u8 taskId)
         }
     }
     PlaySE(SE_HAZURE);
-    MenuZeroFillWindowRect(20, 10, 29, 19);
-    HandleDestroyMenuCursors();
+    Menu_EraseWindowRect(20, 10, 29, 19);
+    Menu_DestroyCursor();
     sub_806D5A4();
     sub_806E834(gOtherText_NoMoreThreePoke, 1);
     gTasks[taskId].func = sub_8122728;
@@ -475,8 +475,8 @@ static void sub_8122728(u8 taskId)
 
     if ((gMain.newKeys & A_BUTTON) || (gMain.newKeys & B_BUTTON))
     {
-        MenuZeroFillWindowRect(0, 14, 29, 19);
-        HandleDestroyMenuCursors();
+        Menu_EraseWindowRect(0, 14, 29, 19);
+        Menu_DestroyCursor();
         BattleTowerEntryMenuCallback_Exit(taskId);
     }
 }
@@ -515,8 +515,8 @@ static void BattleTowerEntryMenuCallback_NoEntry(u8 taskId)
 
 static void sub_81227FC(u8 taskId)
 {
-    MenuZeroFillWindowRect(20, 10, 29, 19);
-    HandleDestroyMenuCursors();
+    Menu_EraseWindowRect(20, 10, 29, 19);
+    Menu_DestroyCursor();
     PrintPartyMenuPromptText(0, 0);
     gTasks[taskId].func = HandleBattleTowerPartyMenu;
 }
@@ -806,19 +806,19 @@ static void Task_DaycareStorageMenu8122EAC(u8 taskId)
     {
         if (gMain.newAndRepeatedKeys & 0x40)
         {
-            if (GetMenuCursorPos() != 0)
+            if (Menu_GetCursorPos() != 0)
             {
                 PlaySE(SE_SELECT);
-                MoveMenuCursor(-1);
+                Menu_MoveCursor(-1);
             }
             return;
         }
         if (gMain.newAndRepeatedKeys & 0x80)
         {
-            if (GetMenuCursorPos() != 3)
+            if (Menu_GetCursorPos() != 3)
             {
                 PlaySE(SE_SELECT);
-                MoveMenuCursor(1);
+                Menu_MoveCursor(1);
             }
             return;
         }
@@ -831,7 +831,7 @@ static void Task_DaycareStorageMenu8122EAC(u8 taskId)
               gTasks[taskId].data[4],
               sDaycareStorageMenus,
               sDaycareStorageMenuItems,
-              GetMenuCursorPos());
+              Menu_GetCursorPos());
             popupMenuFunc(taskId);
             return;
         }
@@ -896,8 +896,8 @@ static void DaycareStorageMenuCallback_Summary(u8 taskId)
 static void DaycareStorageMenuCallback_Exit(u8 taskId)
 {
     PlaySE(SE_SELECT);
-    MenuZeroFillWindowRect(20, 10, 29, 19);
-    HandleDestroyMenuCursors();
+    Menu_EraseWindowRect(20, 10, 29, 19);
+    Menu_DestroyCursor();
     PrintPartyMenuPromptText(15, 0);
     gTasks[taskId].func = HandleDaycarePartyMenu;
 }