GS/HW: Add new method of rounding sprites

2026-07-12 10:14:18 +02:00 · 2026-02-03 21:03:20 +00:00
43 changed files with 940 additions and 1305 deletions
@@ -17,7 +17,7 @@ jobs:
        run: ./.github/workflows/scripts/common/update_base_translation.sh
      
      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0
+        uses: peter-evans/create-pull-request@98357b18bf14b5342f975ff684046ec3b2a07725
        with:
          title: "Qt: Update Base Translation"
          commit-message: "[ci skip] Qt: Update Base Translation."
@@ -19,7 +19,7 @@ jobs:
          mv ./game_controller_db.txt ${{github.workspace}}/bin/resources/game_controller_db.txt

      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0
+        uses: peter-evans/create-pull-request@98357b18bf14b5342f975ff684046ec3b2a07725
        with:
          title: "PAD: Update to latest controller database"
          commit-message: "[ci skip] PAD: Update to latest controller database."
@@ -18,9 +18,6 @@ if [ "${INSTALLDIR:0:1}" != "/" ]; then
 	INSTALLDIR="$PWD/$INSTALLDIR"
 fi

-QT=6.10.2
-QTAPNG=1.3.0
-
 FFMPEG=8.0
 FREETYPE=2.14.1
 HARFBUZZ=12.2.0
@@ -30,6 +27,8 @@ LIBPNG=1.6.53
 LIBWEBP=1.6.0
 NVENC=13.0.19.0
 SDL=SDL3-3.4.0
+QT=6.10.1
+QTAPNG=1.3.0
 LZ4=1.10.0
 VULKAN=1.4.328.1
 ZSTD=1.5.7
@@ -48,14 +47,6 @@ cd deps-build
 export PKG_CONFIG_PATH="$INSTALLDIR/lib/pkgconfig:$PKG_CONFIG_PATH"

 cat > SHASUMS <<EOF
-aeb78d29291a2b5fd53cb55950f8f5065b4978c25fb1d77f627d695ab9adf21e  qtbase-everywhere-src-$QT.tar.xz
-8b8f9c718638081e7b3c000e7f31910140b1202a98e98df5d1b496fe6f639d67  qtimageformats-everywhere-src-$QT.tar.xz
-f07ff80f38caf235187200345392ca7479445ddf49a36c3694cd52a735dad6e1  qtsvg-everywhere-src-$QT.tar.xz
-1e3d2c07c1fd76d2425c6eaeeaa62ffaff5f79210c4e1a5bc2a6a9db668d5b24  qttools-everywhere-src-$QT.tar.xz
-b3b3813bc9d76b545716dc8b6e659fa71b6e2bc14569e9fab6dab8b30650a644  qttranslations-everywhere-src-$QT.tar.xz
-391998eb432719df26a6a67d8efdc67f8bf2afdd76c1ee3381ebff4fe7527ee2  qtwayland-everywhere-src-$QT.tar.xz
-f1d3be3489f758efe1a8f12118a212febbe611aa670af32e0159fa3c1feab2a6  QtApng-$QTAPNG.tar.gz
-
 b2751fccb6cc4c77708113cd78b561059b6fa904b24162fa0be2d60273d27b8e  ffmpeg-$FFMPEG.tar.xz
 32427e8c471ac095853212a37aef816c60b42052d4d9e48230bab3bdf2936ccc  freetype-$FREETYPE.tar.xz
 f63fc519f150465bd0bdafcdf3d0e9c23474f4c474171cd515ea1b3a72c081fb  harfbuzz-$HARFBUZZ.tar.gz
@@ -69,14 +60,20 @@ e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564  libwebp-$LIBWE
 13da39edb3a40ed9713ae390ca89faa2f1202c9dda869ef306a8d4383e242bee  nv-codec-headers-$NVENC.tar.gz
 c465aa56757e7746ac707f582b6e2d51546569a4a2488c1172fb543aa5fdfc2c  vulkan-sdk-$VULKAN.tar.gz
 eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3  zstd-$ZSTD.tar.gz
-51dbf24fe72e43dd7cb9a289d3cab47112010f1a2ed69b6fc8ac0dff31991ed2  KDDockWidgets-$KDDOCKWIDGETS.tar.gz
-7bd4e79ce18b1d47517e7e91fbb7cf19d4f01942804a519bc7c0bf32b6325dd5  plutovg-$PLUTOVG.tar.gz
-78561b571ac224030cdc450ca2986b4de915c2ba7616004a6d71a379bffd15f3  plutosvg-$PLUTOSVG.tar.gz
-
+5a6226f7e23db51fdc3223121eba53f3f5447cf0cc4d6cb82a3a2df7a65d265d  qtbase-everywhere-src-$QT.tar.xz
+498eabdf2381db96f808942b3e3c765f6360fe6c0e9961f0a45ff7a4c68d7a72  qtimageformats-everywhere-src-$QT.tar.xz
+c02f355a58f3bbcf404a628bf488b6aeb2d84a94c269afdb86f6e529343ab01f  qtsvg-everywhere-src-$QT.tar.xz
+8148408380ffea03101a26305c812b612ea30dbc07121e58707601522404d49b  qttools-everywhere-src-$QT.tar.xz
+8e49a2df88a12c376a479ae7bd272a91cf57ebb4e7c0cf7341b3565df99d2314  qttranslations-everywhere-src-$QT.tar.xz
+49bf6db800227a6b2c971f4c5d03dd1e81297e7ffb296ce4a96437304f27cb13  qtwayland-everywhere-src-$QT.tar.xz
+f1d3be3489f758efe1a8f12118a212febbe611aa670af32e0159fa3c1feab2a6  QtApng-$QTAPNG.tar.gz
 8a89fb6612ace8954470aae004623374a8fc8b7a34a4277bee5527173b064faf  shaderc-$SHADERC.tar.gz
 272d2725b140e09e85b96eecdc59c2e00c1a14cda2301767e1bf3c363a44b931  shaderc-glslang-$SHADERC_GLSLANG.tar.gz
 c693867f10a7760ef1bcf85419d51783586768cc2c601d03841bc6a8b2554b9c  shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz
 06b0a042f2e121e954badb4fd78c9e2d4bc7ed6087eceb26ab559c23cf94334f  shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz
+51dbf24fe72e43dd7cb9a289d3cab47112010f1a2ed69b6fc8ac0dff31991ed2  KDDockWidgets-$KDDOCKWIDGETS.tar.gz
+7bd4e79ce18b1d47517e7e91fbb7cf19d4f01942804a519bc7c0bf32b6325dd5  plutovg-$PLUTOVG.tar.gz
+78561b571ac224030cdc450ca2986b4de915c2ba7616004a6d71a379bffd15f3  plutosvg-$PLUTOSVG.tar.gz
 EOF

 curl -L \
@@ -216,7 +213,7 @@ tar xf "harfbuzz-$HARFBUZZ.tar.gz"
 cd "harfbuzz-$HARFBUZZ"
 # Add an SOVERSION to match system harfbuzz
 sed -i 's/PROPERTIES VISIBILITY_INLINES_HIDDEN TRUE)/PROPERTIES VISIBILITY_INLINES_HIDDEN TRUE SOVERSION 0)/g' CMakeLists.txt
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DHB_BUILD_UTILS=OFF -DHB_HAVE_FREETYPE=ON -B build -G Ninja
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DHB_BUILD_UTILS=OFF -DHB_HAVE_FREETYPE=ON -DHB_HAVE_GOBJECT=ON -B build -G Ninja
 cmake --build build --parallel
 ninja -C build install
 cd ..
@@ -250,7 +247,7 @@ tar xf "qtbase-everywhere-src-$QT.tar.xz"
 cd "qtbase-everywhere-src-$QT"
 mkdir build
 cd build
-../configure -prefix "$INSTALLDIR" -release -dbus-linked -gui -widgets -fontconfig -qt-doubleconversion -ssl -openssl-runtime -opengl desktop -qpa xcb,wayland -xkbcommon -xcb -- --log-level=STATUS -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DFEATURE_dbus=ON -DFEATURE_icu=OFF -DFEATURE_printsupport=OFF -DFEATURE_sql=OFF -DFEATURE_system_png=ON -DFEATURE_system_jpeg=ON -DFEATURE_system_zlib=ON -DFEATURE_system_freetype=ON -DFEATURE_system_harfbuzz=ON -DFEATURE_gtk3=OFF
+../configure -prefix "$INSTALLDIR" -release -dbus-linked -gui -widgets -fontconfig -qt-doubleconversion -ssl -openssl-runtime -opengl desktop -qpa xcb,wayland -xkbcommon -xcb -gtk -- --log-level=STATUS -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DFEATURE_dbus=ON -DFEATURE_icu=OFF -DFEATURE_printsupport=OFF -DFEATURE_sql=OFF -DFEATURE_system_png=ON -DFEATURE_system_jpeg=ON -DFEATURE_system_zlib=ON -DFEATURE_system_freetype=ON -DFEATURE_system_harfbuzz=ON
 cmake --build . --parallel
 ninja install
 cd ../../
@@ -38,9 +38,6 @@ if [ "${INSTALLDIR:0:1}" != "/" ]; then
 	INSTALLDIR="$PWD/$INSTALLDIR"
 fi

-QT=6.10.1
-QTAPNG=1.3.0
-
 FREETYPE=2.14.1
 HARFBUZZ=12.2.0
 SDL=SDL3-3.4.0
@@ -51,6 +48,8 @@ LIBJPEGTURBO=3.1.2
 LIBWEBP=1.6.0
 FFMPEG=8.0
 MOLTENVK=1.4.1
+QT=6.10.1
+QTAPNG=1.3.0
 KDDOCKWIDGETS=2.4.0
 PLUTOVG=1.3.2
 PLUTOSVG=0.0.7
@@ -79,13 +78,6 @@ CMAKE_ARCH_ARM64=-DCMAKE_OSX_ARCHITECTURES="arm64"
 CMAKE_ARCH_UNIVERSAL=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"

 cat > SHASUMS <<EOF
-aeb78d29291a2b5fd53cb55950f8f5065b4978c25fb1d77f627d695ab9adf21e  qtbase-everywhere-src-$QT.tar.xz
-8b8f9c718638081e7b3c000e7f31910140b1202a98e98df5d1b496fe6f639d67  qtimageformats-everywhere-src-$QT.tar.xz
-f07ff80f38caf235187200345392ca7479445ddf49a36c3694cd52a735dad6e1  qtsvg-everywhere-src-$QT.tar.xz
-1e3d2c07c1fd76d2425c6eaeeaa62ffaff5f79210c4e1a5bc2a6a9db668d5b24  qttools-everywhere-src-$QT.tar.xz
-b3b3813bc9d76b545716dc8b6e659fa71b6e2bc14569e9fab6dab8b30650a644  qttranslations-everywhere-src-$QT.tar.xz
-f1d3be3489f758efe1a8f12118a212febbe611aa670af32e0159fa3c1feab2a6  QtApng-$QTAPNG.tar.gz
-
 32427e8c471ac095853212a37aef816c60b42052d4d9e48230bab3bdf2936ccc  freetype-$FREETYPE.tar.xz
 f63fc519f150465bd0bdafcdf3d0e9c23474f4c474171cd515ea1b3a72c081fb  harfbuzz-$HARFBUZZ.tar.gz
 082cbf5f429e0d80820f68dc2b507a94d4cc1b4e70817b119bbb8ec6a69584b8  $SDL.tar.gz
@@ -97,14 +89,19 @@ e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564  libwebp-$LIBWE
 8f0012234b464ce50890c490f18194f913a7b1f4e6a03d6644179fa0f867d0cf  libjpeg-turbo-$LIBJPEGTURBO.tar.gz
 b2751fccb6cc4c77708113cd78b561059b6fa904b24162fa0be2d60273d27b8e  ffmpeg-$FFMPEG.tar.xz
 9985f141902a17de818e264d17c1ce334b748e499ee02fcb4703e4dc0038f89c  v$MOLTENVK.tar.gz
-51dbf24fe72e43dd7cb9a289d3cab47112010f1a2ed69b6fc8ac0dff31991ed2  KDDockWidgets-$KDDOCKWIDGETS.tar.gz
-7bd4e79ce18b1d47517e7e91fbb7cf19d4f01942804a519bc7c0bf32b6325dd5  plutovg-$PLUTOVG.tar.gz
-78561b571ac224030cdc450ca2986b4de915c2ba7616004a6d71a379bffd15f3  plutosvg-$PLUTOSVG.tar.gz
-
+5a6226f7e23db51fdc3223121eba53f3f5447cf0cc4d6cb82a3a2df7a65d265d  qtbase-everywhere-src-$QT.tar.xz
+498eabdf2381db96f808942b3e3c765f6360fe6c0e9961f0a45ff7a4c68d7a72  qtimageformats-everywhere-src-$QT.tar.xz
+c02f355a58f3bbcf404a628bf488b6aeb2d84a94c269afdb86f6e529343ab01f  qtsvg-everywhere-src-$QT.tar.xz
+8148408380ffea03101a26305c812b612ea30dbc07121e58707601522404d49b  qttools-everywhere-src-$QT.tar.xz
+8e49a2df88a12c376a479ae7bd272a91cf57ebb4e7c0cf7341b3565df99d2314  qttranslations-everywhere-src-$QT.tar.xz
+f1d3be3489f758efe1a8f12118a212febbe611aa670af32e0159fa3c1feab2a6  QtApng-$QTAPNG.tar.gz
 8a89fb6612ace8954470aae004623374a8fc8b7a34a4277bee5527173b064faf  shaderc-$SHADERC.tar.gz
 272d2725b140e09e85b96eecdc59c2e00c1a14cda2301767e1bf3c363a44b931  shaderc-glslang-$SHADERC_GLSLANG.tar.gz
 c693867f10a7760ef1bcf85419d51783586768cc2c601d03841bc6a8b2554b9c  shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz
 06b0a042f2e121e954badb4fd78c9e2d4bc7ed6087eceb26ab559c23cf94334f  shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz
+51dbf24fe72e43dd7cb9a289d3cab47112010f1a2ed69b6fc8ac0dff31991ed2  KDDockWidgets-$KDDOCKWIDGETS.tar.gz
+7bd4e79ce18b1d47517e7e91fbb7cf19d4f01942804a519bc7c0bf32b6325dd5  plutovg-$PLUTOVG.tar.gz
+78561b571ac224030cdc450ca2986b4de915c2ba7616004a6d71a379bffd15f3  plutosvg-$PLUTOSVG.tar.gz
 EOF

 curl -C - -L \
@@ -20,9 +20,6 @@ if [ "${INSTALLDIR:0:1}" != "/" ]; then
 	INSTALLDIR="$PWD/$INSTALLDIR"
 fi

-QT=6.10.2
-QTAPNG=1.3.0
-
 FREETYPE=2.14.1
 HARFBUZZ=12.2.0
 SDL=SDL3-3.4.0
@@ -33,6 +30,8 @@ LIBJPEGTURBO=3.1.2
 LIBWEBP=1.6.0
 FFMPEG=8.0
 MOLTENVK=1.4.1
+QT=6.10.1
+QTAPNG=1.3.0
 KDDOCKWIDGETS=2.4.0
 PLUTOVG=1.3.2
 PLUTOSVG=0.0.7
@@ -60,13 +59,6 @@ CMAKE_COMMON=(
 )

 cat > SHASUMS <<EOF
-aeb78d29291a2b5fd53cb55950f8f5065b4978c25fb1d77f627d695ab9adf21e  qtbase-everywhere-src-$QT.tar.xz
-8b8f9c718638081e7b3c000e7f31910140b1202a98e98df5d1b496fe6f639d67  qtimageformats-everywhere-src-$QT.tar.xz
-f07ff80f38caf235187200345392ca7479445ddf49a36c3694cd52a735dad6e1  qtsvg-everywhere-src-$QT.tar.xz
-1e3d2c07c1fd76d2425c6eaeeaa62ffaff5f79210c4e1a5bc2a6a9db668d5b24  qttools-everywhere-src-$QT.tar.xz
-b3b3813bc9d76b545716dc8b6e659fa71b6e2bc14569e9fab6dab8b30650a644  qttranslations-everywhere-src-$QT.tar.xz
-f1d3be3489f758efe1a8f12118a212febbe611aa670af32e0159fa3c1feab2a6  QtApng-$QTAPNG.tar.gz
-
 32427e8c471ac095853212a37aef816c60b42052d4d9e48230bab3bdf2936ccc  freetype-$FREETYPE.tar.xz
 f63fc519f150465bd0bdafcdf3d0e9c23474f4c474171cd515ea1b3a72c081fb  harfbuzz-$HARFBUZZ.tar.gz
 082cbf5f429e0d80820f68dc2b507a94d4cc1b4e70817b119bbb8ec6a69584b8  $SDL.tar.gz
@@ -78,14 +70,19 @@ e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564  libwebp-$LIBWE
 8f0012234b464ce50890c490f18194f913a7b1f4e6a03d6644179fa0f867d0cf  libjpeg-turbo-$LIBJPEGTURBO.tar.gz
 b2751fccb6cc4c77708113cd78b561059b6fa904b24162fa0be2d60273d27b8e  ffmpeg-$FFMPEG.tar.xz
 9985f141902a17de818e264d17c1ce334b748e499ee02fcb4703e4dc0038f89c  v$MOLTENVK.tar.gz
-51dbf24fe72e43dd7cb9a289d3cab47112010f1a2ed69b6fc8ac0dff31991ed2  KDDockWidgets-$KDDOCKWIDGETS.tar.gz
-7bd4e79ce18b1d47517e7e91fbb7cf19d4f01942804a519bc7c0bf32b6325dd5  plutovg-$PLUTOVG.tar.gz
-78561b571ac224030cdc450ca2986b4de915c2ba7616004a6d71a379bffd15f3  plutosvg-$PLUTOSVG.tar.gz
-
+5a6226f7e23db51fdc3223121eba53f3f5447cf0cc4d6cb82a3a2df7a65d265d  qtbase-everywhere-src-$QT.tar.xz
+498eabdf2381db96f808942b3e3c765f6360fe6c0e9961f0a45ff7a4c68d7a72  qtimageformats-everywhere-src-$QT.tar.xz
+c02f355a58f3bbcf404a628bf488b6aeb2d84a94c269afdb86f6e529343ab01f  qtsvg-everywhere-src-$QT.tar.xz
+8148408380ffea03101a26305c812b612ea30dbc07121e58707601522404d49b  qttools-everywhere-src-$QT.tar.xz
+8e49a2df88a12c376a479ae7bd272a91cf57ebb4e7c0cf7341b3565df99d2314  qttranslations-everywhere-src-$QT.tar.xz
+f1d3be3489f758efe1a8f12118a212febbe611aa670af32e0159fa3c1feab2a6  QtApng-$QTAPNG.tar.gz
 8a89fb6612ace8954470aae004623374a8fc8b7a34a4277bee5527173b064faf  shaderc-$SHADERC.tar.gz
 272d2725b140e09e85b96eecdc59c2e00c1a14cda2301767e1bf3c363a44b931  shaderc-glslang-$SHADERC_GLSLANG.tar.gz
 c693867f10a7760ef1bcf85419d51783586768cc2c601d03841bc6a8b2554b9c  shaderc-spirv-headers-$SHADERC_SPIRVHEADERS.tar.gz
 06b0a042f2e121e954badb4fd78c9e2d4bc7ed6087eceb26ab559c23cf94334f  shaderc-spirv-tools-$SHADERC_SPIRVTOOLS.tar.gz
+51dbf24fe72e43dd7cb9a289d3cab47112010f1a2ed69b6fc8ac0dff31991ed2  KDDockWidgets-$KDDOCKWIDGETS.tar.gz
+7bd4e79ce18b1d47517e7e91fbb7cf19d4f01942804a519bc7c0bf32b6325dd5  plutovg-$PLUTOVG.tar.gz
+78561b571ac224030cdc450ca2986b4de915c2ba7616004a6d71a379bffd15f3  plutosvg-$PLUTOSVG.tar.gz
 EOF

 curl -L \
@@ -2,15 +2,10 @@
 setlocal enabledelayedexpansion

 echo Setting environment...
