GAMEPAD new enum for PLUGGED

Author: Niko

decompile/General/GAMEPAD/GAMEPAD_03_PollVsync.c

@@ -14,7 +14,10 @@ void DECOMP_GAMEPAD_PollVsync(struct GamepadSystem *gGamepads)
     maxPadsPerPort = 1;
 
     // If there is a multitap present
-    if ((gGamepads->slotBuffer[0].isControllerConnected == 0) && gGamepads->slotBuffer[0].controllerData == (PAD_ID_MULTITAP << 4))
+    if (
+			(gGamepads->slotBuffer[0].plugged == PLUGGED) && 
+			(gGamepads->slotBuffer[0].controllerData == (PAD_ID_MULTITAP << 4))
+		)
     {
         // 4 players, with multitap
         numPorts = 1;
@@ -43,19 +46,16 @@ void DECOMP_GAMEPAD_PollVsync(struct GamepadSystem *gGamepads)
         // to this gamepad port. 1 for no mtap, 4 for mtap
         for (char i = 0; i < maxPadsPerPort; i++)
         {	
-            // if this is not a multitap,
-            // skip next block, and just start
-            // if-body with ptrPadBuff
             if
             (
 				(
-					// multitap here, and controller connected
+					// multitap here, and unplugged
 					(gGamepads->slotBuffer[port].controllerData == (PAD_ID_MULTITAP << 4)) &&
-					(gGamepads->slotBuffer[port].controllers[i].isControllerConnected != 0)
+					(gGamepads->slotBuffer[port].controllers[i].plugged != PLUGGED)
 				) ||
 
-				// controller connected
-				(gGamepads->slotBuffer[port].isControllerConnected != 0)
+				// controller unplugged
+				(gGamepads->slotBuffer[port].plugged != PLUGGED)
             )
             {
                 // no analog sticks found

decompile/General/GAMEPAD/GAMEPAD_04_GetNumConnected.c

@@ -18,7 +18,7 @@ int DECOMP_GAMEPAD_GetNumConnected(struct GamepadSystem* gGamepads)
 
 	if(
 		// multitap detected
-		(gGamepads->slotBuffer[0].isControllerConnected == 0) &&
+		(gGamepads->slotBuffer[0].plugged == PLUGGED) &&
 		(gGamepads->slotBuffer[0].controllerData == (PAD_ID_MULTITAP << 4))
 	)
 	{
@@ -50,15 +50,15 @@ int DECOMP_GAMEPAD_GetNumConnected(struct GamepadSystem* gGamepads)
 		for(int Port = 0; Port < numPortsPerSlot; Port++)
 		{
 			ptrControllerPacket = &gGamepads->slotBuffer[Slot];
-			if(ptrControllerPacket->isControllerConnected == 0)
+			if(ptrControllerPacket->plugged == PLUGGED)
 			{
 				// if multitap plugged in
 				if(ptrControllerPacket->controllerData == (PAD_ID_MULTITAP << 4))
 				{
 					ptrControllerPacket = (struct MultitapPacket*)&ptrControllerPacket->controllers[Port];
 				}
 
-				if(ptrControllerPacket->isControllerConnected == 0)
+				if(ptrControllerPacket->plugged == PLUGGED)
 				{
 					bitwiseConnected |= 1 << (Slot*4 + Port);
 

decompile/General/GAMEPAD/GAMEPAD_05_ProcessHold.c

@@ -30,7 +30,7 @@ void DECOMP_GAMEPAD_ProcessHold(struct GamepadSystem *gGamepads)
         }
 
         // must be zero to confirm connection
-        else if (ptrControllerPacket->isControllerConnected == 0)
+        else if (ptrControllerPacket->plugged == PLUGGED)
 		{
 			// endian flip
 			uVar4 = (ptrControllerPacket->controllerInput1 << 8) | ptrControllerPacket->controllerInput2;

decompile/General/GAMEPAD/GAMEPAD_06_ProcessSticks.c

@@ -29,7 +29,7 @@ void DECOMP_GAMEPAD_ProcessSticks(struct GamepadSystem *gGS)
         // if pointer is valid
         if (packet == NULL) continue;
 
-        if (packet->isControllerConnected == 0)
+        if (packet->plugged == PLUGGED)
         {
 			bVar1 = packet->controllerData;
 

decompile/General/MAIN/MainFrame_06_HaveAllPads.c

@@ -2,50 +2,28 @@
 
 int DECOMP_MainFrame_HaveAllPads(short numPlyrNextGame)
 {
-	short isGamepadsConnected = 1;
-
-	#ifdef USE_4PADTEST
-	return 1;
-	#endif
-
+	
+#ifndef USE_4PADTEST
+	
 	// if game is not loading
 	if (sdata->Loading.stage == -1)
 	{
-		// if there are no players (cutscene)
-		if (numPlyrNextGame == 0)
+		struct GamepadBuffer* gb = 
+			&sdata->gGamepads->gamepad[0];
+					
+		for (int i = 0; i < numPlyrNextGame; i++)
 		{
-			// return 0 means gamepad is missing
-			isGamepadsConnected = 0;
+			struct ControllerPacket* packet = 
+				gb->ptrControllerPacket;
+			
+			if (packet == NULL) return 0;
+			if (packet->plugged != PLUGGED) return 0;
+			
+			gb++
 		}
-
-		// if number of players is not zero
-		else
-		{
-			u_int uVar4 = 1;
-			for (int i = 0; i < numPlyrNextGame; i++)
-			{
-				bool bVar1 = uVar4 != 0;
-				uVar4 = 0;
-				if (
-					// if there are no other gamepads unplugged (so far)
-					(bVar1) &&
-
-					// if this gamepad is plugged in
-					(sdata->gGamepads->gamepad[i].ptrControllerPacket != NULL)
-					)
-				{
-					// Check if gamepad is compatible with game (not a gun or mouse)
-					uVar4 = (u_int)(sdata->gGamepads->gamepad[i].ptrControllerPacket->isControllerConnected == 0);
-				}
-
-				// save the result
-				isGamepadsConnected = (short)uVar4;
-			}
-		}
-
-		// return 0 only if a gamepad is missing
-		// that is currently needed in the game
-		return isGamepadsConnected;
 	}
+	
+#endif
+	
 	return 1;
 }

decompile/General/MAIN/MainFrame_08_RenderFrame.c

@@ -523,7 +523,8 @@ void DrawUnpluggedMsg(struct GameTracker* gGT, struct GamepadSystem* gGamepads)
 		struct ControllerPacket* ptrControllerPacket = gGamepads->gamepad[i].ptrControllerPacket;
 
 		if(ptrControllerPacket != 0)
-			if(ptrControllerPacket->isControllerConnected == 0) continue;
+			if(ptrControllerPacket->plugged == PLUGGED) 
+				continue;
 
 		// if controller is unplugged
 

decompile/General/MAIN/MainFreeze_03_MenuPtrOptions.c

@@ -20,12 +20,17 @@ force_inline void IDENTIFYGAMEPADS_MainFreeze_MenuPtrOptions(struct RectMenu* me
 	{
 		struct ControllerPacket* ptrControllerPacket = sdata->gGamepads->gamepad[i].ptrControllerPacket;
 
+		// === THIS IS NOT CORRECT ===
+		// Since discovering plugged enum, this is not right
+		// Last checked Mar 27 2025, this is NOT on buildList,
+		// need to double-check with ghidra, what should this do?
+
 		// if gamepad is not an "analog controller", as CTR uses to refer to jogcons and negcons
 		if
 		(
 			(
 				(ptrControllerPacket == 0) ||
-				(ptrControllerPacket->isControllerConnected != 0)
+				(ptrControllerPacket->plugged != PLUGGED)
 			) ||
 
 			(
@@ -354,16 +359,14 @@ force_inline void DISPLAYRECTMENU_MainFreeze_MenuPtrOptions(struct RectMenu* men
 
 		for(int i = 0; i < gamepad->numGamepads; i++)
 		{
-			int gamepadConnected = false;
 			int dualShockRowColor = ORANGE;
 			int currPad = gamepad->gamepadId[i];
 
 			struct ControllerPacket* ptrControllerPacket =
 				sdata->gGamepads->gamepad[currPad].ptrControllerPacket;
 
-			if (ptrControllerPacket == 0 || ptrControllerPacket->isControllerConnected != 0)
+			if (ptrControllerPacket == 0 || ptrControllerPacket->plugged != PLUGGED)
 			{
-				gamepadConnected = true;
 				dualShockRowColor = GRAY;
 			}
 
@@ -386,8 +389,7 @@ force_inline void DISPLAYRECTMENU_MainFreeze_MenuPtrOptions(struct RectMenu* men
 			int boolDisabled =
 				(gGT->gameMode1 & data.gGT_gameMode1_VibPerPlayer[currPad]) == 0;
 
-			dualShockRowColor = GRAY;
-			if (!gamepadConnected)
+			if (dualShockRowColor != GRAY)
 			{
 				// RED: 3
 				// WHITE: 4

decompile/General/MAIN/MainMain.c

@@ -406,7 +406,7 @@ u_int DECOMP_main()
 				}
 
 				if ((gGT->gameMode1 & LOADING) == 0)
-				{
+				{					
 					#ifdef USE_PROFILER					
 					void DebugProfiler_SectionStart(char* name, char r, char g, char b);
 					DebugProfiler_SectionStart(0, 0xFF, 0, 0);

decompile/General/zRegionJapan/Retail/DecalFont_boolRacingWheel.c

@@ -11,34 +11,28 @@ u_int DECOMP_DecalFont_boolRacingWheel()
 	(
 		(
 			(
-				// check if ptrControllerPacket in non-P1 controllers is null
-				// or check if non-P1 controller types aren't multitaps (?)
-
-				// if P1 controller exists, is a MadCatz Racing Wheel (neGcon with payload length 3), and is "not connected", then return true
-				// this check will then be used to replace all instances of PS1 button icons with appropriate racing wheel ones
-
 				// controllerPacketP1->payLoadLength == 3
 				// controllerPacketP1->controllerType == PAD_ID_NEGCON
 				(controllerPacketP1->controllerData == ((PAD_ID_NEGCON << 4) | 3)) &&
 				(
 					(
-						sdata->gGamepads->gamepad[1].ptrControllerPacket == 0 || sdata->gGamepads->gamepad[1].ptrControllerPacket->isControllerConnected != 0
+						sdata->gGamepads->gamepad[1].ptrControllerPacket == 0 || sdata->gGamepads->gamepad[1].ptrControllerPacket->plugged != PLUGGED
 					)
 				)
 			) &&
 			(
 				(
-					sdata->gGamepads->gamepad[2].ptrControllerPacket == 0 || sdata->gGamepads->gamepad[2].ptrControllerPacket->isControllerConnected != 0
+					sdata->gGamepads->gamepad[2].ptrControllerPacket == 0 || sdata->gGamepads->gamepad[2].ptrControllerPacket->plugged != PLUGGED
 				)
 			)
 		) &&
 		(
 			(
 				(
 					(
-						sdata->gGamepads->gamepad[3].ptrControllerPacket == 0 || sdata->gGamepads->gamepad[3].ptrControllerPacket->isControllerConnected != 0
+						sdata->gGamepads->gamepad[3].ptrControllerPacket == 0 || sdata->gGamepads->gamepad[3].ptrControllerPacket->plugged != PLUGGED
 					) && (controllerPacketP1 != 0)
-				) && (controllerPacketP1->isControllerConnected == 0)
+				) && (controllerPacketP1->plugged == PLUGGED)
 			)
 		)
 	)

decompile/WorkInProgress/src/MAIN/MainFreeze_ConfigSetupEntry.c

@@ -34,7 +34,7 @@ void DECOMP_MainFreeze_ConfigSetupEntry()
 		sdata_boolOpenWheelConfig = 0;
 		return;
 	}
-	if (psVar4->isControllerConnected != '\0')
+	if (psVar4->plugged != PLUGGED)
 	{
 		sdata_boolOpenWheelConfig = 0;
 		return;