FSUI: Don't move IMGUI cursor unnecessarily in DrawGameGrid()

GameDB: Final Fantasy X Optimal FPU config. (#11958 )
Fixes the vast majority of FFX's FPU glitches as well as fixing a major cutscene bug without breaking anything more than what the current config already breaks. EE clamping fixes reverse controls and characters and enemies facing the wrong way during battles, everything else is affected by EE rounding and EE division rounding. VU0 clamping affects nothing.
2026-01-31 01:15:24 +01:00 · 2024-11-04 12:40:31 +01:00 · 2024-11-04 12:40:16 +01:00 · 2024-11-04 12:39:04 +01:00 · 2024-11-04 12:39:04 +01:00 · 2024-11-04 12:39:04 +01:00
21 changed files with 280 additions and 196 deletions
--- a/.github/workflows/cron_update_base_translation.yml
+++ b/.github/workflows/cron_update_base_translation.yml
@@ -20,7 +20,7 @@ jobs:
        uses: peter-evans/create-pull-request@v7
        with:
          title: "Qt: Update Base Translation"
-          commit-message: "Qt: Update Base Translation"
+          commit-message: "[ci skip]"
          committer: "PCSX2 Bot <PCSX2Bot@users.noreply.github.com>"
          author: "PCSX2 Bot <PCSX2Bot@users.noreply.github.com>"
          body: "Daily update of base translation sources."
--- a/bin/resources/GameIndex.yaml
+++ b/bin/resources/GameIndex.yaml
@@ -2615,7 +2615,7 @@ SCED-50642:
  gameFixes:
    - SoftwareRendererFMVHack # Fixes interlacing.
  roundModes:
-    eeRoundMode: 1 # Fixes reverse control and boss in some places.
+    eeRoundMode: 2 # Fixes reverse control and boss in some places.
  clampModes:
    eeClampMode: 3 # Fixes animations.
  gsHWFixes:
@@ -2742,7 +2742,7 @@ SCED-50907:
  gameFixes:
    - SoftwareRendererFMVHack # Fixes interlacing.
  roundModes:
-    eeRoundMode: 1 # Fixes reverse control and boss in some places.
+    eeRoundMode: 2 # Fixes reverse control and boss in some places.
  clampModes:
    eeClampMode: 3 # Fixes animations.
  gsHWFixes:
@@ -4451,7 +4451,7 @@ SCES-50490:
  gameFixes:
    - SoftwareRendererFMVHack # Fixes interlacing.
  roundModes:
-    eeRoundMode: 1 # Fixes reverse control and boss in some places.
+    eeRoundMode: 2 # Fixes reverse control and boss in some places.
  clampModes:
    eeClampMode: 3 # Fixes animations.
  gsHWFixes:
@@ -4463,7 +4463,7 @@ SCES-50491:
  gameFixes:
    - SoftwareRendererFMVHack # Fixes interlacing.
  roundModes:
-    eeRoundMode: 1 # Fixes reverse control and boss in some places.
+    eeRoundMode: 2 # Fixes reverse control and boss in some places.
  clampModes:
    eeClampMode: 3 # Fixes animations.
  gsHWFixes:
@@ -4476,7 +4476,7 @@ SCES-50492:
  gameFixes:
    - SoftwareRendererFMVHack # Fixes interlacing.
  roundModes:
-    eeRoundMode: 1 # Fixes reverse control and boss in some places.
+    eeRoundMode: 2 # Fixes reverse control and boss in some places.
  clampModes:
    eeClampMode: 3 # Fixes animations.
  gsHWFixes:
@@ -4488,7 +4488,7 @@ SCES-50493:
  gameFixes:
    - SoftwareRendererFMVHack # Fixes interlacing.
  roundModes:
-    eeRoundMode: 1 # Fixes reverse control and boss in some places.
+    eeRoundMode: 2 # Fixes reverse control and boss in some places.
  clampModes:
    eeClampMode: 3 # Fixes animations.
  gsHWFixes:
@@ -4500,7 +4500,7 @@ SCES-50494:
  gameFixes:
    - SoftwareRendererFMVHack # Fixes interlacing.
  roundModes:
-    eeRoundMode: 1 # Fixes reverse control and boss in some places.
+    eeRoundMode: 2 # Fixes reverse control and boss in some places.
  clampModes:
    eeClampMode: 3 # Fixes animations.
  gsHWFixes:
@@ -29780,12 +29780,12 @@ SLKA-25214:
  name: "Final Fantasy X - International [PlayStation 2 - Big Hit Series]"
  region: "NTSC-K"
  roundModes:
-    eeRoundMode: 1 # Fixes reverse control and boss in some places.
+    eeRoundMode: 2 # Fixes reverse control and boss in some places.
  clampModes:
    eeClampMode: 3 # Fixes animations.
-    vu0ClampMode: 3 # Fixes character flickering caused by EE clamp full.
  gsHWFixes:
    roundSprite: 2 # Fixes font artifacts.
+    autoFlush: 1 # Fixes blur effect on attacks.
 SLKA-25215:
  name: "Shining Wind"
  region: "NTSC-K"
@@ -37641,12 +37641,12 @@ SLPM-65115:
  name-en: "Final Fantasy X International"
  region: "NTSC-J"
  roundModes:
-    eeRoundMode: 1 # Fixes reverse control and boss in some places.
+    eeRoundMode: 2 # Fixes reverse control and boss in some places.
  clampModes:
    eeClampMode: 3 # Fixes animations.
-    vu0ClampMode: 3 # Fixes character flickering caused by EE clamp full.
  gsHWFixes:
    roundSprite: 2 # Fixes font artifacts.
+    autoFlush: 1 # Fixes blur effect on attacks.
 SLPM-65116:
  name: "リリーのアトリエ プラス 〜ザールブルグの錬金術士3〜"
  name-sort: "りりーのあとりえ ぷらす 〜ざーるぶるぐのれんきんじゅつし3〜"
@@ -43332,7 +43332,7 @@ SLPM-66124:
  gameFixes:
    - SoftwareRendererFMVHack # Fixes interlacing.
  roundModes:
-    eeRoundMode: 1 # Fixes reverse control and boss in some places.
+    eeRoundMode: 2 # Fixes reverse control and boss in some places.
  clampModes:
    eeClampMode: 3 # Fixes animations.
  gsHWFixes:
@@ -46745,12 +46745,12 @@ SLPM-66677:
  name-en: "Final Fantasy X - International [Ultimate Hits]"
  region: "NTSC-J"
  roundModes:
-    eeRoundMode: 1 # Fixes reverse control and boss in some places.
+    eeRoundMode: 2 # Fixes reverse control and boss in some places.
  clampModes:
    eeClampMode: 3 # Fixes animations.
-    vu0ClampMode: 3 # Fixes character flickering caused by EE clamp full.
  gsHWFixes:
    roundSprite: 2 # Fixes font artifacts.
+    autoFlush: 1 # Fixes blur effect on attacks.
 SLPM-66678:
  name: "ファイナルファンタジーX-2 インターナショナル+ラストミッション [アルティメットヒッツ]"
  name-sort: "ふぁいなるふぁんたじー10-2 いんたーなしょなる+らすとみっしょん [あるてぃめっとひっつ]"
@@ -48710,12 +48710,12 @@ SLPM-67513:
  name: "Final Fantasy X International"
  region: "NTSC-K"
  roundModes:
-    eeRoundMode: 1 # Fixes reverse control and boss in some places.
+    eeRoundMode: 2 # Fixes reverse control and boss in some places.
  clampModes:
    eeClampMode: 3 # Fixes animations.
-    vu0ClampMode: 3 # Fixes character flickering caused by EE clamp full.
  gsHWFixes:
    roundSprite: 2 # Fixes font artifacts.
+    autoFlush: 1 # Fixes blur effect on attacks.
 SLPM-67514:
  name: "Kessen"
  region: "NTSC-K"
@@ -52241,7 +52241,7 @@ SLPS-25050:
  gameFixes:
    - SoftwareRendererFMVHack # Fixes interlacing.
  roundModes:
-    eeRoundMode: 1 # Fixes reverse control and boss in some places.
+    eeRoundMode: 2 # Fixes reverse control and boss in some places.
  clampModes:
    eeClampMode: 3 # Fixes animations.
  gsHWFixes:
@@ -52448,12 +52448,12 @@ SLPS-25088:
  region: "NTSC-J"
  compat: 5
  roundModes:
-    eeRoundMode: 1 # Fixes reverse control and boss in some places.
+    eeRoundMode: 2 # Fixes reverse control and boss in some places.
  clampModes:
    eeClampMode: 3 # Fixes animations.
-    vu0ClampMode: 3 # Fixes character flickering caused by EE clamp full.
  gsHWFixes:
    roundSprite: 2 # Fixes font artifacts.
+    autoFlush: 1 # Fixes blur effect on attacks.
 SLPS-25089:
  name: "Salt Lake 2002"
  region: "NTSC-J"
@@ -57535,7 +57535,7 @@ SLPS-72501:
  gameFixes:
    - SoftwareRendererFMVHack # Fixes interlacing.
  roundModes:
-    eeRoundMode: 1 # Fixes reverse control and boss in some places.
+    eeRoundMode: 2 # Fixes reverse control and boss in some places.
  clampModes:
    eeClampMode: 3 # Fixes animations.
  gsHWFixes:
@@ -59686,7 +59686,7 @@ SLUS-20312:
  gameFixes:
    - SoftwareRendererFMVHack # Fixes interlacing.
  roundModes:
-    eeRoundMode: 1 # Fixes reverse control and boss in some places.
+    eeRoundMode: 2 # Fixes reverse control and boss in some places.
  clampModes:
    eeClampMode: 3 # Fixes animations.
  gsHWFixes:
--- a/pcsx2-qt/MainWindow.cpp
+++ b/pcsx2-qt/MainWindow.cpp
@@ -1911,11 +1911,6 @@ void MainWindow::onInputRecStopActionTriggered()
 	}
 }

