re-label some window and text code

3 files changed, 114 insertions, 114 deletions

diff --git a/include/menu.h b/include/menu.h
index 9a5ca62a0..3339ff644 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -26,38 +26,38 @@ extern u16 gMenuMessageBoxContentTileOffset;
 
 void CloseMenu(void);
 void AppendToList(u8 *list, u8 *pindex, u32 value);
-void InitMenuWindow(const struct WindowConfig *);
-void MultistepInitMenuWindowBegin(const struct WindowConfig *);
+void InitMenuWindow(const struct WindowTemplate *);
+void MultistepInitMenuWindowBegin(const struct WindowTemplate *);
 bool32 MultistepInitMenuWindowContinue(void);
-void unref_sub_8071DA4(struct WindowConfig *, u16);
-void MenuLoadTextWindowGraphics_OverrideFrameType(u8);
-void MenuLoadTextWindowGraphics(void);
-void BasicInitMenuWindow(const struct WindowConfig *);
-void MenuPrint(const u8 *, u8, u8);
-void MenuZeroFillWindowRect(u8, u8, u8, u8);
-void MenuFillWindowRectWithBlankTile(u8, u8, u8, u8);
-void MenuZeroFillScreen(void);
-void MenuDrawTextWindow(u8, u8, u8, u8);
+void unref_sub_8071DA4(struct WindowTemplate *, u16);
+void Menu_LoadStdFrameGraphicsOverrideStyle(u8);
+void Menu_LoadStdFrameGraphics(void);
+void BasicInitMenuWindow(const struct WindowTemplate *);
+void Menu_PrintText(const u8 *, u8, u8);
+void Menu_EraseWindowRect(u8, u8, u8, u8);
+void Menu_BlankWindowRect(u8, u8, u8, u8);
+void Menu_EraseScreen(void);
+void Menu_DrawStdWindowFrame(u8, u8, u8, u8);
 void sub_8071F40(const u8 *);
 void sub_8071F60(u8, u8, u8);
 u16 unref_sub_8071F98(u8, u8);
 void unref_sub_8071FBC(u16, u8, u8, u8, u8);
-void MenuDisplayMessageBox(void);
+void Menu_DisplayDialogueFrame(void);
 void MenuPrintMessage(const u8 *, u8, u8);
 void MenuPrintMessageDefaultCoords(const u8 *);
 void MenuSetText(const u8 *);
-u8 MenuUpdateWindowText(void);
+u8 Menu_UpdateWindowText(void);
 u8 unref_sub_8072098(void);
-void sub_80720B0(void);
-u8 MoveMenuCursor(s8);
-u8 MoveMenuCursorNoWrap(s8);
-u8 GetMenuCursorPos(void);
-s8 ProcessMenuInput(void);
-s8 ProcessMenuInputNoWrap(void);
+void Menu_ClearWindowText(void);
+u8 Menu_MoveCursor(s8);
+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 sub_80727CC(void);
+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);
@@ -76,7 +76,7 @@ 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);
-void sub_8072CD4(u8 *, u8 *, u8 *);
+void Menu_GetTextColors(u8 *, u8 *, u8 *);
 u32 MenuUpdateWindowText_OverrideLineLength(u8);
 struct Window * unref_sub_8072D0C(void);
 u8 InitMenu(u8, u8, u8, u8, u8, u8);
diff --git a/include/text.h b/include/text.h
index ebc4ebe7e..edda0c2ca 100644
--- a/include/text.h
+++ b/include/text.h
@@ -74,7 +74,7 @@
 #define CHAR_NEWLINE        0xFE
 #define EOS                 0xFF // end of string
 
-struct WindowConfig
+struct WindowTemplate
 {
     u8 bgNum;
     u8 charBaseBlock;
@@ -126,7 +126,7 @@ struct Window
  /*0x20*/ const u8 *text;
  /*0x24*/ u8 *tileData;
  /*0x28*/ u16 *tilemap;
- /*0x2C*/ const struct WindowConfig *config;
+ /*0x2C*/ const struct WindowTemplate *template;
 };
 
 extern vu16 *const gBGControlRegs[];
@@ -137,65 +137,65 @@ extern const u16 gUnknown_081E29D8[];
 extern const u16 gUnknown_081E29E0[];
 extern const u16 gUnknown_081E29E8[];
 
