Merge branch 'beta'

# Conflicts:
#	functions/EmuScripts/emuDeckBigPEmu.sh
#	functions/EmuScripts/emuDeckRyujinx.sh
#	functions/EmuScripts/emuDeckShadPS4.sh

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -64,5 +64,5 @@ body:
     id: logs
     attributes:
       label: Relevant log output
-      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks. You can find the EmuDeck log in $HOME/emudeck. For more information, see https://emudeck.github.io/troubleshooting/steamos/#how-to-get-the-emudeck-log. 
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks. You can find the EmuDeck log in $HOME/.config/EmuDeck. For more information, see https://emudeck.github.io/troubleshooting/steamos/#how-to-get-the-emudeck-log. 
       render: shell

.gitignore

@@ -1,3 +1,4 @@
 .DS_Store
 .nova/Publishing/Deck.json
-*.log
+*.log
+.nova/Configuration.json

android/android_settings.sh

@@ -4,7 +4,7 @@
 android_doSetupRA=true
 android_doSetupDolphin=true
 android_doSetupYuzu=true
-android_doSetupCitra=true
+android_doSetupCitra=false
 android_doSetupPPSSPP=true
 android_doSetupAetherSX2=true
 
@@ -12,7 +12,7 @@ android_doSetupAetherSX2=true
 android_doInstallRA=true
 android_doInstallDolphin=true
 android_doInstallYuzu=true
-android_doInstallCitra=true
+android_doInstallCitra=false
 android_doInstallPPSSPP=true
 android_doInstallAetherSX2=true
 

android/functions/EmuScripts/Android_Azahar.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+function Android_Azahar_install(){
+	setMSG "Installing Azahar"
+	temp_url="$(getLatestReleaseURLGH "azahar-emu/azahar" ".apk")"
+	temp_emu="azahar"
+	Android_ADB_dl_installAPK $temp_emu $temp_url
+}
+
+function Android_Azahar_init(){
+	setMSG "Setting up Azahar"
+	rsync -ra "$emudeckBackend/android/configs/azahar-emu/" "$Android_temp_internal/azahar-emu/"
+}
+
+function Android_Azahar_setup(){
+	adb shell pm grant io.github.lime3ds.android android.permission.WRITE_EXTERNAL_STORAGE
+	adb shell am start -n io.github.lime3ds.android/.ui.MainActivity
+	sleep 1
+	adb shell am force-stop  io.github.lime3ds.android
+}
+
+function Android_Azahar_IsInstalled(){
+	package=" io.github.lime3ds.android"
+	Android_ADB_appInstalled $package
+}

android/functions/EmuScripts/Android_Dolphin.sh

