From 408d5cdd28b5af72d58fbc09501a74d238945e66 Mon Sep 17 00:00:00 2001 From: sonninnos <45124675+sonninnos@users.noreply.github.com> Date: Thu, 17 Aug 2023 04:08:08 +0300 Subject: [PATCH] Reorganize 'Saving' menu (#15607) --- config.def.h | 4 +- intl/msg_hash_us.h | 2 +- menu/menu_displaylist.c | 26 ++--- menu/menu_setting.c | 235 ++++++++++++++++++++++------------------ 4 files changed, 144 insertions(+), 123 deletions(-) diff --git a/config.def.h b/config.def.h index b4df733283..bfddfb4055 100644 --- a/config.def.h +++ b/config.def.h @@ -833,8 +833,8 @@ #define DEFAULT_GLOBAL_CORE_OPTIONS false #define DEFAULT_AUTO_SHADERS_ENABLE true -#define DEFAULT_SORT_SAVEFILES_ENABLE false -#define DEFAULT_SORT_SAVESTATES_ENABLE false +#define DEFAULT_SORT_SAVEFILES_ENABLE true +#define DEFAULT_SORT_SAVESTATES_ENABLE true #define DEFAULT_SORT_SAVEFILES_BY_CONTENT_ENABLE false #define DEFAULT_SORT_SAVESTATES_BY_CONTENT_ENABLE false #define DEFAULT_SORT_SCREENSHOTS_BY_CONTENT_ENABLE false diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 98f190dc9b..b354696663 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -4428,7 +4428,7 @@ MSG_HASH( ) MSG_HASH( MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_LOAD, - "Load State Automatically" + "Auto Load State" ) MSG_HASH( MENU_ENUM_SUBLABEL_SAVESTATE_AUTO_LOAD, diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 878a6471e9..24ee785dfe 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -10114,23 +10114,23 @@ unsigned menu_displaylist_build_list( {MENU_ENUM_LABEL_SORT_SAVESTATES_ENABLE, PARSE_ONLY_BOOL, true}, {MENU_ENUM_LABEL_SORT_SAVEFILES_BY_CONTENT_ENABLE, PARSE_ONLY_BOOL, true}, {MENU_ENUM_LABEL_SORT_SAVESTATES_BY_CONTENT_ENABLE, PARSE_ONLY_BOOL, true}, - {MENU_ENUM_LABEL_BLOCK_SRAM_OVERWRITE, PARSE_ONLY_BOOL, true}, - {MENU_ENUM_LABEL_AUTOSAVE_INTERVAL, PARSE_ONLY_UINT, true}, - {MENU_ENUM_LABEL_SAVESTATE_AUTO_INDEX, PARSE_ONLY_BOOL, true}, - {MENU_ENUM_LABEL_SAVESTATE_MAX_KEEP, PARSE_ONLY_UINT, false}, - {MENU_ENUM_LABEL_SAVESTATE_AUTO_SAVE, PARSE_ONLY_BOOL, true}, - {MENU_ENUM_LABEL_SAVESTATE_AUTO_LOAD, PARSE_ONLY_BOOL, true}, - {MENU_ENUM_LABEL_SAVESTATE_THUMBNAIL_ENABLE, PARSE_ONLY_BOOL, true}, - {MENU_ENUM_LABEL_REPLAY_AUTO_INDEX, PARSE_ONLY_BOOL, true}, - {MENU_ENUM_LABEL_REPLAY_MAX_KEEP, PARSE_ONLY_UINT, false}, - {MENU_ENUM_LABEL_REPLAY_CHECKPOINT_INTERVAL, PARSE_ONLY_UINT, true}, - {MENU_ENUM_LABEL_SAVE_FILE_COMPRESSION, PARSE_ONLY_BOOL, true}, - {MENU_ENUM_LABEL_SAVESTATE_FILE_COMPRESSION, PARSE_ONLY_BOOL, true}, {MENU_ENUM_LABEL_SORT_SCREENSHOTS_BY_CONTENT_ENABLE, PARSE_ONLY_BOOL, true}, {MENU_ENUM_LABEL_SAVEFILES_IN_CONTENT_DIR_ENABLE, PARSE_ONLY_BOOL, true}, {MENU_ENUM_LABEL_SAVESTATES_IN_CONTENT_DIR_ENABLE, PARSE_ONLY_BOOL, true}, - {MENU_ENUM_LABEL_SYSTEMFILES_IN_CONTENT_DIR_ENABLE, PARSE_ONLY_BOOL, true}, {MENU_ENUM_LABEL_SCREENSHOTS_IN_CONTENT_DIR_ENABLE, PARSE_ONLY_BOOL, true}, + {MENU_ENUM_LABEL_SYSTEMFILES_IN_CONTENT_DIR_ENABLE, PARSE_ONLY_BOOL, true}, + {MENU_ENUM_LABEL_SAVE_FILE_COMPRESSION, PARSE_ONLY_BOOL, true}, + {MENU_ENUM_LABEL_SAVESTATE_FILE_COMPRESSION, PARSE_ONLY_BOOL, true}, + {MENU_ENUM_LABEL_AUTOSAVE_INTERVAL, PARSE_ONLY_UINT, true}, + {MENU_ENUM_LABEL_BLOCK_SRAM_OVERWRITE, PARSE_ONLY_BOOL, true}, + {MENU_ENUM_LABEL_SAVESTATE_THUMBNAIL_ENABLE, PARSE_ONLY_BOOL, true}, + {MENU_ENUM_LABEL_SAVESTATE_AUTO_SAVE, PARSE_ONLY_BOOL, true}, + {MENU_ENUM_LABEL_SAVESTATE_AUTO_LOAD, PARSE_ONLY_BOOL, true}, + {MENU_ENUM_LABEL_SAVESTATE_AUTO_INDEX, PARSE_ONLY_BOOL, true}, + {MENU_ENUM_LABEL_SAVESTATE_MAX_KEEP, PARSE_ONLY_UINT, false}, + {MENU_ENUM_LABEL_REPLAY_AUTO_INDEX, PARSE_ONLY_BOOL, true}, + {MENU_ENUM_LABEL_REPLAY_MAX_KEEP, PARSE_ONLY_UINT, false}, + {MENU_ENUM_LABEL_REPLAY_CHECKPOINT_INTERVAL, PARSE_ONLY_UINT, true}, {MENU_ENUM_LABEL_CONTENT_RUNTIME_LOG, PARSE_ONLY_BOOL, true}, {MENU_ENUM_LABEL_CONTENT_RUNTIME_LOG_AGGREGATE, PARSE_ONLY_BOOL, true}, #if HAVE_CLOUDSYNC diff --git a/menu/menu_setting.c b/menu/menu_setting.c index ca2d8399d2..a71688789b 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -10594,7 +10594,7 @@ static bool setting_append_list( break; case SETTINGS_LIST_CONFIGURATION: { - uint8_t i; + uint8_t i, listing = 0; struct bool_entry bool_entries[8]; START_GROUP(list, list_info, &group_info, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS), parent_group); @@ -10604,53 +10604,61 @@ static bool setting_append_list( START_SUB_GROUP(list, list_info, "State", &group_info, &subgroup_info, parent_group); - bool_entries[0].target = &settings->bools.config_save_on_exit; - bool_entries[0].name_enum_idx = MENU_ENUM_LABEL_CONFIG_SAVE_ON_EXIT; - bool_entries[0].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT; - bool_entries[0].default_value = DEFAULT_CONFIG_SAVE_ON_EXIT; - bool_entries[0].flags = SD_FLAG_NONE; + bool_entries[listing].target = &settings->bools.config_save_on_exit; + bool_entries[listing].name_enum_idx = MENU_ENUM_LABEL_CONFIG_SAVE_ON_EXIT; + bool_entries[listing].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT; + bool_entries[listing].default_value = DEFAULT_CONFIG_SAVE_ON_EXIT; + bool_entries[listing].flags = SD_FLAG_NONE; + listing++; - bool_entries[1].target = &settings->bools.show_hidden_files; - bool_entries[1].name_enum_idx = MENU_ENUM_LABEL_SHOW_HIDDEN_FILES; - bool_entries[1].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_SHOW_HIDDEN_FILES; - bool_entries[1].default_value = DEFAULT_SHOW_HIDDEN_FILES; - bool_entries[1].flags = SD_FLAG_NONE; + bool_entries[listing].target = &settings->bools.show_hidden_files; + bool_entries[listing].name_enum_idx = MENU_ENUM_LABEL_SHOW_HIDDEN_FILES; + bool_entries[listing].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_SHOW_HIDDEN_FILES; + bool_entries[listing].default_value = DEFAULT_SHOW_HIDDEN_FILES; + bool_entries[listing].flags = SD_FLAG_NONE; + listing++; - bool_entries[2].target = &settings->bools.game_specific_options; - bool_entries[2].name_enum_idx = MENU_ENUM_LABEL_GAME_SPECIFIC_OPTIONS; - bool_entries[2].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS; - bool_entries[2].default_value = DEFAULT_GAME_SPECIFIC_OPTIONS; - bool_entries[2].flags = SD_FLAG_ADVANCED; + bool_entries[listing].target = &settings->bools.game_specific_options; + bool_entries[listing].name_enum_idx = MENU_ENUM_LABEL_GAME_SPECIFIC_OPTIONS; + bool_entries[listing].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS; + bool_entries[listing].default_value = DEFAULT_GAME_SPECIFIC_OPTIONS; + bool_entries[listing].flags = SD_FLAG_ADVANCED; + listing++; - bool_entries[3].target = &settings->bools.auto_overrides_enable; - bool_entries[3].name_enum_idx = MENU_ENUM_LABEL_AUTO_OVERRIDES_ENABLE; - bool_entries[3].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_AUTO_OVERRIDES_ENABLE; - bool_entries[3].default_value = DEFAULT_AUTO_OVERRIDES_ENABLE; - bool_entries[3].flags = SD_FLAG_ADVANCED; + bool_entries[listing].target = &settings->bools.auto_overrides_enable; + bool_entries[listing].name_enum_idx = MENU_ENUM_LABEL_AUTO_OVERRIDES_ENABLE; + bool_entries[listing].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_AUTO_OVERRIDES_ENABLE; + bool_entries[listing].default_value = DEFAULT_AUTO_OVERRIDES_ENABLE; + bool_entries[listing].flags = SD_FLAG_ADVANCED; + listing++; - bool_entries[4].target = &settings->bools.auto_remaps_enable; - bool_entries[4].name_enum_idx = MENU_ENUM_LABEL_AUTO_REMAPS_ENABLE; - bool_entries[4].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_AUTO_REMAPS_ENABLE; - bool_entries[4].default_value = DEFAULT_AUTO_REMAPS_ENABLE; - bool_entries[4].flags = SD_FLAG_ADVANCED; + bool_entries[listing].target = &settings->bools.auto_remaps_enable; + bool_entries[listing].name_enum_idx = MENU_ENUM_LABEL_AUTO_REMAPS_ENABLE; + bool_entries[listing].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_AUTO_REMAPS_ENABLE; + bool_entries[listing].default_value = DEFAULT_AUTO_REMAPS_ENABLE; + bool_entries[listing].flags = SD_FLAG_ADVANCED; + listing++; - bool_entries[5].target = &settings->bools.auto_shaders_enable; - bool_entries[5].name_enum_idx = MENU_ENUM_LABEL_AUTO_SHADERS_ENABLE; - bool_entries[5].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_AUTO_SHADERS_ENABLE; - bool_entries[5].default_value = DEFAULT_AUTO_SHADERS_ENABLE; - bool_entries[5].flags = SD_FLAG_NONE; + bool_entries[listing].target = &settings->bools.auto_shaders_enable; + bool_entries[listing].name_enum_idx = MENU_ENUM_LABEL_AUTO_SHADERS_ENABLE; + bool_entries[listing].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_AUTO_SHADERS_ENABLE; + bool_entries[listing].default_value = DEFAULT_AUTO_SHADERS_ENABLE; + bool_entries[listing].flags = SD_FLAG_NONE; + listing++; - bool_entries[6].target = &settings->bools.global_core_options; - bool_entries[6].name_enum_idx = MENU_ENUM_LABEL_GLOBAL_CORE_OPTIONS; - bool_entries[6].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_GLOBAL_CORE_OPTIONS; - bool_entries[6].default_value = DEFAULT_GLOBAL_CORE_OPTIONS; - bool_entries[6].flags = SD_FLAG_NONE; + bool_entries[listing].target = &settings->bools.global_core_options; + bool_entries[listing].name_enum_idx = MENU_ENUM_LABEL_GLOBAL_CORE_OPTIONS; + bool_entries[listing].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_GLOBAL_CORE_OPTIONS; + bool_entries[listing].default_value = DEFAULT_GLOBAL_CORE_OPTIONS; + bool_entries[listing].flags = SD_FLAG_NONE; + listing++; - bool_entries[7].target = &settings->bools.remap_save_on_exit; - bool_entries[7].name_enum_idx = MENU_ENUM_LABEL_REMAP_SAVE_ON_EXIT; - bool_entries[7].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_REMAP_SAVE_ON_EXIT; - bool_entries[7].default_value = DEFAULT_REMAP_SAVE_ON_EXIT; - bool_entries[7].flags = SD_FLAG_NONE; + bool_entries[listing].target = &settings->bools.remap_save_on_exit; + bool_entries[listing].name_enum_idx = MENU_ENUM_LABEL_REMAP_SAVE_ON_EXIT; + bool_entries[listing].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_REMAP_SAVE_ON_EXIT; + bool_entries[listing].default_value = DEFAULT_REMAP_SAVE_ON_EXIT; + bool_entries[listing].flags = SD_FLAG_NONE; + listing++; for (i = 0; i < ARRAY_SIZE(bool_entries); i++) { @@ -10828,7 +10836,7 @@ static bool setting_append_list( break; case SETTINGS_LIST_SAVING: { - uint8_t i; + uint8_t i, listing = 0; struct bool_entry bool_entries[13]; START_GROUP(list, list_info, &group_info, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SAVING_SETTINGS), parent_group); @@ -10837,83 +10845,96 @@ static bool setting_append_list( START_SUB_GROUP(list, list_info, "State", &group_info, &subgroup_info, parent_group); - bool_entries[0].target = &settings->bools.sort_savefiles_enable; - bool_entries[0].name_enum_idx = MENU_ENUM_LABEL_SORT_SAVEFILES_ENABLE; - bool_entries[0].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_SORT_SAVEFILES_ENABLE; - bool_entries[0].default_value = DEFAULT_SORT_SAVEFILES_ENABLE; - bool_entries[0].flags = SD_FLAG_ADVANCED; + bool_entries[listing].target = &settings->bools.sort_savefiles_enable; + bool_entries[listing].name_enum_idx = MENU_ENUM_LABEL_SORT_SAVEFILES_ENABLE; + bool_entries[listing].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_SORT_SAVEFILES_ENABLE; + bool_entries[listing].default_value = DEFAULT_SORT_SAVEFILES_ENABLE; + bool_entries[listing].flags = SD_FLAG_ADVANCED; + listing++; - bool_entries[1].target = &settings->bools.sort_savestates_enable; - bool_entries[1].name_enum_idx = MENU_ENUM_LABEL_SORT_SAVESTATES_ENABLE; - bool_entries[1].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_SORT_SAVESTATES_ENABLE; - bool_entries[1].default_value = DEFAULT_SORT_SAVESTATES_ENABLE; - bool_entries[1].flags = SD_FLAG_ADVANCED; + bool_entries[listing].target = &settings->bools.sort_savestates_enable; + bool_entries[listing].name_enum_idx = MENU_ENUM_LABEL_SORT_SAVESTATES_ENABLE; + bool_entries[listing].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_SORT_SAVESTATES_ENABLE; + bool_entries[listing].default_value = DEFAULT_SORT_SAVESTATES_ENABLE; + bool_entries[listing].flags = SD_FLAG_ADVANCED; + listing++; - bool_entries[2].target = &settings->bools.sort_savefiles_by_content_enable; - bool_entries[2].name_enum_idx = MENU_ENUM_LABEL_SORT_SAVEFILES_BY_CONTENT_ENABLE; - bool_entries[2].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_SORT_SAVEFILES_BY_CONTENT_ENABLE; - bool_entries[2].default_value = DEFAULT_SORT_SAVEFILES_BY_CONTENT_ENABLE; - bool_entries[2].flags = SD_FLAG_ADVANCED; + bool_entries[listing].target = &settings->bools.sort_savefiles_by_content_enable; + bool_entries[listing].name_enum_idx = MENU_ENUM_LABEL_SORT_SAVEFILES_BY_CONTENT_ENABLE; + bool_entries[listing].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_SORT_SAVEFILES_BY_CONTENT_ENABLE; + bool_entries[listing].default_value = DEFAULT_SORT_SAVEFILES_BY_CONTENT_ENABLE; + bool_entries[listing].flags = SD_FLAG_ADVANCED; + listing++; - bool_entries[3].target = &settings->bools.sort_savestates_by_content_enable; - bool_entries[3].name_enum_idx = MENU_ENUM_LABEL_SORT_SAVESTATES_BY_CONTENT_ENABLE; - bool_entries[3].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_SORT_SAVESTATES_BY_CONTENT_ENABLE; - bool_entries[3].default_value = DEFAULT_SORT_SAVESTATES_BY_CONTENT_ENABLE; - bool_entries[3].flags = SD_FLAG_ADVANCED; + bool_entries[listing].target = &settings->bools.sort_savestates_by_content_enable; + bool_entries[listing].name_enum_idx = MENU_ENUM_LABEL_SORT_SAVESTATES_BY_CONTENT_ENABLE; + bool_entries[listing].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_SORT_SAVESTATES_BY_CONTENT_ENABLE; + bool_entries[listing].default_value = DEFAULT_SORT_SAVESTATES_BY_CONTENT_ENABLE; + bool_entries[listing].flags = SD_FLAG_ADVANCED; + listing++; - bool_entries[4].target = &settings->bools.sort_screenshots_by_content_enable; - bool_entries[4].name_enum_idx = MENU_ENUM_LABEL_SORT_SCREENSHOTS_BY_CONTENT_ENABLE; - bool_entries[4].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_SORT_SCREENSHOTS_BY_CONTENT_ENABLE; - bool_entries[4].default_value = DEFAULT_SORT_SCREENSHOTS_BY_CONTENT_ENABLE; - bool_entries[4].flags = SD_FLAG_ADVANCED; + bool_entries[listing].target = &settings->bools.sort_screenshots_by_content_enable; + bool_entries[listing].name_enum_idx = MENU_ENUM_LABEL_SORT_SCREENSHOTS_BY_CONTENT_ENABLE; + bool_entries[listing].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_SORT_SCREENSHOTS_BY_CONTENT_ENABLE; + bool_entries[listing].default_value = DEFAULT_SORT_SCREENSHOTS_BY_CONTENT_ENABLE; + bool_entries[listing].flags = SD_FLAG_ADVANCED; + listing++; - bool_entries[5].target = &settings->bools.block_sram_overwrite; - bool_entries[5].name_enum_idx = MENU_ENUM_LABEL_BLOCK_SRAM_OVERWRITE; - bool_entries[5].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_BLOCK_SRAM_OVERWRITE; - bool_entries[5].default_value = DEFAULT_BLOCK_SRAM_OVERWRITE; - bool_entries[5].flags = SD_FLAG_NONE; + bool_entries[listing].target = &settings->bools.block_sram_overwrite; + bool_entries[listing].name_enum_idx = MENU_ENUM_LABEL_BLOCK_SRAM_OVERWRITE; + bool_entries[listing].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_BLOCK_SRAM_OVERWRITE; + bool_entries[listing].default_value = DEFAULT_BLOCK_SRAM_OVERWRITE; + bool_entries[listing].flags = SD_FLAG_NONE; + listing++; - bool_entries[6].target = &settings->bools.savestate_auto_save; - bool_entries[6].name_enum_idx = MENU_ENUM_LABEL_SAVESTATE_AUTO_SAVE; - bool_entries[6].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_SAVE; - bool_entries[6].default_value = DEFAULT_SAVESTATE_AUTO_SAVE; - bool_entries[6].flags = SD_FLAG_NONE; + bool_entries[listing].target = &settings->bools.savestate_auto_save; + bool_entries[listing].name_enum_idx = MENU_ENUM_LABEL_SAVESTATE_AUTO_SAVE; + bool_entries[listing].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_SAVE; + bool_entries[listing].default_value = DEFAULT_SAVESTATE_AUTO_SAVE; + bool_entries[listing].flags = SD_FLAG_NONE; + listing++; - bool_entries[7].target = &settings->bools.savestate_auto_load; - bool_entries[7].name_enum_idx = MENU_ENUM_LABEL_SAVESTATE_AUTO_LOAD; - bool_entries[7].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_LOAD; - bool_entries[7].default_value = DEFAULT_SAVESTATE_AUTO_LOAD; - bool_entries[7].flags = SD_FLAG_NONE; + bool_entries[listing].target = &settings->bools.savestate_auto_load; + bool_entries[listing].name_enum_idx = MENU_ENUM_LABEL_SAVESTATE_AUTO_LOAD; + bool_entries[listing].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_LOAD; + bool_entries[listing].default_value = DEFAULT_SAVESTATE_AUTO_LOAD; + bool_entries[listing].flags = SD_FLAG_NONE; + listing++; - bool_entries[8].target = &settings->bools.savestate_thumbnail_enable; - bool_entries[8].name_enum_idx = MENU_ENUM_LABEL_SAVESTATE_THUMBNAIL_ENABLE; - bool_entries[8].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_SAVESTATE_THUMBNAIL_ENABLE; - bool_entries[8].default_value = DEFAULT_SAVESTATE_THUMBNAIL_ENABLE; - bool_entries[8].flags = SD_FLAG_ADVANCED; + bool_entries[listing].target = &settings->bools.savestate_thumbnail_enable; + bool_entries[listing].name_enum_idx = MENU_ENUM_LABEL_SAVESTATE_THUMBNAIL_ENABLE; + bool_entries[listing].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_SAVESTATE_THUMBNAIL_ENABLE; + bool_entries[listing].default_value = DEFAULT_SAVESTATE_THUMBNAIL_ENABLE; + bool_entries[listing].flags = SD_FLAG_ADVANCED; + listing++; - bool_entries[9].target = &settings->bools.savefiles_in_content_dir; - bool_entries[9].name_enum_idx = MENU_ENUM_LABEL_SAVEFILES_IN_CONTENT_DIR_ENABLE; - bool_entries[9].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_SAVEFILES_IN_CONTENT_DIR_ENABLE; - bool_entries[9].default_value = DEFAULT_SAVEFILES_IN_CONTENT_DIR; - bool_entries[9].flags = SD_FLAG_ADVANCED; + bool_entries[listing].target = &settings->bools.savefiles_in_content_dir; + bool_entries[listing].name_enum_idx = MENU_ENUM_LABEL_SAVEFILES_IN_CONTENT_DIR_ENABLE; + bool_entries[listing].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_SAVEFILES_IN_CONTENT_DIR_ENABLE; + bool_entries[listing].default_value = DEFAULT_SAVEFILES_IN_CONTENT_DIR; + bool_entries[listing].flags = SD_FLAG_ADVANCED; + listing++; - bool_entries[10].target = &settings->bools.savestates_in_content_dir; - bool_entries[10].name_enum_idx = MENU_ENUM_LABEL_SAVESTATES_IN_CONTENT_DIR_ENABLE; - bool_entries[10].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_SAVESTATES_IN_CONTENT_DIR_ENABLE; - bool_entries[10].default_value = DEFAULT_SAVESTATES_IN_CONTENT_DIR; - bool_entries[10].flags = SD_FLAG_ADVANCED; + bool_entries[listing].target = &settings->bools.savestates_in_content_dir; + bool_entries[listing].name_enum_idx = MENU_ENUM_LABEL_SAVESTATES_IN_CONTENT_DIR_ENABLE; + bool_entries[listing].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_SAVESTATES_IN_CONTENT_DIR_ENABLE; + bool_entries[listing].default_value = DEFAULT_SAVESTATES_IN_CONTENT_DIR; + bool_entries[listing].flags = SD_FLAG_ADVANCED; + listing++; - bool_entries[11].target = &settings->bools.systemfiles_in_content_dir; - bool_entries[11].name_enum_idx = MENU_ENUM_LABEL_SYSTEMFILES_IN_CONTENT_DIR_ENABLE; - bool_entries[11].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_SYSTEMFILES_IN_CONTENT_DIR_ENABLE; - bool_entries[11].default_value = DEFAULT_SYSTEMFILES_IN_CONTENT_DIR; - bool_entries[11].flags = SD_FLAG_ADVANCED; + bool_entries[listing].target = &settings->bools.systemfiles_in_content_dir; + bool_entries[listing].name_enum_idx = MENU_ENUM_LABEL_SYSTEMFILES_IN_CONTENT_DIR_ENABLE; + bool_entries[listing].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_SYSTEMFILES_IN_CONTENT_DIR_ENABLE; + bool_entries[listing].default_value = DEFAULT_SYSTEMFILES_IN_CONTENT_DIR; + bool_entries[listing].flags = SD_FLAG_ADVANCED; + listing++; - bool_entries[12].target = &settings->bools.screenshots_in_content_dir; - bool_entries[12].name_enum_idx = MENU_ENUM_LABEL_SCREENSHOTS_IN_CONTENT_DIR_ENABLE; - bool_entries[12].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_SCREENSHOTS_IN_CONTENT_DIR_ENABLE; - bool_entries[12].default_value = DEFAULT_SCREENSHOTS_IN_CONTENT_DIR; - bool_entries[12].flags = SD_FLAG_ADVANCED; + bool_entries[listing].target = &settings->bools.screenshots_in_content_dir; + bool_entries[listing].name_enum_idx = MENU_ENUM_LABEL_SCREENSHOTS_IN_CONTENT_DIR_ENABLE; + bool_entries[listing].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_SCREENSHOTS_IN_CONTENT_DIR_ENABLE; + bool_entries[listing].default_value = DEFAULT_SCREENSHOTS_IN_CONTENT_DIR; + bool_entries[listing].flags = SD_FLAG_ADVANCED; + listing++; for (i = 0; i < ARRAY_SIZE(bool_entries); i++) {