Merge branch 'master' into constants-fade

2019-12-17 19:11:51 -05:00
parent 96ec5e1b84 edb5df1716
commit 4879c1eab2
45 changed files with 2801 additions and 2658 deletions
@@ -337,7 +337,7 @@ static void CB2_InitPokenavForTutorial(void)
    else
    {
        InitPokenavResources(gPokenavResources);
-        gPokenavResources->mode = POKENAV_MODE_FORCE_CALL_1;
+        gPokenavResources->mode = POKENAV_MODE_FORCE_CALL_READY;
        ResetTasks();
        ResetSpriteData();
        FreeAllSpritePalettes();