From 2ca18ffe19a6e4d4adfc5e876593c0918c42a395 Mon Sep 17 00:00:00 2001 From: Odaem <45592672+Odaem@users.noreply.github.com> Date: Wed, 31 Mar 2021 21:36:33 +0200 Subject: [PATCH] Fix incorrect mapping to DS4 (#742) the mapping to ds4 when using combined joycon was faulty; this should be correct but I currently have no way to test it --- BetterJoyForCemu/Joycon.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/BetterJoyForCemu/Joycon.cs b/BetterJoyForCemu/Joycon.cs index 1dfd54f..15c8ad8 100644 --- a/BetterJoyForCemu/Joycon.cs +++ b/BetterJoyForCemu/Joycon.cs @@ -1406,10 +1406,10 @@ namespace BetterJoyForCemu { output.thumb_right = buttons[(int)Button.STICK2]; } else { if (other != null) { // no need for && other != this - output.circle = !swapAB ? buttons[(int)(isLeft ? Button.B : Button.DPAD_DOWN)] : buttons[(int)(isLeft ? Button.A : Button.DPAD_RIGHT)]; - output.cross = swapAB ? buttons[(int)(isLeft ? Button.B : Button.DPAD_DOWN)] : buttons[(int)(isLeft ? Button.A : Button.DPAD_RIGHT)]; + output.cross = !swapAB ? buttons[(int)(isLeft ? Button.B : Button.DPAD_DOWN)] : buttons[(int)(isLeft ? Button.A : Button.DPAD_RIGHT)]; + output.circle = swapAB ? buttons[(int)(isLeft ? Button.B : Button.DPAD_DOWN)] : buttons[(int)(isLeft ? Button.A : Button.DPAD_RIGHT)]; output.triangle = !swapXY ? buttons[(int)(isLeft ? Button.X : Button.DPAD_UP)] : buttons[(int)(isLeft ? Button.Y : Button.DPAD_LEFT)]; - output.triangle = swapXY ? buttons[(int)(isLeft ? Button.X : Button.DPAD_UP)] : buttons[(int)(isLeft ? Button.Y : Button.DPAD_LEFT)]; + output.square = swapXY ? buttons[(int)(isLeft ? Button.X : Button.DPAD_UP)] : buttons[(int)(isLeft ? Button.Y : Button.DPAD_LEFT)]; if (buttons[(int)(isLeft ? Button.DPAD_UP : Button.X)]) if (buttons[(int)(isLeft ? Button.DPAD_LEFT : Button.Y)])