-void MainWindow::onInputRecOpenSettingsTriggered()
-{
-	// TODO - Vaser - Implement
-}
-
 InputRecordingViewer* MainWindow::getInputRecordingViewer()
 {
 	if (!m_input_recording_viewer)
--- a/pcsx2-qt/MainWindow.h
+++ b/pcsx2-qt/MainWindow.h
@@ -179,7 +179,6 @@ private Q_SLOTS:
 	void onInputRecNewActionTriggered();
 	void onInputRecPlayActionTriggered();
 	void onInputRecStopActionTriggered();
-	void onInputRecOpenSettingsTriggered();
 	void onInputRecOpenViewer();

 	void onVMStarting();
--- a/pcsx2-qt/MainWindow.ui
+++ b/pcsx2-qt/MainWindow.ui
@@ -196,7 +196,6 @@
     <addaction name="actionInputRecStop"/>
     <addaction name="separator"/>
     <addaction name="actionInputRecOpenViewer"/>
-     <addaction name="actionInputRecOpenSettings"/>
     <addaction name="separator"/>
     <addaction name="actionInputRecConsoleLogs"/>
     <addaction name="actionInputRecControllerLogs"/>
@@ -981,14 +980,6 @@
    <string extracomment="This section refers to the Input Recording submenu.">Stop</string>
   </property>
  </action>
-  <action name="actionInputRecOpenSettings">
-   <property name="enabled">
-    <bool>false</bool>
-   </property>
-   <property name="text">
-    <string extracomment="This section refers to the Input Recording submenu.">Settings</string>
-   </property>
-  </action>
  <action name="actionRecording_Console_Logs">
   <property name="text">
    <string>Input Recording Logs</string>
--- a/pcsx2-qt/Settings/AdvancedSettingsWidget.cpp
+++ b/pcsx2-qt/Settings/AdvancedSettingsWidget.cpp
@@ -56,6 +56,9 @@ AdvancedSettingsWidget::AdvancedSettingsWidget(SettingsWindow* dialog, QWidget*
 	SettingWidgetBinder::BindWidgetToFloatSetting(sif, m_ui.ntscFrameRate, "EmuCore/GS", "FramerateNTSC", 59.94f);
 	SettingWidgetBinder::BindWidgetToFloatSetting(sif, m_ui.palFrameRate, "EmuCore/GS", "FrameratePAL", 50.00f);

+	dialog->registerWidgetHelp(m_ui.savestateSelector, tr("Use Save State Selector"), tr("Checked"), 
+			tr("Show a save state selector UI when switching slots instead of showing a notification bubble."));
+
 	SettingWidgetBinder::BindWidgetToIntSetting(
 		sif, m_ui.savestateCompressionMethod, "EmuCore", "SavestateCompressionType", static_cast<int>(SavestateCompressionMethod::Zstandard));

@@ -67,6 +70,7 @@ AdvancedSettingsWidget::AdvancedSettingsWidget(SettingsWindow* dialog, QWidget*

 	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.backupSaveStates, "EmuCore", "BackupSavestate", true);
 	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.saveStateOnShutdown, "EmuCore", "SaveStateOnShutdown", false);
+	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.savestateSelector, "EmuCore", "UseSavestateSelector", true);

 	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.pineEnable, "EmuCore", "EnablePINE", false);
 	SettingWidgetBinder::BindWidgetToIntSetting(sif, m_ui.pineSlot, "EmuCore", "PINESlot", 28011);
