From a46cb2b24ed1815f2f5b2dd3f6928fe82bf18936 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 19 Jun 2015 22:40:53 +0200 Subject: [PATCH] (Menu) Menu hashes update --- menu/menu_displaylist.c | 20 ++++++++++++-------- menu/menu_hash.c | 16 ++++++++++++++++ menu/menu_hash.h | 4 ++++ 3 files changed, 32 insertions(+), 8 deletions(-) diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 402260b7e2..aa31bd9e75 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -1520,12 +1520,12 @@ static int menu_displaylist_parse_options_cheats(menu_displaylist_info_t *info) menu_hash_to_str(MENU_LABEL_CHEAT_FILE_SAVE_AS), MENU_SETTING_ACTION, 0, 0); menu_list_push(info->list, - "Cheat Passes", - "cheat_num_passes", + menu_hash_to_str(MENU_LABEL_VALUE_CHEAT_NUM_PASSES), + menu_hash_to_str(MENU_LABEL_CHEAT_NUM_PASSES), 0, 0, 0); menu_list_push(info->list, - "Apply Cheat Changes", - "cheat_apply_changes", + menu_hash_to_str(MENU_LABEL_VALUE_CHEAT_APPLY_CHANGES), + menu_hash_to_str(MENU_LABEL_CHEAT_APPLY_CHANGES), MENU_SETTING_ACTION, 0, 0); for (i = 0; i < cheat->size; i++) @@ -1568,10 +1568,14 @@ static int menu_displaylist_parse_options_remappings(menu_displaylist_info_t *in menu_hash_to_str(MENU_LABEL_VALUE_REMAP_FILE_SAVE_AS), menu_hash_to_str(MENU_LABEL_REMAP_FILE_SAVE_AS), MENU_SETTING_ACTION, 0, 0); - menu_list_push(info->list, "Save Core Remap File", - "remap_file_save_core", MENU_SETTING_ACTION, 0, 0); - menu_list_push(info->list, "Save Game Remap File", - "remap_file_save_game", MENU_SETTING_ACTION, 0, 0); + menu_list_push(info->list, + menu_hash_to_str(MENU_LABEL_VALUE_REMAP_FILE_SAVE_CORE), + menu_hash_to_str(MENU_LABEL_REMAP_FILE_SAVE_CORE), + MENU_SETTING_ACTION, 0, 0); + menu_list_push(info->list, + menu_hash_to_str(MENU_LABEL_VALUE_REMAP_FILE_SAVE_GAME), + menu_hash_to_str(MENU_LABEL_REMAP_FILE_SAVE_GAME), + MENU_SETTING_ACTION, 0, 0); for (p = 0; p < settings->input.max_users; p++) { diff --git a/menu/menu_hash.c b/menu/menu_hash.c index 0c43005658..21c890f3af 100644 --- a/menu/menu_hash.c +++ b/menu/menu_hash.c @@ -193,6 +193,22 @@ static const char *menu_hash_to_str_english(uint32_t hash) { switch (hash) { + case MENU_LABEL_VALUE_CHEAT_NUM_PASSES: + return "Cheat Passes"; + case MENU_LABEL_CHEAT_APPLY_CHANGES: + return "cheat_apply_changes"; + case MENU_LABEL_VALUE_REMAP_FILE_SAVE_CORE: + return "Save Core Remap File"; + case MENU_LABEL_REMAP_FILE_SAVE_CORE: + return "remap_file_save_core"; + case MENU_LABEL_VALUE_REMAP_FILE_SAVE_GAME: + return "Save Game Remap File"; + case MENU_LABEL_REMAP_FILE_SAVE_GAME: + return "remap_file_save_game"; + case MENU_LABEL_VALUE_CHEAT_APPLY_CHANGES: + return "Apply Cheat Changes"; + case MENU_LABEL_CHEAT_NUM_PASSES: + return "cheat_num_passes"; case MENU_LABEL_VALUE_SHADER_APPLY_CHANGES: return "Apply Shader Changes"; case MENU_LABEL_SHADER_APPLY_CHANGES: diff --git a/menu/menu_hash.h b/menu/menu_hash.h index f967a07f68..c3a19b8126 100644 --- a/menu/menu_hash.h +++ b/menu/menu_hash.h @@ -220,6 +220,7 @@ extern "C" { #define MENU_LABEL_VIDEO_SHADER_SCALE_PASS 0x18f7b82fU #define MENU_LABEL_VALUE_VIDEO_SHADER_NUM_PASSES 0xb354b30bU #define MENU_LABEL_VIDEO_SHADER_NUM_PASSES 0x79b2992fU +#define MENU_LABEL_VALUE_CHEAT_NUM_PASSES 0x8024fa39U #define MENU_LABEL_CHEAT_NUM_PASSES 0x1910eb87U #define MENU_VALUE_NO_DISK 0x7d54e5cdU @@ -428,6 +429,7 @@ extern "C" { #define MENU_LABEL_SAVE_NEW_CONFIG 0xcce9ab72U #define MENU_LABEL_VALUE_SAVE_NEW_CONFIG 0xd49f2c94U #define MENU_LABEL_ONSCREEN_DISPLAY_SETTINGS 0x67571029U +#define MENU_LABEL_VALUE_CHEAT_APPLY_CHANGES 0x7d5d3489U #define MENU_LABEL_CHEAT_APPLY_CHANGES 0xde88aa27U #define MENU_LABEL_CUSTOM_BIND 0x1e84b3fcU #define MENU_LABEL_CUSTOM_BIND_ALL 0x79ac14f4U @@ -451,6 +453,8 @@ extern "C" { #define MENU_LABEL_REMAP_FILE_SAVE_AS 0xcebf7f3aU #define MENU_LABEL_VIDEO_SHADER_PRESET_SAVE_AS 0x3d6e5ce5U #define MENU_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE_AS 0x405d77b2U +#define MENU_LABEL_VALUE_REMAP_FILE_SAVE_CORE 0xd9891572U +#define MENU_LABEL_VALUE_REMAP_FILE_SAVE_GAME 0x9c487623U #define MENU_LABEL_REMAP_FILE_SAVE_CORE 0x7c9d4c8fU #define MENU_LABEL_REMAP_FILE_SAVE_GAME 0x7c9f41e0U #define MENU_LABEL_CONTENT_COLLECTION_LIST 0x0f8a9086U