Added a toggle for a western layout mapping option, indipendent from system remapping

Author: Banz99

mc_mitm/default.ini

@@ -16,6 +16,8 @@
 ;right_grip=#464646
 
 [misc]
+; Remaps the controller buttons to behave similarly to how they do on western consoles (i.e A to confirm on Xbox controllers, X on Playstation ones)
+;use_western_layout=false
 ; Disable the LED lightbar on Sony Dualshock 4 and Dualsense controllers [default false]
 ;disable_sony_leds=false
 ; Map the dpad of the controller to the left stick and viceversa [default false]

mc_mitm/source/controllers/emulated_switch_controller.cpp

@@ -101,6 +101,7 @@ namespace ams::controller {
         m_colours.left_grip = config.colours.left_grip;
         m_colours.right_grip = config.colours.right_grip;
 
+        m_use_western_layout = config.misc.use_western_layout;
         m_swap_dpad_lstick = config.misc.swap_dpad_lstick;
         m_invert_lstick_xaxis = config.misc.invert_lstick_xaxis;
         m_invert_lstick_yaxis = config.misc.invert_lstick_yaxis;
@@ -137,6 +138,15 @@ namespace ams::controller {
 
         this->ApplyButtonCombos(&switch_report->input0x30.buttons);
 
+        if(m_use_western_layout) {
+            uint8_t temp = switch_report->input0x30.buttons.A;
+            switch_report->input0x30.buttons.A = switch_report->input0x30.buttons.B;
+            switch_report->input0x30.buttons.B = temp;
+            temp = switch_report->input0x30.buttons.X;
+            switch_report->input0x30.buttons.X = switch_report->input0x30.buttons.Y;
+            switch_report->input0x30.buttons.Y = temp;
+        }
+
         if (m_swap_dpad_lstick) {
             uint16_t temp_lstick_x = STICK_ZERO; //Start in a neutral position
             uint16_t temp_lstick_y = STICK_ZERO;

mc_mitm/source/controllers/emulated_switch_controller.hpp

@@ -71,6 +71,7 @@ namespace ams::controller {
             ProControllerColours m_colours;
             bool m_enable_rumble;
 
+            bool m_use_western_layout;
             bool m_swap_dpad_lstick;
             bool m_invert_lstick_xaxis;
             bool m_invert_lstick_yaxis;

mc_mitm/source/mcmitm_config.cpp

@@ -43,6 +43,7 @@ namespace ams::mitm {
                 .right_grip = {0x46, 0x46, 0x46}
             },
             .misc = {
+                .use_western_layout=false,
                 .disable_sony_leds = false,
                 .dualshock_pollingrate_divisor = 8,
                 .swap_dpad_lstick = false,
@@ -230,7 +231,9 @@ namespace ams::mitm {
                     ParseRGBstring(value, &config->colours.right_grip);
             }
             else if (strcasecmp(section, "misc") == 0) {
-                if (strcasecmp(name, "disable_sony_leds") == 0)
+                if (strcasecmp(name, "use_western_layout") == 0)
+                    ParseBoolean(value, &config->misc.use_western_layout);
+                else if (strcasecmp(name, "disable_sony_leds") == 0)
                     ParseBoolean(value, &config->misc.disable_sony_leds);
                 else if (strcasecmp(name, "dualshock_pollingrate_divisor") == 0)
                     ParsePollingRate(value, &config->misc.dualshock_pollingrate_divisor);

mc_mitm/source/mcmitm_config.hpp

@@ -43,6 +43,7 @@ namespace ams::mitm {
         } colours;
 
         struct {
+            bool use_western_layout;
             bool disable_sony_leds;
             int32_t dualshock_pollingrate_divisor;
             bool swap_dpad_lstick;