2 files changed, 35 insertions, 35 deletions

diff --git a/src/field_message_box.c b/src/field_message_box.c
index 9873f3cd1..b516866f4 100644
--- a/src/field_message_box.c
+++ b/src/field_message_box.c
@@ -12,17 +12,20 @@ extern u16 gMenuTextTileOffset;
 
 static u8 sMessageBoxMode;
 
-void textbox_fdecode_auto_and_task_add(u8 *);
-void textbox_auto_and_task_add(void);
+static void Task_FieldMessageBox(u8 taskId);
+static void CreateFieldMessageBoxTask(void);
+static void DestroyFieldMessageBoxTask(void);
+static void PrintFieldMessage(u8 *message);
+static void PrintFieldMessageFromStringVar4(void);
 
-void sub_8064A74(void)
+void InitFieldMessageBox(void)
 {
     sMessageBoxMode = FIELD_MESSAGE_BOX_HIDDEN;
     SetMessageBoxBaseTileNum(gFieldMessageBoxBaseTileNum);
     InitWindowFromConfig(&gFieldMessageBoxWindow, (struct WindowConfig *)&gWindowConfig_81E6CE4);
 }
 
-void sub_8064AA0(u8 taskId)
+static void Task_FieldMessageBox(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
     switch (task->data[0])
@@ -52,19 +55,19 @@ void sub_8064AA0(u8 taskId)
     }
 }
 
-void task_add_textbox(void)
+static void CreateFieldMessageBoxTask(void)
 {
-    CreateTask(sub_8064AA0, 80);
+    CreateTask(Task_FieldMessageBox, 80);
 }
 
-void task_del_textbox()
+static void DestroyFieldMessageBoxTask(void)
 {
-    u8 taskId = FindTaskIdByFunc(sub_8064AA0);
+    u8 taskId = FindTaskIdByFunc(Task_FieldMessageBox);
     if (taskId != 0xFF)
         DestroyTask(taskId);
 }
 
-bool8 box_related_two__2(u8 *message)
+bool8 ShowFieldMessage(u8 *message)
 {
     if (sMessageBoxMode != FIELD_MESSAGE_BOX_HIDDEN)
     {
@@ -72,13 +75,13 @@ bool8 box_related_two__2(u8 *message)
     }
     else
     {
-        textbox_fdecode_auto_and_task_add(message);
+        PrintFieldMessage(message);
         sMessageBoxMode = FIELD_MESSAGE_BOX_NORMAL;
         return TRUE;
     }
 }
 
-bool8 box_related_two__3(u8 *message)
+bool8 ShowFieldAutoScrollMessage(u8 *message)
 {
     if (sMessageBoxMode != FIELD_MESSAGE_BOX_HIDDEN)
     {
@@ -87,7 +90,7 @@ bool8 box_related_two__3(u8 *message)
     else
     {
         sMessageBoxMode = FIELD_MESSAGE_BOX_AUTO_SCROLL;
-        textbox_fdecode_auto_and_task_add(message);
+        PrintFieldMessage(message);
         return TRUE;
     }
 }
@@ -95,7 +98,7 @@ bool8 box_related_two__3(u8 *message)
 bool8 unref_sub_8064BB8(u8 *message)
 {
     sMessageBoxMode = FIELD_MESSAGE_BOX_AUTO_SCROLL;
-    textbox_fdecode_auto_and_task_add(message);
+    PrintFieldMessage(message);
     return TRUE;
 }
 
@@ -108,37 +111,37 @@ bool8 unref_sub_8064BD0(u8 *message)
     else
     {
         sMessageBoxMode = FIELD_MESSAGE_BOX_NORMAL;
-        textbox_auto_and_task_add();
+        PrintFieldMessageFromStringVar4();
         return TRUE;
     }
 }
 
-void textbox_fdecode_auto_and_task_add(u8 *message)
+static void PrintFieldMessage(u8 *message)
 {
     StringExpandPlaceholders(gStringVar4, message);
     sub_8002EB0(&gFieldMessageBoxWindow, gStringVar4, gMenuTextTileOffset, 2, 15);
-    task_add_textbox();
+    CreateFieldMessageBoxTask();
 }
 
-void textbox_auto_and_task_add(void)
+static void PrintFieldMessageFromStringVar4(void)
 {
     sub_8002EB0(&gFieldMessageBoxWindow, gStringVar4, gMenuTextTileOffset, 2, 15);
-    task_add_textbox();
+    CreateFieldMessageBoxTask();
 }
 
