diff options
Diffstat (limited to 'src/start_menu.c')
| -rw-r--r-- | src/start_menu.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/start_menu.c b/src/start_menu.c index 3c5971dd4..c8e77af66 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -8,6 +8,7 @@ #include "sprite.h" #include "string_util.h" #include "task.h" +#include "flag.h" //External functions extern void sub_8064E2C(void); @@ -25,7 +26,7 @@ extern void save_serialize_map(void); extern void PlayRainSoundEffect(void); extern void sub_8093130(u8, void (*)(void)); extern void sub_805469C(void); -extern void sub_80C823C(void); +extern void SafariZoneRetirePrompt(void); extern void CB2_InitOptionMenu(void); extern void sub_8093110(void (*)(void)); extern void sub_80EBA5C(void); @@ -40,7 +41,6 @@ extern void sub_80597F4(void); extern void player_bitmagic(void); extern bool32 GetSafariZoneFlag(void); extern u8 *sub_8072C44(u8 *, s32, u8, u8); -extern u8 FlagGet(u16); extern bool32 is_c1_link_related_active(void); //Menu actions @@ -72,7 +72,7 @@ extern u16 gScriptResult; extern u8 (*gCallback_03004AE8)(void); extern u8 gUnknown_03004860; extern struct MenuItem gStartMenuItems[]; -extern u8 gUnknown_02038808; +extern u8 gNumSafariBalls; EWRAM_DATA static u8 sStartMenuCursorPos = 0; EWRAM_DATA static u8 sNumStartMenuActions = 0; @@ -170,12 +170,12 @@ static void AddStartMenuAction(u8 action) static void BuildStartMenuActions_Normal(void) { - if(FlagGet(0x801) == TRUE) + if(FlagGet(SYS_POKEDEX_GET) == TRUE) AddStartMenuAction(MENU_ACTION_POKEDEX); - if(FlagGet(0x800) == TRUE) + if(FlagGet(SYS_POKEMON_GET) == TRUE) AddStartMenuAction(MENU_ACTION_POKEMON); AddStartMenuAction(MENU_ACTION_BAG); - if(FlagGet(0x802) == TRUE) + if(FlagGet(SYS_POKENAV_GET) == TRUE) AddStartMenuAction(MENU_ACTION_POKENAV); AddStartMenuAction(MENU_ACTION_PLAYER); AddStartMenuAction(MENU_ACTION_SAVE); @@ -198,7 +198,7 @@ static void BuildStartMenuActions_Link(void) { AddStartMenuAction(MENU_ACTION_POKEMON); AddStartMenuAction(MENU_ACTION_BAG); - if(FlagGet(0x802) == TRUE) + if(FlagGet(SYS_POKENAV_GET) == TRUE) AddStartMenuAction(MENU_ACTION_POKENAV); AddStartMenuAction(MENU_ACTION_PLAYER_LINK); AddStartMenuAction(MENU_ACTION_OPTION); @@ -208,7 +208,7 @@ static void BuildStartMenuActions_Link(void) //Show number of safari balls left static void DisplaySafariBallsWindow(void) { - sub_8072C44(gStringVar1, gUnknown_02038808, 12, 1); + sub_8072C44(gStringVar1, gNumSafariBalls, 12, 1); MenuDrawTextWindow(0, 0, 10, 5); MenuPrint(gOtherText_SafariStock, 1, 1); } @@ -456,7 +456,7 @@ u8 StartMenu_ExitCallback(void) u8 StartMenu_RetireCallback(void) { sub_8071C20(); - sub_80C823C(); + SafariZoneRetirePrompt(); return 1; } @@ -473,7 +473,8 @@ u8 StartMenu_PlayerLinkCallback(void) } //Save dialog status -enum { +enum +{ SAVE_IN_PROGRESS, SAVE_SUCCESS, SAVE_CANCELED, |