more text/menu renaming

1 files changed, 19 insertions, 19 deletions

diff --git a/src/field/party_menu.c b/src/field/party_menu.c
index 73a32d070..9cad5bd73 100644
--- a/src/field/party_menu.c
+++ b/src/field/party_menu.c
@@ -679,7 +679,7 @@ bool8 InitPartyMenu(void)
         gMain.state++;
         break;
     case 7:
-        SetUpWindowConfig(&gWindowTemplate_81E6C90);
+        Text_LoadWindowTemplate(&gWindowTemplate_81E6C90);
         gMain.state++;
         break;
     case 8:
@@ -2706,7 +2706,7 @@ void sub_806D5B8(u8 monIndex)
     u8 right = gUnknown_08376948[IsDoubleBattle()][monIndex].right;
     u8 bottom = gUnknown_08376948[IsDoubleBattle()][monIndex].bottom;
 
-    ZeroFillWindowRect(&gUnknown_03004210, left, top, right, bottom);
+    Text_EraseWindowRect(&gUnknown_03004210, left, top, right, bottom);
 
     var1 = 0;
     CpuFastSet(&var1, OBJ_VRAM1 + monIndex * 0x400, 0x1000100);
@@ -2720,7 +2720,7 @@ void sub_806D668(u8 monIndex)
     u8 right = gUnknown_08376978[IsDoubleBattle()][monIndex].right;
     u8 bottom = gUnknown_08376978[IsDoubleBattle()][monIndex].bottom;
 
-    ZeroFillWindowRect(&gUnknown_03004210, left, top, right, bottom);
+    Text_EraseWindowRect(&gUnknown_03004210, left, top, right, bottom);
 
     var1 = 0;
     CpuFastSet(&var1, OBJ_VRAM1 + 0x300 + monIndex * 0x400, 0x1000040);
@@ -3313,7 +3313,7 @@ void PartyMenuDoPrintMonNickname(u8 monIndex, int b, const u8 *nameBuffer)
 {
     u32 var1 = 0;
     CpuFastSet(&var1, gTileBuffer, 0x1000100);
-    sub_8004E3C((struct WindowTemplate *)&gWindowTemplate_81E6CAC, gTileBuffer, nameBuffer);
+    Text_InitWindow8004E3C((struct WindowTemplate *)&gWindowTemplate_81E6CAC, gTileBuffer, nameBuffer);
     CpuFastSet(gTileBuffer, OBJ_VRAM1 + (monIndex * 0x400), 128);
 }
 
@@ -3423,7 +3423,7 @@ void PartyMenuDoPrintLevel(u8 monIndex, u8 menuLayout, u8 level)
 
     var1 = 0;
     CpuFastSet(&var1, gUnknown_02039460, 0x1000020);
-    sub_8004E3C((struct WindowTemplate *)&gWindowTemplate_81E6CAC, gUnknown_02039460 - 0x100 /*gTileBuffer*/, gStringVar1);
+    Text_InitWindow8004E3C((struct WindowTemplate *)&gWindowTemplate_81E6CAC, gUnknown_02039460 - 0x100 /*gTileBuffer*/, gStringVar1);
     CpuFastSet(gUnknown_02039460, OBJ_VRAM1 + 0x200 + (monIndex * 0x400), 32);
 }
 
@@ -3517,7 +3517,7 @@ void PartyMenuDoPrintHP(u8 monIndex, u8 b, u16 currentHP, u16 maxHP)
     var = 0;
 
     CpuFastSet(&var, gUnknown_02039460, 0x1000040);
-    sub_8004E3C((struct WindowTemplate *)&gWindowTemplate_81E6CAC, gUnknown_02039460 - 0x100 /*gTileBuffer*/, gStringVar1);
+    Text_InitWindow8004E3C((struct WindowTemplate *)&gWindowTemplate_81E6CAC, gUnknown_02039460 - 0x100 /*gTileBuffer*/, gStringVar1);
     CpuFastSet(gUnknown_02039460, OBJ_VRAM1 + 0x300 + (monIndex * 0x400), 64);
 }
 
@@ -3668,7 +3668,7 @@ void ClosePartyPopupMenu(u8 index, const struct PartyPopupMenu *menu)
     SetPartyPopupMenuOffsets(index, &left, &top, menu);
 
     Menu_EraseWindowRect(left, top, left + menu[index].width, menu[index].numChoices * 2 + top + 1);
-    HandleDestroyMenuCursors();
+    Menu_DestroyCursor();
 }
 
 TaskFunc PartyMenuGetPopupMenuFunc(u8 menuIndex, const struct PartyPopupMenu *menus, const struct MenuAction2 *menuActions, u8 itemIndex)