--- a/pcsx2-qt/Settings/AdvancedSettingsWidget.ui
+++ b/pcsx2-qt/Settings/AdvancedSettingsWidget.ui
@@ -32,9 +32,9 @@
      <property name="geometry">
       <rect>
        <x>0</x>
-        <y>0</y>
+        <y>-447</y>
        <width>790</width>
-        <height>1023</height>
+        <height>1049</height>
       </rect>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout">
@@ -422,10 +422,10 @@
          <string>Savestate Settings</string>
         </property>
         <layout class="QGridLayout" name="savestateSettingsLayout">
-          <item row="0" column="0">
-           <widget class="QLabel" name="savestateCompressionLabel">
+          <item row="3" column="1">
+           <widget class="QCheckBox" name="saveStateOnShutdown">
            <property name="text">
-             <string>Compression Method:</string>
+             <string>Save State On Shutdown</string>
            </property>
           </widget>
          </item>
@@ -491,10 +491,17 @@
            </property>
           </widget>
          </item>
-          <item row="3" column="1">
-           <widget class="QCheckBox" name="saveStateOnShutdown">
+          <item row="0" column="0">
+           <widget class="QLabel" name="savestateCompressionLabel">
            <property name="text">
-             <string>Save State On Shutdown</string>
+             <string>Compression Method:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="0">
+           <widget class="QCheckBox" name="savestateSelector">
+            <property name="text">
+             <string>Use Save State Selector</string>
            </property>
           </widget>
          </item>
