From 89af7d68c0ed70cbdd2d700e16e8de02955d096e Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 5 Mar 2024 14:03:12 +0100 Subject: [PATCH] RA: re added citra core --- .../retroarch/retroarch-core-options.cfg | 24 +++++++++++++++++++ .../retrodeck/presets/citra_presets.cfg | 7 ++++++ .../reference_lists/bios_checklist.cfg | 1 + .../retroarch/retroarch-core-options.cfg | 24 +++++++++++++++++++ es-configs/es_find_rules.xml | 19 +++++++++++++++ es-configs/es_systems.xml | 11 +++++++++ functions/steam-sync/steam-sync.py | 2 ++ net.retrodeck.retrodeck.appdata.xml | 2 +- net.retrodeck.retrodeck.yml | 9 +++---- 9 files changed, 92 insertions(+), 7 deletions(-) create mode 100644 emu-configs/defaults/retrodeck/presets/citra_presets.cfg diff --git a/emu-configs/defaults/retroarch/retroarch-core-options.cfg b/emu-configs/defaults/retroarch/retroarch-core-options.cfg index 60e61fe0..f7bbfc46 100644 --- a/emu-configs/defaults/retroarch/retroarch-core-options.cfg +++ b/emu-configs/defaults/retroarch/retroarch-core-options.cfg @@ -58,6 +58,30 @@ cap32_retrojoy1 = "auto" cap32_scr_intensity = "8" cap32_scr_tube = "color" cap32_statusbar = "onloading" +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" diff --git a/emu-configs/defaults/retrodeck/presets/citra_presets.cfg b/emu-configs/defaults/retrodeck/presets/citra_presets.cfg new file mode 100644 index 00000000..465dafe1 --- /dev/null +++ b/emu-configs/defaults/retrodeck/presets/citra_presets.cfg @@ -0,0 +1,7 @@ +config_file_format^citra +change^ask_to_exit^confirmClose^true^UI^$citraconf^$emuconfigs/citra/qt-config.ini +change^ask_to_exit^confirmClose\default^true^UI^$citraconf^$emuconfigs/citra/qt-config.ini +change^abxy_button_swap^profiles\1\button_a^button:1,engine:sdl,guid:030079f6de280000ff11000001000000,port:0^Controls^$citraconf^$emuconfigs/citra/qt-config.ini +change^abxy_button_swap^profiles\1\button_b^button:0,engine:sdl,guid:030079f6de280000ff11000001000000,port:0^Controls^$citraconf^$emuconfigs/citra/qt-config.ini +change^abxy_button_swap^profiles\1\button_x^button:3,engine:sdl,guid:030079f6de280000ff11000001000000,port:0^Controls^$citraconf^$emuconfigs/citra/qt-config.ini +change^abxy_button_swap^profiles\1\button_y^button:2,engine:sdl,guid:030079f6de280000ff11000001000000,port:0^Controls^$citraconf^$emuconfigs/citra/qt-config.ini \ No newline at end of file diff --git a/emu-configs/defaults/retrodeck/reference_lists/bios_checklist.cfg b/emu-configs/defaults/retrodeck/reference_lists/bios_checklist.cfg index 99cd8b8a..c46346b7 100644 --- a/emu-configs/defaults/retrodeck/reference_lists/bios_checklist.cfg +++ b/emu-configs/defaults/retrodeck/reference_lists/bios_checklist.cfg @@ -72,6 +72,7 @@ n88_0.rom^^d675a2ca186c6efcd6277b835de4c7e5^NEC PC-8000 / PC-8800 series (QUASI8 n88_1.rom^^e844534dfe5744b381444dbe61ef1b66^NEC PC-8000 / PC-8800 series (QUASI88)^Optional BIOS file n88_2.rom^^6548fa45061274dee1ea8ae1e9e93910^NEC PC-8000 / PC-8800 series (QUASI88)^Optional BIOS file n88_3.rom^^fc4b76a402ba501e6ba6de4b3e8b4273^NEC PC-8000 / PC-8800 series (QUASI88)^Optional BIOS file +aes_keys.txt^citra/sysdata/^Unknown^Nintendo 3DS^Decryption keys used by Citra emulator bios7.bin^^df692a80a5b1bc90728bc3dfc76cd948^Nintendo DS^Used by MelonDS emulator (Required, see Wiki) bios9.bin^^a392174eb3e572fed6447e956bde4b25^Nintendo DS^Used by MelonDS emulator (Required, see Wiki) firmware.bin^^e45033d9b0fa6b0de071292bba7c9d13^Nintendo DS^Used by MelonDS emulator (Required, see Wiki) diff --git a/emu-configs/retroarch/retroarch-core-options.cfg b/emu-configs/retroarch/retroarch-core-options.cfg index 7fb05d1d..06420de7 100644 --- a/emu-configs/retroarch/retroarch-core-options.cfg +++ b/emu-configs/retroarch/retroarch-core-options.cfg @@ -58,6 +58,30 @@ cap32_retrojoy1 = "auto" cap32_scr_intensity = "8" cap32_scr_tube = "color" cap32_statusbar = "onloading" +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" diff --git a/es-configs/es_find_rules.xml b/es-configs/es_find_rules.xml index 5d04b898..8f4a6cc7 100644 --- a/es-configs/es_find_rules.xml +++ b/es-configs/es_find_rules.xml @@ -161,6 +161,25 @@ ~/.local/share/flatpak/exports/bin/info.cemu.Cemu + + + + citra-qt + citra + citra-emu.citra-nightly + org.citra_emu.citra + + + ~/Applications/citra-qt*.AppImage + ~/.local/share/applications/citra-qt*.AppImage + ~/.local/bin/citra-qt*.AppImage + ~/bin/citra-qt*.AppImage + ~/.citra/canary/citra-qt.AppImage + ~/.citra/nightly/citra-qt.AppImage + /var/lib/flatpak/exports/bin/org.citra_emu.citra + ~/.local/share/flatpak/exports/bin/org.citra_emu.citra + + diff --git a/es-configs/es_systems.xml b/es-configs/es_systems.xml index 0013d8a3..ae96fb54 100644 --- a/es-configs/es_systems.xml +++ b/es-configs/es_systems.xml @@ -1167,6 +1167,17 @@ sg-1000 multivision + + n3ds + Nintendo 3DS + %ROMPATH%/n3ds + .3ds .3DS .3dsx .3DSX .app .APP .axf .AXF .cci .CCI .cxi .CXI .elf .ELF .7z .7Z .zip .ZIP + + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/citra_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/citra2018_libretro.so %ROM% + n3ds + n3ds + n64 Nintendo 64 diff --git a/functions/steam-sync/steam-sync.py b/functions/steam-sync/steam-sync.py index 786e16b1..b89d9fc6 100644 --- a/functions/steam-sync/steam-sync.py +++ b/functions/steam-sync/steam-sync.py @@ -231,6 +231,8 @@ alt_command_list={ "BlastEm": "flatpak run --command=retroarch net.retrodeck.retrodeck -L /var/config/retroarch/cores/blastem_libretro.so", "CrocoDS": "flatpak run --command=retroarch net.retrodeck.retrodeck -L /var/config/retroarch/cores/crocods_libretro.so", "fMSX": "flatpak run --command=retroarch net.retrodeck.retrodeck -L /var/config/retroarch/cores/fmsx_libretro.so", +"Citra": "flatpak run --command=retroarch net.retrodeck.retrodeck -L /var/config/retroarch/cores/citra_libretro.so", +"Citra 2018": "flatpak run --command=retroarch net.retrodeck.retrodeck -L /var/config/retroarch/cores/citra2018_libretro.so", "Mupen64Plus-Next": "flatpak run --command=retroarch net.retrodeck.retrodeck -L /var/config/retroarch/cores/mupen64plus_next_libretro.so", "DeSmuME 2015": "flatpak run --command=retroarch net.retrodeck.retrodeck -L /var/config/retroarch/cores/desmume2015_libretro.so", "melonDS": "flatpak run --command=retroarch net.retrodeck.retrodeck -L /var/config/retroarch/cores/melonds_libretro.so", diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml index 63c3be39..c5e852f0 100644 --- a/net.retrodeck.retrodeck.appdata.xml +++ b/net.retrodeck.retrodeck.appdata.xml @@ -75,7 +75,7 @@

Changes:

  • ES-DE: updated to 3.0
    • -
  • CITRA: Removed
    • +
  • CITRA-SA: Removed
  • YUZU: Removed
  • Added new system: RYUJINX
  • Added new system: SOLARUS
    • diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index fd707399..8eebc010 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -581,9 +581,8 @@ modules: - name: retroarch-cores-nightly buildsystem: simple build-commands: - - mkdir -p /app/share/libretro/cores/ - - rm -f ./RetroArch-Linux-x86_64.AppImage.home/.config/retroarch/cores/citra2018_libretro.so # Purge Citra cores until they are dropped from the packages - - rm -f ./RetroArch-Linux-x86_64.AppImage.home/.config/retroarch/cores/citra_libretro.so # Purge Citra cores until they are dropped from the packages + - mkdir -p /app/share/libretro/cores/ + - mv -f ./RetroArch-Linux-x86_64.AppImage.home/.config/retroarch/cores/* /app/share/libretro/cores/ sources: - type: archive @@ -593,9 +592,7 @@ modules: - name: retroarch-cores buildsystem: simple build-commands: - - mkdir -p /app/share/libretro/cores/ - - rm -f ./RetroArch-Linux-x86_64.AppImage.home/.config/retroarch/cores/citra2018_libretro.so # Purge Citra cores until they are dropped from the packages - - rm -f ./RetroArch-Linux-x86_64.AppImage.home/.config/retroarch/cores/citra_libretro.so # Purge Citra cores until they are dropped from the packages + - mkdir -p /app/share/libretro/cores/ - mv -f ./RetroArch-Linux-x86_64.AppImage.home/.config/retroarch/cores/* /app/share/libretro/cores/ sources: - type: archive