Merge branch 'master' into main-menu-state-machine

2019-03-02 17:35:44 -05:00
parent 3716da5430 043071ae12
commit 9372731c3e
188 changed files with 4322 additions and 3958 deletions
@@ -179,7 +179,7 @@ static void CB2_MysteryEventMenu(void)
            if (gMain.newKeys & A_BUTTON)
            {
                PlaySE(SE_SELECT);
-                sub_800A620();
+                CheckShouldAdvanceLinkState();
                DrawStdFrameWithCustomTileAndPalette(1, 1, 1, 0xD);
                PrintMysteryMenuText(1, gText_LoadingEvent, 1, 2, 0);
                PutWindowTilemap(1);