Merge branch 'master' into extern-cleanup

2019-03-08 02:45:26 -05:00
parent 80a4ee1145 bd157b301d
commit 5886f82ef5
229 changed files with 3431 additions and 3446 deletions
--- a/src/field_message_box.c
+++ b/src/field_message_box.c
@@ -31,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:
@@ -125,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;
 }

@@ -144,7 +144,7 @@ bool8 IsFieldMessageBoxHidden(void)
 void sub_8098358(void)
 {
    task_del_textbox();
-    NewMenuHelpers_DrawStdWindowFrame(0, 1);
+    DrawStdWindowFrame(0, 1);
    sFieldMessageBoxMode = 0;
 }