--- a/pcsx2-qt/resources/icons/black/svg/camera-video.svg
+++ b/pcsx2-qt/resources/icons/black/svg/camera-video.svg
@@ -1,7 +1,17 @@
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Uploaded to: SVG Repo, www.svgrepo.com, Transformed by: SVG Repo Mixer Tools -->
-<svg width="256px" height="256px" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" fill="#000000" class="bi bi-camera-video">
-
-<g id="SVGRepo_bgCarrier" stroke-width="0"/>
-
-<g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="camera_video_-_PCSX2" data-name="camera video - PCSX2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 150 150">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: none;
+        stroke: #000;
+        stroke-miterlimit: 10;
+        stroke-width: 12px;
+      }
+    </style>
+  </defs>
+  <g id="By_Maxihplay" data-name="By Maxihplay">
+    <rect class="cls-1" x="9.4" y="33.49" width="90.95" height="83.02" rx="12.96" ry="12.96"/>
+    <path class="cls-1" d="m138.43,105.09l-37.81-15.05v-30.07l37.81-15.05c1.03-.41,2.16.3,2.16,1.35v57.48c0,1.05-1.14,1.76-2.16,1.35Z"/>
+  </g>
+</svg>
--- a/pcsx2-qt/resources/icons/black/svg/jogcon-line.svg
+++ b/pcsx2-qt/resources/icons/black/svg/jogcon-line.svg
@@ -1,20 +1,26 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 27.4.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="PCSX2_-_Namco" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
-	 y="0px" viewBox="0 0 150 150" style="enable-background:new 0 0 150 150;" xml:space="preserve">
-<path id="By_Maxihplay" d="M130.4,64.3c3.3-4.2,5.2-9.4,5.2-15.1c0-13.5-11-24.4-24.4-24.4c-4.7,0-9.1,1.4-12.9,3.7
-	c-5.4-8-14.7-12.8-24.4-12.2c-8.5,0.6-16.1,5.3-20.7,12.3c-3.8-2.4-8.3-3.9-13.2-3.9c-13.5,0-24.4,11-24.4,24.4c0,5.2,1.6,10,4.4,14
-	c-2.6,6.9-8.8,25.5-7.3,37.9c2,15.9,10.9,22.2,11.9,22.8c0.6,0.4,1.3,0.7,2.1,0.8c4.8,0.9,9.5,0.4,13.4-1.5c3.6-1.8,6.4-4.8,8.5-9.1
-	c3.1-6.5,2.8-15.8,1.6-24.7c0.2,0.1,0.8-0.1,1.4-0.2c4.2,8.6,13.1,14.6,23.4,14.6c10.2,0,19.1-5.9,23.3-14.5c0.5,0.1,0.9,0.2,1,0.1
-	c-0.9,7-1.2,17.8,2.1,24.7c2.1,4.3,4.8,7.3,8.5,9.1c2.6,1.3,5.7,2,8.9,2c1.5,0,3-0.1,4.5-0.4c0.8-0.2,1.5-0.4,2.1-0.9
-	c1-0.7,9.9-6.9,11.9-22.8C138.8,89.4,133.1,71.9,130.4,64.3z M111.2,36.8c6.8,0,12.4,5.6,12.4,12.4c0,6.8-5.6,12.4-12.4,12.4
-	s-12.4-5.6-12.4-12.4C98.8,42.4,104.3,36.8,111.2,36.8z M74.7,28.3c6.3-0.4,12.3,3.3,15,9.3c-1.9,3.5-2.9,7.4-2.9,11.6
-	c0,2,0.2,3.9,0.7,5.7c-3.7-2-7.9-3.2-12.5-3.2c-4,0-7.8,0.9-11.1,2.5c0.3-1.6,0.5-3.3,0.5-5.1c0-4-1-7.8-2.7-11.1
-	C63.9,32.6,68.9,28.7,74.7,28.3z M40,36.8c6.8,0,12.4,5.6,12.4,12.4c0,6.8-5.6,12.4-12.4,12.4s-12.4-5.6-12.4-12.4
-	C27.6,42.4,33.1,36.8,40,36.8z M45.8,78l-1.8,0.5c-3.9,1.1-6.3,4.5-5.7,8.1l0,0.1c0.7,4.8,2.7,17.4-0.2,23.4c-1.5,3.2-3,4-3.5,4.2
-	c0,0,0,0,0,0c-2.2,1.1-4.8,0.2-6.2-1.7c-1.7-2.5-3.8-6.5-4.5-12.6c-1-7.9,2.3-20.4,5.2-28.9c3.3,1.6,7,2.6,10.9,2.6
-	c3.5,0,6.7-0.7,9.7-2c-0.5,1.8-0.7,3.7-0.7,5.7C47.8,77.5,46.6,77.8,45.8,78z M75,91.9c-7.7,0-14-6.3-14-14s6.3-14,14-14
-	c7.7,0,14,6.3,14,14S82.7,91.9,75,91.9z M126.1,100c-0.8,6.1-2.8,10.1-4.5,12.6c-1.4,2-4,2.8-6.2,1.8c0,0,0,0,0,0
-	c-0.5-0.3-2-1-3.5-4.2c-2.9-6-1.8-19.2-1.2-23.5l0-0.2c0.5-3.2-1.3-6.2-4.4-7.7l-1.1-0.5c-1-0.5-2.6-0.8-4.1-0.9
-	c-0.1-2.1-0.4-4.2-0.9-6.2c3.3,1.7,7.1,2.7,11.1,2.7c3.5,0,6.9-0.8,9.9-2.1C123.9,80.1,127,92.3,126.1,100z"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Jogcon_-_PCSX2" data-name="Jogcon - PCSX2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 150 150">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: none;
+        stroke: #000;
+        stroke-linecap: round;
+        stroke-linejoin: round;
+        stroke-width: 12px;
+      }
+    </style>
+  </defs>
+  <g id="By_maxihplay" data-name="By @maxihplay">
+    <g>
+      <path class="cls-1" d="m126.03,63.22c3.43-3.42,5.55-8.15,5.55-13.38,0-10.44-8.47-18.91-18.91-18.91-6.44,0-12.12,3.22-15.54,8.13"/>
+      <path class="cls-1" d="m24.65,63.22c-3.43-3.42-4.52-8.15-4.52-13.38,0-10.44,8.47-18.91,18.91-18.91,6.44,0,12.12,3.22,15.54,8.13"/>
+      <g>
+        <path d="m130.41,61.42c-1.1-2.72-4.43-4.12-7.43-3.12-3.01.99-4.55,4-3.46,6.72,2.66,6.58,9.26,26.04,7.91,36.9-.78,6.27-2.83,10.41-4.61,12.93-1.43,2.03-4.12,2.88-6.35,1.79-.01,0-.03-.01-.04-.02-.56-.28-2.05-1.02-3.65-4.34-2.98-6.2-1.89-19.72-1.2-24.16l.04-.26c.51-3.24-1.32-6.4-4.54-7.86l-1.15-.53c-1.81-.83-5.55-1.26-7.4-.87.23,1.26,0,3.43,0,4.75,0,3.3-.69,4.83-2.04,7.68,1.01-.44,3.25.21,3.51.11-.92,7.22-1.22,18.32,2.14,25.31,2.13,4.44,4.98,7.5,8.69,9.35,2.71,1.35,5.83,2.04,9.1,2.04,1.52,0,3.06-.15,4.61-.45.78-.15,1.52-.45,2.17-.88,1.04-.68,10.2-7.1,12.23-23.43,1.93-15.54-8.12-40.61-8.55-41.67Z"/>
+        <path d="m52.83,90.71c-1.19-2.71-2.94-5.14-2.94-8.24,0-1.21.68-2.7.87-3.87-1.34-.25-4.31.36-5.68.74l-1.82.51c-3.97,1.1-6.44,4.6-5.87,8.32l.02.15c.75,4.88,2.74,17.84-.2,23.97-1.6,3.32-3.09,4.06-3.65,4.34-.01,0-.03.01-.04.02-2.23,1.09-4.91.24-6.33-1.79-1.77-2.52-3.85-6.69-4.62-12.93-1.35-10.86,5.26-30.32,7.91-36.9,1.1-2.72-.45-5.73-3.45-6.72-3.01-1-6.33.4-7.43,3.12-.43,1.06-10.47,26.13-8.55,41.67,2.02,16.33,11.19,22.75,12.23,23.43.65.42,1.39.72,2.17.88,4.88.95,9.74.39,13.7-1.59,3.71-1.85,6.56-4.91,8.69-9.35,3.23-6.71,2.84-16.24,1.66-25.32.38.12,2.88-.55,3.33-.43Z"/>
+      </g>
+      <circle class="cls-1" cx="75" cy="79.2" r="20.58"/>
+      <path class="cls-1" d="m55.23,37.19c2.88-8.45,10.44-14.38,19.06-14.98,9.65-.68,18.83,5.45,22.14,14.98"/>
+    </g>
+  </g>
+</svg>
--- a/pcsx2-qt/resources/icons/black/svg/negcon-line.svg
+++ b/pcsx2-qt/resources/icons/black/svg/negcon-line.svg
@@ -1,30 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 26.5.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Duckstation_-_Negcon_00000104687465272175918400000016919813319004934028_"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 150 150"
-	 style="enable-background:new 0 0 150 150;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:none;}
-	.st1{fill:none;stroke:#000000;stroke-width:12;stroke-miterlimit:10;}
-	.st2{fill:none;stroke:#000000;stroke-width:12;stroke-linecap:round;stroke-miterlimit:10;}
-</style>
-<g id="tela">
-	<rect id="tela_00000129895939108887223950000017508827257489233583_" class="st0" width="150" height="150"/>
-</g>
-<g id="By_Maxihplay_00000152974811067316581070000007946929605663458202_">
-	<g id="control">
-		<g id="B">
-			<path class="st1" d="M91.9,87.8h14l20.2,21.1c3.6,2.5,8.5-0.2,8.4-4.6l-3.9-35.4c0-10.3-8.3-18.6-18.6-18.6H91.9V87.8L91.9,87.8z
-				"/>
-			<line class="st1" x1="83.7" y1="40.1" x2="83.5" y2="99.1"/>
-			<polyline class="st2" points="101.6,46.2 116.7,46.2 126.1,52 			"/>
-		</g>
-		<g id="A">
-			<path class="st1" d="M58.1,87.8h-14l-20.2,21.1c-3.6,2.5-8.5-0.2-8.4-4.6l3.9-35.4c0-10.3,8.3-18.6,18.6-18.6h20.1V87.8
-				L58.1,87.8z"/>
-			<line class="st1" x1="66.3" y1="40.1" x2="66.5" y2="99.1"/>
-			<polyline class="st2" points="48.1,46.2 33,46.2 23.6,52 			"/>
-		</g>
-	</g>
-</g>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Negcon_-_PCSX2" data-name="Negcon - PCSX2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 150 150">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: none;
+        stroke: #000;
+        stroke-linecap: round;
+        stroke-miterlimit: 10;
+        stroke-width: 12px;
+      }
+    </style>
+  </defs>
+  <g id="By_maxihplay" data-name="By @maxihplay">
+    <path d="m130.96,116.52c-2.29,0-4.57-.69-6.54-2.06l-.5-.34-19.54-20.41h-17.92v-50.78h26.79c13.8,0,25.04,11.13,25.23,24.88l4.03,36.82c.1,4.4-2.24,8.42-6.11,10.5-1.72.92-3.59,1.38-5.46,1.38Zm-32.49-34.81h11.04l20.83,21.76-3.85-34.98v-.33c0-7.3-5.94-13.23-13.23-13.23h-14.79v26.78Z"/>
+    <line class="cls-1" x1="84" y1="39.48" x2="83.79" y2="97.31"/>
+    <path d="m19.04,116.52c-1.86,0-3.74-.46-5.46-1.38-3.87-2.08-6.21-6.1-6.11-10.5l.03-.52,4-36.3c.19-13.75,11.44-24.88,25.23-24.88h26.79v50.78h-17.92l-19.53,20.41-.5.34c-1.97,1.37-4.25,2.06-6.54,2.06Zm17.7-61.59c-7.3,0-13.23,5.94-13.23,13.23l-.04.66-3.82,34.65,20.83-21.76h11.04v-26.78h-14.79Z"/>
+    <line class="cls-1" x1="66" y1="39.48" x2="66.21" y2="97.31"/>
+  </g>
+</svg>
--- a/pcsx2-qt/resources/icons/black/svg/realplay-sphere-line.svg
+++ b/pcsx2-qt/resources/icons/black/svg/realplay-sphere-line.svg
@@ -1,7 +1,15 @@
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Uploaded to: SVG Repo, www.svgrepo.com, Transformed by: SVG Repo Mixer Tools -->
-<svg width="256px" height="256px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-
-<g id="SVGRepo_bgCarrier" stroke-width="0"/>
-
-<g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.4.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Ball_-_PCSX2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" viewBox="0 0 150 150" style="enable-background:new 0 0 150 150;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;stroke:#000000;stroke-width:12;stroke-miterlimit:42.67;}
+	.st1{stroke:#000000;stroke-width:7;stroke-miterlimit:42.67;}
+</style>
+<g id="Kam_-_ball">
+	<circle class="st0" cx="75" cy="75" r="55.7"/>
+	<circle class="st1" cx="82.1" cy="44.4" r="8.4"/>
+	<circle class="st1" cx="79.2" cy="77.8" r="8.3"/>
+	<path class="st1" d="M52.7,52.7c4.6,0,8.4,3.7,8.4,8.4s-3.7,8.3-8.3,8.3s-8.3-3.7-8.3-8.3S48.1,52.7,52.7,52.7z"/>
+</g>
+</svg>
--- a/pcsx2-qt/resources/icons/black/svg/trance-vibrator-line.svg
+++ b/pcsx2-qt/resources/icons/black/svg/trance-vibrator-line.svg
@@ -1,19 +1,27 @@
-<svg 
-  xmlns="http://www.w3.org/2000/svg"
-  viewBox="0 -10 100 110" >
-  <g>
-    <path
-      fill="none"
-      stroke="black"
-      stroke-width="8"
-      stroke-miterlimit="5"
-      d="m 0 50
-         l 20,0
-         l 7.5,20
-         l 15,-45
-         l 15,55
-         l 15,-65
-         l 7.5,35
-         l 20,0" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Vibration_-_PCSX2" data-name="Vibration - PCSX2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 150 150">
+  <defs>
+    <style>
+      .cls-1 {
+        stroke-linecap: round;
+        stroke-linejoin: round;
+      }
+
+      .cls-1, .cls-2 {
+        fill: none;
+        stroke: #000;
+        stroke-width: 12px;
+      }
+
+      .cls-2 {
+        stroke-miterlimit: 5;
+      }
+    </style>
+  </defs>
+  <g id="By_maxihplay" data-name="By @maxihplay">
+    <rect class="cls-2" x="51.59" y="20.59" width="46.81" height="87.78" rx="17.19" ry="17.19"/>
+    <path class="cls-1" d="m75,113.37v7.22c0,4.85,3.97,8.82,8.82,8.82h18.88"/>
+    <polyline class="cls-1" points="130.09 33.5 116.93 58.56 132.07 75.26 118.88 95.92 130.8 116.5"/>
+    <polyline class="cls-1" points="19.91 33.5 33.07 58.56 17.93 75.26 31.12 95.92 19.2 116.5"/>
  </g>
-</svg>
+</svg>
--- a/pcsx2-qt/resources/icons/white/svg/camera-video.svg
+++ b/pcsx2-qt/resources/icons/white/svg/camera-video.svg
@@ -1,7 +1,17 @@
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Uploaded to: SVG Repo, www.svgrepo.com, Transformed by: SVG Repo Mixer Tools -->
-<svg width="256px" height="256px" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" fill="#ffffff" class="bi bi-camera-video">
-
-<g id="SVGRepo_bgCarrier" stroke-width="0"/>
-
-<g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="camera_video_-_PCSX2" data-name="camera video - PCSX2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 150 150">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: none;
+        stroke: #fff;
+        stroke-miterlimit: 10;
+        stroke-width: 12px;
+      }
+    </style>
+  </defs>
+  <g id="By_Maxihplay" data-name="By Maxihplay">
+    <rect class="cls-1" x="9.4" y="33.49" width="90.95" height="83.02" rx="12.96" ry="12.96"/>
+    <path class="cls-1" d="m138.43,105.09l-37.81-15.05v-30.07l37.81-15.05c1.03-.41,2.16.3,2.16,1.35v57.48c0,1.05-1.14,1.76-2.16,1.35Z"/>
+  </g>
+</svg>
--- a/pcsx2-qt/resources/icons/white/svg/jogcon-line.svg
+++ b/pcsx2-qt/resources/icons/white/svg/jogcon-line.svg
@@ -1,23 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 27.4.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="PCSX2_-_Namco" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
-	 y="0px" viewBox="0 0 150 150" style="enable-background:new 0 0 150 150;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-</style>
-<path id="By_Maxihplay" class="st0" d="M130.4,64.3c3.3-4.2,5.2-9.4,5.2-15.1c0-13.5-11-24.4-24.4-24.4c-4.7,0-9.1,1.4-12.9,3.7
-	c-5.4-8-14.7-12.8-24.4-12.2c-8.5,0.6-16.1,5.3-20.7,12.3c-3.8-2.4-8.3-3.9-13.2-3.9c-13.5,0-24.4,11-24.4,24.4c0,5.2,1.6,10,4.4,14
-	c-2.6,6.9-8.8,25.5-7.3,37.9c2,15.9,10.9,22.2,11.9,22.8c0.6,0.4,1.3,0.7,2.1,0.8c4.8,0.9,9.5,0.4,13.4-1.5c3.6-1.8,6.4-4.8,8.5-9.1
-	c3.1-6.5,2.8-15.8,1.6-24.7c0.2,0.1,0.8-0.1,1.4-0.2c4.2,8.6,13.1,14.6,23.4,14.6c10.2,0,19.1-5.9,23.3-14.5c0.5,0.1,0.9,0.2,1,0.1
-	c-0.9,7-1.2,17.8,2.1,24.7c2.1,4.3,4.8,7.3,8.5,9.1c2.6,1.3,5.7,2,8.9,2c1.5,0,3-0.1,4.5-0.4c0.8-0.2,1.5-0.4,2.1-0.9
-	c1-0.7,9.9-6.9,11.9-22.8C138.8,89.4,133.1,71.9,130.4,64.3z M111.2,36.8c6.8,0,12.4,5.6,12.4,12.4c0,6.8-5.6,12.4-12.4,12.4
-	s-12.4-5.6-12.4-12.4C98.8,42.4,104.3,36.8,111.2,36.8z M74.7,28.3c6.3-0.4,12.3,3.3,15,9.3c-1.9,3.5-2.9,7.4-2.9,11.6
-	c0,2,0.2,3.9,0.7,5.7c-3.7-2-7.9-3.2-12.5-3.2c-4,0-7.8,0.9-11.1,2.5c0.3-1.6,0.5-3.3,0.5-5.1c0-4-1-7.8-2.7-11.1
-	C63.9,32.6,68.9,28.7,74.7,28.3z M40,36.8c6.8,0,12.4,5.6,12.4,12.4c0,6.8-5.6,12.4-12.4,12.4s-12.4-5.6-12.4-12.4
-	C27.6,42.4,33.1,36.8,40,36.8z M45.8,78l-1.8,0.5c-3.9,1.1-6.3,4.5-5.7,8.1l0,0.1c0.7,4.8,2.7,17.4-0.2,23.4c-1.5,3.2-3,4-3.5,4.2
-	c0,0,0,0,0,0c-2.2,1.1-4.8,0.2-6.2-1.7c-1.7-2.5-3.8-6.5-4.5-12.6c-1-7.9,2.3-20.4,5.2-28.9c3.3,1.6,7,2.6,10.9,2.6
-	c3.5,0,6.7-0.7,9.7-2c-0.5,1.8-0.7,3.7-0.7,5.7C47.8,77.5,46.6,77.8,45.8,78z M75,91.9c-7.7,0-14-6.3-14-14s6.3-14,14-14
-	c7.7,0,14,6.3,14,14S82.7,91.9,75,91.9z M126.1,100c-0.8,6.1-2.8,10.1-4.5,12.6c-1.4,2-4,2.8-6.2,1.8c0,0,0,0,0,0
-	c-0.5-0.3-2-1-3.5-4.2c-2.9-6-1.8-19.2-1.2-23.5l0-0.2c0.5-3.2-1.3-6.2-4.4-7.7l-1.1-0.5c-1-0.5-2.6-0.8-4.1-0.9
-	c-0.1-2.1-0.4-4.2-0.9-6.2c3.3,1.7,7.1,2.7,11.1,2.7c3.5,0,6.9-0.8,9.9-2.1C123.9,80.1,127,92.3,126.1,100z"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Jogcon_-_PCSX2" data-name="Jogcon - PCSX2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 150 150">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #fff;
+      }
+
+      .cls-2 {
+        fill: none;
+        stroke: #fff;
+        stroke-linecap: round;
+        stroke-linejoin: round;
+        stroke-width: 12px;
+      }
+    </style>
+  </defs>
+  <g id="By_maxihplay" data-name="By @maxihplay">
+    <g>
+      <path class="cls-2" d="m126.03,63.22c3.43-3.42,5.55-8.15,5.55-13.38,0-10.44-8.47-18.91-18.91-18.91-6.44,0-12.12,3.22-15.54,8.13"/>
+      <path class="cls-2" d="m24.65,63.22c-3.43-3.42-4.52-8.15-4.52-13.38,0-10.44,8.47-18.91,18.91-18.91,6.44,0,12.12,3.22,15.54,8.13"/>
+      <g>
+        <path class="cls-1" d="m130.41,61.42c-1.1-2.72-4.43-4.12-7.43-3.12-3.01.99-4.55,4-3.46,6.72,2.66,6.58,9.26,26.04,7.91,36.9-.78,6.27-2.83,10.41-4.61,12.93-1.43,2.03-4.12,2.88-6.35,1.79-.01,0-.03-.01-.04-.02-.56-.28-2.05-1.02-3.65-4.34-2.98-6.2-1.89-19.72-1.2-24.16l.04-.26c.51-3.24-1.32-6.4-4.54-7.86l-1.15-.53c-1.81-.83-5.55-1.26-7.4-.87.23,1.26,0,3.43,0,4.75,0,3.3-.69,4.83-2.04,7.68,1.01-.44,3.25.21,3.51.11-.92,7.22-1.22,18.32,2.14,25.31,2.13,4.44,4.98,7.5,8.69,9.35,2.71,1.35,5.83,2.04,9.1,2.04,1.52,0,3.06-.15,4.61-.45.78-.15,1.52-.45,2.17-.88,1.04-.68,10.2-7.1,12.23-23.43,1.93-15.54-8.12-40.61-8.55-41.67Z"/>
+        <path class="cls-1" d="m52.83,90.71c-1.19-2.71-2.94-5.14-2.94-8.24,0-1.21.68-2.7.87-3.87-1.34-.25-4.31.36-5.68.74l-1.82.51c-3.97,1.1-6.44,4.6-5.87,8.32l.02.15c.75,4.88,2.74,17.84-.2,23.97-1.6,3.32-3.09,4.06-3.65,4.34-.01,0-.03.01-.04.02-2.23,1.09-4.91.24-6.33-1.79-1.77-2.52-3.85-6.69-4.62-12.93-1.35-10.86,5.26-30.32,7.91-36.9,1.1-2.72-.45-5.73-3.45-6.72-3.01-1-6.33.4-7.43,3.12-.43,1.06-10.47,26.13-8.55,41.67,2.02,16.33,11.19,22.75,12.23,23.43.65.42,1.39.72,2.17.88,4.88.95,9.74.39,13.7-1.59,3.71-1.85,6.56-4.91,8.69-9.35,3.23-6.71,2.84-16.24,1.66-25.32.38.12,2.88-.55,3.33-.43Z"/>
+      </g>
+      <circle class="cls-2" cx="75" cy="79.2" r="20.58"/>
+      <path class="cls-2" d="m55.23,37.19c2.88-8.45,10.44-14.38,19.06-14.98,9.65-.68,18.83,5.45,22.14,14.98"/>
+    </g>
+  </g>
+</svg>
--- a/pcsx2-qt/resources/icons/white/svg/negcon-line.svg
+++ b/pcsx2-qt/resources/icons/white/svg/negcon-line.svg
@@ -1 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?><svg id="Duckstation_-_Negcon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 150 150"><defs><style>.cls-1{stroke-linecap:round;}.cls-1,.cls-2,.cls-3{fill:none;}.cls-1,.cls-3{stroke:#fff;stroke-miterlimit:10;stroke-width:12px;}</style></defs><g id="tela"><rect id="tela-2" class="cls-2" width="150" height="150"/></g><g id="By_Maxihplay"><g id="control"><g id="B"><path class="cls-3" d="M91.9,87.8h14l20.2,21.1c3.6,2.5,8.5-.2,8.4-4.6l-3.9-35.4c0-10.3-8.3-18.6-18.6-18.6h-20.1v37.5h0Z"/><line class="cls-3" x1="83.7" y1="40.1" x2="83.5" y2="99.1"/><polyline class="cls-1" points="101.6 46.2 116.7 46.2 126.1 52"/></g><g id="A"><path class="cls-3" d="M58.1,87.8h-14l-20.2,21.1c-3.6,2.5-8.5-.2-8.4-4.6l3.9-35.4c0-10.3,8.3-18.6,18.6-18.6h20.1v37.5h0Z"/><line class="cls-3" x1="66.3" y1="40.1" x2="66.5" y2="99.1"/><polyline class="cls-1" points="48.1 46.2 33 46.2 23.6 52"/></g></g></g></svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Negcon_-_PCSX2" data-name="Negcon - PCSX2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 150 150">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #fff;
+      }
+
+      .cls-2 {
+        fill: none;
+        stroke: #fff;
+        stroke-linecap: round;
+        stroke-miterlimit: 10;
+        stroke-width: 12px;
+      }
+    </style>
+  </defs>
+  <g id="By_maxihplay" data-name="By @maxihplay">
+    <path class="cls-1" d="m130.96,116.52c-2.29,0-4.57-.69-6.54-2.06l-.5-.34-19.54-20.41h-17.92v-50.78h26.79c13.8,0,25.04,11.13,25.23,24.88l4.03,36.82c.1,4.4-2.24,8.42-6.11,10.5-1.72.92-3.59,1.38-5.46,1.38Zm-32.49-34.81h11.04l20.83,21.76-3.85-34.98v-.33c0-7.3-5.94-13.23-13.24-13.23h-14.79v26.78Z"/>
+    <line class="cls-2" x1="84" y1="39.48" x2="83.79" y2="97.31"/>
+    <path class="cls-1" d="m19.04,116.52c-1.86,0-3.74-.46-5.46-1.38-3.87-2.08-6.21-6.1-6.11-10.5l.03-.52,4-36.3c.19-13.75,11.44-24.88,25.23-24.88h26.79v50.78h-17.92l-19.54,20.41-.5.34c-1.97,1.37-4.25,2.06-6.54,2.06Zm17.7-61.59c-7.3,0-13.23,5.94-13.23,13.23l-.04.66-3.82,34.65,20.83-21.76h11.04v-26.78h-14.79Z"/>
+    <line class="cls-2" x1="66" y1="39.48" x2="66.21" y2="97.31"/>
+  </g>
+</svg>
--- a/pcsx2-qt/resources/icons/white/svg/realplay-sphere-line.svg
+++ b/pcsx2-qt/resources/icons/white/svg/realplay-sphere-line.svg
@@ -1,7 +1,15 @@
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Uploaded to: SVG Repo, www.svgrepo.com, Transformed by: SVG Repo Mixer Tools -->
-<svg width="256px" height="256px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-
-<g id="SVGRepo_bgCarrier" stroke-width="0"/>
-
-<g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.4.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Ball_-_PCSX2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" viewBox="0 0 150 150" style="enable-background:new 0 0 150 150;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;stroke:#FFFFFF;stroke-width:12;stroke-miterlimit:42.67;}
+	.st1{fill:#FFFFFF;stroke:#FFFFFF;stroke-width:7;stroke-miterlimit:42.67;}
+</style>
+<g id="Kam_-_ball">
+	<circle class="st0" cx="75" cy="75" r="55.7"/>
+	<circle class="st1" cx="82.1" cy="44.4" r="8.4"/>
+	<circle class="st1" cx="79.2" cy="77.8" r="8.3"/>
+	<path class="st1" d="M52.7,52.7c4.6,0,8.4,3.7,8.4,8.4s-3.7,8.3-8.3,8.3s-8.3-3.7-8.3-8.3S48.1,52.7,52.7,52.7z"/>
+</g>
+</svg>
--- a/pcsx2-qt/resources/icons/white/svg/trance-vibrator-line.svg
+++ b/pcsx2-qt/resources/icons/white/svg/trance-vibrator-line.svg
@@ -1,19 +1,27 @@
-<svg 
-  xmlns="http://www.w3.org/2000/svg"
-  viewBox="0 -10 100 110" >
-  <g>
-    <path
-      fill="none"
-      stroke="white"
-      stroke-width="8"
-      stroke-miterlimit="5"
-      d="m 0 50
-         l 20,0
-         l 7.5,20
-         l 15,-45
-         l 15,55
-         l 15,-65
-         l 7.5,35
-         l 20,0" />
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Vibration_-_PCSX2" data-name="Vibration - PCSX2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 150 150">
+  <defs>
+    <style>
+      .cls-1 {
+        stroke-miterlimit: 5;
+      }
+
+      .cls-1, .cls-2 {
+        fill: none;
+        stroke: #fff;
+        stroke-width: 12px;
+      }
+
+      .cls-2 {
+        stroke-linecap: round;
+        stroke-linejoin: round;
+      }
+    </style>
+  </defs>
+  <g id="By_maxihplay" data-name="By @maxihplay">
+    <rect class="cls-1" x="51.59" y="20.59" width="46.81" height="87.78" rx="17.19" ry="17.19"/>
+    <path class="cls-2" d="m75,113.37v7.22c0,4.85,3.97,8.82,8.82,8.82h18.88"/>
+    <polyline class="cls-2" points="130.09 33.5 116.93 58.56 132.07 75.26 118.88 95.92 130.8 116.5"/>
+    <polyline class="cls-2" points="19.91 33.5 33.07 58.56 17.93 75.26 31.12 95.92 19.2 116.5"/>
  </g>
-</svg>
+</svg>
--- a/pcsx2/Config.h
+++ b/pcsx2/Config.h
@@ -1276,6 +1276,7 @@ struct Pcsx2Config
 		EnableGameFixes : 1, // enables automatic game fixes
 		SaveStateOnShutdown : 1, // default value for saving state on shutdown
 		EnableDiscordPresence : 1, // enables discord rich presence integration
+		UseSavestateSelector: 1,
 		InhibitScreensaver : 1,
 		BackupSavestate : 1,
 		McdFolderAutoManage : 1,
--- a/pcsx2/Hotkeys.cpp
+++ b/pcsx2/Hotkeys.cpp
@@ -106,6 +106,11 @@ static bool CanPause()
 	return true;
 }