-if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" (
-  for /f "usebackq tokens=*" %%i in (`call "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -version "[17, 18)" -latest -property installationPath`) do set "VSINSTPATH=%%i"
-  if defined VSINSTPATH (
-    echo VSINSTPATH=!VSINSTPATH!
-    call "!VSINSTPATH!\VC\Auxiliary\Build\vcvarsamd64_arm64.bat" || goto error
-  ) else (
-    echo Visual Studio 2022 not found.
-    goto error
-  )
+if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsamd64_arm64.bat" (
+  call "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsamd64_arm64.bat"
+) else if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsamd64_arm64.bat" (
+  call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsamd64_arm64.bat"
 ) else (
  echo Visual Studio 2022 not found.
  goto error
@@ -47,16 +42,15 @@ echo INSTALLDIR=%INSTALLDIR%

 cd "%BUILDDIR%"

-set QT=6.10.2
-set QTMINOR=6.10
-set QTAPNG=1.3.0
-
 set FREETYPE=2.14.1
 set HARFBUZZ=12.2.0
 set LIBJPEGTURBO=3.1.2
 set LIBPNG=1653
 set LIBPNGLONG=1.6.53
 set SDL=SDL3-3.4.0
+set QT=6.10.1
+set QTMINOR=6.10
+set QTAPNG=1.3.0
 set LZ4=1.10.0
 set WEBP=1.6.0
 set ZLIB=1.3.1
@@ -73,13 +67,6 @@ set SHADERC_SPIRVTOOLS=971a7b6e8d7740035bbff089bbbf9f42951ecfd5

 set AGILITYSDK=1.618.5

-call :downloadfile "qtbase-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtbase-everywhere-src-%QT%.zip" 690e08ce807041150d388b5351de2e591febf0a0bc973b56e1197e2df9a2d96f || goto error
-call :downloadfile "qtimageformats-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtimageformats-everywhere-src-%QT%.zip" a407e489ca8d68639530e881aea797f58754e355ca06024a73358bd9cc5fca17 || goto error
-call :downloadfile "qtsvg-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtsvg-everywhere-src-%QT%.zip" fd9f4f6e983a55f6b0ba4c49ce13f8b014cd30d12e75a49a478a640462f9bf64 || goto error
-call :downloadfile "qttools-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttools-everywhere-src-%QT%.zip" a498357aed659c66aa87ceb556eacab55e3e7d7c9b9599049066de70eb7efa59 || goto error
-call :downloadfile "qttranslations-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttranslations-everywhere-src-%QT%.zip" cf5e04a2048c02369f579c1251f61af965f241cde2d69de3db90e6c9f0ee2bf3 || goto error
-call :downloadfile "QtApng-%QTAPNG%.zip" "https://github.com/jurplel/QtApng/archive/refs/tags/%QTAPNG%.zip" 5176082cdd468047a7eb1ec1f106b032f57df207aa318d559b29606b00d159ac || goto error
-
 call :downloadfile "freetype-%FREETYPE%.tar.gz" https://sourceforge.net/projects/freetype/files/freetype2/%FREETYPE%/freetype-%FREETYPE%.tar.gz/download 174d9e53402e1bf9ec7277e22ec199ba3e55a6be2c0740cb18c0ee9850fc8c34 || goto error
 call :downloadfile "harfbuzz-%HARFBUZZ%.zip" https://github.com/harfbuzz/harfbuzz/archive/refs/tags/%HARFBUZZ%.zip 31490c781bacd2ce56862555b11c51c964977c39f14f51b817dfaecf0be089fe || goto error
 call :downloadfile "lpng%LIBPNG%.zip" https://download.sourceforge.net/libpng/lpng1653.zip 140566abc64bb2320cb35f1d154d1cb3eb7174a12234d33bfdffb446bdc0a1d2 || goto error
@@ -87,6 +74,12 @@ call :downloadfile "lpng%LIBPNG%-apng.patch.gz" https://download.sourceforge.net
 call :downloadfile "libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/%LIBJPEGTURBO%/libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" 8f0012234b464ce50890c490f18194f913a7b1f4e6a03d6644179fa0f867d0cf || goto error
 call :downloadfile "libwebp-%WEBP%.tar.gz" "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-%WEBP%.tar.gz" e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564 || goto error
 call :downloadfile "%SDL%.zip" "https://libsdl.org/release/%SDL%.zip" 9ac2debb493e0d3e13dbd2729fb91f4bfeb00a0f4dff5e04b73cc9bac276b38d || goto error
+call :downloadfile "qtbase-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtbase-everywhere-src-%QT%.zip" c43f471a808b07fc541528410e94ce89c6745bdc1d744492e19911d35fbf7d33 || goto error
+call :downloadfile "qtimageformats-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtimageformats-everywhere-src-%QT%.zip" 2d828d8c999fdd18167937c071781c22321c643b04a106c714411c2356cdb26d || goto error
+call :downloadfile "qtsvg-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtsvg-everywhere-src-%QT%.zip" ddd74a417d2397eb085d047a9b6ba52b76e748055817f728fe691f8456035d23 || goto error
+call :downloadfile "qttools-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttools-everywhere-src-%QT%.zip" db8e49ed50912c3c064a4f9ada7791c09eccec5a8d53463a19608eaab17679f0 || goto error
+call :downloadfile "qttranslations-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttranslations-everywhere-src-%QT%.zip" 868eb651e395d48ade5932ef2c386e606e054eb5888ebe5284fbd8cb63ed935a || goto error
+call :downloadfile "QtApng-%QTAPNG%.zip" "https://github.com/jurplel/QtApng/archive/refs/tags/%QTAPNG%.zip" 5176082cdd468047a7eb1ec1f106b032f57df207aa318d559b29606b00d159ac || goto error
 call :downloadfile "lz4-%LZ4%.zip" "https://github.com/lz4/lz4/archive/refs/tags/v%LZ4%.zip" 3224b4c80f351f194984526ef396f6079bd6332dd9825c72ac0d7a37b3cdc565 || goto error
 call :downloadfile "zlib%ZLIBSHORT%.zip" "https://github.com/madler/zlib/releases/download/v%ZLIB%/zlib%ZLIBSHORT%.zip" 72af66d44fcc14c22013b46b814d5d2514673dda3d115e64b690c1ad636e7b17 || goto error
 call :downloadfile "zstd-%ZSTD%.zip" "https://github.com/facebook/zstd/archive/refs/tags/v%ZSTD%.zip" 7897bc5d620580d9b7cd3539c44b59d78f3657d33663fe97a145e07b4ebd69a4 || goto error
@@ -2,15 +2,10 @@
 setlocal enabledelayedexpansion

 echo Setting environment...
-if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" (
-  for /f "usebackq tokens=*" %%i in (`call "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -version "[17, 18)" -latest -property installationPath`) do set "VSINSTPATH=%%i"
-  if defined VSINSTPATH (
-    echo VSINSTPATH=!VSINSTPATH!
-    call "!VSINSTPATH!\VC\Auxiliary\Build\vcvars64.bat" || goto error
-  ) else (
-    echo Visual Studio 2022 not found.
-    goto error
-  )
+if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" (
+  call "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+) else if exist "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat" (
+  call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat"
 ) else (
  echo Visual Studio 2022 not found.
  goto error
@@ -45,16 +40,15 @@ set "PATH=%PATH%;%INSTALLDIR%\bin"

 cd "%BUILDDIR%"

-set QT=6.10.2
-set QTMINOR=6.10
-set QTAPNG=1.3.0
-
 set FREETYPE=2.14.1
 set HARFBUZZ=12.2.0
 set LIBJPEGTURBO=3.1.2
 set LIBPNG=1653
 set LIBPNGLONG=1.6.53
 set SDL=SDL3-3.4.0
+set QT=6.10.1
+set QTMINOR=6.10
+set QTAPNG=1.3.0
 set LZ4=1.10.0
 set WEBP=1.6.0
 set ZLIB=1.3.1
@@ -71,13 +65,6 @@ set SHADERC_SPIRVTOOLS=971a7b6e8d7740035bbff089bbbf9f42951ecfd5

 set AGILITYSDK=1.618.5

-call :downloadfile "qtbase-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtbase-everywhere-src-%QT%.zip" 690e08ce807041150d388b5351de2e591febf0a0bc973b56e1197e2df9a2d96f || goto error
-call :downloadfile "qtimageformats-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtimageformats-everywhere-src-%QT%.zip" a407e489ca8d68639530e881aea797f58754e355ca06024a73358bd9cc5fca17 || goto error
-call :downloadfile "qtsvg-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtsvg-everywhere-src-%QT%.zip" fd9f4f6e983a55f6b0ba4c49ce13f8b014cd30d12e75a49a478a640462f9bf64 || goto error
-call :downloadfile "qttools-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttools-everywhere-src-%QT%.zip" a498357aed659c66aa87ceb556eacab55e3e7d7c9b9599049066de70eb7efa59 || goto error
-call :downloadfile "qttranslations-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttranslations-everywhere-src-%QT%.zip" cf5e04a2048c02369f579c1251f61af965f241cde2d69de3db90e6c9f0ee2bf3 || goto error
-call :downloadfile "QtApng-%QTAPNG%.zip" "https://github.com/jurplel/QtApng/archive/refs/tags/%QTAPNG%.zip" 5176082cdd468047a7eb1ec1f106b032f57df207aa318d559b29606b00d159ac || goto error
-
 call :downloadfile "freetype-%FREETYPE%.tar.gz" https://sourceforge.net/projects/freetype/files/freetype2/%FREETYPE%/freetype-%FREETYPE%.tar.gz/download 174d9e53402e1bf9ec7277e22ec199ba3e55a6be2c0740cb18c0ee9850fc8c34 || goto error
 call :downloadfile "harfbuzz-%HARFBUZZ%.zip" https://github.com/harfbuzz/harfbuzz/archive/refs/tags/%HARFBUZZ%.zip 31490c781bacd2ce56862555b11c51c964977c39f14f51b817dfaecf0be089fe || goto error
 call :downloadfile "lpng%LIBPNG%.zip" https://download.sourceforge.net/libpng/lpng1653.zip 140566abc64bb2320cb35f1d154d1cb3eb7174a12234d33bfdffb446bdc0a1d2 || goto error
@@ -85,6 +72,12 @@ call :downloadfile "lpng%LIBPNG%-apng.patch.gz" https://download.sourceforge.net
 call :downloadfile "libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/%LIBJPEGTURBO%/libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" 8f0012234b464ce50890c490f18194f913a7b1f4e6a03d6644179fa0f867d0cf || goto error
 call :downloadfile "libwebp-%WEBP%.tar.gz" "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-%WEBP%.tar.gz" e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564 || goto error
 call :downloadfile "%SDL%.zip" "https://libsdl.org/release/%SDL%.zip" 9ac2debb493e0d3e13dbd2729fb91f4bfeb00a0f4dff5e04b73cc9bac276b38d || goto error
+call :downloadfile "qtbase-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtbase-everywhere-src-%QT%.zip" c43f471a808b07fc541528410e94ce89c6745bdc1d744492e19911d35fbf7d33 || goto error
+call :downloadfile "qtimageformats-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtimageformats-everywhere-src-%QT%.zip" 2d828d8c999fdd18167937c071781c22321c643b04a106c714411c2356cdb26d || goto error
+call :downloadfile "qtsvg-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qtsvg-everywhere-src-%QT%.zip" ddd74a417d2397eb085d047a9b6ba52b76e748055817f728fe691f8456035d23 || goto error
+call :downloadfile "qttools-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttools-everywhere-src-%QT%.zip" db8e49ed50912c3c064a4f9ada7791c09eccec5a8d53463a19608eaab17679f0 || goto error
+call :downloadfile "qttranslations-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttranslations-everywhere-src-%QT%.zip" 868eb651e395d48ade5932ef2c386e606e054eb5888ebe5284fbd8cb63ed935a || goto error
+call :downloadfile "QtApng-%QTAPNG%.zip" "https://github.com/jurplel/QtApng/archive/refs/tags/%QTAPNG%.zip" 5176082cdd468047a7eb1ec1f106b032f57df207aa318d559b29606b00d159ac || goto error
 call :downloadfile "lz4-%LZ4%.zip" "https://github.com/lz4/lz4/archive/refs/tags/v%LZ4%.zip" 3224b4c80f351f194984526ef396f6079bd6332dd9825c72ac0d7a37b3cdc565 || goto error
 call :downloadfile "zlib%ZLIBSHORT%.zip" "https://github.com/madler/zlib/releases/download/v%ZLIB%/zlib%ZLIBSHORT%.zip" 72af66d44fcc14c22013b46b814d5d2514673dda3d115e64b690c1ad636e7b17 || goto error
 call :downloadfile "zstd-%ZSTD%.zip" "https://github.com/facebook/zstd/archive/refs/tags/v%ZSTD%.zip" 7897bc5d620580d9b7cd3539c44b59d78f3657d33663fe97a145e07b4ebd69a4 || goto error
@@ -236,7 +236,7 @@
 03000000ac0500005b05000000000000,GameSir G3w,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
 03000000ac0500002d02000000000000,GameSir G4,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
 03000000ac0500004d04000000000000,GameSir G4,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
-03000000373500002210000000000000,GameSir G7 Pro,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000373500002210000000000000,GameSir G7 Pro,a:b0,b:b1,x:b3,y:b4,back:b10,start:b11,leftstick:b13,rightstick:b14,leftshoulder:b6,rightshoulder:b7,dpup:h0.1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,leftx:a0,lefty:a1,lefty:a2,rightx:a3,righty:a4,lefttrigger:b8,righttrigger:b9,platform:Window,
 03000000ac0500001a06000000000000,GameSir T3 2.02,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b15,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
 03000000373500009410000000000000,GameSir Tegenaria Lite,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
 030000004c0e00001035000000000000,Gamester,a:b0,b:b1,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b11,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Windows,
@@ -246,6 +246,8 @@
 03000000b62500000100000000000000,Gametel GT004 01,a:b3,b:b0,dpdown:b10,dpleft:b9,dpright:b8,dpup:b11,leftshoulder:b4,rightshoulder:b5,start:b7,x:b1,y:b2,platform:Windows,
 030000008f0e00001411000000000000,Gamo2 Divaller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
 03000000120c0000a857000000000000,Gator Claw,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000c21100000791000000000000,Nacon GC101 1.03,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+03000000c9110000f055000000000000,Nacon GC100XF,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
 030000008305000009a0000000000000,Genius,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
 030000008305000031b0000000000000,Genius Maxfire Blaze 3,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
 03000000451300000010000000000000,Genius Maxfire Grandias 12,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
@@ -365,7 +367,7 @@
 03000000fd0500002a26000000000000,InterAct Hammerhead FX,a:b3,b:b4,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b0,y:b1,platform:Windows,
 03000000fd0500002f26000000000000,InterAct Hammerhead FX,a:b4,b:b5,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b1,y:b2,platform:Windows,
 03000000fd0500005302000000000000,InterAct ProPad,a:b3,b:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b2,righttrigger:b5,x:b0,y:b1,platform:Windows,
-03000000ac0500002c02000000000000,Ipega Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b8,leftstick:b13,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b9,rightstick:b14,righttrigger:b7,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000ac0500002c02000000000000,Ipega Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b8,leftstick:b13,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b9,rightstick:b14,righttrigger:b7,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
 03000000491900000204000000000000,Ipega PG9023,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
 03000000491900000304000000000000,Ipega PG9087,+righty:+a5,-righty:-a4,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,start:b11,x:b3,y:b4,platform:Windows,
 030000007e0500000620000000000000,Joy-Con (L),+leftx:h0.2,+lefty:h0.4,-leftx:h0.8,-lefty:h0.1,a:b0,b:b1,back:b13,leftshoulder:b4,leftstick:b10,rightshoulder:b5,start:b8,x:b2,y:b3,platform:Windows,
@@ -462,8 +464,6 @@
 03000000250900006688000000000000,MP-8866 Super Dual Box,a:b2,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Windows,
 03000000091200004488000000000000,MUSIA PlayStation 2 Input Display,a:b0,b:b2,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b8,leftstick:b6,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b9,rightstick:b7,righttrigger:b11,rightx:a2,righty:a3,start:b5,x:b1,y:b3,platform:Windows,
 03000000f70600000100000000000000,N64 Adaptoid,+rightx:b2,+righty:b1,-rightx:b4,-righty:b5,a:b0,b:b3,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,leftshoulder:b6,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b7,start:b8,platform:Windows,
-03000000c9110000f055000000000000,Nacon GC100XF,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
-03000000c21100000791000000000000,Nacon GC101 1.03,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
 030000006b140000010c000000000000,Nacon GC400ES,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
 030000006b1400001106000000000000,Nacon Revolution 3 PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
 0300000085320000170d000000000000,Nacon Revolution 5 Pro,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
@@ -697,7 +697,7 @@
 03000000730700000601000000000000,Sega Saturn Controller,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b2,start:b9,x:b3,y:b4,platform:Windows,
 03000000b40400000a01000000000000,Sega Saturn Controller,a:b0,b:b1,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,lefttrigger:b7,rightshoulder:b5,righttrigger:b2,start:b8,x:b3,y:b4,platform:Windows,
 030000003b07000004a1000000000000,SFX,a:b0,b:b2,back:b7,leftshoulder:b6,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b9,righttrigger:b5,start:b8,x:b1,y:b3,platform:Windows,
-03000000632500002705000000000000,ShanWan Q36,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b8,rightshoulder:b7,righttrigger:b9,start:b11,x:b3,y:b4,platform:Windows,
+03000000632500002705000000000000,ShanWan Q36,a:b0,b:b1,x:b3,y:b4,leftshoulder:b6,rightshoulder:b7,lefttrigger:b8,righttrigger:b9,back:b10,start:b11,dpup:h0.1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,platform:Windows,
 03000000f82100001900000000000000,Shogun Bros Chameleon X1,a:b2,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Windows,
 03000000120c00001c1e000000000000,SnakeByte 4S PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
 03000000140300000918000000000000,SNES Controller,a:b0,b:b1,back:b6,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,start:b7,x:b2,y:b3,platform:Windows,
@@ -888,7 +888,6 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 03000000c82d00000851000000010000,8BitDo P30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
 03000000c82d00000660000000010000,8BitDo Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
 03000000c82d00000660000000020000,8BitDo Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
-03000000c82d00000960000000000000,8BitDo Pro 3,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,paddle1:b17,paddle2:b16,paddle3:b2,paddle4:b5,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Mac OS X,
 03000000c82d00000131000001000000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
 03000000c82d00000231000001000000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
 03000000c82d00000331000001000000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
@@ -1175,7 +1174,7 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 03000000c82d00000090000011010000,8BitDo FC30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a5,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
 05000000c82d00001038000000010000,8BitDo FC30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
 05000000c82d00006a28000000010000,8BitDo GameCube,a:b0,b:b3,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,paddle1:b9,paddle2:b8,rightshoulder:b10,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b1,y:b4,platform:Linux,
-03000000c82d00001251000011010000,8BitDo Lite 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+03000000c82d00001251000011010000,8BitDo Lite 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a5,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
 05000000c82d00001251000000010000,8BitDo Lite 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
 03000000c82d00001151000011010000,8BitDo Lite SE,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
 05000000c82d00001151000000010000,8BitDo Lite SE,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
@@ -1398,12 +1397,11 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 03000000242e00006a38000010010000,Hyperkin Trooper 2,a:b0,b:b1,back:b4,leftshoulder:b2,leftx:a0,lefty:a1,rightshoulder:b3,start:b5,platform:Linux,
 03000000242e00008816000001010000,Hyperkin X91,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 03000000f00300008d03000011010000,HyperX Clutch,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
-05000000f00300008d04000000010000,HyperX Clutch,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
 03000000830500006020000010010000,iBuffalo Super Famicom Controller,a:b1,b:b0,back:b6,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,start:b7,x:b3,y:b2,platform:Linux,
-03000000d80400004aea000011010000,icedragon.io STAC Dance Pad,a:b0,b:b1,back:b4,x:b2,y:b3,platform:Linux,
-03000000d80400004bea000011010000,icedragon.io STAC Dance Pad,a:b0,b:b1,back:b4,x:b2,y:b3,platform:Linux,
-030000008a2e0000d910000011010000,icedragon.io STAC2 Dance Pad,a:b0,b:b1,back:b4,x:b2,y:b3,platform:Linux,
-030000008a2e0000e910000011010000,icedragon.io STAC2 Dance Pad,a:b8,b:b9,back:b12,x:b10,y:b11,platform:Linux,
+03000000d80400004bea000011010000,icedragon.io STAC Dance Pad,a:b0,b:b1,x:b2,y:b3,back:b4,platform:Linux,
+03000000d80400004aea000011010000,icedragon.io STAC Dance Pad,a:b0,b:b1,x:b2,y:b3,back:b4,platform:Linux,
+030000008a2e0000d910000011010000,icedragon.io STAC2 Dance Pad,a:b0,b:b1,x:b2,y:b3,back:b4,platform:Linux,
+030000008a2e0000e910000011010000,icedragon.io STAC2 Dance Pad,a:b8,b:b9,x:b10,y:b11,back:b12,platform:Linux,
 030000008f0e00001330000001010000,iCode Retro Adapter,b:b3,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b9,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b1,start:b7,x:b2,y:b0,platform:Linux,
 050000006964726f69643a636f6e0000,idroidcon Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
 03000000b50700001503000010010000,Impact,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b0,y:b1,platform:Linux,
@@ -1489,7 +1487,6 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 030000005e040000ea02000008040000,Microsoft Xbox One,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000005e040000ea0200000f050000,Microsoft Xbox One,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 060000005e040000120b000009050000,Microsoft Xbox One,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,misc1:b11,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-060000005e040000120b000014050000,Microsoft Xbox One,a:b0,b:b1,x:b2,y:b3,start:b7,guide:b8,back:b6,leftstick:b9,rightstick:b10,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a3,righty:a4,lefttrigger:a2,righttrigger:a5,platform:Linux
 030000005e040000e302000003020000,Microsoft Xbox One Elite,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000005e040000000b000007040000,Microsoft Xbox One Elite 2,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,paddle1:b12,paddle2:b14,paddle3:b13,paddle4:b15,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000005e040000000b000008040000,Microsoft Xbox One Elite 2,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,paddle1:b12,paddle2:b14,paddle3:b13,paddle4:b15,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
@@ -1507,6 +1504,7 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 05000000d6200000e589000001000000,Moga 2,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Linux,
 05000000d6200000ad0d000001000000,Moga Pro,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Linux,
 05000000d62000007162000001000000,Moga Pro 2,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Linux,
+03000000c82d00000960000000000000,8BitDo Pro 3,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,paddle1:b17,paddle2:b16,paddle3:b2,paddle4:b5,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Mac OS X,
 03000000c62400002b89000011010000,MOGA XP5A Plus,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
 05000000c62400002a89000000010000,MOGA XP5A Plus,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b22,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
 05000000c62400001a89000000010000,MOGA XP5X Plus,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
@@ -1514,9 +1512,9 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 030000005e0400008e02000010020000,MSI GC20 V2,a:b0,b:b1,back:b6,dpdown:b13,dpleft:b14,dpright:b15,dpup:b12,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 03000000f70600000100000000010000,N64 Adaptoid,+rightx:b2,+righty:b1,-rightx:b4,-righty:b5,a:b0,b:b3,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,leftshoulder:b6,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b7,start:b8,platform:Linux,
 030000006b1400000906000014010000,Nacon Asymmetric Wireless PS4 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000006b140000010c000010010000,Nacon GC400ES,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
 0300000085320000030c000011010000,Nacon GC100,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
 03000000853200000706000012010000,Nacon GC100,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-030000006b140000010c000010010000,Nacon GC400ES,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
 05000000853200000503000000010000,Nacon MGX Pro,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
 0300000085320000170d000011010000,Nacon Revolution 5 Pro,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
 0300000085320000190d000011010000,Nacon Revolution 5 Pro,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
@@ -1802,17 +1800,17 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 05000000434f4d4d414e440000000000,VX Gaming Command Series,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
 0000000058626f782033363020576900,Xbox 360 Controller,a:b0,b:b1,back:b14,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,guide:b7,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Linux,
 030000005e0400001907000000010000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:b14,dpleft:b11,dpright:b12,dpup:b13,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-030000005e0400008e02000000010000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-030000005e0400008e02000002010000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-030000005e0400008e02000010010000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-030000005e0400008e02000014010000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-030000005e0400008e02000047010000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-030000005e0400008e02000072050000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000005e0400009102000007010000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:b14,dpleft:b11,dpright:b12,dpup:b13,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000005e040000a102000000010000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:b14,dpleft:b11,dpright:b12,dpup:b13,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000005e040000a102000007010000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000005e040000a102000030060000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000006f0e00001503000000020000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e0400008e02000000010000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e0400008e02000010010000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e0400008e02000002010000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e0400008e02000014010000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e0400008e02000047010000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e0400008e02000072050000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000005e040000a102000014010000,Xbox 360 Receiver,a:b0,b:b1,back:b6,dpdown:b14,dpleft:b11,dpright:b12,dpup:b13,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 0000000058626f782047616d65706100,Xbox Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a4,rightx:a2,righty:a3,start:b7,x:b2,y:b3,platform:Linux,
 030000005e0400000202000000010000,Xbox Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b5,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b2,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b3,y:b4,platform:Linux,
@@ -108,7 +108,7 @@ disable_compiler_warnings_for_target(speex)

 # Find the Qt components that we need.
 if(ENABLE_QT_UI)
-	find_package(Qt6 6.10.1 COMPONENTS CoreTools Core GuiTools Gui WidgetsTools Widgets LinguistTools REQUIRED)
+	find_package(Qt6 6.10.0 COMPONENTS CoreTools Core GuiTools Gui WidgetsTools Widgets LinguistTools REQUIRED)

 	if(NOT WIN32 AND NOT APPLE)
 		if (Qt6_VERSION VERSION_GREATER_EQUAL 6.10.0)
@@ -1,356 +0,0 @@
-// SPDX-FileCopyrightText: 2002-2026 PCSX2 Dev Team
-// SPDX-License-Identifier: GPL-3.0+
-
-#include "AsyncDialogs.h"
-
-#include "common/Assertions.h"
-
-#include <QtWidgets/QPushButton>
-
-template <typename Value>
-static std::function<void(std::optional<Value>)> wrapValueCallback(std::function<void(Value)> callback)
-{
-	return [callback = std::move(callback)](std::optional<Value> input) {
-		if (input.has_value())
-			callback(std::move(*input));
-	};
-}
-
-void AsyncDialogs::getText(
-	QWidget* parent,
-	const QString& title,
-	const QString& label,
-	const QString& text,
-	std::function<void(QString)> value_callback)
-{
-	getText(parent, title, label, QLineEdit::Normal, text, {}, Qt::ImhNone, wrapValueCallback(std::move(value_callback)));
-}
-
-void AsyncDialogs::getText(
-	QWidget* parent,
-	const QString& title,
-	const QString& label,
-	QLineEdit::EchoMode echo,
-	const QString& text,
-	Qt::WindowFlags flags,
-	Qt::InputMethodHints input_method_hints,
-	std::function<void(std::optional<QString>)> callback)
-{
-	QInputDialog* dialog = new QInputDialog(parent, flags);
-	dialog->setWindowTitle(title);
-	dialog->setLabelText(label);
-	dialog->setTextValue(text);
-	dialog->setTextEchoMode(echo);
-	dialog->setInputMethodHints(input_method_hints);
-	dialog->setAttribute(Qt::WA_DeleteOnClose);
-
-	if (callback)
-	{
-		QObject::connect(dialog, &QDialog::finished, [dialog, callback = std::move(callback)](int result) {
-			callback(result ? std::make_optional<QString>(dialog->textValue()) : std::nullopt);
-		});
-	}
-
-	dialog->open();
-}
-
-void AsyncDialogs::getMultiLineText(
-	QWidget* parent,
-	const QString& title,
-	const QString& label,
-	const QString& text,
-	std::function<void(QString)> value_callback)
-{
-	getMultiLineText(parent, title, label, text, {}, Qt::ImhNone, wrapValueCallback(std::move(value_callback)));
-}
-
-void AsyncDialogs::getMultiLineText(
-	QWidget* parent,
-	const QString& title,
-	const QString& label,
-	const QString& text,
-	Qt::WindowFlags flags,
-	Qt::InputMethodHints input_method_hints,
-	std::function<void(std::optional<QString>)> callback)
-{
-	QInputDialog* dialog = new QInputDialog(parent, flags);
-	dialog->setOptions(QInputDialog::UsePlainTextEditForTextInput);
-	dialog->setWindowTitle(title);
-	dialog->setLabelText(label);
-	dialog->setTextValue(text);
-	dialog->setInputMethodHints(input_method_hints);
-	dialog->setAttribute(Qt::WA_DeleteOnClose);
-
-	if (callback)
-	{
-		QObject::connect(dialog, &QDialog::finished, [dialog, callback = std::move(callback)](int result) {
-			callback(result ? std::make_optional<QString>(dialog->textValue()) : std::nullopt);
-		});
-	}
-
-	dialog->open();
-}
-
-void AsyncDialogs::getItem(
-	QWidget* parent,
-	const QString& title,
-	const QString& label,
-	const QStringList& items,
-	int current,
-	std::function<void(QString)> value_callback)
-{
-	getItem(parent, title, label, items, current, true, {}, Qt::ImhNone, wrapValueCallback(std::move(value_callback)));
-}
-
-void AsyncDialogs::getItem(
-	QWidget* parent,
-	const QString& title,
-	const QString& label,
-	const QStringList& items,
-	int current,
-	bool editable,
-	Qt::WindowFlags flags,
-	Qt::InputMethodHints input_method_hints,
-	std::function<void(std::optional<QString>)> callback)
-{
-	const QString text(items.value(current));
-
-	QInputDialog* dialog = new QInputDialog(parent, flags);
-	dialog->setWindowTitle(title);
-	dialog->setLabelText(label);
-	dialog->setComboBoxItems(items);
-	dialog->setTextValue(text);
-	dialog->setComboBoxEditable(editable);
-	dialog->setInputMethodHints(input_method_hints);
-	dialog->setAttribute(Qt::WA_DeleteOnClose);
-
-	if (callback)
-	{
-		QObject::connect(dialog, &QDialog::finished, [dialog, callback = std::move(callback)](int result) {
-			callback(result ? std::make_optional<QString>(dialog->textValue()) : std::nullopt);
-		});
-	}
-
-	dialog->open();
-}
-
-void AsyncDialogs::getInt(
-	QWidget* parent,
-	const QString& title,
-	const QString& label,
-	int value,
-	std::function<void(int)> value_callback)
-{
-	getInt(parent, title, label, value, -2147483647, 2147483647, 1, {}, wrapValueCallback(std::move(value_callback)));
-}
-
-void AsyncDialogs::getInt(
-	QWidget* parent,
-	const QString& title,
-	const QString& label,
-	int value,
-	int min_value,
-	int max_value,
-	int step,
-	Qt::WindowFlags flags,
-	std::function<void(std::optional<int>)> callback)
-{
-	QInputDialog* dialog = new QInputDialog(parent, flags);
-	dialog->setWindowTitle(title);
-	dialog->setLabelText(label);
-	dialog->setIntRange(min_value, max_value);
-	dialog->setIntValue(value);
-	dialog->setIntStep(step);
-	dialog->setAttribute(Qt::WA_DeleteOnClose);
-
-	if (callback)
-	{
-		QObject::connect(dialog, &QDialog::finished, [dialog, callback = std::move(callback)](int result) {
-			callback(result ? std::make_optional<int>(dialog->intValue()) : std::nullopt);
-		});
-	}
-
-	dialog->open();
-}
-
-void AsyncDialogs::getDouble(
-	QWidget* parent,
-	const QString& title,
-	const QString& label,
-	double value,
-	std::function<void(double)> callback)
-{
-	getDouble(parent, title, label, value, -2147483647, 2147483647, 1, {}, 1, wrapValueCallback(std::move(callback)));
-}
-
-void AsyncDialogs::getDouble(
-	QWidget* parent,
-	const QString& title,
-	const QString& label,
-	double value,
-	double min_value,
-	double max_value,
-	int decimals,
-	Qt::WindowFlags flags,
-	double step,
-	std::function<void(std::optional<double>)> callback)
-{
-	QInputDialog* dialog = new QInputDialog(parent, flags);
-	dialog->setWindowTitle(title);
-	dialog->setLabelText(label);
-	dialog->setDoubleDecimals(decimals);
-	dialog->setDoubleRange(min_value, max_value);
-	dialog->setDoubleValue(value);
-	dialog->setDoubleStep(step);
-	dialog->setAttribute(Qt::WA_DeleteOnClose);
-
-	if (callback)
-	{
-		QObject::connect(dialog, &QDialog::finished, [dialog, callback = std::move(callback)](int result) {
-			callback(result ? std::make_optional<double>(dialog->doubleValue()) : std::nullopt);
-		});
-	}
-
-	dialog->open();
-}
-
-// Based on the QMessageBoxPrivate::showNewMessageBox function from Qt Widgets.
-static void openAsyncMessageBox(QWidget* parent,
-	QMessageBox::Icon icon,
-	const QString& title,
-	const QString& text,
-	QMessageBox::StandardButtons buttons,
-	QMessageBox::StandardButton default_button,
-	std::function<void(QMessageBox::StandardButton)> callback)
-{
-	// Don't support the fallback for Qt 4.
-	pxAssert(!(default_button && !(buttons & default_button)));
-
-	QMessageBox* message_box = new QMessageBox(icon, title, text, QMessageBox::NoButton, parent);
-	message_box->setAttribute(Qt::WA_DeleteOnClose);
-
-	const QDialogButtonBox* button_box = message_box->findChild<QDialogButtonBox*>();
-	pxAssert(button_box);
-
-	u32 mask = QMessageBox::FirstButton;
-	while (mask <= QMessageBox::LastButton)
-	{
-		QMessageBox::StandardButton standard_button =
-			static_cast<QMessageBox::StandardButton>(static_cast<u32>(buttons) & mask);
-
-		mask <<= 1;
-
-		if (standard_button == QMessageBox::NoButton)
-			continue;
-
-		QPushButton* button = message_box->addButton(standard_button);
-
-		if (message_box->defaultButton())
-			continue;
-
-		if ((default_button == QMessageBox::NoButton &&
-				button_box->buttonRole(button) == QDialogButtonBox::AcceptRole) ||
-			(default_button != QMessageBox::NoButton &&
-				standard_button == default_button))
-			message_box->setDefaultButton(button);
-	}
-
-	if (callback)
-	{
-		QObject::connect(message_box, &QMessageBox::finished, [message_box, callback = std::move(callback)](int result) {
-			callback(message_box->standardButton(message_box->clickedButton()));
-		});
-	}
-
-	message_box->open();
-}
-
-void AsyncDialogs::information(
-	QWidget* parent,
-	const QString& title,
-	const QString& text,
-	std::function<void(QMessageBox::StandardButton)> callback)
-{
-	information(parent, title, text, QMessageBox::Ok, QMessageBox::NoButton, std::move(callback));
-}
-
-void AsyncDialogs::information(
-	QWidget* parent,
-	const QString& title,
-	const QString& text,
-	QMessageBox::StandardButtons buttons,
-	QMessageBox::StandardButton default_button,
-	std::function<void(QMessageBox::StandardButton)> callback)
-{
-	openAsyncMessageBox(parent, QMessageBox::Information, title, text, buttons, default_button, std::move(callback));
-}
-
-void AsyncDialogs::question(
-	QWidget* parent,
-	const QString& title,
-	const QString& text,
-	std::function<void()> yes_callback)
-{
-	std::function<void(QMessageBox::StandardButton)> callback;
-	if (yes_callback)
-	{
-		callback = [yes_callback = std::move(yes_callback)](QMessageBox::StandardButton result) {
-			if (result == QMessageBox::Yes)
-				yes_callback();
-		};
-	}
-
-	const QMessageBox::StandardButtons buttons(QMessageBox::Yes | QMessageBox::No);
-	question(parent, title, text, buttons, QMessageBox::NoButton, std::move(callback));
-}
-
-void AsyncDialogs::question(
-	QWidget* parent,
-	const QString& title,
-	const QString& text,
-	QMessageBox::StandardButtons buttons,
-	QMessageBox::StandardButton default_button,
-	std::function<void(QMessageBox::StandardButton)> callback)
-{
-	openAsyncMessageBox(parent, QMessageBox::Question, title, text, buttons, default_button, std::move(callback));
-}
-
-void AsyncDialogs::warning(
-	QWidget* parent,
-	const QString& title,
-	const QString& text,
-	std::function<void(QMessageBox::StandardButton)> callback)
-{
-	warning(parent, title, text, QMessageBox::Ok, QMessageBox::NoButton, std::move(callback));
-}
-
-void AsyncDialogs::warning(
-	QWidget* parent,
-	const QString& title,
-	const QString& text,
-	QMessageBox::StandardButtons buttons,
-	QMessageBox::StandardButton default_button,
-	std::function<void(QMessageBox::StandardButton)> callback)
-{
-	openAsyncMessageBox(parent, QMessageBox::Warning, title, text, buttons, default_button, std::move(callback));
-}
-
-void AsyncDialogs::critical(
-	QWidget* parent,
-	const QString& title,
-	const QString& text,
-	std::function<void(QMessageBox::StandardButton)> callback)
-{
-	critical(parent, title, text, QMessageBox::Ok, QMessageBox::NoButton, std::move(callback));
-}
-
-void AsyncDialogs::critical(
-	QWidget* parent,
-	const QString& title,
-	const QString& text,
-	QMessageBox::StandardButtons buttons,
-	QMessageBox::StandardButton default_button,
-	std::function<void(QMessageBox::StandardButton)> callback)
-{
-	openAsyncMessageBox(parent, QMessageBox::Critical, title, text, buttons, default_button, std::move(callback));
-}
@@ -1,178 +0,0 @@
-// SPDX-FileCopyrightText: 2002-2026 PCSX2 Dev Team
-// SPDX-License-Identifier: GPL-3.0+
-
-#pragma once
-
-#include <QtWidgets/QInputDialog>
-#include <QtWidgets/QMessageBox>
-
-#include <functional>
-
-/// A collection of helper functions for opening asynchronous dialog boxes.
-/// These should be used in place of Qt's built-in blocking functions as those
-/// are prone to crashing if the parent is destroyed while the dialog is open.
-namespace AsyncDialogs
-{
-	/// Replacement for QInputDialog::getText.
-	void getText(
-		QWidget* parent,
-		const QString& title,
-		const QString& label,
-		const QString& text,
-		std::function<void(QString)> value_callback);
-
-	/// Replacement for QInputDialog::getText.
-	void getText(
-		QWidget* parent,
-		const QString& title,
-		const QString& label,
-		QLineEdit::EchoMode echo,
-		const QString& text,
-		Qt::WindowFlags flags,
-		Qt::InputMethodHints input_method_hints,
-		std::function<void(std::optional<QString>)> callback);
-
-	/// Replacement for QInputDialog::getMultiLineText.
-	void getMultiLineText(
-		QWidget* parent,
-		const QString& title,
-		const QString& label,
-		const QString& text,
-		std::function<void(QString)> value_callback);
-
-	/// Replacement for QInputDialog::getMultiLineText.
-	void getMultiLineText(
-		QWidget* parent,
-		const QString& title,
-		const QString& label,
-		const QString& text,
-		Qt::WindowFlags flags,
-		Qt::InputMethodHints input_method_hints,
-		std::function<void(std::optional<QString>)> callback);
-
-	/// Replacement for QInputDialog::getItem.
-	void getItem(
-		QWidget* parent,
-		const QString& title,
-		const QString& label,
-		const QStringList& items,
-		int current,
-		std::function<void(QString)> value_callback);
-
-	/// Replacement for QInputDialog::getItem.
-	void getItem(
-		QWidget* parent,
-		const QString& title,
-		const QString& label,
-		const QStringList& items,
-		int current,
-		bool editable,
-		Qt::WindowFlags flags,
-		Qt::InputMethodHints input_method_hints,
-		std::function<void(std::optional<QString>)> callback);
-
-	/// Replacement for QInputDialog::getInt.
-	void getInt(
-		QWidget* parent,
-		const QString& title,
-		const QString& label,
-		int value,
-		std::function<void(int)> value_callback);
-
-	/// Replacement for QInputDialog::getInt.
-	void getInt(
-		QWidget* parent,
-		const QString& title,
-		const QString& label,
-		int value,
-		int min_value,
-		int max_value,
-		int step,
-		Qt::WindowFlags flags,
-		std::function<void(std::optional<int>)> callback);
-
-	/// Replacement for QInputDialog::getDouble.
-	void getDouble(
-		QWidget* parent,
-		const QString& title,
-		const QString& label,
-		double value,
-		std::function<void(double)> value_callback);
-
-	/// Replacement for QInputDialog::getDouble.
-	void getDouble(
-		QWidget* parent,
-		const QString& title,
-		const QString& label,
-		double value,
-		double min_value,
-		double max_value,
-		int decimals,
-		Qt::WindowFlags flags,
-		double step,
-		std::function<void(std::optional<double>)> callback);
-
-	/// Replacement for QMessageBox::information.
-	void information(
-		QWidget* parent,
-		const QString& title,
-		const QString& text,
-		std::function<void(QMessageBox::StandardButton)> callback = {});
-
-	/// Replacement for QMessageBox::information.
-	void information(
-		QWidget* parent,
-		const QString& title,
-		const QString& text,
-		QMessageBox::StandardButtons buttons,
-		QMessageBox::StandardButton default_button,
-		std::function<void(QMessageBox::StandardButton)> callback = {});
-
-	/// Replacement for QMessageBox::question.
-	void question(
-		QWidget* parent,
-		const QString& title,
-		const QString& text,
-		std::function<void()> yes_callback);
-
-	/// Replacement for QMessageBox::question.
-	void question(
-		QWidget* parent,
-		const QString& title,
-		const QString& text,
-		QMessageBox::StandardButtons buttons,
-		QMessageBox::StandardButton default_button,
-		std::function<void(QMessageBox::StandardButton)> callback);
-
-	/// Replacement for QMessageBox::warning.
-	void warning(
-		QWidget* parent,
-		const QString& title,
-		const QString& text,
-		std::function<void(QMessageBox::StandardButton)> callback = {});
-
-	/// Replacement for QMessageBox::warning.
-	void warning(
-		QWidget* parent,
-		const QString& title,
-		const QString& text,
-		QMessageBox::StandardButtons buttons,
-		QMessageBox::StandardButton default_button,
-		std::function<void(QMessageBox::StandardButton)> callback = {});
-
-	/// Replacement for QMessageBox::critical.
-	void critical(
-		QWidget* parent,
-		const QString& title,
-		const QString& text,
-		std::function<void(QMessageBox::StandardButton)> callback = {});
-
-	/// Replacement for QMessageBox::critical.
-	void critical(
-		QWidget* parent,
-		const QString& title,
-		const QString& text,
-		QMessageBox::StandardButtons buttons,
-		QMessageBox::StandardButton default_button,
-		std::function<void(QMessageBox::StandardButton)> callback = {});
-} // namespace AsyncDialogs
@@ -10,8 +10,6 @@ target_sources(pcsx2-qt PRIVATE
 	AboutDialog.cpp
 	AboutDialog.h
 	AboutDialog.ui
-	AsyncDialogs.cpp
-	AsyncDialogs.h
 	AutoUpdaterDialog.cpp
 	AutoUpdaterDialog.h
 	AutoUpdaterDialog.ui
@@ -2,13 +2,12 @@
 // SPDX-License-Identifier: GPL-3.0+

 #include "BreakpointDialog.h"
+#include "DebugTools/Breakpoints.h"

-#include "AsyncDialogs.h"
 #include "QtUtils.h"
 #include "QtHost.h"
-#include "Debugger/DebuggerWindow.h"
-
-#include "DebugTools/Breakpoints.h"
+#include <QtWidgets/QDialog>
+#include <QtWidgets/QMessageBox>

 BreakpointDialog::BreakpointDialog(QWidget* parent, DebugInterface* cpu, BreakpointModel& model)
 	: QDialog(parent)
@@ -101,7 +100,7 @@ void BreakpointDialog::accept()
 		u64 address;
 		if (!m_cpu->evaluateExpression(m_ui.txtAddress->text().toStdString().c_str(), address, error))
 		{
-			AsyncDialogs::warning(g_debugger_window, tr("Invalid Address"), QString::fromStdString(error));
+			QMessageBox::warning(this, tr("Invalid Address"), QString::fromStdString(error));
 			return;
 		}

@@ -117,7 +116,7 @@ void BreakpointDialog::accept()

 			if (!m_cpu->initExpression(m_ui.txtCondition->text().toStdString().c_str(), expr, error))
 			{
-				AsyncDialogs::warning(g_debugger_window, tr("Invalid Condition"), QString::fromStdString(error));
+				QMessageBox::warning(this, tr("Invalid Condition"), QString::fromStdString(error));
 				return;
 			}

@@ -135,14 +134,14 @@ void BreakpointDialog::accept()
 		u64 startAddress;
 		if (!m_cpu->evaluateExpression(m_ui.txtAddress->text().toStdString().c_str(), startAddress, error))
 		{
-			AsyncDialogs::warning(g_debugger_window, tr("Invalid Address"), QString::fromStdString(error));
+			QMessageBox::warning(this, tr("Invalid Address"), QString::fromStdString(error));
 			return;
 		}

 		u64 size;
 		if (!m_cpu->evaluateExpression(m_ui.txtSize->text().toStdString().c_str(), size, error) || !size)
 		{
-			AsyncDialogs::warning(g_debugger_window, tr("Invalid Size"), QString::fromStdString(error));
+			QMessageBox::warning(this, tr("Invalid Size"), QString::fromStdString(error));
 			return;
 		}

@@ -158,7 +157,7 @@ void BreakpointDialog::accept()
 			PostfixExpression expr;
 			if (!m_cpu->initExpression(m_ui.txtCondition->text().toStdString().c_str(), expr, error))
 			{
-				AsyncDialogs::warning(g_debugger_window, tr("Invalid Condition"), QString::fromStdString(error));
+				QMessageBox::warning(this, tr("Invalid Condition"), QString::fromStdString(error));
 				return;
 			}

@@ -3,11 +3,9 @@

 #include "BreakpointModel.h"

-#include "AsyncDialogs.h"
 #include "QtHost.h"
 #include "QtUtils.h"
 #include "Debugger/DebuggerSettingsManager.h"
-#include "Debugger/DebuggerWindow.h"

 #include "DebugTools/DebugInterface.h"
 #include "DebugTools/Breakpoints.h"
@@ -15,6 +13,7 @@
 #include "common/Console.h"

 #include <QtCore/QPointer>
+#include <QtWidgets/QMessageBox>

 #include <algorithm>

@@ -386,7 +385,7 @@ bool BreakpointModel::setData(const QModelIndex& index, const QVariant& value, i
 				std::string error;
 				if (!m_cpu.initExpression(condValue.toLocal8Bit().constData(), expr, error))
 				{
-					AsyncDialogs::warning(g_debugger_window, "Condition Error", QString::fromStdString(error));
+					QMessageBox::warning(nullptr, "Condition Error", QString::fromStdString(error));
 					return false;
 				}

@@ -420,7 +419,7 @@ bool BreakpointModel::setData(const QModelIndex& index, const QVariant& value, i
 				std::string error;
 				if (!m_cpu.initExpression(condValue.toLocal8Bit().constData(), expr, error))
 				{
-					AsyncDialogs::warning(g_debugger_window, "Condition Error", QString::fromStdString(error));
+					QMessageBox::warning(nullptr, "Condition Error", QString::fromStdString(error));
 					return false;
 				}

@@ -3,7 +3,6 @@

 #include "DebuggerWindow.h"

-#include "AsyncDialogs.h"
 #include "Debugger/DebuggerView.h"
 #include "Debugger/Docking/DockManager.h"

@@ -16,6 +15,8 @@
 #include "MainWindow.h"
 #include "AnalysisOptionsDialog.h"

+#include <QtWidgets/QMessageBox>
+
 DebuggerWindow* g_debugger_window = nullptr;

 DebuggerWindow::DebuggerWindow(QWidget* parent)
@@ -69,21 +70,19 @@ DebuggerWindow::DebuggerWindow(QWidget* parent)
 	});

 	connect(m_ui.actionResetAllLayouts, &QAction::triggered, this, [this]() {
-		const QString title = tr("Confirmation");
-		const QString text = tr("Are you sure you want to reset all layouts?");
+		QString text = tr("Are you sure you want to reset all layouts?");
+		if (QMessageBox::question(g_debugger_window, tr("Confirmation"), text) != QMessageBox::Yes)
+			return;

-		AsyncDialogs::question(this, title, text, [this]() {
-			m_dock_manager->resetAllLayouts();
-		});
+		m_dock_manager->resetAllLayouts();
 	});

 	connect(m_ui.actionResetDefaultLayouts, &QAction::triggered, this, [this]() {
-		const QString title = tr("Confirmation");
-		const QString text = tr("Are you sure you want to reset the default layouts?");
+		QString text = tr("Are you sure you want to reset the default layouts?");
+		if (QMessageBox::question(g_debugger_window, tr("Confirmation"), text) != QMessageBox::Yes)
+			return;

-		AsyncDialogs::question(this, title, text, [this]() {
-			m_dock_manager->resetDefaultLayouts();
-		});
+		m_dock_manager->resetDefaultLayouts();
 	});

 	connect(g_emu_thread, &EmuThread::onVMPaused, this, []() {
@@ -3,7 +3,6 @@

 #include "DisassemblyView.h"

-#include "AsyncDialogs.h"
 #include "Debugger/DebuggerWindow.h"
 #include "Debugger/JsonValueWrapper.h"
 #include "Debugger/Breakpoints/BreakpointModel.h"
@@ -19,6 +18,8 @@
 #include <QtGui/QMouseEvent>
 #include <QtWidgets/QMenu>
 #include <QtGui/QClipboard>
+#include <QtWidgets/QInputDialog>
+#include <QtWidgets/QMessageBox>
 #include "SymbolTree/NewSymbolDialogs.h"
 #include "common/StringUtil.h"

@@ -110,7 +111,7 @@ void DisassemblyView::contextPasteInstructionText()
 {
 	if (!cpu().isCpuPaused())
 	{
-		AsyncDialogs::warning(this, tr("Assemble Error"), tr("Unable to change assembly while core is running"));
+		QMessageBox::warning(this, tr("Assemble Error"), tr("Unable to change assembly while core is running"));
 		return;
 	}

@@ -129,7 +130,7 @@ void DisassemblyView::contextPasteInstructionText()
 		bool valid = MipsAssembleOpcode(newInstructions[instructionIdx].c_str(), &cpu(), replaceAddress, encodedInstruction, errorText);
 		if (!valid)
 		{
-			AsyncDialogs::warning(this, tr("Assemble Error"), QString("%1 %2").arg(errorText.c_str()).arg(newInstructions[instructionIdx].c_str()));
+			QMessageBox::warning(this, tr("Assemble Error"), QString("%1 %2").arg(errorText.c_str()).arg(newInstructions[instructionIdx].c_str()));
 			return;
 		}
 		encodedInstructions.push_back(encodedInstruction);
@@ -147,28 +148,29 @@ void DisassemblyView::contextAssembleInstruction()
 {
 	if (!cpu().isCpuPaused())
 	{
-		AsyncDialogs::warning(this, tr("Assemble Error"), tr("Unable to change assembly while core is running"));
+		QMessageBox::warning(this, tr("Assemble Error"), tr("Unable to change assembly while core is running"));
 		return;
 	}

 	DisassemblyLineInfo line;
+	bool ok;
 	m_disassemblyManager.getLine(m_selectedAddressStart, false, line);
+	QString instruction = QInputDialog::getText(this, tr("Assemble Instruction"), "",
+		QLineEdit::Normal, QString("%1 %2").arg(line.name.c_str()).arg(line.params.c_str()), &ok);

-	const QString title = tr("Assemble Instruction");
-	const QString text = QString("%1 %2").arg(line.name.c_str()).arg(line.params.c_str());
+	if (!ok)
+		return;

-	AsyncDialogs::getText(this, title, "", text, [this](QString instruction) {
-		u32 encodedInstruction;
-		std::string errorText;
-		bool valid = MipsAssembleOpcode(instruction.toLocal8Bit().constData(), &cpu(), m_selectedAddressStart, encodedInstruction, errorText);
-		if (!valid)
-		{
-			AsyncDialogs::warning(this, tr("Assemble Error"), QString::fromStdString(errorText));
-			return;
-		}
+	u32 encodedInstruction;
+	std::string errorText;
+	bool valid = MipsAssembleOpcode(instruction.toLocal8Bit().constData(), &cpu(), m_selectedAddressStart, encodedInstruction, errorText);
+	if (!valid)
+	{
+		QMessageBox::warning(this, tr("Assemble Error"), QString::fromStdString(errorText));
+		return;
+	}

-		setInstructions(m_selectedAddressStart, m_selectedAddressEnd, encodedInstruction);
-	});
+	setInstructions(m_selectedAddressStart, m_selectedAddressEnd, encodedInstruction);
 }

 void DisassemblyView::contextNoopInstruction()
@@ -247,34 +249,34 @@ void DisassemblyView::contextFollowBranch()

 void DisassemblyView::contextGoToAddress()
 {
-	const QString title = tr("Go To In Disassembly");
+	bool ok;
+	const QString targetString = QInputDialog::getText(this, tr("Go To In Disassembly"), "",
+		QLineEdit::Normal, "", &ok);

-	AsyncDialogs::getText(this, title, "", "", [this](QString expression) {
-		u64 address = 0;
-		std::string error;
-		if (!cpu().evaluateExpression(expression.toStdString().c_str(), address, error))
-		{
-			AsyncDialogs::warning(this, tr("Cannot Go To"), QString::fromStdString(error));
-			return;
-		}
+	if (!ok)
+		return;

-		gotoAddressAndSetFocus(static_cast<u32>(address) & ~3);
-	});
+	u64 address = 0;
+	std::string error;
+	if (!cpu().evaluateExpression(targetString.toStdString().c_str(), address, error))
+	{
+		QMessageBox::warning(this, tr("Cannot Go To"), QString::fromStdString(error));
+		return;
+	}
+
+	gotoAddressAndSetFocus(static_cast<u32>(address) & ~3);
 }

 void DisassemblyView::contextAddFunction()
 {
 	NewFunctionDialog* dialog = new NewFunctionDialog(cpu(), this);
+	dialog->setAttribute(Qt::WA_DeleteOnClose);
 	dialog->setName(QString("func_%1").arg(m_selectedAddressStart, 8, 16, QChar('0')));
 	dialog->setAddress(m_selectedAddressStart);
-	dialog->setAttribute(Qt::WA_DeleteOnClose);
-
 	if (m_selectedAddressEnd != m_selectedAddressStart)
 		dialog->setCustomSize(m_selectedAddressEnd - m_selectedAddressStart + 4);
-
-	connect(dialog, &QDialog::accepted, this, [this]() { update(); });
-
-	dialog->open();
+	if (dialog->exec() == QDialog::Accepted)
+		update();
 }

 void DisassemblyView::contextCopyFunctionName()
@@ -302,26 +304,28 @@ void DisassemblyView::contextRemoveFunction()
 void DisassemblyView::contextRenameFunction()
 {
 	const FunctionInfo curFunc = cpu().GetSymbolGuardian().FunctionOverlappingAddress(m_selectedAddressStart);
+
 	if (!curFunc.address.valid())
 	{
-		AsyncDialogs::warning(this, tr("Rename Function Error"), tr("No function / symbol is currently selected."));
+		QMessageBox::warning(this, tr("Rename Function Error"), tr("No function / symbol is currently selected."));
 		return;
 	}

-	const QString title = tr("Rename Function");
-	const QString label = tr("Function name");
-	const QString oldName = QString::fromStdString(curFunc.name);
+	QString oldName = QString::fromStdString(curFunc.name);

-	AsyncDialogs::getText(this, title, label, oldName, [this, curFunc](QString newName) {
-		if (newName.isEmpty())
-		{
-			AsyncDialogs::warning(this, tr("Rename Function Error"), tr("Function name cannot be nothing."));
-			return;
-		}
+	bool ok;
+	QString newName = QInputDialog::getText(this, tr("Rename Function"), tr("Function name"), QLineEdit::Normal, oldName, &ok);
+	if (!ok)
+		return;

-		cpu().GetSymbolGuardian().ReadWrite([&](ccc::SymbolDatabase& database) {
-			database.functions.rename_symbol(curFunc.handle, newName.toStdString());
-		});
+	if (newName.isEmpty())
+	{
+		QMessageBox::warning(this, tr("Rename Function Error"), tr("Function name cannot be nothing."));
+		return;
+	}
+
+	cpu().GetSymbolGuardian().ReadWrite([&](ccc::SymbolDatabase& database) {
+		database.functions.rename_symbol(curFunc.handle, newName.toStdString());
 	});
 }

@@ -371,7 +375,7 @@ void DisassemblyView::contextRestoreFunction()
 	}
 	else
 	{
-		AsyncDialogs::warning(this, tr("Restore Function Error"), tr("Unable to stub selected address."));
+		QMessageBox::warning(this, tr("Restore Function Error"), tr("Unable to stub selected address."));
 	}
 }

@@ -3,7 +3,6 @@

 #include "DockManager.h"

-#include "AsyncDialogs.h"
 #include "Debugger/DebuggerView.h"
 #include "Debugger/DebuggerWindow.h"
 #include "Debugger/Docking/DockTables.h"
@@ -25,6 +24,7 @@

 #include <QtCore/QTimer>
 #include <QtCore/QtTranslation>
+#include <QtWidgets/QMessageBox>
 #include <QtWidgets/QProxyStyle>
 #include <QtWidgets/QStyleFactory>

@@ -518,19 +518,17 @@ void DockManager::newLayoutClicked()
 	if (m_menu_bar)
 		m_menu_bar->onCurrentLayoutChanged(m_current_layout);

-	const auto name_validator = [this](const QString& name) {
+	auto name_validator = [this](const QString& name) {
 		return !hasNameConflict(name, DockLayout::INVALID_INDEX);
 	};

-	const bool can_clone_current_layout = m_current_layout != DockLayout::INVALID_INDEX;
+	bool can_clone_current_layout = m_current_layout != DockLayout::INVALID_INDEX;

-	LayoutEditorDialog* dialog = new LayoutEditorDialog(name_validator, can_clone_current_layout, g_debugger_window);
-	dialog->setAttribute(Qt::WA_DeleteOnClose);
-
-	connect(dialog, &QDialog::accepted, this, [this, dialog, name_validator]() {
-		if (!name_validator(dialog->name()))
-			return;
+	QPointer<LayoutEditorDialog> dialog = new LayoutEditorDialog(
+		name_validator, can_clone_current_layout, g_debugger_window);

+	if (dialog->exec() == QDialog::Accepted && name_validator(dialog->name()))
+	{
 		DockLayout::Index new_layout = DockLayout::INVALID_INDEX;

 		const auto [mode, index] = dialog->initialState();
@@ -567,9 +565,9 @@ void DockManager::newLayoutClicked()
 			updateLayoutSwitcher();
 			switchToLayout(new_layout);
 		}
-	});
+	}

-	dialog->open();
+	delete dialog.get();
 }

 void DockManager::openLayoutSwitcherContextMenu(const QPoint& pos, QTabBar* layout_switcher)
@@ -607,33 +605,26 @@ void DockManager::editLayoutClicked(DockLayout::Index layout_index)
 	if (layout_index >= m_layouts.size())
 		return;

-	const DockLayout& layout = m_layouts[layout_index];
+	DockLayout& layout = m_layouts[layout_index];

-	const auto name_validator = [this, layout_index](const QString& name) {
+	auto name_validator = [this, layout_index](const QString& name) {
 		return !hasNameConflict(name, layout_index);
 	};

-	LayoutEditorDialog* dialog = new LayoutEditorDialog(layout.name(), layout.cpu(), name_validator, g_debugger_window);
-	dialog->setAttribute(Qt::WA_DeleteOnClose);
+	QPointer<LayoutEditorDialog> dialog = new LayoutEditorDialog(
+		layout.name(), layout.cpu(), name_validator, g_debugger_window);

-	connect(dialog, &QDialog::accepted, this, [this, layout_index, dialog, name_validator]() {
-		if (layout_index >= m_layouts.size())
-			return;
+	if (dialog->exec() != QDialog::Accepted || !name_validator(dialog->name()))
+		return;

-		DockLayout& layout = m_layouts[layout_index];
+	layout.setName(dialog->name());
+	layout.setCpu(dialog->cpu());

-		if (!name_validator(dialog->name()))
-			return;
+	layout.save(layout_index);

-		layout.setName(dialog->name());
-		layout.setCpu(dialog->cpu());
+	delete dialog.get();

-		layout.save(layout_index);
-
-		updateLayoutSwitcher();
-	});
-
-	dialog->open();
+	updateLayoutSwitcher();
 }

 void DockManager::resetLayoutClicked(DockLayout::Index layout_index)
@@ -645,28 +636,20 @@ void DockManager::resetLayoutClicked(DockLayout::Index layout_index)
 	if (!layout.canReset())
 		return;

-	const QString title = tr("Confirmation");
-	const QString text = tr("Are you sure you want to reset layout '%1'?").arg(layout.name());
+	QString text = tr("Are you sure you want to reset layout '%1'?").arg(layout.name());
+	if (QMessageBox::question(g_debugger_window, tr("Confirmation"), text) != QMessageBox::Yes)
+		return;

-	AsyncDialogs::question(g_debugger_window, title, text, [this, layout_index]() {
-		if (layout_index >= m_layouts.size())
-			return;
+	bool current_layout = layout_index == m_current_layout;

-		DockLayout& layout = m_layouts[layout_index];
-		if (!layout.canReset())
-			return;
+	if (current_layout)
+		switchToLayout(DockLayout::INVALID_INDEX);

-		bool current_layout = layout_index == m_current_layout;
+	layout.reset();
+	layout.save(layout_index);

-		if (current_layout)
-			switchToLayout(DockLayout::INVALID_INDEX);
-
-		layout.reset();
-		layout.save(layout_index);
-
-		if (current_layout)
-			switchToLayout(layout_index);
-	});
+	if (current_layout)
+		switchToLayout(layout_index);
 }

 void DockManager::deleteLayoutClicked(DockLayout::Index layout_index)
@@ -676,16 +659,12 @@ void DockManager::deleteLayoutClicked(DockLayout::Index layout_index)

 	DockLayout& layout = m_layouts[layout_index];

-	const QString title = tr("Confirmation");
-	const QString text = tr("Are you sure you want to delete layout '%1'?").arg(layout.name());
+	QString text = tr("Are you sure you want to delete layout '%1'?").arg(layout.name());
+	if (QMessageBox::question(g_debugger_window, tr("Confirmation"), text) != QMessageBox::Yes)
+		return;

-	AsyncDialogs::question(g_debugger_window, title, text, [this, layout_index]() {
-		if (layout_index >= m_layouts.size())
-			return;
-
-		deleteLayout(layout_index);
-		updateLayoutSwitcher();
-	});
+	deleteLayout(layout_index);
+	updateLayoutSwitcher();
 }

 void DockManager::layoutSwitcherTabMoved(DockLayout::Index from_index, DockLayout::Index to_index)
@@ -3,7 +3,6 @@

 #include "DockViews.h"

-#include "AsyncDialogs.h"
 #include "QtUtils.h"
 #include "Debugger/DebuggerView.h"
 #include "Debugger/DebuggerWindow.h"
@@ -18,6 +17,8 @@

 #include <QtGui/QActionGroup>
 #include <QtGui/QPalette>
+#include <QtWidgets/QInputDialog>
+#include <QtWidgets/QMessageBox>
 #include <QtWidgets/QMenu>
 #include <QtWidgets/QStyleFactory>

@@ -175,22 +176,19 @@ void DockTabBar::openContextMenu(QPoint pos)
 		if (!widget)
 			return;

-		const QString title = tr("Rename Window");
-		const QString label = tr("New name:");
-		const QString text = widget->displayNameWithoutSuffix();
+		bool ok;
+		QString new_name = QInputDialog::getText(
+			this, tr("Rename Window"), tr("New name:"), QLineEdit::Normal, widget->displayNameWithoutSuffix(), &ok);
+		if (!ok)
+			return;

-		AsyncDialogs::getText(this, title, label, text, [this, widget = QPointer(widget)](QString name) {
-			if (!widget || !g_debugger_window)
-				return;
+		if (!widget->setCustomDisplayName(new_name))
+		{
+			QMessageBox::warning(this, tr("Invalid Name"), tr("The specified name is too long."));
+			return;
+		}

-			if (!widget->setCustomDisplayName(name))
-			{
-				AsyncDialogs::warning(this, tr("Invalid Name"), tr("The specified name is too long."));
-				return;
-			}
-
-			g_debugger_window->dockManager().updateDockWidgetTitles();
-		});
+		g_debugger_window->dockManager().updateDockWidgetTitles();
 	});

 	QAction* reset_name_action = menu->addAction(tr("Reset Name"));