-extern const struct WindowConfig gWindowConfig_81E6C3C;
-extern const struct WindowConfig gWindowConfig_81E6C58;
-extern const struct WindowConfig gWindowConfig_81E6C74;
-extern const struct WindowConfig gWindowConfig_81E6C90;
-extern const struct WindowConfig gWindowConfig_81E6CAC;
-extern const struct WindowConfig gWindowConfig_81E6CC8;
-extern const struct WindowConfig gWindowConfig_81E6CE4;
-extern const struct WindowConfig gWindowConfig_81E6D00;
-extern const struct WindowConfig gWindowConfig_81E6D1C;
-extern const struct WindowConfig gWindowConfig_81E6D38;
-extern const struct WindowConfig gWindowConfig_81E6D54;
-extern const struct WindowConfig gWindowConfig_81E6D70;
-extern const struct WindowConfig gWindowConfig_81E6D8C;
-extern const struct WindowConfig gWindowConfig_81E6DA8;
-extern const struct WindowConfig WindowConfig_TrainerCard_Back_Values;
-extern const struct WindowConfig WindowConfig_TrainerCard_Back_Labels;
-extern const struct WindowConfig gWindowConfig_81E6DFC;
-extern const struct WindowConfig gWindowConfig_81E6E18;
-extern const struct WindowConfig gWindowConfig_81E6E34;
-extern const struct WindowConfig gWindowConfig_81E6E50;
-extern const struct WindowConfig gWindowConfig_81E6E6C;
-extern const struct WindowConfig gWindowConfig_81E6E88;
-extern const struct WindowConfig gWindowConfig_81E6EA4;
-extern const struct WindowConfig gWindowConfig_81E6EC0;
-extern const struct WindowConfig gWindowConfig_81E6EDC;
-extern const struct WindowConfig gWindowConfig_81E6EF8;
-extern const struct WindowConfig gWindowConfig_81E6F14;
-extern const struct WindowConfig gWindowConfig_81E6F30;
-extern const struct WindowConfig gWindowConfig_81E6F4C;
-extern const struct WindowConfig gWindowConfig_81E6F68;
-extern const struct WindowConfig gWindowConfig_81E6F84;
-extern const struct WindowConfig gWindowConfig_81E6FA0;
-extern const struct WindowConfig gWindowConfig_81E6FBC;
-extern const struct WindowConfig gWindowConfig_81E6FD8;
-extern const struct WindowConfig gWindowConfig_81E6FF4;
-extern const struct WindowConfig gWindowConfig_81E7010;
-extern const struct WindowConfig gWindowConfig_81E702C;
-extern const struct WindowConfig gWindowConfig_81E7048;
-extern const struct WindowConfig gWindowConfig_81E7064;
-extern const struct WindowConfig gWindowConfig_81E7080;
-extern const struct WindowConfig gWindowConfig_81E709C;
-extern const struct WindowConfig gWindowConfig_81E70B8;
-extern const struct WindowConfig gWindowConfig_81E70D4;
-extern const struct WindowConfig gWindowConfig_81E70F0;
-extern const struct WindowConfig gWindowConfig_81E710C;
-extern const struct WindowConfig gWindowConfig_81E7128;
-extern const struct WindowConfig gWindowConfig_81E7144;
-extern const struct WindowConfig gWindowConfig_81E7160;
-extern const struct WindowConfig gWindowConfig_81E717C;
-extern const struct WindowConfig gWindowConfig_81E7198;
-extern const struct WindowConfig gWindowConfig_81E71B4;
-extern const struct WindowConfig gWindowConfig_81E71D0;
-extern const struct WindowConfig gWindowConfig_81E71EC;
-extern const struct WindowConfig gWindowConfig_81E7208;
-extern const struct WindowConfig gWindowConfig_81E7224;
-extern const struct WindowConfig gWindowConfig_81E7240;
-extern const struct WindowConfig gWindowConfig_81E725C;
-extern const struct WindowConfig gWindowConfig_81E7278;
-extern const struct WindowConfig gWindowConfig_81E7294;
+extern const struct WindowTemplate gWindowConfig_81E6C3C;
+extern const struct WindowTemplate gWindowConfig_81E6C58;
+extern const struct WindowTemplate gWindowConfig_81E6C74;
+extern const struct WindowTemplate gWindowConfig_81E6C90;
+extern const struct WindowTemplate gWindowConfig_81E6CAC;
+extern const struct WindowTemplate gWindowConfig_81E6CC8;
+extern const struct WindowTemplate gWindowConfig_81E6CE4;
+extern const struct WindowTemplate gWindowConfig_81E6D00;
+extern const struct WindowTemplate gWindowConfig_81E6D1C;
+extern const struct WindowTemplate gWindowConfig_81E6D38;
+extern const struct WindowTemplate gWindowConfig_81E6D54;
+extern const struct WindowTemplate gWindowConfig_81E6D70;
+extern const struct WindowTemplate gWindowConfig_81E6D8C;
+extern const struct WindowTemplate gWindowConfig_81E6DA8;
+extern const struct WindowTemplate WindowConfig_TrainerCard_Back_Values;
+extern const struct WindowTemplate WindowConfig_TrainerCard_Back_Labels;
+extern const struct WindowTemplate gWindowConfig_81E6DFC;
+extern const struct WindowTemplate gWindowConfig_81E6E18;
+extern const struct WindowTemplate gWindowConfig_81E6E34;
+extern const struct WindowTemplate gWindowConfig_81E6E50;
+extern const struct WindowTemplate gWindowConfig_81E6E6C;
+extern const struct WindowTemplate gWindowConfig_81E6E88;
+extern const struct WindowTemplate gWindowConfig_81E6EA4;
+extern const struct WindowTemplate gWindowConfig_81E6EC0;
+extern const struct WindowTemplate gWindowConfig_81E6EDC;
+extern const struct WindowTemplate gWindowConfig_81E6EF8;
+extern const struct WindowTemplate gWindowConfig_81E6F14;
+extern const struct WindowTemplate gWindowConfig_81E6F30;
+extern const struct WindowTemplate gWindowConfig_81E6F4C;
+extern const struct WindowTemplate gWindowConfig_81E6F68;
+extern const struct WindowTemplate gWindowConfig_81E6F84;
+extern const struct WindowTemplate gWindowConfig_81E6FA0;
+extern const struct WindowTemplate gWindowConfig_81E6FBC;
+extern const struct WindowTemplate gWindowConfig_81E6FD8;
+extern const struct WindowTemplate gWindowConfig_81E6FF4;
+extern const struct WindowTemplate gWindowConfig_81E7010;
+extern const struct WindowTemplate gWindowConfig_81E702C;
+extern const struct WindowTemplate gWindowConfig_81E7048;
+extern const struct WindowTemplate gWindowConfig_81E7064;
+extern const struct WindowTemplate gWindowConfig_81E7080;
+extern const struct WindowTemplate gWindowConfig_81E709C;
+extern const struct WindowTemplate gWindowConfig_81E70B8;
+extern const struct WindowTemplate gWindowConfig_81E70D4;
+extern const struct WindowTemplate gWindowConfig_81E70F0;
+extern const struct WindowTemplate gWindowConfig_81E710C;
+extern const struct WindowTemplate gWindowConfig_81E7128;
+extern const struct WindowTemplate gWindowConfig_81E7144;
+extern const struct WindowTemplate gWindowConfig_81E7160;
+extern const struct WindowTemplate gWindowConfig_81E717C;
+extern const struct WindowTemplate gWindowConfig_81E7198;
+extern const struct WindowTemplate gWindowConfig_81E71B4;
+extern const struct WindowTemplate gWindowConfig_81E71D0;
+extern const struct WindowTemplate gWindowConfig_81E71EC;
+extern const struct WindowTemplate gWindowConfig_81E7208;
+extern const struct WindowTemplate gWindowConfig_81E7224;
+extern const struct WindowTemplate gWindowConfig_81E7240;
+extern const struct WindowTemplate gWindowConfig_81E725C;
+extern const struct WindowTemplate gWindowConfig_81E7278;
+extern const struct WindowTemplate gWindowConfig_81E7294;
 
 extern u16 gBGTilemapBuffers[4][0x400];
 
