more text/menu renaming

3 files changed, 26 insertions, 29 deletions

diff --git a/include/menu.h b/include/menu.h
index 3339ff644..3295cd5c5 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -45,7 +45,7 @@ void unref_sub_8071FBC(u16, u8, u8, u8, u8);
 void Menu_DisplayDialogueFrame(void);
 void MenuPrintMessage(const u8 *, u8, u8);
 void MenuPrintMessageDefaultCoords(const u8 *);
-void MenuSetText(const u8 *);
+void Menu_SetText(const u8 *);
 u8 Menu_UpdateWindowText(void);
 u8 unref_sub_8072098(void);
 void Menu_ClearWindowText(void);
@@ -54,17 +54,15 @@ u8 Menu_MoveCursorNoWrap(s8);
 u8 Menu_GetCursorPos(void);
 s8 Menu_ProcessInput(void);
 s8 Menu_ProcessInputNoWrap(void);
-u8 MoveMenuCursor3(s8);
-u8 MoveMenuCursor4(s8);
 void sub_807274C(u8, u8, u8, u8, const struct MenuAction[], u8, u32);
 s8 Menu_ProcessInputGridLayout(void);
-u8 sub_807288C(u8);
-void PrintMenuItems(u8, u8, u8, const struct MenuAction[]);
-void PrintMenuItemsReordered(u8 left, u8 top, u8 menuItemCount, const struct MenuAction2 menuItems[], const u8 *order);
+u8 Menu_GetColumnXCoord(u8);
+void Menu_PrintItems(u8, u8, u8, const struct MenuAction[]);
+void Menu_PrintItemsReordered(u8 left, u8 top, u8 menuItemCount, const struct MenuAction2 menuItems[], const u8 *order);
 void InitYesNoMenu(u8, u8, u8);
 void DisplayYesNoMenu(u8, u8, u32);
-s8 ProcessMenuInputNoWrap_(void);
-u8 MenuPrint_PixelCoords(const u8 *, u8, u16, u8);
+s8 Menu_ProcessInputNoWrap_(void);
+u8 Menu_PrintTextPixelCoords(const u8 *, u8, u16, u8);
 u8 sub_8072A18(const u8 *, u8, u16, u8, u32);
 u8 unref_sub_8072A5C(u8 *, u8 *, u8, u16, u8, u32);
 int sub_8072AB0(const u8 *, u8, u16, u8, u8, u32);
@@ -75,16 +73,15 @@ u8 *sub_8072C14(u8 *, s32, u8, u8);
 u8 *sub_8072C44(u8 *, s32, u8, u8);
 u8 *sub_8072C74(u8 *, const u8 *, u8, u8);
 u8 sub_8072CA4(const u8 *s);
-u8 sub_8072CBC(void);
+u8 Menu_GetTextWindowPaletteNum(void);
 void Menu_GetTextColors(u8 *, u8 *, u8 *);
-u32 MenuUpdateWindowText_OverrideLineLength(u8);
+u32 Menu_UpdateWindowTextOverrideLineLength(u8);
 struct Window * unref_sub_8072D0C(void);
 u8 InitMenu(u8, u8, u8, u8, u8, u8);
-void RedrawMenuCursor(u8, u8);
 void unref_sub_8072DC0(void);
 void sub_8072DCC(u8);
 void sub_8072DDC(u8);
-void HandleDestroyMenuCursors(void);
+void Menu_DestroyCursor(void);
 
 #if GERMAN
 u8 *de_sub_8073174(u8 *name, const u8 *format);
diff --git a/include/menu_cursor.h b/include/menu_cursor.h
index ca82ef244..8d9a4f23c 100644
--- a/include/menu_cursor.h
+++ b/include/menu_cursor.h
@@ -4,11 +4,11 @@
 #include "sprite.h"
 
 void sub_814A590(void);
-u8 sub_814A5C0(u8 a1, u16 a2, u8 a3, u16 a4, u8 a5);
+u8 MenuCursor_Create814A5C0(u8 a1, u16 a2, u8 a3, u16 a4, u8 a5);
 u8 sub_814A758(u8 a1, u8 a2, u8 a3, u8 a4);
 u8 unref_sub_814A7AC(u8 a1, u16 a2, u8 a3);
 void DestroyMenuCursor(void);
-void sub_814A880(u8 a1, u8 a2);
+void MenuCursor_SetPos814A880(u8 a1, u8 a2);
 void sub_814A904(void);
 void sub_814A958(u8 a1);
 void sub_814AABC(void (*callback)(struct Sprite *));
@@ -16,8 +16,8 @@ void sub_814AAF8(u16 a1);
 void sub_814AB84(void);
 void unref_sub_814ABE4(int a1);
 u8 CreateBlendedOutlineCursor(u8 a1, u16 a2, u8 a3, u16 a4, u8 a5);
-void sub_814AD44(void);
-void sub_814AD7C(u8 a1, u8 a2);
+void MenuCursor_Destroy814AD44(void);
+void MenuCursor_SetPos814AD7C(u8 a1, u8 a2);
 void sub_814ADC8(void);
 void sub_814ADF4(u8 a1);
 
