Don't limit to 4 bots anywhere

src/game/challenge.c

@@ -209,19 +209,6 @@ void challengeDetermineUnlockedFeatures(void)
 	}
 
 	func0f1895e8();
-
-	// If the ability to have 8 simulants hasn't been unlocked, limit them to 4
-	if (!challengeIsFeatureUnlocked(MPFEATURE_8BOTS)) {
-		for (k = 4; k < MAX_BOTS; k++) {
-			if (g_MpSetup.chrslots & (1 << (4 + k))) {
-				mpRemoveSimulant(k);
-			}
-		}
-
-		if (g_Vars.mpquickteamnumsims > 4) {
-			g_Vars.mpquickteamnumsims = 4;
-		}
-	}
 }
 
 void challengePerformSanityChecks(void)
@@ -253,9 +240,6 @@ void challengePerformSanityChecks(void)
 		if (g_MpSetup.scenario == MPSCENARIO_KINGOFTHEHILL) {
 			g_Vars.mphilltime = 10;
 		}
-	} else if (!challengeIsFeatureUnlocked(MPFEATURE_8BOTS)) {
-		// Limit to 4 players and 4 simulants
-		g_MpSetup.chrslots &= 0x00ff;
 	}
 }
 

src/game/mplayer/mplayer.c

@@ -4573,7 +4573,7 @@ bool mpHasSimulants(void)
 
 bool mpHasUnusedBotSlots(void)
 {
-	s32 numvacant = challengeIsFeatureUnlocked(MPFEATURE_8BOTS) ? MAX_BOTS : 4;
+	s32 numvacant = MAX_BOTS;
 	s32 i;
 
 	for (i = 4; i < MAX_MPCHRS; i++) {

src/game/mplayer/setup.c

@@ -2852,11 +2852,6 @@ s32 menuhandlerMpSimulantSlot(s32 operation, struct menuitem *item, union handle
 			menuPushDialog(&g_MpEditSimulantMenuDialog);
 		}
 		break;
-	case MENUOP_CHECKHIDDEN:
-		if (item->param >= 4 && !challengeIsFeatureUnlocked(MPFEATURE_8BOTS)) {
-			return true;
-		}
-		break;
 	case MENUOP_CHECKDISABLED:
 		if (!mpIsSimSlotEnabled(item->param)) {
 			return true;
@@ -4874,7 +4869,7 @@ s32 menuhandlerMpNumberOfSimulants(s32 operation, struct menuitem *item, union h
 {
 	switch (operation) {
 	case MENUOP_GETOPTIONCOUNT:
-		data->dropdown.value = !challengeIsFeatureUnlocked(MPFEATURE_8BOTS) ? 4 : MAX_BOTS;
+		data->dropdown.value = MAX_BOTS;
 		break;
 	case MENUOP_GETOPTIONTEXT:
 		sprintf(g_StringPointer, "%d\n", data->dropdown.value + 1);