From fbb76fd865e6e5fb53ef7dfeb733eb50599e0d69 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sat, 25 Mar 2023 17:03:32 +0000 Subject: [PATCH 01/11] ES-DE: Updated 2.0 + themes update + nso theme added --- net.retrodeck.retrodeck.appdata.xml | 10 ++++++++ net.retrodeck.retrodeck.yml | 36 +++++++++++++++++++---------- rd-submodules/shared-modules | 2 +- 3 files changed, 35 insertions(+), 13 deletions(-) diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml index 7633237c..e2937c13 100644 --- a/net.retrodeck.retrodeck.appdata.xml +++ b/net.retrodeck.retrodeck.appdata.xml @@ -65,6 +65,16 @@ GPL-3.0 CC0-1.0 + + https://github.com/XargonWan/RetroDECK/releases/tag/0.6.4b + +

New features - General:

+
    +
  • Updated EmulationStation Desktop Edition to 2.0
    • +
  • Removed legacy themes and added themes for ES-DE 2.0
    • +
+ + https://github.com/XargonWan/RetroDECK/releases/tag/0.6.3b diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index fa53e0e2..5e532d3c 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -66,11 +66,11 @@ modules: # The version number is hardcoded in /app/retrodeck/version # # UPDATE STEPS FOR MAIN: - # [X] Update the VERSION variable - # [X] Update the appdata.xml with the version number and notes - # [X] change branch into main in version-initialization (first one) - # [X] change branch into main in retrodeck module (last one) - # [X] if header (before modules) was edited, edit it even in flathub.yml + # [ ] Update the VERSION variable + # [ ] Update the appdata.xml with the version number and notes + # [ ] change branch into main in version-initialization (first one) + # [ ] change branch into main in retrodeck module (last one) + # [ ] if header (before modules) was edited, edit it even in flathub.yml # - name: version-initialization buildsystem: simple @@ -78,7 +78,7 @@ modules: - | git checkout ${GITHUB_REF_NAME} mkdir -p ${FLATPAK_DEST}/retrodeck/ - VERSION="0.6.3b" + VERSION="cooker-0.6.4b" if [[ $VERSION == *"cooker"* ]]; then VERSION="$VERSION-[$(git rev-parse --short HEAD)]" @@ -88,7 +88,7 @@ modules: sources: - type: git url: https://github.com/XargonWan/RetroDECK.git - branch: main + branch: cooker-0.6.4b - name: xmlstarlet config-opts: @@ -239,13 +239,15 @@ modules: # But we don't include them 1:1 as RetroDECK got some specific configs in some cases - name: emulationstation-de buildsystem: cmake-ninja + config-opts: + - DRETRODECK=on cleanup: - es-app - es-core sources: - type: git url: https://gitlab.com/es-de/emulationstation-de - branch: f8d782f1f3b1fba8a119b793edd01f37e0258953 + branch: 608d8a3c09abc5db398cdadc09e18fd2dfbaf570 - type: shell commands: - sed -i 's/QUIT EMULATIONSTATION/QUIT RETRODECK/g' es-app/src/guis/GuiMenu.cpp @@ -265,7 +267,7 @@ modules: sources: - type: git url: https://github.com/anthonycaccese/art-book-next-retropie.git - commit: 23932f484a9949313baf80f92b2fbca38a7a8f37 + commit: 5b2e44ab18007e42b581df57bd5d2a82255b9c14 - name: alekfull-nx-light buildsystem: simple @@ -275,7 +277,7 @@ modules: sources: - type: git url: https://github.com/anthonycaccese/alekfull-nx-retropie.git - commit: 67c8c8dee086bd06bcdc6dc34bb9bef1e1c11be7 + commit: 8d9aa2a992ab31cbe6dc3dc1c155dfb78e7a9732 - name: retrofix-revisited buildsystem: simple @@ -285,7 +287,17 @@ modules: sources: - type: git url: https://github.com/anthonycaccese/retrofix-revisited-retropie.git - commit: 6e75c9521426e69eb9abcb39d135d97a17d14568 + commit: 07207d20d2b617af336dcf829ae9fb901cc1ce94 + + - name: nso-menu-interpreted + buildsystem: simple + build-commands: + - mkdir -p ${FLATPAK_DEST}/share/emulationstation/themes/nso-menu-interpreted/ + - mv -f * ${FLATPAK_DEST}/share/emulationstation/themes/nso-menu-interpreted/ + sources: + - type: git + url: https://github.com/anthonycaccese/nso-menu-interpreted-es-de.git + commit: f129c2d88e060a6c5d7643de5aeb02a0cc013de3 # ES-DE Themes - END @@ -1095,4 +1107,4 @@ modules: sources: - type: git url: https://github.com/XargonWan/RetroDECK.git - branch: main \ No newline at end of file + branch: cooker-0.6.4b \ No newline at end of file diff --git a/rd-submodules/shared-modules b/rd-submodules/shared-modules index ae5d7192..a2441b96 160000 --- a/rd-submodules/shared-modules +++ b/rd-submodules/shared-modules @@ -1 +1 @@ -Subproject commit ae5d7192c6a37f2c754fd92685a72d514931131a +Subproject commit a2441b964afefd8cd1cebcdf562c7878670daf42 From a1b3a2d6ccb0e314a5534698bccdbd5b7d0a8f30 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 31 Mar 2023 08:34:11 +0000 Subject: [PATCH 02/11] ES-DE: updated es_systems and es_findrules --- es-configs/es_find_rules.xml | 289 ++++++++++++++++-- es-configs/es_systems.xml | 558 +++++++++++++++++++++++++---------- 2 files changed, 661 insertions(+), 186 deletions(-) diff --git a/es-configs/es_find_rules.xml b/es-configs/es_find_rules.xml index 78791834..05835dd8 100644 --- a/es-configs/es_find_rules.xml +++ b/es-configs/es_find_rules.xml @@ -17,9 +17,9 @@ /var/lib/flatpak/exports/bin/org.libretro.RetroArch ~/.local/share/flatpak/exports/bin/org.libretro.RetroArch - ~/Applications/RetroArch-Linux-x86_64.AppImage - ~/.local/bin/RetroArch-Linux-x86_64.AppImage - ~/bin/RetroArch-Linux-x86_64.AppImage + ~/Applications/RetroArch-Linux*.AppImage + ~/.local/bin/RetroArch-Linux*.AppImage + ~/bin/RetroArch-Linux*.AppImage @@ -44,6 +44,17 @@ /usr/pkg/lib/libretro + + + + ares + dev.ares.ares + + + /var/lib/flatpak/exports/bin/dev.ares.ares + ~/.local/share/flatpak/exports/bin/dev.ares.ares + + @@ -60,9 +71,9 @@ /var/lib/flatpak/exports/bin/net.cebix.basilisk ~/.local/share/flatpak/exports/bin/net.cebix.basilisk - ~/Applications/BasiliskII-x86_64.AppImage - ~/.local/bin/BasiliskII-x86_64.AppImage - ~/bin/BasiliskII-x86_64.AppImage + ~/Applications/BasiliskII*.AppImage + ~/.local/bin/BasiliskII*.AppImage + ~/bin/BasiliskII*.AppImage @@ -89,9 +100,13 @@ + cemu Cemu + ~/Applications/Cemu*.AppImage + ~/.local/bin/Cemu*.AppImage + ~/bin/Cemu*.AppImage ~/Applications/Cemu/Cemu ~/.local/bin/Cemu/Cemu ~/bin/Cemu/Cemu @@ -101,6 +116,7 @@ citra-qt + citra citra-emu.citra-nightly org.citra_emu.citra @@ -109,6 +125,17 @@ ~/.local/share/flatpak/exports/bin/org.citra_emu.citra + + + + cpcemu + + + ~/Applications/cpcemu/cpcemu + ~/.local/bin/cpcemu/cpcemu + ~/bin/cpcemu/cpcemu + + @@ -166,12 +193,12 @@ /var/lib/flatpak/exports/bin/org.duckstation.DuckStation ~/.local/share/flatpak/exports/bin/org.duckstation.DuckStation - ~/Applications/duckstation-nogui-x64.AppImage - ~/.local/bin/duckstation-nogui-x64.AppImage - ~/bin/duckstation-nogui-x64.AppImage - ~/Applications/duckstation-qt-x64.AppImage - ~/.local/bin/duckstation-qt-x64.AppImage - ~/bin/duckstation-qt-x64.AppImage + ~/Applications/duckstation-nogui*.AppImage + ~/.local/bin/duckstation-nogui*.AppImage + ~/bin/duckstation-nogui*.AppImage + ~/Applications/duckstation-qt*.AppImage + ~/.local/bin/duckstation-qt*.AppImage + ~/bin/duckstation-qt*.AppImage @@ -185,6 +212,17 @@ ~/bin/easyrpg/easyrpg-player + + + + fbneo + + + ~/Applications/fbneo/fbneo + ~/.local/bin/fbneo/fbneo + ~/bin/fbneo/fbneo + + @@ -194,6 +232,9 @@ /var/lib/flatpak/exports/bin/org.flycast.Flycast ~/.local/share/flatpak/exports/bin/org.flycast.Flycast + ~/Applications/flycast*.AppImage + ~/.local/bin/flycast*.AppImage + ~/bin/flycast*.AppImage @@ -208,6 +249,59 @@ ~/.local/share/flatpak/exports/bin/net.fsuae.FS-UAE + + + + fuse + net.sf.fuse_emulator + + + /var/lib/flatpak/exports/bin/net.sf.fuse_emulator + ~/.local/share/flatpak/exports/bin/net.sf.fuse_emulator + + + + + + gargoyle + + + /var/lib/flatpak/exports/bin/io.github.garglk.Gargoyle + ~/.local/share/flatpak/exports/bin/io.github.garglk.Gargoyle + ~/Applications/Gargoyle*.AppImage + ~/.local/bin/Gargoyle*.AppImage + ~/bin/Gargoyle*.AppImage + + + + + + gearboy + + + ~/Applications/gearboy/gearboy + ~/.local/bin/gearboy/gearboy + ~/bin/gearboy/gearboy + + + + + + ~/Applications/gopher2600/gopher2600_linux_amd64 + ~/.local/bin/gopher2600/gopher2600_linux_amd64 + ~/bin/gopher2600/gopher2600_linux_amd64 + + + + + + hatari + + + /var/lib/flatpak/exports/bin/org.tuxfamily.hatari + ~/.local/share/flatpak/exports/bin/org.tuxfamily.hatari + + @@ -257,6 +351,10 @@ mednafen + + /var/lib/flatpak/exports/bin/com.github.AmatCoder.mednaffe|flatpak run --command=mednafen com.github.AmatCoder.mednaffe + ~/.local/share/flatpak/exports/bin/com.github.AmatCoder.mednaffe|flatpak run --command=mednafen com.github.AmatCoder.mednaffe + @@ -274,6 +372,7 @@ mgba + mgba-qt io.mgba.mGBA @@ -296,7 +395,7 @@ - + nestopia @@ -305,6 +404,16 @@ ~/.local/share/flatpak/exports/bin/ca._0ldsk00l.Nestopia + + + + openmsx + + + /var/lib/flatpak/exports/bin/org.openmsx.openMSX + ~/.local/share/flatpak/exports/bin/org.openmsx.openMSX + + @@ -327,6 +436,18 @@ ~/bin/pcsx2*-Qt.AppImage + + + + PCSX2 + pcsx2 + net.pcsx2.PCSX2 + + + /var/lib/flatpak/exports/bin/net.pcsx2.PCSX2 + ~/.local/share/flatpak/exports/bin/net.pcsx2.PCSX2 + + @@ -362,6 +483,12 @@ ~/.local/share/flatpak/exports/bin/org.ppsspp.PPSSPP + + + + prboom-plus + + @@ -373,6 +500,17 @@ ~/.local/share/flatpak/exports/bin/io.github.shiiion.primehack + + + + punes + + + ~/Applications/punes/punes + ~/.local/bin/punes/punes + ~/bin/punes/punes + + @@ -384,6 +522,20 @@ ~/bin/redream/redream + + + + RMG + com.github.Rosalie241.RMG + + + /var/lib/flatpak/exports/bin/com.github.Rosalie241.RMG + ~/.local/share/flatpak/exports/bin/com.github.Rosalie241.RMG + ~/Applications/RMG*.AppImage + ~/.local/bin/RMG*.AppImage + ~/bin/RMG*.AppImage + + @@ -399,16 +551,6 @@ ~/bin/rpcs3*.AppImage - - - - snes9x - - - /var/lib/flatpak/exports/bin/com.snes9x.Snes9x - ~/.local/share/flatpak/exports/bin/com.snes9x.Snes9x - - @@ -424,6 +566,7 @@ Ryujinx + Ryujinx.Ava org.ryujinx.Ryujinx @@ -432,6 +575,20 @@ ~/Applications/publish/Ryujinx ~/.local/bin/publish/Ryujinx ~/bin/publish/Ryujinx + ~/Applications/publish/Ryujinx.Ava + ~/.local/bin/publish/Ryujinx.Ava + ~/bin/publish/Ryujinx.Ava + + + + + + sameboy + io.github.sameboy.SameBoy + + + /var/lib/flatpak/exports/bin/io.github.sameboy.SameBoy + ~/.local/share/flatpak/exports/bin/io.github.sameboy.SameBoy @@ -457,14 +614,14 @@ - + SheepShaver - ~/Applications/SheepShaver-x86_64.AppImage - ~/.local/bin/SheepShaver-x86_64.AppImage - ~/bin/SheepShaver-x86_64.AppImage + ~/Applications/SheepShaver*.AppImage + ~/.local/bin/SheepShaver*.AppImage + ~/bin/SheepShaver*.AppImage @@ -478,10 +635,22 @@ ~/bin/simcoupe/simcoupe + + + + simple64-gui + io.github.simple64.simple64 + + + /var/lib/flatpak/exports/bin/io.github.simple64.simple64 + ~/.local/share/flatpak/exports/bin/io.github.simple64.simple64 + + snes9x + snes9x-gtk /var/lib/flatpak/exports/bin/com.snes9x.Snes9x @@ -494,6 +663,10 @@ solarus-run solarus.run + + /var/lib/flatpak/exports/bin/org.solarus_games.solarus.Launcher|flatpak run --command=solarus-run org.solarus_games.solarus.Launcher + ~/.local/share/flatpak/exports/bin/org.solarus_games.solarus.Launcher|flatpak run --command=solarus-run org.solarus_games.solarus.Launcher + @@ -501,6 +674,39 @@ steam + + + + stella + io.github.stella_emu.Stella + + + /var/lib/flatpak/exports/bin/io.github.stella_emu.Stella + ~/.local/share/flatpak/exports/bin/io.github.stella_emu.Stella + + + + + + supermodel + + + ~/Applications/Supermodel/supermodel + ~/.local/bin/Supermodel/supermodel + ~/bin/Supermodel/supermodel + + + + + + dolphin-emu-triforce + + + ~/Applications/dolphin-emu-triforce*.AppImage + ~/.local/bin/dolphin-emu-triforce*.AppImage + ~/bin/dolphin-emu-triforce*.AppImage + + @@ -515,6 +721,29 @@ visualboyadvance-m + + + + x64sc + vice-jz.x64sc + net.sf.VICE + + + /var/lib/flatpak/exports/bin/net.sf.VICE + ~/.local/share/flatpak/exports/bin/net.sf.VICE + + + + + + xvic + vice-jz.xvic + + + /var/lib/flatpak/exports/bin/net.sf.VICE|flatpak run --command=xvic net.sf.VICE + ~/.local/share/flatpak/exports/bin/net.sf.VICE|flatpak run --command=xvic net.sf.VICE + + @@ -536,9 +765,9 @@ /var/lib/flatpak/exports/bin/app.xemu.xemu ~/.local/share/flatpak/exports/bin/app.xemu.xemu - ~/Applications/Xemu*.AppImage - ~/.local/bin/Xemu*.AppImage - ~/bin/Xemu*.AppImage + ~/Applications/xemu*.AppImage + ~/.local/bin/xemu*.AppImage + ~/bin/xemu*.AppImage diff --git a/es-configs/es_systems.xml b/es-configs/es_systems.xml index 84a91903..933f093f 100644 --- a/es-configs/es_systems.xml +++ b/es-configs/es_systems.xml @@ -3,31 +3,20 @@ 3do - 3DO + 3DO Interactive Multiplayer %ROMPATH%/3do - .iso .ISO .bin .BIN .chd .CHD .cue .CUE + .bin .BIN .chd .CHD .cue .CUE .iso .ISO %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/opera_libretro.so %ROM% 3do 3do - - 64dd - Nintendo 64DD - %ROMPATH%/64dd - .n64 .N64 .v64 .V64 .z64 .Z64 .bin .BIN .u1 .U1 .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mupen64plus_next_libretro.so %ROM% - %EMULATOR_MUPEN64PLUS% --nogui %ROM% - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/parallel_n64_libretro.so %ROM% - n64 - 64dd - + %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/arcade %BASENAME% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbneo_libretro.so %ROM% + %EMULATOR_FINALBURN-NEO% -fullscreen %BASENAME% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM% - + %EMULATOR_FLYCAST% %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/kronos_libretro.so %ROM% + %STARTDIR%=%GAMEDIR% %EMULATOR_SUPERMODEL% -log-output=%GAMEDIR%/Config/Supermodel.log -force-feedback %INJECT%=%BASENAME%.commands %ROM% + %STARTDIR%=%GAMEDIR% %EMULATOR_SUPERMODEL% -log-output=%GAMEDIR%/Config/Supermodel.log -fullscreen -force-feedback %INJECT%=%BASENAME%.commands %ROM% + %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM% arcade arcade + + + arduboy + Arduboy Miniature Game System + %ROMPATH%/arduboy + .hex .HEX .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/arduous_libretro.so %ROM% + arduboy + arduboy + astrocde Bally Astrocade %ROMPATH%/astrocde .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so %ROM% - %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %ROMPATH%/astrocde astrocde -cart %BASENAME% + %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/astrocde astrocde -cart %BASENAME% astrocde astrocade @@ -148,6 +162,9 @@ .a26 .A26 .bin .BIN .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/stella_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/stella2014_libretro.so %ROM% + + + atari2600 atari2600 @@ -155,7 +172,7 @@ atari5200 Atari 5200 %ROMPATH%/atari5200 - .xfd .XFD .atr .ATR .atx .ATX .cdm .CDM .cas .CAS .bin .BIN .a52 .A52 .xex .XEX .7z .7Z .zip .ZIP + .a52 .A52 .atr .ATR .atx .ATX .bin .BIN .car .CAR .cas .CAS .cdm .CDM .rom .ROM .xex .XEX .xfd .XFD .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/a5200_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/atari800_libretro.so %ROM% @@ -167,7 +184,7 @@ Atari 7800 ProSystem %ROMPATH%/atari7800 .a78 .A78 .bin .BIN .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/prosystem_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/prosystem_libretro.so %ROM% atari7800 atari7800 @@ -175,7 +192,7 @@ atari800 Atari 800 %ROMPATH%/atari800 - .xfd .XFD .atr .ATR .atx .ATX .cdm .CDM .cas .CAS .bin .BIN .a52 .A52 .xex .XEX .rom .ROM .7z .7Z .zip .ZIP + .a52 .A52 .atr .ATR .atx .ATX .bin .BIN .car .CAR .cas .CAS .cdm .CDM .rom .ROM .xex .XEX .xfd .XFD .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/atari800_libretro.so %ROM% %EMULATOR_ATARI800% %ROM% atari800 @@ -185,8 +202,9 @@ atarijaguar Atari Jaguar %ROMPATH%/atarijaguar - .j64 .J64 .jag .JAG .rom .ROM .abs .ABS .cof .COF .bin .BIN .prg .PRG .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/virtualjaguar_libretro.so %ROM% + .abs .ABS .bin .BIN .cdi .CDI .cof .COF .cue .CUE .j64 .J64 .jag .JAG .prg .PRG .rom .ROM .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/virtualjaguar_libretro.so %ROM% + atarijaguar, atarijaguarcd atarijaguar @@ -215,7 +233,8 @@ Atari ST %ROMPATH%/atarist .st .ST .msa .MSA .stx .STX .dim .DIM .ipf .IPF .m3u .M3U .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/hatari_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/hatari_libretro.so %ROM% + atarist atarist @@ -223,7 +242,7 @@ atarixe Atari XE %ROMPATH%/atarixe - .xfd .XFD .atr .ATR .atx .ATX .cdm .CDM .cas .CAS .bin .BIN .a52 .A52 .xex .XEX .7z .7Z .zip .ZIP + .a52 .A52 .atr .ATR .atx .ATX .bin .BIN .cas .CAS .cdm .CDM .xex .XEX .xfd .XFD .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/atari800_libretro.so %ROM% %EMULATOR_ATARI800% %ROM% atarixe @@ -231,29 +250,32 @@ atomiswave - Atomiswave + Sammy Corporation Atomiswave %ROMPATH%/atomiswave - .cdi .CDI .iso .ISO .elf .ELF .bin .BIN .cue .CUE .gdi .GDI .lst .LST .dat .DAT .m3u .M3U .7z .7Z .zip .ZIP + .bin .BIN .cdi .CDI .cue .CUE .dat .DAT .elf .ELF .gdi .GDI .iso .ISO .lst .LST .m3u .M3U .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM% %EMULATOR_FLYCAST% %ROM% arcade atomiswave + c64 Commodore 64 %ROMPATH%/c64 .bin .BIN .cmd .CMD .crt .CRT .d2m .D2M .d4m .D4M .d64 .D64 .d6z .D6Z .d71 .D71 .d7z .D7Z .d80 .D80 .d81 .D81 .d82 .D82 .d8z .D8Z .g41 .G41 .g4z .G4Z .g64 .G64 .g6z .G6Z .gz .GZ .lnx .LNX .m3u .M3U .nbz .NBZ .nib .NIB .p00 .P00 .prg .PRG .t64 .T64 .tap .TAP .vfl .VFL .vsf .VSF .x64 .X64 .x6z .X6Z .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_x64sc_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_x64_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_xscpu64_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_x128_libretro.so %ROM% @@ -266,7 +288,7 @@ Cave Story (NXEngine) %ROMPATH%/cavestory .exe .EXE .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nxengine_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nxengine_libretro.so %ROM% cavestory cavestory @@ -295,7 +317,7 @@ ChaiLove Game Engine %ROMPATH%/chailove .chai .CHAI .chailove .CHAILOVE .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/chailove_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/chailove_libretro.so %ROM% love chailove @@ -304,7 +326,7 @@ Fairchild Channel F %ROMPATH%/channelf .bin .BIN .chf .CHF .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/freechaf_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/freechaf_libretro.so %ROM% channelf channelf @@ -322,11 +344,13 @@ --> colecovision - ColecoVision + Coleco ColecoVision %ROMPATH%/colecovision .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 @@ -339,8 +363,9 @@ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2010_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2003_plus_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2000_libretro.so %ROM% - %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%/fbalpha2012_cps1_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_cps2_libretro.so %ROM% @@ -348,6 +373,68 @@ arcade cps + + cps1 + Capcom Play System I + %ROMPATH%/cps1 + .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2010_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2003_plus_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2000_libretro.so %ROM% + + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbneo_libretro.so %ROM% + + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_cps1_libretro.so %ROM% + arcade + cps1 + + + cps2 + Capcom Play System II + %ROMPATH%/cps2 + .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2010_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2003_plus_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2000_libretro.so %ROM% + + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbneo_libretro.so %ROM% + + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_cps2_libretro.so %ROM% + arcade + cps2 + + + cps3 + Capcom Play System III + %ROMPATH%/cps3 + .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2010_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2003_plus_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2000_libretro.so %ROM% + + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbneo_libretro.so %ROM% + + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_cps3_libretro.so %ROM% + arcade + cps3 + + daphne Daphne Arcade LaserDisc Emulator @@ -364,6 +451,7 @@ %ROMPATH%/doom .desktop .iwad .IWAD .pk4 .PK4 .pwad .PWAD .sh .wad .WAD %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/prboom_libretro.so %ROM% + %EMULATOR_PRBOOM-PLUS% -iwad %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/boom3_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/boom3_xp_libretro.so %ROM% %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM% @@ -374,19 +462,19 @@ dos DOS (PC) %ROMPATH%/dos - .bat .BAT .com .COM .conf .CONF .cue .CUE .dosz .DOSZ .exe .EXE .iso .ISO .7z .7Z + .bat .BAT .com .COM .conf .CONF .cue .CUE .dosz .DOSZ .exe .EXE .iso .ISO .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_pure_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_core_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_svn_libretro.so %ROM% - %EMULATOR_DOSBOX-X% %ROM% - %EMULATOR_DOSBOX-STAGING% %ROM% + + dos dos + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fceumm_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/quicknes_libretro.so %ROM% - + + + + famicom famicom @@ -447,8 +538,9 @@ fbneo FinalBurn Neo %ROMPATH%/fbneo - .ccd .CCD .cue .CUE .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbneo_libretro.so %ROM% + .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbneo_libretro.so %ROM% + arcade fbneo @@ -459,9 +551,10 @@ .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_RETROARCH% -L %CORE_RETROARCH%/fceumm_libretro.so %ROM% - + + fds fds @@ -471,11 +564,12 @@ Adobe Flash %ROMPATH%/flash .swf .SWF - %EMULATOR_RUFFLE% --fullscreen %ROM% - %EMULATOR_LIGHTSPARK% %ROM% + %EMULATOR_RUFFLE% ––fullscreen %ROM% + %EMULATOR_LIGHTSPARK% ––fullscreen %ROM% flash flash +--> fmtowns Fujitsu FM Towns @@ -491,10 +585,23 @@ Nintendo Game and Watch %ROMPATH%/gameandwatch .mgw .MGW .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gw_libretro.so %ROM% + + + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gw_libretro.so %ROM% gameandwatch gameandwatch + gamegear Sega Game Gear @@ -515,7 +622,9 @@ .bs .BS .cgb .CGB .dmg .DMG .gb .GB .gbc .GBC .sgb .SGB .sfc .SFC .smc .SMC .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gambatte_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/sameboy_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearboy_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/tgbdual_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM% @@ -547,7 +656,9 @@ .bs .BS .cgb .CGB .dmg .DMG .gb .GB .gbc .GBC .sgb .SGB .sfc .SFC .smc .SMC .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gambatte_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/sameboy_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearboy_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/tgbdual_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM% @@ -562,10 +673,11 @@ gc Nintendo GameCube %ROMPATH%/gc - .gcm .GCM .iso .ISO .wbfs .WBFS .wia .WIA .ciso .CISO .gcz .GCZ .elf .ELF .dol .DOL .dff .DFF .json .JSON .rvz .RVZ .tgc .TGC .wad .WAD .m3u .M3U .7z .7Z .zip .ZIP - %EMULATOR_DOLPHIN% -b -e %ROM% + .ciso .CISO .dff .DFF .dol .DOL .elf .ELF .gcm .GCM .gcz .GCZ .iso .ISO .json .JSON .m3u .M3U .rvz .RVZ .tgc .TGC .wad .WAD .wbfs .WBFS .wia .WIA .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dolphin_libretro.so %ROM% - %EMULATOR_PRIMEHACK% -b -e %ROM% + %INJECT%=%BASENAME%.esprefix %EMULATOR_DOLPHIN% -b -e %ROM% + %INJECT%=%BASENAME%.esprefix %EMULATOR_PRIMEHACK% -b -e %ROM% + gc gc @@ -578,8 +690,9 @@ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_wide_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/blastem_libretro.so %ROM% - %EMULATOR_BLASTEM% -m gen %ROM% - + + + genesis genesis @@ -587,9 +700,10 @@ gx4000 Amstrad GX4000 %ROMPATH%/gx4000 - .cdt .CDT .cpr .CPR .dsk .DSK .kcr .KCR .m3u .M3U .sna .SNA .tap .TAR .voc .VOC .7z .7Z .zip .ZIP + .bin .BIN .cdt .CDT .cpr .CPR .dsk .DSK .kcr .KCR .m3u .M3U .sna .SNA .tap .TAR .voc .VOC .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/cap32_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/crocods_libretro.so %ROM% + gx4000 gx4000 @@ -598,7 +712,7 @@ Mattel Electronics Intellivision %ROMPATH%/intellivision .int .INT .bin .BIN .rom .ROM .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/freeintv_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/freeintv_libretro.so %ROM% intellivision intellivision @@ -611,12 +725,34 @@ android j2me + + + lcdgames + LCD Handheld Games + %ROMPATH%/lcdgames + .mgw .MGW .7z .7Z .zip .ZIP + + + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gw_libretro.so %ROM% + lcdgames, gameandwatch + lcdgames + lutro Lutro Game Engine %ROMPATH%/lutro .lua .LUA .lutro .LUTRO .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/lutro_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/lutro_libretro.so %ROM% lutro lutro @@ -624,17 +760,21 @@ mame Multiple Arcade Machine Emulator %ROMPATH%/mame - .cmd .CMD .7z .7Z .zip .ZIP + .cmd .CMD .desktop .sh .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2010_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2003_plus_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame2000_libretro.so %ROM% - + %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_RETROARCH% -L %CORE_RETROARCH%/kronos_libretro.so %ROM% + + + %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM% arcade mame @@ -666,7 +806,8 @@ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/smsplus_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearsystem_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.so %ROM% - + + mastersystem mastersystem @@ -678,6 +819,7 @@ %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%/picodrive_libretro.so %ROM% + segacd megacd @@ -689,6 +831,7 @@ %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%/picodrive_libretro.so %ROM% + segacd megacdjp @@ -701,8 +844,9 @@ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_wide_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/blastem_libretro.so %ROM% - + + + megadrive megadrive @@ -720,7 +864,7 @@ Multi Emulator Super System %ROMPATH%/mess .chd .CHD .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mess2015_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mess2015_libretro.so %ROM% mess mess @@ -729,19 +873,23 @@ Sega Model 2 %ROMPATH%/model2 .7z .7Z .zip .ZIP - PLACEHOLDER %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so %ROM% + arcade model2 + moonlight Moonlight Game Streaming @@ -756,7 +904,7 @@ Thomson MO/TO Series %ROMPATH%/moto .fd .FD .sap .SAP .k7 .K7 .m7 .M7 .m5 .M5 .rom .ROM .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/theodore_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/theodore_libretro.so %ROM% moto moto @@ -764,9 +912,12 @@ msx MSX %ROMPATH%/msx - .rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP + .cas .CAS .col .COL .di1 .DI1 .di2 .DI2 .dmk .DMK .dsk .DSK .fd1 .FD1 .fd2 .FD2 .m3u .M3U .mx1 .MX1 .mx2 .MX2 .ogv .OGV .ri .RI .rom .ROM .sc .SC .sg .SG .wav .WAV .xsa .XSA .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fmsx_libretro.so %ROM% + + + msx msx @@ -774,9 +925,12 @@ msx1 MSX1 %ROMPATH%/msx1 - .rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP + .cas .CAS .col .COL .di1 .DI1 .di2 .DI2 .dmk .DMK .dsk .DSK .fd1 .FD1 .fd2 .FD2 .m3u .M3U .mx1 .MX1 .mx2 .MX2 .ogv .OGV .ri .RI .rom .ROM .sc .SC .sg .SG .wav .WAV .xsa .XSA .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fmsx_libretro.so %ROM% + + + msx msx1 @@ -784,9 +938,12 @@ msx2 MSX2 %ROMPATH%/msx2 - .rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP + .cas .CAS .col .COL .di1 .DI1 .di2 .DI2 .dmk .DMK .dsk .DSK .fd1 .FD1 .fd2 .FD2 .m3u .M3U .mx1 .MX1 .mx2 .MX2 .ogv .OGV .ri .RI .rom .ROM .sc .SC .sg .SG .wav .WAV .xsa .XSA .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fmsx_libretro.so %ROM% + + + msx2 msx2 @@ -794,8 +951,10 @@ msxturbor MSX Turbo R %ROMPATH%/msxturbor - .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% + .cas .CAS .col .COL .di1 .DI1 .di2 .DI2 .dmk .DMK .dsk .DSK .fd1 .FD1 .fd2 .FD2 .m3u .M3U .mx1 .MX1 .mx2 .MX2 .ogv .OGV .ri .RI .rom .ROM .sc .SC .sg .SG .wav .WAV .xsa .XSA .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.so %ROM% + + msxturbor msxturbor @@ -804,8 +963,8 @@ mugen M.U.G.E.N Game Engine %ROMPATH%/mugen - .7z .7Z .zip .ZIP - PLACEHOLDER %ROM% + .mugen + %STARTDIR%=%GAMEDIR% %EMULATOR_OS-SHELL% -c "%ROM%" mugen mugen @@ -815,7 +974,7 @@ Othello Multivision %ROMPATH%/multivision .bin .BIN .gg .GG .rom .ROM .sg .SG .sms .SMS .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearsystem_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearsystem_libretro.so %ROM% sg-1000 multivision @@ -834,7 +993,7 @@ n64 Nintendo 64 %ROMPATH%/n64 - .bin .BIN .n64 .N64 .ndd .NDD .u1 .U1 .v64 .V64 .z64 .Z64 .7z .7Z .zip .ZIP + .bin .BIN .d64 .D64 .n64 .N64 .ndd .NDD .u1 .U1 .v64 .V64 .z64 .Z64 .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mupen64plus_next_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/parallel_n64_libretro.so %ROM% @@ -845,9 +1004,10 @@ n64dd Nintendo 64DD %ROMPATH%/n64dd - .bin .BIN .n64 .N64 .ndd .NDD .u1 .U1 .v64 .V64 .z64 .Z64 .7z .7Z .zip .ZIP + .bin .BIN .d64 .D64 .n64 .N64 .ndd .NDD .u1 .U1 .v64 .V64 .z64 .Z64 .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/parallel_n64_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mupen64plus_next_libretro.so %ROM% + n64 n64dd @@ -875,7 +1035,7 @@ nds Nintendo DS %ROMPATH%/nds - .bin .BIN .nds .NDS .7z .7Z .zip .ZIP + .app .APP .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% @@ -888,8 +1048,10 @@ neogeo SNK Neo Geo %ROMPATH%/neogeo - .chd .CHD .cue .CUE .iso .ISO .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbneo_libretro.so %ROM% + .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbneo_libretro.so %ROM% + + neogeo neogeo @@ -897,8 +1059,11 @@ neogeocd SNK Neo Geo CD %ROMPATH%/neogeocd - .chd .CHD .cue .CUE .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/neocd_libretro.so %ROM% + .chd .CHD .cue .CUE + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/neocd_libretro.so %ROM% + %EMULATOR_RETROARCH% --subsystem neocd -L %CORE_RETROARCH%/fbneo_libretro.so %ROM% + + neogeocd neogeocd @@ -906,8 +1071,11 @@ neogeocdjp SNK Neo Geo CD %ROMPATH%/neogeocdjp - .chd .CHD .cue .CUE .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/neocd_libretro.so %ROM% + .chd .CHD .cue .CUE + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/neocd_libretro.so %ROM% + %EMULATOR_RETROARCH% --subsystem neocd -L %CORE_RETROARCH%/fbneo_libretro.so %ROM% + + neogeocd neogeocdjp @@ -921,7 +1089,10 @@ %EMULATOR_NESTOPIA-UE% --fullscreen %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fceumm_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/quicknes_libretro.so %ROM% - + + + + nes nes @@ -932,7 +1103,8 @@ .ngp .NGP .ngc .NGC .ngpc .NGPC .npc .NPC .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_ngp_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/race_libretro.so %ROM% - + + ngp ngp @@ -943,7 +1115,8 @@ .ngp .NGP .ngc .NGC .ngpc .NGPC .npc .NPC .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_ngp_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/race_libretro.so %ROM% - + + ngpc ngpc @@ -952,19 +1125,21 @@ Magnavox Odyssey2 %ROMPATH%/odyssey2 .bin .BIN .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/o2em_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/o2em_libretro.so %ROM% odyssey2 odyssey2 + + + pcengine pcengine @@ -1022,7 +1198,8 @@ .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 pcenginecd @@ -1030,9 +1207,9 @@ pcfx NEC PC-FX %ROMPATH%/pcfx - .cue CUE .ccd .CCD .toc .TOC .chd .CHD .7z .7Z .zip .ZIP + .ccd .CCD .chd .CHD .cue CUE .m3u .M3U .toc .TOC .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pcfx_libretro.so %ROM% - + %EMULATOR_MEDNAFEN% -force_module pcfx %ROM% pcfx pcfx @@ -1051,7 +1228,7 @@ Nintendo PokĂ©mon Mini %ROMPATH%/pokemini .min .MIN .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pokemini_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pokemini_libretro.so %ROM% pokemini pokemini @@ -1060,18 +1237,18 @@ Ports %ROMPATH%/ports .desktop .sh - %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM% - pc + %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM% + pc, pcwindows ports ps2 Sony PlayStation 2 %ROMPATH%/ps2 - %EMULATOR_PCSX2% -batch %ROM% .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_PCSX2% -batch %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pcsx2_libretro.so %ROM% - + ps2 ps2 @@ -1119,26 +1296,53 @@ psx Sony PlayStation %ROMPATH%/psx - .bin .BIN .cbn .CBN .ccd .CCD .chd .CHD .cue .CUE .ecm .ECM .exe .EXE .img .IMG .iso .ISO .m3u .M3U .mdf .MDF .mds .MDS .pbp .PBP .psexe .PSEXE .psf .PSF .toc .TOC .z .Z .znx .ZNX .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/swanstation_libretro.so %ROM% + .bin .BIN .cbn .CBN .ccd .CCD .chd .CHD .cue .CUE .ecm .ECM .exe .EXE .img .IMG .iso .ISO .m3u .M3U .mdf .MDF .mds .MDS .minipsf .MINIPSF .pbp .PBP .psexe .PSEXE .psf .PSF .toc .TOC .z .Z .znx .ZNX .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_psx_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_psx_hw_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pcsx_rearmed_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/swanstation_libretro.so %ROM% %EMULATOR_DUCKSTATION% -batch %ROM% - + psx psx + + + quake + Quake + %ROMPATH%/quake + .desktop .pak .PAK .pk3 .PK3 .sh + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/tyrquake_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vitaquake2_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vitaquake2-rogue_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vitaquake2-xatrix_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vitaquake2-zaero_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vitaquake3_libretro.so %ROM% + %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM% + pc, pcwindows + quake + + + %EMULATOR_SIMCOUPE% %ROM% samcoupe samcoupe +--> satellaview Nintendo Satellaview @@ -1164,7 +1368,7 @@ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/kronos_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/yabasanshiro_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/yabause_libretro.so %ROM% - + saturn saturn @@ -1177,7 +1381,7 @@ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/kronos_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/yabasanshiro_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/yabause_libretro.so %ROM% - + saturn saturnjp @@ -1187,7 +1391,7 @@ %ROMPATH%/scummvm .scummvm .SCUMMVM .svm .SVM %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/scummvm_libretro.so %ROM% - + scummvm scummvm @@ -1196,7 +1400,8 @@ Sega Mega Drive 32X %ROMPATH%/sega32x .bin .BIN .gen .GEN .smd .SMD .md .MD .32x .32X .cue .CUE .iso .ISO .sms .SMS .68k .68K .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.so %ROM% + sega32x sega32x @@ -1205,7 +1410,8 @@ Sega Super 32X %ROMPATH%/sega32xjp .bin .BIN .gen .GEN .smd .SMD .md .MD .32x .32X .cue .CUE .iso .ISO .sms .SMS .68k .68K .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.so %ROM% + sega32x sega32xjp @@ -1214,7 +1420,8 @@ Sega Genesis 32X %ROMPATH%/sega32xna .bin .BIN .gen .GEN .smd .SMD .md .MD .32x .32X .cue .CUE .iso .ISO .sms .SMS .68k .68K .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.so %ROM% + sega32x sega32xna @@ -1226,6 +1433,7 @@ %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%/picodrive_libretro.so %ROM% + segacd segacd @@ -1236,13 +1444,15 @@ .bin .BIN .bml .BML .bs .BS .bsx .BSX .dx2 .DX2 .fig .FIG .gd3 .GD3 .gd7 .GD7 .mgd .MGD .sfc .SFC .smc .SMC .st .ST .swc .SWC .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%/mednafen_supafaust_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM% + + snes sfc @@ -1255,6 +1465,7 @@ %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 @@ -1265,7 +1476,7 @@ .gb .GB .gbc .GBC .sgb .SGB .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mgba_libretro.so %ROM% - + gb sgb @@ -1276,13 +1487,15 @@ .bin .BIN .bml .BML .bs .BS .bsx .BSX .dx2 .DX2 .fig .FIG .gd3 .GD3 .gd7 .GD7 .mgd .MGD .sfc .SFC .smc .SMC .st .ST .swc .SWC .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%/mednafen_supafaust_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM% + + snes snes @@ -1293,13 +1506,15 @@ .bin .BIN .bml .BML .bs .BS .bsx .BSX .dx2 .DX2 .fig .FIG .gd3 .GD3 .gd7 .GD7 .mgd .MGD .sfc .SFC .smc .SMC .st .ST .swc .SWC .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%/mednafen_supafaust_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM% + + snes snesna @@ -1309,7 +1524,7 @@ Solarus Game Engine %ROMPATH%/solarus .solarus - %EMULATOR_SOLARUS% %ROM% + %EMULATOR_SOLARUS% %ROM% solarus solarus @@ -1319,7 +1534,7 @@ Spectravideo %ROMPATH%/spectravideo .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% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.so %ROM% spectravideo spectravideo @@ -1339,11 +1554,12 @@ .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 @@ -1354,6 +1570,7 @@ .pce .PCE .sgx .SGX .cue .CUE .ccd .CCD .chd .CHD .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_supergrafx_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_libretro.so %ROM% + supergrafx supergrafx @@ -1370,9 +1587,9 @@ switch Nintendo Switch %ROMPATH%/switch - .nca .NCA .nro .NRO .nso .NSO .nsp .NSP .xci .XCI .7z .7Z .zip .ZIP - %EMULATOR_YUZU% -f -g %ROM% - + .nca .NCA .nro .NRO .nso .NSO .nsp .NSP .xci .XCI + %INJECT%=%BASENAME%.esprefix %EMULATOR_YUZU% -f -g %ROM% + switch switch @@ -1403,7 +1620,8 @@ .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 tg16 @@ -1414,25 +1632,28 @@ .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 tg-cd + tic80 TIC-80 Game Engine %ROMPATH%/tic80 .tic .TIC - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/tic80_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/tic80_libretro.so %ROM% tic80 tic80 @@ -1441,7 +1662,7 @@ Thomson TO8 %ROMPATH%/to8 .fd .FD .sap .SAP .k7 .K7 .m7 .M7 .m5 .M5 .rom .ROM .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/theodore_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/theodore_libretro.so %ROM% moto to8 @@ -1460,19 +1681,19 @@ --> uzebox - Uzebox + Uzebox Open Source Console %ROMPATH%/uzebox .uze .UZE .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/uzem_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/uzem_libretro.so %ROM% uzebox uzebox vectrex - Vectrex + Smith Engineering Vectrex %ROMPATH%/vectrex .bin .BIN .vec .VEC .gam .GAM .vc .VC .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vecx_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vecx_libretro.so %ROM% vectrex vectrex @@ -1481,7 +1702,8 @@ Commodore VIC-20 %ROMPATH%/vic20 .bin .BIN .cmd .CMD .crt .CRT .d2m .D2M .d4m .D4M .d64 .D64 .d6z .D6Z .d71 .D71 .d7z .D7Z .d80 .D80 .d81 .D81 .d82 .D82 .d8z .D8Z .g41 .G41 .g4z .G4Z .g64 .G64 .g6z .G6Z .gz .GZ .lnx .LNX .m3u .M3U .nbz .NBZ .nib .NIB .p00 .P00 .prg .PRG .t64 .T64 .tap .TAP .vfl .VFL .vsf .VSF .x64 .X64 .x6z .X6Z .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_xvic_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vice_xvic_libretro.so %ROM% + vic20 vic20 @@ -1490,7 +1712,7 @@ Philips Videopac G7000 %ROMPATH%/videopac .bin .BIN .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/o2em_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/o2em_libretro.so %ROM% videopac videopac @@ -1500,18 +1722,38 @@ %ROMPATH%/virtualboy .vb .VB .vboy .VBOY .bin .BIN .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_vb_libretro.so %ROM% - + virtualboy virtualboy + + + wasm4 + WASM-4 Fantasy Console + %ROMPATH%/wasm4 + .wasm .WASM + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/wasm4_libretro.so %ROM% + wasm4 + wasm4 + wii Nintendo Wii %ROMPATH%/wii - .gcm .GCM .iso .ISO .wbfs .WBFS .wia .WIA .ciso .CISO .gcz .GCZ .elf .ELF .dol .DOL .dff .DFF .json .JSON .rvz .RVZ .tgc .TGC .wad .WAD .m3u .M3U .7z .7Z .zip .ZIP - %EMULATOR_DOLPHIN% -b -e %ROM% + .ciso .CISO .dff .DFF .dol .DOL .elf .ELF .gcm .GCM .gcz .GCZ .iso .ISO .json .JSON .m3u .M3U .rvz .RVZ .tgc .TGC .wad .WAD .wbfs .WBFS .wia .WIA .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dolphin_libretro.so %ROM% - %EMULATOR_PRIMEHACK% -b -e %ROM% + %INJECT%=%BASENAME%.esprefix %EMULATOR_DOLPHIN% -b -e %ROM% + %INJECT%=%BASENAME%.esprefix %EMULATOR_PRIMEHACK% -b -e %ROM% wii wii @@ -1526,14 +1768,14 @@ wiiu --> - wonderswan Bandai WonderSwan %ROMPATH%/wonderswan .ws .WS .pc2 .PC2 .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_wswan_libretro.so %ROM% - + + wonderswan wonderswan @@ -1543,7 +1785,8 @@ %ROMPATH%/wonderswancolor .ws .WS .wsc .WSC .pc2 .PC2 .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_wswan_libretro.so %ROM% - + + wonderswancolor wonderswancolor @@ -1552,7 +1795,7 @@ Sharp X1 %ROMPATH%/x1 .dx1 .DX1 .2d .2D .2hd .2HD .tfd .TFD .d88 .D88 .88d .88D .hdm .HDM .xdf .XDF .dup .DUP .tap .TAP .cmd .CMD .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/x1_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/x1_libretro.so %ROM% x1 x1 @@ -1561,7 +1804,7 @@ Sharp X68000 %ROMPATH%/x68000 .dim .DIM .img .IMG .d88 .D88 .88d .88D .hdm .HDM .dup .DUP .2hd .2HD .xdf .XDF .hdf .HDF .cmd .CMD .m3u .M3U .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/px68k_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/px68k_libretro.so %ROM% x68000 x68000 @@ -1570,7 +1813,7 @@ Microsoft Xbox %ROMPATH%/xbox .iso .ISO - %EMULATOR_XEMU% -dvd_path %ROM% + %INJECT%=%BASENAME%.esprefix %EMULATOR_XEMU% -dvd_path %ROM% xbox xbox @@ -1583,21 +1826,23 @@ xbox360 xbox360 + zx81 Sinclair ZX81 %ROMPATH%/zx81 .tzx .TZX .p .P .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/81_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/81_libretro.so %ROM% zx81 zx81 @@ -1605,8 +1850,9 @@ zxspectrum Sinclair ZX Spectrum %ROMPATH%/zxspectrum - .tzx .TZX .tap .TAP .z80 .Z80 .rzx .RZX .scl .SCL .trd .TRD .sh .SH .sna .SNA .szx .SZX .udi .UDI .mgt .MGT .img .IMG .dsk .DSK .gz .GZ .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fuse_libretro.so %ROM% + .dsk .DSK .gz .GZ .img .IMG .mgt .MGT .rzx .RZX .scl .SCL .sh .SH .sna .SNA .szx .SZX .tap .TAP .trd .TRD .tzx .TZX .udi .UDI .z80 .Z80 .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fuse_libretro.so %ROM% + zxspectrum zxspectrum @@ -1619,4 +1865,4 @@ tools tools - + \ No newline at end of file From 40beffb2c56eb8416958a59f09d99f0d38dd71ff Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 31 Mar 2023 08:36:44 +0000 Subject: [PATCH 03/11] ES-DE: updated themes --- net.retrodeck.retrodeck.yml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 5e532d3c..c6d73749 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -259,41 +259,41 @@ modules: # ES-DE Themes - START - - name: art-book-next + - name: art-book-next-es-de buildsystem: simple build-commands: - - mkdir -p ${FLATPAK_DEST}/share/emulationstation/themes/art-book-next/ - - mv -f * ${FLATPAK_DEST}/share/emulationstation/themes/art-book-next/ + - mkdir -p ${FLATPAK_DEST}/share/emulationstation/themes/art-book-next-es-de/ + - mv -f * ${FLATPAK_DEST}/share/emulationstation/themes/art-book-next-es-de/ sources: - type: git - url: https://github.com/anthonycaccese/art-book-next-retropie.git - commit: 5b2e44ab18007e42b581df57bd5d2a82255b9c14 + url: https://github.com/anthonycaccese/art-book-next-es-de.git + commit: a0dc0cccaa3f1475feb58e551fe732d982e161c0 - - name: alekfull-nx-light + - name: alekfull-nx-es-de buildsystem: simple build-commands: - - mkdir -p ${FLATPAK_DEST}/share/emulationstation/themes/alekfull-nx-light/ - - mv -f * ${FLATPAK_DEST}/share/emulationstation/themes/alekfull-nx-light/ + - mkdir -p ${FLATPAK_DEST}/share/emulationstation/themes/alekfull-nx-es-de/ + - mv -f * ${FLATPAK_DEST}/share/emulationstation/themes/alekfull-nx-es-de/ sources: - type: git - url: https://github.com/anthonycaccese/alekfull-nx-retropie.git - commit: 8d9aa2a992ab31cbe6dc3dc1c155dfb78e7a9732 + url: https://github.com/anthonycaccese/alekfull-nx-es-de.git + commit: 5011e5dca75663ff18602f3af9d17e9e880880ef - - name: retrofix-revisited + - name: retrofix-revisited-es-de buildsystem: simple build-commands: - - mkdir -p ${FLATPAK_DEST}/share/emulationstation/themes/retrofix-revisited/ - - mv -f * ${FLATPAK_DEST}/share/emulationstation/themes/retrofix-revisited/ + - mkdir -p ${FLATPAK_DEST}/share/emulationstation/themes/retrofix-revisited-es-de/ + - mv -f * ${FLATPAK_DEST}/share/emulationstation/themes/retrofix-revisited-es-de/ sources: - type: git - url: https://github.com/anthonycaccese/retrofix-revisited-retropie.git - commit: 07207d20d2b617af336dcf829ae9fb901cc1ce94 + url: https://github.com/anthonycaccese/retrofix-revisited-es-de.git + commit: 23b80225078d2a3723039a8e94b6147c84065028 - - name: nso-menu-interpreted + - name: nso-menu-interpreted-es-de buildsystem: simple build-commands: - - mkdir -p ${FLATPAK_DEST}/share/emulationstation/themes/nso-menu-interpreted/ - - mv -f * ${FLATPAK_DEST}/share/emulationstation/themes/nso-menu-interpreted/ + - mkdir -p ${FLATPAK_DEST}/share/emulationstation/themes/nso-menu-interpreted-es-de/ + - mv -f * ${FLATPAK_DEST}/share/emulationstation/themes/nso-menu-interpreted-es-de/ sources: - type: git url: https://github.com/anthonycaccese/nso-menu-interpreted-es-de.git From ede0fb1b877bd1c27352165642615ee43fff0ad4 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 31 Mar 2023 12:52:29 +0000 Subject: [PATCH 04/11] Updated: Yuzu, Citra, PCSX2, Xemu, RPCS3 --- net.retrodeck.retrodeck.yml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index c6d73749..a0bacb8c 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -498,8 +498,8 @@ modules: - ln -s "${FLATPAK_DEST}/yuzu/usr/bin/yuzu" "${FLATPAK_DEST}/bin/yuzu" sources: - type: file - url: https://github.com/yuzu-emu/yuzu-mainline/releases/download/mainline-0-1369/yuzu-mainline-20230312-54c359d1e.AppImage - sha256: 219874f72ea09856c8f1349d7bf744ecbd2823a469bd29f036b386924f5c5a97 + url: https://github.com/yuzu-emu/yuzu-mainline/releases/download/mainline-0-1388/yuzu-mainline-20230330-03db6543e.AppImage + sha256: aca7c691f74b0cf74c1801d9960266bc1ce818bca9c242945b95545d22b04d80 # Yuzu - END @@ -532,8 +532,8 @@ modules: sources: - type: archive url: >- - https://github.com/citra-emu/citra-nightly/releases/download/nightly-1854/citra-unified-source-20230312-2cbf6fb.tar.xz - sha256: 018cb7dce3aa29a548a6e4cbad65d97babd98d2cdd1a4848a7c95c117f92fdf5 + https://github.com/citra-emu/citra-nightly/releases/download/nightly-1872/citra-unified-source-20230330-f96047f.tar.xz + sha256: 3c49b691d46a1253df7477d1e9d771b7d15b967459851c096150e9952e160bfa x-checker-data: type: json url: https://api.github.com/repos/citra-emu/citra-nightly/releases/latest @@ -562,8 +562,8 @@ modules: - ln -s "${FLATPAK_DEST}/pcsx2-qt/usr/bin/pcsx2-qt" "${FLATPAK_DEST}/bin/pcsx2-qt" sources: - type: file - url: https://github.com/PCSX2/pcsx2/releases/download/v1.7.4225/pcsx2-v1.7.4225-linux-AppImage-64bit-Qt.AppImage - sha256: e8ed326851941b212193c2bd193ca87efdcc70c18971f45749273a32893fec68 + url: https://github.com/PCSX2/pcsx2/releases/download/v1.7.4303/pcsx2-v1.7.4303-linux-AppImage-64bit-Qt.AppImage + sha256: 5680bcc510f0898e6078c60ef2ef1d987b8414e1296c5ff88bd87933e4a314b3 # PCSX2 - END @@ -747,8 +747,8 @@ modules: sources: - type: git url: https://github.com/xemu-project/xemu.git - tag: v0.7.85 - commit: 065c74a00fe402f65147e9b0d1a1eeac1b4b609f + tag: v0.7.86 + commit: 4a99fd0f1855fc52e15885812abd3ee4bb2b3847 x-checker-data: type: json url: https://api.github.com/repos/xemu-project/xemu/releases/latest @@ -829,10 +829,12 @@ modules: sources: - type: git url: https://github.com/RPCS3/rpcs3.git - commit: cf5346c263111760752cabb94767c07c501207c4 + branch: master + commit: 0c051a83a70ff548b750a92489350cfbb0c1881c - type: git url: https://github.com/intel/ittapi.git - commit: 2de8a23f6130036dcd4d1b78d05df3187951d298 + branch: master + commit: 4a3762fbc517475bfb0586efc513e51c164108c9 dest: ittapi/ittapi disable-shallow-clone: true # remove git-lfs hook From 0a16ff327ef7319581d3906cf784ebb71efe0b13 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 31 Mar 2023 13:43:21 +0000 Subject: [PATCH 05/11] ES-DE: updated config for ES-DE 2.0 --- es-configs/es_settings.xml | 59 ++++++++++++++++++++++++++------------ 1 file changed, 41 insertions(+), 18 deletions(-) diff --git a/es-configs/es_settings.xml b/es-configs/es_settings.xml index 15a842eb..61b6edaa 100644 --- a/es-configs/es_settings.xml +++ b/es-configs/es_settings.xml @@ -1,9 +1,12 @@ + - + + + @@ -13,12 +16,13 @@ - - + + + @@ -44,8 +48,8 @@ - + @@ -54,13 +58,15 @@ + + - + + - @@ -71,41 +77,55 @@ - + - - - + + + - + + + + + + + + - - + + + + + - + + - + + + + @@ -115,7 +135,10 @@ - - + + + + + - + \ No newline at end of file From 47880253926f9024cfae57f2451f00b68c0be52f Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 31 Mar 2023 15:09:03 +0000 Subject: [PATCH 06/11] FIXES: rpcs3, es_settings --- es-configs/es_settings.xml | 2 +- net.retrodeck.retrodeck.yml | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/es-configs/es_settings.xml b/es-configs/es_settings.xml index 61b6edaa..0c31775c 100644 --- a/es-configs/es_settings.xml +++ b/es-configs/es_settings.xml @@ -16,7 +16,7 @@ - + diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index a0bacb8c..7342b293 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -829,11 +829,9 @@ modules: sources: - type: git url: https://github.com/RPCS3/rpcs3.git - branch: master - commit: 0c051a83a70ff548b750a92489350cfbb0c1881c + commit: 3e556c710b3256d23b9e524e44d45ba8bbf63814 - type: git url: https://github.com/intel/ittapi.git - branch: master commit: 4a3762fbc517475bfb0586efc513e51c164108c9 dest: ittapi/ittapi disable-shallow-clone: true From b38aae8031e90df72bb2b53102399a02bf8018f9 Mon Sep 17 00:00:00 2001 From: icenine451 Date: Fri, 31 Mar 2023 13:30:10 -0400 Subject: [PATCH 07/11] Remove extra dialog at the end of first setup --- functions.sh | 18 ++++++------------ rd-submodules/retroarch | 2 +- rd-submodules/shared-modules | 2 +- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/functions.sh b/functions.sh index c3eacb90..b0da3604 100644 --- a/functions.sh +++ b/functions.sh @@ -1283,18 +1283,19 @@ finit() { mkdir -pv $roms_folder - 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." + 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, which can take up to one minute.\nRetroDECK will start once the process is completed.\n\nPress OK to continue." + ( # Recreating the folder - rm -rfv /var/config/emulationstation/ - mkdir -pv /var/config/emulationstation/ + rm -rf /var/config/emulationstation/ + mkdir -p /var/config/emulationstation/ # Initializing ES-DE # 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." - # Initializing ROMs folder - Original in retrodeck home (or SD Card) dir_prep $roms_folder "/var/config/emulationstation/ROMs" @@ -1315,7 +1316,6 @@ finit() { dir_prep "$roms_folder/pico8" "$bios_folder/pico-8/carts" # Symlink default game location to RD roms for cleanliness (this location is overridden anyway by the --root_path launch argument anyway) dir_prep "$saves_folder/pico-8" "$bios_folder/pico-8/cdata" # PICO-8 saves folder - ( ra_init standalones_init ) | @@ -1325,12 +1325,6 @@ finit() { --text="RetroDECK is finishing the initial setup process, please wait." create_lock - - zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap \ - --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ - --title "RetroDECK" \ - --text="Installation completed.\nPlease put your roms in:\n\n$roms_folder\n\nand your bioses in\n\n$bios_folder\n\nThen start the program again.\nIf you wish to change the roms location, you may use the tool located the tools section of RetroDECK.\n\nIMPORTANT NOTES:\n- RetroDECK must be manually added and launched from your Steam Library in order to work correctly.\n- It's recommended to use the 'RetroDECK Offical Controller Config' from Steam (under community layouts).\n- It's suggested to use BoilR to automatically add the SteamGridDB images to Steam (this will be automated soon).\nhttps://github.com/PhilipK/BoilR" - # TODO: Replace the stuff above with BoilR code when ready } #========================= diff --git a/rd-submodules/retroarch b/rd-submodules/retroarch index 717b7809..0b1cfb79 160000 --- a/rd-submodules/retroarch +++ b/rd-submodules/retroarch @@ -1 +1 @@ -Subproject commit 717b78093797270877ec416e58082f1c71d435d8 +Subproject commit 0b1cfb79e591e10488a3262d6b38db843c39a409 diff --git a/rd-submodules/shared-modules b/rd-submodules/shared-modules index a2441b96..ae5d7192 160000 --- a/rd-submodules/shared-modules +++ b/rd-submodules/shared-modules @@ -1 +1 @@ -Subproject commit a2441b964afefd8cd1cebcdf562c7878670daf42 +Subproject commit ae5d7192c6a37f2c754fd92685a72d514931131a From ebcc5c5bfe3b69f992f0baf68286e436a3598666 Mon Sep 17 00:00:00 2001 From: icenine451 Date: Fri, 31 Mar 2023 14:34:24 -0400 Subject: [PATCH 08/11] Patch engine fixes and upgrades --- functions.sh | 86 ++++++++++++++++++++++++++++------------------------ 1 file changed, 47 insertions(+), 39 deletions(-) diff --git a/functions.sh b/functions.sh index b0da3604..cf91b693 100644 --- a/functions.sh +++ b/functions.sh @@ -224,14 +224,14 @@ desktop_mode_warning() { --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ --title "RetroDECK Desktop Mode Warning" \ --text="You appear to be running RetroDECK in the Steam Deck's Desktop mode!\n\nSome functions of RetroDECK may not work properly in Desktop mode, such as the Steam Deck's normal controls.\n\nRetroDECK is best enjoyed in Game mode!\n\nDo you still want to proceed?") - fi - fi - rc=$? # Capture return code, as "Yes" button has no text value - if [[ $rc == "1" ]]; then # If any button other than "Yes" was clicked - if [[ $choice == "No" ]]; then - exit 1 - elif [[ $choice == "Never show this again" ]]; then - set_setting_value $rd_conf "desktop_mode_warning" "false" retrodeck # Store desktop mode warning variable for future checks + rc=$? # Capture return code, as "Yes" button has no text value + if [[ $rc == "1" ]]; then # If any button other than "Yes" was clicked + if [[ $choice == "No" ]]; then + exit 1 + elif [[ $choice == "Never show this again" ]]; then + set_setting_value $rd_conf "desktop_mode_warning" "false" retrodeck # Store desktop mode warning variable for future checks + fi + fi fi fi } @@ -248,38 +248,38 @@ set_setting_value() { "retrodeck" | "citra" | "melonds" | "yuzu" ) if [[ -z $current_section_name ]]; then - sed -i 's^'"$setting_name_to_change"'=.*^'"$setting_name_to_change"'='"$setting_value_to_change"'^' $1 + sed -i 's^\^'"$setting_name_to_change"'=.*^'"$setting_name_to_change"'='"$setting_value_to_change"'^' $1 else - sed -i '\^\['"$current_section_name"'\]^,\^'"$setting_name_to_change"'.*^s^'"$setting_name_to_change"'=.*^'"$setting_name_to_change"'='"$setting_value_to_change"'^' $1 + sed -i '\^\['"$current_section_name"'\]^,\^\^'"$setting_name_to_change"'.*^s^\^'"$setting_name_to_change"'=.*^'"$setting_name_to_change"'='"$setting_value_to_change"'^' $1 fi ;; "retroarch" ) if [[ -z $current_section_name ]]; then - sed -i 's^'"$setting_name_to_change"' = \".*\"^'"$setting_name_to_change"' = \"'"$setting_value_to_change"'\"^' $1 + sed -i 's^\^'"$setting_name_to_change"' = \".*\"^'"$setting_name_to_change"' = \"'"$setting_value_to_change"'\"^' $1 else - sed -i '\^\['"$current_section_name"'\]^,\^'"$setting_name_to_change"'.*^s^'"$setting_name_to_change"' = \".*\"^'"$setting_name_to_change"' = \"'"$setting_value_to_change"'\"^' $1 + sed -i '\^\['"$current_section_name"'\]^,\^\^'"$setting_name_to_change"'.*^s^\^'"$setting_name_to_change"' = \".*\"^'"$setting_name_to_change"' = \"'"$setting_value_to_change"'\"^' $1 fi ;; - "dolphin" | "duckstation" | "pcsx2" | "ppsspp" | "xemu" ) + "dolphin" | "duckstation" | "pcsx2" | "ppsspp" | "primehack" | "xemu" ) if [[ -z $current_section_name ]]; then - sed -i 's^'"$setting_name_to_change"' =.*^'"$setting_name_to_change"' = '"$setting_value_to_change"'^' $1 + sed -i 's^\^'"$setting_name_to_change"' =.*^'"$setting_name_to_change"' = '"$setting_value_to_change"'^' $1 else - sed -i '\^\['"$current_section_name"'\]^,\^'"$setting_name_to_change"'.*^s^'"$setting_name_to_change"' =.*^'"$setting_name_to_change"' = '"$setting_value_to_change"'^' $1 + sed -i '\^\['"$current_section_name"'\]^,\^\^'"$setting_name_to_change"'.*^s^\^'"$setting_name_to_change"' =.*^'"$setting_name_to_change"' = '"$setting_value_to_change"'^' $1 fi ;; "rpcs3" ) # This does not currently work for settings with a $ in them if [[ -z $current_section_name ]]; then - sed -i 's^'"$setting_name_to_change"': .*^'"$setting_name_to_change"': '"$setting_value_to_change"'^' $1 + sed -i 's^\^'"$setting_name_to_change"': .*^'"$setting_name_to_change"': '"$setting_value_to_change"'^' $1 else - sed -i '\^\['"$current_section_name"'\]^,\^'"$setting_name_to_change"'.*^s^'"$setting_name_to_change"': .*^'"$setting_name_to_change"': '"$setting_value_to_change"'^' $1 + sed -i '\^\['"$current_section_name"'\]^,\^\^'"$setting_name_to_change"'.*^s^\^'"$setting_name_to_change"': .*^'"$setting_name_to_change"': '"$setting_value_to_change"'^' $1 fi ;; "emulationstation" ) - sed -i "s%$setting_name_to_change\" \" value=\".*\"%$setting_name_to_change\" \" value=\"$setting_value_to_change\"" $1 + sed -i "s%^$setting_name_to_change\" \" value=\".*\"%$setting_name_to_change\" \" value=\"$setting_value_to_change\"" $1 ;; esac @@ -321,7 +321,7 @@ get_setting_value() { if [[ -z $current_section_name ]]; then echo $(grep -o -P "(?<=^$current_setting_name=).*" $1) else - sed -n '\^\['"$current_section_name"'\]^,\^'"$current_setting_name"'^{ \^\['"$current_section_name"'\]^! { \^'"$current_setting_name"'^ p } }' $1 | grep -o -P "(?<=^$current_setting_name=).*" + sed -n '\^\['"$current_section_name"'\]^,\^\^'"$current_setting_name"'^{ \^\['"$current_section_name"'\]^! { \^\^'"$current_setting_name"'^ p } }' $1 | grep -o -P "(?<=^$current_setting_name=).*" fi ;; @@ -329,15 +329,15 @@ get_setting_value() { if [[ -z $current_section_name ]]; then echo $(grep -o -P "(?<=^$current_setting_name = \").*(?=\")" $1) else - sed -n '\^\['"$current_section_name"'\]^,\^'"$current_setting_name"'^{ \^\['"$current_section_name"'\]^! { \^'"$current_setting_name"'^ p } }' $1 | grep -o -P "(?<=^$current_setting_name = \").*(?=\")" + sed -n '\^\['"$current_section_name"'\]^,\^\^'"$current_setting_name"'^{ \^\['"$current_section_name"'\]^! { \^\^'"$current_setting_name"'^ p } }' $1 | grep -o -P "(?<=^$current_setting_name = \").*(?=\")" fi ;; - "dolphin" | "duckstation" | "pcsx2" | "ppsspp" | "xemu" ) # For files with this syntax - setting_name = setting_value + "dolphin" | "duckstation" | "pcsx2" | "ppsspp" | "primehack" | "xemu" ) # For files with this syntax - setting_name = setting_value if [[ -z $current_section_name ]]; then echo $(grep -o -P "(?<=^$current_setting_name = ).*" $1) else - sed -n '\^\['"$current_section_name"'\]^,\^'"$current_setting_name"'^{ \^\['"$current_section_name"'\]^! { \^'"$current_setting_name"'^ p } }' $1 | grep -o -P "(?<=^$current_setting_name = ).*" + sed -n '\^\['"$current_section_name"'\]^,\^\^'"$current_setting_name"'^{ \^\['"$current_section_name"'\]^! { \^\^'"$current_setting_name"'^ p } }' $1 | grep -o -P "(?<=^$current_setting_name = ).*" fi ;; @@ -345,7 +345,7 @@ get_setting_value() { if [[ -z $current_section_name ]]; then echo $(grep -o -P "(?<=$current_setting_name: ).*" $1) else - sed -n '\^\['"$current_section_name"'\]^,\^'"$current_setting_name"'^{ \^\['"$current_section_name"'\]^! { \^'"$current_setting_name"'^ p } }' $1 | grep -o -P "(?<=$current_setting_name: ).*" + sed -n '\^\['"$current_section_name"'\]^,\^\^'"$current_setting_name"'^{ \^\['"$current_section_name"'\]^! { \^\^'"$current_setting_name"'^ p } }' $1 | grep -o -P "(?<=$current_setting_name: ).*" fi ;; @@ -380,7 +380,7 @@ disable_setting() { # This function will add a '#' to the beginning of a defined setting line, disabling it. # USAGE: disable_setting $setting_file $setting_line $system $section (optional) - local current_setting_line"$2" + local current_setting_line="$2" local current_section_name="$4" case $3 in @@ -400,7 +400,7 @@ enable_setting() { # This function will remove a '#' to the beginning of a defined setting line, enabling it. # USAGE: enable_setting $setting_file $setting_line $system $section (optional) - local current_setting_line"$2" + local current_setting_line="$2" local current_section_name="$4" case $3 in @@ -545,31 +545,35 @@ do case $action in "disable_file" ) - disable_file $setting_name + eval disable_file $setting_name ;; "enable_file" ) - enable_file $setting_name + eval enable_file $setting_name ;; "add_setting" ) - add_setting $3 "$setting_name" $system_name $current_section + eval add_setting $3 "$setting_name" $system_name $current_section ;; "disable_setting" ) - disable_setting $3 "$setting_name" $system_name $current_section + eval disable_setting $3 "$setting_name" $system_name $current_section ;; "enable_setting" ) - enable_setting $3 "$setting_name" $system_name $current_section + eval enable_setting $3 "$setting_name" $system_name $current_section ;; "change" ) - set_setting_value $3 "$setting_name" "$setting_value" $system_name $current_section + eval set_setting_value $3 "$setting_name" "$setting_value" $system_name $current_section ;; + *"#"* ) + # Comment line in patch file + ;; + * ) - echo "Config file malformed" + echo "Config line malformed: $action" ;; esac @@ -588,31 +592,35 @@ do case $action in "disable_file" ) - disable_file $config_file + eval disable_file $config_file ;; "enable_file" ) - enable_file $config_file + eval enable_file $config_file ;; "add_setting" ) - add_setting $config_file "$setting_name" $system_name $current_section + eval add_setting $config_file "$setting_name" $system_name $current_section ;; "disable_setting" ) - disable_setting $config_file "$setting_name" $system_name $current_section + eval disable_setting $config_file "$setting_name" $system_name $current_section ;; "enable_setting" ) - enable_setting $config_file "$setting_name" $system_name $current_section + eval enable_setting $config_file "$setting_name" $system_name $current_section ;; "change" ) - set_setting_value $config_file "$setting_name" "$setting_value" $system_name $current_section + eval set_setting_value $config_file "$setting_name" "$setting_value" $system_name $current_section ;; + *"#"* ) + # Comment line in patch file + ;; + * ) - echo "Config file malformed" + echo "Config line malformed: $action" ;; esac From 1f4f19bae057d9b1c0f2bba1431b39da032f16b3 Mon Sep 17 00:00:00 2001 From: icenine451 Date: Fri, 31 Mar 2023 14:34:48 -0400 Subject: [PATCH 09/11] Primehack: Fix default AR and audio output --- emu-configs/primehack/Dolphin.ini | 2 +- emu-configs/primehack/GFX.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/emu-configs/primehack/Dolphin.ini b/emu-configs/primehack/Dolphin.ini index 7731928e..5ecd48e0 100644 --- a/emu-configs/primehack/Dolphin.ini +++ b/emu-configs/primehack/Dolphin.ini @@ -59,7 +59,7 @@ ThemeName = Clean DebugModeEnabled = False CursorVisibility = 2 [DSP] -Backend = No Audio Output +Backend = Pulse EnableJIT = False DSPThread = True [GBA] diff --git a/emu-configs/primehack/GFX.ini b/emu-configs/primehack/GFX.ini index 4ffbf202..73e36e2e 100644 --- a/emu-configs/primehack/GFX.ini +++ b/emu-configs/primehack/GFX.ini @@ -16,7 +16,7 @@ Lock Camera in Motion Puzzles = True ReduceBloom = True ToggleArmRePosition = True [Settings] -AspectRatio = 3 +AspectRatio = 1 BackendMultithreading = True DumpBaseTextures = True DumpMipTextures = True From c0059ec3a44de3979fa00224c5b0a77144e09b7a Mon Sep 17 00:00:00 2001 From: icenine451 Date: Fri, 31 Mar 2023 15:45:46 -0400 Subject: [PATCH 10/11] Create update script for 0.6.4b config changes --- emu-configs/PCSX2-QT/PCSX2.ini | 2 +- emu-configs/PCSX2/PCSX2.ini | 1 + emu-configs/patches/updates/064b_update.patch | 6 ++++++ emu-configs/primehack/Dolphin.ini | 2 +- post_update.sh | 10 +++++++++- 5 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 emu-configs/patches/updates/064b_update.patch diff --git a/emu-configs/PCSX2-QT/PCSX2.ini b/emu-configs/PCSX2-QT/PCSX2.ini index 5ed8407b..7e428798 100644 --- a/emu-configs/PCSX2-QT/PCSX2.ini +++ b/emu-configs/PCSX2-QT/PCSX2.ini @@ -1,7 +1,7 @@ [UI] SettingsVersion = 1 InhibitScreensaver = true -ConfirmShutdown = true +ConfirmShutdown = false StartPaused = false PauseOnFocusLoss = false StartFullscreen = true diff --git a/emu-configs/PCSX2/PCSX2.ini b/emu-configs/PCSX2/PCSX2.ini index e1d8bec8..abeccf07 100644 --- a/emu-configs/PCSX2/PCSX2.ini +++ b/emu-configs/PCSX2/PCSX2.ini @@ -4,6 +4,7 @@ MainWindowGeometry = AdnQywADAAAAAAAAAAAAAAAAA7UAAAJ/AAAAAAAAAAAAAAO1AAACfwAAAAA MainWindowState = AAAA/wAAAAD9AAAAAAAAA7YAAAJXAAAABAAAAAQAAAAIAAAACPwAAAABAAAAAgAAAAEAAAAOAHQAbwBvAGwAQgBhAHIAAAAAAP////8AAAAAAAAAAA== PauseOnFocusLoss = true StartFullscreen = true +ConfirmShutdown = false [EmuCore] diff --git a/emu-configs/patches/updates/064b_update.patch b/emu-configs/patches/updates/064b_update.patch new file mode 100644 index 00000000..3502b91d --- /dev/null +++ b/emu-configs/patches/updates/064b_update.patch @@ -0,0 +1,6 @@ +# Primehack Changes: Assign audio output, change AR to "Force 16:9" +change^DSP^Backend^Pulse^primehack^$primehackconf +change^Settings^AspectRatio^1^primehack^$primehackgfxconf +# Update "ask on quit" and "save on quit" on supported emulators (PCSX2, Duckstation) +change^UI^ConfirmShutdown^false^pcsx2^$pcsx2qtconf +change^Main^ConfirmPowerOff^false^duckstation^$duckstationconf \ No newline at end of file diff --git a/emu-configs/primehack/Dolphin.ini b/emu-configs/primehack/Dolphin.ini index 5ecd48e0..89358dd0 100644 --- a/emu-configs/primehack/Dolphin.ini +++ b/emu-configs/primehack/Dolphin.ini @@ -48,7 +48,7 @@ DisableScreenSaver = True KeepWindowOnTop = False Fullscreen = True [Interface] -ConfirmStop = False +ConfirmStop = True LanguageCode = OnScreenDisplayMessages = True PauseOnFocusLost = False diff --git a/post_update.sh b/post_update.sh index 8b79912c..361d15f4 100644 --- a/post_update.sh +++ b/post_update.sh @@ -200,7 +200,7 @@ post_update() { dir_prep "$bios_folder/pico-8/cdata" "$saves_folder/pico-8" # PICO-8 saves folder fi if [[ $prev_version -le "063" ]]; then - # In version 0.6.2b, the following changes were made that required config file updates/reset: + # In version 0.6.3b, the following changes were made that required config file updates/reset: # - Put Dolphin and Primehack save states in different folders inside $rd_home/states # - Fix symlink to hard-coded PICO-8 config folder (dir_prep doesn't like ~) # - Overwrite Citra and Yuzu configs, as controller mapping was broken due to emulator updates. @@ -221,6 +221,14 @@ post_update() { # Remove unneeded tools folder, as location has changed to RO space rm -rfv /var/config/retrodeck/tools/ fi + if [[ $prev_version -le "064" ]]; then + # In version 0.6.4b, the following changes were made: + # Changed settings in Primehack: The audio output was not selected by default, default AR was also incorrect. + # Changed settings in Duckstation and PCSX2: The "ask on exit" was disabled and "save on exit" was enabled. + # The default configs have been updated for new installs and resets, a patch was created to address existing installs. + + deploy_multi_patch "emu-configs/patches/updates/064b_update.patch" + fi # The following commands are run every time. From 35e4e40ece0bf88a5b5275fbaa23a58fcaed3ba9 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 4 Apr 2023 18:38:08 +0000 Subject: [PATCH 11/11] APPDATA: Release notes updated [skip ci] --- net.retrodeck.retrodeck.appdata.xml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml index e2937c13..6d30badb 100644 --- a/net.retrodeck.retrodeck.appdata.xml +++ b/net.retrodeck.retrodeck.appdata.xml @@ -65,13 +65,20 @@ GPL-3.0 CC0-1.0 - + https://github.com/XargonWan/RetroDECK/releases/tag/0.6.4b -

New features - General:

+

New features - General

    -
  • Updated EmulationStation Desktop Edition to 2.0
    • -
  • Removed legacy themes and added themes for ES-DE 2.0
    • +
  • Updated to ES-DE 2.0
    • +
  • Added the NSO Menu Interpreted theme
    • +
  • Updated all included themes
    • +
  • Updated the Emulators/RetroArch + cores
    • +
+

Bug fixes and other changes

+
    +
  • Fixed an audio issue in the Primehack configuration
    • +
  • Various backend fixes