diff --git a/emu-configs/PCSX2-legacy/PCSX2.ini b/emu-configs/PCSX2-legacy/PCSX2.ini index e99a089c..56981725 100644 --- a/emu-configs/PCSX2-legacy/PCSX2.ini +++ b/emu-configs/PCSX2-legacy/PCSX2.ini @@ -21,13 +21,13 @@ SaveStateOnShutdown = true ConsoleToStdio = false HostFs = false PatchBios = false -PatchRegion = +PatchRegion = BackupSavestate = true SavestateZstdCompression = true McdEnableEjection = true McdFolderAutoManage = true GzipIsoIndexTemplate = $(f).pindex.tmp -BlockDumpSaveDirectory = +BlockDumpSaveDirectory = [EmuCore/Speedhacks] @@ -169,7 +169,7 @@ ShadeBoost_Contrast = 50 ShadeBoost_Saturation = 50 saven = 0 savel = 5000 -Adapter = +Adapter = shaderfx_conf = shaders/GS_FX_Settings.ini shaderfx_glsl = shaders/GS.fx @@ -198,7 +198,7 @@ DplDecodingLevel = 0 [DEV9/Eth] EthEnable = false EthApi = Unset -EthDevice = +EthDevice = EthLogDNS = false InterceptDHCP = false PS2IP = 0.0.0.0 @@ -267,7 +267,7 @@ IOP.bitset = 0 [Filenames] -BIOS = +BIOS = [Framerate] diff --git a/emu-configs/PCSX2/PCSX2.ini b/emu-configs/PCSX2/PCSX2.ini new file mode 100644 index 00000000..961c2b72 --- /dev/null +++ b/emu-configs/PCSX2/PCSX2.ini @@ -0,0 +1,444 @@ +[UI] +SettingsVersion = 1 +InhibitScreensaver = true +ConfirmShutdown = true +StartPaused = false +PauseOnFocusLoss = false +StartFullscreen = true +DoubleClickTogglesFullscreen = true +HideMouseCursor = false +RenderToSeparateWindow = false +HideMainWindowWhenRunning = false +DisableWindowResize = false +Theme = darkfusion + + +[Folders] +Bios = ~/retrodeck/roms/bios +Snapshots = ~/retrodeck/screenshots +Savestates = ~/retrodeck/states/ps2/pcsx2 +MemoryCards = ~/retrodeck/saves/ps2/memcards +Logs = ~/retrodeck/.logs +Cheats = /var/config/PCSX2/cheats +CheatsWS = /var/config/PCSX2/cheats_ws +CheatsNI = cheats_ni +Cache = /var/config/PCSX2/cache +Textures = /var/config/PCSX2/textures +InputProfiles = inputprofiles + + +[EmuCore] +CdvdVerboseReads = false +CdvdDumpBlocks = false +CdvdShareWrite = false +EnablePatches = true +EnableCheats = false +EnablePINE = false +EnableWideScreenPatches = false +EnableNoInterlacingPatches = false +EnableRecordingTools = true +EnableGameFixes = true +SaveStateOnShutdown = false +EnableDiscordPresence = false +InhibitScreensaver = true +ConsoleToStdio = false +HostFs = false +BackupSavestate = true +SavestateZstdCompression = true +McdEnableEjection = true +McdFolderAutoManage = true +WarnAboutUnsafeSettings = true +GzipIsoIndexTemplate = $(f).pindex.tmp +BlockDumpSaveDirectory = +EnableFastBoot = true + + +[EmuCore/Speedhacks] +EECycleRate = 0 +EECycleSkip = 0 +fastCDVD = false +IntcStat = true +WaitLoop = true +vuFlagHack = true +vuThread = false +vu1Instant = true + + +[EmuCore/CPU] +FPU.DenormalsAreZero = true +FPU.FlushToZero = true +FPU.Roundmode = 3 +AffinityControlMode = 0 +VU.DenormalsAreZero = true +VU.FlushToZero = true +VU.Roundmode = 3 + + +[EmuCore/CPU/Recompiler] +EnableEE = true +EnableIOP = true +EnableEECache = false +EnableVU0 = true +EnableVU1 = true +vuOverflow = true +vuExtraOverflow = false +vuSignOverflow = false +vuUnderflow = false +fpuOverflow = true +fpuExtraOverflow = false +fpuFullMode = false +StackFrameChecks = false +PreBlockCheckEE = false +PreBlockCheckIOP = false + + +[EmuCore/GS] +VsyncQueueSize = 2 +FrameLimitEnable = true +VsyncEnable = 0 +FramerateNTSC = 59.94 +FrameratePAL = 50 +SyncToHostRefreshRate = false +AspectRatio = Auto 4:3/3:2 +FMVAspectRatioSwitch = Off +Zoom = 100 +StretchY = 100 +CropLeft = 0 +CropTop = 0 +CropRight = 0 +CropBottom = 0 +pcrtc_antiblur = true +disable_interlace_offset = false +pcrtc_offsets = false +pcrtc_overscan = false +IntegerScaling = false +linear_present = true +UseDebugDevice = false +UseBlitSwapChain = false +disable_shader_cache = false +DisableDualSourceBlend = false +DisableFramebufferFetch = false +ThreadedPresentation = false +SkipDuplicateFrames = false +OsdShowMessages = true +OsdShowSpeed = false +OsdShowFPS = false +OsdShowCPU = false +OsdShowGPU = false +OsdShowResolution = false +OsdShowGSStats = false +OsdShowIndicators = true +OsdShowSettings = false +OsdShowInputs = false +HWSpinGPUForReadbacks = false +HWSpinCPUForReadbacks = false +paltex = false +autoflush_sw = true +preload_frame_with_gs_data = false +wrap_gs_mem = false +mipmap = true +UserHacks = false +UserHacks_align_sprite_X = false +UserHacks_AutoFlush = false +UserHacks_CPU_FB_Conversion = false +UserHacks_DisableDepthSupport = false +UserHacks_DisablePartialInvalidation = false +UserHacks_Disable_Safe_Features = false +UserHacks_merge_pp_sprite = false +UserHacks_WildHack = false +UserHacks_TextureInsideRt = false +fxaa = false +ShadeBoost = false +shaderfx = false +dump = false +save = false +savef = false +savet = false +savez = false +DumpReplaceableTextures = false +DumpReplaceableMipmaps = false +DumpTexturesWithFMVActive = false +DumpDirectTextures = true +DumpPaletteTextures = true +LoadTextureReplacements = false +LoadTextureReplacementsAsync = true +PrecacheTextureReplacements = false +deinterlace = 7 +OsdScale = 100 +Renderer = -1 +upscale_multiplier = 1 +mipmap_hw = -1 +accurate_blending_unit = 1 +crc_hack_level = -1 +filter = 2 +texture_preloading = 2 +GSDumpCompression = 1 +HWDownloadMode = 0 +dithering_ps2 = 2 +MaxAnisotropy = 0 +extrathreads = 2 +extrathreads_height = 4 +TVShader = 0 +UserHacks_SkipDraw_Start = 0 +UserHacks_SkipDraw_End = 0 +UserHacks_Half_Bottom_Override = -1 +UserHacks_HalfPixelOffset = 0 +UserHacks_round_sprite_offset = 0 +UserHacks_TCOffsetX = 0 +UserHacks_TCOffsetY = 0 +UserHacks_CPUSpriteRenderBW = 0 +TriFilter = -1 +OverrideTextureBarriers = -1 +OverrideGeometryShaders = -1 +ShadeBoost_Brightness = 50 +ShadeBoost_Contrast = 50 +ShadeBoost_Saturation = 50 +saven = 0 +savel = 5000 +Adapter = +shaderfx_conf = shaders/GS_FX_Settings.ini +shaderfx_glsl = shaders/GS.fx + + +[SPU2/Mixing] +Interpolation = 5 +FinalVolume = 100 +VolumeAdjustC = 0 +VolumeAdjustFL = 0 +VolumeAdjustFR = 0 +VolumeAdjustBL = 0 +VolumeAdjustBR = 0 +VolumeAdjustSL = 0 +VolumeAdjustSR = 0 +VolumeAdjustLFE = 0 + + +[SPU2/Output] +OutputModule = cubeb +BackendName = +Latency = 100 +SynchMode = 0 +SpeakerConfiguration = 0 +DplDecodingLevel = 0 + + +[DEV9/Eth] +EthEnable = false +EthApi = Unset +EthDevice = +EthLogDNS = false +InterceptDHCP = false +PS2IP = 0.0.0.0 +Mask = 0.0.0.0 +Gateway = 0.0.0.0 +DNS1 = 0.0.0.0 +DNS2 = 0.0.0.0 +AutoMask = true +AutoGateway = true +ModeDNS1 = Auto +ModeDNS2 = Auto + + +[DEV9/Eth/Hosts] +Count = 0 + + +[DEV9/Hdd] +HddEnable = false +HddFile = DEV9hdd.raw +HddSizeSectors = 83886080 + + +[EmuCore/Gamefixes] +VuAddSubHack = false +FpuMulHack = false +FpuNegDivHack = false +XgKickHack = false +EETimingHack = false +SoftwareRendererFMVHack = false +SkipMPEGHack = false +OPHFlagHack = false +DMABusyHack = false +VIFFIFOHack = false +VIF1StallHack = false +GIFFIFOHack = false +GoemonTlbHack = false +IbitHack = false +VUSyncHack = false +VUOverflowHack = false +BlitInternalFPSHack = false + + +[EmuCore/Profiler] +Enabled = false +RecBlocks_EE = true +RecBlocks_IOP = true +RecBlocks_VU0 = true +RecBlocks_VU1 = true + + +[EmuCore/Debugger] +ShowDebuggerOnStart = false +AlignMemoryWindowStart = true +FontWidth = 8 +FontHeight = 12 +WindowWidth = 0 +WindowHeight = 0 +MemoryViewBytesPerRow = 16 + + +[EmuCore/TraceLog] +Enabled = false +EE.bitset = 0 +IOP.bitset = 0 + + +[Achievements] +Enabled = false +TestMode = false +UnofficialTestMode = false +RichPresence = true +ChallengeMode = false +Leaderboards = true +SoundEffects = true +PrimedIndicators = true + + +[Filenames] +BIOS = + + +[Framerate] +NominalScalar = 1 +TurboScalar = 2 +SlomoScalar = 0.5 + + +[MemoryCards] +Slot1_Enable = true +Slot1_Filename = Mcd001.ps2 +Slot2_Enable = true +Slot2_Filename = Mcd002.ps2 +Multitap1_Slot2_Enable = false +Multitap1_Slot2_Filename = Mcd-Multitap1-Slot02.ps2 +Multitap1_Slot3_Enable = false +Multitap1_Slot3_Filename = Mcd-Multitap1-Slot03.ps2 +Multitap1_Slot4_Enable = false +Multitap1_Slot4_Filename = Mcd-Multitap1-Slot04.ps2 +Multitap2_Slot2_Enable = false +Multitap2_Slot2_Filename = Mcd-Multitap2-Slot02.ps2 +Multitap2_Slot3_Enable = false +Multitap2_Slot3_Filename = Mcd-Multitap2-Slot03.ps2 +Multitap2_Slot4_Enable = false +Multitap2_Slot4_Filename = Mcd-Multitap2-Slot04.ps2 + + +[Logging] +EnableSystemConsole = false +EnableFileLogging = false +EnableTimestamps = true +EnableVerbose = false +EnableEEConsole = false +EnableIOPConsole = false +EnableInputRecordingLogs = true +EnableControllerLogs = false + + +[InputSources] +Keyboard = true +Mouse = true +SDL = true +SDLControllerEnhancedMode = false + + +[Hotkeys] +ToggleFullscreen = Keyboard/Alt & Keyboard/Return +CycleAspectRatio = Keyboard/F6 +CycleInterlaceMode = Keyboard/F5 +CycleMipmapMode = Keyboard/Insert +GSDumpMultiFrame = Keyboard/Control & Keyboard/Shift & Keyboard/F8 +Screenshot = SDL-0/Back & SDL-0/A +GSDumpSingleFrame = Keyboard/Shift & Keyboard/F8 +ToggleSoftwareRendering = Keyboard/F9 +InputRecToggleMode = Keyboard/Shift & Keyboard/R +LoadStateFromSlot = SDL-0/Back & SDL-0/LeftShoulder +SaveStateToSlot = SDL-0/Back & SDL-0/RightShoulder +NextSaveStateSlot = SDL-0/Back & SDL-0/DPadUp +PreviousSaveStateSlot = SDL-0/Back & SDL-0/DPadDown +OpenPauseMenu = SDL-0/Back & SDL-0/Y +ToggleFrameLimit = Keyboard/F4 +TogglePause = SDL-0/Back & SDL-0/B +ToggleSlowMotion = Keyboard/Shift & Keyboard/Backtab +ToggleTurbo = Keyboard/Tab +HoldTurbo = Keyboard/L +ShutdownVM = SDL-0/Start & SDL-0/Back + + +[Pad] +MultitapPort1 = false +MultitapPort2 = false +PointerXScale = 8 +PointerYScale = 8 + + +[Pad1] +Type = DualShock2 +Deadzone = 0.000000 +AxisScale = 1.330000 +LargeMotorScale = 1.000000 +SmallMotorScale = 1.000000 +PressureModifier = 0.500000 +Up = SDL-0/DPadUp +Right = SDL-0/DPadRight +Down = SDL-0/DPadDown +Left = SDL-0/DPadLeft +Triangle = SDL-0/Y +Circle = SDL-0/B +Cross = SDL-0/A +Square = SDL-0/X +Select = SDL-0/Back +Start = SDL-0/Start +L1 = SDL-0/LeftShoulder +L2 = SDL-0/+LeftTrigger +R1 = SDL-0/RightShoulder +R2 = SDL-0/+RightTrigger +L3 = SDL-0/LeftStick +R3 = SDL-0/RightStick +LUp = SDL-0/-LeftY +LRight = SDL-0/+LeftX +LDown = SDL-0/+LeftY +LLeft = SDL-0/-LeftX +RUp = SDL-0/-RightY +RRight = SDL-0/+RightX +RDown = SDL-0/+RightY +RLeft = SDL-0/-RightX +SmallMotor = SDL-0/SmallMotor +LargeMotor = SDL-0/LargeMotor + + +[Pad2] +Type = None + + +[Pad3] +Type = None + + +[Pad4] +Type = None + + +[Pad5] +Type = None + + +[Pad6] +Type = None + + +[Pad7] +Type = None + + +[Pad8] +Type = None diff --git a/emu-configs/defaults/retroarch/retroarch.cfg b/emu-configs/defaults/retroarch/retroarch.cfg index aa4c1fe3..042fdacc 100644 --- a/emu-configs/defaults/retroarch/retroarch.cfg +++ b/emu-configs/defaults/retroarch/retroarch.cfg @@ -10,10 +10,10 @@ all_users_control_menu = "false" apply_cheats_after_load = "false" apply_cheats_after_toggle = "false" aspect_ratio_index = "22" -assets_directory = "~/.config/retroarch/assets" +assets_directory = ":\assets" audio_block_frames = "0" audio_device = "" -audio_driver = "pulse" +audio_driver = "xaudio" audio_dsp_plugin = "" audio_enable = "true" audio_enable_menu = "false" @@ -22,7 +22,7 @@ audio_enable_menu_cancel = "false" audio_enable_menu_notice = "false" audio_enable_menu_ok = "false" audio_fastforward_mute = "false" -audio_filter_dir = "~/.config/retroarch/filters/audio" +audio_filter_dir = ":\filters\audio" audio_latency = "64" audio_max_timing_skew = "0.050000" audio_mixer_mute_enable = "false" @@ -35,6 +35,9 @@ audio_resampler = "sinc" audio_resampler_quality = "3" audio_sync = "true" audio_volume = "0.000000" +audio_wasapi_exclusive_mode = "true" +audio_wasapi_float_format = "false" +audio_wasapi_sh_buffer_length = "-16" auto_overrides_enable = "true" auto_remaps_enable = "true" auto_screenshot_filename = "true" @@ -43,7 +46,7 @@ autosave_interval = "10" block_sram_overwrite = "false" bluetooth_driver = "null" builtin_imageviewer_enable = "true" -builtin_mediaplayer_enable = "false" +builtin_mediaplayer_enable = "true" bundle_assets_dst_path = "" bundle_assets_dst_path_subdir = "" bundle_assets_extract_enable = "false" @@ -53,8 +56,8 @@ bundle_assets_src_path = "" cache_directory = "" camera_allow = "false" camera_device = "" -camera_driver = "video4linux2" -cheat_database_path = "~/.config/retroarch/cheats" +camera_driver = "null" +cheat_database_path = ":\cheats" check_firmware_before_loading = "false" cheevos_auto_screenshot = "false" cheevos_badges_enable = "false" @@ -72,17 +75,17 @@ cheevos_unlock_sound_enable = "false" cheevos_username = "" cheevos_verbose_enable = "true" config_save_on_exit = "true" -content_database_path = "~/.config/retroarch/database/rdb" +content_database_path = ":\database\rdb" content_favorites_directory = "default" -content_favorites_path = "~/.config/retroarch/content_favorites.lpl" +content_favorites_path = "" content_favorites_size = "200" content_history_directory = "default" -content_history_path = "~/.config/retroarch/content_history.lpl" +content_history_path = "" content_history_size = "200" content_image_history_directory = "default" -content_image_history_path = "~/.config/retroarch/content_image_history.lpl" +content_image_history_path = "" content_music_history_directory = "default" -content_music_history_path = "~/.config/retroarch/content_music_history.lpl" +content_music_history_path = "" content_runtime_log = "true" content_runtime_log_aggregate = "false" content_show_add = "true" @@ -97,9 +100,10 @@ content_show_netplay = "true" content_show_playlists = "true" content_show_settings = "true" content_show_settings_password = "" +content_show_video = "true" content_video_directory = "default" -content_video_history_path = "~/.config/retroarch/content_video_history.lpl" -core_assets_directory = "~/.config/retroarch/downloads" +content_video_history_path = "" +core_assets_directory = ":\downloads" core_info_cache_enable = "true" core_option_category_enable = "true" core_options_path = "" @@ -119,16 +123,19 @@ crt_switch_resolution_use_custom_refresh_rate = "false" crt_switch_timings = "" crt_video_refresh_rate = "60.000000" current_resolution_id = "0" -cursor_directory = "~/.config/retroarch/database/cursors" -custom_viewport_height = "720" -custom_viewport_width = "960" +cursor_directory = ":\database\cursors" +custom_viewport_height = "0" +custom_viewport_width = "0" custom_viewport_x = "0" custom_viewport_y = "0" +d3d10_gpu_index = "0" +d3d11_gpu_index = "0" +d3d12_gpu_index = "0" desktop_menu_enable = "true" discord_allow = "false" discord_app_id = "475456035851599874" driver_switch_enable = "true" -dynamic_wallpapers_directory = "default" +dynamic_wallpapers_directory = ":\assets\wallpapers" enable_device_vibration = "false" facebook_stream_key = "" fastforward_frameskip = "true" @@ -144,7 +151,7 @@ frame_time_counter_reset_after_save_state = "false" framecount_show = "false" frontend_log_level = "1" game_specific_options = "true" -gamemode_enable = "false" +gamemode_enable = "true" gamma_correction = "0" global_core_options = "false" history_list_enable = "true" @@ -214,7 +221,7 @@ input_disk_prev = "nul" input_disk_prev_axis = "nul" input_disk_prev_btn = "nul" input_disk_prev_mbtn = "nul" -input_driver = "x" +input_driver = "dinput" input_duty_cycle = "3" input_enable_hotkey = "nul" input_enable_hotkey_axis = "nul" @@ -249,8 +256,24 @@ input_hold_slowmotion_axis = "nul" input_hold_slowmotion_btn = "nul" input_hold_slowmotion_mbtn = "nul" input_hotkey_block_delay = "5" -input_joypad_driver = "udev" +input_joypad_driver = "xinput" input_keyboard_layout = "" +input_libretro_device_p1 = "1" +input_libretro_device_p10 = "1" +input_libretro_device_p11 = "1" +input_libretro_device_p12 = "1" +input_libretro_device_p13 = "1" +input_libretro_device_p14 = "1" +input_libretro_device_p15 = "1" +input_libretro_device_p16 = "1" +input_libretro_device_p2 = "1" +input_libretro_device_p3 = "1" +input_libretro_device_p4 = "1" +input_libretro_device_p5 = "1" +input_libretro_device_p6 = "1" +input_libretro_device_p7 = "1" +input_libretro_device_p8 = "1" +input_libretro_device_p9 = "1" input_load_state = "f4" input_load_state_axis = "nul" input_load_state_btn = "nul" @@ -2681,7 +2704,7 @@ input_recording_toggle_axis = "nul" input_recording_toggle_btn = "nul" input_recording_toggle_mbtn = "nul" input_remap_binds_enable = "true" -input_remapping_directory = "~/.config/retroarch/config/remaps" +input_remapping_directory = ":\config\remaps" input_reset = "h" input_reset_axis = "nul" input_reset_btn = "nul" @@ -2760,19 +2783,19 @@ input_volume_up = "add" input_volume_up_axis = "nul" input_volume_up_btn = "nul" input_volume_up_mbtn = "nul" -joypad_autoconfig_dir = "~/.config/retroarch/autoconfig" +joypad_autoconfig_dir = ":\autoconfig" keyboard_gamepad_enable = "true" keyboard_gamepad_mapping_type = "1" kiosk_mode_enable = "false" kiosk_mode_password = "" led_driver = "null" -libretro_directory = "~/.config/retroarch/cores" -libretro_info_path = "~/.config/retroarch/cores" +libretro_directory = ":\cores" +libretro_info_path = ":\info" libretro_log_level = "1" load_dummy_on_core_shutdown = "true" location_allow = "false" location_driver = "null" -log_dir = "~/.config/retroarch/logs" +log_dir = ":\logs" log_to_file = "false" log_to_file_timestamp = "false" log_verbosity = "false" @@ -2843,7 +2866,7 @@ menu_show_rewind = "true" menu_show_shutdown = "true" menu_show_sublabels = "true" menu_show_video_layout = "true" -menu_swap_ok_cancel_buttons = "false" +menu_swap_ok_cancel_buttons = "true" menu_throttle_framerate = "true" menu_thumbnail_upscale_threshold = "0" menu_thumbnails = "3" @@ -2868,7 +2891,7 @@ menu_xmb_thumbnail_scale_factor = "100" menu_xmb_title_margin = "5" menu_xmb_title_margin_horizontal_offset = "0" menu_xmb_vertical_fade_factor = "100" -midi_driver = "alsa" +midi_driver = "winmm" midi_input = "Off" midi_output = "Off" midi_volume = "100" @@ -2915,6 +2938,7 @@ netplay_show_only_installed_cores = "false" netplay_show_passworded = "true" netplay_spectate_password = "" netplay_start_as_spectator = "false" +netplay_stateless_mode = "false" netplay_use_mitm_server = "false" network_cmd_enable = "false" network_cmd_port = "55355" @@ -2950,7 +2974,7 @@ notification_show_screenshot_duration = "0" notification_show_screenshot_flash = "0" notification_show_set_initial_disk = "true" notification_show_when_menu_is_alive = "false" -overlay_directory = "~/.config/retroarch/overlay" +overlay_directory = ":\overlays" ozone_collapse_sidebar = "false" ozone_menu_color_theme = "1" ozone_scroll_content_metadata = "false" @@ -2960,7 +2984,7 @@ ozone_truncate_playlist_name = "true" pause_nonactive = "true" perfcnt_enable = "false" playlist_compression = "false" -playlist_directory = "~/.config/retroarch/playlists" +playlist_directory = ":\playlists" playlist_entry_remove_enable = "1" playlist_entry_rename = "true" playlist_fuzzy_archive_match = "false" @@ -2999,9 +3023,9 @@ quick_menu_show_take_screenshot = "true" quick_menu_show_undo_save_load_state = "true" quit_on_close_content = "0" quit_press_twice = "true" -record_driver = "null" -recording_config_directory = "~/.config/retroarch/records_config" -recording_output_directory = "~/.config/retroarch/records" +record_driver = "ffmpeg" +recording_config_directory = ":\config\record" +recording_output_directory = ":\recordings" remap_save_on_exit = "true" resampler_directory = "" rewind_buffer_size = "20971520" @@ -3014,7 +3038,7 @@ rgui_background_filler_thickness_enable = "true" rgui_border_filler_enable = "true" rgui_border_filler_thickness_enable = "true" rgui_browser_directory = "default" -rgui_config_directory = "~/.config/retroarch/config" +rgui_config_directory = ":\config" rgui_extended_ascii = "false" rgui_inline_thumbnails = "false" rgui_internal_upscale_level = "0" @@ -3034,12 +3058,12 @@ run_ahead_hide_warnings = "false" run_ahead_secondary_instance = "true" runtime_log_directory = "default" save_file_compression = "false" -savefile_directory = "~/.config/retroarch/saves" +savefile_directory = ":\saves" savefiles_in_content_dir = "false" savestate_auto_index = "false" savestate_auto_load = "false" savestate_auto_save = "false" -savestate_directory = "~/.config/retroarch/states" +savestate_directory = ":\states" savestate_file_compression = "true" savestate_max_keep = "0" savestate_thumbnail_enable = "false" @@ -3047,7 +3071,7 @@ savestates_in_content_dir = "false" scan_without_core_match = "false" screen_brightness = "100" screen_orientation = "0" -screenshot_directory = "~/.config/retroarch/screenshots" +screenshot_directory = ":\screenshots" screenshots_in_content_dir = "false" settings_show_accessibility = "true" settings_show_achievements = "true" @@ -3086,10 +3110,10 @@ stdin_cmd_enable = "false" streaming_mode = "0" suspend_screensaver_enable = "true" sustained_performance_mode = "false" -system_directory = "~/.config/retroarch/system" +system_directory = ":\system" systemfiles_in_content_dir = "false" threaded_data_runloop_enable = "true" -thumbnails_directory = "~/.config/retroarch/thumbnails" +thumbnails_directory = ":\thumbnails" twitch_stream_key = "" ui_companion_enable = "false" ui_companion_start_on_boot = "true" @@ -3110,7 +3134,7 @@ video_ctx_scaling = "false" video_disable_composition = "false" video_driver = "gl" video_filter = "" -video_filter_dir = "~/.config/retroarch/filters/video" +video_filter_dir = ":\filters\video" video_font_enable = "true" video_font_path = "" video_font_size = "32.000000" @@ -3130,7 +3154,7 @@ video_hdr_enable = "false" video_hdr_expand_gamut = "true" video_hdr_max_nits = "1000.000000" video_hdr_paper_white_nits = "200.000000" -video_layout_directory = "~/.config/retroarch/layouts" +video_layout_directory = ":\layouts" video_layout_enable = "true" video_layout_path = "" video_layout_selected_view = "0" @@ -3157,7 +3181,7 @@ video_scale = "3" video_scale_integer = "false" video_scale_integer_overscale = "false" video_shader_delay = "0" -video_shader_dir = "~/.config/retroarch/shaders" +video_shader_dir = ":\shaders" video_shader_enable = "false" video_shader_preset_save_reference_enable = "true" video_shader_remember_last_dir = "false" diff --git a/emu-configs/retroarch.cfg b/emu-configs/retroarch.cfg index 202e3d34..7ee4f8e2 100644 --- a/emu-configs/retroarch.cfg +++ b/emu-configs/retroarch.cfg @@ -2792,6 +2792,8 @@ memory_show = "false" memory_update_interval = "256" menu_battery_level_enable = "true" menu_core_enable = "true" +menu_disable_info_button = "false" +menu_disable_search_button = "false" menu_driver = "ozone" menu_dynamic_wallpaper_enable = "true" menu_enable_widgets = "true" @@ -2862,8 +2864,10 @@ menu_widget_scale_factor_windowed = "1.000000" menu_xmb_animation_horizontal_highlight = "0" menu_xmb_animation_move_up_down = "0" menu_xmb_animation_opening_main_menu = "0" +menu_xmb_show_title_header = "true" menu_xmb_thumbnail_scale_factor = "100" menu_xmb_title_margin = "5" +menu_xmb_title_margin_horizontal_offset = "0" menu_xmb_vertical_fade_factor = "100" midi_driver = "alsa" midi_input = "Off" @@ -2871,6 +2875,8 @@ midi_output = "Off" midi_volume = "100" netplay_allow_pausing = "false" netplay_allow_slaves = "true" +netplay_chat_color_msg = "16777215" +netplay_chat_color_name = "32768" netplay_check_frames = "600" netplay_custom_mitm_server = "" netplay_fade_chat = "true" @@ -2906,6 +2912,8 @@ netplay_require_slaves = "false" netplay_share_analog = "1" netplay_share_digital = "1" netplay_show_only_connectable = "true" +netplay_show_only_installed_cores = "false" +netplay_show_passworded = "true" netplay_spectate_password = "" netplay_start_as_spectator = "false" netplay_stateless_mode = "false" @@ -2983,6 +2991,7 @@ quick_menu_show_save_content_dir_overrides = "true" quick_menu_show_save_core_overrides = "true" quick_menu_show_save_game_overrides = "true" quick_menu_show_save_load_state = "true" +quick_menu_show_savestate_submenu = "false" quick_menu_show_set_core_association = "true" quick_menu_show_shaders = "true" quick_menu_show_start_recording = "true" @@ -2995,6 +3004,7 @@ quit_press_twice = "true" record_driver = "ffmpeg" recording_config_directory = "/var/config/retroarch/records_config" recording_output_directory = "/var/config/retroarch/records" +remap_save_on_exit = "true" resampler_directory = "" rewind_buffer_size = "20971520" rewind_buffer_size_step = "10" @@ -3094,6 +3104,7 @@ video_adaptive_vsync = "false" video_allow_rotate = "true" video_aspect_ratio = "1.333300" video_aspect_ratio_auto = "false" +video_autoswitch_refresh_rate = "0" video_black_frame_insertion = "0" video_context_driver = "" video_crop_overscan = "true" @@ -3162,6 +3173,7 @@ video_stream_url = "" video_swap_interval = "1" video_threaded = "false" video_vsync = "true" +video_waitable_swapchains = "true" video_window_auto_height_max = "1080" video_window_auto_width_max = "1920" video_window_custom_size_enable = "false" diff --git a/functions.sh b/functions.sh index e4b3d651..00928d10 100644 --- a/functions.sh +++ b/functions.sh @@ -141,7 +141,7 @@ set_setting_value() { get_setting_name() { # Function for getting the setting name from a full setting line from a config file - # USAGE: get_setting_name $setting_line $system (needed as different systems use different config file syntax) + # USAGE: get_setting_name $current_setting_line $current_system (needed as different systems use different config file syntax) case $2 in @@ -174,13 +174,13 @@ get_setting_name() { ;; "yuzu" ) # Use quotes when passing setting_name, as this config file contains special characters - yuzu_setting=$(sed -e 's%\\%\\\\%g' <<< "$2") # Accomodate for backslashes in setting names - echo '$yuzu_setting' | grep -o -P ".*(?=\=)" | sed -e 's%\\\\%\\%g' + yuzu_setting_name=$(sed -e 's%\\%\\\\%g' <<< "$1") # Accomodate for backslashes in setting names + echo '$yuzu_setting_name' | grep -o -P ".*(?=\=)" | sed -e 's%\\\\%\\%g' ;; "citra" ) # Use quotes when passing setting_name, as this config file contains special characters - citra_setting=$(sed -e 's%\\%\\\\%g' <<< "$1") # Accomodate for backslashes in setting names - echo '$citra_setting' | grep -o -P ".*(?=\=)" | sed -e 's%\\\\%\\%g' + citra_setting_name=$(sed -e 's%\\%\\\\%g' <<< "$1") # Accomodate for backslashes in setting names + echo "$citra_setting_name" | grep -o -P ".*(?=\=)" | sed -e 's%\\\\%\\%g' ;; "melonds" ) @@ -205,53 +205,53 @@ get_setting_value() { case $3 in "retrodeck" ) - echo $(grep "$2" $1 | grep -o -P "(?<=$2=).*") + echo $(grep -o -P "(?<=^$2=).*" $1) ;; "retroarch" ) - echo $(grep "$2" $1 | grep -o -P "(?<=$2 = \").*(?=\")") + echo $(grep -o -P "(?<=^$2 = \").*(?=\")" $1) ;; "dolphin" ) # Use quotes when passing setting_name, as this config file contains special characters - echo $(grep "$2" $1 | grep -o -P "(?<=$2 = ).*") + echo $(grep -o -P "(?<=^$2 = ).*" $1) ;; "duckstation" ) - echo $(grep "$2" $1 | grep -o -P "(?<=$2 = ).*") + echo $(grep -o -P "(?<=^$2 = ).*" $1) ;; "pcsx2" ) - echo $(grep "$2" $1 | grep -o -P "(?<=$2 = ).*") + echo $(grep -o -P "(?<=^$2 = ).*" $1) ;; "ppsspp" ) # Use quotes when passing setting_name, as this config file contains spaces - echo $(grep "$2" $1 | grep -o -P "(?<=$2 = ).*") + echo $(grep -o -P "(?<=^$2 = ).*" $1) ;; "rpcs3" ) # Use quotes when passing setting_name, as this config file contains special characters and spaces - echo $(grep "$2" $1 | grep -o -P "(?<=$2: ).*") + echo $(grep -o -P "(?<=^$2: ).*" $1) ;; "yuzu" ) # Use quotes when passing setting_name, as this config file contains special characters - yuzu_setting=$(sed -e 's%\\%\\\\%g' <<< "$2") # Accomodate for backslashes in setting names - echo $(grep "$yuzu_setting" $1 | grep -o -P "(?<=$yuzu_setting=).*") + yuzu_setting_value=$(sed -e 's%\\%\\\\%g' <<< "$2") # Accomodate for backslashes in setting names + echo $(grep -o -P "(?<=^$yuzu_setting_value=).*" $1) ;; "citra" ) # Use quotes when passing setting_name, as this config file contains special characters - citra_setting=$(sed -e 's%\\%\\\\%g' <<< "$2") # Accomodate for backslashes in setting names - echo $(grep "$citra_setting" $1 | grep -o -P "(?<=$citra_setting=).*") + citra_setting_value=$(sed -e 's%\\%\\\\%g' <<< "$2") # Accomodate for backslashes in setting names + echo $(grep -o -P "(?<=^$citra_setting_value=).*" $1) ;; "melonds" ) - echo $(grep "$2" $1 | grep -o -P "(?<=$2=).*") + echo $(grep -o -P "(?<=^$2=).*" $1) ;; "xemu" ) - echo $(grep "$2" $1 | grep -o -P "(?<=$2 = ).*") + echo $(grep -o -P "(?<=^$2 = ).*" $1) ;; "emulationstation" ) - echo $(grep "$2" $1 | grep -o -P "(?<=$2\" value=\").*(?=\")") + echo $(grep -o -P "(?<=^$2\" value=\").*(?=\")" $1) ;; esac @@ -535,6 +535,7 @@ pcsx2_init() { #dir_prep "$rdhome/screenshots" "/var/config/PCSX2/snaps" #dir_prep "$rdhome/.logs" "/var/config/PCSX2/logs" #dir_prep "$rdhome/bios" "$rdhome/bios/pcsx2" +} melonds_init() { echo "----------------------"