more text/menu renaming

6 files changed, 26 insertions, 26 deletions

diff --git a/src/scene/berry_blender.c b/src/scene/berry_blender.c
index 32a48fd36..b59d02939 100644
--- a/src/scene/berry_blender.c
+++ b/src/scene/berry_blender.c
@@ -198,8 +198,8 @@ void m4aMPlayTempoControl(struct MusicPlayerInfo *mplayInfo, u16 tempo);
 void m4aMPlayStop(struct MusicPlayerInfo *mplayInfo);
 void sub_80A6978(void);
 u8 sub_80A7DEC(u8 berryId, u8 x, u8 y, bool8 animate);
-void sub_814A880(u8 a1, u8 a2);
-u8 sub_814A5C0(u8 a1, u16 a2, u8 a3, u16 a4, u8 a5);
+void MenuCursor_SetPos814A880(u8 a1, u8 a2);
+u8 MenuCursor_Create814A5C0(u8 a1, u16 a2, u8 a3, u16 a4, u8 a5);
 s8 GetFirstFreePokeblockSlot(void);
 bool8 sub_810CA34(struct Pokeblock *pokeblock);
 #ifdef GERMAN
@@ -957,7 +957,7 @@ static void sub_804E56C(void)
         ResetSpriteData();
         FreeAllSpritePalettes();
         SetVBlankCallback(NULL);
-        SetUpWindowConfig(&gWindowTemplate_81E6F68);
+        Text_LoadWindowTemplate(&gWindowTemplate_81E6F68);
         InitMenuWindow(&gWindowTemplate_81E6F68);
         gBerryBlenderData->field_0++;
         gBerryBlenderData->field_140 = 0;
@@ -1135,7 +1135,7 @@ static void sub_804E9F8(void)
         FreeAllSpritePalettes();
         ResetTasks();
         SetVBlankCallback(VBlankCB0_BerryBlender);
-        SetUpWindowConfig(&gWindowTemplate_81E6F68);
+        Text_LoadWindowTemplate(&gWindowTemplate_81E6F68);
         InitMenuWindow(&gWindowTemplate_81E6F68);
         gLinkType = 0x4422;
         gBerryBlenderData->field_0++;
@@ -1338,7 +1338,7 @@ static void sub_804F0F4(void)
 
     SetVBlankCallback(VBlankCB0_BerryBlender);
 
-    SetUpWindowConfig(&gWindowTemplate_81E6F68);
+    Text_LoadWindowTemplate(&gWindowTemplate_81E6F68);
     InitMenuWindow(&gWindowTemplate_81E6F68);
 
     gLinkType = 0x4422;
@@ -1426,7 +1426,7 @@ static void sub_804F2A8(void)
             if (GetMultiplayerId() == gBerryBlenderData->field_9A[i])
                 stringPtr = StringCopy(stringPtr, sRedColorString);
             StringCopy(stringPtr, gLinkPlayers[gBerryBlenderData->field_9A[i]].name);
-            MenuPrint_PixelCoords(gStringVar1, gUnknown_082162D4[i][0] * 8 + 1, gUnknown_082162D4[i][1] * 8, 1);
+            Menu_PrintTextPixelCoords(gStringVar1, gUnknown_082162D4[i][0] * 8 + 1, gUnknown_082162D4[i][1] * 8, 1);
         }
     }
 }
@@ -2494,14 +2494,14 @@ static void sub_8050760(void)
 static void sub_80508D4(u8 value)
 {
     gBerryBlenderData->field_AA = value;
-    sub_814A880(192, (gBerryBlenderData->field_AA * 16) + 72);
+    MenuCursor_SetPos814A880(192, (gBerryBlenderData->field_AA * 16) + 72);
 }
 
 static void sub_80508FC(void)
 {
     gBerryBlenderData->field_AA = 0;
     Menu_DrawStdWindowFrame(23, 8, 28, 13);
-    sub_814A5C0(0, -1, 12, 0x2D9F, 32);
+    MenuCursor_Create814A5C0(0, -1, 12, 0x2D9F, 32);
     Menu_PrintText(gOtherText_YesNoTerminating, 24, 9);
     sub_80508D4(gBerryBlenderData->field_AA);
 }
