Merge branch 'master' into battle

2019-11-14 12:57:49 +08:00
parent 17b55f50db f6dfeba742
commit 1d3ae2fe78
188 changed files with 15683 additions and 8215 deletions
@@ -1425,7 +1425,7 @@ static void sub_81120AC(u8 taskId)
        break;
    default:
        if (gUnknown_203AE94.unk_0_6 == 1)
-            sub_8098110(1);
+            CreateMapNamePopupIfNotAlreadyRunning(1);
        CpuCopy16(gUnknown_203AE90, gPlttBufferUnfaded, 0x400);
        Free(gUnknown_203AE90);
        gUnknown_203AE94 = (struct UnkStruct_203AE94){};