summaryrefslogtreecommitdiff
path: root/src/start_menu.c
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-01-23 10:24:11 -0500
committerGitHub <noreply@github.com>2020-01-23 10:24:11 -0500
commita01d83a4341cd0cdad01fe2d0b96920301257f2a (patch)
treeac4f4ce6086d4664ea49d515759a8044ecd1d973 /src/start_menu.c
parente7cd8c59f4ca0f6c56a3b3782c21e896c203694e (diff)
parent91099dbd0c451188742bf045a26a036e0e8d9f89 (diff)
Merge branch 'master' into sync-ai
Diffstat (limited to 'src/start_menu.c')
-rw-r--r--src/start_menu.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/start_menu.c b/src/start_menu.c
index 59bfb8643..b159f0375 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -446,7 +446,7 @@ static void StartMenu_FadeScreenIfLeavingOverworld(void)
&& sStartMenuCallback != StartMenuSafariZoneRetireCallback)
{
StopPokemonLeagueLightingEffectTask();
- fade_screen(1, 0);
+ FadeScreen(1, 0);
}
}
@@ -554,7 +554,7 @@ static bool8 StartMenuLinkPlayerCallback(void)
{
PlayRainStoppingSoundEffect();
CleanupOverworldWindowsAndTilemaps();
- ShowTrainerCardInLink(gUnknown_300502C, CB2_ReturnToFieldWithOpenMenu);
+ ShowTrainerCardInLink(gLocalLinkPlayerId, CB2_ReturnToFieldWithOpenMenu);
return TRUE;
}
return FALSE;