diff --git a/include/text.h b/include/text.h
index c34f222d5..f0d039d45 100644
--- a/include/text.h
+++ b/include/text.h
@@ -151,8 +151,8 @@ extern const struct WindowTemplate gWindowTemplate_81E6D54;
 extern const struct WindowTemplate gWindowTemplate_81E6D70;
 extern const struct WindowTemplate gWindowTemplate_81E6D8C;
 extern const struct WindowTemplate gWindowTemplate_81E6DA8;
-extern const struct WindowTemplate WindowConfig_TrainerCard_Back_Values;
-extern const struct WindowTemplate WindowConfig_TrainerCard_Back_Labels;
+extern const struct WindowTemplate gWindowTemplate_TrainerCard_Back_Values;
+extern const struct WindowTemplate gWindowTemplate_TrainerCard_Back_Labels;
 extern const struct WindowTemplate gWindowTemplate_81E6DFC;
 extern const struct WindowTemplate gWindowTemplate_81E6E18;
 extern const struct WindowTemplate gWindowTemplate_81E6E34;
@@ -206,14 +206,14 @@ extern u8 gStringVar4[];
 extern u8 gTileBuffer[];
 
 void LoadFontDefaultPalette(const struct WindowTemplate *winConfig);
-void SetUpWindowConfig(const struct WindowTemplate *winConfig);
+void Text_LoadWindowTemplate(const struct WindowTemplate *winConfig);
 u16 InitWindowTileData(struct Window *win, u16 startOffset);
 u32 MultistepInitWindowTileData(struct Window *win, u16 startOffset);
 bool32 MultistepLoadFont(void);
 void Text_InitWindowWithTemplate(struct Window *win, const struct WindowTemplate *winConfig);
 void Text_InitWindow(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top);
 void Text_InitWindow8002E4C(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u16 top, u32 a6);
-void sub_8002E90(struct Window *win, const u8 *text);
+void Text_SetWindowText(struct Window *win, const u8 *text);
 void Text_InitWindow8002EB0(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top);
 u8 Text_PrintWindow8002F44(struct Window *win);
 u8 Text_PrintWindowSimple(struct Window *win);
@@ -232,24 +232,24 @@ void Text_ClearWindow(struct Window *win);
 u16 Text_GetWindowTilemapEntry(struct Window *win, u8 x, u8 y);
 void Text_FillWindowBorder(struct Window *win, u16 tilemapEntry, u8 left, u8 top, u8 right, u8 bottom);
 void DrawWindowRect_DefaultPalette(struct Window *win, u16 tileNum, u8 left, u8 top, u8 right, u8 bottom);
-void FillWindowRect(struct Window *win, u16 tilemapEntry, u8 left, u8 top, u8 right, u8 bottom);
-void FillWindowRect_DefaultPalette(struct Window *win, u16 tileNum, u8 left, u8 top, u8 right, u8 bottom);
-void ZeroFillWindowRect(struct Window *win, u8 left, u8 top, u8 right, u8 bottom);
+void Text_FillWindowRect(struct Window *win, u16 tilemapEntry, u8 left, u8 top, u8 right, u8 bottom);
+void Text_FillWindowRectDefPalette(struct Window *win, u16 tileNum, u8 left, u8 top, u8 right, u8 bottom);
+void Text_EraseWindowRect(struct Window *win, u8 left, u8 top, u8 right, u8 bottom);
 void Text_BlankWindowRect(struct Window *win, u8 left, u8 top, u8 right, u8 bottom);
 u8 GetExtCtrlCodeLength(u8 code);
 u8 *AlignInt1(struct Window *win, u8 *dest, s32 value, u8 alignAmount, u8 alignType);
 u8 *AlignInt2(struct Window *win, u8 *dest, s32 value, u8 alignAmount, u8 alignType);
 u8 *AlignString(struct Window *win, u8 *dest, const u8 *src, u8 alignAmount, u8 alignType);
 u8 GetStringWidth(struct Window *win, const u8 *s);
-u8 sub_8004D04(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u16 top, u32 a6);
-u8 sub_8004D38(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top);
-u8 sub_8004DB0(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top, u16 a6);
-u8 sub_8004E24(struct Window *win);
+u8 Text_InitWindow8004D04(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u16 top, u32 a6);
+u8 Text_InitWindow8004D38(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top);
+u8 Text_InitWindow8004DB0(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top, u16 a6);
+u8 Text_GetWindowPaletteNum(struct Window *win);
 void Text_GetTextColors(struct Window *win, u8 *foreground, u8 *background, u8 *shadow);
-void sub_8004E3C(const struct WindowTemplate *winConfig, u8 *tileData, const u8 *text);
+void Text_InitWindow8004E3C(const struct WindowTemplate *winConfig, u8 *tileData, const u8 *text);
 u8 Text_GetStringWidthFromWindowTemplate(const struct WindowTemplate *winConfig, const u8 *s);
 void ConvertInternationalString(u8 *s, u8 language);
-void StripExtCtrlCodes(u8 *str);
+void Text_StripExtCtrlCodes(u8 *str);
 s32 StringCompareWithoutExtCtrlCodes(const u8 *str1, const u8 *str2);
 u8 sub_8004FD0(struct Window *win, u8 *dest, const u8 *src, u16 tileDataStartOffset, u8 left, u16 top, u8 width, u32 a8);