From 962e1f710e2dcb03c19ba0f5f6a799b858c7288e Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 6 Feb 2018 13:56:49 +0100 Subject: [PATCH] Updates --- menu/cbs/menu_cbs_deferred_push.c | 7 ++++--- menu/cbs/menu_cbs_title.c | 7 ++++--- msg_hash.h | 5 ----- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c index be6b057b88..db95173633 100644 --- a/menu/cbs/menu_cbs_deferred_push.c +++ b/menu/cbs/menu_cbs_deferred_push.c @@ -794,6 +794,10 @@ static struct cbs_deferred_lbl_callback cbs_deferred_lbl_list[] = { { MENU_ENUM_LABEL_CORE_CHEAT_OPTIONS, deferred_push_core_cheat_options + }, + { + MENU_ENUM_LABEL_CORE_INPUT_REMAPPING_OPTIONS, + deferred_push_core_input_remapping_options } }; @@ -1335,9 +1339,6 @@ static int menu_cbs_init_bind_deferred_push_compare_label( case MENU_LABEL_FRONTEND_COUNTERS: BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_frontend_counters); break; - case MENU_LABEL_CORE_INPUT_REMAPPING_OPTIONS: - BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_core_input_remapping_options); - break; case MENU_LABEL_CONTENT_COLLECTION_LIST: BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_content_collection_list); break; diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c index f89ff8b8a8..f53a7ef076 100644 --- a/menu/cbs/menu_cbs_title.c +++ b/menu/cbs/menu_cbs_title.c @@ -564,6 +564,10 @@ static struct cbs_title_lbl_callback cbs_title_lbl_list[] = { { MENU_ENUM_LABEL_SHADER_OPTIONS, action_get_shader_options_list + }, + { + MENU_ENUM_LABEL_CORE_INPUT_REMAPPING_OPTIONS, + action_get_input_remapping_options_list } }; @@ -1036,9 +1040,6 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs, case MENU_LABEL_DEFERRED_CONFIGURATIONS_LIST: BIND_ACTION_GET_TITLE(cbs, action_get_configurations_list); break; - case MENU_LABEL_CORE_INPUT_REMAPPING_OPTIONS: - BIND_ACTION_GET_TITLE(cbs, action_get_input_remapping_options_list); - break; case MENU_LABEL_FRONTEND_COUNTERS: BIND_ACTION_GET_TITLE(cbs, action_get_frontend_counters_list); break; diff --git a/msg_hash.h b/msg_hash.h index 2b7aba8fa4..a025562786 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -1833,20 +1833,15 @@ enum msg_hash_enums #define MENU_LABEL_FRONTEND_COUNTERS 0xe5696877U #define MENU_LABEL_CORE_COUNTERS 0x64cc83e0U #define MENU_LABEL_ACHIEVEMENT_LIST 0x7b90fc49U -#define MENU_LABEL_CORE_INPUT_REMAPPING_OPTIONS 0x7836a8caU #define MENU_LABEL_DATABASE_MANAGER_LIST 0x7f853d8fU #define MENU_LABEL_CURSOR_MANAGER_LIST 0xa969e378U #define MENU_LABEL_REMAP_FILE_LOAD 0x9c2799b8U -#define MENU_LABEL_INFO_SCREEN 0xd97853d0U -#define MENU_LABEL_CUSTOM_RATIO 0xf038731eU -#define MENU_LABEL_PAL60_ENABLE 0x62bc416eU #define MENU_LABEL_CONTENT_HISTORY_PATH 0x6f22fb9dU #define MENU_LABEL_REMAP_FILE_SAVE_CORE 0x7c9d4c8fU #define MENU_LABEL_REMAP_FILE_SAVE_GAME 0x7c9f41e0U #define MENU_LABEL_CONTENT_COLLECTION_LIST 0x32d1df83U #define MENU_LABEL_COLLECTION 0x5fea5991U - #define MENU_LABEL_DOWNLOADED_FILE_DETECT_CORE_LIST 0xb4f82700U #define MENU_LABEL_FAVORITES 0x67325138U