re-label some window and text code

1 files changed, 17 insertions, 17 deletions

diff --git a/src/engine/option_menu.c b/src/engine/option_menu.c
index dfc49b035..f35ed5b5a 100644
--- a/src/engine/option_menu.c
+++ b/src/engine/option_menu.c
@@ -173,17 +173,17 @@ void CB2_InitOptionMenu(void)
         gTasks[taskId].data[TD_BUTTONMODE] = gSaveBlock2.optionsButtonMode;
         gTasks[taskId].data[TD_FRAMETYPE] = gSaveBlock2.optionsWindowFrameType;
 
-        MenuDrawTextWindow(2, 0, 27, 3);
-        MenuDrawTextWindow(2, 4, 27, 19);
-
-        MenuPrint(gSystemText_OptionMenu, 4, 1);
-        MenuPrint(gSystemText_TextSpeed, 4, 5);
-        MenuPrint(gSystemText_BattleScene, 4, 7);
-        MenuPrint(gSystemText_BattleStyle, 4, 9);
-        MenuPrint(gSystemText_Sound, 4, 11);
-        MenuPrint(gSystemText_ButtonMode, 4, 13);
-        MenuPrint(gSystemText_Frame, 4, 15);
-        MenuPrint(gSystemText_Cancel, 4, 17);
+        Menu_DrawStdWindowFrame(2, 0, 27, 3);
+        Menu_DrawStdWindowFrame(2, 4, 27, 19);
+
+        Menu_PrintText(gSystemText_OptionMenu, 4, 1);
+        Menu_PrintText(gSystemText_TextSpeed, 4, 5);
+        Menu_PrintText(gSystemText_BattleScene, 4, 7);
+        Menu_PrintText(gSystemText_BattleStyle, 4, 9);
+        Menu_PrintText(gSystemText_Sound, 4, 11);
+        Menu_PrintText(gSystemText_ButtonMode, 4, 13);
+        Menu_PrintText(gSystemText_Frame, 4, 15);
+        Menu_PrintText(gSystemText_Cancel, 4, 17);
 
         TextSpeed_DrawChoices(gTasks[taskId].data[TD_TEXTSPEED]);
         BattleScene_DrawChoices(gTasks[taskId].data[TD_BATTLESCENE]);
@@ -432,11 +432,11 @@ static u8 FrameType_ProcessInput(u8 selection)
 {
     if (gMain.newKeys & DPAD_RIGHT)
     {
-        if (selection <= 18)
+        if (selection < 19)
             selection++;
         else
             selection = 0;
-        MenuLoadTextWindowGraphics_OverrideFrameType(selection);
+        Menu_LoadStdFrameGraphicsOverrideStyle(selection);
     }
     if (gMain.newKeys & DPAD_LEFT)
     {
@@ -444,7 +444,7 @@ static u8 FrameType_ProcessInput(u8 selection)
             selection--;
         else
             selection = 19;
-        MenuLoadTextWindowGraphics_OverrideFrameType(selection);
+        Menu_LoadStdFrameGraphicsOverrideStyle(selection);
     }
     return selection;
 }
@@ -478,8 +478,8 @@ static void FrameType_DrawChoices(u8 selection)
     }
 
     text[i] = EOS;
-    MenuPrint(gSystemText_Type, 15, 15);
-    MenuPrint(text, 18, 15);
+    Menu_PrintText(gSystemText_Type, 15, 15);
+    Menu_PrintText(text, 18, 15);
 }
 #elif GERMAN
 __attribute__((naked))
@@ -536,7 +536,7 @@ _0808C380:\n\
     mov r0, sp\n\
     movs r1, 0xF\n\
     movs r2, 0xF\n\
-    bl MenuPrint\n\
+    bl Menu_PrintText\n\
     add sp, 0x10\n\
     pop {r4-r6}\n\
     pop {r0}\n\