Merge branch 'master' of https://github.com/PCSX2/pcsx2

ASI-Factory · Sep 4, 2023 · e0136dc · e0136dc
2 parents 9e02d76 + 1248858
commit e0136dc
Show file tree

Hide file tree

Showing 11 changed files with 7,635 additions and 1,008 deletions.
diff --git a/bin/resources/GameIndex.yaml b/bin/resources/GameIndex.yaml
@@ -21617,7 +21617,8 @@ SLES-54122:
   region: "PAL-E"
   gameFixes:
     - GIFFIFOHack # Partially fixes PATH3 Masking timing, not enough on its own.
-    - EETimingHack # Massages the timing slightly further to make it work okay.
+  speedHacks:
+    eeCycleRate: 3 # Corrects timing of PATH3 further.
 SLES-54123:
   name: "Marvel - Ultimate Alliance"
   region: "PAL-E-I"

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
@@ -29,6 +29,7 @@ target_sources(common PRIVATE
 	ReadbackSpinManager.cpp
 	Semaphore.cpp
 	SettingsWrapper.cpp
+	SmallString.cpp
 	StringUtil.cpp
 	TextureDecompress.cpp
 	Timer.cpp
@@ -93,6 +94,7 @@ target_sources(common PRIVATE
 	ScopedGuard.h
 	SettingsInterface.h
 	SettingsWrapper.h
+	SmallString.h
 	StringUtil.h
 	Timer.h
 	TextureDecompress.h