diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-12-22 14:51:12 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-12-22 14:51:12 -0600 |
| commit | 9c9bcee1e2fbd3fd374023146f99d0417cd8ab52 (patch) | |
| tree | 848c1688fe743dd0410183b182024ee961f07980 /src/field/start_menu.c | |
| parent | ce74d72c31a3ebda26adc6ae888700213f64b113 (diff) | |
| parent | 62bdd4d480ced306b85791c828ee8497e9fa2acc (diff) | |
fix merge conflicts
Diffstat (limited to 'src/field/start_menu.c')
| -rw-r--r-- | src/field/start_menu.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/field/start_menu.c b/src/field/start_menu.c index 7913e5527..dccf1714e 100644 --- a/src/field/start_menu.c +++ b/src/field/start_menu.c @@ -50,7 +50,7 @@ static bool8 savingComplete; extern bool8 gDifferentSaveFile; extern u16 gSaveFileStatus; -extern u16 gScriptResult; +extern u16 gSpecialVar_Result; extern u8 gUnknown_03004860; @@ -154,12 +154,12 @@ static void AddStartMenuAction(u8 action) static void BuildStartMenuActions_Normal(void) { - if (FlagGet(SYS_POKEDEX_GET) == TRUE) + if (FlagGet(FLAG_SYS_POKEDEX_GET) == TRUE) AddStartMenuAction(MENU_ACTION_POKEDEX); - if (FlagGet(SYS_POKEMON_GET) == TRUE) + if (FlagGet(FLAG_SYS_POKEMON_GET) == TRUE) AddStartMenuAction(MENU_ACTION_POKEMON); AddStartMenuAction(MENU_ACTION_BAG); - if (FlagGet(SYS_POKENAV_GET) == TRUE) + if (FlagGet(FLAG_SYS_POKENAV_GET) == TRUE) AddStartMenuAction(MENU_ACTION_POKENAV); AddStartMenuAction(MENU_ACTION_PLAYER); AddStartMenuAction(MENU_ACTION_SAVE); @@ -182,7 +182,7 @@ static void BuildStartMenuActions_Link(void) { AddStartMenuAction(MENU_ACTION_POKEMON); AddStartMenuAction(MENU_ACTION_BAG); - if (FlagGet(SYS_POKENAV_GET) == TRUE) + if (FlagGet(FLAG_SYS_POKENAV_GET) == TRUE) AddStartMenuAction(MENU_ACTION_POKENAV); AddStartMenuAction(MENU_ACTION_PLAYER_LINK); AddStartMenuAction(MENU_ACTION_OPTION); @@ -528,10 +528,10 @@ static void Task_SaveDialog(u8 taskId) { case SAVE_CANCELED: case SAVE_ERROR: - gScriptResult = 0; + gSpecialVar_Result = 0; break; case SAVE_SUCCESS: - gScriptResult = status; + gSpecialVar_Result = status; break; case SAVE_IN_PROGRESS: return; |