+static bool UseSavestateSelector()
+{
+	return EmuConfig.UseSavestateSelector;
+}
+
 BEGIN_HOTKEY_LIST(g_common_hotkeys)
 DEFINE_HOTKEY("OpenPauseMenu", TRANSLATE_NOOP("Hotkeys", "System"), TRANSLATE_NOOP("Hotkeys", "Open Pause Menu"),
 	[](s32 pressed) {
@@ -222,12 +227,12 @@ DEFINE_HOTKEY("InputRecToggleMode", TRANSLATE_NOOP("Hotkeys", "System"),
 DEFINE_HOTKEY("PreviousSaveStateSlot", TRANSLATE_NOOP("Hotkeys", "Save States"),
 	TRANSLATE_NOOP("Hotkeys", "Select Previous Save Slot"), [](s32 pressed) {
 		if (!pressed && VMManager::HasValidVM())
-			SaveStateSelectorUI::SelectPreviousSlot(true);
+			SaveStateSelectorUI::SelectPreviousSlot(UseSavestateSelector());
 	})
 DEFINE_HOTKEY("NextSaveStateSlot", TRANSLATE_NOOP("Hotkeys", "Save States"),
 	TRANSLATE_NOOP("Hotkeys", "Select Next Save Slot"), [](s32 pressed) {
 		if (!pressed && VMManager::HasValidVM())
-			SaveStateSelectorUI::SelectNextSlot(true);
+			SaveStateSelectorUI::SelectNextSlot(UseSavestateSelector());
 	})
 DEFINE_HOTKEY("SaveStateToSlot", TRANSLATE_NOOP("Hotkeys", "Save States"),
 	TRANSLATE_NOOP("Hotkeys", "Save State To Selected Slot"), [](s32 pressed) {
--- a/pcsx2/ImGui/FullscreenUI.cpp
+++ b/pcsx2/ImGui/FullscreenUI.cpp
@@ -3168,6 +3168,9 @@ void FullscreenUI::DrawInterfaceSettingsPage()
 	DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_ARCHIVE, "Create Save State Backups"),
 		FSUI_CSTR("Creates a backup copy of a save state if it already exists when the save is created. The backup copy has a .backup suffix"),
 		"EmuCore", "BackupSavestate", true);
+	DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_INFO_CIRCLE, "Use Save State Selector"),
+		FSUI_CSTR("Show a save state selector UI when switching slots instead of showing a notification bubble."),
+		"EmuCore", "UseSavestateSelector", true);
 	if (DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_LIGHTBULB, "Use Light Theme"),
 			FSUI_CSTR("Uses a light coloured theme instead of the default dark theme."), "UI", "UseLightFullscreenUITheme", false))
 	{
@@ -6221,13 +6224,23 @@ void FullscreenUI::DrawGameGrid(const ImVec2& heading_size)
 	SmallString draw_title;

 	u32 grid_x = 0;
-	ImGui::SetCursorPos(ImVec2(start_x, 0.0f));
 	for (const GameList::Entry* entry : s_game_list_sorted_entries)
 	{
 		ImGuiWindow* window = ImGui::GetCurrentWindow();
 		if (window->SkipItems)
 			continue;

+		if (grid_x == grid_count_x)
+		{
+			grid_x = 0;
+			ImGui::SetCursorPosX(start_x);
+			ImGui::SetCursorPosY(ImGui::GetCursorPosY() + item_spacing);
+		}
+		else
+		{
+			ImGui::SameLine(start_x + static_cast<float>(grid_x) * (item_width + item_spacing));
+		}
+
 		const ImGuiID id = window->GetID(entry->path.c_str(), entry->path.c_str() + entry->path.length());
 		const ImVec2 pos(window->DC.CursorPos);
 		ImRect bb(pos, pos + item_size);
@@ -6280,16 +6293,6 @@ void FullscreenUI::DrawGameGrid(const ImVec2& heading_size)
 		}

 		grid_x++;
-		if (grid_x == grid_count_x)
-		{
-			grid_x = 0;
-			ImGui::SetCursorPosX(start_x);
-			ImGui::SetCursorPosY(ImGui::GetCursorPosY() + item_spacing);
-		}
-		else
-		{
-			ImGui::SameLine(start_x + static_cast<float>(grid_x) * (item_width + item_spacing));
-		}
 	}

 	EndMenuButtons();