-void textbox_close()
+void HideFieldMessageBox(void)
 {
-    task_del_textbox();
+    DestroyFieldMessageBoxTask();
     sub_806536C(&gFieldMessageBoxWindow);
     sMessageBoxMode = FIELD_MESSAGE_BOX_HIDDEN;
 }
 
-u8 textbox_any_visible()
+u8 GetFieldMessageBoxMode(void)
 {
     return sMessageBoxMode;
 }
 
-bool8 sub_8064C84()
+bool8 IsFieldMessageBoxHidden(void)
 {
     if (sMessageBoxMode == FIELD_MESSAGE_BOX_HIDDEN)
         return TRUE;
@@ -146,9 +149,9 @@ bool8 sub_8064C84()
         return FALSE;
 }
 
-void unref_sub_8064CA0()
+void unref_sub_8064CA0(void)
 {
-    task_del_textbox();
+    DestroyFieldMessageBoxTask();
     DrawStandardMessageBox(&gFieldMessageBoxWindow);
     sMessageBoxMode = FIELD_MESSAGE_BOX_HIDDEN;
 }
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 29c227146..f9b64926c 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -7,6 +7,7 @@
 #include "fieldmap.h"
 #include "main.h"
 #include "decoration.h"
+#include "field_message_box.h"
 
 extern void ClearRamScript(void);
 extern u16 *GetVarPointer(u16);
@@ -80,14 +81,10 @@ extern void sub_8064D20(void);
 extern bool8 sub_8064CFC(void);
 extern void sub_8064DD8(void);
 extern bool8 sub_8064DB4(void);
-extern void textbox_close(void);
 extern u8 GetFieldObjectIdByLocalIdAndMap(u8, u8, u8);
 extern u8 FieldObjectClearAnimIfSpecialAnimFinished(void *);
 extern void sub_80A2178(void);
 extern void sub_806451C(void);
-extern bool8 box_related_two__2(u8 *);
-extern bool8 box_related_two__3(u8 *);
-extern bool8 sub_8064C84(void);
 extern bool8 yes_no_box(u8, u8);
 extern bool8 sub_80B5054(u8, u8, u8, u8);
 extern bool8 sub_80B50B0(u8, u8, u8, u8, u8);
@@ -1227,7 +1224,7 @@ bool8 ScrCmd_releaseall(struct ScriptContext *ctx)
 {
     u8 objectId;
 
-    textbox_close();
+    HideFieldMessageBox();
     objectId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0);
     FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[objectId]);
     sub_80A2178();
@@ -1239,7 +1236,7 @@ bool8 ScrCmd_release(struct ScriptContext *ctx)
 {
     u8 objectId;
 
-    textbox_close();
+    HideFieldMessageBox();
     if (gMapObjects[gSelectedMapObject].active)
         FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[gSelectedMapObject]);
     objectId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0);
@@ -1254,7 +1251,7 @@ bool8 ScrCmd_message(struct ScriptContext *ctx)
     u8 *msg = (u8 *)ScriptReadWord(ctx);
     if (!msg)
         msg = (u8 *)ctx->data[0];
-    box_related_two__2(msg);
+    ShowFieldMessage(msg);
     return FALSE;
 }
 
@@ -1263,19 +1260,19 @@ bool8 ScrCmd_message2(struct ScriptContext *ctx)
     u8 *msg = (u8 *)ScriptReadWord(ctx);
     if (!msg)
         msg = (u8 *)ctx->data[0];
-    box_related_two__3(msg);
+    ShowFieldAutoScrollMessage(msg);
     return FALSE;
 }
 
 bool8 ScrCmd_waittext(struct ScriptContext *ctx)
 {
-    SetupNativeScript(ctx, sub_8064C84);
+    SetupNativeScript(ctx, IsFieldMessageBoxHidden);
     return TRUE;
 }
 
 bool8 ScrCmd_closebutton(struct ScriptContext *ctx)
 {
-    textbox_close();
+    HideFieldMessageBox();
     return FALSE;
 }
 
@@ -1446,7 +1443,7 @@ bool8 ScrCmd_braillemsg(struct ScriptContext *ctx)
 bool8 ScrCmd_vtext(struct ScriptContext *ctx)
 {
     u32 v1 = ScriptReadWord(ctx);
-    box_related_two__2((u8 *)(v1 - gUnknown_0202E8B0));
+    ShowFieldMessage((u8 *)(v1 - gUnknown_0202E8B0));
     return FALSE;
 }