Logic fixes on controller order

Some logic fixes to wiiugamepad slot and hid controllers If wiiu gamepad slot is now set to player one it will have priority over wiiugc adapter player 1 slot which will be disabled, slots 2 two 4 will still work on wiiugc adapter and the likes.
FIX94 · Aug 24, 2023 · 8b14080 · 8b14080
1 parent 85130d6
commit 8b14080
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 6 deletions.
diff --git a/common/include/NintendontVersion.h b/common/include/NintendontVersion.h
@@ -2,7 +2,7 @@
 #define __NINTENDONT_VERSION_H__
 
 #define NIN_MAJOR_VERSION			6
-#define NIN_MINOR_VERSION			500
+#define NIN_MINOR_VERSION			501
 
 #define NIN_VERSION		((NIN_MAJOR_VERSION << 16) | NIN_MINOR_VERSION)
 

diff --git a/loader/loader.dol b/loader/loader.dol
diff --git a/loader/source/ppc/PADReadGC/source/PADReadGC.c b/loader/source/ppc/PADReadGC/source/PADReadGC.c
@@ -108,11 +108,6 @@ u32 PADRead(u32 calledByGame)
 	/* For Wii VC */
 	if(calledByGame && *drcAddress && WiiUGamepadSlot != NIN_CFG_MAXPAD)
 	{
-		// If there is an HIDPad, bump WiiUGamepadSlot to
-		// slot 1 if necessary so the HID pad can be slot 0.
-		if(HIDPad != HID_PAD_NONE && WiiUGamepadSlot == 0)
-			WiiUGamepadSlot = 1;
-
 		used |= (1<<WiiUGamepadSlot);
 		if(HIDPad == HID_PAD_NOT_SET)
 		{