rename text window functions

1 files changed, 47 insertions, 46 deletions

diff --git a/src/text_window.c b/src/text_window.c
index 6a24fc67d..ab14fe1fb 100644
--- a/src/text_window.c
+++ b/src/text_window.c
@@ -1,23 +1,24 @@
 #include "global.h"
 #include "main.h"
 #include "text.h"
-
-u16 sub_8064EF4(u16);
-void sub_8064F08(struct Window *);
-void sub_8064F38(struct Window *, u8);
-void sub_8064F6C(struct Window *, u8);
-void AddTextPrinterParametrized(struct Window *win, u8 left, u8 top, u8 right, u8 bottom);
-const struct FrameGraphics *sub_8064FD4(u8 frameType);
-static void sub_8064FF8(u8, void *);
-static void sub_8065014(u8, u8);
-static void DrawWindowInternal(u16 *dest, u16 baseTileNum, u8 left, u8 top, u8 right, u8 bottom);
-u16 sub_80651C8(u16);
+#include "text_window.h"
+
+u16 SetTextWindowBaseTileNum(u16);
+void LoadTextWindowGraphics(struct Window *);
+void LoadTextWindowGraphics_OverridePalSlot(struct Window *, u8);
+void LoadTextWindowGraphics_OverrideFrameType(struct Window *, u8);
+void DrawTextWindow(struct Window *win, u8 left, u8 top, u8 right, u8 bottom);
+const struct FrameGraphics *GetTextWindowFrameGraphics(u8 frameType);
+static void LoadTextWindowTiles(u8, void *);
+static void LoadTextWindowPalette(u8, u8);
+static void DrawTextWindowInternal(u16 *dest, u16 baseTileNum, u8 left, u8 top, u8 right, u8 bottom);
+u16 SetMessageBoxBaseTileNum(u16);
 void unref_sub_80651DC(struct Window *, u8 *);
-void copy_textbox_border_tile_patterns_to_vram(struct Window *);
-static u16 draw_win_3(u16 tilemapEntry, u8 x, u8 y, u8 width, u8 height);
-static void draw_win_2(struct Window *win, u8 left, u8 top, u8 width, u8 height);
-void draw_win(struct Window *win);
-void sub_8065348(struct Window *win);
+void DisplayMessageBox(struct Window *);
+static u16 GetMessageBoxTilemapEntry(u16 tilemapEntry, u8 x, u8 y, u8 width, u8 height);
+static void DrawMessageBox(struct Window *win, u8 left, u8 top, u8 width, u8 height);
+void DrawStandardMessageBox(struct Window *win);
+void LoadMessageBoxTiles(struct Window *win);
 void sub_806536C(struct Window *win);
 
 static u16 sTextWindowBaseTileNum;
@@ -34,39 +35,39 @@ extern const struct FrameGraphics gUnknown_083761F0[20];
 extern const u16 gMessageBoxTilemap[5][7];
 extern const u8 gMessageBox_Gfx[];
 
-u16 sub_8064EF4(u16 baseTileNum)
+u16 SetTextWindowBaseTileNum(u16 baseTileNum)
 {
     sTextWindowBaseTileNum = baseTileNum;
     return baseTileNum + 9;
 }
 
-void sub_8064F08(struct Window *win)
+void LoadTextWindowGraphics(struct Window *win)
 {
     u8 *tileData = win->config->tileData + TILE_SIZE_4BPP * sTextWindowBaseTileNum;
-    sub_8064FF8(gSaveBlock2.optionsWindowFrameType, tileData);
-    sub_8065014(gSaveBlock2.optionsWindowFrameType, 0xE);
+    LoadTextWindowTiles(gSaveBlock2.optionsWindowFrameType, tileData);
+    LoadTextWindowPalette(gSaveBlock2.optionsWindowFrameType, 0xE);
 }
 
-void sub_8064F38(struct Window *win, u8 a2)
+void LoadTextWindowGraphics_OverridePalSlot(struct Window *win, u8 palSlot)
 {
     u8 *tileData = win->config->tileData + TILE_SIZE_4BPP * sTextWindowBaseTileNum;
-    sub_8064FF8(gSaveBlock2.optionsWindowFrameType, tileData);
-    sub_8065014(gSaveBlock2.optionsWindowFrameType, a2);
+    LoadTextWindowTiles(gSaveBlock2.optionsWindowFrameType, tileData);
+    LoadTextWindowPalette(gSaveBlock2.optionsWindowFrameType, palSlot);
 }
 
-void sub_8064F6C(struct Window *win, u8 frameType)
+void LoadTextWindowGraphics_OverrideFrameType(struct Window *win, u8 frameType)
 {
     u8 *tileData = win->config->tileData + TILE_SIZE_4BPP * sTextWindowBaseTileNum;
-    sub_8064FF8(frameType, tileData);
-    sub_8065014(frameType, 0xE);
+    LoadTextWindowTiles(frameType, tileData);
+    LoadTextWindowPalette(frameType, 0xE);
 }
 
