From 415ec02ac5fbf4cb259014a1a1ca1e0f3bcfaef7 Mon Sep 17 00:00:00 2001
From: icenine451 <benjamin.r.shelton@protonmail.com>
Date: Tue, 21 Mar 2023 09:51:07 -0400
Subject: [PATCH] - Removed legacy PCSX2 entries - Internalized Yuzu config
 paths for FP

---
 emu-configs/yuzu/qt-config.ini |  6 +++---
 es-configs/es_find_rules.xml   | 12 ------------
 es-configs/es_systems.xml      |  1 -
 3 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/emu-configs/yuzu/qt-config.ini b/emu-configs/yuzu/qt-config.ini
index bdc3d216..3d9c68a4 100644
--- a/emu-configs/yuzu/qt-config.ini
+++ b/emu-configs/yuzu/qt-config.ini
@@ -805,7 +805,7 @@ cpuopt_unsafe_unfuse_fma=true
 cpuopt_unsafe_unfuse_fma\default=true
 
 [Data%20Storage]
-dump_directory=/home/deck/.var/app/net.retrodeck.retrodeck/data/yuzu/dump
+dump_directory=/var/data/yuzu/dump
 dump_directory\default=true
 gamecard_current_game=false
 gamecard_current_game\default=true
@@ -813,13 +813,13 @@ gamecard_inserted=false
 gamecard_inserted\default=true
 gamecard_path=
 gamecard_path\default=true
-load_directory=/home/deck/.var/app/net.retrodeck.retrodeck/data/yuzu/load
+load_directory=/var/data/yuzu/load
 load_directory\default=true
 nand_directory=/home/deck/retrodeck/saves/switch/yuzu/nand
 nand_directory\default=true
 sdmc_directory=/home/deck/retrodeck/saves/switch/yuzu/sdmc
 sdmc_directory\default=true
-tas_directory=/home/deck/.var/app/net.retrodeck.retrodeck/data/yuzu/tas
+tas_directory=/var/data/yuzu/tas
 tas_directory\default=true
 use_virtual_sd=true
 use_virtual_sd\default=true
diff --git a/es-configs/es_find_rules.xml b/es-configs/es_find_rules.xml
index 3e71b426..78791834 100644
--- a/es-configs/es_find_rules.xml
+++ b/es-configs/es_find_rules.xml
@@ -327,18 +327,6 @@
             <entry>~/bin/pcsx2*-Qt.AppImage</entry>
         </rule>
     </emulator>
-    <emulator name="PCSX2-LEGACY">
-        <!-- Sony PlayStation 2 emulator PCSX2 (legacy) -->
-        <rule type="systempath">
-            <entry>PCSX2</entry>
-            <entry>pcsx2</entry>
-            <entry>net.pcsx2.PCSX2</entry>
-        </rule>
-        <rule type="staticpath">
-            <entry>/var/lib/flatpak/exports/bin/net.pcsx2.PCSX2</entry>
-            <entry>~/.local/share/flatpak/exports/bin/net.pcsx2.PCSX2</entry>
-        </rule>
-    </emulator>
     <emulator name="PICO-8">
         <!-- PICO-8 Fantasy Console (game engine) -->
         <rule type="systempath">
diff --git a/es-configs/es_systems.xml b/es-configs/es_systems.xml
index 44f85c80..f48f4f24 100644
--- a/es-configs/es_systems.xml
+++ b/es-configs/es_systems.xml
@@ -1071,7 +1071,6 @@
         <command label="PCSX2 (Standalone)">%EMULATOR_PCSX2% -batch %ROM%</command>
         <extension>.bin .BIN .chd .CHD .ciso .CISO .cso .CSO .dump .DUMP .elf .ELF .gz .GZ .m3u .M3U .mdf .MDF .img .IMG .iso .ISO .isz .ISZ .ngr .NRG</extension>
         <command label="PCSX2">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pcsx2_libretro.so %ROM%</command>
-<!--        <command label="PCSX2 Legacy (Standalone)">%EMULATOR_PCSX2-LEGACY% -REMOVEME-nogui %ROM%</command> -->
 <!--        <command label="Play! (Standalone)">%EMULATOR_PLAY!% &#45;&#45;disc %ROM%</command> -->
         <platform>ps2</platform>
         <theme>ps2</theme>