@@ -3788,7 +3788,7 @@ void party_menu_link_mon_held_item_object(u8 taskId)
 
 void PartyMenuTryGiveMonHeldItem_806EACC(u8 taskId)
 {
-    s8 selection = ProcessMenuInputNoWrap_();
+    s8 selection = Menu_ProcessInputNoWrap_();
 
     if (selection == 0)
     {
@@ -3925,7 +3925,7 @@ void DoTakeMail(u8 taskId, TaskFunc func)
 
 void Task_LoseMailMessage(u8 taskId)
 {
-    s8 selection = ProcessMenuInputNoWrap_();
+    s8 selection = Menu_ProcessInputNoWrap_();
 
     if (selection == 0)
     {
@@ -3964,7 +3964,7 @@ void Task_ConfirmLoseMailMessage(u8 taskId)
 
 void Task_TakeHeldMail(u8 taskId)
 {
-    s8 selection = ProcessMenuInputNoWrap_();
+    s8 selection = Menu_ProcessInputNoWrap_();
 
     if (selection == 0)
     {
@@ -4126,7 +4126,7 @@ void sub_806F358(u8 taskId)
 
 void sub_806F390(u8 taskId)
 {
-    s8 selection = ProcessMenuInputNoWrap_();
+    s8 selection = Menu_ProcessInputNoWrap_();
 
     if (selection == 0)
     {
@@ -4224,7 +4224,7 @@ void StopTryingToTeachMove_806F67C(u8 taskId)
 
 void StopTryingToTeachMove_806F6B4(u8 taskId)
 {
-    s8 selection = ProcessMenuInputNoWrap_();
+    s8 selection = Menu_ProcessInputNoWrap_();
 
     if (selection == 0)
     {
@@ -4713,7 +4713,7 @@ void DoPPRecoveryItemEffect(u8 taskId, u16 item, TaskFunc c)
 
 void ItemUseMoveMenu_HandleMoveSelection(u8 taskId)
 {
-    HandleDestroyMenuCursors();
+    Menu_DestroyCursor();
     Menu_EraseWindowRect(19, 10, 29, 19);
     sub_806D5A4();
     gTasks[taskId].data[11] = Menu_GetCursorPos();
@@ -4722,7 +4722,7 @@ void ItemUseMoveMenu_HandleMoveSelection(u8 taskId)
 
 void ItemUseMoveMenu_HandleCancel(u8 taskId)
 {
-    HandleDestroyMenuCursors();
+    Menu_DestroyCursor();
     Menu_EraseWindowRect(19, 10, 29, 19);
     if (gMain.inBattle)
         gTasks[ewram1C000.unk4].func = HandleBattlePartyMenu;
@@ -4868,12 +4868,12 @@ void PrintStatGrowthsInLevelUpWindow(u8 taskId)
         x = (i / 3) * 9 + 11;
         y = ((i % 3) << 1) + 1;
 
-        MenuPrint_PixelCoords(StatNames[i], (x + 1) * 8, y * 8, 1);
+        Menu_PrintTextPixelCoords(StatNames[i], (x + 1) * 8, y * 8, 1);
 
         if (i == 2)
-            MenuPrint_PixelCoords(gOtherText_TallPlusAndRightArrow, (x + 6) * 8 + 6, y * 8, 0);
+            Menu_PrintTextPixelCoords(gOtherText_TallPlusAndRightArrow, (x + 6) * 8 + 6, y * 8, 0);
         else
-            MenuPrint_PixelCoords(gOtherText_TallPlusAndRightArrow, (x + 6) * 8 + 6, y * 8, 1);
+            Menu_PrintTextPixelCoords(gOtherText_TallPlusAndRightArrow, (x + 6) * 8 + 6, y * 8, 1);
 
         gStringVar1[0] = EXT_CTRL_CODE_BEGIN;
         gStringVar1[1] = 0x14;
@@ -4881,7 +4881,7 @@ void PrintStatGrowthsInLevelUpWindow(u8 taskId)
 
         ConvertIntToDecimalStringN(gStringVar1 + 3, ewram1B000.statGrowths[i], 1, 2);
 
-        MenuPrint_PixelCoords(gStringVar1, (x + 6) * 8 + 12, y * 8, 0);
+        Menu_PrintTextPixelCoords(gStringVar1, (x + 6) * 8 + 12, y * 8, 0);
     }
 }
 #elif GERMAN
@@ -5028,7 +5028,7 @@ void PrintNewStatsInLevelUpWindow(u8 taskId)
         gStringVar1[2] = 0x06;
 
         ConvertIntToDecimalStringN(gStringVar1 + 3, ewram1B000.statGrowths[newStatIndex], 1, 3);
-        MenuPrint_PixelCoords(gStringVar1, (x + 6) * 8 + 6, y * 8, 0);
+        Menu_PrintTextPixelCoords(gStringVar1, (x + 6) * 8 + 6, y * 8, 0);
     }
 }