Merge pull request #3059 from r3claimer/dev

Fix mupen64 sa controls on ace, bump flycast (SA & LR)

documentation/PER_DEVICE_DOCUMENTATION/RK3588/SUPPORTED_EMULATORS_AND_CORES.md

@@ -73,7 +73,7 @@ This document describes all available systems emulators and cores available for
 |Nintendo|GameCube (gamecube)|2001|`gamecube`|.gcm .iso .gcz .ciso .wbfs .rvz .dol|**dolphin:** dolphin-sa-gc (default)<br>**retroarch:** dolphin<br>|
 |Nintendo|NES (Hacks) (nesh)|1985|`nesh`|.nes .unif .unf .zip .7z|**retroarch:** nestopia (default)<br>**retroarch:** fceumm<br>**retroarch:** quicknes<br>**retroarch:** mesen<br>**mednafen:** nesh<br>|
 |Nintendo|Nintendo 64 (n64)|1996|`n64`|.z64 .n64 .v64 .zip .7z|**retroarch:** mupen64plus_next (default)<br>**retroarch:** mupen64plus<br>**retroarch:** parallel_n64<br>**mupen64plus:** mupen64plus-sa<br>|
-|Nintendo|Nintendo DS (nds)|2005|`nds`|.nds .zip .7z|**drastic:** drastic-sa<br>**retroarch:** melonds (default)<br>**melonds:** melonds-sa<br>**retroarch:** desmume<br>|
+|Nintendo|Nintendo DS (nds)|2005|`nds`|.nds .zip .7z|**drastic:** drastic-sa<br>**retroarch:** melonds<br>**melonds:** melonds-sa (default)<br>**retroarch:** desmume<br>|
 |Nintendo|Nintendo Entertainment System (nes)|1985|`nes`|.nes .unif .unf .zip .7z|**retroarch:** nestopia (default)<br>**retroarch:** fceumm<br>**retroarch:** quicknes<br>**retroarch:** mesen<br>**mednafen:** nes<br>|
 |Nintendo|Pokémon Mini (pokemini)|2001|`pokemini`|.min .zip .7z|**retroarch:** pokemini (default)<br>|
 |Nintendo|Satellaview (satellaview)|1995|`satellaview`|.smc .fig .bs .sfc .bsx .swc .zip .7z|**retroarch:** snes9x (default)<br>**retroarch:** snes9x2010<br>**retroarch:** snes9x2002<br>**retroarch:** snes9x2005_plus<br>|

packages/emulators/libretro/flycast-lr/package.mk

@@ -3,7 +3,7 @@
 # Copyright (C) 2023 JELOS (https://github.com/JustEnoughLinuxOS)
 
 PKG_NAME="flycast-lr"
-PKG_VERSION="f4f087a6ea83a5483dedf23ad2b38763988eccc5"
+PKG_VERSION="40cdef6c1c9bd73bf3a55d412e30c25bbcf2b59c"
 PKG_SITE="https://github.com/flyinghead/flycast"
 PKG_URL="${PKG_SITE}.git"
 PKG_DEPENDS_TARGET="toolchain zlib libzip"

packages/emulators/standalone/flycast-sa/config/RK3588/mappings/SDL_GameForce ACE Gamepad.cfg

@@ -19,7 +19,7 @@ bind2 = 3:btn_y
 bind3 = 4:btn_x
 bind4 = 5:btn_z
 bind5 = 6:btn_c
-bind6 = 7:btn_menu
+bind6 = 9:btn_menu
 bind7 = 8:btn_start
 bind8 = 12:btn_dpad1_up
 bind9 = 13:btn_dpad1_down

packages/emulators/standalone/flycast-sa/package.mk

@@ -3,7 +3,7 @@
 # Copyright (C) 2022-present JELOS (https://github.com/JustEnoughLinuxOS)
 
 PKG_NAME="flycast-sa"
-PKG_VERSION="391da7023f63c2afd32af72ac9f2cfb02bbc7eb6"
+PKG_VERSION="40cdef6c1c9bd73bf3a55d412e30c25bbcf2b59c"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/flyinghead/flycast"
 PKG_URL="${PKG_SITE}.git"

packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-core/config/RK3588/mupen64plus.cfg

@@ -136,7 +136,7 @@ Joy Mapping Increase Volume = ""
 # Joystick event string for decreasing the volume
 Joy Mapping Decrease Volume = ""
 # Joystick event string for fast-forward
-Joy Mapping Fast Forward = "J0B8/B7"
+Joy Mapping Fast Forward = "J0B9/B2"
 # Joystick event string for advancing by one frame when paused
 Joy Mapping Frame Advance = ""
 # Joystick event string for pressing the game shark button
@@ -203,8 +203,8 @@ L Trig = button(5)
 Mempak switch =
 Rumblepak switch =
 # Analog axis configuration mappings
-X Axis = axis(1+,1-)
-Y Axis = axis(0-,0+)
+X Axis = axis(1-,1+)
+Y Axis = axis(0+,01)
 
 [Input-SDL-Control2]
 

packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-input-sdl/config/RK3588/default.ini

@@ -21,5 +21,5 @@ L Trig = button(5)
 Mempak switch = 
 Rumblepak switch = 
 # Analog axis configuration mappings
-X Axis = axis(1+,1-)
-Y Axis = axis(0-,0+)
+X Axis = axis(1-,1+)
+Y Axis = axis(0+,0-)