Merge branch 'master' into doc-link

2020-06-10 17:36:43 -04:00
parent 2859900ea9 a7815857ad
commit a9a427c6f2
22 changed files with 520 additions and 914 deletions
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -1282,7 +1282,7 @@ bool8 ScrCmd_pokenavcall(struct ScriptContext *ctx)

    if (msg == NULL)
        msg = (const u8 *)ctx->data[0];
-    sub_8098238(msg);
+    ShowPokenavFieldMessage(msg);
    return FALSE;
 }