diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index ad54c40752..4e8a90187b 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -2507,3 +2507,15 @@ MSG_HASH( MENU_ENUM_SUBLABEL_AUTOSAVE_INTERVAL, "Autosaves the non-volatile Save RAM at a regular interval. This is disabled by default unless set otherwise. The interval is measured in seconds. A value of 0 disables autosave." ) +MSG_HASH( + MENU_ENUM_SUBLABEL_INPUT_REMAP_BINDS_ENABLE, + "If enabled, overrides the input binds with the remapped binds set for the current core." + ) +MSG_HASH( + MENU_ENUM_SUBLABEL_INPUT_AUTODETECT_ENABLE, + "Enable input auto-detection. Will attempt to autoconfigure joypads, Plug-and-Play style." + ) +MSG_HASH( + MENU_ENUM_SUBLABEL_MENU_INPUT_SWAP_OK_CANCEL, + "Swap buttons for OK/Cancel. Disabled is the Japanese button orientation, enabled is the western orientation." + ) diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index 2b1e27d4d8..ac31e031a1 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -160,6 +160,9 @@ default_sublabel_macro(action_bind_sublabel_savestate_auto_save, MENU_ default_sublabel_macro(action_bind_sublabel_savestate_auto_load, MENU_ENUM_SUBLABEL_SAVESTATE_AUTO_LOAD) default_sublabel_macro(action_bind_sublabel_savestate_thumbnail_enable, MENU_ENUM_SUBLABEL_SAVESTATE_THUMBNAIL_ENABLE) default_sublabel_macro(action_bind_sublabel_autosave_interval, MENU_ENUM_SUBLABEL_AUTOSAVE_INTERVAL) +default_sublabel_macro(action_bind_sublabel_input_remap_binds_enable, MENU_ENUM_SUBLABEL_INPUT_REMAP_BINDS_ENABLE) +default_sublabel_macro(action_bind_sublabel_input_autodetect_enable, MENU_ENUM_SUBLABEL_INPUT_AUTODETECT_ENABLE) +default_sublabel_macro(action_bind_sublabel_input_swap_ok_cancel, MENU_ENUM_SUBLABEL_MENU_INPUT_SWAP_OK_CANCEL) static int action_bind_sublabel_cheevos_entry( file_list_t *list, @@ -221,6 +224,15 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, { switch (cbs->enum_idx) { + case MENU_ENUM_LABEL_MENU_INPUT_SWAP_OK_CANCEL: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_swap_ok_cancel); + break; + case MENU_ENUM_LABEL_INPUT_AUTODETECT_ENABLE: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_autodetect_enable); + break; + case MENU_ENUM_LABEL_INPUT_REMAP_BINDS_ENABLE: + BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_input_remap_binds_enable); + break; case MENU_ENUM_LABEL_AUTOSAVE_INTERVAL: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_autosave_interval); break;