@@ -3,16 +3,16 @@

 #include "MemorySearchView.h"

-#include "AsyncDialogs.h"
-#include "QtUtils.h"
-
 #include "DebugTools/DebugInterface.h"

+#include "QtUtils.h"
+
 #include "common/Console.h"

 #include <QtGui/QClipboard>
 #include <QtWidgets/QMenu>
 #include <QtWidgets/QScrollBar>
+#include <QtWidgets/QMessageBox>
 #include <QtConcurrent/QtConcurrent>
 #include <QtCore/QFutureWatcher>
 #include <QtGui/QPainter>
@@ -478,7 +478,7 @@ void MemorySearchView::onSearchButtonClicked()

 	if (!ok)
 	{
-		AsyncDialogs::critical(this, tr("Debugger"), tr("Invalid start address"));
+		QMessageBox::critical(this, tr("Debugger"), tr("Invalid start address"));
 		return;
 	}

@@ -486,13 +486,13 @@ void MemorySearchView::onSearchButtonClicked()

 	if (!ok)
 	{
-		AsyncDialogs::critical(this, tr("Debugger"), tr("Invalid end address"));
+		QMessageBox::critical(this, tr("Debugger"), tr("Invalid end address"));
 		return;
 	}

 	if (searchStart >= searchEnd)
 	{
-		AsyncDialogs::critical(this, tr("Debugger"), tr("Start address can't be equal to or greater than the end address"));
+		QMessageBox::critical(this, tr("Debugger"), tr("Start address can't be equal to or greater than the end address"));
 		return;
 	}