@@ -205,37 +205,37 @@ extern u8 gStringVar3[];
 extern u8 gStringVar4[];
 extern u8 gTileBuffer[];
 
-void LoadFontDefaultPalette(const struct WindowConfig *winConfig);
-void SetUpWindowConfig(const struct WindowConfig *winConfig);
+void LoadFontDefaultPalette(const struct WindowTemplate *winConfig);
+void SetUpWindowConfig(const struct WindowTemplate *winConfig);
 u16 InitWindowTileData(struct Window *win, u16 startOffset);
 u32 MultistepInitWindowTileData(struct Window *win, u16 startOffset);
 bool32 MultistepLoadFont(void);
-void InitWindowFromConfig(struct Window *win, const struct WindowConfig *winConfig);
-void InitWindow(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top);
-void sub_8002E4C(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u16 top, u32 a6);
+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 sub_8002EB0(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top);
-u8 sub_8002F44(struct Window *win);
-u8 sub_8003418(struct Window *win);
-u8 sub_8003460(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top);
+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);
+u8 Text_InitWindowAndPrintText(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 left, u8 top);
 u8 sub_8003490(struct Window *win, u8 c, u16 tileDataStartOffset, u8 left, u8 top);
 void sub_80034D4(u8 *tileData, const u8 *text);
 u8 sub_80034EC(u8 *str);
 u8 *sub_8003504(u8 *dest, s32 value, u8 alignAmount, u8 alignType);
 u8 *sub_8003558(u8 *dest, const u8 *src, u8 alignAmount, u8 alignType);