@@ -3080,7 +3080,7 @@ void unref_sub_80516F8(u8 taskID)
                 task->data[0] = 0;
             if (task->data[0] == 100)
             {
-                ZeroFillWindowRect(&gBerryBlenderData->field_4, 0, 0, 16, 20);
+                Text_EraseWindowRect(&gBerryBlenderData->field_4, 0, 0, 16, 20);
                 Menu_DrawStdWindowFrame(4, 4, 10, 12);
                 for (i = 0; i < 3; i++)
                 {
@@ -3606,7 +3606,7 @@ void unref_sub_80524BC(void)
     FreeAllSpritePalettes();
     ResetTasks();
     SetVBlankCallback(VBlankCB1_BerryBlender);
-    SetUpWindowConfig(&gWindowTemplate_81E6CE4);
+    Text_LoadWindowTemplate(&gWindowTemplate_81E6CE4);
     InitMenuWindow(&gWindowTemplate_81E6CE4);
     SeedRng(gMain.vblankCounter1);
     REG_DISPCNT = 0x1540;
diff --git a/src/scene/contest_painting.c b/src/scene/contest_painting.c
index de9063823..401872644 100644
--- a/src/scene/contest_painting.c
+++ b/src/scene/contest_painting.c
@@ -244,7 +244,7 @@ static void HoldContestPainting(void)
 static void ContestPaintingInitWindow(u8 arg0)
 {
     InitMenuWindow(&gWindowTemplate_81E7160);
-    SetUpWindowConfig(&gWindowTemplate_81E7160);
+    Text_LoadWindowTemplate(&gWindowTemplate_81E7160);
 }
 
 static void ContestPaintingPrintCaption(u8 contestType, u8 arg1)
@@ -291,7 +291,7 @@ static void ContestPaintingPrintCaption(u8 contestType, u8 arg1)
         xPos = 3;
         yPos = 14;
     }
-    MenuPrint_PixelCoords(gUnknown_03005E40, xPos * 8 + 1, yPos * 8, 1);
+    Menu_PrintTextPixelCoords(gUnknown_03005E40, xPos * 8 + 1, yPos * 8, 1);
 }
 
 static void ContestPaintingInitBG(void)
diff --git a/src/scene/credits.c b/src/scene/credits.c
index f113fe965..e31e2c797 100644
--- a/src/scene/credits.c
+++ b/src/scene/credits.c
@@ -474,7 +474,7 @@ void sub_81439D0(void)
     taskIdC = gTasks[taskIdA].data[TDA_TASK_C_ID];
     gTasks[taskIdC].data[TDC_0] = 40;
 
-    SetUpWindowConfig(&gWindowTemplate_81E7208);
+    Text_LoadWindowTemplate(&gWindowTemplate_81E7208);
     InitMenuWindow(&gWindowTemplate_81E7208);
     LoadPalette(&gUnknown_0840B7BC, 0x80, sizeof(gUnknown_0840B7BC));
 
diff --git a/src/scene/egg_hatch.c b/src/scene/egg_hatch.c
index e76f5b47c..e0b798aea 100644
--- a/src/scene/egg_hatch.c
+++ b/src/scene/egg_hatch.c
@@ -471,7 +471,7 @@ static void CB2_EggHatch_0(void)
         gSpecialVar_0x8005 = GetCurrentMapMusic();
         break;
     case 1:
-        SetUpWindowConfig(&gWindowTemplate_81E6F84);
+        Text_LoadWindowTemplate(&gWindowTemplate_81E6F84);
         Text_InitWindowWithTemplate(&gEggHatchData->window, &gWindowTemplate_81E6F84);
         gEggHatchData->tileDataStartOffset = TextWindow_SetBaseTileNum(20);
         TextWindow_LoadStdFrameGraphics(&gEggHatchData->window);