@@ -527,7 +527,7 @@ void MemorySearchView::onSearchButtonClicked()

 			if (!ok)
 			{
-				AsyncDialogs::critical(this, tr("Debugger"), tr("Invalid search value"));
+				QMessageBox::critical(this, tr("Debugger"), tr("Invalid search value"));
 				return;
 			}

@@ -551,7 +551,7 @@ void MemorySearchView::onSearchButtonClicked()
 					if (value <= std::numeric_limits<unsigned char>::max())
 						break;
 				default:
-					AsyncDialogs::critical(this, tr("Debugger"), tr("Value is larger than type"));
+					QMessageBox::critical(this, tr("Debugger"), tr("Value is larger than type"));
 					return;
 			}
 		}
@@ -565,7 +565,7 @@ void MemorySearchView::onSearchButtonClicked()
 				searchComparison == SearchComparison::IncreasedBy ||
 				searchComparison == SearchComparison::NotChanged))
 		{
-			AsyncDialogs::critical(this, tr("Debugger"), tr("This search comparison can only be used with filter searches."));
+			QMessageBox::critical(this, tr("Debugger"), tr("This search comparison can only be used with filter searches."));
 			return;
 		}
 	}
@@ -578,7 +578,7 @@ void MemorySearchView::onSearchButtonClicked()
 							   searchComparison == SearchComparison::IncreasedBy ||
 							   searchComparison == SearchComparison::NotChanged))
 	{
-		AsyncDialogs::critical(this, tr("Debugger"), tr("This search comparison can only be used with filter searches."));
+		QMessageBox::critical(this, tr("Debugger"), tr("This search comparison can only be used with filter searches."));
 		return;
 	}