-u8 sub_80035AC(struct Window *win);
-u8 sub_800374C(struct Window *win);
-u8 sub_8003778(struct Window *win);
-u8 sub_80037A0(struct Window *win);
-u32 sub_80037C8(struct Window *win, u8 lineLength);
-void ClearWindowTextLines(struct Window *win);
-u16 GetWindowTilemapEntry(struct Window *win, u8 x, u8 y);
-void DrawWindowRect(struct Window *win, u16 tilemapEntry, u8 left, u8 top, u8 right, u8 bottom);
+u8 Text_UpdateWindow(struct Window *win);
+u8 Text_UpdateWindowInBattle(struct Window *win);
+u8 Text_UpdateWindowAutoscroll(struct Window *win);
+u8 Text_UpdateWindowInContest(struct Window *win);
+u32 Text_UpdateWindowOverrideLineLength(struct Window *win, u8 lineLength);
+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 FillWindowRectWithBlankTile(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);
@@ -245,9 +245,9 @@ u8 sub_8004D04(struct Window *win, const u8 *text, u16 tileDataStartOffset, u8 l
 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);
-void sub_8004E28(struct Window *win, u8 *foreground, u8 *background, u8 *shadow);
-void sub_8004E3C(const struct WindowConfig *winConfig, u8 *tileData, const u8 *text);
-u8 GetStringWidthGivenWindowConfig(const struct WindowConfig *winConfig, const u8 *s);
+void Text_GetTextColors(struct Window *win, u8 *foreground, u8 *background, u8 *shadow);
+void sub_8004E3C(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);
 s32 StringCompareWithoutExtCtrlCodes(const u8 *str1, const u8 *str2);
diff --git a/include/text_window.h b/include/text_window.h
index 7df1453ca..21e05ece0 100644
--- a/include/text_window.h
+++ b/include/text_window.h
@@ -9,17 +9,17 @@ struct FrameGraphics
     const u16 *palette;
 };
 
-u16 SetTextWindowBaseTileNum(u16 baseTileNum);
-void LoadTextWindowGraphics(struct Window *win);
-void LoadTextWindowGraphics_OverridePalSlot(struct Window *win, u8 palSlot);
-void LoadTextWindowGraphics_OverrideFrameType(struct Window *win, u8 frameType);
-void DrawTextWindow(struct Window *win, u8 left, u8 top, u8 right, u8 bottom);
-const struct FrameGraphics *GetTextWindowFrameGraphics(u8 frameType);
-u16 SetMessageBoxBaseTileNum(u16 baseTileNum);
+u16 TextWindow_SetBaseTileNum(u16 baseTileNum);
+void TextWindow_LoadStdFrameGraphics(struct Window *win);
+void TextWindow_LoadStdFrameGraphicsOverridePal(struct Window *win, u8 palSlot);
+void TextWindow_LoadStdFrameGraphicsOverrideStyle(struct Window *win, u8 frameType);
+void TextWindow_DrawStdFrame(struct Window *win, u8 left, u8 top, u8 right, u8 bottom);
+const struct FrameGraphics *TextWindow_GetFrameGraphics(u8 frameType);
+u16 TextWindow_SetDlgFrameBaseTileNum(u16 baseTileNum);
 void unref_sub_80651DC(struct Window *, u8 *);
-void DisplayMessageBox(struct Window *);
-void DrawStandardMessageBox(struct Window *win);
-void LoadMessageBoxTiles(struct Window *win);
-void ClearStandardMessageBox(struct Window *win);
+void TextWindow_DisplayDialogueFrame(struct Window *);
+void TextWindow_DrawDialogueFrame(struct Window *win);
+void TextWindow_LoadDialogueFrameTiles(struct Window *win);
+void TextWindow_EraseDialogueFrame(struct Window *win);
 
 #endif // GUARD_TEXT_WINDOW_H