Merge remote-tracking branch 'upstream/master' into use_pokeblock

# Conflicts:
#	src/use_pokeblock.c

1 files changed, 4 insertions, 6 deletions

diff --git a/src/field_message_box.c b/src/field_message_box.c
index 299aafaf2..1c554b6c6 100755
--- a/src/field_message_box.c
+++ b/src/field_message_box.c
@@ -4,9 +4,7 @@
 #include "string_util.h"
 #include "task.h"
 #include "text.h"
-
-extern bool32 IsMatchCallTaskActive(void);
-extern void StartMatchCallFromScript(u8*);
+#include "match_call.h"
 
 static EWRAM_DATA u8 sFieldMessageBoxMode = 0;
 
@@ -33,7 +31,7 @@ static void sub_8098154(u8 taskId)
            task->data[0]++;
            break;
         case 1:
-           NewMenuHelpers_DrawDialogueFrame(0, 1);
+           DrawDialogueFrame(0, 1);
            task->data[0]++;
            break;
         case 2:
@@ -127,7 +125,7 @@ static void textbox_auto_and_task_add(void)
 void HideFieldMessageBox(void)
 {
     task_del_textbox();
-    sub_8197434(0, 1);
+    ClearDialogWindowAndFrame(0, 1);
     sFieldMessageBoxMode = 0;
 }
 
@@ -146,7 +144,7 @@ bool8 IsFieldMessageBoxHidden(void)
 void sub_8098358(void)
 {
     task_del_textbox();
-    NewMenuHelpers_DrawStdWindowFrame(0, 1);
+    DrawStdWindowFrame(0, 1);
     sFieldMessageBoxMode = 0;
 }