@@ -3,7 +3,6 @@

 #include "MemoryView.h"

-#include "AsyncDialogs.h"
 #include "Debugger/JsonValueWrapper.h"

 #include "QtHost.h"
@@ -13,6 +12,8 @@
 #include <QtGui/QActionGroup>
 #include <QtGui/QClipboard>
 #include <QtGui/QMouseEvent>
+#include <QtWidgets/QInputDialog>
+#include <QtWidgets/QMessageBox>

 using namespace QtUtils;

@@ -304,33 +305,36 @@ bool MemoryViewTable::InsertFloatIntoSelectedHexView(DebugInterface& cpu)
 	std::memcpy(&currentFloatVal, &currentIntVal, sizeof(currentFloatVal));
 	const QString currentfloatStr = QString("%1").arg(QString::number(currentFloatVal, 'g'), 14).trimmed();

-	const QString title = tr("Input New Float");
+	// Prompt user to enter a new float value
+	bool isValidInput = false;
+	QString newFloatStr = QInputDialog::getText(parent, tr("Input New Float"), "",
+		QLineEdit::Normal, currentfloatStr, &isValidInput);
+	if (!isValidInput)
+		return false;

-	AsyncDialogs::getText(parent, title, "", currentfloatStr, [this, &cpu](QString newFloatStr) {
-		// Convert string into float value
-		bool isValidFloat = false;
-		const float newFloatVal = newFloatStr.toFloat(&isValidFloat);
-		if (!isValidFloat)
-		{
-			AsyncDialogs::warning(parent, tr("Input Error"), tr("Invalid float value"));
-			return;
-		}
+	// Convert string into float value
+	bool isValidFloat = false;
+	const float newFloatVal = newFloatStr.toFloat(&isValidFloat);
+	if (!isValidFloat)
+	{
+		QMessageBox::warning(parent, tr("Input Error"), tr("Invalid float value"));
+		return false;
+	}

-		// Write new float value back to memory
-		u32 newIntVal = 0;
-		std::memcpy(&newIntVal, &newFloatVal, sizeof(newIntVal));
-		newIntVal = convertEndian(newIntVal);
+	// Write new float value back to memory
+	u32 newIntVal = 0;
+	std::memcpy(&newIntVal, &newFloatVal, sizeof(newIntVal));
+	newIntVal = convertEndian(newIntVal);

-		const QPointer<MemoryViewTable> table(this);
-		Host::RunOnCPUThread([table, address = selectedAddress, &cpu, val = newIntVal] {
-			cpu.write32(address, val);
+	const QPointer<MemoryViewTable> table(this);
+	Host::RunOnCPUThread([table, address = selectedAddress, &cpu, val = newIntVal] {
+		cpu.write32(address, val);

-			QtHost::RunOnUIThread([table] {
-				if (!table)
-					return;
+		QtHost::RunOnUIThread([table] {
+			if (!table)
+				return;

-				table->parent->update();
-			});
+			table->parent->update();
 		});
 	});

@@ -349,7 +353,7 @@ void MemoryViewTable::InsertAtCurrentSelection(const QString& text, DebugInterfa
 		const float newFloatVal = text.toFloat(&isValidFloat);
 		if (!isValidFloat)
 		{
-			AsyncDialogs::warning(parent, tr("Input Error"), tr("Invalid float value"));
+			QMessageBox::warning(parent, tr("Input Error"), tr("Invalid float value"));
 			return;
 		}

@@ -895,19 +899,22 @@ void MemoryView::contextPaste()

 void MemoryView::contextGoToAddress()
 {
-	const QString title = tr("Go To In Memory View");
+	bool ok;
+	QString targetString = QInputDialog::getText(this, tr("Go To In Memory View"), "",
+		QLineEdit::Normal, "", &ok);

-	AsyncDialogs::getText(this, title, "", "", [this](QString expression) {
-		u64 address = 0;
-		std::string error;
-		if (!cpu().evaluateExpression(expression.toStdString().c_str(), address, error))
-		{
-			AsyncDialogs::warning(this, tr("Cannot Go To"), QString::fromStdString(error));
-			return;
-		}
+	if (!ok)
+		return;

-		gotoAddress(static_cast<u32>(address));
-	});
+	u64 address = 0;
+	std::string error;
+	if (!cpu().evaluateExpression(targetString.toStdString().c_str(), address, error))
+	{
+		QMessageBox::warning(this, tr("Cannot Go To"), QString::fromStdString(error));
+		return;
+	}
+
+	gotoAddress(static_cast<u32>(address));
 }

 void MemoryView::contextFollowAddress()
@@ -30,8 +30,7 @@ SavedAddressesView::SavedAddressesView(const DebuggerViewParameters& parameters)
 			DebuggerSettingsManager::loadGameSettings(m_model);
 	});

-	if (m_model->rowCount() == 0)
-		DebuggerSettingsManager::loadGameSettings(m_model);
+	DebuggerSettingsManager::loadGameSettings(m_model);

 	for (std::size_t i = 0; auto mode : SavedAddressesModel::HeaderResizeModes)
 	{
@@ -3,16 +3,17 @@

 #include "RegisterView.h"

-#include "AsyncDialogs.h"
-#include "QtUtils.h"
 #include "Debugger/JsonValueWrapper.h"

+#include "QtUtils.h"
 #include <QtGui/QMouseEvent>
 #include <QtWidgets/QTabBar>
 #include <QtWidgets/QStylePainter>
 #include <QtWidgets/QStyleOptionTab>
 #include <QtGui/QClipboard>
+#include <QtWidgets/QInputDialog>
 #include <QtWidgets/QProxyStyle>
+#include <QtWidgets/QMessageBox>

 #include <bit>

@@ -350,11 +351,12 @@ void RegisterView::contextCopySegment()
 		QApplication::clipboard()->setText(FilledQStringFromValue(val._u32[3 - m_selected128Field], 16));
 }

-void RegisterView::fetchNewValue(u64 currentValue, bool segment, std::function<void(u64)> callback)
+bool RegisterView::contextFetchNewValue(u64& out, u64 currentValue, bool segment)
 {
 	const int categoryIndex = ui.registerTabs->currentIndex();
 	const bool floatingPoint = CAT_SHOW_FLOAT && segment;
 	const int regSize = cpu().getRegisterSize(categoryIndex);
+	bool ok = false;

 	QString existingValue("%1");

@@ -364,89 +366,79 @@ void RegisterView::fetchNewValue(u64 currentValue, bool segment, std::function<v
 		existingValue = existingValue.arg(std::bit_cast<float>((u32)currentValue));

 	//: Changing the value in a CPU register (e.g. "Change t0")
-	const QString title = tr("Change %1").arg(cpu().getRegisterName(categoryIndex, m_selectedRow));
+	QString input = QInputDialog::getText(this, tr("Change %1").arg(cpu().getRegisterName(categoryIndex, m_selectedRow)), "",
+		QLineEdit::Normal, existingValue, &ok);

-	AsyncDialogs::getText(this, title, "", existingValue, [this, callback, floatingPoint](QString input) {
-		u64 value;
-		if (!floatingPoint) // Get input as hexadecimal
-		{
-			bool ok;
-			value = input.toULongLong(&ok, 16);
-			if (!ok)
-			{
-				AsyncDialogs::warning(this, tr("Invalid register value"), tr("Invalid hexadecimal register value."));
-				return;
-			}
-		}
-		else
-		{
-			bool ok;
-			value = std::bit_cast<u32>(input.toFloat(&ok));
-			if (!ok)
-			{
-				AsyncDialogs::warning(this, tr("Invalid register value"), tr("Invalid floating-point register value."));
-				return;
-			}
-		}
+	if (!ok)
+		return false;

-		callback(value);
-	});
+	if (!floatingPoint) // Get input as hexadecimal
+	{
+		out = input.toULongLong(&ok, 16);
+		if (!ok)
+		{
+			QMessageBox::warning(this, tr("Invalid register value"), tr("Invalid hexadecimal register value."));
+			return false;
+		}
+	}
+	else
+	{
+		out = std::bit_cast<u32>(input.toFloat(&ok));
+		if (!ok)
+		{
+			QMessageBox::warning(this, tr("Invalid register value"), tr("Invalid floating-point register value."));
+			return false;
+		}
+	}
+
+	return true;
 }

 void RegisterView::contextChangeValue()
 {
-	const int category_index = ui.registerTabs->currentIndex();
-	const s32 row = m_selectedRow;
-	const u32 old_value = cpu().getRegister(category_index, row).lo;
-
-	fetchNewValue(old_value, false, [this, category_index, row](u64 input) {
-		cpu().setRegister(category_index, row, u128::From64(input));
+	const int categoryIndex = ui.registerTabs->currentIndex();
+	u64 newVal;
+	if (contextFetchNewValue(newVal, cpu().getRegister(categoryIndex, m_selectedRow).lo))
+	{
+		cpu().setRegister(categoryIndex, m_selectedRow, u128::From64(newVal));
 		DebuggerView::broadcastEvent(DebuggerEvents::VMUpdate());
-	});
+	}
 }

 void RegisterView::contextChangeTop()
 {
-	const int category_index = ui.registerTabs->currentIndex();
-	const s32 row = m_selectedRow;
-	const u128 old_value = cpu().getRegister(category_index, row);
-
-	fetchNewValue(old_value.hi, false, [this, category_index, row, old_value](u32 input) {
-		u128 new_value = old_value;
-		new_value.hi = input;
-		cpu().setRegister(category_index, row, new_value);
+	u64 newVal;
+	u128 oldVal = cpu().getRegister(ui.registerTabs->currentIndex(), m_selectedRow);
+	if (contextFetchNewValue(newVal, oldVal.hi))
+	{
+		oldVal.hi = newVal;
+		cpu().setRegister(ui.registerTabs->currentIndex(), m_selectedRow, oldVal);
 		DebuggerView::broadcastEvent(DebuggerEvents::VMUpdate());
-	});
+	}
 }

 void RegisterView::contextChangeBottom()
 {
-	const int category_index = ui.registerTabs->currentIndex();
-	const s32 row = m_selectedRow;
-	const u128 old_value = cpu().getRegister(category_index, row);
-
-	fetchNewValue(old_value.lo, false, [this, category_index, row, old_value](u32 input) {
-		u128 new_value = old_value;
-		new_value.lo = input;
-		cpu().setRegister(category_index, row, new_value);
+	u64 newVal;
+	u128 oldVal = cpu().getRegister(ui.registerTabs->currentIndex(), m_selectedRow);
+	if (contextFetchNewValue(newVal, oldVal.lo))
+	{
+		oldVal.lo = newVal;
+		cpu().setRegister(ui.registerTabs->currentIndex(), m_selectedRow, oldVal);
 		DebuggerView::broadcastEvent(DebuggerEvents::VMUpdate());
-	});
+	}
 }

 void RegisterView::contextChangeSegment()
 {
-	const int category_index = ui.registerTabs->currentIndex();
-	const s32 row = m_selectedRow;
-	const s32 field = m_selected128Field;
-	const u128 old_value = cpu().getRegister(category_index, row);
-	const u32 segment = old_value._u32[3 - field];
-
-	fetchNewValue(segment, false, [this, category_index, row, field, old_value](u32 input) {
-		u128 new_value = old_value;
-		new_value._u32[3 - field] = input;
-		cpu().setRegister(category_index, row, new_value);
+	u64 newVal;
+	u128 oldVal = cpu().getRegister(ui.registerTabs->currentIndex(), m_selectedRow);
+	if (contextFetchNewValue(newVal, oldVal._u32[3 - m_selected128Field], true))
+	{
+		oldVal._u32[3 - m_selected128Field] = (u32)newVal;
+		cpu().setRegister(ui.registerTabs->currentIndex(), m_selectedRow, oldVal);
 		DebuggerView::broadcastEvent(DebuggerEvents::VMUpdate());
-	});
+	}
 }

 std::optional<DebuggerEvents::GoToAddress> RegisterView::contextCreateGotoEvent()
@@ -462,7 +454,7 @@ std::optional<DebuggerEvents::GoToAddress> RegisterView::contextCreateGotoEvent(

 	if (!cpu().isValidAddress(addr))
 	{
-		AsyncDialogs::warning(
+		QMessageBox::warning(
 			this,
 			tr("Invalid target address"),
 			tr("This register holds an invalid address."));
@@ -49,7 +49,8 @@ public slots:
 private:
 	Ui::RegisterView ui;

-	void fetchNewValue(u64 currentValue, bool segment, std::function<void(u64)> callback);
+	// Returns true on success
+	bool contextFetchNewValue(u64& out, u64 currentValue, bool segment = false);

 	// Used for the height offset the tab bar creates
 	// because we share a widget
@@ -3,14 +3,13 @@

 #include "NewSymbolDialogs.h"

-#include "AsyncDialogs.h"
-#include "Debugger/DebuggerWindow.h"
-#include "Debugger/SymbolTree/TypeString.h"
-
 #include <QtCore/QTimer>
 #include <QtCore/QMetaMethod>
+#include <QtWidgets/QMessageBox>
 #include <QtWidgets/QPushButton>

+#include "TypeString.h"
+
 NewSymbolDialog::NewSymbolDialog(u32 flags, u32 alignment, DebugInterface& cpu, QWidget* parent)
 	: QDialog(parent)
 	, m_cpu(cpu)
@@ -360,7 +359,7 @@ void NewFunctionDialog::createSymbol()
 	});

 	if (!error_message.isEmpty())
-		AsyncDialogs::warning(g_debugger_window, tr("Cannot Create Function"), error_message);
+		QMessageBox::warning(this, tr("Cannot Create Function"), error_message);
 }

 // *****************************************************************************
@@ -417,7 +416,7 @@ void NewGlobalVariableDialog::createSymbol()
 	});

 	if (!error_message.isEmpty())
-		AsyncDialogs::warning(g_debugger_window, tr("Cannot Create Global Variable"), error_message);
+		QMessageBox::warning(this, tr("Cannot Create Global Variable"), error_message);
 }

 // *****************************************************************************
@@ -535,7 +534,7 @@ void NewLocalVariableDialog::createSymbol()
 	});

 	if (!error_message.isEmpty())