@@ -633,7 +633,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)
                 {
diff --git a/src/scene/evolution_scene.c b/src/scene/evolution_scene.c
index 571b8ab8d..167130aa5 100644
--- a/src/scene/evolution_scene.c
+++ b/src/scene/evolution_scene.c
@@ -197,7 +197,7 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo,
     REG_WININ = 0;
     REG_WINOUT = 0;
 
-    SetUpWindowConfig(&gWindowTemplate_81E6C58);
+    Text_LoadWindowTemplate(&gWindowTemplate_81E6C58);
     ResetPaletteFade();
 
     gBattle_BG0_X = 0;
@@ -306,7 +306,7 @@ static void CB2_EvolutionSceneLoadGraphics(void)
     REG_WIN1V = 0;
     REG_WININ = 0;
     REG_WINOUT = 0;
-    SetUpWindowConfig(&gWindowTemplate_81E6C58);
+    Text_LoadWindowTemplate(&gWindowTemplate_81E6C58);
     ResetPaletteFade();
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 0;
@@ -373,7 +373,7 @@ static void CB2_TradeEvolutionSceneLoadGraphics(void)
         gMain.state++;
         break;
     case 1:
-        SetUpWindowConfig(&gWindowTemplate_81E6F84);
+        Text_LoadWindowTemplate(&gWindowTemplate_81E6F84);
         Text_InitWindowWithTemplate(&gUnknown_03004828->window, &gWindowTemplate_81E6F84);
         gMain.state++;
         break;
@@ -1087,7 +1087,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
                 sEvoCursorPos = 0;
                 Text_InitWindow(&gUnknown_03004828->window, gOtherText_YesNoAndPlayer, gUnknown_03004828->textWindowBaseTileNum + 128, 25, 9);
                 Text_PrintWindow8002F44(&gUnknown_03004828->window);
-                sub_814A5C0(0, 0xFFFF, 0xC, 0x2D9F, 0x20);
+                MenuCursor_Create814A5C0(0, 0xFFFF, 0xC, 0x2D9F, 0x20);
                 sub_81150D8();
                 gTasks[taskID].tLearnMoveState++;
                 sEvoCursorPos = 0;
@@ -1110,7 +1110,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
             }
             if (gMain.newKeys & A_BUTTON)
             {
-                ZeroFillWindowRect(&gUnknown_03004828->window, 0x18, 8, 0x1D, 0xD);
+                Text_EraseWindowRect(&gUnknown_03004828->window, 0x18, 8, 0x1D, 0xD);
                 DestroyMenuCursor();
                 StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[292]);
                 Text_InitWindow8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15);
@@ -1126,7 +1126,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
             }
             if (gMain.newKeys & B_BUTTON)
             {
-                ZeroFillWindowRect(&gUnknown_03004828->window, 0x18, 8, 0x1D, 0xD);
+                Text_EraseWindowRect(&gUnknown_03004828->window, 0x18, 8, 0x1D, 0xD);
                 DestroyMenuCursor();
                 StrCpyDecodeToDisplayedStringBattle(gBattleStringsTable[292]);
                 Text_InitWindow8002EB0(&gUnknown_03004828->window, gDisplayedStringBattle, gUnknown_03004828->textWindowBaseTileNum, 2, 15);
@@ -3955,7 +3955,7 @@ static void VBlankCB_TradeEvolutionScene(void)
 
 static void sub_81150D8(void)
 {
-    sub_814A880(200, 72 + (sEvoCursorPos * 16));
+    MenuCursor_SetPos814A880(200, 72 + (sEvoCursorPos * 16));
 }
 
 static void EvoDummyFunc2(void)
diff --git a/src/scene/hall_of_fame.c b/src/scene/hall_of_fame.c
index 4f8124ace..948c288ff 100644
--- a/src/scene/hall_of_fame.c
+++ b/src/scene/hall_of_fame.c
@@ -582,7 +582,7 @@ static void sub_81422B8(u8 taskID)
 
 static void sub_81422E8(u8 taskID)
 {
-    SetUpWindowConfig(&gWindowTemplate_81E7198);
+    Text_LoadWindowTemplate(&gWindowTemplate_81E7198);
     InitMenuWindow(&gWindowTemplate_81E7198);
     gTasks[taskID].func = sub_8142320;
 }
@@ -714,7 +714,7 @@ static void sub_81426F8(u8 taskID)
 static void sub_8142738(u8 taskID)
 {
     REG_DISPCNT = 0x1940;
-    SetUpWindowConfig(&gWindowTemplate_81E71B4);
+    Text_LoadWindowTemplate(&gWindowTemplate_81E71B4);
     InitMenuWindow(&gWindowTemplate_81E71B4);
 
     gTasks[taskID].tPlayerSpriteID = HallOfFame_LoadTrainerPic(gSaveBlock2.playerGender, 120, 72, 6);
@@ -864,7 +864,7 @@ static void sub_8142A28(u8 taskID)
             *(vram1 + i) = i + 3;
             *(vram2 + i) = i + 20;
         }
-        SetUpWindowConfig(&gWindowTemplate_81E7198);
+        Text_LoadWindowTemplate(&gWindowTemplate_81E7198);
         InitMenuWindow(&gWindowTemplate_81E7198);
         gTasks[taskID].func = sub_8142B04;
     }
@@ -1285,7 +1285,7 @@ static void sub_8143570(void)
     gReservedSpritePaletteCount = 8;
     LoadCompressedObjectPic(&sHallOfFame_ConfettiSpriteSheet);
     LoadCompressedObjectPalette(&sHallOfFame_ConfettiSpritePalette);
-    SetUpWindowConfig(&gWindowTemplate_81E71B4);
+    Text_LoadWindowTemplate(&gWindowTemplate_81E71B4);
     InitMenuWindow(&gWindowTemplate_81E71B4);
 }