diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-24 05:11:37 -0500 |
---|---|---|
committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-24 05:11:37 -0500 |
commit | ce5bc554e5739044af0c10eb6cc9231308fb28ce (patch) | |
tree | 9bbd647b96b9a44eb897174804bf324861e78874 /src/start_menu.c | |
parent | c63a889bf45d9cd6da0668703fad55941e531fa2 (diff) | |
parent | 39556605cd27a567a45bfc2c46af745ac031ab90 (diff) |
Merge branch 'doc-ttower' of https://github.com/GriffinRichards/pokefirered into doc-ttower
Diffstat (limited to 'src/start_menu.c')
-rw-r--r-- | src/start_menu.c | 4 |
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; |