diff options
author | Evan <eroelke@gmail.com> | 2019-11-26 13:55:24 -0700 |
---|---|---|
committer | Evan <eroelke@gmail.com> | 2019-11-26 13:55:24 -0700 |
commit | 31d8bfb04850a9a1c1639b40b7ff305a673b9c09 (patch) | |
tree | bba0c7d4e6230c2eecbb167b458bad89b8f01e04 /src/start_menu.c | |
parent | d1142b4290e8688a0d42bfc1b95b9d90b1721459 (diff) | |
parent | 19ecb1631b5fce1147077026a8eff890c6ec315a (diff) |
fix merge conflicts
Diffstat (limited to 'src/start_menu.c')
-rw-r--r-- | src/start_menu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/start_menu.c b/src/start_menu.c index 4a4fe52e3..2a1713902 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -504,7 +504,7 @@ static bool8 StartMenuPlayerCallback(void) PlayRainStoppingSoundEffect(); DestroySafariZoneStatsWindow(); CleanupOverworldWindowsAndTilemaps(); - InitTrainerCard(CB2_ReturnToStartMenu); + InitTrainerCard(CB2_ReturnToFieldWithOpenMenu); return TRUE; } return FALSE; @@ -524,7 +524,7 @@ static bool8 StartMenuOptionCallback(void) DestroySafariZoneStatsWindow(); CleanupOverworldWindowsAndTilemaps(); SetMainCallback2(CB2_OptionsMenuFromStartMenu); - gMain.savedCallback = CB2_ReturnToStartMenu; + gMain.savedCallback = CB2_ReturnToFieldWithOpenMenu; return TRUE; } return FALSE; @@ -554,7 +554,7 @@ static bool8 StartMenuLinkPlayerCallback(void) { PlayRainStoppingSoundEffect(); CleanupOverworldWindowsAndTilemaps(); - InitLinkPartnerTrainerCard(gUnknown_300502C, CB2_ReturnToStartMenu); + InitLinkPartnerTrainerCard(gUnknown_300502C, CB2_ReturnToFieldWithOpenMenu); return TRUE; } return FALSE; |