X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fdatabase.c;h=997b13fbc9eee6448d33a1fdbb545d70374e9874;hb=a3d87cd770ffb9b5bcbf519683ec7f29d67794e6;hp=2acd67541462b617a2eecfc39a3d64146c16f231;hpb=9ed80467762a5024f7ba04e9fb384faceca35c29;p=pcsx_rearmed.git

diff --git a/libpcsxcore/database.c b/libpcsxcore/database.c
index 2acd6754..997b13fb 100644
--- a/libpcsxcore/database.c
+++ b/libpcsxcore/database.c
@@ -47,6 +47,14 @@ static const char * const gpu_centering_hack_db[] =
 	"SLPM86009",
 };
 
+static const char * const dualshock_init_analog_hack_db[] =
+{
+	/* Formula 1 Championship Edition */
+	"SLUS00546",
+	/* Gran Turismo 2 */
+	"SCUS94455", "SCUS94488", "SCPS10116", "SCPS10117", "SCES02380", "SCES12380",
+};
+
 #define HACK_ENTRY(var, list) \
 	{ #var, &Config.hacks.var, list, ARRAY_SIZE(list) }
 
@@ -63,44 +71,39 @@ hack_db[] =
 	HACK_ENTRY(gpu_slow_list_walking, gpu_slow_llist_db),
 	HACK_ENTRY(gpu_busy, gpu_busy_hack_db),
 	HACK_ENTRY(gpu_centering, gpu_centering_hack_db),
+	HACK_ENTRY(dualshock_init_analog, dualshock_init_analog_hack_db),
 };
 
 static const struct
 {
-	const char * const id;
 	int mult;
+	const char * const id[4];
 }
 cycle_multiplier_overrides[] =
 {
 	/* note: values are = (10000 / gui_option) */
 	/* Internal Section - fussy about timings */
-	{ "SLPS01868", 202 },
+	{ 202, { "SLPS01868" } },
 	/* Super Robot Taisen Alpha - on the edge with 175,
 	 * changing memcard settings is enough to break/unbreak it */
-	{ "SLPS02528", 190 },
-	{ "SLPS02636", 190 },
+	{ 190, { "SLPS02528", "SLPS02636" } },
 	/* Brave Fencer Musashi - cd sectors arrive too fast */
-	{ "SLUS00726", 170 },
-	{ "SLPS01490", 170 },
+	{ 170, { "SLUS00726", "SLPS01490" } },
 #if defined(DRC_DISABLE) || defined(LIGHTREC) /* new_dynarec has a hack for this game */
 	/* Parasite Eve II - internal timer checks */
-	{ "SLUS01042", 125 },
-	{ "SLUS01055", 125 },
-	{ "SLES02558", 125 },
-	{ "SLES12558", 125 },
+	{ 125, { "SLUS01042", "SLUS01055", "SLES02558", "SLES12558" } },
 #endif
 	/* Discworld Noir - audio skips if CPU runs too fast */
-	{ "SLES01549", 222 },
-	{ "SLES02063", 222 },
-	{ "SLES02064", 222 },
+	{ 222, { "SLES01549", "SLES02063", "SLES02064" } },
 	/* Judge Dredd - could also be poor MDEC timing */
-	{ "SLUS00630", 128 },
-	{ "SLES00755", 128 },
+	{ 128, { "SLUS00630", "SLES00755" } },
 	/* Digimon World */
-	{ "SLUS01032", 153 },
-	{ "SLES02914", 153 },
+	{ 153, { "SLUS01032", "SLES02914" } },
 	/* Syphon Filter - reportedly hangs under unknown conditions */
-	{ "SCUS94240", 169 },
+	{ 169, { "SCUS94240" } },
+	/* Psychic Detective - some weird race condition in the game's cdrom code */
+	{ 222, { "SLUS00165", "SLUS00166", "SLUS00167" } },
+	{ 222, { "SLES00070", "SLES10070", "SLES20070" } },
 };
 
 /* Function for automatic patching according to GameID. */
@@ -122,6 +125,12 @@ void Apply_Hacks_Cdrom(void)
 		}
 	}
 
+	if (Config.hacks.dualshock_init_analog) {
+		// assume the default is off, see LoadPAD1plugin()
+		for (i = 0; i < 8; i++)
+			padToggleAnalog(i);
+	}
+
 	/* Apply Memory card hack for Codename Tenka. (The game needs one of the memory card slots to be empty) */
 	for (i = 0; i < ARRAY_SIZE(MemorycardHack_db); i++)
 	{
@@ -141,7 +150,11 @@ void Apply_Hacks_Cdrom(void)
 
 	for (i = 0; i < ARRAY_SIZE(cycle_multiplier_overrides); i++)
 	{
-		if (strcmp(CdromId, cycle_multiplier_overrides[i].id) == 0)
+		const char * const * const ids = cycle_multiplier_overrides[i].id;
+		for (j = 0; j < ARRAY_SIZE(cycle_multiplier_overrides[i].id); j++)
+			if (ids[j] && strcmp(ids[j], CdromId) == 0)
+				break;
+		if (j < ARRAY_SIZE(cycle_multiplier_overrides[i].id))
 		{
 			Config.cycle_multiplier_override = cycle_multiplier_overrides[i].mult;
 			new_dynarec_hacks_pergame |= NDHACK_OVERRIDE_CYCLE_M;