From 99feb41322739a3c78796f2320d8079514718fbf Mon Sep 17 00:00:00 2001
From: rawdatafeel <108900299+rawdatafeel@users.noreply.github.com>
Date: Thu, 7 Mar 2024 14:58:32 -0500
Subject: [PATCH] Dolphin/RMG: Fix ABXY/BAYX (#1074)

---
 .../config/RMG/mupen64plus.cfg                   |  4 ++--
 .../config/dolphin-emu/GCPadNew.ini              |  4 ++--
 .../dolphin-emu/Profiles/GCPad/GC_base.ini       |  4 ++--
 .../Profiles/GCPad/GC_nintendo_layout.ini        |  8 ++++----
 functions/EmuScripts/emuDeckDolphin.sh           | 16 ++++++++--------
 functions/EmuScripts/emuDeckRMG.sh               | 13 +++++--------
 6 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/configs/com.github.Rosalie241.RMG/config/RMG/mupen64plus.cfg b/configs/com.github.Rosalie241.RMG/config/RMG/mupen64plus.cfg
index 6a326881..a63294fc 100644
--- a/configs/com.github.Rosalie241.RMG/config/RMG/mupen64plus.cfg
+++ b/configs/com.github.Rosalie241.RMG/config/RMG/mupen64plus.cfg
@@ -459,8 +459,8 @@ A_Name = "a"
 A_Data = "0"
 A_ExtraData = "0"
 B_InputType = "0"
-B_Name = "b"
-B_Data = "1"
+B_Name = "x"
+B_Data = "2"
 B_ExtraData = "0"
 Start_InputType = "0"
 Start_Name = "start"
diff --git a/configs/org.DolphinEmu.dolphin-emu/config/dolphin-emu/GCPadNew.ini b/configs/org.DolphinEmu.dolphin-emu/config/dolphin-emu/GCPadNew.ini
index 48150601..d6b564c0 100644
--- a/configs/org.DolphinEmu.dolphin-emu/config/dolphin-emu/GCPadNew.ini
+++ b/configs/org.DolphinEmu.dolphin-emu/config/dolphin-emu/GCPadNew.ini
@@ -1,9 +1,9 @@
 [GCPad1]
 Device = SDL/0/Steam Virtual Gamepad
 Buttons/A = `Button S`
-Buttons/B = `Button N`
+Buttons/B = `Button W`
 Buttons/X = `Button E`
-Buttons/Y = `Button W`
+Buttons/Y = `Button N`
 Buttons/Z = `Shoulder R`|Back
 Buttons/Start = Start
 Main Stick/Up = `Axis 1-`
diff --git a/configs/org.DolphinEmu.dolphin-emu/config/dolphin-emu/Profiles/GCPad/GC_base.ini b/configs/org.DolphinEmu.dolphin-emu/config/dolphin-emu/Profiles/GCPad/GC_base.ini
index 20b9f0cf..31d3ecd2 100644
--- a/configs/org.DolphinEmu.dolphin-emu/config/dolphin-emu/Profiles/GCPad/GC_base.ini
+++ b/configs/org.DolphinEmu.dolphin-emu/config/dolphin-emu/Profiles/GCPad/GC_base.ini
@@ -1,9 +1,9 @@
 [Profile]
 Device = SDL/0/Steam Virtual Gamepad
 Buttons/A = `Button S`
-Buttons/B = `Button N`
+Buttons/B = `Button W`
 Buttons/X = `Button E`
-Buttons/Y = `Button W`
+Buttons/Y = `Button N`
 Buttons/Z = `Shoulder R`|Back
 Buttons/Start = Start
 Main Stick/Up = `Axis 1-`
diff --git a/configs/org.DolphinEmu.dolphin-emu/config/dolphin-emu/Profiles/GCPad/GC_nintendo_layout.ini b/configs/org.DolphinEmu.dolphin-emu/config/dolphin-emu/Profiles/GCPad/GC_nintendo_layout.ini
index 1f512203..4a5961f0 100644
--- a/configs/org.DolphinEmu.dolphin-emu/config/dolphin-emu/Profiles/GCPad/GC_nintendo_layout.ini
+++ b/configs/org.DolphinEmu.dolphin-emu/config/dolphin-emu/Profiles/GCPad/GC_nintendo_layout.ini
@@ -1,9 +1,9 @@
 [Profile]
 Device = SDL/0/Steam Virtual Gamepad
-Buttons/A = `Button E`
-Buttons/B = `Button S`
-Buttons/X = `Button N`
-Buttons/Y = `Button W`
+Buttons/A = `Button S`
+Buttons/B = `Button E`
+Buttons/X = `Button W`
+Buttons/Y = `Button N`
 Buttons/Z = `Shoulder R`|Back
 Buttons/Start = Start
 Main Stick/Up = `Axis 1-`
diff --git a/functions/EmuScripts/emuDeckDolphin.sh b/functions/EmuScripts/emuDeckDolphin.sh
index f48a40c5..54513663 100644
--- a/functions/EmuScripts/emuDeckDolphin.sh
+++ b/functions/EmuScripts/emuDeckDolphin.sh
@@ -142,18 +142,18 @@ Dolphin_uninstall(){
 
 #setABXYstyle
 Dolphin_setABXYstyle(){
-   	sed -i '/^\[GCPad1\]/,/^\[/ s|Buttons/A = `Button S`|Buttons/A = `Button E`|' $Dolphin_gamecubeFile
-   	sed -i '/^\[GCPad1\]/,/^\[/ s|Buttons/B = `Button N`|Buttons/B = `Button S`|' $Dolphin_gamecubeFile
-   	sed -i '/^\[GCPad1\]/,/^\[/ s|Buttons/X = `Button E`|Buttons/X = `Button N`|' $Dolphin_gamecubeFile
-   	sed -i '/^\[GCPad1\]/,/^\[/ s|Buttons/Y = `Button W`|Buttons/Y = `Button W`|' $Dolphin_gamecubeFile
+   	sed -i '/^\[GCPad1\]/,/^\[/ s|Buttons/A = `Button S`|Buttons/A = `Button S`|' $Dolphin_gamecubeFile
+   	sed -i '/^\[GCPad1\]/,/^\[/ s|Buttons/B = `Button W`|Buttons/B = `Button E`|' $Dolphin_gamecubeFile
+   	sed -i '/^\[GCPad1\]/,/^\[/ s|Buttons/X = `Button E`|Buttons/X = `Button W`|' $Dolphin_gamecubeFile
+   	sed -i '/^\[GCPad1\]/,/^\[/ s|Buttons/Y = `Button N`|Buttons/Y = `Button N`|' $Dolphin_gamecubeFile
 
 }
 
 Dolphin_setBAYXstyle(){
-   	sed -i '/^\[GCPad1\]/,/^\[/ s|Buttons/A = `Button E`|Buttons/A = `Button S`|' $Dolphin_gamecubeFile
-   	sed -i '/^\[GCPad1\]/,/^\[/ s|Buttons/B = `Button S`|Buttons/B = `Button N`|' $Dolphin_gamecubeFile
-   	sed -i '/^\[GCPad1\]/,/^\[/ s|Buttons/X = `Button N`|Buttons/X = `Button E`|' $Dolphin_gamecubeFile
-   	sed -i '/^\[GCPad1\]/,/^\[/ s|Buttons/Y = `Button W`|Buttons/Y = `Button W`|' $Dolphin_gamecubeFile
+   	sed -i '/^\[GCPad1\]/,/^\[/ s|Buttons/A = `Button S`|Buttons/A = `Button S`|' $Dolphin_gamecubeFile
+   	sed -i '/^\[GCPad1\]/,/^\[/ s|Buttons/B = `Button E`|Buttons/B = `Button W`|' $Dolphin_gamecubeFile
+   	sed -i '/^\[GCPad1\]/,/^\[/ s|Buttons/X = `Button W`|Buttons/X = `Button E`|' $Dolphin_gamecubeFile
+   	sed -i '/^\[GCPad1\]/,/^\[/ s|Buttons/Y = `Button N`|Buttons/Y = `Button N`|' $Dolphin_gamecubeFile
 }
 
 #Migrate
diff --git a/functions/EmuScripts/emuDeckRMG.sh b/functions/EmuScripts/emuDeckRMG.sh
index 0972b576..b4506c16 100644
--- a/functions/EmuScripts/emuDeckRMG.sh
+++ b/functions/EmuScripts/emuDeckRMG.sh
@@ -193,10 +193,9 @@ RMG_setABXYstyle(){
 	local header="[Rosalie's Mupen GUI - Input Plugin User Profile \"steamdeck\"]"
 
 	sed -i '/\[Rosalie'"'"'s Mupen GUI - Input Plugin User Profile "steamdeck"\]/,/^\[/ {
-		s/A_Name *= *"a"/A_Name = "b"/;
-		s/A_Data *= *"0"/A_Data = "1"/;
-		s/B_Name *= *"b"/B_Name = "a"/;
-		s/B_Data *= *"1"/B_Data = "0"/;
+
+		s/B_Name *= *"x"/B_Name = "b"/;
+		s/B_Data *= *"2"/B_Data = "1"/;
 	}' "$RMG_configFile"
 
 }
@@ -204,10 +203,8 @@ RMG_setBAYXstyle(){
 	local header="[Rosalie's Mupen GUI - Input Plugin User Profile \"steamdeck\"]"
 
 	sed -i '/\[Rosalie'"'"'s Mupen GUI - Input Plugin User Profile "steamdeck"\]/,/^\[/ {
-		s/A_Name *= *"b"/A_Name = "a"/;
-		s/A_Data *= *"1"/A_Data = "0"/;
-		s/B_Name *= *"a"/B_Name = "b"/;
-		s/B_Data *= *"0"/B_Data = "1"/;
+		s/B_Name *= *"b"/B_Name = "x"/;
+		s/B_Data *= *"1"/B_Data = "2"/;
 	}' "$RMG_configFile"
 
 }
\ No newline at end of file