--- a/pcsx2/Pcsx2Config.cpp
+++ b/pcsx2/Pcsx2Config.cpp
@@ -1928,6 +1928,7 @@ void Pcsx2Config::LoadSaveCore(SettingsWrapper& wrap)
 	SettingsWrapBitBool(EnableRecordingTools);
 	SettingsWrapBitBool(EnableGameFixes);
 	SettingsWrapBitBool(SaveStateOnShutdown);
+	SettingsWrapBitBool(UseSavestateSelector);
 	SettingsWrapBitBool(EnableDiscordPresence);
 	SettingsWrapBitBool(InhibitScreensaver);
 	SettingsWrapBitBool(HostFs);
Author	SHA1	Message	Date
TheLastRar	e57f7d92c3	FSUI: Don't move IMGUI cursor unnecessarily in DrawGameGrid()	2024-11-04 12:40:31 +01:00
Gd7	b95eb5cd74	GameDB: Final Fantasy X Optimal FPU config. (#11958 ) Fixes the vast majority of FFX's FPU glitches as well as fixing a major cutscene bug without breaking anything more than what the current config already breaks. EE clamping fixes reverse controls and characters and enemies facing the wrong way during battles, everything else is affected by EE rounding and EE division rounding. VU0 clamping affects nothing.	2024-11-04 12:40:16 +01:00
KamFretoZ	b865bbb0d3	CI: Add ci skip to base translation update workflow	2024-11-04 12:39:04 +01:00
KamFretoZ	ca6e1c9a46	Qt: Cleanup Unused InputRec Menu	2024-11-04 12:39:04 +01:00
KamFretoZ	ea8a2deae6	Qt: Icon Tweaks	2024-11-04 12:39:04 +01:00
KamFretoZ	c67237672c	Qt/Savestate: Add option to disable savestate selector UI	2024-11-04 12:39:04 +01:00