1 files changed, 10 insertions, 10 deletions
diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c
index ae84e5585..249b67e0d 100644
--- a/src/battle/battle_2.c
+++ b/src/battle/battle_2.c
@@ -234,7 +234,7 @@ void InitBattle(void)
     }
     //sub_80895F8(gUnknown_081F9674.unk0, gUnknown_081F9674.unk4, gUnknown_081F9674.unk8);
     sub_80895F8(gUnknown_081F9674);
-    SetUpWindowConfig(&gWindowConfig_81E6C58);
+    Text_LoadWindowTemplate(&gWindowTemplate_81E6C58);
     ResetPaletteFade();
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 0;
@@ -245,9 +245,9 @@ void InitBattle(void)
     gUnknown_030041B0 = 0;
     gUnknown_030041B8 = 0;
     gBattleTerrain = BattleSetup_GetTerrain();
-    InitWindowFromConfig(&gUnknown_03004210, &gWindowConfig_81E6C58);
-    InitWindowFromConfig(&gUnknown_030041D0, &gWindowConfig_81E71D0);
-    InitWindowFromConfig(&gUnknown_03004250, &gWindowConfig_81E71EC);
+    Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowTemplate_81E6C58);
+    Text_InitWindowWithTemplate(&gUnknown_030041D0, &gWindowTemplate_81E71D0);
+    Text_InitWindowWithTemplate(&gUnknown_03004250, &gWindowTemplate_81E71EC);
     sub_800D6D4();
     sub_800DAB8();
     ResetSpriteData();
@@ -553,7 +553,7 @@ void sub_800F02C(void)
         gUnknown_02023A00[i].status      = GetMonData(&gPlayerParty[i], MON_DATA_STATUS);
         gUnknown_02023A00[i].personality = GetMonData(&gPlayerParty[i], MON_DATA_PERSONALITY);
         gUnknown_02023A00[i].gender      = GetMonGender(&gPlayerParty[i]);
-        StripExtCtrlCodes(nickname);
+        Text_StripExtCtrlCodes(nickname);
         gUnknown_02023A00[i].language    = GetMonData(&gPlayerParty[i], MON_DATA_LANGUAGE);
         if (gUnknown_02023A00[i].language != 1)
             PadNameString(nickname, 0);
@@ -898,7 +898,7 @@ void BattleMainCB2(void)
 {
     AnimateSprites();
     BuildOamBuffer();
-    sub_800374C(&gUnknown_03004210);
+    Text_UpdateWindowInBattle(&gUnknown_03004210);
     UpdatePaletteFade();
     RunTasks();
 }
@@ -1210,7 +1210,7 @@ void c2_8011A1C(void)
         gUnknown_03004DE0[0][i] = 0xFF10;
         gUnknown_03004DE0[1][i] = 0xFF10;
     }
-    SetUpWindowConfig(&gWindowConfig_81E6C58);
+    Text_LoadWindowTemplate(&gWindowTemplate_81E6C58);
     ResetPaletteFade();
     gBattle_BG0_X = 0;
     gBattle_BG0_Y = 0;
@@ -1221,9 +1221,9 @@ void c2_8011A1C(void)
     gUnknown_030041B0 = 0;
     gUnknown_030041B8 = 0;
 
-    InitWindowFromConfig(&gUnknown_03004210, &gWindowConfig_81E6C58);
-    InitWindowFromConfig(&gUnknown_030041D0, &gWindowConfig_81E71D0);
-    InitWindowFromConfig(&gUnknown_03004250, &gWindowConfig_81E71EC);
+    Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowTemplate_81E6C58);
+    Text_InitWindowWithTemplate(&gUnknown_030041D0, &gWindowTemplate_81E71D0);
+    Text_InitWindowWithTemplate(&gUnknown_03004250, &gWindowTemplate_81E71EC);
     sub_800D6D4();
     LoadCompressedPalette(gUnknown_08D004E0, 0, 64);
     sub_800D74C();