Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj

2020-02-12 13:05:57 -05:00
parent 9c934c9664 66c6b7a38b
commit 956090b05f
71 changed files with 4332 additions and 2506 deletions
@@ -1304,7 +1304,7 @@ bool8 ScrCmd_cmdDB(struct ScriptContext *ctx)

    if (msg == NULL)
        msg = (const u8 *)ctx->data[0];
-    sub_81973A4();
+    LoadMessageBoxAndBorderGfx();
    DrawDialogueFrame(0, 1);
    AddTextPrinterParameterized(0, 1, msg, 0, 1, 0, 0);
    return FALSE;