diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2019-01-26 15:14:17 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-26 15:14:17 -0600 |
| commit | f4af987c01c95d98a9d2ee943cc11315f80951d1 (patch) | |
| tree | 7f79c6027ee6a7cc6eff4982fece077580c0ee91 /src/start_menu.c | |
| parent | 29b9483f39ad247dd29ea8a2c2c68af1bb64fb43 (diff) | |
| parent | 54ddbaaf0cef7aabf69521feb6dbec222e3df6f0 (diff) | |
Merge pull request #526 from DizzyEggg/frontier_pass
Frontier Pass
Diffstat (limited to 'src/start_menu.c')
| -rw-r--r-- | src/start_menu.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/start_menu.c b/src/start_menu.c index 6b4b0e775..5c7e5365d 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -10,6 +10,7 @@ #include "bg.h" #include "field_effect.h" #include "party_menu.h" +#include "frontier_pass.h" #include "task.h" #include "overworld.h" #include "link.h" @@ -92,8 +93,6 @@ extern void sub_808B864(void); extern void CB2_Pokedex(void); extern void PlayRainSoundEffect(void); extern void CB2_PokeNav(void); -extern void ShowPlayerTrainerCard(void (*)(void)); -extern void sub_80C51C4(void (*)(void)); extern void ScriptUnfreezeEventObjects(void); extern void sub_81A9EC8(void); extern void save_serialize_map(void); @@ -678,7 +677,7 @@ static bool8 StartMenuPlayerNameCallback(void) if (is_c1_link_related_active() || InUnionRoom()) ShowPlayerTrainerCard(CB2_ReturnToFieldWithOpenMenu); // Display trainer card else if (FlagGet(FLAG_SYS_FRONTIER_PASS)) - sub_80C51C4(CB2_ReturnToFieldWithOpenMenu); // Display frontier pass + ShowFrontierPass(CB2_ReturnToFieldWithOpenMenu); // Display frontier pass else ShowPlayerTrainerCard(CB2_ReturnToFieldWithOpenMenu); // Display trainer card |