-		AsyncDialogs::warning(g_debugger_window, tr("Cannot Create Local Variable"), error_message);
+		QMessageBox::warning(this, tr("Cannot Create Local Variable"), error_message);
 }

 // *****************************************************************************
@@ -649,5 +648,5 @@ void NewParameterVariableDialog::createSymbol()
 	});

 	if (!error_message.isEmpty())
-		AsyncDialogs::warning(g_debugger_window, tr("Cannot Create Parameter Variable"), error_message);
+		QMessageBox::warning(this, tr("Cannot Create Parameter Variable"), error_message);
 }
@@ -3,7 +3,6 @@

 #include "SymbolTreeDelegates.h"

-#include "AsyncDialogs.h"
 #include "Debugger/SymbolTree/SymbolTreeModel.h"
 #include "Debugger/SymbolTree/TypeString.h"

@@ -11,6 +10,7 @@
 #include <QtWidgets/QComboBox>
 #include <QtWidgets/QDoubleSpinBox>
 #include <QtWidgets/QLineEdit>
+#include <QtWidgets/QMessageBox>

 SymbolTreeValueDelegate::SymbolTreeValueDelegate(
 	DebugInterface& cpu,
@@ -495,7 +495,7 @@ void SymbolTreeTypeDelegate::setModelData(QWidget* editor, QAbstractItemModel* m
 		symbol_tree_model->resetChildren(index);
 	}
 	else
-		AsyncDialogs::warning(editor, tr("Cannot Change Type"), error_message);
+		QMessageBox::warning(editor, tr("Cannot Change Type"), error_message);
 }

 // *****************************************************************************
@@ -3,14 +3,15 @@

 #include "SymbolTreeViews.h"

-#include "AsyncDialogs.h"
 #include "Debugger/JsonValueWrapper.h"
 #include "Debugger/SymbolTree/NewSymbolDialogs.h"
 #include "Debugger/SymbolTree/SymbolTreeDelegates.h"

 #include <QtGui/QActionGroup>
 #include <QtGui/QClipboard>
+#include <QtWidgets/QInputDialog>
 #include <QtWidgets/QMenu>
+#include <QtWidgets/QMessageBox>
 #include <QtWidgets/QScrollBar>

 static bool testName(const QString& name, const QString& filter);
@@ -642,16 +643,14 @@ void SymbolTreeView::onDeleteButtonPressed()
 	if (!node->symbol.valid())
 		return;

-	const QString title = tr("Confirm Deletion");
-	const QString text = tr("Delete '%1'?").arg(node->name);
+	if (QMessageBox::question(this, tr("Confirm Deletion"), tr("Delete '%1'?").arg(node->name)) != QMessageBox::Yes)
+		return;

-	AsyncDialogs::question(this, title, text, [this, handle = node->symbol]() {
-		cpu().GetSymbolGuardian().ReadWrite([&](ccc::SymbolDatabase& database) {
-			handle.destroy_symbol(database, true);
-		});
-
-		reset();
+	cpu().GetSymbolGuardian().ReadWrite([&](ccc::SymbolDatabase& database) {
+		node->symbol.destroy_symbol(database, true);
 	});
+
+	reset();
 }

 void SymbolTreeView::onCopyName()
@@ -702,10 +701,13 @@ void SymbolTreeView::onRenameSymbol()
 		text = QString::fromStdString(symbol->name());
 	});

-	AsyncDialogs::getText(this, title, label, text, [this, handle = node->symbol](QString new_name) {
-		cpu().GetSymbolGuardian().ReadWrite([&](ccc::SymbolDatabase& database) {
-			handle.rename_symbol(new_name.toStdString(), database);
-		});
+	bool ok;
+	std::string name = QInputDialog::getText(this, title, label, QLineEdit::Normal, text, &ok).toStdString();
+	if (!ok)
+		return;
+
+	cpu().GetSymbolGuardian().ReadWrite([&](ccc::SymbolDatabase& database) {
+		node->symbol.rename_symbol(name, database);
 	});
 }

@@ -735,15 +737,18 @@ void SymbolTreeView::onChangeTypeTemporarily()
 	std::optional<QString> old_type = m_model->typeFromModelIndexToString(index);
 	if (!old_type.has_value())
 	{
-		AsyncDialogs::warning(this, tr("Cannot Change Type"), tr("That node cannot have a type."));
+		QMessageBox::warning(this, tr("Cannot Change Type"), tr("That node cannot have a type."));
 		return;
 	}

-	AsyncDialogs::getText(this, title, label, *old_type, [this, index](QString type_string) {
-		std::optional<QString> error_message = m_model->changeTypeTemporarily(index, type_string.toStdString());
-		if (error_message.has_value() && !error_message->isEmpty())
-			AsyncDialogs::warning(this, tr("Cannot Change Type"), *error_message);
-	});
+	bool ok;
+	QString type_string = QInputDialog::getText(this, title, label, QLineEdit::Normal, *old_type, &ok);
+	if (!ok)
+		return;
+
+	std::optional<QString> error_message = m_model->changeTypeTemporarily(index, type_string.toStdString());
+	if (error_message.has_value() && !error_message->isEmpty())
+		QMessageBox::warning(this, tr("Cannot Change Type"), *error_message);
 }

 void SymbolTreeView::onTreeViewClicked(const QModelIndex& index)
@@ -857,10 +862,8 @@ void FunctionTreeView::onNewButtonPressed()
 {
 	NewFunctionDialog* dialog = new NewFunctionDialog(cpu(), this);
 	dialog->setAttribute(Qt::WA_DeleteOnClose);
-
-	connect(dialog, &QDialog::accepted, this, &FunctionTreeView::reset);
-
-	dialog->open();
+	if (dialog->exec() == QDialog::Accepted)
+		reset();
 }

 // *****************************************************************************
@@ -1002,10 +1005,8 @@ void GlobalVariableTreeView::onNewButtonPressed()
 {
 	NewGlobalVariableDialog* dialog = new NewGlobalVariableDialog(cpu(), this);
 	dialog->setAttribute(Qt::WA_DeleteOnClose);
-
-	connect(dialog, &QDialog::accepted, this, &GlobalVariableTreeView::reset);
-
-	dialog->open();
+	if (dialog->exec() == QDialog::Accepted)
+		reset();
 }

 // *****************************************************************************
@@ -1133,10 +1134,8 @@ void LocalVariableTreeView::onNewButtonPressed()
 {
 	NewLocalVariableDialog* dialog = new NewLocalVariableDialog(cpu(), this);
 	dialog->setAttribute(Qt::WA_DeleteOnClose);
-
-	connect(dialog, &QDialog::accepted, this, &LocalVariableTreeView::reset);
-
-	dialog->open();
+	if (dialog->exec() == QDialog::Accepted)
+		reset();
 }

 // *****************************************************************************
@@ -1262,10 +1261,8 @@ void ParameterVariableTreeView::onNewButtonPressed()
 {
 	NewParameterVariableDialog* dialog = new NewParameterVariableDialog(cpu(), this);
 	dialog->setAttribute(Qt::WA_DeleteOnClose);
-
-	connect(dialog, &QDialog::accepted, this, &ParameterVariableTreeView::reset);
-
-	dialog->open();
+	if (dialog->exec() == QDialog::Accepted)
+		reset();
 }

 static bool testName(const QString& name, const QString& filter)
@@ -243,6 +243,7 @@ void LogWindow::createUi()
 	vlayout->addWidget(m_text);
 	vlayout->addWidget(m_input_widget);

+	central_widget->setLayout(vlayout);
 	setCentralWidget(central_widget);
 }

@@ -118,8 +118,9 @@ void GameCheatSettingsWidget::onCheatListItemHovered(const QModelIndex& index)
 	const QModelIndex source_index = m_model_proxy->mapToSource(index);
 	const QModelIndex sibling_index = source_index.siblingAtColumn(0);
 	QStandardItem* item = m_model->itemFromIndex(sibling_index);
-	if (!item || !item->isCheckable())
+	if (!item)
 	{
+		// No item is selected.
 		m_ui.appliedLabel->clear();
 		return;
 	}
@@ -197,8 +197,8 @@ InterfaceSettingsWidget::InterfaceSettingsWidget(SettingsWindow* settings_dialog
 		   "and unpauses when you switch back."));
 	dialog()->registerWidgetHelp(m_ui.pauseOnControllerDisconnection, tr("Pause On Controller Disconnection"),
 		tr("Unchecked"), tr("Pauses the emulator when a controller with bindings is disconnected."));
