diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml
new file mode 100644
index 00000000..093aa29b
--- /dev/null
+++ b/.github/workflows/cooker-selfhosted.yml
@@ -0,0 +1,84 @@
+name: cooker-selfhosted
+
+on:
+ push:
+ branches:
+ - cooker*
+ pull_request:
+ branches:
+ - cooker*
+
+ workflow_dispatch:
+
+
+jobs:
+
+ Building_flatpak:
+ runs-on: self-hosted
+ steps:
+
+ - name: Get date for artifacts
+ id: date
+ run: echo "::set-output name=date::$(date +'%Y%m%d_%H%M%S')"
+
+ - name: Extract branch name
+ shell: bash
+ run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
+ id: extract_branch
+
+ - name: Generate build ID
+ id: generating_buildid
+ run: echo "##[set-output name=build-id;]$(echo "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}")"
+
+ - uses: actions/checkout@v3
+
+ - name: Initialize enviornment
+ run: |
+ git pull
+ git submodule init
+ git submodule update
+ sudo apt install -y flatpak flatpak-builder p7zip-full
+ flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+ flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 io.qt.qtwebengine.BaseApp/x86_64/5.15-21.08 org.freedesktop.Sdk.Extension.llvm13
+
+ # for main remember to change ${HOME} into ${GITHUB_WORKSPACE}
+ - name: Build flatpak
+ run: |
+ flatpak-builder --build-only --user --force-clean --repo=${HOME}/local ${HOME}/retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml
+
+ - name: Create Bundle
+ run: |
+ flatpak-builder --user --force-clean --repo=${HOME}/local ${HOME}/retrodeck-flatpak-cooker net.retrodeck.retrodeck.yml
+ flatpak build-bundle $GITHUB_WORKSPACE/local RetroDECK.flatpak net.retrodeck.retrodeck
+
+ - name: Read version from version file
+ id: version
+ run: echo "##[set-output name=version;]$(cat $(find . -name version))"
+
+ - name: Publish the flatpak in a new cooker release
+ uses: ncipollo/release-action@v1
+ with:
+ #tag: "${{ steps.version.outputs.version }}"
+ tag: "${{ steps.generating_buildid.outputs.build-id }}"
+ body: |
+ # Release Notes (Cooker)
+ This is a cooker snapshot based on the commit: ${{ github.event.repository.full_name }}@${{github.sha}}.
+
+ Cooker channel is provided for the community to test fixes and explore new functionality.
+ Please DO NOT open issues or ask support on this build.
+
+ artifacts: "RetroDECK.flatpak"
+ allowUpdates: true
+ prerelease: true
+ draft: false
+ token: ${{ secrets.TRIGGER_BUILD_TOKEN }}
+ repo: RetroDECK-cooker
+ continue-on-error: true
+
+ # In case it cannot publish the release at least it's providing the flatpak file for creating a manual release
+ - name: Upload RetroDECK.flatpak
+ uses: actions/upload-artifact@v3
+ with:
+ name: retrodeck-flatpak
+ path: RetroDECK.flatpak
+ continue-on-error: true
\ No newline at end of file
diff --git a/.github/workflows/cooker.yml b/.github/workflows/cooker.yml
index a51bb18d..ff8330e3 100644
--- a/.github/workflows/cooker.yml
+++ b/.github/workflows/cooker.yml
@@ -1,12 +1,12 @@
name: cooker
on:
- push:
- branches:
- - cooker*
- pull_request:
- branches:
- - cooker*
+ # push:
+ # branches:
+ # - cooker*
+ # pull_request:
+ # branches:
+ # - cooker*
workflow_dispatch:
diff --git a/.github/workflows/main-selfhosted.yml b/.github/workflows/main-selfhosted.yml
new file mode 100644
index 00000000..7821f03e
--- /dev/null
+++ b/.github/workflows/main-selfhosted.yml
@@ -0,0 +1,82 @@
+name: main-selfhosted
+
+on:
+ push:
+ branches:
+ - main
+ pull_request:
+ branches:
+ - main
+
+ workflow_dispatch:
+
+
+jobs:
+
+ Building_flatpak:
+ runs-on: self-hosted
+ steps:
+
+ - name: Get date for artifacts
+ id: date
+ run: echo "::set-output name=date::$(date +'%Y%m%d_%H%M%S')"
+
+ - name: Extract branch name
+ shell: bash
+ run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
+ id: extract_branch
+
+ - name: Generate build ID
+ id: generating_buildid
+ run: echo "##[set-output name=build-id;]$(echo "${{ steps.extract_branch.outputs.branch }}-${{ steps.date.outputs.date }}")"
+
+ - uses: actions/checkout@v3
+
+ - name: Initialize enviornment
+ run: |
+ git pull
+ git submodule init
+ git submodule update
+ sudo apt install -y flatpak flatpak-builder p7zip-full
+ flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+ flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 io.qt.qtwebengine.BaseApp/x86_64/5.15-21.08 org.freedesktop.Sdk.Extension.llvm13
+
+ # for main remember to change ${HOME} into ${GITHUB_WORKSPACE}
+ - name: Build flatpak
+ run: |
+ flatpak-builder --build-only --user --force-clean --repo=${GITHUB_WORKSPACE}/local ${GITHUB_WORKSPACE}/retrodeck-flatpak-main net.retrodeck.retrodeck.yml
+
+ - name: Create Bundle
+ run: |
+ flatpak-builder --user --force-clean --repo=${GITHUB_WORKSPACE}/local ${GITHUB_WORKSPACE}/retrodeck-flatpak-main net.retrodeck.retrodeck.yml
+ flatpak build-bundle ${GITHUB_WORKSPACE}/local RetroDECK.flatpak net.retrodeck.retrodeck
+
+ - name: Read version from version file
+ id: version
+ run: echo "##[set-output name=version;]$(cat $(find . -name version))"
+
+ - name: Publish the flatpak in a new release
+ uses: ncipollo/release-action@v1
+ with:
+ #tag: "${{ steps.version.outputs.version }}"
+ tag: "${{ steps.generating_buildid.outputs.build-id }}"
+ body: |
+ # Release Notes
+
+ ( Write release notes here )
+
+ artifacts: "RetroDECK.flatpak"
+ allowUpdates: true
+ prerelease: true
+ draft: true
+ token: ${{ secrets.TRIGGER_BUILD_TOKEN }}
+ repo: RetroDECK
+ continue-on-error: true
+
+ # In case it cannot publish the release at least it's providing the flatpak file for creating a manual release
+ - name: Upload RetroDECK.flatpak
+ uses: actions/upload-artifact@v3
+ with:
+ name: retrodeck-flatpak
+ path: RetroDECK.flatpak
+ continue-on-error: true
\ No newline at end of file
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ce74a3c7..0404e018 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,12 +1,13 @@
name: main
on:
- push:
- branches:
- - main
- pull_request:
- branches:
- - main
+ # Triggers the workflow on push or pull request events but only for the main branch
+ # push:
+ # branches:
+ # - main
+ # pull_request:
+ # branches:
+ # - main
workflow_dispatch:
diff --git a/emu-configs/Dolphin.ini b/emu-configs/Dolphin.ini
deleted file mode 100644
index f7213f93..00000000
--- a/emu-configs/Dolphin.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-[Analytics]
-ID = 09426e1e3e44d72728fb46a9e4a54663
-PermissionAsked = True
-[Core]
-GFXBackend = Vulkan
-SelectedLanguage = 0
-SerialPort1 = 255
-SkipIPL = True
-SlotA = 8
-SlotB = 255
-[Display]
-Fullscreen = True
-[GBA]
-BIOS = ~/retrodeck/bios/gba_bios.bin
-Rom1 =
-Rom2 =
-Rom3 =
-Rom4 =
-SavesInRomPath = False
-SavesPath = ~/retrodeck/saves/dolphin-emu/GBA/Saves/
-Threads = True
-[General]
-ISOPath0 = /run/user/1000/doc/9cd3cde7/wii
-ISOPath1 = /run/user/1000/doc/14708e0c/gc
-ISOPaths = 2
-WiiSDCardPath = ~/retrodeck/saves/dolphin-emu/Wii/sd.raw
-[NetPlay]
-TraversalChoice = direct
diff --git a/emu-configs/Dolphin/Dolphin.ini b/emu-configs/Dolphin/Dolphin.ini
new file mode 100644
index 00000000..bb6ae945
--- /dev/null
+++ b/emu-configs/Dolphin/Dolphin.ini
@@ -0,0 +1,58 @@
+[Analytics]
+ID = 09426e1e3e44d72728fb46a9e4a54663
+PermissionAsked = True
+[Core]
+GFXBackend = Vulkan
+SelectedLanguage = 0
+SerialPort1 = 255
+SkipIPL = True
+SlotA = 8
+SlotB = 255
+WiimoteContinuousScanning = False
+WiimoteControllerInterface = False
+WiimoteEnableSpeaker = False
+SIDevice0 = 6
+SIDevice1 = 0
+SIDevice2 = 0
+SIDevice3 = 0
+AudioStretch = False
+AudioStretchMaxLatency = 80
+DPL2Decoder = False
+DPL2Quality = 2
+DSPHLE = True
+[Display]
+Fullscreen = True
+DisableScreenSaver = True
+[GBA]
+BIOS = /var/data/dolphin-emu/GBA/gba_bios.bin
+Rom1 =
+Rom2 =
+Rom3 =
+Rom4 =
+SavesInRomPath = False
+SavesPath = /var/data/dolphin-emu/GBA/Saves/
+Threads = True
+[General]
+ISOPath0 = /run/user/1000/doc/9cd3cde7/wii
+ISOPath1 = /run/user/1000/doc/14708e0c/gc
+ISOPaths = 2
+WiiSDCardPath = /var/data/dolphin-emu/Wii/sd.raw
+WirelessMac = 00:17:ab:83:9b:d4
+HotkeysRequireFocus = True
+RecursiveISOPaths = True
+[NetPlay]
+TraversalChoice = direct
+[BluetoothPassthrough]
+Enabled = False
+[DSP]
+DSPThread = True
+Backend = Pulse
+EnableJIT = False
+[Interface]
+ConfirmStop = True
+CursorVisibility = 0
+OnScreenDisplayMessages = True
+PauseOnFocusLost = True
+ShowActiveTitle = True
+UseBuiltinTitleDatabase = True
+UsePanicHandlers = True
diff --git a/emu-configs/Dolphin/GCPadNew.ini b/emu-configs/Dolphin/GCPadNew.ini
new file mode 100644
index 00000000..2aa18517
--- /dev/null
+++ b/emu-configs/Dolphin/GCPadNew.ini
@@ -0,0 +1,41 @@
+[GCPad1]
+Device = evdev/0/Microsoft X-Box 360 pad 0
+Buttons/A = SOUTH
+Buttons/B = EAST
+Buttons/X = NORTH
+Buttons/Y = WEST
+Buttons/Z = `Full Axis 5+`
+Buttons/Start = START
+Main Stick/Up = `Axis 1-`
+Main Stick/Down = `Axis 1+`
+Main Stick/Left = `Axis 0-`
+Main Stick/Right = `Axis 0+`
+Main Stick/Modifier = `Shift`
+Main Stick/Modifier/Range = 50.000000000000000
+Main Stick/Calibration = 100.00 141.42 100.00 141.42 100.00 141.42 100.00 141.42
+C-Stick/Up = `Axis 4-`
+C-Stick/Down = `Axis 4+`
+C-Stick/Left = `Axis 3-`
+C-Stick/Right = `Axis 3+`
+C-Stick/Modifier = `Ctrl`
+C-Stick/Modifier/Range = 50.000000000000000
+C-Stick/Calibration = 100.00 141.42 100.00 141.42 100.00 141.42 100.00 141.42
+Triggers/L = TL
+Triggers/R = TR
+D-Pad/Up = `Axis 7-`
+D-Pad/Down = `Axis 7+`
+D-Pad/Left = `Axis 6-`
+D-Pad/Right = `Axis 6+`
+Rumble/Motor = Strong
+[GCPad2]
+Device = XInput2/0/Virtual core pointer
+Main Stick/Modifier/Range = 50.000000000000000
+C-Stick/Modifier/Range = 50.000000000000000
+[GCPad3]
+Device = XInput2/0/Virtual core pointer
+Main Stick/Modifier/Range = 50.000000000000000
+C-Stick/Modifier/Range = 50.000000000000000
+[GCPad4]
+Device = XInput2/0/Virtual core pointer
+Main Stick/Modifier/Range = 50.000000000000000
+C-Stick/Modifier/Range = 50.000000000000000
diff --git a/emu-configs/Dolphin/GFX.ini b/emu-configs/Dolphin/GFX.ini
new file mode 100644
index 00000000..76065805
--- /dev/null
+++ b/emu-configs/Dolphin/GFX.ini
@@ -0,0 +1,19 @@
+[Enhancements]
+ArbitraryMipmapDetection = True
+DisableCopyFilter = True
+ForceTrueColor = True
+[Hacks]
+BBoxEnable = False
+DeferEFBCopies = True
+EFBEmulateFormatChanges = False
+EFBScaledCopy = True
+EFBToTextureEnable = True
+SkipDuplicateXFBs = True
+XFBToTextureEnable = True
+[Settings]
+BackendMultithreading = True
+DumpBaseTextures = True
+DumpMipTextures = True
+FastDepthCalc = True
+InternalResolution = 1
+SaveTextureCacheToState = True
diff --git a/emu-configs/Dolphin/Hotkeys.ini b/emu-configs/Dolphin/Hotkeys.ini
new file mode 100644
index 00000000..c333ab08
--- /dev/null
+++ b/emu-configs/Dolphin/Hotkeys.ini
@@ -0,0 +1,8 @@
+[Hotkeys]
+Device = evdev/0/Microsoft X-Box 360 pad 0
+Save State/Save State Slot 1 = TR&SELECT
+Load State/Load State Slot 1 = TL&SELECT
+General/Take Screenshot = SELECT&SOUTH&`SDL/0/Microsoft X-Box 360 pad 0:Button 0`&`SDL/0/Microsoft X-Box 360 pad 0:Button 6`
+General/Exit = SELECT&START&`SDL/0/Microsoft X-Box 360 pad 0:Button 6`&`SDL/0/Microsoft X-Box 360 pad 0:Button 7`
+Emulation Speed/Increase Emulation Speed = SELECT&l
+Emulation Speed/Decrease Emulation Speed = SELECT&r
diff --git a/emu-configs/Dolphin/Qt.ini b/emu-configs/Dolphin/Qt.ini
new file mode 100644
index 00000000..d4d636e2
--- /dev/null
+++ b/emu-configs/Dolphin/Qt.ini
@@ -0,0 +1,89 @@
+[breakpointwidget]
+floating=false
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\x6\xe0\0\0\0\x14\0\0\aC\0\0\0\x31\0\0\x6\xe0\0\0\0\x14\0\0\aC\0\0\0\x31\0\0\0\0\0\0\0\0\xf\0\0\0\x6\xe0\0\0\0\x14\0\0\aC\0\0\0\x31)
+
+[cheatsmanager]
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\x14\0\0\0\x63\0\0\0\x31\0\0\0\0\0\0\0\x14\0\0\0\x63\0\0\0\x31\0\0\0\x1\0\0\0\0\x5\0\0\0\0\0\0\0\0\x14\0\0\0\x63\0\0\0\x31)
+
+[codewidget]
+boxsplitter=@ByteArray(\0\0\0\xff\0\0\0\x1\0\0\0\x4\0\0\0\x85\0\0\0\x85\0\0\0\x85\0\0\0\x85\x1\xff\xff\xff\xff\x1\0\0\0\x2\0)
+codesplitter=@ByteArray(\0\0\0\xff\0\0\0\x1\0\0\0\x2\0\0\0\x82\0\0\0W\x1\xff\xff\xff\xff\x1\0\0\0\x1\0)
+floating=false
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\x6\xe0\0\0\0\x14\0\0\aC\0\0\0\x31\0\0\x6\xe0\0\0\0\x14\0\0\aC\0\0\0\x31\0\0\0\0\0\0\0\0\xf\0\0\0\x6\xe0\0\0\0\x14\0\0\aC\0\0\0\x31)
+
+[gridview]
+scale=@Variant(\0\0\0\x87?\x80\0\0)
+
+[jitwidget]
+asmsplitter=@ByteArray(\0\0\0\xff\0\0\0\x1\0\0\0\x2\0\0\0W\0\0\0W\x1\xff\xff\xff\xff\x1\0\0\0\x1\0)
+floating=false
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\x6\xe0\0\0\0\x14\0\0\aC\0\0\0\x31\0\0\x6\xe0\0\0\0\x14\0\0\aC\0\0\0\x31\0\0\0\0\0\0\0\0\xf\0\0\0\x6\xe0\0\0\0\x14\0\0\aC\0\0\0\x31)
+tablesplitter=@ByteArray(\0\0\0\xff\0\0\0\x1\0\0\0\x2\0\0\0W\0\0\0W\x1\xff\xff\xff\xff\x1\0\0\0\x2\0)
+
+[logconfigwidget]
+floating=false
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\x6\xe0\0\0\0\x14\0\0\aC\0\0\0\x31\0\0\x6\xe0\0\0\0\x14\0\0\aC\0\0\0\x31\0\0\0\0\0\0\0\0\xf\0\0\0\x6\xe0\0\0\0\x14\0\0\aC\0\0\0\x31)
+
+[logging]
+font=0
+wraplines=false
+
+[logwidget]
+floating=false
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\x6\xe0\0\0\0\x14\0\0\aC\0\0\0\x31\0\0\x6\xe0\0\0\0\x14\0\0\aC\0\0\0\x31\0\0\0\0\0\0\0\0\xf\0\0\0\x6\xe0\0\0\0\x14\0\0\aC\0\0\0\x31)
+
+[mainwindow]
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\r\xb7\0\0\x1\x1\0\0\x10\xd6\0\0\x3\x32\0\0\r\xb7\0\0\x1\x1e\0\0\x10\xd6\0\0\x3\x32\0\0\0\0\0\0\0\0\xf\0\0\0\r\xb7\0\0\x1\x1e\0\0\x10\xd6\0\0\x3\x32)
+state=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\xfc\x2\0\0\0\x1\xfc\0\0\0\0\xff\xff\xff\xff\0\0\0\0\0\xff\xff\xff\xfa\xff\xff\xff\xff\x2\0\0\0\n\xfb\0\0\0\x6\0l\0o\0g\0\0\0\0\0\xff\xff\xff\xff\0\0\0\xb1\x1\0\0\x3\xfb\0\0\0\x12\0l\0o\0g\0\x63\0o\0n\0\x66\0i\0g\0\0\0\0\0\xff\xff\xff\xff\0\0\x2\x1b\x1\0\0\x3\xfb\0\0\0\b\0\x63\0o\0\x64\0\x65\0\0\0\0\0\xff\xff\xff\xff\0\0\x2\x61\x1\0\0\x3\xfb\0\0\0\x12\0r\0\x65\0g\0i\0s\0t\0\x65\0r\0s\0\0\0\0\0\xff\xff\xff\xff\0\0\0}\x1\0\0\x3\xfb\0\0\0\xe\0t\0h\0r\0\x65\0\x61\0\x64\0s\0\0\0\0\0\xff\xff\xff\xff\0\0\x2\x91\x1\0\0\x3\xfb\0\0\0\n\0w\0\x61\0t\0\x63\0h\0\0\0\0\0\xff\xff\xff\xff\0\0\0\xab\x1\0\0\x3\xfb\0\0\0\x16\0\x62\0r\0\x65\0\x61\0k\0p\0o\0i\0n\0t\0s\0\0\0\0\0\xff\xff\xff\xff\0\0\0\xab\x1\0\0\x3\xfb\0\0\0\f\0m\0\x65\0m\0o\0r\0y\0\0\0\0\0\xff\xff\xff\xff\0\0\0}\x1\0\0\x3\xfb\0\0\0\xe\0n\0\x65\0t\0w\0o\0r\0k\0\0\0\0\0\xff\xff\xff\xff\0\0\x2w\x1\0\0\x3\xfb\0\0\0\x12\0j\0i\0t\0w\0i\0\x64\0g\0\x65\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\x1\x1\x1\0\0\x3\0\0\x3 \0\0\x1\xa1\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\x1\0\0\0\x2\0\0\0\x1\0\0\0\xe\0t\0o\0o\0l\0\x62\0\x61\0r\x1\0\0\0\0\xff\xff\xff\xff\0\0\0\0\0\0\0\0)
+
+[memorywidget]
+addrspace_auxiliary=false
+addrspace_effective=true
+addrspace_physical=false
+bplog=true
+bpread=false
+bpreadwrite=true
+bpwrite=false
+floating=false
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\x6\xe0\0\0\0\x14\0\0\aC\0\0\0\x31\0\0\x6\xe0\0\0\0\x14\0\0\aC\0\0\0\x31\0\0\0\0\0\0\0\0\xf\0\0\0\x6\xe0\0\0\0\x14\0\0\aC\0\0\0\x31)
+searchascii=true
+searchhex=false
+splitter=@ByteArray(\0\0\0\xff\0\0\0\x1\0\0\0\x2\xff\xff\xff\xff\xff\xff\xff\xff\x1\xff\xff\xff\xff\x1\0\0\0\x1\0)
+typeascii=false
+typefloat=false
+typeu16=false
+typeu32=false
+typeu8=true
+
+[netplaydialog]
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\x14\0\0\x2\x7f\0\0\x1\xf3\0\0\0\0\0\0\0\x14\0\0\x2\x7f\0\0\x1\xf3\0\0\0\x1\0\0\0\0\x5\0\0\0\0\0\0\0\0\x14\0\0\x2\x7f\0\0\x1\xf3)
+splitter=@ByteArray(\0\0\0\xff\0\0\0\x1\0\0\0\x2\0\0\0\xa5\0\0\0\xd7\x1\xff\xff\xff\xff\x1\0\0\0\x1\0)
+
+[networkwidget]
+floating=false
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\x6\xe0\0\0\0\x14\0\0\aC\0\0\0\x31\0\0\x6\xe0\0\0\0\x14\0\0\aC\0\0\0\x31\0\0\0\0\0\0\0\0\xf\0\0\0\x6\xe0\0\0\0\x14\0\0\aC\0\0\0\x31)
+
+[registerwidget]
+floating=false
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\x6\xe0\0\0\0\x14\0\0\aC\0\0\0\x31\0\0\x6\xe0\0\0\0\x14\0\0\aC\0\0\0\x31\0\0\0\0\0\0\0\0\xf\0\0\0\x6\xe0\0\0\0\x14\0\0\aC\0\0\0\x31)
+
+[renderwidget]
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x2\x7f\0\0\x1\xdf\0\0\0\0\0\0\0\0\0\0\x2\x7f\0\0\x1\xdf\0\0\0\0\0\0\0\0\x5\0\0\0\0\0\0\0\0\0\0\0\x2\x7f\0\0\x1\xdf)
+
+[tableheader]
+state=@ByteArray(\0\0\0\xff\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\x2\x1\0\0\0\0\0\0\0\0\0\0\0\xe(?\0\0\0\b\0\0\0\t\0\0\0\x64\0\0\0\b\0\0\0\x64\0\0\0\v\0\0\0\x64\0\0\0\n\0\0\0\x64\0\0\0\r\0\0\0\x64\0\0\0\f\0\0\0\x64\0\0\0\x3\0\0\0\x64\0\0\0\x5\0\0\0\x46\0\0\x3\v\0\0\0\xe\x1\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x64\0\0\0&\0\0\0\x84\0\0\0\0\0\0\0\xe\0\0\0&\0\0\0\x1\0\0\0\x2\0\0\0\x66\0\0\0\x1\0\0\0\x2\0\0\x1\x2\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\x1\x2\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\x1\0\0\0\x2\0\0\0&\0\0\0\x1\0\0\0\x2\0\0\0U\0\0\0\x1\0\0\0\x2\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\x1\0\0\0\x2\0\0\0\0\0\0\0\x1\0\0\0\x2\0\0\0\0\0\0\0\x1\0\0\0\x2\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\x3\xe8\0\0\0\0\0)
+
+[threadwidget]
+floating=false
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\x6\xe0\0\0\0\x14\0\0\aC\0\0\0\x31\0\0\x6\xe0\0\0\0\x14\0\0\aC\0\0\0\x31\0\0\0\0\0\0\0\0\xf\0\0\0\x6\xe0\0\0\0\x14\0\0\aC\0\0\0\x31)
+
+[toolbar]
+visible=true
+
+[userstyle]
+enabled=false
+name=
+
+[watchwidget]
+floating=false
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\x6\xe0\0\0\0\x14\0\0\aC\0\0\0\x31\0\0\x6\xe0\0\0\0\x14\0\0\aC\0\0\0\x31\0\0\0\0\0\0\0\0\xf\0\0\0\x6\xe0\0\0\0\x14\0\0\aC\0\0\0\x31)
diff --git a/emu-configs/GS.ini b/emu-configs/GS.ini
new file mode 100644
index 00000000..d91aa444
--- /dev/null
+++ b/emu-configs/GS.ini
@@ -0,0 +1,89 @@
+CaptureHeight = 480
+CaptureWidth = 640
+DisableDualSourceBlend = 0
+DisableFramebufferFetch = 0
+DumpReplaceableMipmaps = 0
+DumpReplaceableTextures = 0
+DumpTexturesWithFMVActive = 0
+HWDisableReadbacks = 0
+IntegerScaling = 0
+LoadTextureReplacements = 0
+LoadTextureReplacementsAsync = 1
+MaxAnisotropy = 0
+NTSC_Saturation = 1
+OsdScale = 100
+OsdShowCPU = 0
+OsdShowFPS = 0
+OsdShowGPU = 0
+OsdShowGSStats = 0
+OsdShowIndicators = 1
+OsdShowMessages = 1
+OsdShowResolution = 0
+OsdShowSpeed = 0
+OverrideGeometryShaders = -1
+OverrideTextureBarriers = -1
+PrecacheTextureReplacements = 0
+Renderer = 14
+ShadeBoost = 0
+ShadeBoost_Brightness = 50
+ShadeBoost_Contrast = 50
+ShadeBoost_Saturation = 50
+TVShader = 0
+ThreadedPresentation = 0
+UseBlitSwapChain = 0
+UseDebugDevice = 0
+UserHacks = 1
+UserHacks_AutoFlush = 0
+UserHacks_CPU_FB_Conversion = 0
+UserHacks_DisableDepthSupport = 0
+UserHacks_DisablePartialInvalidation = 1
+UserHacks_Disable_Safe_Features = 0
+UserHacks_HalfPixelOffset = 0
+UserHacks_Half_Bottom_Override = -1
+UserHacks_SkipDraw_End = 0
+UserHacks_SkipDraw_Start = 0
+UserHacks_TCOffsetX = 0
+UserHacks_TCOffsetY = 0
+UserHacks_TextureInsideRt = 0
+UserHacks_TriFilter = 0
+UserHacks_WildHack = 0
+UserHacks_align_sprite_X = 0
+UserHacks_merge_pp_sprite = 0
+UserHacks_round_sprite_offset = 0
+aa1 = 1
+accurate_blending_unit = 1
+accurate_date = 1
+autoflush_sw = 1
+capture_enabled = 0
+capture_out_dir = /tmp/GS_Capture
+capture_threads = 4
+conservative_framebuffer = 1
+crc_hack_level = -1
+disable_shader_cache = 0
+dithering_ps2 = 2
+dump = 0
+extrathreads = 2
+extrathreads_height = 4
+filter = 2
+fxaa = 0
+interlace = 7
+linear_present = 1
+mipmap = 1
+mipmap_hw = -1
+override_GL_ARB_shader_image_load_store = -1
+override_GL_ARB_sparse_texture = -1
+paltex = 0
+png_compression_level = 1
+preload_frame_with_gs_data = 0
+save = 0
+savef = 0
+savel = 5000
+saven = 0
+savet = 0
+savez = 0
+shaderfx = 0
+shaderfx_conf = shaders/GS_FX_Settings.ini
+shaderfx_glsl = shaders/GS.fx
+texture_preloading = 0
+upscale_multiplier = 2
+wrap_gs_mem = 0
diff --git a/emu-configs/PCSX2_ui.ini b/emu-configs/PCSX2_ui.ini
index 3d8e65f9..00f098ce 100644
--- a/emu-configs/PCSX2_ui.ini
+++ b/emu-configs/PCSX2_ui.ini
@@ -1,5 +1,5 @@
-MainGuiPosition=169,145
-SysSettingsTabName=Cpu
+MainGuiPosition=4329,211
+SysSettingsTabName=GS Window
McdSettingsTabName=none
ComponentsTabName=
AppSettingsTabName=none
@@ -26,7 +26,7 @@ CdvdSource=ISO
[ProgramLog]
Visible=disabled
AutoDock=enabled
-DisplayPosition=265,103
+DisplayPosition=4728,211
DisplaySize=680,560
FontSize=8
Theme=Default
@@ -41,9 +41,9 @@ UseDefaultCheats=enabled
UseDefaultCheatsWS=enabled
UseDefaultTextures=enabled
Bios=~/retrodeck/bios
-Snapshots=~/retrodeck/screenshots
-Savestates=~/retrodeck/states/
-MemoryCards=~/retrodeck/saves/
+Snapshots=/var/config/PCSX2/snaps
+Savestates=/var/config/PCSX2/sstates
+MemoryCards=/var/config/PCSX2/memcards
Logs=/var/config/PCSX2/logs
Langs=/app/share/PCSX2/resources/locale
Cheats=/var/config/PCSX2/cheats
@@ -55,16 +55,16 @@ RunELF=/var/config/PCSX2
RunDisc=
[GSWindow]
CloseOnEsc=enabled
-DefaultToFullscreen=disabled
+DefaultToFullscreen=enabled
AlwaysHideMouse=disabled
DisableResizeBorders=disabled
DisableScreenSaver=enabled
-WindowSize=640,480
+WindowSize=1264,717
WindowPos=-1,-1
IsMaximized=disabled
IsFullscreen=disabled
EnableVsyncWindowFlag=disabled
-IsToggleFullscreenOnDoubleClick=enabled
+IsToggleFullscreenOnDoubleClick=disabled
AspectRatio=4:3
FMVAspectRatioSwitch=Off
Zoom=100
@@ -103,7 +103,7 @@ Multitap2_Slot3_Filename=Mcd-Multitap2-Slot03.ps2
Multitap2_Slot4_Enable=disabled
Multitap2_Slot4_Filename=Mcd-Multitap2-Slot04.ps2
[Filenames]
-BIOS=scph10000.bin
+BIOS=SCPH30004R.bin
[Framerate]
NominalScalar=1
TurboScalar=2
@@ -157,3 +157,5 @@ IOP.Events.CDVD=disabled
IOP.Events.MDEC=disabled
[TraceLogSources/IOP.Disasm.COP2]
GPU=disabled
+[DialogPositions]
+CoreSettings_Pos=3645,203
diff --git a/emu-configs/PCSX2_vm.ini b/emu-configs/PCSX2_vm.ini
new file mode 100644
index 00000000..d4afe2b9
--- /dev/null
+++ b/emu-configs/PCSX2_vm.ini
@@ -0,0 +1,113 @@
+[EmuCore]
+CdvdVerboseReads=disabled
+CdvdDumpBlocks=disabled
+CdvdShareWrite=disabled
+EnablePatches=enabled
+EnableCheats=disabled
+EnablePINE=disabled
+EnableWideScreenPatches=enabled
+EnableRecordingTools=disabled
+ConsoleToStdio=disabled
+HostFs=disabled
+BackupSavestate=enabled
+McdEnableEjection=enabled
+McdFolderAutoManage=enabled
+MultitapPort0_Enabled=disabled
+MultitapPort1_Enabled=disabled
+GzipIsoIndexTemplate=$(f).pindex.tmp
+[EmuCore/Speedhacks]
+EECycleRate=0
+EECycleSkip=0
+fastCDVD=disabled
+IntcStat=enabled
+WaitLoop=enabled
+vuFlagHack=enabled
+vuThread=enabled
+vu1Instant=enabled
+[EmuCore/CPU]
+FPU.DenormalsAreZero=enabled
+FPU.FlushToZero=enabled
+FPU.Roundmode=3
+VU.DenormalsAreZero=enabled
+VU.FlushToZero=enabled
+VU.Roundmode=3
+[EmuCore/CPU/Recompiler]
+EnableEE=enabled
+EnableIOP=enabled
+EnableEECache=disabled
+EnableVU0=enabled
+EnableVU1=enabled
+vuOverflow=enabled
+vuExtraOverflow=disabled
+vuSignOverflow=disabled
+vuUnderflow=disabled
+fpuOverflow=enabled
+fpuExtraOverflow=disabled
+fpuFullMode=disabled
+StackFrameChecks=disabled
+PreBlockCheckEE=disabled
+PreBlockCheckIOP=disabled
+[EmuCore/GS]
+VsyncQueueSize=2
+FrameLimitEnable=enabled
+FrameSkipEnable=disabled
+VsyncEnable=1
+FramerateNTSC=59.94
+FrameratePAL=50
+FramesToDraw=2
+FramesToSkip=2
+[EmuCore/Gamefixes]
+VuAddSubHack=disabled
+FpuMulHack=disabled
+FpuNegDivHack=disabled
+XgKickHack=disabled
+EETimingHack=disabled
+SoftwareRendererFMVHack=disabled
+SkipMPEGHack=disabled
+OPHFlagHack=disabled
+DMABusyHack=disabled
+VIFFIFOHack=disabled
+VIF1StallHack=disabled
+GIFFIFOHack=disabled
+GoemonTlbHack=disabled
+IbitHack=disabled
+VUSyncHack=disabled
+VUOverflowHack=disabled
+[EmuCore/Profiler]
+Enabled=disabled
+RecBlocks_EE=enabled
+RecBlocks_IOP=enabled
+RecBlocks_VU0=enabled
+RecBlocks_VU1=enabled
+[EmuCore/Debugger]
+ShowDebuggerOnStart=disabled
+AlignMemoryWindowStart=enabled
+FontWidth=8
+FontHeight=12
+WindowWidth=0
+WindowHeight=0
+MemoryViewBytesPerRow=16
+[EmuCore/TraceLog]
+Enabled=disabled
+EE.bitset=0
+IOP.bitset=0
+[DEV9]
+[DEV9/Eth]
+EthEnable=disabled
+EthApi=Unset
+EthDevice=
+EthLogDNS=disabled
+InterceptDHCP=disabled
+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=enabled
+AutoGateway=enabled
+ModeDNS1=Auto
+ModeDNS2=Auto
+[DEV9/Hdd]
+HddEnable=disabled
+HddFile=DEV9hdd.raw
+HddSizeSectors=83886080
diff --git a/emu-configs/retroarch-core-options.cfg b/emu-configs/retroarch-core-options.cfg
new file mode 100644
index 00000000..5e8960be
--- /dev/null
+++ b/emu-configs/retroarch-core-options.cfg
@@ -0,0 +1,480 @@
+beetle_psx_analog_calibration = "disabled"
+beetle_psx_analog_toggle = "disabled"
+beetle_psx_aspect_ratio = "corrected"
+beetle_psx_cd_access_method = "sync"
+beetle_psx_cd_fastload = "2x(native)"
+beetle_psx_core_timing_fps = "force_progressive"
+beetle_psx_cpu_dynarec = "disabled"
+beetle_psx_cpu_freq_scale = "100%(native)"
+beetle_psx_crop_overscan = "smart"
+beetle_psx_crosshair_color_p1 = "red"
+beetle_psx_crosshair_color_p2 = "blue"
+beetle_psx_display_internal_fps = "disabled"
+beetle_psx_dither_mode = "1x(native)"
+beetle_psx_dynarec_eventcycles = "128"
+beetle_psx_dynarec_invalidate = "full"
+beetle_psx_enable_memcard1 = "enabled"
+beetle_psx_enable_multitap_port1 = "disabled"
+beetle_psx_enable_multitap_port2 = "disabled"
+beetle_psx_frame_duping = "disabled"
+beetle_psx_gpu_overclock = "1x(native)"
+beetle_psx_gte_overclock = "disabled"
+beetle_psx_gun_cursor = "cross"
+beetle_psx_gun_input_mode = "lightgun"
+beetle_psx_image_crop = "disabled"
+beetle_psx_image_offset = "disabled"
+beetle_psx_initial_scanline = "0"
+beetle_psx_initial_scanline_pal = "0"
+beetle_psx_internal_resolution = "1x(native)"
+beetle_psx_last_scanline = "239"
+beetle_psx_last_scanline_pal = "287"
+beetle_psx_line_render = "default"
+beetle_psx_memcard_left_index = "0"
+beetle_psx_memcard_right_index = "1"
+beetle_psx_mouse_sensitivity = "100%"
+beetle_psx_negcon_deadzone = "0%"
+beetle_psx_negcon_response = "linear"
+beetle_psx_override_bios = "disabled"
+beetle_psx_pal_video_timing_override = "disabled"
+beetle_psx_pgxp_2d_tol = "disabled"
+beetle_psx_pgxp_mode = "disabled"
+beetle_psx_pgxp_nclip = "disabled"
+beetle_psx_shared_memory_cards = "disabled"
+beetle_psx_skip_bios = "disabled"
+beetle_psx_use_mednafen_memcard0_method = "libretro"
+beetle_psx_widescreen_hack = "disabled"
+beetle_psx_widescreen_hack_aspect_ratio = "16:9"
+citra_analog_function = "C-Stick and Touchscreen Pointer"
+citra_custom_textures = "disabled"
+citra_deadzone = "15"
+citra_dump_textures = "disabled"
+citra_is_new_3ds = "Old 3DS"
+citra_language = "English"
+citra_layout_option = "Default Top-Bottom Screen"
+citra_mouse_touchscreen = "enabled"
+citra_region_value = "Auto"
+citra_render_touchscreen = "disabled"
+citra_resolution_factor = "4x"
+citra_swap_screen = "Top"
+citra_texture_filter = "none"
+citra_touch_touchscreen = "enabled"
+citra_use_acc_geo_shaders = "enabled"
+citra_use_acc_mul = "enabled"
+citra_use_cpu_jit = "enabled"
+citra_use_gdbstub = "disabled"
+citra_use_hw_renderer = "enabled"
+citra_use_hw_shader_cache = "enabled"
+citra_use_hw_shaders = "enabled"
+citra_use_libretro_save_path = "LibRetro Default"
+citra_use_shader_jit = "enabled"
+citra_use_virtual_sd = "enabled"
+desmume_advanced_timing = "enabled"
+desmume_boot_into_bios = "disabled"
+desmume_color_depth = "16-bit"
+desmume_cpu_mode = "jit"
+desmume_firmware_language = "Auto"
+desmume_frameskip = "0"
+desmume_gfx_edgemark = "enabled"
+desmume_gfx_highres_interpolate_color = "disabled"
+desmume_gfx_linehack = "enabled"
+desmume_gfx_multisampling = "disabled"
+desmume_gfx_texture_deposterize = "disabled"
+desmume_gfx_texture_scaling = "1"
+desmume_gfx_texture_smoothing = "disabled"
+desmume_gfx_txthack = "disabled"
+desmume_hybrid_cursor_always_smallscreen = "enabled"
+desmume_hybrid_layout_ratio = "3:1"
+desmume_hybrid_layout_scale = "disabled"
+desmume_hybrid_showboth_screens = "enabled"
+desmume_input_rotation = "0"
+desmume_internal_resolution = "256x192"
+desmume_jit_block_size = "12"
+desmume_load_to_memory = "disabled"
+desmume_mic_mode = "pattern"
+desmume_mouse_speed = "1.0"
+desmume_num_cores = "1"
+desmume_opengl_depth_lequal_polygon_facing = "disabled"
+desmume_opengl_mode = "disabled"
+desmume_opengl_nds_depth_calculation = "enabled"
+desmume_opengl_shadow_polygon = "enabled"
+desmume_opengl_special_zero_alpha = "enabled"
+desmume_pointer_colour = "white"
+desmume_pointer_device_acceleration_mod = "0"
+desmume_pointer_device_deadzone = "15"
+desmume_pointer_device_l = "none"
+desmume_pointer_device_r = "none"
+desmume_pointer_mouse = "enabled"
+desmume_pointer_stylus_pressure = "50"
+desmume_pointer_type = "mouse"
+desmume_screens_gap = "0"
+desmume_screens_layout = "top/bottom"
+desmume_use_external_bios = "disabled"
+dolphin_alt_gc_ports_on_wii = "disabled"
+dolphin_bbox_enabled = "disabled"
+dolphin_cheats_enabled = "disabled"
+dolphin_cpu_clock_rate = "100%"
+dolphin_cpu_core = "JIT64"
+dolphin_dsp_hle = "enabled"
+dolphin_dsp_jit = "enabled"
+dolphin_efb_scale = "x1 (640 x 528)"
+dolphin_efb_scaled_copy = "enabled"
+dolphin_efb_to_texture = "enabled"
+dolphin_efb_to_vram = "disabled"
+dolphin_enable_rumble = "enabled"
+dolphin_fast_depth_calculation = "enabled"
+dolphin_fastmem = "enabled"
+dolphin_force_texture_filtering = "disabled"
+dolphin_gpu_texture_decoding = "disabled"
+dolphin_ir_mode = "Right Stick controls pointer (relative)"
+dolphin_ir_offset = "10"
+dolphin_ir_pitch = "15"
+dolphin_ir_yaw = "15"
+dolphin_language = "English"
+dolphin_load_custom_textures = "disabled"
+dolphin_log_level = "Info"
+dolphin_max_anisotropy = "1x"
+dolphin_mixer_rate = "32000"
+dolphin_osd_enabled = "enabled"
+dolphin_pal60 = "enabled"
+dolphin_progressive_scan = "enabled"
+dolphin_renderer = "Hardware"
+dolphin_sensor_bar_position = "Bottom"
+dolphin_shader_compilation_mode = "sync"
+dolphin_texture_cache_accuracy = "Fast"
+dolphin_wait_for_shaders = "disabled"
+dolphin_widescreen = "enabled"
+dolphin_widescreen_hack = "disabled"
+dolphin_wiimote_continuous_scanning = "disabled"
+gambatte_audio_resampler = "sinc"
+gambatte_dark_filter_level = "0"
+gambatte_gb_bootloader = "enabled"
+gambatte_gb_colorization = "disabled"
+gambatte_gb_hwmode = "Auto"
+gambatte_gb_internal_palette = "GB - DMG"
+gambatte_gb_link_mode = "Not Connected"
+gambatte_gb_link_network_port = "56400"
+gambatte_gb_link_network_server_ip_1 = "0"
+gambatte_gb_link_network_server_ip_10 = "0"
+gambatte_gb_link_network_server_ip_11 = "0"
+gambatte_gb_link_network_server_ip_12 = "0"
+gambatte_gb_link_network_server_ip_2 = "0"
+gambatte_gb_link_network_server_ip_3 = "0"
+gambatte_gb_link_network_server_ip_4 = "0"
+gambatte_gb_link_network_server_ip_5 = "0"
+gambatte_gb_link_network_server_ip_6 = "0"
+gambatte_gb_link_network_server_ip_7 = "0"
+gambatte_gb_link_network_server_ip_8 = "0"
+gambatte_gb_link_network_server_ip_9 = "0"
+gambatte_gb_palette_pixelshift_1 = "PixelShift 01 - Arctic Green"
+gambatte_gb_palette_twb64_1 = "TWB64 001 - Aqours Blue"
+gambatte_gb_palette_twb64_2 = "TWB64 101 - 765PRO Pink"
+gambatte_gbc_color_correction = "GBC only"
+gambatte_gbc_color_correction_mode = "accurate"
+gambatte_gbc_frontlight_position = "central"
+gambatte_mix_frames = "disabled"
+gambatte_rumble_level = "10"
+gambatte_show_gb_link_settings = "disabled"
+gambatte_turbo_period = "4"
+gambatte_up_down_allowed = "disabled"
+genesis_plus_gx_add_on = "auto"
+genesis_plus_gx_addr_error = "enabled"
+genesis_plus_gx_aspect_ratio = "auto"
+genesis_plus_gx_audio_filter = "disabled"
+genesis_plus_gx_bios = "disabled"
+genesis_plus_gx_blargg_ntsc_filter = "disabled"
+genesis_plus_gx_bram = "per bios"
+genesis_plus_gx_cdda_volume = "100"
+genesis_plus_gx_fm_preamp = "100"
+genesis_plus_gx_force_dtack = "enabled"
+genesis_plus_gx_frameskip = "disabled"
+genesis_plus_gx_frameskip_threshold = "33"
+genesis_plus_gx_gg_extra = "disabled"
+genesis_plus_gx_gun_cursor = "disabled"
+genesis_plus_gx_gun_input = "lightgun"
+genesis_plus_gx_invert_mouse = "disabled"
+genesis_plus_gx_lcd_filter = "disabled"
+genesis_plus_gx_left_border = "disabled"
+genesis_plus_gx_lock_on = "disabled"
+genesis_plus_gx_lowpass_range = "60"
+genesis_plus_gx_md_channel_0_volume = "100"
+genesis_plus_gx_md_channel_1_volume = "100"
+genesis_plus_gx_md_channel_2_volume = "100"
+genesis_plus_gx_md_channel_3_volume = "100"
+genesis_plus_gx_md_channel_4_volume = "100"
+genesis_plus_gx_md_channel_5_volume = "100"
+genesis_plus_gx_no_sprite_limit = "disabled"
+genesis_plus_gx_overclock = "100%"
+genesis_plus_gx_overscan = "disabled"
+genesis_plus_gx_pcm_volume = "100"
+genesis_plus_gx_psg_channel_0_volume = "100"
+genesis_plus_gx_psg_channel_1_volume = "100"
+genesis_plus_gx_psg_channel_2_volume = "100"
+genesis_plus_gx_psg_channel_3_volume = "100"
+genesis_plus_gx_psg_preamp = "150"
+genesis_plus_gx_region_detect = "auto"
+genesis_plus_gx_render = "single field"
+genesis_plus_gx_show_advanced_audio_settings = "disabled"
+genesis_plus_gx_sms_fm_channel_0_volume = "100"
+genesis_plus_gx_sms_fm_channel_1_volume = "100"
+genesis_plus_gx_sms_fm_channel_2_volume = "100"
+genesis_plus_gx_sms_fm_channel_3_volume = "100"
+genesis_plus_gx_sms_fm_channel_4_volume = "100"
+genesis_plus_gx_sms_fm_channel_5_volume = "100"
+genesis_plus_gx_sms_fm_channel_6_volume = "100"
+genesis_plus_gx_sms_fm_channel_7_volume = "100"
+genesis_plus_gx_sms_fm_channel_8_volume = "100"
+genesis_plus_gx_sound_output = "stereo"
+genesis_plus_gx_system_hw = "auto"
+genesis_plus_gx_ym2413 = "auto"
+genesis_plus_gx_ym2413_core = "mame"
+genesis_plus_gx_ym2612 = "mame (ym2612)"
+mame-external_hiscore = "disabled"
+mame_alternate_renderer = "disabled"
+mame_altres = "640x480"
+mame_auto_save = "disabled"
+mame_boot_from_cli = "disabled"
+mame_boot_to_bios = "disabled"
+mame_boot_to_osd = "disabled"
+mame_buttons_profiles = "enabled"
+mame_cheats_enable = "disabled"
+mame_cpu_overclock = "default"
+mame_current_adj_brightness = "default"
+mame_current_adj_contrast = "default"
+mame_current_adj_gamma = "default"
+mame_current_aspect_ratio = "DAR"
+mame_current_frame_skip = "0"
+mame_current_mouse_enable = "enabled"
+mame_current_sample_rate = "48000Hz"
+mame_current_skip_gameinfo = "disabled"
+mame_current_skip_nagscreen = "enabled"
+mame_current_skip_warnings = "disabled"
+mame_current_turbo_button = "disabled"
+mame_current_turbo_delay = "medium"
+mame_current_videoapproach1_enable = "disabled"
+mame_lightgun_mode = "none"
+mame_mame_4way_enable = "disabled"
+mame_mame_paths_enable = "disabled"
+mame_media_type = "rom"
+mame_mouse_enable = "disabled"
+mame_read_config = "disabled"
+mame_saves = "game"
+mame_softlists_auto_media = "enabled"
+mame_softlists_enable = "enabled"
+mame_throttle = "disabled"
+mame_write_config = "disabled"
+melonds_audio_bitrate = "Automatic"
+melonds_audio_interpolation = "None"
+melonds_boot_directly = "enabled"
+melonds_console_mode = "DS"
+melonds_dsi_sdcard = "disabled"
+melonds_hybrid_ratio = "2"
+melonds_hybrid_small_screen = "Bottom"
+melonds_jit_block_size = "32"
+melonds_jit_branch_optimisations = "enabled"
+melonds_jit_enable = "enabled"
+melonds_jit_fast_memory = "enabled"
+melonds_jit_literal_optimisations = "enabled"
+melonds_opengl_better_polygons = "disabled"
+melonds_opengl_filtering = "nearest"
+melonds_opengl_renderer = "disabled"
+melonds_opengl_resolution = "1x native (256x192)"
+melonds_randomize_mac_address = "disabled"
+melonds_screen_gap = "0"
+melonds_screen_layout = "Top/Bottom"
+melonds_swapscreen_mode = "Toggle"
+melonds_threaded_renderer = "disabled"
+melonds_touch_mode = "enabled"
+mgba_allow_opposing_directions = "no"
+mgba_audio_low_pass_filter = "disabled"
+mgba_audio_low_pass_range = "60"
+mgba_color_correction = "OFF"
+mgba_force_gbp = "OFF"
+mgba_frameskip = "disabled"
+mgba_frameskip_interval = "0"
+mgba_frameskip_threshold = "33"
+mgba_gb_colors = "Grayscale"
+mgba_gb_colors_preset = "0"
+mgba_gb_model = "Autodetect"
+mgba_idle_optimization = "Remove Known"
+mgba_interframe_blending = "OFF"
+mgba_sgb_borders = "ON"
+mgba_skip_bios = "OFF"
+mgba_solar_sensor_level = "0"
+mgba_use_bios = "ON"
+mupen64plus-169screensize = "960x540"
+mupen64plus-43screensize = "640x480"
+mupen64plus-alt-map = "False"
+mupen64plus-angrylion-multithread = "all threads"
+mupen64plus-angrylion-overscan = "disabled"
+mupen64plus-angrylion-sync = "Low"
+mupen64plus-angrylion-vioverlay = "Filtered"
+mupen64plus-aspect = "4:3"
+mupen64plus-astick-deadzone = "15"
+mupen64plus-astick-sensitivity = "100"
+mupen64plus-BackgroundMode = "OnePiece"
+mupen64plus-BilinearMode = "standard"
+mupen64plus-CorrectTexrectCoords = "Off"
+mupen64plus-CountPerOp = "0"
+mupen64plus-CountPerOpDenomPot = "0"
+mupen64plus-cpucore = "dynamic_recompiler"
+mupen64plus-d-cbutton = "C3"
+mupen64plus-DitheringPattern = "False"
+mupen64plus-DitheringQuantization = "False"
+mupen64plus-EnableCopyAuxToRDRAM = "False"
+mupen64plus-EnableCopyColorToRDRAM = "Async"
+mupen64plus-EnableCopyDepthToRDRAM = "Software"
+mupen64plus-EnableEnhancedHighResStorage = "False"
+mupen64plus-EnableEnhancedTextureStorage = "False"
+mupen64plus-EnableFBEmulation = "True"
+mupen64plus-EnableFragmentDepthWrite = "True"
+mupen64plus-EnableHiResAltCRC = "False"
+mupen64plus-EnableHWLighting = "False"
+mupen64plus-EnableInaccurateTextureCoordinates = "False"
+mupen64plus-EnableLegacyBlending = "False"
+mupen64plus-EnableLODEmulation = "True"
+mupen64plus-EnableN64DepthCompare = "False"
+mupen64plus-EnableNativeResFactor = "0"
+mupen64plus-EnableNativeResTexrects = "Disabled"
+mupen64plus-EnableOverscan = "Enabled"
+mupen64plus-EnableShadersStorage = "True"
+mupen64plus-EnableTexCoordBounds = "False"
+mupen64plus-EnableTextureCache = "True"
+mupen64plus-ForceDisableExtraMem = "False"
+mupen64plus-FrameDuping = "False"
+mupen64plus-Framerate = "Original"
+mupen64plus-FXAA = "0"
+mupen64plus-GLideN64IniBehaviour = "late"
+mupen64plus-HybridFilter = "True"
+mupen64plus-IgnoreTLBExceptions = "False"
+mupen64plus-l-cbutton = "C2"
+mupen64plus-MaxHiResTxVramLimit = "0"
+mupen64plus-MaxTxCacheSize = "8000"
+mupen64plus-MultiSampling = "0"
+mupen64plus-OverscanBottom = "0"
+mupen64plus-OverscanLeft = "0"
+mupen64plus-OverscanRight = "0"
+mupen64plus-OverscanTop = "0"
+mupen64plus-pak1 = "memory"
+mupen64plus-pak2 = "none"
+mupen64plus-pak3 = "none"
+mupen64plus-pak4 = "none"
+mupen64plus-parallel-rdp-deinterlace-method = "Bob"
+mupen64plus-parallel-rdp-dither-filter = "True"
+mupen64plus-parallel-rdp-divot-filter = "True"
+mupen64plus-parallel-rdp-downscaling = "disable"
+mupen64plus-parallel-rdp-gamma-dither = "True"
+mupen64plus-parallel-rdp-native-tex-rect = "True"
+mupen64plus-parallel-rdp-native-texture-lod = "False"
+mupen64plus-parallel-rdp-overscan = "0"
+mupen64plus-parallel-rdp-super-sampled-read-back = "False"
+mupen64plus-parallel-rdp-super-sampled-read-back-dither = "True"
+mupen64plus-parallel-rdp-synchronous = "True"
+mupen64plus-parallel-rdp-upscaling = "1x"
+mupen64plus-parallel-rdp-vi-aa = "True"
+mupen64plus-parallel-rdp-vi-bilinear = "True"
+mupen64plus-r-cbutton = "C1"
+mupen64plus-rdp-plugin = "gliden64"
+mupen64plus-RDRAMImageDitheringMode = "False"
+mupen64plus-rsp-plugin = "hle"
+mupen64plus-ThreadedRenderer = "False"
+mupen64plus-txCacheCompression = "True"
+mupen64plus-txEnhancementMode = "None"
+mupen64plus-txFilterIgnoreBG = "True"
+mupen64plus-txFilterMode = "None"
+mupen64plus-txHiresEnable = "False"
+mupen64plus-txHiresFullAlphaChannel = "False"
+mupen64plus-u-cbutton = "C4"
+mupen64plus-virefresh = "Auto"
+pcsx2_accurate_date = "enabled"
+pcsx2_anisotropic_filter = "0"
+pcsx2_aspect_ratio = "0"
+pcsx2_bios = "scph10000.bin"
+pcsx2_boot_bios = "disabled"
+pcsx2_clamping_mode = "1"
+pcsx2_conservative_buffer = "enabled"
+pcsx2_deinterlace_mode = "7"
+pcsx2_dithering = "2"
+pcsx2_enable_60fps_patches = "disabled"
+pcsx2_enable_cheats = "disabled"
+pcsx2_enable_widescreen_patches = "enabled"
+pcsx2_fast_invalidation = "disabled"
+pcsx2_fastboot = "disabled"
+pcsx2_fastcdvd = "disabled"
+pcsx2_frames_to_draw = "1"
+pcsx2_frames_to_skip = "1"
+pcsx2_frameskip = "disabled"
+pcsx2_fxaa = "0"
+pcsx2_gamepad_l_deadzone = "0"
+pcsx2_gamepad_r_deadzone = "0"
+pcsx2_memcard_slot_1 = "shared8"
+pcsx2_memcard_slot_2 = "empty"
+pcsx2_mipmapping = "-1"
+pcsx2_palette_conversion = "disabled"
+pcsx2_renderer = "Auto"
+pcsx2_round_mode = "3"
+pcsx2_rumble_enable = "enabled"
+pcsx2_rumble_intensity = "100"
+pcsx2_speedhacks_presets = "3"
+pcsx2_system_language = "English"
+pcsx2_texture_filtering = "2"
+pcsx2_upscale_multiplier = "1"
+pcsx2_userhack_align_sprite = "disabled"
+pcsx2_userhack_auto_flush = "disabled"
+pcsx2_userhack_fb_conversion = "disabled"
+pcsx2_userhack_halfpixel_offset = "0"
+pcsx2_userhack_halfscreen_fix = "-1"
+pcsx2_userhack_merge_sprite = "disabled"
+pcsx2_userhack_round_sprite = "0"
+pcsx2_userhack_skipdraw_layers = "0"
+pcsx2_userhack_skipdraw_start = "0"
+pcsx2_userhack_texture_offset_x_hundreds = "0"
+pcsx2_userhack_texture_offset_x_tens = "0"
+pcsx2_userhack_texture_offset_y_hundreds = "0"
+pcsx2_userhack_texture_offset_y_tens = "0"
+pcsx2_userhack_wildarms_offset = "disabled"
+pcsx2_vsync_mtgs_queue = "2"
+pcsx2_vu_clamping_mode = "1"
+pcsx2_vu_round_mode = "3"
+pokemini_lcdbright = "0"
+pokemini_lcdcontrast = "64"
+pokemini_lcdfilter = "dotmatrix"
+pokemini_lcdmode = "analog"
+pokemini_lowpass_filter = "disabled"
+pokemini_lowpass_range = "60"
+pokemini_palette = "Default"
+pokemini_piezofilter = "enabled"
+pokemini_rumble_lv = "10"
+pokemini_screen_shake_lv = "3"
+pokemini_turbo_period = "18"
+pokemini_video_scale = "4x"
+ppsspp_auto_frameskip = "disabled"
+ppsspp_block_transfer_gpu = "enabled"
+ppsspp_button_preference = "Cross"
+ppsspp_cheats = "disabled"
+ppsspp_cpu_core = "JIT"
+ppsspp_disable_slow_framebuffer_effects = "disabled"
+ppsspp_fast_memory = "enabled"
+ppsspp_force_lag_sync = "disabled"
+ppsspp_frameskip = "Off"
+ppsspp_frameskiptype = "Number of frames"
+ppsspp_gpu_hardware_transform = "enabled"
+ppsspp_ignore_bad_memory_access = "enabled"
+ppsspp_inflight_frames = "Up to 2"
+ppsspp_internal_resolution = "480x272"
+ppsspp_io_timing_method = "Fast"
+ppsspp_language = "Automatic"
+ppsspp_lazy_texture_caching = "disabled"
+ppsspp_locked_cpu_speed = "off"
+ppsspp_lower_resolution_for_effects = "Off"
+ppsspp_rendering_mode = "Buffered"
+ppsspp_retain_changed_textures = "disabled"
+ppsspp_software_skinning = "enabled"
+ppsspp_spline_quality = "Low"
+ppsspp_texture_anisotropic_filtering = "off"
+ppsspp_texture_deposterize = "disabled"
+ppsspp_texture_filtering = "Auto"
+ppsspp_texture_replacement = "disabled"
+ppsspp_texture_scaling_level = "Off"
+ppsspp_texture_scaling_type = "xbrz"
+ppsspp_texture_shader = "Off"
+ppsspp_vertex_cache = "disabled"
diff --git a/emu-configs/retroarch.cfg b/emu-configs/retroarch.cfg
index 46ed1da8..72e91636 100644
--- a/emu-configs/retroarch.cfg
+++ b/emu-configs/retroarch.cfg
@@ -227,7 +227,7 @@ input_exit_emulator_btn = "nul"
input_exit_emulator_mbtn = "nul"
input_fps_toggle = "f3"
input_fps_toggle_axis = "nul"
-input_fps_toggle_btn = "nul"
+input_fps_toggle_btn = "3"
input_fps_toggle_mbtn = "nul"
input_frame_advance = "k"
input_frame_advance_axis = "nul"
@@ -1354,16 +1354,16 @@ input_player16_y_btn = "nul"
input_player16_y_mbtn = "nul"
input_player1_a = "x"
input_player1_a_axis = "nul"
-input_player1_a_btn = "nul"
+input_player1_a_btn = "1"
input_player1_a_mbtn = "nul"
input_player1_analog_dpad_mode = "1"
input_player1_b = "z"
input_player1_b_axis = "nul"
-input_player1_b_btn = "nul"
+input_player1_b_btn = "0"
input_player1_b_mbtn = "nul"
input_player1_down = "down"
input_player1_down_axis = "nul"
-input_player1_down_btn = "nul"
+input_player1_down_btn = "12"
input_player1_down_mbtn = "nul"
input_player1_gun_aux_a = "nul"
input_player1_gun_aux_a_axis = "nul"
@@ -1412,76 +1412,76 @@ input_player1_gun_trigger_mbtn = "1"
input_player1_joypad_index = "0"
input_player1_l = "q"
input_player1_l2 = "nul"
-input_player1_l2_axis = "nul"
+input_player1_l2_axis = "+4"
input_player1_l2_btn = "nul"
input_player1_l2_mbtn = "nul"
input_player1_l3 = "nul"
input_player1_l3_axis = "nul"
-input_player1_l3_btn = "nul"
+input_player1_l3_btn = "7"
input_player1_l3_mbtn = "nul"
input_player1_l_axis = "nul"
-input_player1_l_btn = "nul"
+input_player1_l_btn = "9"
input_player1_l_mbtn = "nul"
input_player1_l_x_minus = "nul"
-input_player1_l_x_minus_axis = "nul"
+input_player1_l_x_minus_axis = "-0"
input_player1_l_x_minus_btn = "nul"
input_player1_l_x_minus_mbtn = "nul"
input_player1_l_x_plus = "nul"
-input_player1_l_x_plus_axis = "nul"
+input_player1_l_x_plus_axis = "+0"
input_player1_l_x_plus_btn = "nul"
input_player1_l_x_plus_mbtn = "nul"
input_player1_l_y_minus = "nul"
-input_player1_l_y_minus_axis = "nul"
+input_player1_l_y_minus_axis = "-1"
input_player1_l_y_minus_btn = "nul"
input_player1_l_y_minus_mbtn = "nul"
input_player1_l_y_plus = "nul"
-input_player1_l_y_plus_axis = "nul"
+input_player1_l_y_plus_axis = "+1"
input_player1_l_y_plus_btn = "nul"
input_player1_l_y_plus_mbtn = "nul"
input_player1_left = "left"
input_player1_left_axis = "nul"
-input_player1_left_btn = "nul"
+input_player1_left_btn = "13"
input_player1_left_mbtn = "nul"
input_player1_mouse_index = "0"
input_player1_r = "w"
input_player1_r2 = "nul"
-input_player1_r2_axis = "nul"
+input_player1_r2_axis = "+5"
input_player1_r2_btn = "nul"
input_player1_r2_mbtn = "nul"
input_player1_r3 = "nul"
input_player1_r3_axis = "nul"
-input_player1_r3_btn = "nul"
+input_player1_r3_btn = "8"
input_player1_r3_mbtn = "nul"
input_player1_r_axis = "nul"
-input_player1_r_btn = "nul"
+input_player1_r_btn = "10"
input_player1_r_mbtn = "nul"
input_player1_r_x_minus = "nul"
-input_player1_r_x_minus_axis = "nul"
+input_player1_r_x_minus_axis = "-2"
input_player1_r_x_minus_btn = "nul"
input_player1_r_x_minus_mbtn = "nul"
input_player1_r_x_plus = "nul"
-input_player1_r_x_plus_axis = "nul"
+input_player1_r_x_plus_axis = "+2"
input_player1_r_x_plus_btn = "nul"
input_player1_r_x_plus_mbtn = "nul"
input_player1_r_y_minus = "nul"
-input_player1_r_y_minus_axis = "nul"
+input_player1_r_y_minus_axis = "-3"
input_player1_r_y_minus_btn = "nul"
input_player1_r_y_minus_mbtn = "nul"
input_player1_r_y_plus = "nul"
-input_player1_r_y_plus_axis = "nul"
+input_player1_r_y_plus_axis = "+3"
input_player1_r_y_plus_btn = "nul"
input_player1_r_y_plus_mbtn = "nul"
input_player1_right = "right"
input_player1_right_axis = "nul"
-input_player1_right_btn = "nul"
+input_player1_right_btn = "14"
input_player1_right_mbtn = "nul"
input_player1_select = "rshift"
input_player1_select_axis = "nul"
-input_player1_select_btn = "nul"
+input_player1_select_btn = "4"
input_player1_select_mbtn = "nul"
input_player1_start = "enter"
input_player1_start_axis = "nul"
-input_player1_start_btn = "nul"
+input_player1_start_btn = "6"
input_player1_start_mbtn = "nul"
input_player1_turbo = "nul"
input_player1_turbo_axis = "nul"
@@ -1489,15 +1489,15 @@ input_player1_turbo_btn = "nul"
input_player1_turbo_mbtn = "nul"
input_player1_up = "up"
input_player1_up_axis = "nul"
-input_player1_up_btn = "nul"
+input_player1_up_btn = "11"
input_player1_up_mbtn = "nul"
input_player1_x = "s"
input_player1_x_axis = "nul"
-input_player1_x_btn = "nul"
+input_player1_x_btn = "3"
input_player1_x_mbtn = "nul"
input_player1_y = "a"
input_player1_y_axis = "nul"
-input_player1_y_btn = "nul"
+input_player1_y_btn = "2"
input_player1_y_mbtn = "nul"
input_player2_a = "nul"
input_player2_a_axis = "nul"
@@ -2723,7 +2723,7 @@ input_state_slot_decrease_btn = "12"
input_state_slot_decrease_mbtn = "nul"
input_state_slot_increase = "f7"
input_state_slot_increase_axis = "nul"
-/home/steamos/RetroDECK/emu-configs/retroarch.cfginput_state_slot_increase_btn = "11"
+input_state_slot_increase_btn = "11"
input_state_slot_increase_mbtn = "nul"
input_streaming_toggle = "nul"
input_streaming_toggle_axis = "nul"
@@ -2733,7 +2733,7 @@ input_toggle_fast_forward = "space"
input_toggle_fast_forward_axis = "nul"
input_toggle_fast_forward_btn = "nul"
input_toggle_fast_forward_mbtn = "nul"
-input_toggle_fullscreen = "f"
+input_toggle_fullscreen = "nul"
input_toggle_fullscreen_axis = "nul"
input_toggle_fullscreen_btn = "nul"
input_toggle_fullscreen_mbtn = "nul"
@@ -2852,7 +2852,7 @@ menu_ticker_type = "1"
menu_timedate_date_separator = "0"
menu_timedate_enable = "true"
menu_timedate_style = "11"
-menu_unified_controls = "false"
+menu_unified_controls = "true"
menu_use_preferred_system_color_theme = "false"
menu_wallpaper = ""
menu_wallpaper_opacity = "0.300000"
@@ -3099,7 +3099,7 @@ video_context_driver = ""
video_crop_overscan = "true"
video_ctx_scaling = "false"
video_disable_composition = "false"
-video_driver = "gl"
+video_driver = "vulkan"
video_filter = ""
video_filter_dir = "/app/lib/retroarch/filters/video"
video_font_enable = "true"
@@ -3144,11 +3144,11 @@ video_record_threads = "2"
video_refresh_rate = "60.000000"
video_rotation = "0"
video_scale = "3.000000"
-video_scale_integer = "true"
+video_scale_integer = "false"
video_scale_integer_overscale = "false"
video_shader_delay = "0"
video_shader_dir = "/app/share/libretro/shaders"
-video_shader_enable = "false"
+video_shader_enable = "true"
video_shader_preset_save_reference_enable = "true"
video_shader_remember_last_dir = "false"
video_shader_watch_files = "false"
@@ -3184,4 +3184,4 @@ xmb_menu_color_theme = "4"
xmb_shadows_enable = "true"
xmb_theme = "0"
xmb_vertical_thumbnails = "false"
-youtube_stream_key = ""
\ No newline at end of file
+youtube_stream_key = ""
diff --git a/emu-configs/yuzu-qt-config.ini b/emu-configs/yuzu-qt-config.ini
index cdc94e33..69935549 100644
--- a/emu-configs/yuzu-qt-config.ini
+++ b/emu-configs/yuzu-qt-config.ini
@@ -77,9 +77,15 @@ player_0_body_color_left=4278893030
player_0_body_color_left\default=false
player_0_body_color_right=4294917160
player_0_body_color_right\default=false
+<<<<<<< HEAD
player_0_button_a="button:1,guid:03000000de280000ff11000001000000,port:0,engine:sdl"
player_0_button_a\default=false
player_0_button_b="button:0,guid:03000000de280000ff11000001000000,port:0,engine:sdl"
+=======
+player_0_button_a="pad:0,button:1,port:0,guid:03000000de280000ff11000001000000,engine:sdl"
+player_0_button_a\default=false
+player_0_button_b="pad:0,button:0,port:0,guid:03000000de280000ff11000001000000,engine:sdl"
+>>>>>>> cooker
player_0_button_b\default=false
player_0_button_color_left=4278197790
player_0_button_color_left\default=false
@@ -91,6 +97,7 @@ player_0_button_dleft="hat:0,direction:left,guid:03000000de280000ff1100000100000
player_0_button_dleft\default=false
player_0_button_dright="hat:0,direction:right,guid:03000000de280000ff11000001000000,port:0,engine:sdl"
player_0_button_dright\default=false
+<<<<<<< HEAD
player_0_button_dup="hat:0,direction:up,guid:03000000de280000ff11000001000000,port:0,engine:sdl"
player_0_button_dup\default=false
player_0_button_home="button:8,guid:03000000de280000ff11000001000000,port:0,engine:sdl"
@@ -104,6 +111,21 @@ player_0_button_minus\default=false
player_0_button_plus="button:7,guid:03000000de280000ff11000001000000,port:0,engine:sdl"
player_0_button_plus\default=false
player_0_button_r="button:5,guid:03000000de280000ff11000001000000,port:0,engine:sdl"
+=======
+player_0_button_dup="hat:0,pad:0,direction:up,port:0,guid:03000000de280000ff11000001000000,engine:sdl"
+player_0_button_dup\default=false
+player_0_button_home=[empty]
+player_0_button_home\default=false
+player_0_button_l="pad:0,button:4,port:0,guid:03000000de280000ff11000001000000,engine:sdl"
+player_0_button_l\default=false
+player_0_button_lstick="button:9,guid:03000000de280000ff11000001000000,port:0,engine:sdl"
+player_0_button_lstick\default=false
+player_0_button_minus="pad:0,button:6,port:0,guid:03000000de280000ff11000001000000,engine:sdl"
+player_0_button_minus\default=false
+player_0_button_plus="pad:0,button:7,port:0,guid:03000000de280000ff11000001000000,engine:sdl"
+player_0_button_plus\default=false
+player_0_button_r="pad:0,button:5,port:0,guid:03000000de280000ff11000001000000,engine:sdl"
+>>>>>>> cooker
player_0_button_r\default=false
player_0_button_rstick="button:10,guid:03000000de280000ff11000001000000,port:0,engine:sdl"
player_0_button_rstick\default=false
@@ -113,6 +135,7 @@ player_0_button_sl="button:4,guid:03000000de280000ff11000001000000,port:0,engine
player_0_button_sl\default=false
player_0_button_sr="button:5,guid:03000000de280000ff11000001000000,port:0,engine:sdl"
player_0_button_sr\default=false
+<<<<<<< HEAD
player_0_button_x="button:3,guid:03000000de280000ff11000001000000,port:0,engine:sdl"
player_0_button_x\default=false
player_0_button_y="button:2,guid:03000000de280000ff11000001000000,port:0,engine:sdl"
@@ -124,12 +147,29 @@ player_0_button_zr\default=false
player_0_connected=true
player_0_connected\default=true
player_0_lstick="deadzone:0.150000,invert_y:+,invert_x:+,offset_y:0.000000,axis_y:1,offset_x:-0.000000,axis_x:0,guid:03000000de280000ff11000001000000,port:0,engine:sdl"
+=======
+player_0_button_x="pad:0,button:3,port:0,guid:03000000de280000ff11000001000000,engine:sdl"
+player_0_button_x\default=false
+player_0_button_y="pad:0,button:2,port:0,guid:03000000de280000ff11000001000000,engine:sdl"
+player_0_button_y\default=false
+player_0_button_zl="threshold:0.500000,axis:2,pad:0,port:0,guid:03000000de280000ff11000001000000,engine:sdl"
+player_0_button_zl\default=false
+player_0_button_zr="threshold:0.500000,axis:5,pad:0,port:0,guid:03000000de280000ff11000001000000,engine:sdl"
+player_0_button_zr\default=false
+player_0_connected=true
+player_0_connected\default=true
+player_0_lstick="range:0.950000,deadzone:0.150000,threshold:0.500000,axis_y:1,axis_x:0,pad:0,port:0,guid:03000000de280000ff11000001000000,engine:sdl"
+>>>>>>> cooker
player_0_lstick\default=false
player_0_motionleft=[empty]
player_0_motionleft\default=false
player_0_motionright=[empty]
player_0_motionright\default=false
+<<<<<<< HEAD
player_0_rstick="deadzone:0.150000,invert_y:+,invert_x:+,offset_y:0.000000,axis_y:4,offset_x:-0.000000,axis_x:3,guid:03000000de280000ff11000001000000,port:0,engine:sdl"
+=======
+player_0_rstick="range:0.950000,deadzone:0.150000,threshold:0.500000,axis_y:3,axis_x:4,pad:0,port:0,guid:03000000de280000ff11000001000000,engine:sdl"
+>>>>>>> cooker
player_0_rstick\default=false
player_0_type=0
player_0_type\default=true
@@ -741,14 +781,14 @@ vibration_enabled=true
vibration_enabled\default=true
[Core]
-use_extended_memory_layout=false
-use_extended_memory_layout\default=true
+use_extended_memory_layout=true
+use_extended_memory_layout\default=false
use_multi_core=true
use_multi_core\default=true
[Cpu]
-cpu_accuracy=0
-cpu_accuracy\default=true
+cpu_accuracy=2
+cpu_accuracy\default=false
cpu_accuracy_first_time=false
cpu_accuracy_first_time\default=false
cpu_debug_mode=false
@@ -789,7 +829,11 @@ cpuopt_unsafe_unfuse_fma=true
cpuopt_unsafe_unfuse_fma\default=true
[Data%20Storage]
+<<<<<<< HEAD
dump_directory=~/.var/app/net.retrodeck.retrodeck/data/yuzu/dump
+=======
+dump_directory=/var/data/yuzu/dump
+>>>>>>> cooker
dump_directory\default=true
gamecard_current_game=false
gamecard_current_game\default=true
@@ -797,6 +841,7 @@ gamecard_inserted=false
gamecard_inserted\default=true
gamecard_path=
gamecard_path\default=true
+<<<<<<< HEAD
load_directory=~/.var/app/net.retrodeck.retrodeck/data/yuzu/load
load_directory\default=true
nand_directory=~/.var/app/net.retrodeck.retrodeck/data/yuzu/nand
@@ -804,6 +849,15 @@ nand_directory\default=true
sdmc_directory=~/.var/app/net.retrodeck.retrodeck/data/yuzu/sdmc
sdmc_directory\default=true
tas_directory=~/.var/app/net.retrodeck.retrodeck/data/yuzu/tas
+=======
+load_directory=/var/data/yuzu/load
+load_directory\default=true
+nand_directory=/var/data/yuzu/nand
+nand_directory\default=true
+sdmc_directory=/var/data/yuzu/sdmc
+sdmc_directory\default=true
+tas_directory=/var/data/yuzu/tas
+>>>>>>> cooker
tas_directory\default=true
use_virtual_sd=true
use_virtual_sd\default=true
@@ -846,8 +900,8 @@ anti_aliasing=0
anti_aliasing\default=true
aspect_ratio=0
aspect_ratio\default=true
-backend=0
-backend\default=true
+backend=1
+backend\default=false
bg_blue=0
bg_blue\default=true
bg_green=0
@@ -862,42 +916,46 @@ fps_cap=1000
fps_cap\default=true
fullscreen_mode=1
fullscreen_mode\default=true
-gpu_accuracy=1
-gpu_accuracy\default=true
-max_anisotropy=0
-max_anisotropy\default=true
+gpu_accuracy=0
+gpu_accuracy\default=false
+max_anisotropy=1
+max_anisotropy\default=false
nsight_aftermath=false
nsight_aftermath\default=true
nvdec_emulation=2
nvdec_emulation\default=true
-resolution_setup=2
-resolution_setup\default=true
-scaling_filter=1
-scaling_filter\default=true
-shader_backend=1
-shader_backend\default=true
+resolution_setup=0
+resolution_setup\default=false
+scaling_filter=5
+scaling_filter\default=false
+shader_backend=0
+shader_backend\default=false
shader_feedback=false
shader_feedback\default=true
-speed_limit=100
-speed_limit\default=true
+speed_limit=200
+speed_limit\default=false
use_asynchronous_gpu_emulation=true
use_asynchronous_gpu_emulation\default=true
-use_asynchronous_shaders=false
-use_asynchronous_shaders\default=true
+use_asynchronous_shaders=true
+use_asynchronous_shaders\default=false
use_disk_shader_cache=true
use_disk_shader_cache\default=true
use_fast_gpu_time=true
use_fast_gpu_time\default=true
use_speed_limit=true
use_speed_limit\default=true
-use_vsync=true
-use_vsync\default=true
+use_vsync=false
+use_vsync\default=false
vulkan_device=0
vulkan_device\default=true
[Services]
network_interface=None
+<<<<<<< HEAD
network_interface\default=true
+=======
+network_interface\default=false
+>>>>>>> cooker
[System]
current_user=0
@@ -948,29 +1006,29 @@ Paths\romsPath=~/retrodeck/roms/switch
Paths\symbolsPath=
Screenshots\enable_screenshot_save_as=true
Screenshots\enable_screenshot_save_as\default=true
-Screenshots\screenshot_path=~/retrodeck/screenshots
+Screenshots\screenshot_path=/var/data/yuzu/screenshots
Shortcuts\Main%20Window\Audio%20Mute\Unmute\Context=1
Shortcuts\Main%20Window\Audio%20Mute\Unmute\Context\default=true
-Shortcuts\Main%20Window\Audio%20Mute\Unmute\Controller_KeySeq=Home+Dpad_Right
-Shortcuts\Main%20Window\Audio%20Mute\Unmute\Controller_KeySeq\default=true
+Shortcuts\Main%20Window\Audio%20Mute\Unmute\Controller_KeySeq=
+Shortcuts\Main%20Window\Audio%20Mute\Unmute\Controller_KeySeq\default=false
Shortcuts\Main%20Window\Audio%20Mute\Unmute\KeySeq=Ctrl+M
Shortcuts\Main%20Window\Audio%20Mute\Unmute\KeySeq\default=true
Shortcuts\Main%20Window\Audio%20Volume%20Down\Context=2
Shortcuts\Main%20Window\Audio%20Volume%20Down\Context\default=true
-Shortcuts\Main%20Window\Audio%20Volume%20Down\Controller_KeySeq=Home+Dpad_Down
-Shortcuts\Main%20Window\Audio%20Volume%20Down\Controller_KeySeq\default=true
+Shortcuts\Main%20Window\Audio%20Volume%20Down\Controller_KeySeq=
+Shortcuts\Main%20Window\Audio%20Volume%20Down\Controller_KeySeq\default=false
Shortcuts\Main%20Window\Audio%20Volume%20Down\KeySeq=-
Shortcuts\Main%20Window\Audio%20Volume%20Down\KeySeq\default=true
Shortcuts\Main%20Window\Audio%20Volume%20Up\Context=2
Shortcuts\Main%20Window\Audio%20Volume%20Up\Context\default=true
-Shortcuts\Main%20Window\Audio%20Volume%20Up\Controller_KeySeq=Home+Dpad_Up
-Shortcuts\Main%20Window\Audio%20Volume%20Up\Controller_KeySeq\default=true
+Shortcuts\Main%20Window\Audio%20Volume%20Up\Controller_KeySeq=
+Shortcuts\Main%20Window\Audio%20Volume%20Up\Controller_KeySeq\default=false
Shortcuts\Main%20Window\Audio%20Volume%20Up\KeySeq=+
Shortcuts\Main%20Window\Audio%20Volume%20Up\KeySeq\default=true
Shortcuts\Main%20Window\Capture%20Screenshot\Context=3
Shortcuts\Main%20Window\Capture%20Screenshot\Context\default=true
-Shortcuts\Main%20Window\Capture%20Screenshot\Controller_KeySeq=Screenshot
-Shortcuts\Main%20Window\Capture%20Screenshot\Controller_KeySeq\default=true
+Shortcuts\Main%20Window\Capture%20Screenshot\Controller_KeySeq=Home+A
+Shortcuts\Main%20Window\Capture%20Screenshot\Controller_KeySeq\default=false
Shortcuts\Main%20Window\Capture%20Screenshot\KeySeq=Ctrl+P
Shortcuts\Main%20Window\Capture%20Screenshot\KeySeq\default=true
Shortcuts\Main%20Window\Change%20Adapting%20Filter\Context=2
@@ -981,8 +1039,8 @@ Shortcuts\Main%20Window\Change%20Adapting%20Filter\KeySeq=F8
Shortcuts\Main%20Window\Change%20Adapting%20Filter\KeySeq\default=true
Shortcuts\Main%20Window\Change%20Docked%20Mode\Context=2
Shortcuts\Main%20Window\Change%20Docked%20Mode\Context\default=true
-Shortcuts\Main%20Window\Change%20Docked%20Mode\Controller_KeySeq=Home+X
-Shortcuts\Main%20Window\Change%20Docked%20Mode\Controller_KeySeq\default=true
+Shortcuts\Main%20Window\Change%20Docked%20Mode\Controller_KeySeq=Home+Y
+Shortcuts\Main%20Window\Change%20Docked%20Mode\Controller_KeySeq\default=false
Shortcuts\Main%20Window\Change%20Docked%20Mode\KeySeq=F10
Shortcuts\Main%20Window\Change%20Docked%20Mode\KeySeq\default=true
Shortcuts\Main%20Window\Change%20GPU%20Accuracy\Context=2
@@ -993,8 +1051,8 @@ Shortcuts\Main%20Window\Change%20GPU%20Accuracy\KeySeq=F9
Shortcuts\Main%20Window\Change%20GPU%20Accuracy\KeySeq\default=true
Shortcuts\Main%20Window\Continue\Pause%20Emulation\Context=1
Shortcuts\Main%20Window\Continue\Pause%20Emulation\Context\default=true
-Shortcuts\Main%20Window\Continue\Pause%20Emulation\Controller_KeySeq=Home+Plus
-Shortcuts\Main%20Window\Continue\Pause%20Emulation\Controller_KeySeq\default=true
+Shortcuts\Main%20Window\Continue\Pause%20Emulation\Controller_KeySeq=Home+B
+Shortcuts\Main%20Window\Continue\Pause%20Emulation\Controller_KeySeq\default=false
Shortcuts\Main%20Window\Continue\Pause%20Emulation\KeySeq=F4
Shortcuts\Main%20Window\Continue\Pause%20Emulation\KeySeq\default=true
Shortcuts\Main%20Window\Exit%20Fullscreen\Context=1
@@ -1011,8 +1069,8 @@ Shortcuts\Main%20Window\Exit%20yuzu\KeySeq=Ctrl+Q
Shortcuts\Main%20Window\Exit%20yuzu\KeySeq\default=true
Shortcuts\Main%20Window\Fullscreen\Context=1
Shortcuts\Main%20Window\Fullscreen\Context\default=true
-Shortcuts\Main%20Window\Fullscreen\Controller_KeySeq=Home+B
-Shortcuts\Main%20Window\Fullscreen\Controller_KeySeq\default=true
+Shortcuts\Main%20Window\Fullscreen\Controller_KeySeq=
+Shortcuts\Main%20Window\Fullscreen\Controller_KeySeq\default=false
Shortcuts\Main%20Window\Fullscreen\KeySeq=F11
Shortcuts\Main%20Window\Fullscreen\KeySeq\default=true
Shortcuts\Main%20Window\Load%20File\Context=3
@@ -1023,8 +1081,8 @@ Shortcuts\Main%20Window\Load%20File\KeySeq=Ctrl+O
Shortcuts\Main%20Window\Load%20File\KeySeq\default=true
Shortcuts\Main%20Window\Load\Remove%20Amiibo\Context=3
Shortcuts\Main%20Window\Load\Remove%20Amiibo\Context\default=true
-Shortcuts\Main%20Window\Load\Remove%20Amiibo\Controller_KeySeq=Home+A
-Shortcuts\Main%20Window\Load\Remove%20Amiibo\Controller_KeySeq\default=true
+Shortcuts\Main%20Window\Load\Remove%20Amiibo\Controller_KeySeq=
+Shortcuts\Main%20Window\Load\Remove%20Amiibo\Controller_KeySeq\default=false
Shortcuts\Main%20Window\Load\Remove%20Amiibo\KeySeq=F2
Shortcuts\Main%20Window\Load\Remove%20Amiibo\KeySeq\default=true
Shortcuts\Main%20Window\Restart%20Emulation\Context=1
@@ -1065,8 +1123,8 @@ Shortcuts\Main%20Window\Toggle%20Filter%20Bar\KeySeq=Ctrl+F
Shortcuts\Main%20Window\Toggle%20Filter%20Bar\KeySeq\default=true
Shortcuts\Main%20Window\Toggle%20Framerate%20Limit\Context=2
Shortcuts\Main%20Window\Toggle%20Framerate%20Limit\Context\default=true
-Shortcuts\Main%20Window\Toggle%20Framerate%20Limit\Controller_KeySeq=Home+Y
-Shortcuts\Main%20Window\Toggle%20Framerate%20Limit\Controller_KeySeq\default=true
+Shortcuts\Main%20Window\Toggle%20Framerate%20Limit\Controller_KeySeq=
+Shortcuts\Main%20Window\Toggle%20Framerate%20Limit\Controller_KeySeq\default=false
Shortcuts\Main%20Window\Toggle%20Framerate%20Limit\KeySeq=Ctrl+U
Shortcuts\Main%20Window\Toggle%20Framerate%20Limit\KeySeq\default=true
Shortcuts\Main%20Window\Toggle%20Mouse%20Panning\Context=2
@@ -1102,7 +1160,7 @@ UILayout\geometryRenderWindow=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\
UILayout\microProfileDialogGeometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\x14\0\0\x3\xe7\0\0\x2k\0\0\0\0\0\0\0\x14\0\0\x3\xe7\0\0\x2k\0\0\0\0\0\0\0\0\x5\0\0\0\0\0\0\0\0\x14\0\0\x3\xe7\0\0\x2k)
UILayout\microProfileDialogVisible=false
UILayout\microProfileDialogVisible\default=true
-UILayout\state=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\xfc\x2\0\0\0\x1\xfb\0\0\0\x1c\0W\0\x61\0i\0t\0T\0r\0\x65\0\x65\0W\0i\0\x64\0g\0\x65\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0y\x1\0\0\x3\0\0\x3U\0\0\x1\xde\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\0)
+UILayout\state=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\xfc\x2\0\0\0\x1\xfb\0\0\0\x1c\0W\0\x61\0i\0t\0T\0r\0\x65\0\x65\0W\0i\0\x64\0g\0\x65\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0Y\0\xff\xff\xff\0\0\x3U\0\0\x1\xeb\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\0)
calloutFlags=1
calloutFlags\default=false
confirmClose=true
@@ -1144,4 +1202,8 @@ web_api_url\default=true
yuzu_token=
yuzu_token\default=true
yuzu_username=RetroDECK
-yuzu_username\default=true
\ No newline at end of file
+<<<<<<< HEAD
+yuzu_username\default=true
+=======
+yuzu_username\default=true
+>>>>>>> cooker
diff --git a/es_configs/es_find_rules.xml b/es-configs/es_find_rules.xml
similarity index 84%
rename from es_configs/es_find_rules.xml
rename to es-configs/es_find_rules.xml
index 35a091a4..35dd2b74 100644
--- a/es_configs/es_find_rules.xml
+++ b/es-configs/es_find_rules.xml
@@ -1,4 +1,3 @@
-
@@ -45,9 +44,38 @@
/app/share/libretro/cores
+
+
+
+ atari800
+ atari800-jz.atari800
+
+
+
+
+
+ blastem
+ com.retrodev.blastem
+
+
+ /var/lib/flatpak/exports/bin/com.retrodev.blastem
+ ~/.local/share/flatpak/exports/bin/com.retrodev.blastem
+
+
+
+
+
+ bsnes
+
+
+ /var/lib/flatpak/exports/bin/dev.bsnes.bsnes
+ ~/.local/share/flatpak/exports/bin/dev.bsnes.bsnes
+
+
+ citra
citra-emu.citra-nightly
org.citra_emu.citra
citra-qt
@@ -57,6 +85,17 @@
~/.local/share/flatpak/exports/bin/org.citra_emu.citra
+
+
+
+ desmume
+ org.desmume.DeSmuME
+
+
+ /var/lib/flatpak/exports/bin/org.desmume.DeSmuME
+ ~/.local/share/flatpak/exports/bin/org.desmume.DeSmuME
+
+
@@ -134,6 +173,17 @@
~/.local/share/flatpak/exports/bin/net.fsuae.FS-UAE
+
+
+
+ hypseus.bin
+
+
+ ~/Applications/hypseus-singe/hypseus.bin
+ ~/.local/bin/hypseus-singe/hypseus.bin
+ ~/bin/hypseus-singe/hypseus.bin
+
+
@@ -177,6 +227,16 @@
~/.local/share/flatpak/exports/bin/io.github.m64p.m64p
+
+
+
+ nestopia
+
+
+ /var/lib/flatpak/exports/bin/ca._0ldsk00l.Nestopia
+ ~/.local/share/flatpak/exports/bin/ca._0ldsk00l.Nestopia
+
+
@@ -315,4 +375,4 @@
~/retrodeck/bios/pico-8/pico8
-
+
\ No newline at end of file
diff --git a/es_configs/es_settings.xml b/es-configs/es_settings.xml
similarity index 100%
rename from es_configs/es_settings.xml
rename to es-configs/es_settings.xml
diff --git a/es_configs/es_systems.xml b/es-configs/es_systems.xml
similarity index 94%
rename from es_configs/es_systems.xml
rename to es-configs/es_systems.xml
index 41f00e31..2bdf7fc4 100644
--- a/es_configs/es_systems.xml
+++ b/es-configs/es_systems.xml
@@ -119,6 +119,8 @@
%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %ROMPATH%/arcade %BASENAME%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbneo_libretro.so %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_libretro.so %ROM%
+ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM%
+ %EMULATOR_FLYCAST% %ROM%
arcade
arcade
@@ -213,7 +215,8 @@
Atari XE
%ROMPATH%/atarixe
.xfd .XFD .atr .ATR .atx .ATX .cdm .CDM .cas .CAS .bin .BIN .a52 .A52 .xex .XEX .7z .7Z .zip .ZIP
- %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/atari800_libretro.so %ROM%
+ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/atari800_libretro.so %ROM%
+ %EMULATOR_ATARI800% %ROM%
atarixe
atarixe
@@ -221,10 +224,10 @@
atomiswave
Atomiswave
%ROMPATH%/atomiswave
- .chd .CHD .cdi .CDI .iso .ISO .elf .ELF .bin .BIN .cue .CUE .gdi .GDI .lst .LST .dat .DAT .m3u .M3U .7z .7Z .zip .ZIP
+ .cdi .CDI .iso .ISO .elf .ELF .bin .BIN .cue .CUE .gdi .GDI .lst .LST .dat .DAT .m3u .M3U .7z .7Z .zip .ZIP
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM%
%EMULATOR_FLYCAST% %ROM%
- atomiswave
+ arcade
atomiswave
@@ -272,8 +275,9 @@
cdtv
Commodore CDTV
%ROMPATH%/cdtv
- .7z .7Z .zip .ZIP
- PLACEHOLDER %ROM%
+ .cue .CUE .ccd .CCD .nrg .NRG .mds .MDS .iso .ISO .m3u .M3U .7z .7Z .zip .ZIP
+ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae_libretro.so %ROM%
+ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae2021_libretro.so %ROM%
cdtv
cdtv
@@ -308,8 +312,9 @@
colecovision
ColecoVision
%ROMPATH%/coleco
- .rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP
- %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.so %ROM%
+ .bin .BIN .cas .CAS .col .COL .cv .CV .dsk .DSK .m3u .M3U .mx1 .MX1 .mx2 .MX2 .ri .RI .rom .ROM .sc .SC .sg .SG .7z .7Z .zip .ZIP
+ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.so %ROM%
+ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearcoleco_libretro.so %ROM%
colecovision
colecovision
@@ -317,8 +322,9 @@
daphne
Daphne Arcade LaserDisc Emulator
%ROMPATH%/daphne
- .7z .7Z .zip .ZIP
- PLACEHOLDER %ROM%
+ .daphne .singe
+ %EMULATOR_HYPSEUS-SINGE% %BASENAME% vldp -framefile %GAMEDIR%/%BASENAME%.txt %INJECT%=%BASENAME%.commands
+ %EMULATOR_HYPSEUS-SINGE% singe vldp -framefile %GAMEDIR%/%BASENAME%.txt -script %GAMEDIR%/%BASENAME%.singe %INJECT%=%BASENAME%.commands
daphne
daphne
@@ -371,6 +377,7 @@
.nes .NES .unf .UNF .unif .UNIF .7z .7Z .zip .ZIP
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen_libretro.so %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nestopia_libretro.so %ROM%
+ %EMULATOR_NESTOPIA-UE% --fullscreen %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fceumm_libretro.so %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/quicknes_libretro.so %ROM%
famicom
@@ -405,6 +412,7 @@
.nes .NES .fds .FDS .unf .UNF .UNIF .UNIF .7z .7Z .zip .ZIP
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen_libretro.so %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nestopia_libretro.so %ROM%
+ %EMULATOR_NESTOPIA-UE% --fullscreen %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fceumm_libretro.so %ROM%
fds
fds
@@ -485,8 +493,8 @@
Nintendo GameCube
%ROMPATH%/gc
.gcm .GCM .iso .ISO .wbfs .WBFS .wia .WIA .ciso .CISO .gcz .GCZ .elf .ELF .dol .DOL .dff .DFF .rvz .RVZ .tgc .TGC .wad .WAD .m3u .M3U .7z .7Z .zip .ZIP
- %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dolphin_libretro.so %ROM%
%EMULATOR_DOLPHIN% -b -e %ROM%
+ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dolphin_libretro.so %ROM%
%EMULATOR_PRIMEHACK% -b -e %ROM%
gc
gc
@@ -552,6 +560,8 @@
%STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %ROMPATH%/mame %BASENAME%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbneo_libretro.so %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_libretro.so %ROM%
+ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM%
+ %EMULATOR_FLYCAST% %ROM%
arcade
mame
@@ -722,20 +732,20 @@
naomi
Sega NAOMI
%ROMPATH%/naomi
- .chd .CHD .cdi .CDI .iso .ISO .elf .ELF .bin .BIN .cue .CUE .gdi .GDI .lst .LST .dat .DAT .m3u .M3U .7z .7Z .zip .ZIP
+ .cdi .CDI .iso .ISO .elf .ELF .bin .BIN .cue .CUE .gdi .GDI .lst .LST .dat .DAT .m3u .M3U .7z .7Z .zip .ZIP
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM%
%EMULATOR_FLYCAST% %ROM%
- naomi
+ arcade
naomi
naomigd
Sega NAOMI GD-ROM
%ROMPATH%/naomigd
- .chd .CHD .cdi .CDI .iso .ISO .elf .ELF .bin .BIN .cue .CUE .gdi .GDI .lst .LST .dat .DAT .m3u .M3U .7z .7Z .zip .ZIP
+ .cdi .CDI .iso .ISO .elf .ELF .bin .BIN .cue .CUE .gdi .GDI .lst .LST .dat .DAT .m3u .M3U .7z .7Z .zip .ZIP
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM%
%EMULATOR_FLYCAST% %ROM%
- naomi
+ arcade
naomigd
@@ -745,6 +755,7 @@
.bin .BIN .nds .NDS .7z .7Z .zip .ZIP
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/desmume_libretro.so %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/desmume2015_libretro.so %ROM%
+ %EMULATOR_DESMUME% %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/melonds_libretro.so %ROM%
%EMULATOR_MELONDS% %ROM%
nds
@@ -784,6 +795,7 @@
.nes .NES .unf .UNF .unif .UNIF .7z .7Z .zip .ZIP
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen_libretro.so %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nestopia_libretro.so %ROM%
+ %EMULATOR_NESTOPIA-UE% --fullscreen %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fceumm_libretro.so %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/quicknes_libretro.so %ROM%
nes
@@ -868,7 +880,7 @@
pcengine
NEC PC Engine
%ROMPATH%/pcengine
- .bin .BIN .ccd .CCD .chd .CHD .cue .CUE .img .IMG .iso .ISO .m3u .M3U .pce .PCE .sgx .SGX .toc .TOC .7z .7Z .zip .ZIP
+ .ccd .CCD .chd .CHD .cue .CUE .img .IMG .iso .ISO .m3u .M3U .pce .PCE .sgx .SGX .toc .TOC .7z .7Z .zip .ZIP
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_libretro.so %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_fast_libretro.so %ROM%
pcengine
@@ -878,7 +890,7 @@
pcenginecd
NEC PC Engine CD
%ROMPATH%/pcenginecd
- .bin .BIN .ccd .CCD .chd .CHD .cue .CUE .img .IMG .iso .ISO .m3u .M3U .pce .PCE .sgx .SGX .toc .TOC .7z .7Z .zip .ZIP
+ .ccd .CCD .chd .CHD .cue .CUE .img .IMG .iso .ISO .m3u .M3U .pce .PCE .sgx .SGX .toc .TOC .7z .7Z .zip .ZIP
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_libretro.so %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_fast_libretro.so %ROM%
pcenginecd
@@ -915,7 +927,7 @@
ps2
Sony PlayStation 2
%ROMPATH%/ps2
- .bin .BIN .chd .CHD .cso .CSO .elf .ELF .iso .ISO .isz .ISZ
+ .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
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pcsx2_libretro.so %ROM%
%EMULATOR_PCSX2% --nogui %ROM%
%EMULATOR_PLAY!% --disc %ROM%
@@ -988,9 +1000,11 @@
.bml .BML .bs .BS .fig .FIG .sfc .SFC .smc .SMC .swc .SWC .st .ST .7z .7Z .zip .ZIP
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x_libretro.so %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x2010_libretro.so %ROM%
+ %EMULATOR_SNES9X% %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_hd_beta_libretro.so %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_mercury_accuracy_libretro.so %ROM%
+ %EMULATOR_BSNES% --fullscreen %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM%
satellaview
satellaview
@@ -1077,6 +1091,7 @@
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_hd_beta_libretro.so %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_mercury_accuracy_libretro.so %ROM%
+ %EMULATOR_BSNES% --fullscreen %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_supafaust_libretro.so %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM%
snes
@@ -1087,9 +1102,9 @@
Sega SG-1000
%ROMPATH%/sg-1000
.68k .68K .bin .BIN .bms .BMS .chd .CHD .cue .CUE .gen .GEN .gg .GG .iso .ISO .m3u .M3U .md .MD .mdx .MDX .ri .RI .rom .ROM .sg .SG .sgd .SGD .smd .SMD .sms .SMS .7z .7Z .zip .ZIP
- %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearsystem_libretro.so %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_libretro.so %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_wide_libretro.so %ROM%
+ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearsystem_libretro.so %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.so %ROM%
sg-1000
sg-1000
@@ -1105,6 +1120,7 @@
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_hd_beta_libretro.so %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_mercury_accuracy_libretro.so %ROM%
+ %EMULATOR_BSNES% --fullscreen %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_supafaust_libretro.so %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM%
snes
@@ -1121,6 +1137,7 @@
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_hd_beta_libretro.so %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_mercury_accuracy_libretro.so %ROM%
+ %EMULATOR_BSNES% --fullscreen %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_supafaust_libretro.so %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM%
snes
@@ -1160,9 +1177,11 @@
.bml .BML .bs .BS .fig .FIG .sfc .SFC .smc .SMC .st .ST .7z .7Z .zip .ZIP
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x_libretro.so %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/snes9x2010_libretro.so %ROM%
+ %EMULATOR_SNES9X% %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_hd_beta_libretro.so %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_mercury_accuracy_libretro.so %ROM%
+ %EMULATOR_BSNES% --fullscreen %ROM%
sufami
sufami
@@ -1208,7 +1227,7 @@
tg16
NEC TurboGrafx-16
%ROMPATH%/tg16
- .bin .BIN .ccd .CCD .chd .CHD .cue .CUE .img .IMG .iso .ISO .m3u .M3U .pce .PCE .sgx .SGX .toc .TOC .7z .7Z .zip .ZIP
+ .ccd .CCD .chd .CHD .cue .CUE .img .IMG .iso .ISO .m3u .M3U .pce .PCE .sgx .SGX .toc .TOC .7z .7Z .zip .ZIP
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_libretro.so %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_fast_libretro.so %ROM%
pcengine
@@ -1218,7 +1237,7 @@
tg-cd
NEC TurboGrafx-CD
%ROMPATH%/tg-cd
- .bin .BIN .ccd .CCD .chd .CHD .cue .CUE .img .IMG .iso .ISO .m3u .M3U .pce .PCE .sgx .SGX .toc .TOC .7z .7Z .zip .ZIP
+ .ccd .CCD .chd .CHD .cue .CUE .img .IMG .iso .ISO .m3u .M3U .pce .PCE .sgx .SGX .toc .TOC .7z .7Z .zip .ZIP
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_libretro.so %ROM%
%EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_fast_libretro.so %ROM%
pcenginecd
@@ -1310,8 +1329,8 @@
Nintendo Wii
%ROMPATH%/wii
.gcm .GCM .iso .ISO .wbfs .WBFS .wia .WIA .ciso .CISO .gcz .GCZ .elf .ELF .dol .DOL .dff .DFF .rvz .RVZ .tgc .TGC .wad .WAD .m3u .M3U .7z .7Z .zip .ZIP
- %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dolphin_libretro.so %ROM%
%EMULATOR_DOLPHIN% -b -e %ROM%
+ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dolphin_libretro.so %ROM%
%EMULATOR_PRIMEHACK% -b -e %ROM%
wii
wii
@@ -1366,7 +1385,7 @@
Microsoft Xbox
%ROMPATH%/xbox
.iso .ISO
- %EMULATOR_XEMU% -full-screen -dvd_path %ROM%
+ %EMULATOR_XEMU% -dvd_path %ROM%
xbox
xbox
@@ -1427,4 +1446,4 @@
pico-8
pico-8
-
+
\ No newline at end of file
diff --git a/es_configs/tools-gamelist.xml b/es-configs/tools-gamelist.xml
similarity index 100%
rename from es_configs/tools-gamelist.xml
rename to es-configs/tools-gamelist.xml
diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 8030bc61..5a76b5d3 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -104,6 +104,21 @@ modules:
- ln -s "xml" "${FLATPAK_DEST}/bin/xmlstarlet" ||:
cleanup: ["*"]
+ # mesa repo got a double certificate issue and gnutils cannot handle that so GLU download fails,
+ # this affects even the shared-modules's glu so I have to replace it temporarly
+ # more info there: https://gitlab.com/gnutls/gnutls/-/issues/1335
+ - name: libglu
+ buildsystem: meson
+ cleanup:
+ - /include
+ - /lib/debug
+ - /lib/pkgconfig
+ - /lib/*.a
+ sources:
+ - type: archive
+ url: https://ftp.osuosl.org/pub/blfs/conglomeration/glu/glu-9.0.2.tar.xz
+ sha256: 6e7280ff585c6a1d9dfcdf2fca489251634b3377bfc33c29e4002466a38d02d4
+
# ES-DE
- name: ffmpeg
@@ -146,6 +161,8 @@ modules:
url: https://github.com/zeux/pugixml/releases/download/v1.11.4/pugixml-1.11.4.tar.gz
sha256: 8ddf57b65fb860416979a3f0640c2ad45ddddbbafa82508ef0a0af3ce7061716
+ # When updating this module remember to check those: https://gitlab.com/es-de/emulationstation-de/-/tree/stable-1.2.5/resources/systems/unix
+ # But we don't include them 1:1 as RetroDECK got some specific configs in some cases
- name: emulationstation-de
buildsystem: cmake-ninja
cleanup:
@@ -154,10 +171,10 @@ modules:
sources:
- type: git
url: https://gitlab.com/es-de/emulationstation-de
- branch: d89cedd25f1bbb9a38c1f66bca18b74d5332cad1
+ branch: 5a76fef25ffc659f098ee65215281c51a63c3198
- type: shell
commands:
- - sed -i 's/QUIT EMULATIONSTATION/QUIT RETRODECK/g' es-app/src/guis/GuiMenu.cpp
+ - sed -i 's/QUIT EMULATIONSTATION/QUIT RETRODECK/g' es-app/src/guis/GuiMenu.cpp
- sed -i 's#"EMULATIONSTATION-DE V" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#"RetroDECK v'$(cat ${FLATPAK_DEST}/retrodeck/version)', ES-DE v" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#g' es-app/src/guis/GuiMenu.cpp
# ES-DE - END
@@ -208,7 +225,8 @@ modules:
- shared-modules/gudev/gudev.json
- rd-submodules/retroarch/libbz2/libbz2-1.0.8.json
- rd-submodules/retroarch/libaio/libaio-0.3.112.json
- - shared-modules/glu/glu-9.json
+ # glu issue, check libglu module for more info
+ #- shared-modules/glu/glu-9.json
- rd-submodules/retroarch/libdecor/libdecor-0.1.0.json
- name: retroarch-filers-video
subdir: gfx/video_filters
@@ -687,22 +705,23 @@ modules:
# XEMU - START
- - name: libglu
- buildsystem: meson
- cleanup:
- - /include
- - /lib/debug
- - /lib/pkgconfig
- - /lib/*.a
- sources:
- - type: archive
- url: https://mesa.freedesktop.org/archive/glu/glu-9.0.2.tar.xz
- sha256: 6e7280ff585c6a1d9dfcdf2fca489251634b3377bfc33c29e4002466a38d02d4
- x-checker-data:
- type: anitya
- project-id: 13518
- stable-only: true
- url-template: https://mesa.freedesktop.org/archive/glu/glu-$version.tar.xz
+ # glu issue, check libglu module for more info
+ # - name: libglu
+ # buildsystem: meson
+ # cleanup:
+ # - /include
+ # - /lib/debug
+ # - /lib/pkgconfig
+ # - /lib/*.a
+ # sources:
+ # - type: archive
+ # url: http://mesa.freedesktop.org/archive/glu/glu-9.0.2.tar.xz
+ # sha256: 6e7280ff585c6a1d9dfcdf2fca489251634b3377bfc33c29e4002466a38d02d4
+ # x-checker-data:
+ # type: anitya
+ # project-id: 13518
+ # stable-only: true
+ # url-template: http://mesa.freedesktop.org/archive/glu/glu-$version.tar.xz
- name: xemu
buildsystem: autotools
@@ -807,7 +826,8 @@ modules:
# RPCS3 - START
# https://github.com/flathub/net.rpcs3.RPCS3
- - shared-modules/glu/glu-9.json
+ # glu issue, check libglu module for more info
+ #- shared-modules/glu/glu-9.json
- shared-modules/glew/glew.json
- name: rpcs3-llvm
@@ -1012,13 +1032,19 @@ modules:
# Configuring emulators:
- mkdir -p ${FLATPAK_DEST}/retrodeck/emu-configs/
# RetroArch
- - cp retroarch.cfg ${FLATPAK_DEST}/retrodeck/emu-configs/
+ - cp retroarch* ${FLATPAK_DEST}/retrodeck/emu-configs/
# Dolphin
- cp Dolphin.ini ${FLATPAK_DEST}/retrodeck/emu-configs/
+ - cp Hotkeys.ini ${FLATPAK_DEST}/retrodeck/emu-configs/
+ - cp GCPadNew.ini ${FLATPAK_DEST}/retrodeck/emu-configs/
+ - cp GFX.ini ${FLATPAK_DEST}/retrodeck/emu-configs/
+ - cp Qt.ini ${FLATPAK_DEST}/retrodeck/emu-configs/
# Yuzu
- cp yuzu-qt-config.ini ${FLATPAK_DEST}/retrodeck/emu-configs/
# Pcsx2
- cp PCSX2_ui.ini ${FLATPAK_DEST}/retrodeck/emu-configs/
+ - cp GS.ini ${FLATPAK_DEST}/retrodeck/emu-configs/
+ - cp PCSX2_vm.ini ${FLATPAK_DEST}/retrodeck/emu-configs/
# MelonDS
- cp melonDS.ini ${FLATPAK_DEST}/retrodeck/emu-configs/
# CITRA
@@ -1032,11 +1058,13 @@ modules:
sources:
- type: dir
- path: es_configs
+ path: es-configs
- type: file
path: retrodeck.sh
- type: dir
path: emu-configs
+ - type: dir
+ path: emu-configs/Dolphin
- type: dir
path: res
- type: dir
@@ -1046,5 +1074,4 @@ modules:
- type: file
path: net.retrodeck.retrodeck.desktop
- type: file
- path: net.retrodeck.retrodeck.appdata.xml
-
+ path: net.retrodeck.retrodeck.appdata.xml
\ No newline at end of file
diff --git a/retrodeck.sh b/retrodeck.sh
index 93452f90..7f9ce114 100644
--- a/retrodeck.sh
+++ b/retrodeck.sh
@@ -3,7 +3,7 @@
lockfile="$HOME/retrodeck/.lock" # where the lockfile is located
version="$(cat /app/retrodeck/version)" # version info taken from the version file
rdhome="$HOME/retrodeck" # the retrodeck home, aka ~/retrodecck
-emuconfigs="/app/retrodeck/emu-configs" # folder with all the default emulator configs
+emuconfigs="/app/retrodeck/emu-configs" # folder with all the default emulator configs
sdcard="/run/media/mmcblk0p1" # Steam Deck SD default path
# Functions area
@@ -41,7 +41,7 @@ dir_prep() {
if [ -d "$symlink.old" ];
then
echo "Moving the data from $symlink.old to $real" #DEBUG
- mv -fv "$symlink.old/*" "$real"
+ mv -fv "$symlink".old/* $real
echo "Removing $symlink.old" #DEBUG
rm -rf "$symlink.old"
fi
@@ -58,11 +58,26 @@ dir_prep() {
echo $symlink is now $real
}
-is_mounted() {
- # This script checks if the provided path in $1 is mounted
- mount | awk -v DIR="$1" '{if ($3 == DIR) { exit 0}} ENDFILE{exit -1}'
+cfg_init() {
+ # Initializing retrodeck config file
+ #rdconf=/var/config/retrodeck/retrodeck.cfg
+
+ # if I got a config file already I parse it
+ #if []
+
+ #else
+ # touch $rdconf
+ #fi
+
+ #$roms_folder > /var/config/retrodeck/retrodeck.cfg
+ return
}
+# is_mounted() {
+# # This script checks if the provided path in $1 is mounted
+# mount | awk -v DIR="$1" '{if ($3 == DIR) { exit 0}} ENDFILE{exit -1}'
+# }
+
tools_init() {
rm -rfv /var/config/retrodeck/tools/
mkdir -pv /var/config/retrodeck/tools/
@@ -88,19 +103,31 @@ standalones_init() {
# configuring Yuzu
mkdir -pv /var/config/yuzu/
cp -fv $emuconfigs/yuzu-qt-config.ini /var/config/yuzu/qt-config.ini
+ sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/yuzu/qt-config.ini
+ dir_prep "$rdhome/screenshots" "/var/data/yuzu/screenshots"
# Dolphin
mkdir -pv /var/config/dolphin-emu/
- cp -fv $emuconfigs/Dolphin.ini /var/config/dolphin-emu/
+ cp -fv $emuconfigs/Dolphin/* /var/config/dolphin-emu/
+ dir_prep "$rdhome/saves" "/var/data/dolphin-emu/GBA/Saves"
+ dir_prep "$rdhome/saves" "/var/data/dolphin-emu/Wii"
# pcsx2
mkdir -pv /var/config/PCSX2/inis/
cp -fv $emuconfigs/PCSX2_ui.ini /var/config/PCSX2/inis/
+ sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/PCSX2/inis/PCSX2_ui.ini
+ cp -fv $emuconfigs/GS.ini /var/config/PCSX2/inis/
+ cp -fv $emuconfigs/PCSX2_vm.ini /var/config/PCSX2/inis/
+ dir_prep "$rdhome/states" "/var/config/PCSX2/sstates"
+ dir_prep "$rdhome/screenshots" "/var/config/PCSX2/snaps"
+ dir_prep "$rdhome/.logs" "/var/config/PCSX2/logs"
# MelonDS
mkdir -pv /var/config/melonDS/
dir_prep "$rdhome/bios" "/var/config/melonDS/bios"
cp -fv $emuconfigs/melonDS.ini /var/config/melonDS/
+ # Replace ~/retrodeck with $rdhome as ~ cannot be understood by MelonDS
+ sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/melonDS/melonDS.ini
# CITRA
mkdir -pv /var/config/citra-emu/
@@ -120,7 +147,9 @@ ra_init() {
mkdir -pv /var/config/retroarch/cores/
cp /app/share/libretro/cores/* /var/config/retroarch/cores/
cp -f $emuconfigs/retroarch.cfg /var/config/retroarch/
+ cp -f $emuconfigs/retroarch-core-options.cfg /var/config/retroarch/
#rm -rf $rdhome/bios/bios # in some situations a double bios symlink is created
+ sed -i 's#~/retrodeck#'$rdhome'#g' /var/config/retroarch/retroarch.cfg
}
create_lock() {
@@ -160,28 +189,55 @@ finit() {
then
roms_folder="$rdhome/roms"
else #no - SD Card
- if [ is_mounted "$sdcard" ];
+ if [ -d "$sdcard" ];
then
roms_folder="$sdcard/retrodeck/roms"
else
- zenity --error --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" --text="SD Card is not readable.\nPlease check if it's inserted or mounted correctly and run RetroDECK again."
- exit 0
+ sdselected=false
+ zenity --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" --cancel-label="Cancel" --ok-label "Browse" --text="SD Card was not find in the default location.\nPlease choose the SD Card root.\nA retrodeck/roms folder will be created starting from the directory that you selected."
+ if [ $? == 1 ] #cancel
+ then
+ exit 0
+ fi
+ while [ $sdselected == false ]
+ do
+ sdcard="$(zenity --file-selection --title="Choose SD Card root" --directory)"
+ echo "DEBUG: sdcard=$sdcard, answer=$?"
+ zenity --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" --cancel-label="No" --ok-label "Yes" --text="Your rom folder will be:\n\n$sdcard/retrodeck/roms\n\nis that ok?"
+ if [ $? == 0 ] #yes
+ then
+ sdselected == true
+ roms_folder="$sdcard/retrodeck/roms"
+ break
+ else
+ zenity --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" --cancel-label="No" --ok-label "Yes" --text="Do you want to quit?"
+ if [ $? == 0 ] # yes, quit
+ then
+ exit 0
+ fi
+ fi
+ done
fi
fi
mkdir -pv $roms_folder
# TODO: after the next update of ES-DE this will not be needed
- zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" --text="EmulationStation will now initialize the system.\nPlease DON'T EDIT THE ROMS LOCATION, just select:\n\nCREATE DIRECTORIES\nYES\nOK\nQUIT\n\nRetroDECK will manage the rest."
+ #zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" --text="EmulationStation will now initialize the system.\nPlease DON'T EDIT THE ROMS LOCATION, just select:\n\nCREATE DIRECTORIES\nYES\nOK\nQUIT\n\nRetroDECK will manage the rest."
+ zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" --text="RetroDECK will now install the needed files.\nPlease wait up to one minute,\nanother message will notify when the process will be finished.\n\nPress OK to continue."
# Recreating the folder
- /var/config/retrodeck/tools/
+ rm -rfv /var/config/emulationstation/
+ rm -rfv /var/config/retrodeck/tools/
mkdir -pv /var/config/emulationstation/
+
# Initializing ES-DE
- # TODO: after the next update of ES-DE this will not be needed
- start_retrodeck
+ # TODO: after the next update of ES-DE this will not be needed - let's test it
+ emulationstation --home /var/config/emulationstation --create-system-dirs
- zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" --text="RetroDECK will now install the needed files.\nPlease wait up to one minute,\nanother message will notify when the process will be finished.\n\nPress OK to continue."
+ mkdir -pv /var/config/retrodeck/tools/
+
+ #zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" --text="RetroDECK will now install the needed files.\nPlease wait up to one minute,\nanother message will notify when the process will be finished.\n\nPress OK to continue."
# Initializing ROMs folder - Original in retrodeck home (or SD Card)
dir_prep $roms_folder "/var/config/emulationstation/ROMs"