-void AddTextPrinterParametrized(struct Window *win, u8 left, u8 top, u8 right, u8 bottom)
+void DrawTextWindow(struct Window *win, u8 left, u8 top, u8 right, u8 bottom)
 {
-    DrawWindowInternal(win->config->tilemap, sTextWindowBaseTileNum, left, top, right, bottom);
+    DrawTextWindowInternal(win->config->tilemap, sTextWindowBaseTileNum, left, top, right, bottom);
 }
 
-const struct FrameGraphics *sub_8064FD4(u8 frameType)
+const struct FrameGraphics *GetTextWindowFrameGraphics(u8 frameType)
 {
     if (frameType > 19)
         return &gUnknown_083761F0[0];
@@ -74,19 +75,19 @@ const struct FrameGraphics *sub_8064FD4(u8 frameType)
         return &gUnknown_083761F0[frameType];
 }
 
-static void sub_8064FF8(u8 frameType, void *dest)
+static void LoadTextWindowTiles(u8 frameType, void *dest)
 {
-    const struct FrameGraphics *frameGraphics = sub_8064FD4(frameType);
+    const struct FrameGraphics *frameGraphics = GetTextWindowFrameGraphics(frameType);
     CpuFastCopy(frameGraphics->tiles, dest, 9 * TILE_SIZE_4BPP);
 }
 
-static void sub_8065014(u8 frameType, u8 palSlot)
+static void LoadTextWindowPalette(u8 frameType, u8 palSlot)
 {
-    const struct FrameGraphics *frameGraphics = sub_8064FD4(frameType);
+    const struct FrameGraphics *frameGraphics = GetTextWindowFrameGraphics(frameType);
     LoadPalette(frameGraphics->palette, 16 * palSlot, 0x20);
 }
 
-static void DrawWindowInternal(u16 *dest, u16 baseTileNum, u8 left, u8 top, u8 right, u8 bottom)
+static void DrawTextWindowInternal(u16 *dest, u16 baseTileNum, u8 left, u8 top, u8 right, u8 bottom)
 {
     u8 x, y;
     u8 startX, endX;
@@ -123,10 +124,10 @@ static void DrawWindowInternal(u16 *dest, u16 baseTileNum, u8 left, u8 top, u8 r
     dest[32 * endY + endX] = (baseTileNum + 8) | 0xE000;
 }
 
-u16 sub_80651C8(u16 a1)
+u16 SetMessageBoxBaseTileNum(u16 baseTileNum)
 {
-    sMessageBoxBaseTileNum = a1;
-    return a1 + 14;
+    sMessageBoxBaseTileNum = baseTileNum;
+    return baseTileNum + 14;
 }
 
 void unref_sub_80651DC(struct Window *win, u8 *text)
@@ -134,13 +135,13 @@ void unref_sub_80651DC(struct Window *win, u8 *text)
     sub_8002EB0(win, text, sMessageBoxBaseTileNum + 14, 2, 15);
 }
 
-void copy_textbox_border_tile_patterns_to_vram(struct Window *win)
+void DisplayMessageBox(struct Window *win)
 {
-    sub_8065348(win);
-    draw_win(win);
+    LoadMessageBoxTiles(win);
+    DrawStandardMessageBox(win);
 }
 
-static u16 draw_win_3(u16 baseTilemapEntry, u8 x, u8 y, u8 width, u8 height)
+static u16 GetMessageBoxTilemapEntry(u16 baseTilemapEntry, u8 x, u8 y, u8 width, u8 height)
 {
     u16 tilemapEntry = 9;
 
@@ -162,7 +163,7 @@ static u16 draw_win_3(u16 baseTilemapEntry, u8 x, u8 y, u8 width, u8 height)
     return tilemapEntry;
 }
 
-static void draw_win_2(struct Window *win, u8 left, u8 top, u8 width, u8 height)
+static void DrawMessageBox(struct Window *win, u8 left, u8 top, u8 width, u8 height)
 {
     u8 i, j;
     u16 tilemapEntry = (win->paletteNum << 12) | sMessageBoxBaseTileNum;
@@ -170,15 +171,15 @@ static void draw_win_2(struct Window *win, u8 left, u8 top, u8 width, u8 height)
 
     for (i = 0; i < height + 2; i++)
         for (j = 0; j < width + 6; j++)
-            tilemap[(left + j) + 32 * (top + i)] = (win->paletteNum << 12) | draw_win_3(tilemapEntry, j, i, width, height);
+            tilemap[(left + j) + 32 * (top + i)] = (win->paletteNum << 12) | GetMessageBoxTilemapEntry(tilemapEntry, j, i, width, height);
 }
 
-void draw_win(struct Window *win)
+void DrawStandardMessageBox(struct Window *win)
 {
-    draw_win_2(win, 0, 14, 26, 4);
+    DrawMessageBox(win, 0, 14, 26, 4);
 }
 
-void sub_8065348(struct Window *win)
+void LoadMessageBoxTiles(struct Window *win)
 {
     u8 *tileData = win->config->tileData;
     CpuFastCopy(gMessageBox_Gfx, tileData + 32 * sMessageBoxBaseTileNum, 14 * TILE_SIZE_4BPP);