@@ -10,7 +10,7 @@ function Android_Dolphin_install(){
 function Android_Dolphin_init(){
 	setMSG "Setting up Dolphin"
 
-	rsync -ra "$HOME/.config/EmuDeck/backend/android/configs/mmjr2-vbi/" "$Android_temp_internal/mmjr2-vbi/"
+	rsync -ra "$emudeckBackend/android/configs/mmjr2-vbi/" "$Android_temp_internal/mmjr2-vbi/"
 	originFile="$Android_temp_internal/mmjr2-vbi/Config/Dolphin.ini"
 	origin="XXXX"
 

android/functions/EmuScripts/Android_Lime3DS.sh

@@ -1,25 +0,0 @@
-#!/bin/bash
-
-function Android_Lime3DS_install(){
-	setMSG "Installing Citra"
-	temp_url="$(getLatestReleaseURLGH "Lime3DS/lime3ds-archive" ".apk")"
-	temp_emu="citra"
-	Android_ADB_dl_installAPK $temp_emu $temp_url
-}
-
-function Android_Lime3DS_init(){
-	setMSG "Setting up Citra"
-	rsync -ra "$HOME/.config/EmuDeck/backend/android/configs/citra-emu/" "$Android_temp_internal/citra-emu/"
-}
-
-function Android_Lime3DS_setup(){
-	adb shell pm grant org.citra.emu android.permission.WRITE_EXTERNAL_STORAGE
-	adb shell am start -n org.citra.emu/.ui.MainActivity
-	sleep 1
-	adb shell am force-stop org.citra.emu
-}
-
-function Android_Lime3DS_IsInstalled(){
-	package="org.citra.emu"
-	Android_ADB_appInstalled $package
-}

android/functions/EmuScripts/Android_NetherSX2.sh

@@ -9,7 +9,7 @@ function Android_NetherSX2_install(){
 	rm -rf "$Android_folder/$temp_emu.zip"
 	chmod +x $Android_folder/builder/build-nethersx2.sh
 	$Android_folder/builder/build-nethersx2.sh
-	Android_ADB_installAPK "$HOME/emudeck/android/builder/PatchedAPK/15210-v1.5-4248-noads.apk"
+	Android_ADB_installAPK "$emudeckFolder/android/builder/PatchedAPK/15210-v1.5-4248-noads.apk"
 }
 
 function Android_NetherSX2_init(){

android/functions/EmuScripts/Android_RetroArch.sh

@@ -2127,16 +2127,16 @@ Android_RetroArch_retroAchievementsPromptLogin(){
 			ans=$?
 	if [ $ans -eq 0 ]; then
 		echo "RetroAchievment Login"
-		echo "$RAInput" | awk -F "," '{print $1}' > "$HOME/.config/EmuDeck/.rau"
-		echo "$RAInput" | awk -F "," '{print $2}' > "$HOME/.config/EmuDeck/.rap"
+		echo "$RAInput" | awk -F "," '{print $1}' > "$emudeckFolder/.rau"
+		echo "$RAInput" | awk -F "," '{print $2}' > "$emudeckFolder/.rap"
 	else
 		echo "Cancel RetroAchievment Login"
 	fi
 }
 Android_RetroArch_retroAchievementsSetLogin(){
-	rm -rf "$HOME/.config/EmuDeck/.rap"
-	rau=$(cat "$HOME/.config/EmuDeck/.rau")
-	rat=$(cat "$HOME/.config/EmuDeck/.rat")
+	rm -rf "$emudeckFolder/.rap"
+	rau=$(cat "$emudeckFolder/.rau")
+	rat=$(cat "$emudeckFolder/.rat")
 	echo "Evaluate RetroAchievements Login."
 	if [ ${#rat} -lt 1 ]; then
 		echo "--No token."

android/functions/EmuScripts/Android_Yuzu.sh

@@ -10,7 +10,7 @@ function Android_Yuzu_install(){
 function Android_Yuzu_init(){
 	setMSG "Setting up Yuzu"
 
-	rsync -ra "$HOME/.config/EmuDeck/backend/android/configs/Android/data/org.yuzu.yuzu_emu/" "$Android_temp_android_data/org.yuzu.yuzu_emu/"
+	rsync -ra "$emudeckBackend/android/configs/Android/data/org.yuzu.yuzu_emu/" "$Android_temp_android_data/org.yuzu.yuzu_emu/"
 
 	originFile="$Android_temp_android_data/org.yuzu.yuzu_emu/files/config/config.ini"
 	origin="XXXX"

android/functions/ToolScripts/Android_ADB.sh

@@ -16,15 +16,15 @@ function Android_ADB_isInstalled(){
 
 function Android_ADB_install(){
 	local outFile="adb.zip"
-	local outDir="$HOME/emudeck/android"
+	local outDir="$emudeckFolder/android"
 
 	Android_download "$outFile" "$Android_ADB_url" && unzip -o "$outDir/$outFile" -d $outDir && rm -rf "$outDir/$outFile" && echo "true" && return 0
 
 }
 
 function Android_download(){
-	local outDir="$HOME/emudeck/android/"
-	local outFile="$HOME/emudeck/android/$1"
+	local outDir="$emudeckFolder/android/"
+	local outFile="$emudeckFolder/android/$1"
 	local url=$2
 	mkdir -p $outDir
 
@@ -75,7 +75,7 @@ Android_ADB_dl_installAPK(){
 	local temp_emu=$1
 	local temp_url=$2
 	Android_download "$temp_emu.apk" $temp_url
-	Android_ADB_installAPK "$HOME/emudeck/android/$temp_emu.apk"
+	Android_ADB_installAPK "$emudeckFolder/android/$temp_emu.apk"
 }
 
 function Android_ADB_getSDCard(){

android/functions/ToolScripts/Android_Pegasus.sh

@@ -38,7 +38,7 @@ function Android_Pegasus_init(){
 	Android_Pegasus_dl_theme $temp_emu $temp_url
 
 	#Change paths
-	rsync -ra "$HOME/.config/EmuDeck/backend/android/configs/Android/data/org.pegasus_frontend.android/files/pegasus-frontend/" "$Android_Pegasus_temp/"
+	rsync -ra "$emudeckBackend/android/configs/Android/data/org.pegasus_frontend.android/files/pegasus-frontend/" "$Android_Pegasus_temp/"
 	originFile="$Android_Pegasus_temp/game_dirs.txt"
 	origin="XXXX"
 	target="$androidStoragePath"

android/functions/all.sh

@@ -1,26 +1,27 @@
 #!/bin/bash
 
-# SETTINGSFILEANDROID="$HOME/emudeck/android_settings.sh"
+# SETTINGSFILEANDROID="$emudeckFolder/android_settings.sh"
 # if [ -f "$SETTINGSFILEANDROID" ]; then
 # 	# shellcheck source=./settings.sh
 # 	source "$SETTINGSFILEANDROID"
 # else
-# 	cp "$EMUDECKGIT/android/android_settings.sh" "$SETTINGSFILEANDROID"
-# 	source "$HOME/emudeck/android_settings.sh"
+# 	cp "$emudeckBackend/android/android_settings.sh" "$SETTINGSFILEANDROID"
+# 	source "$emudeckFolder/android_settings.sh"
 # fi
-source "$EMUDECKGIT/android/vars.sh"
+source "$emudeckBackend/vars.sh"
+source "$emudeckBackend/android/vars.sh"
 
-source "$EMUDECKGIT"/android/functions/EmuScripts/Android_Yuzu.sh
-source "$EMUDECKGIT"/android/functions/EmuScripts/Android_NetherSX2.sh
-source "$EMUDECKGIT"/android/functions/EmuScripts/Android_Lime3DS.sh
-source "$EMUDECKGIT"/android/functions/EmuScripts/Android_Dolphin.sh
-source "$EMUDECKGIT"/android/functions/EmuScripts/Android_RetroArch.sh
-source "$EMUDECKGIT"/android/functions/EmuScripts/Android_PPSSPP.sh
-source "$EMUDECKGIT"/android/functions/EmuScripts/Android_ScummVM.sh
-source "$EMUDECKGIT"/android/functions/EmuScripts/Android_Vita3K.sh
+source "$emudeckBackend"/android/functions/EmuScripts/Android_Yuzu.sh
+source "$emudeckBackend"/android/functions/EmuScripts/Android_NetherSX2.sh
+source "$emudeckBackend"/android/functions/EmuScripts/Android_Azahar.sh
+source "$emudeckBackend"/android/functions/EmuScripts/Android_Dolphin.sh
+source "$emudeckBackend"/android/functions/EmuScripts/Android_RetroArch.sh
+source "$emudeckBackend"/android/functions/EmuScripts/Android_PPSSPP.sh
+source "$emudeckBackend"/android/functions/EmuScripts/Android_ScummVM.sh
+source "$emudeckBackend"/android/functions/EmuScripts/Android_Vita3K.sh
 
-source "$EMUDECKGIT"/android/functions/ToolScripts/Android_ADB.sh
-source "$EMUDECKGIT"/android/functions/ToolScripts/Android_Daijisho.sh
-source "$EMUDECKGIT"/android/functions/ToolScripts/Android_Pegasus.sh
+source "$emudeckBackend"/android/functions/ToolScripts/Android_ADB.sh
+source "$emudeckBackend"/android/functions/ToolScripts/Android_Daijisho.sh
+source "$emudeckBackend"/android/functions/ToolScripts/Android_Pegasus.sh
 
 Android_ADB_setPath

android/roms/3ds/metadata.pegasus.txt

@@ -1,4 +1,4 @@
 collection: Nintendo 3DS
 shortname: 3ds
-extensions: 3ds, 3dsx, app, axf, cci, cxi, elf
-launch: am start -n org.citra.emu/.ui.EmulationActivity -a android.intent.action.VIEW -e GamePath {file.path}
+extensions: app, axf, cci, cxi, elf
+launch: am start -n io.github.lime3ds.android/.ui.EmulationActivity -a android.intent.action.VIEW -e GamePath {file.path}

android/setup.sh

@@ -1,9 +1,16 @@
 #!/bin/bash
-#source $HOME/.config/EmuDeck/backend/functions/all.sh
 
+#
+##
+## set backend location
+##
+#
+if [[ "$emudeckBackend" == "" ]]; then
+	emudeckBackend="$HOME/.config/EmuDeck/backend/"
+fi
+. "$emudeckBackend/vars.sh"
 
-
-MSG=$HOME/emudeck/logs/msg.log
+MSG=$emudeckLogs/msg.log
 echo "0" > "$MSG"
 
 #
@@ -13,8 +20,8 @@ echo "0" > "$MSG"
 #
 
 #mkdir -p "$HOME/.config/EmuDeck"
-#mkdir -p "$HOME/emudeck/logs"
-PIDFILE="$HOME/.config/EmuDeck/install.pid"
+#mkdir -p "$emudeckLogs"
+PIDFILE="$emudeckFolder/install.pid"
 
 
 if [ -f "$PIDFILE" ]; then
@@ -55,9 +62,9 @@ trap finish EXIT
 #
 
 #Creating log file
-LOGFILE="$HOME/emudeck/logs/emudeckAndroidSetup.log"
+LOGFILE="$emudeckLogs/emudeckAndroidSetup.log"
 
-mv "${LOGFILE}" "$HOME/emudeck/logs/emudeckAndroidSetup.last.log" #backup last log
+mv "${LOGFILE}" "$emudeckLogs/emudeckAndroidSetup.last.log" #backup last log
 
 if echo "${@}" > "${LOGFILE}" ; then
 	echo "Log created"
@@ -72,23 +79,16 @@ date "+%Y.%m.%d-%H:%M:%S %Z"
 echo 'Github API limits:'
 curl -H "Accept: application/vnd.github+json" -H "X-GitHub-Api-Version: 2022-11-28"  "https://api.github.com/rate_limit"
 
-#
-##
-## set backend location
-##
-#
-if [[ "$EMUDECKGIT" == "" ]]; then
-	EMUDECKGIT="$HOME/.config/EmuDeck/backend"
-fi
+
 #
 ##
 ## Start of installation
 ##
 #
-source "$EMUDECKGIT"/functions/helperFunctions.sh
-source "$EMUDECKGIT"/functions/jsonToBashVars.sh
-jsonToBashVars "$HOME/.config/EmuDeck/settings.json"
-source "$EMUDECKGIT/functions/all.sh"
+source "$emudeckBackend"/functions/helperFunctions.sh
+source "$emudeckBackend"/functions/jsonToBashVars.sh
+jsonToBashVars "$emudeckFolder/settings.json"
+source "$emudeckBackend/functions/all.sh"
 
 mkdir -p $Android_temp_internal
 mkdir -p $Android_temp_external
@@ -103,7 +103,7 @@ fi
 setMSG "Creating rom folders in $androidStoragePath..."
 
 mkdir -p "$Android_cond_path/Emulation/roms/"
-rsync -ra --ignore-existing "$EMUDECKGIT/roms/" "$Android_cond_path/Emulation/roms/"
+rsync -ra --ignore-existing "$emudeckBackend/roms/" "$Android_cond_path/Emulation/roms/"
 
 setMSG "Copying BIOS"
 rsync -ra --ignore-existing "$biosPath/" "$Android_cond_path/Emulation/bios/"
@@ -133,9 +133,9 @@ if [ $androidInstallPegasus == "true" ]; then
 	Android_Pegasus_init
 fi
 
-if [ $androidInstallLime3DS == "true" ]; then
-	Android_Lime3DS_install
-	Android_Lime3DS_init
+if [ $androidInstallAzahar == "true" ]; then
+	Android_Azahar_install
+	Android_Azahar_init
 fi
 if [ $androidInstallDolphin == "true" ]; then
 	Android_Dolphin_install
@@ -183,8 +183,8 @@ done
 if [ "$success" = "false" ]; then
 	echo "500 #ANDROID"
 else
-	if [ "$androidInstallCitraMMJ" = "true" ]; then
-		Android_Citra_setup
+	if [ "$androidInstallAzahar" = "true" ]; then
+		Android_Azahar_setup
 	fi
 	if [ "$androidInstallPegasus" = "true" ]; then
 		Android_Pegasus_setup
@@ -207,8 +207,8 @@ xdg-open "$Android_folder/temp" &
 #
 # We mark the script as finished
 #
-echo "100" > "$HOME/emudeck/logs/msg.log"
-echo "# Installation Complete" >> "$HOME/emudeck/logs/msg.log"
+echo "100" > "$emudeckLogs/msg.log"
+echo "# Installation Complete" >> "$emudeckLogs/msg.log"
 
 } | tee "${LOGFILE}" 2>&1
 

android/vars.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
-Android_ADB_path="$HOME/emudeck/android/platform-tools"
+Android_ADB_path="$emudeckFolder/android/platform-tools"
 Android_ADB_url="https://dl.google.com/android/repository/platform-tools-latest-linux.zip"
-Android_folder="$HOME/emudeck/android/"
-Android_temp_android_data="$HOME/emudeck/android/temp/CopyToInternal/Android/data"
-Android_temp_internal="$HOME/emudeck/android/temp/CopyToInternal"
-Android_temp_external="$HOME/emudeck/android/temp/CopyToSDCARD"
+Android_folder="$emudeckFolder/android/"
+Android_temp_android_data="$emudeckFolder/android/temp/CopyToInternal/Android/data"
+Android_temp_internal="$emudeckFolder/android/temp/CopyToInternal"
+Android_temp_external="$emudeckFolder/android/temp/CopyToSDCARD"
 Android_emusPath="/storage/emulated/0"

api.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
-. $HOME/.config/EmuDeck/backend/functions/all.sh
+. "$HOME/.config/EmuDeck/backend/functions/all.sh"
 
 API_pull(){
 	local branch=$1
-	cd ~/.config/EmuDeck/backend && touch ~/emudeck/logs/git.log && git reset --hard && git clean -fd && git checkout $branch && git pull && appImageInit && echo "OK" || echo "KO" >&2
+	cd ~/.config/EmuDeck/backend && touch $emudeckLogs/git.log && git reset --hard && git clean -fd && git checkout $branch && git pull && appImageInit && echo "OK" || echo "KO" >&2
 }
 
 API_autoSave(){
@@ -57,7 +57,7 @@ API_setCloud(){
 API_setToken(){
 	local token=$1
 	local user=$2
-	echo $token > "$HOME/.config/EmuDeck/.rat" && echo $user > "$HOME/.config/EmuDeck/.rau" && RetroArch_retroAchievementsSetLogin && DuckStation_retroAchievementsSetLogin && PCSX2QT_retroAchievementsSetLogin && echo "OK" || echo "KO" >&2
+	echo $token > "$emudeckFolder/.rat" && echo $user > "$emudeckFolder/.rau" && RetroArch_retroAchievementsSetLogin && DuckStation_retroAchievementsSetLogin && PCSX2QT_retroAchievementsSetLogin && echo "OK" || echo "KO" >&2
 }
 
 API_getToken(){

chimeraOS/configs/emulationstation/custom_systems/es_find_rules.xml

@@ -62,4 +62,17 @@
             <entry>~/.local/share/flatpak/exports/bin/org.yuzu_emu.yuzu</entry>
         </rule>
     </emulator>
+    <emulator name="AZAHAR">
+        <!-- Nintendo 3DS -->
+        <rule type="staticpath">
+            <entry>~/Applications/azahar*.AppImage</entry>
+        </rule>
+    </emulator>
+    <emulator name="CITRON">
+        <!-- Nintendo Switch emulator Citron -->
+        <rule type="staticpath">
+            <entry>~/Applications/citron*.AppImage</entry>
+        </rule>
+    </emulator>
+
 </ruleList>

cloudSyncHealth.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 clear
-source "$HOME/.config/EmuDeck/backend/functions/all.sh"
+. "$HOME/.config/EmuDeck/backend/functions/all.sh"
 
 NONE='\033[00m'
 RED='\033[01;31m'
@@ -40,7 +40,7 @@ cloud_sync_dowload_test(){
 echo -e "${CYAN}CloudSync Status Report${NONE}"
 echo ""
 
-miArray=("Cemu" "citra" "dolphin" "duckstation" "MAME" "melonds" "mgba" "pcsx2" "ppsspp" "primehack" "retroarch" "rpcs3" "scummvm" "Vita3K" "yuzu" "ryujinx" )
+miArray=("Cemu" "azahar" "dolphin" "duckstation" "MAME" "melonds" "mgba" "pcsx2" "ppsspp" "primehack" "retroarch" "rpcs3" "scummvm" "Vita3K" "yuzu" "ryujinx" )
 
 upload="true"
 download="true"

configs/azahar/qt-config.ini

@@ -174,9 +174,9 @@ use_cpu_jit=true
 use_cpu_jit\default=true
 
 [Data%20Storage]
-nand_directory=/home/deck/.local/share/lime3ds-emu/nand/
+nand_directory=/home/deck/.local/share/azahar-emu/nand/
 nand_directory\default=false
-sdmc_directory=/home/deck/.local/share/lime3ds-emu/sdmc/
+sdmc_directory=/home/deck/.local/share/azahar-emu/sdmc/
 sdmc_directory\default=false
 use_custom_storage=true
 use_custom_storage\default=false
@@ -459,7 +459,7 @@ Paths\moviePlaybackPath=
 Paths\movieRecordPath=
 Paths\recentFiles=
 Paths\romsPath=
-Paths\screenshotPath=/home/deck/.local/share/lime3ds-emu/screenshots/
+Paths\screenshotPath=/home/deck/.local/share/azahar-emu/screenshots/
 Paths\screenshotPath\default=false
 Paths\symbolsPath=
 Paths\videoDumpingPath=
@@ -495,10 +495,10 @@ Shortcuts\Main%20Window\Decrease%20Speed%20Limit\Context=2
 Shortcuts\Main%20Window\Decrease%20Speed%20Limit\Context\default=true
 Shortcuts\Main%20Window\Decrease%20Speed%20Limit\KeySeq=-
 Shortcuts\Main%20Window\Decrease%20Speed%20Limit\KeySeq\default=true
-Shortcuts\Main%20Window\Exit%20Lime3DS\Context=1
-Shortcuts\Main%20Window\Exit%20Lime3DS\Context\default=true
-Shortcuts\Main%20Window\Exit%20Lime3DS\KeySeq=Alt+F4
-Shortcuts\Main%20Window\Exit%20Lime3DS\KeySeq\default=false
+Shortcuts\Main%20Window\Exit%20Azahar\Context=1
+Shortcuts\Main%20Window\Exit%20Azahar\Context\default=true
+Shortcuts\Main%20Window\Exit%20Azahar\KeySeq=Alt+F4
+Shortcuts\Main%20Window\Exit%20Azahar\KeySeq\default=false
 Shortcuts\Main%20Window\Exit%20Fullscreen\Context=1
 Shortcuts\Main%20Window\Exit%20Fullscreen\Context\default=true
 Shortcuts\Main%20Window\Exit%20Fullscreen\KeySeq=PgDown

configs/cemu/config/cemu/settings.xml

@@ -95,7 +95,7 @@
         <InputVolume>100</InputVolume>
         <TVDevice>default</TVDevice>
         <PadDevice>default</PadDevice>
-        <InputDevice>default</InputDevice>
+        <InputDevice></InputDevice>
     </Audio>
     <Account>
         <PersistentId>2147483649</PersistentId>

configs/citron/config/input/emudeck.ini

@@ -0,0 +1,51 @@
+[Controls]
+button_a="button:1,guid:03000000de280000ff11000001000000,port:0,engine:sdl"
+button_a\default=false
+button_b="button:0,guid:03000000de280000ff11000001000000,port:0,engine:sdl"
+button_b\default=false
+button_ddown="hat:0,direction:down,guid:03000000de280000ff11000001000000,port:0,engine:sdl"
+button_ddown\default=false
+button_dleft="hat:0,direction:left,guid:03000000de280000ff11000001000000,port:0,engine:sdl"
+button_dleft\default=false
+button_dright="hat:0,direction:right,guid:03000000de280000ff11000001000000,port:0,engine:sdl"
+button_dright\default=false
+button_dup="hat:0,direction:up,guid:03000000de280000ff11000001000000,port:0,engine:sdl"
+button_dup\default=false
+button_home="button:8,guid:03000000de280000ff11000001000000,port:0,engine:sdl"
+button_home\default=false
+button_l="pad:0,button:4,port:0,guid:03000000de280000ff11000001000000,engine:sdl"
+button_l\default=false
+button_lstick="button:9,guid:03000000de280000ff11000001000000,port:0,engine:sdl"
+button_lstick\default=false
+button_minus="pad:0,button:6,port:0,guid:03000000de280000ff11000001000000,engine:sdl"
+button_minus\default=false
+button_plus="pad:0,button:7,port:0,guid:03000000de280000ff11000001000000,engine:sdl"
+button_plus\default=false
+button_r="pad:0,button:5,port:0,guid:03000000de280000ff11000001000000,engine:sdl"
+button_r\default=false
+button_rstick="button:10,guid:03000000de280000ff11000001000000,port:0,engine:sdl"
+button_rstick\default=false
+button_screenshot=[empty]
+button_screenshot\default=false
+button_sl="button:4,guid:03000000de280000ff11000001000000,port:0,engine:sdl"
+button_sl\default=false
+button_sr="button:5,guid:03000000de280000ff11000001000000,port:0,engine:sdl"
+button_sr\default=false
+button_x="button:3,guid:03000000de280000ff11000001000000,port:0,engine:sdl"
+button_x\default=false
+button_y="button:2,guid:03000000de280000ff11000001000000,port:0,engine:sdl"
+button_y\default=false
+button_zl="threshold:0.500000,axis:2,pad:0,port:0,guid:03000000de280000ff11000001000000,engine:sdl"
+button_zl\default=false
+button_zr="threshold:0.500000,axis:5,pad:0,port:0,guid:03000000de280000ff11000001000000,engine:sdl"
+button_zr\default=false
+lstick="range:0.950000,deadzone:0.150000,threshold:0.500000,axis_y:1,axis_x:0,pad:0,port:0,guid:03000000de280000ff11000001000000,engine:sdl"
+lstick\default=false
+motionleft=[empty]
+motionleft\default=false
+motionright=[empty]
+motionright\default=false
+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"
+rstick\default=false
+type=0
+type\default=true

configs/citron/data/keys/readme.txt

@@ -0,0 +1 @@
+Copy your keys here. Don't overwrite or delete this folder!

configs/citron/data/nand/system/Contents/registered/readme.txt

@@ -0,0 +1 @@
+Copy your firmware here. Don't overwrite or delete this folder!

configs/emulationstation/custom_systems/es_find_rules.xml

@@ -10,48 +10,122 @@
     </emulator>
     <emulator name="RETROARCH">
         <rule type="staticpath">
-			<entry>/run/media/mmcblk0p1/Emulation/tools/launchers/retroarch.sh</entry>
+            <entry>/run/media/mmcblk0p1/Emulation/tools/launchers/retroarch.sh</entry>
         </rule>
     </emulator>
     <core name="RETROARCH">
         <rule type="corepath">
-            <!-- Flatpak package -->
-            <entry>~/.var/app/org.libretro.RetroArch/config/retroarch/cores</entry>
-            <!-- Snap package -->
-            <entry>~/snap/retroarch/current/.config/retroarch/cores</entry>
-            <!-- AppImage and compiled from source -->
             <entry>~/.config/retroarch/cores</entry>
-            <!-- Ubuntu and Linux Mint repository -->
-            <entry>/usr/lib/x86_64-linux-gnu/libretro</entry>
-            <!-- Fedora repository -->
-            <entry>/usr/lib64/libretro</entry>
-            <!-- Manjaro repository -->
-            <entry>/usr/lib/libretro</entry>
-            <!-- FreeBSD and OpenBSD repository -->
-            <entry>/usr/local/lib/libretro</entry>
-            <!-- NetBSD repository -->
-            <entry>/usr/pkg/lib/libretro</entry>
         </rule>
     </core>
     <emulator name="SHADPS4">
-        <!-- PS4 emulator ShadPS4 -->
         <rule type="staticpath">
             <entry>/run/media/mmcblk0p1/Emulation/tools/launchers/shadps4.sh</entry>
         </rule>
     </emulator>
     <emulator name="YUZU">
-        <!-- Nintendo Switch emulator Yuzu -->
-        <rule type="systempath">
-            <entry>yuzu</entry>
-            <entry>org.yuzu_emu.yuzu</entry>
-        </rule>
         <rule type="staticpath">
-            <entry>~/Applications/yuzu*.AppImage</entry>
-            <entry>~/.local/share/applications/yuzu*.AppImage</entry>
-            <entry>~/.local/bin/yuzu*.AppImage</entry>
-            <entry>~/bin/yuzu*.AppImage</entry>
-            <entry>/var/lib/flatpak/exports/bin/org.yuzu_emu.yuzu</entry>
-            <entry>~/.local/share/flatpak/exports/bin/org.yuzu_emu.yuzu</entry>
+            <entry>/run/media/mmcblk0p1/Emulation/tools/launchers/yuzu.sh</entry>
+        </rule>
+    </emulator>
+    <emulator name="CEMU">
+        <rule type="staticpath">
+            <entry>/run/media/mmcblk0p1/Emulation/tools/launchers/cemu.sh</entry>
+        </rule>
+    </emulator>
+    <emulator name="DOLPHIN">
+        <rule type="staticpath">
+            <entry>/run/media/mmcblk0p1/Emulation/tools/launchers/dolphin.sh</entry>
+        </rule>
+    </emulator>
+    <emulator name="DUCKSTATION">
+        <rule type="staticpath">
+            <entry>/run/media/mmcblk0p1/Emulation/tools/launchers/duckstation.sh</entry>
+        </rule>
+    </emulator>
+    <emulator name="FLYCAST">
+        <rule type="staticpath">
+            <entry>/run/media/mmcblk0p1/Emulation/tools/launchers/flycast.sh</entry>
+        </rule>
+    </emulator>
+    <emulator name="AZAHAR">
+        <rule type="staticpath">
+            <entry>/run/media/mmcblk0p1/Emulation/tools/launchers/azahar.sh</entry>
+        </rule>
+    </emulator>
+    <emulator name="MAME">
+        <rule type="staticpath">
+            <entry>/run/media/mmcblk0p1/Emulation/tools/launchers/mame.sh</entry>
+        </rule>
+    </emulator>
+    <emulator name="MELONDS">
+        <rule type="staticpath">
+            <entry>/run/media/mmcblk0p1/Emulation/tools/launchers/melonds.sh</entry>
+        </rule>
+    </emulator>
+    <emulator name="MGBA">
+        <rule type="staticpath">
+            <entry>/run/media/mmcblk0p1/Emulation/tools/launchers/mgba.sh</entry>
+        </rule>
+    </emulator>
+    <emulator name="MODEL2">
+        <rule type="staticpath">
+            <entry>/run/media/mmcblk0p1/Emulation/tools/launchers/model-2-emulator.sh</entry>
+        </rule>
+    </emulator>
+    <emulator name="SUPERMODEL">
+        <rule type="staticpath">
+            <entry>/run/media/mmcblk0p1/Emulation/tools/launchers/supermodel.sh</entry>
+        </rule>
+    </emulator>
+    <emulator name="PCSX2QT">
+        <rule type="staticpath">
+            <entry>/run/media/mmcblk0p1/Emulation/tools/launchers/pcsx2-qt.sh</entry>
+        </rule>
+    </emulator>
+    <emulator name="PPSSPP">
+        <rule type="staticpath">
+            <entry>/run/media/mmcblk0p1/Emulation/tools/launchers/ppsspp.sh</entry>
+        </rule>
+    </emulator>
+    <emulator name="PRIMEHACK">
+        <rule type="staticpath">
+            <entry>/run/media/mmcblk0p1/Emulation/tools/launchers/primehack.sh</entry>
+        </rule>
+    </emulator>
+    <emulator name="RMG">
+        <rule type="staticpath">
+            <entry>/run/media/mmcblk0p1/Emulation/tools/launchers/rosaliesmupengui.sh</entry>
+        </rule>
+    </emulator>
+    <emulator name="RPCS3">
+        <rule type="staticpath">
+            <entry>/run/media/mmcblk0p1/Emulation/tools/launchers/rpcs3.sh</entry>
+        </rule>
+    </emulator>
+    <emulator name="RYUJINX">
+        <rule type="staticpath">
+            <entry>/run/media/mmcblk0p1/Emulation/tools/launchers/ryujinx.sh</entry>
+        </rule>
+    </emulator>
+    <emulator name="SCUMMVM">
+        <rule type="staticpath">
+            <entry>/run/media/mmcblk0p1/Emulation/tools/launchers/scummvm.sh</entry>
+        </rule>
+    </emulator>
+    <emulator name="VITA3K">
+        <rule type="staticpath">
+            <entry>/run/media/mmcblk0p1/Emulation/tools/launchers/vita3k.sh</entry>
+        </rule>
+    </emulator>
+    <emulator name="XEMU">
+        <rule type="staticpath">
+            <entry>/run/media/mmcblk0p1/Emulation/tools/launchers/xemu.sh</entry>
+        </rule>
+    </emulator>
+    <emulator name="XENIA">
+        <rule type="staticpath">
+            <entry>/run/media/mmcblk0p1/Emulation/tools/launchers/xenia.sh</entry>
         </rule>
     </emulator>
 </ruleList>

configs/emulationstation/custom_systems/es_systems.xml

@@ -76,4 +76,15 @@
 		<platform>ps4</platform>
 		<theme>ps4</theme>
 	</system> -->
+	<system>
+		  <name>n3ds</name>
+		  <fullname>Nintendo 3DS</fullname>
+		  <path>%ROMPATH%/n3ds</path>
+		  <extension>.3ds .3DS .3dsx .3DSX .app .APP .axf .AXF .cci .CCI .cxi .CXI .elf .ELF .7z .7Z .zip .ZIP</extension>
+		  <command label="Citra">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\citra_libretro.dll %ROM%</command>
+		  <command label="Citra 2018">%EMULATOR_RETROARCH% -L %CORE_RETROARCH%\citra2018_libretro.dll %ROM%</command>
+		  <command label="Azahar (Standalone)">%EMULATOR_AZAHAR% %ROM%</command>
+		  <platform>n3ds</platform>
+		  <theme>n3ds</theme>
+	  </system>
 </systemList>

configs/emulationstation/gamelists/3ds/gamelist.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <alternativeEmulator>
-    <label>Citra (Standalone)</label>
+    <label>Azahar (Standalone)</label>
 </alternativeEmulator>
 <gameList />

configs/emulationstation/gamelists/n3ds/gamelist.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <alternativeEmulator>
-    <label>Citra (Standalone)</label>
+    <label>Azahar (Standalone)</label>
 </alternativeEmulator>
 <gameList />