diff options
author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-01-23 10:20:32 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-23 10:20:32 -0500 |
commit | 91099dbd0c451188742bf045a26a036e0e8d9f89 (patch) | |
tree | 01c4c152ba0b751f66d790e395f72fd803e938e5 /src/start_menu.c | |
parent | e97d3532d4d72a1fe9aec755cd2a3c6527484e27 (diff) | |
parent | 7824a413dea43f2c0c99c2b86af17c33378139fa (diff) |
Merge pull request #236 from PikalaxALT/union_room
Union room
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; |