-	dialog()->registerWidgetHelp(m_ui.promptOnStateLoadSaveFailure, tr("Prompt On State Load/Save Failure"),
-		tr("Checked"), tr("Displays a modal dialog when a save state load/save operation fails."));
+	dialog()->registerWidgetHelp(m_ui.promptOnStateLoadSaveFailure, tr("Pause On State Load/Save Failure"),
+		tr("Checked"), tr("Display a modal dialog when a save state load/save operation fails."));
 	dialog()->registerWidgetHelp(m_ui.startFullscreen, tr("Start Fullscreen"), tr("Unchecked"),
 		tr("Automatically switches to fullscreen mode when a game is started."));
 	dialog()->registerWidgetHelp(m_ui.hideMouseCursor, tr("Hide Cursor In Fullscreen"), tr("Unchecked"),
@@ -89,7 +89,6 @@
    <Manifest Include="..\pcsx2\windows\PCSX2.manifest" />
  </ItemGroup>
  <ItemGroup>
-    <ClCompile Include="AsyncDialogs.cpp" />
    <ClCompile Include="ColorPickerButton.cpp" />
    <ClCompile Include="Debugger\SymbolTree\NewSymbolDialogs.cpp" />
    <ClCompile Include="Debugger\SymbolTree\SymbolTreeDelegates.cpp" />
@@ -184,7 +183,6 @@
    <ClCompile Include="VCRuntimeChecker.cpp" />
  </ItemGroup>
  <ItemGroup>
-    <ClInclude Include="AsyncDialogs.h" />
    <QtMoc Include="SetupWizardDialog.h" />
    <QtMoc Include="Settings\InterfaceSettingsWidget.h" />
    <QtMoc Include="Settings\GameListSettingsWidget.h" />
@@ -43,7 +43,6 @@
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="PrecompiledHeader.cpp" />
-    <ClCompile Include="AsyncDialogs.cpp" />
    <ClCompile Include="QtHost.cpp" />
    <ClCompile Include="MainWindow.cpp" />
    <ClCompile Include="$(IntDir)moc_MainWindow.cpp">
@@ -519,7 +518,6 @@
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="PrecompiledHeader.h" />
-    <ClInclude Include="AsyncDialogs.h" />
    <ClInclude Include="QtUtils.h" />
    <ClInclude Include="SettingWidgetBinder.h" />
    <ClInclude Include="Settings\HddCreateQt.h">
@@ -3560,7 +3560,7 @@ __forceinline bool AreTrianglesQuad(const GSVertex* RESTRICT vin, const u16* RES
 	return are_quad;
 }

-__forceinline bool AreTrianglesQuadNonAA(const GSVertex* RESTRICT vin, const u16* RESTRICT index0, const u16* RESTRICT index1)
+bool GSState::AreTrianglesQuadNonAA(const GSVertex* RESTRICT vin, const u16* RESTRICT index0, const u16* RESTRICT index1)
 {
 	u32 v0[3] = {
 		vin[index0[0]].XYZ.U32[0],
@@ -478,6 +478,7 @@ public:
 	
 	template<bool shuffle_check>
 	bool TrianglesAreQuadsImpl();
+	bool AreTrianglesQuadNonAA(const GSVertex* RESTRICT vin, const u16* RESTRICT index0, const u16* RESTRICT index1);
 	bool TrianglesAreQuads(bool shuffle_check = false);
 	template <u32 primclass>
 	PRIM_OVERLAP GetPrimitiveOverlapDrawlistImpl(bool save_drawlist = false, bool save_bbox = false, float bbox_scale = 1.0f);
@@ -4711,31 +4711,260 @@ void GSRendererHW::Draw()
 	// Note: second hack corrects only the texture coordinate
 	// Be careful to not correct downscaled targets, this can get messy and break post processing
 	// but it still needs to adjust native stuff from memory as it's not been compensated for upscaling (Dragon Quest 8 font for example).
-	if (CanUpscale() && (m_vt.m_primclass == GS_SPRITE_CLASS) && rt && rt->GetScale() > 1.0f)
+	if (CanUpscale() && ((m_vt.m_primclass == GS_SPRITE_CLASS) || ((m_index.tail % 6 == 0) && m_vt.m_primclass == GS_TRIANGLE_CLASS && m_vt.m_eq.z)) && rt && rt->GetScale() > 1.0f)
 	{
-		const u32 count = m_vertex.next;
-		GSVertex* v = &m_vertex.buff[0];
+		bool valid_format = true;

-		// Hack to avoid vertical black line in various games (ace combat/tekken)
-		if (GSConfig.UserHacks_AlignSpriteX)
+		if (m_vt.m_primclass == GS_TRIANGLE_CLASS)
 		{
-			// Note for performance reason I do the check only once on the first
-			// primitive
-			const int win_position = v[1].XYZ.X - context->XYOFFSET.OFX;
-			const bool unaligned_position = ((win_position & 0xF) == 8);
-			const bool unaligned_texture = ((v[1].U & 0xF) == 0) && PRIM->FST; // I'm not sure this check is useful
-			const bool hole_in_vertex = (count < 4) || (v[1].XYZ.X != v[2].XYZ.X);
-			if (hole_in_vertex && unaligned_position && (unaligned_texture || !PRIM->FST))
+			const GSVertex* RESTRICT v = m_vertex.buff;
+			const u16* RESTRICT index = m_index.buff;
+			const size_t count = m_index.tail;
+
+			for (int i = 0; i < count; i += 6)
 			{
-				// Normaly vertex are aligned on full pixels and texture in half
-				// pixels. Let's extend the coverage of an half-pixel to avoid
-				// hole after upscaling
-				for (u32 i = 0; i < count; i += 2)
+				// Non-axis aligned check when only two triangles
+				if (!AreTrianglesQuadNonAA(v, &index[i], &index[i + 3]))
 				{
-					v[i + 1].XYZ.X += 8;
-					// I really don't know if it is a good idea. Neither what to do for !PRIM->FST
-					if (unaligned_texture)
-						v[i + 1].U += 8;
+					valid_format = false;
+					break;
+				}
+			}
+		}
+		if (valid_format)
+		{
+			const u32 count = m_vertex.next;
+			GSVertex* v = &m_vertex.buff[0];
+			u16* idx = &m_index.buff[0];
+			const bool indexed_texture = src && src->m_scale == 1.0f && GSLocalMemory::m_psm[src->m_TEX0.PSM].pal > 0;
+
+			// Shortcut for when the sprites are right up against each other.
+			if (GSConfig.UserHacks_AlignSpriteX && m_vt.m_primclass == GS_SPRITE_CLASS && indexed_texture && PRIM->FST && m_index.tail > 2 &&
+				((v[idx[1]].U == v[idx[2]].U && (v[idx[1]].XYZ.X == v[idx[2]].XYZ.X) && v[idx[0]].V == v[idx[2]].V) || 
+				  (v[idx[1]].V == v[idx[2]].V && (v[idx[1]].XYZ.Y == v[idx[2]].XYZ.Y) && v[idx[0]].U == v[idx[2]].U)))
+			{
+				for (int i = 0; i < m_index.tail; i += 2)
+				{
+					if (!((v[idx[i + 1]].U == v[idx[i + 2]].U && (v[idx[i + 1]].XYZ.X == v[idx[i + 2]].XYZ.X) && v[idx[i]].V == v[idx[i + 2]].V)))
+					{
+						if (v[idx[i + 1]].U & 0x8)
+							v[idx[i + 1]].U -= 8;
+					}
+					if (!((v[idx[i + 1]].V == v[idx[i + 2]].V && (v[idx[i + 1]].XYZ.Y == v[idx[i + 2]].XYZ.Y) && v[idx[i]].U == v[idx[i + 2]].U)))
+					{
+						if (v[idx[i + 1]].V & 0x8)
+							v[idx[i + 11]].V -= 8;
+					}
+				}
+				if (v[idx[m_index.tail - 1]].U & 0x8)
+					v[idx[m_index.tail - 1]].U -= 8;
+
+				if (v[idx[m_index.tail - 1]].V & 0x8)
+					v[idx[m_index.tail - 1]].V -= 8;
+			}
+			else
+			// Hack to avoid vertical black line in various games (ace combat/tekken)
+			if (GSConfig.UserHacks_AlignSpriteX)
+			{
+				// Note for performance reason I do the check only once on the first
+				// primitive
+				const int win_position0 = v[idx[0]].XYZ.X - context->XYOFFSET.OFX;
+				const int win_position1 = v[idx[1]].XYZ.X - context->XYOFFSET.OFX;
+				const bool unaligned_position = ((win_position0 & 0xf) != 0) || ((win_position1 & 0xF) != 0);
+				const int first_s = (v[idx[0]].ST.S / v[idx[0]].RGBAQ.Q) * static_cast<int>(1 << m_cached_ctx.TEX0.TW);
+				const bool unaligned_texture = (PRIM->FST && ((v[1].U & 0xF) == 0)) || (!PRIM->FST && (first_s & 0xF) == 0); // I'm not sure this check is useful
+				const int gap = std::min(static_cast<int>(v[2].XYZ.X), static_cast<int>(v[3].XYZ.X)) - std::max(static_cast<int>(v[0].XYZ.X), static_cast<int>(v[1].XYZ.X));
+				bool hole_in_vertex = (count < 4) || (v[1].XYZ.X != v[2].XYZ.X && ((v[1].XYZ.X ^ v[2].XYZ.X) & 0xF) != 0);
+				const bool is_tri = m_vt.m_primclass == GS_TRIANGLE_CLASS;
+				const int skip = is_tri ? 3 : 2;
+
+				GSVector2 gradient = GSVector2(1.0f, 1.0f);
+
+				if (m_lod.y == 0)
+				{
+					bool can_disable_linear = true;
+					for (u32 i = 0; i < m_index.tail; i += skip)
+					{
+						const int x_offset = (is_tri && v[idx[i]].XYZ.X == v[idx[i + 1]].XYZ.X) ? 2 : 1;
+						const int y_offset = (is_tri && v[idx[i]].XYZ.Y == v[idx[i + 1]].XYZ.Y) ? 2 : 1;
+
+						GSVector2 vert = GSVector2(std::abs(static_cast<float>(v[idx[i]].XYZ.X - v[idx[i + x_offset]].XYZ.X)), std::abs(static_cast<float>(v[idx[i]].XYZ.Y - v[idx[i + y_offset]].XYZ.Y)));
+						GSVector2 tex;
+
+						if (!PRIM->FST)
+						{
+							const int s_offset = (is_tri && (v[idx[i]].ST.S / v[idx[i]].RGBAQ.Q) == (v[idx[i + 1]].ST.S / v[idx[i + 1]].RGBAQ.Q)) ? 2 : 1;
+							const int t_offset = (is_tri && (v[idx[i]].ST.T / v[idx[i]].RGBAQ.Q) == (v[idx[i + 1]].ST.T / v[idx[i + 1]].RGBAQ.Q)) ? 2 : 1;
+							GSVector2 v0, v1;
+							float s = std::min((v[idx[i]].ST.S / v[idx[i]].RGBAQ.Q), 1.0f);
+							float t = std::min((v[idx[i]].ST.T / v[idx[i]].RGBAQ.Q), 1.0f);
+							v0.x = static_cast<int>((1 << m_cached_ctx.TEX0.TW) * s * 16.0f);
+							v0.y = static_cast<int>((1 << m_cached_ctx.TEX0.TH) * t * 16.0f);
+
+							s = std::min((v[idx[i + s_offset]].ST.S / v[idx[i + s_offset]].RGBAQ.Q), 1.0f);
+							t = std::min((v[idx[i + t_offset]].ST.T / v[idx[i + t_offset]].RGBAQ.Q), 1.0f);
+							v1.x = static_cast<int>((1 << m_cached_ctx.TEX0.TW) * s * 16.0f);
+							v1.y = static_cast<int>((1 << m_cached_ctx.TEX0.TH) * t * 16.0f);
+
+							tex = GSVector2(std::abs(v1.x - v0.x), std::abs(v1.y - v0.y));
+						}
+						else
+						{
+							const int u_offset = (is_tri && v[idx[i]].U == v[idx[i + 1]].U) ? 2 : 1;
+							const int v_offset = (is_tri && v[idx[i]].V == v[idx[i + 1]].V) ? 2 : 1;
+							tex = GSVector2(std::abs(static_cast<float>(v[idx[i]].U - v[idx[i + u_offset]].U)), std::abs(static_cast<float>(v[idx[i]].V - v[idx[i + v_offset]].V)));
+						}
+
+						GSVector2 grad = tex / vert;
+						if ((grad.x != gradient.x && grad.x != floor(grad.x)) || (grad.y != gradient.y && grad.y != floor(grad.y)))
+						{
+							can_disable_linear = false;
+							gradient = grad;
+							break;
+						}
+					}
+					if (can_disable_linear)
+					{
+						m_vt.m_filter.linear = 0;
+						m_vt.m_filter.opt_linear = 0;
+					}
+				}
+
+				/*if ((m_vt.m_primclass == GS_SPRITE_CLASS) && hole_in_vertex && unaligned_position && (unaligned_texture || !PRIM->FST))
+				{
+					// Normaly vertex are aligned on full pixels and texture in half
+					// pixels. Let's extend the coverage of an half-pixel to avoid
+					// hole after upscaling
+					for (u32 i = 0; i < count; i += 2)
+					{
+						v[i + 1].XYZ.X += 8;
+						// I really don't know if it is a good idea. Neither what to do for !PRIM->FST
+						if (unaligned_texture)
+							v[i + 1].U += 8;
+					}
+				}
+				else */if (indexed_texture && (gradient.x > (1.0f / 16.0f) || gradient.y > (1.0f / 16.0f)))
+				{
+					const int comparitor = unaligned_position ? 0 : 8;
+
+					if (!PRIM->FST)
+					{
+						int s_offset = (is_tri && (v[idx[0]].ST.S / v[idx[0]].RGBAQ.Q) == (v[idx[1]].ST.S / v[idx[1]].RGBAQ.Q)) ? 2 : 1;
+						int t_offset = (is_tri && (v[idx[0]].ST.T / v[idx[0]].RGBAQ.Q) == (v[idx[1]].ST.T / v[idx[1]].RGBAQ.Q)) ? 2 : 1;
+						GSVector2i v0, v1;
+						float q = v[idx[0]].RGBAQ.Q == 0 ? FLT_MIN : v[idx[0]].RGBAQ.Q;
+						float s = v[idx[0]].ST.S / q;
+						float t = v[idx[0]].ST.T / q;
+						v0.x = static_cast<int>((1 << m_cached_ctx.TEX0.TW) * s * 16.0f);
+						v0.y = static_cast<int>((1 << m_cached_ctx.TEX0.TH) * t * 16.0f);
+
+						q = v[idx[s_offset]].RGBAQ.Q == 0 ? FLT_MIN : v[idx[s_offset]].RGBAQ.Q;
+						s = v[idx[s_offset]].ST.S / q;
+						t = v[idx[t_offset]].ST.T / q;
+						v1.x = static_cast<int>((1 << m_cached_ctx.TEX0.TW) * s * 16.0f);
+						v1.y = static_cast<int>((1 << m_cached_ctx.TEX0.TH) * t * 16.0f);
+						bool small_texture = std::abs(v1.x - v0.x) <= (64 * 16) || std::abs(v1.y - v0.y) <= (64 * 16);
+						bool offset_texture_x = (m_vt.IsLinear() || ((v0.x & 0xF) && (v1.x & 0xF))) && small_texture; // Keep them relatively small to avoid full screen stuff.
+						bool offset_texture_y = (m_vt.IsLinear() || ((v0.y & 0xF) && (v1.y & 0xF))) && small_texture;
+
+						//if (offset_texture_x && offset_texture_y)
+						{
+							for (u32 i = m_index.buff[0]; i < m_index.tail; i += skip)
+							{
+								GSVector2 st;
+
+								if (gradient.x > (1.0f / 16.0f))
+								{
+									float largest_s = std::max(is_tri ? (v[i + 2].ST.S / v[i + 2].RGBAQ.Q) : static_cast<float>(0), std::max((v[i].ST.S / v[i].RGBAQ.Q), (v[i + 1].ST.S / v[i + 1].RGBAQ.Q)));
+									float smallest_s = std::min(is_tri ? (v[i + 2].ST.S / v[i + 2].RGBAQ.Q) : static_cast<float>(0), std::min((v[i].ST.S / v[i].RGBAQ.Q), (v[i + 1].ST.S / v[i + 1].RGBAQ.Q)));
+
+									for (int j = 0; j < skip; j++)
+									{
+										q = v[i + j].RGBAQ.Q == 0 ? FLT_MIN : v[i + j].RGBAQ.Q;
+										float s = v[i + j].ST.S / q;
+										st.x = static_cast<float>(1 << m_cached_ctx.TEX0.TW) * s;
+										if ((v[i + j].ST.S / q) == largest_s)
+											v[i + j].ST.S = ((st.x - 0.5f) / static_cast<float>(1 << m_cached_ctx.TEX0.TW)) * q;
+										// Check the minimap in Persona 3.
+										if ((static_cast<int>(st.x * 16) & 0x8) == comparitor && (v[i + j].ST.S / q) == smallest_s)
+											v[i + j].ST.S = (std::max(0.0f, (st.x - 0.5f)) / static_cast<float>(1 << m_cached_ctx.TEX0.TW)) * q;
+									}
+								}
+
+								if (gradient.y > (1.0f / 16.0f))
+								{
+									float largest_t = std::max(is_tri ? (v[i + 2].ST.T / v[i + 2].RGBAQ.Q) : static_cast<float>(0), std::max((v[i].ST.T / v[i].RGBAQ.Q), (v[i + 1].ST.T / v[i + 1].RGBAQ.Q)));
+									float smallest_t = std::min(is_tri ? (v[i + 2].ST.T / v[i + 2].RGBAQ.Q) : static_cast<float>(0), std::min((v[i].ST.T / v[i].RGBAQ.Q), (v[i + 1].ST.T / v[i + 1].RGBAQ.Q)));
+									for (int j = 0; j < skip; j++)
+									{
+										q = v[i + j].RGBAQ.Q == 0 ? FLT_MIN : v[i + j].RGBAQ.Q;
+										float t = v[i + j].ST.T / q;
+										st.y = static_cast<float>(1 << m_cached_ctx.TEX0.TH) * t;
+										if ((v[i + j].ST.T / q) == largest_t)
+											v[i + j].ST.T = ((st.y - 0.5f) / static_cast<float>(1 << m_cached_ctx.TEX0.TH)) * q;
+										// Check the minimap in Persona 3.
+										if ((static_cast<int>(st.y * 16) & 0x8) == comparitor && (v[i + j].ST.T / q) == smallest_t)
+											v[i + j].ST.T = (std::max(0.0f, (st.y - 0.5f)) / static_cast<float>(1 << m_cached_ctx.TEX0.TH)) * q;
+									}
+								}
+							}
+						}
+					}
+					else
+					{
+						int u_offset = (is_tri && (v[0].U == v[1].U)) ? 2 : 1;
+						int v_offset = (is_tri && (v[0].V == v[1].V)) ? 2 : 1;
+						bool small_texture = std::abs(static_cast<int>(v[idx[u_offset]].U) - static_cast<int>(v[idx[0]].U)) <= (64 * 16) || std::abs(static_cast<int>(v[idx[v_offset]].V) - static_cast<int>(v[idx[0]].V)) <= (64 * 16);
+						bool offset_texture_x = (m_vt.IsLinear() || ((v[0].U & 0xF) && (v[idx[u_offset]].U & 0xF))) && small_texture;
+						bool offset_texture_y = (m_vt.IsLinear() || ((v[0].V & 0xF) && (v[idx[v_offset]].V & 0xF))) && small_texture;
+
+						if (offset_texture_x && offset_texture_y)
+						{
+							for (u32 i = m_index.buff[0]; i < m_index.tail; i += skip)
+							{
+								if (gradient.x > (1.0f / 16.0f))
+								{
+									const u16 largest_u = std::max(is_tri ? v[idx[i + 2]].U : static_cast<u16>(0), std::max(v[idx[i]].U, v[idx[i + 1]].U));
+
+									if ((v[idx[i]].U & 0x8) == comparitor && v[idx[i]].U == largest_u)
+										v[idx[i]].U = std::max(static_cast<int>(v[idx[i]].U) - 8, 0);
+
+									if ((v[idx[i + 1]].U & 0x8) == comparitor && v[idx[i + 1]].U == largest_u)
+										v[idx[i + 1]].U = std::max(static_cast<int>(v[idx[i + 1]].U) - 8, 0);
+
+									if (is_tri && (v[idx[i + 2]].U & 0x8) == comparitor && v[idx[i + 2]].U == largest_u)
+										v[idx[i + 2]].U = std::max(static_cast<int>(v[idx[i + 2]].U) - 8, 0);
+								}
+
+								if (gradient.y > (1.0f / 16.0f))
+								{
+									const u16 largest_v = std::max(is_tri ? v[idx[i + 2]].V : static_cast<u16>(0), std::max(v[idx[i]].V, v[idx[i + 1]].V));
+
+									if ((v[idx[i]].V & 0x8) == comparitor && v[idx[i]].V == largest_v)
+										v[idx[i]].V = std::max(static_cast<int>(v[idx[i]].V) - 8, 0);
+
+									if ((v[idx[i + 1]].V & 0x8) == comparitor && v[idx[i + 1]].V == largest_v)
+										v[idx[i + 1]].V = std::max(static_cast<int>(v[idx[i + 1]].V) - 8, 0);
+
+									if (is_tri && (v[idx[i + 2]].V & 0x8) == comparitor && v[idx[i + 2]].V == largest_v)
+										v[idx[i + 2]].V = std::max(static_cast<int>(v[idx[i + 2]].V) - 8, 0);
+								}
+							}
+						}
+					}
+				}
+				else if ((m_vt.m_primclass == GS_SPRITE_CLASS) && hole_in_vertex && unaligned_position && (unaligned_texture || !PRIM->FST))
+				{
+					// Normaly vertex are aligned on full pixels and texture in half
+					// pixels. Let's extend the coverage of an half-pixel to avoid
+					// hole after upscaling
+					for (u32 i = 0; i < count; i += 2)
+					{
+						v[i + 1].XYZ.X += 8;
+						// I really don't know if it is a good idea. Neither what to do for !PRIM->FST
+						if (unaligned_texture)
+							v[i + 1].U += 8;
+					}
 				}
 			}
 		}
@@ -314,13 +314,6 @@ void ipuSoftReset()
 	g_ipu_thresh[0] = 0;
 	g_ipu_thresh[1] = 0;

-	if (!decoder.intra_dc_precision)
-	{
-		decoder.dc_dct_pred[0] =
-		decoder.dc_dct_pred[1] =
-		decoder.dc_dct_pred[2] = 128 << decoder.intra_dc_precision;
-	}
-
 	ipuRegs.ctrl.reset();
 	ipuRegs.top = 0;
 	ipu_cmd.clear();
@@ -64,14 +64,14 @@ static const u32

 	// SIO2 is a DMA interface for the SIO.

-	HW_SIO2_TX		    = 0x1F808260,
-	HW_SIO2_RX		    = 0x1f808264,
+	HW_SIO2_DATAIN		= 0x1F808260,
+	HW_SIO2_FIFO		= 0x1f808264,
 	HW_SIO2_CTRL		= 0x1f808268,
-	HW_SIO2_CMD_STAT	= 0x1f80826c,
-	HW_SIO2_PORT_STAT   = 0x1f808270,
-	HW_SIO2_FIFO_STAT	= 0x1f808274,
-	HW_SIO2_FIFO_TX     = 0x1F808278, // May as well add defs
-	HW_SIO2_FIFO_RX     = 0x1F80827C, // for these 2...
+	HW_SIO2_RECV1		= 0x1f80826c,
+	HW_SIO2_RECV2		= 0x1f808270,
+	HW_SIO2_RECV3		= 0x1f808274,
+	HW_SIO2_8278        = 0x1F808278, // May as well add defs
+	HW_SIO2_827C        = 0x1F80827C, // for these 2...
 	HW_SIO2_INTR		= 0x1f808280;

 enum DMAMadrAddresses
@@ -29,25 +29,25 @@ bool Sio2::Initialize()
 {
 	this->SoftReset();

-	for (size_t i = 0; i < CmdQueue.size(); i++)
+	for (size_t i = 0; i < send3.size(); i++)
 	{
-		CmdQueue[i] = 0;
+		send3[i] = 0;
 	}

-	for (size_t i = 0; i < PortCtrl0.size(); i++)
+	for (size_t i = 0; i < send1.size(); i++)
 	{
-		PortCtrl0[i] = 0;
-		PortCtrl1[i] = 0;
+		send1[i] = 0;
+		send2[i] = 0;
 	}

 	dataIn = 0;
 	dataOut = 0;
 	SetCtrl(Sio2Ctrl::SIO2MAN_RESET);
-	SetCmdStat(CmdStat::DISCONNECTED);
-	PortStat = PortStat::DEFAULT;
-	FifoStat = FifoStat::DEFAULT;
-	FifoTxPos = 0;
-	FifoRxPos = 0;
+	SetRecv1(Recv1::DISCONNECTED);
+	recv2 = Recv2::DEFAULT;
+	recv3 = Recv3::DEFAULT;
+	unknown1 = 0;
+	unknown2 = 0;
 	iStat = 0;

 	port = 0;
@@ -80,13 +80,13 @@ bool Sio2::Shutdown()

 void Sio2::SoftReset()
 {
-	queueRead = false;
-	queuePosition = 0;
+	send3Read = false;
+	send3Position = 0;
 	commandLength = 0;
 	processedLength = 0;
 	// Clear dmaBlockSize, in case the next SIO2 command is not sent over DMA11.
 	dmaBlockSize = 0;
-	queueComplete = false;
+	send3Complete = false;

 	// Anything in g_Sio2FifoIn which was not necessary to consume should be cleared out prior to the next SIO2 cycle.
 	while (!g_Sio2FifoIn.empty())
@@ -94,8 +94,8 @@ void Sio2::SoftReset()
 		g_Sio2FifoIn.pop_front();
 	}

-	// cmd_stat should always be reassembled based on the devices being probed by the packet.
-	CmdStat = 0;
+	// RECV1 should always be reassembled based on the devices being probed by the packet.
+	recv1 = 0;
 }

 void Sio2::Interrupt()
@@ -113,9 +113,9 @@ void Sio2::SetCtrl(u32 value)
 	}
 }

-void Sio2::SetCmd(size_t position, u32 value)
+void Sio2::SetSend3(size_t position, u32 value)
 {
-	this->CmdQueue[position] = value;
+	this->send3[position] = value;

 	if (position == 0)
 	{
@@ -123,9 +123,9 @@ void Sio2::SetCmd(size_t position, u32 value)
 	}
 }

-void Sio2::SetCmdStat(u32 value)
+void Sio2::SetRecv1(u32 value)
 {
-	this->CmdStat = value;
+	this->recv1 = value;
 }

 void Sio2::Pad()
@@ -134,29 +134,29 @@ void Sio2::Pad()
 	PadBase* pad = Pad::GetPad(port, mtap.GetPadSlot());

 	// Update the third nibble with which ports have been accessed
-	if (this->CmdStat & CmdStat::ONE_PORT_OPEN)
+	if (this->recv1 & Recv1::ONE_PORT_OPEN)
 	{
-		this->CmdStat &= ~(CmdStat::ONE_PORT_OPEN);
-		this->CmdStat |= CmdStat::TWO_PORTS_OPEN;
+		this->recv1 &= ~(Recv1::ONE_PORT_OPEN);
+		this->recv1 |= Recv1::TWO_PORTS_OPEN;
 	}
 	else
 	{
-		this->CmdStat |= CmdStat::ONE_PORT_OPEN;
+		this->recv1 |= Recv1::ONE_PORT_OPEN;
 	}

 	// This bit is always set, whether the pad is present or missing
-	this->CmdStat |= CmdStat::NO_DEVICES_MISSING;
+	this->recv1 |= Recv1::NO_DEVICES_MISSING;

 	// If the currently accessed pad is missing, also tick those bits
 	if (pad->GetType() == Pad::ControllerType::NotConnected || pad->ejectTicks)
 	{
 		if (!port)
 		{
-			this->CmdStat |= CmdStat::PORT_1_MISSING;
+			this->recv1 |= Recv1::PORT_1_MISSING;
 		}
 		else
 		{
-			this->CmdStat |= CmdStat::PORT_2_MISSING;
+			this->recv1 |= Recv1::PORT_2_MISSING;
 		}
 	}

@@ -196,18 +196,18 @@ void Sio2::Multitap()
 	const bool multitapEnabled = EmuConfig.Pad.IsMultitapPortEnabled(this->port);
 	
 	// Update the third nibble with which ports have been accessed
-	if (this->CmdStat & CmdStat::ONE_PORT_OPEN)
+	if (this->recv1 & Recv1::ONE_PORT_OPEN)
 	{
-		this->CmdStat &= ~(CmdStat::ONE_PORT_OPEN);
-		this->CmdStat |= CmdStat::TWO_PORTS_OPEN;
+		this->recv1 &= ~(Recv1::ONE_PORT_OPEN);
+		this->recv1 |= Recv1::TWO_PORTS_OPEN;
 	}
 	else
 	{
-		this->CmdStat |= CmdStat::ONE_PORT_OPEN;
+		this->recv1 |= Recv1::ONE_PORT_OPEN;
 	}

 	// This bit is always set, whether the pad is present or missing
-	this->CmdStat |= CmdStat::NO_DEVICES_MISSING;
+	this->recv1 |= Recv1::NO_DEVICES_MISSING;

 	// If the currently accessed multitap is missing, also tick those bits.
 	// MTAPMAN is special though.
@@ -217,11 +217,11 @@ void Sio2::Multitap()
 	// then a disconnect value would look like 0x0002D100.
 	//
 	// MTAPMAN however does not check the bit set by 0x00020000. It only checks the bit
-	// set by 0x00010000. So even if port 2 is being addressed, cmd stat should be 0x0001D100
+	// set by 0x00010000. So even if port 2 is being addressed, RECV1 should be 0x0001D100
 	// (or 0x0001D200 if there are both ports being accessed in that packet).
 	if (!multitapEnabled)
 	{
-		this->CmdStat |= CmdStat::PORT_1_MISSING;
+		this->recv1 |= Recv1::PORT_1_MISSING;
 	}

 	g_MultitapArr.at(this->port).SendToMultitap();
@@ -229,7 +229,7 @@ void Sio2::Multitap()

 void Sio2::Infrared()
 {
-	SetCmdStat(CmdStat::DISCONNECTED);
+	SetRecv1(Recv1::DISCONNECTED);

 	g_Sio2FifoIn.pop_front();
 	const u8 responseByte = 0xff;
@@ -246,11 +246,11 @@ void Sio2::Memcard()

 	mcd = &mcds[port][mtap.GetMemcardSlot()];

-	// Check if auto ejection is active. If so, set cmd stat to DISCONNECTED,
+	// Check if auto ejection is active. If so, set RECV1 to DISCONNECTED,
 	// and zero out the fifo to simulate dead air over the wire.
 	if (mcd->autoEjectTicks)
 	{
-		SetCmdStat(CmdStat::DISCONNECTED);
+		SetRecv1(Recv1::DISCONNECTED);
 		g_Sio2FifoOut.push_back(0xff); // Because Sio2::Write pops the first g_Sio2FifoIn member

 		while (!g_Sio2FifoIn.empty())
@@ -262,7 +262,7 @@ void Sio2::Memcard()
 		return;
 	}

-	SetCmdStat(mcd->IsPresent() ? CmdStat::CONNECTED : CmdStat::DISCONNECTED);
+	SetRecv1(mcd->IsPresent() ? Recv1::CONNECTED : Recv1::DISCONNECTED);

 	const u8 commandByte = g_Sio2FifoIn.front();
 	g_Sio2FifoIn.pop_front();
@@ -376,25 +376,25 @@ void Sio2::Write(u8 data)
 {
 	Sio2Log.WriteLn("%s(%02X) SIO2 DATA Write", __FUNCTION__, data);

-	if (!queueRead)
+	if (!send3Read)
 	{
-		// No more queue positions to access, but the game is still sending us SIO2 writes. Lets ignore them.
-		if (queuePosition > CmdQueue.size())
+		// No more SEND3 positions to access, but the game is still sending us SIO2 writes. Lets ignore them.
+		if (send3Position > send3.size())
 		{
-			Console.Warning("%s(%02X) Received data after exhausting all queue entries!", __FUNCTION__, data);
+			Console.Warning("%s(%02X) Received data after exhausting all SEND3 values!", __FUNCTION__, data);
 			return;
 		}

-		const u32 currentCmd = CmdQueue[queuePosition];
-		port = currentCmd & Sio2Cmd::PORT;
-		commandLength = (currentCmd >> 8) & Sio2Cmd::COMMAND_LENGTH_MASK;
-		queueRead = true;
+		const u32 currentSend3 = send3[send3Position];
+		port = currentSend3 & Send3::PORT;
+		commandLength = (currentSend3 >> 8) & Send3::COMMAND_LENGTH_MASK;
+		send3Read = true;

-		// The freshly read cmd position had a length of 0, so we are done handling SIO2 commands until
-		// the next cmd writes.
+		// The freshly read SEND3 position had a length of 0, so we are done handling SIO2 commands until
+		// the next SEND3 writes.
 		if (commandLength == 0)
 		{
-			queueComplete = true;
+			send3Complete = true;
 		}

 		// If the prior command did not need to fully pop g_Sio2FifoIn, do so now,
@@ -405,7 +405,7 @@ void Sio2::Write(u8 data)
 		}
 	}

-	if (queueComplete)
+	if (send3Complete)
 	{
 		return;
 	}
@@ -418,9 +418,9 @@ void Sio2::Write(u8 data)
 	// ... These were from SIO2 DMA (DMA block size is non-zero when SIO2 DMA occurs)
 	if ((g_Sio2FifoIn.size() == g_Sio2.commandLength && g_Sio2.dmaBlockSize == 0) || g_Sio2FifoIn.size() == g_Sio2.dmaBlockSize)
 	{
-		// Go ahead and prep so the next write triggers a load of the new cmd value.
-		g_Sio2.queueRead = false;
-		g_Sio2.queuePosition++;
+		// Go ahead and prep so the next write triggers a load of the new SEND3 value.
+		g_Sio2.send3Read = false;
+		g_Sio2.send3Position++;

 		// Check the SIO mode
 		const u8 sioMode = g_Sio2FifoIn.front();
@@ -443,7 +443,7 @@ void Sio2::Write(u8 data)
 			default:
 				Console.Error("%s(%02X) Unhandled SIO mode %02X", __FUNCTION__, data, sioMode);
 				g_Sio2FifoOut.push_back(0xff);
-				SetCmdStat(CmdStat::DISCONNECTED);
+				SetRecv1(Recv1::DISCONNECTED);
 				break;
 		}

@@ -488,25 +488,25 @@ bool Sio2::DoState(StateWrapper& sw)
 	if (!sw.DoMarker("Sio2"))
 		return false;

-	sw.Do(&CmdQueue);
-	sw.Do(&PortCtrl0);
-	sw.Do(&PortCtrl1);
+	sw.Do(&send3);
+	sw.Do(&send1);
+	sw.Do(&send2);
 	sw.Do(&dataIn);
 	sw.Do(&dataOut);
 	sw.Do(&ctrl);
-	sw.Do(&CmdStat);
-	sw.Do(&PortStat);
-	sw.Do(&FifoStat);
-	sw.Do(&FifoTxPos);
-	sw.Do(&FifoRxPos);
+	sw.Do(&recv1);
+	sw.Do(&recv2);
+	sw.Do(&recv3);
+	sw.Do(&unknown1);
+	sw.Do(&unknown2);
 	sw.Do(&iStat);
 	sw.Do(&port);
-	sw.Do(&queueRead);
-	sw.Do(&queuePosition);
+	sw.Do(&send3Read);
+	sw.Do(&send3Position);
 	sw.Do(&commandLength);
 	sw.Do(&processedLength);
 	sw.Do(&dmaBlockSize);
-	sw.Do(&queueComplete);
+	sw.Do(&send3Complete);

 	sw.Do(&g_Sio2FifoIn);
 	sw.Do(&g_Sio2FifoOut);
@@ -3,8 +3,6 @@

 #pragma once

-#include "common/Pcsx2Types.h"
-
 #include <array>
 #include <deque>

@@ -13,33 +11,37 @@ class StateWrapper;
 class Sio2
 {
 public:
-	std::array<u32, 16> CmdQueue; // 0x1f808200 - 0x1f80823f
-	std::array<u32, 4> PortCtrl0; // 0x1f808240 - 0x1f80825f
-	std::array<u32, 4> PortCtrl1; // 0x1f808240 - 0x1f80825f
+	std::array<u32, 16> send3; // 0x1f808200 - 0x1f80823f
+	// SEND1 and SEND2 are an unusual bunch. It's not entirely clear just from
+	// documentation but these registers almost seem like they are the same thing;
+	// when bit 2 is set, SEND2 is being read/written. When bit 2 isn't set, it is
+	// SEND1. Their use is not really known, either.
+	std::array<u32, 4> send1; // 0x1f808240 - 0x1f80825f
+	std::array<u32, 4> send2; // 0x1f808240 - 0x1f80825f
 	u32 dataIn; // 0x1f808260
 	u32 dataOut; // 0x1f808264
 	u32 ctrl; // 0x1f808268
-	u32 CmdStat; // 0x1f80826c
-	u32 PortStat; // 0x1f808270
-	u32 FifoStat; // 0x1f808274
-	u32 FifoTxPos; // 0x1f808278
-	u32 FifoRxPos; // 0x1f80827c
+	u32 recv1; // 0x1f80826c
+	u32 recv2; // 0x1f808270
+	u32 recv3; // 0x1f808274
+	u32 unknown1; // 0x1f808278
+	u32 unknown2; // 0x1f80827c
 	u32 iStat; // 0x1f808280

 	u8 port = 0;

-	// The current working index of the command queue. The queue is a 16 position
+	// The current working index of SEND3. The SEND3 register is a 16 position
 	// array of command descriptors. Each descriptor describes the port the command
 	// is targeting, as well as the length of the command in bytes.
-	bool queueRead = false;
-	size_t queuePosition = 0;
+	bool send3Read = false;
+	size_t send3Position = 0;
 	size_t commandLength = 0;
 	size_t processedLength = 0;
 	// Tracks the size of a single block of DMA11/DMA12 data. psxDma11 will set this prior
 	// to doing writes, and Sio2::SetSend3 will clear this to ensure a non-DMA write into SIO2
 	// does not accidentally use dmaBlockSize.
 	size_t dmaBlockSize = 0;
-	bool queueComplete = false;
+	bool send3Complete = false;

 	Sio2();
 	~Sio2();
@@ -53,8 +55,8 @@ public:
 	void Interrupt();

 	void SetCtrl(u32 value);
-	void SetCmd(size_t position, u32 value);
-	void SetCmdStat(u32 value);
+	void SetSend3(size_t position, u32 value);
+	void SetRecv1(u32 value);

 	void Pad();
 	void Multitap();
@@ -103,7 +103,7 @@ namespace SIO0_CTRL
 	static constexpr u16 PORT = 0x2000;
 } // namespace SIO0_CTRL

-namespace Sio2Cmd
+namespace Send3
 {
 	static constexpr u32 PORT = 0x01;
 	static constexpr u16 COMMAND_LENGTH_MASK = 0x3ff;
@@ -119,7 +119,7 @@ namespace Sio2Ctrl
 } // namespace Sio2Ctrl

 // TODO: Remove deprecated options once memcards are no longer using them.
-namespace CmdStat
+namespace Recv1
 {
 	// Deprecated
 	static constexpr u32 DISCONNECTED = 0x1d100;
@@ -135,7 +135,7 @@ namespace CmdStat

 } // namespace Recv1

-namespace PortStat
+namespace Recv2
 {
 	static constexpr u32 DEFAULT = 0xf;
 } // namespace Recv2
@@ -145,7 +145,7 @@ namespace PortStat
 // to use them. We're going to try and respect these where it seems like
 // it may make sense to do so, but these are still largely unknown and
 // tests suggest they are not even used at all.
-namespace FifoStat
+namespace Recv3
 {
 	static constexpr u32 DEFAULT = 0x0;
 	// Set when getting memcard specs
@@ -119,7 +119,7 @@ mem8_t iopHwRead8_Page8( u32 addr )

 	mem8_t ret;

-	if (addr == HW_SIO2_RX)
+	if (addr == HW_SIO2_FIFO)
 	{
 		ret = g_Sio2.Read();
 	}
@@ -415,7 +415,7 @@ mem32_t iopHwRead32_Page8( u32 addr )
 		if( masked_addr < 0x240 )
 		{
 			const int parm = (masked_addr-0x200) / 4;
-			ret = g_Sio2.CmdQueue[parm];
+			ret = g_Sio2.send3[parm];
 			Sio2Log.WriteLn("%s(%08X) SIO2 SEND3 Read (%08X)", __FUNCTION__, addr, ret);
 		}
 		else if ( masked_addr < 0x260 )
@@ -423,18 +423,18 @@ mem32_t iopHwRead32_Page8( u32 addr )
 			// SIO2 Send commands alternate registers.  First reg maps to Send1, second
 			// to Send2, third to Send1, etc.  And the following clever code does this:
 			const int parm = (masked_addr-0x240) / 8;
-			ret = (masked_addr & 4) ? g_Sio2.PortCtrl1[parm] : g_Sio2.PortCtrl0[parm];
+			ret = (masked_addr & 4) ? g_Sio2.send2[parm] : g_Sio2.send1[parm];
 			Sio2Log.WriteLn("%s(%08X) SIO2 SEND1/2 Read (%08X)", __FUNCTION__, addr, ret);
 		}
 		else if ( masked_addr <= 0x280 )
 		{
 			switch( masked_addr )
 			{
-				case (HW_SIO2_TX & 0x0fff):
+				case (HW_SIO2_DATAIN & 0x0fff):
 					ret = psxHu32(addr);
 					Sio2Log.Warning("%s(%08X) Unexpected 32 bit read of HW_SIO2_DATAIN (%08X)", __FUNCTION__, addr, ret);
 					break;
-				case (HW_SIO2_RX & 0x0fff):
+				case (HW_SIO2_FIFO & 0x0fff):
 					ret = psxHu32(addr);
 					Sio2Log.Warning("%s(%08X) Unexpected 32 bit read of HW_SIO2_FIFO (%08X)", __FUNCTION__, addr, ret);
 					break;
@@ -442,24 +442,24 @@ mem32_t iopHwRead32_Page8( u32 addr )
 					ret = g_Sio2.ctrl;
 					Sio2Log.WriteLn("%s(%08X) SIO2 CTRL Read (%08X)", __FUNCTION__, addr, ret);
 					break;
-				case (HW_SIO2_CMD_STAT & 0xfff):
-					ret = g_Sio2.CmdStat;
+				case (HW_SIO2_RECV1 & 0xfff):
+					ret = g_Sio2.recv1;
 					Sio2Log.WriteLn("%s(%08X) SIO2 RECV1 Read (%08X)", __FUNCTION__, addr, ret);
 					break;
-				case (HW_SIO2_PORT_STAT & 0x0fff):
-					ret = g_Sio2.PortStat;
+				case (HW_SIO2_RECV2 & 0x0fff):
+					ret = g_Sio2.recv2;
 					Sio2Log.WriteLn("%s(%08X) SIO2 RECV2 Read (%08X)", __FUNCTION__, addr, ret);
 					break;
-				case (HW_SIO2_FIFO_STAT & 0x0fff):
-					ret = g_Sio2.FifoStat;
+				case (HW_SIO2_RECV3 & 0x0fff):
+					ret = g_Sio2.recv3;
 					Sio2Log.WriteLn("%s(%08X) SIO2 RECV3 Read (%08X)", __FUNCTION__, addr, ret);
 					break;
 				case (0x1f808278 & 0x0fff):
-					ret = g_Sio2.FifoTxPos;
+					ret = g_Sio2.unknown1;
 					Sio2Log.WriteLn("%s(%08X) SIO2 UNK1 Read (%08X)", __FUNCTION__, addr, ret);
 					break;
 				case (0x1f80827C & 0x0fff):
-					ret = g_Sio2.FifoRxPos;
+					ret = g_Sio2.unknown2;
 					Sio2Log.WriteLn("%s(%08X) SIO2 UNK2 Read (%08X)", __FUNCTION__, addr, ret);
 					break;
 				case (HW_SIO2_INTR & 0x0fff):
@@ -162,7 +162,7 @@ void iopHwWrite8_Page8( u32 addr, mem8_t val )
 	// all addresses are assumed to be prefixed with 0x1f808xxx:
 	pxAssert( (addr >> 12) == 0x1f808 );

-	if (addr == HW_SIO2_TX)
+	if (addr == HW_SIO2_DATAIN)
 	{
 		g_Sio2.Write(val);
 	}
@@ -595,9 +595,9 @@ void iopHwWrite32_Page8( u32 addr, mem32_t val )
 	{
 		if( masked_addr < 0x240 )
 		{
-			Sio2Log.WriteLn("%s(%08X, %08X) SIO2 SEND3 Write (len = %d / %d) (port = %d)", __FUNCTION__, addr, val, (val >> 8) & Sio2Cmd::COMMAND_LENGTH_MASK, (val >> 18) & Sio2Cmd::COMMAND_LENGTH_MASK, val & 0x01);
+			Sio2Log.WriteLn("%s(%08X, %08X) SIO2 SEND3 Write (len = %d / %d) (port = %d)", __FUNCTION__, addr, val, (val >> 8) & Send3::COMMAND_LENGTH_MASK, (val >> 18) & Send3::COMMAND_LENGTH_MASK, val & 0x01);
 			const int parm = (masked_addr - 0x200) / 4;
-			g_Sio2.SetCmd(parm, val);
+			g_Sio2.SetSend3(parm, val);
 		}
 		else if ( masked_addr < 0x260 )
 		{
@@ -609,47 +609,47 @@ void iopHwWrite32_Page8( u32 addr, mem32_t val )
 			if (masked_addr & 4)
 			{
 				Sio2Log.WriteLn("%s(%08X, %08X) SIO2 SEND2 Write", __FUNCTION__, addr, val);
-				g_Sio2.PortCtrl1[parm] = val;
+				g_Sio2.send2[parm] = val;
 			}
 			else
 			{
 				Sio2Log.WriteLn("%s(%08X, %08X) SIO2 SEND1 Write", __FUNCTION__, addr, val);
-				g_Sio2.PortCtrl0[parm] = val;
+				g_Sio2.send1[parm] = val;
 			}
 		}
 		else if ( masked_addr <= 0x280 )
 		{
 			switch( masked_addr )
 			{
-				case (HW_SIO2_TX & 0x0fff):
+				case (HW_SIO2_DATAIN & 0x0fff):
 					Sio2Log.Warning("%s(%08X, %08X) Unexpected 32 bit write to HW_SIO2_DATAIN", __FUNCTION__, addr, val);
 					break;
-				case (HW_SIO2_RX & 0x0fff):
+				case (HW_SIO2_FIFO & 0x0fff):
 					Sio2Log.Warning("%s(%08X, %08X) Unexpected 32 bit write to HW_SIO2_FIFO", __FUNCTION__, addr, val);
 					break;
 				case (HW_SIO2_CTRL & 0x0fff):
 					Sio2Log.WriteLn("%s(%08X, %08X) SIO2 CTRL Write", __FUNCTION__, addr, val);
 					g_Sio2.SetCtrl(val);
 					break;
-				case (HW_SIO2_CMD_STAT & 0x0fff):
+				case (HW_SIO2_RECV1 & 0x0fff):
 					Sio2Log.WriteLn("%s(%08X, %08X) SIO2 RECV1 Write", __FUNCTION__, addr, val);
-					g_Sio2.CmdStat = val;
+					g_Sio2.recv1 = val;
 					break;
-				case (HW_SIO2_PORT_STAT & 0x0fff):
+				case (HW_SIO2_RECV2 & 0x0fff):
 					Sio2Log.WriteLn("%s(%08X, %08X) SIO2 RECV2 Write", __FUNCTION__, addr, val);
-					g_Sio2.PortStat = val;
+					g_Sio2.recv2 = val;
 					break;
-				case (HW_SIO2_FIFO_STAT & 0x0fff):
+				case (HW_SIO2_RECV3 & 0x0fff):
 					Sio2Log.WriteLn("%s(%08X, %08X) SIO2 RECV3 Write", __FUNCTION__, addr, val);
-					g_Sio2.FifoStat = val;
+					g_Sio2.recv3 = val;
 					break;
-				case (HW_SIO2_FIFO_TX & 0x0fff):
+				case (HW_SIO2_8278 & 0x0fff):
 					Sio2Log.WriteLn("%s(%08X, %08X) SIO2 UNK1 Write", __FUNCTION__, addr, val);
-					g_Sio2.FifoTxPos = val;
+					g_Sio2.unknown1 = val;
 					break;
-				case (HW_SIO2_FIFO_RX & 0x0fff):
+				case (HW_SIO2_827C & 0x0fff):
 					Sio2Log.WriteLn("%s(%08X, %08X) SIO2 UNK2 Write", __FUNCTION__, addr, val);
-					g_Sio2.FifoRxPos = val;
+					g_Sio2.unknown2 = val;
 					break;
 				case (HW_SIO2_INTR & 0x0fff):
 					Sio2Log.WriteLn("%s(%08X, %08X) SIO2 ISTAT Write", __FUNCTION__, addr, val);
@@ -136,14 +136,14 @@ static __ri const char* _ioplog_GetHwName( u32 addr, T val )

 		// ------------------------------------------------------------------------

-		case HW_SIO2_RX:	    return "SIO2 RX";
-		case HW_SIO2_CTRL:	    return "SIO2 CTRL";
-		case HW_SIO2_CMD_STAT:	return "SIO2 CMD_STAT";
-		case HW_SIO2_PORT_STAT:	return "SIO2 PORT_STAT";
-		case HW_SIO2_FIFO_STAT:	return "SIO2 FIFO_STAT";
-		case HW_SIO2_INTR:	    return "SIO2 INTR";
-		case HW_SIO2_FIFO_TX:   return "SIO2 FIFO_TX";
-		case HW_SIO2_FIFO_RX:   return "SIO2 FIFO_RX";
+		case HW_SIO2_FIFO:	return "SIO2 FIFO";
+		case HW_SIO2_CTRL:	return "SIO2 CTRL";
+		case HW_SIO2_RECV1:	return "SIO2 RECV1";
+		case HW_SIO2_RECV2:	return "SIO2 RECV2";
+		case HW_SIO2_RECV3:	return "SIO2 RECV3";
+		case HW_SIO2_INTR:	return "SIO2 INTR";
+		case 0x1f808278:	return "SIO2 8278";
+		case 0x1f80827C:	return "SIO2 827C";

 		// ------------------------------------------------------------------------
 		// Check for "zoned" registers in the default case.