summaryrefslogtreecommitdiff
path: root/src/pokenav.c
diff options
context:
space:
mode:
authorGriffinR <griffin.richards@comcast.net>2019-12-17 21:17:46 -0500
committerGriffinR <griffin.richards@comcast.net>2019-12-17 21:17:46 -0500
commit23f952b34ecc3d527b2bfee86ee1f35e1abe8246 (patch)
tree9e276d9e08c46e9fe4f92af636d53f1dda33190a /src/pokenav.c
parentddfa0c6298f4c4dcde9b40782bbdf41867bff761 (diff)
parentf8cef9a6a86fb85634e21370e5a7a0d2ac4a9ba2 (diff)
Merge master into doc-tower
Diffstat (limited to 'src/pokenav.c')
-rw-r--r--src/pokenav.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pokenav.c b/src/pokenav.c
index 9f12380df..a7b7c95a3 100644
--- a/src/pokenav.c
+++ b/src/pokenav.c
@@ -320,7 +320,7 @@ void CB2_InitPokeNav(void)
void OpenPokenavForTutorial(void)
{
SetMainCallback2(CB2_InitPokenavForTutorial);
- FadeScreen(1, 0);
+ FadeScreen(FADE_TO_BLACK, 0);
}
static void CB2_InitPokenavForTutorial(void)
@@ -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();