diff --git a/msg_hash.h b/msg_hash.h index b7f3badb97..7b1ea59d72 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -434,8 +434,7 @@ enum msg_hash_enums MENU_ENUM_LABEL_INPUT_SETTINGS_BEGIN, MENU_ENUM_LABEL_INPUT_OVERLAY_HIDE_IN_MENU, - MENU_ENUM_LABEL_INPUT_HOTKEY_BINDS, - MENU_ENUM_SUBLABEL_INPUT_HOTKEY_BINDS, + MENU_LABEL(INPUT_HOTKEY_BINDS), MENU_ENUM_LABEL_INPUT_HOTKEY_BINDS_BEGIN, @@ -475,7 +474,10 @@ enum msg_hash_enums MENU_ENUM_LABEL_INPUT_USER_16_BINDS, MENU_ENUM_LABEL_INPUT_HOTKEY_SETTINGS, MENU_ENUM_LABEL_INPUT_AUTODETECT_ENABLE, + MENU_ENUM_LABEL_INPUT_REMAPPING_DIRECTORY, + MENU_ENUM_LABEL_VALUE_INPUT_REMAPPING_DIRECTORY, + MENU_ENUM_LABEL_INPUT_BIND_MODE, MENU_ENUM_LABEL_INPUT_DESCRIPTOR_HIDE_UNBOUND, MENU_ENUM_LABEL_INPUT_DESCRIPTOR_LABEL_SHOW, @@ -555,8 +557,7 @@ enum msg_hash_enums MENU_LABEL(INPUT_MAX_USERS), - MENU_ENUM_LABEL_VALUE_INPUT_USER_BINDS, - MENU_ENUM_SUBLABEL_INPUT_USER_BINDS, + MENU_LABEL(INPUT_USER_BINDS), MENU_LABEL(INPUT_DUTY_CYCLE), @@ -571,7 +572,6 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_MENU_INPUT_SWAP_OK_CANCEL, MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_ENABLE, MENU_ENUM_LABEL_VALUE_INPUT_OSK_OVERLAY_ENABLE, - MENU_ENUM_LABEL_VALUE_INPUT_HOTKEY_BINDS, MENU_LABEL(INPUT_MENU_ENUM_TOGGLE_GAMEPAD_COMBO), @@ -586,19 +586,17 @@ enum msg_hash_enums MENU_LABEL(INPUT_POLL_TYPE_BEHAVIOR), /* Video */ - MENU_ENUM_LABEL_VIDEO_FONT_ENABLE, - MENU_ENUM_LABEL_VIDEO_FONT_PATH, - MENU_ENUM_LABEL_VIDEO_FONT_SIZE, - MENU_ENUM_LABEL_VIDEO_MESSAGE_POS_X, - MENU_ENUM_LABEL_VIDEO_MESSAGE_POS_Y, - MENU_ENUM_LABEL_VIDEO_FILTER_FLICKER, - MENU_ENUM_LABEL_VIDEO_SOFT_FILTER, - MENU_ENUM_LABEL_VIDEO_SWAP_INTERVAL, + MENU_LABEL(VIDEO_FONT_ENABLE), + MENU_LABEL(VIDEO_FONT_PATH), + MENU_LABEL(VIDEO_FONT_SIZE), + MENU_LABEL(VIDEO_MESSAGE_POS_X), + MENU_LABEL(VIDEO_MESSAGE_POS_Y), + MENU_LABEL(VIDEO_FILTER_FLICKER), + MENU_LABEL(VIDEO_SOFT_FILTER), MENU_LABEL(VIDEO_MAX_SWAPCHAIN_IMAGES), + MENU_LABEL(VIDEO_GPU_SCREENSHOT), - MENU_ENUM_LABEL_VIDEO_GPU_SCREENSHOT, - MENU_ENUM_LABEL_VIDEO_FULLSCREEN, MENU_LABEL(VIDEO_BLACK_FRAME_INSERTION), MENU_LABEL(VIDEO_FRAME_DELAY), @@ -617,31 +615,19 @@ enum msg_hash_enums MENU_ENUM_LABEL_VIDEO_VIEWPORT_CUSTOM_Y, MENU_ENUM_LABEL_VIDEO_VIEWPORT_CUSTOM_WIDTH, MENU_ENUM_LABEL_VIDEO_VIEWPORT_CUSTOM_HEIGHT, - MENU_ENUM_LABEL_VIDEO_GAMMA, + MENU_LABEL(VIDEO_GAMMA), 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, - MENU_ENUM_LABEL_VALUE_VIDEO_FONT_ENABLE, - MENU_ENUM_LABEL_VALUE_VIDEO_FONT_PATH, - MENU_ENUM_LABEL_VALUE_VIDEO_FONT_SIZE, - MENU_ENUM_LABEL_VALUE_VIDEO_MESSAGE_POS_X, - MENU_ENUM_LABEL_VALUE_VIDEO_MESSAGE_POS_Y, - MENU_ENUM_LABEL_VALUE_VIDEO_FILTER_FLICKER, - MENU_ENUM_LABEL_VALUE_VIDEO_SOFT_FILTER, MENU_ENUM_LABEL_VALUE_VIDEO_ROTATION, - MENU_ENUM_LABEL_VALUE_VIDEO_SWAP_INTERVAL, - MENU_ENUM_LABEL_VALUE_VIDEO_GPU_SCREENSHOT, - MENU_ENUM_LABEL_VALUE_VIDEO_FULLSCREEN, - MENU_ENUM_LABEL_VALUE_VIDEO_FORCE_ASPECT, - MENU_ENUM_LABEL_VALUE_VIDEO_ASPECT_RATIO_AUTO, - MENU_ENUM_LABEL_VALUE_VIDEO_ASPECT_RATIO_INDEX, - MENU_ENUM_LABEL_VALUE_VIDEO_VFILTER, - MENU_ENUM_LABEL_VALUE_VIDEO_GPU_RECORD, - MENU_ENUM_LABEL_VALUE_VIDEO_GAMMA, + + MENU_LABEL(VIDEO_SWAP_INTERVAL), + + MENU_LABEL(VIDEO_FULLSCREEN), + MENU_LABEL(VIDEO_MONITOR_INDEX), @@ -672,20 +658,11 @@ enum msg_hash_enums /* Menu settings */ - MENU_ENUM_LABEL_MENU_WALLPAPER, - MENU_ENUM_LABEL_VALUE_MENU_WALLPAPER, - - MENU_ENUM_LABEL_DYNAMIC_WALLPAPER, - MENU_ENUM_LABEL_VALUE_DYNAMIC_WALLPAPER, - - MENU_ENUM_LABEL_PAUSE_NONACTIVE, - MENU_ENUM_LABEL_VALUE_PAUSE_NONACTIVE, - - MENU_ENUM_LABEL_MOUSE_ENABLE, - MENU_ENUM_LABEL_VALUE_MOUSE_ENABLE, - - MENU_ENUM_LABEL_POINTER_ENABLE, - MENU_ENUM_LABEL_VALUE_POINTER_ENABLE, + MENU_LABEL(MENU_WALLPAPER), + MENU_LABEL(DYNAMIC_WALLPAPER), + MENU_LABEL(PAUSE_NONACTIVE), + MENU_LABEL(MOUSE_ENABLE), + MENU_LABEL(POINTER_ENABLE), MENU_ENUM_LABEL_MENU_LINEAR_FILTER, MENU_ENUM_LABEL_VALUE_MENU_LINEAR_FILTER, @@ -737,13 +714,10 @@ enum msg_hash_enums /* UI settings */ MENU_ENUM_LABEL_VIDEO_DISABLE_COMPOSITION, - MENU_ENUM_LABEL_UI_COMPANION_ENABLE, - MENU_ENUM_LABEL_UI_COMPANION_START_ON_BOOT, - MENU_ENUM_LABEL_UI_MENUBAR_ENABLE, - MENU_ENUM_LABEL_VALUE_UI_COMPANION_ENABLE, - MENU_ENUM_LABEL_VALUE_UI_COMPANION_START_ON_BOOT, - MENU_ENUM_LABEL_VALUE_UI_MENUBAR_ENABLE, + MENU_LABEL(UI_COMPANION_ENABLE), + MENU_LABEL(UI_COMPANION_START_ON_BOOT), + MENU_LABEL(UI_MENUBAR_ENABLE), MENU_ENUM_LABEL_FILE_CONFIG, MENU_ENUM_LABEL_FILE_BROWSER_COMPRESSED_ARCHIVE, @@ -833,11 +807,9 @@ enum msg_hash_enums MENU_ENUM_LABEL_MENU_ENUM_LINEAR_FILTER, MENU_ENUM_LABEL_VALUE_MENU_ENUM_LINEAR_FILTER, - MENU_ENUM_LABEL_MENU_ENUM_THROTTLE_FRAMERATE, - MENU_ENUM_LABEL_VALUE_MENU_ENUM_THROTTLE_FRAMERATE, + MENU_LABEL(MENU_ENUM_THROTTLE_FRAMERATE), - MENU_ENUM_LABEL_STATE_SLOT, - MENU_ENUM_LABEL_VALUE_STATE_SLOT, + MENU_LABEL(STATE_SLOT), MENU_ENUM_LABEL_PLAYLIST_SETTINGS_BEGIN, @@ -880,16 +852,10 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_MENU_ENUM_CONTROLS_PROLOG, - MENU_ENUM_LABEL_VALUE_HELP_WHAT_IS_A_CORE, - MENU_ENUM_LABEL_HELP_WHAT_IS_A_CORE, - - MENU_ENUM_LABEL_HELP_LOADING_CONTENT, - MENU_ENUM_LABEL_VALUE_HELP_LOADING_CONTENT, - + MENU_LABEL(HELP_WHAT_IS_A_CORE), + MENU_LABEL(HELP_LOADING_CONTENT), MENU_LABEL(HELP_LIST), - - MENU_ENUM_LABEL_VALUE_HELP_CONTROLS, - MENU_ENUM_LABEL_HELP_CONTROLS, + MENU_LABEL(HELP_CONTROLS), MENU_ENUM_LABEL_VALUE_EXTRACTING_PLEASE_WAIT, @@ -966,23 +932,13 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_SEARCH, - MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE_CONTENT, - MENU_ENUM_LABEL_DOWNLOAD_CORE_CONTENT, - MENU_ENUM_LABEL_DOWNLOAD_CORE_CONTENT_DIRS, - - MENU_ENUM_LABEL_SCAN_THIS_DIRECTORY, - MENU_ENUM_LABEL_VALUE_SCAN_THIS_DIRECTORY, - - MENU_ENUM_LABEL_SCAN_DIRECTORY, - MENU_ENUM_LABEL_VALUE_SCAN_DIRECTORY, - - MENU_ENUM_LABEL_VALUE_SCAN_FILE, - MENU_ENUM_LABEL_SCAN_FILE, - + MENU_LABEL(DOWNLOAD_CORE_CONTENT), + MENU_LABEL(DOWNLOAD_CORE_CONTENT_DIRS), + MENU_LABEL(SCAN_THIS_DIRECTORY), + MENU_LABEL(SCAN_DIRECTORY), + MENU_LABEL(SCAN_FILE), MENU_LABEL(ADD_CONTENT_LIST), - - MENU_ENUM_LABEL_CONFIGURATIONS_LIST, - MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_LIST, + MENU_LABEL(CONFIGURATIONS_LIST), MENU_ENUM_LABEL_VALUE_DONT_CARE, MENU_ENUM_LABEL_VALUE_LINEAR, @@ -1021,33 +977,16 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_UPDATE_GLSL_SHADERS, MENU_ENUM_LABEL_VALUE_UPDATE_SLANG_SHADERS, - MENU_ENUM_LABEL_INFORMATION, - MENU_ENUM_LABEL_VALUE_INFORMATION, - MENU_ENUM_LABEL_INFORMATION_LIST, - MENU_ENUM_LABEL_VALUE_INFORMATION_LIST, - - MENU_ENUM_LABEL_USE_BUILTIN_PLAYER, - MENU_ENUM_LABEL_VALUE_USE_BUILTIN_PLAYER, - - MENU_ENUM_LABEL_CONTENT_SETTINGS, - MENU_ENUM_LABEL_VALUE_CONTENT_SETTINGS, - - MENU_ENUM_LABEL_LOAD_CONTENT_LIST, - MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_LIST, - - MENU_ENUM_LABEL_NO_SETTINGS_FOUND, - MENU_ENUM_LABEL_VALUE_NO_SETTINGS_FOUND, - - MENU_ENUM_LABEL_NO_PERFORMANCE_COUNTERS, - MENU_ENUM_LABEL_VALUE_NO_PERFORMANCE_COUNTERS, - + MENU_LABEL(INFORMATION), + MENU_LABEL(INFORMATION_LIST), + MENU_LABEL(USE_BUILTIN_PLAYER), + MENU_LABEL(CONTENT_SETTINGS), + MENU_LABEL(LOAD_CONTENT_LIST), + MENU_LABEL(NO_SETTINGS_FOUND), + MENU_LABEL(NO_PERFORMANCE_COUNTERS), MENU_LABEL(FRAME_THROTTLE_SETTINGS), - - MENU_ENUM_LABEL_FRAME_THROTTLE_ENABLE, - MENU_ENUM_LABEL_VALUE_FRAME_THROTTLE_ENABLE, - - MENU_ENUM_LABEL_CORE_ENABLE, - MENU_ENUM_LABEL_VALUE_CORE_ENABLE, + MENU_LABEL(FRAME_THROTTLE_ENABLE), + MENU_LABEL(CORE_ENABLE), /* Netplay */ @@ -1091,12 +1030,11 @@ enum msg_hash_enums MSG_APPLICATION_DIR, MSG_EXTERNAL_APPLICATION_DIR, - MENU_ENUM_LABEL_ARCHIVE_MODE, - MENU_ENUM_LABEL_VALUE_ARCHIVE_MODE, - MENU_ENUM_LABEL_VALUE_SHADER_OPTIONS, - MENU_ENUM_LABEL_VALUE_USE_THIS_DIRECTORY, - MENU_ENUM_LABEL_USE_THIS_DIRECTORY, - MENU_ENUM_LABEL_VALUE_CORE_OPTIONS, + MENU_LABEL(ARCHIVE_MODE), + MENU_LABEL(SHADER_OPTIONS), + MENU_LABEL(USE_THIS_DIRECTORY), + MENU_LABEL(CORE_OPTIONS), + MENU_ENUM_LABEL_VALUE_NO_SHADER_PARAMETERS, MENU_ENUM_LABEL_NO_CORE_INFORMATION_AVAILABLE, @@ -1139,7 +1077,6 @@ enum msg_hash_enums MENU_ENUM_LABEL_NETPLAY_FLIP_PLAYERS, MENU_ENUM_LABEL_CHEAT_INDEX_MINUS, MENU_ENUM_LABEL_CHEAT_INDEX_PLUS, - MENU_ENUM_LABEL_SCREENSHOT_DIRECTORY, MENU_ENUM_LABEL_SHADER_NEXT, MENU_ENUM_LABEL_SHADER_PREV, MENU_ENUM_LABEL_FRAME_ADVANCE, @@ -1188,7 +1125,6 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_INDEX, MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_SAVE, MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_LOAD, - MENU_ENUM_LABEL_SYSTEM_DIRECTORY, MENU_LABEL(SUSPEND_SCREENSAVER_ENABLE), @@ -1410,34 +1346,15 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_CRC, MENU_ENUM_LABEL_VALUE_MORE, - MENU_ENUM_LABEL_VIDEO_TAB, - MENU_ENUM_LABEL_VALUE_VIDEO_TAB, - - MENU_ENUM_LABEL_MUSIC_TAB, - MENU_ENUM_LABEL_VALUE_MUSIC_TAB, - - MENU_ENUM_LABEL_IMAGES_TAB, - MENU_ENUM_LABEL_VALUE_IMAGES_TAB, - - MENU_ENUM_LABEL_HORIZONTAL_MENU, - MENU_ENUM_LABEL_VALUE_HORIZONTAL_MENU, - - MENU_ENUM_LABEL_SETTINGS_TAB, - MENU_ENUM_LABEL_VALUE_SETTINGS_TAB, - - MENU_ENUM_LABEL_HISTORY_TAB, - MENU_ENUM_LABEL_VALUE_HISTORY_TAB, - - MENU_ENUM_LABEL_ADD_TAB, - MENU_ENUM_LABEL_VALUE_ADD_TAB, - - MENU_ENUM_LABEL_PLAYLISTS_TAB, - MENU_ENUM_LABEL_VALUE_PLAYLISTS_TAB, - - MENU_ENUM_LABEL_MAIN_MENU, - MENU_ENUM_LABEL_VALUE_MAIN_MENU, - MENU_ENUM_LABEL_VALUE_SETTINGS, - + MENU_LABEL(VIDEO_TAB), + MENU_LABEL(MUSIC_TAB), + MENU_LABEL(IMAGES_TAB), + MENU_LABEL(HORIZONTAL_MENU), + MENU_LABEL(SETTINGS_TAB), + MENU_LABEL(HISTORY_TAB), + MENU_LABEL(ADD_TAB), + MENU_LABEL(PLAYLISTS_TAB), + MENU_LABEL(MAIN_MENU), MENU_LABEL(INPUT_SETTINGS), MENU_ENUM_LABEL_VALUE_ON, @@ -1516,40 +1433,27 @@ enum msg_hash_enums MENU_ENUM_LABEL_REBOOT, MENU_ENUM_LABEL_VALUE_REBOOT, MENU_ENUM_LABEL_DISK_IMAGE_APPEND, - MENU_ENUM_LABEL_CORE_LIST, - MENU_ENUM_LABEL_VALUE_CORE_LIST, - MENU_ENUM_LABEL_MANAGEMENT, - MENU_ENUM_LABEL_VALUE_MANAGEMENT, - MENU_ENUM_LABEL_ONLINE, - MENU_ENUM_LABEL_VALUE_ONLINE, - + MENU_LABEL(CORE_LIST), + MENU_LABEL(MANAGEMENT), + MENU_LABEL(ONLINE), MENU_LABEL(ONLINE_UPDATER), MENU_LABEL(NETPLAY), + MENU_LABEL(SETTINGS), + MENU_LABEL(FRONTEND_COUNTERS), + MENU_LABEL(CORE_COUNTERS), + MENU_LABEL(LOAD_CONTENT_HISTORY), + MENU_LABEL(NETWORK_INFORMATION), + MENU_LABEL(SYSTEM_INFORMATION), + MENU_LABEL(ACHIEVEMENT_LIST), + MENU_LABEL(ACHIEVEMENT_LIST_HARDCORE), + MENU_LABEL(CORE_INFORMATION), - MENU_ENUM_LABEL_SETTINGS, - MENU_ENUM_LABEL_FRONTEND_COUNTERS, - MENU_ENUM_LABEL_VALUE_FRONTEND_COUNTERS, - MENU_ENUM_LABEL_VALUE_CORE_COUNTERS, - MENU_ENUM_LABEL_CORE_COUNTERS, - MENU_ENUM_LABEL_LOAD_CONTENT_HISTORY, - MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_HISTORY, - MENU_ENUM_LABEL_NETWORK_INFORMATION, - MENU_ENUM_LABEL_VALUE_NETWORK_INFORMATION, - MENU_ENUM_LABEL_SYSTEM_INFORMATION, - MENU_ENUM_LABEL_ACHIEVEMENT_LIST, - MENU_ENUM_LABEL_ACHIEVEMENT_LIST_HARDCORE, - MENU_ENUM_LABEL_VALUE_SYSTEM_INFORMATION, - MENU_ENUM_LABEL_VALUE_ACHIEVEMENT_LIST, - MENU_ENUM_LABEL_VALUE_ACHIEVEMENT_LIST_HARDCORE, - MENU_ENUM_LABEL_CORE_INFORMATION, - MENU_ENUM_LABEL_VALUE_CORE_INFORMATION, MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PARAMETERS, MENU_ENUM_LABEL_VIDEO_SHADER_PARAMETERS, MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_PARAMETERS, MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_PARAMETERS, MENU_ENUM_LABEL_DISK_OPTIONS, MENU_ENUM_LABEL_VALUE_DISK_OPTIONS, - MENU_ENUM_LABEL_CORE_OPTIONS, MENU_ENUM_LABEL_DISK_CYCLE_TRAY_STATUS, MENU_ENUM_LABEL_VALUE_DISK_CYCLE_TRAY_STATUS, @@ -1559,11 +1463,10 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_DISK_INDEX, MENU_ENUM_LABEL_VALUE_DISK_IMAGE_APPEND, MENU_ENUM_LABEL_DISK_INDEX, - MENU_ENUM_LABEL_SHADER_OPTIONS, - MENU_ENUM_LABEL_VALUE_CORE_CHEAT_OPTIONS, - MENU_ENUM_LABEL_CORE_CHEAT_OPTIONS, - MENU_ENUM_LABEL_VALUE_CORE_INPUT_REMAPPING_OPTIONS, - MENU_ENUM_LABEL_CORE_INPUT_REMAPPING_OPTIONS, + + MENU_LABEL(CORE_CHEAT_OPTIONS), + MENU_LABEL(CORE_INPUT_REMAPPING_OPTIONS), + MENU_ENUM_LABEL_VALUE_CURSOR_MANAGER, MENU_ENUM_LABEL_VALUE_DATABASE_MANAGER, MENU_ENUM_LABEL_DATABASE_MANAGER_LIST, @@ -1572,10 +1475,10 @@ enum msg_hash_enums MENU_ENUM_LABEL_VIDEO_SHADER_PASS, MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_TWO, MENU_ENUM_LABEL_VIDEO_SHADER_PRESET, - MENU_ENUM_LABEL_CHEAT_FILE_LOAD, - MENU_ENUM_LABEL_VALUE_CHEAT_FILE_LOAD, - MENU_ENUM_LABEL_REMAP_FILE_LOAD, - MENU_ENUM_LABEL_VALUE_REMAP_FILE_LOAD, + + MENU_LABEL(CHEAT_FILE_LOAD), + MENU_LABEL(REMAP_FILE_LOAD), + MENU_ENUM_LABEL_MESSAGE, MENU_ENUM_LABEL_INFO_SCREEN, MENU_ENUM_LABEL_CUSTOM_RATIO, @@ -1584,79 +1487,52 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_HELP, MENU_ENUM_LABEL_CHEAT_DATABASE_PATH, MENU_ENUM_LABEL_VALUE_CHEAT_DATABASE_PATH, - MENU_ENUM_LABEL_CURSOR_DIRECTORY, - MENU_ENUM_LABEL_VALUE_CURSOR_DIRECTORY, - MENU_ENUM_LABEL_OSK_OVERLAY_DIRECTORY, - MENU_ENUM_LABEL_VALUE_OSK_OVERLAY_DIRECTORY, - MENU_ENUM_LABEL_RECORDING_OUTPUT_DIRECTORY, - MENU_ENUM_LABEL_VALUE_RECORDING_OUTPUT_DIRECTORY, - MENU_ENUM_LABEL_RECORDING_CONFIG_DIRECTORY, - MENU_ENUM_LABEL_VALUE_RECORDING_CONFIG_DIRECTORY, + + MENU_LABEL(CURSOR_DIRECTORY), + MENU_LABEL(OSK_OVERLAY_DIRECTORY), + MENU_LABEL(RECORDING_OUTPUT_DIRECTORY), + MENU_LABEL(RECORDING_CONFIG_DIRECTORY), + MENU_ENUM_LABEL_VIDEO_FILTER, MENU_ENUM_LABEL_PAL60_ENABLE, MENU_ENUM_LABEL_VALUE_PAL60_ENABLE, MENU_ENUM_LABEL_CONTENT_HISTORY_PATH, - MENU_ENUM_LABEL_RGUI_BROWSER_DIRECTORY, - MENU_ENUM_LABEL_VALUE_RGUI_BROWSER_DIRECTORY, - MENU_ENUM_LABEL_CONTENT_DATABASE_DIRECTORY, - MENU_ENUM_LABEL_VALUE_CONTENT_DATABASE_DIRECTORY, - MENU_ENUM_LABEL_PLAYLIST_DIRECTORY, - MENU_ENUM_LABEL_VALUE_PLAYLIST_DIRECTORY, - MENU_ENUM_LABEL_CORE_ASSETS_DIRECTORY, - MENU_ENUM_LABEL_VALUE_CORE_ASSETS_DIRECTORY, - MENU_ENUM_LABEL_CONTENT_DIRECTORY, - MENU_ENUM_LABEL_VALUE_SCREENSHOT_DIRECTORY, - MENU_ENUM_LABEL_VALUE_INPUT_REMAPPING_DIRECTORY, - MENU_ENUM_LABEL_VIDEO_SHADER_DIR, - MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_DIR, - MENU_ENUM_LABEL_VIDEO_FILTER_DIR, - MENU_ENUM_LABEL_VALUE_VIDEO_FILTER_DIR, - MENU_ENUM_LABEL_AUDIO_FILTER_DIR, - MENU_ENUM_LABEL_VALUE_AUDIO_FILTER_DIR, - MENU_ENUM_LABEL_TURBO_DEADZONE_LIST, - MENU_ENUM_LABEL_VALUE_TURBO_DEADZONE_LIST, - MENU_ENUM_LABEL_LIBRETRO_DIR_PATH, - MENU_ENUM_LABEL_VALUE_LIBRETRO_DIR_PATH, - MENU_ENUM_LABEL_LIBRETRO_INFO_PATH, - MENU_ENUM_LABEL_VALUE_LIBRETRO_INFO_PATH, - MENU_ENUM_LABEL_RGUI_CONFIG_DIRECTORY, - MENU_ENUM_LABEL_VALUE_RGUI_CONFIG_DIRECTORY, - MENU_ENUM_LABEL_OVERLAY_DIRECTORY, - MENU_ENUM_LABEL_VALUE_OVERLAY_DIRECTORY, - MENU_ENUM_LABEL_VALUE_SYSTEM_DIRECTORY, - MENU_ENUM_LABEL_ASSETS_DIRECTORY, - MENU_ENUM_LABEL_VALUE_ASSETS_DIRECTORY, - MENU_ENUM_LABEL_CACHE_DIRECTORY, - MENU_ENUM_LABEL_VALUE_CACHE_DIRECTORY, - MENU_ENUM_LABEL_JOYPAD_AUTOCONFIG_DIR, - MENU_ENUM_LABEL_VALUE_JOYPAD_AUTOCONFIG_DIR, + MENU_LABEL(RGUI_BROWSER_DIRECTORY), + MENU_LABEL(CONTENT_DATABASE_DIRECTORY), + MENU_LABEL(PLAYLIST_DIRECTORY), + MENU_LABEL(CORE_ASSETS_DIRECTORY), + MENU_LABEL(SCREENSHOT_DIRECTORY), + MENU_LABEL(CONTENT_DIRECTORY), + MENU_LABEL(VIDEO_SHADER_DIR), + MENU_LABEL(VIDEO_FILTER_DIR), + MENU_LABEL(AUDIO_FILTER_DIR), + + MENU_LABEL(TURBO_DEADZONE_LIST), + MENU_LABEL(LIBRETRO_DIR_PATH), + MENU_LABEL(LIBRETRO_INFO_PATH), + MENU_LABEL(RGUI_CONFIG_DIRECTORY), + MENU_LABEL(OVERLAY_DIRECTORY), + MENU_LABEL(SYSTEM_DIRECTORY), + MENU_LABEL(ASSETS_DIRECTORY), + MENU_LABEL(CACHE_DIRECTORY), + MENU_LABEL(JOYPAD_AUTOCONFIG_DIR), 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_LABEL(CONFIGURATION_SETTINGS), MENU_LABEL(LOGGING_SETTINGS), MENU_LABEL(SAVING_SETTINGS), - - MENU_ENUM_LABEL_REWIND_SETTINGS, - MENU_ENUM_LABEL_VALUE_REWIND_SETTINGS, - MENU_LABEL(RECORDING_SETTINGS), + MENU_LABEL(OVERLAY_SETTINGS), + MENU_LABEL(REWIND_SETTINGS), - MENU_ENUM_LABEL_SHADER_SETTINGS, - MENU_ENUM_LABEL_FONT_SETTINGS, - MENU_ENUM_LABEL_OVERLAY_SETTINGS, - MENU_ENUM_LABEL_VALUE_OVERLAY_SETTINGS, - MENU_ENUM_LABEL_ONSCREEN_KEYBOARD_OVERLAY_SETTINGS, - MENU_ENUM_LABEL_VALUE_MULTIMEDIA_SETTINGS, - MENU_ENUM_LABEL_VALUE_MENU_ENUM_FILE_BROWSER_SETTINGS, - MENU_ENUM_LABEL_MENU_ENUM_SETTINGS, - MENU_ENUM_LABEL_VALUE_MENU_ENUM_SETTINGS, - MENU_ENUM_LABEL_PATCH_SETTINGS, + MENU_ENUM_LABEL_ONSCREEN_KEYBOARD_OVERLAY_SETTINGS, + + MENU_LABEL(MENU_ENUM_SETTINGS), /* TODO: remove? */ + MENU_ENUM_LABEL_VALUE_MULTIMEDIA_SETTINGS, /* TODO: remove ? */ + MENU_ENUM_LABEL_PATCH_SETTINGS, /* TODO: remove ? */ MENU_LABEL(PLAYLIST_SETTINGS), @@ -1675,69 +1551,51 @@ enum msg_hash_enums MENU_ENUM_LABEL_ONSCREEN_OVERLAY_SETTINGS, MENU_ENUM_LABEL_VALUE_ONSCREEN_OVERLAY_SETTINGS, - MENU_ENUM_LABEL_CHEAT_APPLY_CHANGES, - MENU_ENUM_LABEL_CHEAT_FILE_SAVE_AS, + MENU_LABEL(CHEAT_APPLY_CHANGES), + MENU_ENUM_LABEL_COLLECTION, - MENU_ENUM_LABEL_CONFIGURATIONS, - MENU_ENUM_LABEL_CONTENT_COLLECTION_LIST, + MENU_LABEL(CONFIGURATIONS), + MENU_LABEL(CONTENT_COLLECTION_LIST), + MENU_ENUM_LABEL_CUSTOM_BIND, + MENU_ENUM_LABEL_CUSTOM_BIND_ALL, + MENU_ENUM_LABEL_CUSTOM_BIND_DEFAULTS, - MENU_ENUM_LABEL_DELETE_ENTRY, MENU_ENUM_LABEL_EXIT_EMULATOR, MENU_ENUM_LABEL_OSK_ENABLE, - MENU_ENUM_LABEL_REMAP_FILE_SAVE_CORE, - MENU_ENUM_LABEL_REMAP_FILE_SAVE_GAME, - MENU_ENUM_LABEL_RESTART_CONTENT, - MENU_ENUM_LABEL_RESTART_RETROARCH, - MENU_ENUM_LABEL_RESUME_CONTENT, - MENU_ENUM_LABEL_TAKE_SCREENSHOT, - MENU_ENUM_LABEL_VALUE_CHEAT_APPLY_CHANGES, - MENU_ENUM_LABEL_VALUE_CHEAT_FILE_SAVE_AS, - MENU_ENUM_LABEL_VALUE_CONFIGURATIONS, - MENU_ENUM_LABEL_VALUE_CONTENT_COLLECTION_LIST, - MENU_ENUM_LABEL_VALUE_DELETE_ENTRY, - MENU_ENUM_LABEL_VALUE_REMAP_FILE_SAVE_CORE, - MENU_ENUM_LABEL_VALUE_REMAP_FILE_SAVE_GAME, - MENU_ENUM_LABEL_VALUE_RESTART_CONTENT, - MENU_ENUM_LABEL_VALUE_RESTART_RETROARCH, + + MENU_LABEL(REMAP_FILE_SAVE_CORE), + MENU_LABEL(REMAP_FILE_SAVE_GAME), + MENU_LABEL(RESTART_CONTENT), + MENU_LABEL(RESUME_CONTENT), + + MENU_LABEL(CHEAT_FILE_SAVE_AS), + MENU_LABEL(DELETE_ENTRY), + MENU_LABEL(RESTART_RETROARCH), + MENU_ENUM_LABEL_VALUE_RESUME, - MENU_ENUM_LABEL_VALUE_RESUME_CONTENT, - MENU_ENUM_LABEL_VALUE_TAKE_SCREENSHOT, + + MENU_LABEL(TAKE_SCREENSHOT), + MENU_ENUM_LABEL_VALUE_UNABLE_TO_READ_COMPRESSED_FILE, - MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE_AS, - MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE_CORE, - MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE_GAME, - MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_AS, - MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_CORE, - MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_GAME, + MENU_LABEL(VIDEO_SHADER_PRESET_SAVE_AS), + MENU_LABEL(VIDEO_SHADER_PRESET_SAVE_CORE), + MENU_LABEL(VIDEO_SHADER_PRESET_SAVE_GAME), MENU_LABEL(USER_LANGUAGE), - - MENU_ENUM_LABEL_NETPLAY_NICKNAME, - MENU_ENUM_LABEL_VALUE_NETPLAY_NICKNAME, - - MENU_ENUM_LABEL_VIDEO_VI_WIDTH, - MENU_ENUM_LABEL_VIDEO_FORCE_ASPECT, - MENU_ENUM_LABEL_VIDEO_ASPECT_RATIO_AUTO, - MENU_ENUM_LABEL_VIDEO_ASPECT_RATIO_INDEX, - MENU_ENUM_LABEL_VIDEO_VFILTER, - MENU_ENUM_LABEL_VIDEO_GPU_RECORD, - - MENU_ENUM_LABEL_RECORD_USE_OUTPUT_DIRECTORY, - MENU_ENUM_LABEL_VALUE_RECORD_USE_OUTPUT_DIRECTORY, - - MENU_ENUM_LABEL_RECORD_CONFIG, - MENU_ENUM_LABEL_VALUE_RECORD_CONFIG, - - MENU_ENUM_LABEL_RECORD_PATH, - MENU_ENUM_LABEL_VALUE_RECORD_PATH, - - MENU_ENUM_LABEL_VIDEO_POST_FILTER_RECORD, - MENU_ENUM_LABEL_VALUE_VIDEO_POST_FILTER_RECORD, - - MENU_ENUM_LABEL_RECORD_ENABLE, - MENU_ENUM_LABEL_VALUE_RECORD_ENABLE, + MENU_LABEL(NETPLAY_NICKNAME), + MENU_LABEL(VIDEO_VI_WIDTH), + MENU_LABEL(VIDEO_FORCE_ASPECT), + MENU_LABEL(VIDEO_ASPECT_RATIO_AUTO), + MENU_LABEL(VIDEO_ASPECT_RATIO_INDEX), + MENU_LABEL(VIDEO_VFILTER), + MENU_LABEL(VIDEO_GPU_RECORD), + MENU_LABEL(RECORD_USE_OUTPUT_DIRECTORY), + MENU_LABEL(RECORD_CONFIG), + MENU_LABEL(RECORD_PATH), + MENU_LABEL(VIDEO_POST_FILTER_RECORD), + MENU_LABEL(RECORD_ENABLE), MENU_ENUM_LABEL_VALUE_SECONDS, MENU_ENUM_LABEL_VALUE_STATUS, @@ -1856,39 +1714,29 @@ enum msg_hash_enums MENU_ENUM_LABEL_VALUE_NONE, MENU_ENUM_LABEL_VALUE_NO_INFORMATION_AVAILABLE, - MENU_ENUM_LABEL_USE_BUILTIN_IMAGE_VIEWER, - MENU_ENUM_LABEL_VALUE_USE_BUILTIN_IMAGE_VIEWER, - - MENU_ENUM_LABEL_OVERLAY_AUTOLOAD_PREFERRED, - MENU_ENUM_LABEL_VALUE_OVERLAY_AUTOLOAD_PREFERRED, - - MENU_ENUM_LABEL_LOAD_ARCHIVE, - MENU_ENUM_LABEL_OPEN_ARCHIVE, + MENU_LABEL(USE_BUILTIN_IMAGE_VIEWER), + MENU_LABEL(OVERLAY_AUTOLOAD_PREFERRED), + MENU_LABEL(LOAD_ARCHIVE), + MENU_LABEL(OPEN_ARCHIVE), MENU_ENUM_LABEL_LOAD_ARCHIVE_DETECT_CORE, MENU_ENUM_LABEL_OPEN_ARCHIVE_DETECT_CORE, - MENU_ENUM_LABEL_VALUE_LOAD_ARCHIVE, - MENU_ENUM_LABEL_VALUE_OPEN_ARCHIVE, MENU_ENUM_LABEL_VALUE_WHAT_IS_A_CORE_DESC, - MENU_ENUM_LABEL_HELP_CHANGE_VIRTUAL_GAMEPAD, - MENU_ENUM_LABEL_VALUE_HELP_CHANGE_VIRTUAL_GAMEPAD, - MENU_ENUM_LABEL_VALUE_HELP_CHANGE_VIRTUAL_GAMEPAD_DESC, + MENU_LABEL(HELP_CHANGE_VIRTUAL_GAMEPAD), + MENU_LABEL(HELP_CHANGE_VIRTUAL_GAMEPAD_DESC), + + MENU_LABEL(HELP_AUDIO_VIDEO_TROUBLESHOOTING), - MENU_ENUM_LABEL_HELP_AUDIO_VIDEO_TROUBLESHOOTING, - MENU_ENUM_LABEL_VALUE_HELP_AUDIO_VIDEO_TROUBLESHOOTING, MENU_ENUM_LABEL_VALUE_HELP_AUDIO_VIDEO_TROUBLESHOOTING_DESC, - MENU_ENUM_LABEL_HELP_SCANNING_CONTENT, - MENU_ENUM_LABEL_VALUE_HELP_SCANNING_CONTENT, + MENU_LABEL(HELP_SCANNING_CONTENT), + MENU_ENUM_LABEL_VALUE_HELP_SCANNING_CONTENT_DESC, - MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG, - MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_CORE, - MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_GAME, - MENU_ENUM_LABEL_VALUE_SAVE_CURRENT_CONFIG, - MENU_ENUM_LABEL_VALUE_SAVE_CURRENT_CONFIG_OVERRIDE_CORE, - MENU_ENUM_LABEL_VALUE_SAVE_CURRENT_CONFIG_OVERRIDE_GAME, + MENU_LABEL(SAVE_CURRENT_CONFIG), + MENU_LABEL(SAVE_CURRENT_CONFIG_OVERRIDE_CORE), + MENU_LABEL(SAVE_CURRENT_CONFIG_OVERRIDE_GAME), MENU_ENUM_LABEL_VALUE_THUMBNAIL_MODE_BOXARTS, MENU_ENUM_LABEL_VALUE_THUMBNAIL_MODE_SCREENSHOTS,