Explicit support for Motion Plus controllers

wiiu-env · Jul 5, 2024 · 87bb3c5 · 87bb3c5
1 parent 87ad325
commit 87bb3c5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/source/patcher/hooks_patcher_static.cpp b/source/patcher/hooks_patcher_static.cpp
@@ -111,12 +111,13 @@ DECL_FUNCTION(void, WPADRead, WPADChan chan, WPADStatusProController *data) {
 
     if (!sConfigMenuOpened && data && data[0].err == 0) {
         if (data[0].extensionType != 0xFF) {
-            if (data[0].extensionType == WPAD_EXT_CORE || data[0].extensionType == WPAD_EXT_NUNCHUK) {
+            if (data[0].extensionType == WPAD_EXT_CORE || data[0].extensionType == WPAD_EXT_NUNCHUK ||
+                data[0].extensionType == WPAD_EXT_MPLUS || data[0].extensionType == WPAD_EXT_MPLUS_NUNCHUK) {
                 // button data is in the first 2 bytes for wiimotes
                 if (((uint16_t *) data)[0] == (WPAD_BUTTON_B | WPAD_BUTTON_DOWN | WPAD_BUTTON_MINUS)) {
                     sWantsToOpenConfigMenu = true;
                 }
-            } else if (data[0].extensionType == WPAD_EXT_CLASSIC) {
+            } else if (data[0].extensionType == WPAD_EXT_CLASSIC || data[0].extensionType == WPAD_EXT_MPLUS_CLASSIC) {
                 // TODO: figure out the real struct..
                 if ((((uint32_t *) data)[10] & 0xFFFF) == (WPAD_CLASSIC_BUTTON_L | WPAD_CLASSIC_BUTTON_DOWN | WPAD_CLASSIC_BUTTON_MINUS)) {
                     sWantsToOpenConfigMenu = true;
@@ -223,4 +224,4 @@ function_replacement_data_t method_hooks_static[] __attribute__((section(".data"
 
 };
 
-uint32_t method_hooks_static_size __attribute__((section(".data"))) = sizeof(method_hooks_static) / sizeof(function_replacement_data_t);
+uint32_t method_hooks_static_size __attribute__((section(".data"))) = sizeof(method_hooks_static) / sizeof(function_replacement_data_t);
diff --git a/source/utils/input/WPADInput.h b/source/utils/input/WPADInput.h
@@ -144,7 +144,8 @@ class WPADInput : public Input {
             return false;
         }
 
-        if (kpad.extensionType == WPAD_EXT_CORE || kpad.extensionType == WPAD_EXT_NUNCHUK) {
+        if (kpad.extensionType == WPAD_EXT_CORE || kpad.extensionType == WPAD_EXT_NUNCHUK ||
+            kpad.extensionType == WPAD_EXT_MPLUS || kpad.extensionType == WPAD_EXT_MPLUS_NUNCHUK) {
             data.buttons_r = remapWiiMoteButtons(kpad.release);
             data.buttons_h = remapWiiMoteButtons(kpad.hold);
             data.buttons_d = remapWiiMoteButtons(kpad.trigger);
@@ -184,4 +185,4 @@ class WPADInput : public Input {
     KPADStatus kpad     = {};
     KPADError kpadError = KPAD_ERROR_UNINITIALIZED;
     KPADChan channel;
-};
+};