From f48c31cf68ed396e6dd3e8004143cd3956b07780 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 17 Jul 2015 21:50:51 +0200 Subject: [PATCH] Update 'Basic Menu Controls' --- menu/cbs/menu_cbs_iterate.c | 19 +++++++------------ menu/intl/menu_hash_us.c | 2 ++ menu/menu_hash.h | 2 ++ 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/menu/cbs/menu_cbs_iterate.c b/menu/cbs/menu_cbs_iterate.c index fe5d8f723f..b733bbe5e0 100644 --- a/menu/cbs/menu_cbs_iterate.c +++ b/menu/cbs/menu_cbs_iterate.c @@ -84,6 +84,7 @@ static int action_iterate_help(char *s, size_t len, const char *label) RETRO_DEVICE_ID_JOYPAD_A, RETRO_DEVICE_ID_JOYPAD_B, RETRO_DEVICE_ID_JOYPAD_SELECT, + RETRO_DEVICE_ID_JOYPAD_START, RARCH_MENU_TOGGLE, RARCH_QUIT_KEY, RETRO_DEVICE_ID_JOYPAD_X, @@ -118,23 +119,17 @@ static int action_iterate_help(char *s, size_t len, const char *label) "%-20s\n" "[%s]: " "%-20s\n" - " \n" - - "To run content:\n" - "Load a libretro core (Core).\n" - "Load a content file (Load Content). \n" - " \n" - "See Path Settings to set directories \n" - "for faster access to files.\n" - " \n", + "[%s]: " + "%-20s\n", menu_hash_to_str(MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_SCROLL_UP), desc[0], menu_hash_to_str(MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_SCROLL_DOWN), desc[1], menu_hash_to_str(MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_CONFIRM), desc[2], menu_hash_to_str(MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_BACK), desc[3], menu_hash_to_str(MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_INFO), desc[4], - menu_hash_to_str(MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_TOGGLE_MENU), desc[5], - menu_hash_to_str(MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_QUIT), desc[6], - menu_hash_to_str(MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_TOGGLE_KEYBOARD), desc[7] + menu_hash_to_str(MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_START), desc[5], + menu_hash_to_str(MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_TOGGLE_MENU), desc[6], + menu_hash_to_str(MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_QUIT), desc[7], + menu_hash_to_str(MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_TOGGLE_KEYBOARD), desc[8] ); } break; diff --git a/menu/intl/menu_hash_us.c b/menu/intl/menu_hash_us.c index 5fc74dc019..fb3b5f8dc8 100644 --- a/menu/intl/menu_hash_us.c +++ b/menu/intl/menu_hash_us.c @@ -654,6 +654,8 @@ const char *menu_hash_to_str_us(uint32_t hash) return "Confirm/OK"; case MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_BACK: return "Back"; + case MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_START: + return "Defaults"; case MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_INFO: return "Info"; case MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_TOGGLE_MENU: diff --git a/menu/menu_hash.h b/menu/menu_hash.h index b6bed82215..34f39b6c07 100644 --- a/menu/menu_hash.h +++ b/menu/menu_hash.h @@ -22,6 +22,7 @@ extern "C" { #endif + #define MENU_LABEL_HELP_LIST 0x006af669U #define MENU_LABEL_VALUE_HELP_LIST 0x6c57426aU @@ -33,6 +34,7 @@ extern "C" { #define MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_SCROLL_DOWN 0x55f0f413U #define MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_CONFIRM 0x40e50edbU #define MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_BACK 0xd834d89eU +#define MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_START 0xe00df0fbU #define MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_INFO 0xd838e6f9U #define MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_TOGGLE_MENU 0x98159c23U #define MENU_LABEL_VALUE_BASIC_MENU_CONTROLS_QUIT 0xd83d6830U