diff --git a/msg_hash.h b/msg_hash.h index 7697c0172b..b7f3badb97 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -126,6 +126,11 @@ enum msg_file_type FILE_TYPE_LAST }; +#define MENU_LABEL(STR) \ + MENU_ENUM_LABEL_##STR, \ + MENU_ENUM_SUBLABEL_##STR, \ + MENU_ENUM_LABEL_VALUE_##STR + enum msg_hash_enums { MSG_UNKNOWN = 0, @@ -414,10 +419,7 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_INTERNAL_STORAGE_STATUS, /* System information */ - - MENU_ENUM_LABEL_CPU_CORES, - MENU_ENUM_SUBLABEL_CPU_CORES, - MENU_ENUM_LABEL_VALUE_CPU_CORES, + MENU_LABEL(CPU_CORES), MENU_ENUM_LABEL_CPU_ARCHITECTURE, MENU_ENUM_LABEL_VALUE_CPU_ARCHITECTURE, @@ -434,11 +436,10 @@ enum msg_hash_enums MENU_ENUM_LABEL_INPUT_HOTKEY_BINDS, MENU_ENUM_SUBLABEL_INPUT_HOTKEY_BINDS, + MENU_ENUM_LABEL_INPUT_HOTKEY_BINDS_BEGIN, - MENU_ENUM_LABEL_INPUT_TURBO_PERIOD, - MENU_ENUM_SUBLABEL_INPUT_TURBO_PERIOD, - MENU_ENUM_LABEL_VALUE_INPUT_TURBO_PERIOD, + MENU_LABEL(INPUT_TURBO_PERIOD), MENU_ENUM_LABEL_INPUT_OSK_OVERLAY_ENABLE, MENU_ENUM_LABEL_INPUT_OVERLAY_ENABLE, @@ -552,28 +553,19 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_INPUT_BIND_DEFAULT_ALL, MENU_ENUM_LABEL_VALUE_INPUT_SAVE_AUTOCONFIG, - MENU_ENUM_LABEL_INPUT_MAX_USERS, - MENU_ENUM_SUBLABEL_INPUT_MAX_USERS, - MENU_ENUM_LABEL_VALUE_INPUT_MAX_USERS, + MENU_LABEL(INPUT_MAX_USERS), MENU_ENUM_LABEL_VALUE_INPUT_USER_BINDS, MENU_ENUM_SUBLABEL_INPUT_USER_BINDS, - MENU_ENUM_LABEL_INPUT_DUTY_CYCLE, - MENU_ENUM_SUBLABEL_INPUT_DUTY_CYCLE, - MENU_ENUM_LABEL_VALUE_INPUT_DUTY_CYCLE, + MENU_LABEL(INPUT_DUTY_CYCLE), MENU_ENUM_LABEL_VALUE_INPUT_AUTODETECT_ENABLE, MENU_ENUM_LABEL_VALUE_INPUT_DESCRIPTOR_LABEL_SHOW, MENU_ENUM_LABEL_VALUE_INPUT_DESCRIPTOR_HIDE_UNBOUND, - MENU_ENUM_LABEL_INPUT_AXIS_THRESHOLD, - MENU_ENUM_SUBLABEL_INPUT_AXIS_THRESHOLD, - MENU_ENUM_LABEL_VALUE_INPUT_AXIS_THRESHOLD, - - MENU_ENUM_LABEL_INPUT_BIND_TIMEOUT, - MENU_ENUM_SUBLABEL_INPUT_BIND_TIMEOUT, - MENU_ENUM_LABEL_VALUE_INPUT_BIND_TIMEOUT, + MENU_LABEL(INPUT_AXIS_THRESHOLD), + MENU_LABEL(INPUT_BIND_TIMEOUT), MENU_ENUM_LABEL_VALUE_INPUT_REMAP_BINDS_ENABLE, MENU_ENUM_LABEL_VALUE_MENU_INPUT_SWAP_OK_CANCEL, @@ -581,9 +573,7 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_INPUT_OSK_OVERLAY_ENABLE, MENU_ENUM_LABEL_VALUE_INPUT_HOTKEY_BINDS, - MENU_ENUM_LABEL_INPUT_MENU_ENUM_TOGGLE_GAMEPAD_COMBO, - MENU_ENUM_SUBLABEL_INPUT_MENU_ENUM_TOGGLE_GAMEPAD_COMBO, - MENU_ENUM_LABEL_VALUE_INPUT_MENU_ENUM_TOGGLE_GAMEPAD_COMBO, + MENU_LABEL(INPUT_MENU_ENUM_TOGGLE_GAMEPAD_COMBO), MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_HIDE_IN_MENU, MENU_ENUM_LABEL_VALUE_INPUT_KEYBOARD_GAMEPAD_MAPPING_TYPE, @@ -592,13 +582,8 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_INPUT_PREFER_FRONT_TOUCH, MENU_ENUM_LABEL_VALUE_INPUT_ICADE_ENABLE, - MENU_ENUM_LABEL_INPUT_ALL_USERS_CONTROL_MENU, - MENU_ENUM_SUBLABEL_INPUT_ALL_USERS_CONTROL_MENU, - MENU_ENUM_LABEL_VALUE_INPUT_ALL_USERS_CONTROL_MENU, - - MENU_ENUM_LABEL_INPUT_POLL_TYPE_BEHAVIOR, - MENU_ENUM_SUBLABEL_INPUT_POLL_TYPE_BEHAVIOR, - MENU_ENUM_LABEL_VALUE_INPUT_POLL_TYPE_BEHAVIOR, + MENU_LABEL(INPUT_ALL_USERS_CONTROL_MENU), + MENU_LABEL(INPUT_POLL_TYPE_BEHAVIOR), /* Video */ MENU_ENUM_LABEL_VIDEO_FONT_ENABLE, @@ -610,32 +595,16 @@ enum msg_hash_enums MENU_ENUM_LABEL_VIDEO_SOFT_FILTER, MENU_ENUM_LABEL_VIDEO_SWAP_INTERVAL, - MENU_ENUM_LABEL_VALUE_VIDEO_MAX_SWAPCHAIN_IMAGES, - MENU_ENUM_SUBLABEL_VIDEO_MAX_SWAPCHAIN_IMAGES, - MENU_ENUM_LABEL_VIDEO_MAX_SWAPCHAIN_IMAGES, + MENU_LABEL(VIDEO_MAX_SWAPCHAIN_IMAGES), MENU_ENUM_LABEL_VIDEO_GPU_SCREENSHOT, MENU_ENUM_LABEL_VIDEO_FULLSCREEN, - MENU_ENUM_LABEL_VALUE_VIDEO_BLACK_FRAME_INSERTION, - MENU_ENUM_SUBLABEL_VIDEO_BLACK_FRAME_INSERTION, - MENU_ENUM_LABEL_VIDEO_BLACK_FRAME_INSERTION, - - MENU_ENUM_LABEL_VALUE_VIDEO_FRAME_DELAY, - MENU_ENUM_SUBLABEL_VIDEO_FRAME_DELAY, - MENU_ENUM_LABEL_VIDEO_FRAME_DELAY, - - MENU_ENUM_LABEL_VIDEO_VSYNC, - MENU_ENUM_SUBLABEL_VIDEO_VSYNC, - MENU_ENUM_LABEL_VALUE_VIDEO_VSYNC, - - MENU_ENUM_LABEL_VIDEO_HARD_SYNC, - MENU_ENUM_SUBLABEL_VIDEO_HARD_SYNC, - MENU_ENUM_LABEL_VALUE_VIDEO_HARD_SYNC, - - MENU_ENUM_LABEL_VIDEO_HARD_SYNC_FRAMES, - MENU_ENUM_SUBLABEL_VIDEO_HARD_SYNC_FRAMES, - MENU_ENUM_LABEL_VALUE_VIDEO_HARD_SYNC_FRAMES, + MENU_LABEL(VIDEO_BLACK_FRAME_INSERTION), + MENU_LABEL(VIDEO_FRAME_DELAY), + MENU_LABEL(VIDEO_VSYNC), + MENU_LABEL(VIDEO_HARD_SYNC), + MENU_LABEL(VIDEO_HARD_SYNC_FRAMES), MENU_ENUM_LABEL_VIDEO_WINDOWED_FULLSCREEN, MENU_ENUM_LABEL_VIDEO_FORCE_SRGB_DISABLE, @@ -650,17 +619,9 @@ enum msg_hash_enums MENU_ENUM_LABEL_VIDEO_VIEWPORT_CUSTOM_HEIGHT, MENU_ENUM_LABEL_VIDEO_GAMMA, - MENU_ENUM_LABEL_VIDEO_ALLOW_ROTATE, - MENU_ENUM_SUBLABEL_VIDEO_ALLOW_ROTATE, - MENU_ENUM_LABEL_VALUE_VIDEO_ALLOW_ROTATE, - - MENU_ENUM_LABEL_VIDEO_SHARED_CONTEXT, - MENU_ENUM_SUBLABEL_VIDEO_SHARED_CONTEXT, - MENU_ENUM_LABEL_VALUE_VIDEO_SHARED_CONTEXT, - - MENU_ENUM_LABEL_VIDEO_THREADED, - MENU_ENUM_SUBLABEL_VIDEO_THREADED, - MENU_ENUM_LABEL_VALUE_VIDEO_THREADED, + MENU_LABEL(VIDEO_ALLOW_ROTATE), + MENU_LABEL(VIDEO_SHARED_CONTEXT), + MENU_LABEL(VIDEO_THREADED), MENU_ENUM_LABEL_VALUE_VIDEO_VI_WIDTH, MENU_ENUM_LABEL_VALUE_VIDEO_FILTER, @@ -682,9 +643,7 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_VIDEO_GPU_RECORD, MENU_ENUM_LABEL_VALUE_VIDEO_GAMMA, - MENU_ENUM_LABEL_VIDEO_MONITOR_INDEX, - MENU_ENUM_SUBLABEL_VIDEO_MONITOR_INDEX, - MENU_ENUM_LABEL_VALUE_VIDEO_MONITOR_INDEX, + MENU_LABEL(VIDEO_MONITOR_INDEX), MENU_ENUM_LABEL_VALUE_VIDEO_WINDOWED_FULLSCREEN, MENU_ENUM_LABEL_VALUE_VIDEO_FORCE_SRGB_DISABLE, @@ -693,13 +652,8 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_VIDEO_CROP_OVERSCAN, MENU_ENUM_LABEL_VALUE_VIDEO_SCALE_INTEGER, - MENU_ENUM_LABEL_VIDEO_REFRESH_RATE, - MENU_ENUM_SUBLABEL_VIDEO_REFRESH_RATE, - MENU_ENUM_LABEL_VALUE_VIDEO_REFRESH_RATE, - - MENU_ENUM_LABEL_VIDEO_REFRESH_RATE_AUTO, - MENU_ENUM_SUBLABEL_VIDEO_REFRESH_RATE_AUTO, - MENU_ENUM_LABEL_VALUE_VIDEO_REFRESH_RATE_AUTO, + MENU_LABEL(VIDEO_REFRESH_RATE), + MENU_LABEL(VIDEO_REFRESH_RATE_AUTO), MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_X, MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_Y, @@ -854,45 +808,25 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_QUIT, MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_TOGGLE_KEYBOARD, - MENU_ENUM_LABEL_MENU_SETTINGS, - MENU_ENUM_SUBLABEL_MENU_SETTINGS, - MENU_ENUM_LABEL_VALUE_MENU_SETTINGS, + MENU_LABEL(MENU_SETTINGS), MENU_ENUM_LABEL_THUMBNAILS_UPDATER_LIST, MENU_ENUM_LABEL_VALUE_THUMBNAILS_UPDATER_LIST, - MENU_ENUM_LABEL_USER_INTERFACE_SETTINGS, - MENU_ENUM_SUBLABEL_USER_INTERFACE_SETTINGS, - MENU_ENUM_LABEL_VALUE_USER_INTERFACE_SETTINGS, + MENU_LABEL(USER_INTERFACE_SETTINGS), MENU_ENUM_LABEL_MENU_FILE_BROWSER_SETTINGS, - MENU_ENUM_LABEL_RETRO_ACHIEVEMENTS_SETTINGS, - MENU_ENUM_SUBLABEL_RETRO_ACHIEVEMENTS_SETTINGS, - MENU_ENUM_LABEL_VALUE_RETRO_ACHIEVEMENTS_SETTINGS, + MENU_LABEL(RETRO_ACHIEVEMENTS_SETTINGS), MENU_ENUM_LABEL_UPDATER_SETTINGS, MENU_ENUM_LABEL_VALUE_UPDATER_SETTINGS, - MENU_ENUM_LABEL_WIFI_SETTINGS, - MENU_ENUM_SUBLABEL_WIFI_SETTINGS, - MENU_ENUM_LABEL_VALUE_WIFI_SETTINGS, - - MENU_ENUM_LABEL_USER_SETTINGS, - MENU_ENUM_SUBLABEL_USER_SETTINGS, - MENU_ENUM_LABEL_VALUE_USER_SETTINGS, - - MENU_ENUM_LABEL_DIRECTORY_SETTINGS, - MENU_ENUM_SUBLABEL_DIRECTORY_SETTINGS, - MENU_ENUM_LABEL_VALUE_DIRECTORY_SETTINGS, - - MENU_ENUM_LABEL_PRIVACY_SETTINGS, - MENU_ENUM_SUBLABEL_PRIVACY_SETTINGS, - MENU_ENUM_LABEL_VALUE_PRIVACY_SETTINGS, - - MENU_ENUM_LABEL_NETWORK_SETTINGS, - MENU_ENUM_SUBLABEL_NETWORK_SETTINGS, - MENU_ENUM_LABEL_VALUE_NETWORK_SETTINGS, + MENU_LABEL(WIFI_SETTINGS), + MENU_LABEL(USER_SETTINGS), + MENU_LABEL(DIRECTORY_SETTINGS), + MENU_LABEL(PRIVACY_SETTINGS), + MENU_LABEL(NETWORK_SETTINGS), MENU_ENUM_LABEL_CONNECT_WIFI, @@ -920,9 +854,7 @@ enum msg_hash_enums MENU_ENUM_LABEL_ACCOUNTS_CHEEVOS_USERNAME, MENU_ENUM_LABEL_VALUE_ACCOUNTS_CHEEVOS_USERNAME, - MENU_ENUM_LABEL_CHEEVOS_HARDCORE_MODE_ENABLE, - MENU_ENUM_SUBLABEL_CHEEVOS_HARDCORE_MODE_ENABLE, - MENU_ENUM_LABEL_VALUE_CHEEVOS_HARDCORE_MODE_ENABLE, + MENU_LABEL(CHEEVOS_HARDCORE_MODE_ENABLE), MENU_ENUM_LABEL_CHEEVOS_TEST_UNOFFICIAL, MENU_ENUM_LABEL_VALUE_CHEEVOS_TEST_UNOFFICIAL, @@ -954,9 +886,7 @@ enum msg_hash_enums MENU_ENUM_LABEL_HELP_LOADING_CONTENT, MENU_ENUM_LABEL_VALUE_HELP_LOADING_CONTENT, - MENU_ENUM_LABEL_HELP_LIST, - MENU_ENUM_SUBLABEL_HELP_LIST, - MENU_ENUM_LABEL_VALUE_HELP_LIST, + MENU_LABEL(HELP_LIST), MENU_ENUM_LABEL_VALUE_HELP_CONTROLS, MENU_ENUM_LABEL_HELP_CONTROLS, @@ -1049,9 +979,7 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_SCAN_FILE, MENU_ENUM_LABEL_SCAN_FILE, - MENU_ENUM_LABEL_ADD_CONTENT_LIST, - MENU_ENUM_SUBLABEL_ADD_CONTENT_LIST, - MENU_ENUM_LABEL_VALUE_ADD_CONTENT_LIST, + MENU_LABEL(ADD_CONTENT_LIST), MENU_ENUM_LABEL_CONFIGURATIONS_LIST, MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_LIST, @@ -1113,9 +1041,7 @@ enum msg_hash_enums MENU_ENUM_LABEL_NO_PERFORMANCE_COUNTERS, MENU_ENUM_LABEL_VALUE_NO_PERFORMANCE_COUNTERS, - MENU_ENUM_LABEL_FRAME_THROTTLE_SETTINGS, - MENU_ENUM_SUBLABEL_FRAME_THROTTLE_SETTINGS, - MENU_ENUM_LABEL_VALUE_FRAME_THROTTLE_SETTINGS, + MENU_LABEL(FRAME_THROTTLE_SETTINGS), MENU_ENUM_LABEL_FRAME_THROTTLE_ENABLE, MENU_ENUM_LABEL_VALUE_FRAME_THROTTLE_ENABLE, @@ -1180,13 +1106,8 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_NO_CORES_AVAILABLE, /* Audio */ - MENU_ENUM_LABEL_AUDIO_ENABLE, - MENU_ENUM_SUBLABEL_AUDIO_ENABLE, - MENU_ENUM_LABEL_VALUE_AUDIO_ENABLE, - - MENU_ENUM_LABEL_AUDIO_MAX_TIMING_SKEW, - MENU_ENUM_SUBLABEL_AUDIO_MAX_TIMING_SKEW, - MENU_ENUM_LABEL_VALUE_AUDIO_MAX_TIMING_SKEW, + MENU_LABEL(AUDIO_ENABLE), + MENU_LABEL(AUDIO_MAX_TIMING_SKEW), MENU_ENUM_LABEL_AUDIO_OUTPUT_RATE, MENU_ENUM_LABEL_VALUE_AUDIO_OUTPUT_RATE, @@ -1200,25 +1121,11 @@ enum msg_hash_enums MENU_ENUM_LABEL_AUDIO_DSP_PLUGIN, MENU_ENUM_LABEL_VALUE_AUDIO_DSP_PLUGIN, - MENU_ENUM_LABEL_AUDIO_MUTE, - MENU_ENUM_SUBLABEL_AUDIO_MUTE, - MENU_ENUM_LABEL_VALUE_AUDIO_MUTE, - - MENU_ENUM_LABEL_AUDIO_SYNC, - MENU_ENUM_SUBLABEL_AUDIO_SYNC, - MENU_ENUM_LABEL_VALUE_AUDIO_SYNC, - - MENU_ENUM_LABEL_AUDIO_VOLUME, - MENU_ENUM_SUBLABEL_AUDIO_VOLUME, - MENU_ENUM_LABEL_VALUE_AUDIO_VOLUME, - - MENU_ENUM_LABEL_AUDIO_RATE_CONTROL_DELTA, - MENU_ENUM_SUBLABEL_AUDIO_RATE_CONTROL_DELTA, - MENU_ENUM_LABEL_VALUE_AUDIO_RATE_CONTROL_DELTA, - - MENU_ENUM_LABEL_AUDIO_LATENCY, - MENU_ENUM_SUBLABEL_AUDIO_LATENCY, - MENU_ENUM_LABEL_VALUE_AUDIO_LATENCY, + MENU_LABEL(AUDIO_MUTE), + MENU_LABEL(AUDIO_SYNC), + MENU_LABEL(AUDIO_VOLUME), + MENU_LABEL(AUDIO_RATE_CONTROL_DELTA), + MENU_LABEL(AUDIO_LATENCY), MENU_ENUM_LABEL_SAVE_STATE, MENU_ENUM_LABEL_VALUE_LOAD_STATE, @@ -1237,9 +1144,7 @@ enum msg_hash_enums MENU_ENUM_LABEL_SHADER_PREV, MENU_ENUM_LABEL_FRAME_ADVANCE, - MENU_ENUM_LABEL_FPS_SHOW, - MENU_ENUM_SUBLABEL_FPS_SHOW, - MENU_ENUM_LABEL_VALUE_FPS_SHOW, + MENU_LABEL(FPS_SHOW), MENU_ENUM_LABEL_MOVIE_RECORD_TOGGLE, MENU_ENUM_LABEL_L_X_PLUS, @@ -1285,9 +1190,7 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_LOAD, MENU_ENUM_LABEL_SYSTEM_DIRECTORY, - MENU_ENUM_LABEL_SUSPEND_SCREENSAVER_ENABLE, - MENU_ENUM_SUBLABEL_SUSPEND_SCREENSAVER_ENABLE, - MENU_ENUM_LABEL_VALUE_SUSPEND_SCREENSAVER_ENABLE, + MENU_LABEL(SUSPEND_SCREENSAVER_ENABLE), MENU_ENUM_LABEL_DPI_OVERRIDE_ENABLE, MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_ENABLE, @@ -1297,25 +1200,15 @@ enum msg_hash_enums MENU_ENUM_LABEL_VOLUME_UP, MENU_ENUM_LABEL_VOLUME_DOWN, - MENU_ENUM_LABEL_LOG_VERBOSITY, - MENU_ENUM_SUBLABEL_LOG_VERBOSITY, - MENU_ENUM_LABEL_VALUE_LOG_VERBOSITY, + MENU_LABEL(LOG_VERBOSITY), MENU_ENUM_LABEL_OVERLAY_NEXT, MENU_ENUM_LABEL_NETPLAY_ENABLE, MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE, - MENU_ENUM_LABEL_SSH_ENABLE, - MENU_ENUM_SUBLABEL_SSH_ENABLE, - MENU_ENUM_LABEL_VALUE_SSH_ENABLE, - - MENU_ENUM_LABEL_SAMBA_ENABLE, - MENU_ENUM_SUBLABEL_SAMBA_ENABLE, - MENU_ENUM_LABEL_VALUE_SAMBA_ENABLE, - - MENU_ENUM_LABEL_BLUETOOTH_ENABLE, - MENU_ENUM_SUBLABEL_BLUETOOTH_ENABLE, - MENU_ENUM_LABEL_VALUE_BLUETOOTH_ENABLE, + MENU_LABEL(SSH_ENABLE), + MENU_LABEL(SAMBA_ENABLE), + MENU_LABEL(BLUETOOTH_ENABLE), MENU_ENUM_LABEL_NETPLAY_CLIENT_SWAP_INPUT, MENU_ENUM_LABEL_VALUE_NETPLAY_CLIENT_SWAP_INPUT, @@ -1369,16 +1262,12 @@ enum msg_hash_enums MENU_ENUM_LABEL_AUTOSAVE_INTERVAL, MENU_ENUM_LABEL_VALUE_AUTOSAVE_INTERVAL, - MENU_ENUM_LABEL_CONFIG_SAVE_ON_EXIT, - MENU_ENUM_SUBLABEL_CONFIG_SAVE_ON_EXIT, - MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT, + MENU_LABEL(CONFIG_SAVE_ON_EXIT), MENU_ENUM_LABEL_CONFIRM_ON_EXIT, MENU_ENUM_LABEL_VALUE_CONFIRM_ON_EXIT, - MENU_ENUM_LABEL_SHOW_HIDDEN_FILES, - MENU_ENUM_SUBLABEL_SHOW_HIDDEN_FILES, - MENU_ENUM_LABEL_VALUE_SHOW_HIDDEN_FILES, + MENU_LABEL(SHOW_HIDDEN_FILES), /* Driver settings */ @@ -1434,13 +1323,8 @@ enum msg_hash_enums /* Privacy settings */ - MENU_ENUM_LABEL_CAMERA_ALLOW, - MENU_ENUM_SUBLABEL_CAMERA_ALLOW, - MENU_ENUM_LABEL_VALUE_CAMERA_ALLOW, - - MENU_ENUM_LABEL_LOCATION_ALLOW, - MENU_ENUM_SUBLABEL_LOCATION_ALLOW, - MENU_ENUM_LABEL_VALUE_LOCATION_ALLOW, + MENU_LABEL(CAMERA_ALLOW), + MENU_LABEL(LOCATION_ALLOW), /* RDB Settings */ @@ -1554,9 +1438,7 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_MAIN_MENU, MENU_ENUM_LABEL_VALUE_SETTINGS, - MENU_ENUM_LABEL_INPUT_SETTINGS, - MENU_ENUM_SUBLABEL_INPUT_SETTINGS, - MENU_ENUM_LABEL_VALUE_INPUT_SETTINGS, + MENU_LABEL(INPUT_SETTINGS), MENU_ENUM_LABEL_VALUE_ON, MENU_ENUM_LABEL_VALUE_OFF, @@ -1604,9 +1486,7 @@ enum msg_hash_enums MENU_ENUM_LABEL_NETWORK_REMOTE_USER_LAST_ENABLE = MENU_ENUM_LABEL_NETWORK_REMOTE_USER_1_ENABLE + MAX_USERS, - MENU_ENUM_LABEL_DUMMY_ON_CORE_SHUTDOWN, - MENU_ENUM_SUBLABEL_DUMMY_ON_CORE_SHUTDOWN, - MENU_ENUM_LABEL_VALUE_DUMMY_ON_CORE_SHUTDOWN, + MENU_LABEL(DUMMY_ON_CORE_SHUTDOWN), MENU_ENUM_LABEL_VALUE_STDIN_CMD_ENABLE, MENU_ENUM_LABEL_VALUE_NETWORK_REMOTE_ENABLE, @@ -1643,13 +1523,8 @@ enum msg_hash_enums MENU_ENUM_LABEL_ONLINE, MENU_ENUM_LABEL_VALUE_ONLINE, - MENU_ENUM_LABEL_ONLINE_UPDATER, - MENU_ENUM_SUBLABEL_ONLINE_UPDATER, - MENU_ENUM_LABEL_VALUE_ONLINE_UPDATER, - - MENU_ENUM_LABEL_NETPLAY, - MENU_ENUM_SUBLABEL_NETPLAY, - MENU_ENUM_LABEL_VALUE_NETPLAY, + MENU_LABEL(ONLINE_UPDATER), + MENU_LABEL(NETPLAY), MENU_ENUM_LABEL_SETTINGS, MENU_ENUM_LABEL_FRONTEND_COUNTERS, @@ -1756,39 +1631,21 @@ enum msg_hash_enums MENU_ENUM_LABEL_JOYPAD_AUTOCONFIG_DIR, MENU_ENUM_LABEL_VALUE_JOYPAD_AUTOCONFIG_DIR, - MENU_ENUM_LABEL_DRIVER_SETTINGS, - MENU_ENUM_SUBLABEL_DRIVER_SETTINGS, - MENU_ENUM_LABEL_VALUE_DRIVER_SETTINGS, - - MENU_ENUM_LABEL_VALUE_VIDEO_SETTINGS, - MENU_ENUM_SUBLABEL_VIDEO_SETTINGS, - MENU_ENUM_LABEL_VIDEO_SETTINGS, - - MENU_ENUM_LABEL_AUDIO_SETTINGS, - MENU_ENUM_SUBLABEL_AUDIO_SETTINGS, - MENU_ENUM_LABEL_VALUE_AUDIO_SETTINGS, - - MENU_ENUM_LABEL_CORE_SETTINGS, - MENU_ENUM_SUBLABEL_CORE_SETTINGS, - MENU_ENUM_LABEL_VALUE_CORE_SETTINGS, + MENU_LABEL(DRIVER_SETTINGS), + MENU_LABEL(VIDEO_SETTINGS), + MENU_LABEL(AUDIO_SETTINGS), + MENU_LABEL(CORE_SETTINGS), MENU_ENUM_LABEL_CONFIGURATION_SETTINGS, MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS, - MENU_ENUM_LABEL_LOGGING_SETTINGS, - MENU_ENUM_SUBLABEL_LOGGING_SETTINGS, - MENU_ENUM_LABEL_VALUE_LOGGING_SETTINGS, - - MENU_ENUM_LABEL_SAVING_SETTINGS, - MENU_ENUM_SUBLABEL_SAVING_SETTINGS, - MENU_ENUM_LABEL_VALUE_SAVING_SETTINGS, + MENU_LABEL(LOGGING_SETTINGS), + MENU_LABEL(SAVING_SETTINGS), MENU_ENUM_LABEL_REWIND_SETTINGS, MENU_ENUM_LABEL_VALUE_REWIND_SETTINGS, - MENU_ENUM_LABEL_RECORDING_SETTINGS, - MENU_ENUM_SUBLABEL_RECORDING_SETTINGS, - MENU_ENUM_LABEL_VALUE_RECORDING_SETTINGS, + MENU_LABEL(RECORDING_SETTINGS), MENU_ENUM_LABEL_SHADER_SETTINGS, MENU_ENUM_LABEL_FONT_SETTINGS, @@ -1801,9 +1658,7 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_MENU_ENUM_SETTINGS, MENU_ENUM_LABEL_PATCH_SETTINGS, - MENU_ENUM_LABEL_PLAYLIST_SETTINGS, - MENU_ENUM_SUBLABEL_PLAYLIST_SETTINGS, - MENU_ENUM_LABEL_VALUE_PLAYLIST_SETTINGS, + MENU_LABEL(PLAYLIST_SETTINGS), MENU_ENUM_LABEL_CORE_UPDATER_SETTINGS, MENU_ENUM_LABEL_VALUE_CORE_UPDATER_SETTINGS, @@ -1815,9 +1670,7 @@ enum msg_hash_enums MENU_ENUM_LABEL_SAVE_NEW_CONFIG, MENU_ENUM_LABEL_VALUE_SAVE_NEW_CONFIG, - MENU_ENUM_LABEL_ONSCREEN_DISPLAY_SETTINGS, - MENU_ENUM_SUBLABEL_ONSCREEN_DISPLAY_SETTINGS, - MENU_ENUM_LABEL_VALUE_ONSCREEN_DISPLAY_SETTINGS, + MENU_LABEL(ONSCREEN_DISPLAY_SETTINGS), MENU_ENUM_LABEL_ONSCREEN_OVERLAY_SETTINGS, MENU_ENUM_LABEL_VALUE_ONSCREEN_OVERLAY_SETTINGS, @@ -1859,9 +1712,7 @@ enum msg_hash_enums MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_CORE, MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_GAME, - MENU_ENUM_LABEL_USER_LANGUAGE, - MENU_ENUM_SUBLABEL_USER_LANGUAGE, - MENU_ENUM_LABEL_VALUE_USER_LANGUAGE, + MENU_LABEL(USER_LANGUAGE), MENU_ENUM_LABEL_NETPLAY_NICKNAME, MENU_ENUM_LABEL_VALUE_NETPLAY_NICKNAME,