diff --git a/.editorconfig b/.editorconfig
index f15a5a7e6ac6..769094d3fb58 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -11,7 +11,8 @@ insert_final_newline = true
 max_line_length = 100
 
 [{CMakeLists.txt,*.cmake}]
-indent_style = tab
+indent_style = space
+insert_final_newline = true
 
 [.editorconfig]
 insert_final_newline = true
diff --git a/BuildMacOSUniversalBinary.py b/BuildMacOSUniversalBinary.py
index 5eff0d0cfc44..3fc84a1c15f2 100755
--- a/BuildMacOSUniversalBinary.py
+++ b/BuildMacOSUniversalBinary.py
@@ -295,6 +295,8 @@ def build(config):
                 "-DENABLE_AUTOUPDATE="
                 + python_to_cmake_bool(config["autoupdate"]),
                 '-DDISTRIBUTOR=' + config['distributor'],
+                # Distributable bundles need to be postprocessed to embed dependencies
+                "-DPOSTPROCESS_BUNDLE=ON",
                 # Always use libraries from Externals to prevent any libraries
                 # installed by Homebrew from leaking in to the app
                 "-DUSE_SYSTEM_LIBS=OFF",
diff --git a/CMake/CCache.cmake b/CMake/CCache.cmake
index a8ee5da473dd..cfb29e210170 100644
--- a/CMake/CCache.cmake
+++ b/CMake/CCache.cmake
@@ -1,17 +1,13 @@
 find_program(CCACHE_BIN NAMES ccache sccache)
 if(CCACHE_BIN)
-    # Official ccache recommendation is to set CMAKE_C(XX)_COMPILER_LAUNCHER
-    if (NOT CMAKE_C_COMPILER_LAUNCHER MATCHES "ccache")
-        list(INSERT CMAKE_C_COMPILER_LAUNCHER 0 "${CCACHE_BIN}")
+  set(_CCACHE_SUPPORTED_LAUCHERS C CXX OBJC OBJCXX)
+  foreach(LAUNCHER ${_CCACHE_SUPPORTED_LAUCHERS})
+    if (NOT CMAKE_${LAUNCHER}_COMPILER_LAUNCHER MATCHES "ccache")
+      list(INSERT CMAKE_${LAUNCHER}_COMPILER_LAUNCHER 0 ${CCACHE_BIN})
     endif()
-
-    if (NOT CMAKE_CXX_COMPILER_LAUNCHER MATCHES "ccache")
-        list(INSERT CMAKE_CXX_COMPILER_LAUNCHER 0 "${CCACHE_BIN}")
-    endif()
-
     # ccache uses -I when compiling without preprocessor, which makes clang complain.
-    if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-        set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Qunused-arguments -fcolor-diagnostics")
-        set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Qunused-arguments -fcolor-diagnostics")
+    if("${CMAKE_${LAUNCHER}_COMPILER_ID}" MATCHES "Clang")
+      set(CMAKE_${LAUNCHER}_FLAGS "${CMAKE_${LAUNCHER}_FLAGS} -Qunused-arguments -fcolor-diagnostics")
     endif()
+  endforeach()
 endif()
diff --git a/CMake/CheckLib.cmake b/CMake/CheckLib.cmake
index 64c05e9ba05f..ba6b8bf0aad3 100644
--- a/CMake/CheckLib.cmake
+++ b/CMake/CheckLib.cmake
@@ -1,58 +1,58 @@
 find_package(PkgConfig)
 
 macro(_internal_message msg)
-	if(NOT ${_is_quiet})
-		message(STATUS "${msg}")
-	endif()
+  if(NOT ${_is_quiet})
+    message(STATUS "${msg}")
+  endif()
 endmacro()
 
 macro(check_lib var pc lib)
-	set(_is_required 0)
-	set(_is_quiet 0)
-	set(_arg_list ${ARGN})
-	foreach(_arg ${ARGN})
-		if(_arg STREQUAL "REQUIRED")
-			list(REMOVE_ITEM _arg_list "REQUIRED")
-			set(_is_required 1)
-		endif()
-		if(_arg STREQUAL "QUIET")
-			list(REMOVE_ITEM _arg_list "QUIET")
-			set(_is_quiet 1)
-		endif()
-	endforeach()
+  set(_is_required 0)
+  set(_is_quiet 0)
+  set(_arg_list ${ARGN})
+  foreach(_arg ${ARGN})
+    if(_arg STREQUAL "REQUIRED")
+      list(REMOVE_ITEM _arg_list "REQUIRED")
+      set(_is_required 1)
+    endif()
+    if(_arg STREQUAL "QUIET")
+      list(REMOVE_ITEM _arg_list "QUIET")
+      set(_is_quiet 1)
+    endif()
+  endforeach()
 
-	if(PKG_CONFIG_FOUND AND NOT ${var}_FOUND)
-		pkg_search_module(${var} QUIET ${pc})
-	endif()
+  if(PKG_CONFIG_FOUND AND NOT ${var}_FOUND)
+    pkg_search_module(${var} QUIET ${pc})
+  endif()
 
-	if(${var}_FOUND)
-		if(${var}_INCLUDE_DIRS)
-			include_directories(${${var}_INCLUDE_DIRS})
-		endif()
-		# Make sure include directories for headers found using find_path below
-		# are re-added when reconfiguring
-		if(${var}_INCLUDE)
-			include_directories(${${var}_INCLUDE})
-		endif()
-		_internal_message("${lib} found")
-	else()
-		find_library(${var} ${lib})
-		if(_arg_list)
-			find_path(${var}_INCLUDE ${_arg_list})
-		else()
-			set(${var}_INCLUDE FALSE)
-		endif()
-		if(${var} AND ${var}_INCLUDE)
-			include_directories(${${var}_INCLUDE})
-			_internal_message("${lib} found")
-			set(${var}_FOUND 1 CACHE INTERNAL "")
-		else()
-			if(_is_required)
-				message(FATAL_ERROR "${lib} is required but not found")
-			else()
-				_internal_message("${lib} not found")
-			endif()
-		endif()
-	endif()
+  if(${var}_FOUND)
+    if(${var}_INCLUDE_DIRS)
+      include_directories(${${var}_INCLUDE_DIRS})
+    endif()
+    # Make sure include directories for headers found using find_path below
+    # are re-added when reconfiguring
+    if(${var}_INCLUDE)
+      include_directories(${${var}_INCLUDE})
+    endif()
+    _internal_message("${lib} found")
+  else()
+    find_library(${var} ${lib})
+    if(_arg_list)
+      find_path(${var}_INCLUDE ${_arg_list})
+    else()
+      set(${var}_INCLUDE FALSE)
+    endif()
+    if(${var} AND ${var}_INCLUDE)
+      include_directories(${${var}_INCLUDE})
+      _internal_message("${lib} found")
+      set(${var}_FOUND 1 CACHE INTERNAL "")
+    else()
+      if(_is_required)
+        message(FATAL_ERROR "${lib} is required but not found")
+      else()
+        _internal_message("${lib} not found")
+      endif()
+    endif()
+  endif()
 endmacro()
 
diff --git a/CMake/DolphinPostprocessBundle.cmake b/CMake/DolphinPostprocessBundle.cmake
index 4a1c68562c87..83cee8c971be 100644
--- a/CMake/DolphinPostprocessBundle.cmake
+++ b/CMake/DolphinPostprocessBundle.cmake
@@ -10,15 +10,15 @@
 # module as a post-build step.
 
 if(CMAKE_GENERATOR)
-	# Being called as include(DolphinPostprocessBundle), so define a helper function.
-	set(_DOLPHIN_POSTPROCESS_BUNDLE_MODULE_LOCATION "${CMAKE_CURRENT_LIST_FILE}")
-	function(dolphin_postprocess_bundle target)
-		add_custom_command(TARGET ${target} POST_BUILD
-			COMMAND ${CMAKE_COMMAND} "-D" "DOLPHIN_BUNDLE_PATH=$<TARGET_BUNDLE_DIR:${target}>"
-				-P "${_DOLPHIN_POSTPROCESS_BUNDLE_MODULE_LOCATION}"
-		)
-	endfunction()
-	return()
+  # Being called as include(DolphinPostprocessBundle), so define a helper function.
+  set(_DOLPHIN_POSTPROCESS_BUNDLE_MODULE_LOCATION "${CMAKE_CURRENT_LIST_FILE}")
+  function(dolphin_postprocess_bundle target)
+    add_custom_command(TARGET ${target} POST_BUILD
+      COMMAND ${CMAKE_COMMAND} "-D" "DOLPHIN_BUNDLE_PATH=$<TARGET_BUNDLE_DIR:${target}>"
+        -P "${_DOLPHIN_POSTPROCESS_BUNDLE_MODULE_LOCATION}"
+    )
+  endfunction()
+  return()
 endif()
 
 message(STATUS "Fixing up application bundle: ${DOLPHIN_BUNDLE_PATH}")
@@ -35,9 +35,9 @@ set(extra_dirs "/usr/local/lib" "/lib" "/usr/lib")
 
 # BundleUtilities is overly verbose, so disable most of its messages
 function(message)
-	if(NOT ARGV MATCHES "^STATUS;")
-		_message(${ARGV})
-	endif()
+  if(NOT ARGV MATCHES "^STATUS;")
+    _message(${ARGV})
+  endif()
 endfunction()
 
 include(BundleUtilities)
diff --git a/CMake/FindCUBEB.cmake b/CMake/FindCUBEB.cmake
index 94ed431a9bb2..3b9235c83611 100644
--- a/CMake/FindCUBEB.cmake
+++ b/CMake/FindCUBEB.cmake
@@ -4,7 +4,7 @@ mark_as_advanced(CUBEB_INCLUDE_DIR CUBEB_LIBRARY)
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(CUBEB DEFAULT_MSG
-	CUBEB_INCLUDE_DIR CUBEB_LIBRARY)
+  CUBEB_INCLUDE_DIR CUBEB_LIBRARY)
 
 if(CUBEB_FOUND AND NOT TARGET cubeb::cubeb)
   add_library(cubeb::cubeb UNKNOWN IMPORTED)
diff --git a/CMake/FindEGL.cmake b/CMake/FindEGL.cmake
index dd7a8bcff0c0..43e4a1a9f573 100644
--- a/CMake/FindEGL.cmake
+++ b/CMake/FindEGL.cmake
@@ -36,16 +36,16 @@ find_package(PkgConfig)
 pkg_check_modules(PC_EGL egl)
 
 if (PC_EGL_FOUND)
-    set(EGL_DEFINITIONS ${PC_EGL_CFLAGS_OTHER})
+  set(EGL_DEFINITIONS ${PC_EGL_CFLAGS_OTHER})
 endif ()
 
 find_path(EGL_INCLUDE_DIRS NAMES EGL/egl.h
-    HINTS ${PC_EGL_INCLUDEDIR} ${PC_EGL_INCLUDE_DIRS}
+  HINTS ${PC_EGL_INCLUDEDIR} ${PC_EGL_INCLUDE_DIRS}
 )
 
 set(EGL_NAMES ${EGL_NAMES} egl EGL)
 find_library(EGL_LIBRARIES NAMES ${EGL_NAMES}
-    HINTS ${PC_EGL_LIBDIR} ${PC_EGL_LIBRARY_DIRS}
+  HINTS ${PC_EGL_LIBDIR} ${PC_EGL_LIBRARY_DIRS}
 )
 
 include(FindPackageHandleStandardArgs)
diff --git a/CMake/FindHIDAPI.cmake b/CMake/FindHIDAPI.cmake
index 81b9990212ad..422a894902e2 100644
--- a/CMake/FindHIDAPI.cmake
+++ b/CMake/FindHIDAPI.cmake
@@ -7,11 +7,11 @@ include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(HIDAPI DEFAULT_MSG HIDAPI_LIBRARY HIDAPI_INCLUDE_DIR)
 
 if(HIDAPI_FOUND AND NOT TARGET Hidapi::Hidapi)
-    add_library(Hidapi::Hidapi UNKNOWN IMPORTED)
-    set_target_properties(Hidapi::Hidapi PROPERTIES
-      IMPORTED_LOCATION ${HIDAPI_LIBRARIES}
-      INTERFACE_INCLUDE_DIRECTORIES ${HIDAPI_INCLUDE_DIRS}
-    )
+  add_library(Hidapi::Hidapi UNKNOWN IMPORTED)
+  set_target_properties(Hidapi::Hidapi PROPERTIES
+    IMPORTED_LOCATION ${HIDAPI_LIBRARIES}
+    INTERFACE_INCLUDE_DIRECTORIES ${HIDAPI_INCLUDE_DIRS}
+  )
 endif()
 
 mark_as_advanced(HIDAPI_INCLUDE_DIR HIDAPI_LIBRARY)
diff --git a/CMake/FindLIBEVDEV.cmake b/CMake/FindLIBEVDEV.cmake
index f01e41a562de..3edfbca18848 100644
--- a/CMake/FindLIBEVDEV.cmake
+++ b/CMake/FindLIBEVDEV.cmake
@@ -8,19 +8,19 @@ find_package(PkgConfig)
 pkg_check_modules(PC_LIBEVDEV QUIET libevdev)
 
 FIND_PATH(
-    LIBEVDEV_INCLUDE_DIR libevdev/libevdev.h
-    HINTS ${PC_LIBEVDEV_INCLUDEDIR} ${PC_LIBEVDEV_INCLUDE_DIRS}
-    /usr/include
-    /usr/local/include
-    ${LIBEVDEV_PATH_INCLUDES}
+  LIBEVDEV_INCLUDE_DIR libevdev/libevdev.h
+  HINTS ${PC_LIBEVDEV_INCLUDEDIR} ${PC_LIBEVDEV_INCLUDE_DIRS}
+  /usr/include
+  /usr/local/include
+  ${LIBEVDEV_PATH_INCLUDES}
 )
 
 FIND_LIBRARY(
-    LIBEVDEV_LIBRARY
-    NAMES evdev libevdev
-    HINTS ${PC_LIBEVDEV_LIBDIR} ${PC_LIBEVDEV_LIBRARY_DIRS}
-    PATHS ${ADDITIONAL_LIBRARY_PATHS}
-        ${LIBEVDEV_PATH_LIB}
+  LIBEVDEV_LIBRARY
+  NAMES evdev libevdev
+  HINTS ${PC_LIBEVDEV_LIBDIR} ${PC_LIBEVDEV_LIBRARY_DIRS}
+  PATHS ${ADDITIONAL_LIBRARY_PATHS}
+    ${LIBEVDEV_PATH_LIB}
 )
 
 set(LIBEVDEV_LIBRARIES ${LIBEVDEV_LIBRARY} )
diff --git a/CMake/FindLIBMGBA.cmake b/CMake/FindLIBMGBA.cmake
index 7772c4097bb5..ab56c85aa72f 100644
--- a/CMake/FindLIBMGBA.cmake
+++ b/CMake/FindLIBMGBA.cmake
@@ -4,7 +4,7 @@ mark_as_advanced(LIBMGBA_INCLUDE_DIR LIBMGBA_LIBRARY)
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(LIBMGBA DEFAULT_MSG
-	LIBMGBA_INCLUDE_DIR LIBMGBA_LIBRARY)
+  LIBMGBA_INCLUDE_DIR LIBMGBA_LIBRARY)
 
 if(LIBMGBA_FOUND AND NOT mGBA::mgba)
   add_library(mGBA::mgba UNKNOWN IMPORTED)
diff --git a/CMake/FindLIBUDEV.cmake b/CMake/FindLIBUDEV.cmake
index 2b71e4e605c2..aa4aba04e37d 100644
--- a/CMake/FindLIBUDEV.cmake
+++ b/CMake/FindLIBUDEV.cmake
@@ -5,17 +5,17 @@
 #  LIBUDEV_LIBRARIES - The libraries needed to use LIBUDEV
 
 FIND_PATH(
-    LIBUDEV_INCLUDE_DIR libudev.h
-    /usr/include
-    /usr/local/include
-    ${LIBUDEV_PATH_INCLUDES}
+  LIBUDEV_INCLUDE_DIR libudev.h
+  /usr/include
+  /usr/local/include
+  ${LIBUDEV_PATH_INCLUDES}
 )
 
 FIND_LIBRARY(
-    LIBUDEV_LIBRARY
-    NAMES udev libudev
-    PATHS ${ADDITIONAL_LIBRARY_PATHS}
-        ${LIBUDEV_PATH_LIB}
+  LIBUDEV_LIBRARY
+  NAMES udev libudev
+  PATHS ${ADDITIONAL_LIBRARY_PATHS}
+    ${LIBUDEV_PATH_LIB}
 )
 
 set(LIBUDEV_LIBRARIES ${LIBUDEV_LIBRARY} )
diff --git a/CMake/FindLZO.cmake b/CMake/FindLZO.cmake
index 2a146b37c8c4..c7e08c6bf3f4 100644
--- a/CMake/FindLZO.cmake
+++ b/CMake/FindLZO.cmake
@@ -4,7 +4,7 @@ mark_as_advanced(LZO_INCLUDE_DIR LZO_LIBRARY)
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(LZO DEFAULT_MSG
-	LZO_INCLUDE_DIR LZO_LIBRARY)
+  LZO_INCLUDE_DIR LZO_LIBRARY)
 
 if(LZO_FOUND AND NOT TARGET LZO::LZO)
   add_library(LZO::LZO UNKNOWN IMPORTED)
diff --git a/CMake/FindLibUSB.cmake b/CMake/FindLibUSB.cmake
index c087edfcb85a..5a6fc7197ffc 100644
--- a/CMake/FindLibUSB.cmake
+++ b/CMake/FindLibUSB.cmake
@@ -9,42 +9,42 @@
 # vim: expandtab sw=4 ts=4 sts=4:
 
 if(ANDROID)
-       set(LIBUSB_FOUND FALSE CACHE INTERNAL "libusb-1.0 found")
-       message(STATUS "libusb-1.0 not found.")
+  set(LIBUSB_FOUND FALSE CACHE INTERNAL "libusb-1.0 found")
+  message(STATUS "libusb-1.0 not found.")
 elseif (NOT LIBUSB_FOUND)
-    pkg_check_modules (LIBUSB_PKG libusb-1.0)
+  pkg_check_modules (LIBUSB_PKG libusb-1.0)
 
-    find_path(LIBUSB_INCLUDE_DIR NAMES libusb.h
-       PATHS
-       ${LIBUSB_PKG_INCLUDE_DIRS}
-       /usr/include/libusb-1.0
-       /usr/include
-       /usr/local/include/libusb-1.0
-       /usr/local/include
-    )
+  find_path(LIBUSB_INCLUDE_DIR NAMES libusb.h
+    PATHS
+    ${LIBUSB_PKG_INCLUDE_DIRS}
+    /usr/include/libusb-1.0
+    /usr/include
+    /usr/local/include/libusb-1.0
+    /usr/local/include
+  )
 
-    find_library(LIBUSB_LIBRARIES NAMES usb-1.0 usb
-       PATHS
-       ${LIBUSB_PKG_LIBRARY_DIRS}
-       /usr/lib
-       /usr/local/lib
-    )
+  find_library(LIBUSB_LIBRARIES NAMES usb-1.0 usb
+    PATHS
+    ${LIBUSB_PKG_LIBRARY_DIRS}
+    /usr/lib
+    /usr/local/lib
+  )
 
-    if(LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
-       set(LIBUSB_FOUND TRUE CACHE INTERNAL "libusb-1.0 found")
-       message(STATUS "Found libusb-1.0: ${LIBUSB_INCLUDE_DIR}, ${LIBUSB_LIBRARIES}")
-    else(LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
-       set(LIBUSB_FOUND FALSE CACHE INTERNAL "libusb-1.0 found")
-       message(STATUS "libusb-1.0 not found.")
-    endif(LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
+  if(LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
+    set(LIBUSB_FOUND TRUE CACHE INTERNAL "libusb-1.0 found")
+    message(STATUS "Found libusb-1.0: ${LIBUSB_INCLUDE_DIR}, ${LIBUSB_LIBRARIES}")
+  else(LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
+    set(LIBUSB_FOUND FALSE CACHE INTERNAL "libusb-1.0 found")
+    message(STATUS "libusb-1.0 not found.")
+  endif(LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
 
-    mark_as_advanced(LIBUSB_INCLUDE_DIR LIBUSB_LIBRARIES)
+  mark_as_advanced(LIBUSB_INCLUDE_DIR LIBUSB_LIBRARIES)
 endif ()
 if(LIBUSB_FOUND AND NOT TARGET LibUSB::LibUSB)
-    add_library(LibUSB::LibUSB UNKNOWN IMPORTED)
-    set_target_properties(LibUSB::LibUSB PROPERTIES
-        IMPORTED_LOCATION "${LIBUSB_LIBRARIES}"
-        INTERFACE_INCLUDE_DIRECTORIES "${LIBUSB_INCLUDE_DIR}"
-    )
+  add_library(LibUSB::LibUSB UNKNOWN IMPORTED)
+  set_target_properties(LibUSB::LibUSB PROPERTIES
+    IMPORTED_LOCATION "${LIBUSB_LIBRARIES}"
+    INTERFACE_INCLUDE_DIRECTORIES "${LIBUSB_INCLUDE_DIR}"
+  )
 endif()
 
diff --git a/CMake/FindMBEDTLS.cmake b/CMake/FindMBEDTLS.cmake
index 6512cc92f6ea..0438c2449e1a 100644
--- a/CMake/FindMBEDTLS.cmake
+++ b/CMake/FindMBEDTLS.cmake
@@ -8,52 +8,52 @@ set(MBEDTLS_INCLUDE_DIRS ${MBEDTLS_INCLUDE_DIR})
 set(MBEDTLS_LIBRARIES ${MBEDTLS_LIBRARY} ${MBEDX509_LIBRARY} ${MBEDCRYPTO_LIBRARY})
 
 if(NOT MBEDTLS_INCLUDE_DIR STREQUAL "MBEDTLS_INCLUDE_DIR-NOTFOUND")
-	if(EXISTS ${MBEDTLS_INCLUDE_DIR}/mbedtls/build_info.h)
-	    file(STRINGS ${MBEDTLS_INCLUDE_DIR}/mbedtls/build_info.h MBEDTLS_VERSION_STR REGEX "^#define[ \t]+MBEDTLS_VERSION_STRING[\t ].*")
-	else()
-	    file(STRINGS ${MBEDTLS_INCLUDE_DIR}/mbedtls/version.h MBEDTLS_VERSION_STR REGEX "^#define[ \t]+MBEDTLS_VERSION_STRING[\t ].*")
-	endif()
-	string(REGEX REPLACE "^#define[\t ]+MBEDTLS_VERSION_STRING[\t ]+\"([.0-9]+)\".*" "\\1" MBEDTLS_VERSION ${MBEDTLS_VERSION_STR})
+  if(EXISTS ${MBEDTLS_INCLUDE_DIR}/mbedtls/build_info.h)
+    file(STRINGS ${MBEDTLS_INCLUDE_DIR}/mbedtls/build_info.h MBEDTLS_VERSION_STR REGEX "^#define[ \t]+MBEDTLS_VERSION_STRING[\t ].*")
+  else()
+    file(STRINGS ${MBEDTLS_INCLUDE_DIR}/mbedtls/version.h MBEDTLS_VERSION_STR REGEX "^#define[ \t]+MBEDTLS_VERSION_STRING[\t ].*")
+  endif()
+  string(REGEX REPLACE "^#define[\t ]+MBEDTLS_VERSION_STRING[\t ]+\"([.0-9]+)\".*" "\\1" MBEDTLS_VERSION ${MBEDTLS_VERSION_STR})
 endif()
 
 if(NOT MBEDTLS_INCLUDE_DIR STREQUAL "MBEDTLS_INCLUDE_DIR-NOTFOUND" AND MBEDTLS_VERSION VERSION_GREATER_EQUAL 3)
-	# Once CMake 3.19 is required, we can enable HANDLE_VERSION_RANGE and use that
-	if(MBEDTLS_FIND_REQUIRED)
-		set(type FATAL_ERROR)
-	else()
-		set(type STATUS)
-	endif()
-	if(MBEDTLS_FIND_REQUIRED OR NOT MBEDTLS_FIND_QUIETLY)
-		message(${type} "Could NOT find MBEDTLS: Found unsuitable version \"${MBEDTLS_VERSION}\", but a 2.x version is required (found ${MBEDTLS_INCLUDE_DIR})")
-	endif()
-	set(MBEDTLS_FOUND FALSE)
+  # Once CMake 3.19 is required, we can enable HANDLE_VERSION_RANGE and use that
+  if(MBEDTLS_FIND_REQUIRED)
+    set(type FATAL_ERROR)
+  else()
+    set(type STATUS)
+  endif()
+  if(MBEDTLS_FIND_REQUIRED OR NOT MBEDTLS_FIND_QUIETLY)
+    message(${type} "Could NOT find MBEDTLS: Found unsuitable version \"${MBEDTLS_VERSION}\", but a 2.x version is required (found ${MBEDTLS_INCLUDE_DIR})")
+  endif()
+  set(MBEDTLS_FOUND FALSE)
 else()
-	include(FindPackageHandleStandardArgs)
-	find_package_handle_standard_args(MBEDTLS
-		REQUIRED_VARS MBEDTLS_INCLUDE_DIR MBEDTLS_LIBRARY MBEDX509_LIBRARY MBEDCRYPTO_LIBRARY
-		VERSION_VAR MBEDTLS_VERSION)
+  include(FindPackageHandleStandardArgs)
+  find_package_handle_standard_args(MBEDTLS
+    REQUIRED_VARS MBEDTLS_INCLUDE_DIR MBEDTLS_LIBRARY MBEDX509_LIBRARY MBEDCRYPTO_LIBRARY
+    VERSION_VAR MBEDTLS_VERSION)
 endif()
 
 mark_as_advanced(MBEDTLS_INCLUDE_DIR MBEDTLS_LIBRARY MBEDX509_LIBRARY MBEDCRYPTO_LIBRARY)
 
 if(MBEDTLS_FOUND)
-	add_library(MbedTLS::mbedcrypto UNKNOWN IMPORTED)
-	set_target_properties(MbedTLS::mbedcrypto PROPERTIES
-	    IMPORTED_LOCATION "${MBEDCRYPTO_LIBRARY}"
-	    INTERFACE_INCLUDE_DIRECTORIES "${MBEDTLS_INCLUDE_DIR}"
-	)
-
-	add_library(MbedTLS::mbedx509 UNKNOWN IMPORTED)
-	set_target_properties(MbedTLS::mbedx509 PROPERTIES
-	    IMPORTED_LOCATION "${MBEDX509_LIBRARY}"
-	    INTERFACE_INCLUDE_DIRECTORIES "${MBEDTLS_INCLUDE_DIR}"
-	    INTERFACE_LINK_LIBRARIES MbedTLS::mbedcrypto
-	)
-
-	add_library(MbedTLS::mbedtls UNKNOWN IMPORTED)
-	set_target_properties(MbedTLS::mbedtls PROPERTIES
-	    IMPORTED_LOCATION "${MBEDTLS_LIBRARY}"
-	    INTERFACE_INCLUDE_DIRECTORIES "${MBEDTLS_INCLUDE_DIR}"
-	    INTERFACE_LINK_LIBRARIES MbedTLS::mbedx509
-	)
+  add_library(MbedTLS::mbedcrypto UNKNOWN IMPORTED)
+  set_target_properties(MbedTLS::mbedcrypto PROPERTIES
+    IMPORTED_LOCATION "${MBEDCRYPTO_LIBRARY}"
+    INTERFACE_INCLUDE_DIRECTORIES "${MBEDTLS_INCLUDE_DIR}"
+  )
+
+  add_library(MbedTLS::mbedx509 UNKNOWN IMPORTED)
+  set_target_properties(MbedTLS::mbedx509 PROPERTIES
+    IMPORTED_LOCATION "${MBEDX509_LIBRARY}"
+    INTERFACE_INCLUDE_DIRECTORIES "${MBEDTLS_INCLUDE_DIR}"
+    INTERFACE_LINK_LIBRARIES MbedTLS::mbedcrypto
+  )
+
+  add_library(MbedTLS::mbedtls UNKNOWN IMPORTED)
+  set_target_properties(MbedTLS::mbedtls PROPERTIES
+    IMPORTED_LOCATION "${MBEDTLS_LIBRARY}"
+    INTERFACE_INCLUDE_DIRECTORIES "${MBEDTLS_INCLUDE_DIR}"
+    INTERFACE_LINK_LIBRARIES MbedTLS::mbedx509
+  )
 endif()
diff --git a/CMake/FindMINIUPNPC.cmake b/CMake/FindMINIUPNPC.cmake
index edfc5b2b9daf..72c2dd0c6efc 100644
--- a/CMake/FindMINIUPNPC.cmake
+++ b/CMake/FindMINIUPNPC.cmake
@@ -5,16 +5,16 @@ find_path(MINIUPNPC_INCLUDE_DIR miniupnpc.h PATH_SUFFIXES miniupnpc)
 find_library(MINIUPNPC_LIBRARY miniupnpc)
 
 if(MINIUPNPC_INCLUDE_DIR)
-	file(STRINGS "${MINIUPNPC_INCLUDE_DIR}/miniupnpc.h" MINIUPNPC_VERSION_STR REGEX "^#define[\t ]+MINIUPNPC_VERSION[\t ]+.*")
-	if(MINIUPNPC_VERSION_STR)
-		string(REGEX REPLACE "^#define[\t ]+MINIUPNPC_VERSION[\t ]+\"([.0-9]+)\"" "\\1" MINIUPNPC_VERSION ${MINIUPNPC_VERSION_STR})
-	endif()
+  file(STRINGS "${MINIUPNPC_INCLUDE_DIR}/miniupnpc.h" MINIUPNPC_VERSION_STR REGEX "^#define[\t ]+MINIUPNPC_VERSION[\t ]+.*")
+  if(MINIUPNPC_VERSION_STR)
+    string(REGEX REPLACE "^#define[\t ]+MINIUPNPC_VERSION[\t ]+\"([.0-9]+)\"" "\\1" MINIUPNPC_VERSION ${MINIUPNPC_VERSION_STR})
+  endif()
 endif()
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(MINIUPNPC
-	REQUIRED_VARS MINIUPNPC_INCLUDE_DIR MINIUPNPC_LIBRARY
-	VERSION_VAR MINIUPNPC_VERSION
+  REQUIRED_VARS MINIUPNPC_INCLUDE_DIR MINIUPNPC_LIBRARY
+  VERSION_VAR MINIUPNPC_VERSION
 )
 
 set(MINIUPNPC_LIBRARIES ${MINIUPNPC_LIBRARY})
diff --git a/CMake/FindSFML.cmake b/CMake/FindSFML.cmake
index 79522c5b0f8c..ba2a92736bad 100644
--- a/CMake/FindSFML.cmake
+++ b/CMake/FindSFML.cmake
@@ -52,13 +52,13 @@
 
 # define the SFML_STATIC macro if static build was chosen
 if(SFML_STATIC_LIBRARIES)
-    add_definitions(-DSFML_STATIC)
+  add_definitions(-DSFML_STATIC)
 endif()
 
 # deduce the libraries suffix from the options
 set(FIND_SFML_LIB_SUFFIX "")
 if(SFML_STATIC_LIBRARIES)
-    set(FIND_SFML_LIB_SUFFIX "${FIND_SFML_LIB_SUFFIX}-s")
+  set(FIND_SFML_LIB_SUFFIX "${FIND_SFML_LIB_SUFFIX}-s")
 endif()
 
 # find the SFML include directory
@@ -79,41 +79,41 @@ find_path(SFML_INCLUDE_DIR SFML/Config.hpp
 # check the version number
 set(SFML_VERSION_OK TRUE)
 if(SFML_FIND_VERSION AND SFML_INCLUDE_DIR)
-    # extract the major and minor version numbers from SFML/Config.hpp
-    # we have to handle framework a little bit differently :
-    if("${SFML_INCLUDE_DIR}" MATCHES "SFML.framework")
-        set(SFML_CONFIG_HPP_INPUT "${SFML_INCLUDE_DIR}/Headers/Config.hpp")
-    else()
-        set(SFML_CONFIG_HPP_INPUT "${SFML_INCLUDE_DIR}/SFML/Config.hpp")
+  # extract the major and minor version numbers from SFML/Config.hpp
+  # we have to handle framework a little bit differently :
+  if("${SFML_INCLUDE_DIR}" MATCHES "SFML.framework")
+    set(SFML_CONFIG_HPP_INPUT "${SFML_INCLUDE_DIR}/Headers/Config.hpp")
+  else()
+    set(SFML_CONFIG_HPP_INPUT "${SFML_INCLUDE_DIR}/SFML/Config.hpp")
+  endif()
+  FILE(READ "${SFML_CONFIG_HPP_INPUT}" SFML_CONFIG_HPP_CONTENTS)
+  STRING(REGEX MATCH "#define SFML_VERSION_MAJOR[ \t]+([0-9]+)" SFML_VERSION_MAJOR_MATCH "${SFML_CONFIG_HPP_CONTENTS}")
+  STRING(REGEX MATCH "#define SFML_VERSION_MINOR[ \t]+([0-9]+)" SFML_VERSION_MINOR_MATCH "${SFML_CONFIG_HPP_CONTENTS}")
+  STRING(REGEX REPLACE "#define SFML_VERSION_MAJOR[ \t]+([0-9]+)" "\\1" SFML_VERSION_MAJOR "${SFML_VERSION_MAJOR_MATCH}")
+  STRING(REGEX REPLACE "#define SFML_VERSION_MINOR[ \t]+([0-9]+)" "\\1" SFML_VERSION_MINOR "${SFML_VERSION_MINOR_MATCH}")
+  math(EXPR SFML_REQUESTED_VERSION "${SFML_FIND_VERSION_MAJOR} * 10 + ${SFML_FIND_VERSION_MINOR}")
+
+  # if we could extract them, compare with the requested version number
+  if (SFML_VERSION_MAJOR)
+    # transform version numbers to an integer
+    math(EXPR SFML_VERSION "${SFML_VERSION_MAJOR} * 10 + ${SFML_VERSION_MINOR}")
+
+    # compare them
+    if(SFML_VERSION LESS SFML_REQUESTED_VERSION)
+      set(SFML_VERSION_OK FALSE)
     endif()
-    FILE(READ "${SFML_CONFIG_HPP_INPUT}" SFML_CONFIG_HPP_CONTENTS)
-    STRING(REGEX MATCH "#define SFML_VERSION_MAJOR[ \t]+([0-9]+)" SFML_VERSION_MAJOR_MATCH "${SFML_CONFIG_HPP_CONTENTS}")
-    STRING(REGEX MATCH "#define SFML_VERSION_MINOR[ \t]+([0-9]+)" SFML_VERSION_MINOR_MATCH "${SFML_CONFIG_HPP_CONTENTS}")
-    STRING(REGEX REPLACE "#define SFML_VERSION_MAJOR[ \t]+([0-9]+)" "\\1" SFML_VERSION_MAJOR "${SFML_VERSION_MAJOR_MATCH}")
-    STRING(REGEX REPLACE "#define SFML_VERSION_MINOR[ \t]+([0-9]+)" "\\1" SFML_VERSION_MINOR "${SFML_VERSION_MINOR_MATCH}")
-    math(EXPR SFML_REQUESTED_VERSION "${SFML_FIND_VERSION_MAJOR} * 10 + ${SFML_FIND_VERSION_MINOR}")
-
-    # if we could extract them, compare with the requested version number
-    if (SFML_VERSION_MAJOR)
-        # transform version numbers to an integer
-        math(EXPR SFML_VERSION "${SFML_VERSION_MAJOR} * 10 + ${SFML_VERSION_MINOR}")
-
-        # compare them
-        if(SFML_VERSION LESS SFML_REQUESTED_VERSION)
-            set(SFML_VERSION_OK FALSE)
-        endif()
-    else()
-        # SFML version is < 3.0
-        if (SFML_REQUESTED_VERSION GREATER 29)
-            set(SFML_VERSION_OK FALSE)
-            if (SFML_REQUESTED_VERSION GREATER 19)
-                set(SFML_VERSION_MAJOR 1)
-            else()
-                set(SFML_VERSION_MAJOR 2)
-            endif()
-            set(SFML_VERSION_MINOR x)
-        endif()
+  else()
+    # SFML version is < 3.0
+    if (SFML_REQUESTED_VERSION GREATER 29)
+      set(SFML_VERSION_OK FALSE)
+      if (SFML_REQUESTED_VERSION GREATER 19)
+        set(SFML_VERSION_MAJOR 1)
+      else()
+        set(SFML_VERSION_MAJOR 2)
+      endif()
+      set(SFML_VERSION_MINOR x)
     endif()
+  endif()
 endif()
 
 # find the requested modules
@@ -130,101 +130,101 @@ set(FIND_SFML_LIB_PATHS
     /opt/csw
     /opt)
 foreach(FIND_SFML_COMPONENT ${SFML_FIND_COMPONENTS})
-    string(TOLOWER ${FIND_SFML_COMPONENT} FIND_SFML_COMPONENT_LOWER)
-    string(TOUPPER ${FIND_SFML_COMPONENT} FIND_SFML_COMPONENT_UPPER)
-    set(FIND_SFML_COMPONENT_NAME sfml-${FIND_SFML_COMPONENT_LOWER}${FIND_SFML_LIB_SUFFIX})
-
-    # no suffix for sfml-main, it is always a static library
-    if(FIND_SFML_COMPONENT_LOWER STREQUAL "main")
-        set(FIND_SFML_COMPONENT_NAME sfml-${FIND_SFML_COMPONENT_LOWER})
+  string(TOLOWER ${FIND_SFML_COMPONENT} FIND_SFML_COMPONENT_LOWER)
+  string(TOUPPER ${FIND_SFML_COMPONENT} FIND_SFML_COMPONENT_UPPER)
+  set(FIND_SFML_COMPONENT_NAME sfml-${FIND_SFML_COMPONENT_LOWER}${FIND_SFML_LIB_SUFFIX})
+
+  # no suffix for sfml-main, it is always a static library
+  if(FIND_SFML_COMPONENT_LOWER STREQUAL "main")
+    set(FIND_SFML_COMPONENT_NAME sfml-${FIND_SFML_COMPONENT_LOWER})
+  endif()
+
+  # debug library
+  find_library(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG
+                NAMES ${FIND_SFML_COMPONENT_NAME}-d
+                PATH_SUFFIXES lib64 lib
+                PATHS ${FIND_SFML_LIB_PATHS})
+
+  # release library
+  find_library(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE
+                NAMES ${FIND_SFML_COMPONENT_NAME}
+                PATH_SUFFIXES lib64 lib
+                PATHS ${FIND_SFML_LIB_PATHS})
+
+  if (SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG OR SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE)
+    # library found
+    set(SFML_${FIND_SFML_COMPONENT_UPPER}_FOUND TRUE)
+
+    # if both are found, set SFML_XXX_LIBRARY to contain both
+    if (SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG AND SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE)
+      set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY debug     ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG}
+                                                    optimized ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE})
     endif()
 
-    # debug library
-    find_library(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG
-                 NAMES ${FIND_SFML_COMPONENT_NAME}-d
-                 PATH_SUFFIXES lib64 lib
-                 PATHS ${FIND_SFML_LIB_PATHS})
-
-    # release library
-    find_library(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE
-                 NAMES ${FIND_SFML_COMPONENT_NAME}
-                 PATH_SUFFIXES lib64 lib
-                 PATHS ${FIND_SFML_LIB_PATHS})
-
-    if (SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG OR SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE)
-        # library found
-        set(SFML_${FIND_SFML_COMPONENT_UPPER}_FOUND TRUE)
-
-        # if both are found, set SFML_XXX_LIBRARY to contain both
-        if (SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG AND SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE)
-            set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY debug     ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG}
-                                                          optimized ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE})
-        endif()
-
-        # if only one debug/release variant is found, set the other to be equal to the found one
-        if (SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG AND NOT SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE)
-            # debug and not release
-            set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG})
-            set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY         ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG})
-        endif()
-        if (SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE AND NOT SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG)
-            # release and not debug
-            set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE})
-            set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY       ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE})
-        endif()
-    else()
-        # library not found
-        set(SFML_FOUND FALSE)
-        set(SFML_${FIND_SFML_COMPONENT_UPPER}_FOUND FALSE)
-        set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY "")
-        set(FIND_SFML_MISSING "${FIND_SFML_MISSING} SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY")
+    # if only one debug/release variant is found, set the other to be equal to the found one
+    if (SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG AND NOT SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE)
+      # debug and not release
+      set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG})
+      set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY         ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG})
     endif()
-
-    # mark as advanced
-    MARK_AS_ADVANCED(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY
-                     SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE
-                     SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG)
-
-    # add to the global list of libraries
-    set(SFML_LIBRARIES ${SFML_LIBRARIES} "${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY}")
+    if (SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE AND NOT SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG)
+      # release and not debug
+      set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE})
+      set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY       ${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE})
+    endif()
+  else()
+    # library not found
+    set(SFML_FOUND FALSE)
+    set(SFML_${FIND_SFML_COMPONENT_UPPER}_FOUND FALSE)
+    set(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY "")
+    set(FIND_SFML_MISSING "${FIND_SFML_MISSING} SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY")
+  endif()
+
+  # mark as advanced
+  MARK_AS_ADVANCED(SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY
+                    SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_RELEASE
+                    SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY_DEBUG)
+
+  # add to the global list of libraries
+  set(SFML_LIBRARIES ${SFML_LIBRARIES} "${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY}")
 endforeach()
 
 # handle errors
 if(NOT SFML_VERSION_OK)
-    # SFML version not ok
-    set(FIND_SFML_ERROR "SFML found but version too low (requested: ${SFML_FIND_VERSION}, found: ${SFML_VERSION_MAJOR}.${SFML_VERSION_MINOR})")
-    set(SFML_FOUND FALSE)
+  # SFML version not ok
+  set(FIND_SFML_ERROR "SFML found but version too low (requested: ${SFML_FIND_VERSION}, found: ${SFML_VERSION_MAJOR}.${SFML_VERSION_MINOR})")
+  set(SFML_FOUND FALSE)
 elseif(NOT SFML_FOUND)
-    # include directory or library not found
-    set(FIND_SFML_ERROR "Could NOT find SFML (missing: ${FIND_SFML_MISSING})")
+  # include directory or library not found
+  set(FIND_SFML_ERROR "Could NOT find SFML (missing: ${FIND_SFML_MISSING})")
 endif()
 if (NOT SFML_FOUND)
-    if(SFML_FIND_REQUIRED)
-        # fatal error
-        message(FATAL_ERROR ${FIND_SFML_ERROR})
-    elseif(NOT SFML_FIND_QUIETLY)
-        # error but continue
-        message(STATUS "${FIND_SFML_ERROR}")
-    endif()
+  if(SFML_FIND_REQUIRED)
+    # fatal error
+    message(FATAL_ERROR ${FIND_SFML_ERROR})
+  elseif(NOT SFML_FIND_QUIETLY)
+    # error but continue
+    message(STATUS "${FIND_SFML_ERROR}")
+  endif()
 endif()
 
 # handle success
 if(SFML_FOUND)
-    message(STATUS "Found SFML ${SFML_VERSION_MAJOR}.${SFML_VERSION_MINOR} in ${SFML_INCLUDE_DIR}")
-    foreach(FIND_SFML_COMPONENT ${SFML_FIND_COMPONENTS})
-        string(TOLOWER ${FIND_SFML_COMPONENT} FIND_SFML_COMPONENT_LOWER)
-        string(TOUPPER ${FIND_SFML_COMPONENT} FIND_SFML_COMPONENT_UPPER)
-        if(NOT TARGET sfml-${FIND_SFML_COMPONENT_LOWER})
-            add_library(sfml-${FIND_SFML_COMPONENT_LOWER} UNKNOWN IMPORTED)
-            set_target_properties(sfml-${FIND_SFML_COMPONENT_LOWER} PROPERTIES
-                IMPORTED_LOCATION "${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY}"
-                INTERFACE_INCLUDE_DIRECTORIES "${SFML_INCLUDE_DIR}"
-            )
-            if(NOT ${FIND_SFML_COMPONENT_LOWER} STREQUAL system)
-                set_target_properties(sfml-${FIND_SFML_COMPONENT_LOWER} PROPERTIES
-                    INTERFACE_LINK_LIBRARIES sfml-system
-                )
-            endif()
-        endif()
-    endforeach()
+  message(STATUS "Found SFML ${SFML_VERSION_MAJOR}.${SFML_VERSION_MINOR} in ${SFML_INCLUDE_DIR}")
+  foreach(FIND_SFML_COMPONENT ${SFML_FIND_COMPONENTS})
+    string(TOLOWER ${FIND_SFML_COMPONENT} FIND_SFML_COMPONENT_LOWER)
+    string(TOUPPER ${FIND_SFML_COMPONENT} FIND_SFML_COMPONENT_UPPER)
+    if(NOT TARGET sfml-${FIND_SFML_COMPONENT_LOWER})
+      add_library(sfml-${FIND_SFML_COMPONENT_LOWER} UNKNOWN IMPORTED)
+      set_target_properties(sfml-${FIND_SFML_COMPONENT_LOWER} PROPERTIES
+        IMPORTED_LOCATION "${SFML_${FIND_SFML_COMPONENT_UPPER}_LIBRARY}"
+        INTERFACE_INCLUDE_DIRECTORIES "${SFML_INCLUDE_DIR}"
+      )
+      if(NOT ${FIND_SFML_COMPONENT_LOWER} STREQUAL system)
+        set_target_properties(sfml-${FIND_SFML_COMPONENT_LOWER} PROPERTIES
+          INTERFACE_LINK_LIBRARIES sfml-system
+        )
+      endif()
+    endif()
+  endforeach()
 endif()
diff --git a/CMake/FindSYSTEMD.cmake b/CMake/FindSYSTEMD.cmake
index d3a706ad1988..c0eab93c313e 100644
--- a/CMake/FindSYSTEMD.cmake
+++ b/CMake/FindSYSTEMD.cmake
@@ -2,28 +2,28 @@ find_package(PkgConfig QUIET)
 pkg_check_modules(PC_SYSTEMD QUIET "libsystemd")
 
 if (PC_SYSTEMD_FOUND)
-	add_definitions(${PC_SYSTEMD_CFLAGS} ${PC_SYSTEMD_CFLAGS_OTHER})
+  add_definitions(${PC_SYSTEMD_CFLAGS} ${PC_SYSTEMD_CFLAGS_OTHER})
 endif(PC_SYSTEMD_FOUND)
 
 find_path(
-    SYSTEMD_INCLUDE_DIRS
-    NAMES systemd/sd-daemon.h
-    HINTS ${PC_SYSTEMD_INCLUDEDIR} ${PC_SYSTEMD_INCLUDE_DIRS}
+  SYSTEMD_INCLUDE_DIRS
+  NAMES systemd/sd-daemon.h
+  HINTS ${PC_SYSTEMD_INCLUDEDIR} ${PC_SYSTEMD_INCLUDE_DIRS}
 )
 
 find_library(
-    SYSTEMD_LIBRARIES
-    NAMES systemd
-    HINTS ${PC_SYSTEMD_LIBDIR} ${PC_SYSTEMD_LIBRARY_DIRS}
+  SYSTEMD_LIBRARIES
+  NAMES systemd
+  HINTS ${PC_SYSTEMD_LIBDIR} ${PC_SYSTEMD_LIBRARY_DIRS}
 )
 
 include(FindPackageHandleStandardArgs)
 
 find_package_handle_standard_args(
-    SYSTEMD
-    REQUIRED_VARS SYSTEMD_LIBRARIES SYSTEMD_INCLUDE_DIRS
+  SYSTEMD
+  REQUIRED_VARS SYSTEMD_LIBRARIES SYSTEMD_INCLUDE_DIRS
 )
 mark_as_advanced(
-    SYSTEMD_FOUND
-    SYSTEMD_LIBRARIES SYSTEMD_INCLUDE_DIRS
+  SYSTEMD_FOUND
+  SYSTEMD_LIBRARIES SYSTEMD_INCLUDE_DIRS
 )
diff --git a/CMake/RemoveCompileFlag.cmake b/CMake/RemoveCompileFlag.cmake
index 1bb9c167bede..e29ae3863120 100644
--- a/CMake/RemoveCompileFlag.cmake
+++ b/CMake/RemoveCompileFlag.cmake
@@ -8,9 +8,9 @@
 #   _flag       - The compile flag to remove
 #
 macro(remove_cxx_flag_from_target _target _flag)
-    get_target_property(_target_cxx_flags ${_target} COMPILE_OPTIONS)
-    if(_target_cxx_flags)
-        list(REMOVE_ITEM _target_cxx_flags ${_flag})
-        set_target_properties(${_target} PROPERTIES COMPILE_OPTIONS "${_target_cxx_flags}")
-    endif()
+  get_target_property(_target_cxx_flags ${_target} COMPILE_OPTIONS)
+  if(_target_cxx_flags)
+    list(REMOVE_ITEM _target_cxx_flags ${_flag})
+    set_target_properties(${_target} PROPERTIES COMPILE_OPTIONS "${_target_cxx_flags}")
+  endif()
 endmacro()
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 17c40f208830..f639b94fb0cd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,23 +1,10 @@
 ########################################
 # General setup
 #
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.20...4.2.1)
 
-cmake_policy(SET CMP0079 NEW) # let target_link_libraries() link to a target defined in a different directory
 cmake_policy(SET CMP0080 OLD) # allow using BundleUtilities at configure time
 
-if (POLICY CMP0099)
-  cmake_policy(SET CMP0099 NEW) # Propagate INTERFACE_LINK_OPTIONS from private dependencies, used by MacOS framework builds of SDL
-endif()
-
-# Weird chicken-and-egg problem: We can't check the compiler before the project() call, but we have to set the policies before it.
-# So we do this in two steps: Set the policies if they exist, then error out afterwards if we end up being MSVC and they don't exist.
-if (POLICY CMP0117)
-  cmake_policy(SET CMP0091 NEW) # MSVC runtime library flags are selected by an abstraction.
-  cmake_policy(SET CMP0092 NEW) # MSVC warning flags are not in CMAKE_{C,CXX}_FLAGS by default.
-  cmake_policy(SET CMP0117 NEW) # MSVC RTTI flag will not be added by default.
-endif()
-
 if (POLICY CMP0141)
   cmake_policy(SET CMP0141 NEW) # MSVC debug information format flags are selected by an abstraction.
 endif()
@@ -28,6 +15,12 @@ set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0.0" CACHE STRING "")
 
 set(CMAKE_USER_MAKE_RULES_OVERRIDE "${CMAKE_CURRENT_SOURCE_DIR}/CMake/FlagsOverride.cmake")
 
+# CMake 3.28 and later scan c++ source files for module imports by default. Since we don't use
+# modules scanning is pointless, so disable it. This also prevents Clang from generating an error
+# if the clang-scan-deps tool isn't installed:
+# "CMAKE_CXX_COMPILER_CLANG_SCAN_DEPS-NOTFOUND: not found".
+set(CMAKE_CXX_SCAN_FOR_MODULES OFF)
+
 project(dolphin-emu)
 
 if (CMAKE_VERSION VERSION_LESS "3.25" AND CMAKE_SYSTEM_NAME MATCHES "Linux")
@@ -35,12 +28,6 @@ if (CMAKE_VERSION VERSION_LESS "3.25" AND CMAKE_SYSTEM_NAME MATCHES "Linux")
 endif()
 
 if (MSVC)
-  if (POLICY CMP0117)
-    # cmake is a weird language. You can't do if(not POLICY)
-  else()
-    message(FATAL_ERROR "Please update to CMake 3.20 or higher.")
-  endif()
-
   set(CMAKE_C_STANDARD 99)
   set(CMAKE_CXX_STANDARD 23)
   set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -51,12 +38,12 @@ if (COMPILER STREQUAL "GNU")
   set(COMPILER "GCC") # prefer printing GCC instead of GNU
 endif()
 
-# Enforce minimum compiler versions that support the c++20 features we use
-set (GCC_min_version 11)
-set (Clang_min_version 14)
+# Enforce minimum compiler versions that support the c++23 features we use
+set (GCC_min_version 12)
+set (Clang_min_version 15)
 set (AppleClang_min_version 14.0.3)
-set (min_xcode_version "14.0") # corresponding xcode version for AppleClang_min_version
-set (MSVC_min_version 14.32)
+set (min_xcode_version "14.3") # corresponding xcode version for AppleClang_min_version
+set (MSVC_min_version 19.32)
 set (min_vs_version "2022 17.2.3") # corresponding Visual Studio version for MSVC_min_version
 
 message(STATUS "Using ${COMPILER} ${CMAKE_CXX_COMPILER_VERSION}")
@@ -149,7 +136,7 @@ if(APPLE)
   enable_language(OBJC)
   enable_language(OBJCXX)
   option(MACOS_USE_DEFAULT_SEARCH_PATH "Don't prioritize system library paths" OFF)
-  option(SKIP_POSTPROCESS_BUNDLE "Skip postprocessing bundle for redistributability" OFF)
+  option(POSTPROCESS_BUNDLE "Postprocess bundle for redistributability" OFF)
   # Enable adhoc code signing by default (otherwise makefile builds on ARM will not work)
   option(MACOS_CODE_SIGNING "Enable codesigning" ON)
   option(USE_BUNDLED_MOLTENVK "Build MoltenVK from Externals with Dolphin-specific patches" ON)
@@ -235,11 +222,11 @@ if(ENABLE_GENERIC)
   message(STATUS "Warning! Building generic build!")
   set(_M_GENERIC 1)
   add_definitions(-D_M_GENERIC=1)
-elseif(_ARCH_64 AND CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64|AMD64")
+elseif(_ARCH_64 AND CMAKE_SYSTEM_PROCESSOR MATCHES "x64|x86_64|amd64|AMD64")
   set(_M_X86_64 1)
   add_definitions(-D_M_X86_64=1)
   check_and_add_flag(HAVE_SSE2 -msse2)
-elseif(_ARCH_64 AND CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|arm64")
+elseif(_ARCH_64 AND CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|arm64|ARM64")
   set(_M_ARM_64 1)
   add_definitions(-D_M_ARM_64=1)
   # CRC instruction set is used in the CRC32 hash function
@@ -369,7 +356,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
   set(CMAKE_XCODE_ATTRIBUTE_GCC_STRICT_ALIASING NO)
 
   # Specify target CPUs.
-  if(_ARCH_64 AND CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64|AMD64")
+  if(_ARCH_64 AND _M_X86_64)
     check_and_add_flag(HAVE_MSSSE3 -mssse3)
     check_and_add_flag(HAVE_ARCH_CORE2 -march=core2)
   endif()
@@ -396,15 +383,13 @@ if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
 endif()
 
 if(ENABLE_LTO)
-  if(CMAKE_C_COMPILER_ID MATCHES "MSVC")
-    add_compile_options(/GL)
-    string(APPEND CMAKE_EXE_LINKER_FLAGS " /LTCG")
+  include(CheckIPOSupported)
+  check_ipo_supported(RESULT supported OUTPUT error)
+
+  if(supported)
+    set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
   else()
-    check_and_add_flag(LTO -flto)
-    if(CMAKE_CXX_COMPILER_ID STREQUAL GNU)
-      set(CMAKE_AR gcc-ar)
-      set(CMAKE_RANLIB gcc-ranlib)
-    endif()
+    message(STATUS "IPO / LTO not supported: <${error}>")
   endif()
 endif()
 
@@ -526,6 +511,11 @@ if(LIBRETRO)
     set(USE_SYSTEM_LZO OFF CACHE BOOL "" FORCE)
     set(USE_SYSTEM_ZSTD OFF CACHE BOOL "" FORCE)
   endif()
+  if(IOS)
+    # prevent use of system zsdt/openssl in minizip
+    set(MZ_FORCE_FETCH_LIBS ON CACHE BOOL "" FORCE)
+    set(MZ_OPENSSL OFF CACHE BOOL "" FORCE)
+  endif()
   if(CMAKE_CXX_COMPILER MATCHES "arm-webos-linux-gnueabi-")
     set(WEBOS TRUE CACHE BOOL "Building for webOS")
     add_definitions(-D__WEBOS__)
@@ -706,7 +696,7 @@ endif()
 add_subdirectory(Externals/cpp-optparse)
 
 dolphin_find_optional_system_library_pkgconfig(FMT
-  fmt>=10.1 fmt::fmt Externals/fmt
+  fmt>=11.0 fmt::fmt Externals/fmt
 )
 
 add_subdirectory(Externals/imgui)
@@ -734,7 +724,7 @@ if(ENABLE_VULKAN)
   endif()
 endif()
 
-if(NOT WIN32 OR (NOT (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")))
+if(NOT (WIN32 AND _M_ARM_64))
   # OpenGL is available on all platforms except windows-arm64
   add_definitions(-DHAS_OPENGL)
 endif()
@@ -756,7 +746,7 @@ dolphin_find_optional_system_library_pkgconfig(ZSTD libzstd>=1.4.0 zstd::zstd Ex
 dolphin_find_optional_system_library_pkgconfig(ZLIB zlib>=1.3.1 ZLIB::ZLIB Externals/zlib-ng)
 
 dolphin_find_optional_system_library_pkgconfig(minizip-ng
-  "minizip-ng>=4.0.4" minizip-ng::minizip-ng Externals/minizip-ng
+  "minizip-ng>=4.0.4" MINIZIP::minizip-ng Externals/minizip-ng
 )
 
 dolphin_find_optional_system_library(LZO Externals/LZO)
@@ -847,15 +837,17 @@ add_subdirectory(Externals/rangeset)
 add_subdirectory(Externals/FatFs)
 
 if (USE_RETRO_ACHIEVEMENTS)
-	add_subdirectory(Externals/rcheevos)
+  add_subdirectory(Externals/rcheevos)
 endif()
 
 if (NOT IOS)
   add_subdirectory(Externals/watcher)
 endif()
 
-if(WIN32 OR LINUX)
+# Any other platform or BSD is currently unsupported by cpp-ipc
+if(WIN32 OR LINUX OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "QNX")
   add_subdirectory(Externals/cpp-ipc)
+  add_definitions(-DHAVE_CPPIPC)
 endif()
 
 ########################################
@@ -868,7 +860,7 @@ file(REMOVE "${PROJECT_SOURCE_DIR}/Source/Core/Common/scmrev.h")
 
 file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Source/Core/Common)
 if (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/Source/Core/Common/scmrev.h)
-	file(TOUCH ${CMAKE_CURRENT_BINARY_DIR}/Source/Core/Common/scmrev.h)
+  file(TOUCH ${CMAKE_CURRENT_BINARY_DIR}/Source/Core/Common/scmrev.h)
 endif()
 
 if(APPLE)
@@ -887,13 +879,13 @@ endif()
 
 find_package(Git)
 if(NOT GIT_FOUND)
-	set(GIT_EXECUTABLE "")
+  set(GIT_EXECUTABLE "")
 endif()
 add_custom_target(
-	dolphin_scmrev
-	${CMAKE_COMMAND} -DPROJECT_SOURCE_DIR=${PROJECT_SOURCE_DIR} -DPROJECT_BINARY_DIR=${PROJECT_BINARY_DIR} -DDISTRIBUTOR=${DISTRIBUTOR} -DDOLPHIN_DEFAULT_UPDATE_TRACK=${DOLPHIN_DEFAULT_UPDATE_TRACK} -DGIT_FOUND=${GIT_FOUND} -DGIT_EXECUTABLE=${GIT_EXECUTABLE} -DDOLPHIN_WC_REVISION=${DOLPHIN_WC_REVISION} -DDOLPHIN_WC_DESCRIBE=${DOLPHIN_WC_DESCRIBE} -DDOLPHIN_WC_BRANCH=${DOLPHIN_WC_BRANCH} -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET} -P ${CMAKE_CURRENT_SOURCE_DIR}/CMake/ScmRevGen.cmake
-	BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/Source/Core/Common/scmrev.h" "${CMAKE_CURRENT_BINARY_DIR}/Source/Core/DolphinQt/Info.plist" "${CMAKE_CURRENT_BINARY_DIR}/Source/Core/MacUpdater/Info.plist" "${CMAKE_CURRENT_BINARY_DIR}/Flatpak/org.DolphinEmu.dolphin-emu.metainfo.xml"
-	VERBATIM
+  dolphin_scmrev
+  ${CMAKE_COMMAND} -DPROJECT_SOURCE_DIR=${PROJECT_SOURCE_DIR} -DPROJECT_BINARY_DIR=${PROJECT_BINARY_DIR} -DDISTRIBUTOR=${DISTRIBUTOR} -DDOLPHIN_DEFAULT_UPDATE_TRACK=${DOLPHIN_DEFAULT_UPDATE_TRACK} -DGIT_FOUND=${GIT_FOUND} -DGIT_EXECUTABLE=${GIT_EXECUTABLE} -DDOLPHIN_WC_REVISION=${DOLPHIN_WC_REVISION} -DDOLPHIN_WC_DESCRIBE=${DOLPHIN_WC_DESCRIBE} -DDOLPHIN_WC_BRANCH=${DOLPHIN_WC_BRANCH} -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET} -P ${CMAKE_CURRENT_SOURCE_DIR}/CMake/ScmRevGen.cmake
+  BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/Source/Core/Common/scmrev.h" "${CMAKE_CURRENT_BINARY_DIR}/Source/Core/DolphinQt/Info.plist" "${CMAKE_CURRENT_BINARY_DIR}/Source/Core/MacUpdater/Info.plist" "${CMAKE_CURRENT_BINARY_DIR}/Flatpak/org.DolphinEmu.dolphin-emu.metainfo.xml"
+  VERBATIM
 )
 
 # This is here so #include "Common/scmrev.h" finds the generated header.
@@ -930,7 +922,8 @@ if(NOT CMAKE_SYSTEM_NAME MATCHES "Darwin|Windows")
   install(DIRECTORY Data/Sys/ DESTINATION ${datadir}/sys PATTERN)
 endif()
 if(NOT CMAKE_SYSTEM_NAME MATCHES "Linux|FreeBSD|OpenBSD|Darwin")
-  install(FILES Data/license.txt DESTINATION ${datadir})
+  install(FILES COPYING DESTINATION ${datadir})
+  install(DIRECTORY LICENSES DESTINATION ${datadir}/LICENSES PATTERN)
 endif()
 if(CMAKE_SYSTEM_NAME MATCHES "Linux|FreeBSD|OpenBSD")
   # Install the application icon and menu item
diff --git a/Data/Sys/ApprovedInis.json b/Data/Sys/ApprovedInis.json
index 396bcf11af70..34a3ce9c560b 100644
--- a/Data/Sys/ApprovedInis.json
+++ b/Data/Sys/ApprovedInis.json
@@ -1 +1 @@
-{"D43J01":{"loophack":"CAB9CED2D904F12CCB21F5B1DE9B5433620C3E13"},"DPOJ8P":{"Bypass Modem Detection":"90BA66E25640A538FEFA6693715718139079FA7B"},"G2BE5G":{"Disable interlaced rendering":"7FFF6BDD93713BEDFD23739C32B86153FA19AEA0"},"G2BP7D":{"Disable interlaced rendering":"56E85D7285F10348E1E5354E379918D07E79EDA9"},"G2VE08":{"16:9 Widescreen":"3ED033396382424533A263A39687A0961EC994A6"},"G2VP08":{"16:9 Widescreen":"EEBC3C5F04BB70AFCA1A4C3D638335CDC9142BA2"},"G3RP52":{"16:9 Widescreen":"7F6B7743F0DDD3704B15882330E490103AE24E36","60fps":"4C9A8572A35F1DB85BBB2F32ED34288A343F1FC0"},"G3YP52":{"16:9 Widescreen":"3D102AFEE2F4945894E74BB702ED3ED2294C6FEC","Force PAL60":"FD61581C593EA34DD358AE33819FAB310F2CE961"},"G4AEE9":{"16:9 Aspect Ratio Fix":"8C2564CF47BB6A9B57D712C90E17F459B0BB6CCD"},"G4ME69":{"16:9 Widescreen":"6FC6E5D91693FAABE25CC721F2121CB0B5CA9D12"},"G5SE7D":{"16:9 Widescreen":"16119398BFE241A84151C046E0BC5BCF89D22049","Remove Bloom":"A5F2FB2B3BFF61F34F8AB1DD5A912A0FD8DFA720"},"G5SP7D":{"16:9 Widescreen":"718AA8BD831961C33114852FDA75BB58F768F46A"},"G8ME01":{"16:9 Aspect Ratio Fix - Centered HUD":"8C2FC3FC6F7766AA8E87425BF3BDD2E46E73DE71","16:9 Aspect Ratio Fix - Centered HUD with letterboxing":"AE3DBE2604CA0660165CA870C4B80E2B523C9475","16:9 Aspect Ratio Fix - Normal HUD":"F6E8264CF14D0189219C1E2D20C4182F190F4B88","16:9 Aspect Ratio Fix - Stretched HUD":"8EA4C7B80ADE3E8FEC28EEFA3A046B6B04162E81","No Letterbox":"B1DE2A3526F2E4511F2B94A5171BF7B3C2C52B9B"},"G8MJ01":{"16:9 Aspect Ratio Fix - Centered HUD":"B3181CA1AAB11EAE9132184DA48D76E775AC0A24","16:9 Aspect Ratio Fix - Centered HUD with letterboxing":"904C0EEEF16D761F7BDF7099DEB384DD9AB26E00","16:9 Aspect Ratio Fix - Normal HUD":"631CE99BDE3F1475303C00C67E3C130D4EB2547B","16:9 Aspect Ratio Fix - Stretched HUD":"81F7AD591F12A01DE82850457ECF147998D1238F"},"G8MP01":{"16:9 Aspect Ratio Fix - Centered HUD":"75AF5D7FA49BE9C3C73EA1482B49CD9B36CE817E","16:9 Aspect Ratio Fix - Centered HUD with letterboxing":"C2E5003E74551DF693A7CB814850CA51D77549EF","16:9 Aspect Ratio Fix - Normal HUD":"FB26AA84B0CB787705E84E869B649307776A2839","16:9 Aspect Ratio Fix - Stretched HUD":"C5F8A81520193418C07C7BC4881F02BE9C4DC9BC","No Letterbox":"7828F5B0C8B470620755C16C60A5A4554F92640C"},"G9SE8P":{"16:9 Widescreen":"CD043229AC47AC93D537B6A0725A2D0BB6FEF4E8"},"G9SJ8P":{"16:9 Widescreen":"C55EF90B542AA3973352A232629A828BC22A8509"},"G9SP8P":{"16:9 Widescreen":"9521774ADEE769CFCCE86F8170FE626387E73019"},"GAFE01":{"16:9 Widescreen":"D24F6D9BE5D79D3C795C2844634A0214BB68B5DA","Make Game Save Copyable (donny2112)":"F9A812FF62A20D5440CAB79DB6AFAE068457A10E"},"GAHEGG":{"Limit internal frame rate (speed hack)":"2873E5178C8068AFA8AFE751F903A69CA9A41F16"},"GAL":{"Trophy Viewer":"DBDB50216B22CDFFF77BDD80261CD0FF75803D3B"},"GALE01r0":{"Normal C Stick Functionality in Singleplayer Modes":"9DC8D90D986FAC175F45006AFF20CF00EDFBE053","Proper 16:9 Widescreen Support":"18B4159E77013EDFE499A33281B771C442970E3B","Properly Display in 4:3":"DC2BCA7D99EBDE1DC7C68CA6AC7F543B93FD6A67"},"GALE01r1":{"Normal C Stick Functionality in Singleplayer Modes":"F6030959C1CAC92F37287D556F18B3C5298FAD5B"},"GALE01r2":{"Disable Rumble":"CFDEEA8AD2A99394BFFEA7211EF03394E7471FA9","Normal C Stick Functionality in Singleplayer Modes":"BCD918A72368B2A30E797C76994E7539A1C0B5D9","PAL Stock Icons":"6B92D95F0EEA165EA84FD753F74B0A9E2079C2D7","Proper 16:9 Widescreen Support":"CEDF18354CDCFC49398551C629E51B053331A55B","Widescreen Support v1.2 [Dan Salvato]":"D32ED4CD685F3FF649F7E749E8C182C657013918"},"GALP01":{"Normal C Stick Functionality in Singleplayer Modes":"4817F202678559291F9F76B46DC7561A45D00B77","Proper 16:9 Widescreen Support":"BFCBE098FE8679B9140A48EA1D8620D5A369697C","Properly Display in 4:3":"5BA2933B8365E21553AA273B91954A4C722B1035"},"GAZE69":{"60FPS":"BC281053C5266B21FDDC6C8996A6021DEA03D459"},"GBLE52":{"16:9 Widescreen":"C0F3AB3BBC9B21F4BF25F44E48CF1CD36D2B3F45"},"GBLP52":{"16:9 Widescreen":"797040CB097BFD369490A1BE29659929D76CE6F7"},"GBRJ18":{"16:9 Widescreen":"B3C867AB34D90E2E9C5B799D800F4C191DE279FA"},"GBSE8P":{"16:9 Widescreen":"4148D453F61A5B81E53669335BC667E651865C76"},"GBSP8P":{"16:9 Widescreen":"6CB029AE768BA5B9995D5F12C1EBB37B3D1FE242"},"GC6E01":{"16:9 Widescreen":"DE932CCAD1B5EB1FAA8D08733BD0D3940C78382A","60 FPS [Nerdzilla]":"85F98064F17AFE0FB02A99A182AF3FEB7644DCAA","Allow Memory Card saving with Savestates":"2F64F98686E62B60E466E931A9EBCD19A750FF4E"},"GC6J01":{"60 FPS [Nerdzilla]":"A6146772E37970EA5564F51A622A04792158B321","Allow Memory Card saving with Savestates":"D8F327304A88FBC717BB1F775494C5F864B9E8D2"},"GC6P01":{"16:9 Widescreen [Ralf]":"05C9016BF58A628A3FD7B16E1B9BB0769A14846F","60 FPS [Nerdzilla]":"1D3FB017C0D20754E48A8BA54EEE7DC4851BE84B","Allow Memory Card saving with Savestates":"EDEE0E28EEA1834868F2865336290FFBDFB9C6DA"},"GC8JA4":{"Fix C4 texture tiling (used for buttons and some character icons)":"843297019804192AF1FC660BC85F4B10891D0BA3"},"GCBE7D":{"16:9 Widescreen":"478DA1D596D8513C343850719155813CB61A56DD"},"GCBP7D":{"16:9 Widescreen":"478DA1D596D8513C343850719155813CB61A56DD","60Hz":"DF2C4DDF082C9E67919443C5ACC485AB2CF7F8D0"},"GCCE01":{"16:9 Widescreen":"BA0066518E7EA8599A81F8496BD39DE20CC369D6","Fix GBA connections":"483BDB94615C690045C3759795AF13CE76552286","Fix buffer overrun bug (crash at Goblin Wall)":"6C107FEC15C76201233CA2645EB5FAB4FF9751CE"},"GCCJGC":{"Fix GBA connections":"4C104D24329172F5D0F8649DE9423B931FE72CA3"},"GCCP01":{"16:9 Widescreen":"2580E7379633CF4DE13B9EC945DB17543477828A","Fix GBA connections":"2EAA60A8A115AD68A795109FB59E4A726D29016D"},"GCN":{"Fix C4 texture tiling (used for buttons and some character icons)":"601FE183C9524ACCF068874DABD73921C86769CF"},"GCVEEB":{"16:9 Widescreen":"ADA686C90189D1D7D23E23E525EFC96EFA104BB9"},"GD7E70":{"Deinterlacing Fix":"95A17AFAAFD83E96CD1CC6242B8667F6A3DC8416"},"GD7PB2":{"Deinterlacing Fix":"847264D37B4822FCBE30082590D936A45BB327D6"},"GDREAF":{"Fix audio issues":"F8EAE60FEB0CFB4477FDC4B9E136B63F68DFA63A"},"GDRP69":{"Fix audio issues":"E23D98B2CE185C3993A40F2495D37E41B971BF91"},"GEDE01":{"Fix startup hang":"21068C3CE905FB0CFFAA7408A93154AF8A5295A2"},"GEDJ01":{"Fix startup hang":"7061F3CF11BF64D3BA7F32CCF2BAC42FF3614AB6"},"GEDP01":{"Fix startup hang":"6F1B00517CBA30BEB738EAA90E71221378CD570D"},"GEME7F":{"Force Progressive Scan":"CB04E00918C9C0F161715D21D046ED6620F7ADEF"},"GEMJ28":{"Force Progressive Scan":"41D8F2C833C0B7B79FCA038752052059207AE4D5"},"GEZE8P":{"16:9 Widescreen [gamemasterplc]":"5CEBCFBEA4E444495D2FD6D8B6607DFB2349CC1B"},"GF7E01":{"16:9 Widescreen [gamemasterplc]":"C59CCA3EF8A5E97B32EB64DB9AE80E652ED281C6"},"GF7P01":{"16:9 Widescreen [gamemasterplc]":"1230053B5C347B62E432EFD6635433A183D18619"},"GFQEA4":{"16:9 Widescreen":"5CD9568CE58EF82EB371594667015C9B799454B9"},"GFZJ01":{"Make Save Copyable":"F659D22CB1DFF15C3915D7630D838EED8DB0BA48"},"GFZP01":{"Make Save Copyable":"F659D22CB1DFF15C3915D7630D838EED8DB0BA48"},"GGTE01":{"16:9 Widescreen [darkludx]":"EF128E7A9C22676834F558BA0F0F7FD8B9028727","Experimental 60fps":"D40344111D989EA009901F8B1C45B5AC8D39E6D2","Simple 60FPS":"5232A937D1D813FF58DD71D716284ED6AB535689"},"GGTJ01":{"Experimental 60fps":"BEC2310911003AF9E4B984A4051E0F885B8CC825","Simple 60FPS":"D62E777A2F019D7BD0AFFBCE876BD9AE408F1667"},"GGTP01":{"16:9 Widescreen":"FA9CD330ECDA01275DA88BD0803DE47757D16A4E","Experimental 60fps":"EB1ACD613BB432A3391CFFF1F0145A6ACE66B210","Simple 60FPS":"43FAD0DDD130BE1E4C8C7603EF6CA7DAA0DF5EE9"},"GGVD78":{"16:9 Widescreen":"9D07DBB5EC2FAA47F2E4587FBD75FD6F3E7E91B0","EFB Copy Fix":"FE52240DF6D132C15A8324E8A477F2BF2250D208"},"GGVE78":{"16:9 Widescreen":"86E561452235BF88D41884558EF34F54CE0FEB48","EFB Copy Fix":"5E38E10829D5F77243C95E9E41518BB3ADE24139"},"GGVP78":{"16:9 Widescreen":"F9B2108D833084FA36A53E00F1647A9579F847D3","EFB Copy Fix":"5E38E10829D5F77243C95E9E41518BB3ADE24139"},"GGVX78":{"EFB Copy Fix":"740F2D1C01DA39D1760D96B03974A48E6F74578D"},"GHAE08":{"Fix audio issues":"9799AFF8463EC86C9230E31E2627E141F0C129D3"},"GHAJ08":{"Fix audio issues":"B45A8FC32D14567B8D6C95F303E00A72C0E1D344"},"GHAP08":{"Fix audio issues":"BC7F3CFC97593AA2055C370C175950DC478D2709"},"GHKD7D":{"Limit internal frame rate (speed hack, also fixes audio and gameplay bugs)":"1AF09E98F0B72833A0F4E519EC3D4130C36D615E"},"GHKE7D":{"Limit internal frame rate (speed hack, also fixes audio and gameplay bugs)":"9BFBDE9184BC05EBD545625DEE486E3AAB36B6A3"},"GHKF7D":{"Limit internal frame rate (speed hack, also fixes audio and gameplay bugs)":"919E853513192C97F3CF49246A65ECBF39E7C201"},"GHKP7D":{"Limit internal frame rate (speed hack, also fixes audio and gameplay bugs)":"1AF09E98F0B72833A0F4E519EC3D4130C36D615E"},"GHKS7D":{"Limit internal frame rate (speed hack, also fixes audio and gameplay bugs)":"919E853513192C97F3CF49246A65ECBF39E7C201"},"GHLE69":{"16:9 Widescreen":"742BFC79D8F0BA5D6215772B58F5A0EADD7BFAFF"},"GHQE7D":{"16:9 Widescreen":"520E5F718D3BD1291C55021776091E0DE0FB4822","Limit internal frame rate during startup (speed hack)":"F6BF450D22104FD2527122EA6E81B1F70E916B95"},"GHQP7D":{"16:9 Widescreen":"AAE14CDC13A0C082A850DED85417100A8C8A0687","60Hz":"884A33613AE8D916128E3FF39B3AA9F63DAADC58","Limit internal frame rate during startup (speed hack)":"BD475ADEF145AC9226514CD1B2D4D5F3BFE67964"},"GHSE69":{"16:9 Widescreen":"3538CDBD13FA939B7BA5F0F82253401AFDD1E2CD"},"GHSP69":{"16:9 Widescreen":"409754E2EBB6F05DEE1AFC647E25B15D462638FF"},"GICD78":{"EFB Copy Fix":"3A94591A149AE88C150AB3320BBC909FE54BAEA5"},"GICE78":{"EFB Copy Fix":"5BF55685B8867A85EAA9C86571309B17BF7DED32"},"GICF78":{"EFB Copy Fix":"85AABAEB9A59C4F96D9330A3B884F6D757DA1683"},"GICH78":{"EFB Copy Fix":"3A94591A149AE88C150AB3320BBC909FE54BAEA5"},"GICJG9":{"EFB Copy Fix":"969134EA21A160EBDA91C0870266E7D1707FDC43"},"GICP78":{"EFB Copy Fix":"13B158CF41F5412BC637F50644193D43CC3DA49A"},"GIQE78":{"EFB Copy Fix":"E15AA1E30D26E5735D68AAADE436E7B7E4A33A35"},"GIQJ8P":{"EFB Copy Fix":"FFFCB76E98DDB06A7BBBC0AA73C869C87EB787D6"},"GIQX78":{"EFB Copy Fix":"485DA99FAB35646DAA2A138B0315361495ABE778"},"GIQY78":{"EFB Copy Fix":"485DA99FAB35646DAA2A138B0315361495ABE778"},"GK2":{"16:9 Widescreen [Vague Rant]":"6B4C59C2A2C5D71C7A38C8513A76E6467E307A26"},"GK2E52":{"60 FPS":"8F2397930A50C3C176188526EB9612578F9CBCE5"},"GK4":{"16:9 Widescreen":"4652969A4DA869FD28F2CAA3869A38F5C2AAFEB1"},"GKB":{"16:9 Widescreen Region-Free":"4652969A4DA869FD28F2CAA3869A38F5C2AAFEB1"},"GKBPAF":{"60Hz":"8E4E0ABA0E6D102A33206F34F4DEE63159B3CB4F"},"GKDP01":{"16:9 Widescreen":"DF4657937DE730107B636C73E959277EB963D210","60Hz":"6740D7B914CC897AF50798C0AB391965294FD1E1"},"GKRPB2":{"16:9 Widescreen":"69C01A4F91D991CF866237FED94A138308FC104F","60Hz":"40D06A5C7A3D873ABC73DEDF573738C2E3E37FF0"},"GKWJ18":{"16:9 Widescreen":"696570101FA040778EAD310377C484C846D87430"},"GKYE01":{"16:9 Widescreen":"6520EF1B7D88F00747B120A3A010458602ED989D"},"GKYJ01":{"16:9 Widescreen":"47B8EF7D02831AA5C375C698797BF2D5475FEFF2"},"GKYP01":{"16:9 Widescreen":"69413C75036D2975716066E6574461B981FF0124"},"GLEE08":{"Fix audio issues":"7355F358CAC6F418D37E4C23E64F7867D46E4FC9"},"GLEJ08":{"Fix audio issues":"12B24A6D7389A2AC5AB75FC0BF8493E7661F2A73"},"GLEP08":{"Fix audio issues":"81BD39F5527552DE89E3B59BA86298900F0A3168"},"GLSD64":{"Fix freeze in opening cutscene":"5E2A73717BD66EF647846DD64C33BC80AD9B5227"},"GLSE64":{"Fix freeze in opening cutscene":"1CE78E7954415A44DF693C0BB879AA5A4FF059A3"},"GLSF64":{"Fix freeze in opening cutscene":"009B0C4AD80A9C28C987934D254C2C4AACC9A07A"},"GLSP64":{"16:9 Widescreen":"8E7A544C10E7A5E2F0304A0D2586879627EF6586","60Hz":"B67144E87B54246137142992A3BC83DC13BE68A7","Fix freeze in opening cutscene":"3D0894616C9A7FA5ED91C1D2F461BF14DF47ECEC"},"GM4E01":{"16:9 Menu Backgrounds Add-On":"87D1A6A3E29ADA03B0D29C2F1841C18E62DB0A15","16:9 Widescreen v2":"78BE50F93E81A1972CA31ABC318949E366E82BD0"},"GM4P01":{"16:9 Menu Backgrounds Add-On":"87D1A6A3E29ADA03B0D29C2F1841C18E62DB0A15","16:9 Widescreen v2":"6D950B6EEFD6D304E1A424355B74A595D32BDF2F"},"GMBE8P":{"16:9 Widescreen":"D12DE9E3941BCE6EB50B8DA92140E09AFC0104C8","NA Stretched HUD":"0151A6683E1FBFD20096807C54A6952C4A4BAD40"},"GMBP8P":{"16:9 Widescreen":"8A688981F33A2C53882EF08FCF20B88AD43EF417"},"GMNE78":{"Limit internal FPS to VPS (improves performance)":"DE38BC8493EA24F93B6D805F28746AA99C53C677"},"GMNP78":{"Limit internal FPS to VPS (improves performance)":"65FB9B430F7D58EBC76DAADE8CA9DBBAA32B8B51"},"GMOP70":{"16:9 Widescreen":"CE4D298616BD42E4D8F8936B325CD1FD7F5B956B","60Hz":"0CD2CC787A5FF551901E41C85C8AAC02017ECB89"},"GMPE01":{"16:9 Widescreen":"4F98592DB3DEE3857469A8D8605FAF4BD6F7C76D","QOL - Allow Digital Presses for Map Screen":"E232B27564E9AA0C32DE163C9C056317A7B2B12E","QOL - Automatically Advance Text Boxes":"59607671BFC4717ACAF9807BB7EB0D9F982866D4","QOL - Disable Advance on Results":"CAEA37F3FEF89400513353EB85875F2A3AF4C03E","QOL - Faster Boot Time":"F75FBBD838C5B84FF687962FBA9195B217DE132C","QOL - Increased Board Speed":"19F264DE7F07EAC9433CA4B591BEBA1EC976C9F1","QOL - Increased Taunt Capabilities":"C70391D4961A0E820DE40141C89341369A9F021B","QOL - Instant Text Display":"F4E6913CF034E5778B9F9CA5FF448FF1B78B3333","QOL - Rumble Always Off":"93621947019532F02C25937FD3EEEE21A788CB07","QOL - Show Controller Port Number of Who Paused":"D7249AC3C949FEB860CF4350C5B7B79AC16569F1"},"GMPJ01":{"16:9 Widescreen":"A795811F2F0C92D9DCABDE97D9E39B47B1DBCEFD"},"GMPP01":{"16:9 Widescreen":"A795811F2F0C92D9DCABDE97D9E39B47B1DBCEFD"},"GMSE01":{"60FPS":"2805B1A0DD53EB64877D375D10F667700955720F","Widescreen":"BD718F961DBA5372B1D0257D454D535746C453A0"},"GMSJ01":{"16:9 Widescreen":"E8112A01040A06460E368F142C5D1FD0B4085D94"},"GMSJ01r0":{"60FPS":"9894B5B6B5215844D48411021FF8EECFE851D79D"},"GMSJ01r1":{"60FPS":"2DB69DB7A3753D543CD85CA4C77B4EF0AED7486E"},"GMSP01":{"60FPS":"D07009B710B3BBC6B12E54ED6A7969D58197EDAF","Widescreen":"0B7B89BF0868393076EF5F9DBD689DD0EDBCB84C"},"GNHE5d":{"Nop Hack":"89393A24E2336841AA4CD0AD3BE1C9A66B89E9EF"},"GOCE5D":{"16:9 Widescreen":"E4D800B90F16A15D9252EED1B2A23AEAF5CD230A"},"GOME01":{"16:9 Widescreen":"C33CBBF6F22195BF626104B4827200B3EE1CF30C"},"GOMP01":{"16:9 Widescreen":"874784CCD4AC3DC9C69654E471C18AD0F5E4D9AE"},"GONE69":{"Widescreen Hack Culling":"6412A67E1C26E146A9526AFC9F0EE517B214069D"},"GP4J18":{"16:9 Widescreen":"BF4D2D6AF66F285E81173B3B20D5369DB6FB351B"},"GP5E01":{"16:9 Widescreen":"5ED053787332DB5EEB8B963BA5DF197B58C6BB75","QOL - Automatically Advance Text Boxes":"41EF84663008668682BB75DC8B874E38669AE041","QOL - Disable Advance on Results":"6C36BEFE751131298BC8B39012892F6A6903CE60","QOL - Faster Boot Time":"8E952E6E12639AC20F6F9FDD150C12F0C294DF43","QOL - Increased Board Speed":"4BD72B8ED75ED8EFB3329C104BAD114FDDB8AD2C","QOL - Increased Capsule Throwing Speed":"C5BA3C9D386D09DD6CB9242A12A0D041BEB93160","QOL - Increased Taunt Capabilities":"C360EBDDCB0237076052C983BD9719411CA67CDE","QOL - Instant Text Display":"2CD4A06A3B9C18CC9EA2A2DEBD96E066CD1D700A","QOL - Show Controller Port Number of Who Paused":"5BA3648D18346EDC97B23475D4748C637E6095A2"},"GP5J01":{"16:9 Widescreen":"81E69B6BEE85E06805EC24E1CFEA9405BF459DF8"},"GP5P01":{"16:9 Widescreen":"FD4FCCB97C06F0173A30D4CC9A99422B2C0ABA9B"},"GP6E01":{"16:9 Widescreen":"B502AF0887792E9B140516D14BA75F99772C17BE","QOL - Auto Advance Text Boxes":"E645DF70CE0266D174D917A817A7FBEEE974A9F0","QOL - Disable Advance on Results":"798E566B621F6A32BF23C588E76EAC0776E2A8A3","QOL - Faster Boot Time":"B089A3C80D5DA86ABF6258F8BFB1DC78BB54A973","QOL - Increased Board Speed":"501C52ACF117950888A66DB2BEDBDFD7D9B20235","QOL - Increased Orb Throwing Speed":"845F439278DA8CBC225658FF4E2F82D707422BFB","QOL - Increased Taunt Capabilities":"0AED27341A06186AD92D5725C0B9693CA8F85B7B","QOL - Instant Text Display":"5AAC4E21927D4AEE7AC329CE793D4CDAEDDF7A3F","QOL - Show Controller Port Number of Who Paused":"DF5D2F068D76ABF2B1C294D413B9154B8C356929"},"GP6J01":{"16:9 Widescreen":"88F50F8298F82E3E5C161277BD4A985CE893A9D0"},"GP6P01":{"16:9 Widescreen":"DCCE59CA987624C753F0A86BEBA4287635901C93","Remove Black Bars":"138A86D43B5830BFE1926F58C0A4FBE2971BB02D"},"GP7E01":{"16:9 Widescreen":"87EBF72D90503EBC5CE9BC994795669E48A92A4A","QOL - Auto Advance Text Boxes":"82338AB5D82A7F398B4EB674CA4866DD1F4A1E65","QOL - Controller Options Always Acesssible":"D2F9CC0B9E52136E77187395FB7DA9B64B2C3B30","QOL - Disable Advance on Results":"A644551162A61DE7997B2A84F5BFDEFFD3FC2FB5","QOL - Faster Boot Time":"1939B5C575AE8FF6890BDDDD1B3FEA472D8CABA0","QOL - Increased Board Speed":"7E06A2EBCFECADB8074152B489984237A6FE9F21","QOL - Increased Orb Throwing Speed":"6671BEE71920D6B845AE1257AFE3AB3B95CD6FBD","QOL - Increased Taunt Capabilities":"9F60923F95FFE709CCD06966CD2DF743263934D1","QOL - Instant Text Display":"48FA6002E42DA9BB83ABC980A32C60CE3B21C4FC","QOL - Show Controller Port Number of Who Paused":"5E6F8C6C87D5944DB18A4E4F9A45F61EE87A4163"},"GP7J01":{"16:9 Widescreen":"A081F0729068D233E99DC00C64E36CA33C945640"},"GP7P01":{"16:9 Widescreen":"75D6CDA4EA301A71F7701A0487544E79136850B9","60Hz":"6D0D5B7CA58C38A3147F8ED981B5B21CC6C519CD"},"GPIE01":{"No Blur":"A25CDDB79991F090BD7F12840AD06F13BD5CCF95"},"GPIE01r0":{"16:9 Widescreen":"2B58166A66644F984E64077A6245C94C79B51063"},"GPIE01r1":{"16:9 Widescreen":"9A1545AB4E2B9216B95AFFA83420D723512DA8C8","60FPS":"3337C767EAA21D30C6CFEAE9985FFCABFC63E2E3","Disable Pikmin optimizations":"CBD15E9104929F0631713AE482475CB2B90E71F2"},"GPIP01":{"16:9 Widescreen":"5AE44D5B0E0D4C412B453B95CF5A41DBA4D685E6","60Hz":"AE59FF751E167632AE283F38CC4B96BDF7B9B81F","Turn off blur":"4ED79A548DBD7DBD35928A2F1138315FF103E260"},"GPNE08":{"16:9 Widescreen [Ralf, darkludx]":"ED3D9BB08C5F1D21BC8D5C73155C00E3C25C466F"},"GPNP08":{"16:9 Widescreen [Ralf]":"469B18FE8219031D355557B836EF02B625040A4F"},"GPOE8P":{"Make Save Copyable NTSC Port  - 1.0\/1.1":"7A4B3E596BA4FDA8F3FCF984079B3F44CB2D6AB3","Make Save Copyable NTSC Port - PLUS\/1.2":"304DB311F2107E88EBCE058535B266F9263AA8E2","Save Validation Code v 1.0\/v1.1":"9F6259132453DCC0607EAB35DB182C76818F2F9F","Save Validation Code v1.2\/Plus":"17EB6CFB408EF27D44C053A1336C3B87B6A05018"},"GPOE8Pr0":{"16:9 Widescreen":"99986BB1D4ABE45C429D48B01BFB578FEA69C14F"},"GPOE8Pr1":{"16:9 Widescreen (Plus) [Ralf]":"5563671A6702785FFE106DAB7EF3F4FE6D9F705B"},"GPOP8P":{"16:9 Widescreen":"DF133C61C29D5CFA87A2A785C962C205F80E6D04","Game Save Valid":"40EC1590DB26C7C58D00E3065F1E404341EF0E73","Game Save copyable":"2F5FB98927DAFF141D1CCD1EACA8AF626397E284"},"GPVE01":{"16:9 Widescreen":"E5B51080CFD518FE584CF3B61A1099CD032479D6","60 FPS":"ADF5E3BBF0002A76949D0C11C51E58089BACFEED"},"GPVP01":{"16:9 Widescreen":"78F3C9A789827B063A6701987262276A66ABD82B"},"GQPE78":{"EFB Copy Fix":"880B114E9A308084CAB92C004A9EE067B371C310"},"GQPP78":{"EFB Copy Fix":"5D9A14954AE8D639C9B254F3BA73A70F284BBC8D"},"GQSDAF":{"16:9 Widescreen":"CA82C44B2E8FC5C184E3FF935BC89661B7DB55D6","60Hz":"952165FD78543EB6D2F5230F7570B0513773D332","No Blur":"DEB7DF358423F0EF30C9FD49F4F14590836D52A6"},"GQSEAF":{"16:9 Widescreen":"48AFE1D32843C6B5AD4337A49F15FD447DF2A752","Remove Blur":"EF448CF1FA6A15EB2661EA5338703C13D52EF65B"},"GQSFAF":{"16:9 Widescreen":"76C30E1737CC5C3B5DE32532B5F9A5CD50B690F8","No Blur":"986BAE5103CDE9286D2D34FD28FE2540D0759AAB"},"GR2E52":{"16:9 Widescreen":"5F55CE7DA7E1E3261CF2FF88F34CDA63BA511003"},"GR2J52":{"16:9 Widescreen":"D3C6FA690BED07BFA65C2E1FCDE2FFA5AA0EEEE4"},"GR2P52":{"16:9 Widescreen":"D7BCADD4E76B5E3F7D9D463F55A2777528E37E94"},"GRNE52":{"16:9 Widescreen":"483D74C47AD1012606D591A226AB3144C7FB201C"},"GRNJ52":{"16:9 Widescreen":"949281B7221B20680B7BC29E4754B73A326EBE85"},"GRNP52":{"16:9 Widescreen":"11051B094FE5A8B2E73060BFF786C1588E36979A"},"GROE5Z":{"16:9 Widescreen":"FADBAB5EC280CF8ED4C9536A33F4184BA210C9B0"},"GRYE41":{"Disable Culling to Fix Rise and Shrine Hang":"AF0A575EB6071EAC0D2EC3D2EA30A23EB05A4192"},"GSAE01r0":{"viWidth 704 Aspect Ratio Fix":"0D529180B9B28BB06E21EDBDBA61C17EEF0FFB7F"},"GSAE01r1":{"viWidth 704 Aspect Ratio Fix":"CB15ED22625690A5DBE4607FE30160125421461D"},"GSAP01":{"viWidth 704 Aspect Ratio Fix":"749EDA62B1B73354599929F1B50E992E111C5493"},"GSNE8P":{"16:9 Widescreen":"CFDF3FA5B48B347E49E8E521D7BE47FCC9A5CBF4","60Hz Aspect Ratio Fix":"D90F66C0D46D9BEF27C8E13BC8804DB1F382C8B1"},"GSNJ8P":{"60Hz Aspect Ratio Fix":"98DF9D67DE77F66A4B09F25C5621805DEB40865B"},"GSNP8P":{"60Hz Aspect Ratio Fix":"D90F66C0D46D9BEF27C8E13BC8804DB1F382C8B1"},"GSO":{"16:9 Widescreen Region Free":"0D60D0593F6DA28B1236381B22082506B9533F0E"},"GSPE69":{"16:9 Widescreen":"80E18A8963F4EFD3C03494C95934452FCB6E521B"},"GSPP69":{"16:9 Widescreen":"162E87E9F5511CD82216811055836C11B374C45B","60Hz":"E5DF2DF34D2F0BDEE4205C891576511EC572C5DC"},"GSWE64":{"16:9 Widescreen":"6480326CCA8FF64A4868EC6E9FDE9F38819A75A1","Disable Dithering":"85F65E4B627641862C1A6091D29A3BB0626B04C3"},"GTEE01":{"16:9 Widescreen":"6B57EBCB9CC0ACE2EDA0F13E3F1F55F3FABC3A26"},"GTEP01":{"16:9 Widescreen":"72785784363C46180AF8E388348FD77667E7D382"},"GTOJAF":{"Remove Blur":"53A2EDF113F2ED7E54A16AA0E73FDB2C44C79DE5"},"GTRE78r0":{"Limit internal FPS to VPS (improves performance)":"42B85EFC5DEF8B243521EAD434DDCBDF95664CB1"},"GTRE78r1":{"Limit internal FPS to VPS (improves performance)":"ADB3A41B992EAB15AE484B2E575ACF3354415186"},"GTRJ8N":{"Limit internal FPS to VPS (improves performance)":"47DBEFDCF22ADC2AB148A54AC885FE19B3C07E3F"},"GTRP78":{"Limit internal FPS to VPS (improves performance)":"E8752E1B60DF76CD0CC7408074E742B0966BC904"},"GTZE41":{"16:9 Widescreen":"ECCE87E0006475C73E7D936AA0150BD20166F9EF"},"GTZP41":{"16:9 Widescreen":"62D8F159B93167171E0860D96C4BB32A5BF5648B"},"GU2D78":{"EFB Copy Fix":"CFF4C3F932B08732627572EDA1A0CD2D9C71AE0C"},"GU2F78":{"EFB Copy Fix":"CFF4C3F932B08732627572EDA1A0CD2D9C71AE0C"},"GU3D78":{"EFB Copy Fix":"8A0E3114862ADFE421874211BD6F5220AA425BF5"},"GU3X78":{"EFB Copy Fix":"E3303FDAE7ECA17A72EDC440C32D94648A6453A0"},"GU4Y78":{"EFB Copy Fix":"D54767785E139A8BC8C4B75573FBD5A0B686D8E3"},"GUNE5Dr0":{"16:9 Widescreen":"C942EBCBE8A487C25E296EC1FAC2358DA1487DBD","60 FPS":"A441630EC5FF0EB74D2243A3092D22E69C6BEA02"},"GUNE5Dr1":{"16:9 Widescreen":"39BD84CBE2AFACFEDEC5E9020D1A8B0D36DD53F9","60 FPS":"05779F1A3D0C43305D52A95447D612CB424942C0"},"GUNP5D":{"16:9 Widescreen":"FE3BA1DAA1AF278A7839E27BF466B0BA0B390EC2","50 FPS":"3B20499A3F8D1D7CCA5B0015F2D80ECED25842A6"},"GV4E69":{"Fix 2D Rendering":"8679891FCAA250FCFF670B26E0CB9875900D17FD"},"GVJE08":{"16:9 Widescreen":"09EFDA75D876A675121C8344D8FDD09A70A1A846"},"GVJP08":{"16:9 Widescreen":"93938F4C6112C91549F2B52E6259170F7501EC07"},"GVPE69":{"Fix 2D Rendering":"3159CA79B0A890131763EA6CB163684BEE886E3F"},"GVSE8P":{"16:9 Widescreen":"4CE9C491160A4B631142EE9CE802C694163F1CA3"},"GWRE01":{"16:9 Widescreen":"AC42770B06662BE1DC863EC80F44B5E034C63664"},"GWRP01":{"16:9 Widescreen":"9DDDFAB28C4BD35CF64050E1EF684DC042B1AFFA"},"GWWE01":{"16:9 Widescreen":"98B2E75D8E1CED4A964D3129A5DC10E30538CAA6"},"GWWJ01":{"16:9 Widescreen":"2DAD9A5E2A140F02CCBA727C4BE7C74BAC156778"},"GWWP01":{"16:9 Widescreen":"2DAD9A5E2A140F02CCBA727C4BE7C74BAC156778"},"GWZE01":{"16:9 Widescreen":"9EFC191DE6D21A1681FE241AB2EE4A131259F317"},"GXCE01":{"16:9 Widescreen":"901A1E78A3A0124F55548507D3B3707125C64A8A"},"GXSE8P":{"16:9 Widescreen":"F50BBA440184FC77A4DFFAA58FF2BB888E2E072F","Aspect Ratio Fix":"4214C74DFB8A74FC3AA4A643E869BC4D9A38EDA0"},"GXSJ8P":{"Aspect Ratio Fix":"227909607984BBC3D36AAC7DB9DFE385F3363C49"},"GXXE01":{"16:9 Widescreen":"7CAFDAD7B5E7459CCC1BB209D439DDCBB5BE4E4E","60 FPS":"7E2829049003FC9DC8BC28044B33CAFF3768B54C","Allow Memory Card saving with Savestates":"64FAA15062F0D0C319F904BBDE9C4489A25D6369"},"GXXJ01":{"16:9 Widescreen":"AF704A8C6838FDF47054D9EDD9106B3F46781FA9","60 FPS":"4F5FD45B4EC1B33FE076FA06F8FF863C46A06BBA","Allow Memory Card saving with Savestates":"8293802260536FA2EF2EFDAB5266DE36BB88DE1B"},"GXXP01":{"16:9 Widescreen":"02716B2585BEE74F8FCDD97A78F6A0D3DC7F331B","60 FPS":"BF6171EA5CCF4B57AA596372589DDB5E6904DD7A","Allow Memory Card saving with Savestates":"3CAFBC4AE6FC5CE9F53377F86AB5BD8F1BC8861A"},"GYFPA4":{"60Hz":"402ED10AC842041AB4B39AE8F2D81B2D7AEF9CB4"},"GZ2E01":{"16:9 Widescreen v2":"E7521ED27BFC972628906CBE8D5403ED57253BB8","Hyrule Field Speed Hack":"FCB673D46E716C7F63C618B8D8BF83AEE0B501F0"},"GZ2J01":{"16:9 Widescreen":"F985A0A58D8E2B23E8A557FAFF8D367AFFEADD07","Hyrule Field Speed Hack":"FCB673D46E716C7F63C618B8D8BF83AEE0B501F0"},"GZ2P01":{"16:9 Widescreen v2":"CAC38B0D334B925A57AA3118D35932B8A185137E","Hyrule Field Speed Hack":"0F63623D4D984B7706F718F57C0ABDB6DBADCF8D"},"GZ3E70":{"16:9 Widescreen":"167F9E9A9B372CB3A01F308B46FF1403F8599C51","Deinterlacing Fix":"2E163CB5FE724EB49B31CF607E5B9AFDA031DDD5"},"GZDP70":{"16:9 Widescreen":"2E424E0BBAE6EF5D6A8FB4224EA1D0746BAC37D3"},"GZLE01":{"16:9 Widescreen":"9FA864EE7DD8CE7FF538EB4E0243F20137430BD8","Remove Distance Blur":"78EA34CEF8E01701491C280F155F1C12EC9BF1A2"},"GZLJ01":{"16:9 Widescreen":"E03B61989025CA33937E63A057E6E40A403811BC"},"GZLP01":{"16:9 Widescreen":"3EFFF6C52B5633A1729FAA6883D8579E77F7D057","Remove Distance Blur":"14BECBEA4DD281EBD0F7FE7DEE8020B6F2418ACD"},"GZPE70":{"16:9 Widescreen":"7142F2495507AC7136992128ED0FCA6BC72B61F4"},"GZPP70":{"16:9 Widescreen":"591FD6C9668C79FF1CE8558EBED2486A7A327F05","60Hz":"A59B84DB5486521AEE1C23B6C741ECD35216E5AD"},"GZSE70":{"16:9 Widescreen":"8E86EAC7EA4F4D2854DD9020CD795630CA64C4EE"},"HAF":{"BufferPatch":"181195871F63B89B1CF09AFA4420CF89B9883108"},"HAL":{"RSAPatch":"AD12237401ABE9FE4A545AADB5C5AE10355E2076"},"R7XE69":{"Speed hack":"53F3273525BB719D535007FB97E7F381D808A8A9"},"R7XJ13":{"Speed hack":"4590D425BCBAFA0D1E32D27B46068843F6A2BE09"},"R7XP69":{"Speed hack":"53F3273525BB719D535007FB97E7F381D808A8A9"},"RB7E54":{"Limit internal frame rate in loading screens (fix hangs)":"BD1A252B43FD339391ED33554542E786BAD6671B"},"RB7P54":{"Limit internal frame rate in loading screens (fix hangs)":"90247F89DF8EB7A4AFA2C425CD3006257A95A8F8"},"RGQE70":{"crashfix":"5F4CF8D4DA19A0FF74FF9EB925AC0236069BFD59"},"RLEEFS":{"Fix crash on main menu":"793642AC6862C2F3412035A9E3D7172CC4A1D5C7"},"RM8E01":{"16:9 Widescreen":"E61344EB1542A78D497981C307B6549985C7A05A","Extra - Disable Music":"25223F9EFAABF601CAC7810004F124E4056598B1","QOL - Faster Boot Time":"BCC4279F8B28636AD773F01540E78DF40EAD6087","QOL - Increased Board Speed":"B65AF1819966CD3435D88801E8C79704E3A52DB5","QOL - Increased Taunt Capabilities":"66495D7CB532FAE778AFC22CF45D17D0FFDE5310","QOL - Increased Text Display":"B4186DDC54F33F4D6A22188EF50CEB43FB205673","QOL - Invert IR Stick for GameCube Mod":"9D90A9C66AE8AD91B201B40C4145D1323B701A77","QOL - Remove Explanations":"330DD53AB993A99576564FEFD222D7BD211B878F"},"RM8J01":{"16:9 Widescreen":"A140BDCB8E1721CB6B4CD878E412113322258B57"},"RM8P01":{"16:9 Widescreen":"F664C32AFD3D785FC6E04D8990A3FA1C72A18C5C"},"RMHE08":{"Bloom OFF":"CCF233DA57B3E75221870DE502955114B0D4E7FA"},"RMHJ08":{"Bloom OFF":"29D3625B7ED577587E56AA07CB0EB8C47C97E823"},"RMHP08":{"Bloom OFF":"1720C1173D4698167080DBFC4232F21757C4DA08"},"RO2P7N":{"Hangfix":"EEE9C8DE4671C18DD7F81DD08D39B64C57600DEA"},"RPBE01":{"Fix black screen effects":"775ABECA6073E02C5C68CF4D644194D966A418F5"},"RPBJ01r0":{"Fix black screen effects":"0EAB5D8DE827894AFEF97C10ACB67378E6983323"},"RPBJ01r1":{"Fix black screen effects":"4905E08643E9D00136F7EAF51978CF2F54D10D07"},"RPBJ01r2":{"Fix black screen effects":"4905E08643E9D00136F7EAF51978CF2F54D10D07"},"RPBP01":{"Fix black screen effects":"82AEB60F9A9083F93060531A970FFAABE0833A40"},"RRBE41r0":{"Idle loop speed hack":"20C7A2D4A3D6D55A8029A9D200D57CBD11F60B88"},"RRBE41r1":{"Idle loop speed hack":"0A30FA4C7E787197A00B7267368F372EFF623776"},"RRBE41r2":{"Idle loop speed hack":"2227787007F16F0CD454422AE6EB94656464B6D0"},"RRBJ41":{"Idle loop speed hack":"E9209EB728AA13375B2ABEF1C15D066DAFBF2EBF"},"RRBP41":{"Idle loop speed hack":"8A47BC311138EE3A11E049DF3EE6AED38990FB49"},"RTH":{"Disable blur":"812EE46AC967BFCD239335B10A664D71A93E8175"},"RX4E4Z":{"Fix file reads (dcache bypass)":"9E4E0F1465A9A1E85349DBA3B1278AC215A97DBB"},"RX4PMT":{"Fix file reads (dcache bypass)":"EE85907C03F0295794821383B93F8D5B91D2697A"},"RZDE01r0":{"Hyrule Field Speed Hack":"15EAD073414C9903D6CAE5229DCE582BD17A9162"},"RZDE01r2":{"Hyrule Field Speed Hack":"27395CC8BC2C51201D566657D31A471A850482FB"},"RZDJ01":{"Hyrule Field Speed Hack":"B3F7473F8C911A32F1D616491C9E78EBBD7A6309"},"RZDK01":{"Hyrule Field Speed Hack":"A280C0114B800D7DC056ECFB5E482229DA0B1550"},"RZDP01":{"Hyrule Field Speed Hack":"2A83ADFB760F9498841ED0ED68B0C0438232472C"},"SAOE78":{"Fix crash on boot":"EA11FA4908FB20B61876ACD360EC7657A6D39FB2"},"SAOEVZ":{"Fix crash on boot":"AA55C214DE7545DE0E203CC39F06BF3D31451BE9"},"SC2":{"Limit internal frame rate (speed hack)":"B3FB0FCE108E85E6198BAF3535850470049E2BE2"},"SGLEA4":{"Fix black screen":"258378187ACF475A55EFEAF8A703681252E014C3"},"SGLPA4":{"Fix black screen":"6F8CD59D897338CA90939149E1A62588620C6D88"}}
\ No newline at end of file
+{"D43J01":{"loophack":"CAB9CED2D904F12CCB21F5B1DE9B5433620C3E13"},"DPOJ8P":{"Bypass Modem Detection":"90BA66E25640A538FEFA6693715718139079FA7B"},"G2BE5G":{"Disable interlaced rendering":"7FFF6BDD93713BEDFD23739C32B86153FA19AEA0"},"G2BP7D":{"Disable interlaced rendering":"56E85D7285F10348E1E5354E379918D07E79EDA9"},"G2VE08":{"16:9 Widescreen":"3ED033396382424533A263A39687A0961EC994A6"},"G2VP08":{"16:9 Widescreen":"EEBC3C5F04BB70AFCA1A4C3D638335CDC9142BA2"},"G3RP52":{"16:9 Widescreen":"7F6B7743F0DDD3704B15882330E490103AE24E36","60fps":"4C9A8572A35F1DB85BBB2F32ED34288A343F1FC0"},"G3YP52":{"16:9 Widescreen":"3D102AFEE2F4945894E74BB702ED3ED2294C6FEC","Force PAL60":"FD61581C593EA34DD358AE33819FAB310F2CE961"},"G4AEE9":{"16:9 Aspect Ratio Fix":"8C2564CF47BB6A9B57D712C90E17F459B0BB6CCD"},"G4ME69":{"16:9 Widescreen":"6FC6E5D91693FAABE25CC721F2121CB0B5CA9D12"},"G5SE7D":{"16:9 Widescreen":"16119398BFE241A84151C046E0BC5BCF89D22049","Remove Bloom":"A5F2FB2B3BFF61F34F8AB1DD5A912A0FD8DFA720"},"G5SP7D":{"16:9 Widescreen":"718AA8BD831961C33114852FDA75BB58F768F46A"},"G8ME01":{"16:9 Aspect Ratio Fix - Centered HUD":"8C2FC3FC6F7766AA8E87425BF3BDD2E46E73DE71","16:9 Aspect Ratio Fix - Centered HUD with letterboxing":"AE3DBE2604CA0660165CA870C4B80E2B523C9475","16:9 Aspect Ratio Fix - Normal HUD":"F6E8264CF14D0189219C1E2D20C4182F190F4B88","16:9 Aspect Ratio Fix - Stretched HUD":"8EA4C7B80ADE3E8FEC28EEFA3A046B6B04162E81","No Letterbox":"B1DE2A3526F2E4511F2B94A5171BF7B3C2C52B9B"},"G8MJ01":{"16:9 Aspect Ratio Fix - Centered HUD":"B3181CA1AAB11EAE9132184DA48D76E775AC0A24","16:9 Aspect Ratio Fix - Centered HUD with letterboxing":"904C0EEEF16D761F7BDF7099DEB384DD9AB26E00","16:9 Aspect Ratio Fix - Normal HUD":"631CE99BDE3F1475303C00C67E3C130D4EB2547B","16:9 Aspect Ratio Fix - Stretched HUD":"81F7AD591F12A01DE82850457ECF147998D1238F"},"G8MP01":{"16:9 Aspect Ratio Fix - Centered HUD":"75AF5D7FA49BE9C3C73EA1482B49CD9B36CE817E","16:9 Aspect Ratio Fix - Centered HUD with letterboxing":"C2E5003E74551DF693A7CB814850CA51D77549EF","16:9 Aspect Ratio Fix - Normal HUD":"FB26AA84B0CB787705E84E869B649307776A2839","16:9 Aspect Ratio Fix - Stretched HUD":"C5F8A81520193418C07C7BC4881F02BE9C4DC9BC","No Letterbox":"7828F5B0C8B470620755C16C60A5A4554F92640C"},"G9SE8P":{"16:9 Widescreen":"CD043229AC47AC93D537B6A0725A2D0BB6FEF4E8"},"G9SJ8P":{"16:9 Widescreen":"C55EF90B542AA3973352A232629A828BC22A8509"},"G9SP8P":{"16:9 Widescreen":"9521774ADEE769CFCCE86F8170FE626387E73019"},"GAFE01":{"16:9 Widescreen":"D24F6D9BE5D79D3C795C2844634A0214BB68B5DA","Make Game Save Copyable (donny2112)":"F9A812FF62A20D5440CAB79DB6AFAE068457A10E"},"GAHEGG":{"Limit internal frame rate (speed hack)":"2873E5178C8068AFA8AFE751F903A69CA9A41F16"},"GAL":{"Trophy Viewer":"DBDB50216B22CDFFF77BDD80261CD0FF75803D3B"},"GALE01r0":{"Normal C Stick Functionality in Singleplayer Modes":"9DC8D90D986FAC175F45006AFF20CF00EDFBE053","Proper 16:9 Widescreen Support":"18B4159E77013EDFE499A33281B771C442970E3B","Properly Display in 4:3":"DC2BCA7D99EBDE1DC7C68CA6AC7F543B93FD6A67"},"GALE01r1":{"Normal C Stick Functionality in Singleplayer Modes":"F6030959C1CAC92F37287D556F18B3C5298FAD5B"},"GALE01r2":{"Disable Rumble":"CFDEEA8AD2A99394BFFEA7211EF03394E7471FA9","Normal C Stick Functionality in Singleplayer Modes":"BCD918A72368B2A30E797C76994E7539A1C0B5D9","PAL Stock Icons":"6B92D95F0EEA165EA84FD753F74B0A9E2079C2D7","Proper 16:9 Widescreen Support":"CEDF18354CDCFC49398551C629E51B053331A55B","Widescreen Support v1.2 [Dan Salvato]":"D32ED4CD685F3FF649F7E749E8C182C657013918"},"GALP01":{"Normal C Stick Functionality in Singleplayer Modes":"4817F202678559291F9F76B46DC7561A45D00B77","Proper 16:9 Widescreen Support":"BFCBE098FE8679B9140A48EA1D8620D5A369697C","Properly Display in 4:3":"5BA2933B8365E21553AA273B91954A4C722B1035"},"GAZE69":{"60FPS":"BC281053C5266B21FDDC6C8996A6021DEA03D459"},"GBLE52":{"16:9 Widescreen":"C0F3AB3BBC9B21F4BF25F44E48CF1CD36D2B3F45"},"GBLP52":{"16:9 Widescreen":"797040CB097BFD369490A1BE29659929D76CE6F7"},"GBRJ18":{"16:9 Widescreen":"B3C867AB34D90E2E9C5B799D800F4C191DE279FA"},"GBSE8P":{"16:9 Widescreen":"4148D453F61A5B81E53669335BC667E651865C76"},"GBSP8P":{"16:9 Widescreen":"6CB029AE768BA5B9995D5F12C1EBB37B3D1FE242"},"GC6E01":{"16:9 Widescreen":"DE932CCAD1B5EB1FAA8D08733BD0D3940C78382A","60 FPS [Nerdzilla]":"85F98064F17AFE0FB02A99A182AF3FEB7644DCAA","Allow Memory Card saving with Savestates":"2F64F98686E62B60E466E931A9EBCD19A750FF4E"},"GC6J01":{"60 FPS [Nerdzilla]":"A6146772E37970EA5564F51A622A04792158B321","Allow Memory Card saving with Savestates":"D8F327304A88FBC717BB1F775494C5F864B9E8D2"},"GC6P01":{"16:9 Widescreen [Ralf]":"05C9016BF58A628A3FD7B16E1B9BB0769A14846F","60 FPS [Nerdzilla]":"1D3FB017C0D20754E48A8BA54EEE7DC4851BE84B","Allow Memory Card saving with Savestates":"EDEE0E28EEA1834868F2865336290FFBDFB9C6DA"},"GC8JA4":{"Fix C4 texture tiling (used for buttons and some character icons)":"843297019804192AF1FC660BC85F4B10891D0BA3"},"GCBE7D":{"16:9 Widescreen":"478DA1D596D8513C343850719155813CB61A56DD"},"GCBP7D":{"16:9 Widescreen":"478DA1D596D8513C343850719155813CB61A56DD","60Hz":"DF2C4DDF082C9E67919443C5ACC485AB2CF7F8D0"},"GCCE01":{"16:9 Widescreen":"BA0066518E7EA8599A81F8496BD39DE20CC369D6","Fix GBA connections":"483BDB94615C690045C3759795AF13CE76552286","Fix buffer overrun bug (crash at Goblin Wall)":"6C107FEC15C76201233CA2645EB5FAB4FF9751CE"},"GCCJGC":{"Fix GBA connections":"4C104D24329172F5D0F8649DE9423B931FE72CA3"},"GCCP01":{"16:9 Widescreen":"2580E7379633CF4DE13B9EC945DB17543477828A","Fix GBA connections":"2EAA60A8A115AD68A795109FB59E4A726D29016D"},"GCN":{"Fix C4 texture tiling (used for buttons and some character icons)":"601FE183C9524ACCF068874DABD73921C86769CF"},"GCVEEB":{"16:9 Widescreen":"ADA686C90189D1D7D23E23E525EFC96EFA104BB9"},"GD7E70":{"Deinterlacing Fix":"6F8B6E33214162E5CDEBD2BC6A60FAFA04D2EB10"},"GD7PB2":{"Deinterlacing Fix":"3B798C9D63E755349B253FAF9186BAE1F703D96A"},"GDREAF":{"Fix audio issues":"F8EAE60FEB0CFB4477FDC4B9E136B63F68DFA63A"},"GDRP69":{"Fix audio issues":"E23D98B2CE185C3993A40F2495D37E41B971BF91"},"GEDE01":{"Fix startup hang":"21068C3CE905FB0CFFAA7408A93154AF8A5295A2"},"GEDJ01":{"Fix startup hang":"7061F3CF11BF64D3BA7F32CCF2BAC42FF3614AB6"},"GEDP01":{"Fix startup hang":"6F1B00517CBA30BEB738EAA90E71221378CD570D"},"GEME7F":{"Force Progressive Scan":"CB04E00918C9C0F161715D21D046ED6620F7ADEF"},"GEMJ28":{"Force Progressive Scan":"41D8F2C833C0B7B79FCA038752052059207AE4D5"},"GEZE8P":{"16:9 Widescreen [gamemasterplc]":"5CEBCFBEA4E444495D2FD6D8B6607DFB2349CC1B"},"GF7E01":{"16:9 Widescreen [gamemasterplc]":"C59CCA3EF8A5E97B32EB64DB9AE80E652ED281C6"},"GF7P01":{"16:9 Widescreen [gamemasterplc]":"1230053B5C347B62E432EFD6635433A183D18619"},"GFQEA4":{"16:9 Widescreen":"5CD9568CE58EF82EB371594667015C9B799454B9"},"GFZJ01":{"Make Save Copyable":"F659D22CB1DFF15C3915D7630D838EED8DB0BA48"},"GFZP01":{"Make Save Copyable":"F659D22CB1DFF15C3915D7630D838EED8DB0BA48"},"GGTE01":{"16:9 Widescreen [darkludx]":"EF128E7A9C22676834F558BA0F0F7FD8B9028727","Experimental 60fps":"D40344111D989EA009901F8B1C45B5AC8D39E6D2","Simple 60FPS":"5232A937D1D813FF58DD71D716284ED6AB535689"},"GGTJ01":{"Experimental 60fps":"BEC2310911003AF9E4B984A4051E0F885B8CC825","Simple 60FPS":"D62E777A2F019D7BD0AFFBCE876BD9AE408F1667"},"GGTP01":{"16:9 Widescreen":"FA9CD330ECDA01275DA88BD0803DE47757D16A4E","Experimental 60fps":"EB1ACD613BB432A3391CFFF1F0145A6ACE66B210","Simple 60FPS":"43FAD0DDD130BE1E4C8C7603EF6CA7DAA0DF5EE9"},"GGVD78":{"16:9 Widescreen":"9D07DBB5EC2FAA47F2E4587FBD75FD6F3E7E91B0","EFB Copy Fix":"FE52240DF6D132C15A8324E8A477F2BF2250D208"},"GGVE78":{"16:9 Widescreen":"86E561452235BF88D41884558EF34F54CE0FEB48","EFB Copy Fix":"5E38E10829D5F77243C95E9E41518BB3ADE24139"},"GGVP78":{"16:9 Widescreen":"F9B2108D833084FA36A53E00F1647A9579F847D3","EFB Copy Fix":"5E38E10829D5F77243C95E9E41518BB3ADE24139"},"GGVX78":{"EFB Copy Fix":"740F2D1C01DA39D1760D96B03974A48E6F74578D"},"GHAE08":{"Fix audio issues":"9799AFF8463EC86C9230E31E2627E141F0C129D3"},"GHAJ08":{"Fix audio issues":"B45A8FC32D14567B8D6C95F303E00A72C0E1D344"},"GHAP08":{"Fix audio issues":"BC7F3CFC97593AA2055C370C175950DC478D2709"},"GHKD7D":{"Limit internal frame rate (speed hack, also fixes audio and gameplay bugs)":"1AF09E98F0B72833A0F4E519EC3D4130C36D615E"},"GHKE7D":{"Limit internal frame rate (speed hack, also fixes audio and gameplay bugs)":"9BFBDE9184BC05EBD545625DEE486E3AAB36B6A3"},"GHKF7D":{"Limit internal frame rate (speed hack, also fixes audio and gameplay bugs)":"919E853513192C97F3CF49246A65ECBF39E7C201"},"GHKP7D":{"Limit internal frame rate (speed hack, also fixes audio and gameplay bugs)":"1AF09E98F0B72833A0F4E519EC3D4130C36D615E"},"GHKS7D":{"Limit internal frame rate (speed hack, also fixes audio and gameplay bugs)":"919E853513192C97F3CF49246A65ECBF39E7C201"},"GHLE69":{"16:9 Widescreen":"742BFC79D8F0BA5D6215772B58F5A0EADD7BFAFF"},"GHQE7D":{"16:9 Widescreen":"520E5F718D3BD1291C55021776091E0DE0FB4822","Limit internal frame rate during startup (speed hack)":"F6BF450D22104FD2527122EA6E81B1F70E916B95"},"GHQP7D":{"16:9 Widescreen":"AAE14CDC13A0C082A850DED85417100A8C8A0687","60Hz":"884A33613AE8D916128E3FF39B3AA9F63DAADC58","Limit internal frame rate during startup (speed hack)":"BD475ADEF145AC9226514CD1B2D4D5F3BFE67964"},"GHSE69":{"16:9 Widescreen":"3538CDBD13FA939B7BA5F0F82253401AFDD1E2CD"},"GHSP69":{"16:9 Widescreen":"409754E2EBB6F05DEE1AFC647E25B15D462638FF"},"GICD78":{"EFB Copy Fix":"3A94591A149AE88C150AB3320BBC909FE54BAEA5"},"GICE78":{"EFB Copy Fix":"5BF55685B8867A85EAA9C86571309B17BF7DED32"},"GICF78":{"EFB Copy Fix":"85AABAEB9A59C4F96D9330A3B884F6D757DA1683"},"GICH78":{"EFB Copy Fix":"3A94591A149AE88C150AB3320BBC909FE54BAEA5"},"GICJG9":{"EFB Copy Fix":"969134EA21A160EBDA91C0870266E7D1707FDC43"},"GICP78":{"EFB Copy Fix":"13B158CF41F5412BC637F50644193D43CC3DA49A"},"GIQE78":{"EFB Copy Fix":"E15AA1E30D26E5735D68AAADE436E7B7E4A33A35"},"GIQJ8P":{"EFB Copy Fix":"FFFCB76E98DDB06A7BBBC0AA73C869C87EB787D6"},"GIQX78":{"EFB Copy Fix":"485DA99FAB35646DAA2A138B0315361495ABE778"},"GIQY78":{"EFB Copy Fix":"485DA99FAB35646DAA2A138B0315361495ABE778"},"GK2":{"16:9 Widescreen [Vague Rant]":"6B4C59C2A2C5D71C7A38C8513A76E6467E307A26"},"GK2E52":{"60 FPS":"8F2397930A50C3C176188526EB9612578F9CBCE5"},"GK4":{"16:9 Widescreen":"4652969A4DA869FD28F2CAA3869A38F5C2AAFEB1"},"GKB":{"16:9 Widescreen Region-Free":"4652969A4DA869FD28F2CAA3869A38F5C2AAFEB1"},"GKBPAF":{"60Hz":"8E4E0ABA0E6D102A33206F34F4DEE63159B3CB4F"},"GKDP01":{"16:9 Widescreen":"DF4657937DE730107B636C73E959277EB963D210","60Hz":"6740D7B914CC897AF50798C0AB391965294FD1E1"},"GKRPB2":{"16:9 Widescreen":"69C01A4F91D991CF866237FED94A138308FC104F","60Hz":"40D06A5C7A3D873ABC73DEDF573738C2E3E37FF0"},"GKWJ18":{"16:9 Widescreen":"696570101FA040778EAD310377C484C846D87430"},"GKYE01":{"16:9 Widescreen":"6520EF1B7D88F00747B120A3A010458602ED989D"},"GKYJ01":{"16:9 Widescreen":"47B8EF7D02831AA5C375C698797BF2D5475FEFF2"},"GKYP01":{"16:9 Widescreen":"69413C75036D2975716066E6574461B981FF0124"},"GLEE08":{"Fix audio issues":"7355F358CAC6F418D37E4C23E64F7867D46E4FC9"},"GLEJ08":{"Fix audio issues":"12B24A6D7389A2AC5AB75FC0BF8493E7661F2A73"},"GLEP08":{"Fix audio issues":"81BD39F5527552DE89E3B59BA86298900F0A3168"},"GLSD64":{"Fix freeze in opening cutscene":"5E2A73717BD66EF647846DD64C33BC80AD9B5227"},"GLSE64":{"Fix freeze in opening cutscene":"1CE78E7954415A44DF693C0BB879AA5A4FF059A3"},"GLSF64":{"Fix freeze in opening cutscene":"009B0C4AD80A9C28C987934D254C2C4AACC9A07A"},"GLSP64":{"16:9 Widescreen":"8E7A544C10E7A5E2F0304A0D2586879627EF6586","60Hz":"B67144E87B54246137142992A3BC83DC13BE68A7","Fix freeze in opening cutscene":"3D0894616C9A7FA5ED91C1D2F461BF14DF47ECEC"},"GM4E01":{"16:9 Menu Backgrounds Add-On":"87D1A6A3E29ADA03B0D29C2F1841C18E62DB0A15","16:9 Widescreen v2":"78BE50F93E81A1972CA31ABC318949E366E82BD0"},"GM4P01":{"16:9 Menu Backgrounds Add-On":"87D1A6A3E29ADA03B0D29C2F1841C18E62DB0A15","16:9 Widescreen v2":"6D950B6EEFD6D304E1A424355B74A595D32BDF2F"},"GMBE8P":{"16:9 Widescreen":"D12DE9E3941BCE6EB50B8DA92140E09AFC0104C8","NA Stretched HUD":"0151A6683E1FBFD20096807C54A6952C4A4BAD40"},"GMBP8P":{"16:9 Widescreen":"8A688981F33A2C53882EF08FCF20B88AD43EF417"},"GMNE78":{"Limit internal FPS to VPS (improves performance)":"DE38BC8493EA24F93B6D805F28746AA99C53C677"},"GMNP78":{"Limit internal FPS to VPS (improves performance)":"65FB9B430F7D58EBC76DAADE8CA9DBBAA32B8B51"},"GMOP70":{"16:9 Widescreen":"CE4D298616BD42E4D8F8936B325CD1FD7F5B956B","60Hz":"0CD2CC787A5FF551901E41C85C8AAC02017ECB89"},"GMPE01":{"16:9 Widescreen":"4F98592DB3DEE3857469A8D8605FAF4BD6F7C76D","QOL - Allow Digital Presses for Map Screen":"E232B27564E9AA0C32DE163C9C056317A7B2B12E","QOL - Automatically Advance Text Boxes":"59607671BFC4717ACAF9807BB7EB0D9F982866D4","QOL - Disable Advance on Results":"CAEA37F3FEF89400513353EB85875F2A3AF4C03E","QOL - Faster Boot Time":"F75FBBD838C5B84FF687962FBA9195B217DE132C","QOL - Increased Board Speed":"19F264DE7F07EAC9433CA4B591BEBA1EC976C9F1","QOL - Increased Taunt Capabilities":"C70391D4961A0E820DE40141C89341369A9F021B","QOL - Instant Text Display":"F4E6913CF034E5778B9F9CA5FF448FF1B78B3333","QOL - Rumble Always Off":"93621947019532F02C25937FD3EEEE21A788CB07","QOL - Show Controller Port Number of Who Paused":"D7249AC3C949FEB860CF4350C5B7B79AC16569F1"},"GMPJ01":{"16:9 Widescreen":"A795811F2F0C92D9DCABDE97D9E39B47B1DBCEFD"},"GMPP01":{"16:9 Widescreen":"A795811F2F0C92D9DCABDE97D9E39B47B1DBCEFD"},"GMSE01":{"60FPS":"2805B1A0DD53EB64877D375D10F667700955720F","Widescreen":"BD718F961DBA5372B1D0257D454D535746C453A0"},"GMSJ01":{"16:9 Widescreen":"E8112A01040A06460E368F142C5D1FD0B4085D94"},"GMSJ01r0":{"60FPS":"9894B5B6B5215844D48411021FF8EECFE851D79D"},"GMSJ01r1":{"60FPS":"2DB69DB7A3753D543CD85CA4C77B4EF0AED7486E"},"GMSP01":{"60FPS":"D07009B710B3BBC6B12E54ED6A7969D58197EDAF","Widescreen":"0B7B89BF0868393076EF5F9DBD689DD0EDBCB84C"},"GNHE5d":{"Nop Hack":"89393A24E2336841AA4CD0AD3BE1C9A66B89E9EF"},"GOCE5D":{"16:9 Widescreen":"E4D800B90F16A15D9252EED1B2A23AEAF5CD230A"},"GOME01":{"16:9 Widescreen":"C33CBBF6F22195BF626104B4827200B3EE1CF30C"},"GOMP01":{"16:9 Widescreen":"874784CCD4AC3DC9C69654E471C18AD0F5E4D9AE"},"GONE69":{"Widescreen Hack Culling":"6412A67E1C26E146A9526AFC9F0EE517B214069D"},"GP4J18":{"16:9 Widescreen":"BF4D2D6AF66F285E81173B3B20D5369DB6FB351B"},"GP5E01":{"16:9 Widescreen":"5ED053787332DB5EEB8B963BA5DF197B58C6BB75","QOL - Automatically Advance Text Boxes":"41EF84663008668682BB75DC8B874E38669AE041","QOL - Disable Advance on Results":"6C36BEFE751131298BC8B39012892F6A6903CE60","QOL - Faster Boot Time":"8E952E6E12639AC20F6F9FDD150C12F0C294DF43","QOL - Increased Board Speed":"4BD72B8ED75ED8EFB3329C104BAD114FDDB8AD2C","QOL - Increased Capsule Throwing Speed":"C5BA3C9D386D09DD6CB9242A12A0D041BEB93160","QOL - Increased Taunt Capabilities":"C360EBDDCB0237076052C983BD9719411CA67CDE","QOL - Instant Text Display":"2CD4A06A3B9C18CC9EA2A2DEBD96E066CD1D700A","QOL - Show Controller Port Number of Who Paused":"5BA3648D18346EDC97B23475D4748C637E6095A2"},"GP5J01":{"16:9 Widescreen":"81E69B6BEE85E06805EC24E1CFEA9405BF459DF8"},"GP5P01":{"16:9 Widescreen":"FD4FCCB97C06F0173A30D4CC9A99422B2C0ABA9B"},"GP6E01":{"16:9 Widescreen":"B502AF0887792E9B140516D14BA75F99772C17BE","QOL - Auto Advance Text Boxes":"E645DF70CE0266D174D917A817A7FBEEE974A9F0","QOL - Disable Advance on Results":"798E566B621F6A32BF23C588E76EAC0776E2A8A3","QOL - Faster Boot Time":"B089A3C80D5DA86ABF6258F8BFB1DC78BB54A973","QOL - Increased Board Speed":"501C52ACF117950888A66DB2BEDBDFD7D9B20235","QOL - Increased Orb Throwing Speed":"845F439278DA8CBC225658FF4E2F82D707422BFB","QOL - Increased Taunt Capabilities":"0AED27341A06186AD92D5725C0B9693CA8F85B7B","QOL - Instant Text Display":"5AAC4E21927D4AEE7AC329CE793D4CDAEDDF7A3F","QOL - Show Controller Port Number of Who Paused":"DF5D2F068D76ABF2B1C294D413B9154B8C356929"},"GP6J01":{"16:9 Widescreen":"88F50F8298F82E3E5C161277BD4A985CE893A9D0"},"GP6P01":{"16:9 Widescreen":"DCCE59CA987624C753F0A86BEBA4287635901C93","Remove Black Bars":"138A86D43B5830BFE1926F58C0A4FBE2971BB02D"},"GP7E01":{"16:9 Widescreen":"87EBF72D90503EBC5CE9BC994795669E48A92A4A","QOL - Auto Advance Text Boxes":"82338AB5D82A7F398B4EB674CA4866DD1F4A1E65","QOL - Controller Options Always Acesssible":"D2F9CC0B9E52136E77187395FB7DA9B64B2C3B30","QOL - Disable Advance on Results":"A644551162A61DE7997B2A84F5BFDEFFD3FC2FB5","QOL - Faster Boot Time":"1939B5C575AE8FF6890BDDDD1B3FEA472D8CABA0","QOL - Increased Board Speed":"7E06A2EBCFECADB8074152B489984237A6FE9F21","QOL - Increased Orb Throwing Speed":"6671BEE71920D6B845AE1257AFE3AB3B95CD6FBD","QOL - Increased Taunt Capabilities":"9F60923F95FFE709CCD06966CD2DF743263934D1","QOL - Instant Text Display":"48FA6002E42DA9BB83ABC980A32C60CE3B21C4FC","QOL - Show Controller Port Number of Who Paused":"5E6F8C6C87D5944DB18A4E4F9A45F61EE87A4163"},"GP7J01":{"16:9 Widescreen":"A081F0729068D233E99DC00C64E36CA33C945640"},"GP7P01":{"16:9 Widescreen":"75D6CDA4EA301A71F7701A0487544E79136850B9","60Hz":"6D0D5B7CA58C38A3147F8ED981B5B21CC6C519CD"},"GPIE01":{"No Blur":"A25CDDB79991F090BD7F12840AD06F13BD5CCF95"},"GPIE01r0":{"16:9 Widescreen":"2B58166A66644F984E64077A6245C94C79B51063"},"GPIE01r1":{"16:9 Widescreen":"9A1545AB4E2B9216B95AFFA83420D723512DA8C8","60FPS":"3337C767EAA21D30C6CFEAE9985FFCABFC63E2E3","Disable Pikmin optimizations":"CBD15E9104929F0631713AE482475CB2B90E71F2"},"GPIP01":{"16:9 Widescreen":"5AE44D5B0E0D4C412B453B95CF5A41DBA4D685E6","60Hz":"AE59FF751E167632AE283F38CC4B96BDF7B9B81F","Turn off blur":"4ED79A548DBD7DBD35928A2F1138315FF103E260"},"GPNE08":{"16:9 Widescreen [Ralf, darkludx]":"ED3D9BB08C5F1D21BC8D5C73155C00E3C25C466F"},"GPNP08":{"16:9 Widescreen [Ralf]":"469B18FE8219031D355557B836EF02B625040A4F"},"GPOE8P":{"Make Save Copyable NTSC Port  - 1.0\/1.1":"7A4B3E596BA4FDA8F3FCF984079B3F44CB2D6AB3","Make Save Copyable NTSC Port - PLUS\/1.2":"304DB311F2107E88EBCE058535B266F9263AA8E2","Save Validation Code v 1.0\/v1.1":"9F6259132453DCC0607EAB35DB182C76818F2F9F","Save Validation Code v1.2\/Plus":"17EB6CFB408EF27D44C053A1336C3B87B6A05018"},"GPOE8Pr0":{"16:9 Widescreen":"99986BB1D4ABE45C429D48B01BFB578FEA69C14F"},"GPOE8Pr1":{"16:9 Widescreen (Plus) [Ralf]":"5563671A6702785FFE106DAB7EF3F4FE6D9F705B"},"GPOP8P":{"16:9 Widescreen":"DF133C61C29D5CFA87A2A785C962C205F80E6D04","Game Save Valid":"40EC1590DB26C7C58D00E3065F1E404341EF0E73","Game Save copyable":"2F5FB98927DAFF141D1CCD1EACA8AF626397E284"},"GPVE01":{"16:9 Widescreen":"E5B51080CFD518FE584CF3B61A1099CD032479D6","60 FPS":"ADF5E3BBF0002A76949D0C11C51E58089BACFEED"},"GPVP01":{"16:9 Widescreen":"78F3C9A789827B063A6701987262276A66ABD82B"},"GQPE78":{"EFB Copy Fix":"880B114E9A308084CAB92C004A9EE067B371C310"},"GQPP78":{"EFB Copy Fix":"5D9A14954AE8D639C9B254F3BA73A70F284BBC8D"},"GQSDAF":{"16:9 Widescreen":"CA82C44B2E8FC5C184E3FF935BC89661B7DB55D6","60Hz":"952165FD78543EB6D2F5230F7570B0513773D332","No Blur":"DEB7DF358423F0EF30C9FD49F4F14590836D52A6"},"GQSEAF":{"16:9 Widescreen":"48AFE1D32843C6B5AD4337A49F15FD447DF2A752","Remove Blur":"EF448CF1FA6A15EB2661EA5338703C13D52EF65B"},"GQSFAF":{"16:9 Widescreen":"76C30E1737CC5C3B5DE32532B5F9A5CD50B690F8","No Blur":"986BAE5103CDE9286D2D34FD28FE2540D0759AAB"},"GR2E52":{"16:9 Widescreen":"5F55CE7DA7E1E3261CF2FF88F34CDA63BA511003"},"GR2J52":{"16:9 Widescreen":"D3C6FA690BED07BFA65C2E1FCDE2FFA5AA0EEEE4"},"GR2P52":{"16:9 Widescreen":"D7BCADD4E76B5E3F7D9D463F55A2777528E37E94"},"GRNE52":{"16:9 Widescreen":"483D74C47AD1012606D591A226AB3144C7FB201C"},"GRNJ52":{"16:9 Widescreen":"949281B7221B20680B7BC29E4754B73A326EBE85"},"GRNP52":{"16:9 Widescreen":"11051B094FE5A8B2E73060BFF786C1588E36979A"},"GROE5Z":{"16:9 Widescreen":"FADBAB5EC280CF8ED4C9536A33F4184BA210C9B0"},"GRYE41":{"Disable Culling to Fix Rise and Shrine Hang":"AF0A575EB6071EAC0D2EC3D2EA30A23EB05A4192"},"GSAE01r0":{"viWidth 704 Aspect Ratio Fix":"0D529180B9B28BB06E21EDBDBA61C17EEF0FFB7F"},"GSAE01r1":{"viWidth 704 Aspect Ratio Fix":"CB15ED22625690A5DBE4607FE30160125421461D"},"GSAP01":{"viWidth 704 Aspect Ratio Fix":"749EDA62B1B73354599929F1B50E992E111C5493"},"GSNE8P":{"16:9 Widescreen":"CFDF3FA5B48B347E49E8E521D7BE47FCC9A5CBF4","60Hz Aspect Ratio Fix":"D90F66C0D46D9BEF27C8E13BC8804DB1F382C8B1"},"GSNJ8P":{"60Hz Aspect Ratio Fix":"98DF9D67DE77F66A4B09F25C5621805DEB40865B"},"GSNP8P":{"60Hz Aspect Ratio Fix":"D90F66C0D46D9BEF27C8E13BC8804DB1F382C8B1"},"GSO":{"16:9 Widescreen Region Free":"0D60D0593F6DA28B1236381B22082506B9533F0E"},"GSPE69":{"16:9 Widescreen":"80E18A8963F4EFD3C03494C95934452FCB6E521B"},"GSPP69":{"16:9 Widescreen":"162E87E9F5511CD82216811055836C11B374C45B","60Hz":"E5DF2DF34D2F0BDEE4205C891576511EC572C5DC"},"GSWE64":{"16:9 Widescreen":"6480326CCA8FF64A4868EC6E9FDE9F38819A75A1","Disable Dithering":"85F65E4B627641862C1A6091D29A3BB0626B04C3"},"GTEE01":{"16:9 Widescreen":"6B57EBCB9CC0ACE2EDA0F13E3F1F55F3FABC3A26"},"GTEP01":{"16:9 Widescreen":"72785784363C46180AF8E388348FD77667E7D382"},"GTOJAF":{"Remove Blur":"53A2EDF113F2ED7E54A16AA0E73FDB2C44C79DE5"},"GTRE78r0":{"Limit internal FPS to VPS (improves performance)":"42B85EFC5DEF8B243521EAD434DDCBDF95664CB1"},"GTRE78r1":{"Limit internal FPS to VPS (improves performance)":"ADB3A41B992EAB15AE484B2E575ACF3354415186"},"GTRJ8N":{"Limit internal FPS to VPS (improves performance)":"47DBEFDCF22ADC2AB148A54AC885FE19B3C07E3F"},"GTRP78":{"Limit internal FPS to VPS (improves performance)":"E8752E1B60DF76CD0CC7408074E742B0966BC904"},"GTZE41":{"16:9 Widescreen":"ECCE87E0006475C73E7D936AA0150BD20166F9EF"},"GTZP41":{"16:9 Widescreen":"62D8F159B93167171E0860D96C4BB32A5BF5648B"},"GU2D78":{"EFB Copy Fix":"CFF4C3F932B08732627572EDA1A0CD2D9C71AE0C"},"GU2F78":{"EFB Copy Fix":"CFF4C3F932B08732627572EDA1A0CD2D9C71AE0C"},"GU3D78":{"EFB Copy Fix":"8A0E3114862ADFE421874211BD6F5220AA425BF5"},"GU3X78":{"EFB Copy Fix":"E3303FDAE7ECA17A72EDC440C32D94648A6453A0"},"GU4Y78":{"EFB Copy Fix":"D54767785E139A8BC8C4B75573FBD5A0B686D8E3"},"GUNE5Dr0":{"16:9 Widescreen":"C942EBCBE8A487C25E296EC1FAC2358DA1487DBD","60 FPS":"A441630EC5FF0EB74D2243A3092D22E69C6BEA02"},"GUNE5Dr1":{"16:9 Widescreen":"39BD84CBE2AFACFEDEC5E9020D1A8B0D36DD53F9","60 FPS":"05779F1A3D0C43305D52A95447D612CB424942C0"},"GUNP5D":{"16:9 Widescreen":"FE3BA1DAA1AF278A7839E27BF466B0BA0B390EC2","50 FPS":"3B20499A3F8D1D7CCA5B0015F2D80ECED25842A6"},"GV4E69":{"Fix 2D Rendering":"8679891FCAA250FCFF670B26E0CB9875900D17FD"},"GVJE08":{"16:9 Widescreen":"09EFDA75D876A675121C8344D8FDD09A70A1A846"},"GVJP08":{"16:9 Widescreen":"93938F4C6112C91549F2B52E6259170F7501EC07"},"GVPE69":{"Fix 2D Rendering":"3159CA79B0A890131763EA6CB163684BEE886E3F"},"GVSE8P":{"16:9 Widescreen":"4CE9C491160A4B631142EE9CE802C694163F1CA3"},"GWRE01":{"16:9 Widescreen":"AC42770B06662BE1DC863EC80F44B5E034C63664"},"GWRP01":{"16:9 Widescreen":"9DDDFAB28C4BD35CF64050E1EF684DC042B1AFFA"},"GWWE01":{"16:9 Widescreen":"98B2E75D8E1CED4A964D3129A5DC10E30538CAA6"},"GWWJ01":{"16:9 Widescreen":"2DAD9A5E2A140F02CCBA727C4BE7C74BAC156778"},"GWWP01":{"16:9 Widescreen":"2DAD9A5E2A140F02CCBA727C4BE7C74BAC156778"},"GWZE01":{"16:9 Widescreen":"9EFC191DE6D21A1681FE241AB2EE4A131259F317"},"GXCE01":{"16:9 Widescreen":"901A1E78A3A0124F55548507D3B3707125C64A8A"},"GXSE8P":{"16:9 Widescreen":"F50BBA440184FC77A4DFFAA58FF2BB888E2E072F","Aspect Ratio Fix":"4214C74DFB8A74FC3AA4A643E869BC4D9A38EDA0"},"GXSJ8P":{"Aspect Ratio Fix":"227909607984BBC3D36AAC7DB9DFE385F3363C49"},"GXXE01":{"16:9 Widescreen":"7CAFDAD7B5E7459CCC1BB209D439DDCBB5BE4E4E","60 FPS":"7E2829049003FC9DC8BC28044B33CAFF3768B54C","Allow Memory Card saving with Savestates":"64FAA15062F0D0C319F904BBDE9C4489A25D6369"},"GXXJ01":{"16:9 Widescreen":"AF704A8C6838FDF47054D9EDD9106B3F46781FA9","60 FPS":"4F5FD45B4EC1B33FE076FA06F8FF863C46A06BBA","Allow Memory Card saving with Savestates":"8293802260536FA2EF2EFDAB5266DE36BB88DE1B"},"GXXP01":{"16:9 Widescreen":"02716B2585BEE74F8FCDD97A78F6A0D3DC7F331B","60 FPS":"BF6171EA5CCF4B57AA596372589DDB5E6904DD7A","Allow Memory Card saving with Savestates":"3CAFBC4AE6FC5CE9F53377F86AB5BD8F1BC8861A"},"GYFPA4":{"60Hz":"402ED10AC842041AB4B39AE8F2D81B2D7AEF9CB4"},"GZ2E01":{"16:9 Widescreen v2":"E7521ED27BFC972628906CBE8D5403ED57253BB8","Hyrule Field Speed Hack":"FCB673D46E716C7F63C618B8D8BF83AEE0B501F0"},"GZ2J01":{"16:9 Widescreen":"F985A0A58D8E2B23E8A557FAFF8D367AFFEADD07","Hyrule Field Speed Hack":"FCB673D46E716C7F63C618B8D8BF83AEE0B501F0"},"GZ2P01":{"16:9 Widescreen v2":"CAC38B0D334B925A57AA3118D35932B8A185137E","Hyrule Field Speed Hack":"0F63623D4D984B7706F718F57C0ABDB6DBADCF8D"},"GZ3E70":{"16:9 Widescreen":"167F9E9A9B372CB3A01F308B46FF1403F8599C51","Deinterlacing Fix":"EF1291C0E45277CDAE4D0F61E1949C1E75E5A3E1"},"GZBJB2":{"Deinterlacing Fix":"19D67BD12A18F0E3A960BBB92E2F490BEF5C00C1"},"GZDP70":{"16:9 Widescreen":"2E424E0BBAE6EF5D6A8FB4224EA1D0746BAC37D3"},"GZLE01":{"16:9 Widescreen":"9FA864EE7DD8CE7FF538EB4E0243F20137430BD8","Remove Distance Blur":"78EA34CEF8E01701491C280F155F1C12EC9BF1A2"},"GZLJ01":{"16:9 Widescreen":"E03B61989025CA33937E63A057E6E40A403811BC"},"GZLP01":{"16:9 Widescreen":"3EFFF6C52B5633A1729FAA6883D8579E77F7D057","Remove Distance Blur":"14BECBEA4DD281EBD0F7FE7DEE8020B6F2418ACD"},"GZPE70":{"16:9 Widescreen":"7142F2495507AC7136992128ED0FCA6BC72B61F4"},"GZPP70":{"16:9 Widescreen":"591FD6C9668C79FF1CE8558EBED2486A7A327F05","60Hz":"A59B84DB5486521AEE1C23B6C741ECD35216E5AD"},"GZSE70":{"16:9 Widescreen":"8E86EAC7EA4F4D2854DD9020CD795630CA64C4EE"},"HAF":{"BufferPatch":"181195871F63B89B1CF09AFA4420CF89B9883108"},"HAL":{"RSAPatch":"AD12237401ABE9FE4A545AADB5C5AE10355E2076"},"R7XE69":{"Speed hack":"53F3273525BB719D535007FB97E7F381D808A8A9"},"R7XJ13":{"Speed hack":"4590D425BCBAFA0D1E32D27B46068843F6A2BE09"},"R7XP69":{"Speed hack":"53F3273525BB719D535007FB97E7F381D808A8A9"},"RB7E54":{"Limit internal frame rate in loading screens (fix hangs)":"BD1A252B43FD339391ED33554542E786BAD6671B"},"RB7P54":{"Limit internal frame rate in loading screens (fix hangs)":"90247F89DF8EB7A4AFA2C425CD3006257A95A8F8"},"RGQE70":{"crashfix":"5F4CF8D4DA19A0FF74FF9EB925AC0236069BFD59"},"RLEEFS":{"Fix crash on main menu":"793642AC6862C2F3412035A9E3D7172CC4A1D5C7"},"RM8E01":{"16:9 Widescreen":"E61344EB1542A78D497981C307B6549985C7A05A","Extra - Disable Music":"25223F9EFAABF601CAC7810004F124E4056598B1","QOL - Faster Boot Time":"BCC4279F8B28636AD773F01540E78DF40EAD6087","QOL - Increased Board Speed":"B65AF1819966CD3435D88801E8C79704E3A52DB5","QOL - Increased Taunt Capabilities":"66495D7CB532FAE778AFC22CF45D17D0FFDE5310","QOL - Increased Text Display":"B4186DDC54F33F4D6A22188EF50CEB43FB205673","QOL - Invert IR Stick for GameCube Mod":"9D90A9C66AE8AD91B201B40C4145D1323B701A77","QOL - Remove Explanations":"330DD53AB993A99576564FEFD222D7BD211B878F"},"RM8J01":{"16:9 Widescreen":"A140BDCB8E1721CB6B4CD878E412113322258B57"},"RM8P01":{"16:9 Widescreen":"F664C32AFD3D785FC6E04D8990A3FA1C72A18C5C"},"RMHE08":{"Bloom OFF":"CCF233DA57B3E75221870DE502955114B0D4E7FA"},"RMHJ08":{"Bloom OFF":"29D3625B7ED577587E56AA07CB0EB8C47C97E823"},"RMHP08":{"Bloom OFF":"1720C1173D4698167080DBFC4232F21757C4DA08"},"RO2P7N":{"Hangfix":"EEE9C8DE4671C18DD7F81DD08D39B64C57600DEA"},"RPBE01":{"Fix black screen effects":"775ABECA6073E02C5C68CF4D644194D966A418F5"},"RPBJ01r0":{"Fix black screen effects":"0EAB5D8DE827894AFEF97C10ACB67378E6983323"},"RPBJ01r1":{"Fix black screen effects":"4905E08643E9D00136F7EAF51978CF2F54D10D07"},"RPBJ01r2":{"Fix black screen effects":"4905E08643E9D00136F7EAF51978CF2F54D10D07"},"RPBP01":{"Fix black screen effects":"82AEB60F9A9083F93060531A970FFAABE0833A40"},"RRBE41r0":{"Idle loop speed hack":"20C7A2D4A3D6D55A8029A9D200D57CBD11F60B88"},"RRBE41r1":{"Idle loop speed hack":"0A30FA4C7E787197A00B7267368F372EFF623776"},"RRBE41r2":{"Idle loop speed hack":"2227787007F16F0CD454422AE6EB94656464B6D0"},"RRBJ41":{"Idle loop speed hack":"E9209EB728AA13375B2ABEF1C15D066DAFBF2EBF"},"RRBP41":{"Idle loop speed hack":"8A47BC311138EE3A11E049DF3EE6AED38990FB49"},"RTH":{"Disable blur":"812EE46AC967BFCD239335B10A664D71A93E8175"},"RUUE01r0":{"QOL - Classic Controller Support (Pointer on Left Stick, recommended) v1.1":"244D1FC7D6284DC8832CF7F34506B0DE4DBF8914","QOL - Classic Controller Support (Pointer on Right Stick) v1.1":"6FDD09D51EC3D754BA7F80630B1FE1D3FEF6FE97","QOL - Disable Grass Deterioration":"D566F2AF5BB1EDB8284461DEA85FF3B5A8DEBDD6"},"RUUE01r1":{"QOL - Classic Controller Support (Pointer on Left Stick, recommended) v1.1":"0235631B6F9A439B9718635F5AB7ADAFA2B6B3DE","QOL - Classic Controller Support (Pointer on Right Stick) v1.1":"5DEAC5F3390CE19487A9473A1988E7BB5EA4790F"},"RUUJ01r1":{"QOL - Classic Controller Support (Pointer on Left Stick, recommended) v1.1":"C88CFD7E6C18F570DE974D6C0202987E4F1B72C4","QOL - Classic Controller Support (Pointer on Right Stick) v1.1":"3C92010E7DE2E93C48AFF25B30A18BBFCBD12707"},"RUUK01r1":{"QOL - Classic Controller Support (Pointer on Left Stick, recommended) v1.1":"EF883FB0C237BF51ABD88C35D34571D240C79484","QOL - Classic Controller Support (Pointer on Right Stick) v1.1":"F08D0F233F3F5833DFAFE5C8049C37D32360F0FA"},"RUUP01r0":{"QOL - Classic Controller Support (Pointer on Left Stick, recommended) v1.1":"D28D4E4FBD153A6D4C49E2D250213F37BEC941E5","QOL - Classic Controller Support (Pointer on Right Stick) v1.1":"80C3F50C018E076DF2CD39732A5ABB8A1C0E88B1","QOL - Disable Grass Deterioration":"3B278C19AC76D27488C55201BA0DB63864F66AAF"},"RUUP01r1":{"QOL - Classic Controller Support (Pointer on Left Stick, recommended) v1.1":"9121BEDD72436F4EAB47E4CE96ABD864118B22F3","QOL - Classic Controller Support (Pointer on Right Stick) v1.1":"8FC58B3DC4817515822EBB82BB7A8055270EE51D","QOL - Disable Grass Deterioration":"9B199D77AF748518358D32966F3F55F5C5759C3A"},"RX4E4Z":{"Fix file reads (dcache bypass)":"9E4E0F1465A9A1E85349DBA3B1278AC215A97DBB"},"RX4PMT":{"Fix file reads (dcache bypass)":"EE85907C03F0295794821383B93F8D5B91D2697A"},"RZDE01r0":{"Hyrule Field Speed Hack":"15EAD073414C9903D6CAE5229DCE582BD17A9162"},"RZDE01r2":{"Hyrule Field Speed Hack":"27395CC8BC2C51201D566657D31A471A850482FB"},"RZDJ01":{"Hyrule Field Speed Hack":"B3F7473F8C911A32F1D616491C9E78EBBD7A6309"},"RZDK01":{"Hyrule Field Speed Hack":"A280C0114B800D7DC056ECFB5E482229DA0B1550"},"RZDP01":{"Hyrule Field Speed Hack":"2A83ADFB760F9498841ED0ED68B0C0438232472C"},"SAOE78":{"Fix crash on boot":"EA11FA4908FB20B61876ACD360EC7657A6D39FB2"},"SAOEVZ":{"Fix crash on boot":"AA55C214DE7545DE0E203CC39F06BF3D31451BE9"},"SC2":{"Limit internal frame rate (speed hack)":"B3FB0FCE108E85E6198BAF3535850470049E2BE2"},"SGLEA4":{"Fix black screen":"258378187ACF475A55EFEAF8A703681252E014C3"},"SGLPA4":{"Fix black screen":"6F8CD59D897338CA90939149E1A62588620C6D88"}}
\ No newline at end of file
diff --git a/Data/Sys/GameSettings/DLS.ini b/Data/Sys/GameSettings/DLS.ini
index 8e4e3addcfd2..dd526a78e7a9 100644
--- a/Data/Sys/GameSettings/DLS.ini
+++ b/Data/Sys/GameSettings/DLS.ini
@@ -16,4 +16,5 @@ MMU = True
 
 [Video_Hacks]
 EFBToTextureEnable = False
+# Avoids majorly corrupted graphics in menus.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/E62.ini b/Data/Sys/GameSettings/E62.ini
index c5511f837896..e51aab17f4f8 100644
--- a/Data/Sys/GameSettings/E62.ini
+++ b/Data/Sys/GameSettings/E62.ini
@@ -14,4 +14,5 @@ CPUThread = False
 SafeTextureCacheColorSamples = 0
 
 [Video_Hacks]
+# Avoids majorly corrupted screen edges.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/E63.ini b/Data/Sys/GameSettings/E63.ini
index d3b516299d6f..13bcbd859dbf 100644
--- a/Data/Sys/GameSettings/E63.ini
+++ b/Data/Sys/GameSettings/E63.ini
@@ -1,4 +1,4 @@
-# E63E8P - Shinobi
+# E63E8P, E63P8P, E63J8P - Shinobi
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -14,4 +14,5 @@ CPUThread = False
 SafeTextureCacheColorSamples = 0
 
 [Video_Hacks]
+# Avoids majorly corrupted screen edges.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/E6V.ini b/Data/Sys/GameSettings/E6V.ini
index 18ab424e44d9..2ba892fdc569 100644
--- a/Data/Sys/GameSettings/E6V.ini
+++ b/Data/Sys/GameSettings/E6V.ini
@@ -13,4 +13,5 @@
 SafeTextureCacheColorSamples = 0
 
 [Video_Hacks]
+# Avoids majorly corrupted graphics.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/E6W.ini b/Data/Sys/GameSettings/E6W.ini
index baec48c40e69..0d7098155503 100644
--- a/Data/Sys/GameSettings/E6W.ini
+++ b/Data/Sys/GameSettings/E6W.ini
@@ -14,4 +14,5 @@ CPUThread = False
 SafeTextureCacheColorSamples = 0
 
 [Video_Hacks]
+# Avoids majorly corrupted screen edges.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/E6X.ini b/Data/Sys/GameSettings/E6X.ini
index f50445f8347e..a8470581465c 100644
--- a/Data/Sys/GameSettings/E6X.ini
+++ b/Data/Sys/GameSettings/E6X.ini
@@ -14,4 +14,5 @@ CPUThread = False
 SafeTextureCacheColorSamples = 0
 
 [Video_Hacks]
+# Avoids majorly corrupted graphics.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/G2V.ini b/Data/Sys/GameSettings/G2V.ini
index d514c6b521f6..784840c7f613 100644
--- a/Data/Sys/GameSettings/G2V.ini
+++ b/Data/Sys/GameSettings/G2V.ini
@@ -10,5 +10,5 @@
 # Add action replay cheats here.
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False
-
diff --git a/Data/Sys/GameSettings/G3L.ini b/Data/Sys/GameSettings/G3L.ini
index 279371250bc5..7d7b95bf790b 100644
--- a/Data/Sys/GameSettings/G3L.ini
+++ b/Data/Sys/GameSettings/G3L.ini
@@ -1,4 +1,4 @@
-# G3LE8P - Super Monkey Ball Adventure
+# G3LE8P, G3LP8P - Super Monkey Ball Adventure
 
 [Core]
 # Values set here will override the main Dolphin settings.
diff --git a/Data/Sys/GameSettings/G4C.ini b/Data/Sys/GameSettings/G4C.ini
index a8c75d7fd39e..b27ba4ac53c8 100644
--- a/Data/Sys/GameSettings/G4C.ini
+++ b/Data/Sys/GameSettings/G4C.ini
@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/G4S.ini b/Data/Sys/GameSettings/G4S.ini
index f469b42057d7..7b1bd521584d 100644
--- a/Data/Sys/GameSettings/G4S.ini
+++ b/Data/Sys/GameSettings/G4S.ini
@@ -1,4 +1,4 @@
-# G4SE01, G4SP01 - The Legend of Zelda: Four Swords
+# G4SE01, G4SP01 - The Legend of Zelda: Four Swords Adventures
 
 [Core]
 # Values set here will override the main Dolphin settings.
diff --git a/Data/Sys/GameSettings/G4SP01.ini b/Data/Sys/GameSettings/G4SP01.ini
index 261a3236e3cf..834c6239ca98 100644
--- a/Data/Sys/GameSettings/G4SP01.ini
+++ b/Data/Sys/GameSettings/G4SP01.ini
@@ -1,4 +1,4 @@
-# G4SP01 - The Legend of Zelda: Four Swords
+# G4SP01 - The Legend of Zelda: Four Swords Adventures
 
 [OnFrame]
 # Add memory patches to be applied every frame here.
diff --git a/Data/Sys/GameSettings/G5N.ini b/Data/Sys/GameSettings/G5N.ini
index 509b466777c9..f4948b25d72b 100644
--- a/Data/Sys/GameSettings/G5N.ini
+++ b/Data/Sys/GameSettings/G5N.ini
@@ -13,4 +13,5 @@
 SafeTextureCacheColorSamples = 0
 
 [Video_Hacks]
+# Avoids flickering during initial loading screen and terrible pacing during game selection.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/G6Q.ini b/Data/Sys/GameSettings/G6Q.ini
index afe1c66dcb30..b205f2692318 100644
--- a/Data/Sys/GameSettings/G6Q.ini
+++ b/Data/Sys/GameSettings/G6Q.ini
@@ -13,4 +13,5 @@
 SafeTextureCacheColorSamples = 0
 
 [Video_Hacks]
+# Avoids stuck screens during FMVs.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GAP.ini b/Data/Sys/GameSettings/GAP.ini
index 594df5adeb6f..8944cf281e5b 100644
--- a/Data/Sys/GameSettings/GAP.ini
+++ b/Data/Sys/GameSettings/GAP.ini
@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck screens during FMVs.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GAU.ini b/Data/Sys/GameSettings/GAU.ini
index e424907df514..ceafa32032e9 100644
--- a/Data/Sys/GameSettings/GAU.ini
+++ b/Data/Sys/GameSettings/GAU.ini
@@ -1,4 +1,4 @@
-# GAUE08, GAUJ08 - auto modellista
+# GAUE08, GAUJ08 - Auto Modellista
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -12,5 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids constant flickering while in game.
 ImmediateXFBEnable = False
-
diff --git a/Data/Sys/GameSettings/GAY.ini b/Data/Sys/GameSettings/GAY.ini
index ef9cb81b8db1..46dcb0b37410 100644
--- a/Data/Sys/GameSettings/GAY.ini
+++ b/Data/Sys/GameSettings/GAY.ini
@@ -13,4 +13,5 @@
 SafeTextureCacheColorSamples = 0
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GBH.ini b/Data/Sys/GameSettings/GBH.ini
index 47f5878bd13a..2df1c0de1e70 100644
--- a/Data/Sys/GameSettings/GBH.ini
+++ b/Data/Sys/GameSettings/GBH.ini
@@ -12,5 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False
-
diff --git a/Data/Sys/GameSettings/GBL.ini b/Data/Sys/GameSettings/GBL.ini
index 9e369dfd2cad..db92817cc7d8 100644
--- a/Data/Sys/GameSettings/GBL.ini
+++ b/Data/Sys/GameSettings/GBL.ini
@@ -1,4 +1,4 @@
-# GBLE52, GBLP52 - BLOODY ROAR(R): PRIMAL FURY
+# GBLE52, GBLP52, GBRJ18 - Bloody Roar: Primal Fury
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -12,5 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck black screens in opening cinematics.
 ImmediateXFBEnable = False
-
diff --git a/Data/Sys/GameSettings/GBM.ini b/Data/Sys/GameSettings/GBM.ini
index 5e08dd1797ca..e370ff515e25 100644
--- a/Data/Sys/GameSettings/GBM.ini
+++ b/Data/Sys/GameSettings/GBM.ini
@@ -1,4 +1,4 @@
-# GBME7F, GBMJ28, GBMP7F - BATMAN: DARK TOMORROW
+# GBME7F, GBMJ28, GBMP7F - Batman: Dark Tomorrow
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GBV.ini b/Data/Sys/GameSettings/GBV.ini
index 410933988716..02b81b12c4c4 100644
--- a/Data/Sys/GameSettings/GBV.ini
+++ b/Data/Sys/GameSettings/GBV.ini
@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
-ImmediateXFBEnable = False
\ No newline at end of file
+# Avoids black screens during FMVs.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GBW.ini b/Data/Sys/GameSettings/GBW.ini
index f723f50d751e..d6e125b6cccb 100644
--- a/Data/Sys/GameSettings/GBW.ini
+++ b/Data/Sys/GameSettings/GBW.ini
@@ -12,5 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck screens during FMVs.
 ImmediateXFBEnable = False
-
diff --git a/Data/Sys/GameSettings/GC2.ini b/Data/Sys/GameSettings/GC2.ini
index 77e6ab51d831..6bfee54a3aa3 100644
--- a/Data/Sys/GameSettings/GC2.ini
+++ b/Data/Sys/GameSettings/GC2.ini
@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GC8JA4.ini b/Data/Sys/GameSettings/GC8JA4.ini
index 68f5247e3c2b..6b4a9ff712f8 100644
--- a/Data/Sys/GameSettings/GC8JA4.ini
+++ b/Data/Sys/GameSettings/GC8JA4.ini
@@ -18,6 +18,7 @@ $Fix C4 texture tiling (used for buttons and some character icons)
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids black screen FMVs, flickering in menus, and broken loading screens.
 ImmediateXFBEnable = False
 
 [AR_RetroAchievements_Verified]
diff --git a/Data/Sys/GameSettings/GCA.ini b/Data/Sys/GameSettings/GCA.ini
index 7c40a9a9687a..92b6581fb8e8 100644
--- a/Data/Sys/GameSettings/GCA.ini
+++ b/Data/Sys/GameSettings/GCA.ini
@@ -10,4 +10,5 @@
 # Add action replay cheats here.
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GCE.ini b/Data/Sys/GameSettings/GCE.ini
index acaf8cc25de2..06c5aa370a88 100644
--- a/Data/Sys/GameSettings/GCE.ini
+++ b/Data/Sys/GameSettings/GCE.ini
@@ -4,4 +4,5 @@
 [ActionReplay]
 [Video_Settings]
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GCN.ini b/Data/Sys/GameSettings/GCN.ini
index 5fcad61ff5e7..2d894502fcfb 100644
--- a/Data/Sys/GameSettings/GCN.ini
+++ b/Data/Sys/GameSettings/GCN.ini
@@ -18,6 +18,7 @@ $Fix C4 texture tiling (used for buttons and some character icons)
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids black screen FMVs, flickering in menus, and broken loading screens.
 ImmediateXFBEnable = False
 
 [AR_RetroAchievements_Verified]
diff --git a/Data/Sys/GameSettings/GCVEEB.ini b/Data/Sys/GameSettings/GCVEEB.ini
index ddcdb12d8714..7577f1c9edef 100644
--- a/Data/Sys/GameSettings/GCVEEB.ini
+++ b/Data/Sys/GameSettings/GCVEEB.ini
@@ -4,6 +4,7 @@
 # Add memory patches to be applied every frame here.
 
 [Video_Hacks]
+# Avoids shifted screen.
 ImmediateXFBEnable = False
 
 [ActionReplay]
diff --git a/Data/Sys/GameSettings/GD7.ini b/Data/Sys/GameSettings/GD7.ini
index 1788c98cd224..e568ddb7e5e9 100644
--- a/Data/Sys/GameSettings/GD7.ini
+++ b/Data/Sys/GameSettings/GD7.ini
@@ -1,4 +1,4 @@
-# GD7JB2, GD7E70, GD7PB2 - Dragon Ball Z: Budokai
+# GD7E70, GD7PB2 - Dragon Ball Z: Budokai
 
 [Video_Hacks]
 # Frame pacing
diff --git a/Data/Sys/GameSettings/GD7E70.ini b/Data/Sys/GameSettings/GD7E70.ini
index 991bf5493881..485c1c86a6ee 100644
--- a/Data/Sys/GameSettings/GD7E70.ini
+++ b/Data/Sys/GameSettings/GD7E70.ini
@@ -1,17 +1,11 @@
 # GD7E70 - Dragon Ball Z: Budokai
 
-[Core]
-# Values set here will override the main Dolphin settings.
-
 [OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
+$Deinterlacing Fix
+0x803cb228:byte:0x00000000
 
-[Gecko]
+[OnFrame_Enabled]
 $Deinterlacing Fix
-003CB228 00000000
 
-[Gecko_RetroAchievements_Verified]
+[Patches_RetroAchievements_Verified]
 $Deinterlacing Fix
diff --git a/Data/Sys/GameSettings/GD7PB2.ini b/Data/Sys/GameSettings/GD7PB2.ini
index 556c2eefcf79..d14a7c7d3fb8 100644
--- a/Data/Sys/GameSettings/GD7PB2.ini
+++ b/Data/Sys/GameSettings/GD7PB2.ini
@@ -1,17 +1,11 @@
 # GD7PB2 - Dragon Ball Z: Budokai
 
-[Core]
-# Values set here will override the main Dolphin settings.
-
 [OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
+$Deinterlacing Fix
+0x8044e9a8:byte:0x00000000
 
-[Gecko]
+[OnFrame_Enabled]
 $Deinterlacing Fix
-0044E9A8 00000000
 
-[Gecko_RetroAchievements_Verified]
+[Patches_RetroAchievements_Verified]
 $Deinterlacing Fix
diff --git a/Data/Sys/GameSettings/GDD.ini b/Data/Sys/GameSettings/GDD.ini
index e622fd586f71..b00489c1bff8 100644
--- a/Data/Sys/GameSettings/GDD.ini
+++ b/Data/Sys/GameSettings/GDD.ini
@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GDG.ini b/Data/Sys/GameSettings/GDG.ini
index 27c2f4d1031f..fc71f8b61e4a 100644
--- a/Data/Sys/GameSettings/GDG.ini
+++ b/Data/Sys/GameSettings/GDG.ini
@@ -1,4 +1,4 @@
-# GDGE7H, GDGP78 - Dragon's Lair 3D
+# GDGE7H, GDGP78 - Dragon's Lair 3D: Return to the Lair
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -12,5 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck screens during FMVs.
 ImmediateXFBEnable = False
-
diff --git a/Data/Sys/GameSettings/GDJ.ini b/Data/Sys/GameSettings/GDJ.ini
new file mode 100644
index 000000000000..6b27ce67fbb4
--- /dev/null
+++ b/Data/Sys/GameSettings/GDJ.ini
@@ -0,0 +1,5 @@
+# GDJEB2, GDJJB2 - Digimon World 4
+
+[Video_Hacks]
+# Avoids constant black flickering.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GDS.ini b/Data/Sys/GameSettings/GDS.ini
index a7420b03d088..6de44d28fb41 100644
--- a/Data/Sys/GameSettings/GDS.ini
+++ b/Data/Sys/GameSettings/GDS.ini
@@ -1,16 +1,5 @@
 # GDSE78, GDSP78 - Dark Summit
 
-[Core]
-# Values set here will override the main Dolphin settings.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video_Settings]
-
 [Video_Hacks]
+# Avoids stuck screens during FMVs.
 ImmediateXFBEnable = False
-
diff --git a/Data/Sys/GameSettings/GDSE78.ini b/Data/Sys/GameSettings/GDSE78.ini
new file mode 100644
index 000000000000..5982fb3bb90b
--- /dev/null
+++ b/Data/Sys/GameSettings/GDSE78.ini
@@ -0,0 +1,8 @@
+# GDSE78 - Dark Summit
+
+[OnFrame]
+$Limit internal frame rate (speed hack)
+0x80088784:dword:0x48184278
+
+[OnFrame_Enabled]
+$Limit internal frame rate (speed hack)
diff --git a/Data/Sys/GameSettings/GDSP78.ini b/Data/Sys/GameSettings/GDSP78.ini
new file mode 100644
index 000000000000..23c786c55c1a
--- /dev/null
+++ b/Data/Sys/GameSettings/GDSP78.ini
@@ -0,0 +1,8 @@
+# GDSP78 - Dark Summit
+
+[OnFrame]
+$Limit internal frame rate (speed hack)
+0x80089808:dword:0x481818A0
+
+[OnFrame_Enabled]
+$Limit internal frame rate (speed hack)
diff --git a/Data/Sys/GameSettings/GDT.ini b/Data/Sys/GameSettings/GDT.ini
index 56a77d17d239..030ec0246eb3 100644
--- a/Data/Sys/GameSettings/GDT.ini
+++ b/Data/Sys/GameSettings/GDT.ini
@@ -1,4 +1,4 @@
-# GDTE69, GDTP69 - Def Jam VENDETTA
+# GDTE69, GDTP69 - Def Jam Vendetta
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GE3.ini b/Data/Sys/GameSettings/GE3.ini
index 9528536dc513..b7d6b6dc9218 100644
--- a/Data/Sys/GameSettings/GE3.ini
+++ b/Data/Sys/GameSettings/GE3.ini
@@ -13,4 +13,5 @@
 SafeTextureCacheColorSamples = 0
 
 [Video_Hacks]
+# Intro FMVs are uncapped and slow to emulate.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GE4.ini b/Data/Sys/GameSettings/GE4.ini
index 23568b9c12cd..38aacca65d73 100644
--- a/Data/Sys/GameSettings/GE4.ini
+++ b/Data/Sys/GameSettings/GE4.ini
@@ -2,11 +2,17 @@
 
 [Core]
 # Values set here will override the main Dolphin settings.
+# The game has an uncapped frame rate, which is equivalent to SyncOnSkipIdle already being False.
+# Setting it is meant to avoid any performance regression when using the frame rate limit patch.
 SyncOnSkipIdle = False
 
 [OnFrame]
-# Add memory patches to be applied every frame here.
+# `nop` a branch that skips a call to `VIWaitForRetrace`.
+$Limit internal FPS to VPS (improves performance)
+0x80013818:dword:0x60000000
 
 [ActionReplay]
 # Add action replay cheats here.
 
+[OnFrame_Enabled]
+$Limit internal FPS to VPS (improves performance)
diff --git a/Data/Sys/GameSettings/GE9.ini b/Data/Sys/GameSettings/GE9.ini
index 781f2bb04b22..ea8c314514da 100644
--- a/Data/Sys/GameSettings/GE9.ini
+++ b/Data/Sys/GameSettings/GE9.ini
@@ -1,4 +1,4 @@
-# GE9E5D - Ed, Edd n Eddy
+# GE9E5D - Ed, Edd n Eddy: The Mis-Edventures
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -16,3 +16,6 @@ HLE_BS2 = True
 [Video_Settings]
 SafeTextureCacheColorSamples = 512
 
+[Video_Hacks]
+# Avoids shifted screen.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GEO.ini b/Data/Sys/GameSettings/GEO.ini
index 378abdec39ef..385e8edcde33 100644
--- a/Data/Sys/GameSettings/GEO.ini
+++ b/Data/Sys/GameSettings/GEO.ini
@@ -1,4 +1,4 @@
-# GEOE08, GEOP08 - CAPCOM VS. SNK 2  EO
+# GEOE08, GEOP08 - Capcom vs. SNK 2 EO
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -13,4 +13,5 @@
 SafeTextureCacheColorSamples = 512
 
 [Video_Hacks]
+# Avoids subtle flickering in menu and severe flickering in game.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GEYJ6E.ini b/Data/Sys/GameSettings/GEYJ6E.ini
new file mode 100644
index 000000000000..c410c05bd796
--- /dev/null
+++ b/Data/Sys/GameSettings/GEYJ6E.ini
@@ -0,0 +1,4 @@
+# GEYJ6E - Virtua Striker 2002 (Japan)
+
+[Core]
+FPRF = True
diff --git a/Data/Sys/GameSettings/GEYP6E.ini b/Data/Sys/GameSettings/GEYP6E.ini
new file mode 100644
index 000000000000..ccfcf0a9e4ed
--- /dev/null
+++ b/Data/Sys/GameSettings/GEYP6E.ini
@@ -0,0 +1,4 @@
+# GEYP6E - Virtua Striker 2002 (Export, Type3)
+
+[Core]
+FPRF = True
diff --git a/Data/Sys/GameSettings/GF4.ini b/Data/Sys/GameSettings/GF4.ini
index f23b1d82f701..72ccfa0d6011 100644
--- a/Data/Sys/GameSettings/GF4.ini
+++ b/Data/Sys/GameSettings/GF4.ini
@@ -12,5 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids extraneous frames with terrible pacing and flickering in the UI.
 ImmediateXFBEnable = False
-
diff --git a/Data/Sys/GameSettings/GFD.ini b/Data/Sys/GameSettings/GFD.ini
index ef4d314aa815..52c95732c455 100644
--- a/Data/Sys/GameSettings/GFD.ini
+++ b/Data/Sys/GameSettings/GFD.ini
@@ -12,5 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids shifted display and constant black flickering.
 ImmediateXFBEnable = False
-
diff --git a/Data/Sys/GameSettings/GFG.ini b/Data/Sys/GameSettings/GFG.ini
index 0adb66c07699..6bebb1bfdfcb 100644
--- a/Data/Sys/GameSettings/GFG.ini
+++ b/Data/Sys/GameSettings/GFG.ini
@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GGE.ini b/Data/Sys/GameSettings/GGE.ini
index 94bbb23e4fa5..6973902b75bb 100644
--- a/Data/Sys/GameSettings/GGE.ini
+++ b/Data/Sys/GameSettings/GGE.ini
@@ -14,4 +14,5 @@
 [Video_Hacks]
 
 [Video_Hacks]
+# Avoids extraneous frames with terrible pacing.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GGGE6E.ini b/Data/Sys/GameSettings/GGGE6E.ini
new file mode 100644
index 000000000000..8391b80aca5f
--- /dev/null
+++ b/Data/Sys/GameSettings/GGGE6E.ini
@@ -0,0 +1,5 @@
+# GGGE6E - F-ZERO AX
+
+[Core]
+FPRF = True
+
diff --git a/Data/Sys/GameSettings/GGN.ini b/Data/Sys/GameSettings/GGN.ini
index 3e7b6d6378d5..318021cae91c 100644
--- a/Data/Sys/GameSettings/GGN.ini
+++ b/Data/Sys/GameSettings/GGN.ini
@@ -1,4 +1,4 @@
-# GGNE5D - The Grim Adventures of Billy & Mandy
+# GGNE5D - The Grim Adventures of Billy & Mandy (GC)
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GGR.ini b/Data/Sys/GameSettings/GGR.ini
index 8f70a01a2b3f..32e43f379efc 100644
--- a/Data/Sys/GameSettings/GGR.ini
+++ b/Data/Sys/GameSettings/GGR.ini
@@ -1,4 +1,4 @@
-# GGRE41 - TOM CLANCY'S GHOST RECON
+# GGRE41, GGRP41, GGRD41 - Tom Clancy's Ghost Recon (GC)
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -12,5 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False
-
diff --git a/Data/Sys/GameSettings/GGY.ini b/Data/Sys/GameSettings/GGY.ini
index 1b3810182c5d..ea8044aeec1d 100644
--- a/Data/Sys/GameSettings/GGY.ini
+++ b/Data/Sys/GameSettings/GGY.ini
@@ -1,4 +1,4 @@
-# GGYE41, GGYP41 - GR2GC
+# GGYE41, GGYP41 - Tom Clancy's Ghost Recon 2
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -13,5 +13,5 @@
 SafeTextureCacheColorSamples = 512
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False
-
diff --git a/Data/Sys/GameSettings/GH2.ini b/Data/Sys/GameSettings/GH2.ini
index 3c9d5cb18171..9c2fca42c879 100644
--- a/Data/Sys/GameSettings/GH2.ini
+++ b/Data/Sys/GameSettings/GH2.ini
@@ -1,4 +1,4 @@
-# GH2E69, GH2P69 - NFS: HP2
+# GH2E69, GH2P69 - Need for Speed: Hot Pursuit 2
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -12,5 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Game runs uncapped and is slow to emulate.
 ImmediateXFBEnable = False
-
diff --git a/Data/Sys/GameSettings/GHAE6E.ini b/Data/Sys/GameSettings/GHAE6E.ini
new file mode 100644
index 000000000000..4f6821b253d1
--- /dev/null
+++ b/Data/Sys/GameSettings/GHAE6E.ini
@@ -0,0 +1,5 @@
+# GHAE6E - F-ZERO AX (Monster)
+
+[Core]
+FPRF = True
+
diff --git a/Data/Sys/GameSettings/GHN.ini b/Data/Sys/GameSettings/GHN.ini
index 692550fe5524..5c5ef425d2ef 100644
--- a/Data/Sys/GameSettings/GHN.ini
+++ b/Data/Sys/GameSettings/GHN.ini
@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck screeens before title screen.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GHS.ini b/Data/Sys/GameSettings/GHS.ini
index 163f6068c95a..8a42ace87138 100644
--- a/Data/Sys/GameSettings/GHS.ini
+++ b/Data/Sys/GameSettings/GHS.ini
@@ -1,4 +1,4 @@
-# GHSE69, GHSJ69, GHSP69, GHSX69, GHSY69 - Harry Potter COS
+# GHSE69, GHSJ69, GHSP69, GHSX69, GHSY69 - Harry Potter and the Chamber of Secrets
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -12,5 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck FMVs and flickering throughout the entire game.
 ImmediateXFBEnable = False
-
diff --git a/Data/Sys/GameSettings/GHY.ini b/Data/Sys/GameSettings/GHY.ini
index 523b7cdf5420..07881e6e44f3 100644
--- a/Data/Sys/GameSettings/GHY.ini
+++ b/Data/Sys/GameSettings/GHY.ini
@@ -1,4 +1,4 @@
-# GHYE6S - HauntedMansion
+# GHYE6S - The Haunted Mansion
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck screens during FMVs.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GHZW6E.ini b/Data/Sys/GameSettings/GHZW6E.ini
new file mode 100644
index 000000000000..afd22fb56cec
--- /dev/null
+++ b/Data/Sys/GameSettings/GHZW6E.ini
@@ -0,0 +1,4 @@
+# GHZW6E - VIRTUA STRIKER 4 (Asia)
+
+[Core]
+FPRF = True
diff --git a/Data/Sys/GameSettings/GIZ.ini b/Data/Sys/GameSettings/GIZ.ini
index 856d200d679c..cae96d9c36bb 100644
--- a/Data/Sys/GameSettings/GIZ.ini
+++ b/Data/Sys/GameSettings/GIZ.ini
@@ -1,4 +1,4 @@
-# GIZE52 - TY the Tasmanian Tiger 3: Night of the Quinkan
+# GIZE52 - Ty the Tasmanian Tiger 3: Night of the Quinkan
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -13,6 +13,7 @@
 SafeTextureCacheColorSamples = 512
 
 [Video_Hacks]
+# Avoids shifted screen.
 ImmediateXFBEnable = False
 # Fixes missing splash logo at boot.
 EFBAccessEnable = True
diff --git a/Data/Sys/GameSettings/GJAP6E.ini b/Data/Sys/GameSettings/GJAP6E.ini
new file mode 100644
index 000000000000..071cb0d5b9cc
--- /dev/null
+++ b/Data/Sys/GameSettings/GJAP6E.ini
@@ -0,0 +1,4 @@
+# GJAP6E - VIRTUA STRIKER 4 (Export)
+
+[Core]
+FPRF = True
diff --git a/Data/Sys/GameSettings/GJB.ini b/Data/Sys/GameSettings/GJB.ini
index e36dab918c7e..13a368f03ac1 100644
--- a/Data/Sys/GameSettings/GJB.ini
+++ b/Data/Sys/GameSettings/GJB.ini
@@ -13,5 +13,6 @@
 SafeTextureCacheColorSamples = 512
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False
 
diff --git a/Data/Sys/GameSettings/GJD.ini b/Data/Sys/GameSettings/GJD.ini
index 4312948d643a..29ba77bfec30 100644
--- a/Data/Sys/GameSettings/GJD.ini
+++ b/Data/Sys/GameSettings/GJD.ini
@@ -1,4 +1,5 @@
 # GJDX7D, GJDE5S, GJDY7D - Judge Dredd: Dredd vs. Death
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GJF.ini b/Data/Sys/GameSettings/GJF.ini
index 6f14276b354b..094b6e839e7b 100644
--- a/Data/Sys/GameSettings/GJF.ini
+++ b/Data/Sys/GameSettings/GJF.ini
@@ -13,6 +13,7 @@
 SafeTextureCacheColorSamples = 512
 
 [Video_Hacks]
+# Avoids shifted screen.
 ImmediateXFBEnable = False
 # Fixes missing splash logo at boot.
 EFBAccessEnable = True
diff --git a/Data/Sys/GameSettings/GJU.ini b/Data/Sys/GameSettings/GJU.ini
new file mode 100644
index 000000000000..eb88311dbeb9
--- /dev/null
+++ b/Data/Sys/GameSettings/GJU.ini
@@ -0,0 +1,5 @@
+# GJUF78, GJUE78, GJUD78, GJUP78 - Tak and the Power of Juju
+
+[Video_Hacks]
+# Avoids constant black flickering.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GKH.ini b/Data/Sys/GameSettings/GKH.ini
index 932e6d711979..dafa54dfc04b 100644
--- a/Data/Sys/GameSettings/GKH.ini
+++ b/Data/Sys/GameSettings/GKH.ini
@@ -10,6 +10,7 @@
 # Add action replay cheats here.
 
 [Video_Hacks]
+# Avoids shifted screen.
 ImmediateXFBEnable = False
 # Fixes missing splash logo at boot.
 EFBAccessEnable = True
diff --git a/Data/Sys/GameSettings/GKS.ini b/Data/Sys/GameSettings/GKS.ini
index a2dd40b5d368..a2b363af2bae 100644
--- a/Data/Sys/GameSettings/GKS.ini
+++ b/Data/Sys/GameSettings/GKS.ini
@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GKZ.ini b/Data/Sys/GameSettings/GKZ.ini
index d4cb20af1a9a..1834fb6bd9ae 100644
--- a/Data/Sys/GameSettings/GKZ.ini
+++ b/Data/Sys/GameSettings/GKZ.ini
@@ -1,4 +1,4 @@
-# GKZD9G, GKZE9G, GKZF9G, GKZP54, GKZP9G - Codename: Kids Next Door
+# GKZD9G, GKZE9G, GKZF9G, GKZP54, GKZP9G - Codename: Kids Next Door - Operation: V.I.D.E.O.G.A.M.E.
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GLKJ6E.ini b/Data/Sys/GameSettings/GLKJ6E.ini
new file mode 100644
index 000000000000..9b981daee609
--- /dev/null
+++ b/Data/Sys/GameSettings/GLKJ6E.ini
@@ -0,0 +1,4 @@
+# GLKJ6E - VIRTUA STRIKER 4 Ver.2006 (Japan)
+
+[Core]
+FPRF = True
diff --git a/Data/Sys/GameSettings/GLLP6E.ini b/Data/Sys/GameSettings/GLLP6E.ini
new file mode 100644
index 000000000000..b607f28de4f5
--- /dev/null
+++ b/Data/Sys/GameSettings/GLLP6E.ini
@@ -0,0 +1,4 @@
+# GLLP6E - VIRTUA STRIKER 4 Ver.2006 (Export)
+
+[Core]
+FPRF = True
diff --git a/Data/Sys/GameSettings/GLR.ini b/Data/Sys/GameSettings/GLR.ini
index 71381da14709..1f72e2d58a2c 100644
--- a/Data/Sys/GameSettings/GLR.ini
+++ b/Data/Sys/GameSettings/GLR.ini
@@ -16,5 +16,6 @@ MMU = True
 
 [Video_Hacks]
 EFBToTextureEnable = False
+# Avoids majorly corrupted graphics in menus.
 ImmediateXFBEnable = False
 DeferEFBCopies = False
diff --git a/Data/Sys/GameSettings/GLS.ini b/Data/Sys/GameSettings/GLS.ini
index 4053751ec51c..9724b88c9393 100644
--- a/Data/Sys/GameSettings/GLS.ini
+++ b/Data/Sys/GameSettings/GLS.ini
@@ -13,4 +13,5 @@ CPUThread = False
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GM3.ini b/Data/Sys/GameSettings/GM3.ini
index 51772982bc2e..b7a47d96d103 100644
--- a/Data/Sys/GameSettings/GM3.ini
+++ b/Data/Sys/GameSettings/GM3.ini
@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs and flickering in menus.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GMD.ini b/Data/Sys/GameSettings/GMD.ini
index 6f887d5de890..6cb0649d173d 100644
--- a/Data/Sys/GameSettings/GMD.ini
+++ b/Data/Sys/GameSettings/GMD.ini
@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck periwinkle screens during FMVs and flickering in menus.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GMK.ini b/Data/Sys/GameSettings/GMK.ini
new file mode 100644
index 000000000000..a8c8b92b0f2f
--- /dev/null
+++ b/Data/Sys/GameSettings/GMK.ini
@@ -0,0 +1,5 @@
+# GMKE5D, GMKP5D, GMKD5D - Mortal Kombat: Deadly Alliance
+
+[Video_Hacks]
+# Avoids stuck black screens during FMVs.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GMSE01.ini b/Data/Sys/GameSettings/GMSE01.ini
index 718c560d6485..17db68bfbc66 100644
--- a/Data/Sys/GameSettings/GMSE01.ini
+++ b/Data/Sys/GameSettings/GMSE01.ini
@@ -92,8 +92,9 @@ $D-Pad Left For Normal Mario
 4240E12C 4DE63F80
 4240E12C 4DE83F80
 00000000 40000000
+
 [Gecko]
-$Improved Jesus Mode  A.K.A Walk on Water DPad Up/Down = On/Off
+$Improved Jesus Mode A.K.A Walk on Water DPad Up/Down = On/Off [gamemasterplc]
 28404454 FFF70008
 C224F134 0000000A
 A8030000 2C000101
@@ -110,11 +111,11 @@ E2000001 80008000
 28404454 FFFB0004
 0424F134 A0630000
 E2000001 80008000
-$Infinite Water
+$Infinite Water [gamemasterplc]
 C2141DD8 00000002
 3B002710 93131C80
 60000000 00000000
-$Widescreen
+$Widescreen [gamemasterplc]
 04416758 44480000
 044123E8 442F0000
 04416620 442F0000
diff --git a/Data/Sys/GameSettings/GMX.ini b/Data/Sys/GameSettings/GMX.ini
index 9046c4c08fcd..c60afc251d74 100644
--- a/Data/Sys/GameSettings/GMX.ini
+++ b/Data/Sys/GameSettings/GMX.ini
@@ -15,4 +15,5 @@ EFBToTextureEnable = False
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GNE.ini b/Data/Sys/GameSettings/GNE.ini
index 30e4051eb490..8354da0afc91 100644
--- a/Data/Sys/GameSettings/GNE.ini
+++ b/Data/Sys/GameSettings/GNE.ini
@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GO2.ini b/Data/Sys/GameSettings/GO2.ini
index 787c7e2fec78..838161010e3a 100644
--- a/Data/Sys/GameSettings/GO2.ini
+++ b/Data/Sys/GameSettings/GO2.ini
@@ -14,4 +14,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck screens before the title screen.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GOF.ini b/Data/Sys/GameSettings/GOF.ini
new file mode 100644
index 000000000000..893c46286eb7
--- /dev/null
+++ b/Data/Sys/GameSettings/GOF.ini
@@ -0,0 +1,5 @@
+# GOFE7L, GOFP6S - Outlaw Golf
+
+[Video_Hacks]
+# Avoids stuck black FMVs and loading screens.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GP2.ini b/Data/Sys/GameSettings/GP2.ini
index 069e3a755f42..fee2349d6fdc 100644
--- a/Data/Sys/GameSettings/GP2.ini
+++ b/Data/Sys/GameSettings/GP2.ini
@@ -12,5 +12,6 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False
 
diff --git a/Data/Sys/GameSettings/GPK.ini b/Data/Sys/GameSettings/GPK.ini
index 5a7bab56c9ea..29d36b96f58f 100644
--- a/Data/Sys/GameSettings/GPK.ini
+++ b/Data/Sys/GameSettings/GPK.ini
@@ -1,4 +1,4 @@
-# GPKE41 - DISNEY'S PK: OUT OF THE SHADOWS
+# GPKE41, GDOP41 - Disney's PK: Out of the Shadows
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -12,5 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False
-
diff --git a/Data/Sys/GameSettings/GQX.ini b/Data/Sys/GameSettings/GQX.ini
index 81f13b4e89b5..0b977e93970f 100644
--- a/Data/Sys/GameSettings/GQX.ini
+++ b/Data/Sys/GameSettings/GQX.ini
@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck white screens during FMVs.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GR2.ini b/Data/Sys/GameSettings/GR2.ini
new file mode 100644
index 000000000000..a44ecb6d98eb
--- /dev/null
+++ b/Data/Sys/GameSettings/GR2.ini
@@ -0,0 +1,5 @@
+# GR2P52, GR2JCQ, GR2E52 - Lost Kingdoms II
+
+[Video_Hacks]
+# Avoids consistent extraneous swaps that cause terrible pacing.
+CapImmediateXFB = True
diff --git a/Data/Sys/GameSettings/GRH.ini b/Data/Sys/GameSettings/GRH.ini
index 780a9f898c11..ab09e3f6e728 100644
--- a/Data/Sys/GameSettings/GRH.ini
+++ b/Data/Sys/GameSettings/GRH.ini
@@ -1,4 +1,4 @@
-# GRHE41, GRHP41 - RAYMAN 3 HOODLUM HAVOC
+# GRHE41, GRHP41 - Rayman 3: Hoodlum Havoc
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -12,5 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids flickering during FMVs.
 ImmediateXFBEnable = False
-
diff --git a/Data/Sys/GameSettings/GRN.ini b/Data/Sys/GameSettings/GRN.ini
new file mode 100644
index 000000000000..9a8af763dc11
--- /dev/null
+++ b/Data/Sys/GameSettings/GRN.ini
@@ -0,0 +1,5 @@
+# GRNP52, GRNE52, GRNJCQ - Lost Kingdoms
+
+[Video_Hacks]
+# Avoids stuck black screens during FMVs.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GRY.ini b/Data/Sys/GameSettings/GRY.ini
index 466970da077e..02c51e397081 100644
--- a/Data/Sys/GameSettings/GRY.ini
+++ b/Data/Sys/GameSettings/GRY.ini
@@ -12,5 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck screens during FMVs.
 ImmediateXFBEnable = False
-
diff --git a/Data/Sys/GameSettings/GSM.ini b/Data/Sys/GameSettings/GSM.ini
index 9ccb572795df..4190a2fcd5ff 100644
--- a/Data/Sys/GameSettings/GSM.ini
+++ b/Data/Sys/GameSettings/GSM.ini
@@ -15,4 +15,5 @@
 SuggestedAspectRatio = 2
 
 [Video_Hacks]
+# Avoids stuck FMVs and black screen flickering while in game.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GSQ.ini b/Data/Sys/GameSettings/GSQ.ini
index 9202b06bd583..8489e4c02aa1 100644
--- a/Data/Sys/GameSettings/GSQ.ini
+++ b/Data/Sys/GameSettings/GSQ.ini
@@ -1,8 +1,5 @@
-# GSQE78, GSQP78 - SpongeBob SquarePants ROTFD
-[Core]
-[OnFrame]
-[ActionReplay]
-[Gecko]
-[Video_Settings]
+# GSQE78, GSQP78 - SpongeBob SquarePants: Revenge of the Flying Dutchman
+
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GST.ini b/Data/Sys/GameSettings/GST.ini
index a62023a80b46..144c31f97c9a 100644
--- a/Data/Sys/GameSettings/GST.ini
+++ b/Data/Sys/GameSettings/GST.ini
@@ -15,4 +15,5 @@ MemoryCardSize = 2
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GSW.ini b/Data/Sys/GameSettings/GSW.ini
index dfd4a93c717d..cd0c1a34b7ce 100644
--- a/Data/Sys/GameSettings/GSW.ini
+++ b/Data/Sys/GameSettings/GSW.ini
@@ -17,4 +17,5 @@ MMU = True
 [Video_Hacks]
 EFBToTextureEnable = False
 EFBEmulateFormatChanges = True
+# Avoids majorly corrupted graphics.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GT3.ini b/Data/Sys/GameSettings/GT3.ini
index 4a26fc2553e9..54ccc1b5acf9 100644
--- a/Data/Sys/GameSettings/GT3.ini
+++ b/Data/Sys/GameSettings/GT3.ini
@@ -15,4 +15,5 @@ CPUThread = False
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GT6.ini b/Data/Sys/GameSettings/GT6.ini
index 12cf82d82f5e..c374fde2ecd4 100644
--- a/Data/Sys/GameSettings/GT6.ini
+++ b/Data/Sys/GameSettings/GT6.ini
@@ -10,4 +10,5 @@
 # Add action replay cheats here.
 
 [Video_Hacks]
+# Avoids flickering in pause menu and in game.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GT7.ini b/Data/Sys/GameSettings/GT7.ini
index 982b349153f0..4183c7143642 100644
--- a/Data/Sys/GameSettings/GT7.ini
+++ b/Data/Sys/GameSettings/GT7.ini
@@ -1,4 +1,4 @@
-# GT7E41, GT7P41, GT7X41 - TOM CLANCY'S SPLINTER CELL PANDORA TOMORROW
+# GT7E41, GT7P41, GT7X41 - Tom Clancy's Splinter Cell: Pandora Tomorrow
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -13,5 +13,5 @@
 SafeTextureCacheColorSamples = 512
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False
-
diff --git a/Data/Sys/GameSettings/GTY.ini b/Data/Sys/GameSettings/GTY.ini
index ff325b24daf0..7492a5819c3e 100644
--- a/Data/Sys/GameSettings/GTY.ini
+++ b/Data/Sys/GameSettings/GTY.ini
@@ -1,4 +1,4 @@
-# GYTE69, GYTP69 - TY the Tasmanian Tiger
+# GYTE69, GYTP69 - Ty the Tasmanian Tiger
 
 [Core]
 # Values set here will override the main Dolphin settings.
diff --git a/Data/Sys/GameSettings/GTZ.ini b/Data/Sys/GameSettings/GTZ.ini
index ab27ff1e0440..c7f8a0b2e1a3 100644
--- a/Data/Sys/GameSettings/GTZ.ini
+++ b/Data/Sys/GameSettings/GTZ.ini
@@ -1,4 +1,4 @@
-# GTZE41, GTZP41 - DISNEY'S TARZAN
+# GTZE41, GTZP41 - Disney's Tarzan Untamed
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -12,5 +12,6 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False
 
diff --git a/Data/Sys/GameSettings/GUZ.ini b/Data/Sys/GameSettings/GUZ.ini
index 67db3ba33204..12d92f61b0b0 100644
--- a/Data/Sys/GameSettings/GUZ.ini
+++ b/Data/Sys/GameSettings/GUZ.ini
@@ -12,5 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck screens during FMVs.
 ImmediateXFBEnable = False
-
diff --git a/Data/Sys/GameSettings/GVC.ini b/Data/Sys/GameSettings/GVC.ini
index 1fc9f78f14de..1b44e3f06cc4 100644
--- a/Data/Sys/GameSettings/GVC.ini
+++ b/Data/Sys/GameSettings/GVC.ini
@@ -12,5 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False
-
diff --git a/Data/Sys/GameSettings/GVJ.ini b/Data/Sys/GameSettings/GVJ.ini
index 01085eb483bf..2599e365f7e8 100644
--- a/Data/Sys/GameSettings/GVJ.ini
+++ b/Data/Sys/GameSettings/GVJ.ini
@@ -1,4 +1,4 @@
-# GVJE08, GVJJ08, GVJP08 - VIEWTIFUL JOE
+# GVJE08, GVJJ08, GVJP08 - Viewtiful Joe
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -12,5 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False
-
diff --git a/Data/Sys/GameSettings/GVO.ini b/Data/Sys/GameSettings/GVO.ini
index 90f10c432383..38755e4353e9 100644
--- a/Data/Sys/GameSettings/GVO.ini
+++ b/Data/Sys/GameSettings/GVO.ini
@@ -1,4 +1,4 @@
-# GVOE69, GVOP69 - BIONICLE
+# GVOE69, GVOP69 - Bionicle: The Game
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck screens during FMVs.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GVR.ini b/Data/Sys/GameSettings/GVR.ini
index 6274b0d6787a..259184d58035 100644
--- a/Data/Sys/GameSettings/GVR.ini
+++ b/Data/Sys/GameSettings/GVR.ini
@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids constant flickering while in game.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GW7.ini b/Data/Sys/GameSettings/GW7.ini
index 1cd8b5ba8bd8..4757067af5ec 100644
--- a/Data/Sys/GameSettings/GW7.ini
+++ b/Data/Sys/GameSettings/GW7.ini
@@ -1,4 +1,4 @@
-# GW7D69, GW7E69, GW7F69, GW7P69 - 007: Agent Under Fire (tm)
+# GW7D69, GW7E69, GW7F69, GW7P69 - 007: Agent Under Fire
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids flashes of green and cyan frames during FMVs.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GWWE01.ini b/Data/Sys/GameSettings/GWWE01.ini
index ad8ba01bef0e..1fd3ee9fc998 100644
--- a/Data/Sys/GameSettings/GWWE01.ini
+++ b/Data/Sys/GameSettings/GWWE01.ini
@@ -1,4 +1,4 @@
-# GWWE01 - WARIO WORLD
+# GWWE01 - Wario World
 
 [OnFrame]
 # Add memory patches to be applied every frame here.
diff --git a/Data/Sys/GameSettings/GWWJ01.ini b/Data/Sys/GameSettings/GWWJ01.ini
index 1568017485b7..94ee2bacae22 100644
--- a/Data/Sys/GameSettings/GWWJ01.ini
+++ b/Data/Sys/GameSettings/GWWJ01.ini
@@ -1,4 +1,4 @@
-# GWWJ01 - WARIO WORLD
+# GWWJ01 - Wario World
 
 [OnFrame]
 # Add memory patches to be applied every frame here.
diff --git a/Data/Sys/GameSettings/GWWP01.ini b/Data/Sys/GameSettings/GWWP01.ini
index 9975d3598ab6..86359fe4a475 100644
--- a/Data/Sys/GameSettings/GWWP01.ini
+++ b/Data/Sys/GameSettings/GWWP01.ini
@@ -1,4 +1,4 @@
-# GWWP01 - WARIO WORLD
+# GWWP01 - Wario World
 
 [OnFrame]
 # Add memory patches to be applied every frame here.
diff --git a/Data/Sys/GameSettings/GWY.ini b/Data/Sys/GameSettings/GWY.ini
index 0cb0958467c4..91ab3f8c4442 100644
--- a/Data/Sys/GameSettings/GWY.ini
+++ b/Data/Sys/GameSettings/GWY.ini
@@ -1,4 +1,4 @@
-# GWYE41, GWYX41 - Tom Clancy's Splinter Cell Double Agent
+# GWYE41, GWYX41 - Tom Clancy's Splinter Cell Double Agent (GC)
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -16,5 +16,6 @@ MMU = True
 SafeTextureCacheColorSamples = 512
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False
 EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/GX3.ini b/Data/Sys/GameSettings/GX3.ini
index ca96afb1e08d..0d8d0a90e029 100644
--- a/Data/Sys/GameSettings/GX3.ini
+++ b/Data/Sys/GameSettings/GX3.ini
@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GXM.ini b/Data/Sys/GameSettings/GXM.ini
index 862f6f27c8ae..5ab29e9f2c95 100644
--- a/Data/Sys/GameSettings/GXM.ini
+++ b/Data/Sys/GameSettings/GXM.ini
@@ -1,4 +1,4 @@
-# GXME52, GXMF52, GXMP52 - X-Men Next Dimension
+# GXME52, GXMF52, GXMP52 - X-Men: Next Dimension
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck black screens during FMVs.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GXRP08.ini b/Data/Sys/GameSettings/GXRP08.ini
new file mode 100644
index 000000000000..90860442768a
--- /dev/null
+++ b/Data/Sys/GameSettings/GXRP08.ini
@@ -0,0 +1,6 @@
+# GXRP08 - Mega Man X: Command Mission
+
+[Gecko]
+$16:9 Widescreen
+045ACC34 C2D40000
+045ACC38 42D40000
diff --git a/Data/Sys/GameSettings/GYT.ini b/Data/Sys/GameSettings/GYT.ini
index 343d60b3bc79..a18ce04826e0 100644
--- a/Data/Sys/GameSettings/GYT.ini
+++ b/Data/Sys/GameSettings/GYT.ini
@@ -1,4 +1,4 @@
-# GYTE69, GYTP69 - TY the Tasmanian Tiger 2: Bush Rescue
+# GYTE69, GYTP69 - Ty the Tasmanian Tiger 2: Bush Rescue
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -10,6 +10,7 @@
 # Add action replay cheats here.
 
 [Video_Hacks]
+# Avoids shifted screen.
 ImmediateXFBEnable = False
 # Fixes missing splash logo at boot.
 EFBAccessEnable = True
diff --git a/Data/Sys/GameSettings/GZ3E70.ini b/Data/Sys/GameSettings/GZ3E70.ini
index a291d6a7939a..37c6a1230dc0 100644
--- a/Data/Sys/GameSettings/GZ3E70.ini
+++ b/Data/Sys/GameSettings/GZ3E70.ini
@@ -1,7 +1,8 @@
-# GZ3E70 - Dragon Ball Z 2
+# GZ3E70 - Dragon Ball Z: Budokai 2
 
 [OnFrame]
-# Add memory patches to be applied every frame here.
+$Deinterlacing Fix
+0x80625dc8:byte:0x00000000
 
 [ActionReplay]
 # Add action replay cheats here.
@@ -61,9 +62,12 @@ C0BA0020 00000000
 202F2D50 3F4CCCCD
 042F2D50 3F19999A
 E2000001 80008000
-$Deinterlacing Fix
-00625DC8 00000000
 
 [Gecko_RetroAchievements_Verified]
 $16:9 Widescreen
+
+[OnFrame_Enabled]
+$Deinterlacing Fix
+
+[Patches_RetroAchievements_Verified]
 $Deinterlacing Fix
diff --git a/Data/Sys/GameSettings/GZB.ini b/Data/Sys/GameSettings/GZB.ini
new file mode 100644
index 000000000000..b51a319210e1
--- /dev/null
+++ b/Data/Sys/GameSettings/GZB.ini
@@ -0,0 +1,5 @@
+# GZBJB2 - ドラゴンボールＺ
+
+[Video_Hacks]
+# Frame pacing
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/GZBJB2.ini b/Data/Sys/GameSettings/GZBJB2.ini
new file mode 100644
index 000000000000..5d0456c35754
--- /dev/null
+++ b/Data/Sys/GameSettings/GZBJB2.ini
@@ -0,0 +1,11 @@
+# GZBJB2 - ドラゴンボールＺ
+
+[OnFrame]
+$Deinterlacing Fix
+0x803C69E8:byte:0x00000000
+
+[OnFrame_Enabled]
+$Deinterlacing Fix
+
+[Patches_RetroAchievements_Verified]
+$Deinterlacing Fix
diff --git a/Data/Sys/GameSettings/L.ini b/Data/Sys/GameSettings/L.ini
index 75d4996f923d..19a67d4322ad 100644
--- a/Data/Sys/GameSettings/L.ini
+++ b/Data/Sys/GameSettings/L.ini
@@ -8,4 +8,5 @@ SuggestedAspectRatio = 2
 SafeTextureCacheColorSamples = 0
 
 [Video_Hacks]
+# Avoids shifted and/or improperly-scaled screen.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/LAD.ini b/Data/Sys/GameSettings/LAD.ini
index 315051140a05..ad056308797b 100644
--- a/Data/Sys/GameSettings/LAD.ini
+++ b/Data/Sys/GameSettings/LAD.ini
@@ -3,4 +3,5 @@
 [Video_Hacks]
 # Fixes purple screen.
 XFBToTextureEnable = False
+# Avoids shifted screen.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/LAK.ini b/Data/Sys/GameSettings/LAK.ini
index 35488a56d45d..82c7634c8499 100644
--- a/Data/Sys/GameSettings/LAK.ini
+++ b/Data/Sys/GameSettings/LAK.ini
@@ -3,4 +3,5 @@
 [Video_Hacks]
 # Fixes purple screen.
 XFBToTextureEnable = False
+# Avoids shifted screen.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/LAL.ini b/Data/Sys/GameSettings/LAL.ini
index 38ac8e87c929..7b5f28567d3d 100644
--- a/Data/Sys/GameSettings/LAL.ini
+++ b/Data/Sys/GameSettings/LAL.ini
@@ -3,4 +3,5 @@
 [Video_Hacks]
 # Fixes purple screen.
 XFBToTextureEnable = False
+# Avoids shifted screen.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/LAO.ini b/Data/Sys/GameSettings/LAO.ini
index ab8e956abc3a..aba13e4038be 100644
--- a/Data/Sys/GameSettings/LAO.ini
+++ b/Data/Sys/GameSettings/LAO.ini
@@ -3,4 +3,5 @@
 [Video_Hacks]
 # Fixes purple screen.
 XFBToTextureEnable = False
+# Avoids shifted screen.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/LAP.ini b/Data/Sys/GameSettings/LAP.ini
index 986060e1d63d..fb784a03eea4 100644
--- a/Data/Sys/GameSettings/LAP.ini
+++ b/Data/Sys/GameSettings/LAP.ini
@@ -1,6 +1,7 @@
-# LAPP8P, LAPE8P Wonder Boy III: The Dragon's Trap
+# LAPP8P, LAPE8P - Wonder Boy III: The Dragon's Trap
 
 [Video_Hacks]
 # Fixes purple screen.
 XFBToTextureEnable = False
+# Avoids shifted screen.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/MAK.ini b/Data/Sys/GameSettings/MAK.ini
index 918c8e7ef8a3..27ba22b87d0c 100644
--- a/Data/Sys/GameSettings/MAK.ini
+++ b/Data/Sys/GameSettings/MAK.ini
@@ -1,6 +1,5 @@
-# MAKE8P - Shadow Dancer
-
-[Video_Settings]
+# MAKE8P, MAKJ8P, MAKP8P - Shadow Dancer: The Secret of Shinobi
 
 [Video_Hacks]
+# Avoids majorly corrupted graphics.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/MBA.ini b/Data/Sys/GameSettings/MBA.ini
index 8c7cfa9ccf2f..5fc6032776b1 100644
--- a/Data/Sys/GameSettings/MBA.ini
+++ b/Data/Sys/GameSettings/MBA.ini
@@ -5,4 +5,5 @@
 CPUThread = False
 
 [Video_Hacks]
+# Avoids majorly corrupted screen edges.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/MCD.ini b/Data/Sys/GameSettings/MCD.ini
index b79bdbc02eb1..24ffb2c5c3f4 100644
--- a/Data/Sys/GameSettings/MCD.ini
+++ b/Data/Sys/GameSettings/MCD.ini
@@ -1,6 +1,5 @@
-# MCDE8P - Sonic & Knuckles
-
-[Video_Settings]
+# MCDP8P, MCDE8P, MCDJ8P - Sonic & Knuckles
 
 [Video_Hacks]
+# Avoids majorly corrupted graphics.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/MCS.ini b/Data/Sys/GameSettings/MCS.ini
index e0adac7c87a0..38df077b6d20 100644
--- a/Data/Sys/GameSettings/MCS.ini
+++ b/Data/Sys/GameSettings/MCS.ini
@@ -1,6 +1,5 @@
-# MCSN8P - Monster Lair
-
-[Video_Settings]
+# MCSN8P, MCSP8P, MCSJ8P - Wonder Boy III: Monster Lair
 
 [Video_Hacks]
+# Avoids majorly corrupted graphics.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/MCT.ini b/Data/Sys/GameSettings/MCT.ini
index c461ac16c9ed..d77df2c613e6 100644
--- a/Data/Sys/GameSettings/MCT.ini
+++ b/Data/Sys/GameSettings/MCT.ini
@@ -3,4 +3,5 @@
 [Video_Hacks]
 # Fixes purple screen.
 XFBToTextureEnable = False
+# Avoids shifted screen.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/MCW.ini b/Data/Sys/GameSettings/MCW.ini
index 71a66b9ade83..137d9337c9bc 100644
--- a/Data/Sys/GameSettings/MCW.ini
+++ b/Data/Sys/GameSettings/MCW.ini
@@ -1,6 +1,5 @@
-# MCWE8P - Galaxy Force II
-
-[Video_Settings]
+# MCWE8P, MCWJ8P, MCWP8P - Galaxy Force II
 
 [Video_Hacks]
+# Avoids majorly corrupted screen edges.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/MCY.ini b/Data/Sys/GameSettings/MCY.ini
index 97a6116b567b..d9b8d6a4badc 100644
--- a/Data/Sys/GameSettings/MCY.ini
+++ b/Data/Sys/GameSettings/MCY.ini
@@ -5,4 +5,5 @@
 CPUThread = False
 
 [Video_Hacks]
+# Avoids majorly corrupted graphics.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/MCZ.ini b/Data/Sys/GameSettings/MCZ.ini
index 79a6d49741d9..01484c56b004 100644
--- a/Data/Sys/GameSettings/MCZ.ini
+++ b/Data/Sys/GameSettings/MCZ.ini
@@ -1,7 +1,8 @@
-# MCZE8P - Shanghai II
+# MCZP8P, MCZE8P - Shanghai II: Dragon's Eye
 
 [Video_Settings]
 SafeTextureCacheColorSamples = 0
 
 [Video_Hacks]
+# Avoids majorly corrupted graphics.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/PGS.ini b/Data/Sys/GameSettings/PGS.ini
index 863edac2c73a..c8d86c010705 100644
--- a/Data/Sys/GameSettings/PGS.ini
+++ b/Data/Sys/GameSettings/PGS.ini
@@ -1,4 +1,4 @@
-# PGSJ01 - METAL GEAR SOLID Special Disc
+# PGSJ01 - Metal Gear Solid: Special Disc
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -10,6 +10,7 @@
 # Add action replay cheats here.
 
 [Video_Hacks]
+# Avoids majorly corrupted graphics.
 ImmediateXFBEnable = False
 
 [Video_Settings]
diff --git a/Data/Sys/GameSettings/R2G.ini b/Data/Sys/GameSettings/R2G.ini
index cb92094ad5ff..a895ccef3991 100644
--- a/Data/Sys/GameSettings/R2G.ini
+++ b/Data/Sys/GameSettings/R2G.ini
@@ -1,4 +1,4 @@
-# R2GEXJ, R2GJAF, R2GP99 - FRAGILE DREAMS
+# R2GEXJ, R2GJAF, R2GP99 - Fragile Dreams: Farewell Ruins of the Moon
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -13,5 +13,5 @@
 
 [Video_Hacks]
 EFBEmulateFormatChanges = True
+# Avoids constant black flickering.
 ImmediateXFBEnable = False
-
diff --git a/Data/Sys/GameSettings/R2P.ini b/Data/Sys/GameSettings/R2P.ini
index e7aef5c46f82..ee9668f623a7 100644
--- a/Data/Sys/GameSettings/R2P.ini
+++ b/Data/Sys/GameSettings/R2P.ini
@@ -1,4 +1,8 @@
-# R2PE9B, R2PJ9B, R2PKZ4, R2PP99 - Super Swing Golf Season 2
+# R2PP9B, R2PP99, R2PJ9B, R2PKZ4, R2PE9B - Super Swing Golf Season 2
 
 [Video_Settings]
 SuggestedAspectRatio = 2
+
+[Video_Hacks]
+# Avoids constant black flickering.
+ImmediateXFBenable = False
diff --git a/Data/Sys/GameSettings/R2W.ini b/Data/Sys/GameSettings/R2W.ini
new file mode 100644
index 000000000000..1408559a59a7
--- /dev/null
+++ b/Data/Sys/GameSettings/R2W.ini
@@ -0,0 +1,5 @@
+# R2WPA4, R2WXA4, R2WEA4, R2WJA4 - Pro Evolution Soccer 2009
+
+[Video_Hacks]
+# Properly show miniatures on Tactics/Substitutions screen.
+EFBAccessEnable = True
diff --git a/Data/Sys/GameSettings/R3P.ini b/Data/Sys/GameSettings/R3P.ini
new file mode 100644
index 000000000000..54a61bc97e8d
--- /dev/null
+++ b/Data/Sys/GameSettings/R3P.ini
@@ -0,0 +1,5 @@
+# R3PEWR, R3PJ52, R3PPWR - Speed Racer
+
+[Video_Hacks]
+# Avoids constant black flickering.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/R3X.ini b/Data/Sys/GameSettings/R3X.ini
new file mode 100644
index 000000000000..af7eb19394a5
--- /dev/null
+++ b/Data/Sys/GameSettings/R3X.ini
@@ -0,0 +1,5 @@
+# R3XE6U, R3XP6V - Sam & Max: Season One
+
+[Video_Hacks]
+# Avoids majorly corrupted graphics.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/R6C.INI b/Data/Sys/GameSettings/R6C.ini
similarity index 63%
rename from Data/Sys/GameSettings/R6C.INI
rename to Data/Sys/GameSettings/R6C.ini
index be0f8b88d3a3..9fbb640540da 100644
--- a/Data/Sys/GameSettings/R6C.INI
+++ b/Data/Sys/GameSettings/R6C.ini
@@ -12,4 +12,6 @@
 [Video_Enhancements]
 
 [Video_Hacks]
-DeferEFBCopies = False
\ No newline at end of file
+# Both settings are required to avoid black faces and text issues with the on-screen keyboard.
+EFBToTextureEnable = False
+DeferEFBCopies = False
diff --git a/Data/Sys/GameSettings/R79.ini b/Data/Sys/GameSettings/R79.ini
index 9c07d610c2b5..72eae594a8a6 100644
--- a/Data/Sys/GameSettings/R79.ini
+++ b/Data/Sys/GameSettings/R79.ini
@@ -2,3 +2,7 @@
 
 [Video_Settings]
 SuggestedAspectRatio = 2
+
+[Video_Hacks]
+# Avoids black flickering while in game.
+ImmediateXFBenable = False
diff --git a/Data/Sys/GameSettings/R7G.ini b/Data/Sys/GameSettings/R7G.ini
index 6bb4b7019369..144e688ff26f 100644
--- a/Data/Sys/GameSettings/R7G.ini
+++ b/Data/Sys/GameSettings/R7G.ini
@@ -1,4 +1,4 @@
-# R7GEAF, R7GJAF, R7GPAF - DragonBall
+# R7GEAF, R7GJAF, R7GPAF - Dragon Ball: Revenge of King Piccolo
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -13,5 +13,5 @@ AccurateNaNs = True
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids constant black flickering.
 ImmediateXFBEnable = False
-
diff --git a/Data/Sys/GameSettings/RBO.ini b/Data/Sys/GameSettings/RBO.ini
index d01bbed817aa..5cc0a310fd6b 100644
--- a/Data/Sys/GameSettings/RBO.ini
+++ b/Data/Sys/GameSettings/RBO.ini
@@ -15,4 +15,5 @@
 ForceTextureFiltering = 0
 
 [Video_Hacks]
+# Avoids majorly corrupted graphics.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/RC2.ini b/Data/Sys/GameSettings/RC2.ini
new file mode 100644
index 000000000000..4112894effef
--- /dev/null
+++ b/Data/Sys/GameSettings/RC2.ini
@@ -0,0 +1,5 @@
+# RC2E78, RC2P78, RC2X78, RC2Y78 - Cars Mater-National Championship
+
+[Video_Hacks]
+# Avoids stuck black screens during FMVs.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/RCA.ini b/Data/Sys/GameSettings/RCA.ini
new file mode 100644
index 000000000000..45b12d273109
--- /dev/null
+++ b/Data/Sys/GameSettings/RCA.ini
@@ -0,0 +1,5 @@
+# RCAJ78, RCAE78, RCAP78, RCAX78, RCAY78 - Cars (Wii)
+
+[Video_Hacks]
+# Avoids stuck black screens during FMVs.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/RCH.ini b/Data/Sys/GameSettings/RCH.ini
index baa1c8168bf7..b8144d79c458 100644
--- a/Data/Sys/GameSettings/RCH.ini
+++ b/Data/Sys/GameSettings/RCH.ini
@@ -13,4 +13,5 @@
 # Add graphics enhancements here.
 
 [Video_Hacks]
-DeferEFBCopies = False
\ No newline at end of file
+# Required to avoid washed out rendering.
+EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/RG6.ini b/Data/Sys/GameSettings/RG6.ini
index 06d850465a11..6f213984b8d1 100644
--- a/Data/Sys/GameSettings/RG6.ini
+++ b/Data/Sys/GameSettings/RG6.ini
@@ -10,4 +10,5 @@
 # Add action replay cheats here.
 
 [Video_Hacks]
+# Avoids majorly corrupted graphics.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/RGM.ini b/Data/Sys/GameSettings/RGM.ini
index 9b3e5659560c..c75fe4426545 100644
--- a/Data/Sys/GameSettings/RGM.ini
+++ b/Data/Sys/GameSettings/RGM.ini
@@ -1,4 +1,4 @@
-# RGME5D, RGMP5D - The Grim Adventures of Billy & Mandy
+# RGME5D, RGMP5D - The Grim Adventures of Billy & Mandy (Wii)
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -11,3 +11,7 @@
 
 [Video_Settings]
 SuggestedAspectRatio = 2
+
+[Video_Hacks]
+# Avoids stuck black screens during FMVs.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/RGW.ini b/Data/Sys/GameSettings/RGW.ini
index 0915a82ad991..af427d726bb4 100644
--- a/Data/Sys/GameSettings/RGW.ini
+++ b/Data/Sys/GameSettings/RGW.ini
@@ -18,6 +18,7 @@ SafeTextureCacheColorSamples = 0
 [Video_Hacks]
 # Fixes visible lines in air vents/fans.
 VertexRounding = True
+# Intro FMVs are uncapped and very slow to emulate.
 ImmediateXFBEnable = False
 # Fixes rabbid tattoo textures saving as black.
 EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/RH8.ini b/Data/Sys/GameSettings/RH8.ini
index ae46dd3ca255..e34c3b4916d0 100644
--- a/Data/Sys/GameSettings/RH8.ini
+++ b/Data/Sys/GameSettings/RH8.ini
@@ -12,5 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck black screens before the title screen.
 ImmediateXFBEnable = False
-
diff --git a/Data/Sys/GameSettings/RJ2.ini b/Data/Sys/GameSettings/RJ2.ini
index b4f4634f7c20..3098c795d721 100644
--- a/Data/Sys/GameSettings/RJ2.ini
+++ b/Data/Sys/GameSettings/RJ2.ini
@@ -1,19 +1,7 @@
-# RJ2E52 - Quantum of Solace
-
-[Core]
-# Values set here will override the main Dolphin settings.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
+# RJ2JGD, RJ2P52, RJ2E52 - 007: Quantum of Solace
 
 [Video_Settings]
 SafeTextureCacheColorSamples = 0
 
 [Video_Enhancements]
 ForceTextureFiltering = 0
-
-[Video_Hacks]
-ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/RJ2E52.ini b/Data/Sys/GameSettings/RJ2E52.ini
new file mode 100644
index 000000000000..8255e17be95a
--- /dev/null
+++ b/Data/Sys/GameSettings/RJ2E52.ini
@@ -0,0 +1,8 @@
+# RJ2E52 - 007: Quantum of Solace
+
+[OnFrame]
+$Limit internal frame rate (speed hack)
+0x8000909c:dword:0x4801d714
+
+[OnFrame_Enabled]
+$Limit internal frame rate (speed hack)
diff --git a/Data/Sys/GameSettings/RJ2JGD.ini b/Data/Sys/GameSettings/RJ2JGD.ini
new file mode 100644
index 000000000000..08530713b708
--- /dev/null
+++ b/Data/Sys/GameSettings/RJ2JGD.ini
@@ -0,0 +1,8 @@
+# RJ2JGD - 007: Quantum of Solace
+
+[OnFrame]
+$Limit internal frame rate (speed hack)
+0x80009390:dword:0x4801d8e4
+
+[OnFrame_Enabled]
+$Limit internal frame rate (speed hack)
diff --git a/Data/Sys/GameSettings/RJ2P52.ini b/Data/Sys/GameSettings/RJ2P52.ini
new file mode 100644
index 000000000000..2476cd18c8af
--- /dev/null
+++ b/Data/Sys/GameSettings/RJ2P52.ini
@@ -0,0 +1,8 @@
+# RJ2P52 - 007: Quantum of Solace
+
+[OnFrame]
+$Limit internal frame rate (speed hack)
+0x80009388:dword:0x4801d7fc
+
+[OnFrame_Enabled]
+$Limit internal frame rate (speed hack)
diff --git a/Data/Sys/GameSettings/RLJ.ini b/Data/Sys/GameSettings/RLJ.ini
index 1d6283cc5340..9478e10c21a3 100644
--- a/Data/Sys/GameSettings/RLJ.ini
+++ b/Data/Sys/GameSettings/RLJ.ini
@@ -1,4 +1,4 @@
-# RLJPKM - Line Rider Freestyle
+# RLJEHJ, RLJPKM - Line Rider: Freestyle
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck screen during opening FMV.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/RLS.ini b/Data/Sys/GameSettings/RLS.ini
index a89ed5c7b94a..a443a71acac4 100644
--- a/Data/Sys/GameSettings/RLS.ini
+++ b/Data/Sys/GameSettings/RLS.ini
@@ -1,4 +1,4 @@
-# RLSE8P - Alien Syndrome
+# RLSE8P, RLSP8P - Alien Syndrome
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -17,4 +17,5 @@ EFBToTextureEnable = False
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids constant flickering.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/RM4.ini b/Data/Sys/GameSettings/RM4.ini
new file mode 100644
index 000000000000..35bd77adc0b6
--- /dev/null
+++ b/Data/Sys/GameSettings/RM4.ini
@@ -0,0 +1,5 @@
+# RM4J41, RM4E41, RM4P41 - Monster 4x4: World Circuit
+
+[Video_Hacks]
+# Avoids shifted screen and terrible frame pacing.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/RM6.ini b/Data/Sys/GameSettings/RM6.ini
new file mode 100644
index 000000000000..f60a40b539b8
--- /dev/null
+++ b/Data/Sys/GameSettings/RM6.ini
@@ -0,0 +1,5 @@
+# RM6EEB, RM6P99 - Baroque
+
+[Video_Hacks]
+# Avoids constant flickering.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/RM9.ini b/Data/Sys/GameSettings/RM9.ini
index c1688e10c343..fe77cc8a15d8 100644
--- a/Data/Sys/GameSettings/RM9.ini
+++ b/Data/Sys/GameSettings/RM9.ini
@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids stuck screens during FMVs.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/RMC.ini b/Data/Sys/GameSettings/RMC.ini
index c2bfa056c54c..a2725cb5ca8f 100644
--- a/Data/Sys/GameSettings/RMC.ini
+++ b/Data/Sys/GameSettings/RMC.ini
@@ -10,7 +10,6 @@
 
 [Video_Hacks]
 EFBEmulateFormatChanges = True
-DeferEFBCopies = False
 
 [Video_Stereoscopy]
 StereoConvergence = 613
diff --git a/Data/Sys/GameSettings/RO3.ini b/Data/Sys/GameSettings/RO3.ini
index b41db11a972e..8c41b838fd59 100644
--- a/Data/Sys/GameSettings/RO3.ini
+++ b/Data/Sys/GameSettings/RO3.ini
@@ -12,5 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids constant flickering.
 ImmediateXFBEnable = False
-
diff --git a/Data/Sys/GameSettings/ROQ.ini b/Data/Sys/GameSettings/ROQ.ini
new file mode 100644
index 000000000000..bbafbc32ac9d
--- /dev/null
+++ b/Data/Sys/GameSettings/ROQ.ini
@@ -0,0 +1,5 @@
+# ROQJEP - Baroque
+
+[Video_Hacks]
+# Avoids constant flickering.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/RPY.ini b/Data/Sys/GameSettings/RPY.ini
index 727dbb8e4337..1cd647ef5d18 100644
--- a/Data/Sys/GameSettings/RPY.ini
+++ b/Data/Sys/GameSettings/RPY.ini
@@ -1,4 +1,4 @@
-# RPYP9B - Pangya! Golf with Style
+# RPYE9B, RPYJ9B, RPYP9B - Super Swing Golf
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -12,3 +12,7 @@ FPRF = True
 
 [Video_Settings]
 SuggestedAspectRatio = 2
+
+[Video_Hacks]
+# Avoids constant black flickering.
+ImmediateXFBenable = False
diff --git a/Data/Sys/GameSettings/RQN.ini b/Data/Sys/GameSettings/RQN.ini
new file mode 100644
index 000000000000..4d25d2a9778b
--- /dev/null
+++ b/Data/Sys/GameSettings/RQN.ini
@@ -0,0 +1,5 @@
+# RQNEWR, RQNPWR - Scooby-Doo! First Frights
+
+[Video_Hacks]
+# Avoids majorly corrupted graphics.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/RSM.ini b/Data/Sys/GameSettings/RSM.ini
index 397ec620ff92..f890cfed582e 100644
--- a/Data/Sys/GameSettings/RSM.ini
+++ b/Data/Sys/GameSettings/RSM.ini
@@ -1,4 +1,4 @@
-# RSME8P, RSMJ8P, RSMP8P - SUPER MONKEY BALL BANANA BLITZ
+# RSME8P, RSMJ8P, RSMP8P - Super Monkey Ball: Banana Blitz
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -9,4 +9,3 @@ FPRF = True
 
 [ActionReplay]
 # Add action replay cheats here.
-
diff --git a/Data/Sys/GameSettings/RSS.ini b/Data/Sys/GameSettings/RSS.ini
index 4676ae3fd2f2..1774301a9754 100644
--- a/Data/Sys/GameSettings/RSS.ini
+++ b/Data/Sys/GameSettings/RSS.ini
@@ -2,3 +2,5 @@
 
 [Video_Settings]
 SuggestedAspectRatio = 2
+# Fix text issues
+SafeTextureCacheColorSamples = 0
diff --git a/Data/Sys/GameSettings/RSX.ini b/Data/Sys/GameSettings/RSX.ini
index 4f249caf856d..d2b4fc4862d9 100644
--- a/Data/Sys/GameSettings/RSX.ini
+++ b/Data/Sys/GameSettings/RSX.ini
@@ -14,4 +14,5 @@
 [Video_Hacks]
 
 [Video_Hacks]
+# Avoids majorly corrupted graphics.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/RT3.ini b/Data/Sys/GameSettings/RT3.ini
index 0c90538e5d8e..8164dc17b9ae 100644
--- a/Data/Sys/GameSettings/RT3.ini
+++ b/Data/Sys/GameSettings/RT3.ini
@@ -1,7 +1,5 @@
-# RT3E54, RT3JEL, RT3P54 - Rockstar Games presents Table Tennis
-[Core]
-[OnFrame]
-[ActionReplay]
-[Video_Settings]
+# RT3E54, RT3JEL, RT3P54 - Rockstar Games Presents Table Tennis
+
 [Video_Hacks]
+# Avoids majorly corrupted graphics.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/RTC.ini b/Data/Sys/GameSettings/RTC.ini
new file mode 100644
index 000000000000..d38b29d16a73
--- /dev/null
+++ b/Data/Sys/GameSettings/RTC.ini
@@ -0,0 +1,5 @@
+# RTCE41, RTCP41 - Tom Clancy's Splinter Cell Double Agent (Wii)
+
+[Video_Hacks]
+# Avoids stuck black screens during FMVs.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/RTZ.ini b/Data/Sys/GameSettings/RTZ.ini
index 1865de7aacb7..c40bde31ccdc 100644
--- a/Data/Sys/GameSettings/RTZ.ini
+++ b/Data/Sys/GameSettings/RTZ.ini
@@ -1,4 +1,4 @@
-# RTZE08, RTZJ08, RTZK08, RTZP08 - Zack and Wiki: Quest for Barbaros' Treasure
+# RTZE08, RTZJ08, RTZK08, RTZP08 - Zack & Wiki: Quest for Barbaros' Treasure
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -12,5 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids constant flickering.
 ImmediateXFBEnable = False
-
diff --git a/Data/Sys/GameSettings/RUUE01r0.ini b/Data/Sys/GameSettings/RUUE01r0.ini
new file mode 100644
index 000000000000..b5bbc61784a4
--- /dev/null
+++ b/Data/Sys/GameSettings/RUUE01r0.ini
@@ -0,0 +1,254 @@
+# RUUE01 - Animal Crossing: City Folk (NTSC-U, Rev 0)
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Gecko]
+# Add gecko cheats here.
+
+$!!! - README
+*It is required you configure your Wii Remote with a mapped Classic Controller extension!
+*Left Stick variant toggles between movement and IR input (recommended!).
+*Right Stick variant allows cursor movement while moving, but this is not a real advantage and may feel less convenient.
+*Pointer mode is activated intelligently, but can be forced on/off with the L button.
+*3C75C28F (float 0.015) sets cursor speed. You can adjust it between 3C23D70A (0.01) and 3CA3D70A (0.02).
+*To use the in-game keyboard, it is recommended to connect a real keyboard over using the pointer.
+*More information: https://gbatemp.net/threads/new-classic-controller-hacks.659837/post-10507857
+
+$!!! - CONTROL SCHEME
+*Remote & Nunchuk     Classic Controller   Game Function
+*--------------------------------------------------------------------
+*Remote Home          Home                 Open/Close Home Menu
+*Remote D-Pad         D-Pad                Up: Change Camera
+* ---                  ---                 Left/Right: Change Tool
+* ---                  ---                 Down: Put Away Tool
+*Remote A             A                    Confirm, Action
+*Remote B             B                    Cancel, Run, Pick Up Item
+*Remote +             Plus                 Open/Close Map
+* ---                 ZR                   Next Tab
+*Remote -             X                    Open/Close Inventory
+* ---                 ZL                   Previous Tab
+*Remote 1             Minus                Take Photo
+*Remote 2             Y                    Open/Close Photos
+*Nunchuk Stick        Left Stick           Movement
+*Nunchuk C            N/A (Use A)          Confirm, Action
+*Nunchuk Z            R                    Cancel, Run, Pick Up Item
+*Remote Pointer       L (Toggle)           Move Cursor
+*          
+*For the Pointer, use Left or Right Stick, depending on code used.
+*Home Menu works as normal, but remember to enable the pointer with L.
+
+$QOL - Classic Controller Support (Pointer on Left Stick, recommended) v1.1 [Vague Rant, crediar]
+C20FA624 00000003
+2C030002 40820008
+3863FFFF 3803FF04
+60000000 00000000
+C20FA68C 00000003
+2C040002 40820008
+3884FFFF 20640001
+60000000 00000000
+042CE160 48000010
+C2443CE4 00000003
+2C000001 4182000C
+C0230104 48000008
+C0230074 00000000
+C2443D00 00000003
+2C000001 4182000C
+C0230108 48000008
+C0230078 00000000
+C23BE750 0000001C
+88A40028 2C050002
+408200CC 88A3005E
+2C050002 4C820020
+9421FFF0 7C0802A6
+9001000C 90610008
+3CC0803A 60C6D338
+7CC803A6 4E800021
+2C030001 80610008
+48000005 7CA802A6
+C0450084 40820008
+EC4200B2 C0650088
+C0030020 C023006C
+FC211024 48000039
+D0030020 C0030024
+C0230070 FC200850
+48000025 D0030024
+38000000 9003006C
+90030070 8001000C
+7C0803A6 38210010
+4E800020 FC0100FA
+C025008C FC000800
+4180000C FC000890
+48000014 FC200850
+FC000800 41810008
+FC000890 4E800020
+3FAAAAAB 3C75C28F
+3F800000 9421FFC0
+60000000 00000000
+C23BF784 00000026
+901F0068 811F0060
+48000061 80DF0000
+7D083378 911F0000
+7D0840F8 80DF0008
+7CC84038 911F0008
+811F0064 4800003D
+80DF0004 7D083378
+911F0004 71060040
+41820010 38C00002
+98DF005E 480000E0
+71060080 418200D8
+88DF005E 68C60002
+98DF005E 480000C8
+38E00000 71060800
+41820008 60E78000
+71060001 41820008
+60E70008 71064000
+41820008 60E70004
+71060002 41820008
+60E70001 71068000
+41820008 60E70002
+71060010 41820008
+60E70800 71060040
+41820008 60E70400
+71060008 41820008
+60E71080 71060020
+41820008 60E70180
+71062000 41820008
+60E70080 71060200
+41820008 60E72000
+71060080 41820008
+60E71040 71060004
+4182000C 60E70050
+48000004 71060400
+41820008 60E70090
+71061000 41820008
+60E70200 7CE83B78
+4E800020 00000000
+*Left Stick variant toggles between movement and IR input (recommended!).
+*See README and CONTROL SCHEME for further instructions.
+
+$QOL - Classic Controller Support (Pointer on Right Stick) v1.1 [Vague Rant, crediar]
+C20FA624 00000003
+2C030002 40820008
+3863FFFF 3803FF04
+60000000 00000000
+C20FA68C 00000003
+2C040002 40820008
+3884FFFF 20640001
+60000000 00000000
+042CE160 48000010
+C2443CE4 00000003
+2C000001 4182000C
+C0230104 48000008
+C0230074 00000000
+C2443D00 00000003
+2C000001 4182000C
+C0230108 48000008
+C0230078 00000000
+C23BE750 0000001A
+88A40028 2C050002
+408200C0 88A3005E
+2C050002 4C820020
+9421FFF0 7C0802A6
+9001000C 90610008
+3CC0803A 60C6D338
+7CC803A6 4E800021
+2C030001 80610008
+48000005 7CA802A6
+C0450078 40820008
+EC4200B2 C065007C
+C0030020 C0230074
+FC211024 4800002D
+D0030020 C0030024
+C0230078 FC200850
+48000019 D0030024
+8001000C 7C0803A6
+38210010 4E800020
+FC0100FA C0250080
+FC000800 4180000C
+FC000890 48000014
+FC200850 FC000800
+41810008 FC000890
+4E800020 3FAAAAAB
+3C75C28F 3F800000
+9421FFC0 00000000
+C23BF784 00000026
+901F0068 811F0060
+48000061 80DF0000
+7D083378 911F0000
+7D0840F8 80DF0008
+7CC84038 911F0008
+811F0064 4800003D
+80DF0004 7D083378
+911F0004 71060040
+41820010 38C00002
+98DF005E 480000E0
+71060080 418200D8
+88DF005E 68C60002
+98DF005E 480000C8
+38E00000 71060800
+41820008 60E78000
+71060001 41820008
+60E70008 71064000
+41820008 60E70004
+71060002 41820008
+60E70001 71068000
+41820008 60E70002
+71060010 41820008
+60E70800 71060040
+41820008 60E70400
+71060008 41820008
+60E71080 71060020
+41820008 60E70180
+71062000 41820008
+60E70080 71060200
+41820008 60E72000
+71060080 41820008
+60E71040 71060004
+4182000C 60E70050
+48000004 71060400
+41820008 60E70090
+71061000 41820008
+60E70200 7CE83B78
+4E800020 00000000
+*Right Stick variant allows cursor movement while moving, but this is not a real advantage and may feel less convenient.
+*See README and CONTROL SCHEME for further instructions.
+
+$QOL - Disable Grass Deterioration [Seth@WiiPlaza, Fox_McCloud45]
+042B62EC 60000000
+*Prevents grass from deteriorating when walked on.
+*Hides deteriorating grass patches, e.g., around houses.
+*Does not modify pre-existing save file data; grass will still be deteriorated when disabled.
+*While active, save file data remains static; grass will neither heal nor deteriorate in save data.
+
+$QOL - Set Grass Type to Green Darkest (Rain) [Seth@WiiPlaza, hetoan2]
+04162974 38600000
+$QOL - Set Grass Type to Green Lightest (Rain) [Seth@WiiPlaza, hetoan2]
+04162974 38600005
+$QOL - Set Grass Type to Brown w/ Green (Rain) [Seth@WiiPlaza, hetoan2]
+04162974 38600006
+$QOL - Set Grass Type to Brown Lightest (Rain) [Seth@WiiPlaza, hetoan2]
+04162974 38600007
+$QOL - Set Grass Type to Brown Darkest (Rain) [Seth@WiiPlaza, hetoan2]
+04162974 38600010
+$QOL - Set Grass Type to Brown Ground Light (Snow) [Seth@WiiPlaza, hetoan2]
+04162974 38600011
+$QOL - Set Grass Type to Brown Ground Dark (Snow) [Seth@WiiPlaza, hetoan2]
+04162974 38600012
+$QOL - Set Grass Type to Snowy w/ Purple/Brown Trees(Snow) [Seth@WiiPlaza, hetoan2]
+04162974 38600013
+$QOL - Set Grass Type to Snowy w/ Blue Trees (Snow) [Seth@WiiPlaza, hetoan2]
+04162974 38600014
+$QOL - Set Grass Type to Snowy w/ Green Trees (Snow) [Seth@WiiPlaza, hetoan2]
+04162974 38600015s
+
+[Gecko_RetroAchievements_Verified]
+$QOL - Classic Controller Support (Pointer on Left Stick, recommended) v1.1
+$QOL - Classic Controller Support (Pointer on Right Stick) v1.1
+$QOL - Disable Grass Deterioration
\ No newline at end of file
diff --git a/Data/Sys/GameSettings/RUUE01r1.ini b/Data/Sys/GameSettings/RUUE01r1.ini
new file mode 100644
index 000000000000..279c9bc96c22
--- /dev/null
+++ b/Data/Sys/GameSettings/RUUE01r1.ini
@@ -0,0 +1,225 @@
+# RUUE01 - Animal Crossing: City Folk (NTSC-U, Rev 1)
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Gecko]
+# Add gecko cheats here.
+
+$!!! - README
+*It is required you configure your Wii Remote with a mapped Classic Controller extension!
+*Left Stick variant toggles between movement and IR input (recommended!).
+*Right Stick variant allows cursor movement while moving, but this is not a real advantage and may feel less convenient.
+*Pointer mode is activated intelligently, but can be forced on/off with the L button.
+*3C75C28F (float 0.015) sets cursor speed. You can adjust it between 3C23D70A (0.01) and 3CA3D70A (0.02).
+*To use the in-game keyboard, it is recommended to connect a real keyboard over using the pointer.
+*More information: https://gbatemp.net/threads/new-classic-controller-hacks.659837/post-10507857
+
+$!!! - CONTROL SCHEME
+*Remote & Nunchuk     Classic Controller   Game Function
+*--------------------------------------------------------------------
+*Remote Home          Home                 Open/Close Home Menu
+*Remote D-Pad         D-Pad                Up: Change Camera
+* ---                  ---                 Left/Right: Change Tool
+* ---                  ---                 Down: Put Away Tool
+*Remote A             A                    Confirm, Action
+*Remote B             B                    Cancel, Run, Pick Up Item
+*Remote +             Plus                 Open/Close Map
+* ---                 ZR                   Next Tab
+*Remote -             X                    Open/Close Inventory
+* ---                 ZL                   Previous Tab
+*Remote 1             Minus                Take Photo
+*Remote 2             Y                    Open/Close Photos
+*Nunchuk Stick        Left Stick           Movement
+*Nunchuk C            N/A (Use A)          Confirm, Action
+*Nunchuk Z            R                    Cancel, Run, Pick Up Item
+*Remote Pointer       L (Toggle)           Move Cursor
+*          
+*For the Pointer, use Left or Right Stick, depending on code used.
+*Home Menu works as normal, but remember to enable the pointer with L.
+
+$QOL - Classic Controller Support (Pointer on Left Stick, recommended) v1.1 [Vague Rant, crediar]
+C20FA624 00000003
+2C030002 40820008
+3863FFFF 3803FF04
+60000000 00000000
+C20FA68C 00000003
+2C040002 40820008
+3884FFFF 20640001
+60000000 00000000
+042CE284 48000010
+C2443F4C 00000003
+2C000001 4182000C
+C0230104 48000008
+C0230074 00000000
+C2443F68 00000003
+2C000001 4182000C
+C0230108 48000008
+C0230078 00000000
+C23BE9B8 0000001C
+88A40028 2C050002
+408200CC 88A3005E
+2C050002 4C820020
+9421FFF0 7C0802A6
+9001000C 90610008
+3CC0803A 60C6D5A0
+7CC803A6 4E800021
+2C030001 80610008
+48000005 7CA802A6
+C0450084 40820008
+EC4200B2 C0650088
+C0030020 C023006C
+FC211024 48000039
+D0030020 C0030024
+C0230070 FC200850
+48000025 D0030024
+38000000 9003006C
+90030070 8001000C
+7C0803A6 38210010
+4E800020 FC0100FA
+C025008C FC000800
+4180000C FC000890
+48000014 FC200850
+FC000800 41810008
+FC000890 4E800020
+3FAAAAAB 3C75C28F
+3F800000 9421FFC0
+60000000 00000000
+C23BF9EC 00000026
+901F0068 811F0060
+48000061 80DF0000
+7D083378 911F0000
+7D0840F8 80DF0008
+7CC84038 911F0008
+811F0064 4800003D
+80DF0004 7D083378
+911F0004 71060040
+41820010 38C00002
+98DF005E 480000E0
+71060080 418200D8
+88DF005E 68C60002
+98DF005E 480000C8
+38E00000 71060800
+41820008 60E78000
+71060001 41820008
+60E70008 71064000
+41820008 60E70004
+71060002 41820008
+60E70001 71068000
+41820008 60E70002
+71060010 41820008
+60E70800 71060040
+41820008 60E70400
+71060008 41820008
+60E71080 71060020
+41820008 60E70180
+71062000 41820008
+60E70080 71060200
+41820008 60E72000
+71060080 41820008
+60E71040 71060004
+4182000C 60E70050
+48000004 71060400
+41820008 60E70090
+71061000 41820008
+60E70200 7CE83B78
+4E800020 00000000
+*Left Stick variant toggles between movement and IR input (recommended!).
+*See README and CONTROL SCHEME for further instructions.
+
+$QOL - Classic Controller Support (Pointer on Right Stick) v1.1 [Vague Rant, crediar]
+C20FA624 00000003
+2C030002 40820008
+3863FFFF 3803FF04
+60000000 00000000
+C20FA68C 00000003
+2C040002 40820008
+3884FFFF 20640001
+60000000 00000000
+042CE284 48000010
+C2443F4C 00000003
+2C000001 4182000C
+C0230104 48000008
+C0230074 00000000
+C2443F68 00000003
+2C000001 4182000C
+C0230108 48000008
+C0230078 00000000
+C23BE9B8 0000001A
+88A40028 2C050002
+408200C0 88A3005E
+2C050002 4C820020
+9421FFF0 7C0802A6
+9001000C 90610008
+3CC0803A 60C6D5A0
+7CC803A6 4E800021
+2C030001 80610008
+48000005 7CA802A6
+C0450078 40820008
+EC4200B2 C065007C
+C0030020 C0230074
+FC211024 4800002D
+D0030020 C0030024
+C0230078 FC200850
+48000019 D0030024
+8001000C 7C0803A6
+38210010 4E800020
+FC0100FA C0250080
+FC000800 4180000C
+FC000890 48000014
+FC200850 FC000800
+41810008 FC000890
+4E800020 3FAAAAAB
+3C75C28F 3F800000
+9421FFC0 00000000
+C23BF9EC 00000026
+901F0068 811F0060
+48000061 80DF0000
+7D083378 911F0000
+7D0840F8 80DF0008
+7CC84038 911F0008
+811F0064 4800003D
+80DF0004 7D083378
+911F0004 71060040
+41820010 38C00002
+98DF005E 480000E0
+71060080 418200D8
+88DF005E 68C60002
+98DF005E 480000C8
+38E00000 71060800
+41820008 60E78000
+71060001 41820008
+60E70008 71064000
+41820008 60E70004
+71060002 41820008
+60E70001 71068000
+41820008 60E70002
+71060010 41820008
+60E70800 71060040
+41820008 60E70400
+71060008 41820008
+60E71080 71060020
+41820008 60E70180
+71062000 41820008
+60E70080 71060200
+41820008 60E72000
+71060080 41820008
+60E71040 71060004
+4182000C 60E70050
+48000004 71060400
+41820008 60E70090
+71061000 41820008
+60E70200 7CE83B78
+4E800020 00000000
+*Right Stick variant allows cursor movement while moving, but this is not a real advantage and may feel less convenient.
+*See README and CONTROL SCHEME for further instructions.
+
+[Gecko_RetroAchievements_Verified]
+$QOL - Classic Controller Support (Pointer on Left Stick, recommended) v1.1
+$QOL - Classic Controller Support (Pointer on Right Stick) v1.1
\ No newline at end of file
diff --git a/Data/Sys/GameSettings/RUUJ01r1.ini b/Data/Sys/GameSettings/RUUJ01r1.ini
new file mode 100644
index 000000000000..7bea0ebcab44
--- /dev/null
+++ b/Data/Sys/GameSettings/RUUJ01r1.ini
@@ -0,0 +1,225 @@
+# RUUJ01 - Machi e Ikou yo: Doubutsu no Mori (NTSC-J, Rev 1)
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Gecko]
+# Add gecko cheats here.
+
+$!!! - README
+*It is required you configure your Wii Remote with a mapped Classic Controller extension!
+*Left Stick variant toggles between movement and IR input (recommended!).
+*Right Stick variant allows cursor movement while moving, but this is not a real advantage and may feel less convenient.
+*Pointer mode is activated intelligently, but can be forced on/off with the L button.
+*3C75C28F (float 0.015) sets cursor speed. You can adjust it between 3C23D70A (0.01) and 3CA3D70A (0.02).
+*To use the in-game keyboard, it is recommended to connect a real keyboard over using the pointer.
+*More information: https://gbatemp.net/threads/new-classic-controller-hacks.659837/post-10507857
+
+$!!! - CONTROL SCHEME
+*Remote & Nunchuk     Classic Controller   Game Function
+*--------------------------------------------------------------------
+*Remote Home          Home                 Open/Close Home Menu
+*Remote D-Pad         D-Pad                Up: Change Camera
+* ---                  ---                 Left/Right: Change Tool
+* ---                  ---                 Down: Put Away Tool
+*Remote A             A                    Confirm, Action
+*Remote B             B                    Cancel, Run, Pick Up Item
+*Remote +             Plus                 Open/Close Map
+* ---                 ZR                   Next Tab
+*Remote -             X                    Open/Close Inventory
+* ---                 ZL                   Previous Tab
+*Remote 1             Minus                Take Photo
+*Remote 2             Y                    Open/Close Photos
+*Nunchuk Stick        Left Stick           Movement
+*Nunchuk C            N/A (Use A)          Confirm, Action
+*Nunchuk Z            R                    Cancel, Run, Pick Up Item
+*Remote Pointer       L (Toggle)           Move Cursor
+*          
+*For the Pointer, use Left or Right Stick, depending on code used.
+*Home Menu works as normal, but remember to enable the pointer with L.
+
+$QOL - Classic Controller Support (Pointer on Left Stick, recommended) v1.1 [Vague Rant, crediar]
+C20FA8DC 00000003
+2C030002 40820008
+3863FFFF 3803FF04
+60000000 00000000
+C20FA944 00000003
+2C040002 40820008
+3884FFFF 20640001
+60000000 00000000
+042CE300 48000010
+C2443E80 00000003
+2C000001 4182000C
+C0230104 48000008
+C0230074 00000000
+C2443E9C 00000003
+2C000001 4182000C
+C0230108 48000008
+C0230078 00000000
+C23BE8F4 0000001C
+88A40028 2C050002
+408200CC 88A3005E
+2C050002 4C820020
+9421FFF0 7C0802A6
+9001000C 90610008
+3CC0803A 60C6D4DC
+7CC803A6 4E800021
+2C030001 80610008
+48000005 7CA802A6
+C0450084 40820008
+EC4200B2 C0650088
+C0030020 C023006C
+FC211024 48000039
+D0030020 C0030024
+C0230070 FC200850
+48000025 D0030024
+38000000 9003006C
+90030070 8001000C
+7C0803A6 38210010
+4E800020 FC0100FA
+C025008C FC000800
+4180000C FC000890
+48000014 FC200850
+FC000800 41810008
+FC000890 4E800020
+3FAAAAAB 3C75C28F
+3F800000 9421FFC0
+60000000 00000000
+C23BF928 00000026
+901F0068 811F0060
+48000061 80DF0000
+7D083378 911F0000
+7D0840F8 80DF0008
+7CC84038 911F0008
+811F0064 4800003D
+80DF0004 7D083378
+911F0004 71060040
+41820010 38C00002
+98DF005E 480000E0
+71060080 418200D8
+88DF005E 68C60002
+98DF005E 480000C8
+38E00000 71060800
+41820008 60E78000
+71060001 41820008
+60E70008 71064000
+41820008 60E70004
+71060002 41820008
+60E70001 71068000
+41820008 60E70002
+71060010 41820008
+60E70800 71060040
+41820008 60E70400
+71060008 41820008
+60E71080 71060020
+41820008 60E70180
+71062000 41820008
+60E70080 71060200
+41820008 60E72000
+71060080 41820008
+60E71040 71060004
+4182000C 60E70050
+48000004 71060400
+41820008 60E70090
+71061000 41820008
+60E70200 7CE83B78
+4E800020 00000000
+*Left Stick variant toggles between movement and IR input (recommended!).
+*See README and CONTROL SCHEME for further instructions.
+
+$QOL - Classic Controller Support (Pointer on Right Stick) v1.1 [Vague Rant, crediar]
+C20FA8DC 00000003
+2C030002 40820008
+3863FFFF 3803FF04
+60000000 00000000
+C20FA944 00000003
+2C040002 40820008
+3884FFFF 20640001
+60000000 00000000
+042CE300 48000010
+C2443E80 00000003
+2C000001 4182000C
+C0230104 48000008
+C0230074 00000000
+C2443E9C 00000003
+2C000001 4182000C
+C0230108 48000008
+C0230078 00000000
+C23BE8F4 0000001A
+88A40028 2C050002
+408200C0 88A3005E
+2C050002 4C820020
+9421FFF0 7C0802A6
+9001000C 90610008
+3CC0803A 60C6D4DC
+7CC803A6 4E800021
+2C030001 80610008
+48000005 7CA802A6
+C0450078 40820008
+EC4200B2 C065007C
+C0030020 C0230074
+FC211024 4800002D
+D0030020 C0030024
+C0230078 FC200850
+48000019 D0030024
+8001000C 7C0803A6
+38210010 4E800020
+FC0100FA C0250080
+FC000800 4180000C
+FC000890 48000014
+FC200850 FC000800
+41810008 FC000890
+4E800020 3FAAAAAB
+3C75C28F 3F800000
+9421FFC0 00000000
+C23BF928 00000026
+901F0068 811F0060
+48000061 80DF0000
+7D083378 911F0000
+7D0840F8 80DF0008
+7CC84038 911F0008
+811F0064 4800003D
+80DF0004 7D083378
+911F0004 71060040
+41820010 38C00002
+98DF005E 480000E0
+71060080 418200D8
+88DF005E 68C60002
+98DF005E 480000C8
+38E00000 71060800
+41820008 60E78000
+71060001 41820008
+60E70008 71064000
+41820008 60E70004
+71060002 41820008
+60E70001 71068000
+41820008 60E70002
+71060010 41820008
+60E70800 71060040
+41820008 60E70400
+71060008 41820008
+60E71080 71060020
+41820008 60E70180
+71062000 41820008
+60E70080 71060200
+41820008 60E72000
+71060080 41820008
+60E71040 71060004
+4182000C 60E70050
+48000004 71060400
+41820008 60E70090
+71061000 41820008
+60E70200 7CE83B78
+4E800020 00000000
+*Right Stick variant allows cursor movement while moving, but this is not a real advantage and may feel less convenient.
+*See README and CONTROL SCHEME for further instructions.
+
+[Gecko_RetroAchievements_Verified]
+$QOL - Classic Controller Support (Pointer on Left Stick, recommended) v1.1
+$QOL - Classic Controller Support (Pointer on Right Stick) v1.1
\ No newline at end of file
diff --git a/Data/Sys/GameSettings/RUUK01r1.ini b/Data/Sys/GameSettings/RUUK01r1.ini
new file mode 100644
index 000000000000..ad429263e46d
--- /dev/null
+++ b/Data/Sys/GameSettings/RUUK01r1.ini
@@ -0,0 +1,225 @@
+# RUUK01 - Tauneuro Nolleogayo: Dongmurui Sup (NTSC-K, Rev 1)
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Gecko]
+# Add gecko cheats here.
+
+$!!! - README
+*It is required you configure your Wii Remote with a mapped Classic Controller extension!
+*Left Stick variant toggles between movement and IR input (recommended!).
+*Right Stick variant allows cursor movement while moving, but this is not a real advantage and may feel less convenient.
+*Pointer mode is activated intelligently, but can be forced on/off with the L button.
+*3C75C28F (float 0.015) sets cursor speed. You can adjust it between 3C23D70A (0.01) and 3CA3D70A (0.02).
+*To use the in-game keyboard, it is recommended to connect a real keyboard over using the pointer.
+*More information: https://gbatemp.net/threads/new-classic-controller-hacks.659837/post-10507857
+
+$!!! - CONTROL SCHEME
+*Remote & Nunchuk     Classic Controller   Game Function
+*--------------------------------------------------------------------
+*Remote Home          Home                 Open/Close Home Menu
+*Remote D-Pad         D-Pad                Up: Change Camera
+* ---                  ---                 Left/Right: Change Tool
+* ---                  ---                 Down: Put Away Tool
+*Remote A             A                    Confirm, Action
+*Remote B             B                    Cancel, Run, Pick Up Item
+*Remote +             Plus                 Open/Close Map
+* ---                 ZR                   Next Tab
+*Remote -             X                    Open/Close Inventory
+* ---                 ZL                   Previous Tab
+*Remote 1             Minus                Take Photo
+*Remote 2             Y                    Open/Close Photos
+*Nunchuk Stick        Left Stick           Movement
+*Nunchuk C            N/A (Use A)          Confirm, Action
+*Nunchuk Z            R                    Cancel, Run, Pick Up Item
+*Remote Pointer       L (Toggle)           Move Cursor
+*          
+*For the Pointer, use Left or Right Stick, depending on code used.
+*Home Menu works as normal, but remember to enable the pointer with L.
+
+$QOL - Classic Controller Support (Pointer on Left Stick, recommended) v1.1 [Vague Rant, crediar]
+C20FA6A4 00000003
+2C030002 40820008
+3863FFFF 3803FF04
+60000000 00000000
+C20FA70C 00000003
+2C040002 40820008
+3884FFFF 20640001
+60000000 00000000
+042CF840 48000010
+C244D8C4 00000003
+2C000001 4182000C
+C0230104 48000008
+C0230074 00000000
+C244D8E0 00000003
+2C000001 4182000C
+C0230108 48000008
+C0230078 00000000
+C23C72FC 0000001C
+88A40028 2C050002
+408200CC 88A3005E
+2C050002 4C820020
+9421FFF0 7C0802A6
+9001000C 90610008
+3CC0803B 60C65EE4
+7CC803A6 4E800021
+2C030001 80610008
+48000005 7CA802A6
+C0450084 40820008
+EC4200B2 C0650088
+C0030020 C023006C
+FC211024 48000039
+D0030020 C0030024
+C0230070 FC200850
+48000025 D0030024
+38000000 9003006C
+90030070 8001000C
+7C0803A6 38210010
+4E800020 FC0100FA
+C025008C FC000800
+4180000C FC000890
+48000014 FC200850
+FC000800 41810008
+FC000890 4E800020
+3FAAAAAB 3C75C28F
+3F800000 9421FFC0
+60000000 00000000
+C23C8330 00000026
+901F0068 811F0060
+48000061 80DF0000
+7D083378 911F0000
+7D0840F8 80DF0008
+7CC84038 911F0008
+811F0064 4800003D
+80DF0004 7D083378
+911F0004 71060040
+41820010 38C00002
+98DF005E 480000E0
+71060080 418200D8
+88DF005E 68C60002
+98DF005E 480000C8
+38E00000 71060800
+41820008 60E78000
+71060001 41820008
+60E70008 71064000
+41820008 60E70004
+71060002 41820008
+60E70001 71068000
+41820008 60E70002
+71060010 41820008
+60E70800 71060040
+41820008 60E70400
+71060008 41820008
+60E71080 71060020
+41820008 60E70180
+71062000 41820008
+60E70080 71060200
+41820008 60E72000
+71060080 41820008
+60E71040 71060004
+4182000C 60E70050
+48000004 71060400
+41820008 60E70090
+71061000 41820008
+60E70200 7CE83B78
+4E800020 00000000
+*Left Stick variant toggles between movement and IR input (recommended!).
+*See README and CONTROL SCHEME for further instructions.
+
+$QOL - Classic Controller Support (Pointer on Right Stick) v1.1 [Vague Rant, crediar]
+C20FA6A4 00000003
+2C030002 40820008
+3863FFFF 3803FF04
+60000000 00000000
+C20FA70C 00000003
+2C040002 40820008
+3884FFFF 20640001
+60000000 00000000
+042CF840 48000010
+C244D8C4 00000003
+2C000001 4182000C
+C0230104 48000008
+C0230074 00000000
+C244D8E0 00000003
+2C000001 4182000C
+C0230108 48000008
+C0230078 00000000
+C23C72FC 0000001A
+88A40028 2C050002
+408200C0 88A3005E
+2C050002 4C820020
+9421FFF0 7C0802A6
+9001000C 90610008
+3CC0803B 60C65EE4
+7CC803A6 4E800021
+2C030001 80610008
+48000005 7CA802A6
+C0450078 40820008
+EC4200B2 C065007C
+C0030020 C0230074
+FC211024 4800002D
+D0030020 C0030024
+C0230078 FC200850
+48000019 D0030024
+8001000C 7C0803A6
+38210010 4E800020
+FC0100FA C0250080
+FC000800 4180000C
+FC000890 48000014
+FC200850 FC000800
+41810008 FC000890
+4E800020 3FAAAAAB
+3C75C28F 3F800000
+9421FFC0 00000000
+C23C8330 00000026
+901F0068 811F0060
+48000061 80DF0000
+7D083378 911F0000
+7D0840F8 80DF0008
+7CC84038 911F0008
+811F0064 4800003D
+80DF0004 7D083378
+911F0004 71060040
+41820010 38C00002
+98DF005E 480000E0
+71060080 418200D8
+88DF005E 68C60002
+98DF005E 480000C8
+38E00000 71060800
+41820008 60E78000
+71060001 41820008
+60E70008 71064000
+41820008 60E70004
+71060002 41820008
+60E70001 71068000
+41820008 60E70002
+71060010 41820008
+60E70800 71060040
+41820008 60E70400
+71060008 41820008
+60E71080 71060020
+41820008 60E70180
+71062000 41820008
+60E70080 71060200
+41820008 60E72000
+71060080 41820008
+60E71040 71060004
+4182000C 60E70050
+48000004 71060400
+41820008 60E70090
+71061000 41820008
+60E70200 7CE83B78
+4E800020 00000000
+*Right Stick variant allows cursor movement while moving, but this is not a real advantage and may feel less convenient.
+*See README and CONTROL SCHEME for further instructions.
+
+[Gecko_RetroAchievements_Verified]
+$QOL - Classic Controller Support (Pointer on Left Stick, recommended) v1.1
+$QOL - Classic Controller Support (Pointer on Right Stick) v1.1
\ No newline at end of file
diff --git a/Data/Sys/GameSettings/RUUP01r0.ini b/Data/Sys/GameSettings/RUUP01r0.ini
new file mode 100644
index 000000000000..44a5df6e3e37
--- /dev/null
+++ b/Data/Sys/GameSettings/RUUP01r0.ini
@@ -0,0 +1,233 @@
+# RUUP01 - Animal Crossing: Let's Go to the City (PAL, Rev 0)
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Gecko]
+# Add gecko cheats here.
+
+$!!! - README
+*It is required you configure your Wii Remote with a mapped Classic Controller extension!
+*Left Stick variant toggles between movement and IR input (recommended!).
+*Right Stick variant allows cursor movement while moving, but this is not a real advantage and may feel less convenient.
+*Pointer mode is activated intelligently, but can be forced on/off with the L button.
+*3C75C28F (float 0.015) sets cursor speed. You can adjust it between 3C23D70A (0.01) and 3CA3D70A (0.02).
+*To use the in-game keyboard, it is recommended to connect a real keyboard over using the pointer.
+*More information: https://gbatemp.net/threads/new-classic-controller-hacks.659837/post-10507857
+
+$!!! - CONTROL SCHEME
+*Remote & Nunchuk     Classic Controller   Game Function
+*--------------------------------------------------------------------
+*Remote Home          Home                 Open/Close Home Menu
+*Remote D-Pad         D-Pad                Up: Change Camera
+* ---                  ---                 Left/Right: Change Tool
+* ---                  ---                 Down: Put Away Tool
+*Remote A             A                    Confirm, Action
+*Remote B             B                    Cancel, Run, Pick Up Item
+*Remote +             Plus                 Open/Close Map
+* ---                 ZR                   Next Tab
+*Remote -             X                    Open/Close Inventory
+* ---                 ZL                   Previous Tab
+*Remote 1             Minus                Take Photo
+*Remote 2             Y                    Open/Close Photos
+*Nunchuk Stick        Left Stick           Movement
+*Nunchuk C            N/A (Use A)          Confirm, Action
+*Nunchuk Z            R                    Cancel, Run, Pick Up Item
+*Remote Pointer       L (Toggle)           Move Cursor
+*          
+*For the Pointer, use Left or Right Stick, depending on code used.
+*Home Menu works as normal, but remember to enable the pointer with L.
+
+$QOL - Classic Controller Support (Pointer on Left Stick, recommended) v1.1 [Vague Rant, crediar]
+C20FA784 00000003
+2C030002 40820008
+3863FFFF 3803FF04
+60000000 00000000
+C20FA7EC 00000003
+2C040002 40820008
+3884FFFF 20640001
+60000000 00000000
+042CDFB0 48000010
+C2443CC8 00000003
+2C000001 4182000C
+C0230104 48000008
+C0230074 00000000
+C2443CE4 00000003
+2C000001 4182000C
+C0230108 48000008
+C0230078 00000000
+C23BE5A0 0000001C
+88A40028 2C050002
+408200CC 88A3005E
+2C050002 4C820020
+9421FFF0 7C0802A6
+9001000C 90610008
+3CC0803A 60C6D188
+7CC803A6 4E800021
+2C030001 80610008
+48000005 7CA802A6
+C0450084 40820008
+EC4200B2 C0650088
+C0030020 C023006C
+FC211024 48000039
+D0030020 C0030024
+C0230070 FC200850
+48000025 D0030024
+38000000 9003006C
+90030070 8001000C
+7C0803A6 38210010
+4E800020 FC0100FA
+C025008C FC000800
+4180000C FC000890
+48000014 FC200850
+FC000800 41810008
+FC000890 4E800020
+3FAAAAAB 3C75C28F
+3F800000 9421FFC0
+60000000 00000000
+C23BF5D4 00000026
+901F0068 811F0060
+48000061 80DF0000
+7D083378 911F0000
+7D0840F8 80DF0008
+7CC84038 911F0008
+811F0064 4800003D
+80DF0004 7D083378
+911F0004 71060040
+41820010 38C00002
+98DF005E 480000E0
+71060080 418200D8
+88DF005E 68C60002
+98DF005E 480000C8
+38E00000 71060800
+41820008 60E78000
+71060001 41820008
+60E70008 71064000
+41820008 60E70004
+71060002 41820008
+60E70001 71068000
+41820008 60E70002
+71060010 41820008
+60E70800 71060040
+41820008 60E70400
+71060008 41820008
+60E71080 71060020
+41820008 60E70180
+71062000 41820008
+60E70080 71060200
+41820008 60E72000
+71060080 41820008
+60E71040 71060004
+4182000C 60E70050
+48000004 71060400
+41820008 60E70090
+71061000 41820008
+60E70200 7CE83B78
+4E800020 00000000
+*Left Stick variant toggles between movement and IR input (recommended!).
+*See README and CONTROL SCHEME for further instructions.
+
+$QOL - Classic Controller Support (Pointer on Right Stick) v1.1 [Vague Rant, crediar]
+C20FA784 00000003
+2C030002 40820008
+3863FFFF 3803FF04
+60000000 00000000
+C20FA7EC 00000003
+2C040002 40820008
+3884FFFF 20640001
+60000000 00000000
+042CDFB0 48000010
+C2443CC8 00000003
+2C000001 4182000C
+C0230104 48000008
+C0230074 00000000
+C2443CE4 00000003
+2C000001 4182000C
+C0230108 48000008
+C0230078 00000000
+C23BE5A0 0000001A
+88A40028 2C050002
+408200C0 88A3005E
+2C050002 4C820020
+9421FFF0 7C0802A6
+9001000C 90610008
+3CC0803A 60C6D188
+7CC803A6 4E800021
+2C030001 80610008
+48000005 7CA802A6
+C0450078 40820008
+EC4200B2 C065007C
+C0030020 C0230074
+FC211024 4800002D
+D0030020 C0030024
+C0230078 FC200850
+48000019 D0030024
+8001000C 7C0803A6
+38210010 4E800020
+FC0100FA C0250080
+FC000800 4180000C
+FC000890 48000014
+FC200850 FC000800
+41810008 FC000890
+4E800020 3FAAAAAB
+3C75C28F 3F800000
+9421FFC0 00000000
+C23BF5D4 00000026
+901F0068 811F0060
+48000061 80DF0000
+7D083378 911F0000
+7D0840F8 80DF0008
+7CC84038 911F0008
+811F0064 4800003D
+80DF0004 7D083378
+911F0004 71060040
+41820010 38C00002
+98DF005E 480000E0
+71060080 418200D8
+88DF005E 68C60002
+98DF005E 480000C8
+38E00000 71060800
+41820008 60E78000
+71060001 41820008
+60E70008 71064000
+41820008 60E70004
+71060002 41820008
+60E70001 71068000
+41820008 60E70002
+71060010 41820008
+60E70800 71060040
+41820008 60E70400
+71060008 41820008
+60E71080 71060020
+41820008 60E70180
+71062000 41820008
+60E70080 71060200
+41820008 60E72000
+71060080 41820008
+60E71040 71060004
+4182000C 60E70050
+48000004 71060400
+41820008 60E70090
+71061000 41820008
+60E70200 7CE83B78
+4E800020 00000000
+*Right Stick variant allows cursor movement while moving, but this is not a real advantage and may feel less convenient.
+*See README and CONTROL SCHEME for further instructions.
+
+$QOL - Disable Grass Deterioration [Seth@WiiPlaza, Fox_McCloud45]
+042B613C 60000000
+*Prevents grass from deteriorating when walked on.
+*Hides deteriorating grass patches, e.g., around houses.
+*Does not modify pre-existing save file data; grass will still be deteriorated when disabled.
+*While active, save file data remains static; grass will neither heal nor deteriorate in save data.
+
+[Gecko_RetroAchievements_Verified]
+$QOL - Classic Controller Support (Pointer on Left Stick, recommended) v1.1
+$QOL - Classic Controller Support (Pointer on Right Stick) v1.1
+$QOL - Disable Grass Deterioration
\ No newline at end of file
diff --git a/Data/Sys/GameSettings/RUUP01r1.ini b/Data/Sys/GameSettings/RUUP01r1.ini
new file mode 100644
index 000000000000..a39e65f95311
--- /dev/null
+++ b/Data/Sys/GameSettings/RUUP01r1.ini
@@ -0,0 +1,233 @@
+# RUUP01 - Animal Crossing: Let's Go to the City (PAL, Rev 1)
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Gecko]
+# Add gecko cheats here.
+
+$!!! - README
+*It is required you configure your Wii Remote with a mapped Classic Controller extension!
+*Left Stick variant toggles between movement and IR input (recommended!).
+*Right Stick variant allows cursor movement while moving, but this is not a real advantage and may feel less convenient.
+*Pointer mode is activated intelligently, but can be forced on/off with the L button.
+*3C75C28F (float 0.015) sets cursor speed. You can adjust it between 3C23D70A (0.01) and 3CA3D70A (0.02).
+*To use the in-game keyboard, it is recommended to connect a real keyboard over using the pointer.
+*More information: https://gbatemp.net/threads/new-classic-controller-hacks.659837/post-10507857
+
+$!!! - CONTROL SCHEME
+*Remote & Nunchuk     Classic Controller   Game Function
+*--------------------------------------------------------------------
+*Remote Home          Home                 Open/Close Home Menu
+*Remote D-Pad         D-Pad                Up: Change Camera
+* ---                  ---                 Left/Right: Change Tool
+* ---                  ---                 Down: Put Away Tool
+*Remote A             A                    Confirm, Action
+*Remote B             B                    Cancel, Run, Pick Up Item
+*Remote +             Plus                 Open/Close Map
+* ---                 ZR                   Next Tab
+*Remote -             X                    Open/Close Inventory
+* ---                 ZL                   Previous Tab
+*Remote 1             Minus                Take Photo
+*Remote 2             Y                    Open/Close Photos
+*Nunchuk Stick        Left Stick           Movement
+*Nunchuk C            N/A (Use A)          Confirm, Action
+*Nunchuk Z            R                    Cancel, Run, Pick Up Item
+*Remote Pointer       L (Toggle)           Move Cursor
+*          
+*For the Pointer, use Left or Right Stick, depending on code used.
+*Home Menu works as normal, but remember to enable the pointer with L.
+
+$QOL - Classic Controller Support (Pointer on Left Stick, recommended) v1.1 [Vague Rant, crediar]
+C20FA784 00000003
+2C030002 40820008
+3863FFFF 3803FF04
+60000000 00000000
+C20FA7EC 00000003
+2C040002 40820008
+3884FFFF 20640001
+60000000 00000000
+042CE0D4 48000010
+C2443F30 00000003
+2C000001 4182000C
+C0230104 48000008
+C0230074 00000000
+C2443F4C 00000003
+2C000001 4182000C
+C0230108 48000008
+C0230078 00000000
+C23BE808 0000001C
+88A40028 2C050002
+408200CC 88A3005E
+2C050002 4C820020
+9421FFF0 7C0802A6
+9001000C 90610008
+3CC0803A 60C6D3F0
+7CC803A6 4E800021
+2C030001 80610008
+48000005 7CA802A6
+C0450084 40820008
+EC4200B2 C0650088
+C0030020 C023006C
+FC211024 48000039
+D0030020 C0030024
+C0230070 FC200850
+48000025 D0030024
+38000000 9003006C
+90030070 8001000C
+7C0803A6 38210010
+4E800020 FC0100FA
+C025008C FC000800
+4180000C FC000890
+48000014 FC200850
+FC000800 41810008
+FC000890 4E800020
+3FAAAAAB 3C75C28F
+3F800000 9421FFC0
+60000000 00000000
+C23BF83C 00000026
+901F0068 811F0060
+48000061 80DF0000
+7D083378 911F0000
+7D0840F8 80DF0008
+7CC84038 911F0008
+811F0064 4800003D
+80DF0004 7D083378
+911F0004 71060040
+41820010 38C00002
+98DF005E 480000E0
+71060080 418200D8
+88DF005E 68C60002
+98DF005E 480000C8
+38E00000 71060800
+41820008 60E78000
+71060001 41820008
+60E70008 71064000
+41820008 60E70004
+71060002 41820008
+60E70001 71068000
+41820008 60E70002
+71060010 41820008
+60E70800 71060040
+41820008 60E70400
+71060008 41820008
+60E71080 71060020
+41820008 60E70180
+71062000 41820008
+60E70080 71060200
+41820008 60E72000
+71060080 41820008
+60E71040 71060004
+4182000C 60E70050
+48000004 71060400
+41820008 60E70090
+71061000 41820008
+60E70200 7CE83B78
+4E800020 00000000
+*Left Stick variant toggles between movement and IR input (recommended!).
+*See README and CONTROL SCHEME for further instructions.
+
+$QOL - Classic Controller Support (Pointer on Right Stick) v1.1 [Vague Rant, crediar]
+C20FA784 00000003
+2C030002 40820008
+3863FFFF 3803FF04
+60000000 00000000
+C20FA7EC 00000003
+2C040002 40820008
+3884FFFF 20640001
+60000000 00000000
+042CE0D4 48000010
+C2443F30 00000003
+2C000001 4182000C
+C0230104 48000008
+C0230074 00000000
+C2443F4C 00000003
+2C000001 4182000C
+C0230108 48000008
+C0230078 00000000
+C23BE808 0000001A
+88A40028 2C050002
+408200C0 88A3005E
+2C050002 4C820020
+9421FFF0 7C0802A6
+9001000C 90610008
+3CC0803A 60C6D3F0
+7CC803A6 4E800021
+2C030001 80610008
+48000005 7CA802A6
+C0450078 40820008
+EC4200B2 C065007C
+C0030020 C0230074
+FC211024 4800002D
+D0030020 C0030024
+C0230078 FC200850
+48000019 D0030024
+8001000C 7C0803A6
+38210010 4E800020
+FC0100FA C0250080
+FC000800 4180000C
+FC000890 48000014
+FC200850 FC000800
+41810008 FC000890
+4E800020 3FAAAAAB
+3C75C28F 3F800000
+9421FFC0 00000000
+C23BF83C 00000026
+901F0068 811F0060
+48000061 80DF0000
+7D083378 911F0000
+7D0840F8 80DF0008
+7CC84038 911F0008
+811F0064 4800003D
+80DF0004 7D083378
+911F0004 71060040
+41820010 38C00002
+98DF005E 480000E0
+71060080 418200D8
+88DF005E 68C60002
+98DF005E 480000C8
+38E00000 71060800
+41820008 60E78000
+71060001 41820008
+60E70008 71064000
+41820008 60E70004
+71060002 41820008
+60E70001 71068000
+41820008 60E70002
+71060010 41820008
+60E70800 71060040
+41820008 60E70400
+71060008 41820008
+60E71080 71060020
+41820008 60E70180
+71062000 41820008
+60E70080 71060200
+41820008 60E72000
+71060080 41820008
+60E71040 71060004
+4182000C 60E70050
+48000004 71060400
+41820008 60E70090
+71061000 41820008
+60E70200 7CE83B78
+4E800020 00000000
+*Right Stick variant allows cursor movement while moving, but this is not a real advantage and may feel less convenient.
+*See README and CONTROL SCHEME for further instructions.
+
+$QOL - Disable Grass Deterioration [Seth@WiiPlaza, Fox_McCloud45]
+042B6260 60000000
+*Prevents grass from deteriorating when walked on.
+*Hides deteriorating grass patches, e.g., around houses.
+*Does not modify pre-existing save file data; grass will still be deteriorated when disabled.
+*While active, save file data remains static; grass will neither heal nor deteriorate in save data.
+
+[Gecko_RetroAchievements_Verified]
+$QOL - Classic Controller Support (Pointer on Left Stick, recommended) v1.1
+$QOL - Classic Controller Support (Pointer on Right Stick) v1.1
+$QOL - Disable Grass Deterioration
\ No newline at end of file
diff --git a/Data/Sys/GameSettings/RWA.ini b/Data/Sys/GameSettings/RWA.ini
index bcf5e356d3a7..79d1e20e9ffe 100644
--- a/Data/Sys/GameSettings/RWA.ini
+++ b/Data/Sys/GameSettings/RWA.ini
@@ -2,4 +2,9 @@
 
 [Video_Settings]
 SuggestedAspectRatio = 2
+# Avoids garbled text in menus.
 SafeTextureCacheColorSamples = 0
+
+[Video_Hacks]
+# Avoids stuck black screens during FMVs.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/RXX.ini b/Data/Sys/GameSettings/RXX.ini
index bfffcbeb8c44..0b55248830b4 100644
--- a/Data/Sys/GameSettings/RXX.ini
+++ b/Data/Sys/GameSettings/RXX.ini
@@ -13,4 +13,5 @@
 
 [Video_Hacks]
 EFBEmulateFormatChanges = True
+# Avoids constant black flickering.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/RYI.ini b/Data/Sys/GameSettings/RYI.ini
index b3fedbbdd23a..92c3b03bb8b5 100644
--- a/Data/Sys/GameSettings/RYI.ini
+++ b/Data/Sys/GameSettings/RYI.ini
@@ -1,6 +1,7 @@
 # RYIE9B, RYIPNK - SPRay
 
 [Video_Hacks]
+# Avoids constant flickering.
 ImmediateXFBEnable = False
 
 [Video_Settings]
diff --git a/Data/Sys/GameSettings/RZD.ini b/Data/Sys/GameSettings/RZD.ini
index 6a46bbdba062..424edfcfc121 100644
--- a/Data/Sys/GameSettings/RZD.ini
+++ b/Data/Sys/GameSettings/RZD.ini
@@ -1,4 +1,5 @@
 # RZDE01, RZDJ01, RZDK01, RZDP01 - The Legend of Zelda: Twilight Princess [Wii]
+
 [Core]
 # Values set here will override the main Dolphin settings.
 
diff --git a/Data/Sys/GameSettings/S2P.ini b/Data/Sys/GameSettings/S2P.ini
new file mode 100644
index 000000000000..772c8bd0b617
--- /dev/null
+++ b/Data/Sys/GameSettings/S2P.ini
@@ -0,0 +1,5 @@
+# S2PJA4, S2PEA4, S2PPA4, S2PXA4, S2PYA4 - Pro Evolution Soccer 2012
+
+[Video_Hacks]
+# Properly show miniatures on Tactics/Substitutions screen.
+EFBAccessEnable = True
diff --git a/Data/Sys/GameSettings/S3I.ini b/Data/Sys/GameSettings/S3I.ini
new file mode 100644
index 000000000000..250c6210a346
--- /dev/null
+++ b/Data/Sys/GameSettings/S3I.ini
@@ -0,0 +1,5 @@
+# S3IEA4, S3IPA4, S3IXA4, S3IYA4 - Pro Evolution Soccer 2013
+
+[Video_Hacks]
+# Properly show miniatures on Tactics/Substitutions screen.
+EFBAccessEnable = True
diff --git a/Data/Sys/GameSettings/SAA.ini b/Data/Sys/GameSettings/SAA.ini
new file mode 100644
index 000000000000..80dd88017e6a
--- /dev/null
+++ b/Data/Sys/GameSettings/SAA.ini
@@ -0,0 +1,5 @@
+# SAAJA4 - World Soccer: Winning Eleven 2013
+
+[Video_Hacks]
+# Properly show miniatures on Tactics/Substitutions screen.
+EFBAccessEnable = True
diff --git a/Data/Sys/GameSettings/SAK.ini b/Data/Sys/GameSettings/SAK.ini
index 6ee72bff3fd4..7c2edf9adec7 100644
--- a/Data/Sys/GameSettings/SAK.ini
+++ b/Data/Sys/GameSettings/SAK.ini
@@ -11,6 +11,8 @@
 
 [Video_Hacks]
 EFBToTextureEnable = False
+# Avoids constant black flickering.
+ImmediateXFBenable = False
 
 [Video_Settings]
 SafeTextureCacheColorSamples = 512
diff --git a/Data/Sys/GameSettings/SCY.ini b/Data/Sys/GameSettings/SCY.ini
index 70f952ae463e..f2311e3fb4f7 100644
--- a/Data/Sys/GameSettings/SCY.ini
+++ b/Data/Sys/GameSettings/SCY.ini
@@ -12,3 +12,7 @@ LowDCBZHack = True
 
 [Video_Settings]
 SafeTextureCacheColorSamples = 2048
+
+[Video_Hacks]
+# Avoids constant black flickering.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/SDAE5G.ini b/Data/Sys/GameSettings/SDA.ini
similarity index 93%
rename from Data/Sys/GameSettings/SDAE5G.ini
rename to Data/Sys/GameSettings/SDA.ini
index a6f6abc8c8b6..21f1666d9282 100644
--- a/Data/Sys/GameSettings/SDAE5G.ini
+++ b/Data/Sys/GameSettings/SDA.ini
@@ -33,3 +33,7 @@ $Fix startup crash
 0x801C9E5C:dword:0x48032C75
 [OnFrame_Enabled]
 $Fix startup crash
+
+[Video_Hacks]
+# Avoids majorly corrupted graphics.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/SDM.ini b/Data/Sys/GameSettings/SDM.ini
index 0f14a0a822fe..9dd91367e727 100644
--- a/Data/Sys/GameSettings/SDM.ini
+++ b/Data/Sys/GameSettings/SDM.ini
@@ -13,4 +13,5 @@
 
 [Video_Hacks]
 EFBToTextureEnable = False
+# Avoids majorly corrupted graphics.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/SEM.ini b/Data/Sys/GameSettings/SEM.ini
index 391fc38641b4..1b923e03601d 100644
--- a/Data/Sys/GameSettings/SEM.ini
+++ b/Data/Sys/GameSettings/SEM.ini
@@ -16,4 +16,5 @@ SafeTextureCacheColorSamples = 0
 ForceTextureFiltering = 0
 
 [Video_Hacks]
-
+# Avoids constant black flickering.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/SGV.ini b/Data/Sys/GameSettings/SGV.ini
index 16576592e777..b156c594038b 100644
--- a/Data/Sys/GameSettings/SGV.ini
+++ b/Data/Sys/GameSettings/SGV.ini
@@ -10,4 +10,5 @@
 # Add action replay cheats here.
 
 [Video_Hacks]
+# Avoids extra/incomplete frames in some minigames.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/SJ2.ini b/Data/Sys/GameSettings/SJ2.ini
new file mode 100644
index 000000000000..261f1504010a
--- /dev/null
+++ b/Data/Sys/GameSettings/SJ2.ini
@@ -0,0 +1,5 @@
+# SJ2EWR, SJ2PWR - Scooby-Doo! And the Spooky Swamp
+
+[Video_Hacks]
+# Avoids majorly corrupted graphics.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/SLW.ini b/Data/Sys/GameSettings/SLW.ini
index 4ef3eb3f52a1..bebdcafb7caf 100644
--- a/Data/Sys/GameSettings/SLW.ini
+++ b/Data/Sys/GameSettings/SLW.ini
@@ -14,4 +14,5 @@ SuggestedAspectRatio = 2
 
 [Video_Hacks]
 ImmediateXFBEnable = False
+# Avoids invisible cursor.
 XFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/SMB.ini b/Data/Sys/GameSettings/SMB.ini
index ede5339f824e..0a69bc6ee9f0 100644
--- a/Data/Sys/GameSettings/SMB.ini
+++ b/Data/Sys/GameSettings/SMB.ini
@@ -1,4 +1,4 @@
-# SMBE8P, SMBP8P - SUPER MONKEY BALL STEP AND ROLL
+# SMBE8P, SMBP8P - Super Monkey Ball: Step and Roll
 
 [Core]
 # Values set here will override the main Dolphin settings.
diff --git a/Data/Sys/GameSettings/SOJ.ini b/Data/Sys/GameSettings/SOJ.ini
index 4ad4d801ffc6..abb96e9b2b17 100644
--- a/Data/Sys/GameSettings/SOJ.ini
+++ b/Data/Sys/GameSettings/SOJ.ini
@@ -13,4 +13,5 @@
 ForceTextureFiltering = 0
 
 [Video_Hacks]
+# Avoids incorrect aspect ratio in 4:3 mode.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/SOM.ini b/Data/Sys/GameSettings/SOM.ini
index b3bc682e6cf9..d662642771ad 100644
--- a/Data/Sys/GameSettings/SOM.ini
+++ b/Data/Sys/GameSettings/SOM.ini
@@ -10,5 +10,6 @@
 # Add action replay cheats here.
 
 [Video_Hacks]
+# Avoids "issues in some levels".
 ImmediateXFBEnable = False
 EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/SPV.ini b/Data/Sys/GameSettings/SPV.ini
index d3760e20c417..9b9c7fe0ed85 100644
--- a/Data/Sys/GameSettings/SPV.ini
+++ b/Data/Sys/GameSettings/SPV.ini
@@ -1,14 +1,5 @@
-# SPVEA4, SPVPA4, SPVXA4, SPVYA4 - Pro Evolution Soccer 2011
-
-[Core]
-# Values set here will override the main Dolphin settings.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video_Settings]
-SafeTextureCacheColorSamples = 512
+# SPVEA4, SPVPA4, SPVYA4, SPVXA4 - Pro Evolution Soccer 2011
 
+[Video_Hacks]
+# Properly show miniatures on Tactics/Substitutions screen.
+EFBAccessEnable = True
diff --git a/Data/Sys/GameSettings/SQI.ini b/Data/Sys/GameSettings/SQI.ini
index 99a662264cc7..0b65c7e8ee3f 100644
--- a/Data/Sys/GameSettings/SQI.ini
+++ b/Data/Sys/GameSettings/SQI.ini
@@ -12,3 +12,7 @@ LowDCBZHack = True
 
 [Video_Settings]
 SafeTextureCacheColorSamples = 2048
+
+[Video_Hacks]
+# Avoids constant black flickering.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/STS.ini b/Data/Sys/GameSettings/STS.ini
index 1823d1d21184..0139cf71ff59 100644
--- a/Data/Sys/GameSettings/STS.ini
+++ b/Data/Sys/GameSettings/STS.ini
@@ -13,3 +13,7 @@
 
 [Video_Settings]
 SafeTextureCacheColorSamples = 512
+
+[Video_Hacks]
+# Avoids constant black flickering.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/SU7.ini b/Data/Sys/GameSettings/SU7.ini
index b1e9656cb00f..48b6925fa4d4 100644
--- a/Data/Sys/GameSettings/SU7.ini
+++ b/Data/Sys/GameSettings/SU7.ini
@@ -1,7 +1,5 @@
-# SU7EG9, SU7PAF - RISE OF THE GUARDIANS
-[Core]
-[OnFrame]
-[ActionReplay]
-[Video_Settings]
+# SU7EG9, SU7PAF - Rise of the Guardians
+
 [Video_Hacks]
+# Avoids constant flickering.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/SUK.ini b/Data/Sys/GameSettings/SUK.ini
deleted file mode 100644
index 1d7efa4b72cb..000000000000
--- a/Data/Sys/GameSettings/SUK.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-# SUKE01, SUKJ01, SUKP01 - Kirby Wii
-
-[Core]
-# Values set here will override the main Dolphin settings.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video_Settings]
-
-[Video_Hacks]
-ImmediateXFBEnable = False
-
diff --git a/Data/Sys/GameSettings/SUX.ini b/Data/Sys/GameSettings/SUX.ini
new file mode 100644
index 000000000000..16ea67a70aec
--- /dev/null
+++ b/Data/Sys/GameSettings/SUX.ini
@@ -0,0 +1,5 @@
+# SUXEA4, SUXYA4, SUXJA4, SJWJA4, SUXPA4, SUXXA4 - Pro Evolution Soccer 2010
+
+[Video_Hacks]
+# Properly show miniatures on Tactics/Substitutions screen.
+EFBAccessEnable = True
diff --git a/Data/Sys/GameSettings/SVZ.ini b/Data/Sys/GameSettings/SVZ.ini
index 241a8186cc49..8e6d0ff75eb6 100644
--- a/Data/Sys/GameSettings/SVZ.ini
+++ b/Data/Sys/GameSettings/SVZ.ini
@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids constant black frame flickering.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/SW4.ini b/Data/Sys/GameSettings/SW4.ini
new file mode 100644
index 000000000000..156391726112
--- /dev/null
+++ b/Data/Sys/GameSettings/SW4.ini
@@ -0,0 +1,5 @@
+# SW4JA4 - World Soccer: Winning Eleven 2011
+
+[Video_Hacks]
+# Properly show miniatures on Tactics/Substitutions screen.
+EFBAccessEnable = True
diff --git a/Data/Sys/GameSettings/SX3.ini b/Data/Sys/GameSettings/SX3.ini
index 462bd3ae782a..78fd2c811174 100644
--- a/Data/Sys/GameSettings/SX3.ini
+++ b/Data/Sys/GameSettings/SX3.ini
@@ -1,4 +1,4 @@
-# SX3J01, SX3P01 - Pandora s Tower
+# SX3J01, SX3P01 - Pandora's Tower
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -12,3 +12,6 @@
 [Video_Settings]
 SafeTextureCacheColorSamples = 0
 
+[Video_Hacks]
+# Avoids shifted screen.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/SX4.ini b/Data/Sys/GameSettings/SX4.ini
index 1d937ab49c4b..24d31349e1a1 100644
--- a/Data/Sys/GameSettings/SX4.ini
+++ b/Data/Sys/GameSettings/SX4.ini
@@ -10,4 +10,5 @@
 # Add action replay cheats here.
 
 [Video_Hacks]
-ImmediateXFBEnable = False
+# Makes the uncapped "Reading Disc" screen not unbearably slow.
+CapImmediateXFB = True
diff --git a/Data/Sys/GameSettings/W3M.ini b/Data/Sys/GameSettings/W3M.ini
index 15b1dde2c005..f89b3a3c1583 100644
--- a/Data/Sys/GameSettings/W3M.ini
+++ b/Data/Sys/GameSettings/W3M.ini
@@ -1,4 +1,4 @@
-# W3MELJ - The Three Musketeers
+# W3MELJ, W3MPLJ - The Three Musketeers: One for all!
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids flickering HUD.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/WA2.ini b/Data/Sys/GameSettings/WA2.ini
index 373eec944a4f..9eac10608bec 100644
--- a/Data/Sys/GameSettings/WA2.ini
+++ b/Data/Sys/GameSettings/WA2.ini
@@ -1,4 +1,4 @@
-# WA2E01 - Magnetica Twist
+# WA2P01, WA2E01, WA2J01 - Magnetica Twist
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids majorly corrupted graphics.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/WB2.ini b/Data/Sys/GameSettings/WB2.ini
index 1a800abb0ae0..eae1258ac0c9 100644
--- a/Data/Sys/GameSettings/WB2.ini
+++ b/Data/Sys/GameSettings/WB2.ini
@@ -1,7 +1,5 @@
-# WB2ETL - Dangeresque 3
-[Core]
-[OnFrame]
-[ActionReplay]
-[Video_Settings]
+# WB2ETL, WB2PTL - Strong Bad's Cool Game for Attractive People - Episode 4: Dangeresque 3: The Criminal Projective
+
 [Video_Hacks]
+# Avoids majorly corrupted graphics.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/WB3.ini b/Data/Sys/GameSettings/WB3.ini
index 2ff7fe68886f..f045307f9ca3 100644
--- a/Data/Sys/GameSettings/WB3.ini
+++ b/Data/Sys/GameSettings/WB3.ini
@@ -1,7 +1,5 @@
-# WB3ETL - 8-Bit Is Enough
-[Core]
-[OnFrame]
-[ActionReplay]
-[Video_Settings]
+# WB3ETL, WB3PTL - Strong Bad's Cool Game for Attractive People - Episode 5: 8-Bit Is Enough
+
 [Video_Hacks]
+# Avoids majorly corrupted graphics.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/WB6.ini b/Data/Sys/GameSettings/WB6.ini
index 172b232ba071..4013d8a6a819 100644
--- a/Data/Sys/GameSettings/WB6.ini
+++ b/Data/Sys/GameSettings/WB6.ini
@@ -1,7 +1,5 @@
-# WB6EGL - TV Show King
-[Core]
-[OnFrame]
-[ActionReplay]
-[Video_Settings]
+# WB6PGL, WB6EGL, WB6JGL - TV Show King
+
 [Video_Hacks]
+# Avoids flickering.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/WB7.ini b/Data/Sys/GameSettings/WB7.ini
index dd4126ffdbc5..3b56c3b2bd25 100644
--- a/Data/Sys/GameSettings/WB7.ini
+++ b/Data/Sys/GameSettings/WB7.ini
@@ -1,4 +1,4 @@
-# WB7EGL - Midnight Pool
+# WB7PGL, WB7JGL, WB7EGL - Midnight Pool
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids majorly corrupted graphics.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/WB8.ini b/Data/Sys/GameSettings/WB8.ini
index 059f7388b162..b96e7db65f1a 100644
--- a/Data/Sys/GameSettings/WB8.ini
+++ b/Data/Sys/GameSettings/WB8.ini
@@ -1,4 +1,4 @@
-# WB8EGL, WB8PGL - Midnight Bowling
+# WB8EGL, WB8PGL, WB8JGL - Midnight Bowling
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -10,4 +10,5 @@
 # Add action replay cheats here.
 
 [Video_Hacks]
+# Avoids majorly corrupted graphics.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/WBX.ini b/Data/Sys/GameSettings/WBX.ini
index 0543fdec797e..f2e2773a077b 100644
--- a/Data/Sys/GameSettings/WBX.ini
+++ b/Data/Sys/GameSettings/WBX.ini
@@ -1,7 +1,5 @@
-# WBXETL - Homestar Ruiner
-[Core]
-[OnFrame]
-[ActionReplay]
-[Video_Settings]
+# WBXETL, WBXPTL - Strong Bad's Cool Game for Attractive People - Episode 1: Homestar Ruiner
+
 [Video_Hacks]
+# Avoids majorly corrupted graphics.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/WBY.ini b/Data/Sys/GameSettings/WBY.ini
index 62d3cbe121fa..dae8e017261f 100644
--- a/Data/Sys/GameSettings/WBY.ini
+++ b/Data/Sys/GameSettings/WBY.ini
@@ -1,7 +1,5 @@
-# WBYETL - StrongBadia the Free
-[Core]
-[OnFrame]
-[ActionReplay]
-[Video_Settings]
+# WBYETL, WBYPTL - Strong Bad's Cool Game for Attractive People - Episode 2: Strong Badia the Free
+
 [Video_Hacks]
+# Avoids majorly corrupted graphics.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/WBZ.ini b/Data/Sys/GameSettings/WBZ.ini
index c6922625d833..c85b12e88c4b 100644
--- a/Data/Sys/GameSettings/WBZ.ini
+++ b/Data/Sys/GameSettings/WBZ.ini
@@ -1,7 +1,5 @@
-# WBZETL - Baddest of the Bands
-[Core]
-[OnFrame]
-[ActionReplay]
-[Video_Settings]
+# WBZETL, WBZPTL - Strong Bad's Cool Game for Attractive People - Episode 3: Baddest of the Bands
+
 [Video_Hacks]
+# Avoids majorly corrupted graphics.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/WCH.ini b/Data/Sys/GameSettings/WCH.ini
index ff5bed4d0b53..bad837967080 100644
--- a/Data/Sys/GameSettings/WCH.ini
+++ b/Data/Sys/GameSettings/WCH.ini
@@ -1,4 +1,4 @@
-# WCHEJS - Chess Challenge!
+# WCHPJS, WCHEJS - Chess Challenge!
 
 [Core]
 
@@ -14,4 +14,5 @@ EFBToTextureEnable = False
 SuggestedAspectRatio = 2
 
 [Video_Hacks]
+# Avoids flickering.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/WDO.ini b/Data/Sys/GameSettings/WDO.ini
index 614e415d7c06..e3c00da66c44 100644
--- a/Data/Sys/GameSettings/WDO.ini
+++ b/Data/Sys/GameSettings/WDO.ini
@@ -1,4 +1,4 @@
-# WDOEA4 - Driift Mania
+# WDOEA4, WDOPA4 - Driift Mania
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids majorly corrupted graphics.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/WFH.ini b/Data/Sys/GameSettings/WFH.ini
index e712fe1ecebc..9064178fd12f 100644
--- a/Data/Sys/GameSettings/WFH.ini
+++ b/Data/Sys/GameSettings/WFH.ini
@@ -1,4 +1,4 @@
-# WFHEPT - Flight Control
+# WFHEPT, WFHPPT - Flight Control
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids constant flickering.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/WFU.ini b/Data/Sys/GameSettings/WFU.ini
index 3b99b7e91344..84526b9ec593 100644
--- a/Data/Sys/GameSettings/WFU.ini
+++ b/Data/Sys/GameSettings/WFU.ini
@@ -1,7 +1,5 @@
-# WFUEQQ - Furry Legends
-[Core]
-[OnFrame]
-[ActionReplay]
-[Video_Settings]
+# WFUEQQ, WFUPQQ - Furry Legends
+
 [Video_Hacks]
+# Avoids majorly broken graphics when in game.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/WGG.ini b/Data/Sys/GameSettings/WGG.ini
index 58799515f1b5..2c8fcd97ef2b 100644
--- a/Data/Sys/GameSettings/WGG.ini
+++ b/Data/Sys/GameSettings/WGG.ini
@@ -1,4 +1,4 @@
-# WGGEE9 - Gabrielle's Ghostly
+# WGGEE9, WGGPE9, WGGJQ2 - Gabrielle's Ghostly Groove: Monster Mix
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids constant flickering.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/WGL.ini b/Data/Sys/GameSettings/WGL.ini
index 15c6cc16268b..d93d38ebfe0e 100644
--- a/Data/Sys/GameSettings/WGL.ini
+++ b/Data/Sys/GameSettings/WGL.ini
@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids majorly corrupted graphics.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/WHF.ini b/Data/Sys/GameSettings/WHF.ini
index 25e94f44fecd..7ce3d7aa922b 100644
--- a/Data/Sys/GameSettings/WHF.ini
+++ b/Data/Sys/GameSettings/WHF.ini
@@ -1,4 +1,4 @@
-# WHFETY - Heavy Fire Special Operations
+# WHFETY, WHFPTY - Heavy Fire: Special Operations
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Game is uncapped and slow to emulate.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/WHP.ini b/Data/Sys/GameSettings/WHP.ini
index 04700b0466ad..ad449fc5b17a 100644
--- a/Data/Sys/GameSettings/WHP.ini
+++ b/Data/Sys/GameSettings/WHP.ini
@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids extraneous frames with terrible pacing.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/WHY.ini b/Data/Sys/GameSettings/WHY.ini
new file mode 100644
index 000000000000..497f9f53c108
--- /dev/null
+++ b/Data/Sys/GameSettings/WHY.ini
@@ -0,0 +1,5 @@
+# WHYETY - Heavy Fire: Black Arms
+
+[Video_Hacks]
+# Game is uncapped and slow to emulate.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/WIB.ini b/Data/Sys/GameSettings/WIB.ini
index 26ba5827634d..d8ad73ed973d 100644
--- a/Data/Sys/GameSettings/WIB.ini
+++ b/Data/Sys/GameSettings/WIB.ini
@@ -14,4 +14,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids constant flickering.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/WJA.ini b/Data/Sys/GameSettings/WJA.ini
index 55b91d17f7e3..314eeff9eccf 100644
--- a/Data/Sys/GameSettings/WJA.ini
+++ b/Data/Sys/GameSettings/WJA.ini
@@ -1,4 +1,4 @@
-# WJAEYJ - Jam City Rollergirls
+# WJAPYJ, WJAEYJ, XI8EYJ - Jam City Rollergirls
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids majorly corrupted graphics.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/WKD.ini b/Data/Sys/GameSettings/WKD.ini
index 8b815321c337..2cd8c4656abd 100644
--- a/Data/Sys/GameSettings/WKD.ini
+++ b/Data/Sys/GameSettings/WKD.ini
@@ -1,4 +1,4 @@
-# WKDEGN - Pirates
+# WKDEGN, WBRPGN - Pirates: The Key of Dreams
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -13,4 +13,5 @@
 SuggestedAspectRatio = 2
 
 [Video_Hacks]
+# Avoids flickering UI elements.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/WLE.ini b/Data/Sys/GameSettings/WLE.ini
index daffb6432549..f7af8e51a340 100644
--- a/Data/Sys/GameSettings/WLE.ini
+++ b/Data/Sys/GameSettings/WLE.ini
@@ -1,12 +1,5 @@
-# WLEELU - PooYoos Episode 1
-
-[Core]
-
-[OnFrame]
-
-[ActionReplay]
-
-[Video_Settings]
+# WLEELU, WLEPLU, WLEJ2L - Learning with The PooYoos: Episode 1
 
 [Video_Hacks]
+# Avoids flickering elements.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/WLN.ini b/Data/Sys/GameSettings/WLN.ini
index 21664bb6b150..6237db5d4dcb 100644
--- a/Data/Sys/GameSettings/WLN.ini
+++ b/Data/Sys/GameSettings/WLN.ini
@@ -1,12 +1,5 @@
-# WLNELU - PooYoos Episode 2
-
-[Core]
-
-[OnFrame]
-
-[ActionReplay]
-
-[Video_Settings]
+# WLNELU, WLNPLU - Learning with The PooYoos: Episode 2
 
 [Video_Hacks]
+# Avoids flickering elements.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/WLZ.ini b/Data/Sys/GameSettings/WLZ.ini
index b3fa14f46d63..f14c62f63732 100644
--- a/Data/Sys/GameSettings/WLZ.ini
+++ b/Data/Sys/GameSettings/WLZ.ini
@@ -1,4 +1,4 @@
-# WLZEXY - lilt line
+# WLZEXY, WLZPXY, XIAEXY - lilt line
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids majorly corrupted graphics.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/WMA.ini b/Data/Sys/GameSettings/WMA.ini
index 816ee5d5f208..d572d0f0b165 100644
--- a/Data/Sys/GameSettings/WMA.ini
+++ b/Data/Sys/GameSettings/WMA.ini
@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids flickering on the Wii strap screen and extraneous frames with bad pacing.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/WMB.ini b/Data/Sys/GameSettings/WMB.ini
index 80962f23aa94..8b685f5123e7 100644
--- a/Data/Sys/GameSettings/WMB.ini
+++ b/Data/Sys/GameSettings/WMB.ini
@@ -1,4 +1,4 @@
-# WMBE01, WMBP01 - Maboshi's Arcade
+# WMBP01, WMBE01, WMBJ01 - Maboshi's Arcade
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -12,5 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids majorly corrupted graphics.
 ImmediateXFBEnable = False
-
diff --git a/Data/Sys/GameSettings/WMG.ini b/Data/Sys/GameSettings/WMG.ini
index efb396b3e11d..07662cdf932d 100644
--- a/Data/Sys/GameSettings/WMG.ini
+++ b/Data/Sys/GameSettings/WMG.ini
@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids majorly corrupted graphics.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/WOY.ini b/Data/Sys/GameSettings/WOY.ini
index ebd5a95be104..e2094a71132a 100644
--- a/Data/Sys/GameSettings/WOY.ini
+++ b/Data/Sys/GameSettings/WOY.ini
@@ -1,8 +1,5 @@
-# WOYEPS - Bit Boy!!
-[Core]
-[OnFrame]
-[ActionReplay]
-[Gecko]
-[Video_Settings]
+# WOYEPS, WOYPPS, WOYJ99 - Bit Boy!!
+
 [Video_Hacks]
+# Avoids majorly corrupted graphics.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/WP4.ini b/Data/Sys/GameSettings/WP4.ini
index 0a90073d3fd7..130f1ee65c9b 100644
--- a/Data/Sys/GameSettings/WP4.ini
+++ b/Data/Sys/GameSettings/WP4.ini
@@ -1,15 +1,5 @@
-# WP4ELU - PooYoos - Episode 3
-
-[Core]
-# Values set here will override the main Dolphin settings.
-
-[OnFrame]
-# Add memory patches to be applied every frame here.
-
-[ActionReplay]
-# Add action replay cheats here.
-
-[Video_Settings]
+# WP4ELU, WP4PLU - Learning with The PooYoos: Episode 3
 
 [Video_Hacks]
+# Avoids flickering elements.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/WPK.ini b/Data/Sys/GameSettings/WPK.ini
new file mode 100644
index 000000000000..85cb70d363c9
--- /dev/null
+++ b/Data/Sys/GameSettings/WPK.ini
@@ -0,0 +1,5 @@
+# WPKEGL, WPKPGL - Texas Hold'em Poker
+
+[Video_Hacks]
+# Avoids majorly corrupted graphics.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/WR2.ini b/Data/Sys/GameSettings/WR2.ini
index 3c4a3f1a0fda..48885be4be0d 100644
--- a/Data/Sys/GameSettings/WR2.ini
+++ b/Data/Sys/GameSettings/WR2.ini
@@ -18,6 +18,7 @@ SafeTextureCacheColorSamples = 0
 [Video_Hacks]
 # Fixes visible lines in air vents/fans.
 VertexRounding = True
+# This game runs with an uncapped framerate.
 ImmediateXFBEnable = False
 # Fixes rabbid tattoo textures saving as black.
 EFBToTextureEnable = False
diff --git a/Data/Sys/GameSettings/WSR.ini b/Data/Sys/GameSettings/WSR.ini
index e186f5319eca..9a9d70b2e8b7 100644
--- a/Data/Sys/GameSettings/WSR.ini
+++ b/Data/Sys/GameSettings/WSR.ini
@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids constant flickering.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/WW2.ini b/Data/Sys/GameSettings/WW2.ini
index e0c69b08f3af..e49648f8a49e 100644
--- a/Data/Sys/GameSettings/WW2.ini
+++ b/Data/Sys/GameSettings/WW2.ini
@@ -1,8 +1,9 @@
-# WW2P - Where's Wally? Fantastic Journey 2
+# WW2PQV - Where's Wally? Fantastic Journey 2
 
 [Video_Settings]
 SuggestedAspectRatio = 2
 
 [Video_Hacks]
 XFBToTextureEnable = False
+# Avoids invisible cursor.
 ImmediateXFBenable = False
diff --git a/Data/Sys/GameSettings/WW3.ini b/Data/Sys/GameSettings/WW3.ini
index 77914a0e28f7..4768d48a4453 100644
--- a/Data/Sys/GameSettings/WW3.ini
+++ b/Data/Sys/GameSettings/WW3.ini
@@ -1,8 +1,9 @@
-# WW3P - Where's Wally? Fantastic Journey 3
+# WW3PQV - Where's Wally? Fantastic Journey 3
 
 [Video_Settings]
 SuggestedAspectRatio = 2
 
 [Video_Hacks]
 XFBToTextureEnable = False
+# Avoids invisible cursor.
 ImmediateXFBenable = False
diff --git a/Data/Sys/GameSettings/WWA.ini b/Data/Sys/GameSettings/WWA.ini
index 2ed8576975d9..ebca42c6954d 100644
--- a/Data/Sys/GameSettings/WWA.ini
+++ b/Data/Sys/GameSettings/WWA.ini
@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids constant flickering.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/WWI.ini b/Data/Sys/GameSettings/WWI.ini
index 38333161946f..0864f3a6ee28 100644
--- a/Data/Sys/GameSettings/WWI.ini
+++ b/Data/Sys/GameSettings/WWI.ini
@@ -1,8 +1,9 @@
-# WWIP - Where's Wally? Fantastic Journey 1
+# WWIPQV - Where's Wally? Fantastic Journey 1
 
 [Video_Settings]
 SuggestedAspectRatio = 2
 
 [Video_Hacks]
 XFBToTextureEnable = False
+# Avoids invisible cursor.
 ImmediateXFBenable = False
diff --git a/Data/Sys/GameSettings/WXR.ini b/Data/Sys/GameSettings/WXR.ini
index 9bfb8ef58b23..5c8c87aaa5b9 100644
--- a/Data/Sys/GameSettings/WXR.ini
+++ b/Data/Sys/GameSettings/WXR.ini
@@ -1,4 +1,4 @@
-# WXREE9 - RF Ocean Challenge
+# WXREE9, WXRPE9 - Reel Fishing Ocean Challenge
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -13,4 +13,5 @@
 SafeTextureCacheColorSamples = 0
 
 [Video_Hacks]
+# Avoids extraneous frames with terrible pacing.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/WZI.ini b/Data/Sys/GameSettings/WZI.ini
index 0a693081a30c..dc2ad22a7270 100644
--- a/Data/Sys/GameSettings/WZI.ini
+++ b/Data/Sys/GameSettings/WZI.ini
@@ -1,4 +1,4 @@
-# WZIPTW - Rubik's: Rush
+# WZIPTW, WZIETW - Rubik's Puzzle Galaxy: Rush
 
 [Core]
 # Values set here will override the main Dolphin settings.
@@ -12,4 +12,5 @@
 [Video_Settings]
 
 [Video_Hacks]
+# Avoids majorly corrupted graphics.
 ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/XHR.ini b/Data/Sys/GameSettings/XHR.ini
new file mode 100644
index 000000000000..70692145298d
--- /dev/null
+++ b/Data/Sys/GameSettings/XHR.ini
@@ -0,0 +1,5 @@
+# XHREQQ, XHRPQQ - Furry Legends
+
+[Video_Hacks]
+# Avoids majorly broken graphics when in game.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/XIN.ini b/Data/Sys/GameSettings/XIN.ini
new file mode 100644
index 000000000000..a8c04e6dc61f
--- /dev/null
+++ b/Data/Sys/GameSettings/XIN.ini
@@ -0,0 +1,5 @@
+# XINPLU, XINELU - Learning with The PooYoos: Episode 1
+
+[Video_Hacks]
+# Avoids flickering elements.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/XIO.ini b/Data/Sys/GameSettings/XIO.ini
new file mode 100644
index 000000000000..5594ec2e9218
--- /dev/null
+++ b/Data/Sys/GameSettings/XIO.ini
@@ -0,0 +1,5 @@
+# XIOPLU, XIOELU - Learning with The PooYoos: Episode 2
+
+[Video_Hacks]
+# Avoids flickering elements.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/GameSettings/XIP.ini b/Data/Sys/GameSettings/XIP.ini
new file mode 100644
index 000000000000..f5edc7d53e7d
--- /dev/null
+++ b/Data/Sys/GameSettings/XIP.ini
@@ -0,0 +1,5 @@
+# XIPPLU, XIPELU - Learning with The PooYoos: Episode 3
+
+[Video_Hacks]
+# Avoids flickering elements.
+ImmediateXFBEnable = False
diff --git a/Data/Sys/Shaders/default_pre_post_process.glsl b/Data/Sys/Shaders/default_pre_post_process.glsl
index 24fb8c409a80..b4d5266e65a0 100644
--- a/Data/Sys/Shaders/default_pre_post_process.glsl
+++ b/Data/Sys/Shaders/default_pre_post_process.glsl
@@ -11,9 +11,9 @@ mat3 from_NTSCM = transpose(mat3(
 
 // ARIB TR-B9 (9300K+27MPCD with chromatic adaptation) (NTSC-J) -> BT.709
 mat3 from_NTSCJ = transpose(mat3(
-	0.823613036967492,		-0.0943227111084757,	0.00799341532931119,
-	0.0289258355537324,		1.02310733489462,			0.00243547111576797,
-	-0.00569501554980891,	0.0161828357559315,		1.22328453915712));
+	0.768497526,		-0.210804164,	  0.000297427177,
+	0.0397904068,		1.04825413,			0.00555809540,
+	0.00147510506,	0.0328789241,		1.36515128));
 
 // EBU - BT.470BG/BT.601 (PAL) -> BT.709
 mat3 from_PAL = transpose(mat3(
diff --git a/Data/license.txt b/Data/license.txt
deleted file mode 100644
index d511905c1647..000000000000
--- a/Data/license.txt
+++ /dev/null
@@ -1,339 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/Externals/FatFs/CMakeLists.txt b/Externals/FatFs/CMakeLists.txt
index 5777bf2a3a7b..c944edd8f34f 100644
--- a/Externals/FatFs/CMakeLists.txt
+++ b/Externals/FatFs/CMakeLists.txt
@@ -1,12 +1,12 @@
 add_library(FatFs STATIC
-	ff.c
-	ffunicode.c
-	diskio.h
-	ff.h
-	ffconf.h
+  ff.c
+  ffunicode.c
+  diskio.h
+  ff.h
+  ffconf.h
 )
 
 target_include_directories(FatFs
 PUBLIC
-	${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
 )
diff --git a/Externals/SDL/CMakeLists.txt b/Externals/SDL/CMakeLists.txt
index 9e054f77d9b2..03163602412d 100644
--- a/Externals/SDL/CMakeLists.txt
+++ b/Externals/SDL/CMakeLists.txt
@@ -8,14 +8,17 @@ set(SDL_INSTALL_TESTS OFF)
 set(SDL_UNIX_CONSOLE_BUILD ON)
 
 set(SDL_AUDIO OFF)
-if (NOT APPLE)
-  # Working around cocoa/SDL_tray.m linker errors.
-  set(SDL_VIDEO OFF)
-endif()
+set(SDL_VIDEO OFF)
 set(SDL_GPU OFF)
 set(SDL_RENDER OFF)
 set(SDL_CAMERA OFF)
 set(SDL_DIALOG OFF)
+set(SDL_TRAY OFF)
+
+if(CCACHE_BIN)
+  set(SDL_CCACHE ON)
+  set(CCACHE_BINARY ${CCACHE_BIN})
+endif()
 
 add_subdirectory(SDL)
 
diff --git a/Externals/SDL/SDL b/Externals/SDL/SDL
index badbf8da4ee7..a962f40bbba1 160000
--- a/Externals/SDL/SDL
+++ b/Externals/SDL/SDL
@@ -1 +1 @@
-Subproject commit badbf8da4ee72b3ef599c721ffc9899e8d7c8d90
+Subproject commit a962f40bbba175e9716557a25d5d7965f134a3d3
diff --git a/Externals/SDL/SDL3.vcxproj b/Externals/SDL/SDL3.vcxproj
index 63e0f81b8a08..d2515630ec14 100644
--- a/Externals/SDL/SDL3.vcxproj
+++ b/Externals/SDL/SDL3.vcxproj
@@ -22,18 +22,21 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="SDL\include\SDL3\SDL_begin_code.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_camera.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_close_code.h" />
     <ClInclude Include="SDL\include\SDL3\SDL.h" />
     <ClInclude Include="SDL\include\SDL3\SDL_assert.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_asyncio.h" />
     <ClInclude Include="SDL\include\SDL3\SDL_atomic.h" />
     <ClInclude Include="SDL\include\SDL3\SDL_audio.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_begin_code.h" />
     <ClInclude Include="SDL\include\SDL3\SDL_bits.h" />
     <ClInclude Include="SDL\include\SDL3\SDL_blendmode.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_camera.h" />
     <ClInclude Include="SDL\include\SDL3\SDL_clipboard.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_close_code.h" />
     <ClInclude Include="SDL\include\SDL3\SDL_copying.h" />
     <ClInclude Include="SDL\include\SDL3\SDL_cpuinfo.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_dialog.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_dlopennote.h" />
     <ClInclude Include="SDL\include\SDL3\SDL_egl.h" />
     <ClInclude Include="SDL\include\SDL3\SDL_endian.h" />
     <ClInclude Include="SDL\include\SDL3\SDL_error.h" />
@@ -43,9 +46,11 @@
     <ClInclude Include="SDL\include\SDL3\SDL_gpu.h" />
     <ClInclude Include="SDL\include\SDL3\SDL_guid.h" />
     <ClInclude Include="SDL\include\SDL3\SDL_haptic.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_hints.h" />
     <ClInclude Include="SDL\include\SDL3\SDL_hidapi.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_asyncio.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_hints.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_init.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_intrin.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_iostream.h" />
     <ClInclude Include="SDL\include\SDL3\SDL_joystick.h" />
     <ClInclude Include="SDL\include\SDL3\SDL_keyboard.h" />
     <ClInclude Include="SDL\include\SDL3\SDL_keycode.h" />
@@ -53,11 +58,13 @@
     <ClInclude Include="SDL\include\SDL3\SDL_locale.h" />
     <ClInclude Include="SDL\include\SDL3\SDL_log.h" />
     <ClInclude Include="SDL\include\SDL3\SDL_main.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_main_impl.h" />
     <ClInclude Include="SDL\include\SDL3\SDL_messagebox.h" />
     <ClInclude Include="SDL\include\SDL3\SDL_metal.h" />
     <ClInclude Include="SDL\include\SDL3\SDL_misc.h" />
     <ClInclude Include="SDL\include\SDL3\SDL_mouse.h" />
     <ClInclude Include="SDL\include\SDL3\SDL_mutex.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_oldnames.h" />
     <ClInclude Include="SDL\include\SDL3\SDL_opengl.h" />
     <ClInclude Include="SDL\include\SDL3\SDL_opengl_glext.h" />
     <ClInclude Include="SDL\include\SDL3\SDL_opengles.h" />
@@ -76,7 +83,6 @@
     <ClInclude Include="SDL\include\SDL3\SDL_rect.h" />
     <ClInclude Include="SDL\include\SDL3\SDL_render.h" />
     <ClInclude Include="SDL\include\SDL3\SDL_revision.h" />
-    <ClInclude Include="SDL\include\SDL3\SDL_iostream.h" />
     <ClInclude Include="SDL\include\SDL3\SDL_scancode.h" />
     <ClInclude Include="SDL\include\SDL3\SDL_sensor.h" />
     <ClInclude Include="SDL\include\SDL3\SDL_stdinc.h" />
@@ -98,6 +104,7 @@
     <ClInclude Include="SDL\include\SDL3\SDL_time.h" />
     <ClInclude Include="SDL\include\SDL3\SDL_timer.h" />
     <ClInclude Include="SDL\include\SDL3\SDL_touch.h" />
+    <ClInclude Include="SDL\include\SDL3\SDL_tray.h" />
     <ClInclude Include="SDL\include\SDL3\SDL_version.h" />
     <ClInclude Include="SDL\include\SDL3\SDL_video.h" />
     <ClInclude Include="SDL\include\SDL3\SDL_vulkan.h" />
@@ -113,6 +120,7 @@
     <ClInclude Include="SDL\src\audio\wasapi\SDL_wasapi.h" />
     <ClInclude Include="SDL\src\camera\SDL_camera_c.h" />
     <ClInclude Include="SDL\src\camera\SDL_syscamera.h" />
+    <ClInclude Include="SDL\src\core\SDL_core_unsupported.h" />
     <ClInclude Include="SDL\src\core\windows\SDL_directx.h" />
     <ClInclude Include="SDL\src\core\windows\SDL_gameinput.h" />
     <ClInclude Include="SDL\src\core\windows\SDL_hid.h" />
@@ -145,13 +153,16 @@
     <ClInclude Include="SDL\src\io\SDL_sysasyncio.h" />
     <ClInclude Include="SDL\src\haptic\SDL_haptic_c.h" />
     <ClInclude Include="SDL\src\haptic\SDL_syshaptic.h" />
+    <ClInclude Include="SDL\src\haptic\SDL_hidapihaptic.h" />
     <ClInclude Include="SDL\src\haptic\windows\SDL_dinputhaptic_c.h" />
     <ClInclude Include="SDL\src\haptic\windows\SDL_windowshaptic_c.h" />
+    <ClInclude Include="SDL\src\haptic\hidapi\SDL_hidapihaptic_c.h" />
     <ClInclude Include="SDL\src\hidapi\hidapi\hidapi.h" />
     <ClInclude Include="SDL\src\hidapi\SDL_hidapi_c.h" />
     <ClInclude Include="SDL\src\joystick\controller_type.h" />
     <ClInclude Include="SDL\src\joystick\hidapi\SDL_hidapijoystick_c.h" />
     <ClInclude Include="SDL\src\joystick\hidapi\SDL_hidapi_rumble.h" />
+    <ClInclude Include="SDL\src\joystick\hidapi\SDL_report_descriptor.h" />
     <ClInclude Include="SDL\src\joystick\SDL_gamepad_c.h" />
     <ClInclude Include="SDL\src\joystick\SDL_gamepad_db.h" />
     <ClInclude Include="SDL\src\joystick\SDL_joystick_c.h" />
@@ -186,7 +197,6 @@
     <ClInclude Include="SDL\src\render\software\SDL_drawline.h" />
     <ClInclude Include="SDL\src\render\software\SDL_drawpoint.h" />
     <ClInclude Include="SDL\src\render\software\SDL_render_sw_c.h" />
-    <ClInclude Include="SDL\src\render\software\SDL_rotate.h" />
     <ClInclude Include="SDL\src\render\software\SDL_triangle.h" />
     <ClInclude Include="SDL\src\render\vulkan\SDL_shaders_vulkan.h" />
     <ClInclude Include="SDL\src\SDL_assert_c.h" />
@@ -266,9 +276,11 @@
     <ClInclude Include="SDL\src\video\SDL_pixels_c.h" />
     <ClInclude Include="SDL\src\video\SDL_rect_c.h" />
     <ClInclude Include="SDL\src\video\SDL_RLEaccel_c.h" />
+    <ClInclude Include="SDL\src\video\SDL_rotate.h" />
     <ClInclude Include="SDL\src\video\SDL_stb_c.h" />
     <ClInclude Include="SDL\src\video\SDL_surface_c.h" />
     <ClInclude Include="SDL\src\video\SDL_sysvideo.h" />
+    <ClInclude Include="SDL\src\video\SDL_video_unsupported.h" />
     <ClInclude Include="SDL\src\video\SDL_vulkan_internal.h" />
     <ClInclude Include="SDL\src\video\SDL_yuv_c.h" />
     <ClInclude Include="SDL\src\video\windows\SDL_msctf.h" />
@@ -313,19 +325,14 @@
     <ClCompile Include="SDL\src\audio\SDL_wave.c" />
     <ClCompile Include="SDL\src\audio\wasapi\SDL_wasapi.c" />
     <ClCompile Include="SDL\src\core\SDL_core_unsupported.c" />
-    <ClCompile Include="SDL\src\core\windows\SDL_gameinput.c" />
+    <ClCompile Include="SDL\src\core\windows\SDL_gameinput.cpp" />
     <ClCompile Include="SDL\src\core\windows\SDL_hid.c" />
     <ClCompile Include="SDL\src\core\windows\SDL_immdevice.c" />
     <ClCompile Include="SDL\src\core\windows\SDL_windows.c" />
     <ClCompile Include="SDL\src\core\windows\SDL_xinput.c" />
     <ClCompile Include="SDL\src\cpuinfo\SDL_cpuinfo.c" />
     <ClCompile Include="SDL\src\dialog\windows\SDL_windowsdialog.c" />
-    <ClCompile Include="SDL\src\dynapi\SDL_dynapi.c">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
-    </ClCompile>
+    <ClCompile Include="SDL\src\dynapi\SDL_dynapi.c" />
     <ClCompile Include="SDL\src\events\SDL_categories.c" />
     <ClCompile Include="SDL\src\events\SDL_clipboardevents.c" />
     <ClCompile Include="SDL\src\events\SDL_displayevents.c" />
@@ -345,28 +352,39 @@
     <ClCompile Include="SDL\src\haptic\SDL_haptic.c" />
     <ClCompile Include="SDL\src\haptic\windows\SDL_dinputhaptic.c" />
     <ClCompile Include="SDL\src\haptic\windows\SDL_windowshaptic.c" />
+    <ClCompile Include="SDL\src\haptic\hidapi\SDL_hidapihaptic.c" />
+    <ClCompile Include="SDL\src\haptic\hidapi\SDL_hidapihaptic_lg4ff.c" />
     <ClCompile Include="SDL\src\hidapi\SDL_hidapi.c" />
     <ClCompile Include="SDL\src\joystick\controller_type.c" />
     <ClCompile Include="SDL\src\joystick\dummy\SDL_sysjoystick.c" />
-    <ClCompile Include="SDL\src\joystick\gdk\SDL_gameinputjoystick.c" />
+    <ClCompile Include="SDL\src\joystick\gdk\SDL_gameinputjoystick.cpp" />
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapijoystick.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_8bitdo.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_flydigi.c" />
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_combined.c" />
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_gamecube.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_gip.c" />
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_luna.c" />
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_ps3.c" />
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_ps4.c" />
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_ps5.c" />
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_rumble.c" />
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_shield.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_sinput.c" />
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_stadia.c" />
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_steam.c" />
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_steam_hori.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_steam_triton.c" />
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_steamdeck.c" />
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_switch.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_switch2.c" />
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_wii.c" />
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_xbox360.c" />
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_xbox360w.c" />
     <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_xboxone.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_lg4ff.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_hidapi_zuiki.c" />
+    <ClCompile Include="SDL\src\joystick\hidapi\SDL_report_descriptor.c" />
     <ClCompile Include="SDL\src\joystick\SDL_gamepad.c" />
     <ClCompile Include="SDL\src\joystick\SDL_joystick.c" />
     <ClCompile Include="SDL\src\joystick\SDL_steam_virtual_gamepad.c" />
@@ -380,6 +398,7 @@
     <ClCompile Include="SDL\src\loadso\windows\SDL_sysloadso.c" />
     <ClCompile Include="SDL\src\locale\SDL_locale.c" />
     <ClCompile Include="SDL\src\locale\windows\SDL_syslocale.c" />
+    <ClCompile Include="SDL\src\misc\SDL_libusb.c" />
     <ClCompile Include="SDL\src\misc\SDL_url.c" />
     <ClCompile Include="SDL\src\misc\windows\SDL_sysurl.c" />
     <ClCompile Include="SDL\src\power\SDL_power.c" />
@@ -408,7 +427,6 @@
     <ClCompile Include="SDL\src\render\software\SDL_drawline.c" />
     <ClCompile Include="SDL\src\render\software\SDL_drawpoint.c" />
     <ClCompile Include="SDL\src\render\software\SDL_render_sw.c" />
-    <ClCompile Include="SDL\src\render\software\SDL_rotate.c" />
     <ClCompile Include="SDL\src\render\software\SDL_triangle.c" />
     <ClCompile Include="SDL\src\SDL.c" />
     <ClCompile Include="SDL\src\SDL_assert.c" />
@@ -479,6 +497,7 @@
     <ClCompile Include="SDL\src\video\SDL_pixels.c" />
     <ClCompile Include="SDL\src\video\SDL_rect.c" />
     <ClCompile Include="SDL\src\video\SDL_RLEaccel.c" />
+    <ClCompile Include="SDL\src\video\SDL_rotate.c" />
     <ClCompile Include="SDL\src\video\SDL_stb.c" />
     <ClCompile Include="SDL\src\video\SDL_stretch.c" />
     <ClCompile Include="SDL\src\video\SDL_surface.c" />
@@ -486,12 +505,11 @@
     <ClCompile Include="SDL\src\video\SDL_video_unsupported.c" />
     <ClCompile Include="SDL\src\video\SDL_vulkan_utils.c" />
     <ClCompile Include="SDL\src\video\SDL_yuv.c" />
-    <ClCompile Include="SDL\src\video\windows\SDL_surface_utils.c" />
     <ClCompile Include="SDL\src\video\windows\SDL_windowsclipboard.c" />
     <ClCompile Include="SDL\src\video\windows\SDL_windowsevents.c" />
     <ClCompile Include="SDL\src\video\windows\SDL_windowsframebuffer.c" />
     <ClCompile Include="SDL\src\video\windows\SDL_windowskeyboard.c" />
-    <ClCompile Include="SDL\src\video\windows\SDL_windowsgameinput.c" />
+    <ClCompile Include="SDL\src\video\windows\SDL_windowsgameinput.cpp" />
     <ClCompile Include="SDL\src\video\windows\SDL_windowsmessagebox.c" />
     <ClCompile Include="SDL\src\video\windows\SDL_windowsmodes.c" />
     <ClCompile Include="SDL\src\video\windows\SDL_windowsmouse.c" />
diff --git a/Externals/SFML/CMakeLists.txt b/Externals/SFML/CMakeLists.txt
index 786df802cf20..7736feb12c54 100644
--- a/Externals/SFML/CMakeLists.txt
+++ b/Externals/SFML/CMakeLists.txt
@@ -1,25 +1,25 @@
 set(SRC_NETWORK
-	SFML/src/SFML/Network/Http.cpp
-	SFML/src/SFML/Network/IpAddress.cpp
-	SFML/src/SFML/Network/Packet.cpp
-	SFML/src/SFML/Network/Socket.cpp
-	SFML/src/SFML/Network/SocketSelector.cpp
-	SFML/src/SFML/Network/TcpListener.cpp
-	SFML/src/SFML/Network/TcpSocket.cpp
-	SFML/src/SFML/Network/UdpSocket.cpp
+  SFML/src/SFML/Network/Http.cpp
+  SFML/src/SFML/Network/IpAddress.cpp
+  SFML/src/SFML/Network/Packet.cpp
+  SFML/src/SFML/Network/Socket.cpp
+  SFML/src/SFML/Network/SocketSelector.cpp
+  SFML/src/SFML/Network/TcpListener.cpp
+  SFML/src/SFML/Network/TcpSocket.cpp
+  SFML/src/SFML/Network/UdpSocket.cpp
 )
 
 if(WIN32)
-	list(APPEND SRC_NETWORK SFML/src/SFML/Network/Win32/SocketImpl.cpp)
+  list(APPEND SRC_NETWORK SFML/src/SFML/Network/Win32/SocketImpl.cpp)
 else()
-	list(APPEND SRC_NETWORK SFML/src/SFML/Network/Unix/SocketImpl.cpp)
+  list(APPEND SRC_NETWORK SFML/src/SFML/Network/Unix/SocketImpl.cpp)
 endif()
 
 set(SRC_SYSTEM
-	SFML/src/SFML/System/Err.cpp
-	SFML/include/SFML/System/String.hpp
-	SFML/src/SFML/System/String.cpp
-	SFML/src/SFML/System/Utils.cpp
+  SFML/src/SFML/System/Err.cpp
+  SFML/include/SFML/System/String.hpp
+  SFML/src/SFML/System/String.cpp
+  SFML/src/SFML/System/Utils.cpp
 )
 
 add_library(sfml-network STATIC ${SRC_NETWORK})
@@ -31,4 +31,4 @@ target_include_directories(sfml-system PUBLIC SFML/include PRIVATE SFML/src)
 target_include_directories(sfml-network PUBLIC SFML/include PRIVATE SFML/src)
 target_link_libraries(sfml-network PUBLIC sfml-system)
 dolphin_disable_warnings(sfml-network)
-dolphin_disable_warnings(sfml-system)
\ No newline at end of file
+dolphin_disable_warnings(sfml-system)
diff --git a/Externals/SFML/SFML b/Externals/SFML/SFML
index 016bea9491cc..0fa201c969e4 160000
--- a/Externals/SFML/SFML
+++ b/Externals/SFML/SFML
@@ -1 +1 @@
-Subproject commit 016bea9491ccafc3529019fe1d403885a8b3a6ae
+Subproject commit 0fa201c969e48ecc253581c5841ce73f44d42f49
diff --git a/Externals/bzip2/CMakeLists.txt b/Externals/bzip2/CMakeLists.txt
index 1bbc50827c71..94bbc3bcba65 100644
--- a/Externals/bzip2/CMakeLists.txt
+++ b/Externals/bzip2/CMakeLists.txt
@@ -16,24 +16,24 @@ set(CMAKE_REQUIRED_DEFINITIONS -D_LARGEFILE64_SOURCE=1)
 # in CMake 2.4.x does not automatically do so and we want
 # compatibility with CMake 2.4.x.
 if(HAVE_SYS_TYPES_H)
-    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_SYS_TYPES_H)
+  list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_SYS_TYPES_H)
 endif()
 if(HAVE_STDINT_H)
-    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDINT_H)
+  list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDINT_H)
 endif()
 if(HAVE_STDDEF_H)
-    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDDEF_H)
+  list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDDEF_H)
 endif()
 check_type_size(off64_t OFF64_T)
 if(HAVE_OFF64_T)
-   add_definitions(-D_LARGEFILE64_SOURCE=1)
+  add_definitions(-D_LARGEFILE64_SOURCE=1)
 endif()
 set(CMAKE_REQUIRED_DEFINITIONS) # clear variable
 
 # Check for fseeko
 check_function_exists(fseeko HAVE_FSEEKO)
 if(NOT HAVE_FSEEKO)
-    add_definitions(-DNO_FSEEKO)
+  add_definitions(-DNO_FSEEKO)
 endif()
 
 #
@@ -41,12 +41,12 @@ endif()
 #
 check_include_file(unistd.h HAVE_UNISTD_H)
 if(HAVE_UNISTD_H)
-    add_definitions(-DHAVE_UNISTD_H)
+  add_definitions(-DHAVE_UNISTD_H)
 endif()
 
 if(MSVC)
-    add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
-    add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
+  add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
+  add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
 endif()
 
 #============================================================================
@@ -54,19 +54,19 @@ endif()
 #============================================================================
 
 set(BZIP2_PUBLIC_HDRS
-    bzip2/bzlib.h
+  bzip2/bzlib.h
 )
 set(BZIP2_PRIVATE_HDRS
-    bzip2/bzlib_private.h
+  bzip2/bzlib_private.h
 )
 set(BZIP2_SRCS
-    bzip2/blocksort.c
-    bzip2/huffman.c
-    bzip2/crctable.c
-    bzip2/randtable.c
-    bzip2/compress.c
-    bzip2/decompress.c
-    bzip2/bzlib.c
+  bzip2/blocksort.c
+  bzip2/huffman.c
+  bzip2/crctable.c
+  bzip2/randtable.c
+  bzip2/compress.c
+  bzip2/decompress.c
+  bzip2/bzlib.c
 )
 
 add_library(bzip2 STATIC ${BZIP2_SRCS} ${BZIP2_PUBLIC_HDRS} ${BZIP2_PRIVATE_HDRS})
@@ -75,5 +75,5 @@ dolphin_disable_warnings(bzip2)
 
 target_include_directories(bzip2
 PUBLIC
-    ${CMAKE_CURRENT_SOURCE_DIR}/bzip2
+  ${CMAKE_CURRENT_SOURCE_DIR}/bzip2
 )
diff --git a/Externals/cpp-ipc/cpp-ipc b/Externals/cpp-ipc/cpp-ipc
index c5302d00ab33..ce0773b3e6d5 160000
--- a/Externals/cpp-ipc/cpp-ipc
+++ b/Externals/cpp-ipc/cpp-ipc
@@ -1 +1 @@
-Subproject commit c5302d00ab332a4a6f0dccfedba9601eda1d5700
+Subproject commit ce0773b3e6d5abaa8d104100c5704321113853ca
diff --git a/Externals/cpp-optparse/CMakeLists.txt b/Externals/cpp-optparse/CMakeLists.txt
index 25bff0d4440a..1d255582f7bb 100644
--- a/Externals/cpp-optparse/CMakeLists.txt
+++ b/Externals/cpp-optparse/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(SRCS
-    cpp-optparse/OptionParser.cpp
-    cpp-optparse/OptionParser.h
+  cpp-optparse/OptionParser.cpp
+  cpp-optparse/OptionParser.h
 )
 
 add_library(cpp-optparse STATIC ${SRCS})
@@ -10,5 +10,5 @@ dolphin_disable_warnings(cpp-optparse)
 
 target_include_directories(cpp-optparse
 PUBLIC
-    ${CMAKE_CURRENT_SOURCE_DIR}/cpp-optparse
+  ${CMAKE_CURRENT_SOURCE_DIR}/cpp-optparse
 )
diff --git a/Externals/curl/CMakeLists.txt b/Externals/curl/CMakeLists.txt
index d48eafefcc76..55f010fb15bf 100644
--- a/Externals/curl/CMakeLists.txt
+++ b/Externals/curl/CMakeLists.txt
@@ -6,6 +6,7 @@ set(BUILD_SHARED_LIBS OFF)
 set(BUILD_STATIC_LIBS ON)
 set(BUILD_TESTING OFF)
 set(CURL_ENABLE_EXPORT_TARGET OFF)
+set(ENABLE_CURL_MANUAL OFF)
 
 set(HTTP_ONLY ON)
 
diff --git a/Externals/discord-rpc/CMakeLists.txt b/Externals/discord-rpc/CMakeLists.txt
index 148af125e92a..f5e313e2af90 100644
--- a/Externals/discord-rpc/CMakeLists.txt
+++ b/Externals/discord-rpc/CMakeLists.txt
@@ -5,8 +5,8 @@ include(GNUInstallDirs)
 
 # format
 file(GLOB_RECURSE ALL_SOURCE_FILES
-    include/*.h
-    src/*.cpp src/*.h src/*.c
+  include/*.h
+  src/*.cpp src/*.h src/*.c
 )
 
 # add subdirs
diff --git a/Externals/imgui/CMakeLists.txt b/Externals/imgui/CMakeLists.txt
index bc63dd58fe7b..4dd9579eb309 100644
--- a/Externals/imgui/CMakeLists.txt
+++ b/Externals/imgui/CMakeLists.txt
@@ -16,9 +16,9 @@ add_library(imgui STATIC ${SRCS})
 dolphin_disable_warnings(imgui)
 
 target_include_directories(imgui
-    PUBLIC
-        "${CMAKE_CURRENT_SOURCE_DIR}"
-        "${CMAKE_CURRENT_SOURCE_DIR}/imgui"
+  PUBLIC
+    "${CMAKE_CURRENT_SOURCE_DIR}"
+    "${CMAKE_CURRENT_SOURCE_DIR}/imgui"
 )
 
 target_compile_definitions(imgui
@@ -27,6 +27,6 @@ target_compile_definitions(imgui
 )
 
 target_link_libraries(imgui
-PRIVATE
-  fmt::fmt
+  PRIVATE
+    fmt::fmt
 )
diff --git a/Externals/implot/CMakeLists.txt b/Externals/implot/CMakeLists.txt
index 922ae4ff9397..6ee7a386a8ea 100644
--- a/Externals/implot/CMakeLists.txt
+++ b/Externals/implot/CMakeLists.txt
@@ -20,3 +20,9 @@ target_link_libraries(implot
   PRIVATE imgui
   PRIVATE fmt::fmt
 )
+
+# https://github.com/epezent/implot/pull/565
+target_compile_options(implot PRIVATE
+  $<$<CXX_COMPILER_ID:MSVC>:/FI${CMAKE_CURRENT_SOURCE_DIR}/implot_isnan_fix.h>
+  $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-include ${CMAKE_CURRENT_SOURCE_DIR}/implot_isnan_fix.h>
+)
diff --git a/Externals/implot/implot_isnan_fix.h b/Externals/implot/implot_isnan_fix.h
new file mode 100644
index 000000000000..4e89d33d22c3
--- /dev/null
+++ b/Externals/implot/implot_isnan_fix.h
@@ -0,0 +1,5 @@
+#pragma once
+
+#include <cmath>
+
+using std::isnan;
diff --git a/Externals/libiconv/CMakeLists.txt b/Externals/libiconv/CMakeLists.txt
index a447d607715a..8e90d1ea4922 100644
--- a/Externals/libiconv/CMakeLists.txt
+++ b/Externals/libiconv/CMakeLists.txt
@@ -3,14 +3,14 @@ add_subdirectory(lib)
 add_subdirectory(libcharset)
 
 add_library(iconv STATIC
-    lib/iconv.c
+  lib/iconv.c
 )
 
 target_link_libraries(iconv PUBLIC libcharset)
 target_include_directories(iconv
-    PUBLIC
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-         $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/lib>
+  PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/lib>
 )
 
 dolphin_disable_warnings(iconv)
diff --git a/Externals/libiconv/lib/CMakeLists.txt b/Externals/libiconv/lib/CMakeLists.txt
index 00d1975a9eae..635c0931997e 100644
--- a/Externals/libiconv/lib/CMakeLists.txt
+++ b/Externals/libiconv/lib/CMakeLists.txt
@@ -56,4 +56,4 @@ configure_file(
     ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
     ${CMAKE_CURRENT_BINARY_DIR}/config.h
     @ONLY
-)
\ No newline at end of file
+)
diff --git a/Externals/liblzma/CMakeLists.txt b/Externals/liblzma/CMakeLists.txt
index ef6398a52922..84080aa3834c 100644
--- a/Externals/liblzma/CMakeLists.txt
+++ b/Externals/liblzma/CMakeLists.txt
@@ -14,24 +14,24 @@ set(CMAKE_REQUIRED_DEFINITIONS -D_LARGEFILE64_SOURCE=1)
 # in CMake 2.4.x does not automatically do so and we want
 # compatibility with CMake 2.4.x.
 if(HAVE_SYS_TYPES_H)
-    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_SYS_TYPES_H)
+  list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_SYS_TYPES_H)
 endif()
 if(HAVE_STDINT_H)
-    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDINT_H)
+  list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDINT_H)
 endif()
 if(HAVE_STDDEF_H)
-    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDDEF_H)
+  list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDDEF_H)
 endif()
 check_type_size(off64_t OFF64_T)
 if(HAVE_OFF64_T)
-   add_definitions(-D_LARGEFILE64_SOURCE=1)
+  add_definitions(-D_LARGEFILE64_SOURCE=1)
 endif()
 set(CMAKE_REQUIRED_DEFINITIONS) # clear variable
 
 # Check for fseeko
 check_function_exists(fseeko HAVE_FSEEKO)
 if(NOT HAVE_FSEEKO)
-    add_definitions(-DNO_FSEEKO)
+  add_definitions(-DNO_FSEEKO)
 endif()
 
 #
@@ -39,13 +39,13 @@ endif()
 #
 check_include_file(unistd.h HAVE_UNISTD_H)
 if(HAVE_UNISTD_H)
-    add_definitions(-DHAVE_UNISTD_H)
+  add_definitions(-DHAVE_UNISTD_H)
 endif()
 
 
 if(MSVC)
-    add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
-    add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
+  add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
+  add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
 endif()
 
 add_definitions(-DHAVE_CONFIG_H)
@@ -60,152 +60,152 @@ endif()
 #============================================================================
 
 set(LZMA_PUBLIC_HDRS
-    api/lzma.h
-    api/lzma/base.h
-    api/lzma/bcj.h
-    api/lzma/block.h
-    api/lzma/check.h
-    api/lzma/container.h
-    api/lzma/delta.h
-    api/lzma/filter.h
-    api/lzma/hardware.h
-    api/lzma/index.h
-    api/lzma/index_hash.h
-    api/lzma/lzma12.h
-    api/lzma/stream_flags.h
-    api/lzma/version.h
-    api/lzma/vli.h
+  api/lzma.h
+  api/lzma/base.h
+  api/lzma/bcj.h
+  api/lzma/block.h
+  api/lzma/check.h
+  api/lzma/container.h
+  api/lzma/delta.h
+  api/lzma/filter.h
+  api/lzma/hardware.h
+  api/lzma/index.h
+  api/lzma/index_hash.h
+  api/lzma/lzma12.h
+  api/lzma/stream_flags.h
+  api/lzma/version.h
+  api/lzma/vli.h
 )
 
 set(LZMA_SRCS
-    check/check.c
-    check/check.h
-    check/crc32_fast.c
-    check/crc32_table_be.h
-    check/crc32_table.c
-    check/crc32_table_le.h
-    check/crc64_fast.c
-    check/crc64_table_be.h
-    check/crc64_table.c
-    check/crc64_table_le.h
-    check/crc_macros.h
-    check/sha256.c
-    common/alone_decoder.c
-    common/alone_decoder.h
-    common/alone_encoder.c
-    common/auto_decoder.c
-    common/block_buffer_decoder.c
-    common/block_buffer_encoder.c
-    common/block_buffer_encoder.h
-    common/block_decoder.c
-    common/block_decoder.h
-    common/block_encoder.c
-    common/block_encoder.h
-    common/block_header_decoder.c
-    common/block_header_encoder.c
-    common/block_util.c
-    common/common.c
-    common/common.h
-    common/easy_buffer_encoder.c
-    common/easy_decoder_memusage.c
-    common/easy_encoder.c
-    common/easy_encoder_memusage.c
-    common/easy_preset.c
-    common/easy_preset.h
-    common/filter_buffer_decoder.c
-    common/filter_buffer_encoder.c
-    common/filter_common.c
-    common/filter_common.h
-    common/filter_decoder.c
-    common/filter_decoder.h
-    common/filter_encoder.c
-    common/filter_encoder.h
-    common/filter_flags_decoder.c
-    common/filter_flags_encoder.c
-    common/hardware_cputhreads.c
-    common/hardware_physmem.c
-    common/index.c
-    common/index_decoder.c
-    common/index_encoder.c
-    common/index_encoder.h
-    common/index.h
-    common/index_hash.c
-    common/memcmplen.h
-    common/outqueue.c
-    common/outqueue.h
-    common/stream_buffer_decoder.c
-    common/stream_buffer_encoder.c
-    common/stream_decoder.c
-    common/stream_decoder.h
-    common/stream_encoder.c
-    common/stream_encoder_mt.c
-    common/stream_flags_common.c
-    common/stream_flags_common.h
-    common/stream_flags_decoder.c
-    common/stream_flags_encoder.c
-    common/vli_decoder.c
-    common/vli_encoder.c
-    common/vli_size.c
-    delta/delta_common.c
-    delta/delta_common.h
-    delta/delta_decoder.c
-    delta/delta_decoder.h
-    delta/delta_encoder.c
-    delta/delta_encoder.h
-    delta/delta_private.h
-    lz/lz_decoder.c
-    lz/lz_decoder.h
-    lz/lz_encoder.c
-    lz/lz_encoder.h
-    lz/lz_encoder_hash.h
-    lz/lz_encoder_hash_table.h
-    lz/lz_encoder_mf.c
-    lzma/fastpos.h
-    lzma/fastpos_table.c
-    lzma/lzma2_decoder.c
-    lzma/lzma2_decoder.h
-    lzma/lzma2_encoder.c
-    lzma/lzma2_encoder.h
-    lzma/lzma_common.h
-    lzma/lzma_decoder.c
-    lzma/lzma_decoder.h
-    lzma/lzma_encoder.c
-    lzma/lzma_encoder.h
-    lzma/lzma_encoder_optimum_fast.c
-    lzma/lzma_encoder_optimum_normal.c
-    lzma/lzma_encoder_presets.c
-    lzma/lzma_encoder_private.h
-    rangecoder/price.h
-    rangecoder/price_table.c
-    rangecoder/range_common.h
-    rangecoder/range_decoder.h
-    rangecoder/range_encoder.h
-    simple/simple_coder.c
-    simple/simple_coder.h
-    simple/simple_decoder.c
-    simple/simple_decoder.h
-    simple/simple_encoder.c
-    simple/simple_encoder.h
-    simple/simple_private.h
-    tuklib/mythread.h
-    tuklib/sysdefs.h
-    tuklib/tuklib_common.h
-    tuklib/tuklib_config.h
-    tuklib/tuklib_cpucores.c
-    tuklib/tuklib_cpucores.h
-    tuklib/tuklib_exit.c
-    tuklib/tuklib_exit.h
-    tuklib/tuklib_gettext.h
-    tuklib/tuklib_integer.h
-    tuklib/tuklib_mbstr_fw.c
-    tuklib/tuklib_mbstr.h
-    tuklib/tuklib_mbstr_width.c
-    tuklib/tuklib_open_stdxxx.c
-    tuklib/tuklib_open_stdxxx.h
-    tuklib/tuklib_physmem.c
-    tuklib/tuklib_physmem.h
-    tuklib/tuklib_progname.c
-    tuklib/tuklib_progname.h
+  check/check.c
+  check/check.h
+  check/crc32_fast.c
+  check/crc32_table_be.h
+  check/crc32_table.c
+  check/crc32_table_le.h
+  check/crc64_fast.c
+  check/crc64_table_be.h
+  check/crc64_table.c
+  check/crc64_table_le.h
+  check/crc_macros.h
+  check/sha256.c
+  common/alone_decoder.c
+  common/alone_decoder.h
+  common/alone_encoder.c
+  common/auto_decoder.c
+  common/block_buffer_decoder.c
+  common/block_buffer_encoder.c
+  common/block_buffer_encoder.h
+  common/block_decoder.c
+  common/block_decoder.h
+  common/block_encoder.c
+  common/block_encoder.h
+  common/block_header_decoder.c
+  common/block_header_encoder.c
+  common/block_util.c
+  common/common.c
+  common/common.h
+  common/easy_buffer_encoder.c
+  common/easy_decoder_memusage.c
+  common/easy_encoder.c
+  common/easy_encoder_memusage.c
+  common/easy_preset.c
+  common/easy_preset.h
+  common/filter_buffer_decoder.c
+  common/filter_buffer_encoder.c
+  common/filter_common.c
+  common/filter_common.h
+  common/filter_decoder.c
+  common/filter_decoder.h
+  common/filter_encoder.c
+  common/filter_encoder.h
+  common/filter_flags_decoder.c
+  common/filter_flags_encoder.c
+  common/hardware_cputhreads.c
+  common/hardware_physmem.c
+  common/index.c
+  common/index_decoder.c
+  common/index_encoder.c
+  common/index_encoder.h
+  common/index.h
+  common/index_hash.c
+  common/memcmplen.h
+  common/outqueue.c
+  common/outqueue.h
+  common/stream_buffer_decoder.c
+  common/stream_buffer_encoder.c
+  common/stream_decoder.c
+  common/stream_decoder.h
+  common/stream_encoder.c
+  common/stream_encoder_mt.c
+  common/stream_flags_common.c
+  common/stream_flags_common.h
+  common/stream_flags_decoder.c
+  common/stream_flags_encoder.c
+  common/vli_decoder.c
+  common/vli_encoder.c
+  common/vli_size.c
+  delta/delta_common.c
+  delta/delta_common.h
+  delta/delta_decoder.c
+  delta/delta_decoder.h
+  delta/delta_encoder.c
+  delta/delta_encoder.h
+  delta/delta_private.h
+  lz/lz_decoder.c
+  lz/lz_decoder.h
+  lz/lz_encoder.c
+  lz/lz_encoder.h
+  lz/lz_encoder_hash.h
+  lz/lz_encoder_hash_table.h
+  lz/lz_encoder_mf.c
+  lzma/fastpos.h
+  lzma/fastpos_table.c
+  lzma/lzma2_decoder.c
+  lzma/lzma2_decoder.h
+  lzma/lzma2_encoder.c
+  lzma/lzma2_encoder.h
+  lzma/lzma_common.h
+  lzma/lzma_decoder.c
+  lzma/lzma_decoder.h
+  lzma/lzma_encoder.c
+  lzma/lzma_encoder.h
+  lzma/lzma_encoder_optimum_fast.c
+  lzma/lzma_encoder_optimum_normal.c
+  lzma/lzma_encoder_presets.c
+  lzma/lzma_encoder_private.h
+  rangecoder/price.h
+  rangecoder/price_table.c
+  rangecoder/range_common.h
+  rangecoder/range_decoder.h
+  rangecoder/range_encoder.h
+  simple/simple_coder.c
+  simple/simple_coder.h
+  simple/simple_decoder.c
+  simple/simple_decoder.h
+  simple/simple_encoder.c
+  simple/simple_encoder.h
+  simple/simple_private.h
+  tuklib/mythread.h
+  tuklib/sysdefs.h
+  tuklib/tuklib_common.h
+  tuklib/tuklib_config.h
+  tuklib/tuklib_cpucores.c
+  tuklib/tuklib_cpucores.h
+  tuklib/tuklib_exit.c
+  tuklib/tuklib_exit.h
+  tuklib/tuklib_gettext.h
+  tuklib/tuklib_integer.h
+  tuklib/tuklib_mbstr_fw.c
+  tuklib/tuklib_mbstr.h
+  tuklib/tuklib_mbstr_width.c
+  tuklib/tuklib_open_stdxxx.c
+  tuklib/tuklib_open_stdxxx.h
+  tuklib/tuklib_physmem.c
+  tuklib/tuklib_physmem.h
+  tuklib/tuklib_progname.c
+  tuklib/tuklib_progname.h
 )
 
 add_library(lzma STATIC ${LZMA_SRCS} ${LZMA_PUBLIC_HDRS})
@@ -215,9 +215,9 @@ dolphin_disable_warnings(lzma)
 target_compile_definitions(lzma PUBLIC LZMA_API_STATIC)
 
 target_include_directories(lzma
-PUBLIC
+  PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/api
-PRIVATE
+  PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/
     ${CMAKE_CURRENT_SOURCE_DIR}/check
     ${CMAKE_CURRENT_SOURCE_DIR}/common
diff --git a/Externals/libusb/CMakeLists.txt b/Externals/libusb/CMakeLists.txt
index 8327b40054f6..6f3b3105f067 100644
--- a/Externals/libusb/CMakeLists.txt
+++ b/Externals/libusb/CMakeLists.txt
@@ -1,86 +1,86 @@
 add_library(usb STATIC EXCLUDE_FROM_ALL
-    libusb/libusb/core.c
-    libusb/libusb/descriptor.c
-    libusb/libusb/hotplug.c
-    libusb/libusb/io.c
-    libusb/libusb/strerror.c
-    libusb/libusb/sync.c
+  libusb/libusb/core.c
+  libusb/libusb/descriptor.c
+  libusb/libusb/hotplug.c
+  libusb/libusb/io.c
+  libusb/libusb/strerror.c
+  libusb/libusb/sync.c
 )
 dolphin_disable_warnings(usb)
 
 set_target_properties(usb PROPERTIES VERSION 1.0.26)
 if(MSVC)
-    target_include_directories(usb BEFORE PUBLIC libusb/libusb PRIVATE libusb/msvc)
+  target_include_directories(usb BEFORE PUBLIC libusb/libusb PRIVATE libusb/msvc)
 else()
 target_include_directories(usb
-    # turns out other projects also have "config.h", so make sure the
-    # LibUSB one comes first
-    BEFORE
+  # turns out other projects also have "config.h", so make sure the
+  # LibUSB one comes first
+  BEFORE
 
-    PUBLIC libusb/libusb
-    PRIVATE "${CMAKE_CURRENT_BINARY_DIR}"
+  PUBLIC libusb/libusb
+  PRIVATE "${CMAKE_CURRENT_BINARY_DIR}"
 )
 endif()
 
 if(WIN32 OR CYGWIN)
-    target_sources(usb PRIVATE
-      libusb/libusb/os/threads_windows.c
-      libusb/libusb/os/windows_common.c
-      libusb/libusb/os/windows_usbdk.c
-      libusb/libusb/os/windows_winusb.c
-      libusb/libusb/os/events_windows.c
-    )
-    set(PLATFORM_WINDOWS TRUE)
+  target_sources(usb PRIVATE
+    libusb/libusb/os/threads_windows.c
+    libusb/libusb/os/windows_common.c
+    libusb/libusb/os/windows_usbdk.c
+    libusb/libusb/os/windows_winusb.c
+    libusb/libusb/os/events_windows.c
+  )
+  set(PLATFORM_WINDOWS TRUE)
 elseif(APPLE)
-    target_sources(usb PRIVATE libusb/libusb/os/darwin_usb.c)
-    find_library(COREFOUNDATION_LIBRARY CoreFoundation)
-    find_library(IOKIT_LIBRARY IOKit)
-    find_library(OBJC_LIBRARY objc)
-    find_library(SECURITY_LIBRARY Security)
-    target_link_libraries(usb PRIVATE
-        ${COREFOUNDATION_LIBRARY}
-        ${IOKIT_LIBRARY}
-        ${OBJC_LIBRARY}
-        ${SECURITY_LIBRARY}
-    )
+  target_sources(usb PRIVATE libusb/libusb/os/darwin_usb.c)
+  find_library(COREFOUNDATION_LIBRARY CoreFoundation)
+  find_library(IOKIT_LIBRARY IOKit)
+  find_library(OBJC_LIBRARY objc)
+  find_library(SECURITY_LIBRARY Security)
+  target_link_libraries(usb PRIVATE
+    ${COREFOUNDATION_LIBRARY}
+    ${IOKIT_LIBRARY}
+    ${OBJC_LIBRARY}
+    ${SECURITY_LIBRARY}
+  )
 # # Dolphin on Android doesn't use libusb.
 #elseif(ANDROID)
-#    target_sources(usb PRIVATE
-#        libusb/libusb/os/linux_usbfs.c
-#        libusb/libusb/os/linux_netlink.c
-#    )
-#    find_library(LOG_LIBRARY log)
-#    target_link_libraries(usb PRIVATE ${LOG_LIBRARY})
+#  target_sources(usb PRIVATE
+#    libusb/libusb/os/linux_usbfs.c
+#    libusb/libusb/os/linux_netlink.c
+#  )
+#  find_library(LOG_LIBRARY log)
+#  target_link_libraries(usb PRIVATE ${LOG_LIBRARY})
 elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-    target_sources(usb PRIVATE libusb/libusb/os/linux_usbfs.c)
-    find_package(LIBUDEV)
-    if(LIBUDEV_FOUND)
-        target_sources(usb PRIVATE libusb/libusb/os/linux_udev.c)
-        target_link_libraries(usb PRIVATE "${LIBUDEV_LIBRARIES}")
-        target_include_directories(usb PRIVATE "${LIBUDEV_INCLUDE_DIR}")
-        set(HAVE_LIBUDEV TRUE)
-    else()
-        target_sources(usb PRIVATE libusb/libusb/os/linux_netlink.c)
-    endif()
+  target_sources(usb PRIVATE libusb/libusb/os/linux_usbfs.c)
+  find_package(LIBUDEV)
+  if(LIBUDEV_FOUND)
+    target_sources(usb PRIVATE libusb/libusb/os/linux_udev.c)
+    target_link_libraries(usb PRIVATE "${LIBUDEV_LIBRARIES}")
+    target_include_directories(usb PRIVATE "${LIBUDEV_INCLUDE_DIR}")
+    set(HAVE_LIBUDEV TRUE)
+  else()
+    target_sources(usb PRIVATE libusb/libusb/os/linux_netlink.c)
+  endif()
 elseif(${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
-    target_sources(usb PRIVATE libusb/libusb/os/netbsd_usb.c)
+  target_sources(usb PRIVATE libusb/libusb/os/netbsd_usb.c)
 elseif(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
-    target_sources(usb PRIVATE libusb/libusb/os/openbsd_usb.c)
+  target_sources(usb PRIVATE libusb/libusb/os/openbsd_usb.c)
 endif()
 
 if(UNIX)
-    target_sources(usb PRIVATE
-        libusb/libusb/os/events_posix.c
-        libusb/libusb/os/threads_posix.c
-    )
-    find_package(Threads REQUIRED)
-    if(THREADS_HAVE_PTHREAD_ARG)
-      target_compile_options(usb PUBLIC "-pthread")
-    endif()
-    if(CMAKE_THREAD_LIBS_INIT)
-      target_link_libraries(usb PRIVATE "${CMAKE_THREAD_LIBS_INIT}")
-    endif()
-    set(PLATFORM_POSIX TRUE)
+  target_sources(usb PRIVATE
+    libusb/libusb/os/events_posix.c
+    libusb/libusb/os/threads_posix.c
+  )
+  find_package(Threads REQUIRED)
+  if(THREADS_HAVE_PTHREAD_ARG)
+    target_compile_options(usb PUBLIC "-pthread")
+  endif()
+  if(CMAKE_THREAD_LIBS_INIT)
+    target_link_libraries(usb PRIVATE "${CMAKE_THREAD_LIBS_INIT}")
+  endif()
+  set(PLATFORM_POSIX TRUE)
 endif()
 
 # Create config.h
diff --git a/Externals/licenses.md b/Externals/licenses.md
index 727a41e2a188..7aed5313ac93 100644
--- a/Externals/licenses.md
+++ b/Externals/licenses.md
@@ -76,6 +76,8 @@ Dolphin includes or links code of the following third-party software projects:
    [MIT](https://github.com/microsoft/wil/blob/master/LICENSE)
 - [xxHash](https://github.com/Cyan4973/xxHash):
    [BSD 2-Clause](https://github.com/Cyan4973/xxHash/blob/master/LICENSE)
+- [YACardEmu](https://github.com/GXTX/YACardEmu)
+   [GPLv2+](https://github.com/GXTX/YACardEmu/blob/master/license.txt)
 - [zlib-ng](https://github.com/zlib-ng/zlib-ng):
    [zlib license](https://github.com/zlib-ng/zlib-ng/blob/develop/LICENSE.md)
 - [Zstandard](https://facebook.github.io/zstd/):
diff --git a/Externals/minizip-ng/CMakeLists.txt b/Externals/minizip-ng/CMakeLists.txt
index 22f8d058ac24..086ffd01c1a9 100644
--- a/Externals/minizip-ng/CMakeLists.txt
+++ b/Externals/minizip-ng/CMakeLists.txt
@@ -1,96 +1,14 @@
-project(minizip C)
+set(MZ_COMPAT OFF)
+set(MZ_BUILD_TESTS OFF)
+set(MZ_BUILD_UNIT_TESTS OFF)
+set(MZ_BUILD_FUZZ_TESTS OFF)
+set(MZ_CODE_COVERAGE OFF)
+set(SKIP_INSTALL_ALL ON)
 
-include(CheckFunctionExists)
-include(CheckIncludeFile)
-
-add_library(minizip STATIC
-  minizip-ng/mz.h
-  # minizip-ng/compat/crypt.h
-  # minizip-ng/compat/ioapi.c
-  # minizip-ng/compat/ioapi.h
-  # minizip-ng/compat/unzip.c
-  # minizip-ng/compat/unzip.h
-  # minizip-ng/compat/zip.c
-  # minizip-ng/compat/zip.h
-  minizip-ng/mz_crypt.c
-  minizip-ng/mz_crypt.h
-  minizip-ng/mz_os.c
-  minizip-ng/mz_os.h
-  minizip-ng/mz_strm.c
-  minizip-ng/mz_strm.h
-  minizip-ng/mz_strm_buf.c
-  minizip-ng/mz_strm_buf.h
-# minizip-ng/mz_strm_bzip.c
-# minizip-ng/mz_strm_bzip.h
-# minizip-ng/mz_strm_libcomp.c
-# minizip-ng/mz_strm_libcomp.h
-# minizip-ng/mz_strm_lzma.c
-# minizip-ng/mz_strm_lzma.h
-  minizip-ng/mz_strm_mem.c
-  minizip-ng/mz_strm_mem.h
-  minizip-ng/mz_strm_os.h
-# minizip-ng/mz_strm_pkcrypt.c
-# minizip-ng/mz_strm_pkcrypt.h
-  minizip-ng/mz_strm_split.c
-  minizip-ng/mz_strm_split.h
-# minizip-ng/mz_strm_wzaes.c
-# minizip-ng/mz_strm_wzaes.h
-  minizip-ng/mz_strm_zlib.c
-  minizip-ng/mz_strm_zlib.h
-# minizip-ng/mz_strm_zstd.c
-# minizip-ng/mz_strm_zstd.h
-  minizip-ng/mz_zip.c
-  minizip-ng/mz_zip.h
-  minizip-ng/mz_zip_rw.c
-  minizip-ng/mz_zip_rw.h
-)
-dolphin_disable_warnings(minizip)
-
-if (UNIX)
-  target_sources(minizip PRIVATE
-    minizip-ng/mz_os_posix.c
-    minizip-ng/mz_strm_os_posix.c
-  )
-endif()
-
-if (WIN32)
-  target_sources(minizip PRIVATE
-    minizip-ng/mz_os_win32.c
-    minizip-ng/mz_strm_os_win32.c
-  )
-endif()
-
-# Unused files
-#  minizip-ng/minigzip.c
-#  minizip-ng/minizip.c
-#  minizip-ng/mz_crypt_apple.c
-#  minizip-ng/mz_crypt_openssl.c
-#  minizip-ng/mz_crypt_winvista.c
-#  minizip-ng/mz_crypt_winxp.c
-
-target_include_directories(minizip PUBLIC minizip-ng minizip-ng/compat)
-
-target_compile_definitions(minizip PRIVATE HAVE_ZLIB ZLIB_COMPAT MZ_ZIP_NO_CRYPTO MZ_ZIP_NO_ENCRYPTION)
-if (UNIX)
-  target_compile_definitions(minizip PRIVATE _POSIX_C_SOURCE=200809L)
-  target_compile_definitions(minizip PRIVATE __USE_LARGEFILE64 _LARGEFILE64_SOURCE)
+if (MINGW OR MSVC)
+  set(MZ_FETCH_LIBS OFF)
+  set(MZ_FORCE_FETCH_LIBS OFF)
 endif()
 
-check_include_file(stdint.h HAVE_STDINT_H)
-if (HAVE_STDINT_H)
-  target_compile_definitions(minizip PRIVATE HAVE_STDINT_H)
-endif()
-
-check_include_file(inttypes.h HAVE_INTTYPES_H)
-if (HAVE_INTTYPES_H)
-  target_compile_definitions(minizip PRIVATE HAVE_INTTYPES_H)
-endif()
-
-check_function_exists(fseeko HAVE_FSEEKO)
-if (NOT HAVE_FSEEKO)
-  target_compile_definitions(minizip PRIVATE NO_FSEEKO)
-endif()
-
-target_link_libraries(minizip PUBLIC ZLIB::ZLIB)
-
-add_library(minizip-ng::minizip-ng ALIAS minizip)
+add_subdirectory(minizip-ng)
+dolphin_disable_warnings(minizip-ng)
diff --git a/Externals/rangeset/CMakeLists.txt b/Externals/rangeset/CMakeLists.txt
index af76d99b01de..a3dca5a1ec66 100644
--- a/Externals/rangeset/CMakeLists.txt
+++ b/Externals/rangeset/CMakeLists.txt
@@ -1,4 +1,4 @@
 add_library(RangeSet::RangeSet INTERFACE IMPORTED GLOBAL)
 set_target_properties(RangeSet::RangeSet PROPERTIES
-	INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/include
+  INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/include
 )
diff --git a/Externals/rcheevos/CMakeLists.txt b/Externals/rcheevos/CMakeLists.txt
index e1a857488b37..dd7548733951 100644
--- a/Externals/rcheevos/CMakeLists.txt
+++ b/Externals/rcheevos/CMakeLists.txt
@@ -1,61 +1,61 @@
 add_library(rcheevos
-	rcheevos/include/rc_api_editor.h
-	rcheevos/include/rc_api_info.h
-	rcheevos/include/rc_api_request.h
-	rcheevos/include/rc_api_runtime.h
-	rcheevos/include/rc_api_user.h
-	rcheevos/include/rc_client.h
-	rcheevos/include/rc_client_raintegration.h
-	rcheevos/include/rc_consoles.h
-	rcheevos/include/rc_error.h
-	rcheevos/include/rc_export.h
-	rcheevos/include/rc_hash.h
-	rcheevos/include/rcheevos.h
-	rcheevos/include/rc_runtime.h
-	rcheevos/include/rc_runtime_types.h
-	rcheevos/include/rc_util.h
-	rcheevos/src/rapi/rc_api_common.c
-	rcheevos/src/rapi/rc_api_common.h
-	rcheevos/src/rapi/rc_api_editor.c
-	rcheevos/src/rapi/rc_api_info.c
-	rcheevos/src/rapi/rc_api_runtime.c
-	rcheevos/src/rapi/rc_api_user.c
-	rcheevos/src/rcheevos/alloc.c
-	rcheevos/src/rcheevos/condition.c
-	rcheevos/src/rcheevos/condset.c
-	rcheevos/src/rcheevos/consoleinfo.c
-	rcheevos/src/rcheevos/format.c
-	rcheevos/src/rcheevos/lboard.c
-	rcheevos/src/rcheevos/memref.c
-	rcheevos/src/rcheevos/operand.c
-	rcheevos/src/rcheevos/rc_internal.h
-	rcheevos/src/rcheevos/rc_validate.c
-	rcheevos/src/rcheevos/rc_validate.h
-	rcheevos/src/rcheevos/richpresence.c
-	rcheevos/src/rcheevos/runtime.c
-	rcheevos/src/rcheevos/runtime_progress.c
-	rcheevos/src/rcheevos/trigger.c
-	rcheevos/src/rcheevos/value.c
-	rcheevos/src/rhash/aes.c
-	rcheevos/src/rhash/aes.h
-	rcheevos/src/rhash/cdreader.c
-	rcheevos/src/rhash/hash.c
-	rcheevos/src/rhash/hash_disc.c
-	rcheevos/src/rhash/md5.c
-	rcheevos/src/rhash/md5.h
-	rcheevos/src/rhash/rc_hash_internal.h
-	rcheevos/src/rc_client.c
-	rcheevos/src/rc_client_external.c
-	rcheevos/src/rc_client_external.h
-	rcheevos/src/rc_client_external_versions.h
-	rcheevos/src/rc_client_internal.h
-	rcheevos/src/rc_client_raintegration.c
-	rcheevos/src/rc_client_raintegration_internal.h
-	rcheevos/src/rc_compat.c
-	rcheevos/src/rc_compat.h
-	rcheevos/src/rc_util.c
-	rcheevos/src/rc_version.c
-	rcheevos/src/rc_version.h
+  rcheevos/include/rc_api_editor.h
+  rcheevos/include/rc_api_info.h
+  rcheevos/include/rc_api_request.h
+  rcheevos/include/rc_api_runtime.h
+  rcheevos/include/rc_api_user.h
+  rcheevos/include/rc_client.h
+  rcheevos/include/rc_client_raintegration.h
+  rcheevos/include/rc_consoles.h
+  rcheevos/include/rc_error.h
+  rcheevos/include/rc_export.h
+  rcheevos/include/rc_hash.h
+  rcheevos/include/rcheevos.h
+  rcheevos/include/rc_runtime.h
+  rcheevos/include/rc_runtime_types.h
+  rcheevos/include/rc_util.h
+  rcheevos/src/rapi/rc_api_common.c
+  rcheevos/src/rapi/rc_api_common.h
+  rcheevos/src/rapi/rc_api_editor.c
+  rcheevos/src/rapi/rc_api_info.c
+  rcheevos/src/rapi/rc_api_runtime.c
+  rcheevos/src/rapi/rc_api_user.c
+  rcheevos/src/rcheevos/alloc.c
+  rcheevos/src/rcheevos/condition.c
+  rcheevos/src/rcheevos/condset.c
+  rcheevos/src/rcheevos/consoleinfo.c
+  rcheevos/src/rcheevos/format.c
+  rcheevos/src/rcheevos/lboard.c
+  rcheevos/src/rcheevos/memref.c
+  rcheevos/src/rcheevos/operand.c
+  rcheevos/src/rcheevos/rc_internal.h
+  rcheevos/src/rcheevos/rc_validate.c
+  rcheevos/src/rcheevos/rc_validate.h
+  rcheevos/src/rcheevos/richpresence.c
+  rcheevos/src/rcheevos/runtime.c
+  rcheevos/src/rcheevos/runtime_progress.c
+  rcheevos/src/rcheevos/trigger.c
+  rcheevos/src/rcheevos/value.c
+  rcheevos/src/rhash/aes.c
+  rcheevos/src/rhash/aes.h
+  rcheevos/src/rhash/cdreader.c
+  rcheevos/src/rhash/hash.c
+  rcheevos/src/rhash/hash_disc.c
+  rcheevos/src/rhash/md5.c
+  rcheevos/src/rhash/md5.h
+  rcheevos/src/rhash/rc_hash_internal.h
+  rcheevos/src/rc_client.c
+  rcheevos/src/rc_client_external.c
+  rcheevos/src/rc_client_external.h
+  rcheevos/src/rc_client_external_versions.h
+  rcheevos/src/rc_client_internal.h
+  rcheevos/src/rc_client_raintegration.c
+  rcheevos/src/rc_client_raintegration_internal.h
+  rcheevos/src/rc_compat.c
+  rcheevos/src/rc_compat.h
+  rcheevos/src/rc_util.c
+  rcheevos/src/rc_version.c
+  rcheevos/src/rc_version.h
 )
 dolphin_disable_warnings(rcheevos)
 
@@ -69,5 +69,5 @@ target_compile_definitions(rcheevos PRIVATE "RC_HASH_NO_ROM")
 target_compile_definitions(rcheevos PRIVATE "RC_HASH_NO_ZIP")
 if(CMAKE_SYSTEM_NAME MATCHES "Windows")
   target_compile_definitions(rcheevos PRIVATE "RC_CLIENT_SUPPORTS_RAINTEGRATION")
-	target_compile_definitions(rcheevos PRIVATE "_CRT_SECURE_NO_WARNINGS")
+  target_compile_definitions(rcheevos PRIVATE "_CRT_SECURE_NO_WARNINGS")
 endif()
diff --git a/Externals/rcheevos/rcheevos b/Externals/rcheevos/rcheevos
index b443902b1cdf..926e4608f8dc 160000
--- a/Externals/rcheevos/rcheevos
+++ b/Externals/rcheevos/rcheevos
@@ -1 +1 @@
-Subproject commit b443902b1cdfee5a66b09fec20a94d2d2afaf2ec
+Subproject commit 926e4608f8dca7989267c787bbefb3ab1c835ac5
diff --git a/Externals/spirv_cross/CMakeLists.txt b/Externals/spirv_cross/CMakeLists.txt
index db55eec30503..2b9461dc07ea 100644
--- a/Externals/spirv_cross/CMakeLists.txt
+++ b/Externals/spirv_cross/CMakeLists.txt
@@ -1,32 +1,32 @@
 set(SRCS
-	SPIRV-Cross/GLSL.std.450.h
-	SPIRV-Cross/spirv.h
-	SPIRV-Cross/spirv.hpp
-	SPIRV-Cross/spirv_cfg.cpp
-	SPIRV-Cross/spirv_cfg.hpp
-	SPIRV-Cross/spirv_common.hpp
-	SPIRV-Cross/spirv_cpp.cpp
-	SPIRV-Cross/spirv_cpp.hpp
-	SPIRV-Cross/spirv_cross.cpp
-	SPIRV-Cross/spirv_cross.hpp
-	SPIRV-Cross/spirv_cross_c.cpp
-	SPIRV-Cross/spirv_cross_c.h
-	SPIRV-Cross/spirv_cross_containers.hpp
-	SPIRV-Cross/spirv_cross_error_handling.hpp
-	SPIRV-Cross/spirv_cross_parsed_ir.cpp
-	SPIRV-Cross/spirv_cross_parsed_ir.hpp
-	SPIRV-Cross/spirv_cross_util.cpp
-	SPIRV-Cross/spirv_cross_util.hpp
-	SPIRV-Cross/spirv_glsl.cpp
-	SPIRV-Cross/spirv_glsl.hpp
-	SPIRV-Cross/spirv_hlsl.cpp
-	SPIRV-Cross/spirv_hlsl.hpp
-	SPIRV-Cross/spirv_msl.cpp
-	SPIRV-Cross/spirv_msl.hpp
-	SPIRV-Cross/spirv_parser.cpp
-	SPIRV-Cross/spirv_parser.hpp
-	SPIRV-Cross/spirv_reflect.cpp
-	SPIRV-Cross/spirv_reflect.hpp
+  SPIRV-Cross/GLSL.std.450.h
+  SPIRV-Cross/spirv.h
+  SPIRV-Cross/spirv.hpp
+  SPIRV-Cross/spirv_cfg.cpp
+  SPIRV-Cross/spirv_cfg.hpp
+  SPIRV-Cross/spirv_common.hpp
+  SPIRV-Cross/spirv_cpp.cpp
+  SPIRV-Cross/spirv_cpp.hpp
+  SPIRV-Cross/spirv_cross.cpp
+  SPIRV-Cross/spirv_cross.hpp
+  SPIRV-Cross/spirv_cross_c.cpp
+  SPIRV-Cross/spirv_cross_c.h
+  SPIRV-Cross/spirv_cross_containers.hpp
+  SPIRV-Cross/spirv_cross_error_handling.hpp
+  SPIRV-Cross/spirv_cross_parsed_ir.cpp
+  SPIRV-Cross/spirv_cross_parsed_ir.hpp
+  SPIRV-Cross/spirv_cross_util.cpp
+  SPIRV-Cross/spirv_cross_util.hpp
+  SPIRV-Cross/spirv_glsl.cpp
+  SPIRV-Cross/spirv_glsl.hpp
+  SPIRV-Cross/spirv_hlsl.cpp
+  SPIRV-Cross/spirv_hlsl.hpp
+  SPIRV-Cross/spirv_msl.cpp
+  SPIRV-Cross/spirv_msl.hpp
+  SPIRV-Cross/spirv_parser.cpp
+  SPIRV-Cross/spirv_parser.hpp
+  SPIRV-Cross/spirv_reflect.cpp
+  SPIRV-Cross/spirv_reflect.hpp
 )
 
 if(NOT MSVC)
@@ -40,9 +40,9 @@ add_compile_options(-Wno-sign-compare)
 add_compile_options(-Wno-parentheses)
 add_compile_options(-Wno-unused-variable)
 if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-	add_compile_options(-Wno-unused-but-set-variable)
+  add_compile_options(-Wno-unused-but-set-variable)
 elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-	add_compile_options(-Wno-missing-variable-declarations)
+  add_compile_options(-Wno-missing-variable-declarations)
 endif()
 endif()
 
diff --git a/Externals/tinygltf/CMakeLists.txt b/Externals/tinygltf/CMakeLists.txt
index 0d86268bbe36..b11ac09b68b9 100644
--- a/Externals/tinygltf/CMakeLists.txt
+++ b/Externals/tinygltf/CMakeLists.txt
@@ -3,7 +3,7 @@ target_compile_definitions(tinygltf PUBLIC TINYGLTF_NOEXCEPTION)
 target_compile_definitions(tinygltf PUBLIC TINYGLTF_NO_EXTERNAL_IMAGE)
 target_compile_definitions(tinygltf PUBLIC TINYGLTF_USE_CPP14)
 if (NOT MSVC)
-	target_compile_features(tinygltf PRIVATE cxx_std_20)
+  target_compile_features(tinygltf PRIVATE cxx_std_20)
 endif()
 target_sources(tinygltf PRIVATE
   tinygltf/tiny_gltf.cc)
diff --git a/Externals/watcher/CMakeLists.txt b/Externals/watcher/CMakeLists.txt
index 046adaa621f8..044b258d6394 100644
--- a/Externals/watcher/CMakeLists.txt
+++ b/Externals/watcher/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_library(watcher INTERFACE IMPORTED GLOBAL)
 set_target_properties(watcher PROPERTIES
-	INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/watcher/include
+  INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/watcher/include
 )
 
 if (MINGW)
diff --git a/Externals/zstd/CMakeLists.txt b/Externals/zstd/CMakeLists.txt
index bb164b45a706..d83ce4cb1fdf 100644
--- a/Externals/zstd/CMakeLists.txt
+++ b/Externals/zstd/CMakeLists.txt
@@ -1,146 +1,10 @@
-project(zstd C)
+cmake_minimum_required(VERSION 3.13...4.2.0)
 
-if(NOT MSVC)
-    enable_language(ASM)
-endif()
+set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
+set(ZSTD_BUILD_PROGRAMS OFF)
+set(ZSTD_BUILD_SHARED OFF)
 
-include(CheckTypeSize)
-include(CheckFunctionExists)
-include(CheckIncludeFile)
+add_subdirectory(zstd EXCLUDE_FROM_ALL)
 
-check_include_file(sys/types.h HAVE_SYS_TYPES_H)
-check_include_file(stdint.h    HAVE_STDINT_H)
-check_include_file(stddef.h    HAVE_STDDEF_H)
-
-# Check to see if we have large file support
-set(CMAKE_REQUIRED_DEFINITIONS -D_LARGEFILE64_SOURCE=1)
-# We add these other definitions here because CheckTypeSize.cmake
-# in CMake 2.4.x does not automatically do so and we want
-# compatibility with CMake 2.4.x.
-if(HAVE_SYS_TYPES_H)
-    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_SYS_TYPES_H)
-endif()
-if(HAVE_STDINT_H)
-    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDINT_H)
-endif()
-if(HAVE_STDDEF_H)
-    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDDEF_H)
-endif()
-check_type_size(off64_t OFF64_T)
-if(HAVE_OFF64_T)
-   add_definitions(-D_LARGEFILE64_SOURCE=1)
-endif()
-set(CMAKE_REQUIRED_DEFINITIONS) # clear variable
-
-# Check for fseeko
-check_function_exists(fseeko HAVE_FSEEKO)
-if(NOT HAVE_FSEEKO)
-    add_definitions(-DNO_FSEEKO)
-endif()
-
-#
-# Check for unistd.h
-#
-check_include_file(unistd.h HAVE_UNISTD_H)
-if(HAVE_UNISTD_H)
-    add_definitions(-DHAVE_UNISTD_H)
-endif()
-
-if(MSVC)
-    add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
-    add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
-endif()
-
-# Always hide XXHash symbols
-add_definitions(-DXXH_NAMESPACE=ZSTD_)
-
-#============================================================================
-# zstd
-#============================================================================
-
-set(ZSTD_PUBLIC_HDRS
-    zstd/lib/zstd.h
-    zstd/lib/zstd_errors.h
-)
-set(ZSTD_PRIVATE_HDRS
-    zstd/lib/common/allocations.h
-    zstd/lib/common/bits.h
-    zstd/lib/common/bitstream.h
-    zstd/lib/common/compiler.h
-    zstd/lib/common/cpu.h
-    zstd/lib/common/debug.h
-    zstd/lib/common/error_private.h
-    zstd/lib/common/fse.h
-    zstd/lib/common/huf.h
-    zstd/lib/common/mem.h
-    zstd/lib/common/pool.h
-    zstd/lib/common/portability_macros.h
-    zstd/lib/common/threading.h
-    zstd/lib/common/xxhash.h
-    zstd/lib/common/zstd_deps.h
-    zstd/lib/common/zstd_internal.h
-    zstd/lib/common/zstd_trace.h
-    zstd/lib/compress/clevels.h
-    zstd/lib/compress/hist.h
-    zstd/lib/compress/zstd_compress_internal.h
-    zstd/lib/compress/zstd_compress_literals.h
-    zstd/lib/compress/zstd_compress_sequences.h
-    zstd/lib/compress/zstd_compress_superblock.h
-    zstd/lib/compress/zstd_cwksp.h
-    zstd/lib/compress/zstd_double_fast.h
-    zstd/lib/compress/zstd_fast.h
-    zstd/lib/compress/zstd_lazy.h
-    zstd/lib/compress/zstd_ldm.h
-    zstd/lib/compress/zstd_ldm_geartab.h
-    zstd/lib/compress/zstd_opt.h
-    zstd/lib/compress/zstd_preSplit.h
-    zstd/lib/compress/zstdmt_compress.h
-    zstd/lib/decompress/zstd_ddict.h
-    zstd/lib/decompress/zstd_decompress_block.h
-    zstd/lib/decompress/zstd_decompress_internal.h
-)
-set(ZSTD_SRCS
-    zstd/lib/common/debug.c
-    zstd/lib/common/entropy_common.c
-    zstd/lib/common/error_private.c
-    zstd/lib/common/fse_decompress.c
-    zstd/lib/common/pool.c
-    zstd/lib/common/threading.c
-    zstd/lib/common/xxhash.c
-    zstd/lib/common/zstd_common.c
-    zstd/lib/compress/fse_compress.c
-    zstd/lib/compress/hist.c
-    zstd/lib/compress/huf_compress.c
-    zstd/lib/compress/zstd_compress.c
-    zstd/lib/compress/zstd_compress_literals.c
-    zstd/lib/compress/zstd_compress_sequences.c
-    zstd/lib/compress/zstd_compress_superblock.c
-    zstd/lib/compress/zstd_double_fast.c
-    zstd/lib/compress/zstd_fast.c
-    zstd/lib/compress/zstd_lazy.c
-    zstd/lib/compress/zstd_ldm.c
-    zstd/lib/compress/zstd_opt.c
-    zstd/lib/compress/zstd_preSplit.c
-    zstd/lib/compress/zstdmt_compress.c
-    zstd/lib/decompress/huf_decompress.c
-    zstd/lib/decompress/zstd_ddict.c
-    zstd/lib/decompress/zstd_decompress.c
-    zstd/lib/decompress/zstd_decompress_block.c
-)
-
-add_library(zstd STATIC ${ZSTD_SRCS} ${ZSTD_PUBLIC_HDRS} ${ZSTD_PRIVATE_HDRS})
-target_compile_definitions(zstd PUBLIC ZSTD_LEGACY_SUPPORT=0)
-
-if(MSVC)
-    target_compile_definitions(zstd PUBLIC ZSTD_DISABLE_ASM)
-else()
-    target_sources(zstd PRIVATE zstd/lib/decompress/huf_decompress_amd64.S)
-endif()
-
-dolphin_disable_warnings(zstd)
-add_library(zstd::zstd ALIAS zstd)
-
-target_include_directories(zstd
-PUBLIC
-    ${CMAKE_CURRENT_SOURCE_DIR}/zstd/lib
-)
+dolphin_disable_warnings(libzstd_static)
+add_library(zstd::zstd ALIAS libzstd_static)
diff --git a/Externals/zstd/zstd b/Externals/zstd/zstd
index f8745da6ff1a..711e17da9851 160000
--- a/Externals/zstd/zstd
+++ b/Externals/zstd/zstd
@@ -1 +1 @@
-Subproject commit f8745da6ff1ad1e7bab384bd1f9d742439278e99
+Subproject commit 711e17da98510a3567bf47f85a08a76f64811474
diff --git a/Flatpak/org.DolphinEmu.dolphin-emu.yml b/Flatpak/org.DolphinEmu.dolphin-emu.yml
index 0bece4769bab..a636a278e775 100644
--- a/Flatpak/org.DolphinEmu.dolphin-emu.yml
+++ b/Flatpak/org.DolphinEmu.dolphin-emu.yml
@@ -1,6 +1,6 @@
 app-id: org.DolphinEmu.dolphin-emu
 runtime: org.kde.Platform
-runtime-version: '6.8'
+runtime-version: '6.10'
 sdk: org.kde.Sdk
 command: dolphin-emu-wrapper
 rename-desktop-file: dolphin-emu.desktop
diff --git a/Source/Android/app/.gitignore b/Source/Android/app/.gitignore
index 0886f94956c5..3b78de26aa3b 100644
--- a/Source/Android/app/.gitignore
+++ b/Source/Android/app/.gitignore
@@ -1,2 +1,6 @@
 /build
+/debug
+/release
+/benchmarkRelease
+/nonMinifiedRelease
 /.externalNativeBuild
diff --git a/Source/Android/app/build.gradle.kts b/Source/Android/app/build.gradle.kts
index 2beaad255118..64d909423c1f 100644
--- a/Source/Android/app/build.gradle.kts
+++ b/Source/Android/app/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
@@ -23,8 +25,10 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.fromTarget("17")
+        }
     }
 
     lint {
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.kt
index 0b6490b2908c..0edc0f91f9d3 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.kt
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.kt
@@ -233,19 +233,17 @@ object NativeLibrary {
      * Saves a game state to the slot number.
      *
      * @param slot The slot location to save state to.
-     * @param wait If false, returns as early as possible. If true, returns once the savestate has been written to disk.
      */
     @JvmStatic
-    external fun SaveState(slot: Int, wait: Boolean)
+    external fun SaveState(slot: Int)
 
     /**
      * Saves a game state to the specified path.
      *
      * @param path The path to save state to.
-     * @param wait If false, returns as early as possible. If true, returns once the savestate has been written to disk.
      */
     @JvmStatic
-    external fun SaveStateAs(path: String, wait: Boolean)
+    external fun SaveStateAs(path: String)
 
     /**
      * Loads a game state from the slot number.
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.kt
index 1b23118de392..8a1d8addbdfb 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.kt
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.kt
@@ -494,16 +494,16 @@ class EmulationActivity : AppCompatActivity(), ThemeProvider {
             }
 
             MENU_ACTION_TAKE_SCREENSHOT -> NativeLibrary.SaveScreenShot()
-            MENU_ACTION_QUICK_SAVE -> NativeLibrary.SaveState(9, false)
+            MENU_ACTION_QUICK_SAVE -> NativeLibrary.SaveState(9)
             MENU_ACTION_QUICK_LOAD -> NativeLibrary.LoadState(9)
             MENU_ACTION_SAVE_ROOT -> showSubMenu(SaveOrLoad.SAVE)
             MENU_ACTION_LOAD_ROOT -> showSubMenu(SaveOrLoad.LOAD)
-            MENU_ACTION_SAVE_SLOT1 -> NativeLibrary.SaveState(0, false)
-            MENU_ACTION_SAVE_SLOT2 -> NativeLibrary.SaveState(1, false)
-            MENU_ACTION_SAVE_SLOT3 -> NativeLibrary.SaveState(2, false)
-            MENU_ACTION_SAVE_SLOT4 -> NativeLibrary.SaveState(3, false)
-            MENU_ACTION_SAVE_SLOT5 -> NativeLibrary.SaveState(4, false)
-            MENU_ACTION_SAVE_SLOT6 -> NativeLibrary.SaveState(5, false)
+            MENU_ACTION_SAVE_SLOT1 -> NativeLibrary.SaveState(0)
+            MENU_ACTION_SAVE_SLOT2 -> NativeLibrary.SaveState(1)
+            MENU_ACTION_SAVE_SLOT3 -> NativeLibrary.SaveState(2)
+            MENU_ACTION_SAVE_SLOT4 -> NativeLibrary.SaveState(3)
+            MENU_ACTION_SAVE_SLOT5 -> NativeLibrary.SaveState(4)
+            MENU_ACTION_SAVE_SLOT6 -> NativeLibrary.SaveState(5)
             MENU_ACTION_LOAD_SLOT1 -> NativeLibrary.LoadState(0)
             MENU_ACTION_LOAD_SLOT2 -> NativeLibrary.LoadState(1)
             MENU_ACTION_LOAD_SLOT3 -> NativeLibrary.LoadState(2)
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/model/ControllerInterface.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/model/ControllerInterface.kt
index e09e0dec9969..71b37ff51347 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/model/ControllerInterface.kt
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/input/model/ControllerInterface.kt
@@ -6,6 +6,7 @@ import android.content.Context
 import android.hardware.input.InputManager
 import android.os.Build
 import android.os.Handler
+import android.os.HandlerThread
 import android.os.Looper
 import android.os.VibrationEffect
 import android.os.Vibrator
@@ -17,7 +18,6 @@ import androidx.annotation.Keep
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import org.dolphinemu.dolphinemu.DolphinApplication
-import org.dolphinemu.dolphinemu.utils.LooperThread
 import java.util.concurrent.atomic.AtomicBoolean
 
 /**
@@ -26,9 +26,9 @@ import java.util.concurrent.atomic.AtomicBoolean
  */
 object ControllerInterface {
     private var inputDeviceListener: InputDeviceListener? = null
-    private lateinit var looperThread: LooperThread
+    private var handlerThread: HandlerThread? = null
 
-    private var inputStateUpdatePending = AtomicBoolean(false)
+    private val inputStateUpdatePending = AtomicBoolean(false)
     private val inputStateVersion = MutableLiveData(0)
     private val devicesVersion = MutableLiveData(0)
 
@@ -81,9 +81,7 @@ object ControllerInterface {
     }
 
     private external fun dispatchSensorEventNative(
-        deviceQualifier: String,
-        axisName: String,
-        value: Float
+        deviceQualifier: String, axisName: String, value: Float
     ): Boolean
 
     /**
@@ -94,16 +92,9 @@ object ControllerInterface {
      * @param suspended       Whether the sensor is now suspended.
      */
     external fun notifySensorSuspendedState(
-        deviceQualifier: String,
-        axisNames: Array<String>,
-        suspended: Boolean
+        deviceQualifier: String, axisNames: Array<String>, suspended: Boolean
     )
 
-    /**
-     * Rescans for input devices.
-     */
-    external fun refreshDevices()
-
     external fun getAllDeviceStrings(): Array<String>
 
     external fun getDevice(deviceString: String): CoreDevice?
@@ -132,15 +123,18 @@ object ControllerInterface {
     @Keep
     @JvmStatic
     private fun registerInputDeviceListener() {
-        looperThread = LooperThread("Hotplug thread")
-        looperThread.start()
-
         if (inputDeviceListener == null) {
+            handlerThread = HandlerThread("Hotplug thread").apply { start() }
+            val thread = requireNotNull(handlerThread) { "HandlerThread is not available" }
+
             val im = DolphinApplication.getAppContext()
-                .getSystemService(Context.INPUT_SERVICE) as InputManager?
+                .getSystemService(Context.INPUT_SERVICE) as InputManager
+            val looper = requireNotNull(thread.looper) {
+                "HandlerThread looper is not available"
+            }
 
             inputDeviceListener = InputDeviceListener()
-            im!!.registerInputDeviceListener(inputDeviceListener, Handler(looperThread.looper))
+            im.registerInputDeviceListener(inputDeviceListener, Handler(looper))
         }
     }
 
@@ -149,10 +143,12 @@ object ControllerInterface {
     private fun unregisterInputDeviceListener() {
         if (inputDeviceListener != null) {
             val im = DolphinApplication.getAppContext()
-                .getSystemService(Context.INPUT_SERVICE) as InputManager?
+                .getSystemService(Context.INPUT_SERVICE) as InputManager
 
-            im!!.unregisterInputDeviceListener(inputDeviceListener)
+            im.unregisterInputDeviceListener(inputDeviceListener)
             inputDeviceListener = null
+            handlerThread?.quitSafely()
+            handlerThread = null
         }
     }
 
@@ -172,8 +168,9 @@ object ControllerInterface {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
             val vibratorManager = DolphinApplication.getAppContext()
                 .getSystemService(Context.VIBRATOR_MANAGER_SERVICE) as VibratorManager?
-            if (vibratorManager != null)
+            if (vibratorManager != null) {
                 return DolphinVibratorManagerPassthrough(vibratorManager)
+            }
         }
         val vibrator = DolphinApplication.getAppContext()
             .getSystemService(Context.VIBRATOR_SERVICE) as Vibrator
@@ -191,13 +188,10 @@ object ControllerInterface {
     }
 
     private class InputDeviceListener : InputManager.InputDeviceListener {
-        // Simple implementation for now. We could do something fancier if we wanted to.
-        override fun onInputDeviceAdded(deviceId: Int) = refreshDevices()
+        override external fun onInputDeviceAdded(deviceId: Int)
 
-        // Simple implementation for now. We could do something fancier if we wanted to.
-        override fun onInputDeviceRemoved(deviceId: Int) = refreshDevices()
+        override external fun onInputDeviceRemoved(deviceId: Int)
 
-        // Simple implementation for now. We could do something fancier if we wanted to.
-        override fun onInputDeviceChanged(deviceId: Int) = refreshDevices()
+        override external fun onInputDeviceChanged(deviceId: Int)
     }
 }
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/BooleanSetting.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/BooleanSetting.kt
index bcb61a97f1e6..06680cdf44bd 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/BooleanSetting.kt
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/BooleanSetting.kt
@@ -31,6 +31,7 @@ enum class BooleanSetting(
         false
     ),
     MAIN_AUDIO_FILL_GAPS(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "AudioFillGaps", true),
+    MAIN_AUDIO_PRESERVE_PITCH(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, "AudioPreservePitch", false),
     MAIN_BBA_XLINK_CHAT_OSD(
         Settings.FILE_DOLPHIN,
         Settings.SECTION_INI_CORE,
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/StringSetting.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/StringSetting.kt
index 29640aa92f4b..c4f1107bcd65 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/StringSetting.kt
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/StringSetting.kt
@@ -69,6 +69,12 @@ enum class StringSetting(
         ""
     ),
     MAIN_WFS_PATH(Settings.FILE_DOLPHIN, Settings.SECTION_INI_GENERAL, "WFSPath", ""),
+    MAIN_TRIFORCE_IP_REDIRECTIONS(
+        Settings.FILE_DOLPHIN,
+        Settings.SECTION_INI_CORE,
+        "TriforceIPRedirections",
+        "0.0.0.0/0=127.0.0.1"
+    ),
     GFX_ENHANCE_POST_SHADER(
         Settings.FILE_GFX,
         Settings.SECTION_GFX_ENHANCEMENTS,
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt
index 09b71966a203..1f68bbbd1ae9 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt
@@ -556,6 +556,14 @@ class SettingsFragmentPresenter(
                 R.string.audio_fill_gaps_description
             )
         )
+        sl.add(
+            SwitchSetting(
+                context,
+                BooleanSetting.MAIN_AUDIO_PRESERVE_PITCH,
+                R.string.audio_preserve_pitch,
+                R.string.audio_preserve_pitch_description
+            )
+        )
         sl.add(
             IntSliderSetting(
                 context,
@@ -1161,7 +1169,7 @@ class SettingsFragmentPresenter(
                 R.string.overclock_title,
                 R.string.overclock_title_description,
                 0f,
-                400f,
+                500f,
                 "%",
                 1f,
                 false
@@ -1268,7 +1276,17 @@ class SettingsFragmentPresenter(
     }
 
     private fun addSerialPortSubSettings(sl: ArrayList<SettingsItem>, serialPort1Type: Int) {
-        if (serialPort1Type == 10) {
+        if (serialPort1Type == 6) {
+            // Triforce Baseboard
+            sl.add(
+                InputStringSetting(
+                    context,
+                    StringSetting.MAIN_TRIFORCE_IP_REDIRECTIONS,
+                    R.string.triforce_ip_redirections,
+                    0
+                )
+            )
+        } else if (serialPort1Type == 10) {
             // Broadband Adapter (XLink Kai)
             sl.add(HyperLinkHeaderSetting(context, R.string.xlink_kai_guide_header, 0))
             sl.add(
@@ -2344,7 +2362,7 @@ class SettingsFragmentPresenter(
 
     private fun addGcPadSubSettings(sl: ArrayList<SettingsItem>, gcPadNumber: Int, gcPadType: Int) {
         when (gcPadType) {
-            6, 8, 9, 10 -> {
+            6, 8, 9, 10, 11 -> {
                 // Emulated
                 val gcPad = EmulatedController.getGcPad(gcPadNumber)
 
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.kt
index 9cf87c3401aa..e4698ba43c81 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.kt
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.kt
@@ -232,7 +232,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
         }
     }
 
-    fun saveTemporaryState() = NativeLibrary.SaveStateAs(temporaryStateFilePath, true)
+    fun saveTemporaryState() = NativeLibrary.SaveStateAs(temporaryStateFilePath)
 
     private val temporaryStateFilePath: String
         get() = "${requireContext().filesDir}${File.separator}temp.sav"
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.kt
index 7964cc1ebc9f..3d991fed1e1c 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.kt
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.kt
@@ -2285,6 +2285,7 @@ class InputOverlay(context: Context?, attrs: AttributeSet?) : SurfaceView(contex
         const val OVERLAY_NONE = 5
         private const val DISABLED_GAMECUBE_CONTROLLER = 0
         private const val EMULATED_GAMECUBE_CONTROLLER = 6
+        private const val EMULATED_AM_BASEBOARD = 11
         private const val GAMECUBE_ADAPTER = 12
 
         // Buttons that have special positions in Wiimote only
@@ -2337,8 +2338,11 @@ class InputOverlay(context: Context?, attrs: AttributeSet?) : SurfaceView(contex
 
                 if (controllerIndex in 0 until 4) {
                     // GameCube controller
-                    if (getSettingForSIDevice(controllerIndex).int == 6)
-                        return OVERLAY_GAMECUBE
+                    when (getSettingForSIDevice(controllerIndex).int) {
+                        EMULATED_GAMECUBE_CONTROLLER, EMULATED_AM_BASEBOARD -> {
+                            return OVERLAY_GAMECUBE
+                        }
+                    }
                 } else if (controllerIndex in 4 until 8) {
                     // Wii Remote
                     val wiimoteIndex = controllerIndex - 4
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainPresenter.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainPresenter.kt
index cea17578d403..893d6a16d4d7 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainPresenter.kt
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainPresenter.kt
@@ -26,7 +26,6 @@ import org.dolphinemu.dolphinemu.model.GameFileCache
 import org.dolphinemu.dolphinemu.services.GameFileCacheManager
 import org.dolphinemu.dolphinemu.utils.AfterDirectoryInitializationRunner
 import org.dolphinemu.dolphinemu.utils.BooleanSupplier
-import org.dolphinemu.dolphinemu.utils.CompletableFuture
 import org.dolphinemu.dolphinemu.utils.ContentHandler
 import org.dolphinemu.dolphinemu.utils.DirectoryInitialization
 import org.dolphinemu.dolphinemu.utils.FileBrowserHelper
@@ -34,7 +33,8 @@ import org.dolphinemu.dolphinemu.utils.PermissionsHandler
 import org.dolphinemu.dolphinemu.utils.ThreadUtil
 import org.dolphinemu.dolphinemu.utils.WiiUtils
 import java.util.Arrays
-import java.util.concurrent.ExecutionException
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.atomic.AtomicReference
 
 class MainPresenter(private val mainView: MainView, private val activity: FragmentActivity) {
     private var dirToAdd: String? = null
@@ -104,8 +104,9 @@ class MainPresenter(private val mainView: MainView, private val activity: Fragme
 
     fun onCreate() {
         // Ask the user to grant write permission if relevant and not already granted
-        if (DirectoryInitialization.isWaitingForWriteAccess(activity))
+        if (DirectoryInitialization.isWaitingForWriteAccess(activity)) {
             PermissionsHandler.requestWritePermission(activity)
+        }
 
         val versionName = BuildConfig.VERSION_NAME
         mainView.setVersionString(versionName)
@@ -118,85 +119,83 @@ class MainPresenter(private val mainView: MainView, private val activity: Fragme
     }
 
     fun launchFileListActivity() {
-        val intent =
-            if (DirectoryInitialization.preferOldFolderPicker(activity)) {
-                FileBrowserHelper.createDirectoryPickerIntent(
-                    activity,
-                    FileBrowserHelper.GAME_EXTENSIONS,
-                )
-            } else {
-                Intent(Intent.ACTION_OPEN_DOCUMENT_TREE)
-            }
+        val intent = if (DirectoryInitialization.preferOldFolderPicker(activity)) {
+            FileBrowserHelper.createDirectoryPickerIntent(
+                activity,
+                FileBrowserHelper.GAME_EXTENSIONS,
+            )
+        } else {
+            Intent(Intent.ACTION_OPEN_DOCUMENT_TREE)
+        }
         requestDirectory.launch(intent)
     }
 
-    fun handleOptionSelection(itemId: Int, activity: ComponentActivity): Boolean =
-        when (itemId) {
-            R.id.menu_settings -> {
-                mainView.launchSettingsActivity(MenuTag.SETTINGS)
-                true
-            }
-
-            R.id.menu_grid_options -> {
-                mainView.showGridOptions()
-                true
-            }
+    fun handleOptionSelection(itemId: Int, activity: ComponentActivity): Boolean = when (itemId) {
+        R.id.menu_settings -> {
+            mainView.launchSettingsActivity(MenuTag.SETTINGS)
+            true
+        }
 
-            R.id.menu_refresh -> {
-                mainView.setRefreshing(true)
-                GameFileCacheManager.startRescan()
-                true
-            }
+        R.id.menu_grid_options -> {
+            mainView.showGridOptions()
+            true
+        }
 
-            R.id.button_add_directory -> {
-                AfterDirectoryInitializationRunner().runWithLifecycle(activity) { launchFileListActivity() }
-                true
-            }
+        R.id.menu_refresh -> {
+            mainView.setRefreshing(true)
+            GameFileCacheManager.startRescan()
+            true
+        }
 
-            R.id.menu_open_file -> {
-                requestGameFile.launch("*/*")
-                true
-            }
+        R.id.button_add_directory -> {
+            AfterDirectoryInitializationRunner().runWithLifecycle(activity) { launchFileListActivity() }
+            true
+        }
 
-            R.id.menu_load_wii_system_menu -> {
-                launchWiiSystemMenu()
-                true
-            }
+        R.id.menu_open_file -> {
+            requestGameFile.launch("*/*")
+            true
+        }
 
-            R.id.menu_online_system_update -> {
-                AfterDirectoryInitializationRunner().runWithLifecycle(activity) { launchOnlineUpdate() }
-                true
-            }
+        R.id.menu_load_wii_system_menu -> {
+            launchWiiSystemMenu()
+            true
+        }
 
-            R.id.menu_install_wad -> {
-                AfterDirectoryInitializationRunner().runWithLifecycle(
-                    activity
-                ) { requestWadFile.launch("*/*") }
-                true
-            }
+        R.id.menu_online_system_update -> {
+            AfterDirectoryInitializationRunner().runWithLifecycle(activity) { launchOnlineUpdate() }
+            true
+        }
 
-            R.id.menu_import_wii_save -> {
-                AfterDirectoryInitializationRunner().runWithLifecycle(
-                    activity
-                ) { requestWiiSaveFile.launch("*/*") }
-                true
-            }
+        R.id.menu_install_wad -> {
+            AfterDirectoryInitializationRunner().runWithLifecycle(
+                activity
+            ) { requestWadFile.launch("*/*") }
+            true
+        }
 
-            R.id.menu_import_nand_backup -> {
-                AfterDirectoryInitializationRunner().runWithLifecycle(
-                    activity
-                ) { requestNandBinFile.launch("*/*") }
-                true
-            }
+        R.id.menu_import_wii_save -> {
+            AfterDirectoryInitializationRunner().runWithLifecycle(
+                activity
+            ) { requestWiiSaveFile.launch("*/*") }
+            true
+        }
 
-            R.id.menu_about -> {
-                showAboutDialog()
-                false
-            }
+        R.id.menu_import_nand_backup -> {
+            AfterDirectoryInitializationRunner().runWithLifecycle(
+                activity
+            ) { requestNandBinFile.launch("*/*") }
+            true
+        }
 
-            else -> false
+        R.id.menu_about -> {
+            showAboutDialog()
+            false
         }
 
+        else -> false
+    }
+
     fun onResume() {
         if (dirToAdd != null) {
             GameFileCache.addGameFolder(dirToAdd!!)
@@ -226,24 +225,25 @@ class MainPresenter(private val mainView: MainView, private val activity: Fragme
         val recursive = BooleanSetting.MAIN_RECURSIVE_ISO_PATHS.boolean
         val childNames = ContentHandler.getChildNames(uri, recursive)
         if (Arrays.stream(childNames).noneMatch {
-                FileBrowserHelper.GAME_EXTENSIONS
-                    .contains(FileBrowserHelper.getExtension(it, false))
-            }) {
-            MaterialAlertDialogBuilder(activity)
-                .setMessage(
-                    activity.getString(
-                        R.string.wrong_file_extension_in_directory,
-                        FileBrowserHelper.setToSortedDelimitedString(FileBrowserHelper.GAME_EXTENSIONS)
+                FileBrowserHelper.GAME_EXTENSIONS.contains(
+                    FileBrowserHelper.getExtension(
+                        it, false
                     )
                 )
-                .setPositiveButton(android.R.string.ok, null)
-                .show()
+            }) {
+            MaterialAlertDialogBuilder(activity).setMessage(
+                activity.getString(
+                    R.string.wrong_file_extension_in_directory,
+                    FileBrowserHelper.setToSortedDelimitedString(FileBrowserHelper.GAME_EXTENSIONS)
+                )
+            ).setPositiveButton(android.R.string.ok, null).show()
         }
 
         val contentResolver = activity.contentResolver
         val canonicalizedUri = contentResolver.canonicalize(uri)
-        if (canonicalizedUri != null)
+        if (canonicalizedUri != null) {
             uri = canonicalizedUri
+        }
 
         val takeFlags = result.flags and Intent.FLAG_GRANT_READ_URI_PERMISSION
         activity.contentResolver.takePersistableUriPermission(uri, takeFlags)
@@ -253,10 +253,7 @@ class MainPresenter(private val mainView: MainView, private val activity: Fragme
 
     fun installWAD(path: String?) {
         ThreadUtil.runOnThreadAndShowResult(
-            activity,
-            R.string.import_in_progress,
-            0,
-            {
+            activity, R.string.import_in_progress, 0, {
                 val success = WiiUtils.installWAD(path!!)
                 val message =
                     if (success) R.string.wad_install_success else R.string.wad_install_failure
@@ -265,33 +262,28 @@ class MainPresenter(private val mainView: MainView, private val activity: Fragme
     }
 
     fun importWiiSave(path: String?) {
-        val canOverwriteFuture = CompletableFuture<Boolean>()
         ThreadUtil.runOnThreadAndShowResult(
-            activity,
-            R.string.import_in_progress,
-            0,
-            {
+            activity, R.string.import_in_progress, 0, {
                 val canOverwrite = BooleanSupplier {
+                    val latch = CountDownLatch(1)
+                    val decision = AtomicReference<Boolean>()
                     activity.runOnUiThread {
-                        MaterialAlertDialogBuilder(activity)
-                            .setMessage(R.string.wii_save_exists)
+                        MaterialAlertDialogBuilder(activity).setMessage(R.string.wii_save_exists)
                             .setCancelable(false)
                             .setPositiveButton(R.string.yes) { _: DialogInterface?, _: Int ->
-                                canOverwriteFuture.complete(true)
-                            }
-                            .setNegativeButton(R.string.no) { _: DialogInterface?, _: Int ->
-                                canOverwriteFuture.complete(false)
-                            }
-                            .show()
+                                decision.set(true)
+                                latch.countDown()
+                            }.setNegativeButton(R.string.no) { _: DialogInterface?, _: Int ->
+                                decision.set(false)
+                                latch.countDown()
+                            }.show()
                     }
                     try {
-                        return@BooleanSupplier canOverwriteFuture.get()
-                    } catch (e: ExecutionException) {
-                        // Shouldn't happen
-                        throw RuntimeException(e)
+                        latch.await()
                     } catch (e: InterruptedException) {
                         throw RuntimeException(e)
                     }
+                    decision.get() ?: false
                 }
 
                 val message: Int = when (WiiUtils.importWiiSave(path!!, canOverwrite)) {
@@ -306,23 +298,18 @@ class MainPresenter(private val mainView: MainView, private val activity: Fragme
     }
 
     fun importNANDBin(path: String?) {
-        MaterialAlertDialogBuilder(activity)
-            .setMessage(R.string.nand_import_warning)
+        MaterialAlertDialogBuilder(activity).setMessage(R.string.nand_import_warning)
             .setNegativeButton(R.string.no) { dialog: DialogInterface, _: Int -> dialog.dismiss() }
             .setPositiveButton(R.string.yes) { dialog: DialogInterface, _: Int ->
                 dialog.dismiss()
                 ThreadUtil.runOnThreadAndShowResult(
-                    activity,
-                    R.string.import_in_progress,
-                    R.string.do_not_close_app,
-                    {
+                    activity, R.string.import_in_progress, R.string.do_not_close_app, {
                         // ImportNANDBin unfortunately doesn't provide any result value...
                         // It does however show a panic alert if something goes wrong.
                         WiiUtils.importNANDBin(path!!)
                         null
                     })
-            }
-            .show()
+            }.show()
     }
 
     private fun launchOnlineUpdate() {
@@ -332,8 +319,7 @@ class MainPresenter(private val mainView: MainView, private val activity: Fragme
             launchUpdateProgressBarFragment(activity)
         } else {
             SystemMenuNotInstalledDialogFragment().show(
-                activity.supportFragmentManager,
-                SystemMenuNotInstalledDialogFragment.TAG
+                activity.supportFragmentManager, SystemMenuNotInstalledDialogFragment.TAG
             )
         }
     }
@@ -344,8 +330,7 @@ class MainPresenter(private val mainView: MainView, private val activity: Fragme
                 EmulationActivity.launchSystemMenu(activity)
             } else {
                 SystemMenuNotInstalledDialogFragment().show(
-                    activity.supportFragmentManager,
-                    SystemMenuNotInstalledDialogFragment.TAG
+                    activity.supportFragmentManager, SystemMenuNotInstalledDialogFragment.TAG
                 )
             }
         }
@@ -372,8 +357,9 @@ class MainPresenter(private val mainView: MainView, private val activity: Fragme
 
         private fun launchUpdateProgressBarFragment(activity: FragmentActivity) {
             val progressBarFragment = SystemUpdateProgressBarDialogFragment()
-            progressBarFragment
-                .show(activity.supportFragmentManager, SystemUpdateProgressBarDialogFragment.TAG)
+            progressBarFragment.show(
+                activity.supportFragmentManager, SystemUpdateProgressBarDialogFragment.TAG
+            )
             progressBarFragment.isCancelable = false
         }
     }
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/ActivityTracker.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/ActivityTracker.kt
index 8bcd1bdecb80..62de1f41614a 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/ActivityTracker.kt
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/ActivityTracker.kt
@@ -56,10 +56,21 @@ class ActivityTracker : ActivityLifecycleCallbacks {
 
     override fun onActivitySaveInstanceState(activity: Activity, bundle: Bundle) {}
 
+    override fun onActivityPostSaveInstanceState(activity: Activity, bundle: Bundle) {
+        if (DirectoryInitialization.areDolphinDirectoriesReady() &&
+            !activity.isChangingConfigurations
+        ) {
+            flushUnsavedData()
+        }
+    }
+
     override fun onActivityDestroyed(activity: Activity) {}
 
     companion object {
         @JvmStatic
         external fun setBackgroundExecutionAllowedNative(allowed: Boolean)
+
+        @JvmStatic
+        external fun flushUnsavedData()
     }
 }
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/CompletableFuture.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/CompletableFuture.java
deleted file mode 100644
index 1b3c4505349b..000000000000
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/CompletableFuture.java
+++ /dev/null
@@ -1,97 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.dolphinemu.dolphinemu.utils;
-
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-
-/**
- * Simplified re-implementation of a subset of {@link java.util.concurrent.CompletableFuture}.
- * Replace this class with that class once we have full Java 8 support (once we require API 24).
- */
-public class CompletableFuture<T> implements Future<T>
-{
-  private final Lock lock = new ReentrantLock();
-  private final Condition done = lock.newCondition();
-
-  private boolean isDone = false;
-  private T result = null;
-
-  @Override
-  public boolean cancel(boolean mayInterruptIfRunning)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public boolean isCancelled()
-  {
-    return false;
-  }
-
-  @Override
-  public boolean isDone()
-  {
-    return isDone;
-  }
-
-  @Override
-  public T get() throws ExecutionException, InterruptedException
-  {
-    lock.lock();
-    try
-    {
-      while (!isDone)
-        done.await();
-
-      return result;
-    }
-    finally
-    {
-      lock.unlock();
-    }
-  }
-
-  @Override
-  public T get(long timeout, TimeUnit unit)
-          throws ExecutionException, InterruptedException, TimeoutException
-  {
-    lock.lock();
-    try
-    {
-      while (!isDone)
-      {
-        if (!done.await(timeout, unit))
-          throw new TimeoutException();
-      }
-
-      return result;
-    }
-    finally
-    {
-      lock.unlock();
-    }
-  }
-
-  public boolean complete(T value)
-  {
-    lock.lock();
-    try
-    {
-      boolean wasDone = isDone;
-      result = value;
-      isDone = true;
-      done.signalAll();
-      return !wasDone;
-    }
-    finally
-    {
-      lock.unlock();
-    }
-  }
-}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Log.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Log.java
deleted file mode 100644
index 2f695278724d..000000000000
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Log.java
+++ /dev/null
@@ -1,55 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.dolphinemu.dolphinemu.utils;
-
-import org.dolphinemu.dolphinemu.BuildConfig;
-
-/**
- * Contains methods that call through to {@link android.util.Log}, but
- * with the same TAG automatically provided. Also no-ops VERBOSE and DEBUG log
- * levels in release builds.
- */
-public final class Log
-{
-  private static final String TAG = "Dolphin";
-
-  private Log()
-  {
-  }
-
-  public static void verbose(String message)
-  {
-    if (BuildConfig.DEBUG)
-    {
-      android.util.Log.v(TAG, message);
-    }
-  }
-
-  public static void debug(String message)
-  {
-    if (BuildConfig.DEBUG)
-    {
-      android.util.Log.d(TAG, message);
-    }
-  }
-
-  public static void info(String message)
-  {
-    android.util.Log.i(TAG, message);
-  }
-
-  public static void warning(String message)
-  {
-    android.util.Log.w(TAG, message);
-  }
-
-  public static void error(String message)
-  {
-    android.util.Log.e(TAG, message);
-  }
-
-  public static void wtf(String message)
-  {
-    android.util.Log.wtf(TAG, message);
-  }
-}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Log.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Log.kt
new file mode 100644
index 000000000000..28a661ffd43f
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Log.kt
@@ -0,0 +1,49 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.dolphinemu.dolphinemu.utils
+
+import org.dolphinemu.dolphinemu.BuildConfig
+import android.util.Log as AndroidLog
+
+/**
+ * Contains methods that call through to [android.util.Log], but
+ * with the same TAG automatically provided. Also no-ops VERBOSE and DEBUG log
+ * levels in release builds.
+ */
+object Log {
+    private const val TAG = "Dolphin"
+
+    @JvmStatic
+    fun verbose(message: String) {
+        if (BuildConfig.DEBUG) {
+            AndroidLog.v(TAG, message)
+        }
+    }
+
+    @JvmStatic
+    fun debug(message: String) {
+        if (BuildConfig.DEBUG) {
+            AndroidLog.d(TAG, message)
+        }
+    }
+
+    @JvmStatic
+    fun info(message: String) {
+        AndroidLog.i(TAG, message)
+    }
+
+    @JvmStatic
+    fun warning(message: String) {
+        AndroidLog.w(TAG, message)
+    }
+
+    @JvmStatic
+    fun error(message: String) {
+        AndroidLog.e(TAG, message)
+    }
+
+    @JvmStatic
+    fun wtf(message: String) {
+        AndroidLog.wtf(TAG, message)
+    }
+}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/LooperThread.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/LooperThread.java
deleted file mode 100644
index 8a67ec7e890b..000000000000
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/LooperThread.java
+++ /dev/null
@@ -1,58 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.dolphinemu.dolphinemu.utils;
-
-import android.os.Looper;
-
-public class LooperThread extends Thread
-{
-  private Looper mLooper;
-
-  public LooperThread()
-  {
-    super();
-  }
-
-  public LooperThread(String name)
-  {
-    super(name);
-  }
-
-  @Override
-  public void run()
-  {
-    Looper.prepare();
-
-    synchronized (this)
-    {
-      mLooper = Looper.myLooper();
-      notifyAll();
-    }
-
-    Looper.loop();
-  }
-
-  public Looper getLooper()
-  {
-    if (!isAlive())
-    {
-      throw new IllegalStateException();
-    }
-
-    synchronized (this)
-    {
-      while (mLooper == null)
-      {
-        try
-        {
-          wait();
-        }
-        catch (InterruptedException ignored)
-        {
-        }
-      }
-    }
-
-    return mLooper;
-  }
-}
diff --git a/Source/Android/app/src/main/res/values/arrays.xml b/Source/Android/app/src/main/res/values/arrays.xml
index 8892f7f21851..d919edb1d223 100644
--- a/Source/Android/app/src/main/res/values/arrays.xml
+++ b/Source/Android/app/src/main/res/values/arrays.xml
@@ -105,6 +105,7 @@
         <item>@string/broadband_adapter_hle</item>
         <item>@string/broadband_adapter_tapserver</item>
         <item>@string/modem_adapter_tapserver</item>
+        <item>@string/sp1_am_baseboard</item>
     </string-array>
     <integer-array name="serialPort1DeviceValues">
         <item>255</item>
@@ -113,6 +114,7 @@
         <item>12</item>
         <item>11</item>
         <item>13</item>
+        <item>6</item>
     </integer-array>
 
     <!-- Wii System Languages -->
@@ -375,6 +377,7 @@
         <item>@string/gcpad_steering_wheel</item>
         <item>@string/gcpad_dance_mat</item>
         <item>@string/gcpad_taru_konga</item>
+        <item>@string/gcpad_am_baseboard</item>
         <item>@string/gcpad_gc_adapter</item>
     </string-array>
     <integer-array name="gcpadTypeValues">
@@ -384,6 +387,7 @@
         <item>8</item>
         <item>9</item>
         <item>10</item>
+        <item>11</item>
         <item>12</item>
     </integer-array>
 
diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml
index 7ebc5867e3d4..855cb56ab85a 100644
--- a/Source/Android/app/src/main/res/values/strings.xml
+++ b/Source/Android/app/src/main/res/values/strings.xml
@@ -142,6 +142,7 @@
     <string name="modem_tapserver_destination_description">Enter the socket path or netloc (address:port) of the tapserver instance</string>
     <string name="bba_builtin_dns">DNS Server</string>
     <string name="bba_builtin_dns_description">Use 8.8.8.8 for normal DNS, else enter your custom one</string>
+    <string name="triforce_ip_redirections">IP Redirections</string>
 
     <!-- Interface Preference Fragment -->
     <string name="interface_submenu">Interface</string>
@@ -188,6 +189,8 @@
     <string name="audio_buffer_size_description">Controls the number of audio samples buffered. Lower values reduce latency but may cause more crackling or stuttering. If unsure, set this to 80 ms.</string>
     <string name="audio_fill_gaps">Fill Audio Gaps</string>
     <string name="audio_fill_gaps_description">Repeat existing audio during lag spikes to prevent stuttering. If unsure, leave this checked.</string>
+    <string name="audio_preserve_pitch">Preserve Audio Pitch</string>
+    <string name="audio_preserve_pitch_description">Keeps audio at normal pitch when changing emulation speed. Without this, audio pitch changes proportionally with speed. If unsure, leave this unchecked.</string>
     <string name="audio_volume">Audio Volume</string>
 
     <!-- Path Settings -->
@@ -705,6 +708,7 @@ It can efficiently compress both junk data and encrypted Wii data.
     <string name="broadband_adapter_hle">Broadband Adapter (HLE)</string>
     <string name="broadband_adapter_tapserver">Broadband Adapter (tapserver)</string>
     <string name="modem_adapter_tapserver">Modem Adapter (tapserver)</string>
+    <string name="sp1_am_baseboard">Triforce Baseboard</string>
 
     <!-- Sound Mode -->
     <string name="sound_mode_mono">Mono</string>
@@ -809,6 +813,7 @@ It can efficiently compress both junk data and encrypted Wii data.
     <string name="gcpad_steering_wheel">Steering Wheel</string>
     <string name="gcpad_dance_mat">Dance Mat</string>
     <string name="gcpad_taru_konga">DK Bongos</string>
+    <string name="gcpad_am_baseboard">Triforce Baseboard</string>
     <string name="gcpad_gc_adapter">GameCube Adapter</string>
 
     <!-- Wiimote Types -->
diff --git a/Source/Android/app/src/main/res/values/themes.xml b/Source/Android/app/src/main/res/values/themes.xml
index e2e24397b90c..efd994af8e05 100644
--- a/Source/Android/app/src/main/res/values/themes.xml
+++ b/Source/Android/app/src/main/res/values/themes.xml
@@ -13,7 +13,7 @@
     </style>
 
     <!-- Base theme -->
-    <style name="Theme.Dolphin" parent="Theme.Material3.DayNight.NoActionBar">
+    <style name="Theme.Dolphin" parent="Theme.Material3.DynamicColors.DayNight.NoActionBar">
         <item name="colorPrimary">@color/dolphin_primary</item>
         <item name="colorOnPrimary">@color/dolphin_onPrimary</item>
         <item name="colorPrimaryContainer">@color/dolphin_primaryContainer</item>
diff --git a/Source/Android/benchmark/build.gradle.kts b/Source/Android/benchmark/build.gradle.kts
index 06267c42e565..242aff8f8606 100644
--- a/Source/Android/benchmark/build.gradle.kts
+++ b/Source/Android/benchmark/build.gradle.kts
@@ -1,4 +1,5 @@
 import com.android.build.api.dsl.ManagedVirtualDevice
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id("com.android.test")
@@ -15,8 +16,10 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = "17"
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.fromTarget("17")
+        }
     }
 
     defaultConfig {
diff --git a/Source/Android/jni/ActivityTracker.cpp b/Source/Android/jni/ActivityTracker.cpp
index b8718905769a..20fc7df79ad2 100644
--- a/Source/Android/jni/ActivityTracker.cpp
+++ b/Source/Android/jni/ActivityTracker.cpp
@@ -5,6 +5,8 @@
 
 #include "Common/Logging/Log.h"
 #include "Core/AchievementManager.h"
+#include "UICommon/UICommon.h"
+#include "jni/Host.h"
 
 extern "C" {
 
@@ -18,4 +20,11 @@ Java_org_dolphinemu_dolphinemu_utils_ActivityTracker_setBackgroundExecutionAllow
   INFO_LOG_FMT(CORE, "SetBackgroundExecutionAllowed {}", allowed);
   AchievementManager::GetInstance().SetBackgroundExecutionAllowed(allowed);
 }
+
+JNIEXPORT void JNICALL
+Java_org_dolphinemu_dolphinemu_utils_ActivityTracker_flushUnsavedData(JNIEnv*, jclass)
+{
+  HostThreadLock guard;
+  UICommon::FlushUnsavedData();
+}
 }
diff --git a/Source/Android/jni/AndroidCommon/AndroidCommon.cpp b/Source/Android/jni/AndroidCommon/AndroidCommon.cpp
index a976d573b8df..029b64aa367c 100644
--- a/Source/Android/jni/AndroidCommon/AndroidCommon.cpp
+++ b/Source/Android/jni/AndroidCommon/AndroidCommon.cpp
@@ -5,6 +5,7 @@
 
 #include <algorithm>
 #include <ios>
+#include <span>
 #include <string>
 #include <string_view>
 #include <vector>
@@ -49,9 +50,13 @@ std::vector<std::string> JStringArrayToVector(JNIEnv* env, jobjectArray array)
   return result;
 }
 
-jobjectArray VectorToJStringArray(JNIEnv* env, const std::vector<std::string>& vector)
+jobjectArray SpanToJStringArray(JNIEnv* env, std::span<const std::string_view> span)
 {
-  return VectorToJObjectArray(env, vector, IDCache::GetStringClass(), ToJString);
+  return SpanToJObjectArray(env, span, IDCache::GetStringClass(), ToJString);
+}
+jobjectArray SpanToJStringArray(JNIEnv* env, std::span<const std::string> span)
+{
+  return SpanToJObjectArray(env, span, IDCache::GetStringClass(), ToJString);
 }
 
 bool IsPathAndroidContent(std::string_view uri)
@@ -193,13 +198,13 @@ std::vector<std::string> GetAndroidContentChildNames(std::string_view uri)
 }
 
 std::vector<std::string> DoFileSearchAndroidContent(std::string_view directory,
-                                                    const std::vector<std::string>& extensions,
+                                                    std::span<const std::string_view> extensions,
                                                     bool recursive)
 {
   JNIEnv* env = IDCache::GetEnvForThread();
 
   jstring j_directory = ToJString(env, directory);
-  jobjectArray j_extensions = VectorToJStringArray(env, extensions);
+  jobjectArray j_extensions = SpanToJStringArray(env, extensions);
 
   jobjectArray j_result = reinterpret_cast<jobjectArray>(env->CallStaticObjectMethod(
       IDCache::GetContentHandlerClass(), IDCache::GetContentHandlerDoFileSearch(), j_directory,
diff --git a/Source/Android/jni/AndroidCommon/AndroidCommon.h b/Source/Android/jni/AndroidCommon/AndroidCommon.h
index cc8679541824..e04180ef20b2 100644
--- a/Source/Android/jni/AndroidCommon/AndroidCommon.h
+++ b/Source/Android/jni/AndroidCommon/AndroidCommon.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <ios>
+#include <span>
 #include <string>
 #include <string_view>
 #include <vector>
@@ -14,22 +15,30 @@ std::string GetJString(JNIEnv* env, jstring jstr);
 jstring ToJString(JNIEnv* env, std::string_view str);
 
 std::vector<std::string> JStringArrayToVector(JNIEnv* env, jobjectArray array);
-jobjectArray VectorToJStringArray(JNIEnv* env, const std::vector<std::string>& vector);
+jobjectArray SpanToJStringArray(JNIEnv* env, std::span<const std::string_view> span);
+jobjectArray SpanToJStringArray(JNIEnv* env, std::span<const std::string> span);
 
 template <typename T, typename F>
-jobjectArray VectorToJObjectArray(JNIEnv* env, const std::vector<T>& vector, jclass clazz, F f)
+jobjectArray SpanToJObjectArray(JNIEnv* env, std::span<const T> span, jclass clazz, F f)
 {
-  const auto vector_size = static_cast<jsize>(vector.size());
-  jobjectArray result = env->NewObjectArray(vector_size, clazz, nullptr);
-  for (jsize i = 0; i < vector_size; ++i)
+  const auto span_size = static_cast<jsize>(span.size());
+  jobjectArray result = env->NewObjectArray(span_size, clazz, nullptr);
+  for (jsize i = 0; i < span_size; ++i)
   {
-    jobject obj = f(env, vector[i]);
+    jobject obj = f(env, span[i]);
     env->SetObjectArrayElement(result, i, obj);
     env->DeleteLocalRef(obj);
   }
   return result;
 }
 
+template <typename T, typename F>
+inline jobjectArray VectorToJObjectArray(JNIEnv* env, const std::vector<T>& vector, jclass clazz,
+                                         F f)
+{
+  return SpanToJObjectArray(env, std::span(vector), clazz, f);
+}
+
 // Returns true if the given path should be opened as Android content instead of a normal file.
 bool IsPathAndroidContent(std::string_view uri);
 
@@ -55,7 +64,7 @@ std::string GetAndroidContentDisplayName(std::string_view uri);
 std::vector<std::string> GetAndroidContentChildNames(std::string_view uri);
 
 std::vector<std::string> DoFileSearchAndroidContent(std::string_view directory,
-                                                    const std::vector<std::string>& extensions,
+                                                    std::span<const std::string_view> extensions,
                                                     bool recursive);
 
 int GetNetworkIpAddress();
diff --git a/Source/Android/jni/Config/NativeConfig.cpp b/Source/Android/jni/Config/NativeConfig.cpp
index 8478174dae20..c524c0ea9e6e 100644
--- a/Source/Android/jni/Config/NativeConfig.cpp
+++ b/Source/Android/jni/Config/NativeConfig.cpp
@@ -11,7 +11,6 @@
 #include "Core/ConfigLoaders/GameConfigLoader.h"
 #include "Core/ConfigLoaders/IsSettingSaveable.h"
 #include "jni/AndroidCommon/AndroidCommon.h"
-#include "jni/Host.h"
 
 constexpr jint LAYER_BASE_OR_CURRENT = 0;
 constexpr jint LAYER_BASE = 1;
@@ -143,10 +142,6 @@ Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_unloadGameIn
 JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_save(
     JNIEnv*, jclass, jint layer)
 {
-  // HostThreadLock is used to ensure we don't try to save to SYSCONF at the same time as
-  // emulation shutdown does
-  HostThreadLock guard;
-
   return GetLayer(layer, {})->Save();
 }
 
diff --git a/Source/Android/jni/Config/PostProcessing.cpp b/Source/Android/jni/Config/PostProcessing.cpp
index ea1b9d8ad4a9..5576c2d314a4 100644
--- a/Source/Android/jni/Config/PostProcessing.cpp
+++ b/Source/Android/jni/Config/PostProcessing.cpp
@@ -15,20 +15,20 @@ JNIEXPORT jobjectArray JNICALL
 Java_org_dolphinemu_dolphinemu_features_settings_model_PostProcessing_getShaderList(JNIEnv* env,
                                                                                     jclass)
 {
-  return VectorToJStringArray(env, VideoCommon::PostProcessing::GetShaderList());
+  return SpanToJStringArray(env, VideoCommon::PostProcessing::GetShaderList());
 }
 
 JNIEXPORT jobjectArray JNICALL
 Java_org_dolphinemu_dolphinemu_features_settings_model_PostProcessing_getAnaglyphShaderList(
     JNIEnv* env, jclass)
 {
-  return VectorToJStringArray(env, VideoCommon::PostProcessing::GetAnaglyphShaderList());
+  return SpanToJStringArray(env, VideoCommon::PostProcessing::GetAnaglyphShaderList());
 }
 
 JNIEXPORT jobjectArray JNICALL
 Java_org_dolphinemu_dolphinemu_features_settings_model_PostProcessing_getPassiveShaderList(
     JNIEnv* env, jclass)
 {
-  return VectorToJStringArray(env, VideoCommon::PostProcessing::GetPassiveShaderList());
+  return SpanToJStringArray(env, VideoCommon::PostProcessing::GetPassiveShaderList());
 }
 }
diff --git a/Source/Android/jni/GameList/GameFileCache.cpp b/Source/Android/jni/GameList/GameFileCache.cpp
index 27c3b0ef6368..c0a78c8cee29 100644
--- a/Source/Android/jni/GameList/GameFileCache.cpp
+++ b/Source/Android/jni/GameList/GameFileCache.cpp
@@ -1,6 +1,8 @@
 // Copyright 2018 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <algorithm>
+#include <iterator>
 #include <memory>
 #include <vector>
 
@@ -35,14 +37,16 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_model_GameFileCache_finali
 JNIEXPORT jobjectArray JNICALL Java_org_dolphinemu_dolphinemu_model_GameFileCache_getAllGamePaths(
     JNIEnv* env, jclass, jobjectArray folder_paths, jboolean recursive_scan)
 {
-  return VectorToJStringArray(
-      env, UICommon::FindAllGamePaths(JStringArrayToVector(env, folder_paths), recursive_scan));
+  const std::vector<std::string> paths = JStringArrayToVector(env, folder_paths);
+  std::vector<std::string_view> path_views;
+  std::ranges::copy(paths, std::back_inserter(path_views));
+  return SpanToJStringArray(env, UICommon::FindAllGamePaths(path_views, recursive_scan));
 }
 
 JNIEXPORT jobjectArray JNICALL
 Java_org_dolphinemu_dolphinemu_model_GameFileCache_getIsoPaths(JNIEnv* env, jclass)
 {
-  return VectorToJStringArray(env, Config::GetIsoPaths());
+  return SpanToJStringArray(env, Config::GetIsoPaths());
 }
 
 JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_model_GameFileCache_setIsoPaths(
diff --git a/Source/Android/jni/GpuDriver.cpp b/Source/Android/jni/GpuDriver.cpp
index cff81691e723..de37ab8d4032 100644
--- a/Source/Android/jni/GpuDriver.cpp
+++ b/Source/Android/jni/GpuDriver.cpp
@@ -7,7 +7,8 @@
 
 #include <jni.h>
 
-#include "Common/EnumUtils.h"
+#include <utility>
+
 #include "Common/IniFile.h"
 #include "jni/AndroidCommon/AndroidCommon.h"
 #include "jni/AndroidCommon/IDCache.h"
@@ -70,7 +71,7 @@ Java_org_dolphinemu_dolphinemu_utils_GpuDriverHelper_00024Companion_getSystemDri
     properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2;
     properties2.pNext = &driverProperties;
     vkGetPhysicalDeviceProperties2(gpu_list.front(), &properties2);
-    driverId = fmt::format("{}", Common::ToUnderlying(driverProperties.driverID));
+    driverId = fmt::format("{}", std::to_underlying(driverProperties.driverID));
   }
   else
   {
diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp
index 7c78f49045b2..71128334034a 100644
--- a/Source/Android/jni/MainAndroid.cpp
+++ b/Source/Android/jni/MainAndroid.cpp
@@ -310,19 +310,17 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_eglBindAPI(J
 }
 
 JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SaveState(JNIEnv*, jclass,
-                                                                              jint slot,
-                                                                              jboolean wait)
+                                                                              jint slot)
 {
   HostThreadLock guard;
-  State::Save(Core::System::GetInstance(), slot, wait);
+  State::Save(Core::System::GetInstance(), slot);
 }
 
 JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SaveStateAs(JNIEnv* env, jclass,
-                                                                                jstring path,
-                                                                                jboolean wait)
+                                                                                jstring path)
 {
   HostThreadLock guard;
-  State::SaveAs(Core::System::GetInstance(), GetJString(env, path), wait);
+  State::SaveAs(Core::System::GetInstance(), GetJString(env, path));
 }
 
 JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_LoadState(JNIEnv*, jclass,
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 405f160e66ec..08d63f583fd3 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -16,7 +16,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "Windows" OR MINGW)
 endif()
 
 if (NOT MSVC)
-  set(CMAKE_CXX_STANDARD 20)
+  set(CMAKE_CXX_STANDARD 23)
   set(CMAKE_CXX_STANDARD_REQUIRED ON)
   set(CMAKE_CXX_EXTENSIONS OFF)
 endif()
@@ -80,7 +80,7 @@ add_definitions(-D__STDC_CONSTANT_MACROS)
 
 check_symbol_exists(elf_aux_info sys/auxv.h HAVE_ELF_AUX_INFO)
 if(HAVE_ELF_AUX_INFO)
-    add_definitions(-DHAVE_ELF_AUX_INFO)
+  add_definitions(-DHAVE_ELF_AUX_INFO)
 endif()
 
 add_subdirectory(Core)
diff --git a/Source/Core/AudioCommon/AlsaSoundStream.cpp b/Source/Core/AudioCommon/AlsaSoundStream.cpp
index b9e817331c78..5a60f9d45ae6 100644
--- a/Source/Core/AudioCommon/AlsaSoundStream.cpp
+++ b/Source/Core/AudioCommon/AlsaSoundStream.cpp
@@ -5,7 +5,6 @@
 
 #include <mutex>
 
-#include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
 #include "Common/Thread.h"
 
diff --git a/Source/Core/AudioCommon/CubebStream.cpp b/Source/Core/AudioCommon/CubebStream.cpp
index 539db7845ea4..7f2c0936c3b4 100644
--- a/Source/Core/AudioCommon/CubebStream.cpp
+++ b/Source/Core/AudioCommon/CubebStream.cpp
@@ -7,9 +7,7 @@
 
 #include "AudioCommon/CubebUtils.h"
 #include "Common/CommonTypes.h"
-#include "Common/Event.h"
 #include "Common/Logging/Log.h"
-#include "Common/ScopeGuard.h"
 #include "Core/Config/MainSettings.h"
 
 #ifdef _WIN32
diff --git a/Source/Core/AudioCommon/CubebStream.h b/Source/Core/AudioCommon/CubebStream.h
index 723abff51ac0..db5d14b33e24 100644
--- a/Source/Core/AudioCommon/CubebStream.h
+++ b/Source/Core/AudioCommon/CubebStream.h
@@ -7,7 +7,9 @@
 #include <vector>
 
 #include "AudioCommon/SoundStream.h"
+#ifdef _WIN32
 #include "Common/WorkQueueThread.h"
+#endif
 
 #ifdef HAVE_CUBEB
 #include <cubeb/cubeb.h>
diff --git a/Source/Core/AudioCommon/Mixer.cpp b/Source/Core/AudioCommon/Mixer.cpp
index eab73fb17c99..0d673a9e0db6 100644
--- a/Source/Core/AudioCommon/Mixer.cpp
+++ b/Source/Core/AudioCommon/Mixer.cpp
@@ -71,7 +71,7 @@ void Mixer::MixerFifo::Mix(s16* samples, std::size_t num_samples)
       static_cast<double>(FIXED_SAMPLE_RATE_DIVIDEND) / m_input_sample_rate_divisor;
 
   const double emulation_speed = m_mixer->m_config_emulation_speed;
-  if (0 < emulation_speed && emulation_speed != 1.0)
+  if (!m_mixer->m_config_audio_preserve_pitch && 0 < emulation_speed && emulation_speed != 1.0)
     in_sample_rate *= emulation_speed;
 
   const double base = static_cast<double>(1 << GRANULE_FRAC_BITS);
@@ -430,6 +430,7 @@ void Mixer::StopLogDSPAudio()
 void Mixer::RefreshConfig()
 {
   m_config_emulation_speed = Config::Get(Config::MAIN_EMULATION_SPEED);
+  m_config_audio_preserve_pitch = Config::Get(Config::MAIN_AUDIO_PRESERVE_PITCH);
   m_config_fill_audio_gaps = Config::Get(Config::MAIN_AUDIO_FILL_GAPS);
   m_config_audio_buffer_ms = Config::Get(Config::MAIN_AUDIO_BUFFER_SIZE);
 }
diff --git a/Source/Core/AudioCommon/Mixer.h b/Source/Core/AudioCommon/Mixer.h
index 808ce540ec6f..87939895e2fb 100644
--- a/Source/Core/AudioCommon/Mixer.h
+++ b/Source/Core/AudioCommon/Mixer.h
@@ -163,6 +163,7 @@ class Mixer final
   bool m_log_dsp_audio = false;
 
   float m_config_emulation_speed;
+  bool m_config_audio_preserve_pitch;
   bool m_config_fill_audio_gaps;
   int m_config_audio_buffer_ms;
 
diff --git a/Source/Core/AudioCommon/OpenALStream.h b/Source/Core/AudioCommon/OpenALStream.h
index 909626b671c4..1630c0396083 100644
--- a/Source/Core/AudioCommon/OpenALStream.h
+++ b/Source/Core/AudioCommon/OpenALStream.h
@@ -3,15 +3,15 @@
 
 #pragma once
 
-#include <thread>
-
 #include "AudioCommon/SoundStream.h"
-#include "Common/Event.h"
 
 #ifdef _WIN32
 #include <al.h>
 #include <alc.h>
 #include <alext.h>
+#include <thread>
+
+#include "Common/Event.h"
 
 // OpenAL requires a minimum of two buffers, three or more recommended
 #define OAL_BUFFERS 3
diff --git a/Source/Core/AudioCommon/WASAPIStream.cpp b/Source/Core/AudioCommon/WASAPIStream.cpp
index ecbcf6a6af7c..64d114c496a4 100644
--- a/Source/Core/AudioCommon/WASAPIStream.cpp
+++ b/Source/Core/AudioCommon/WASAPIStream.cpp
@@ -6,6 +6,7 @@
 #ifdef _WIN32
 
 // clang-format off
+#include <initguid.h>
 #include <audioclient.h>
 #include <mmdeviceapi.h>
 #include <functiondiscoverykeys_devpkey.h>
@@ -94,13 +95,13 @@ static void ForEachNamedDevice(const std::function<bool(ComPtr<IMMDevice>, std::
   ComPtr<IMMDeviceEnumerator> enumerator;
 
   result = CoCreateInstance(__uuidof(MMDeviceEnumerator), nullptr, CLSCTX_INPROC_SERVER,
-                            IID_PPV_ARGS(enumerator.GetAddressOf()));
+                            IID_PPV_ARGS(&enumerator));
 
   if (!HandleWinAPI("Failed to create MMDeviceEnumerator", result))
     return;
 
   ComPtr<IMMDeviceCollection> devices;
-  result = enumerator->EnumAudioEndpoints(eRender, DEVICE_STATE_ACTIVE, devices.GetAddressOf());
+  result = enumerator->EnumAudioEndpoints(eRender, DEVICE_STATE_ACTIVE, &devices);
 
   if (!HandleWinAPI("Failed to get available devices", result))
     return;
@@ -111,13 +112,13 @@ static void ForEachNamedDevice(const std::function<bool(ComPtr<IMMDevice>, std::
   for (u32 i = 0; i < count; i++)
   {
     ComPtr<IMMDevice> device;
-    devices->Item(i, device.GetAddressOf());
+    devices->Item(i, &device);
     if (!HandleWinAPI("Failed to get device " + std::to_string(i), result))
       continue;
 
     ComPtr<IPropertyStore> device_properties;
 
-    result = device->OpenPropertyStore(STGM_READ, device_properties.GetAddressOf());
+    result = device->OpenPropertyStore(STGM_READ, &device_properties);
 
     if (!HandleWinAPI("Failed to initialize IPropertyStore", result))
       continue;
@@ -161,9 +162,8 @@ ComPtr<IMMDevice> WASAPIStream::GetDeviceByName(std::string_view name)
 bool WASAPIStream::Init()
 {
   ASSERT(m_enumerator == nullptr);
-  HRESULT const result =
-      CoCreateInstance(__uuidof(MMDeviceEnumerator), nullptr, CLSCTX_INPROC_SERVER,
-                       IID_PPV_ARGS(m_enumerator.GetAddressOf()));
+  HRESULT const result = CoCreateInstance(__uuidof(MMDeviceEnumerator), nullptr,
+                                          CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&m_enumerator));
 
   if (!HandleWinAPI("Failed to create MMDeviceEnumerator", result))
     return false;
@@ -181,7 +181,7 @@ bool WASAPIStream::SetRunning(bool running)
 
     if (Config::Get(Config::MAIN_WASAPI_DEVICE) == "default")
     {
-      result = m_enumerator->GetDefaultAudioEndpoint(eRender, eConsole, device.GetAddressOf());
+      result = m_enumerator->GetDefaultAudioEndpoint(eRender, eConsole, &device);
     }
     else
     {
@@ -192,7 +192,7 @@ bool WASAPIStream::SetRunning(bool running)
       {
         ERROR_LOG_FMT(AUDIO, "Can't find device '{}', falling back to default",
                       Config::Get(Config::MAIN_WASAPI_DEVICE));
-        result = m_enumerator->GetDefaultAudioEndpoint(eRender, eConsole, device.GetAddressOf());
+        result = m_enumerator->GetDefaultAudioEndpoint(eRender, eConsole, &device);
       }
     }
 
@@ -202,7 +202,7 @@ bool WASAPIStream::SetRunning(bool running)
     // Show a friendly name in the log
     ComPtr<IPropertyStore> device_properties;
 
-    result = device->OpenPropertyStore(STGM_READ, device_properties.GetAddressOf());
+    result = device->OpenPropertyStore(STGM_READ, &device_properties);
 
     if (!HandleWinAPI("Failed to initialize IPropertyStore", result))
       return false;
@@ -215,8 +215,7 @@ bool WASAPIStream::SetRunning(bool running)
     ComPtr<IAudioClient> audio_client;
 
     // Get IAudioDevice
-    result = device->Activate(__uuidof(IAudioClient), CLSCTX_INPROC_SERVER, nullptr,
-                              reinterpret_cast<LPVOID*>(audio_client.GetAddressOf()));
+    result = device->Activate(__uuidof(IAudioClient), CLSCTX_INPROC_SERVER, nullptr, &audio_client);
 
     if (!HandleWinAPI("Failed to activate IAudioClient", result))
       return false;
@@ -252,8 +251,8 @@ bool WASAPIStream::SetRunning(bool running)
         return false;
 
       // Get IAudioDevice
-      result = device->Activate(__uuidof(IAudioClient), CLSCTX_INPROC_SERVER, nullptr,
-                                reinterpret_cast<LPVOID*>(audio_client.ReleaseAndGetAddressOf()));
+      result =
+          device->Activate(__uuidof(IAudioClient), CLSCTX_INPROC_SERVER, nullptr, &audio_client);
 
       if (!HandleWinAPI("Failed to reactivate IAudioClient", result))
         return false;
@@ -279,7 +278,7 @@ bool WASAPIStream::SetRunning(bool running)
 
     ComPtr<IAudioRenderClient> audio_renderer;
 
-    result = audio_client->GetService(IID_PPV_ARGS(audio_renderer.GetAddressOf()));
+    result = audio_client->GetService(IID_PPV_ARGS(&audio_renderer));
 
     if (!HandleWinAPI("Failed to get IAudioRenderClient from IAudioClient", result))
       return false;
diff --git a/Source/Core/AudioCommon/WaveFile.cpp b/Source/Core/AudioCommon/WaveFile.cpp
index 89cdced4de74..042b9d7a7ff3 100644
--- a/Source/Core/AudioCommon/WaveFile.cpp
+++ b/Source/Core/AudioCommon/WaveFile.cpp
@@ -16,7 +16,6 @@
 #include "Common/StringUtil.h"
 #include "Common/Swap.h"
 #include "Core/Config/MainSettings.h"
-#include "Core/ConfigManager.h"
 
 constexpr size_t WaveFileWriter::BUFFER_SIZE;
 
diff --git a/Source/Core/Common/Arm64Emitter.cpp b/Source/Core/Common/Arm64Emitter.cpp
index 6f157ece62cf..51c9823d170d 100644
--- a/Source/Core/Common/Arm64Emitter.cpp
+++ b/Source/Core/Common/Arm64Emitter.cpp
@@ -3156,6 +3156,10 @@ void ARM64FloatEmitter::DUP(u8 size, ARM64Reg Rd, ARM64Reg Rn, u8 index)
 
   EmitCopy(IsQuad(Rd), 0, imm5, 0, Rd, Rn);
 }
+void ARM64FloatEmitter::EOR(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+  EmitThreeSame(1, 0, 3, Rd, Rn, Rm);
+}
 void ARM64FloatEmitter::FABS(u8 size, ARM64Reg Rd, ARM64Reg Rn)
 {
   Emit2RegMisc(IsQuad(Rd), 0, 2 | (size >> 6), 0xF, Rd, Rn);
@@ -3505,6 +3509,53 @@ void ARM64FloatEmitter::UCVTF(ARM64Reg Rd, ARM64Reg Rn, int scale)
   EmitConversion2(sf, 0, false, type, 0, 3, 64 - scale, Rd, Rn);
 }
 
+// Comparison
+void ARM64FloatEmitter::CMEQ(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+  EmitThreeSame(1, MathUtil::IntLog2(size) - 3, 0x11, Rd, Rn, Rm);
+}
+void ARM64FloatEmitter::CMEQ(u8 size, ARM64Reg Rd, ARM64Reg Rn)
+{
+  Emit2RegMisc(IsQuad(Rd), 0, MathUtil::IntLog2(size) - 3, 0x9, Rd, Rn);
+}
+void ARM64FloatEmitter::CMGE(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+  EmitThreeSame(0, MathUtil::IntLog2(size) - 3, 0x7, Rd, Rn, Rm);
+}
+void ARM64FloatEmitter::CMGE(u8 size, ARM64Reg Rd, ARM64Reg Rn)
+{
+  Emit2RegMisc(IsQuad(Rd), 1, MathUtil::IntLog2(size) - 3, 0x8, Rd, Rn);
+}
+void ARM64FloatEmitter::CMGT(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+  EmitThreeSame(0, MathUtil::IntLog2(size) - 3, 0x6, Rd, Rn, Rm);
+}
+void ARM64FloatEmitter::CMGT(u8 size, ARM64Reg Rd, ARM64Reg Rn)
+{
+  Emit2RegMisc(IsQuad(Rd), 0, MathUtil::IntLog2(size) - 3, 0x8, Rd, Rn);
+}
+void ARM64FloatEmitter::CMHI(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+  EmitThreeSame(1, MathUtil::IntLog2(size) - 3, 0x6, Rd, Rn, Rm);
+}
+void ARM64FloatEmitter::CMHS(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+  EmitThreeSame(1, MathUtil::IntLog2(size) - 3, 0x7, Rd, Rn, Rm);
+}
+void ARM64FloatEmitter::CMLE(u8 size, ARM64Reg Rd, ARM64Reg Rn)
+{
+  Emit2RegMisc(IsQuad(Rd), 1, MathUtil::IntLog2(size) - 3, 0x9, Rd, Rn);
+}
+void ARM64FloatEmitter::CMLT(u8 size, ARM64Reg Rd, ARM64Reg Rn)
+{
+  Emit2RegMisc(IsQuad(Rd), 0, MathUtil::IntLog2(size) - 3, 0xA, Rd, Rn);
+}
+void ARM64FloatEmitter::CMTST(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm)
+{
+  EmitThreeSame(0, MathUtil::IntLog2(size) - 3, 0x11, Rd, Rn, Rm);
+}
+
+// Float comparison
 void ARM64FloatEmitter::FCMP(ARM64Reg Rn, ARM64Reg Rm)
 {
   EmitCompare(0, 0, 0, 0, Rn, Rm);
@@ -3664,7 +3715,7 @@ void ARM64FloatEmitter::SHL(u8 src_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift)
 {
   ASSERT_MSG(DYNA_REC, shift < src_size, "Shift amount must be less than the element size! {} {}",
              shift, src_size);
-  EmitShiftImm(1, 0, src_size | shift, 0b01010, Rd, Rn);
+  EmitShiftImm(IsQuad(Rd), 0, src_size | shift, 0b01010, Rd, Rn);
 }
 
 void ARM64FloatEmitter::SSHLL(u8 src_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift, bool upper)
@@ -3674,11 +3725,18 @@ void ARM64FloatEmitter::SSHLL(u8 src_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift,
   EmitShiftImm(upper, 0, src_size | shift, 0b10100, Rd, Rn);
 }
 
+void ARM64FloatEmitter::SSHR(u8 src_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift)
+{
+  ASSERT_MSG(DYNA_REC, shift < src_size, "Shift amount must be less than the element size! {} {}",
+             shift, src_size);
+  EmitShiftImm(IsQuad(Rd), 0, src_size * 2 - shift, 0b00000, Rd, Rn);
+}
+
 void ARM64FloatEmitter::URSHR(u8 src_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift)
 {
   ASSERT_MSG(DYNA_REC, shift < src_size, "Shift amount must be less than the element size! {} {}",
              shift, src_size);
-  EmitShiftImm(1, 1, src_size * 2 - shift, 0b00100, Rd, Rn);
+  EmitShiftImm(IsQuad(Rd), 1, src_size * 2 - shift, 0b00100, Rd, Rn);
 }
 
 void ARM64FloatEmitter::USHLL(u8 src_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift, bool upper)
diff --git a/Source/Core/Common/Arm64Emitter.h b/Source/Core/Common/Arm64Emitter.h
index 134f9b64cce5..d0c91abd6191 100644
--- a/Source/Core/Common/Arm64Emitter.h
+++ b/Source/Core/Common/Arm64Emitter.h
@@ -800,6 +800,7 @@ class ARM64XEmitter
     ARM64Reg zr = Is64Bit(Rd) ? ARM64Reg::ZR : ARM64Reg::WZR;
     CSINV(Rd, zr, zr, (CCFlags)((u32)cond ^ 1));
   }
+  void CNEG(ARM64Reg Rd, ARM64Reg Rn, CCFlags cond) { CSNEG(Rd, Rn, Rn, (CCFlags)((u32)cond ^ 1)); }
   void NEG(ARM64Reg Rd, ARM64Reg Rs) { SUB(Rd, Is64Bit(Rd) ? ARM64Reg::ZR : ARM64Reg::WZR, Rs); }
   void NEG(ARM64Reg Rd, ARM64Reg Rs, ArithOption Option)
   {
@@ -1281,6 +1282,7 @@ class ARM64FloatEmitter
   void BIT(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
   void BSL(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
   void DUP(u8 size, ARM64Reg Rd, ARM64Reg Rn, u8 index);
+  void EOR(ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
   void FABS(u8 size, ARM64Reg Rd, ARM64Reg Rn);
   void FADD(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
   void FMAX(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
@@ -1342,6 +1344,19 @@ class ARM64FloatEmitter
   void SCVTF(ARM64Reg Rd, ARM64Reg Rn, int scale);
   void UCVTF(ARM64Reg Rd, ARM64Reg Rn, int scale);
 
+  // Comparison
+  void CMEQ(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+  void CMEQ(u8 size, ARM64Reg Rd, ARM64Reg Rn);
+  void CMGE(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+  void CMGE(u8 size, ARM64Reg Rd, ARM64Reg Rn);
+  void CMGT(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+  void CMGT(u8 size, ARM64Reg Rd, ARM64Reg Rn);
+  void CMHI(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+  void CMHS(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+  void CMLE(u8 size, ARM64Reg Rd, ARM64Reg Rn);
+  void CMLT(u8 size, ARM64Reg Rd, ARM64Reg Rn);
+  void CMTST(u8 size, ARM64Reg Rd, ARM64Reg Rn, ARM64Reg Rm);
+
   // Float comparison
   void FCMP(ARM64Reg Rn, ARM64Reg Rm);
   void FCMP(ARM64Reg Rn);
@@ -1380,6 +1395,7 @@ class ARM64FloatEmitter
   void SHL(u8 src_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift);
   void SSHLL(u8 src_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift);
   void SSHLL2(u8 src_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift);
+  void SSHR(u8 src_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift);
   void URSHR(u8 src_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift);
   void USHLL(u8 src_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift);
   void USHLL2(u8 src_size, ARM64Reg Rd, ARM64Reg Rn, u32 shift);
diff --git a/Source/Core/Common/Assembler/AssemblerShared.h b/Source/Core/Common/Assembler/AssemblerShared.h
index 23bf5be0ce35..0bcce3e48cb6 100644
--- a/Source/Core/Common/Assembler/AssemblerShared.h
+++ b/Source/Core/Common/Assembler/AssemblerShared.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #include <cstddef>
-#include <cstdint>
 #include <string>
 #include <string_view>
 #include <variant>
diff --git a/Source/Core/Common/Assembler/CaseInsensitiveDict.h b/Source/Core/Common/Assembler/CaseInsensitiveDict.h
index 5dffbb633522..050dd7e68044 100644
--- a/Source/Core/Common/Assembler/CaseInsensitiveDict.h
+++ b/Source/Core/Common/Assembler/CaseInsensitiveDict.h
@@ -4,10 +4,10 @@
 #pragma once
 
 #include <array>
+#include <cctype>
+#include <cstdint>
 #include <optional>
-#include <string>
 #include <string_view>
-#include <type_traits>
 #include <utility>
 #include <vector>
 
diff --git a/Source/Core/Common/Assembler/GekkoAssembler.cpp b/Source/Core/Common/Assembler/GekkoAssembler.cpp
index 4ee97c59d9c4..b58c56021fa3 100644
--- a/Source/Core/Common/Assembler/GekkoAssembler.cpp
+++ b/Source/Core/Common/Assembler/GekkoAssembler.cpp
@@ -3,7 +3,6 @@
 
 #include "Common/Assembler/GekkoAssembler.h"
 
-#include <algorithm>
 #include <array>
 #include <string>
 #include <vector>
diff --git a/Source/Core/Common/Assembler/GekkoIRGen.cpp b/Source/Core/Common/Assembler/GekkoIRGen.cpp
index 51cbbb4208ce..b32c0fd582f6 100644
--- a/Source/Core/Common/Assembler/GekkoIRGen.cpp
+++ b/Source/Core/Common/Assembler/GekkoIRGen.cpp
@@ -17,7 +17,6 @@
 #include "Common/Assembler/AssemblerShared.h"
 #include "Common/Assembler/GekkoParser.h"
 #include "Common/Assert.h"
-#include "Common/BitUtils.h"
 
 namespace Common::GekkoAssembler::detail
 {
@@ -844,7 +843,7 @@ void GekkoIRPlugin::EvalTerminalAbs(Terminal type, const AssemblerToken& tok)
 
   case Terminal::NumLabFwd:
     m_owner->EmitErrorHere(
-        fmt::format("Forward label references not supported in fully resolved expressons"));
+        fmt::format("Forward label references not supported in fully resolved expressions"));
     break;
 
   case Terminal::NumLabBwd:
diff --git a/Source/Core/Common/Assembler/GekkoIRGen.h b/Source/Core/Common/Assembler/GekkoIRGen.h
index 4a1a56fa6686..00bf9dbdb530 100644
--- a/Source/Core/Common/Assembler/GekkoIRGen.h
+++ b/Source/Core/Common/Assembler/GekkoIRGen.h
@@ -7,7 +7,6 @@
 #include <vector>
 
 #include "Common/Assembler/AssemblerShared.h"
-#include "Common/Assembler/GekkoLexer.h"
 #include "Common/CommonTypes.h"
 
 namespace Common::GekkoAssembler::detail
diff --git a/Source/Core/Common/Assembler/GekkoLexer.cpp b/Source/Core/Common/Assembler/GekkoLexer.cpp
index 2b643601e1d2..4cfb1c6243ce 100644
--- a/Source/Core/Common/Assembler/GekkoLexer.cpp
+++ b/Source/Core/Common/Assembler/GekkoLexer.cpp
@@ -3,7 +3,6 @@
 
 #include "Common/Assembler/GekkoLexer.h"
 
-#include "Common/Assert.h"
 #include "Common/StringUtil.h"
 
 #include <iterator>
diff --git a/Source/Core/Common/Assembler/GekkoLexer.h b/Source/Core/Common/Assembler/GekkoLexer.h
index bd99fa511b46..f20a951e97b8 100644
--- a/Source/Core/Common/Assembler/GekkoLexer.h
+++ b/Source/Core/Common/Assembler/GekkoLexer.h
@@ -8,7 +8,6 @@
 #include <deque>
 #include <optional>
 #include <string_view>
-#include <type_traits>
 #include <vector>
 
 #include "Common/Assembler/AssemblerShared.h"
diff --git a/Source/Core/Common/Assembler/GekkoParser.cpp b/Source/Core/Common/Assembler/GekkoParser.cpp
index ddd3f65e1f79..d76aad9be894 100644
--- a/Source/Core/Common/Assembler/GekkoParser.cpp
+++ b/Source/Core/Common/Assembler/GekkoParser.cpp
@@ -3,9 +3,7 @@
 
 #include "Common/Assembler/GekkoParser.h"
 
-#include <algorithm>
 #include <array>
-#include <functional>
 
 #include <fmt/format.h>
 
diff --git a/Source/Core/Common/BitUtils.h b/Source/Core/Common/BitUtils.h
index e052c8aeff4b..458fff63a33d 100644
--- a/Source/Core/Common/BitUtils.h
+++ b/Source/Core/Common/BitUtils.h
@@ -11,6 +11,7 @@
 #include <initializer_list>
 #include <span>
 #include <type_traits>
+#include <utility>
 
 #include "Common/CommonTypes.h"
 
@@ -188,7 +189,7 @@ template <typename ValueType, typename From>
 }
 
 template <typename T>
-void SetBit(T& value, size_t bit_number, bool bit_value)
+constexpr void SetBit(T& value, size_t bit_number, bool bit_value)
 {
   static_assert(std::is_unsigned<T>(), "SetBit is only sane on unsigned types.");
 
@@ -199,7 +200,7 @@ void SetBit(T& value, size_t bit_number, bool bit_value)
 }
 
 template <size_t bit_number, typename T>
-void SetBit(T& value, bool bit_value)
+constexpr void SetBit(T& value, bool bit_value)
 {
   SetBit(value, bit_number, bit_value);
 }
@@ -208,23 +209,20 @@ template <typename T>
 class FlagBit
 {
 public:
-  FlagBit(std::underlying_type_t<T>& bits, T bit) : m_bits(bits), m_bit(bit) {}
-  explicit operator bool() const
-  {
-    return (m_bits & static_cast<std::underlying_type_t<T>>(m_bit)) != 0;
-  }
-  FlagBit& operator=(const bool rhs)
+  FlagBit(T* bits, std::type_identity_t<T> bit) : m_bits(*bits), m_bit(bit) {}
+  explicit operator bool() const { return (m_bits & m_bit) != 0; }
+  FlagBit& operator=(const bool rhs) requires(!std::is_const_v<T>)
   {
     if (rhs)
-      m_bits |= static_cast<std::underlying_type_t<T>>(m_bit);
+      m_bits |= m_bit;
     else
-      m_bits &= ~static_cast<std::underlying_type_t<T>>(m_bit);
+      m_bits &= ~m_bit;
     return *this;
   }
 
 private:
-  std::underlying_type_t<T>& m_bits;
-  T m_bit;
+  T& m_bits;
+  const T m_bit;
 };
 
 template <typename T>
@@ -239,7 +237,8 @@ class Flags
       m_hex |= static_cast<std::underlying_type_t<T>>(bit);
     }
   }
-  FlagBit<T> operator[](T bit) { return FlagBit(m_hex, bit); }
+  auto operator[](T bit) { return FlagBit(&m_hex, std::to_underlying(bit)); }
+  auto operator[](T bit) const { return FlagBit(&m_hex, std::to_underlying(bit)); }
 
   std::underlying_type_t<T> m_hex = 0;
 };
diff --git a/Source/Core/Common/Buffer.h b/Source/Core/Common/Buffer.h
index 3915424fbfbd..4b1aa8ac5a85 100644
--- a/Source/Core/Common/Buffer.h
+++ b/Source/Core/Common/Buffer.h
@@ -7,7 +7,7 @@
 
 // UniqueBuffer<T> and SharedBuffer<T> are a lighter alternative to std::vector<T>.
 // The main benefit is that elements are not value-initialized like in vector.
-// That can be quite a bit of unecessary overhead when allocating a large buffer.
+// That can be quite a bit of unnecessary overhead when allocating a large buffer.
 
 namespace Common
 {
diff --git a/Source/Core/Common/CMakeLists.txt b/Source/Core/Common/CMakeLists.txt
index 77bfe106a04c..142d2e34293d 100644
--- a/Source/Core/Common/CMakeLists.txt
+++ b/Source/Core/Common/CMakeLists.txt
@@ -60,7 +60,6 @@ add_library(common
   ENet.h
   EnumFormatter.h
   EnumMap.h
-  EnumUtils.h
   Event.h
   FatFsUtil.cpp
   FatFsUtil.h
@@ -128,7 +127,6 @@ add_library(common
   QoSSession.h
   Random.cpp
   Random.h
-  Result.h
   ScopeGuard.h
   SDCardUtil.cpp
   SDCardUtil.h
@@ -153,11 +151,11 @@ add_library(common
   Timer.h
   TimeUtil.cpp
   TimeUtil.h
+  TransferableSharedMutex.h
   TraversalClient.cpp
   TraversalClient.h
   TraversalProto.h
   TypeUtils.h
-  Unreachable.h
   UPnP.cpp
   UPnP.h
   VariantUtil.h
@@ -183,7 +181,7 @@ PUBLIC
   enet::enet
   fmt::fmt
   MbedTLS::mbedtls
-  minizip-ng::minizip-ng
+  MINIZIP::minizip-ng
   sfml-network
 
 PRIVATE
@@ -405,7 +403,7 @@ if(UNIX AND NOT LIBRETRO)
     )
   configure_file(
     "${CMAKE_CURRENT_SOURCE_DIR}/build_info.txt.in"
-    "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/build_info.txt"
+    "${CMAKE_BINARY_DIR}/build_info.txt"
     )
 
   target_link_libraries(common PRIVATE "-INCLUDE:enableCompatPatches")
diff --git a/Source/Core/Common/ChunkFile.h b/Source/Core/Common/ChunkFile.h
index 7e48e6e9132e..f44f08d2792c 100644
--- a/Source/Core/Common/ChunkFile.h
+++ b/Source/Core/Common/ChunkFile.h
@@ -264,9 +264,9 @@ class PointerWrap
   }
 
   template <typename T>
+  requires(std::is_trivially_copyable_v<T> && !std::is_pointer_v<T>)
   void Do(T& x)
   {
-    static_assert(std::is_trivially_copyable_v<T>, "Only sane for trivially copyable types");
     // Note:
     // Usually we can just use x = **ptr, etc.  However, this doesn't work
     // for unions containing BitFields (long story, stupid language rules)
diff --git a/Source/Core/Common/CommonFuncs.cpp b/Source/Core/Common/CommonFuncs.cpp
index 5e0a496ea35a..369d09066ec8 100644
--- a/Source/Core/Common/CommonFuncs.cpp
+++ b/Source/Core/Common/CommonFuncs.cpp
@@ -6,7 +6,6 @@
 #include <cstddef>
 #include <cstring>
 #include <errno.h>
-#include <type_traits>
 
 #ifdef _WIN32
 #include <windows.h>
diff --git a/Source/Core/Common/CommonFuncs.h b/Source/Core/Common/CommonFuncs.h
index 1b13aa84a2b6..07de216559a2 100644
--- a/Source/Core/Common/CommonFuncs.h
+++ b/Source/Core/Common/CommonFuncs.h
@@ -3,14 +3,14 @@
 
 #pragma once
 
+#ifdef _WIN32
 #include <optional>
+#endif
 #include <string>
 #ifdef __MINGW32__
 #include <sys/stat.h>
 #endif
 
-#include "Common/CommonTypes.h"
-
 #ifndef _WIN32
 
 // go to debugger mode
diff --git a/Source/Core/Common/CommonPaths.h b/Source/Core/Common/CommonPaths.h
index d0efa6600655..474890c4d859 100644
--- a/Source/Core/Common/CommonPaths.h
+++ b/Source/Core/Common/CommonPaths.h
@@ -41,11 +41,13 @@
 #define USA_DIR "USA"
 #define JAP_DIR "JAP"
 #define JPN_DIR "JPN"
+#define DEV_DIR "DEV"
 
 // Subdirs in the User dir returned by GetUserPath(D_USER_IDX)
 #define GC_USER_DIR "GC"
 #define GBA_USER_DIR "GBA"
 #define WII_USER_DIR "Wii"
+#define TRI_USER_DIR "Triforce"
 #define CONFIG_DIR "Config"
 #define GAMESETTINGS_DIR "GameSettings"
 #define MAPS_DIR "Maps"
@@ -155,6 +157,7 @@
 // Subdirs in Sys
 #define GC_SYS_DIR "GC"
 #define WII_SYS_DIR "Wii"
+#define TRI_SYS_DIR "Triforce"
 
 // Subdirs in Config
 #define GRAPHICSMOD_CONFIG_DIR "GraphicMods"
diff --git a/Source/Core/Common/CompatPatches.cpp b/Source/Core/Common/CompatPatches.cpp
index 768a9e53f569..91394e96c0b9 100644
--- a/Source/Core/Common/CompatPatches.cpp
+++ b/Source/Core/Common/CompatPatches.cpp
@@ -124,7 +124,7 @@ class ImportPatcher
   PIMAGE_DATA_DIRECTORY directories;
 };
 
-void CompatPatchesInstall(LdrWatcher* watcher)
+static void CompatPatchesInstall(LdrWatcher* watcher)
 {
   watcher->Install({{L"EZFRD64.dll", L"811EZFRD64.DLL"}, [](const LdrDllLoadEvent& event) {
                       // *EZFRD64 is included in software packages for cheapo third-party gamepads
diff --git a/Source/Core/Common/Config/Config.h b/Source/Core/Common/Config/Config.h
index 1e0b32551b19..d8a2a9a691d3 100644
--- a/Source/Core/Common/Config/Config.h
+++ b/Source/Core/Common/Config/Config.h
@@ -5,7 +5,6 @@
 
 #include <functional>
 #include <limits>
-#include <map>
 #include <memory>
 #include <optional>
 #include <string>
diff --git a/Source/Core/Common/Config/Layer.cpp b/Source/Core/Common/Config/Layer.cpp
index 5520e02d2e03..09cee1dfeb3a 100644
--- a/Source/Core/Common/Config/Layer.cpp
+++ b/Source/Core/Common/Config/Layer.cpp
@@ -3,12 +3,6 @@
 
 #include "Common/Config/Layer.h"
 
-#include <algorithm>
-#include <cstring>
-#include <map>
-
-#include "Common/Config/Config.h"
-
 namespace Config
 {
 ConfigLayerLoader::ConfigLayerLoader(LayerType layer) : m_layer(layer)
diff --git a/Source/Core/Common/Crypto/AES.cpp b/Source/Core/Common/Crypto/AES.cpp
index e0ffa5591d39..a83812ff2eb9 100644
--- a/Source/Core/Common/Crypto/AES.cpp
+++ b/Source/Core/Common/Crypto/AES.cpp
@@ -4,7 +4,6 @@
 #include "Common/Crypto/AES.h"
 
 #include <array>
-#include <bit>
 #include <memory>
 
 #include <mbedtls/aes.h>
diff --git a/Source/Core/Common/Crypto/HMAC.cpp b/Source/Core/Common/Crypto/HMAC.cpp
index 660817ea7578..6313f44e5002 100644
--- a/Source/Core/Common/Crypto/HMAC.cpp
+++ b/Source/Core/Common/Crypto/HMAC.cpp
@@ -1,7 +1,7 @@
 // Copyright 2023 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include <mbedtls/hmac_drbg.h>
+#include "mbedtls/md.h"
 
 #include "Common/Crypto/HMAC.h"
 #include "Common/ScopeGuard.h"
diff --git a/Source/Core/Common/Crypto/ec.cpp b/Source/Core/Common/Crypto/ec.cpp
index cdfe228f8141..c8b85eb38770 100644
--- a/Source/Core/Common/Crypto/ec.cpp
+++ b/Source/Core/Common/Crypto/ec.cpp
@@ -8,9 +8,7 @@
 #include <cstring>
 
 #include "Common/Crypto/bn.h"
-#include "Common/Inline.h"
 #include "Common/Random.h"
-#include "Common/StringUtil.h"
 
 namespace Common::ec
 {
diff --git a/Source/Core/Common/Debug/MemoryPatches.cpp b/Source/Core/Common/Debug/MemoryPatches.cpp
index 0becba1ddea5..b9f6e14901f2 100644
--- a/Source/Core/Common/Debug/MemoryPatches.cpp
+++ b/Source/Core/Common/Debug/MemoryPatches.cpp
@@ -4,7 +4,6 @@
 #include "Common/Debug/MemoryPatches.h"
 
 #include <algorithm>
-#include <sstream>
 #include <utility>
 
 namespace Common::Debug
diff --git a/Source/Core/Common/Debug/MemoryPatches.h b/Source/Core/Common/Debug/MemoryPatches.h
index 607bb831a036..187934beca7d 100644
--- a/Source/Core/Common/Debug/MemoryPatches.h
+++ b/Source/Core/Common/Debug/MemoryPatches.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #include <cstddef>
-#include <string>
 #include <vector>
 
 #include "Common/CommonTypes.h"
diff --git a/Source/Core/Common/DynamicLibrary.cpp b/Source/Core/Common/DynamicLibrary.cpp
index ce5fcd58648e..ca6c17be6dd9 100644
--- a/Source/Core/Common/DynamicLibrary.cpp
+++ b/Source/Core/Common/DynamicLibrary.cpp
@@ -7,8 +7,6 @@
 
 #include <fmt/format.h>
 
-#include "Common/Assert.h"
-
 #ifdef _WIN32
 #include <windows.h>
 #else
diff --git a/Source/Core/Common/EnumUtils.h b/Source/Core/Common/EnumUtils.h
deleted file mode 100644
index 1a13f59dae8a..000000000000
--- a/Source/Core/Common/EnumUtils.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: CC0-1.0
-
-#pragma once
-
-#include <type_traits>
-
-namespace Common
-{
-// TODO: Replace with std::to_underlying in C++23
-template <typename Enum>
-constexpr std::underlying_type_t<Enum> ToUnderlying(Enum e) noexcept
-{
-  return static_cast<std::underlying_type_t<Enum>>(e);
-}
-}  // namespace Common
diff --git a/Source/Core/Common/FatFsUtil.cpp b/Source/Core/Common/FatFsUtil.cpp
index 80e2c424b44a..004d84b688bc 100644
--- a/Source/Core/Common/FatFsUtil.cpp
+++ b/Source/Core/Common/FatFsUtil.cpp
@@ -4,7 +4,6 @@
 #include "Common/FatFsUtil.h"
 
 #include <algorithm>
-#include <cmath>
 #include <cstdlib>
 #include <mutex>
 #include <string>
diff --git a/Source/Core/Common/FileSearch.cpp b/Source/Core/Common/FileSearch.cpp
index 36727ace4a6f..016f1db7ff8f 100644
--- a/Source/Core/Common/FileSearch.cpp
+++ b/Source/Core/Common/FileSearch.cpp
@@ -5,8 +5,6 @@
 
 #include <algorithm>
 #include <filesystem>
-#include <functional>
-#include <iterator>
 #include <system_error>
 
 #include "Common/CommonPaths.h"
@@ -15,22 +13,16 @@
 
 #ifdef _MSC_VER
 #include <windows.h>
-#else
-#ifdef ANDROID
+#elifdef ANDROID
 #include "jni/AndroidCommon/AndroidCommon.h"
 #endif
 
-#include <cstring>
-#include "Common/CommonFuncs.h"
-#include "Common/FileUtil.h"
-#endif
-
 namespace fs = std::filesystem;
 
 namespace Common
 {
-std::vector<std::string> DoFileSearch(const std::vector<std::string>& directories,
-                                      const std::vector<std::string>& exts, bool recursive)
+std::vector<std::string> DoFileSearch(std::span<const std::string_view> directories,
+                                      std::span<const std::string_view> exts, bool recursive)
 {
   const bool accept_all = exts.empty();
 
diff --git a/Source/Core/Common/FileSearch.h b/Source/Core/Common/FileSearch.h
index ac8fb7bf1b63..ef28e244d37a 100644
--- a/Source/Core/Common/FileSearch.h
+++ b/Source/Core/Common/FileSearch.h
@@ -3,14 +3,36 @@
 
 #pragma once
 
+#include <span>
 #include <string>
+#include <string_view>
 #include <vector>
 
 namespace Common
 {
 // Callers can pass empty "exts" to indicate they want all files + directories in results
 // Otherwise, only files matching the extensions are returned
-std::vector<std::string> DoFileSearch(const std::vector<std::string>& directories,
-                                      const std::vector<std::string>& exts = {},
+std::vector<std::string> DoFileSearch(std::span<const std::string_view> directories,
+                                      std::span<const std::string_view> exts = {},
                                       bool recursive = false);
+
+inline std::vector<std::string> DoFileSearch(std::span<const std::string_view> directories,
+                                             std::string_view ext, bool recursive = false)
+{
+  return DoFileSearch(directories, std::span(&ext, 1), recursive);
+}
+
+inline std::vector<std::string> DoFileSearch(std::string_view directory,
+                                             std::span<const std::string_view> exts = {},
+                                             bool recursive = false)
+{
+  return DoFileSearch(std::span(&directory, 1), exts, recursive);
+}
+
+inline std::vector<std::string> DoFileSearch(std::string_view directory, std::string_view ext,
+                                             bool recursive = false)
+{
+  return DoFileSearch(std::span(&directory, 1), std::span(&ext, 1), recursive);
+}
+
 }  // namespace Common
diff --git a/Source/Core/Common/FileUtil.cpp b/Source/Core/Common/FileUtil.cpp
index 896318439da6..cd6e3e997e5e 100644
--- a/Source/Core/Common/FileUtil.cpp
+++ b/Source/Core/Common/FileUtil.cpp
@@ -3,28 +3,24 @@
 
 #include "Common/FileUtil.h"
 
-#include <algorithm>
-#include <chrono>
 #include <cstddef>
 #include <cstdint>
 #include <cstdio>
 #include <cstring>
 #include <fcntl.h>
 #include <filesystem>
-#include <fstream>
 #include <limits.h>
 #include <stack>
 #include <string>
-#include <sys/stat.h>
 #include <system_error>
-#include <thread>
 #include <vector>
 
-#include "Common/Assert.h"
-#include "Common/Common.h"
 #include "Common/CommonFuncs.h"
 #include "Common/CommonPaths.h"
 #include "Common/CommonTypes.h"
+#ifdef ANDROID
+#include "Common/Assert.h"
+#endif
 #ifdef __APPLE__
 #include "Common/DynamicLibrary.h"
 #endif
@@ -42,8 +38,6 @@
 #include <share.h>
 #include <shellapi.h>
 #else
-#include <dirent.h>
-#include <errno.h>
 #include <libgen.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -861,6 +855,7 @@ static void RebuildUserDirectories(unsigned int dir_index)
   case D_USER_IDX:
     s_user_paths[D_GCUSER_IDX] = s_user_paths[D_USER_IDX] + GC_USER_DIR DIR_SEP;
     s_user_paths[D_WIIROOT_IDX] = s_user_paths[D_USER_IDX] + WII_USER_DIR DIR_SEP;
+    s_user_paths[D_TRIUSER_IDX] = s_user_paths[D_USER_IDX] + TRI_USER_DIR DIR_SEP;
     s_user_paths[D_CONFIG_IDX] = s_user_paths[D_USER_IDX] + CONFIG_DIR DIR_SEP;
     s_user_paths[D_GAMESETTINGS_IDX] = s_user_paths[D_USER_IDX] + GAMESETTINGS_DIR DIR_SEP;
     s_user_paths[D_MAPS_IDX] = s_user_paths[D_USER_IDX] + MAPS_DIR DIR_SEP;
diff --git a/Source/Core/Common/FileUtil.h b/Source/Core/Common/FileUtil.h
index 9023f3164e41..50d3e3fc9da7 100644
--- a/Source/Core/Common/FileUtil.h
+++ b/Source/Core/Common/FileUtil.h
@@ -3,9 +3,7 @@
 
 #pragma once
 
-#include <cstddef>
 #include <filesystem>
-#include <fstream>
 #include <string>
 #include <string_view>
 #include <vector>
@@ -28,7 +26,8 @@ enum
 {
   D_USER_IDX,
   D_GCUSER_IDX,
-  D_WIIROOT_IDX,          // always points to User/Wii or global user-configured directory
+  D_WIIROOT_IDX,  // always points to User/Wii or global user-configured directory
+  D_TRIUSER_IDX,
   D_SESSION_WIIROOT_IDX,  // may point to minimal temporary directory for determinism
   D_CONFIG_IDX,           // global settings
   D_GAMESETTINGS_IDX,     // user-specified settings which override both the global and the default
diff --git a/Source/Core/Common/GL/GLInterface/EGL.cpp b/Source/Core/Common/GL/GLInterface/EGL.cpp
index 30230e7d082e..a0bf6dcbab1b 100644
--- a/Source/Core/Common/GL/GLInterface/EGL.cpp
+++ b/Source/Core/Common/GL/GLInterface/EGL.cpp
@@ -4,7 +4,6 @@
 #include "Common/GL/GLInterface/EGL.h"
 
 #include <array>
-#include <cstdlib>
 #include <sstream>
 #include <vector>
 
diff --git a/Source/Core/Common/GL/GLInterface/WGL.cpp b/Source/Core/Common/GL/GLInterface/WGL.cpp
index 03796e7e11a8..d322bffcce39 100644
--- a/Source/Core/Common/GL/GLInterface/WGL.cpp
+++ b/Source/Core/Common/GL/GLInterface/WGL.cpp
@@ -143,7 +143,7 @@ static void LoadWGLExtensions()
   wglReleasePbufferDCARB =
       reinterpret_cast<PFNWGLRELEASEPBUFFERDCARBPROC>(wglGetProcAddress("wglReleasePbufferDCARB"));
   wglDestroyPbufferARB =
-      reinterpret_cast<PFNWGLDESTROYPBUFFERARBPROC>(wglGetProcAddress("wglGetPbufferDCARB"));
+      reinterpret_cast<PFNWGLDESTROYPBUFFERARBPROC>(wglGetProcAddress("wglDestroyPbufferARB"));
 }
 
 static void ClearWGLExtensionPointers()
diff --git a/Source/Core/Common/GL/GLUtil.cpp b/Source/Core/Common/GL/GLUtil.cpp
index 9f65e7158b36..f447d55d3fb7 100644
--- a/Source/Core/Common/GL/GLUtil.cpp
+++ b/Source/Core/Common/GL/GLUtil.cpp
@@ -3,9 +3,6 @@
 
 #include "Common/GL/GLUtil.h"
 
-#include <memory>
-
-#include "Common/Assert.h"
 #include "Common/GL/GLContext.h"
 #include "Common/Logging/Log.h"
 
diff --git a/Source/Core/Common/GL/GLX11Window.cpp b/Source/Core/Common/GL/GLX11Window.cpp
index d8f072d1a72a..1fb8c1935cec 100644
--- a/Source/Core/Common/GL/GLX11Window.cpp
+++ b/Source/Core/Common/GL/GLX11Window.cpp
@@ -3,8 +3,6 @@
 
 #include "Common/GL/GLX11Window.h"
 
-#include "Common/GL/GLContext.h"
-
 GLX11Window::GLX11Window(Display* display, Window parent_window, Colormap color_map, Window window,
                          int width, int height)
     : m_display(display), m_parent_window(parent_window), m_color_map(color_map), m_window(window),
diff --git a/Source/Core/Common/GekkoDisassembler.cpp b/Source/Core/Common/GekkoDisassembler.cpp
index 18ed219e643f..6dc66a8f1e33 100644
--- a/Source/Core/Common/GekkoDisassembler.cpp
+++ b/Source/Core/Common/GekkoDisassembler.cpp
@@ -493,7 +493,7 @@ void GekkoDisassembler::trapi(u32 in, unsigned char dmode)
 
   if (cnd != nullptr)
   {
-    m_opcode = fmt::format("t{}{}", dmode ? 'd' : 'w', cnd);
+    m_opcode = fmt::format("t{}{}i", dmode ? 'd' : 'w', cnd);
   }
   else
   {
@@ -918,16 +918,6 @@ void GekkoDisassembler::mtb(u32 in)
   }
 }
 
-void GekkoDisassembler::sradi(u32 in)
-{
-  int s = (int)PPCGETD(in);
-  int a = (int)PPCGETA(in);
-  int bsh = (int)(((in & 2) << 4) + PPCGETB(in));
-
-  m_opcode = fmt::format("sradi{}", (in & 1) ? "." : "");
-  m_operands = fmt::format("{}, {}, {}", regnames[a], regnames[s], bsh);
-}
-
 void GekkoDisassembler::ldst(u32 in, std::string_view name, char reg)
 {
   int s = (int)PPCGETD(in);
@@ -1094,7 +1084,7 @@ void GekkoDisassembler::ps(u32 inst)
 
   case 23:
     m_opcode = "ps_sel";
-    m_operands = fmt::format("p{}>=0?p{}:p{}", FD, FA, FC);
+    m_operands = fmt::format("p{}, p{}>=0?p{}:p{}", FD, FA, FC, FB);
     return;
 
   case 24:
@@ -1443,30 +1433,6 @@ u32* GekkoDisassembler::DoDisassembly(bool big_endian)
     ori(in, "andis.");
     break;
 
-  case 30:
-    switch ((in >> 2) & 0x7)
-    {
-    case 0:
-      rld(in, "icl", 0);  // rldicl
-      break;
-    case 1:
-      rld(in, "icr", 0);  // rldicr
-      break;
-    case 2:
-      rld(in, "ic", 0);  // rldic
-      break;
-    case 3:
-      rld(in, "imi", 0);  // rldimi
-      break;
-    case 4:
-      rld(in, in & 2 ? "cl" : "cr", 1);  // rldcl, rldcr
-      break;
-    default:
-      ill(in);
-      break;
-    }
-    break;
-
   case 31:
     switch (PPCGETIDX2(in))
     {
@@ -1813,10 +1779,6 @@ u32* GekkoDisassembler::DoDisassembly(bool big_endian)
       dab(in, "orc", 7, 1, 0, -1);
       break;
 
-    case 413:
-      sradi(in);  // sradi
-      break;
-
     case 434:
       if (in & (PPCDMASK | PPCAMASK))
         ill(in);
@@ -2291,18 +2253,6 @@ u32* GekkoDisassembler::DoDisassembly(bool big_endian)
         }
         break;
 
-      case 814:
-        fdabc(in, "fctid", 9);
-        break;
-
-      case 815:
-        fdabc(in, "fctidz", 9);
-        break;
-
-      case 846:
-        fdabc(in, "fcfid", 9);
-        break;
-
       default:
         ill(in);
         break;
diff --git a/Source/Core/Common/Hash.cpp b/Source/Core/Common/Hash.cpp
index 8cb697b6956f..a3984745f549 100644
--- a/Source/Core/Common/Hash.cpp
+++ b/Source/Core/Common/Hash.cpp
@@ -9,9 +9,7 @@
 
 #include <zlib.h>
 
-#include "Common/BitUtils.h"
 #include "Common/CPUDetect.h"
-#include "Common/CommonFuncs.h"
 #include "Common/Intrinsics.h"
 
 #ifdef _M_ARM_64
diff --git a/Source/Core/Common/IOFile.cpp b/Source/Core/Common/IOFile.cpp
index b52854fe5bdc..f68bd0454714 100644
--- a/Source/Core/Common/IOFile.cpp
+++ b/Source/Core/Common/IOFile.cpp
@@ -3,7 +3,6 @@
 
 #include "Common/IOFile.h"
 
-#include <cstddef>
 #include <cstdio>
 #include <string>
 
diff --git a/Source/Core/Common/IniFile.h b/Source/Core/Common/IniFile.h
index 31a7ee0e6b05..181175101f23 100644
--- a/Source/Core/Common/IniFile.h
+++ b/Source/Core/Common/IniFile.h
@@ -3,14 +3,12 @@
 
 #pragma once
 
-#include <algorithm>
 #include <list>
 #include <map>
 #include <string>
 #include <string_view>
 #include <vector>
 
-#include "Common/CommonTypes.h"
 #include "Common/StringUtil.h"
 
 namespace Common
diff --git a/Source/Core/Common/JitRegister.cpp b/Source/Core/Common/JitRegister.cpp
index 8e3211182f2a..94da2afdb021 100644
--- a/Source/Core/Common/JitRegister.cpp
+++ b/Source/Core/Common/JitRegister.cpp
@@ -3,17 +3,14 @@
 
 #include "Common/JitRegister.h"
 
-#include <cstddef>
 #include <cstdio>
 #include <cstdlib>
-#include <fstream>
 #include <string>
 
 #include <fmt/format.h>
 
 #include "Common/CommonTypes.h"
 #include "Common/IOFile.h"
-#include "Common/StringUtil.h"
 
 #ifdef _WIN32
 #include <process.h>
@@ -34,15 +31,21 @@ static bool s_is_enabled = false;
 
 void Init(const std::string& perf_dir)
 {
+#ifdef USE_VTUNE
+  s_is_enabled = true;
+#endif
+
   if (!perf_dir.empty() || getenv("PERF_BUILDID_DIR"))
   {
     const std::string dir = perf_dir.empty() ? "/tmp" : perf_dir;
     const std::string filename = fmt::format("{}/perf-{}.map", dir, getpid());
-    s_perf_map_file.Open(filename, "w");
-    // Disable buffering in order to avoid missing some mappings
-    // if the event of a crash:
-    std::setvbuf(s_perf_map_file.GetHandle(), nullptr, _IONBF, 0);
-    s_is_enabled = true;
+    if (s_perf_map_file.Open(filename, "w"))
+    {
+      // Disable buffering in order to avoid missing some mappings
+      // in the event of a crash:
+      std::setvbuf(s_perf_map_file.GetHandle(), nullptr, _IONBF, 0);
+      s_is_enabled = true;
+    }
   }
 }
 
@@ -65,11 +68,6 @@ bool IsEnabled()
 
 void Register(const void* base_address, u32 code_size, const std::string& symbol_name)
 {
-#ifndef USE_VTUNE
-  if (!s_perf_map_file.IsOpen())
-    return;
-#endif
-
 #ifdef USE_VTUNE
   iJIT_Method_Load jmethod = {0};
   jmethod.method_id = iJIT_GetNewMethodID();
@@ -80,7 +78,7 @@ void Register(const void* base_address, u32 code_size, const std::string& symbol
 #endif
 
   // Linux perf /tmp/perf-$pid.map:
-  if (!s_perf_map_file.IsOpen())
+  if (!s_perf_map_file)
     return;
 
   const auto entry = fmt::format("{} {:x} {}\n", fmt::ptr(base_address), code_size, symbol_name);
diff --git a/Source/Core/Common/JitRegister.h b/Source/Core/Common/JitRegister.h
index 41f020a2f6d4..b54a0c2df6ba 100644
--- a/Source/Core/Common/JitRegister.h
+++ b/Source/Core/Common/JitRegister.h
@@ -20,6 +20,9 @@ template <typename... Args>
 inline void Register(const void* base_address, u32 code_size, fmt::format_string<Args...> format,
                      Args&&... args)
 {
+  if (!IsEnabled())
+    return;
+
   Register(base_address, code_size, fmt::format(format, std::forward<Args>(args)...));
 }
 
@@ -27,6 +30,9 @@ template <typename... Args>
 inline void Register(const void* start, const void* end, fmt::format_string<Args...> format,
                      Args&&... args)
 {
+  if (!IsEnabled())
+    return;
+
   u32 code_size = (u32)((const char*)end - (const char*)start);
   Register(start, code_size, fmt::format(format, std::forward<Args>(args)...));
 }
diff --git a/Source/Core/Common/Logging/Log.h b/Source/Core/Common/Logging/Log.h
index c4f38e72f605..64d353af00d7 100644
--- a/Source/Core/Common/Logging/Log.h
+++ b/Source/Core/Common/Logging/Log.h
@@ -5,7 +5,6 @@
 
 #include <cstddef>
 #include <fmt/format.h>
-#include <string_view>
 #include "Common/FormatUtil.h"
 
 namespace Common::Log
@@ -28,6 +27,8 @@ enum class LogType : int
   DSP_MAIL,
   DSPINTERFACE,
   DVDINTERFACE,
+  AMMEDIABOARD,
+  AMMEDIABOARD_NET,
   DYNA_REC,
   EXPANSIONINTERFACE,
   FILEMON,
@@ -59,6 +60,9 @@ enum class LogType : int
   PROCESSORINTERFACE,
   POWERPC,
   SERIALINTERFACE,
+  SERIALINTERFACE_AMBB,
+  SERIALINTERFACE_CARD,
+  SERIALINTERFACE_JVSIO,
   SP1,
   SYMBOLS,
   VIDEO,
diff --git a/Source/Core/Common/Logging/LogManager.cpp b/Source/Core/Common/Logging/LogManager.cpp
index a1302a817102..6c15608420ce 100644
--- a/Source/Core/Common/Logging/LogManager.cpp
+++ b/Source/Core/Common/Logging/LogManager.cpp
@@ -6,18 +6,15 @@
 #include <algorithm>
 #include <atomic>
 #include <chrono>
-#include <cstdarg>
 #include <cstring>
-#include <locale>
+#include <fstream>
 #include <memory>
 #include <mutex>
-#include <ostream>
 #include <string>
 
 #include <fmt/chrono.h>
 #include <fmt/format.h>
 
-#include "Common/CommonPaths.h"
 #include "Common/Config/Config.h"
 #include "Common/FileUtil.h"
 #include "Common/Logging/ConsoleListener.h"
@@ -114,6 +111,8 @@ LogManager::LogManager()
   m_log[LogType::DSP_MAIL] = {"DSPMails", "DSP Mails"};
   m_log[LogType::DSPINTERFACE] = {"DSP", "DSP Interface"};
   m_log[LogType::DVDINTERFACE] = {"DVD", "DVD Interface"};
+  m_log[LogType::AMMEDIABOARD] = {"AMMB", "AMMB Interface"};
+  m_log[LogType::AMMEDIABOARD_NET] = {"AMMB_NET", "AMMB - Network"};
   m_log[LogType::DYNA_REC] = {"JIT", "JIT Dynamic Recompiler"};
   m_log[LogType::EXPANSIONINTERFACE] = {"EXI", "Expansion Interface"};
   m_log[LogType::FILEMON] = {"FileMon", "File Monitor"};
@@ -145,6 +144,9 @@ LogManager::LogManager()
   m_log[LogType::PROCESSORINTERFACE] = {"PI", "Processor Interface"};
   m_log[LogType::POWERPC] = {"PowerPC", "PowerPC IBM CPU"};
   m_log[LogType::SERIALINTERFACE] = {"SI", "Serial Interface"};
+  m_log[LogType::SERIALINTERFACE_AMBB] = {"SI_AMBB", "AMBB Interface"};
+  m_log[LogType::SERIALINTERFACE_CARD] = {"SI_CARD", "CARD Interface"};
+  m_log[LogType::SERIALINTERFACE_JVSIO] = {"SI_JVS", "JVS-I/O"};
   m_log[LogType::SP1] = {"SP1", "Serial Port 1"};
   m_log[LogType::SYMBOLS] = {"SYMBOLS", "Symbols"};
   m_log[LogType::VIDEO] = {"Video", "Video Backend"};
diff --git a/Source/Core/Common/Matrix.cpp b/Source/Core/Common/Matrix.cpp
index 44463ef1effd..9c7548711160 100644
--- a/Source/Core/Common/Matrix.cpp
+++ b/Source/Core/Common/Matrix.cpp
@@ -3,7 +3,6 @@
 
 #include "Common/Matrix.h"
 
-#include <algorithm>
 #include <cmath>
 
 #include "Common/MathUtil.h"
diff --git a/Source/Core/Common/MemArena.h b/Source/Core/Common/MemArena.h
index d9d472079cd6..1a3093cc4d40 100644
--- a/Source/Core/Common/MemArena.h
+++ b/Source/Core/Common/MemArena.h
@@ -102,10 +102,22 @@ class MemArena final
   /// from.
   /// @param size Size of the region to map.
   /// @param base Address within the memory region from ReserveMemoryRegion() where to map it.
+  /// @param writeable Whether the region should be both readable and writeable, or just readable.
   ///
   /// @return The address we actually ended up mapping, which should be the given 'base'.
   ///
-  void* MapInMemoryRegion(s64 offset, size_t size, void* base);
+  void* MapInMemoryRegion(s64 offset, size_t size, void* base, bool writeable);
+
+  ///
+  /// Changes whether a section mapped by MapInMemoryRegion is writeable.
+  ///
+  /// @param view The address returned by MapInMemoryRegion.
+  /// @param size The size passed to MapInMemoryRegion.
+  /// @param writeable Whether the region should be both readable and writeable, or just readable.
+  ///
+  /// @return Whether the operation succeeded.
+  ///
+  bool ChangeMappingProtection(void* view, size_t size, bool writeable);
 
   ///
   /// Unmap a memory region previously mapped with MapInMemoryRegion().
@@ -115,6 +127,11 @@ class MemArena final
   ///
   void UnmapFromMemoryRegion(void* view, size_t size);
 
+  ///
+  /// Return the system's page size or required page alignment, whichever is larger.
+  ///
+  size_t GetPageSize() const;
+
 private:
 #ifdef _WIN32
   WindowsMemoryRegion* EnsureSplitRegionForMapping(void* address, size_t size);
@@ -187,6 +204,14 @@ class LazyMemoryRegion final
 #endif
   }
 
+  void EnsureMemoryPagesWritable(size_t offset, size_t size)
+  {
+#ifdef _WIN32
+    for (const auto end_offset = offset + size; offset < end_offset; offset += BLOCK_SIZE)
+      EnsureMemoryPageWritable(offset);
+#endif
+  }
+
 private:
   void* m_memory = nullptr;
   size_t m_size = 0;
diff --git a/Source/Core/Common/MemArenaAndroid.cpp b/Source/Core/Common/MemArenaAndroid.cpp
index bcba64e1e1fa..81c27b7677c2 100644
--- a/Source/Core/Common/MemArenaAndroid.cpp
+++ b/Source/Core/Common/MemArenaAndroid.cpp
@@ -123,9 +123,13 @@ void MemArena::ReleaseMemoryRegion()
   }
 }
 
-void* MemArena::MapInMemoryRegion(s64 offset, size_t size, void* base)
+void* MemArena::MapInMemoryRegion(s64 offset, size_t size, void* base, bool writeable)
 {
-  void* retval = mmap(base, size, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_FIXED, m_shm_fd, offset);
+  int prot = PROT_READ;
+  if (writeable)
+    prot |= PROT_WRITE;
+
+  void* retval = mmap(base, size, prot, MAP_SHARED | MAP_FIXED, m_shm_fd, offset);
   if (retval == MAP_FAILED)
   {
     NOTICE_LOG_FMT(MEMMAP, "mmap failed");
@@ -137,6 +141,18 @@ void* MemArena::MapInMemoryRegion(s64 offset, size_t size, void* base)
   }
 }
 
+bool MemArena::ChangeMappingProtection(void* view, size_t size, bool writeable)
+{
+  int prot = PROT_READ;
+  if (writeable)
+    prot |= PROT_WRITE;
+
+  int retval = mprotect(view, size, prot);
+  if (retval != 0)
+    NOTICE_LOG_FMT(MEMMAP, "mprotect failed");
+  return retval == 0;
+}
+
 void MemArena::UnmapFromMemoryRegion(void* view, size_t size)
 {
   void* retval = mmap(view, size, PROT_NONE, MAP_SHARED | MAP_ANONYMOUS | MAP_FIXED, -1, 0);
@@ -144,6 +160,11 @@ void MemArena::UnmapFromMemoryRegion(void* view, size_t size)
     NOTICE_LOG_FMT(MEMMAP, "mmap failed");
 }
 
+size_t MemArena::GetPageSize() const
+{
+  return sysconf(_SC_PAGESIZE);
+}
+
 LazyMemoryRegion::LazyMemoryRegion() = default;
 
 LazyMemoryRegion::~LazyMemoryRegion()
diff --git a/Source/Core/Common/MemArenaDarwin.cpp b/Source/Core/Common/MemArenaDarwin.cpp
index c528e3279901..9414535be58c 100644
--- a/Source/Core/Common/MemArenaDarwin.cpp
+++ b/Source/Core/Common/MemArenaDarwin.cpp
@@ -3,6 +3,8 @@
 
 #include "Common/MemArena.h"
 
+#include <unistd.h>
+
 #include "Common/Assert.h"
 #include "Common/Logging/Log.h"
 
@@ -121,7 +123,7 @@ void MemArena::ReleaseMemoryRegion()
   m_region_size = 0;
 }
 
-void* MemArena::MapInMemoryRegion(s64 offset, size_t size, void* base)
+void* MemArena::MapInMemoryRegion(s64 offset, size_t size, void* base, bool writeable)
 {
   if (m_shm_address == 0)
   {
@@ -130,11 +132,13 @@ void* MemArena::MapInMemoryRegion(s64 offset, size_t size, void* base)
   }
 
   vm_address_t address = reinterpret_cast<vm_address_t>(base);
-  constexpr vm_prot_t prot = VM_PROT_READ | VM_PROT_WRITE;
+  vm_prot_t prot = VM_PROT_READ;
+  if (writeable)
+    prot |= VM_PROT_WRITE;
 
   kern_return_t retval =
       vm_map(mach_task_self(), &address, size, 0, VM_FLAGS_FIXED | VM_FLAGS_OVERWRITE, m_shm_entry,
-             offset, false, prot, prot, VM_INHERIT_DEFAULT);
+             offset, false, prot, VM_PROT_READ | VM_PROT_WRITE, VM_INHERIT_DEFAULT);
   if (retval != KERN_SUCCESS)
   {
     ERROR_LOG_FMT(MEMMAP, "MapInMemoryRegion failed: vm_map returned {0:#x}", retval);
@@ -144,6 +148,20 @@ void* MemArena::MapInMemoryRegion(s64 offset, size_t size, void* base)
   return reinterpret_cast<void*>(address);
 }
 
+bool MemArena::ChangeMappingProtection(void* view, size_t size, bool writeable)
+{
+  vm_address_t address = reinterpret_cast<vm_address_t>(view);
+  vm_prot_t prot = VM_PROT_READ;
+  if (writeable)
+    prot |= VM_PROT_WRITE;
+
+  kern_return_t retval = vm_protect(mach_task_self(), address, size, false, prot);
+  if (retval != KERN_SUCCESS)
+    ERROR_LOG_FMT(MEMMAP, "ChangeMappingProtection failed: vm_protect returned {0:#x}", retval);
+
+  return retval == KERN_SUCCESS;
+}
+
 void MemArena::UnmapFromMemoryRegion(void* view, size_t size)
 {
   vm_address_t address = reinterpret_cast<vm_address_t>(view);
@@ -163,6 +181,11 @@ void MemArena::UnmapFromMemoryRegion(void* view, size_t size)
   }
 }
 
+size_t MemArena::GetPageSize() const
+{
+  return getpagesize();
+}
+
 LazyMemoryRegion::LazyMemoryRegion() = default;
 
 LazyMemoryRegion::~LazyMemoryRegion()
diff --git a/Source/Core/Common/MemArenaUnix.cpp b/Source/Core/Common/MemArenaUnix.cpp
index 83026f76b8b6..fd4af4e74b36 100644
--- a/Source/Core/Common/MemArenaUnix.cpp
+++ b/Source/Core/Common/MemArenaUnix.cpp
@@ -7,7 +7,6 @@
 #include <cstddef>
 #include <cstdlib>
 #include <cstring>
-#include <set>
 #include <string>
 
 #include <fmt/format.h>
@@ -21,7 +20,6 @@
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"
-#include "Common/StringUtil.h"
 
 namespace Common
 {
@@ -89,9 +87,13 @@ void MemArena::ReleaseMemoryRegion()
   }
 }
 
-void* MemArena::MapInMemoryRegion(s64 offset, size_t size, void* base)
+void* MemArena::MapInMemoryRegion(s64 offset, size_t size, void* base, bool writeable)
 {
-  void* retval = mmap(base, size, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_FIXED, m_shm_fd, offset);
+  int prot = PROT_READ;
+  if (writeable)
+    prot |= PROT_WRITE;
+
+  void* retval = mmap(base, size, prot, MAP_SHARED | MAP_FIXED, m_shm_fd, offset);
   if (retval == MAP_FAILED)
   {
     NOTICE_LOG_FMT(MEMMAP, "mmap failed");
@@ -103,6 +105,18 @@ void* MemArena::MapInMemoryRegion(s64 offset, size_t size, void* base)
   }
 }
 
+bool MemArena::ChangeMappingProtection(void* view, size_t size, bool writeable)
+{
+  int prot = PROT_READ;
+  if (writeable)
+    prot |= PROT_WRITE;
+
+  int retval = mprotect(view, size, prot);
+  if (retval != 0)
+    NOTICE_LOG_FMT(MEMMAP, "mprotect failed");
+  return retval == 0;
+}
+
 void MemArena::UnmapFromMemoryRegion(void* view, size_t size)
 {
   void* retval = mmap(view, size, PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0);
@@ -110,6 +124,11 @@ void MemArena::UnmapFromMemoryRegion(void* view, size_t size)
     NOTICE_LOG_FMT(MEMMAP, "mmap failed");
 }
 
+size_t MemArena::GetPageSize() const
+{
+  return sysconf(_SC_PAGESIZE);
+}
+
 LazyMemoryRegion::LazyMemoryRegion() = default;
 
 LazyMemoryRegion::~LazyMemoryRegion()
diff --git a/Source/Core/Common/MemArenaWin.cpp b/Source/Core/Common/MemArenaWin.cpp
index 610b384b0806..4f57383cd772 100644
--- a/Source/Core/Common/MemArenaWin.cpp
+++ b/Source/Core/Common/MemArenaWin.cpp
@@ -318,8 +318,10 @@ WindowsMemoryRegion* MemArena::EnsureSplitRegionForMapping(void* start_address,
   }
 }
 
-void* MemArena::MapInMemoryRegion(s64 offset, size_t size, void* base)
+void* MemArena::MapInMemoryRegion(s64 offset, size_t size, void* base, bool writeable)
 {
+  void* result;
+
   if (m_memory_functions.m_api_ms_win_core_memory_l1_1_6_handle.IsOpen())
   {
     WindowsMemoryRegion* const region = EnsureSplitRegionForMapping(base, size);
@@ -329,10 +331,10 @@ void* MemArena::MapInMemoryRegion(s64 offset, size_t size, void* base)
       return nullptr;
     }
 
-    void* rv = reinterpret_cast<PMapViewOfFile3>(m_memory_functions.m_address_MapViewOfFile3)(
+    result = reinterpret_cast<PMapViewOfFile3>(m_memory_functions.m_address_MapViewOfFile3)(
         m_memory_handle, nullptr, base, offset, size, MEM_REPLACE_PLACEHOLDER, PAGE_READWRITE,
         nullptr, 0);
-    if (rv)
+    if (result)
     {
       region->m_is_mapped = true;
     }
@@ -342,11 +344,37 @@ void* MemArena::MapInMemoryRegion(s64 offset, size_t size, void* base)
 
       // revert the split, if any
       JoinRegionsAfterUnmap(base, size);
+
+      return nullptr;
     }
-    return rv;
   }
+  else
+  {
+    result =
+        MapViewOfFileEx(m_memory_handle, FILE_MAP_ALL_ACCESS, 0, (DWORD)((u64)offset), size, base);
+
+    if (!result)
+      return nullptr;
+  }
+
+  if (!writeable)
+  {
+    // If we want to use PAGE_READONLY for now while still being able to switch to PAGE_READWRITE
+    // later, we have to call MapViewOfFile with PAGE_READWRITE and then switch to PAGE_READONLY.
+    ChangeMappingProtection(base, size, writeable);
+  }
+
+  return result;
+}
 
-  return MapViewOfFileEx(m_memory_handle, FILE_MAP_ALL_ACCESS, 0, (DWORD)((u64)offset), size, base);
+bool MemArena::ChangeMappingProtection(void* view, size_t size, bool writeable)
+{
+  DWORD old_protect;
+  const int retval =
+      VirtualProtect(view, size, writeable ? PAGE_READWRITE : PAGE_READONLY, &old_protect);
+  if (retval == 0)
+    PanicAlertFmt("VirtualProtect failed: {}", GetLastErrorString());
+  return retval != 0;
 }
 
 bool MemArena::JoinRegionsAfterUnmap(void* start_address, size_t size)
@@ -438,6 +466,21 @@ void MemArena::UnmapFromMemoryRegion(void* view, size_t size)
   UnmapViewOfFile(view);
 }
 
+size_t MemArena::GetPageSize() const
+{
+  SYSTEM_INFO si;
+  GetSystemInfo(&si);
+
+  if (!m_memory_functions.m_address_MapViewOfFile3)
+  {
+    // In this case, we can only map pages that are 64K aligned.
+    // See https://devblogs.microsoft.com/oldnewthing/20031008-00/?p=42223
+    return std::max<size_t>(si.dwPageSize, 64 * 1024);
+  }
+
+  return si.dwPageSize;
+}
+
 LazyMemoryRegion::LazyMemoryRegion()
 {
   InitWindowsMemoryFunctions(&m_memory_functions);
diff --git a/Source/Core/Common/MemoryUtil.cpp b/Source/Core/Common/MemoryUtil.cpp
index 57c71f0f8143..5fe5aaf9a74a 100644
--- a/Source/Core/Common/MemoryUtil.cpp
+++ b/Source/Core/Common/MemoryUtil.cpp
@@ -5,10 +5,8 @@
 
 #include <cstddef>
 #include <cstdlib>
-#include <string>
 
 #include "Common/CommonFuncs.h"
-#include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"
 
@@ -16,10 +14,11 @@
 #include <windows.h>
 #include "Common/StringUtil.h"
 #else
-#include <pthread.h>
 #include <stdio.h>
 #include <sys/mman.h>
-#include <sys/types.h>
+#if defined(_M_ARM_64) && defined(__APPLE__)
+#include <pthread.h>
+#endif
 #if defined __APPLE__ || defined __FreeBSD__ || defined __OpenBSD__ || defined __NetBSD__
 #include <sys/sysctl.h>
 #elif defined __HAIKU__
diff --git a/Source/Core/Common/MsgHandler.cpp b/Source/Core/Common/MsgHandler.cpp
index 660782ad9da6..f6201c651fc1 100644
--- a/Source/Core/Common/MsgHandler.cpp
+++ b/Source/Core/Common/MsgHandler.cpp
@@ -3,21 +3,19 @@
 
 #include "Common/MsgHandler.h"
 
-#include <cstdarg>
 #include <cstdlib>
 #include <string>
 
 #ifdef _WIN32
 #include <windows.h>
 #else
-#include <cstdio>
 #include <fmt/format.h>
 #endif
 
-#include "Common/Common.h"
-#include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
+#ifdef _WIN32
 #include "Common/StringUtil.h"
+#endif
 
 namespace Common
 {
diff --git a/Source/Core/Common/MsgHandler.h b/Source/Core/Common/MsgHandler.h
index 0220c781863d..4fc7196a9701 100644
--- a/Source/Core/Common/MsgHandler.h
+++ b/Source/Core/Common/MsgHandler.h
@@ -3,13 +3,11 @@
 
 #pragma once
 
-#include <cstdint>
 #include <string>
 #include <utility>
 
 #include <fmt/format.h>
 
-#include "Common/FormatUtil.h"
 #include "Common/Logging/Log.h"
 
 namespace Common
diff --git a/Source/Core/Common/Network.cpp b/Source/Core/Common/Network.cpp
index e628074ffd88..c1c34b9a70ee 100644
--- a/Source/Core/Common/Network.cpp
+++ b/Source/Core/Common/Network.cpp
@@ -9,23 +9,234 @@
 #include <vector>
 
 #ifndef _WIN32
+#include <cstring>
 #include <netinet/in.h>
-#include <string.h>
 #include <sys/socket.h>
-#include <sys/types.h>
 #else
 #include <winsock2.h>
 #endif
 
 #include <fmt/format.h>
+#include <fmt/ranges.h>
 
 #include "Common/BitUtils.h"
 #include "Common/CommonFuncs.h"
+#include "Common/Logging/Log.h"
 #include "Common/Random.h"
 #include "Common/StringUtil.h"
+#include "Common/Swap.h"
 
 namespace Common
 {
+
+static constexpr auto GetMaskFromNetworkPrefixLength(u32 network_prefix_length)
+{
+  return (network_prefix_length == 0) ?
+             u32(0) :
+             u32(BigEndianValue(u32(-1) >> (32 - network_prefix_length)));
+}
+
+u32 IPv4Port::GetIPAddressValue() const
+{
+  return std::bit_cast<Common::BigEndianValue<u32>>(ip_address);
+}
+
+u16 IPv4Port::GetPortValue() const
+{
+  return std::bit_cast<Common::BigEndianValue<u16>>(port);
+}
+
+bool IPv4PortRange::IsMatch(IPv4Port subject) const
+{
+  const u32 ip_u32 = subject.GetIPAddressValue();
+  const u16 port_u16 = subject.GetPortValue();
+
+  return ip_u32 >= first.GetIPAddressValue() && ip_u32 <= last.GetIPAddressValue() &&
+         port_u16 >= first.GetPortValue() && port_u16 <= last.GetPortValue();
+}
+
+std::string IPv4PortRange::ToString() const
+{
+  const u32 first_ip_value = first.GetIPAddressValue();
+  const u32 last_ip_value = last.GetIPAddressValue();
+  const u32 different_bits = first_ip_value ^ last_ip_value;
+  const u32 common_high_bits = std::countl_zero(different_bits);
+
+  std::string ip_range = Common::IPAddressToString(first.ip_address);
+  if (common_high_bits == 32)
+  {
+    // Identical first and last IP.
+  }
+  else if ((last_ip_value - first_ip_value + 1) << common_high_bits == 0)
+  {
+    // An exact network range can use CIDR notation.
+    ip_range = fmt::format("{}/{}", ip_range, common_high_bits);
+  }
+  else if (common_high_bits >= 24)
+  {
+    // Only the last octet is different.
+    ip_range = fmt::format("{}-{}", ip_range, last.ip_address.back());
+  }
+  else
+  {
+    // Plainly specified range.
+    ip_range = fmt::format("{}-{}", ip_range, Common::IPAddressToString(last.ip_address));
+  }
+
+  if (first.port == 0)
+    return ip_range;
+
+  if (first.port == last.port)
+    return fmt::format("{}:{}", ip_range, first.GetPortValue());
+
+  return fmt::format("{}:{}-{}", ip_range, first.GetPortValue(), last.GetPortValue());
+}
+
+std::string IPAddressToString(IPAddress ip_address)
+{
+  return fmt::format("{}", fmt::join(ip_address, "."));
+}
+
+std::optional<IPv4PortRange> StringToIPv4PortRange(std::string_view subject)
+{
+  // TODO: This could be optimized and improved a lot.
+
+  auto read_pos = std::ranges::find_first_of(subject, std::string_view{"-/:"});
+
+  const auto first_ip_octets = SplitStringIntoArray<4>({subject.begin(), read_pos}, '.');
+
+  if (!first_ip_octets.has_value())
+    return std::nullopt;  // Wrong number of octets.
+
+  std::optional<IPv4PortRange> result;
+  result.emplace();
+
+  for (u32 i = 0; i != result->first.ip_address.size(); ++i)
+  {
+    if (!TryParse(std::string((*first_ip_octets)[i]), &result->first.ip_address[i]))
+      return std::nullopt;  // Bad octet.
+  }
+
+  if (read_pos == subject.end())
+  {
+    // Last IP and ports not specified.
+    result->last.ip_address = result->first.ip_address;
+    result->first.port = 0;
+    result->last.port = u16(-1);
+    return result;
+  }
+
+  if (*read_pos == '-')
+  {
+    // Read last IP.
+    ++read_pos;
+
+    const auto last_ip_end = std::ranges::find(read_pos, subject.end(), ':');
+    const auto last_ip_octets = SplitString({read_pos, last_ip_end}, '.');
+
+    // Copy octets from first_ip when less than 4 are specified.
+    // FYI: This currently allows for syntax like: 10.0.0.1-7.255
+    // I don't know if it's desirable or not to allow 2 or 3 octets on the last IP.
+    const std::size_t octet_share_count = 4 - last_ip_octets.size();
+
+    if (octet_share_count >= 4)
+      return std::nullopt;  // Too many octets.
+
+    std::copy_n(result->first.ip_address.begin(), octet_share_count,
+                result->last.ip_address.begin());
+
+    std::size_t i = octet_share_count;
+    for (auto&& octet_str : last_ip_octets)
+    {
+      if (!TryParse(octet_str, &result->last.ip_address[i]))
+        return std::nullopt;  // Bad octet.
+      ++i;
+    }
+
+    if (result->first.ip_address > result->last.ip_address)
+      return std::nullopt;  // Reversed range.
+
+    read_pos = last_ip_end;
+  }
+  else if (*read_pos == '/')
+  {
+    // Read network prefix length.
+    ++read_pos;
+
+    u32 network_prefix_length{};
+    const auto [parse_end, ec] = FromChars({read_pos, subject.end()}, network_prefix_length);
+
+    if (ec != std::errc{} || network_prefix_length > 32)
+      return std::nullopt;  // Bad network prefix.
+
+    read_pos += parse_end - std::to_address(read_pos);  // Working around MSVC iterators..
+
+    const auto net_mask = GetMaskFromNetworkPrefixLength(network_prefix_length);
+    const auto first_ip_address_u32 = std::bit_cast<u32>(result->first.ip_address) & net_mask;
+    result->first.ip_address = std::bit_cast<IPAddress>(first_ip_address_u32);
+    result->last.ip_address = std::bit_cast<IPAddress>(first_ip_address_u32 | ~net_mask);
+  }
+  else
+  {
+    // Last IP not specified.
+    result->last.ip_address = result->first.ip_address;
+  }
+
+  if (read_pos == subject.end())
+  {
+    // Ports not specified.
+    result->first.port = 0;
+    result->last.port = u16(-1);
+    return result;
+  }
+
+  if (*read_pos != ':')
+    return std::nullopt;  // Unexpected character.
+
+  u16 first_port_u16{};
+  {
+    // Read first port.
+    ++read_pos;
+
+    const auto [parse_end, ec] = FromChars({read_pos, subject.end()}, first_port_u16);
+    if (ec != std::errc{})
+      return std::nullopt;  // Bad first port.
+
+    result->first.port = std::bit_cast<u16>(Common::BigEndianValue(first_port_u16));
+
+    read_pos += parse_end - std::to_address(read_pos);  // Working around MSVC iterators..
+  }
+
+  if (read_pos == subject.end())
+  {
+    // Last port not specified.
+    result->last.port = result->first.port;
+    return result;
+  }
+
+  if (*read_pos != '-')
+    return std::nullopt;  // Unexpected character.
+
+  u16 first_last_u16{};
+  {
+    // Read last port.
+    ++read_pos;
+
+    const auto [parse_end, ec] = FromChars({read_pos, subject.end()}, first_last_u16);
+    if (ec != std::errc{} || first_last_u16 < first_port_u16)
+      return std::nullopt;  // Bad last port.
+
+    result->last.port = std::bit_cast<u16>(Common::BigEndianValue(first_last_u16));
+
+    read_pos += parse_end - std::to_address(read_pos);  // Working around MSVC iterators..
+  }
+
+  if (read_pos != subject.end())
+    return std::nullopt;
+
+  return result;
+}
+
 MACAddress GenerateMacAddress(const MACConsumer type)
 {
   constexpr std::array<u8, 3> oui_bba{{0x00, 0x09, 0xbf}};
@@ -588,4 +799,18 @@ const char* StrNetworkError()
 #endif
   return DecodeNetworkError(error_code);
 }
+
+bool SetPlatformSocketOptions(int fd [[maybe_unused]])
+{
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+  int opt_no_sigpipe = 1;
+  if (setsockopt(fd, SOL_SOCKET, SO_NOSIGPIPE, &opt_no_sigpipe, sizeof(opt_no_sigpipe)) < 0)
+  {
+    ERROR_LOG_FMT(COMMON, "Failed to set SO_NOSIGPIPE on socket: {}", StrNetworkError());
+    return false;
+  }
+#endif
+  return true;
+}
+
 }  // namespace Common
diff --git a/Source/Core/Common/Network.h b/Source/Core/Common/Network.h
index 8f446d7a3815..5e0da6559e39 100644
--- a/Source/Core/Common/Network.h
+++ b/Source/Core/Common/Network.h
@@ -10,6 +10,10 @@
 #include <type_traits>
 #include <vector>
 
+#if defined(__linux__) || defined(__HAIKU__)
+#include <sys/socket.h>
+#endif
+
 #include "Common/CommonTypes.h"
 
 struct sockaddr_in;
@@ -264,6 +268,30 @@ struct NetworkErrorState
 #endif
 };
 
+struct IPv4Port
+{
+  IPAddress ip_address;
+  u16 port;  // Network byte order.
+
+  // These convert to host byte order.
+  u32 GetIPAddressValue() const;
+  u16 GetPortValue() const;
+};
+
+struct IPv4PortRange
+{
+  IPv4Port first;
+  IPv4Port last;
+
+  bool IsMatch(IPv4Port subject) const;
+  std::string ToString() const;
+};
+
+std::string IPAddressToString(IPAddress ip_address);
+
+// Syntax is: first_ip[-last_ip|/network_prefix_length][:first_port[-last_port]]
+std::optional<IPv4PortRange> StringToIPv4PortRange(std::string_view subject);
+
 MACAddress GenerateMacAddress(MACConsumer type);
 
 std::string MacAddressToString(const MACAddress& mac);
@@ -279,4 +307,15 @@ NetworkErrorState SaveNetworkErrorState();
 void RestoreNetworkErrorState(const NetworkErrorState& state);
 const char* DecodeNetworkError(s32 error_code);
 const char* StrNetworkError();
+
+// Sets SO_NOSIGPIPE when available.
+bool SetPlatformSocketOptions(int fd);
+
+// Pass this to all `send` calls to avoid SIGPIPE.
+#if defined(__linux__) || defined(__HAIKU__)
+static constexpr int SEND_FLAGS = MSG_NOSIGNAL;
+#else
+static constexpr int SEND_FLAGS = 0;
+#endif
+
 }  // namespace Common
diff --git a/Source/Core/Common/Profiler.cpp b/Source/Core/Common/Profiler.cpp
index 34aafd38fdfa..3a8eeb2746ae 100644
--- a/Source/Core/Common/Profiler.cpp
+++ b/Source/Core/Common/Profiler.cpp
@@ -5,8 +5,6 @@
 
 #include <algorithm>
 #include <cmath>
-#include <cstdio>
-#include <cstring>
 #include <iomanip>
 #include <ios>
 #include <sstream>
diff --git a/Source/Core/Common/QoSSession.cpp b/Source/Core/Common/QoSSession.cpp
index 289c8b790808..125af032063c 100644
--- a/Source/Core/Common/QoSSession.cpp
+++ b/Source/Core/Common/QoSSession.cpp
@@ -8,8 +8,6 @@
 #pragma comment(lib, "qwave")
 #endif
 
-#include "Core/ConfigManager.h"
-
 namespace Common
 {
 #if defined(_MSC_VER)
diff --git a/Source/Core/Common/Random.cpp b/Source/Core/Common/Random.cpp
index 0c859eaa1268..9ecb6bcc1ca0 100644
--- a/Source/Core/Common/Random.cpp
+++ b/Source/Core/Common/Random.cpp
@@ -7,6 +7,7 @@
 #include <mbedtls/hmac_drbg.h>
 
 #include "Common/Assert.h"
+#include "Common/CommonTypes.h"
 
 namespace Common::Random
 {
diff --git a/Source/Core/Common/Random.h b/Source/Core/Common/Random.h
index 86192f840f2a..e899743c41f4 100644
--- a/Source/Core/Common/Random.h
+++ b/Source/Core/Common/Random.h
@@ -4,11 +4,8 @@
 #pragma once
 
 #include <cstddef>
-#include <memory>
 #include <type_traits>
 
-#include "Common/CommonTypes.h"
-
 namespace Common::Random
 {
 /// Fill `buffer` with random bytes using a cryptographically secure pseudo-random number generator.
diff --git a/Source/Core/Common/Result.h b/Source/Core/Common/Result.h
deleted file mode 100644
index 78d675360bf6..000000000000
--- a/Source/Core/Common/Result.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2018 Dolphin Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <variant>
-
-namespace Common
-{
-template <typename ResultCode, typename T>
-class Result final
-{
-public:
-  Result(ResultCode code) : m_variant{code} {}
-  Result(const T& t) : m_variant{t} {}
-  Result(T&& t) : m_variant{std::move(t)} {}
-  explicit operator bool() const { return Succeeded(); }
-  bool Succeeded() const { return std::holds_alternative<T>(m_variant); }
-  // Must only be called when Succeeded() returns false.
-  ResultCode Error() const { return std::get<ResultCode>(m_variant); }
-  // Must only be called when Succeeded() returns true.
-  const T& operator*() const { return std::get<T>(m_variant); }
-  const T* operator->() const { return &std::get<T>(m_variant); }
-  T& operator*() { return std::get<T>(m_variant); }
-  T* operator->() { return &std::get<T>(m_variant); }
-
-private:
-  std::variant<ResultCode, T> m_variant;
-};
-}  // namespace Common
diff --git a/Source/Core/Common/SFMLHelper.h b/Source/Core/Common/SFMLHelper.h
index f3bf96882376..7f6e32ef7855 100644
--- a/Source/Core/Common/SFMLHelper.h
+++ b/Source/Core/Common/SFMLHelper.h
@@ -5,8 +5,9 @@
 
 #include <SFML/Network/Packet.hpp>
 
+#include <utility>
+
 #include "Common/CommonTypes.h"
-#include "Common/EnumUtils.h"
 #include "Common/Swap.h"
 #include "Common/TypeUtils.h"
 
@@ -17,7 +18,7 @@ sf::Packet& operator>>(sf::Packet& packet, Common::BigEndianValue<u64>& data);
 template <Common::Enum Enum>
 sf::Packet& operator<<(sf::Packet& packet, Enum e)
 {
-  packet << Common::ToUnderlying(e);
+  packet << std::to_underlying(e);
   return packet;
 }
 
diff --git a/Source/Core/Common/SettingsHandler.cpp b/Source/Core/Common/SettingsHandler.cpp
index b0faf6f6f03f..7f2f43679893 100644
--- a/Source/Core/Common/SettingsHandler.cpp
+++ b/Source/Core/Common/SettingsHandler.cpp
@@ -8,7 +8,6 @@
 #include <algorithm>
 #include <cstddef>
 #include <ctime>
-#include <iomanip>
 #include <string>
 
 #include <fmt/chrono.h>
diff --git a/Source/Core/Common/SocketContext.cpp b/Source/Core/Common/SocketContext.cpp
index f9c630c43449..dcc637891a63 100644
--- a/Source/Core/Common/SocketContext.cpp
+++ b/Source/Core/Common/SocketContext.cpp
@@ -2,9 +2,10 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "Common/SocketContext.h"
-
+#ifdef _WIN32
 #include "Common/Logging/Log.h"
 #include "Common/Network.h"
+#endif
 
 namespace Common
 {
diff --git a/Source/Core/Common/SpanUtils.h b/Source/Core/Common/SpanUtils.h
index d09193b31421..eef3567f4ca7 100644
--- a/Source/Core/Common/SpanUtils.h
+++ b/Source/Core/Common/SpanUtils.h
@@ -5,8 +5,8 @@
 
 #include <algorithm>
 #include <cstddef>
+#include <cstring>
 #include <span>
-#include <utility>
 
 #include "Common/CommonTypes.h"
 
diff --git a/Source/Core/Common/StringUtil.h b/Source/Core/Common/StringUtil.h
index 2351c3f72064..6e2c385df9c9 100644
--- a/Source/Core/Common/StringUtil.h
+++ b/Source/Core/Common/StringUtil.h
@@ -12,14 +12,15 @@
 #include <iomanip>
 #include <limits>
 #include <locale>
+#include <ranges>
 #include <span>
 #include <sstream>
 #include <string>
 #include <type_traits>
+#include <utility>
 #include <vector>
 
 #include "Common/CommonTypes.h"
-#include "Common/EnumUtils.h"
 #include "Common/TypeUtils.h"
 
 std::string StringFromFormatV(const char* format, va_list args);
@@ -157,7 +158,7 @@ std::string ValueToString(s64 value);
 std::string ValueToString(bool value);
 std::string ValueToString(Common::Enum auto value)
 {
-  return ValueToString(Common::ToUnderlying(value));
+  return ValueToString(std::to_underlying(value));
 }
 
 // Generates an hexdump-like representation of a binary data blob.
@@ -182,6 +183,32 @@ std::from_chars_result FromChars(std::string_view sv, std::floating_point auto&
 
 std::vector<std::string> SplitString(const std::string& str, char delim);
 
+// Returns `nullopt` if subject does not contain exactly (Count - 1) delim.
+template <std::size_t Count>
+requires(Count > 1)
+std::optional<std::array<std::string_view, Count>> SplitStringIntoArray(std::string_view subject,
+                                                                        char delim)
+{
+  std::optional<std::array<std::string_view, Count>> result;
+  result.emplace();
+
+  std::size_t index = 0;
+  for (auto&& item : subject | std::views::split(delim))
+  {
+    // Too many delim.
+    if (index == Count)
+      return std::nullopt;
+
+    (*result)[index++] = std::string_view{item};
+  }
+
+  // Too few delim.
+  if (index != Count)
+    return std::nullopt;
+
+  return result;
+}
+
 // "C:/Windows/winhelp.exe" to "C:/Windows/", "winhelp", ".exe"
 // This requires forward slashes to be used for the path separators, even on Windows.
 bool SplitPath(std::string_view full_path, std::string* path, std::string* filename,
@@ -314,7 +341,7 @@ bool CaseInsensitiveContains(std::string_view haystack, std::string_view needle)
 // 'std::less'-like comparison function object type for case-insensitive strings.
 struct CaseInsensitiveLess
 {
-  using is_transparent = void;  // Allow heterogenous lookup.
+  using is_transparent = void;  // Allow heterogeneous lookup.
   bool operator()(std::string_view a, std::string_view b) const;
 };
 
diff --git a/Source/Core/Common/Swap.h b/Source/Core/Common/Swap.h
index 23ded8cd691e..294fd000d62b 100644
--- a/Source/Core/Common/Swap.h
+++ b/Source/Core/Common/Swap.h
@@ -140,6 +140,22 @@ inline u64 swap64(const u8* data)
   return swap64(value);
 }
 
+inline void WriteSwap16(u8* data, u16 value)
+{
+  value = swap16(value);
+  std::memcpy(data, &value, sizeof(u16));
+}
+inline void WriteSwap32(u8* data, u32 value)
+{
+  value = swap32(value);
+  std::memcpy(data, &value, sizeof(u32));
+}
+inline void WriteSwap64(u8* data, u64 value)
+{
+  value = swap64(value);
+  std::memcpy(data, &value, sizeof(u64));
+}
+
 template <int count>
 void swap(u8*);
 
diff --git a/Source/Core/Common/Thread.cpp b/Source/Core/Common/Thread.cpp
index 32988c8cb429..64352a5b5b78 100644
--- a/Source/Core/Common/Thread.cpp
+++ b/Source/Core/Common/Thread.cpp
@@ -26,9 +26,10 @@
 #pragma comment(lib, "libittnotify.lib")
 #endif
 
-#include "Common/CommonFuncs.h"
 #include "Common/CommonTypes.h"
+#ifdef _WIN32
 #include "Common/StringUtil.h"
+#endif
 
 namespace Common
 {
diff --git a/Source/Core/Common/Timer.cpp b/Source/Core/Common/Timer.cpp
index 3f4373957113..8d10cd5aeacf 100644
--- a/Source/Core/Common/Timer.cpp
+++ b/Source/Core/Common/Timer.cpp
@@ -10,8 +10,6 @@
 #ifdef _WIN32
 #include <windows.h>
 #include <timeapi.h>
-#else
-#include <sys/time.h>
 #endif
 
 #include "Common/CommonTypes.h"
diff --git a/Source/Core/Common/TransferableSharedMutex.h b/Source/Core/Common/TransferableSharedMutex.h
new file mode 100644
index 000000000000..f735046ff048
--- /dev/null
+++ b/Source/Core/Common/TransferableSharedMutex.h
@@ -0,0 +1,92 @@
+// Copyright 2025 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <atomic>
+#include <cassert>
+#include <cstdint>
+
+namespace Common
+{
+// Behaves like `std::shared_mutex` but locks and unlocks may come from different threads.
+class TransferableSharedMutex
+{
+public:
+  void lock()
+  {
+    while (true)
+    {
+      CounterType old_value{};
+      if (m_counter.compare_exchange_strong(old_value, EXCLUSIVE_LOCK_VALUE,
+                                            std::memory_order_acquire, std::memory_order_relaxed))
+      {
+        return;
+      }
+
+      // lock() or lock_shared() is already held.
+      // Wait for an unlock notification and try again.
+      m_counter.wait(old_value, std::memory_order_relaxed);
+    }
+  }
+
+  bool try_lock()
+  {
+    CounterType old_value{};
+    return m_counter.compare_exchange_weak(old_value, EXCLUSIVE_LOCK_VALUE,
+                                           std::memory_order_acquire, std::memory_order_relaxed);
+  }
+
+  void unlock()
+  {
+    m_counter.store(0, std::memory_order_release);
+    m_counter.notify_all();  // Notify potentially multiple wait()ers in lock_shared().
+  }
+
+  void lock_shared()
+  {
+    while (true)
+    {
+      auto old_value = m_counter.load(std::memory_order_relaxed);
+      while (old_value < LAST_SHARED_LOCK_VALUE)
+      {
+        if (m_counter.compare_exchange_strong(old_value, old_value + 1, std::memory_order_acquire,
+                                              std::memory_order_relaxed))
+        {
+          return;
+        }
+      }
+
+      // Something has gone very wrong if m_counter is nearly saturated with shared_lock().
+      assert(old_value != LAST_SHARED_LOCK_VALUE);
+
+      // lock() is already held.
+      // Wait for an unlock notification and try again.
+      m_counter.wait(old_value, std::memory_order_relaxed);
+    }
+  }
+
+  bool try_lock_shared()
+  {
+    auto old_value = m_counter.load(std::memory_order_relaxed);
+    return (old_value < LAST_SHARED_LOCK_VALUE) &&
+           m_counter.compare_exchange_weak(old_value, old_value + 1, std::memory_order_acquire,
+                                           std::memory_order_relaxed);
+  }
+
+  void unlock_shared()
+  {
+    if (m_counter.fetch_sub(1, std::memory_order_release) == 1)
+      m_counter.notify_one();  // Notify one of the wait()ers in lock().
+  }
+
+private:
+  using CounterType = std::uintptr_t;
+
+  static constexpr auto EXCLUSIVE_LOCK_VALUE = CounterType(-1);
+  static constexpr auto LAST_SHARED_LOCK_VALUE = EXCLUSIVE_LOCK_VALUE - 1;
+
+  std::atomic<CounterType> m_counter{};
+};
+
+}  // namespace Common
diff --git a/Source/Core/Common/TraversalClient.h b/Source/Core/Common/TraversalClient.h
index efe0e2f7d1f4..759edd653a35 100644
--- a/Source/Core/Common/TraversalClient.h
+++ b/Source/Core/Common/TraversalClient.h
@@ -12,7 +12,6 @@
 
 #include "Common/CommonTypes.h"
 #include "Common/ENet.h"
-#include "Common/Thread.h"
 #include "Common/TraversalProto.h"
 
 namespace Common
diff --git a/Source/Core/Common/TraversalServer.cpp b/Source/Core/Common/TraversalServer.cpp
index 3d449256d1e5..0a9b6c0d0bc7 100644
--- a/Source/Core/Common/TraversalServer.cpp
+++ b/Source/Core/Common/TraversalServer.cpp
@@ -7,18 +7,14 @@
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
-#include <fcntl.h>
 #include <netinet/in.h>
 #include <sys/select.h>
 #include <sys/socket.h>
-#include <sys/types.h>
 #include <tuple>
-#include <unistd.h>
 #include <unordered_map>
-#include <utility>
 #include <vector>
 
-#include <fmt/format.h>
+#include <fmt/base.h>
 
 #ifdef HAVE_LIBSYSTEMD
 #include <systemd/sd-daemon.h>
diff --git a/Source/Core/Common/UPnP.cpp b/Source/Core/Common/UPnP.cpp
index be5474706b39..81807f1e3c1d 100644
--- a/Source/Core/Common/UPnP.cpp
+++ b/Source/Core/Common/UPnP.cpp
@@ -16,7 +16,6 @@
 #include <thread>
 #include <upnpcommands.h>
 #include <upnperrors.h>
-#include <vector>
 
 static UPNPUrls s_urls;
 static IGDdatas s_data;
diff --git a/Source/Core/Common/UnixUtil.h b/Source/Core/Common/UnixUtil.h
index f1b5fc136fb4..374126e403f3 100644
--- a/Source/Core/Common/UnixUtil.h
+++ b/Source/Core/Common/UnixUtil.h
@@ -4,13 +4,18 @@
 #pragma once
 
 #include <pthread.h>
+
+#if defined(__linux__)
 #include <sys/eventfd.h>
+#endif
 
 #include "Common/CommonFuncs.h"
 #include "Common/Logging/Log.h"
 
 namespace UnixUtil
 {
+
+#if defined(__linux__)
 inline int CreateEventFD(unsigned int count, int flags)
 {
   const int result = eventfd(count, flags);
@@ -21,6 +26,7 @@ inline int CreateEventFD(unsigned int count, int flags)
   }
   return result;
 }
+#endif
 
 // Repeatedly call a function that can erroneously produce EINTR.
 auto RetryOnEINTR(auto func, auto... args)
diff --git a/Source/Core/Common/Unreachable.h b/Source/Core/Common/Unreachable.h
deleted file mode 100644
index a01810a2396b..000000000000
--- a/Source/Core/Common/Unreachable.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2024 Dolphin Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "Common/CommonFuncs.h"
-
-namespace Common
-{
-// TODO C++23: Replace with std::unreachable.
-[[noreturn]] inline void Unreachable()
-{
-#ifdef _DEBUG
-  Crash();
-#elif defined(_MSC_VER) && !defined(__clang__)
-  __assume(false);
-#else
-  __builtin_unreachable();
-#endif
-}
-}  // namespace Common
diff --git a/Source/Core/Common/WindowsDevice.cpp b/Source/Core/Common/WindowsDevice.cpp
index 4f834b50e60a..49b6fbd4df98 100644
--- a/Source/Core/Common/WindowsDevice.cpp
+++ b/Source/Core/Common/WindowsDevice.cpp
@@ -13,6 +13,12 @@
 #include "Common/CommonFuncs.h"
 #include "Common/Logging/Log.h"
 
+#ifdef __MINGW32__
+#ifndef __callback
+#define __callback
+#endif
+#endif
+
 #if defined(__MINGW32__) && !defined(CM_Get_Device_Interface_Property)
 extern "C" {
 CONFIGRET WINAPI CM_Get_Device_Interface_PropertyW(
@@ -28,29 +34,6 @@ CONFIGRET WINAPI CM_Get_Device_Interface_PropertyW(
 
 namespace Common
 {
-std::wstring GetDeviceProperty(const HDEVINFO& device_info, const PSP_DEVINFO_DATA device_data,
-                               const DEVPROPKEY* requested_property)
-{
-  DWORD required_size = 0;
-  DEVPROPTYPE device_property_type;
-  BOOL result;
-
-  result = SetupDiGetDeviceProperty(device_info, device_data, requested_property,
-                                    &device_property_type, nullptr, 0, &required_size, 0);
-  if (!result && GetLastError() != ERROR_INSUFFICIENT_BUFFER)
-    return std::wstring();
-
-  std::vector<TCHAR> unicode_buffer(required_size / sizeof(TCHAR));
-
-  result = SetupDiGetDeviceProperty(
-      device_info, device_data, requested_property, &device_property_type,
-      reinterpret_cast<PBYTE>(unicode_buffer.data()), required_size, nullptr, 0);
-  if (!result)
-    return std::wstring();
-
-  return std::wstring(unicode_buffer.data());
-}
-
 std::optional<std::wstring> GetPropertyHelper(auto function, auto dev,
                                               const DEVPROPKEY* requested_property,
                                               DEVPROPTYPE expected_type)
@@ -97,6 +80,95 @@ std::optional<std::wstring> GetDeviceInterfaceStringProperty(LPCWSTR iface,
                            DEVPROP_TYPE_STRING);
 }
 
+NullTerminatedStringList<WCHAR> GetDeviceInterfaceList(LPGUID iface_class_guid, DEVINSTID device_id,
+                                                       ULONG flags)
+{
+  while (true)
+  {
+    ULONG list_size = 0;
+    const auto size_result =
+        CM_Get_Device_Interface_List_Size(&list_size, iface_class_guid, device_id, flags);
+    if (size_result != CR_SUCCESS || list_size == 0)
+      list_size = 1;
+
+    auto buffer = std::make_unique_for_overwrite<WCHAR[]>(list_size);
+    const auto list_result =
+        CM_Get_Device_Interface_List(iface_class_guid, device_id, buffer.get(), list_size, flags);
+
+    // "A new device can be added to the system causing the size returned to no longer be valid."
+    // Microsoft recommends trying again in a loop.
+    if (list_result == CR_BUFFER_SMALL)
+      continue;
+
+    if (list_result != CR_SUCCESS)
+    {
+      ERROR_LOG_FMT(COMMON, "CM_Get_Device_Interface_List: {}", list_result);
+      buffer[0] = 0;
+    }
+
+    return {std::move(buffer)};
+  }
+}
+
+static __callback DWORD OnDevicesChanged(_In_ HCMNOTIFICATION notify_handle, _In_opt_ PVOID context,
+                                         _In_ CM_NOTIFY_ACTION action,
+                                         _In_reads_bytes_(event_data_size)
+                                             PCM_NOTIFY_EVENT_DATA event_data,
+                                         _In_ DWORD event_data_size)
+{
+  auto& callback = *static_cast<DeviceChangeNotification::CallbackType*>(context);
+  switch (action)
+  {
+  case CM_NOTIFY_ACTION_DEVICEINTERFACEARRIVAL:
+    callback(DeviceChangeNotification::EventType::Arrival);
+    break;
+  case CM_NOTIFY_ACTION_DEVICEINTERFACEREMOVAL:
+    callback(DeviceChangeNotification::EventType::Removal);
+    break;
+  default:
+    break;
+  }
+  return ERROR_SUCCESS;
+}
+
+DeviceChangeNotification::DeviceChangeNotification() = default;
+
+DeviceChangeNotification::~DeviceChangeNotification()
+{
+  Unregister();
+}
+
+void DeviceChangeNotification::Register(CallbackType callback)
+{
+  Unregister();
+  m_callback = std::move(callback);
+
+  CM_NOTIFY_FILTER notify_filter{
+      .cbSize = sizeof(notify_filter),
+      .FilterType = CM_NOTIFY_FILTER_TYPE_DEVICEINTERFACE,
+      .u{.DeviceInterface{.ClassGuid = GUID_DEVINTERFACE_HID}},
+  };
+  const CONFIGRET cfg_rv =
+      CM_Register_Notification(&notify_filter, &m_callback, OnDevicesChanged, &m_notify_handle);
+  if (cfg_rv != CR_SUCCESS)
+  {
+    ERROR_LOG_FMT(COMMON, "CM_Register_Notification failed: {:x}", cfg_rv);
+  }
+}
+
+void DeviceChangeNotification::Unregister()
+{
+  if (m_notify_handle == nullptr)
+    return;
+
+  const CONFIGRET cfg_rv = CM_Unregister_Notification(m_notify_handle);
+  if (cfg_rv != CR_SUCCESS)
+  {
+    ERROR_LOG_FMT(COMMON, "CM_Unregister_Notification failed: {:x}", cfg_rv);
+  }
+  m_notify_handle = nullptr;
+}
+
 }  // namespace Common
 
 #endif
diff --git a/Source/Core/Common/WindowsDevice.h b/Source/Core/Common/WindowsDevice.h
index aef3e7d49079..e966db4e16bc 100644
--- a/Source/Core/Common/WindowsDevice.h
+++ b/Source/Core/Common/WindowsDevice.h
@@ -5,6 +5,8 @@
 
 #ifdef _WIN32
 
+#include <iterator>
+#include <memory>
 #include <optional>
 #include <string>
 
@@ -20,18 +22,84 @@
 #include <cfgmgr32.h>
 #include <devpropdef.h>
 
+#include "Common/Functional.h"
+
 namespace Common
 {
-// Obtains a device property and returns it as a wide string.
-std::wstring GetDeviceProperty(const HANDLE& device_info, const PSP_DEVINFO_DATA device_data,
-                               const DEVPROPKEY* requested_property);
-
 std::optional<std::wstring> GetDevNodeStringProperty(DEVINST device,
                                                      const DEVPROPKEY* requested_property);
 
 std::optional<std::wstring> GetDeviceInterfaceStringProperty(LPCWSTR iface,
                                                              const DEVPROPKEY* requested_property);
 
+// Allows iterating null-separated/terminated string lists returned by the Windows API.
+template <typename T>
+struct NullTerminatedStringList
+{
+  class Iterator
+  {
+    friend NullTerminatedStringList;
+
+  public:
+    constexpr T* operator*() { return m_ptr; }
+
+    constexpr Iterator& operator++()
+    {
+      m_ptr += std::basic_string_view(m_ptr).size() + 1;
+      return *this;
+    }
+
+    constexpr Iterator operator++(int)
+    {
+      const auto result{*this};
+      ++*this;
+      return result;
+    }
+
+    constexpr bool operator==(std::default_sentinel_t) const { return *m_ptr == T{}; }
+
+  private:
+    constexpr Iterator(T* ptr) : m_ptr{ptr} {}
+
+    T* m_ptr;
+  };
+
+  constexpr auto begin() const { return Iterator{list.get()}; }
+  constexpr auto end() const { return std::default_sentinel; }
+
+  std::unique_ptr<T[]> list;
+};
+
+NullTerminatedStringList<WCHAR> GetDeviceInterfaceList(LPGUID iface_class_guid, DEVINSTID device_id,
+                                                       ULONG flags);
+
+class DeviceChangeNotification
+{
+public:
+  enum class EventType : bool
+  {
+    Arrival,
+    Removal,
+  };
+  using CallbackType = Common::MoveOnlyFunction<void(EventType)>;
+
+  DeviceChangeNotification();
+  ~DeviceChangeNotification();
+
+  // FYI: Currently hardcoded to a GUID_DEVINTERFACE_HID filter.
+  void Register(CallbackType callback);
+  void Unregister();
+
+  DeviceChangeNotification(const DeviceChangeNotification&) = delete;
+  DeviceChangeNotification(DeviceChangeNotification&&) = delete;
+  void operator=(const DeviceChangeNotification&) = delete;
+  void operator=(DeviceChangeNotification&&) = delete;
+
+private:
+  CallbackType m_callback{};
+  HCMNOTIFICATION m_notify_handle{nullptr};
+};
+
 }  // namespace Common
 
 #endif
diff --git a/Source/Core/Common/WindowsRegistry.cpp b/Source/Core/Common/WindowsRegistry.cpp
index 36cb6e717dae..e95bd2da0ca9 100644
--- a/Source/Core/Common/WindowsRegistry.cpp
+++ b/Source/Core/Common/WindowsRegistry.cpp
@@ -3,11 +3,53 @@
 #include <windows.h>
 #include <string>
 #include <type_traits>
+#include "Common/StringUtil.h"
 
 namespace WindowsRegistry
 {
-template bool ReadValue<u32>(u32* value, const std::string& subkey, const std::string& name);
-template bool ReadValue<u64>(u64* value, const std::string& subkey, const std::string& name);
+template <typename T>
+bool ReadValue(T* value, const std::string& subkey, const std::string& name)
+{
+  DWORD flags = 0;
+  static_assert(std::is_integral_v<T> && (sizeof(T) == sizeof(u32) || sizeof(T) == sizeof(u64)),
+                "Unsupported type");
+  if constexpr (sizeof(T) == sizeof(u32))
+    flags = RRF_RT_REG_DWORD;
+  else if constexpr (sizeof(T) == sizeof(u64))
+    flags = RRF_RT_REG_QWORD;
+
+  DWORD value_len = sizeof(*value);
+  return RegGetValueA(HKEY_LOCAL_MACHINE, subkey.c_str(), name.c_str(), flags, nullptr, value,
+                      &value_len) == ERROR_SUCCESS;
+}
+
+template <>
+bool ReadValue(std::string* value, const std::string& subkey, const std::string& name)
+{
+  const DWORD flags = RRF_RT_REG_SZ | RRF_NOEXPAND;
+  DWORD value_len = 0;
+  auto status = RegGetValueA(HKEY_LOCAL_MACHINE, subkey.c_str(), name.c_str(), flags, nullptr,
+                             nullptr, &value_len);
+  if (status != ERROR_SUCCESS && status != ERROR_MORE_DATA)
+    return false;
+
+  value->resize(value_len);
+  status = RegGetValueA(HKEY_LOCAL_MACHINE, subkey.c_str(), name.c_str(), flags, nullptr,
+                        value->data(), &value_len);
+  if (status != ERROR_SUCCESS)
+  {
+    value->clear();
+    return false;
+  }
+
+  TruncateToCString(value);
+  return true;
+}
+
+// These explicit instantiations are needed to prevent linker errors when calling
+// ReadValue in WinUpdater/Platform.cpp (for u32) and ArmCPUDetect.cpp (for u64)
+template bool ReadValue(u32* value, const std::string& subkey, const std::string& name);
+template bool ReadValue(u64* value, const std::string& subkey, const std::string& name);
 
 OSVERSIONINFOW GetOSVersion()
 {
diff --git a/Source/Core/Common/WindowsRegistry.h b/Source/Core/Common/WindowsRegistry.h
index 45f81b0870c1..affeba41cb6d 100644
--- a/Source/Core/Common/WindowsRegistry.h
+++ b/Source/Core/Common/WindowsRegistry.h
@@ -4,48 +4,13 @@
 #include <string>
 
 #include "Common/CommonTypes.h"
-#include "Common/StringUtil.h"
 
 namespace WindowsRegistry
 {
 template <typename T>
-inline bool ReadValue(T* value, const std::string& subkey, const std::string& name)
-{
-  DWORD flags = 0;
-  static_assert(std::is_integral_v<T> && (sizeof(T) == sizeof(u32) || sizeof(T) == sizeof(u64)),
-                "Unsupported type");
-  if constexpr (sizeof(T) == sizeof(u32))
-    flags = RRF_RT_REG_DWORD;
-  else if constexpr (sizeof(T) == sizeof(u64))
-    flags = RRF_RT_REG_QWORD;
-
-  DWORD value_len = sizeof(*value);
-  return RegGetValueA(HKEY_LOCAL_MACHINE, subkey.c_str(), name.c_str(), flags, nullptr, value,
-                      &value_len) == ERROR_SUCCESS;
-}
-
+bool ReadValue(T* value, const std::string& subkey, const std::string& name);
 template <>
-inline bool ReadValue(std::string* value, const std::string& subkey, const std::string& name)
-{
-  const DWORD flags = RRF_RT_REG_SZ | RRF_NOEXPAND;
-  DWORD value_len = 0;
-  auto status = RegGetValueA(HKEY_LOCAL_MACHINE, subkey.c_str(), name.c_str(), flags, nullptr,
-                             nullptr, &value_len);
-  if (status != ERROR_SUCCESS && status != ERROR_MORE_DATA)
-    return false;
-
-  value->resize(value_len);
-  status = RegGetValueA(HKEY_LOCAL_MACHINE, subkey.c_str(), name.c_str(), flags, nullptr,
-                        value->data(), &value_len);
-  if (status != ERROR_SUCCESS)
-  {
-    value->clear();
-    return false;
-  }
-
-  TruncateToCString(value);
-  return true;
-}
+bool ReadValue(std::string* value, const std::string& subkey, const std::string& name);
 
 OSVERSIONINFOW GetOSVersion();
 }  // namespace WindowsRegistry
diff --git a/Source/Core/Common/x64CPUDetect.cpp b/Source/Core/Common/x64CPUDetect.cpp
index 9fa3d854376b..fa9cb0c15c5b 100644
--- a/Source/Core/Common/x64CPUDetect.cpp
+++ b/Source/Core/Common/x64CPUDetect.cpp
@@ -17,9 +17,10 @@
 #include <fmt/ranges.h>
 
 #include "Common/CommonTypes.h"
-#include "Common/Intrinsics.h"
-#include "Common/MsgHandler.h"
 #include "Common/StringUtil.h"
+#ifdef _WIN32
+#include "Common/MsgHandler.h"
+#endif
 
 #ifndef _MSC_VER
 
diff --git a/Source/Core/Common/x64Emitter.cpp b/Source/Core/Common/x64Emitter.cpp
index 0a122e112188..f9a8a015f929 100644
--- a/Source/Core/Common/x64Emitter.cpp
+++ b/Source/Core/Common/x64Emitter.cpp
@@ -2519,19 +2519,19 @@ void XEmitter::PUNPCKLQDQ(X64Reg dest, const OpArg& arg)
   WriteSSEOp(0x66, 0x6C, dest, arg);
 }
 
-void XEmitter::PSRLW(X64Reg reg, int shift)
+void XEmitter::PSRLW(X64Reg reg, u8 shift)
 {
   WriteSSEOp(0x66, 0x71, (X64Reg)2, R(reg));
   Write8(shift);
 }
 
-void XEmitter::PSRLD(X64Reg reg, int shift)
+void XEmitter::PSRLD(X64Reg reg, u8 shift)
 {
   WriteSSEOp(0x66, 0x72, (X64Reg)2, R(reg));
   Write8(shift);
 }
 
-void XEmitter::PSRLQ(X64Reg reg, int shift)
+void XEmitter::PSRLQ(X64Reg reg, u8 shift)
 {
   WriteSSEOp(0x66, 0x73, (X64Reg)2, R(reg));
   Write8(shift);
@@ -2542,38 +2542,38 @@ void XEmitter::PSRLQ(X64Reg reg, const OpArg& arg)
   WriteSSEOp(0x66, 0xd3, reg, arg);
 }
 
-void XEmitter::PSRLDQ(X64Reg reg, int shift)
+void XEmitter::PSRLDQ(X64Reg reg, u8 shift)
 {
   WriteSSEOp(0x66, 0x73, (X64Reg)3, R(reg));
   Write8(shift);
 }
 
-void XEmitter::PSLLW(X64Reg reg, int shift)
+void XEmitter::PSLLW(X64Reg reg, u8 shift)
 {
   WriteSSEOp(0x66, 0x71, (X64Reg)6, R(reg));
   Write8(shift);
 }
 
-void XEmitter::PSLLD(X64Reg reg, int shift)
+void XEmitter::PSLLD(X64Reg reg, u8 shift)
 {
   WriteSSEOp(0x66, 0x72, (X64Reg)6, R(reg));
   Write8(shift);
 }
 
-void XEmitter::PSLLQ(X64Reg reg, int shift)
+void XEmitter::PSLLQ(X64Reg reg, u8 shift)
 {
   WriteSSEOp(0x66, 0x73, (X64Reg)6, R(reg));
   Write8(shift);
 }
 
-void XEmitter::PSLLDQ(X64Reg reg, int shift)
+void XEmitter::PSLLDQ(X64Reg reg, u8 shift)
 {
   WriteSSEOp(0x66, 0x73, (X64Reg)7, R(reg));
   Write8(shift);
 }
 
 // WARNING not REX compatible
-void XEmitter::PSRAW(X64Reg reg, int shift)
+void XEmitter::PSRAW(X64Reg reg, u8 shift)
 {
   if (reg > 7)
     PanicAlertFmt("The PSRAW-emitter does not support regs above 7");
@@ -2585,7 +2585,7 @@ void XEmitter::PSRAW(X64Reg reg, int shift)
 }
 
 // WARNING not REX compatible
-void XEmitter::PSRAD(X64Reg reg, int shift)
+void XEmitter::PSRAD(X64Reg reg, u8 shift)
 {
   if (reg > 7)
     PanicAlertFmt("The PSRAD-emitter does not support regs above 7");
@@ -2695,6 +2695,11 @@ void XEmitter::BLENDPD(X64Reg dest, const OpArg& arg, u8 blend)
   Write8(blend);
 }
 
+void XEmitter::PCMPEQQ(X64Reg dest, const OpArg& arg)
+{
+  WriteSSE41Op(0x66, 0x3829, dest, arg);
+}
+
 void XEmitter::PAND(X64Reg dest, const OpArg& arg)
 {
   WriteSSEOp(0x66, 0xDB, dest, arg);
@@ -3038,6 +3043,12 @@ void XEmitter::VPXOR(X64Reg regOp1, X64Reg regOp2, const OpArg& arg)
   WriteAVXOp(0x66, 0xEF, regOp1, regOp2, arg);
 }
 
+void XEmitter::VPSLLQ(X64Reg regOp1, X64Reg regOp2, u8 shift)
+{
+  WriteAVXOp(0x66, 0x73, (X64Reg)6, regOp1, R(regOp2));
+  Write8(shift);
+}
+
 void XEmitter::VMOVAPS(const OpArg& arg, X64Reg regOp)
 {
   WriteAVXOp(0x00, 0x29, regOp, X64Reg::INVALID_REG, arg);
diff --git a/Source/Core/Common/x64Emitter.h b/Source/Core/Common/x64Emitter.h
index 71dcea30f9f2..35d88a46bceb 100644
--- a/Source/Core/Common/x64Emitter.h
+++ b/Source/Core/Common/x64Emitter.h
@@ -113,8 +113,8 @@ struct OpArg
   // dummy op arg, used for storage
   constexpr OpArg() = default;
   constexpr OpArg(u64 offset_, int scale_, X64Reg rm_reg = RAX, X64Reg scaled_reg = RAX)
-      : scale{static_cast<u8>(scale_)}, offsetOrBaseReg{static_cast<u16>(rm_reg)},
-        indexReg{static_cast<u16>(scaled_reg)}, offset{offset_}
+      : offset{offset_}, offsetOrBaseReg{static_cast<u16>(rm_reg)},
+        indexReg{static_cast<u16>(scaled_reg)}, scale{static_cast<u8>(scale_)}
   {
   }
   constexpr bool operator==(const OpArg& b) const
@@ -234,11 +234,11 @@ struct OpArg
   void WriteSingleByteOp(XEmitter* emit, u8 op, X64Reg operandReg, int bits);
   void WriteNormalOp(XEmitter* emit, bool toRM, NormalOp op, const OpArg& operand, int bits) const;
 
-  u8 scale = 0;
+  u64 offset = 0;  // Also used to store immediates.
   u16 offsetOrBaseReg = 0;
   u16 indexReg = 0;
-  u64 offset = 0;  // Also used to store immediates.
   u16 operandReg = 0;
+  u8 scale = 0;
 };
 
 template <typename T>
@@ -801,19 +801,19 @@ class XEmitter
   void PSHUFLW(X64Reg dest, const OpArg& arg, u8 shuffle);
   void PSHUFHW(X64Reg dest, const OpArg& arg, u8 shuffle);
 
-  void PSRLW(X64Reg reg, int shift);
-  void PSRLD(X64Reg reg, int shift);
-  void PSRLQ(X64Reg reg, int shift);
+  void PSRLW(X64Reg reg, u8 shift);
+  void PSRLD(X64Reg reg, u8 shift);
+  void PSRLQ(X64Reg reg, u8 shift);
   void PSRLQ(X64Reg reg, const OpArg& arg);
-  void PSRLDQ(X64Reg reg, int shift);
+  void PSRLDQ(X64Reg reg, u8 shift);
 
-  void PSLLW(X64Reg reg, int shift);
-  void PSLLD(X64Reg reg, int shift);
-  void PSLLQ(X64Reg reg, int shift);
-  void PSLLDQ(X64Reg reg, int shift);
+  void PSLLW(X64Reg reg, u8 shift);
+  void PSLLD(X64Reg reg, u8 shift);
+  void PSLLQ(X64Reg reg, u8 shift);
+  void PSLLDQ(X64Reg reg, u8 shift);
 
-  void PSRAW(X64Reg reg, int shift);
-  void PSRAD(X64Reg reg, int shift);
+  void PSRAW(X64Reg reg, u8 shift);
+  void PSRAD(X64Reg reg, u8 shift);
 
   // SSE4: data type conversions
   void PMOVSXBW(X64Reg dest, const OpArg& arg);
@@ -836,6 +836,9 @@ class XEmitter
   void BLENDPS(X64Reg dest, const OpArg& arg, u8 blend);
   void BLENDPD(X64Reg dest, const OpArg& arg, u8 blend);
 
+  // SSE4: compare instructions
+  void PCMPEQQ(X64Reg dest, const OpArg& arg);
+
   // AVX
   void VADDSS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
   void VSUBSS(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
@@ -878,6 +881,8 @@ class XEmitter
   void VPOR(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
   void VPXOR(X64Reg regOp1, X64Reg regOp2, const OpArg& arg);
 
+  void VPSLLQ(X64Reg regOp1, X64Reg regOp2, u8 shift);
+
   void VMOVAPS(const OpArg& arg, X64Reg regOp);
 
   void VZEROUPPER();
diff --git a/Source/Core/Common/x64FPURoundMode.cpp b/Source/Core/Common/x64FPURoundMode.cpp
index 06b66ec5273f..fdd13d9cf440 100644
--- a/Source/Core/Common/x64FPURoundMode.cpp
+++ b/Source/Core/Common/x64FPURoundMode.cpp
@@ -3,9 +3,6 @@
 
 #include "Common/FPURoundMode.h"
 
-#include <cfenv>
-
-#include "Common/CPUDetect.h"
 #include "Common/CommonTypes.h"
 #include "Common/Intrinsics.h"
 
diff --git a/Source/Core/Core/ARDecrypt.cpp b/Source/Core/Core/ARDecrypt.cpp
index 98f49cfc4117..b94b36de5a41 100644
--- a/Source/Core/Core/ARDecrypt.cpp
+++ b/Source/Core/Core/ARDecrypt.cpp
@@ -7,11 +7,13 @@
 
 #include "Core/ARDecrypt.h"
 
-#include <algorithm>
 #include <array>
 #include <bit>
+#include <cassert>
 #include <cstring>
+#include <expected>
 #include <string>
+#include <utility>
 #include <vector>
 
 #ifdef _WIN32
@@ -209,45 +211,43 @@ constexpr Seeds genseeds = [] {
   return seeds;
 }();
 
-static void getcode(const u32* src, u32* addr, u32* val)
+static std::pair<u32, u32> GetCode(const u32* src)
 {
-  *addr = Common::swap32(src[0]);
-  *val = Common::swap32(src[1]);
+  return {Common::swap32(src[0]), Common::swap32(src[1])};
 }
 
-static void setcode(u32* dst, u32 addr, u32 val)
+static void SetCode(u32* dst, u32 addr, u32 val)
 {
   dst[0] = Common::swap32(addr);
   dst[1] = Common::swap32(val);
 }
 
-static u16 gencrc16(const u32* codes, u16 size)
+// This looks like a nibble-wise CRC-16/KERMIT.
+static constexpr u16 GetCRC16(std::span<const u32> codes)
 {
   u16 ret = 0;
 
-  if (size > 0)
+  for (u32 code : codes)
   {
-    for (u8 tmp = 0; tmp < size; ++tmp)
+    for (u32 i = 0; i != 4; ++i)
     {
-      for (int i = 0; i < 4; ++i)
-      {
-        u8 tmp2 = ((codes[tmp] >> (i << 3)) ^ ret);
-        ret = ((crctable0[(tmp2 >> 4) & 0x0F] ^ crctable1[tmp2 & 0x0F]) ^ (ret >> 8));
-      }
+      const u8 tmp = ((code >> (i << 3)) ^ ret);
+      ret = ((crctable0[(tmp >> 4) & 0x0F] ^ crctable1[tmp & 0x0F]) ^ (ret >> 8));
     }
   }
+
   return ret;
 }
 
-static u8 verifycode(const u32* codes, u16 size)
+static constexpr u8 VerifyCode(std::span<const u32> codes)
 {
-  u16 tmp = gencrc16(codes, size);
+  const u16 tmp = GetCRC16(codes);
   return (((tmp >> 12) ^ (tmp >> 8) ^ (tmp >> 4) ^ tmp) & 0x0F);
 }
 
-static void unscramble1(u32* addr, u32* val)
+static void Unscramble1(u32* addr, u32* val)
 {
-  u32 tmp;
+  u32 tmp = 0;
 
   *val = std::rotl(*val, 4);
 
@@ -272,9 +272,9 @@ static void unscramble1(u32* addr, u32* val)
   *val ^= tmp;
 }
 
-static void unscramble2(u32* addr, u32* val)
+static void Unscramble2(u32* addr, u32* val)
 {
-  u32 tmp;
+  u32 tmp = 0;
 
   *val = std::rotr(*val, 1);
 
@@ -299,18 +299,15 @@ static void unscramble2(u32* addr, u32* val)
   *addr = std::rotr((*addr ^ tmp), 4);
 }
 
-static void decryptcode(const u32* seeds, u32* code)
+static void DecryptCode(const Seeds& seeds, u32* code)
 {
-  u32 addr, val;
-  u32 tmp, tmp2;
-  int i = 0;
+  auto [addr, val] = GetCode(code);
+  Unscramble1(&addr, &val);
 
-  getcode(code, &addr, &val);
-  unscramble1(&addr, &val);
-  while (i < 32)
+  for (u32 i = 0; i < 32;)
   {
-    tmp = (std::rotr(val, 4) ^ seeds[i++]);
-    tmp2 = (val ^ seeds[i++]);
+    u32 tmp = (std::rotr(val, 4) ^ seeds[i++]);
+    u32 tmp2 = (val ^ seeds[i++]);
     addr ^= (table6[tmp & 0x3F] ^ table4[(tmp >> 8) & 0x3F] ^ table2[(tmp >> 16) & 0x3F] ^
              table0[(tmp >> 24) & 0x3F] ^ table7[tmp2 & 0x3F] ^ table5[(tmp2 >> 8) & 0x3F] ^
              table3[(tmp2 >> 16) & 0x3F] ^ table1[(tmp2 >> 24) & 0x3F]);
@@ -321,16 +318,16 @@ static void decryptcode(const u32* seeds, u32* code)
             table0[(tmp >> 24) & 0x3F] ^ table7[tmp2 & 0x3F] ^ table5[(tmp2 >> 8) & 0x3F] ^
             table3[(tmp2 >> 16) & 0x3F] ^ table1[(tmp2 >> 24) & 0x3F]);
   }
-  unscramble2(&addr, &val);
-  setcode(code, val, addr);
+  Unscramble2(&addr, &val);
+  SetCode(code, val, addr);
 }
 
-static bool getbitstring(u32* ctrl, u32* out, u8 len)
+static bool GetBitString(u32* ctrl, u32* out, u8 len)
 {
   u32 tmp = (ctrl[0] + (ctrl[1] << 2));
 
   *out = 0;
-  while (len--)
+  while (len-- != 0)
   {
     if (ctrl[2] > 0x1F)
     {
@@ -348,155 +345,139 @@ static bool getbitstring(u32* ctrl, u32* out, u8 len)
   return true;
 }
 
-static bool batchdecrypt(u32* codes, u16 size)
+static std::optional<GameIDAndRegion> BatchDecrypt(std::span<u32> codes)
 {
-  u32* ptr = codes;
-  std::array<u32, 4> tmparray{};
-  std::array<u32, 8> tmparray2{};
+  const auto size = u32(codes.size());
 
-  // Not required
-  // if (size & 1) return 0;
-  // if (!size) return 0;
+  assert((size & 1) == 0);
+  assert(size != 0);
 
-  u32 tmp = (size >> 1);
-  while (tmp--)
-  {
-    decryptcode(genseeds.data(), ptr);
-    ptr += 2;
-  }
+  for (u32 i = 0; i < size; i += 2)
+    DecryptCode(genseeds, codes.data() + i);
 
-  tmparray[0] = *codes;
-  tmparray[1] = 0;
-  tmparray[2] = 4;  // Skip crc
-  tmparray[3] = size;
-  getbitstring(tmparray.data(), &tmparray2[1], 11);  // Game id
-  getbitstring(tmparray.data(), &tmparray2[2], 17);  // Code id
-  getbitstring(tmparray.data(), &tmparray2[3], 1);   // Master code
-  getbitstring(tmparray.data(), &tmparray2[4], 1);   // Unknown
-  getbitstring(tmparray.data(), &tmparray2[5], 2);   // Region
+  const u32 tmp = codes[0];
+  codes[0] &= 0x0FFFFFFF;
+  if ((tmp >> 28) != VerifyCode(codes))
+    return std::nullopt;
 
-  // Grab gameid and region from the last decrypted code
-  // TODO: Maybe check this against Dolphin's GameID? - "code is for wrong game" type msg
-  // gameid = tmparray2[1];
-  // region = tmparray2[5];
+  std::array<u32, 4> tmparray = {
+      codes[0],
+      0,
+      4,  // Skip crc
+      size,
+  };
 
-  tmp = codes[0];
-  codes[0] &= 0x0FFFFFFF;
-  if ((tmp >> 28) != verifycode(codes, size))
-  {
-    return false;
-  }
+  std::array<u32, 8> tmparray2{};
+  GetBitString(tmparray.data(), &tmparray2[1], 11);  // Game id
+  GetBitString(tmparray.data(), &tmparray2[2], 17);  // Code id
+  GetBitString(tmparray.data(), &tmparray2[3], 1);   // Master code
+  GetBitString(tmparray.data(), &tmparray2[4], 1);   // Unknown
+  GetBitString(tmparray.data(), &tmparray2[5], 2);   // Region
 
-  return true;
+  // Grab gameid and region from the last decrypted code
+  // TODO: Maybe check this against Dolphin's GameID? - "code is for wrong game" type msg
+  return GameIDAndRegion{tmparray2[1], tmparray2[5]};
 
   // Unfinished (so says Parasyte :p )
 }
 
-static int GetVal(const char* flt, char chr)
+static u32 GetVal(char chr)
 {
-  int ret = (int)(strchr(flt, chr) - flt);
+  const auto ret = u32(strchr(filter, Common::ToUpper(chr)) - filter);
   switch (ret)
   {
   case 32:  // 'I'
   case 33:  // 'L'
-    ret = 1;
+    return 1;
     break;
   case 34:  // 'O'
-    ret = 0;
+    return 0;
     break;
   case 35:  // 'S'
-    ret = 5;
+    return 5;
     break;
+  default:
+    return ret;
   }
-  return ret;
 }
 
-static int alphatobin(u32* dst, const std::vector<std::string>& alpha, int size)
+// Returns a vector of converted lines or an index where conversion failed.
+static std::expected<std::vector<u32>, std::size_t>
+ConvertAlphaToBinary(const std::span<const std::string>& alpha)
 {
-  int j = 0;
-  int ret = 0;
-  int org = size + 1;
-  u32 bin[2];
-  u8 parity;
+  std::vector<u32> result;
+  result.reserve(alpha.size() * 2);
 
-  for (; size; --size)
+  std::size_t current_index = 0;
+  for (const auto& line : alpha)
   {
-    bin[0] = 0;
-    for (int i = 0; i < 6; i++)
-    {
-      bin[0] |= (GetVal(filter, alpha[j >> 1][i]) << (((5 - i) * 5) + 2));
-    }
-    bin[0] |= (GetVal(filter, alpha[j >> 1][6]) >> 3);
-    dst[j++] = bin[0];
+    assert(line.size() == 13);
 
-    bin[1] = 0;
-    for (int i = 0; i < 6; i++)
+    u32 value_a = GetVal(line[6]) >> 3;
+    u32 value_b = GetVal(line[12]) >> 1;
+    for (u32 i = 0; i != 6; ++i)
     {
-      bin[1] |= (GetVal(filter, alpha[j >> 1][i + 6]) << (((5 - i) * 5) + 4));
+      value_a |= (GetVal(line[i]) << (((5 - i) * 5) + 2));
+      value_b |= (GetVal(line[i + 6]) << (((5 - i) * 5) + 4));
     }
-    bin[1] |= (GetVal(filter, alpha[j >> 1][12]) >> 1);
-    dst[j++] = bin[1];
+    result.emplace_back(value_a);
+    result.emplace_back(value_b);
 
-    // verify parity bit
-    int k = 0;
-    parity = 0;
-    for (int i = 0; i < 64; i++)
-    {
-      if (i == 32)
-      {
-        k++;
-      }
-      parity ^= (bin[k] >> (i - (k << 5)));
-    }
-    if ((parity & 1) != (GetVal(filter, alpha[(j - 2) >> 1][12]) & 1))
-    {
-      ret = (org - size);
-    }
+    const u32 parity = std::popcount(value_a ^ value_b);
+    if ((parity & 1) != (GetVal(line[12]) & 1))
+      return std::unexpected{current_index};
+
+    ++current_index;
   }
 
-  return ret;
+  return std::move(result);
 }
 
-void DecryptARCode(std::vector<std::string> vCodes, std::vector<AREntry>* ops)
+std::optional<GameIDAndRegion> DecryptARCode(std::span<const std::string> encrypted_lines,
+                                             std::vector<AREntry>* result)
 {
-  std::array<u32, 1200> uCodes{};
-
-  for (std::string& s : vCodes)
-  {
-    Common::ToUpper(&s);
-  }
+  if (encrypted_lines.empty())
+    return std::nullopt;
 
-  const u32 ret = alphatobin(uCodes.data(), vCodes, (int)vCodes.size());
-  if (ret)
+  auto conversion_result = ConvertAlphaToBinary(encrypted_lines);
+  if (!conversion_result.has_value())
   {
-    // Return value is index + 1, 0 being the success flag value.
     PanicAlertFmtT(
         "Action Replay Code Decryption Error:\nParity Check Failed\n\nCulprit Code:\n{0}",
-        vCodes[ret - 1]);
+        encrypted_lines[conversion_result.error()]);
+    return std::nullopt;
   }
-  else if (!batchdecrypt(uCodes.data(), (u16)vCodes.size() << 1))
+
+  auto& codes = *conversion_result;
+  const auto decrypted_result = BatchDecrypt(codes);
+  if (!decrypted_result.has_value())
   {
-    // Commented out since we just send the code anyways and hope for the best XD
-    // PanicAlertFmt("Action Replay Code Decryption Error:\nCRC Check Failed\n\n"
-    //               "First Code in Block (should be verification code):\n{}",
-    //               vCodes[0]);
+    ERROR_LOG_FMT(ACTIONREPLAY,
+                  "Decryption Error: CRC Check Failed. "
+                  "First Code in Block (should be verification code): {}",
+                  encrypted_lines[0]);
 
-    for (size_t i = 0; i < (vCodes.size() << 1); i += 2)
+    for (size_t i = 0; i < codes.size(); i += 2)
     {
-      ops->emplace_back(uCodes[i], uCodes[i + 1]);
-      // PanicAlertFmt("Decrypted AR Code without verification code:\n{:08X} {:08X}", uCodes[i],
-      //               uCodes[i + 1]);
+      result->emplace_back(codes[i], codes[i + 1]);
+      WARN_LOG_FMT(ACTIONREPLAY, "Decrypted AR Code without verification code: {:08X} {:08X}",
+                   codes[i], codes[i + 1]);
     }
   }
   else
   {
+    INFO_LOG_FMT(ACTIONREPLAY, "Decrypted AR Code: GameID:{:08X} Region:{}",
+                 decrypted_result->game_id, decrypted_result->region);
+
     // Skip passing the verification code back
-    for (size_t i = 2; i < (vCodes.size() << 1); i += 2)
+    for (size_t i = 2; i < codes.size(); i += 2)
     {
-      ops->emplace_back(uCodes[i], uCodes[i + 1]);
-      // PanicAlertFmt("Decrypted AR Code:\n{:08X} {:08X}", uCodes[i], uCodes[i+1]);
+      result->emplace_back(codes[i], codes[i + 1]);
+      DEBUG_LOG_FMT(ACTIONREPLAY, "Decrypted AR Code: {:08X} {:08X}", codes[i], codes[i + 1]);
     }
   }
+
+  return decrypted_result;
 }
 
 }  // namespace ActionReplay
diff --git a/Source/Core/Core/ARDecrypt.h b/Source/Core/Core/ARDecrypt.h
index d74e46dc27ab..1364ae888145 100644
--- a/Source/Core/Core/ARDecrypt.h
+++ b/Source/Core/Core/ARDecrypt.h
@@ -3,14 +3,24 @@
 
 #pragma once
 
+#include <optional>
+#include <span>
 #include <string>
 #include <vector>
 
-#include "Common/CommonTypes.h"
 #include "Core/ActionReplay.h"
 
 namespace ActionReplay
 {
-void DecryptARCode(std::vector<std::string> vCodes, std::vector<AREntry>* ops);
+
+struct GameIDAndRegion
+{
+  // FYI: The "game id" here doesn't seem to match what we are familiar with.
+  u32 game_id;
+  u32 region;
+};
+
+std::optional<GameIDAndRegion> DecryptARCode(std::span<const std::string> encrypted_lines,
+                                             std::vector<AREntry>* result);
 
 }  // namespace ActionReplay
diff --git a/Source/Core/Core/AchievementManager.cpp b/Source/Core/Core/AchievementManager.cpp
index 4dc581d12595..d8f6c3bdc0cd 100644
--- a/Source/Core/Core/AchievementManager.cpp
+++ b/Source/Core/Core/AchievementManager.cpp
@@ -5,20 +5,17 @@
 
 #include "Core/AchievementManager.h"
 
-#include <cctype>
 #include <memory>
 
 #include <fmt/format.h>
 
-#include <rcheevos/include/rc_api_info.h>
-
-#include "Common/Assert.h"
 #include "Common/BitUtils.h"
 #include "Common/CommonPaths.h"
 #include "Common/Config/Config.h"
 #include "Common/FileUtil.h"
+#include "Common/HttpRequest.h"
 #include "Common/IOFile.h"
-#include "Common/Image.h"
+#include "Common/JsonUtil.h"
 #include "Common/Logging/Log.h"
 #include "Common/ScopeGuard.h"
 #include "Common/StringUtil.h"
@@ -33,7 +30,6 @@
 #include "Core/GeckoCode.h"
 #include "Core/HW/Memmap.h"
 #include "Core/HW/VideoInterface.h"
-#include "Core/Host.h"
 #include "Core/PatchEngine.h"
 #include "Core/PowerPC/MMU.h"
 #include "Core/System.h"
@@ -414,7 +410,7 @@ bool AchievementManager::IsHardcoreModeActive() const
 }
 
 template <typename T>
-void AchievementManager::FilterApprovedIni(std::vector<T>& codes, const std::string& game_id,
+void AchievementManager::FilterApprovedIni(std::vector<T>& codes, std::string_view game_id,
                                            u16 revision) const
 {
   if (codes.empty())
@@ -443,7 +439,7 @@ void AchievementManager::FilterApprovedIni(std::vector<T>& codes, const std::str
 }
 
 template <typename T>
-bool AchievementManager::ShouldCodeBeActivated(const T& code, const std::string& game_id,
+bool AchievementManager::ShouldCodeBeActivated(const T& code, std::string_view game_id,
                                                u16 revision) const
 {
   if (!code.enabled)
@@ -470,8 +466,7 @@ bool AchievementManager::ShouldCodeBeActivated(const T& code, const std::string&
 }
 
 template <typename T>
-bool AchievementManager::IsApprovedCode(const T& code, const std::string& game_id,
-                                        u16 revision) const
+bool AchievementManager::IsApprovedCode(const T& code, std::string_view game_id, u16 revision) const
 {
   // Approved codes list failed to hash
   if (!m_ini_root->is<picojson::value::object>())
@@ -536,42 +531,42 @@ Common::SHA1::Digest AchievementManager::GetCodeHash(const ActionReplay::ARCode&
 }
 
 void AchievementManager::FilterApprovedPatches(std::vector<PatchEngine::Patch>& patches,
-                                               const std::string& game_id, u16 revision) const
+                                               std::string_view game_id, u16 revision) const
 {
   FilterApprovedIni(patches, game_id, revision);
 }
 
 void AchievementManager::FilterApprovedGeckoCodes(std::vector<Gecko::GeckoCode>& codes,
-                                                  const std::string& game_id, u16 revision) const
+                                                  std::string_view game_id, u16 revision) const
 {
   FilterApprovedIni(codes, game_id, revision);
 }
 
 void AchievementManager::FilterApprovedARCodes(std::vector<ActionReplay::ARCode>& codes,
-                                               const std::string& game_id, u16 revision) const
+                                               std::string_view game_id, u16 revision) const
 {
   FilterApprovedIni(codes, game_id, revision);
 }
 
 bool AchievementManager::ShouldGeckoCodeBeActivated(const Gecko::GeckoCode& code,
-                                                    const std::string& game_id, u16 revision) const
+                                                    std::string_view game_id, u16 revision) const
 {
   return ShouldCodeBeActivated(code, game_id, revision);
 }
 
 bool AchievementManager::ShouldARCodeBeActivated(const ActionReplay::ARCode& code,
-                                                 const std::string& game_id, u16 revision) const
+                                                 std::string_view game_id, u16 revision) const
 {
   return ShouldCodeBeActivated(code, game_id, revision);
 }
 
-bool AchievementManager::IsApprovedGeckoCode(const Gecko::GeckoCode& code,
-                                             const std::string& game_id, u16 revision) const
+bool AchievementManager::IsApprovedGeckoCode(const Gecko::GeckoCode& code, std::string_view game_id,
+                                             u16 revision) const
 {
   return IsApprovedCode(code, game_id, revision);
 }
 bool AchievementManager::IsApprovedARCode(const ActionReplay::ARCode& code,
-                                          const std::string& game_id, u16 revision) const
+                                          std::string_view game_id, u16 revision) const
 {
   return IsApprovedCode(code, game_id, revision);
 }
@@ -936,22 +931,8 @@ void AchievementManager::LoginCallback(int result, const char* error_message, rc
   std::string config_username = Config::Get(Config::RA_USERNAME);
   if (config_username != user->username)
   {
-    if (Common::CaseInsensitiveEquals(config_username, user->username))
-    {
-      INFO_LOG_FMT(ACHIEVEMENTS,
-                   "Case mismatch between site {} and local {}; updating local config.",
-                   user->username, Config::Get(Config::RA_USERNAME));
-      Config::SetBaseOrCurrent(Config::RA_USERNAME, user->username);
-    }
-    else
-    {
-      INFO_LOG_FMT(ACHIEVEMENTS, "Attempted to login prior user {}; current user is {}.",
-                   user->username, Config::Get(Config::RA_USERNAME));
-      rc_client_logout(client);
-      instance.update_event.Trigger({.failed_login_code = RC_INVALID_STATE});
-      instance.login_event.Trigger(RC_INVALID_STATE);
-      return;
-    }
+    INFO_LOG_FMT(ACHIEVEMENTS, "Username alias {} -> {}.", config_username, user->username);
+    Config::SetBaseOrCurrent(Config::RA_USERNAME, user->username);
   }
   instance.login_event.Trigger(RC_OK);
 
@@ -1334,8 +1315,6 @@ u32 AchievementManager::MemoryPeeker(u32 address, u8* buffer, u32 num_bytes, rc_
     return 0u;
   auto& system = Core::System::GetInstance();
   Core::CPUThreadGuard thread_guard(system);
-  if (address > MEM1_SIZE)
-    address += (MEM2_START - MEM1_SIZE);
   for (u32 num_read = 0; num_read < num_bytes; num_read++)
   {
     auto value = system.GetMMU().HostTryRead<u8>(thread_guard, address + num_read,
@@ -1505,6 +1484,7 @@ void AchievementManager::LoadIntegrationCallback(int result, const char* error_m
   case RC_OK:
     INFO_LOG_FMT(ACHIEVEMENTS, "RAIntegration.dll found.");
     instance.m_dll_found = true;
+    rc_client_set_allow_background_memory_reads(instance.m_client, 0);
     rc_client_raintegration_set_event_handler(instance.m_client, RAIntegrationEventHandler);
     rc_client_raintegration_set_write_memory_function(instance.m_client, MemoryPoker);
     rc_client_raintegration_set_get_game_name_function(instance.m_client, GameTitleEstimateHandler);
@@ -1561,10 +1541,7 @@ void AchievementManager::MemoryPoker(u32 address, u8* buffer, u32 num_bytes, rc_
   if (!system)
     return;
   Core::CPUThreadGuard thread_guard(*system);
-  if (address < MEM1_SIZE)
-    system->GetMemory().CopyToEmu(address, buffer, num_bytes);
-  else
-    system->GetMemory().CopyToEmu(address - MEM1_SIZE + MEM2_START, buffer, num_bytes);
+  system->GetMemory().CopyToEmu(address, buffer, num_bytes);
 }
 
 void AchievementManager::GameTitleEstimateHandler(char* buffer, u32 buffer_size,
diff --git a/Source/Core/Core/AchievementManager.h b/Source/Core/Core/AchievementManager.h
index 0c486deeba87..2ab23a43683a 100644
--- a/Source/Core/Core/AchievementManager.h
+++ b/Source/Core/Core/AchievementManager.h
@@ -9,17 +9,17 @@
 #include <chrono>
 #include <ctime>
 #include <functional>
-#include <map>
 #include <memory>
 #include <mutex>
 #include <set>
 #include <string>
 #include <string_view>
-#include <thread>
 #include <unordered_map>
 #include <unordered_set>
 #include <vector>
 
+#include <picojson.h>
+
 #include <rcheevos/include/rc_api_runtime.h>
 #include <rcheevos/include/rc_api_user.h>
 #include <rcheevos/include/rc_client.h>
@@ -28,10 +28,7 @@
 
 #include "Common/CommonTypes.h"
 #include "Common/Config/Config.h"
-#include "Common/Event.h"
 #include "Common/HookableEvent.h"
-#include "Common/HttpRequest.h"
-#include "Common/JsonUtil.h"
 #include "Common/Lazy.h"
 #include "Common/WorkQueueThread.h"
 #include "DiscIO/Volume.h"
@@ -43,7 +40,6 @@
 
 namespace Core
 {
-class CPUThreadGuard;
 class System;
 }  // namespace Core
 
@@ -77,9 +73,6 @@ class AchievementManager
   using RichPresence = std::array<char, RP_SIZE>;
   using Badge = VideoCommon::CustomTextureData::ArraySlice::Level;
   static constexpr size_t MAX_DISPLAYED_LBOARDS = 4;
-  // This is hardcoded to 24MiB because rcheevos currently hardcodes it to 24MiB.
-  static constexpr u32 MEM1_SIZE = 0x01800000;
-  static constexpr u32 MEM2_START = 0x10000000;
 
   static constexpr std::string_view DEFAULT_PLAYER_BADGE_FILENAME = "achievements_player.png";
   static constexpr std::string_view DEFAULT_GAME_BADGE_FILENAME = "achievements_game.png";
@@ -90,8 +83,8 @@ class AchievementManager
   static constexpr std::string_view BLUE = "#0B71C1";
   static constexpr std::string_view APPROVED_LIST_FILENAME = "ApprovedInis.json";
   static const inline Common::SHA1::Digest APPROVED_LIST_HASH = {
-      0xDF, 0x11, 0xD6, 0xA7, 0x2E, 0x8D, 0x3B, 0x3C, 0x41, 0x22,
-      0x29, 0x3F, 0x67, 0x40, 0xD9, 0x92, 0xBF, 0xC0, 0x1C, 0x43};
+      0xEA, 0x2F, 0x74, 0xA1, 0x6C, 0xF3, 0xB5, 0xD4, 0x8A, 0xAF,
+      0x03, 0x30, 0x58, 0x2A, 0xE0, 0xF7, 0x0A, 0x88, 0x86, 0xB3};
 
   struct LeaderboardEntry
   {
@@ -144,19 +137,19 @@ class AchievementManager
   std::recursive_mutex& GetLock();
   bool IsHardcoreModeActive() const;
 
-  void FilterApprovedPatches(std::vector<PatchEngine::Patch>& patches, const std::string& game_id,
+  void FilterApprovedPatches(std::vector<PatchEngine::Patch>& patches, std::string_view game_id,
                              u16 revision) const;
-  void FilterApprovedGeckoCodes(std::vector<Gecko::GeckoCode>& codes, const std::string& game_id,
+  void FilterApprovedGeckoCodes(std::vector<Gecko::GeckoCode>& codes, std::string_view game_id,
                                 u16 revision) const;
-  void FilterApprovedARCodes(std::vector<ActionReplay::ARCode>& codes, const std::string& game_id,
+  void FilterApprovedARCodes(std::vector<ActionReplay::ARCode>& codes, std::string_view game_id,
                              u16 revision) const;
-  bool ShouldGeckoCodeBeActivated(const Gecko::GeckoCode& code, const std::string& game_id,
+  bool ShouldGeckoCodeBeActivated(const Gecko::GeckoCode& code, std::string_view game_id,
                                   u16 revision) const;
-  bool ShouldARCodeBeActivated(const ActionReplay::ARCode& code, const std::string& game_id,
+  bool ShouldARCodeBeActivated(const ActionReplay::ARCode& code, std::string_view game_id,
                                u16 revision) const;
-  bool IsApprovedGeckoCode(const Gecko::GeckoCode& code, const std::string& game_id,
+  bool IsApprovedGeckoCode(const Gecko::GeckoCode& code, std::string_view game_id,
                            u16 revision) const;
-  bool IsApprovedARCode(const ActionReplay::ARCode& code, const std::string& game_id,
+  bool IsApprovedARCode(const ActionReplay::ARCode& code, std::string_view game_id,
                         u16 revision) const;
 
   void SetSpectatorMode();
@@ -223,11 +216,11 @@ class AchievementManager
   void SetHardcoreMode();
 
   template <typename T>
-  void FilterApprovedIni(std::vector<T>& codes, const std::string& game_id, u16 revision) const;
+  void FilterApprovedIni(std::vector<T>& codes, std::string_view game_id, u16 revision) const;
   template <typename T>
-  bool ShouldCodeBeActivated(const T& code, const std::string& game_id, u16 revision) const;
+  bool ShouldCodeBeActivated(const T& code, std::string_view game_id, u16 revision) const;
   template <typename T>
-  bool IsApprovedCode(const T& code, const std::string& game_id, u16 revision) const;
+  bool IsApprovedCode(const T& code, std::string_view game_id, u16 revision) const;
   Common::SHA1::Digest GetCodeHash(const PatchEngine::Patch& patch) const;
   Common::SHA1::Digest GetCodeHash(const Gecko::GeckoCode& code) const;
   Common::SHA1::Digest GetCodeHash(const ActionReplay::ARCode& code) const;
@@ -326,14 +319,14 @@ class AchievementManager
 
   constexpr bool IsHardcoreModeActive() { return false; }
 
-  constexpr bool ShouldGeckoCodeBeActivated(const Gecko::GeckoCode& code,
-                                            const std::string& game_id, u16 revision)
+  constexpr bool ShouldGeckoCodeBeActivated(const Gecko::GeckoCode& code, std::string_view game_id,
+                                            u16 revision)
   {
     return code.enabled;
   }
 
-  constexpr bool ShouldARCodeBeActivated(const ActionReplay::ARCode& code,
-                                         const std::string& game_id, u16 revision)
+  constexpr bool ShouldARCodeBeActivated(const ActionReplay::ARCode& code, std::string_view game_id,
+                                         u16 revision)
   {
     return code.enabled;
   }
diff --git a/Source/Core/Core/ActionReplay.cpp b/Source/Core/Core/ActionReplay.cpp
index f5089acaae16..9dbb0450a82c 100644
--- a/Source/Core/Core/ActionReplay.cpp
+++ b/Source/Core/Core/ActionReplay.cpp
@@ -33,7 +33,6 @@
 #include <fmt/format.h>
 
 #include "Common/CommonTypes.h"
-#include "Common/Config/Config.h"
 #include "Common/IniFile.h"
 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"
diff --git a/Source/Core/Core/Boot/Boot.cpp b/Source/Core/Core/Boot/Boot.cpp
index 943744fcd52c..4ba59ffb95c3 100644
--- a/Source/Core/Core/Boot/Boot.cpp
+++ b/Source/Core/Core/Boot/Boot.cpp
@@ -5,8 +5,8 @@
 
 #include <algorithm>
 #include <array>
-#include <cmath>
 #include <cstring>
+#include <fstream>
 #include <memory>
 #include <numeric>
 #include <optional>
@@ -17,7 +17,6 @@
 
 #include <fmt/ranges.h>
 
-#include "Common/Align.h"
 #include "Common/CommonPaths.h"
 #include "Common/CommonTypes.h"
 #include "Common/Config/Config.h"
@@ -37,6 +36,7 @@
 #include "Core/ConfigManager.h"
 #include "Core/FifoPlayer/FifoPlayer.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HW/DVD/AMMediaboard.h"
 #include "Core/HW/DVD/DVDInterface.h"
 #include "Core/HW/EXI/EXI_DeviceIPL.h"
 #include "Core/HW/Memmap.h"
@@ -253,7 +253,7 @@ std::unique_ptr<BootParameters> BootParameters::GenerateFromFile(std::vector<std
        ".elf"}};
   if (disc_image_extensions.contains(extension))
   {
-    std::unique_ptr<DiscIO::VolumeDisc> disc = DiscIO::CreateDisc(path);
+    std::unique_ptr<DiscIO::VolumeDisc> disc = DiscIO::CreateDiscForCore(path);
     if (disc)
     {
       return std::make_unique<BootParameters>(Disc{std::move(path), std::move(disc), paths},
@@ -387,7 +387,8 @@ bool CBoot::Load_BS2(Core::System& system, const std::string& boot_rom_filename)
   constexpr u32 PAL_v1_0 = 0x4F319F43;
   // DOL-101(EUR) (PAL Revision 1.2)
   constexpr u32 PAL_v1_2 = 0xAD1B7F16;
-  constexpr u32 Triforce = 0xD1883221;  // The Triforce's special IPL
+  // Triforce Arcade IPL (DEV Revision 1.0)
+  constexpr u32 Triforce = 0xD1883221;
 
   // Load the IPL ROM dump, limited to 2MiB which is the size of the official IPLs.
   constexpr size_t max_ipl_size = 2 * 1024 * 1024;
@@ -421,6 +422,7 @@ bool CBoot::Load_BS2(Core::System& system, const std::string& boot_rom_filename)
     break;
   case Triforce:
     known_ipl = true;
+    break;
   default:
     PanicAlertFmtT("The IPL file is not a known good dump. (CRC32: {0:x})", ipl_hash);
     break;
@@ -471,6 +473,14 @@ bool CBoot::Load_BS2(Core::System& system, const std::string& boot_rom_filename)
   ppc_state.spr[SPR_DBAT3L] = 0xfff00001;
   SetupBAT(system, /*is_wii*/ false);
 
+  if (ipl_hash == Triforce)
+  {
+    HLE::Patch(system, 0x813048B8, "OSReport");
+    HLE::Patch(system, 0x8130095C, "OSReport");  // Apploader
+
+    AMMediaboard::FirmwareMap(true);
+  }
+
   ppc_state.pc = 0x81200150;
 
   system.GetPowerPC().MSRUpdated();
@@ -482,7 +492,7 @@ static void SetDefaultDisc(DVD::DVDInterface& dvd_interface)
 {
   const std::string default_iso = Config::Get(Config::MAIN_DEFAULT_ISO);
   if (!default_iso.empty())
-    SetDisc(dvd_interface, DiscIO::CreateDisc(default_iso));
+    SetDisc(dvd_interface, DiscIO::CreateDiscForCore(default_iso));
 }
 
 static void CopyDefaultExceptionHandlers(Core::System& system)
@@ -504,6 +514,12 @@ bool CBoot::BootUp(Core::System& system, const Core::CPUThreadGuard& guard,
 {
   SConfig& config = SConfig::GetInstance();
 
+  // Triforce systems are region free and always must use the NTSC video mode
+  if (system.IsTriforce())
+  {
+    config.m_region = DiscIO::Region::NTSC_J;
+  }
+
   // PAL Wii uses NTSC framerate and linecount in 60Hz modes
   system.GetVideoInterface().Preset(DiscIO::IsNTSC(config.m_region) ||
                                     (system.IsWii() && Config::Get(Config::SYSCONF_PAL60)));
@@ -642,7 +658,7 @@ bool CBoot::BootUp(Core::System& system, const Core::CPUThreadGuard& guard,
       if (ipl.disc)
       {
         NOTICE_LOG_FMT(BOOT, "Inserting disc: {}", ipl.disc->path);
-        SetDisc(system.GetDVDInterface(), DiscIO::CreateDisc(ipl.disc->path),
+        SetDisc(system.GetDVDInterface(), DiscIO::CreateDiscForCore(ipl.disc->path),
                 ipl.disc->auto_disc_change_paths);
       }
       else
@@ -716,13 +732,13 @@ void UpdateStateFlags(std::function<void(StateFlags*)> update_function)
 
   StateFlags state{};
   if (file->GetStatus()->size == sizeof(StateFlags))
-    file->Read(&state, 1);
+    (void)file->Read(&state, 1);
 
   update_function(&state);
   state.UpdateChecksum();
 
-  file->Seek(0, IOS::HLE::FS::SeekMode::Set);
-  file->Write(&state, 1);
+  (void)file->Seek(0, IOS::HLE::FS::SeekMode::Set);
+  (void)file->Write(&state, 1);
 }
 
 void CreateSystemMenuTitleDirs()
diff --git a/Source/Core/Core/Boot/Boot_BS2Emu.cpp b/Source/Core/Core/Boot/Boot_BS2Emu.cpp
index c65177975aaf..a44796dd4f78 100644
--- a/Source/Core/Core/Boot/Boot_BS2Emu.cpp
+++ b/Source/Core/Core/Boot/Boot_BS2Emu.cpp
@@ -21,6 +21,7 @@
 #include "Core/Core.h"
 #include "Core/Debugger/BranchWatch.h"
 #include "Core/HLE/HLE.h"
+#include "Core/HW/DVD/AMMediaboard.h"
 #include "Core/HW/DVD/DVDInterface.h"
 #include "Core/HW/EXI/EXI_DeviceIPL.h"
 #include "Core/HW/Memmap.h"
@@ -228,12 +229,16 @@ bool CBoot::RunApploader(Core::System& system, const Core::CPUThreadGuard& guard
   ppc_state.pc = ppc_state.gpr[3];
 
   branch_watch.SetRecordingActive(guard, resume_branch_watch);
-  // Blank out session key (https://debugmo.de/2008/05/part-2-dumping-the-media-board/)
-  if (volume.GetVolumeType() == DiscIO::Platform::Triforce)
+
+  if (system.IsTriforce())
   {
     auto& memory = system.GetMemory();
 
-    memory.Memset(0, 0, 12);
+    AMMediaboard::InitDIMM(volume);
+
+    // Triforce disc register obfuscation
+    AMMediaboard::InitKeys(memory.Read_U32(0), memory.Read_U32(4), memory.Read_U32(8));
+    AMMediaboard::FirmwareMap(false);
   }
 
   return true;
@@ -526,7 +531,7 @@ static void WriteEmptyPlayRecord()
   if (!playrec_file)
     return;
   std::vector<u8> empty_record(0x80);
-  playrec_file->Write(empty_record.data(), empty_record.size());
+  (void)playrec_file->Write(empty_record.data(), empty_record.size());
 }
 
 // __________________________________________________________________________________________________
diff --git a/Source/Core/Core/Boot/Boot_WiiWAD.cpp b/Source/Core/Core/Boot/Boot_WiiWAD.cpp
index 8b3d78033508..c4b5419a698e 100644
--- a/Source/Core/Core/Boot/Boot_WiiWAD.cpp
+++ b/Source/Core/Core/Boot/Boot_WiiWAD.cpp
@@ -1,13 +1,10 @@
 // Copyright 2009 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include <memory>
-
 #include "Common/CommonTypes.h"
 #include "Common/MsgHandler.h"
 
 #include "Core/Boot/Boot.h"
-#include "Core/CommonTitles.h"
 #include "Core/IOS/ES/ES.h"
 #include "Core/IOS/ES/Formats.h"
 #include "Core/IOS/IOS.h"
diff --git a/Source/Core/Core/BootManager.cpp b/Source/Core/Core/BootManager.cpp
index 222b8eca708b..fe31802653f6 100644
--- a/Source/Core/Core/BootManager.cpp
+++ b/Source/Core/Core/BootManager.cpp
@@ -17,10 +17,6 @@
 
 #include "Core/BootManager.h"
 
-#include <algorithm>
-#include <array>
-#include <string>
-
 #include <fmt/format.h>
 
 #ifdef __LIBRETRO__
@@ -29,13 +25,11 @@
 #include "Common/CommonTypes.h"
 #include "Common/Config/Config.h"
 #include "Common/FileUtil.h"
-#include "Common/IniFile.h"
-#include "Common/Logging/Log.h"
 
 #include "Core/AchievementManager.h"
 #include "Core/Boot/Boot.h"
+#include "Core/Config/GraphicsSettings.h"
 #include "Core/Config/MainSettings.h"
-#include "Core/Config/SYSCONFSettings.h"
 #include "Core/ConfigLoaders/BaseConfigLoader.h"
 #include "Core/ConfigLoaders/NetPlayConfigLoader.h"
 #include "Core/ConfigManager.h"
@@ -44,17 +38,13 @@
 #include "Core/HW/SI/SI.h"
 #include "Core/HW/SI/SI_Device.h"
 #include "Core/HW/Sram.h"
-#include "Core/HW/WiimoteReal/WiimoteReal.h"
 #include "Core/Movie.h"
 #include "Core/NetPlayProto.h"
-#include "Core/PowerPC/PowerPC.h"
 #include "Core/System.h"
 #include "Core/WiiRoot.h"
 
 #include "DiscIO/Enums.h"
 
-#include "VideoCommon/VideoBackendBase.h"
-
 namespace BootManager
 {
 // Boot the ISO or file
@@ -131,7 +121,7 @@ bool BootCore(Core::System& system, std::unique_ptr<BootParameters> boot,
         case DiscIO::Region::NTSC_K:
           Config::SetCurrent(Config::SYSCONF_COUNTRY, 0x88);  // South Korea
           break;
-        case DiscIO::Region::Unknown:
+        default:
           break;
         }
       }
@@ -147,10 +137,34 @@ bool BootCore(Core::System& system, std::unique_ptr<BootParameters> boot,
   if (!boot->riivolution_patches.empty())
     Config::SetCurrent(Config::MAIN_FAST_DISC_SPEED, true);
 
+  if (system.IsTriforce())
+  {
+    // Attach Triforce Baseboard hardware if not overridden in any layer.
+    // Users may set these in their GameConfig if they want them not automatically attached.
+    if (GetActiveLayerForConfig(Config::MAIN_SERIAL_PORT_1) == Config::LayerType::Base)
+    {
+      Config::SetCurrent(Config::MAIN_SERIAL_PORT_1, ExpansionInterface::EXIDeviceType::Baseboard);
+    }
+    if (GetActiveLayerForConfig(Config::GetInfoForSIDevice(0)) == Config::LayerType::Base)
+    {
+      Config::SetCurrent(Config::GetInfoForSIDevice(0),
+                         SerialInterface::SIDevices::SIDEVICE_AM_BASEBOARD);
+    }
+
+    // Mario Kart Arcade GP has widescreen heuristic issues.
+    // All Triforce games are 4:3 so we'll just disable the heuristic for now.
+    if (GetActiveLayerForConfig(Config::GFX_SUGGESTED_ASPECT_RATIO) == Config::LayerType::Base)
+    {
+      Config::SetCurrent(Config::GFX_SUGGESTED_ASPECT_RATIO, AspectMode::ForceStandard);
+    }
+  }
+
   system.Initialize();
 
   Core::UpdateWantDeterminism(system, /*initial*/ true);
 
+  ConfigLoaders::TransferSYSCONFControlToGuest();
+
   if (system.IsWii())
   {
     Core::InitializeWiiRoot(Core::WantsDeterminism());
@@ -159,13 +173,16 @@ bool BootCore(Core::System& system, std::unique_ptr<BootParameters> boot,
     if (!Core::WantsDeterminism())
     {
       Core::BackupWiiSettings();
-      ConfigLoaders::SaveToSYSCONF(Config::LayerType::Meta);
+      ConfigLoaders::SaveToSYSCONF(Config::LayerType::Meta,
+                                   ConfigLoaders::SkipIfControlledByGuest::No);
     }
     else
     {
-      ConfigLoaders::SaveToSYSCONF(Config::LayerType::Meta, [](const Config::Location& location) {
-        return Config::GetActiveLayerForConfig(location) >= Config::LayerType::Movie;
-      });
+      ConfigLoaders::SaveToSYSCONF(
+          Config::LayerType::Meta, ConfigLoaders::SkipIfControlledByGuest::No,
+          [](const Config::Location& location) {
+            return Config::GetActiveLayerForConfig(location) >= Config::LayerType::Movie;
+          });
     }
   }
 
@@ -188,6 +205,8 @@ bool BootCore(Core::System& system, std::unique_ptr<BootParameters> boot,
       case DiscIO::Region::PAL:
         ipl_path = EUR_DIR DIR_SEP GC_IPL;
         break;
+      case DiscIO::Region::DEV:
+        ipl_path = DEV_DIR DIR_SEP GC_IPL;
       default:
         break;
     }
@@ -225,46 +244,22 @@ bool BootCore(Core::System& system, std::unique_ptr<BootParameters> boot,
             std::move(boot->boot_session_data)),
         wsi);
   }
-  return Core::Init(system, std::move(boot), wsi);
-}
-
-// SYSCONF can be modified during emulation by the user and internally, which makes it
-// a bad idea to just always overwrite it with the settings from the base layer.
-//
-// Conversely, we also shouldn't just accept any changes to SYSCONF, as it may cause
-// temporary settings (from Movie, Netplay, game INIs, etc.) to stick around.
-//
-// To avoid inconveniences in most cases, we accept changes that aren't being overridden by a
-// non-base layer, and restore only the overridden settings.
-static void RestoreSYSCONF()
-{
-  // This layer contains the new SYSCONF settings (including any temporary settings).
-  Config::Layer temp_layer(Config::LayerType::Base);
-  // Use a separate loader so the temp layer doesn't automatically save
-  ConfigLoaders::GenerateBaseConfigLoader()->Load(&temp_layer);
 
-  for (const auto& setting : Config::SYSCONF_SETTINGS)
-  {
-    std::visit(
-        [&](auto* info) {
-          // If this setting was overridden, then we copy the base layer value back to the SYSCONF.
-          // Otherwise we leave the new value in the SYSCONF.
-          if (Config::GetActiveLayerForConfig(*info) == Config::LayerType::Base)
-            Config::SetBase(*info, temp_layer.Get(*info));
-        },
-        setting.config_info);
-  }
-  ConfigLoaders::SaveToSYSCONF(Config::LayerType::Base);
+  return Core::Init(system, std::move(boot), wsi);
 }
 
 void RestoreConfig()
 {
   Core::ShutdownWiiRoot();
 
-  if (!Core::WiiRootIsTemporary())
+  if (Core::WiiRootIsTemporary())
+  {
+    ConfigLoaders::TransferSYSCONFControlFromGuest(ConfigLoaders::WriteBackChangedValues::No);
+  }
+  else
   {
     Core::RestoreWiiSettings(Core::RestoreReason::EmulationEnd);
-    RestoreSYSCONF();
+    ConfigLoaders::TransferSYSCONFControlFromGuest(ConfigLoaders::WriteBackChangedValues::Yes);
   }
 
   Config::ClearCurrentRunLayer();
diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt
index 511702a7484e..e495e4f27b03 100644
--- a/Source/Core/Core/CMakeLists.txt
+++ b/Source/Core/Core/CMakeLists.txt
@@ -123,8 +123,6 @@ add_library(core
   FifoPlayer/FifoPlayer.h
   FifoPlayer/FifoRecorder.cpp
   FifoPlayer/FifoRecorder.h
-  FreeLookConfig.cpp
-  FreeLookConfig.h
   FreeLookManager.cpp
   FreeLookManager.h
   GeckoCode.cpp
@@ -183,6 +181,8 @@ add_library(core
   HW/DSPLLE/DSPSymbols.h
   HW/DVD/DVDInterface.cpp
   HW/DVD/DVDInterface.h
+  HW/DVD/AMMediaboard.cpp
+  HW/DVD/AMMediaboard.h
   HW/DVD/DVDMath.cpp
   HW/DVD/DVDMath.h
   HW/DVD/DVDThread.cpp
@@ -254,6 +254,12 @@ add_library(core
   HW/HSP/HSP_DeviceNull.h
   HW/HW.cpp
   HW/HW.h
+  HW/MagCard/C1231BR.cpp
+  HW/MagCard/C1231BR.h
+  HW/MagCard/C1231LR.cpp
+  HW/MagCard/C1231LR.h
+  HW/MagCard/MagneticCardReader.cpp
+  HW/MagCard/MagneticCardReader.h
   HW/Memmap.cpp
   HW/Memmap.h
   HW/MemoryInterface.cpp
@@ -276,6 +282,8 @@ add_library(core
   HW/SI/SI_DeviceGCSteeringWheel.h
   HW/SI/SI_DeviceKeyboard.cpp
   HW/SI/SI_DeviceKeyboard.h
+  HW/SI/SI_DeviceAMBaseboard.cpp
+  HW/SI/SI_DeviceAMBaseboard.h
   HW/SI/SI_DeviceNull.cpp
   HW/SI/SI_DeviceNull.h
   HW/SI/SI.cpp
@@ -801,7 +809,7 @@ if(UNIX)
   )
 endif()
 
-if(WIN32 OR LINUX)
+if(TARGET cpp-ipc::ipc)
   target_sources(core PRIVATE HW/EXI/BBA/IPC.cpp)
   target_link_libraries(core PRIVATE cpp-ipc::ipc)
 endif()
diff --git a/Source/Core/Core/CheatGeneration.cpp b/Source/Core/Core/CheatGeneration.cpp
index e6120a0e5851..cf027105da8b 100644
--- a/Source/Core/Core/CheatGeneration.cpp
+++ b/Source/Core/Core/CheatGeneration.cpp
@@ -3,13 +3,13 @@
 
 #include "Core/CheatGeneration.h"
 
+#include <expected>
 #include <vector>
 
 #include <fmt/format.h>
 
 #include "Common/Align.h"
 #include "Common/CommonTypes.h"
-#include "Common/Result.h"
 #include "Common/Swap.h"
 
 #include "Core/ActionReplay.h"
@@ -52,20 +52,20 @@ static std::vector<ActionReplay::AREntry> ResultToAREntries(u32 addr, const Chea
   return codes;
 }
 
-Common::Result<Cheats::GenerateActionReplayCodeErrorCode, ActionReplay::ARCode>
+std::expected<ActionReplay::ARCode, Cheats::GenerateActionReplayCodeErrorCode>
 Cheats::GenerateActionReplayCode(const Cheats::CheatSearchSessionBase& session, size_t index)
 {
   if (index >= session.GetResultCount())
-    return Cheats::GenerateActionReplayCodeErrorCode::IndexOutOfRange;
+    return std::unexpected{Cheats::GenerateActionReplayCodeErrorCode::IndexOutOfRange};
 
   if (session.GetResultValueState(index) != Cheats::SearchResultValueState::ValueFromVirtualMemory)
-    return Cheats::GenerateActionReplayCodeErrorCode::NotVirtualMemory;
+    return std::unexpected{Cheats::GenerateActionReplayCodeErrorCode::NotVirtualMemory};
 
   u32 address = session.GetResultAddress(index);
 
   // check if the address is actually addressable by the ActionReplay system
   if (((address & 0x01ff'ffffu) | 0x8000'0000u) != address)
-    return Cheats::GenerateActionReplayCodeErrorCode::InvalidAddress;
+    return std::unexpected{Cheats::GenerateActionReplayCodeErrorCode::InvalidAddress};
 
   ActionReplay::ARCode ar_code;
   ar_code.enabled = true;
diff --git a/Source/Core/Core/CheatGeneration.h b/Source/Core/Core/CheatGeneration.h
index f6fda3a2217a..87f6f07ab0e3 100644
--- a/Source/Core/Core/CheatGeneration.h
+++ b/Source/Core/Core/CheatGeneration.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "Common/Result.h"
+#include <expected>
 
 #include "Core/ActionReplay.h"
 
@@ -18,6 +18,6 @@ enum class GenerateActionReplayCodeErrorCode
   InvalidAddress,
 };
 
-Common::Result<GenerateActionReplayCodeErrorCode, ActionReplay::ARCode>
+std::expected<ActionReplay::ARCode, GenerateActionReplayCodeErrorCode>
 GenerateActionReplayCode(const Cheats::CheatSearchSessionBase& session, size_t index);
 }  // namespace Cheats
diff --git a/Source/Core/Core/CheatSearch.cpp b/Source/Core/Core/CheatSearch.cpp
index 40868e5efc9f..2cf509e880e3 100644
--- a/Source/Core/Core/CheatSearch.cpp
+++ b/Source/Core/Core/CheatSearch.cpp
@@ -4,6 +4,7 @@
 #include "Core/CheatSearch.h"
 
 #include <bit>
+#include <expected>
 #include <functional>
 #include <memory>
 #include <optional>
@@ -109,23 +110,23 @@ TryReadValueFromEmulatedMemory(const Core::CPUThreadGuard& guard, u32 addr,
 }
 
 template <typename T>
-Common::Result<Cheats::SearchErrorCode, std::vector<Cheats::SearchResult<T>>>
-Cheats::NewSearch(const Core::CPUThreadGuard& guard,
-                  const std::vector<Cheats::MemoryRange>& memory_ranges,
-                  PowerPC::RequestedAddressSpace address_space, bool aligned,
-                  const std::function<bool(const T& value)>& validator)
+auto Cheats::NewSearch(const Core::CPUThreadGuard& guard,
+                       const std::vector<Cheats::MemoryRange>& memory_ranges,
+                       PowerPC::RequestedAddressSpace address_space, bool aligned,
+                       const std::function<bool(const T& value)>& validator)
+    -> std::expected<std::vector<SearchResult<T>>, SearchErrorCode>
 {
   if (AchievementManager::GetInstance().IsHardcoreModeActive())
-    return Cheats::SearchErrorCode::DisabledInHardcoreMode;
+    return std::unexpected{Cheats::SearchErrorCode::DisabledInHardcoreMode};
   auto& system = guard.GetSystem();
   std::vector<Cheats::SearchResult<T>> results;
   const Core::State core_state = Core::GetState(system);
   if (core_state != Core::State::Running && core_state != Core::State::Paused)
-    return Cheats::SearchErrorCode::NoEmulationActive;
+    return std::unexpected{Cheats::SearchErrorCode::NoEmulationActive};
 
   const auto& ppc_state = system.GetPPCState();
   if (address_space == PowerPC::RequestedAddressSpace::Virtual && !ppc_state.msr.DR)
-    return Cheats::SearchErrorCode::VirtualAddressesCurrentlyNotAccessible;
+    return std::unexpected{Cheats::SearchErrorCode::VirtualAddressesCurrentlyNotAccessible};
 
   for (const Cheats::MemoryRange& range : memory_ranges)
   {
@@ -162,23 +163,23 @@ Cheats::NewSearch(const Core::CPUThreadGuard& guard,
 }
 
 template <typename T>
-Common::Result<Cheats::SearchErrorCode, std::vector<Cheats::SearchResult<T>>>
-Cheats::NextSearch(const Core::CPUThreadGuard& guard,
-                   const std::vector<Cheats::SearchResult<T>>& previous_results,
-                   PowerPC::RequestedAddressSpace address_space,
-                   const std::function<bool(const T& new_value, const T& old_value)>& validator)
+auto Cheats::NextSearch(
+    const Core::CPUThreadGuard& guard, const std::vector<Cheats::SearchResult<T>>& previous_results,
+    PowerPC::RequestedAddressSpace address_space,
+    const std::function<bool(const T& new_value, const T& old_value)>& validator)
+    -> std::expected<std::vector<SearchResult<T>>, SearchErrorCode>
 {
   if (AchievementManager::GetInstance().IsHardcoreModeActive())
-    return Cheats::SearchErrorCode::DisabledInHardcoreMode;
+    return std::unexpected{Cheats::SearchErrorCode::DisabledInHardcoreMode};
   auto& system = guard.GetSystem();
   std::vector<Cheats::SearchResult<T>> results;
   const Core::State core_state = Core::GetState(system);
   if (core_state != Core::State::Running && core_state != Core::State::Paused)
-    return Cheats::SearchErrorCode::NoEmulationActive;
+    return std::unexpected{Cheats::SearchErrorCode::NoEmulationActive};
 
   const auto& ppc_state = system.GetPPCState();
   if (address_space == PowerPC::RequestedAddressSpace::Virtual && !ppc_state.msr.DR)
-    return Cheats::SearchErrorCode::VirtualAddressesCurrentlyNotAccessible;
+    return std::unexpected{Cheats::SearchErrorCode::VirtualAddressesCurrentlyNotAccessible};
 
   for (const auto& previous_result : previous_results)
   {
@@ -335,8 +336,8 @@ Cheats::SearchErrorCode Cheats::CheatSearchSession<T>::RunSearch(const Core::CPU
 {
   if (AchievementManager::GetInstance().IsHardcoreModeActive())
     return Cheats::SearchErrorCode::DisabledInHardcoreMode;
-  Common::Result<SearchErrorCode, std::vector<SearchResult<T>>> result =
-      Cheats::SearchErrorCode::InvalidParameters;
+  std::expected<std::vector<SearchResult<T>>, SearchErrorCode> result =
+      std::unexpected{Cheats::SearchErrorCode::InvalidParameters};
   if (m_filter_type == FilterType::CompareAgainstSpecificValue)
   {
     if (!m_value)
@@ -376,14 +377,14 @@ Cheats::SearchErrorCode Cheats::CheatSearchSession<T>::RunSearch(const Core::CPU
     }
   }
 
-  if (result.Succeeded())
+  if (result.has_value())
   {
     m_search_results = std::move(*result);
     m_first_search_done = true;
     return Cheats::SearchErrorCode::Success;
   }
 
-  return result.Error();
+  return result.error();
 }
 
 template <typename T>
diff --git a/Source/Core/Core/CheatSearch.h b/Source/Core/Core/CheatSearch.h
index 6c6d5090471a..7df135d51aa9 100644
--- a/Source/Core/Core/CheatSearch.h
+++ b/Source/Core/Core/CheatSearch.h
@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include <expected>
 #include <functional>
 #include <memory>
 #include <optional>
@@ -12,7 +13,6 @@
 #include <vector>
 
 #include "Common/CommonTypes.h"
-#include "Common/Result.h"
 #include "Core/PowerPC/MMU.h"
 
 namespace Core
@@ -116,7 +116,7 @@ std::vector<u8> GetValueAsByteVector(const SearchValue& value);
 // Do a new search across the given memory region in the given address space, only keeping values
 // for which the given validator returns true.
 template <typename T>
-Common::Result<SearchErrorCode, std::vector<SearchResult<T>>>
+std::expected<std::vector<SearchResult<T>>, SearchErrorCode>
 NewSearch(const Core::CPUThreadGuard& guard, const std::vector<MemoryRange>& memory_ranges,
           PowerPC::RequestedAddressSpace address_space, bool aligned,
           const std::function<bool(const T& value)>& validator);
@@ -124,7 +124,7 @@ NewSearch(const Core::CPUThreadGuard& guard, const std::vector<MemoryRange>& mem
 // Refresh the values for the given results in the given address space, only keeping values for
 // which the given validator returns true.
 template <typename T>
-Common::Result<SearchErrorCode, std::vector<SearchResult<T>>>
+std::expected<std::vector<SearchResult<T>>, SearchErrorCode>
 NextSearch(const Core::CPUThreadGuard& guard, const std::vector<SearchResult<T>>& previous_results,
            PowerPC::RequestedAddressSpace address_space,
            const std::function<bool(const T& new_value, const T& old_value)>& validator);
diff --git a/Source/Core/Core/Config/AchievementSettings.cpp b/Source/Core/Core/Config/AchievementSettings.cpp
index f3b3e43ebcf8..538461e474e0 100644
--- a/Source/Core/Core/Config/AchievementSettings.cpp
+++ b/Source/Core/Core/Config/AchievementSettings.cpp
@@ -6,8 +6,6 @@
 
 #include <string>
 
-#include "Common/Config/Config.h"
-
 namespace Config
 {
 // Configuration Information
diff --git a/Source/Core/Core/Config/DefaultLocale.cpp b/Source/Core/Core/Config/DefaultLocale.cpp
index a543a491719f..55f304c88fd2 100644
--- a/Source/Core/Core/Config/DefaultLocale.cpp
+++ b/Source/Core/Core/Config/DefaultLocale.cpp
@@ -5,7 +5,6 @@
 
 #include <algorithm>
 #include <array>
-#include <locale>
 #include <optional>
 #include <string>
 #include <string_view>
diff --git a/Source/Core/Core/Config/FreeLookSettings.cpp b/Source/Core/Core/Config/FreeLookSettings.cpp
index d66400bbe7c3..405a6029498b 100644
--- a/Source/Core/Core/Config/FreeLookSettings.cpp
+++ b/Source/Core/Core/Config/FreeLookSettings.cpp
@@ -3,11 +3,6 @@
 
 #include "Core/Config/FreeLookSettings.h"
 
-#include <string>
-
-#include "Common/Config/Config.h"
-#include "Core/FreeLookConfig.h"
-
 namespace Config
 {
 // Configuration Information
diff --git a/Source/Core/Core/Config/FreeLookSettings.h b/Source/Core/Core/Config/FreeLookSettings.h
index 367173a0a4c0..3d1375940b05 100644
--- a/Source/Core/Core/Config/FreeLookSettings.h
+++ b/Source/Core/Core/Config/FreeLookSettings.h
@@ -3,11 +3,16 @@
 
 #pragma once
 
-#include "Common/Config/Config.h"
+#include "Common/Config/ConfigInfo.h"
 
 namespace FreeLook
 {
-enum class ControlType : int;
+enum class ControlType : int
+{
+  SixAxis,
+  FPS,
+  Orbital
+};
 }
 
 namespace Config
diff --git a/Source/Core/Core/Config/GraphicsSettings.cpp b/Source/Core/Core/Config/GraphicsSettings.cpp
index 7062a724cb52..b401df3da91a 100644
--- a/Source/Core/Core/Config/GraphicsSettings.cpp
+++ b/Source/Core/Core/Config/GraphicsSettings.cpp
@@ -5,7 +5,6 @@
 
 #include <string>
 
-#include "Common/Config/Config.h"
 #include "VideoCommon/VideoConfig.h"
 
 namespace Config
@@ -194,6 +193,7 @@ const Info<bool> GFX_HACK_SKIP_XFB_COPY_TO_RAM{{System::GFX, "Hacks", "XFBToText
 const Info<bool> GFX_HACK_DISABLE_COPY_TO_VRAM{{System::GFX, "Hacks", "DisableCopyToVRAM"}, false};
 const Info<bool> GFX_HACK_DEFER_EFB_COPIES{{System::GFX, "Hacks", "DeferEFBCopies"}, true};
 const Info<bool> GFX_HACK_IMMEDIATE_XFB{{System::GFX, "Hacks", "ImmediateXFBEnable"}, false};
+const Info<bool> GFX_HACK_CAP_IMMEDIATE_XFB{{System::GFX, "Hacks", "CapImmediateXFB"}, false};
 const Info<bool> GFX_HACK_SKIP_DUPLICATE_XFBS{{System::GFX, "Hacks", "SkipDuplicateXFBs"}, true};
 const Info<bool> GFX_HACK_EARLY_XFB_OUTPUT{{System::GFX, "Hacks", "EarlyXFBOutput"}, true};
 const Info<bool> GFX_HACK_COPY_EFB_SCALED{{System::GFX, "Hacks", "EFBScaledCopy"}, true};
diff --git a/Source/Core/Core/Config/GraphicsSettings.h b/Source/Core/Core/Config/GraphicsSettings.h
index 99dbfb5e6452..5c22f588eaf5 100644
--- a/Source/Core/Core/Config/GraphicsSettings.h
+++ b/Source/Core/Core/Config/GraphicsSettings.h
@@ -168,6 +168,7 @@ extern const Info<bool> GFX_HACK_SKIP_XFB_COPY_TO_RAM;
 extern const Info<bool> GFX_HACK_DISABLE_COPY_TO_VRAM;
 extern const Info<bool> GFX_HACK_DEFER_EFB_COPIES;
 extern const Info<bool> GFX_HACK_IMMEDIATE_XFB;
+extern const Info<bool> GFX_HACK_CAP_IMMEDIATE_XFB;
 extern const Info<bool> GFX_HACK_SKIP_DUPLICATE_XFBS;
 extern const Info<bool> GFX_HACK_EARLY_XFB_OUTPUT;
 extern const Info<bool> GFX_HACK_COPY_EFB_SCALED;
diff --git a/Source/Core/Core/Config/MainSettings.cpp b/Source/Core/Core/Config/MainSettings.cpp
index 4e06ec371366..6d5f260f0709 100644
--- a/Source/Core/Core/Config/MainSettings.cpp
+++ b/Source/Core/Core/Config/MainSettings.cpp
@@ -6,6 +6,7 @@
 #include <sstream>
 
 #include <fmt/format.h>
+#include <fmt/ranges.h>
 
 #include "AudioCommon/AudioCommon.h"
 #include "Common/Assert.h"
@@ -20,13 +21,16 @@
 #include "Common/Version.h"
 #include "Core/AchievementManager.h"
 #include "Core/Config/DefaultLocale.h"
+#include "Core/Core.h"
 #include "Core/HW/EXI/EXI.h"
 #include "Core/HW/EXI/EXI_Device.h"
 #include "Core/HW/GCMemcard/GCMemcard.h"
 #include "Core/HW/HSP/HSP_Device.h"
 #include "Core/HW/Memmap.h"
 #include "Core/HW/SI/SI_Device.h"
+#include "Core/IOS/Network/Socket.h"
 #include "Core/PowerPC/PowerPC.h"
+#include "Core/System.h"
 #include "Core/USBUtils.h"
 #include "DiscIO/Enums.h"
 #include "VideoCommon/VideoBackendBase.h"
@@ -58,6 +62,7 @@ constexpr bool DEFAULT_CPU_THREAD = true;
 constexpr bool DEFAULT_CPU_THREAD = false;
 #endif
 const Info<bool> MAIN_CPU_THREAD{{System::Main, "Core", "CPUThread"}, DEFAULT_CPU_THREAD};
+const Info<bool> MAIN_LOAD_GAME_INTO_MEMORY{{System::Main, "Core", "LoadGameIntoMemory"}, false};
 const Info<bool> MAIN_SYNC_ON_SKIP_IDLE{{System::Main, "Core", "SyncOnSkipIdle"}, true};
 const Info<std::string> MAIN_DEFAULT_ISO{{System::Main, "Core", "DefaultISO"}, ""};
 const Info<bool> MAIN_ENABLE_CHEATS{{System::Main, "Core", "EnableCheats"}, false};
@@ -70,6 +75,7 @@ const Info<AudioCommon::DPL2Quality> MAIN_DPL2_QUALITY{{System::Main, "Core", "D
 const Info<int> MAIN_AUDIO_LATENCY{{System::Main, "Core", "AudioLatency"}, 20};
 const Info<int> MAIN_AUDIO_BUFFER_SIZE{{System::Main, "Core", "AudioBufferSize"}, 80};
 const Info<bool> MAIN_AUDIO_FILL_GAPS{{System::Main, "Core", "AudioFillGaps"}, true};
+const Info<bool> MAIN_AUDIO_PRESERVE_PITCH{{System::Main, "Core", "AudioPreservePitch"}, false};
 const Info<std::string> MAIN_MEMCARD_A_PATH{{System::Main, "Core", "MemcardAPath"}, ""};
 const Info<std::string> MAIN_MEMCARD_B_PATH{{System::Main, "Core", "MemcardBPath"}, ""};
 const Info<std::string>& GetInfoForMemcardPath(ExpansionInterface::Slot slot)
@@ -221,6 +227,7 @@ const Info<bool> MAIN_DIVIDE_BY_ZERO_EXCEPTIONS{{System::Main, "Core", "DivByZer
                                                 false};
 const Info<bool> MAIN_FPRF{{System::Main, "Core", "FPRF"}, false};
 const Info<bool> MAIN_ACCURATE_NANS{{System::Main, "Core", "AccurateNaNs"}, false};
+const Info<bool> MAIN_ACCURATE_FMADDS{{System::Main, "Core", "AccurateFmadds"}, true};
 const Info<bool> MAIN_DISABLE_ICACHE{{System::Main, "Core", "DisableICache"}, false};
 const Info<float> MAIN_EMULATION_SPEED{{System::Main, "Core", "EmulationSpeed"}, 1.0f};
 #if defined(ANDROID)
@@ -636,6 +643,45 @@ const std::array<Info<s16>, EMULATED_LOGITECH_MIC_COUNT> MAIN_LOGITECH_MIC_VOLUM
     Info<s16>{{System::Main, "EmulatedUSBDevices", "LogitechMic3VolumeModifier"}, 0},
     Info<s16>{{System::Main, "EmulatedUSBDevices", "LogitechMic4VolumeModifier"}, 0}};
 
+static std::string GetDefaultTriforceIPRedirections()
+{
+#if defined(ANDROID)
+  return "0.0.0.0/0=127.0.0.1";
+#else
+  constexpr std::string_view entries[] = {
+
+      // Mario Kart Arcade GP 1 + 2
+      // This config allows for 4x Multicabinet on the same PC.
+      "192.168.29.150:5000-5008=127.0.0.1:5000-5008 MarioKart Seat #1 Static",
+      "192.168.29.151:5000-5008=127.0.0.1:5010-5018 MarioKart Seat #2 Static",
+      "192.168.29.152:5000-5008=127.0.0.1:5020-5028 MarioKart Seat #3 Static",
+      "192.168.29.153:5000-5008=127.0.0.1:5030-5038 MarioKart Seat #4 Static",
+      // Ephemeral ports are constrained to differentiate incoming connections.
+      "192.168.29.150=127.0.0.1:50000-50999 MarioKart Seat #1 Ephemeral",
+      "192.168.29.151=127.0.0.1:51000-51999 MarioKart Seat #2 Ephemeral",
+      "192.168.29.152=127.0.0.1:52000-52999 MarioKart Seat #3 Ephemeral",
+      "192.168.29.153=127.0.0.1:53000-53999 MarioKart Seat #4 Ephemeral",
+      // The cameras.
+      "192.168.29.104-107=127.0.0.1 MarioKart namcam2",
+
+      // CyCraft Connect IP
+      "192.168.11.0/24=127.0.0.1 CyCraft",
+
+      // The Key of Avalon
+      // This config isn't usable as-is. It's just here for reference.
+      "192.168.13.0/24=127.0.0.1 The Key of Avalon",
+
+      // Sega ALL.Net
+      "192.168.150.0/24=127.0.0.1 ALL.Net",
+  };
+
+  return fmt::format("{}", fmt::join(entries, ","));
+#endif
+}
+
+const Info<std::string> MAIN_TRIFORCE_IP_REDIRECTIONS{
+    {System::Main, "Core", "TriforceIPRedirections"}, GetDefaultTriforceIPRedirections()};
+
 // The reason we need this function is because some memory card code
 // expects to get a non-NTSC-K region even if we're emulating an NTSC-K Wii.
 DiscIO::Region ToGameCubeRegion(DiscIO::Region region)
@@ -669,6 +715,9 @@ const char* GetDirectoryForRegion(DiscIO::Region region, RegionDirectoryStyle st
     ASSERT_MSG(BOOT, false, "NTSC-K is not a valid GameCube region");
     return style == RegionDirectoryStyle::Legacy ? JAP_DIR : JPN_DIR;
 
+  case DiscIO::Region::DEV:
+    return DEV_DIR;
+
   default:
     ASSERT_MSG(BOOT, false, "Default case should not be reached");
     return EUR_DIR;
@@ -722,6 +771,7 @@ std::string GetMemcardPath(std::string configured_filename, ExpansionInterface::
   constexpr std::string_view us_region = "." USA_DIR;
   constexpr std::string_view jp_region = "." JAP_DIR;
   constexpr std::string_view eu_region = "." EUR_DIR;
+  constexpr std::string_view dv_region = "." DEV_DIR;
   std::optional<DiscIO::Region> path_region = std::nullopt;
   if (name.ends_with(us_region))
   {
@@ -738,6 +788,11 @@ std::string GetMemcardPath(std::string configured_filename, ExpansionInterface::
     name = name.substr(0, name.size() - eu_region.size());
     path_region = DiscIO::Region::PAL;
   }
+  else if (name.ends_with(dv_region))
+  {
+    name = name.substr(0, name.size() - dv_region.size());
+    path_region = DiscIO::Region::DEV;
+  }
 
   const DiscIO::Region used_region =
       region ? *region : (path_region ? *path_region : Config::Get(Config::MAIN_FALLBACK_REGION));
@@ -781,6 +836,7 @@ std::string GetGCIFolderPath(std::string configured_folder, ExpansionInterface::
   constexpr std::string_view us_region = "/" USA_DIR;
   constexpr std::string_view jp_region = "/" JPN_DIR;
   constexpr std::string_view eu_region = "/" EUR_DIR;
+  constexpr std::string_view dv_region = "/" DEV_DIR;
   std::string_view base_path = configured_folder;
   std::optional<DiscIO::Region> path_region = std::nullopt;
   if (base_path.ends_with(us_region))
@@ -798,6 +854,11 @@ std::string GetGCIFolderPath(std::string configured_folder, ExpansionInterface::
     base_path = base_path.substr(0, base_path.size() - eu_region.size());
     path_region = DiscIO::Region::PAL;
   }
+  else if (base_path.ends_with(dv_region))
+  {
+    base_path = base_path.substr(0, base_path.size() - dv_region.size());
+    path_region = DiscIO::Region::DEV;
+  }
 
   const DiscIO::Region used_region =
       region ? *region : (path_region ? *path_region : Config::Get(Config::MAIN_FALLBACK_REGION));
diff --git a/Source/Core/Core/Config/MainSettings.h b/Source/Core/Core/Config/MainSettings.h
index b2b40b32b61b..7e651b4c0847 100644
--- a/Source/Core/Core/Config/MainSettings.h
+++ b/Source/Core/Core/Config/MainSettings.h
@@ -71,6 +71,7 @@ extern const Info<bool> MAIN_CORRECT_TIME_DRIFT;
 extern const Info<bool> MAIN_RUSH_FRAME_PRESENTATION;
 extern const Info<bool> MAIN_SMOOTH_EARLY_PRESENTATION;
 extern const Info<bool> MAIN_CPU_THREAD;
+extern const Info<bool> MAIN_LOAD_GAME_INTO_MEMORY;
 extern const Info<bool> MAIN_SYNC_ON_SKIP_IDLE;
 extern const Info<std::string> MAIN_DEFAULT_ISO;
 extern const Info<bool> MAIN_ENABLE_CHEATS;
@@ -81,6 +82,7 @@ extern const Info<AudioCommon::DPL2Quality> MAIN_DPL2_QUALITY;
 extern const Info<int> MAIN_AUDIO_LATENCY;
 extern const Info<int> MAIN_AUDIO_BUFFER_SIZE;
 extern const Info<bool> MAIN_AUDIO_FILL_GAPS;
+extern const Info<bool> MAIN_AUDIO_PRESERVE_PITCH;
 extern const Info<std::string> MAIN_MEMCARD_A_PATH;
 extern const Info<std::string> MAIN_MEMCARD_B_PATH;
 const Info<std::string>& GetInfoForMemcardPath(ExpansionInterface::Slot slot);
@@ -130,6 +132,7 @@ extern const Info<bool> MAIN_FLOAT_EXCEPTIONS;
 extern const Info<bool> MAIN_DIVIDE_BY_ZERO_EXCEPTIONS;
 extern const Info<bool> MAIN_FPRF;
 extern const Info<bool> MAIN_ACCURATE_NANS;
+extern const Info<bool> MAIN_ACCURATE_FMADDS;
 extern const Info<bool> MAIN_DISABLE_ICACHE;
 extern const Info<float> MAIN_EMULATION_SPEED;
 extern const Info<bool> MAIN_PRECISION_FRAME_TIMING;
@@ -386,6 +389,8 @@ extern const std::array<Info<std::string>, EMULATED_LOGITECH_MIC_COUNT>
 extern const std::array<Info<bool>, EMULATED_LOGITECH_MIC_COUNT> MAIN_LOGITECH_MIC_MUTED;
 extern const std::array<Info<s16>, EMULATED_LOGITECH_MIC_COUNT> MAIN_LOGITECH_MIC_VOLUME_MODIFIER;
 
+extern const Info<std::string> MAIN_TRIFORCE_IP_REDIRECTIONS;
+
 // GameCube path utility functions
 
 // Replaces NTSC-K with some other region, and doesn't replace non-NTSC-K regions
diff --git a/Source/Core/Core/Config/NetplaySettings.cpp b/Source/Core/Core/Config/NetplaySettings.cpp
index 094c0e7211f3..de8722902378 100644
--- a/Source/Core/Core/Config/NetplaySettings.cpp
+++ b/Source/Core/Core/Config/NetplaySettings.cpp
@@ -3,8 +3,6 @@
 
 #include "Core/Config/NetplaySettings.h"
 
-#include "Common/Config/Config.h"
-
 namespace Config
 {
 static constexpr u16 DEFAULT_LISTEN_PORT = 2626;
diff --git a/Source/Core/Core/Config/SessionSettings.cpp b/Source/Core/Core/Config/SessionSettings.cpp
index 7ccd3873609b..0e3deacd624a 100644
--- a/Source/Core/Core/Config/SessionSettings.cpp
+++ b/Source/Core/Core/Config/SessionSettings.cpp
@@ -4,8 +4,6 @@
 #include "Core/Config/SessionSettings.h"
 
 #include "Common/CPUDetect.h"
-#include "Common/CommonTypes.h"
-#include "Common/Config/Config.h"
 
 namespace Config
 {
diff --git a/Source/Core/Core/ConfigLoaders/BaseConfigLoader.cpp b/Source/Core/Core/ConfigLoaders/BaseConfigLoader.cpp
index d41c73958dae..8b35d4d68431 100644
--- a/Source/Core/Core/ConfigLoaders/BaseConfigLoader.cpp
+++ b/Source/Core/Core/ConfigLoaders/BaseConfigLoader.cpp
@@ -6,15 +6,15 @@
 #include <algorithm>
 #include <cstring>
 #include <functional>
-#include <list>
 #include <map>
 #include <memory>
+#include <mutex>
 #include <string>
-#include <type_traits>
 #include <variant>
 
 #include "Common/CommonTypes.h"
 #include "Common/Config/Config.h"
+#include "Common/Config/Layer.h"
 #include "Common/FileUtil.h"
 #include "Common/IniFile.h"
 #include "Common/Logging/Log.h"
@@ -23,17 +23,68 @@
 #include "Core/Config/SYSCONFSettings.h"
 #include "Core/ConfigLoaders/IsSettingSaveable.h"
 #include "Core/ConfigManager.h"
-#include "Core/Core.h"
 #include "Core/IOS/IOS.h"
 #include "Core/IOS/USB/Bluetooth/BTBase.h"
 #include "Core/SysConf.h"
 #include "Core/System.h"
 
+static bool s_sysconf_controlled_by_guest = false;
+static std::recursive_mutex s_sysconf_lock;
+
 namespace ConfigLoaders
 {
-void SaveToSYSCONF(Config::LayerType layer, std::function<bool(const Config::Location&)> predicate)
+void TransferSYSCONFControlToGuest()
+{
+  std::lock_guard lock(s_sysconf_lock);
+
+  ASSERT(!s_sysconf_controlled_by_guest);
+  s_sysconf_controlled_by_guest = true;
+}
+
+void TransferSYSCONFControlFromGuest(WriteBackChangedValues write_back_changed_values)
+{
+  std::lock_guard lock(s_sysconf_lock);
+
+  ASSERT(s_sysconf_controlled_by_guest);
+  s_sysconf_controlled_by_guest = false;
+
+  if (write_back_changed_values == WriteBackChangedValues::No)
+    return;
+
+  // SYSCONF can be modified during emulation by the user and internally, which makes it
+  // a bad idea to just always overwrite it with the settings from the base layer.
+  //
+  // Conversely, we also shouldn't just accept any changes to SYSCONF, as it may cause
+  // temporary settings (from Movie, Netplay, game INIs, etc.) to stick around.
+  //
+  // To avoid inconveniences in most cases, we accept changes that aren't being overridden by a
+  // non-base layer, and restore only the overridden settings.
+
+  // This layer contains the new SYSCONF settings (including any temporary settings).
+  Config::Layer temp_layer(Config::LayerType::Base);
+  // Use a separate loader so the temp layer doesn't automatically save
+  GenerateBaseConfigLoader()->Load(&temp_layer);
+
+  for (const auto& setting : Config::SYSCONF_SETTINGS)
+  {
+    std::visit(
+        [&](auto* info) {
+          // If this setting was overridden, then we copy the base layer value back to the
+          // SYSCONF. Otherwise we leave the new value in the SYSCONF.
+          if (Config::GetActiveLayerForConfig(*info) == Config::LayerType::Base)
+            Config::SetBase(*info, temp_layer.Get(*info));
+        },
+        setting.config_info);
+  }
+
+  SaveToSYSCONF(Config::LayerType::Base, SkipIfControlledByGuest::No);
+}
+
+void SaveToSYSCONF(Config::LayerType layer, SkipIfControlledByGuest skip,
+                   std::function<bool(const Config::Location&)> predicate)
 {
-  if (Core::IsRunning(Core::System::GetInstance()))
+  std::lock_guard lock(s_sysconf_lock);
+  if (skip == SkipIfControlledByGuest::Yes && s_sysconf_controlled_by_guest)
     return;
 
   IOS::HLE::Kernel ios;
@@ -127,7 +178,7 @@ class BaseConfigLayerLoader final : public Config::ConfigLayerLoader
 
   void Save(Config::Layer* layer) override
   {
-    SaveToSYSCONF(layer->GetLayer());
+    SaveToSYSCONF(layer->GetLayer(), SkipIfControlledByGuest::Yes);
 
     std::map<Config::System, Common::IniFile> inis;
 
@@ -182,7 +233,8 @@ class BaseConfigLayerLoader final : public Config::ConfigLayerLoader
 private:
   void LoadFromSYSCONF(Config::Layer* layer)
   {
-    if (Core::IsRunning(Core::System::GetInstance()))
+    std::lock_guard lock(s_sysconf_lock);
+    if (s_sysconf_controlled_by_guest)
       return;
 
     IOS::HLE::Kernel ios;
diff --git a/Source/Core/Core/ConfigLoaders/BaseConfigLoader.h b/Source/Core/Core/ConfigLoaders/BaseConfigLoader.h
index 7c20a5e065ff..30a6d26e4bdd 100644
--- a/Source/Core/Core/ConfigLoaders/BaseConfigLoader.h
+++ b/Source/Core/Core/ConfigLoaders/BaseConfigLoader.h
@@ -15,7 +15,21 @@ struct Location;
 
 namespace ConfigLoaders
 {
-void SaveToSYSCONF(Config::LayerType layer,
+enum class WriteBackChangedValues
+{
+  No,
+  Yes,
+};
+
+enum class SkipIfControlledByGuest
+{
+  No,
+  Yes,
+};
+
+void TransferSYSCONFControlToGuest();
+void TransferSYSCONFControlFromGuest(WriteBackChangedValues write_back_changed_values);
+void SaveToSYSCONF(Config::LayerType layer, SkipIfControlledByGuest skip,
                    std::function<bool(const Config::Location&)> predicate = {});
 std::unique_ptr<Config::ConfigLayerLoader> GenerateBaseConfigLoader();
 }  // namespace ConfigLoaders
diff --git a/Source/Core/Core/ConfigLoaders/GameConfigLoader.cpp b/Source/Core/Core/ConfigLoaders/GameConfigLoader.cpp
index a922a9ec382d..d086d4d9db57 100644
--- a/Source/Core/Core/ConfigLoaders/GameConfigLoader.cpp
+++ b/Source/Core/Core/ConfigLoaders/GameConfigLoader.cpp
@@ -3,13 +3,12 @@
 
 #include "Core/ConfigLoaders/GameConfigLoader.h"
 
-#include <algorithm>
 #include <array>
-#include <list>
 #include <map>
 #include <optional>
 #include <sstream>
 #include <string>
+#include <string_view>
 #include <tuple>
 #include <utility>
 #include <vector>
@@ -22,7 +21,6 @@
 #include "Common/IniFile.h"
 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"
-#include "Common/StringUtil.h"
 
 #include "Core/Config/MainSettings.h"
 #include "Core/Config/SYSCONFSettings.h"
@@ -32,7 +30,7 @@
 namespace ConfigLoaders
 {
 // Returns all possible filenames in ascending order of priority
-std::vector<std::string> GetGameIniFilenames(const std::string& id, std::optional<u16> revision)
+std::vector<std::string> GetGameIniFilenames(std::string_view id, std::optional<u16> revision)
 {
   std::vector<std::string> filenames;
 
@@ -44,18 +42,18 @@ std::vector<std::string> GetGameIniFilenames(const std::string& id, std::optiona
   if (id.length() == 6)
   {
     // INIs that match the system code (unique for each Virtual Console system)
-    filenames.push_back(id.substr(0, 1) + ".ini");
+    filenames.push_back(fmt::format("{}.ini", id.substr(0, 1)));
 
     // INIs that match all regions
-    filenames.push_back(id.substr(0, 3) + ".ini");
+    filenames.push_back(fmt::format("{}.ini", id.substr(0, 3)));
   }
 
   // Regular INIs
-  filenames.push_back(id + ".ini");
+  filenames.push_back(fmt::format("{}.ini", id));
 
   // INIs with specific revisions
   if (revision)
-    filenames.push_back(id + fmt::format("r{}", *revision) + ".ini");
+    filenames.push_back(fmt::format("{}r{}.ini", id, *revision));
 
   return filenames;
 }
@@ -313,7 +311,7 @@ void INIGameConfigLayerLoader::Save(Config::Layer* layer)
 
   // Try to save to the revision specific INI first, if it exists.
   const std::string gameini_with_rev =
-      File::GetUserPath(D_GAMESETTINGS_IDX) + m_id + fmt::format("r{}", m_revision) + ".ini";
+      fmt::format("{}{}r{}.ini", File::GetUserPath(D_GAMESETTINGS_IDX), m_id, m_revision);
   if (File::Exists(gameini_with_rev))
   {
     ini.Save(gameini_with_rev);
@@ -322,7 +320,7 @@ void INIGameConfigLayerLoader::Save(Config::Layer* layer)
 
   // Otherwise, save to the game INI. We don't try any INI broader than that because it will
   // likely cause issues with cheat codes and game patches.
-  const std::string gameini = File::GetUserPath(D_GAMESETTINGS_IDX) + m_id + ".ini";
+  const std::string gameini = fmt::format("{}{}.ini", File::GetUserPath(D_GAMESETTINGS_IDX), m_id);
   ini.Save(gameini);
 }
 
diff --git a/Source/Core/Core/ConfigLoaders/GameConfigLoader.h b/Source/Core/Core/ConfigLoaders/GameConfigLoader.h
index 78f849b4fe69..b907fe283682 100644
--- a/Source/Core/Core/ConfigLoaders/GameConfigLoader.h
+++ b/Source/Core/Core/ConfigLoaders/GameConfigLoader.h
@@ -3,10 +3,10 @@
 
 #pragma once
 
-#include <cstring>
 #include <memory>
 #include <optional>
 #include <string>
+#include <string_view>
 #include <vector>
 
 #include "Common/CommonTypes.h"
@@ -18,7 +18,7 @@ class ConfigLayerLoader;
 
 namespace ConfigLoaders
 {
-std::vector<std::string> GetGameIniFilenames(const std::string& id, std::optional<u16> revision);
+std::vector<std::string> GetGameIniFilenames(std::string_view id, std::optional<u16> revision);
 
 std::unique_ptr<Config::ConfigLayerLoader> GenerateGlobalGameConfigLoader(const std::string& id,
                                                                           u16 revision);
diff --git a/Source/Core/Core/ConfigLoaders/MovieConfigLoader.cpp b/Source/Core/Core/ConfigLoaders/MovieConfigLoader.cpp
index 37071de27b94..b310fb31a44b 100644
--- a/Source/Core/Core/ConfigLoaders/MovieConfigLoader.cpp
+++ b/Source/Core/Core/ConfigLoaders/MovieConfigLoader.cpp
@@ -14,9 +14,7 @@
 #include "Core/Config/MainSettings.h"
 #include "Core/Config/SYSCONFSettings.h"
 #include "Core/Config/SessionSettings.h"
-#include "Core/ConfigManager.h"
 #include "Core/Movie.h"
-#include "VideoCommon/VideoConfig.h"
 
 namespace PowerPC
 {
diff --git a/Source/Core/Core/ConfigLoaders/NetPlayConfigLoader.cpp b/Source/Core/Core/ConfigLoaders/NetPlayConfigLoader.cpp
index 855cc181b920..8ead83f8cc32 100644
--- a/Source/Core/Core/ConfigLoaders/NetPlayConfigLoader.cpp
+++ b/Source/Core/Core/ConfigLoaders/NetPlayConfigLoader.cpp
@@ -8,7 +8,6 @@
 #include <fmt/format.h>
 
 #include "Common/CommonPaths.h"
-#include "Common/Config/Config.h"
 #include "Common/FileUtil.h"
 
 #include "Core/Config/AchievementSettings.h"
@@ -80,6 +79,7 @@ class NetPlayConfigLayerLoader final : public Config::ConfigLayerLoader
     layer->Set(Config::MAIN_DIVIDE_BY_ZERO_EXCEPTIONS, m_settings.divide_by_zero_exceptions);
     layer->Set(Config::MAIN_FPRF, m_settings.fprf);
     layer->Set(Config::MAIN_ACCURATE_NANS, m_settings.accurate_nans);
+    layer->Set(Config::MAIN_ACCURATE_FMADDS, m_settings.accurate_fmadds);
     layer->Set(Config::MAIN_DISABLE_ICACHE, m_settings.disable_icache);
     layer->Set(Config::MAIN_SYNC_ON_SKIP_IDLE, m_settings.sync_on_skip_idle);
     layer->Set(Config::MAIN_SYNC_GPU, m_settings.sync_gpu);
diff --git a/Source/Core/Core/ConfigManager.cpp b/Source/Core/Core/ConfigManager.cpp
index a2c2ac1f0f7c..8404cfff07d7 100644
--- a/Source/Core/Core/ConfigManager.cpp
+++ b/Source/Core/Core/ConfigManager.cpp
@@ -4,11 +4,9 @@
 #include "Core/ConfigManager.h"
 
 #include <algorithm>
-#include <climits>
 #include <memory>
 #include <mutex>
 #include <optional>
-#include <sstream>
 #include <string>
 #include <string_view>
 #include <variant>
@@ -19,7 +17,6 @@
 
 #include "AudioCommon/AudioCommon.h"
 
-#include "Common/Assert.h"
 #include "Common/CommonPaths.h"
 #include "Common/CommonTypes.h"
 #include "Common/Config/Config.h"
@@ -27,13 +24,10 @@
 #include "Common/IniFile.h"
 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"
-#include "Common/NandPaths.h"
 #include "Common/StringUtil.h"
-#include "Common/Version.h"
 
 #include "Core/AchievementManager.h"
 #include "Core/Boot/Boot.h"
-#include "Core/CommonTitles.h"
 #include "Core/Config/DefaultLocale.h"
 #include "Core/Config/MainSettings.h"
 #include "Core/Config/SYSCONFSettings.h"
@@ -54,7 +48,6 @@
 #include "Core/IOS/ES/Formats.h"
 #include "Core/PatchEngine.h"
 #include "Core/PowerPC/PPCSymbolDB.h"
-#include "Core/PowerPC/PowerPC.h"
 #include "Core/System.h"
 #include "Core/TitleDatabase.h"
 #include "Core/WC24PatchEngine.h"
@@ -149,12 +142,6 @@ const std::string SConfig::GetTitleDescription() const
   return m_title_description;
 }
 
-std::string SConfig::GetTriforceID() const
-{
-  std::lock_guard<std::recursive_mutex> lock(m_metadata_lock);
-  return m_triforce_id;
-}
-
 u64 SConfig::GetTitleID() const
 {
   std::lock_guard<std::recursive_mutex> lock(m_metadata_lock);
@@ -170,7 +157,7 @@ u16 SConfig::GetRevision() const
 void SConfig::ResetRunningGameMetadata()
 {
   std::lock_guard<std::recursive_mutex> lock(m_metadata_lock);
-  SetRunningGameMetadata("00000000", "", "", 0, 0, DiscIO::Region::Unknown);
+  SetRunningGameMetadata("00000000", "", 0, 0, DiscIO::Region::Unknown);
 }
 
 void SConfig::SetRunningGameMetadata(const DiscIO::Volume& volume,
@@ -179,14 +166,14 @@ void SConfig::SetRunningGameMetadata(const DiscIO::Volume& volume,
   std::lock_guard<std::recursive_mutex> lock(m_metadata_lock);
   if (partition == volume.GetGamePartition())
   {
-    SetRunningGameMetadata(volume.GetGameID(), volume.GetGameTDBID(), volume.GetTriforceID(),
+    SetRunningGameMetadata(volume.GetGameID(), volume.GetGameTDBID(),
                            volume.GetTitleID().value_or(0), volume.GetRevision().value_or(0),
                            volume.GetRegion());
   }
   else
   {
     SetRunningGameMetadata(volume.GetGameID(partition), volume.GetGameTDBID(partition),
-                           volume.GetTriforceID(), volume.GetTitleID(partition).value_or(0),
+                           volume.GetTitleID(partition).value_or(0),
                            volume.GetRevision(partition).value_or(0), volume.GetRegion());
   }
 }
@@ -204,28 +191,25 @@ void SConfig::SetRunningGameMetadata(const IOS::ES::TMDReader& tmd, DiscIO::Plat
       !Core::System::GetInstance().GetDVDInterface().UpdateRunningGameMetadata(tmd_title_id))
   {
     // If not launching a disc game, just read everything from the TMD.
-    SetRunningGameMetadata(tmd.GetGameID(), tmd.GetGameTDBID(), "", tmd_title_id,
-                           tmd.GetTitleVersion(), tmd.GetRegion());
+    SetRunningGameMetadata(tmd.GetGameID(), tmd.GetGameTDBID(), tmd_title_id, tmd.GetTitleVersion(),
+                           tmd.GetRegion());
   }
 }
 
 void SConfig::SetRunningGameMetadata(const std::string& game_id)
 {
   std::lock_guard<std::recursive_mutex> lock(m_metadata_lock);
-  SetRunningGameMetadata(game_id, "", "", 0, 0, DiscIO::Region::Unknown);
+  SetRunningGameMetadata(game_id, "", 0, 0, DiscIO::Region::Unknown);
 }
 
 void SConfig::SetRunningGameMetadata(const std::string& game_id, const std::string& gametdb_id,
-                                     std::string triforce_id, u64 title_id, u16 revision,
-                                     DiscIO::Region region)
+                                     u64 title_id, u16 revision, DiscIO::Region region)
 {
   std::lock_guard<std::recursive_mutex> lock(m_metadata_lock);
   const bool was_changed = m_game_id != game_id || m_gametdb_id != gametdb_id ||
-                           m_triforce_id != triforce_id || m_title_id != title_id ||
-                           m_revision != revision;
+                           m_title_id != title_id || m_revision != revision;
   m_game_id = game_id;
   m_gametdb_id = gametdb_id;
-  m_triforce_id = triforce_id;
   m_title_id = title_id;
   m_revision = revision;
 
@@ -258,7 +242,7 @@ void SConfig::SetRunningGameMetadata(const std::string& game_id, const std::stri
   const Core::TitleDatabase title_database;
   auto& system = Core::System::GetInstance();
   const DiscIO::Language language = GetLanguageAdjustedForRegion(system.IsWii(), region);
-  m_title_name = title_database.GetTitleName(m_gametdb_id, m_triforce_id, language);
+  m_title_name = title_database.GetTitleName(m_gametdb_id, language);
   m_title_description = title_database.Describe(m_gametdb_id, language);
   NOTICE_LOG_FMT(CORE, "Active title: {}", m_title_description);
   Host_TitleChanged();
@@ -435,7 +419,16 @@ struct SetGameMetadata
 
     *region = DiscIO::Region::NTSC_U;
     system.SetIsWii(dff_file->GetIsWii());
-    Host_TitleChanged();
+
+    const std::string& game_id = dff_file->GetGameId();
+    if (game_id == DEFAULT_GAME_ID)
+    {
+      Host_TitleChanged();
+    }
+    else
+    {
+      config->SetRunningGameMetadata(game_id);
+    }
 
     return true;
   }
@@ -456,6 +449,9 @@ bool SConfig::SetPathsAndGameMetadata(Core::System& system, const BootParameters
   if (m_region == DiscIO::Region::Unknown)
     m_region = Config::Get(Config::MAIN_FALLBACK_REGION);
 
+  if (system.IsTriforce())
+    m_region = DiscIO::Region::DEV;
+
   // Set up paths
   const std::string region_dir = Config::GetDirectoryForRegion(Config::ToGameCubeRegion(m_region));
   m_strSRAM = File::GetUserPath(F_GCSRAM_IDX);
@@ -527,7 +523,7 @@ Common::IniFile SConfig::LoadGameIni() const
   return LoadGameIni(GetGameID(), m_revision);
 }
 
-Common::IniFile SConfig::LoadDefaultGameIni(const std::string& id, std::optional<u16> revision)
+Common::IniFile SConfig::LoadDefaultGameIni(std::string_view id, std::optional<u16> revision)
 {
   Common::IniFile game_ini;
   for (const std::string& filename : ConfigLoaders::GetGameIniFilenames(id, revision))
@@ -535,7 +531,7 @@ Common::IniFile SConfig::LoadDefaultGameIni(const std::string& id, std::optional
   return game_ini;
 }
 
-Common::IniFile SConfig::LoadLocalGameIni(const std::string& id, std::optional<u16> revision)
+Common::IniFile SConfig::LoadLocalGameIni(std::string_view id, std::optional<u16> revision)
 {
   Common::IniFile game_ini;
   for (const std::string& filename : ConfigLoaders::GetGameIniFilenames(id, revision))
@@ -543,7 +539,7 @@ Common::IniFile SConfig::LoadLocalGameIni(const std::string& id, std::optional<u
   return game_ini;
 }
 
-Common::IniFile SConfig::LoadGameIni(const std::string& id, std::optional<u16> revision)
+Common::IniFile SConfig::LoadGameIni(std::string_view id, std::optional<u16> revision)
 {
   Common::IniFile game_ini;
   for (const std::string& filename : ConfigLoaders::GetGameIniFilenames(id, revision))
diff --git a/Source/Core/Core/ConfigManager.h b/Source/Core/Core/ConfigManager.h
index e255974d8b20..39dbc6d39ae6 100644
--- a/Source/Core/Core/ConfigManager.h
+++ b/Source/Core/Core/ConfigManager.h
@@ -3,16 +3,11 @@
 
 #pragma once
 
-#include <limits>
 #include <mutex>
 #include <optional>
-#include <set>
 #include <string>
 #include <string_view>
-#include <utility>
-#include <vector>
 
-#include "Common/Common.h"
 #include "Common/CommonTypes.h"
 
 namespace Common
@@ -42,6 +37,8 @@ class TMDReader;
 
 struct BootParameters;
 
+static constexpr std::string_view DEFAULT_GAME_ID = "00000000";
+
 struct SConfig
 {
   // Settings
@@ -57,7 +54,6 @@ struct SConfig
   // files
   std::string m_strBootROM;
   std::string m_strSRAM;
-
   std::string m_debugger_game_id;
 
   // TODO: remove this as soon as the ticket view hack in IOS/ES/Views is dropped.
@@ -67,7 +63,6 @@ struct SConfig
   const std::string GetGameTDBID() const;
   const std::string GetTitleName() const;
   const std::string GetTitleDescription() const;
-  std::string GetTriforceID() const;
   u64 GetTitleID() const;
   u16 GetRevision() const;
   void ResetRunningGameMetadata();
@@ -95,9 +90,9 @@ struct SConfig
   Common::IniFile LoadLocalGameIni() const;
   Common::IniFile LoadGameIni() const;
 
-  static Common::IniFile LoadDefaultGameIni(const std::string& id, std::optional<u16> revision);
-  static Common::IniFile LoadLocalGameIni(const std::string& id, std::optional<u16> revision);
-  static Common::IniFile LoadGameIni(const std::string& id, std::optional<u16> revision);
+  static Common::IniFile LoadDefaultGameIni(std::string_view id, std::optional<u16> revision);
+  static Common::IniFile LoadLocalGameIni(std::string_view id, std::optional<u16> revision);
+  static Common::IniFile LoadGameIni(std::string_view id, std::optional<u16> revision);
 
   SConfig(const SConfig&) = delete;
   SConfig& operator=(const SConfig&) = delete;
@@ -124,15 +119,13 @@ struct SConfig
   static void ReloadTextures(Core::System& system);
 
   void SetRunningGameMetadata(const std::string& game_id, const std::string& gametdb_id,
-                              std::string triforce_id, u64 title_id, u16 revision,
-                              DiscIO::Region region);
+                              u64 title_id, u16 revision, DiscIO::Region region);
 
   static SConfig* m_Instance;
   mutable std::recursive_mutex m_metadata_lock;
 
   std::string m_game_id;
   std::string m_gametdb_id;
-  std::string m_triforce_id;
   std::string m_title_name;
   std::string m_title_description;
   u64 m_title_id;
diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp
index cb28e9abe74d..5730a33442b6 100644
--- a/Source/Core/Core/Core.cpp
+++ b/Source/Core/Core/Core.cpp
@@ -5,7 +5,6 @@
 
 #include <algorithm>
 #include <atomic>
-#include <cstring>
 #include <functional>
 #include <future>
 #include <mutex>
@@ -27,7 +26,6 @@
 #include "Common/CPUDetect.h"
 #include "Common/CommonPaths.h"
 #include "Common/CommonTypes.h"
-#include "Common/FPURoundMode.h"
 #include "Common/FatFsUtil.h"
 #include "Common/FileUtil.h"
 #include "Common/Logging/Log.h"
@@ -338,16 +336,12 @@ void UndeclareAsGPUThread()
 }
 
 // For the CPU Thread only.
-static void CPUSetInitialExecutionState(bool force_paused = false)
+static void CPUSetInitialExecutionState(Core::System& system, bool force_paused = false)
 {
   // The CPU starts in stepping state, and will wait until a new state is set before executing.
-  // SetState isn't safe to call from the CPU thread, so we ask the host thread to call it.
-  QueueHostJob([force_paused](Core::System& system) {
-    bool paused = SConfig::GetInstance().bBootToPause || force_paused;
-    SetState(system, paused ? State::Paused : State::Running, true, true);
-    Host_UpdateDisasmDialog();
-    Host_Message(HostMessageID::WMUserCreate);
-  });
+  const bool paused = SConfig::GetInstance().bBootToPause || force_paused;
+  SetState(system, paused ? State::Paused : State::Running, true, true);
+  Host_UpdateDisasmDialog();
 }
 
 // Create the CPU thread, which is a CPU + Video thread in Single Core mode.
@@ -398,7 +392,7 @@ static void CpuThread(Core::System& system, const std::optional<std::string> sav
     if (!gdb_socket.empty() && !AchievementManager::GetInstance().IsHardcoreModeActive())
     {
       GDBStub::InitLocal(gdb_socket.data());
-      CPUSetInitialExecutionState(true);
+      CPUSetInitialExecutionState(system, true);
     }
     else
 #endif
@@ -407,11 +401,11 @@ static void CpuThread(Core::System& system, const std::optional<std::string> sav
       if (gdb_port > 0 && !AchievementManager::GetInstance().IsHardcoreModeActive())
       {
         GDBStub::Init(gdb_port);
-        CPUSetInitialExecutionState(true);
+        CPUSetInitialExecutionState(system, true);
       }
       else
       {
-        CPUSetInitialExecutionState();
+        CPUSetInitialExecutionState(system);
       }
     }
   }
@@ -462,7 +456,7 @@ static void FifoPlayerThread(Core::System& system, const std::optional<std::stri
       s_state.compare_exchange_strong(expected, State::Running);
     }
 
-    CPUSetInitialExecutionState();
+    CPUSetInitialExecutionState(system);
 
     system.GetCPU().Run();
 
@@ -909,8 +903,11 @@ static void RestoreStateAndUnlock(Core::System& system, const bool unpause_on_un
   system.GetCPU().RestoreStateAndUnlock(unpause_on_unlock);
 }
 
-void RunOnCPUThread(Core::System& system, Common::MoveOnlyFunction<void()> function,
-                    bool wait_for_completion)
+void RunOnCPUThread(Core::System& system, Common::MoveOnlyFunction<void()> function
+#ifdef __LIBRETRO__
+                    , bool wait_for_completion
+#endif
+                  )
 {
   if (IsCPUThread())
   {
@@ -918,7 +915,9 @@ void RunOnCPUThread(Core::System& system, Common::MoveOnlyFunction<void()> funct
     return;
   }
 
+#ifdef __LIBRETRO__
   Common::OneShotEvent cpu_thread_job_finished;
+#endif
 
   // Pause the CPU (set it to stepping mode).
   const bool was_running = PauseAndLock(system);
@@ -927,8 +926,11 @@ void RunOnCPUThread(Core::System& system, Common::MoveOnlyFunction<void()> funct
   {
     // If the core hasn't been started, there is no active CPU thread we can race against.
     function();
+#ifdef __LIBRETRO__
     wait_for_completion = false;
+#endif
   }
+#ifdef __LIBRETRO__
   else if (wait_for_completion)
   {
     // Queue the job function followed by triggering the event.
@@ -937,6 +939,7 @@ void RunOnCPUThread(Core::System& system, Common::MoveOnlyFunction<void()> funct
       cpu_thread_job_finished.Set();
     });
   }
+#endif
   else
   {
     // Queue the job function.
@@ -946,6 +949,7 @@ void RunOnCPUThread(Core::System& system, Common::MoveOnlyFunction<void()> funct
   // Release the CPU thread, and let it execute the callback.
   RestoreStateAndUnlock(system, was_running);
 
+#ifdef __LIBRETRO__
   // If we're waiting for completion, block until the event fires.
   if (wait_for_completion)
   {
@@ -953,6 +957,7 @@ void RunOnCPUThread(Core::System& system, Common::MoveOnlyFunction<void()> funct
     while (!cpu_thread_job_finished.WaitFor(std::chrono::milliseconds(10)))
       Host_YieldToUI();
   }
+#endif
 }
 
 // --- Callbacks for backends / engine ---
diff --git a/Source/Core/Core/Core.h b/Source/Core/Core/Core.h
index c594c42b9a87..b8eb40cc8612 100644
--- a/Source/Core/Core/Core.h
+++ b/Source/Core/Core/Core.h
@@ -144,8 +144,7 @@ bool IsGPUThread();
 
 bool WantsDeterminism();
 
-// SetState can't be called by the CPU thread, but can be called by any thread that isn't launched
-// by the emulator core.
+// SetState can be called from any thread.
 void SetState(Core::System& system, State state, bool report_state_change = true,
               bool override_achievement_restrictions = false);
 State GetState(Core::System& system);
@@ -160,8 +159,11 @@ void FrameUpdateOnCPUThread();
 void OnFrameEnd(Core::System& system);
 
 // Run a function on the CPU thread, asynchronously.
-void RunOnCPUThread(Core::System& system, Common::MoveOnlyFunction<void()> function,
-                    bool wait_for_completion);
+void RunOnCPUThread(Core::System& system, Common::MoveOnlyFunction<void()> function
+#ifdef __LIBRETRO__
+  , bool wait_for_completion = false
+#endif
+);
 
 // for calling back into UI code without introducing a dependency on it in core
 using StateChangedCallbackFunc = std::function<void(Core::State)>;
diff --git a/Source/Core/Core/DSP/DSPAssembler.cpp b/Source/Core/Core/DSP/DSPAssembler.cpp
index 01ef9a81e581..d2008090a54a 100644
--- a/Source/Core/Core/DSP/DSPAssembler.cpp
+++ b/Source/Core/Core/DSP/DSPAssembler.cpp
@@ -9,7 +9,6 @@
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
-#include <fstream>
 #include <map>
 #include <sstream>
 #include <string>
@@ -20,7 +19,6 @@
 
 #include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
-#include "Common/StringUtil.h"
 
 #include "Core/DSP/DSPCore.h"
 #include "Core/DSP/DSPDisassembler.h"
diff --git a/Source/Core/Core/DSP/DSPAssembler.h b/Source/Core/Core/DSP/DSPAssembler.h
index 29ccaeb557cb..1688abc8ae2a 100644
--- a/Source/Core/Core/DSP/DSPAssembler.h
+++ b/Source/Core/Core/DSP/DSPAssembler.h
@@ -57,7 +57,7 @@ class DSPAssembler
   explicit DSPAssembler(const AssemblerSettings& settings);
   ~DSPAssembler();
 
-  // line_numbers is optional (and not yet implemented). It'll receieve a list of ints,
+  // line_numbers is optional (and not yet implemented). It'll receive a list of ints,
   // one for each word of code, indicating the source assembler code line number it came from.
 
   // If returns false, call GetErrorString to get some text to present to the user.
diff --git a/Source/Core/Core/DSP/DSPCodeUtil.cpp b/Source/Core/Core/DSP/DSPCodeUtil.cpp
index 074dd86c3aeb..7b9b5d3b0a65 100644
--- a/Source/Core/Core/DSP/DSPCodeUtil.cpp
+++ b/Source/Core/Core/DSP/DSPCodeUtil.cpp
@@ -4,7 +4,6 @@
 #include "Core/DSP/DSPCodeUtil.h"
 
 #include <algorithm>
-#include <iostream>
 #include <string>
 #include <vector>
 
@@ -13,9 +12,7 @@
 #include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
 #include "Common/IOFile.h"
-#include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"
-#include "Common/StringUtil.h"
 #include "Common/Swap.h"
 
 #include "Core/DSP/DSPAssembler.h"
diff --git a/Source/Core/Core/DSP/DSPDisassembler.cpp b/Source/Core/Core/DSP/DSPDisassembler.cpp
index c0d2d37848c1..75f235b38fea 100644
--- a/Source/Core/Core/DSP/DSPDisassembler.cpp
+++ b/Source/Core/Core/DSP/DSPDisassembler.cpp
@@ -4,15 +4,14 @@
 
 #include "Core/DSP/DSPDisassembler.h"
 
-#include <algorithm>
 #include <limits>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include <fmt/format.h>
 
 #include "Common/CommonTypes.h"
-#include "Common/EnumUtils.h"
 #include "Common/Logging/Log.h"
 #include "Common/StringUtil.h"
 
@@ -108,7 +107,7 @@ std::string DSPDisassembler::DisassembleParameters(const DSPOPCTemplate& opc, u1
         if (opc.params[j].mask == 0x003f)
         {
           // Left and right shifts function essentially as a single shift by a 7-bit signed value,
-          // but are split into two intructions for clarity.
+          // but are split into two instructions for clarity.
           buf += fmt::format("#{}", (val & 0x20) != 0 ? (int(val) - 64) : int(val));
         }
         else
@@ -133,8 +132,7 @@ std::string DSPDisassembler::DisassembleParameters(const DSPOPCTemplate& opc, u1
       break;
 
     default:
-      ERROR_LOG_FMT(DSPLLE, "Unknown parameter type: {:x}",
-                    Common::ToUnderlying(opc.params[j].type));
+      ERROR_LOG_FMT(DSPLLE, "Unknown parameter type: {:x}", std::to_underlying(opc.params[j].type));
       break;
     }
   }
diff --git a/Source/Core/Core/DSP/DSPHWInterface.cpp b/Source/Core/Core/DSP/DSPHWInterface.cpp
index 8e1170f5cd91..9ef08545171d 100644
--- a/Source/Core/Core/DSP/DSPHWInterface.cpp
+++ b/Source/Core/Core/DSP/DSPHWInterface.cpp
@@ -5,15 +5,10 @@
 #include "Core/DSP/DSPCore.h"
 
 #include <atomic>
-#include <cstddef>
-#include <cstring>
 
-#include "Common/CPUDetect.h"
 #include "Common/CommonTypes.h"
-#include "Common/Intrinsics.h"
 #include "Common/Logging/Log.h"
 #include "Common/MemoryUtil.h"
-#include "Common/Swap.h"
 
 #include "Core/DSP/DSPAccelerator.h"
 #include "Core/DSP/DSPHost.h"
diff --git a/Source/Core/Core/DSP/Interpreter/DSPIntMisc.cpp b/Source/Core/Core/DSP/Interpreter/DSPIntMisc.cpp
index 4c3af7ec85d4..c212c535f90b 100644
--- a/Source/Core/Core/DSP/Interpreter/DSPIntMisc.cpp
+++ b/Source/Core/Core/DSP/Interpreter/DSPIntMisc.cpp
@@ -6,8 +6,6 @@
 #include "Core/DSP/Interpreter/DSPInterpreter.h"
 
 #include "Core/DSP/DSPCore.h"
-#include "Core/DSP/DSPTables.h"
-#include "Core/DSP/Interpreter/DSPIntUtil.h"
 
 namespace DSP::Interpreter
 {
diff --git a/Source/Core/Core/DSP/Interpreter/DSPIntMultiplier.cpp b/Source/Core/Core/DSP/Interpreter/DSPIntMultiplier.cpp
index 9f9450514e8a..2b237f4e8949 100644
--- a/Source/Core/Core/DSP/Interpreter/DSPIntMultiplier.cpp
+++ b/Source/Core/Core/DSP/Interpreter/DSPIntMultiplier.cpp
@@ -7,9 +7,7 @@
 
 #include "Core/DSP/Interpreter/DSPInterpreter.h"
 
-#include "Core/DSP/DSPTables.h"
 #include "Core/DSP/Interpreter/DSPIntCCUtil.h"
-#include "Core/DSP/Interpreter/DSPIntUtil.h"
 
 namespace DSP::Interpreter
 {
diff --git a/Source/Core/Core/DSP/Jit/x64/DSPJitRegCache.cpp b/Source/Core/Core/DSP/Jit/x64/DSPJitRegCache.cpp
index 47a011e9b47d..aad457cd96e9 100644
--- a/Source/Core/Core/DSP/Jit/x64/DSPJitRegCache.cpp
+++ b/Source/Core/Core/DSP/Jit/x64/DSPJitRegCache.cpp
@@ -4,9 +4,9 @@
 #include "Core/DSP/Jit/x64/DSPJitRegCache.h"
 
 #include <cstddef>
+#include <utility>
 
 #include "Common/Assert.h"
-#include "Common/EnumUtils.h"
 #include "Common/Logging/Log.h"
 
 #include "Core/DSP/DSPCore.h"
@@ -16,7 +16,7 @@ using namespace Gen;
 
 namespace DSP::JIT::x64
 {
-// Ordered in order of prefered use.
+// Ordered in order of preferred use.
 // Not all of these are actually available
 constexpr std::array<X64Reg, 15> s_allocation_order = {
     {R8, R9, R10, R11, R12, R13, R14, R15, RSI, RDI, RBX, RCX, RDX, RAX, RBP}};
@@ -367,38 +367,38 @@ void DSPJitRegCache::FlushRegs()
   }
 
   ASSERT_MSG(DSPLLE, m_xregs[RSP].guest_reg == DSP_REG_STATIC, "wrong xreg state for {}",
-             Common::ToUnderlying(RSP));
+             std::to_underlying(RSP));
   ASSERT_MSG(DSPLLE, m_xregs[RBX].guest_reg == DSP_REG_STATIC, "wrong xreg state for {}",
-             Common::ToUnderlying(RBX));
+             std::to_underlying(RBX));
   ASSERT_MSG(DSPLLE, m_xregs[RBP].guest_reg == DSP_REG_NONE, "wrong xreg state for {}",
-             Common::ToUnderlying(RBP));
+             std::to_underlying(RBP));
   ASSERT_MSG(DSPLLE, m_xregs[RSI].guest_reg == DSP_REG_NONE, "wrong xreg state for {}",
-             Common::ToUnderlying(RSI));
+             std::to_underlying(RSI));
   ASSERT_MSG(DSPLLE, m_xregs[RDI].guest_reg == DSP_REG_NONE, "wrong xreg state for {}",
-             Common::ToUnderlying(RDI));
+             std::to_underlying(RDI));
 #ifdef STATIC_REG_ACCS
   ASSERT_MSG(DSPLLE, m_xregs[R8].guest_reg == DSP_REG_STATIC, "wrong xreg state for {}",
-             Common::ToUnderlying(R8));
+             std::to_underlying(R8));
   ASSERT_MSG(DSPLLE, m_xregs[R9].guest_reg == DSP_REG_STATIC, "wrong xreg state for {}",
-             Common::ToUnderlying(R9));
+             std::to_underlying(R9));
 #else
   ASSERT_MSG(DSPLLE, m_xregs[R8].guest_reg == DSP_REG_NONE, "wrong xreg state for {}",
-             Common::ToUnderlying(R8));
+             std::to_underlying(R8));
   ASSERT_MSG(DSPLLE, m_xregs[R9].guest_reg == DSP_REG_NONE, "wrong xreg state for {}",
-             Common::ToUnderlying(R9));
+             std::to_underlying(R9));
 #endif
   ASSERT_MSG(DSPLLE, m_xregs[R10].guest_reg == DSP_REG_NONE, "wrong xreg state for {}",
-             Common::ToUnderlying(R10));
+             std::to_underlying(R10));
   ASSERT_MSG(DSPLLE, m_xregs[R11].guest_reg == DSP_REG_NONE, "wrong xreg state for {}",
-             Common::ToUnderlying(R11));
+             std::to_underlying(R11));
   ASSERT_MSG(DSPLLE, m_xregs[R12].guest_reg == DSP_REG_NONE, "wrong xreg state for {}",
-             Common::ToUnderlying(R12));
+             std::to_underlying(R12));
   ASSERT_MSG(DSPLLE, m_xregs[R13].guest_reg == DSP_REG_NONE, "wrong xreg state for {}",
-             Common::ToUnderlying(R13));
+             std::to_underlying(R13));
   ASSERT_MSG(DSPLLE, m_xregs[R14].guest_reg == DSP_REG_NONE, "wrong xreg state for {}",
-             Common::ToUnderlying(R14));
+             std::to_underlying(R14));
   ASSERT_MSG(DSPLLE, m_xregs[R15].guest_reg == DSP_REG_STATIC, "wrong xreg state for {}",
-             Common::ToUnderlying(R15));
+             std::to_underlying(R15));
 
   m_use_ctr = 0;
 }
@@ -985,14 +985,14 @@ void DSPJitRegCache::SpillXReg(X64Reg reg)
   {
     ASSERT_MSG(DSPLLE, !m_regs[m_xregs[reg].guest_reg].used,
                "to be spilled host reg {:#x} (guest reg {:#x}) still in use!",
-               Common::ToUnderlying(reg), m_xregs[reg].guest_reg);
+               std::to_underlying(reg), m_xregs[reg].guest_reg);
 
     MovToMemory(m_xregs[reg].guest_reg);
   }
   else
   {
     ASSERT_MSG(DSPLLE, m_xregs[reg].guest_reg == DSP_REG_NONE,
-               "to be spilled host reg {:#x} still in use!", Common::ToUnderlying(reg));
+               "to be spilled host reg {:#x} still in use!", std::to_underlying(reg));
   }
 }
 
@@ -1037,7 +1037,7 @@ void DSPJitRegCache::GetXReg(X64Reg reg)
 {
   if (m_xregs[reg].guest_reg == DSP_REG_STATIC)
   {
-    ERROR_LOG_FMT(DSPLLE, "Trying to get statically used XReg {}", Common::ToUnderlying(reg));
+    ERROR_LOG_FMT(DSPLLE, "Trying to get statically used XReg {}", std::to_underlying(reg));
     return;
   }
 
@@ -1053,7 +1053,7 @@ void DSPJitRegCache::PutXReg(X64Reg reg)
 {
   if (m_xregs[reg].guest_reg == DSP_REG_STATIC)
   {
-    ERROR_LOG_FMT(DSPLLE, "Trying to put statically used XReg {}", Common::ToUnderlying(reg));
+    ERROR_LOG_FMT(DSPLLE, "Trying to put statically used XReg {}", std::to_underlying(reg));
     return;
   }
 
diff --git a/Source/Core/Core/DSP/LabelMap.cpp b/Source/Core/Core/DSP/LabelMap.cpp
index 0e4f7d39eddb..1dfdfdaf6a11 100644
--- a/Source/Core/Core/DSP/LabelMap.cpp
+++ b/Source/Core/Core/DSP/LabelMap.cpp
@@ -7,7 +7,8 @@
 #include <string>
 #include <vector>
 
-#include "Common/Logging/Log.h"
+#include <fmt/base.h>
+
 #include "Core/DSP/DSPTables.h"
 
 namespace DSP
diff --git a/Source/Core/Core/Debugger/BranchWatch.cpp b/Source/Core/Core/Debugger/BranchWatch.cpp
index 8393d8fcec90..5f5084562c99 100644
--- a/Source/Core/Core/Debugger/BranchWatch.cpp
+++ b/Source/Core/Core/Debugger/BranchWatch.cpp
@@ -8,8 +8,6 @@
 #include <cstdio>
 #include <functional>
 
-#include <fmt/format.h>
-
 #include "Common/Assert.h"
 #include "Common/BitField.h"
 #include "Common/CommonTypes.h"
diff --git a/Source/Core/Core/Debugger/BranchWatch.h b/Source/Core/Core/Debugger/BranchWatch.h
index d15af60a03b9..f455d91898d3 100644
--- a/Source/Core/Core/Debugger/BranchWatch.h
+++ b/Source/Core/Core/Debugger/BranchWatch.h
@@ -8,11 +8,14 @@
 #include <cstdio>
 #include <functional>
 #include <unordered_map>
+#include <utility>
 #include <vector>
 
 #include "Common/CommonTypes.h"
-#include "Common/EnumUtils.h"
+#include "Core/Core.h"
 #include "Core/PowerPC/Gekko.h"
+#include "Core/PowerPC/JitInterface.h"
+#include "Core/System.h"
 
 namespace Core
 {
@@ -71,15 +74,15 @@ enum class BranchWatchSelectionInspection : u8
 constexpr BranchWatchSelectionInspection operator|(BranchWatchSelectionInspection lhs,
                                                    BranchWatchSelectionInspection rhs)
 {
-  return static_cast<BranchWatchSelectionInspection>(Common::ToUnderlying(lhs) |
-                                                     Common::ToUnderlying(rhs));
+  return static_cast<BranchWatchSelectionInspection>(std::to_underlying(lhs) |
+                                                     std::to_underlying(rhs));
 }
 
 constexpr BranchWatchSelectionInspection operator&(BranchWatchSelectionInspection lhs,
                                                    BranchWatchSelectionInspection rhs)
 {
-  return static_cast<BranchWatchSelectionInspection>(Common::ToUnderlying(lhs) &
-                                                     Common::ToUnderlying(rhs));
+  return static_cast<BranchWatchSelectionInspection>(std::to_underlying(lhs) &
+                                                     std::to_underlying(rhs));
 }
 
 constexpr BranchWatchSelectionInspection& operator|=(BranchWatchSelectionInspection& self,
@@ -98,7 +101,7 @@ struct BranchWatchSelectionValueType
   BranchWatchCollection::value_type* collection_ptr;
   bool is_virtual;
   bool condition;
-  // This is moreso a GUI thing, but it works best in the Core code for multiple reasons.
+  // This is more so a GUI thing, but it works best in the Core code for multiple reasons.
   Inspection inspection;
 };
 
@@ -110,7 +113,7 @@ enum class BranchWatchPhase : bool
   Reduction,
 };
 
-class BranchWatch final  // Class is final to enforce the safety of GetOffsetOfRecordingActive().
+class BranchWatch final
 {
 public:
   using Collection = BranchWatchCollection;
@@ -119,7 +122,12 @@ class BranchWatch final  // Class is final to enforce the safety of GetOffsetOfR
   using SelectionInspection = BranchWatchSelectionInspection;
 
   bool GetRecordingActive() const { return m_recording_active; }
-  void SetRecordingActive(const CPUThreadGuard& guard, bool active) { m_recording_active = active; }
+  void SetRecordingActive(const CPUThreadGuard& guard, bool active)
+  {
+    m_recording_active = active;
+    auto& system = guard.GetSystem();
+    system.GetJitInterface().ClearCache(guard);
+  }
   void Clear(const CPUThreadGuard& guard);
 
   void Save(const CPUThreadGuard& guard, std::FILE* file) const;
@@ -226,19 +234,6 @@ class BranchWatch final  // Class is final to enforce the safety of GetOffsetOfR
       HitPhysicalFalse(this, origin, destination, inst.hex);
   }
 
-  // The JIT needs this value, but doesn't need to be a full-on friend.
-  static constexpr int GetOffsetOfRecordingActive()
-  {
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Winvalid-offsetof"
-#endif
-    return offsetof(BranchWatch, m_recording_active);
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif
-  }
-
 private:
   Collection& GetCollectionV(bool condition)
   {
@@ -273,8 +268,4 @@ class BranchWatch final  // Class is final to enforce the safety of GetOffsetOfR
   Collection m_collection_pf;  // physical address space | false path
   Selection m_selection;
 };
-
-#if _M_X86_64
-static_assert(BranchWatch::GetOffsetOfRecordingActive() < 0x80);  // Makes JIT code smaller.
-#endif
 }  // namespace Core
diff --git a/Source/Core/Core/Debugger/CodeTrace.cpp b/Source/Core/Core/Debugger/CodeTrace.cpp
index f90681a488fd..466fdfd7a7ee 100644
--- a/Source/Core/Core/Debugger/CodeTrace.cpp
+++ b/Source/Core/Core/Debugger/CodeTrace.cpp
@@ -8,7 +8,6 @@
 #include <regex>
 
 #include "Common/Contains.h"
-#include "Common/Event.h"
 #include "Core/Core.h"
 #include "Core/Debugger/PPCDebugInterface.h"
 #include "Core/HW/CPU.h"
@@ -263,7 +262,7 @@ HitType CodeTrace::TraceLogic(const TraceOutput& current_instr, bool first_hit)
   if (!match_reg0 && !match_reg123 && !mem_hit)
     return HitType::SKIP;
 
-  // Checks if the intstruction is a type that needs special handling.
+  // Checks if the instruction is a type that needs special handling.
   const auto CompareInstruction = [](std::string_view instruction, const auto& type_compare) {
     return std::ranges::any_of(
         type_compare, [&instruction](std::string_view s) { return instruction.starts_with(s); });
diff --git a/Source/Core/Core/Debugger/Debugger_SymbolMap.cpp b/Source/Core/Core/Debugger/Debugger_SymbolMap.cpp
index 76bfd0c78090..e9b1c6ebd9c0 100644
--- a/Source/Core/Core/Debugger/Debugger_SymbolMap.cpp
+++ b/Source/Core/Core/Debugger/Debugger_SymbolMap.cpp
@@ -3,14 +3,12 @@
 
 #include "Core/Debugger/Debugger_SymbolMap.h"
 
-#include <cstdio>
 #include <functional>
 #include <string>
 
 #include <fmt/format.h>
 
 #include "Common/CommonTypes.h"
-#include "Common/StringUtil.h"
 
 #include "Core/Core.h"
 #include "Core/HW/Memmap.h"
diff --git a/Source/Core/Core/Debugger/OSThread.cpp b/Source/Core/Core/Debugger/OSThread.cpp
index b5fd60e3a1d7..9f992a00c80f 100644
--- a/Source/Core/Core/Debugger/OSThread.cpp
+++ b/Source/Core/Core/Debugger/OSThread.cpp
@@ -3,7 +3,6 @@
 
 #include "Core/Debugger/OSThread.h"
 
-#include <algorithm>
 #include <fmt/format.h>
 
 #include "Core/PowerPC/MMU.h"
diff --git a/Source/Core/Core/Debugger/RSO.cpp b/Source/Core/Core/Debugger/RSO.cpp
index 81183344d44f..6dfb8baa0b4f 100644
--- a/Source/Core/Core/Debugger/RSO.cpp
+++ b/Source/Core/Core/Debugger/RSO.cpp
@@ -9,7 +9,6 @@
 #include <utility>
 #include <vector>
 
-#include "Common/CommonFuncs.h"
 #include "Common/Logging/Log.h"
 #include "Core/PowerPC/MMU.h"
 #include "Core/PowerPC/PPCSymbolDB.h"
diff --git a/Source/Core/Core/DolphinAnalytics.cpp b/Source/Core/Core/DolphinAnalytics.cpp
index aa4e59d16e54..c84648b26751 100644
--- a/Source/Core/Core/DolphinAnalytics.cpp
+++ b/Source/Core/Core/DolphinAnalytics.cpp
@@ -7,6 +7,7 @@
 #include <memory>
 #include <mutex>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include <fmt/format.h>
@@ -27,10 +28,10 @@
 #include "Common/CommonTypes.h"
 #include "Common/Config/Config.h"
 #include "Common/Crypto/SHA1.h"
-#include "Common/EnumUtils.h"
 #include "Common/Random.h"
 #include "Common/Timer.h"
 #include "Common/Version.h"
+#include "Core/Config/GraphicsSettings.h"
 #include "Core/Config/MainSettings.h"
 #include "Core/ConfigManager.h"
 #include "Core/HW/GCPad.h"
@@ -352,9 +353,9 @@ void DolphinAnalytics::MakeBaseBuilder()
   m_base_builder = builder;
 }
 
-static const char* GetShaderCompilationMode(const VideoConfig& video_config)
+static const char* GetShaderCompilationMode()
 {
-  switch (video_config.iShaderCompilationMode)
+  switch (Config::Get(Config::GFX_SHADER_COMPILATION_MODE))
   {
   case ShaderCompilationMode::AsynchronousUberShaders:
     return "async-ubershaders";
@@ -368,6 +369,11 @@ static const char* GetShaderCompilationMode(const VideoConfig& video_config)
   }
 }
 
+static bool UseVertexRounding()
+{
+  return Config::Get(Config::GFX_HACK_VERTEX_ROUNDING) && Config::Get(Config::GFX_EFB_SCALE) != 1;
+}
+
 void DolphinAnalytics::MakePerGameBuilder()
 {
   Common::AnalyticsReportBuilder builder(m_base_builder);
@@ -397,34 +403,40 @@ void DolphinAnalytics::MakePerGameBuilder()
   }
 
   // Video configuration.
-  builder.AddData("cfg-gfx-multisamples", g_Config.iMultisamples);
-  builder.AddData("cfg-gfx-ssaa", g_Config.bSSAA);
-  builder.AddData("cfg-gfx-anisotropy", Common::ToUnderlying(g_Config.iMaxAnisotropy));
-  builder.AddData("cfg-gfx-vsync", g_Config.bVSync);
-  builder.AddData("cfg-gfx-aspect-ratio", static_cast<int>(g_Config.aspect_mode));
-  builder.AddData("cfg-gfx-efb-access", g_Config.bEFBAccessEnable);
-  builder.AddData("cfg-gfx-efb-copy-format-changes", g_Config.bEFBEmulateFormatChanges);
-  builder.AddData("cfg-gfx-efb-copy-ram", !g_Config.bSkipEFBCopyToRam);
-  builder.AddData("cfg-gfx-xfb-copy-ram", !g_Config.bSkipXFBCopyToRam);
-  builder.AddData("cfg-gfx-defer-efb-copies", g_Config.bDeferEFBCopies);
-  builder.AddData("cfg-gfx-immediate-xfb", !g_Config.bImmediateXFB);
-  builder.AddData("cfg-gfx-efb-copy-scaled", g_Config.bCopyEFBScaled);
-  builder.AddData("cfg-gfx-internal-resolution", g_Config.iEFBScale);
-  builder.AddData("cfg-gfx-tc-samples", g_Config.iSafeTextureCache_ColorSamples);
-  builder.AddData("cfg-gfx-stereo-mode", static_cast<int>(g_Config.stereo_mode));
+  builder.AddData("cfg-gfx-multisamples", Config::Get(Config::GFX_MSAA));
+  builder.AddData("cfg-gfx-ssaa", Config::Get(Config::GFX_SSAA));
+  builder.AddData("cfg-gfx-anisotropy",
+                  std::to_underlying(Config::Get(Config::GFX_ENHANCE_MAX_ANISOTROPY)));
+  builder.AddData("cfg-gfx-vsync", Config::Get(Config::GFX_VSYNC));
+  builder.AddData("cfg-gfx-aspect-ratio", static_cast<int>(Config::Get(Config::GFX_ASPECT_RATIO)));
+  builder.AddData("cfg-gfx-efb-access", Config::Get(Config::GFX_HACK_EFB_ACCESS_ENABLE));
+  builder.AddData("cfg-gfx-efb-copy-format-changes",
+                  Config::Get(Config::GFX_HACK_EFB_EMULATE_FORMAT_CHANGES));
+  builder.AddData("cfg-gfx-efb-copy-ram", !Config::Get(Config::GFX_HACK_SKIP_EFB_COPY_TO_RAM));
+  builder.AddData("cfg-gfx-xfb-copy-ram", !Config::Get(Config::GFX_HACK_SKIP_XFB_COPY_TO_RAM));
+  builder.AddData("cfg-gfx-defer-efb-copies", Config::Get(Config::GFX_HACK_DEFER_EFB_COPIES));
+  // Note: Incorrectly inverted. Keeping as-is to not break analytics history.
+  builder.AddData("cfg-gfx-immediate-xfb", !Config::Get(Config::GFX_HACK_IMMEDIATE_XFB));
+  builder.AddData("cfg-gfx-efb-copy-scaled", Config::Get(Config::GFX_HACK_COPY_EFB_SCALED));
+  builder.AddData("cfg-gfx-internal-resolution", Config::Get(Config::GFX_EFB_SCALE));
+  builder.AddData("cfg-gfx-tc-samples", Config::Get(Config::GFX_SAFE_TEXTURE_CACHE_COLOR_SAMPLES));
+  builder.AddData("cfg-gfx-stereo-mode", static_cast<int>(Config::Get(Config::GFX_STEREO_MODE)));
   builder.AddData("cfg-gfx-stereo-per-eye-resolution-full",
-                  g_Config.stereo_per_eye_resolution_full);
-  builder.AddData("cfg-gfx-hdr", static_cast<int>(g_Config.bHDR));
-  builder.AddData("cfg-gfx-per-pixel-lighting", g_Config.bEnablePixelLighting);
-  builder.AddData("cfg-gfx-shader-compilation-mode", GetShaderCompilationMode(g_Config));
-  builder.AddData("cfg-gfx-wait-for-shaders", g_Config.bWaitForShadersBeforeStarting);
-  builder.AddData("cfg-gfx-fast-depth", g_Config.bFastDepthCalc);
-  builder.AddData("cfg-gfx-vertex-rounding", g_Config.UseVertexRounding());
+                  Config::Get(Config::GFX_STEREO_PER_EYE_RESOLUTION_FULL));
+  // Note: An int for some reason. Keeping as-is to not break analytics history.
+  builder.AddData("cfg-gfx-hdr", static_cast<int>(Config::Get(Config::GFX_ENHANCE_HDR_OUTPUT)));
+  builder.AddData("cfg-gfx-per-pixel-lighting", Config::Get(Config::GFX_ENABLE_PIXEL_LIGHTING));
+  builder.AddData("cfg-gfx-shader-compilation-mode", GetShaderCompilationMode());
+  builder.AddData("cfg-gfx-wait-for-shaders",
+                  Config::Get(Config::GFX_WAIT_FOR_SHADERS_BEFORE_STARTING));
+  builder.AddData("cfg-gfx-fast-depth", Config::Get(Config::GFX_FAST_DEPTH_CALC));
+  builder.AddData("cfg-gfx-vertex-rounding", UseVertexRounding());
 
   // GPU features.
-  if (g_Config.iAdapter < static_cast<int>(g_backend_info.Adapters.size()))
+  const int adapter_index = Config::Get(Config::GFX_ADAPTER);
+  if (adapter_index < static_cast<int>(g_backend_info.Adapters.size()))
   {
-    builder.AddData("gpu-adapter", g_backend_info.Adapters[g_Config.iAdapter]);
+    builder.AddData("gpu-adapter", g_backend_info.Adapters[adapter_index]);
   }
   else if (!g_backend_info.AdapterName.empty())
   {
diff --git a/Source/Core/Core/FifoPlayer/FifoDataFile.cpp b/Source/Core/Core/FifoPlayer/FifoDataFile.cpp
index f48b555f7e98..1e7ec5d77e63 100644
--- a/Source/Core/Core/FifoPlayer/FifoDataFile.cpp
+++ b/Source/Core/Core/FifoPlayer/FifoDataFile.cpp
@@ -12,11 +12,12 @@
 #include "Common/IOFile.h"
 #include "Common/MsgHandler.h"
 #include "Core/Config/MainSettings.h"
+#include "Core/ConfigManager.h"
 #include "Core/HW/Memmap.h"
 #include "Core/System.h"
 
 constexpr u32 FILE_ID = 0x0d01f1f0;
-constexpr u32 VERSION_NUMBER = 5;
+constexpr u32 VERSION_NUMBER = 6;
 constexpr u32 MIN_LOADER_VERSION = 1;
 // This value is only used if the DFF file was created with overridden RAM sizes.
 // If the MIN_LOADER_VERSION ever exceeds this, it's alright to remove it.
@@ -42,13 +43,15 @@ struct FileHeader
   u32 flags;
   u64 texMemOffset;
   u32 texMemSize;
-  // These are for overriden RAM sizes.  Otherwise the FIFO Player
+  // These are for overridden RAM sizes.  Otherwise the FIFO Player
   // will crash and burn with mismatched settings.  See PR #8722.
   u32 mem1_size;
   u32 mem2_size;
-  u8 reserved[32];
+  char gameid[8];
+  u8 reserved[24];
 };
 static_assert(sizeof(FileHeader) == 128, "FileHeader should be 128 bytes");
+static_assert(DEFAULT_GAME_ID.size() == sizeof(FileHeader::gameid), "Default game id size changed");
 
 struct FileFrameInfo
 {
@@ -136,7 +139,7 @@ bool FifoDataFile::Save(const std::string& filename)
   FileHeader header;
   header.fileId = FILE_ID;
   header.file_version = VERSION_NUMBER;
-  // Maintain backwards compatability so long as the RAM sizes aren't overridden.
+  // Maintain backwards compatibility so long as the RAM sizes aren't overridden.
   if (Config::Get(Config::MAIN_RAM_OVERRIDE_ENABLE))
     header.min_loader_version = MIN_LOADER_VERSION_FOR_RAM_OVERRIDE;
   else
@@ -167,6 +170,17 @@ bool FifoDataFile::Save(const std::string& filename)
   header.mem1_size = memory.GetRamSizeReal();
   header.mem2_size = memory.GetExRamSizeReal();
 
+  const auto gameid = SConfig::GetInstance().GetGameID();
+  if (gameid.size() > DEFAULT_GAME_ID.size())
+  {
+    // Custom game id?  Won't fit, just use default
+    std::memcpy(header.gameid, DEFAULT_GAME_ID.data(), DEFAULT_GAME_ID.size());
+  }
+  else
+  {
+    std::strncpy(header.gameid, gameid.c_str(), DEFAULT_GAME_ID.size());
+  }
+
   file.Seek(0, File::SeekOrigin::Begin);
   file.WriteBytes(&header, sizeof(FileHeader));
 
@@ -253,6 +267,16 @@ std::unique_ptr<FifoDataFile> FifoDataFile::Load(const std::string& filename, bo
   dataFile->m_Flags = header.flags;
   dataFile->m_Version = header.file_version;
 
+  // Official support for game id was added in version 6
+  if (header.file_version < 6)
+  {
+    dataFile->m_game_id = DEFAULT_GAME_ID;
+  }
+  else
+  {
+    dataFile->m_game_id = std::string{header.gameid, DEFAULT_GAME_ID.size()};
+  }
+
   if (flagsOnly)
   {
     // Force settings to match those used when the DFF was created.  This is sort of a hack.
diff --git a/Source/Core/Core/FifoPlayer/FifoDataFile.h b/Source/Core/Core/FifoPlayer/FifoDataFile.h
index dc4f7915daa0..f0fd098eaae6 100644
--- a/Source/Core/Core/FifoPlayer/FifoDataFile.h
+++ b/Source/Core/Core/FifoPlayer/FifoDataFile.h
@@ -9,6 +9,7 @@
 #include <vector>
 
 #include "Common/CommonTypes.h"
+#include "Core/ConfigManager.h"
 #include "VideoCommon/XFMemory.h"
 
 namespace File
@@ -71,6 +72,7 @@ class FifoDataFile
   u8* GetTexMem() { return m_TexMem.data(); }
   u32 GetRamSizeReal() { return m_ram_size_real; }
   u32 GetExRamSizeReal() { return m_exram_size_real; }
+  const std::string& GetGameId() const { return m_game_id; }
 
   void AddFrame(const FifoFrameInfo& frameInfo);
   const FifoFrameInfo& GetFrame(u32 frame) const { return m_Frames[frame]; }
@@ -102,6 +104,8 @@ class FifoDataFile
   u32 m_ram_size_real = 0;
   u32 m_exram_size_real = 0;
 
+  std::string m_game_id = std::string{DEFAULT_GAME_ID};
+
   u32 m_Flags = 0;
   u32 m_Version = 0;
 
diff --git a/Source/Core/Core/FifoPlayer/FifoPlayer.cpp b/Source/Core/Core/FifoPlayer/FifoPlayer.cpp
index 57ff28d7fdaa..f0c62d4e3f2c 100644
--- a/Source/Core/Core/FifoPlayer/FifoPlayer.cpp
+++ b/Source/Core/Core/FifoPlayer/FifoPlayer.cpp
@@ -5,7 +5,6 @@
 
 #include <algorithm>
 #include <cstring>
-#include <mutex>
 #include <type_traits>
 
 #include "Common/Assert.h"
@@ -315,7 +314,7 @@ void FifoPlayer::SetFileLoadedCallback(CallbackFunc callback)
 {
   m_FileLoadedCb = std::move(callback);
 
-  // Trigger the callback immediatly if the file is already loaded.
+  // Trigger the callback immediately if the file is already loaded.
   if (GetFile() != nullptr)
   {
     m_FileLoadedCb();
diff --git a/Source/Core/Core/FifoPlayer/FifoRecorder.cpp b/Source/Core/Core/FifoPlayer/FifoRecorder.cpp
index 207e12fb7a15..571766eb1144 100644
--- a/Source/Core/Core/FifoPlayer/FifoRecorder.cpp
+++ b/Source/Core/Core/FifoPlayer/FifoRecorder.cpp
@@ -8,7 +8,6 @@
 
 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"
-#include "Common/Thread.h"
 
 #include "Core/HW/Memmap.h"
 #include "Core/System.h"
@@ -19,7 +18,6 @@
 #include "VideoCommon/TextureDecoder.h"
 #include "VideoCommon/VideoEvents.h"
 #include "VideoCommon/XFMemory.h"
-#include "VideoCommon/XFStructs.h"
 
 class FifoRecorder::FifoRecordAnalyzer : public OpcodeDecoder::Callback
 {
diff --git a/Source/Core/Core/FreeLookConfig.cpp b/Source/Core/Core/FreeLookConfig.cpp
deleted file mode 100644
index 56aadb9af2ab..000000000000
--- a/Source/Core/Core/FreeLookConfig.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright 2020 Dolphin Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "Core/FreeLookConfig.h"
-
-#include <optional>
-
-#include "Core/AchievementManager.h"
-#include "Core/CPUThreadConfigCallback.h"
-#include "Core/Config/AchievementSettings.h"
-#include "Core/Config/FreeLookSettings.h"
-#include "Core/ConfigManager.h"
-#include "Core/Core.h"
-
-namespace FreeLook
-{
-static Config s_config;
-static Config s_active_config;
-static std::optional<CPUThreadConfigCallback::ConfigChangedCallbackID>
-    s_config_changed_callback_id = std::nullopt;
-
-Config& GetConfig()
-{
-  return s_config;
-}
-
-const Config& GetActiveConfig()
-{
-  return s_active_config;
-}
-
-void UpdateActiveConfig()
-{
-  s_active_config = s_config;
-}
-
-Config::Config()
-{
-  camera_config.control_type = ControlType::SixAxis;
-  enabled = false;
-}
-
-void Config::Refresh()
-{
-  if (!s_config_changed_callback_id.has_value())
-  {
-    s_config_changed_callback_id =
-        CPUThreadConfigCallback::AddConfigChangedCallback([] { s_config.Refresh(); });
-  }
-
-  camera_config.control_type = ::Config::Get(::Config::FL1_CONTROL_TYPE);
-  enabled = ::Config::Get(::Config::FREE_LOOK_ENABLED) &&
-            !AchievementManager::GetInstance().IsHardcoreModeActive();
-}
-
-void Config::Shutdown()
-{
-  if (!s_config_changed_callback_id.has_value())
-    return;
-
-  CPUThreadConfigCallback::RemoveConfigChangedCallback(*s_config_changed_callback_id);
-  s_config_changed_callback_id.reset();
-}
-}  // namespace FreeLook
diff --git a/Source/Core/Core/FreeLookConfig.h b/Source/Core/Core/FreeLookConfig.h
deleted file mode 100644
index 5819d81269c9..000000000000
--- a/Source/Core/Core/FreeLookConfig.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2020 Dolphin Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-// IMPORTANT: UI etc should modify the value returned by FreeLook::GetConfig().
-// Free Look code should read from the value returned by FreeLook::GetActiveConfig().
-// The reason for this is to get rid of race conditions etc when the
-// configuration changes in the middle of a frame.
-
-#pragma once
-
-namespace FreeLook
-{
-enum class ControlType : int
-{
-  SixAxis,
-  FPS,
-  Orbital
-};
-
-struct CameraConfig
-{
-  ControlType control_type;
-};
-
-// NEVER inherit from this class.
-struct Config final
-{
-  Config();
-  void Refresh();
-  void Shutdown();
-
-  CameraConfig camera_config;
-  bool enabled;
-};
-
-Config& GetConfig();
-const Config& GetActiveConfig();
-
-// Called every frame.
-void UpdateActiveConfig();
-}  // namespace FreeLook
diff --git a/Source/Core/Core/FreeLookManager.cpp b/Source/Core/Core/FreeLookManager.cpp
index 58b71b708f3e..9dc23e893440 100644
--- a/Source/Core/Core/FreeLookManager.cpp
+++ b/Source/Core/Core/FreeLookManager.cpp
@@ -7,14 +7,11 @@
 #include <fmt/ranges.h>
 
 #include "Common/Common.h"
-#include "Common/CommonTypes.h"
 #include "Common/Config/Config.h"
 #include "Common/ScopeGuard.h"
 
 #include "Core/Config/FreeLookSettings.h"
-#include "Core/ConfigManager.h"
 #include "Core/Core.h"
-#include "Core/FreeLookConfig.h"
 
 #include "InputCommon/ControlReference/ControlReference.h"
 #include "InputCommon/ControllerEmu/ControlGroup/Buttons.h"
@@ -22,7 +19,6 @@
 #include "InputCommon/InputConfig.h"
 
 #include "VideoCommon/FreeLookCamera.h"
-#include "VideoCommon/OnScreenDisplay.h"
 
 namespace
 {
@@ -326,8 +322,6 @@ void Shutdown()
 {
   s_config.UnregisterHotplugCallback();
   s_config.ClearControllers();
-
-  GetConfig().Shutdown();
 }
 
 void Initialize()
@@ -339,7 +333,7 @@ void Initialize()
 
   s_config.RegisterHotplugCallback();
 
-  FreeLook::GetConfig().Refresh();
+  g_freelook_camera.RefreshConfig();
 
   s_config.LoadConfig();
 }
diff --git a/Source/Core/Core/FreeLookManager.h b/Source/Core/Core/FreeLookManager.h
index 1cf8b7f12441..c03f5b582636 100644
--- a/Source/Core/Core/FreeLookManager.h
+++ b/Source/Core/Core/FreeLookManager.h
@@ -6,7 +6,6 @@
 #include <chrono>
 #include <optional>
 
-#include "Common/CommonTypes.h"
 #include "InputCommon/ControllerEmu/ControllerEmu.h"
 
 class CameraControllerInput;
diff --git a/Source/Core/Core/GeckoCode.cpp b/Source/Core/Core/GeckoCode.cpp
index 45b8db279ade..79b8449e92b1 100644
--- a/Source/Core/Core/GeckoCode.cpp
+++ b/Source/Core/Core/GeckoCode.cpp
@@ -12,7 +12,6 @@
 #include "Common/ChunkFile.h"
 #include "Common/CommonPaths.h"
 #include "Common/CommonTypes.h"
-#include "Common/Config/Config.h"
 #include "Common/FileUtil.h"
 
 #include "Core/AchievementManager.h"
diff --git a/Source/Core/Core/GeckoCodeConfig.cpp b/Source/Core/Core/GeckoCodeConfig.cpp
index 58e15775f743..c4a74c866800 100644
--- a/Source/Core/Core/GeckoCodeConfig.cpp
+++ b/Source/Core/Core/GeckoCodeConfig.cpp
@@ -3,7 +3,6 @@
 
 #include "Core/GeckoCodeConfig.h"
 
-#include <algorithm>
 #include <optional>
 #include <sstream>
 #include <string>
@@ -11,7 +10,6 @@
 
 #include "Common/HttpRequest.h"
 #include "Common/IniFile.h"
-#include "Common/Logging/Log.h"
 #include "Common/StringUtil.h"
 #include "Core/CheatCodes.h"
 
diff --git a/Source/Core/Core/HLE/HLE.cpp b/Source/Core/Core/HLE/HLE.cpp
index a0ca8593716f..31b6c2d1ed12 100644
--- a/Source/Core/Core/HLE/HLE.cpp
+++ b/Source/Core/Core/HLE/HLE.cpp
@@ -8,7 +8,6 @@
 #include <map>
 
 #include "Common/CommonTypes.h"
-#include "Common/Config/Config.h"
 
 #include "Core/Config/MainSettings.h"
 #include "Core/Core.h"
@@ -17,7 +16,6 @@
 #include "Core/HLE/HLE_OS.h"
 #include "Core/HW/Memmap.h"
 #include "Core/Host.h"
-#include "Core/IOS/ES/ES.h"
 #include "Core/PowerPC/PPCSymbolDB.h"
 #include "Core/PowerPC/PowerPC.h"
 #include "Core/System.h"
@@ -103,7 +101,7 @@ void PatchFixedFunctions(Core::System& system)
   // Not part of the binary itself, but either we or Gecko OS might insert
   // this, and it doesn't clear the icache properly.
   Patch(system, Gecko::ENTRY_POINT, "GeckoCodehandler");
-  // This has to always be installed even if cheats are not enabled because of the possiblity of
+  // This has to always be installed even if cheats are not enabled because of the possibility of
   // loading a savestate where PC is inside the code handler while cheats are disabled.
   Patch(system, Gecko::HLE_TRAMPOLINE_ADDRESS, "GeckoHandlerReturnTrampoline");
 }
diff --git a/Source/Core/Core/HLE/HLE_Misc.cpp b/Source/Core/Core/HLE/HLE_Misc.cpp
index 6f2a2fc389ab..c9f160ad97b7 100644
--- a/Source/Core/Core/HLE/HLE_Misc.cpp
+++ b/Source/Core/Core/HLE/HLE_Misc.cpp
@@ -3,7 +3,6 @@
 
 #include "Core/HLE/HLE_Misc.h"
 
-#include "Common/Common.h"
 #include "Common/CommonTypes.h"
 #include "Core/Core.h"
 #include "Core/GeckoCode.h"
diff --git a/Source/Core/Core/HLE/HLE_OS.cpp b/Source/Core/Core/HLE/HLE_OS.cpp
index 43f5796bb489..5aa5a905c6be 100644
--- a/Source/Core/Core/HLE/HLE_OS.cpp
+++ b/Source/Core/Core/HLE/HLE_OS.cpp
@@ -11,7 +11,6 @@
 #include <fmt/format.h>
 #include <fmt/printf.h>
 
-#include "Common/BitUtils.h"
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"
diff --git a/Source/Core/Core/HW/AddressSpace.h b/Source/Core/Core/HW/AddressSpace.h
index 63302999fef6..75a92ed14b80 100644
--- a/Source/Core/Core/HW/AddressSpace.h
+++ b/Source/Core/Core/HW/AddressSpace.h
@@ -32,7 +32,7 @@ struct Accessors
   virtual u8 ReadU8(const Core::CPUThreadGuard& guard, u32 address) const = 0;
   virtual void WriteU8(const Core::CPUThreadGuard& guard, u32 address, u8 value) = 0;
 
-  // overrideable naive implementations of below are defined
+  // overridable naive implementations of below are defined
   virtual u16 ReadU16(const Core::CPUThreadGuard& guard, u32 address) const;
   virtual void WriteU16(const Core::CPUThreadGuard& guard, u32 address, u16 value);
   virtual u32 ReadU32(const Core::CPUThreadGuard& guard, u32 address) const;
diff --git a/Source/Core/Core/HW/CPU.cpp b/Source/Core/Core/HW/CPU.cpp
index 0353f3f4ca28..c84e082e308f 100644
--- a/Source/Core/Core/HW/CPU.cpp
+++ b/Source/Core/Core/HW/CPU.cpp
@@ -8,7 +8,6 @@
 #include <queue>
 
 #include "AudioCommon/AudioCommon.h"
-#include "Common/CommonTypes.h"
 #include "Common/Event.h"
 #include "Common/Thread.h"
 #include "Common/Timer.h"
@@ -337,16 +336,18 @@ void CPUManager::SetStepping(bool stepping)
   {
     SetStateLocked(State::Stepping);
 
-    while (m_state_cpu_thread_active)
+    if (!Core::IsCPUThread())
     {
-      m_state_cpu_idle_cvar.wait(state_lock);
+      while (m_state_cpu_thread_active)
+        m_state_cpu_idle_cvar.wait(state_lock);
     }
 
     RunAdjacentSystems(false);
   }
   else if (SetStateLocked(State::Running))
   {
-    m_state_cpu_cvar.notify_one();
+    if (!Core::IsCPUThread())
+      m_state_cpu_cvar.notify_one();
     m_time_played_finish_sync.Set();
     RunAdjacentSystems(true);
   }
diff --git a/Source/Core/Core/HW/CPU.h b/Source/Core/Core/HW/CPU.h
index 11830ed37341..6fa3beadc781 100644
--- a/Source/Core/Core/HW/CPU.h
+++ b/Source/Core/Core/HW/CPU.h
@@ -67,7 +67,7 @@ class CPUManager
   // StepOpcode (Steps one Opcode)
   void StepOpcode(Common::Event* event = nullptr);
 
-  // Enable or Disable Stepping. [Will deadlock if called from a system thread]
+  // Enable or Disable Stepping.
   void SetStepping(bool stepping);
 
   // Breakpoint activation for system threads. Similar to SetStepping(true).
diff --git a/Source/Core/Core/HW/DSP.cpp b/Source/Core/Core/HW/DSP.cpp
index 17672b1924d1..3abea2bea8ea 100644
--- a/Source/Core/Core/HW/DSP.cpp
+++ b/Source/Core/Core/HW/DSP.cpp
@@ -603,4 +603,9 @@ u8* DSPManager::GetARAMPtr() const
   return m_aram.ptr;
 }
 
+u32 DSPManager::GetARAMSize() const
+{
+  return m_aram.size;
+}
+
 }  // end of namespace DSP
diff --git a/Source/Core/Core/HW/DSP.h b/Source/Core/Core/HW/DSP.h
index d65116468c45..995ffec8cb97 100644
--- a/Source/Core/Core/HW/DSP.h
+++ b/Source/Core/Core/HW/DSP.h
@@ -97,6 +97,7 @@ class DSPManager
 
   // Debugger Helper
   u8* GetARAMPtr() const;
+  u32 GetARAMSize() const;
 
   void UpdateAudioDMA();
   void UpdateDSPSlice(int cycles);
diff --git a/Source/Core/Core/HW/DSPHLE/MailHandler.cpp b/Source/Core/Core/HW/DSPHLE/MailHandler.cpp
index db783a51e740..192de92be6da 100644
--- a/Source/Core/Core/HW/DSPHLE/MailHandler.cpp
+++ b/Source/Core/Core/HW/DSPHLE/MailHandler.cpp
@@ -6,7 +6,6 @@
 #include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
-#include "Common/MsgHandler.h"
 #include "Core/HW/DSP.h"
 
 namespace DSP::HLE
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/AESnd.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/AESnd.cpp
index 973ee7e4ec98..fb2254363bfe 100644
--- a/Source/Core/Core/HW/DSPHLE/UCodes/AESnd.cpp
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/AESnd.cpp
@@ -10,12 +10,12 @@
 
 #include "Common/ChunkFile.h"
 #include "Common/Logging/Log.h"
-#include "Common/Swap.h"
 #include "Core/DSP/DSPAccelerator.h"
 #include "Core/HW/DSP.h"
 #include "Core/HW/DSPHLE/DSPHLE.h"
 #include "Core/HW/DSPHLE/MailHandler.h"
 #include "Core/HW/DSPHLE/UCodes/UCodes.h"
+#include "Core/HW/Memmap.h"
 #include "Core/System.h"
 
 namespace DSP::HLE
@@ -159,11 +159,8 @@ void AESndUCode::HandleMail(u32 mail)
       DEBUG_LOG_FMT(DSPHLE, "AESndUCode - MAIL_SEND_SAMPLES");
       // send_samples
       auto& memory = m_dsphle->GetSystem().GetMemory();
-      for (u32 i = 0; i < NUM_OUTPUT_SAMPLES * 2; i++)
-      {
-        HLEMemory_Write_U16(memory, m_parameter_block.out_buf + i * sizeof(u16),
-                            m_output_buffer[i]);
-      }
+      memory.CopyToEmuSwapped(m_parameter_block.out_buf, m_output_buffer.data(),
+                              sizeof(m_output_buffer));
       m_mail_handler.PushMail(DSP_SYNC, true);
       break;
     }
@@ -203,41 +200,41 @@ void AESndUCode::HandleMail(u32 mail)
 void AESndUCode::DMAInParameterBlock()
 {
   auto& memory = m_dsphle->GetSystem().GetMemory();
-  m_parameter_block.out_buf = HLEMemory_Read_U32(memory, m_parameter_block_addr + 0);
-  m_parameter_block.buf_start = HLEMemory_Read_U32(memory, m_parameter_block_addr + 4);
-  m_parameter_block.buf_end = HLEMemory_Read_U32(memory, m_parameter_block_addr + 8);
-  m_parameter_block.buf_curr = HLEMemory_Read_U32(memory, m_parameter_block_addr + 12);
-  m_parameter_block.yn1 = HLEMemory_Read_U16(memory, m_parameter_block_addr + 16);
-  m_parameter_block.yn2 = HLEMemory_Read_U16(memory, m_parameter_block_addr + 18);
-  m_parameter_block.pds = HLEMemory_Read_U16(memory, m_parameter_block_addr + 20);
-  m_parameter_block.freq = HLEMemory_Read_U32(memory, m_parameter_block_addr + 22);
-  m_parameter_block.counter = HLEMemory_Read_U16(memory, m_parameter_block_addr + 26);
-  m_parameter_block.left = HLEMemory_Read_U16(memory, m_parameter_block_addr + 28);
-  m_parameter_block.right = HLEMemory_Read_U16(memory, m_parameter_block_addr + 30);
-  m_parameter_block.volume_l = HLEMemory_Read_U16(memory, m_parameter_block_addr + 32);
-  m_parameter_block.volume_r = HLEMemory_Read_U16(memory, m_parameter_block_addr + 34);
-  m_parameter_block.delay = HLEMemory_Read_U32(memory, m_parameter_block_addr + 36);
-  m_parameter_block.flags = HLEMemory_Read_U32(memory, m_parameter_block_addr + 40);
+  m_parameter_block.out_buf = memory.Read_U32(m_parameter_block_addr + 0);
+  m_parameter_block.buf_start = memory.Read_U32(m_parameter_block_addr + 4);
+  m_parameter_block.buf_end = memory.Read_U32(m_parameter_block_addr + 8);
+  m_parameter_block.buf_curr = memory.Read_U32(m_parameter_block_addr + 12);
+  m_parameter_block.yn1 = memory.Read_U16(m_parameter_block_addr + 16);
+  m_parameter_block.yn2 = memory.Read_U16(m_parameter_block_addr + 18);
+  m_parameter_block.pds = memory.Read_U16(m_parameter_block_addr + 20);
+  m_parameter_block.freq = memory.Read_U32(m_parameter_block_addr + 22);
+  m_parameter_block.counter = memory.Read_U16(m_parameter_block_addr + 26);
+  m_parameter_block.left = memory.Read_U16(m_parameter_block_addr + 28);
+  m_parameter_block.right = memory.Read_U16(m_parameter_block_addr + 30);
+  m_parameter_block.volume_l = memory.Read_U16(m_parameter_block_addr + 32);
+  m_parameter_block.volume_r = memory.Read_U16(m_parameter_block_addr + 34);
+  m_parameter_block.delay = memory.Read_U32(m_parameter_block_addr + 36);
+  m_parameter_block.flags = memory.Read_U32(m_parameter_block_addr + 40);
 }
 
 void AESndUCode::DMAOutParameterBlock()
 {
   auto& memory = m_dsphle->GetSystem().GetMemory();
-  HLEMemory_Write_U32(memory, m_parameter_block_addr + 0, m_parameter_block.out_buf);
-  HLEMemory_Write_U32(memory, m_parameter_block_addr + 4, m_parameter_block.buf_start);
-  HLEMemory_Write_U32(memory, m_parameter_block_addr + 8, m_parameter_block.buf_end);
-  HLEMemory_Write_U32(memory, m_parameter_block_addr + 12, m_parameter_block.buf_curr);
-  HLEMemory_Write_U16(memory, m_parameter_block_addr + 16, m_parameter_block.yn1);
-  HLEMemory_Write_U16(memory, m_parameter_block_addr + 18, m_parameter_block.yn2);
-  HLEMemory_Write_U16(memory, m_parameter_block_addr + 20, m_parameter_block.pds);
-  HLEMemory_Write_U32(memory, m_parameter_block_addr + 22, m_parameter_block.freq);
-  HLEMemory_Write_U16(memory, m_parameter_block_addr + 26, m_parameter_block.counter);
-  HLEMemory_Write_U16(memory, m_parameter_block_addr + 28, m_parameter_block.left);
-  HLEMemory_Write_U16(memory, m_parameter_block_addr + 30, m_parameter_block.right);
-  HLEMemory_Write_U16(memory, m_parameter_block_addr + 32, m_parameter_block.volume_l);
-  HLEMemory_Write_U16(memory, m_parameter_block_addr + 34, m_parameter_block.volume_r);
-  HLEMemory_Write_U32(memory, m_parameter_block_addr + 36, m_parameter_block.delay);
-  HLEMemory_Write_U32(memory, m_parameter_block_addr + 40, m_parameter_block.flags);
+  memory.Write_U32(m_parameter_block.out_buf, m_parameter_block_addr + 0);
+  memory.Write_U32(m_parameter_block.buf_start, m_parameter_block_addr + 4);
+  memory.Write_U32(m_parameter_block.buf_end, m_parameter_block_addr + 8);
+  memory.Write_U32(m_parameter_block.buf_curr, m_parameter_block_addr + 12);
+  memory.Write_U16(m_parameter_block.yn1, m_parameter_block_addr + 16);
+  memory.Write_U16(m_parameter_block.yn2, m_parameter_block_addr + 18);
+  memory.Write_U16(m_parameter_block.pds, m_parameter_block_addr + 20);
+  memory.Write_U32(m_parameter_block.freq, m_parameter_block_addr + 22);
+  memory.Write_U16(m_parameter_block.counter, m_parameter_block_addr + 26);
+  memory.Write_U16(m_parameter_block.left, m_parameter_block_addr + 28);
+  memory.Write_U16(m_parameter_block.right, m_parameter_block_addr + 30);
+  memory.Write_U16(m_parameter_block.volume_l, m_parameter_block_addr + 32);
+  memory.Write_U16(m_parameter_block.volume_r, m_parameter_block_addr + 34);
+  memory.Write_U32(m_parameter_block.delay, m_parameter_block_addr + 36);
+  memory.Write_U32(m_parameter_block.flags, m_parameter_block_addr + 40);
 }
 
 AESndAccelerator::AESndAccelerator(DSPManager& dsp) : m_dsp(dsp)
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/ASnd.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/ASnd.cpp
index c0fe5a3a496a..8f4edda1a648 100644
--- a/Source/Core/Core/HW/DSPHLE/UCodes/ASnd.cpp
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/ASnd.cpp
@@ -15,6 +15,7 @@
 #include "Core/HW/DSPHLE/DSPHLE.h"
 #include "Core/HW/DSPHLE/MailHandler.h"
 #include "Core/HW/DSPHLE/UCodes/UCodes.h"
+#include "Core/HW/Memmap.h"
 #include "Core/System.h"
 
 namespace DSP::HLE
@@ -31,7 +32,7 @@ constexpr u32 MAIL_INPUT_NEXT_SAMPLES = 0x0222;
 // "send the samples for the internal buffer to the external buffer"
 constexpr u32 MAIN_SEND_SAMPLES = 0x0666;
 // "special: to dump the IROM Datas (remember disable others functions from the interrupt vector to
-// use) (CMBH+0x8000) countain the address of IROM" (not used)
+// use) (CMBH+0x8000) contains the address of IROM" (not used)
 constexpr u32 MAIL_ROM_DUMP_WORD = 0x0777;
 // "Used for test" (not used)
 constexpr u32 MAIL_TEST = 0x0888;
@@ -136,10 +137,8 @@ void ASndUCode::HandleMail(u32 mail)
       DMAInVoiceData();  // first do_dma call
       // second do_dma call
       auto& memory = m_dsphle->GetSystem().GetMemory();
-      for (u32 i = 0; i < NUM_OUTPUT_SAMPLES * 2; i++)
-      {
-        m_output_buffer[i] = HLEMemory_Read_U16(memory, m_current_voice.out_buf + i * sizeof(u16));
-      }
+      memory.CopyFromEmuSwapped(m_output_buffer.data(), m_current_voice.out_buf,
+                                sizeof(m_output_buffer));
       DoMixing(DSP_SYNC);
       // Mail is handled by DoMixing()
       break;
@@ -161,10 +160,8 @@ void ASndUCode::HandleMail(u32 mail)
     {
       DEBUG_LOG_FMT(DSPHLE, "ASndUCode - MAIN_SEND_SAMPLES: {:08x}", mail);
       auto& memory = m_dsphle->GetSystem().GetMemory();
-      for (u32 i = 0; i < NUM_OUTPUT_SAMPLES * 2; i++)
-      {
-        HLEMemory_Write_U16(memory, m_current_voice.out_buf + i * sizeof(u16), m_output_buffer[i]);
-      }
+      memory.CopyToEmuSwapped(m_current_voice.out_buf, m_output_buffer.data(),
+                              sizeof(m_output_buffer));
       m_mail_handler.PushMail(DSP_SYNC, true);
       break;
     }
@@ -205,52 +202,52 @@ void ASndUCode::HandleMail(u32 mail)
 void ASndUCode::DMAInVoiceData()
 {
   auto& memory = m_dsphle->GetSystem().GetMemory();
-  m_current_voice.out_buf = HLEMemory_Read_U32(memory, m_voice_addr);
-  m_current_voice.delay_samples = HLEMemory_Read_U32(memory, m_voice_addr + 4);
-  u32 new_flags = HLEMemory_Read_U32(memory, m_voice_addr + 8);
+  m_current_voice.out_buf = memory.Read_U32(m_voice_addr);
+  m_current_voice.delay_samples = memory.Read_U32(m_voice_addr + 4);
+  u32 new_flags = memory.Read_U32(m_voice_addr + 8);
   if (m_current_voice.flags != new_flags)
     DEBUG_LOG_FMT(DSPHLE, "ASndUCode - flags: {:08x}", new_flags);
   m_current_voice.flags = new_flags;
-  m_current_voice.start_addr = HLEMemory_Read_U32(memory, m_voice_addr + 12);
-  m_current_voice.end_addr = HLEMemory_Read_U32(memory, m_voice_addr + 16);
-  m_current_voice.freq = HLEMemory_Read_U32(memory, m_voice_addr + 20);
-  m_current_voice.left = HLEMemory_Read_U16(memory, m_voice_addr + 24);
-  m_current_voice.right = HLEMemory_Read_U16(memory, m_voice_addr + 26);
-  m_current_voice.counter = HLEMemory_Read_U32(memory, m_voice_addr + 28);
-  m_current_voice.volume_l = HLEMemory_Read_U16(memory, m_voice_addr + 32);
-  m_current_voice.volume_r = HLEMemory_Read_U16(memory, m_voice_addr + 34);
-  m_current_voice.start_addr2 = HLEMemory_Read_U32(memory, m_voice_addr + 36);
-  m_current_voice.end_addr2 = HLEMemory_Read_U32(memory, m_voice_addr + 40);
-  m_current_voice.volume2_l = HLEMemory_Read_U16(memory, m_voice_addr + 44);
-  m_current_voice.volume2_r = HLEMemory_Read_U16(memory, m_voice_addr + 46);
-  m_current_voice.backup_addr = HLEMemory_Read_U32(memory, m_voice_addr + 48);
-  m_current_voice.tick_counter = HLEMemory_Read_U32(memory, m_voice_addr + 52);
-  m_current_voice.cb = HLEMemory_Read_U32(memory, m_voice_addr + 56);
-  m_current_voice._pad = HLEMemory_Read_U32(memory, m_voice_addr + 60);
+  m_current_voice.start_addr = memory.Read_U32(m_voice_addr + 12);
+  m_current_voice.end_addr = memory.Read_U32(m_voice_addr + 16);
+  m_current_voice.freq = memory.Read_U32(m_voice_addr + 20);
+  m_current_voice.left = memory.Read_U16(m_voice_addr + 24);
+  m_current_voice.right = memory.Read_U16(m_voice_addr + 26);
+  m_current_voice.counter = memory.Read_U32(m_voice_addr + 28);
+  m_current_voice.volume_l = memory.Read_U16(m_voice_addr + 32);
+  m_current_voice.volume_r = memory.Read_U16(m_voice_addr + 34);
+  m_current_voice.start_addr2 = memory.Read_U32(m_voice_addr + 36);
+  m_current_voice.end_addr2 = memory.Read_U32(m_voice_addr + 40);
+  m_current_voice.volume2_l = memory.Read_U16(m_voice_addr + 44);
+  m_current_voice.volume2_r = memory.Read_U16(m_voice_addr + 46);
+  m_current_voice.backup_addr = memory.Read_U32(m_voice_addr + 48);
+  m_current_voice.tick_counter = memory.Read_U32(m_voice_addr + 52);
+  m_current_voice.cb = memory.Read_U32(m_voice_addr + 56);
+  m_current_voice._pad = memory.Read_U32(m_voice_addr + 60);
 }
 
 void ASndUCode::DMAOutVoiceData()
 {
   auto& memory = m_dsphle->GetSystem().GetMemory();
-  HLEMemory_Write_U32(memory, m_voice_addr, m_current_voice.out_buf);
-  HLEMemory_Write_U32(memory, m_voice_addr + 4, m_current_voice.delay_samples);
-  HLEMemory_Write_U32(memory, m_voice_addr + 8, m_current_voice.flags);
-  HLEMemory_Write_U32(memory, m_voice_addr + 12, m_current_voice.start_addr);
-  HLEMemory_Write_U32(memory, m_voice_addr + 16, m_current_voice.end_addr);
-  HLEMemory_Write_U32(memory, m_voice_addr + 20, m_current_voice.freq);
-  HLEMemory_Write_U16(memory, m_voice_addr + 24, m_current_voice.left);
-  HLEMemory_Write_U16(memory, m_voice_addr + 26, m_current_voice.right);
-  HLEMemory_Write_U32(memory, m_voice_addr + 28, m_current_voice.counter);
-  HLEMemory_Write_U16(memory, m_voice_addr + 32, m_current_voice.volume_l);
-  HLEMemory_Write_U16(memory, m_voice_addr + 34, m_current_voice.volume_r);
-  HLEMemory_Write_U32(memory, m_voice_addr + 36, m_current_voice.start_addr2);
-  HLEMemory_Write_U32(memory, m_voice_addr + 40, m_current_voice.end_addr2);
-  HLEMemory_Write_U16(memory, m_voice_addr + 44, m_current_voice.volume2_l);
-  HLEMemory_Write_U16(memory, m_voice_addr + 46, m_current_voice.volume2_r);
-  HLEMemory_Write_U32(memory, m_voice_addr + 48, m_current_voice.backup_addr);
-  HLEMemory_Write_U32(memory, m_voice_addr + 52, m_current_voice.tick_counter);
-  HLEMemory_Write_U32(memory, m_voice_addr + 56, m_current_voice.cb);
-  HLEMemory_Write_U32(memory, m_voice_addr + 60, m_current_voice._pad);
+  memory.Write_U32(m_current_voice.out_buf, m_voice_addr);
+  memory.Write_U32(m_current_voice.delay_samples, m_voice_addr + 4);
+  memory.Write_U32(m_current_voice.flags, m_voice_addr + 8);
+  memory.Write_U32(m_current_voice.start_addr, m_voice_addr + 12);
+  memory.Write_U32(m_current_voice.end_addr, m_voice_addr + 16);
+  memory.Write_U32(m_current_voice.freq, m_voice_addr + 20);
+  memory.Write_U16(m_current_voice.left, m_voice_addr + 24);
+  memory.Write_U16(m_current_voice.right, m_voice_addr + 26);
+  memory.Write_U32(m_current_voice.counter, m_voice_addr + 28);
+  memory.Write_U16(m_current_voice.volume_l, m_voice_addr + 32);
+  memory.Write_U16(m_current_voice.volume_r, m_voice_addr + 34);
+  memory.Write_U32(m_current_voice.start_addr2, m_voice_addr + 36);
+  memory.Write_U32(m_current_voice.end_addr2, m_voice_addr + 40);
+  memory.Write_U16(m_current_voice.volume2_l, m_voice_addr + 44);
+  memory.Write_U16(m_current_voice.volume2_r, m_voice_addr + 46);
+  memory.Write_U32(m_current_voice.backup_addr, m_voice_addr + 48);
+  memory.Write_U32(m_current_voice.tick_counter, m_voice_addr + 52);
+  memory.Write_U32(m_current_voice.cb, m_voice_addr + 56);
+  memory.Write_U32(m_current_voice._pad, m_voice_addr + 60);
 }
 
 void ASndUCode::DoMixing(u32 return_mail)
@@ -461,10 +458,7 @@ void ASndUCode::DMAInSampleData()
   // jump_load_smp_dma is used, the address is expected to already be aligned.
   const u32 addr = m_current_voice.start_addr & ~INPUT_SAMPLE_BUFFER_BYTE_MASK;
   auto& memory = m_dsphle->GetSystem().GetMemory();
-  for (u16 i = 0; i < INPUT_SAMPLE_BUFFER_SIZE_WORDS; i++)
-  {
-    m_input_sample_buffer[i] = HLEMemory_Read_U16(memory, addr + i * sizeof(u16));
-  }
+  memory.CopyFromEmuSwapped(m_input_sample_buffer.data(), addr, INPUT_SAMPLE_BUFFER_SIZE_BYTES);
 }
 
 void ASndUCode::DMAInSampleDataAssumeAligned()
@@ -474,10 +468,7 @@ void ASndUCode::DMAInSampleDataAssumeAligned()
   // (which is set to an address from sample_selector). We can just treat it as a function though.
   const u32 addr = m_current_voice.start_addr;
   auto& memory = m_dsphle->GetSystem().GetMemory();
-  for (u16 i = 0; i < INPUT_SAMPLE_BUFFER_SIZE_WORDS; i++)
-  {
-    m_input_sample_buffer[i] = HLEMemory_Read_U16(memory, addr + i * sizeof(u16));
-  }
+  memory.CopyFromEmuSwapped(m_input_sample_buffer.data(), addr, INPUT_SAMPLE_BUFFER_SIZE_BYTES);
 }
 
 std::pair<s16, s16> ASndUCode::ReadSampleMono8Bits() const
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/ASnd.h b/Source/Core/Core/HW/DSPHLE/UCodes/ASnd.h
index 159471d41677..ffac1f892554 100644
--- a/Source/Core/Core/HW/DSPHLE/UCodes/ASnd.h
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/ASnd.h
@@ -103,7 +103,7 @@ class ASndUCode final : public UCodeInterface
     u32 flags;
     // internal addr counter
     u32 start_addr;
-    // end voice physical pointer (bytes without alignament, but remember it reads in blocks of 32
+    // end voice physical pointer (bytes without alignment, but remember it reads in blocks of 32
     // bytes (use padding to the end))
     u32 end_addr;
     // freq operation
@@ -116,7 +116,7 @@ class ASndUCode final : public UCodeInterface
     u16 volume_l, volume_r;
     // initial voice2 physical pointer (bytes aligned 32 bytes) (to do a ring)
     u32 start_addr2;
-    // end voice2 physical pointer (bytes without alignament, but remember it reads in blocks of 32
+    // end voice2 physical pointer (bytes without alignment, but remember it reads in blocks of 32
     // bytes (use padding to the end))
     u32 end_addr2;
     // volume (from 0 to 256) for voice 2
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/AX.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/AX.cpp
index 6beeace5831f..7159a5be4b4c 100644
--- a/Source/Core/Core/HW/DSPHLE/UCodes/AX.cpp
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/AX.cpp
@@ -3,7 +3,6 @@
 
 #include "Core/HW/DSPHLE/UCodes/AX.h"
 
-#include <algorithm>
 #include <array>
 #include <cstring>
 #include <iterator>
@@ -21,6 +20,7 @@
 #include "Core/HW/DSPHLE/DSPHLE.h"
 #include "Core/HW/DSPHLE/MailHandler.h"
 #include "Core/HW/DSPHLE/UCodes/AXStructs.h"
+#include "Core/HW/Memmap.h"
 
 #define AX_GC
 #include "Core/HW/DSPHLE/UCodes/AXVoice.h"
@@ -390,7 +390,7 @@ void AXUCode::DownloadAndMixWithVolume(u32 addr, u16 vol_main, u16 vol_auxa, u16
   auto& memory = m_dsphle->GetSystem().GetMemory();
   for (u32 i = 0; i < 3; ++i)
   {
-    int* ptr = (int*)HLEMemory_Get_Pointer(memory, addr);
+    int* ptr = reinterpret_cast<int*>(memory.GetPointerForRange(addr, 3 * 5 * 32 * sizeof(int)));
     u16 volume = volumes[i];
     for (u32 j = 0; j < 3; ++j)
     {
@@ -515,15 +515,19 @@ void AXUCode::MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr)
   auto& memory = m_dsphle->GetSystem().GetMemory();
   if (write_addr)
   {
-    int* ptr = (int*)HLEMemory_Get_Pointer(memory, write_addr);
     for (auto& buffer : buffers)
-      for (u32 j = 0; j < 5 * 32; ++j)
-        *ptr++ = Common::swap32(buffer[j]);
+    {
+      memory.CopyToEmuSwapped(write_addr, buffer, 5 * 32 * sizeof(int));
+      write_addr += 5 * 32 * sizeof(int);
+    }
   }
 
   // Then, we read the new temp from the CPU and add to our current
   // temp.
-  int* ptr = (int*)HLEMemory_Get_Pointer(memory, read_addr);
+  int* ptr = reinterpret_cast<int*>(memory.GetPointerForRange(
+      read_addr, sizeof(m_samples_main_left) + sizeof(m_samples_main_right) +
+                     sizeof(m_samples_main_surround)));
+
   for (auto& sample : m_samples_main_left)
     sample += (int)Common::swap32(*ptr++);
   for (auto& sample : m_samples_main_right)
@@ -534,21 +538,19 @@ void AXUCode::MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr)
 
 void AXUCode::UploadLRS(u32 dst_addr)
 {
-  int buffers[3][5 * 32];
+  auto& memory = m_dsphle->GetSystem().GetMemory();
 
-  for (u32 i = 0; i < 5 * 32; ++i)
+  for (const auto& samples : {m_samples_main_left, m_samples_main_right, m_samples_main_surround})
   {
-    buffers[0][i] = Common::swap32(m_samples_main_left[i]);
-    buffers[1][i] = Common::swap32(m_samples_main_right[i]);
-    buffers[2][i] = Common::swap32(m_samples_main_surround[i]);
+    memory.CopyToEmuSwapped(dst_addr, samples, 5 * 32 * sizeof(int));
+    dst_addr += 5 * 32 * sizeof(int);
   }
-  memcpy(HLEMemory_Get_Pointer(m_dsphle->GetSystem().GetMemory(), dst_addr), buffers,
-         sizeof(buffers));
 }
 
 void AXUCode::SetMainLR(u32 src_addr)
 {
-  int* ptr = (int*)HLEMemory_Get_Pointer(m_dsphle->GetSystem().GetMemory(), src_addr);
+  auto& memory = m_dsphle->GetSystem().GetMemory();
+  int* ptr = reinterpret_cast<int*>(memory.GetPointerForRange(src_addr, 5 * 32 * sizeof(int)));
   for (u32 i = 0; i < 5 * 32; ++i)
   {
     int samp = (int)Common::swap32(*ptr++);
@@ -596,7 +598,8 @@ void AXUCode::RunCompressor(u16 threshold, u16 release_frames, u32 table_addr, u
 
   // apply the selected ramp
   auto& memory = m_dsphle->GetSystem().GetMemory();
-  u16* ramp = (u16*)HLEMemory_Get_Pointer(memory, table_addr + table_offset);
+  u16* ramp = reinterpret_cast<u16*>(
+      memory.GetPointerForRange(table_addr + table_offset, 32 * millis * sizeof(u16)));
   for (u32 i = 0; i < 32 * millis; ++i)
   {
     u16 coef = Common::swap16(*ramp++);
@@ -607,12 +610,8 @@ void AXUCode::RunCompressor(u16 threshold, u16 release_frames, u32 table_addr, u
 
 void AXUCode::OutputSamples(u32 lr_addr, u32 surround_addr)
 {
-  int surround_buffer[5 * 32];
-
-  for (u32 i = 0; i < 5 * 32; ++i)
-    surround_buffer[i] = Common::swap32(m_samples_main_surround[i]);
   auto& memory = m_dsphle->GetSystem().GetMemory();
-  memcpy(HLEMemory_Get_Pointer(memory, surround_addr), surround_buffer, sizeof(surround_buffer));
+  memory.CopyToEmuSwapped(surround_addr, m_samples_main_surround, 5 * 32 * sizeof(int));
 
   // 32 samples per ms, 5 ms, 2 channels
   short buffer[5 * 32 * 2];
@@ -627,21 +626,19 @@ void AXUCode::OutputSamples(u32 lr_addr, u32 surround_addr)
     buffer[2 * i + 1] = Common::swap16(left);
   }
 
-  memcpy(HLEMemory_Get_Pointer(memory, lr_addr), buffer, sizeof(buffer));
+  memory.CopyToEmu(lr_addr, buffer, sizeof(buffer));
 }
 
 void AXUCode::MixAUXBLR(u32 ul_addr, u32 dl_addr)
 {
   // Upload AUXB L/R
   auto& memory = m_dsphle->GetSystem().GetMemory();
-  int* ptr = (int*)HLEMemory_Get_Pointer(memory, ul_addr);
-  for (auto& sample : m_samples_auxB_left)
-    *ptr++ = Common::swap32(sample);
-  for (auto& sample : m_samples_auxB_right)
-    *ptr++ = Common::swap32(sample);
+  memory.CopyToEmuSwapped(ul_addr, m_samples_auxB_left, sizeof(m_samples_auxB_left));
+  memory.CopyToEmuSwapped(ul_addr + sizeof(m_samples_auxB_left), m_samples_auxB_right,
+                          sizeof(m_samples_auxB_right));
 
   // Mix AUXB L/R to MAIN L/R, and replace AUXB L/R
-  ptr = (int*)HLEMemory_Get_Pointer(memory, dl_addr);
+  int* ptr = reinterpret_cast<int*>(memory.GetPointerForRange(dl_addr, 2 * 5 * 32 * sizeof(int)));
   for (u32 i = 0; i < 5 * 32; ++i)
   {
     int samp = Common::swap32(*ptr++);
@@ -659,7 +656,7 @@ void AXUCode::MixAUXBLR(u32 ul_addr, u32 dl_addr)
 void AXUCode::SetOppositeLR(u32 src_addr)
 {
   auto& memory = m_dsphle->GetSystem().GetMemory();
-  int* ptr = (int*)HLEMemory_Get_Pointer(memory, src_addr);
+  int* ptr = reinterpret_cast<int*>(memory.GetPointerForRange(src_addr, 5 * 32 * sizeof(int)));
   for (u32 i = 0; i < 5 * 32; ++i)
   {
     int inp = Common::swap32(*ptr++);
@@ -672,26 +669,16 @@ void AXUCode::SetOppositeLR(u32 src_addr)
 void AXUCode::SendAUXAndMix(u32 auxa_lrs_up, u32 auxb_s_up, u32 main_l_dl, u32 main_r_dl,
                             u32 auxb_l_dl, u32 auxb_r_dl)
 {
-  // Buffers to upload first
-  const std::array<const int*, 3> up_buffers{
-      m_samples_auxA_left,
-      m_samples_auxA_right,
-      m_samples_auxA_surround,
-  };
-
   // Upload AUXA LRS
   auto& memory = m_dsphle->GetSystem().GetMemory();
-  int* ptr = (int*)HLEMemory_Get_Pointer(memory, auxa_lrs_up);
-  for (const auto& up_buffer : up_buffers)
-  {
-    for (u32 j = 0; j < 32 * 5; ++j)
-      *ptr++ = Common::swap32(up_buffer[j]);
-  }
+  memory.CopyToEmuSwapped(auxa_lrs_up, m_samples_auxA_left, 32 * 5 * sizeof(int));
+  memory.CopyToEmuSwapped(auxa_lrs_up + 32 * 5 * sizeof(int), m_samples_auxA_right,
+                          32 * 5 * sizeof(int));
+  memory.CopyToEmuSwapped(auxa_lrs_up + 2 * 32 * 5 * sizeof(int), m_samples_auxA_surround,
+                          32 * 5 * sizeof(int));
 
   // Upload AUXB S
-  ptr = (int*)HLEMemory_Get_Pointer(memory, auxb_s_up);
-  for (auto& sample : m_samples_auxB_surround)
-    *ptr++ = Common::swap32(sample);
+  memory.CopyToEmuSwapped(auxb_s_up, m_samples_auxB_surround, sizeof(m_samples_auxB_surround));
 
   // Download buffers and addresses
   const std::array<int*, 4> dl_buffers{
@@ -710,7 +697,8 @@ void AXUCode::SendAUXAndMix(u32 auxa_lrs_up, u32 auxb_s_up, u32 main_l_dl, u32 m
   // Download and mix
   for (size_t i = 0; i < dl_buffers.size(); ++i)
   {
-    const int* dl_src = (int*)HLEMemory_Get_Pointer(memory, dl_addrs[i]);
+    const int* dl_src =
+        reinterpret_cast<int*>(memory.GetPointerForRange(dl_addrs[i], 32 * 5 * sizeof(int)));
     for (size_t j = 0; j < 32 * 5; ++j)
       dl_buffers[i][j] += (int)Common::swap32(*dl_src++);
   }
@@ -799,8 +787,7 @@ void AXUCode::CopyCmdList(u32 addr, u16 size)
   }
 
   auto& memory = m_dsphle->GetSystem().GetMemory();
-  for (u32 i = 0; i < size; ++i, addr += 2)
-    m_cmdlist[i] = HLEMemory_Read_U16(memory, addr);
+  memory.CopyFromEmuSwapped(m_cmdlist, addr, size * sizeof(u16));
 }
 
 void AXUCode::Update()
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/AXWii.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/AXWii.cpp
index 04dee941ca01..e8b54966a762 100644
--- a/Source/Core/Core/HW/DSPHLE/UCodes/AXWii.cpp
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/AXWii.cpp
@@ -5,7 +5,6 @@
 
 #include "Core/HW/DSPHLE/UCodes/AXWii.h"
 
-#include <algorithm>
 #include <array>
 
 #include "Common/ChunkFile.h"
@@ -17,6 +16,7 @@
 #include "Core/HW/DSPHLE/UCodes/AXStructs.h"
 #include "Core/HW/DSPHLE/UCodes/AXVoice.h"
 #include "Core/HW/DSPHLE/UCodes/UCodes.h"
+#include "Core/HW/Memmap.h"
 
 namespace DSP::HLE
 {
@@ -274,7 +274,7 @@ void AXWiiUCode::SetupProcessing(u32 init_addr)
 void AXWiiUCode::AddToLR(u32 val_addr, bool neg)
 {
   auto& memory = m_dsphle->GetSystem().GetMemory();
-  int* ptr = (int*)HLEMemory_Get_Pointer(memory, val_addr);
+  int* ptr = reinterpret_cast<int*>(memory.GetPointerForRange(val_addr, 32 * 3 * sizeof(int)));
   for (int i = 0; i < 32 * 3; ++i)
   {
     int val = (int)Common::swap32(*ptr++);
@@ -289,7 +289,7 @@ void AXWiiUCode::AddToLR(u32 val_addr, bool neg)
 void AXWiiUCode::AddSubToLR(u32 val_addr)
 {
   auto& memory = m_dsphle->GetSystem().GetMemory();
-  int* ptr = (int*)HLEMemory_Get_Pointer(memory, val_addr);
+  int* ptr = reinterpret_cast<int*>(memory.GetPointerForRange(val_addr, 2 * 32 * 3 * sizeof(int)));
   for (int i = 0; i < 32 * 3; ++i)
   {
     int val = (int)Common::swap32(*ptr++);
@@ -526,16 +526,16 @@ void AXWiiUCode::MixAUXSamples(int aux_id, u32 write_addr, u32 read_addr, u16 vo
   auto& memory = m_dsphle->GetSystem().GetMemory();
   if (write_addr)
   {
-    int* ptr = (int*)HLEMemory_Get_Pointer(memory, write_addr);
     for (const auto& buffer : buffers)
     {
-      for (u32 j = 0; j < 3 * 32; ++j)
-        *ptr++ = Common::swap32(buffer[j]);
+      memory.CopyToEmuSwapped(write_addr, buffer, 3 * 32 * sizeof(int));
+      write_addr += 3 * 32 * sizeof(int);
     }
   }
 
   // Then read the buffers from the CPU and add to our main buffers.
-  const int* ptr = (int*)HLEMemory_Get_Pointer(memory, read_addr);
+  const int* ptr = reinterpret_cast<int*>(
+      memory.GetPointerForRange(read_addr, main_buffers.size() * 3 * 32 * sizeof(int)));
   for (auto& main_buffer : main_buffers)
   {
     for (u32 j = 0; j < 3 * 32; ++j)
@@ -555,17 +555,11 @@ void AXWiiUCode::UploadAUXMixLRSC(int aux_id, u32* addresses, u16 volume)
   int* auxc_buffer = aux_id ? m_samples_auxC_surround : m_samples_auxC_right;
 
   auto& memory = m_dsphle->GetSystem().GetMemory();
-  int* upload_ptr = (int*)HLEMemory_Get_Pointer(memory, addresses[0]);
-  for (u32 i = 0; i < 96; ++i)
-    *upload_ptr++ = Common::swap32(aux_left[i]);
-  for (u32 i = 0; i < 96; ++i)
-    *upload_ptr++ = Common::swap32(aux_right[i]);
-  for (u32 i = 0; i < 96; ++i)
-    *upload_ptr++ = Common::swap32(aux_surround[i]);
-
-  upload_ptr = (int*)HLEMemory_Get_Pointer(memory, addresses[1]);
-  for (u32 i = 0; i < 96; ++i)
-    *upload_ptr++ = Common::swap32(auxc_buffer[i]);
+  memory.CopyToEmuSwapped(addresses[0], aux_left, 96 * sizeof(int));
+  memory.CopyToEmuSwapped(addresses[0] + 96 * sizeof(int), aux_right, 96 * sizeof(int));
+  memory.CopyToEmuSwapped(addresses[0] + 2 * 96 * sizeof(int), aux_surround, 96 * sizeof(int));
+
+  memory.CopyToEmuSwapped(addresses[1], auxc_buffer, 96 * sizeof(int));
 
   u16 volume_ramp[96];
   GenerateVolumeRamp(volume_ramp, m_last_aux_volumes[aux_id], volume, 96);
@@ -575,9 +569,7 @@ void AXWiiUCode::UploadAUXMixLRSC(int aux_id, u32* addresses, u16 volume)
                       m_samples_auxC_left};
   for (u32 mix_i = 0; mix_i < 4; ++mix_i)
   {
-    int* dl_ptr = (int*)HLEMemory_Get_Pointer(memory, addresses[2 + mix_i]);
-    for (u32 i = 0; i < 96; ++i)
-      aux_left[i] = Common::swap32(dl_ptr[i]);
+    memory.CopyFromEmuSwapped(aux_left, addresses[2 + mix_i], 96 * sizeof(int));
 
     for (u32 i = 0; i < 96; ++i)
     {
@@ -594,20 +586,13 @@ void AXWiiUCode::OutputSamples(u32 lr_addr, u32 surround_addr, u16 volume, bool
   GenerateVolumeRamp(volume_ramp.data(), m_last_main_volume, volume, volume_ramp.size());
   m_last_main_volume = volume;
 
-  std::array<int, 3 * 32> upload_buffer{};
-
-  for (size_t i = 0; i < upload_buffer.size(); ++i)
-    upload_buffer[i] = Common::swap32(m_samples_main_surround[i]);
   auto& memory = m_dsphle->GetSystem().GetMemory();
-  memcpy(HLEMemory_Get_Pointer(memory, surround_addr), upload_buffer.data(), sizeof(upload_buffer));
+  memory.CopyToEmuSwapped(surround_addr, m_samples_main_surround, 3 * 32 * sizeof(int));
 
   if (upload_auxc)
   {
-    surround_addr += sizeof(upload_buffer);
-    for (size_t i = 0; i < upload_buffer.size(); ++i)
-      upload_buffer[i] = Common::swap32(m_samples_auxC_left[i]);
-    memcpy(HLEMemory_Get_Pointer(memory, surround_addr), upload_buffer.data(),
-           sizeof(upload_buffer));
+    memory.CopyToEmuSwapped(surround_addr + 3 * 32 * sizeof(int), m_samples_auxC_left,
+                            3 * 32 * sizeof(int));
   }
 
   // Clamp internal buffers to 16 bits.
@@ -632,7 +617,7 @@ void AXWiiUCode::OutputSamples(u32 lr_addr, u32 surround_addr, u16 volume, bool
     buffer[2 * i + 1] = Common::swap16(m_samples_main_left[i]);
   }
 
-  memcpy(HLEMemory_Get_Pointer(memory, lr_addr), buffer.data(), sizeof(buffer));
+  memory.CopyToEmu(lr_addr, buffer.data(), sizeof(buffer));
   m_mail_handler.PushMail(DSP_SYNC, true);
 }
 
@@ -644,7 +629,7 @@ void AXWiiUCode::OutputWMSamples(u32* addresses)
   for (u32 i = 0; i < 4; ++i)
   {
     int* in = buffers[i];
-    u16* out = (u16*)HLEMemory_Get_Pointer(memory, addresses[i]);
+    u16* out = reinterpret_cast<u16*>(memory.GetPointerForRange(addresses[i], 3 * 6 * sizeof(s16)));
     for (u32 j = 0; j < 3 * 6; ++j)
     {
       s16 sample = ClampS16(in[j]);
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/GBA.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/GBA.cpp
index 552f8ca84346..859fe2e854ff 100644
--- a/Source/Core/Core/HW/DSPHLE/UCodes/GBA.cpp
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/GBA.cpp
@@ -11,6 +11,7 @@
 #include "Core/HW/DSPHLE/DSPHLE.h"
 #include "Core/HW/DSPHLE/MailHandler.h"
 #include "Core/HW/DSPHLE/UCodes/UCodes.h"
+#include "Core/HW/Memmap.h"
 #include "Core/System.h"
 
 namespace DSP::HLE
@@ -18,23 +19,23 @@ namespace DSP::HLE
 void ProcessGBACrypto(Memory::MemoryManager& memory, u32 address)
 {
   // Nonce challenge (first read from GBA, hence already little-endian)
-  const u32 challenge = HLEMemory_Read_U32LE(memory, address);
+  const u32 challenge = memory.Read_U32_Swap(address);
 
   // Palette of pulsing logo on GBA during transmission [0,6]
-  const u32 logo_palette = HLEMemory_Read_U32(memory, address + 4);
+  const u32 logo_palette = memory.Read_U32(address + 4);
 
   // Speed and direction of palette interpolation [-4,4]
-  const u32 logo_speed_32 = HLEMemory_Read_U32(memory, address + 8);
+  const u32 logo_speed_32 = memory.Read_U32(address + 8);
 
   // Length of JoyBoot program to upload
-  const u32 length = HLEMemory_Read_U32(memory, address + 12);
+  const u32 length = memory.Read_U32(address + 12);
 
   // Address to return results to game
-  const u32 dest_addr = HLEMemory_Read_U32(memory, address + 16);
+  const u32 dest_addr = memory.Read_U32(address + 16);
 
   // Unwrap key from challenge using 'sedo' magic number (to encrypt JoyBoot program)
   const u32 key = challenge ^ 0x6f646573;
-  HLEMemory_Write_U32(memory, dest_addr, key);
+  memory.Write_U32(key, dest_addr);
 
   // Pack palette parameters
   u16 palette_speed_coded;
@@ -62,7 +63,7 @@ void ProcessGBACrypto(Memory::MemoryManager& memory, u32 address)
 
   // Wrap with 'Kawa' or 'sedo' (Kawasedo is the author of the BIOS cipher)
   t3 ^= ((t3 & 0x200) != 0 ? 0x6f646573 : 0x6177614b);
-  HLEMemory_Write_U32(memory, dest_addr + 4, t3);
+  memory.Write_U32(t3, dest_addr + 4);
 
   // Done!
   DEBUG_LOG_FMT(DSPHLE,
@@ -95,7 +96,7 @@ void GBAUCode::HandleMail(u32 mail)
   {
     PrepareBootUCode(mail);
     // The GBA ucode ignores the first 3 mails (mram_dest_addr, mram_size, mram_dram_addr)
-    // but we currently don't handle that (they're read when they shoudln't be, but DSP HLE doesn't
+    // but we currently don't handle that (they're read when they shouldn't be, but DSP HLE doesn't
     // implement them so it's fine).
     return;
   }
@@ -106,7 +107,7 @@ void GBAUCode::HandleMail(u32 mail)
   {
     if (mail == REQUEST_MAIL)
     {
-      INFO_LOG_FMT(DSPHLE, "GBAUCode - Recieved request mail");
+      INFO_LOG_FMT(DSPHLE, "GBAUCode - Received request mail");
       m_mail_state = MailState::WaitingForAddress;
     }
     else
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/ROM.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/ROM.cpp
index 4fc8c665c1ce..a2151f949bde 100644
--- a/Source/Core/Core/HW/DSPHLE/UCodes/ROM.cpp
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/ROM.cpp
@@ -3,8 +3,6 @@
 
 #include "Core/HW/DSPHLE/UCodes/ROM.h"
 
-#include <string>
-
 #ifdef _WIN32
 #include <windows.h>
 #endif
@@ -19,6 +17,7 @@
 #include "Core/HW/DSPHLE/DSPHLE.h"
 #include "Core/HW/DSPHLE/MailHandler.h"
 #include "Core/HW/DSPHLE/UCodes/UCodes.h"
+#include "Core/HW/Memmap.h"
 #include "Core/System.h"
 
 namespace DSP::HLE
@@ -96,15 +95,12 @@ void ROMUCode::HandleMail(u32 mail)
 void ROMUCode::BootUCode()
 {
   auto& memory = m_dsphle->GetSystem().GetMemory();
-  const u32 ector_crc = Common::HashEctor(
-      static_cast<u8*>(HLEMemory_Get_Pointer(memory, m_current_ucode.m_ram_address)),
-      m_current_ucode.m_length);
+  const u8* pointer =
+      memory.GetPointerForRange(m_current_ucode.m_ram_address, m_current_ucode.m_length);
+  const u32 ector_crc = Common::HashEctor(pointer, m_current_ucode.m_length);
 
   if (Config::Get(Config::MAIN_DUMP_UCODE))
-  {
-    DumpDSPCode(static_cast<u8*>(HLEMemory_Get_Pointer(memory, m_current_ucode.m_ram_address)),
-                m_current_ucode.m_length, ector_crc);
-  }
+    DumpDSPCode(pointer, m_current_ucode.m_length, ector_crc);
 
   INFO_LOG_FMT(DSPHLE, "CurrentUCode SOURCE Addr: {:#010x}", m_current_ucode.m_ram_address);
   INFO_LOG_FMT(DSPHLE, "CurrentUCode Length:      {:#010x}", m_current_ucode.m_length);
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp
index 13521c611753..5bc1e2b1d04c 100644
--- a/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.cpp
@@ -5,7 +5,6 @@
 
 #include <cstring>
 #include <memory>
-#include <string>
 
 #ifdef _WIN32
 #include <windows.h>
@@ -34,95 +33,6 @@
 
 namespace DSP::HLE
 {
-constexpr bool ExramRead(u32 address)
-{
-  return (address & 0x10000000) != 0;
-}
-
-u8 HLEMemory_Read_U8(Memory::MemoryManager& memory, u32 address)
-{
-  if (ExramRead(address))
-    return memory.GetEXRAM()[address & memory.GetExRamMask()];
-
-  return memory.GetRAM()[address & memory.GetRamMask()];
-}
-
-void HLEMemory_Write_U8(Memory::MemoryManager& memory, u32 address, u8 value)
-{
-  if (ExramRead(address))
-    memory.GetEXRAM()[address & memory.GetExRamMask()] = value;
-  else
-    memory.GetRAM()[address & memory.GetRamMask()] = value;
-}
-
-u16 HLEMemory_Read_U16LE(Memory::MemoryManager& memory, u32 address)
-{
-  u16 value;
-
-  if (ExramRead(address))
-    std::memcpy(&value, &memory.GetEXRAM()[address & memory.GetExRamMask()], sizeof(u16));
-  else
-    std::memcpy(&value, &memory.GetRAM()[address & memory.GetRamMask()], sizeof(u16));
-
-  return value;
-}
-
-u16 HLEMemory_Read_U16(Memory::MemoryManager& memory, u32 address)
-{
-  return Common::swap16(HLEMemory_Read_U16LE(memory, address));
-}
-
-void HLEMemory_Write_U16LE(Memory::MemoryManager& memory, u32 address, u16 value)
-{
-  if (ExramRead(address))
-    std::memcpy(&memory.GetEXRAM()[address & memory.GetExRamMask()], &value, sizeof(u16));
-  else
-    std::memcpy(&memory.GetRAM()[address & memory.GetRamMask()], &value, sizeof(u16));
-}
-
-void HLEMemory_Write_U16(Memory::MemoryManager& memory, u32 address, u16 value)
-{
-  HLEMemory_Write_U16LE(memory, address, Common::swap16(value));
-}
-
-u32 HLEMemory_Read_U32LE(Memory::MemoryManager& memory, u32 address)
-{
-  u32 value;
-
-  if (ExramRead(address))
-    std::memcpy(&value, &memory.GetEXRAM()[address & memory.GetExRamMask()], sizeof(u32));
-  else
-    std::memcpy(&value, &memory.GetRAM()[address & memory.GetRamMask()], sizeof(u32));
-
-  return value;
-}
-
-u32 HLEMemory_Read_U32(Memory::MemoryManager& memory, u32 address)
-{
-  return Common::swap32(HLEMemory_Read_U32LE(memory, address));
-}
-
-void HLEMemory_Write_U32LE(Memory::MemoryManager& memory, u32 address, u32 value)
-{
-  if (ExramRead(address))
-    std::memcpy(&memory.GetEXRAM()[address & memory.GetExRamMask()], &value, sizeof(u32));
-  else
-    std::memcpy(&memory.GetRAM()[address & memory.GetRamMask()], &value, sizeof(u32));
-}
-
-void HLEMemory_Write_U32(Memory::MemoryManager& memory, u32 address, u32 value)
-{
-  HLEMemory_Write_U32LE(memory, address, Common::swap32(value));
-}
-
-void* HLEMemory_Get_Pointer(Memory::MemoryManager& memory, u32 address)
-{
-  if (ExramRead(address))
-    return &memory.GetEXRAM()[address & memory.GetExRamMask()];
-
-  return &memory.GetRAM()[address & memory.GetRamMask()];
-}
-
 UCodeInterface::UCodeInterface(DSPHLE* dsphle, u32 crc)
     : m_mail_handler(dsphle->AccessMailHandler()), m_dsphle(dsphle), m_crc(crc)
 {
@@ -184,16 +94,12 @@ void UCodeInterface::PrepareBootUCode(u32 mail)
     m_upload_setup_in_progress = false;
 
     auto& memory = m_dsphle->GetSystem().GetMemory();
-    const u32 ector_crc = Common::HashEctor(
-        static_cast<u8*>(HLEMemory_Get_Pointer(memory, m_next_ucode.iram_mram_addr)),
-        m_next_ucode.iram_size);
+    const u8* pointer =
+        memory.GetPointerForRange(m_next_ucode.iram_mram_addr, m_next_ucode.iram_size);
+    const u32 ector_crc = Common::HashEctor(pointer, m_next_ucode.iram_size);
 
     if (Config::Get(Config::MAIN_DUMP_UCODE))
-    {
-      const u8* pointer =
-          memory.GetPointerForRange(m_next_ucode.iram_mram_addr, m_next_ucode.iram_size);
       DumpDSPCode(pointer, m_next_ucode.iram_size, ector_crc);
-    }
 
     DEBUG_LOG_FMT(DSPHLE, "PrepareBootUCode {:#010x}", ector_crc);
     DEBUG_LOG_FMT(DSPHLE, "DRAM -> MRAM: src {:04x} dst {:08x} size {:04x}",
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.h b/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.h
index 67841cf8115a..80d056ac6ec2 100644
--- a/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.h
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/UCodes.h
@@ -23,23 +23,6 @@ class DSPHLE;
 #define UCODE_INIT_AUDIO_SYSTEM 0x00000001
 #define UCODE_NULL 0xFFFFFFFF
 
-u8 HLEMemory_Read_U8(Memory::MemoryManager& memory, u32 address);
-void HLEMemory_Write_U8(Memory::MemoryManager& memory, u32 address, u8 value);
-
-u16 HLEMemory_Read_U16LE(Memory::MemoryManager& memory, u32 address);
-u16 HLEMemory_Read_U16(Memory::MemoryManager& memory, u32 address);
-
-void HLEMemory_Write_U16LE(Memory::MemoryManager& memory, u32 address, u16 value);
-void HLEMemory_Write_U16(Memory::MemoryManager& memory, u32 address, u16 value);
-
-u32 HLEMemory_Read_U32LE(Memory::MemoryManager& memory, u32 address);
-u32 HLEMemory_Read_U32(Memory::MemoryManager& memory, u32 address);
-
-void HLEMemory_Write_U32LE(Memory::MemoryManager& memory, u32 address, u32 value);
-void HLEMemory_Write_U32(Memory::MemoryManager& memory, u32 address, u32 value);
-
-void* HLEMemory_Get_Pointer(Memory::MemoryManager& memory, u32 address);
-
 class UCodeInterface
 {
 public:
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/Zelda.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/Zelda.cpp
index 70ea293cdd27..7334b5c01a70 100644
--- a/Source/Core/Core/HW/DSPHLE/UCodes/Zelda.cpp
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/Zelda.cpp
@@ -17,6 +17,7 @@
 #include "Core/HW/DSPHLE/MailHandler.h"
 #include "Core/HW/DSPHLE/UCodes/GBA.h"
 #include "Core/HW/DSPHLE/UCodes/UCodes.h"
+#include "Core/HW/Memmap.h"
 #include "Core/System.h"
 
 namespace DSP::HLE
@@ -470,32 +471,27 @@ void ZeldaUCode::RunPendingCommands()
       m_renderer.SetVPBBaseAddress(Read32());
 
       auto& memory = m_dsphle->GetSystem().GetMemory();
-      u16* data_ptr = (u16*)HLEMemory_Get_Pointer(memory, Read32());
+      u32 address = Read32();
 
-      std::array<s16, 0x100> resampling_coeffs;
-      for (size_t i = 0; i < 0x100; ++i)
-        resampling_coeffs[i] = Common::swap16(data_ptr[i]);
+      std::array<s16, 0x100> resampling_coeffs{};
+      memory.CopyFromEmuSwapped(resampling_coeffs.data(), address, sizeof(resampling_coeffs));
       m_renderer.SetResamplingCoeffs(std::move(resampling_coeffs));
 
-      std::array<s16, 0x100> const_patterns;
-      for (size_t i = 0; i < 0x100; ++i)
-        const_patterns[i] = Common::swap16(data_ptr[0x100 + i]);
+      std::array<s16, 0x100> const_patterns{};
+      memory.CopyFromEmuSwapped(const_patterns.data(), address + 0x200, sizeof(const_patterns));
       m_renderer.SetConstPatterns(std::move(const_patterns));
 
       // The sine table is only used for Dolby mixing
       // which the light protocol doesn't support.
       if ((m_flags & LIGHT_PROTOCOL) == 0)
       {
-        std::array<s16, 0x80> sine_table;
-        for (size_t i = 0; i < 0x80; ++i)
-          sine_table[i] = Common::swap16(data_ptr[0x200 + i]);
+        std::array<s16, 0x80> sine_table{};
+        memory.CopyFromEmuSwapped(sine_table.data(), address + 0x400, sizeof(sine_table));
         m_renderer.SetSineTable(std::move(sine_table));
       }
 
-      u16* afc_coeffs_ptr = (u16*)HLEMemory_Get_Pointer(memory, Read32());
-      std::array<s16, 0x20> afc_coeffs;
-      for (size_t i = 0; i < 0x20; ++i)
-        afc_coeffs[i] = Common::swap16(afc_coeffs_ptr[i]);
+      std::array<s16, 0x20> afc_coeffs{};
+      memory.CopyFromEmuSwapped(afc_coeffs.data(), Read32(), sizeof(afc_coeffs));
       m_renderer.SetAfcCoeffs(std::move(afc_coeffs));
 
       m_renderer.SetReverbPBBaseAddress(Read32());
@@ -1087,13 +1083,11 @@ void ZeldaAudioRenderer::ApplyReverb(bool post_rendering)
   };
 
   auto& memory = m_system.GetMemory();
-  u16* rpb_base_ptr = (u16*)HLEMemory_Get_Pointer(memory, m_reverb_pb_base_addr);
   for (u16 rpb_idx = 0; rpb_idx < 4; ++rpb_idx)
   {
     ReverbPB rpb;
-    u16* rpb_raw_ptr = reinterpret_cast<u16*>(&rpb);
-    for (size_t i = 0; i < sizeof(ReverbPB) / 2; ++i)
-      rpb_raw_ptr[i] = Common::swap16(rpb_base_ptr[rpb_idx * sizeof(ReverbPB) / 2 + i]);
+    u32 rpb_addr = m_reverb_pb_base_addr + rpb_idx * sizeof(ReverbPB);
+    memory.CopyFromEmuSwapped(reinterpret_cast<u16*>(&rpb), rpb_addr, sizeof(ReverbPB));
 
     if (!rpb.enabled)
       continue;
@@ -1101,7 +1095,6 @@ void ZeldaAudioRenderer::ApplyReverb(bool post_rendering)
     u16 mram_buffer_idx = m_reverb_pb_frames_count[rpb_idx];
 
     u32 mram_addr = rpb.GetCircularBufferBase() + mram_buffer_idx * 0x50 * sizeof(s16);
-    s16* mram_ptr = (s16*)HLEMemory_Get_Pointer(memory, mram_addr);
 
     if (!post_rendering)
     {
@@ -1111,8 +1104,7 @@ void ZeldaAudioRenderer::ApplyReverb(bool post_rendering)
       for (u16 i = 0; i < 8; ++i)
         buffer[i] = (*last8_samples_buffers[rpb_idx])[i];
 
-      for (u16 i = 0; i < 0x50; ++i)
-        buffer[8 + i] = Common::swap16(mram_ptr[i]);
+      memory.CopyFromEmuSwapped(&buffer[8], mram_addr, 0x50 * sizeof(s16));
 
       for (u16 i = 0; i < 8; ++i)
         (*last8_samples_buffers[rpb_idx])[i] = buffer[0x50 + i];
@@ -1161,8 +1153,7 @@ void ZeldaAudioRenderer::ApplyReverb(bool post_rendering)
       MixingBuffer* buffer = reverb_buffers[rpb_idx];
 
       // Upload the reverb data to RAM.
-      for (auto sample : *buffer)
-        *mram_ptr++ = Common::swap16(sample);
+      memory.CopyToEmuSwapped(mram_addr, buffer->data(), sizeof(*buffer));
 
       mram_buffer_idx = (mram_buffer_idx + 1) % rpb.circular_buffer_size;
       m_reverb_pb_frames_count[rpb_idx] = mram_buffer_idx;
@@ -1427,15 +1418,10 @@ void ZeldaAudioRenderer::FinalizeFrame()
   ApplyVolumeInPlace_4_12(&m_buf_front_right, m_output_volume);
 
   auto& memory = m_system.GetMemory();
-  u16* ram_left_buffer = (u16*)HLEMemory_Get_Pointer(memory, m_output_lbuf_addr);
-  u16* ram_right_buffer = (u16*)HLEMemory_Get_Pointer(memory, m_output_rbuf_addr);
-  for (size_t i = 0; i < m_buf_front_left.size(); ++i)
-  {
-    ram_left_buffer[i] = Common::swap16(m_buf_front_left[i]);
-    ram_right_buffer[i] = Common::swap16(m_buf_front_right[i]);
-  }
-  m_output_lbuf_addr += sizeof(u16) * (u32)m_buf_front_left.size();
-  m_output_rbuf_addr += sizeof(u16) * (u32)m_buf_front_right.size();
+  memory.CopyToEmuSwapped(m_output_lbuf_addr, m_buf_front_left.data(), sizeof(m_buf_front_left));
+  memory.CopyToEmuSwapped(m_output_rbuf_addr, m_buf_front_right.data(), sizeof(m_buf_front_right));
+  m_output_lbuf_addr += sizeof(m_buf_front_left);
+  m_output_rbuf_addr += sizeof(m_buf_front_right);
 
   // TODO: Some more Dolby mixing.
 
@@ -1448,16 +1434,14 @@ void ZeldaAudioRenderer::FetchVPB(u16 voice_id, VPB* vpb)
 {
   auto& memory = m_system.GetMemory();
   u16* vpb_words = (u16*)vpb;
-  u16* ram_vpbs = (u16*)HLEMemory_Get_Pointer(memory, m_vpb_base_addr);
 
   // A few versions of the UCode have VPB of size 0x80 (vs. the standard
   // 0xC0). The whole 0x40-0x80 part is gone. Handle that by moving things
   // around.
-  size_t vpb_size = (m_flags & TINY_VPB) ? 0x80 : 0xC0;
+  u32 vpb_size = ((m_flags & TINY_VPB) ? 0x80 : 0xC0) * sizeof(u16);
 
-  size_t base_idx = voice_id * vpb_size;
-  for (size_t i = 0; i < vpb_size; ++i)
-    vpb_words[i] = Common::swap16(ram_vpbs[base_idx + i]);
+  u32 base_idx = voice_id * vpb_size;
+  memory.CopyFromEmuSwapped(vpb_words, m_vpb_base_addr + base_idx, vpb_size);
 
   if (m_flags & TINY_VPB)
     vpb->Uncompress();
@@ -1467,17 +1451,15 @@ void ZeldaAudioRenderer::StoreVPB(u16 voice_id, VPB* vpb)
 {
   auto& memory = m_system.GetMemory();
   u16* vpb_words = (u16*)vpb;
-  u16* ram_vpbs = (u16*)HLEMemory_Get_Pointer(memory, m_vpb_base_addr);
 
-  size_t vpb_size = (m_flags & TINY_VPB) ? 0x80 : 0xC0;
-  size_t base_idx = voice_id * vpb_size;
+  u32 vpb_size = ((m_flags & TINY_VPB) ? 0x80 : 0xC0) * sizeof(u16);
+  u32 base_idx = voice_id * vpb_size;
 
   if (m_flags & TINY_VPB)
     vpb->Compress();
 
   // Only the first 0x80 words are transferred back - the rest is read-only.
-  for (size_t i = 0; i < vpb_size - 0x40; ++i)
-    ram_vpbs[base_idx + i] = Common::swap16(vpb_words[i]);
+  memory.CopyToEmuSwapped(m_vpb_base_addr + base_idx, vpb_words, vpb_size - 0x80);
 }
 
 void ZeldaAudioRenderer::LoadInputSamples(MixingBuffer* buffer, VPB* vpb)
@@ -1649,12 +1631,21 @@ void ZeldaAudioRenderer::Resample(VPB* vpb, const s16* src, MixingBuffer* dst)
   vpb->current_pos_frac = pos & 0xFFF;
 }
 
-void* ZeldaAudioRenderer::GetARAMPtr(u32 offset) const
+static u8* GetARAMPointerForRange(const Core::System& system, u32 aram_base_addr, u32 offset,
+                                  size_t size)
 {
-  if (m_system.IsWii())
-    return HLEMemory_Get_Pointer(m_system.GetMemory(), m_aram_base_addr + offset);
+  if (system.IsWii())
+  {
+    const auto& memory = system.GetMemory();
+    return memory.GetPointerForRange(aram_base_addr + offset, size);
+  }
   else
-    return reinterpret_cast<u8*>(m_system.GetDSP().GetARAMPtr()) + offset;
+  {
+    const auto& dsp = system.GetDSP();
+    if (offset >= dsp.GetARAMSize() || size > dsp.GetARAMSize() - offset)
+      return nullptr;
+    return system.GetDSP().GetARAMPtr() + offset;
+  }
 }
 
 template <typename T>
@@ -1691,8 +1682,9 @@ void ZeldaAudioRenderer::DownloadPCMSamplesFromARAM(s16* dst, VPB* vpb, u16 requ
       vpb->SetCurrentARAMAddr(vpb->GetBaseAddress() + vpb->GetCurrentPosition() * sizeof(T));
     }
 
-    T* src_ptr = (T*)GetARAMPtr(vpb->GetCurrentARAMAddr());
     u16 samples_to_download = std::min(vpb->GetRemainingLength(), (u32)requested_samples_count);
+    T* src_ptr = reinterpret_cast<T*>(GetARAMPointerForRange(
+        m_system, m_aram_base_addr, vpb->GetCurrentARAMAddr(), samples_to_download * sizeof(T)));
 
     for (u16 i = 0; i < samples_to_download; ++i)
       *dst++ = Common::FromBigEndian<T>(*src_ptr++) << (16 - 8 * sizeof(T));
@@ -1826,7 +1818,8 @@ void ZeldaAudioRenderer::DownloadAFCSamplesFromARAM(s16* dst, VPB* vpb, u16 requ
 void ZeldaAudioRenderer::DecodeAFC(VPB* vpb, s16* dst, size_t block_count)
 {
   u32 addr = vpb->GetCurrentARAMAddr();
-  u8* src = (u8*)GetARAMPtr(addr);
+  u8* src = (u8*)GetARAMPointerForRange(m_system, m_aram_base_addr, addr,
+                                        block_count * vpb->samples_source_type);
   vpb->SetCurrentARAMAddr(addr + (u32)block_count * vpb->samples_source_type);
 
   for (size_t b = 0; b < block_count; ++b)
@@ -1883,39 +1876,39 @@ void ZeldaAudioRenderer::DownloadRawSamplesFromMRAM(s16* dst, VPB* vpb, u16 requ
 {
   auto& memory = m_system.GetMemory();
   u32 addr = vpb->GetBaseAddress() + vpb->current_position_h * sizeof(u16);
-  s16* src_ptr = (s16*)HLEMemory_Get_Pointer(memory, addr);
 
-  if (requested_samples_count > vpb->GetRemainingLength())
+  u32 remaining_length = vpb->GetRemainingLength();
+  if (requested_samples_count > remaining_length)
   {
     s16 last_sample = 0;
-    for (u16 i = 0; i < vpb->GetRemainingLength(); ++i)
-      *dst++ = last_sample = Common::swap16(*src_ptr++);
-    for (u16 i = vpb->GetRemainingLength(); i < requested_samples_count; ++i)
+    if (remaining_length != 0)
+    {
+      memory.CopyFromEmuSwapped(dst, addr, remaining_length * sizeof(s16));
+      last_sample = dst[remaining_length - 1];
+    }
+    for (u16 i = remaining_length; i < requested_samples_count; ++i)
       *dst++ = last_sample;
 
-    vpb->current_position_h += vpb->GetRemainingLength();
+    vpb->current_position_h += remaining_length;
     vpb->SetRemainingLength(0);
     vpb->done = true;
   }
   else
   {
-    vpb->SetRemainingLength(vpb->GetRemainingLength() - requested_samples_count);
+    vpb->SetRemainingLength(remaining_length - requested_samples_count);
     vpb->samples_before_loop = vpb->loop_start_position_h - vpb->current_position_h;
     if (requested_samples_count <= vpb->samples_before_loop)
     {
-      for (u16 i = 0; i < requested_samples_count; ++i)
-        *dst++ = Common::swap16(*src_ptr++);
+      memory.CopyFromEmuSwapped(dst, addr, requested_samples_count * sizeof(s16));
       vpb->current_position_h += requested_samples_count;
     }
     else
     {
-      for (u16 i = 0; i < vpb->samples_before_loop; ++i)
-        *dst++ = Common::swap16(*src_ptr++);
+      memory.CopyFromEmuSwapped(dst, addr, vpb->samples_before_loop * sizeof(s16));
       vpb->SetBaseAddress(vpb->GetLoopAddress());
-      src_ptr = (s16*)HLEMemory_Get_Pointer(memory, vpb->GetLoopAddress());
-      for (u16 i = vpb->samples_before_loop; i < requested_samples_count; ++i)
-        *dst++ = Common::swap16(*src_ptr++);
       vpb->current_position_h = requested_samples_count - vpb->samples_before_loop;
+      memory.CopyFromEmuSwapped(dst + vpb->samples_before_loop, vpb->GetLoopAddress(),
+                                vpb->current_position_h * sizeof(s16));
     }
   }
 }
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/Zelda.h b/Source/Core/Core/HW/DSPHLE/UCodes/Zelda.h
index 4ebc775ebe64..ce712519d52f 100644
--- a/Source/Core/Core/HW/DSPHLE/UCodes/Zelda.h
+++ b/Source/Core/Core/HW/DSPHLE/UCodes/Zelda.h
@@ -168,7 +168,6 @@ class ZeldaAudioRenderer
 
   // On the Wii, base address of the MRAM or ExRAM region replacing ARAM.
   u32 m_aram_base_addr = 0;
-  void* GetARAMPtr(u32 offset) const;
 
   // Downloads PCM encoded samples from ARAM. Handles looping and other
   // parameters appropriately.
diff --git a/Source/Core/Core/HW/DSPLLE/DSPHost.cpp b/Source/Core/Core/HW/DSPLLE/DSPHost.cpp
index 75f321518f40..e3b71bb8569a 100644
--- a/Source/Core/Core/HW/DSPLLE/DSPHost.cpp
+++ b/Source/Core/Core/HW/DSPLLE/DSPHost.cpp
@@ -12,11 +12,9 @@
 #include "Core/DSP/DSPAnalyzer.h"
 #include "Core/DSP/DSPCodeUtil.h"
 #include "Core/DSP/DSPCore.h"
-#include "Core/DSP/Jit/x64/DSPEmitter.h"
 #include "Core/HW/DSP.h"
 #include "Core/HW/DSPLLE/DSPSymbols.h"
 #include "Core/HW/Memmap.h"
-#include "Core/Host.h"
 #include "Core/System.h"
 #include "VideoCommon/OnScreenDisplay.h"
 
diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp b/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp
index ca18e45999bf..7495d20fd895 100644
--- a/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp
+++ b/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp
@@ -13,10 +13,8 @@
 #include "Common/Event.h"
 #include "Common/FileUtil.h"
 #include "Common/Logging/Log.h"
-#include "Common/MemoryUtil.h"
 #include "Common/Thread.h"
 #include "Core/Config/MainSettings.h"
-#include "Core/ConfigManager.h"
 #include "Core/Core.h"
 #include "Core/DSP/DSPAccelerator.h"
 #include "Core/DSP/DSPCaptureLogger.h"
@@ -26,7 +24,6 @@
 #include "Core/DSP/Interpreter/DSPInterpreter.h"
 #include "Core/DSP/Jit/DSPEmitterBase.h"
 #include "Core/HW/Memmap.h"
-#include "Core/Host.h"
 
 namespace DSP::LLE
 {
diff --git a/Source/Core/Core/HW/DVD/AMMediaboard.cpp b/Source/Core/Core/HW/DVD/AMMediaboard.cpp
new file mode 100644
index 000000000000..5cd69f8a6253
--- /dev/null
+++ b/Source/Core/Core/HW/DVD/AMMediaboard.cpp
@@ -0,0 +1,2180 @@
+// Copyright 2025 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "Core/HW/DVD/AMMediaboard.h"
+
+#include <algorithm>
+#include <bit>
+#include <random>
+#include <string>
+#include <unordered_map>
+
+#include <fmt/format.h>
+
+#include "Common/BitUtils.h"
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/IOFile.h"
+#include "Common/Logging/Log.h"
+#include "Common/ScopeGuard.h"
+
+#include "Core/Config/MainSettings.h"
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/HLE/HLE.h"
+#include "Core/HW/EXI/EXI_DeviceBaseboard.h"
+#include "Core/HW/Memmap.h"
+#include "Core/IOS/Network/Socket.h"
+#include "Core/Movie.h"
+#include "Core/System.h"
+
+#include "DiscIO/CachedBlob.h"
+
+#if defined(__linux__) or defined(__APPLE__) or defined(__FreeBSD__) or defined(__NetBSD__) or     \
+    defined(__HAIKU__)
+
+#include <unistd.h>
+
+#include "Common/UnixUtil.h"
+
+static constexpr auto* closesocket = close;
+static auto ioctlsocket(auto... args)
+{
+  return ioctl(args...);
+}
+
+static constexpr int WSAEWOULDBLOCK = 10035;
+static constexpr int SOCKET_ERROR = -1;
+
+using SOCKET = int;
+using WSAPOLLFD = pollfd;
+
+static constexpr SOCKET INVALID_SOCKET = SOCKET(~0);
+
+static int WSAGetLastError()
+{
+  switch (errno)
+  {
+  case EINPROGRESS:
+  case EWOULDBLOCK:
+    return WSAEWOULDBLOCK;
+  default:
+    break;
+  }
+
+  return errno;
+}
+
+#endif
+
+namespace AMMediaboard
+{
+
+MediaBoardRange::MediaBoardRange(u32 start_, u32 size_, std::span<u8> buffer_)
+    : start{start_}, end{start_ + size_}, buffer{buffer_.data()}, buffer_size{buffer_.size()}
+{
+}
+
+using Common::SEND_FLAGS;
+
+enum class GuestSocket : s32
+{
+};
+static constexpr auto INVALID_GUEST_SOCKET = GuestSocket(-1);
+
+struct TimeVal
+{
+  // TODO: Verify this.
+  u64 seconds;
+  u32 microseconds;
+};
+
+struct GuestFdSet
+{
+  static constexpr std::size_t BIT_COUNT = 256;
+
+  std::array<u8, BIT_COUNT / CHAR_BIT> bits{};
+
+  constexpr bool IsFdSet(GuestSocket s) const
+  {
+    const auto index = std::size_t(s);
+    assert(index < BIT_COUNT);
+    return Common::ExtractBit(bits[index / CHAR_BIT], index % CHAR_BIT) != 0;
+  }
+
+  constexpr void SetFd(GuestSocket s, bool value = true)
+  {
+    const auto index = std::size_t(s);
+    assert(index < BIT_COUNT);
+    Common::SetBit(bits[index / CHAR_BIT], index % CHAR_BIT, value);
+  }
+};
+static_assert(sizeof(GuestFdSet) == 32);
+
+// This seems to be based on VxWorks sockaddr_in.
+struct GuestSocketAddress
+{
+  // Seemingly always zero or random values ? Game bug ?
+  // This is the struct size in VxWorks.
+  u8 unknown_value;
+
+  u8 ip_family;
+  u16 port;  // Network byte order.
+  Common::IPAddress ip_address;
+  std::array<u8, 8> padding;
+};
+static_assert(sizeof(GuestSocketAddress) == 16);
+
+static bool s_firmware_map = false;
+static bool s_test_menu = false;
+static std::array<u32, 3> s_timeouts = {20000, 20000, 20000};
+static u32 s_last_error = SSC_SUCCESS;
+
+static u32 s_gcam_key_a = 0;
+static u32 s_gcam_key_b = 0;
+static u32 s_gcam_key_c = 0;
+
+static File::IOFile s_netcfg;
+static File::IOFile s_netctrl;
+static File::IOFile s_extra;
+static File::IOFile s_backup;
+static File::IOFile s_dimm;
+
+static std::unique_ptr<DiscIO::BlobReader> s_dimm_disc;
+
+static std::array<u8, 0x200000> s_firmware;
+static std::array<u32, 0xc0> s_media_buffer_32;
+static u8* const s_media_buffer = reinterpret_cast<u8*>(s_media_buffer_32.data());
+static std::array<u8, 0x4ffe00> s_network_command_buffer;
+static std::array<u8, 0x80000> s_network_buffer;
+static std::array<u8, 0x1000> s_allnet_buffer;
+static std::array<u8, 0x8500> s_allnet_settings;
+
+static Common::IPAddress s_game_modified_ip_address;
+
+// Fake loading the game to have a chance to enter test mode
+static u32 s_board_status = LoadingGameProgram;
+static u32 s_load_progress = 80;
+
+static constexpr std::size_t MAX_IPV4_STRING_LENGTH = 15;
+
+constexpr char s_allnet_reply[] = {
+    "uri=http://"
+    "sega.com&host=sega.com&nickname=sega&name=sega&year=2025&month=08&day=16&hour=21&minute=10&"
+    "second=12&place_id=1234&setting=0x123&region0=jap&region_name0=japan&region_name1=usa&region_"
+    "name2=asia&region_name3=export&end"};
+
+static const MediaBoardRange s_mediaboard_ranges[] = {
+    {DIMMCommandVersion1, 0x40, Common::AsWritableU8Span(s_media_buffer_32)},
+    {DIMMCommandVersion2, 0x60, Common::AsWritableU8Span(s_media_buffer_32)},
+    {DIMMCommandVersion2_2, 0x220, Common::AsWritableU8Span(s_media_buffer_32)},
+    {NetworkCommandAddress1, 0x1040, s_network_command_buffer},
+    {NetworkCommandAddress2, 0x20000, s_network_command_buffer},
+    {NetworkBufferAddress1, 0x10000, s_network_buffer},
+    {NetworkBufferAddress2, 0x10000, s_network_buffer},
+    {NetworkBufferAddress3, 0x50000, s_network_buffer},
+    {NetworkBufferAddress4, 0xc0000, s_network_buffer},
+    {NetworkBufferAddress5, 0x10000, s_network_buffer},
+    {AllNetSettings, 0x8000, s_allnet_settings},
+    {AllNetBuffer, 0x1000, s_allnet_buffer},
+};
+
+static const std::unordered_map<u16, GameType> s_game_map = {
+    {0x4747, FZeroAX},
+    {0x4841, FZeroAXMonster},
+    {0x4B50, MarioKartGP},
+    {0x4B5A, MarioKartGP},
+    {0x4E4A, MarioKartGP2},
+    {0x4E4C, MarioKartGP2},
+    {0x454A, VirtuaStriker3},
+    {0x4559, VirtuaStriker3},
+    {0x4C4A, VirtuaStriker4_2006},
+    {0x4C4B, VirtuaStriker4_2006},
+    {0x4C4C, VirtuaStriker4_2006},
+    {0x484A, VirtuaStriker4},
+    {0x484E, VirtuaStriker4},
+    {0x485A, VirtuaStriker4},
+    {0x4A41, VirtuaStriker4},
+    {0x4A4A, VirtuaStriker4},
+    {0x4658, KeyOfAvalon},
+    {0x4A4E, KeyOfAvalon},
+    {0x4758, GekitouProYakyuu},
+    {0x5342, VirtuaStriker3},
+    {0x3132, VirtuaStriker3},
+    {0x454C, VirtuaStriker3},
+    {0x3030, FirmwareUpdate},
+};
+
+// Sockets FDs are required to go from 0 to 63.
+// Games use the FD as indexes so we have to workaround it.
+
+static std::array<SOCKET, SOCKET_FD_MAX> s_sockets;
+
+// TODO: Verify this.
+static constexpr u32 FIRST_VALID_FD = 1;
+
+static GuestSocket GetAvailableGuestSocket()
+{
+  for (u32 i = FIRST_VALID_FD; i < std::size(s_sockets); ++i)
+  {
+    if (s_sockets[i] == SOCKET_ERROR)
+      return GuestSocket(i);
+  }
+
+  // Out of sockets.
+  return INVALID_GUEST_SOCKET;
+}
+
+static SOCKET GetHostSocket(GuestSocket x)
+{
+  const auto index = u32(x);
+
+  if (index < std::size(s_sockets))
+    return s_sockets[index];
+
+  WARN_LOG_FMT(AMMEDIABOARD, "GC-AM: Bad GuestSocket value: {}", index);
+  return INVALID_SOCKET;
+}
+
+static GuestSocket GetGuestSocket(SOCKET x)
+{
+  const auto it = std::find(std::begin(s_sockets) + FIRST_VALID_FD, std::end(s_sockets), x);
+
+  if (it == std::end(s_sockets))
+  {
+    ERROR_LOG_FMT(AMMEDIABOARD, "GuestSocket not found. This should not happen.");
+    return INVALID_GUEST_SOCKET;
+  }
+
+  return GuestSocket(it - std::begin(s_sockets));
+}
+
+static bool NetworkCMDBufferCheck(u32 offset, u32 length)
+{
+  if (offset <= std::size(s_network_command_buffer) &&
+      length <= std::size(s_network_command_buffer) - offset)
+  {
+    return true;
+  }
+
+  ERROR_LOG_FMT(AMMEDIABOARD, "GC-AM: Invalid command buffer range: offset={}, length={}", offset,
+                length);
+  return false;
+}
+
+static constexpr u8* GetSafePtr(std::span<u8> buffer, u32 buffer_base, u32 offset, u32 length)
+{
+  if (offset >= buffer_base)
+  {
+    const u64 off = offset - buffer_base;
+    if ((off + length) <= buffer.size())
+      return std::data(buffer) + off;
+  }
+
+  if (offset != 0)
+  {
+    ERROR_LOG_FMT(AMMEDIABOARD,
+                  "GetSafePtr: buffer[0x{:08x}] base=0x{:08x} offset=0x{:08x} length=0x{:08x}",
+                  buffer.size(), buffer_base, offset, length);
+  }
+
+  return nullptr;
+}
+
+static constexpr std::string_view GetSafeString(std::span<u8> buffer, u32 buffer_base, u32 offset,
+                                                u32 max_length)
+{
+  auto* const ptr = GetSafePtr(buffer, buffer_base, offset, 0);
+
+  if (ptr == nullptr)
+    return {};
+
+  // Don't exceed max_length or end of buffer.
+  const auto adjusted_length =
+      std::min<std::size_t>(max_length, buffer.data() + buffer.size() - ptr);
+  const auto length = strnlen(reinterpret_cast<char*>(ptr), adjusted_length);
+
+  return {reinterpret_cast<char*>(ptr), length};
+}
+
+static bool NetworkBufferCheck(u32 offset, u32 length)
+{
+  if (offset <= std::size(s_network_buffer) && length <= std::size(s_network_buffer) - offset)
+  {
+    return true;
+  }
+
+  ERROR_LOG_FMT(AMMEDIABOARD, "GC-AM: Invalid network buffer range: offset={}, length={}", offset,
+                length);
+  return false;
+}
+
+static bool SafeCopyToEmu(Memory::MemoryManager& memory, u32 address, const u8* source,
+                          u64 source_size, u32 offset, u32 length)
+{
+  if (offset > source_size || length > source_size - offset)
+  {
+    ERROR_LOG_FMT(AMMEDIABOARD, "GC-AM: Read overflow: offset=0x{:08x}, length={}, source_size={}",
+                  offset, length, source_size);
+    return false;
+  }
+
+  auto span = memory.GetSpanForAddress(address);
+  if (length > span.size())
+  {
+    ERROR_LOG_FMT(AMMEDIABOARD,
+                  "GC-AM: Memory buffer too small: address=0x{:08x}, length={}, span={}", address,
+                  length, span.size());
+    return false;
+  }
+
+  memory.CopyToEmu(address, source + offset, length);
+  return true;
+}
+
+static bool SafeCopyFromEmu(Memory::MemoryManager& memory, u8* destination, u32 address,
+                            u64 destination_size, u32 offset, u32 length)
+{
+  if (offset > destination_size || length > destination_size - offset)
+  {
+    ERROR_LOG_FMT(AMMEDIABOARD,
+                  "GC-AM: Write overflow: offset=0x{:08x}, length={}, destination_size={}", offset,
+                  length, destination_size);
+    return false;
+  }
+
+  auto span = memory.GetSpanForAddress(address);
+  if (length > span.size())
+  {
+    ERROR_LOG_FMT(AMMEDIABOARD,
+                  "GC-AM: Memory buffer too small: address=0x{:08x}, length={}, span={}", address,
+                  length, span.size());
+    return false;
+  }
+
+  memory.CopyFromEmu(destination + offset, address, length);
+  return true;
+}
+
+static GuestSocket socket_(int af, int type, int protocol)
+{
+  const auto guest_socket = GetAvailableGuestSocket();
+  if (guest_socket == INVALID_GUEST_SOCKET)
+    return INVALID_GUEST_SOCKET;
+
+  const s32 host_fd = socket(af, type, protocol);
+  if (host_fd < 0)
+  {
+    ERROR_LOG_FMT(AMMEDIABOARD, "GC-AM: failed to create socket ({})", Common::StrNetworkError());
+    return INVALID_GUEST_SOCKET;
+  }
+
+  Common::SetPlatformSocketOptions(host_fd);
+
+  s_sockets[u32(guest_socket)] = host_fd;
+  return guest_socket;
+}
+
+static GuestSocket accept_(int fd, sockaddr* addr, socklen_t* len)
+{
+  const auto guest_socket = GetAvailableGuestSocket();
+  if (guest_socket == INVALID_GUEST_SOCKET)
+    return INVALID_GUEST_SOCKET;
+
+  const s32 host_fd = accept(fd, addr, len);
+  if (host_fd < 0)
+    return INVALID_GUEST_SOCKET;
+
+  Common::SetPlatformSocketOptions(host_fd);
+
+  s_sockets[u32(guest_socket)] = host_fd;
+  return guest_socket;
+}
+
+static inline void PrintMBBuffer(u32 address, u32 length)
+{
+  const auto& system = Core::System::GetInstance();
+  auto& memory = system.GetMemory();
+
+  for (u32 i = 0; i < length; i += 0x10)
+  {
+    DEBUG_LOG_FMT(AMMEDIABOARD, "GC-AM: {:08x} {:08x} {:08x} {:08x}", memory.Read_U32(address + i),
+                  memory.Read_U32(address + i + 4), memory.Read_U32(address + i + 8),
+                  memory.Read_U32(address + i + 12));
+  }
+}
+
+void FirmwareMap(bool on)
+{
+  s_firmware_map = on;
+}
+
+void InitKeys(u32 key_a, u32 key_b, u32 key_c)
+{
+  s_gcam_key_a = key_a;
+  s_gcam_key_b = key_b;
+  s_gcam_key_c = key_c;
+}
+
+static File::IOFile OpenOrCreateFile(const std::string& filename)
+{
+  // Try opening for read/write first
+  if (File::Exists(filename))
+    return File::IOFile(filename, "rb+");
+
+  // Create new file
+  return File::IOFile(filename, "wb+");
+}
+
+void Init()
+{
+  s_media_buffer_32.fill(0);
+  s_network_buffer.fill(0);
+  s_network_command_buffer.fill(0);
+  s_firmware.fill(-1);
+  s_sockets.fill(SOCKET_ERROR);
+  s_allnet_buffer.fill(0);
+  s_allnet_settings.fill(0);
+
+  s_game_modified_ip_address = {};
+
+  s_board_status = LoadingGameProgram;
+  s_load_progress = 80;
+
+  s_firmware_map = false;
+  s_test_menu = false;
+
+  s_last_error = SSC_SUCCESS;
+
+  s_gcam_key_a = 0;
+  s_gcam_key_b = 0;
+  s_gcam_key_c = 0;
+
+  const std::string base_path = File::GetUserPath(D_TRIUSER_IDX);
+
+  s_netcfg = OpenOrCreateFile(base_path + "trinetcfg.bin");
+  s_netctrl = OpenOrCreateFile(base_path + "trinetctrl.bin");
+  s_extra = OpenOrCreateFile(base_path + "triextra.bin");
+  s_dimm = OpenOrCreateFile(base_path + "tridimm_" + SConfig::GetInstance().GetGameID() + ".bin");
+  s_backup = OpenOrCreateFile(base_path + "backup_" + SConfig::GetInstance().GetGameID() + ".bin");
+
+  if (!s_netcfg.IsOpen())
+    PanicAlertFmt("Failed to open/create: {}", base_path + "trinetcfg.bin");
+  if (!s_netctrl.IsOpen())
+    PanicAlertFmt("Failed to open/create: {}", base_path + "trinetctrl.bin");
+  if (!s_extra.IsOpen())
+    PanicAlertFmt("Failed to open/create: {}", base_path + "triextra.bin");
+  if (!s_dimm.IsOpen())
+    PanicAlertFmt("Failed to open/create: {}", base_path + "tridimm.bin");
+  if (!s_backup.IsOpen())
+    PanicAlertFmt("Failed to open/create: {}", base_path + "backup.bin");
+
+  // This is the firmware for the Triforce
+  const std::string sega_boot_filename = base_path + "segaboot.gcm";
+
+  if (!File::Exists(sega_boot_filename))
+  {
+    PanicAlertFmt("Failed to open segaboot.gcm({}), which is required for test menus.",
+                  sega_boot_filename.c_str());
+    return;
+  }
+
+  File::IOFile sega_boot(sega_boot_filename, "rb+");
+  if (!sega_boot.IsOpen())
+  {
+    PanicAlertFmt("Failed to read: {}", sega_boot_filename);
+    return;
+  }
+
+  const u64 length = std::min<u64>(sega_boot.GetSize(), sizeof(s_firmware));
+  sega_boot.ReadBytes(s_firmware.data(), length);
+
+  s_test_menu = true;
+}
+
+void InitDIMM(const DiscIO::Volume& volume)
+{
+  // Load game into RAM, like on the actual Triforce.
+  s_dimm_disc = DiscIO::CreateCachedBlobReader(volume.GetBlobReader().CopyReader());
+}
+
+static int PlatformPoll(std::span<WSAPOLLFD> pfds, std::chrono::milliseconds timeout)
+{
+#if defined(_WIN32)
+  return WSAPoll(pfds.data(), ULONG(pfds.size()), INT(timeout.count()));
+#else
+  return UnixUtil::RetryOnEINTR(poll, pfds.data(), pfds.size(), timeout.count());
+#endif
+}
+
+std::optional<ParsedIPRedirection> ParseIPRedirection(std::string_view str)
+{
+  // Everything after a space is the description.
+  const auto ip_pair_str = std::string_view{str.begin(), std::ranges::find(str, ' ')};
+
+  const auto parts = SplitStringIntoArray<2>(ip_pair_str, '=');
+  if (!parts.has_value())
+    return std::nullopt;
+
+  const bool have_description = ip_pair_str.size() != str.size();
+
+  return ParsedIPRedirection{
+      .original = (*parts)[0],
+      .replacement = (*parts)[1],
+      .description = have_description ? str.substr(ip_pair_str.size() + 1) : std::string_view{},
+  };
+}
+
+// Caller should check if it matches first!
+Common::IPv4Port IPRedirection::Apply(Common::IPv4Port subject) const
+{
+  // This logic could probably be better.
+  // Ranges of different sizes will be weird in general.
+
+  const auto replacement_first_ip_u32 = replacement.first.GetIPAddressValue();
+  const auto ip_count = 1u + u64(replacement.last.GetIPAddressValue()) - replacement_first_ip_u32;
+  const auto result_ip =
+      u32(replacement_first_ip_u32 +
+          ((subject.GetIPAddressValue() - original.first.GetIPAddressValue()) % ip_count));
+
+  subject.ip_address = std::bit_cast<Common::IPAddress>(Common::BigEndianValue{result_ip});
+
+  const auto replacement_first_port_u16 = replacement.first.GetPortValue();
+  const auto port_count = 1u + u32(replacement.last.GetPortValue()) - replacement_first_port_u16;
+
+  // If the replacement includes all ports then we don't alter the port.
+  // This allows "10.0.0.1:80-88=10.0.0.2" to have the expected behavior.
+  if (port_count != 65536u)
+  {
+    const auto result_port_u16 =
+        u16(replacement_first_port_u16 +
+            ((subject.GetPortValue() - original.first.GetPortValue()) % port_count));
+    subject.port = std::bit_cast<u16>(Common::BigEndianValue{result_port_u16});
+  }
+
+  return subject;
+}
+
+Common::IPv4Port IPRedirection::Reverse(Common::IPv4Port subject) const
+{
+  // Low effort implementation..
+  return IPRedirection{.original = replacement, .replacement = original}.Apply(subject);
+}
+
+std::string IPRedirection::ToString() const
+{
+  return fmt::format("{}={}", original.ToString(), replacement.ToString());
+}
+
+IPRedirections GetIPRedirections()
+{
+  IPRedirections result;
+
+  const auto ip_redirections_str = Config::Get(Config::MAIN_TRIFORCE_IP_REDIRECTIONS);
+  for (auto&& ip_pair : ip_redirections_str | std::views::split(','))
+  {
+    const auto ip_pair_str = std::string_view{ip_pair};
+    const auto parts = ParseIPRedirection(ip_pair_str);
+    if (parts.has_value())
+    {
+      const auto original = Common::StringToIPv4PortRange(parts->original);
+      const auto replacement = Common::StringToIPv4PortRange(parts->replacement);
+
+      if (original.has_value() && replacement.has_value())
+      {
+        result.emplace_back(*original, *replacement);
+        continue;
+      }
+
+      ERROR_LOG_FMT(AMMEDIABOARD, "Bad IP redirection string: {}", ip_pair_str);
+    }
+  }
+
+  return result;
+}
+
+static std::optional<Common::IPv4Port> AdjustIPv4PortFromConfig(Common::IPv4Port subject)
+{
+  // TODO: We should parse this elsewhere to avoid repeated string manipulations.
+  for (auto&& redirection : GetIPRedirections())
+  {
+    if (redirection.original.IsMatch(subject))
+      return redirection.Apply(subject);
+  }
+
+  return std::nullopt;
+}
+
+static std::optional<Common::IPv4Port> ReverseAdjustIPv4PortFromConfig(Common::IPv4Port subject)
+{
+  // TODO: We should parse this elsewhere to avoid repeated string manipulations.
+  for (auto&& redirection : GetIPRedirections())
+  {
+    if (redirection.replacement.IsMatch(subject))
+      return redirection.Reverse(subject);
+  }
+
+  return std::nullopt;
+}
+
+// Ports are in host byte order.
+static bool BindEphemeralPort(SOCKET host_socket, Common::IPAddress ip_address,
+                              u16 first_port_value, u16 last_port_value, u32 attempt_count)
+{
+  std::mt19937 rng(u32(Clock::now().time_since_epoch().count()));
+  std::uniform_int_distribution<u16> port_distribution{first_port_value, last_port_value};
+
+  sockaddr_in addr = {
+      .sin_family = AF_INET,
+      .sin_addr = std::bit_cast<in_addr>(ip_address),
+  };
+
+  while (attempt_count-- != 0)
+  {
+    const u16 port_value = port_distribution(rng);
+
+    addr.sin_port = htons(port_value);
+
+    const auto bind_result = bind(host_socket, reinterpret_cast<sockaddr*>(&addr), sizeof(addr));
+    const int bind_err = WSAGetLastError();
+
+    INFO_LOG_FMT(AMMEDIABOARD, "BindEphemeralPort: bind ({}:{}) = {} ({})",
+                 Common::IPAddressToString(ip_address), port_value, bind_result,
+                 Common::DecodeNetworkError(bind_err));
+
+    if (bind_result == 0)
+      return true;
+  }
+
+  return false;
+}
+
+static s32 NetDIMMConnect(GuestSocket guest_socket, const GuestSocketAddress& guest_addr)
+{
+  INFO_LOG_FMT(AMMEDIABOARD, "NetDIMMConnect: {}:{}",
+               Common::IPAddressToString(guest_addr.ip_address), ntohs(guest_addr.port));
+
+  sockaddr_in addr{
+      .sin_family = guest_addr.ip_family,
+  };
+
+  // Adjust destination IP and port.
+  const auto adjusted_ipv4port = AdjustIPv4PortFromConfig({guest_addr.ip_address, guest_addr.port});
+  if (adjusted_ipv4port.has_value())
+  {
+    addr.sin_addr = std::bit_cast<in_addr>(adjusted_ipv4port->ip_address);
+    addr.sin_port = adjusted_ipv4port->port;
+
+    INFO_LOG_FMT(AMMEDIABOARD, "NetDIMMConnect: Redirecting to: {}:{}",
+                 Common::IPAddressToString(adjusted_ipv4port->ip_address),
+                 ntohs(adjusted_ipv4port->port));
+  }
+  else
+  {
+    addr.sin_addr = std::bit_cast<in_addr>(guest_addr.ip_address);
+    addr.sin_port = guest_addr.port;
+  }
+
+  const auto host_socket = GetHostSocket(guest_socket);
+
+  // See if we have a redirection for the game modified IP.
+  // If so, adjust the source IP by binding the socket.
+  const auto adjusted_source_ipv4port = AdjustIPv4PortFromConfig({s_game_modified_ip_address, 0});
+  if (adjusted_source_ipv4port.has_value())
+  {
+    // FYI: We don't handle the situation if games bind outgoing TCP themselves.
+    // But I think that's unlikely.
+
+    const u16 first_port_value = adjusted_source_ipv4port->GetPortValue();
+
+    // If port zero is included then we don't care about the port number.
+    const bool use_any_port = first_port_value == 0;
+    const u32 attempt_count = use_any_port ? 1 : 10;
+
+    // TODO: Handle the range properly. AdjustIPv4PortFromConfig should return a port range.
+    // This magic 999 is here just to match our default config..
+    const u16 last_port_value = use_any_port ? 0 : first_port_value + 999;
+
+    const auto bind_result = BindEphemeralPort(host_socket, adjusted_source_ipv4port->ip_address,
+                                               first_port_value, last_port_value, attempt_count);
+
+    if (!bind_result)
+    {
+      s_last_error = SOCKET_ERROR;
+      return SOCKET_ERROR;
+    }
+  }
+
+  // Set socket to non-blocking
+  {
+    u_long val = 1;
+    ioctlsocket(host_socket, FIONBIO, &val);
+  }
+  // Restore blocking mode
+  Common::ScopeGuard guard{[&] {
+    u_long val = 0;
+    ioctlsocket(host_socket, FIONBIO, &val);
+  }};
+
+  const int connect_result =
+      connect(host_socket, reinterpret_cast<const sockaddr*>(&addr), sizeof(addr));
+  const int err = WSAGetLastError();
+
+  INFO_LOG_FMT(AMMEDIABOARD_NET, "NetDIMMConnect: connect( {}({}), ({},{}:{}) ):{} ({})",
+               host_socket, u32(guest_socket), addr.sin_family, inet_ntoa(addr.sin_addr),
+               Common::swap16(addr.sin_port), connect_result, err);
+
+  if (connect_result == 0) [[unlikely]]
+  {
+    // Immediate success.
+    s_last_error = SSC_SUCCESS;
+    return 0;
+  }
+
+  if (err != WSAEWOULDBLOCK)
+  {
+    // Immediate failure (e.g. WSAECONNREFUSED)
+    WARN_LOG_FMT(AMMEDIABOARD, "NetDIMMConnect: connect: {} ({})", err,
+                 Common::DecodeNetworkError(err));
+
+    s_last_error = SOCKET_ERROR;
+    return SOCKET_ERROR;
+  }
+
+  WSAPOLLFD pfds[1]{{.fd = host_socket, .events = POLLOUT}};
+
+  const auto timeout =
+      duration_cast<std::chrono::milliseconds>(std::chrono::microseconds{s_timeouts[0]});
+
+  const int poll_result = PlatformPoll(pfds, timeout);
+
+  if (poll_result < 0) [[unlikely]]
+  {
+    // Poll failure.
+    ERROR_LOG_FMT(AMMEDIABOARD, "NetDIMMConnect: PlatformPoll: {}", Common::StrNetworkError());
+
+    s_last_error = SOCKET_ERROR;
+    return SOCKET_ERROR;
+  }
+
+  if ((pfds[0].revents & POLLOUT) == 0)
+  {
+    // Timeout.
+    s_last_error = SSC_EWOULDBLOCK;
+    return SOCKET_ERROR;
+  }
+
+  int so_error = 0;
+  socklen_t optlen = sizeof(so_error);
+  const int getsockopt_result =
+      getsockopt(host_socket, SOL_SOCKET, SO_ERROR, reinterpret_cast<char*>(&so_error), &optlen);
+
+  if (getsockopt_result != 0) [[unlikely]]
+  {
+    // getsockopt failure.
+    ERROR_LOG_FMT(AMMEDIABOARD, "NetDIMMConnect: getsockopt: {}", Common::StrNetworkError());
+  }
+  else if (so_error == 0)
+  {
+    s_last_error = SSC_SUCCESS;
+    return 0;
+  }
+
+  s_last_error = SOCKET_ERROR;
+  return SOCKET_ERROR;
+}
+
+static GuestSocket NetDIMMAccept(GuestSocket guest_socket, u8* guest_addr_ptr,
+                                 u8* guest_addrlen_ptr)
+{
+  // Either both parameters should be provided, or neither.
+  if ((guest_addr_ptr != nullptr) != (guest_addrlen_ptr != nullptr))
+  {
+    ERROR_LOG_FMT(AMMEDIABOARD_NET, "NetDIMMAccept: bad parmeters");
+
+    // TODO: Not hardware tested.
+    s_last_error = SSC_EFAULT;
+    return INVALID_GUEST_SOCKET;
+  }
+
+  const auto host_socket = GetHostSocket(guest_socket);
+  WSAPOLLFD pfds[1]{{.fd = host_socket, .events = POLLIN}};
+
+  // FYI: Currently using a 0ms timeout to make accept calls always non-blocking.
+  constexpr auto timeout = std::chrono::milliseconds{0};
+
+  DEBUG_LOG_FMT(AMMEDIABOARD, "NetDIMMAccept: {}({})", host_socket, int(guest_socket));
+
+  const int poll_result = PlatformPoll(pfds, timeout);
+
+  if (poll_result < 0) [[unlikely]]
+  {
+    // Poll failure.
+    ERROR_LOG_FMT(AMMEDIABOARD, "NetDIMMAccept: PlatformPoll: {}", Common::StrNetworkError());
+
+    s_last_error = SOCKET_ERROR;
+    return INVALID_GUEST_SOCKET;
+  }
+
+  if ((pfds[0].revents & POLLIN) == 0)
+  {
+    // Timeout.
+    DEBUG_LOG_FMT(AMMEDIABOARD, "NetDIMMAccept: Timeout.");
+
+    s_last_error = SSC_EWOULDBLOCK;
+    return INVALID_GUEST_SOCKET;
+  }
+
+  sockaddr_in addr;
+  socklen_t addrlen = sizeof(addr);
+  const auto client_sock = accept_(host_socket, reinterpret_cast<sockaddr*>(&addr), &addrlen);
+
+  if (client_sock == INVALID_GUEST_SOCKET)
+  {
+    ERROR_LOG_FMT(AMMEDIABOARD, "AMMBCommandAccept: accept: ({})", Common::StrNetworkError());
+    s_last_error = SOCKET_ERROR;
+    return INVALID_GUEST_SOCKET;
+  }
+
+  s_last_error = SSC_SUCCESS;
+
+  NOTICE_LOG_FMT(AMMEDIABOARD, "AMMBCommandAccept: {}:{}",
+                 Common::IPAddressToString(std::bit_cast<Common::IPAddress>(addr.sin_addr)),
+                 ntohs(addr.sin_port));
+
+  if (guest_addr_ptr == nullptr)
+    return client_sock;
+
+  GuestSocketAddress guest_addr{
+      .ip_family = u8(addr.sin_family),
+      .port = addr.sin_port,
+      .ip_address = std::bit_cast<Common::IPAddress>(addr.sin_addr),
+  };
+
+  if (const auto adjusted_ipv4port =
+          ReverseAdjustIPv4PortFromConfig({guest_addr.ip_address, guest_addr.port}))
+  {
+    guest_addr.ip_address = adjusted_ipv4port->ip_address;
+    guest_addr.port = adjusted_ipv4port->port;
+
+    NOTICE_LOG_FMT(AMMEDIABOARD, "AMMBCommandAccept: Translating result to: {}:{}",
+                   Common::IPAddressToString(guest_addr.ip_address), ntohs(guest_addr.port));
+  }
+
+  const auto write_size =
+      std::min<u32>(Common::BitCastPtr<u32>(guest_addrlen_ptr), sizeof(guest_addr));
+
+  // Write out the addr.
+  std::memcpy(guest_addr_ptr, &guest_addr, write_size);
+
+  // Write out the addrlen.
+  *guest_addrlen_ptr = sizeof(guest_addr);
+
+  return client_sock;
+}
+
+static Common::IPv4Port GetAdjustedBindIPv4Port(Common::IPv4Port socket_addr)
+{
+  auto considered_ipv4 = socket_addr;
+
+  if (std::bit_cast<u32>(considered_ipv4.ip_address) == INADDR_ANY)
+  {
+    // Because the game is binding to "0.0.0.0",
+    //  use the "game modified" IP for redirection purposes.
+    // If no redirection applies, then we still bind "0.0.0.0".
+    considered_ipv4.ip_address = s_game_modified_ip_address;
+    INFO_LOG_FMT(AMMEDIABOARD, "GetAdjustedBindIPv4Port: Considering game modified IP: {}",
+                 Common::IPAddressToString(s_game_modified_ip_address));
+  }
+
+  if (const auto adjusted_ipv4 = AdjustIPv4PortFromConfig(considered_ipv4))
+  {
+    socket_addr = *adjusted_ipv4;
+    INFO_LOG_FMT(AMMEDIABOARD, "GetAdjustedBindIPv4Port: Redirecting to: {}:{}",
+                 Common::IPAddressToString(socket_addr.ip_address), ntohs(socket_addr.port));
+  }
+
+  return socket_addr;
+}
+
+static u32 NetDIMMBind(GuestSocket guest_socket, const GuestSocketAddress& guest_addr)
+{
+  const auto host_socket = GetHostSocket(guest_socket);
+
+  NOTICE_LOG_FMT(AMMEDIABOARD, "NetDIMMBind: {}({}) {}, {}, {}:{}", host_socket, int(guest_socket),
+                 guest_addr.unknown_value, guest_addr.ip_family,
+                 Common::IPAddressToString(guest_addr.ip_address), ntohs(guest_addr.port));
+
+  const auto adjusted_ipv4port = GetAdjustedBindIPv4Port({guest_addr.ip_address, guest_addr.port});
+
+  sockaddr_in addr{
+      .sin_family = guest_addr.ip_family,
+      .sin_port = adjusted_ipv4port.port,
+      .sin_addr = std::bit_cast<in_addr>(adjusted_ipv4port.ip_address),
+  };
+
+  const int bind_result = bind(host_socket, reinterpret_cast<const sockaddr*>(&addr), sizeof(addr));
+  const int err = WSAGetLastError();
+
+  INFO_LOG_FMT(AMMEDIABOARD_NET, "NetDIMMBind: bind( {}({}), ({},{}:{}) ):{}", host_socket,
+               u32(guest_socket), addr.sin_family,
+               Common::IPAddressToString(adjusted_ipv4port.ip_address),
+               Common::swap16(adjusted_ipv4port.port), bind_result);
+
+  if (bind_result < 0)
+  {
+    const auto* const err_msg = Common::DecodeNetworkError(err);
+    ERROR_LOG_FMT(AMMEDIABOARD, "NetDIMMBind bind() = {} ({})", err, err_msg);
+
+    PanicAlertFmt("Failed to bind socket {}:{}\nError: {} ({})",
+                  Common::IPAddressToString(adjusted_ipv4port.ip_address),
+                  ntohs(adjusted_ipv4port.port), err, err_msg);
+  }
+
+  return bind_result;
+}
+
+static void AMMBCommandRecv(u32 parameter_offset, u32 network_buffer_base)
+{
+  const auto fd = GetHostSocket(GuestSocket(s_media_buffer_32[parameter_offset]));
+  u32 off = s_media_buffer_32[parameter_offset + 1];
+  auto len = std::min<u32>(s_media_buffer_32[parameter_offset + 2], sizeof(s_network_buffer));
+  const u64 off_len = u64(off) + len;
+
+  if (off >= network_buffer_base && off_len <= network_buffer_base + sizeof(s_network_buffer))
+  {
+    off -= network_buffer_base;
+  }
+  else if (off_len > sizeof(s_network_buffer))
+  {
+    ERROR_LOG_FMT(AMMEDIABOARD_NET,
+                  "GC-AM: recv(error) invalid destination or length: off={:08x}, len={}", off, len);
+    off = 0;
+    len = 0;
+  }
+
+  const int ret = recv(fd, reinterpret_cast<char*>(s_network_buffer.data() + off), len, 0);
+  const int err = WSAGetLastError();
+
+  DEBUG_LOG_FMT(AMMEDIABOARD_NET, "GC-AM: recv( {}, 0x{:08x}, {} ):{} {}", fd, off, len, ret, err);
+
+  s_media_buffer[1] = s_media_buffer[8];
+  s_media_buffer_32[1] = ret;
+}
+
+static void AMMBCommandSend(u32 parameter_offset, u32 network_buffer_base)
+{
+  const auto guest_socket = GuestSocket(s_media_buffer_32[parameter_offset]);
+  const auto fd = GetHostSocket(guest_socket);
+  u32 off = s_media_buffer_32[parameter_offset + 1];
+  auto len = std::min<u32>(s_media_buffer_32[parameter_offset + 2], sizeof(s_network_buffer));
+  const u64 off_len = u64(off) + len;
+
+  if (off >= network_buffer_base && off_len <= network_buffer_base + sizeof(s_network_buffer))
+  {
+    off -= network_buffer_base;
+  }
+  else if (off_len > sizeof(s_network_buffer))
+  {
+    ERROR_LOG_FMT(AMMEDIABOARD_NET,
+                  "GC-AM: send(error) unhandled destination or length: {:08x}, len={}", off, len);
+    off = 0;
+    len = 0;
+  }
+
+  const int ret = send(fd, reinterpret_cast<char*>(s_network_buffer.data() + off), len, SEND_FLAGS);
+  const int err = WSAGetLastError();
+
+  DEBUG_LOG_FMT(AMMEDIABOARD_NET, "GC-AM: send( {}({}), 0x{:08x}, {} ): {} {}", fd,
+                u32(guest_socket), off, len, ret, err);
+
+  s_media_buffer[1] = s_media_buffer[8];
+  s_media_buffer_32[1] = ret;
+}
+
+static void AMMBCommandSocket(u32 parameter_offset)
+{
+  // Protocol is not sent (determined automatically).
+  const u32 domain = s_media_buffer_32[parameter_offset];
+  const u32 type = s_media_buffer_32[parameter_offset + 1];
+
+  const GuestSocket guest_socket = socket_(int(domain), int(type), 0);
+
+  NOTICE_LOG_FMT(AMMEDIABOARD_NET, "GC-AM: socket( {}, {} ):{}", domain, type, u32(guest_socket));
+
+  s_media_buffer[1] = 0;
+  s_media_buffer_32[1] = u32(guest_socket);
+}
+
+static void AMMBCommandClosesocket(u32 parameter_offset)
+{
+  const auto guest_socket = GuestSocket(s_media_buffer_32[parameter_offset]);
+  const auto fd = GetHostSocket(guest_socket);
+
+  const int ret = closesocket(fd);
+
+  NOTICE_LOG_FMT(AMMEDIABOARD_NET, "GC-AM: closesocket( {}({}) ):{}", fd, u32(guest_socket), ret);
+
+  if (u32(guest_socket) < std::size(s_sockets))
+    s_sockets[u32(guest_socket)] = SOCKET_ERROR;
+
+  s_media_buffer_32[1] = ret;
+  s_last_error = SSC_SUCCESS;
+}
+
+static void AMMBCommandConnect(u32 parameter_offset, u32 network_buffer_base)
+{
+  const auto guest_socket = GuestSocket(s_media_buffer_32[parameter_offset + 0]);
+  const u32 addr_offset = s_media_buffer_32[parameter_offset + 1];
+  const u32 len = s_media_buffer_32[parameter_offset + 2];
+
+  GuestSocketAddress addr;
+
+  if (len != sizeof(addr))
+  {
+    ERROR_LOG_FMT(AMMEDIABOARD_NET, "AMMBCommandConnect: Unexpected length: {}", len);
+    return;
+  }
+
+  const auto* addr_ptr =
+      GetSafePtr(s_network_command_buffer, network_buffer_base, addr_offset, sizeof(addr));
+  if (addr_ptr == nullptr)
+    return;
+
+  memcpy(&addr, addr_ptr, sizeof(addr));
+
+  const int ret = NetDIMMConnect(guest_socket, addr);
+
+  s_media_buffer[1] = s_media_buffer[8];
+  s_media_buffer_32[1] = ret;
+}
+
+static void AMMBCommandAccept(u32 parameter_offset, u32 network_buffer_base)
+{
+  const auto guest_socket = GuestSocket(s_media_buffer_32[parameter_offset]);
+  const u32 addr_off = s_media_buffer_32[parameter_offset + 1];
+  const u32 addrlen_off = s_media_buffer_32[parameter_offset + 2];
+
+  auto* const addrlen_ptr =
+      GetSafePtr(s_network_command_buffer, network_buffer_base, addrlen_off, sizeof(u32));
+
+  auto* const addr_ptr = (addrlen_ptr == nullptr) ?
+                             nullptr :
+                             GetSafePtr(s_network_command_buffer, network_buffer_base, addr_off,
+                                        Common::BitCastPtr<u32>(addrlen_ptr));
+
+  const auto accept_result = NetDIMMAccept(guest_socket, addr_ptr, addrlen_ptr);
+
+  s_media_buffer_32[1] = u32(accept_result);
+}
+
+static void AMMBCommandBind()
+{
+  const auto guest_socket = GuestSocket(s_media_buffer_32[2]);
+  const u32 addr_offset = s_media_buffer_32[3];
+  const u32 len = s_media_buffer_32[4];
+
+  GuestSocketAddress guest_addr;
+
+  if (len != sizeof(guest_addr))
+  {
+    ERROR_LOG_FMT(AMMEDIABOARD_NET, "AMMBCommandBind: Unexpected length: {}", len);
+    return;
+  }
+
+  const auto* addr_ptr =
+      GetSafePtr(s_network_command_buffer, NetworkCommandAddress2, addr_offset, sizeof(guest_addr));
+  if (addr_ptr == nullptr)
+    return;
+
+  memcpy(&guest_addr, addr_ptr, sizeof(guest_addr));
+
+  const auto bind_result = NetDIMMBind(guest_socket, guest_addr);
+
+  s_media_buffer_32[1] = bind_result;
+  s_last_error = SSC_SUCCESS;
+}
+
+// Expects a pointer to a GuestFdSet or nullptr.
+static void FillPollFdsFromGuestFdSet(std::span<WSAPOLLFD> pfds, const void* guest_fds_ptr,
+                                      short requested_events)
+{
+  if (guest_fds_ptr == nullptr)
+    return;
+
+  GuestFdSet guest_fds;
+  std::memcpy(&guest_fds, guest_fds_ptr, sizeof(guest_fds));
+
+  u32 index = 0;
+  for (auto& pfd : pfds)
+  {
+    const auto guest_socket = GuestSocket(index);
+    if (guest_fds.IsFdSet(guest_socket))
+    {
+      pfd.fd = GetHostSocket(guest_socket);
+      pfd.events |= requested_events;
+    }
+
+    ++index;
+  }
+}
+
+// Expects a pointer to a GuestFdSet or nullptr.
+static void WriteGuestFdSetFromPollFds(void* guest_fds_ptr, std::span<const WSAPOLLFD> fds,
+                                       short returned_events)
+{
+  if (guest_fds_ptr == nullptr)
+    return;
+
+  GuestFdSet guest_fds;
+
+  for (const auto& fd : fds)
+  {
+    if ((fd.revents & returned_events) == 0)
+      continue;
+
+    const auto guest_socket = GetGuestSocket(fd.fd);
+    if (guest_socket == INVALID_GUEST_SOCKET)
+      continue;
+
+    guest_fds.SetFd(guest_socket);
+  }
+
+  std::memcpy(guest_fds_ptr, &guest_fds, sizeof(guest_fds));
+}
+
+static void AMMBCommandSelect(u32 parameter_offset, u32 network_buffer_base)
+{
+  u32 nfds = int(s_media_buffer_32[parameter_offset]);
+
+  const u32 readfds_offset = s_media_buffer_32[parameter_offset + 1];
+  auto* const guest_readfds_ptr =
+      GetSafePtr(s_network_command_buffer, network_buffer_base, readfds_offset, sizeof(GuestFdSet));
+
+  const u32 writefds_offset = s_media_buffer_32[parameter_offset + 2];
+  auto* const guest_writefds_ptr = GetSafePtr(s_network_command_buffer, network_buffer_base,
+                                              writefds_offset, sizeof(GuestFdSet));
+
+  const u32 exceptfds_offset = s_media_buffer_32[parameter_offset + 3];
+  auto* const guest_exceptfds_ptr = GetSafePtr(s_network_command_buffer, network_buffer_base,
+                                               exceptfds_offset, sizeof(GuestFdSet));
+
+  const u32 timeout_offset = s_media_buffer_32[parameter_offset + 4];
+  auto* const guest_timeout_ptr =
+      GetSafePtr(s_network_command_buffer, network_buffer_base, timeout_offset, sizeof(TimeVal));
+
+  // Games sometimes send 256 (the bit size of GuestFdSet).
+  nfds = std::min<u32>(nfds, std::size(s_sockets));
+
+  std::chrono::milliseconds timeout{-1};
+  if (guest_timeout_ptr != nullptr)
+  {
+    TimeVal guest_timeout;
+    std::memcpy(&guest_timeout, guest_timeout_ptr, sizeof(guest_timeout));
+
+    timeout = duration_cast<std::chrono::milliseconds>(
+        std::chrono::seconds(guest_timeout.seconds) +
+        std::chrono::microseconds(guest_timeout.microseconds));
+  }
+
+  if (timeout < std::chrono::milliseconds{})
+  {
+    // TODO: We should have a way to break out of any timeout on shutdown.
+    // e.g. include a "wakeup" socket in each `poll` call.
+    WARN_LOG_FMT(AMMEDIABOARD, "AMMBCommandSelect: Infinite timout!");
+  }
+
+  DEBUG_LOG_FMT(AMMEDIABOARD_NET,
+                "GC-AM: select( {}, 0x{:08x} 0x{:08x} 0x{:08x} 0x{:08x} ) timeout={}", nfds,
+                readfds_offset, writefds_offset, exceptfds_offset, timeout_offset, timeout.count());
+
+  // Fill with the host sockets for each guest socket less-than `nfds` in each GuestFdSet.
+  std::vector<WSAPOLLFD> pollfds(nfds, WSAPOLLFD{.fd = INVALID_SOCKET});
+
+  FillPollFdsFromGuestFdSet(pollfds, guest_readfds_ptr, POLLIN);
+  FillPollFdsFromGuestFdSet(pollfds, guest_writefds_ptr, POLLOUT);
+  FillPollFdsFromGuestFdSet(pollfds, guest_exceptfds_ptr, POLLPRI);
+
+  // Erase "INVALID" entries and also entries that weren't in any GuestFdSet.
+  std::erase_if(pollfds, [](const WSAPOLLFD& fd) { return fd.fd == INVALID_SOCKET; });
+
+  // TODO: There may be some edge cases where
+  // poll's (POLLIN,POLLOUT,POLLPRI) don't map 1:1 with select's (readfds,writefds,exceptfds).
+
+  DEBUG_LOG_FMT(AMMEDIABOARD, "AMMBCommandSelect: Polling with socket count: {}", pollfds.size());
+
+  const int ret = PlatformPoll(pollfds, timeout);
+
+  if (ret >= 0)
+  {
+    WriteGuestFdSetFromPollFds(guest_readfds_ptr, pollfds, POLLIN);
+    WriteGuestFdSetFromPollFds(guest_writefds_ptr, pollfds, POLLOUT);
+    WriteGuestFdSetFromPollFds(guest_exceptfds_ptr, pollfds, POLLPRI);
+  }
+
+  DEBUG_LOG_FMT(AMMEDIABOARD_NET, "GC-AM: select result: {}", ret);
+
+  s_media_buffer[1] = 0;
+  s_media_buffer_32[1] = ret;
+}
+
+static void AMMBCommandSetSockOpt(u32 parameter_offset, u32 network_buffer_base)
+{
+  const auto fd = GetHostSocket(GuestSocket(s_media_buffer_32[parameter_offset]));
+  const int level = static_cast<int>(s_media_buffer_32[parameter_offset + 1]);
+  const int optname = static_cast<int>(s_media_buffer_32[parameter_offset + 2]);
+  const u32 optval_offset = s_media_buffer_32[parameter_offset + 3] - network_buffer_base;
+  const int optlen = static_cast<int>(s_media_buffer_32[parameter_offset + 4]);
+
+  if (!NetworkCMDBufferCheck(optval_offset, optlen))
+  {
+    return;
+  }
+
+  const char* optval = reinterpret_cast<char*>(s_network_command_buffer.data() + optval_offset);
+
+  // TODO: Ensure parameters are compatible with host's setsockopt
+  const int ret = setsockopt(fd, level, optname, optval, optlen);
+  const int err = WSAGetLastError();
+
+  NOTICE_LOG_FMT(AMMEDIABOARD_NET, "GC-AM: setsockopt( {:d}, {:04x}, {}, {:p}, {} ):{:d} ({})", fd,
+                 level, optname, optval, optlen, ret, err);
+
+  s_media_buffer[1] = s_media_buffer[8];
+  s_media_buffer_32[1] = ret;
+}
+
+static void AMMBCommandModifyMyIPaddr(u32 parameter_offset, u32 network_buffer_base)
+{
+  const u32 ip_address_offset = s_media_buffer_32[parameter_offset];
+  const auto ip_address_str = GetSafeString(s_network_command_buffer, network_buffer_base,
+                                            ip_address_offset, MAX_IPV4_STRING_LENGTH);
+
+  NOTICE_LOG_FMT(AMMEDIABOARD_NET, "GC-AM: modifyMyIPaddr({})", ip_address_str);
+
+  if (const auto parse_result = Common::StringToIPv4PortRange(ip_address_str))
+    s_game_modified_ip_address = parse_result->first.ip_address;
+}
+
+static void FileWriteData(Memory::MemoryManager& memory, File::IOFile* file, u32 seek_pos,
+                          u32 address, std::size_t length)
+{
+  auto span = memory.GetSpanForAddress(address);
+  if (length <= span.size())
+  {
+    file->Seek(seek_pos, File::SeekOrigin::Begin);
+    file->WriteBytes(span.data(), length);
+    file->Flush();
+  }
+  else
+  {
+    ERROR_LOG_FMT(AMMEDIABOARD, "GC-AM: Write overflow: address=0x{:08x}, length={}, span={}",
+                  address, length, span.size());
+  }
+}
+
+static void FileReadData(Memory::MemoryManager& memory, File::IOFile* file, u32 seek_pos,
+                         u32 address, std::size_t length)
+{
+  auto span = memory.GetSpanForAddress(address);
+  if (length <= span.size())
+  {
+    file->Seek(seek_pos, File::SeekOrigin::Begin);
+    file->ReadBytes(span.data(), length);
+  }
+  else
+  {
+    ERROR_LOG_FMT(AMMEDIABOARD, "GC-AM: Read overflow: address=0x{:08x}, length={}, span={}",
+                  address, length, span.size());
+  }
+}
+
+u32 ExecuteCommand(std::array<u32, 3>& dicmd_buf, u32* diimm_buf, u32 address, u32 length)
+{
+  auto& system = Core::System::GetInstance();
+  auto& memory = system.GetMemory();
+
+  dicmd_buf[0] ^= s_gcam_key_a;
+  dicmd_buf[1] ^= s_gcam_key_b;
+  dicmd_buf[2] ^= s_gcam_key_c;
+
+  const u32 seed = dicmd_buf[0] >> 16;
+
+  s_gcam_key_a *= seed;
+  s_gcam_key_b *= seed;
+  s_gcam_key_c *= seed;
+
+  // Key setup for Triforce IPL:
+  // These RAM offsets always hold the key for the next command. Since two dummy commands are sent
+  // before any real ones, you can just use the key from RAM without missing a real command.
+
+  if (s_gcam_key_a == 0)
+  {
+    if (memory.Read_U32(0))
+    {
+      HLE::Patch(system, 0x813048B8, "OSReport");
+      HLE::Patch(system, 0x8130095C, "OSReport");  // Apploader
+
+      InitKeys(memory.Read_U32(0), memory.Read_U32(4), memory.Read_U32(8));
+    }
+  }
+
+  const u32 command = dicmd_buf[0] << 24;
+  const u32 offset = dicmd_buf[1] << 2;
+
+  DEBUG_LOG_FMT(AMMEDIABOARD,
+                "GC-AM: {:08x} {:08x} DMA=addr:{:08x},len:{:08x} Keys: {:08x} {:08x} {:08x}",
+                command, offset, address, length, s_gcam_key_a, s_gcam_key_b, s_gcam_key_c);
+
+  // Test mode
+  if (offset == 0x0002440)
+  {
+    // Set by OSResetSystem
+    if (memory.Read_U32(0x811FFF00) == 1)
+    {
+      // Don't map firmware while in SegaBoot
+      if (memory.Read_U32(0x8006BF70) != 0x0A536567)
+      {
+        s_firmware_map = true;
+      }
+    }
+  }
+
+  switch (AMMBDICommand(command >> 24))
+  {
+  case AMMBDICommand::Inquiry:
+    if (s_firmware_map)
+    {
+      s_firmware_map = false;
+    }
+
+    // Returned value is used to set the protocol version.
+    switch (GetGameType())
+    {
+    default:
+      *diimm_buf = Version1;
+      return 0;
+    case VirtuaStriker4_2006:
+    case KeyOfAvalon:
+    case MarioKartGP:
+    case MarioKartGP2:
+    case FirmwareUpdate:
+      *diimm_buf = Version2;
+      return 0;
+    }
+    break;
+  case AMMBDICommand::Read:
+    if ((offset & 0x8FFF0000) == 0x80000000)
+    {
+      switch (offset)
+      {
+      case MediaBoardStatus1:
+        memory.Write_U16(1, address);
+        break;
+      case MediaBoardStatus2:
+        memory.Memset(address, 0, length);
+        break;
+      case MediaBoardStatus3:
+        memory.Memset(address, 0xFF, length);
+        // DIMM size (512MB)
+        memory.Write_U32_Swap(0x20000000, address);
+        // GCAM signature
+        memory.Write_U32(0x4743414D, address + 4);
+        break;
+      case 0x80000100:
+        memory.Write_U32_Swap(0x001F1F1F, address);
+        break;
+      case FirmwareStatus1:
+        memory.Write_U32_Swap(0x01FA, address);
+        break;
+      case FirmwareStatus2:
+        memory.Write_U32_Swap(1, address);
+        break;
+      case 0x80000160:
+        memory.Write_U32(0x00001E00, address);
+        break;
+      case 0x80000180:
+        memory.Write_U32(0, address);
+        break;
+      case 0x800001A0:
+        memory.Write_U32(0xFFFFFFFF, address);
+        break;
+      default:
+        PrintMBBuffer(address, length);
+        PanicAlertFmtT("Unhandled Media Board Read: offset={0:08x} length={0:08x}", offset, length);
+        break;
+      }
+      return 0;
+    }
+
+    // Network configuration
+    if (offset == 0x00000000 && length == 0x80)
+    {
+      FileReadData(memory, &s_netcfg, 0, address, length);
+      return 0;
+    }
+
+    // Media crc check on/off
+    if (offset == DIMMExtraSettings && length == 0x20)
+    {
+      FileReadData(memory, &s_extra, 0, address, length);
+      return 0;
+    }
+
+    // DIMM memory (8MB)
+    if (offset >= DIMMMemory && offset < 0x1F800000)
+    {
+      FileReadData(memory, &s_dimm, offset - DIMMMemory, address, length);
+      return 0;
+    }
+
+    // DIMM memory (8MB)
+    if (offset >= DIMMMemory2 && offset < 0xFF800000)
+    {
+      FileReadData(memory, &s_dimm, offset - DIMMMemory2, address, length);
+      return 0;
+    }
+
+    if (offset == NetworkControl && length == 0x20)
+    {
+      FileReadData(memory, &s_netctrl, 0, address, length);
+      return 0;
+    }
+
+    if (offset >= AllNetBuffer && offset < 0x89011000)
+    {
+      INFO_LOG_FMT(AMMEDIABOARD, "GC-AM: Read All.Net Buffer ({:08x},{})", offset, length);
+      // Fake reply
+      SafeCopyToEmu(memory, address, reinterpret_cast<const u8*>(s_allnet_reply),
+                    sizeof(s_allnet_reply), offset - AllNetBuffer, sizeof(s_allnet_reply));
+      return 0;
+    }
+
+    for (const auto& range : s_mediaboard_ranges)
+    {
+      if (offset >= range.start && offset < range.end)
+      {
+        DEBUG_LOG_FMT(AMMEDIABOARD, "GC-AM: Read MediaBoard ({:08x},{:08x},{:08x})", offset,
+                      range.start, length);
+        SafeCopyToEmu(memory, address, range.buffer, range.buffer_size, offset - range.start,
+                      length);
+        PrintMBBuffer(address, length);
+        return 0;
+      }
+    }
+
+    if (offset == DIMMCommandExecute2)
+    {
+      const AMMBCommand ammb_command = Common::BitCastPtr<AMMBCommand>(s_media_buffer + 0x202);
+
+      DEBUG_LOG_FMT(AMMEDIABOARD, "GC-AM: Execute command: (2){0:04X}",
+                    static_cast<u16>(ammb_command));
+
+      memcpy(s_media_buffer, s_media_buffer + 0x200, 0x20);
+      memset(s_media_buffer + 0x200, 0, 0x20);
+      s_media_buffer[0x204] = 1;
+
+      switch (ammb_command)
+      {
+      case AMMBCommand::Unknown_001:
+        s_media_buffer_32[1] = 1;
+        break;
+      case AMMBCommand::GetNetworkFirmVersion:
+        s_media_buffer_32[1] = 0x1305;  // Version: 13.05
+        s_media_buffer[6] = 1;          // Type: VxWorks
+        break;
+      case AMMBCommand::GetSystemFlags:
+        s_media_buffer[4] = 1;
+        s_media_buffer[6] = NANDMaskBoardNAND;
+        s_media_buffer[7] = 1;
+        break;
+      // Empty reply
+      case AMMBCommand::Unknown_103:
+        break;
+      case AMMBCommand::Unknown_104:
+        s_media_buffer[4] = 1;
+        break;
+      case AMMBCommand::Accept:
+        AMMBCommandAccept(2, NetworkCommandAddress2);
+        break;
+      case AMMBCommand::Bind:
+        AMMBCommandBind();
+        break;
+      case AMMBCommand::Closesocket:
+        AMMBCommandClosesocket(2);
+        break;
+      case AMMBCommand::Connect:
+        AMMBCommandConnect(2, NetworkCommandAddress2);
+        break;
+      case AMMBCommand::InetAddr:
+      {
+        const char* ip_address = reinterpret_cast<char*>(s_network_command_buffer.data());
+
+        // IP address shouldn't be longer than 15
+        // TODO: Shouldn't this look at 16 characters for lack of null-termination?
+        if (strnlen(ip_address, MAX_IPV4_STRING_LENGTH) > MAX_IPV4_STRING_LENGTH)
+        {
+          ERROR_LOG_FMT(AMMEDIABOARD_NET, "GC-AM: Invalid size for address: InetAddr():{}",
+                        strlen(ip_address));
+          break;
+        }
+
+        const u32 ip = inet_addr(ip_address);
+        NOTICE_LOG_FMT(AMMEDIABOARD_NET, "GC-AM: InetAddr( {} )", ip_address);
+
+        s_media_buffer[1] = s_media_buffer[8];
+        s_media_buffer_32[1] = ip;
+        break;
+      }
+      case AMMBCommand::Listen:
+      {
+        const auto fd = GetHostSocket(GuestSocket(s_media_buffer_32[2]));
+        const u32 backlog = s_media_buffer_32[3];
+
+        const int ret = listen(fd, backlog);
+
+        NOTICE_LOG_FMT(AMMEDIABOARD_NET, "GC-AM: listen( {}, {} ):{:d}", fd, backlog, ret);
+
+        s_media_buffer[1] = s_media_buffer[8];
+        s_media_buffer_32[1] = ret;
+        break;
+      }
+      case AMMBCommand::Recv:
+        AMMBCommandRecv(2, NetworkBufferAddress4);
+        break;
+      case AMMBCommand::Send:
+        AMMBCommandSend(2, NetworkBufferAddress3);
+        break;
+      case AMMBCommand::Socket:
+        AMMBCommandSocket(2);
+        break;
+      case AMMBCommand::Select:
+        AMMBCommandSelect(2, NetworkCommandAddress2);
+        break;
+      case AMMBCommand::SetSockOpt:
+        AMMBCommandSetSockOpt(2, NetworkCommandAddress2);
+        break;
+      case AMMBCommand::SetTimeOuts:
+      {
+        const auto guest_socket = GuestSocket(s_media_buffer_32[2]);
+        const auto host_socket = GetHostSocket(guest_socket);
+        const u32 timeout_a = s_media_buffer_32[3];
+        const u32 timeout_b = s_media_buffer_32[4];
+        const u32 timeout_c = s_media_buffer_32[5];
+
+        s_timeouts[0] = timeout_a;
+        s_timeouts[1] = timeout_b;
+        s_timeouts[2] = timeout_c;
+
+        int ret = SOCKET_ERROR;
+
+        if (host_socket != INVALID_SOCKET)
+        {
+          ret = setsockopt(host_socket, SOL_SOCKET, SO_SNDTIMEO,
+                           reinterpret_cast<const char*>(&timeout_b), sizeof(int));
+          if (ret < 0)
+          {
+            ret = WSAGetLastError();
+          }
+          else
+          {
+            ret = setsockopt(host_socket, SOL_SOCKET, SO_RCVTIMEO,
+                             reinterpret_cast<const char*>(&timeout_c), sizeof(int));
+            if (ret < 0)
+              ret = WSAGetLastError();
+          }
+
+          INFO_LOG_FMT(AMMEDIABOARD_NET, "GC-AM: SetTimeOuts( {}({}), {}, {}, {} ):{}", host_socket,
+                       int(guest_socket), timeout_a, timeout_b, timeout_c, ret);
+        }
+        else
+        {
+          ERROR_LOG_FMT(AMMEDIABOARD_NET,
+                        "GC-AM: Invalid Socket: SetTimeOuts( {}({}), {}, {}, {} ):{}", host_socket,
+                        int(guest_socket), timeout_a, timeout_b, timeout_c, ret);
+        }
+
+        s_media_buffer[1] = s_media_buffer[8];
+        s_media_buffer_32[1] = ret;
+        break;
+      }
+      case AMMBCommand::GetParambyDHCPExec:
+      {
+        const u32 value = s_media_buffer_32[2];
+
+        NOTICE_LOG_FMT(AMMEDIABOARD_NET, "GC-AM: GetParambyDHCPExec({})", value);
+
+        s_media_buffer[1] = 0;
+        s_media_buffer_32[1] = 0;
+        break;
+      }
+      case AMMBCommand::ModifyMyIPaddr:
+        AMMBCommandModifyMyIPaddr(2, NetworkCommandAddress2);
+        break;
+      case AMMBCommand::GetLastError:
+      {
+        const auto guest_socket = GuestSocket(s_media_buffer_32[2]);
+        const auto host_socket = GetHostSocket(guest_socket);
+
+        DEBUG_LOG_FMT(AMMEDIABOARD_NET, "GC-AM: GetLastError( {}({}) ):{}", host_socket,
+                      int(guest_socket), int(s_last_error));
+
+        // Good enough, assuming it's called for the same socket right after an error.
+        // TODO: Implement something similar per socket.
+        s_media_buffer[1] = s_media_buffer[8];
+        s_media_buffer_32[1] = s_last_error;
+      }
+      break;
+      case AMMBCommand::InitLink:
+        NOTICE_LOG_FMT(AMMEDIABOARD_NET, "GC-AM: InitLink");
+        break;
+      case AMMBCommand::AllNetInit:
+        NOTICE_LOG_FMT(AMMEDIABOARD_NET, "GC-AM: AllNetInit");
+        break;
+      default:
+        ERROR_LOG_FMT(AMMEDIABOARD, "GC-AM: Command:{0:04x}", static_cast<u16>(ammb_command));
+        ERROR_LOG_FMT(AMMEDIABOARD, "GC-AM: Command Unhandled!");
+        break;
+      }
+
+      s_media_buffer[3] |= 0x80;  // Command complete flag
+
+      memory.Memset(address, 0, length);
+
+      ExpansionInterface::GenerateInterrupt(0x10);
+      return 0;
+    }
+
+    // Max GC disc offset
+    if (offset >= 0x57058000)
+    {
+      PanicAlertFmtT("Unhandled Media Board Read: offset={0:08x} length={0:08x}", offset, length);
+      return 0;
+    }
+
+    if (s_firmware_map)
+    {
+      if (!SafeCopyToEmu(memory, address, s_firmware.data(), s_firmware.size(), offset, length))
+      {
+        ERROR_LOG_FMT(AMMEDIABOARD, "GC-AM: Invalid firmware buffer range: offset={}, length={}",
+                      offset, length);
+      }
+      return 0;
+    }
+
+    if (const auto span = memory.GetSpanForAddress(address); span.size() < length)
+    {
+      ERROR_LOG_FMT(AMMEDIABOARD, "GC-AM: Invalid DIMM Disc read from: offset={}, length={}",
+                    offset, length);
+    }
+    else if (s_dimm_disc->Read(offset, length, span.data()))
+    {
+      return 0;
+    }
+
+    return 1;
+    break;
+  case AMMBDICommand::Write:
+
+    // These two magic writes allow a new firmware to be programmed
+    if (offset == FirmwareMagicWrite1 && length == 0x20)
+    {
+      s_firmware_map = true;
+      return 0;
+    }
+
+    if (offset == FirmwareMagicWrite2 && length == 0x20)
+    {
+      s_firmware_map = true;
+      return 0;
+    }
+
+    if (s_firmware_map)
+    {
+      // Firmware memory (2MB)
+      if (offset >= 0x00400000 && offset <= 0x600000)
+      {
+        const u32 fw_offset = offset - 0x00400000;
+        if (!SafeCopyFromEmu(memory, s_firmware.data(), address, s_firmware.size(), fw_offset,
+                             length))
+        {
+          ERROR_LOG_FMT(AMMEDIABOARD, "GC-AM: Invalid firmware write: offset={}, length={}",
+                        fw_offset, length);
+        }
+        return 0;
+      }
+    }
+
+    // Network configuration
+    if (offset == 0x00000000 && length == 0x80)
+    {
+      FileWriteData(memory, &s_netcfg, 0, address, length);
+      return 0;
+    }
+
+    // media crc check on/off
+    if (offset == DIMMExtraSettings && length == 0x20)
+    {
+      FileWriteData(memory, &s_extra, 0, address, length);
+      return 0;
+    }
+
+    // Backup memory (8MB)
+    if (offset >= BackupMemory && offset < 0x00800000)
+    {
+      FileWriteData(memory, &s_backup, 0, address, length);
+      return 0;
+    }
+
+    // DIMM memory (8MB)
+    if (offset >= DIMMMemory && offset < 0x1F800000)
+    {
+      FileWriteData(memory, &s_dimm, offset - DIMMMemory, address, length);
+      return 0;
+    }
+
+    // Firmware Write
+    if (offset >= FirmwareAddress && offset < 0x84818000)
+    {
+      INFO_LOG_FMT(AMMEDIABOARD, "GC-AM: Write Firmware ({:08x})", offset);
+      PrintMBBuffer(address, length);
+      return 0;
+    }
+
+    // DIMM memory (8MB)
+    if (offset >= DIMMMemory2 && offset < 0xFF800000)
+    {
+      FileWriteData(memory, &s_dimm, offset - DIMMMemory2, address, length);
+      return 0;
+    }
+
+    if (offset == NetworkControl && length == 0x20)
+    {
+      FileWriteData(memory, &s_netctrl, 0, address, length);
+      return 0;
+    }
+
+    if (offset == DIMMCommandExecute1 && length == 0x20)
+    {
+      if (memory.Read_U8(address) == 1)
+      {
+        const AMMBCommand ammb_command = Common::BitCastPtr<AMMBCommand>(s_media_buffer + 0x22);
+
+        DEBUG_LOG_FMT(AMMEDIABOARD, "GC-AM: Execute command: (1):{0:04X}",
+                      static_cast<u16>(ammb_command));
+
+        memset(s_media_buffer, 0, 0x20);
+
+        // Counter/Command
+        s_media_buffer_32[0] = s_media_buffer_32[8] | 0x80000000;  // Set command okay flag
+
+        // Handle command
+        switch (ammb_command)
+        {
+        case AMMBCommand::Unknown_000:
+          s_media_buffer_32[1] = 1;
+          break;
+        case AMMBCommand::GetDIMMSize:
+          s_media_buffer_32[1] = 0x20000000;
+          break;
+        case AMMBCommand::GetMediaBoardStatus:
+          s_media_buffer_32[1] = LoadedGameProgram;
+          s_media_buffer_32[2] = 100;
+          break;
+          // SegaBoot version: 3.09
+        case AMMBCommand::GetSegaBootVersion:
+          // Version
+          s_media_buffer[4] = 0x03;
+          s_media_buffer[5] = 0x09;
+          // Unknown
+          s_media_buffer[6] = 1;
+          s_media_buffer_32[2] = 1;
+          s_media_buffer_32[4] = 0xFF;
+          break;
+        case AMMBCommand::GetSystemFlags:
+          s_media_buffer[4] = 1;
+          s_media_buffer[5] = GDROM;
+          // Enable development mode (Sega Boot)
+          // This also allows region free booting
+          s_media_buffer[6] = 1;
+          s_media_buffer[8] = 0;  // Access Count
+          break;
+        case AMMBCommand::GetMediaBoardSerial:
+          memcpy(s_media_buffer + 4, "A89E-27A50364511", 16);
+          break;
+        case AMMBCommand::Unknown_104:
+          s_media_buffer[4] = 1;
+          break;
+        default:
+          PanicAlertFmtT("Unhandled Media Board Command:{0:04x}", static_cast<u16>(ammb_command));
+          break;
+        }
+
+        memset(s_media_buffer + 0x20, 0, 0x20);
+
+        ExpansionInterface::GenerateInterrupt(0x04);
+        return 0;
+      }
+    }
+
+    for (const auto& range : s_mediaboard_ranges)
+    {
+      if (offset >= range.start && offset < range.end)
+      {
+        DEBUG_LOG_FMT(AMMEDIABOARD, "GC-AM: Write MediaBoard ({:08x},{:08x},{:08x})", offset,
+                      range.start, length);
+        SafeCopyFromEmu(memory, range.buffer, address, range.buffer_size, offset - range.start,
+                        length);
+        PrintMBBuffer(address, length);
+        return 0;
+      }
+    }
+
+    // Max GC disc offset
+    if (offset >= 0x57058000)
+    {
+      PrintMBBuffer(address, length);
+      PanicAlertFmtT("Unhandled Media Board Write: offset={0:08x} length={0:08x}", offset, length);
+    }
+    break;
+  case AMMBDICommand::Execute:
+  {
+    const auto ammb_command = static_cast<AMMBCommand>(s_media_buffer_32[8] >> 16);
+    if (ammb_command == AMMBCommand::Unknown_000)
+      break;
+
+    if (offset == 0 && length == 0)
+    {
+      memset(s_media_buffer, 0, 0x20);
+
+      // Counter/Command
+      s_media_buffer_32[0] = s_media_buffer_32[8] | 0x80000000;  // Set command okay flag
+
+      switch (ammb_command)
+      {
+      case AMMBCommand::Unknown_000:
+        s_media_buffer_32[1] = 1;
+        break;
+      case AMMBCommand::GetDIMMSize:
+        s_media_buffer_32[1] = 0x20000000;
+        break;
+      case AMMBCommand::GetMediaBoardStatus:
+      {
+        s_media_buffer_32[1] = s_board_status;
+        s_media_buffer_32[2] = s_load_progress;
+        if (s_load_progress < 100)
+        {
+          s_load_progress++;
+        }
+        else
+        {
+          s_board_status = LoadedGameProgram;
+        }
+      }
+      break;
+      // SegaBoot version: 3.11
+      case AMMBCommand::GetSegaBootVersion:
+        // Version
+        s_media_buffer[4] = 0x03;
+        s_media_buffer[5] = 0x11;
+        // Unknown
+        s_media_buffer[6] = 1;
+        s_media_buffer_32[2] = 1;
+        s_media_buffer_32[4] = 0xFF;
+        break;
+      case AMMBCommand::GetSystemFlags:
+        s_media_buffer[4] = 1;
+        s_media_buffer[5] = GDROM;
+        // Enable development mode (Sega Boot)
+        // This also allows region free booting
+        s_media_buffer[6] = 1;
+        s_media_buffer[8] = 0;  // Access Count
+        break;
+      case AMMBCommand::GetMediaBoardSerial:
+        memcpy(s_media_buffer + 4, "A89E-27A50364511", 16);
+        break;
+      case AMMBCommand::Unknown_104:
+        s_media_buffer[4] = 1;
+        break;
+      case AMMBCommand::NetworkReInit:
+        break;
+      case AMMBCommand::TestHardware:
+        // Test type
+
+        // 0x01: Media board
+        // 0x04: Network
+
+        DEBUG_LOG_FMT(AMMEDIABOARD, "GC-AM: TestHardware: ({:08x})", s_media_buffer_32[11]);
+        // Pointer to a memory address that is directly displayed on screen as a string
+        DEBUG_LOG_FMT(AMMEDIABOARD, "GC-AM:               ({:08x})", s_media_buffer_32[12]);
+
+        // On real systems it shows the status about the DIMM/GD-ROM here
+        // We just show "TEST OK"
+        memory.Write_U32(0x54534554, s_media_buffer_32[12]);
+        memory.Write_U32(0x004B4F20, s_media_buffer_32[12] + 4);
+
+        s_media_buffer_32[1] = s_media_buffer_32[9];
+        break;
+      case AMMBCommand::Closesocket:
+        AMMBCommandClosesocket(10);
+        break;
+      case AMMBCommand::Connect:
+        AMMBCommandConnect(10, NetworkCommandAddress1);
+        break;
+      case AMMBCommand::Recv:
+        AMMBCommandRecv(10, NetworkBufferAddress5);
+        break;
+      case AMMBCommand::Send:
+        AMMBCommandSend(10, NetworkBufferAddress1);
+        break;
+      case AMMBCommand::Socket:
+        AMMBCommandSocket(10);
+        break;
+      case AMMBCommand::Select:
+        AMMBCommandSelect(10, NetworkCommandAddress1);
+        break;
+      case AMMBCommand::SetSockOpt:
+        AMMBCommandSetSockOpt(10, NetworkCommandAddress1);
+        break;
+      case AMMBCommand::ModifyMyIPaddr:
+        AMMBCommandModifyMyIPaddr(10, NetworkCommandAddress1);
+        break;
+      // Empty reply
+      case AMMBCommand::InitLink:
+        NOTICE_LOG_FMT(AMMEDIABOARD_NET, "GC-AM: InitLink");
+        break;
+      case AMMBCommand::Unknown_605:
+        NOTICE_LOG_FMT(AMMEDIABOARD, "GC-AM: 0x605");
+        break;
+      case AMMBCommand::SetupLink:
+      {
+        const auto addra = std::bit_cast<Common::IPAddress>(s_media_buffer_32[12]);
+        const auto addrb = std::bit_cast<Common::IPAddress>(s_media_buffer_32[13]);
+
+        const u16 size = s_media_buffer[0x24] | s_media_buffer[0x25] << 8;
+        const u16 port = Common::swap16(s_media_buffer[0x27] | s_media_buffer[0x26] << 8);
+        const u16 unknown = s_media_buffer[0x2D] | s_media_buffer[0x2C] << 8;
+
+        NOTICE_LOG_FMT(AMMEDIABOARD_NET, "GC-AM: SetupLink:");
+        NOTICE_LOG_FMT(AMMEDIABOARD_NET, "GC-AM:  Size: ({}) ", size);
+        NOTICE_LOG_FMT(AMMEDIABOARD_NET, "GC-AM:  Port: ({})", port);
+        NOTICE_LOG_FMT(AMMEDIABOARD_NET, "GC-AM:LinkNum:({:02x})", s_media_buffer[0x28]);
+        NOTICE_LOG_FMT(AMMEDIABOARD_NET, "GC-AM:        ({:02x})", s_media_buffer[0x2A]);
+        NOTICE_LOG_FMT(AMMEDIABOARD_NET, "GC-AM:        ({:04x})", unknown);
+        NOTICE_LOG_FMT(AMMEDIABOARD_NET, "GC-AM:   IP:  ({})",
+                       Common::IPAddressToString(addra));  // IP ?
+        NOTICE_LOG_FMT(AMMEDIABOARD_NET, "GC-AM:   IP:  ({})",
+                       Common::IPAddressToString(addrb));  // Target IP
+        NOTICE_LOG_FMT(AMMEDIABOARD_NET, "GC-AM:        ({:08x})",
+                       Common::swap32(s_media_buffer_32[14]));  // some RAM address
+        NOTICE_LOG_FMT(AMMEDIABOARD_NET, "GC-AM:        ({:08x})",
+                       Common::swap32(s_media_buffer_32[15]));  // some RAM address
+
+        s_media_buffer_32[1] = 0;
+      }
+      break;
+      // This sends a UDP packet to previously defined Target IP/Port
+      case AMMBCommand::SearchDevices:
+      {
+        const u16 unknown = s_media_buffer[0x25] | s_media_buffer[0x24] << 8;
+        const u16 off = s_media_buffer[0x26] | s_media_buffer[0x27] << 8;
+        const u32 addr = s_media_buffer_32[10];
+
+        NOTICE_LOG_FMT(AMMEDIABOARD_NET, "GC-AM: SearchDevices: ({})", unknown);
+        NOTICE_LOG_FMT(AMMEDIABOARD_NET, "GC-AM:        Offset: ({:04x})", off);
+        NOTICE_LOG_FMT(AMMEDIABOARD_NET, "GC-AM:                ({:08x})", addr);
+
+        if (!NetworkBufferCheck(off + addr - NetworkBufferAddress2, 0x20))
+        {
+          break;
+        }
+
+        const u8* const data = s_network_buffer.data() + (off + addr - NetworkBufferAddress2);
+
+        for (u32 i = 0; i < 0x20; i += 0x10)
+        {
+          const std::array<u32, 4> data_u32 = Common::BitCastPtr<std::array<u32, 4>>(data + i);
+          NOTICE_LOG_FMT(AMMEDIABOARD_NET, "GC-AM: {:08x} {:08x} {:08x} {:08x}", data_u32[0],
+                         data_u32[1], data_u32[2], data_u32[3]);
+        }
+
+        s_media_buffer_32[1] = 0;
+      }
+      break;
+      case AMMBCommand::Unknown_608:
+      {
+        const u32 ip = s_media_buffer_32[10];
+        const u16 port = Common::swap16(s_media_buffer[6] | s_media_buffer[7] << 8);
+        const u16 flag = s_media_buffer[10] | s_media_buffer[11] << 8;
+
+        NOTICE_LOG_FMT(AMMEDIABOARD_NET, "GC-AM: 0x608( {} {} {} )", ip, port, flag);
+      }
+      break;
+      case AMMBCommand::Unknown_614:
+        NOTICE_LOG_FMT(AMMEDIABOARD_NET, "GC-AM: 0x614");
+        break;
+      default:
+        ERROR_LOG_FMT(AMMEDIABOARD, "GC-AM: Execute buffer UNKNOWN:{0:04x}",
+                      static_cast<u16>(ammb_command));
+        break;
+      }
+
+      memset(s_media_buffer + 0x20, 0, 0x20);
+      return 0;
+    }
+
+    PanicAlertFmtT("Unhandled Media Board Execute:{0:04x}", static_cast<u16>(ammb_command));
+    break;
+  }
+  default:
+    PanicAlertFmtT("Unhandled Media Board Command:{0:02x}", command);
+    break;
+  }
+
+  return 0;
+}
+
+u32 GetMediaType()
+{
+  switch (GetGameType())
+  {
+  default:
+  case FZeroAX:
+  case VirtuaStriker3:
+  case VirtuaStriker4:
+  case VirtuaStriker4_2006:
+  case GekitouProYakyuu:
+  case KeyOfAvalon:
+    return GDROM;
+
+  case MarioKartGP:
+  case MarioKartGP2:
+  case FZeroAXMonster:
+    return NAND;
+  }
+}
+
+// This is checking for the real game IDs (See boot.id within the game)
+u32 GetGameType()
+{
+  u16 triforce_id = 0;
+  const std::string& game_id = SConfig::GetInstance().GetGameID();
+
+  if (game_id.length() == 6)
+  {
+    triforce_id = game_id[1] << 8 | game_id[2];
+  }
+  else
+  {
+    triforce_id = 0x454A;  // Fallback (VirtuaStriker3)
+  }
+
+  auto it = s_game_map.find(triforce_id);
+  if (it != s_game_map.end())
+  {
+    return it->second;
+  }
+
+  PanicAlertFmtT("Unknown game ID:{0:08x}, using default controls.", triforce_id);
+  return VirtuaStriker3;  // Fallback
+}
+
+bool GetTestMenu()
+{
+  return s_test_menu;
+}
+
+static void CloseAllSockets()
+{
+  for (u32 i = FIRST_VALID_FD; i < std::size(s_sockets); ++i)
+  {
+    if (s_sockets[i] != SOCKET_ERROR)
+    {
+      closesocket(s_sockets[i]);
+      s_sockets[i] = SOCKET_ERROR;
+    }
+  }
+}
+
+void Shutdown()
+{
+  s_netcfg.Close();
+  s_netctrl.Close();
+  s_extra.Close();
+  s_backup.Close();
+  s_dimm.Close();
+
+  s_dimm_disc.reset();
+
+  CloseAllSockets();
+}
+
+void DoState(PointerWrap& p)
+{
+  p.Do(s_firmware_map);
+  p.Do(s_test_menu);
+  p.Do(s_timeouts);
+  p.Do(s_last_error);
+  p.Do(s_gcam_key_a);
+  p.Do(s_gcam_key_b);
+  p.Do(s_gcam_key_c);
+  p.Do(s_firmware);
+  p.Do(s_media_buffer_32);
+  p.Do(s_network_command_buffer);
+  p.Do(s_network_buffer);
+  p.Do(s_allnet_buffer);
+  p.Do(s_allnet_settings);
+
+  p.Do(s_game_modified_ip_address);
+
+  p.Do(s_board_status);
+  p.Do(s_load_progress);
+
+  // TODO: Handle the files better.
+  // Data corruption is probably currently possible.
+
+  // s_netcfg
+  // s_netctrl
+  // s_extra
+  // s_backup
+  // s_dimm
+
+  // TODO: Handle sockets better.
+  // For now, we just recreate a TCP socket for any socket that existed.
+  // We should probably re-bind sockets and handle UDP sockets.
+
+  GuestFdSet created_sockets{};
+  if (p.IsWriteMode() || p.IsVerifyMode())
+  {
+    for (u32 i = FIRST_VALID_FD; i < std::size(s_sockets); ++i)
+    {
+      if (s_sockets[i] != SOCKET_ERROR)
+        created_sockets.SetFd(GuestSocket(i));
+    }
+  }
+
+  p.Do(created_sockets);
+
+  if (p.IsReadMode())
+  {
+    CloseAllSockets();
+
+    for (u32 i = FIRST_VALID_FD; i < std::size(s_sockets); ++i)
+    {
+      if (!created_sockets.IsFdSet(GuestSocket(i)))
+        continue;
+
+      s_sockets[i] = socket(AF_INET, SOCK_STREAM, 0);
+    }
+  }
+}
+
+s32 DebuggerGetSocket(u32 triforce_fd)
+{
+  if (triforce_fd < std::size(s_sockets))
+    return s32(s_sockets[triforce_fd]);
+
+  WARN_LOG_FMT(AMMEDIABOARD, "GC-AM: Bad socket fd used by the debugger: {}", triforce_fd);
+  return -1;
+}
+}  // namespace AMMediaboard
diff --git a/Source/Core/Core/HW/DVD/AMMediaboard.h b/Source/Core/Core/HW/DVD/AMMediaboard.h
new file mode 100644
index 000000000000..4fa649c8bb21
--- /dev/null
+++ b/Source/Core/Core/HW/DVD/AMMediaboard.h
@@ -0,0 +1,274 @@
+// Copyright 2025 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <array>
+#include <optional>
+#include <span>
+#include <string_view>
+
+#include "Common/ChunkFile.h"
+#include "Common/CommonTypes.h"
+#include "Common/Network.h"
+
+#include "DiscIO/Volume.h"
+
+namespace Core
+{
+class CPUThreadGuard;
+class System;
+}  // namespace Core
+
+namespace AMMediaboard
+{
+
+enum GameType
+{
+  FZeroAX = 1,
+  FZeroAXMonster,
+  MarioKartGP,
+  MarioKartGP2,
+  VirtuaStriker3,
+  VirtuaStriker4,
+  VirtuaStriker4_2006,
+  GekitouProYakyuu,
+  KeyOfAvalon,
+  FirmwareUpdate,
+};
+
+enum MediaType
+{
+  GDROM = 1,
+  NAND,
+};
+
+enum MediaBoardType
+{
+  NANDMaskBoardHDD = 0,
+  NANDMaskBoardMask = 1,
+  NANDMaskBoardNAND = 2,
+  DIMMBoardType3 = 4,
+};
+
+enum MediaBoardStatus
+{
+  Initializing = 0,
+  CheckingNetwork = 1,
+  SystemDisc = 2,
+  TestingGameProgram = 3,
+  LoadingGameProgram = 4,
+  LoadedGameProgram = 5,
+  Error = 6,
+};
+
+enum InquiryType
+{
+  Version1 = 0x21484100,
+  Version2 = 0x29484100,
+};
+
+struct MediaBoardRange
+{
+  u32 start;
+  u32 end;
+  u8* buffer;
+  std::size_t buffer_size;
+
+  MediaBoardRange(u32 start_, u32 size_, std::span<u8> buffer_);
+};
+
+enum class AMMBDICommand : u16
+{
+  Inquiry = 0x12,
+  Read = 0xA8,
+  Write = 0xAA,
+  Execute = 0xAB,
+};
+
+enum class AMMBCommand : u16
+{
+  Unknown_000 = 0x000,
+  GetDIMMSize = 0x001,
+
+  GetMediaBoardStatus = 0x100,
+  GetSegaBootVersion = 0x101,
+  GetSystemFlags = 0x102,
+  GetMediaBoardSerial = 0x103,
+  Unknown_104 = 0x104,
+
+  NetworkReInit = 0x204,
+
+  TestHardware = 0x301,
+
+  // Network used by Mario Kart GPs
+  Accept = 0x401,
+  Bind = 0x402,
+  Closesocket = 0x403,
+  Connect = 0x404,
+  GetIPbyDNS = 0x405,
+  InetAddr = 0x406,
+  Ioctl = 0x407,  // Unused
+  Listen = 0x408,
+  Recv = 0x409,
+  Send = 0x40A,
+  Socket = 0x40B,
+  Select = 0x40C,
+  Shutdown = 0x40D,  // Unused
+  SetSockOpt = 0x40E,
+  GetSockOpt = 0x40F,  // Unused
+  SetTimeOuts = 0x410,
+  GetLastError = 0x411,
+  RouteAdd = 0x412,     // Unused
+  RouteDelete = 0x413,  // Unused
+  GetParambyDHCPExec = 0x414,
+  ModifyMyIPaddr = 0x415,
+  Recvfrom = 0x416,       // Unused
+  Sendto = 0x417,         // Unused
+  RecvDimmImage = 0x418,  // Unused
+  SendDimmImage = 0x419,  // Unused
+
+  // Network used by F-Zero AX
+  InitLink = 0x601,
+  Unknown_605 = 0x605,
+  SetupLink = 0x606,
+  SearchDevices = 0x607,
+  Unknown_608 = 0x608,
+  Unknown_614 = 0x614,
+
+  // All.Net used by Virtua Striker 4 2006 (Japan)
+  AllNetInit = 0x700,
+  Unknown_701 = 0x701,
+  Unknown_702 = 0x702,
+  Unknown_703 = 0x703,
+  Unknown_704 = 0x704,
+
+  // NETDIMM Commands
+  Unknown_001 = 0x001,
+  GetNetworkFirmVersion = 0x101,
+  Unknown_103 = 0x103,
+};
+
+enum MediaBoardAddress : u32
+{
+  MediaBoardStatus1 = 0x80000000,
+  MediaBoardStatus2 = 0x80000020,
+  MediaBoardStatus3 = 0x80000040,
+
+  FirmwareStatus1 = 0x80000120,
+  FirmwareStatus2 = 0x80000140,
+
+  BackupMemory = 0x000006A0,
+
+  DIMMMemory = 0x1F000000,
+  DIMMMemory2 = 0xFF000000,
+
+  DIMMExtraSettings = 0x1FFEFFE0,
+
+  AllNetSettings = 0x1EFF8000,
+
+  NetworkControl = 0xFFFF0000,
+
+  DIMMCommandVersion1 = 0x1F900000,
+  DIMMCommandVersion2 = 0x84000000,
+  DIMMCommandVersion2_2 = 0x89000000,
+  DIMMCommandExecute1 = 0x84000040,
+  DIMMCommandExecute2 = 0x88000000,
+
+  NetworkCommandAddress1 = 0x1F800200,
+  NetworkCommandAddress2 = 0x89040200,
+
+  NetworkBufferAddress1 = 0x1FA00000,
+  NetworkBufferAddress2 = 0x1FD00000,
+  NetworkBufferAddress3 = 0x89100000,
+  NetworkBufferAddress4 = 0x89180000,
+  NetworkBufferAddress5 = 0x1FB00000,
+
+  AllNetBuffer = 0x89010000,
+
+  FirmwareAddress = 0x84800000,
+
+  FirmwareMagicWrite1 = 0x00600000,
+  FirmwareMagicWrite2 = 0x00700000,
+};
+
+// Mario Kart GP2 has a complete list of them
+// but in japanese
+// They somewhat match WSA errors codes
+enum SocketStatusCodes
+{
+  SSC_E_4 = -4,  // Failure (abnormal argument)
+  SSC_E_3 = -3,  // Success (unsupported command)
+  SSC_E_2 =
+      -2,  // Failure (failed to send, abnormal argument, or communication condition violation)
+  SSC_E_1 = -1,  // Failure (error termination)
+
+  SSC_EINTR = 4,    // An interrupt occurred before data reception was completed
+  SSC_EBADF = 9,    // Invalid descriptor
+  SSC_E_11 = 11,    // Send operation was blocked on a non-blocking mode socket
+  SSC_EACCES = 13,  // The socket does not support broadcast addresses, but the destination address
+                    // is a broadcast address
+  SSC_EFAULT =
+      14,  // The name argument specifies a location other than an address used by the process.
+  SSC_E_23 = 23,     // System file table is full.
+  SSC_AEMFILE = 24,  // Process descriptor table is full.
+  SSC_EMSGSIZE =
+      36,  // Socket tried to send message without splitting, but message size is too large.
+  SSC_EAFNOSUPPORT = 47,   // Address prohibited for use on this socket.
+  SSC_EADDRINUSE = 48,     // Address already in use.
+  SSC_EADDRNOTAVAIL = 49,  // Prohibited address.
+  SSC_E_50 = 50,           // Non-socket descriptor.
+  SSC_ENETUNREACH = 51,    // Cannot access specified network.
+  SSC_ENOBUFS = 55,        // Insufficient buffer
+  SSC_EISCONN = 56,        // Already connected socket
+  SSC_ENOTCONN = 57,       // No connection for connection-type socket
+  SSC_ETIMEDOUT = 60,      // Timeout
+  SSC_ECONNREFUSED = 61,   // Connection request forcibly rejected
+  SSC_EHOSTUNREACH = 65,   // Remote host cannot be reached
+  SSC_EHOSTDOWN = 67,      // Remote host is down
+  SSC_EWOULDBLOCK = 70,    // Socket is in non-blocking mode and connection has not been completed
+  SSC_E_69 = 69,  // Socket is in non-blocking mode and a previously issued Connect command has not
+                  // been completed
+  SSC_SUCCESS = 70,
+};
+
+static constexpr std::size_t SOCKET_FD_MAX = 64;
+
+void Init();
+void FirmwareMap(bool on);
+void InitDIMM(const DiscIO::Volume& volume);
+void InitKeys(u32 key_a, u32 key_b, u32 key_c);
+u32 ExecuteCommand(std::array<u32, 3>& dicmd_buf, u32* diimm_buf, u32 address, u32 length);
+u32 GetGameType();
+u32 GetMediaType();
+bool GetTestMenu();
+void Shutdown();
+void DoState(PointerWrap& p);
+
+struct ParsedIPRedirection
+{
+  std::string_view original;
+  std::string_view replacement;
+  std::string_view description;
+};
+
+std::optional<ParsedIPRedirection> ParseIPRedirection(std::string_view str);
+
+struct IPRedirection
+{
+  Common::IPv4PortRange original;
+  Common::IPv4PortRange replacement;
+
+  // Caller should check if it matches first!
+  Common::IPv4Port Apply(Common::IPv4Port subject) const;
+  Common::IPv4Port Reverse(Common::IPv4Port subject) const;
+  std::string ToString() const;
+};
+
+using IPRedirections = std::vector<IPRedirection>;
+
+IPRedirections GetIPRedirections();
+
+s32 DebuggerGetSocket(u32 triforce_fd);
+
+};  // namespace AMMediaboard
diff --git a/Source/Core/Core/HW/DVD/DVDInterface.cpp b/Source/Core/Core/HW/DVD/DVDInterface.cpp
index 410f5763a551..33b0efc548f1 100644
--- a/Source/Core/Core/HW/DVD/DVDInterface.cpp
+++ b/Source/Core/Core/HW/DVD/DVDInterface.cpp
@@ -5,7 +5,6 @@
 
 #include <algorithm>
 #include <array>
-#include <cmath>
 #include <memory>
 #include <optional>
 #include <string>
@@ -27,6 +26,7 @@
 #include "Core/CoreTiming.h"
 #include "Core/DolphinAnalytics.h"
 #include "Core/HW/AudioInterface.h"
+#include "Core/HW/DVD/AMMediaboard.h"
 #include "Core/HW/DVD/DVDMath.h"
 #include "Core/HW/DVD/DVDThread.h"
 #include "Core/HW/EXI/EXI_DeviceIPL.h"
@@ -124,6 +124,12 @@ void DVDInterface::DoState(PointerWrap& p)
   m_system.GetDVDThread().DoState(p);
 
   m_adpcm_decoder.DoState(p);
+
+  if (m_system.IsTriforce())
+  {
+    AMMediaboard::DoState(p);
+    p.DoMarker("AMMediaboard");
+  }
 }
 
 size_t DVDInterface::ProcessDTKSamples(s16* target_samples, size_t target_block_count,
@@ -282,6 +288,17 @@ void DVDInterface::Init()
 
   u64 userdata = PackFinishExecutingCommandUserdata(ReplyType::DTK, DIInterruptType::TCINT);
   core_timing.ScheduleEvent(0, m_finish_executing_command, userdata);
+
+  if (m_system.IsTriforce())
+  {
+    AMMediaboard::Init();
+
+    // The Triforce IPL expects the cover to be closed
+    m_DICVR.Hex = 0;
+    // The Triforce IPL checks this bit to set the physical memory to
+    // either 50MB(unset) or 24MB(set)
+    m_DICFG.Hex |= 8;
+  }
 }
 
 // Resets state on the MN102 chip in the drive itself, but not the DI registers exposed on the
@@ -311,7 +328,7 @@ void DVDInterface::ResetDrive(bool spinup)
   else if (!spinup)
   {
     // Wii hardware tests indicate that this is used when ejecting and inserting a new disc, or
-    // performing a reset without spinup.
+    // performing a reset without spin-up.
     SetDriveState(DriveState::DiscChangeDetected);
   }
   else
@@ -331,6 +348,11 @@ void DVDInterface::ResetDrive(bool spinup)
 void DVDInterface::Shutdown()
 {
   m_system.GetDVDThread().Stop();
+
+  if (m_system.IsTriforce())
+  {
+    AMMediaboard::Shutdown();
+  }
 }
 
 static u64 GetDiscEndOffset(const DiscIO::VolumeDisc& disc)
@@ -428,7 +450,8 @@ void DVDInterface::EjectDiscCallback(Core::System& system, u64 userdata, s64 cyc
 void DVDInterface::InsertDiscCallback(Core::System& system, u64 userdata, s64 cyclesLate)
 {
   auto& di = system.GetDVDInterface();
-  std::unique_ptr<DiscIO::VolumeDisc> new_disc = DiscIO::CreateDisc(di.m_disc_path_to_insert);
+  std::unique_ptr<DiscIO::VolumeDisc> new_disc =
+      DiscIO::CreateDiscForCore(di.m_disc_path_to_insert);
 
   if (new_disc)
     di.SetDisc(std::move(new_disc), {});
@@ -697,11 +720,16 @@ bool DVDInterface::CheckReadPreconditions()
     SetDriveError(DriveError::MotorStopped);
     return false;
   }
-  if (m_drive_state == DriveState::DiscIdNotRead)
+
+  // SegaBoot doesn't read the Disc ID
+  if (!m_system.IsTriforce())
   {
-    ERROR_LOG_FMT(DVDINTERFACE, "Disc id not read.");
-    SetDriveError(DriveError::NoDiscID);
-    return false;
+    if (m_drive_state == DriveState::DiscIdNotRead)
+    {
+      ERROR_LOG_FMT(DVDINTERFACE, "Disc id not read.");
+      SetDriveError(DriveError::NoDiscID);
+      return false;
+    }
   }
   return true;
 }
@@ -753,12 +781,19 @@ void DVDInterface::ExecuteCommand(ReplyType reply_type)
   DIInterruptType interrupt_type = DIInterruptType::TCINT;
   bool command_handled_by_thread = false;
 
-  // Swaps endian of Triforce DI commands, and zeroes out random bytes to prevent unknown read
-  // subcommand errors
-  auto& dvd_thread = m_system.GetDVDThread();
-  if (dvd_thread.HasDisc() && dvd_thread.GetDiscType() == DiscIO::Platform::Triforce)
+  if (m_system.IsTriforce())
   {
-    // TODO(C++23): Use std::byteswap and a bitwise AND for increased clarity
+    if (!AMMediaboard::ExecuteCommand(m_DICMDBUF, &m_DIIMMBUF, m_DIMAR, m_DILENGTH))
+    {
+      // Transfer is done
+      m_DICR.TSTART = 0;
+      m_DIMAR += m_DILENGTH;
+      m_DILENGTH = 0;
+      GenerateDIInterrupt(DIInterruptType::TCINT);
+      m_error_code = DriveError::None;
+      return;
+    }
+    // Normal read command pass on to normal handling
     m_DICMDBUF[0] <<= 24;
   }
 
diff --git a/Source/Core/Core/HW/DVD/DVDMath.cpp b/Source/Core/Core/HW/DVD/DVDMath.cpp
index dae98159aa8c..311105ff4c71 100644
--- a/Source/Core/Core/HW/DVD/DVDMath.cpp
+++ b/Source/Core/Core/HW/DVD/DVDMath.cpp
@@ -52,7 +52,7 @@ constexpr double LONG_SEEK_VELOCITY_INVERSE = 4.5;  // inverse: s/m
 // In practice this yields good-enough numbers as a more exact formula
 // involving the integral over a polar equation (too complex to describe here)
 // or the approximation of a DVD as a set of concentric circles (which is a
-// better approximation, but makes futher derivations more complicated than
+// better approximation, but makes further derivations more complicated than
 // they need to be).
 //
 // From the area approximation, we end up with this formula:
diff --git a/Source/Core/Core/HW/DVD/FileMonitor.cpp b/Source/Core/Core/HW/DVD/FileMonitor.cpp
index b469b4257022..f7e5e8019ec4 100644
--- a/Source/Core/Core/HW/DVD/FileMonitor.cpp
+++ b/Source/Core/Core/HW/DVD/FileMonitor.cpp
@@ -3,7 +3,6 @@
 
 #include "Core/HW/DVD/FileMonitor.h"
 
-#include <algorithm>
 #include <memory>
 #include <string>
 #include <unordered_set>
diff --git a/Source/Core/Core/HW/EXI/BBA/BuiltIn.cpp b/Source/Core/Core/HW/EXI/BBA/BuiltIn.cpp
index 1028a532c1c0..97afbbaa0878 100644
--- a/Source/Core/Core/HW/EXI/BBA/BuiltIn.cpp
+++ b/Source/Core/Core/HW/EXI/BBA/BuiltIn.cpp
@@ -14,7 +14,6 @@
 #else
 #include <sys/select.h>
 #include <sys/socket.h>
-#include <sys/types.h>
 #endif
 
 #include "Common/BitUtils.h"
@@ -22,7 +21,6 @@
 #include "Common/MsgHandler.h"
 #include "Common/Network.h"
 #include "Common/ScopeGuard.h"
-#include "Core/HW/EXI/EXI_Device.h"
 #include "Core/HW/EXI/EXI_DeviceEthernet.h"
 
 namespace
diff --git a/Source/Core/Core/HW/EXI/BBA/TAPServerConnection.cpp b/Source/Core/Core/HW/EXI/BBA/TAPServerConnection.cpp
index 2bc9b4ed810c..570221c72b40 100644
--- a/Source/Core/Core/HW/EXI/BBA/TAPServerConnection.cpp
+++ b/Source/Core/Core/HW/EXI/BBA/TAPServerConnection.cpp
@@ -1,28 +1,25 @@
 // Copyright 2020 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include <cstdlib>
+#include <cstring>
 #include <optional>
-#include "Core/HW/EXI/EXI_DeviceEthernet.h"
-#include "SFML/Network/IpAddress.hpp"
 
 #ifdef _WIN32
 #include <winsock2.h>
 #include <ws2ipdef.h>
 #else
-#include <fcntl.h>
+#include <netinet/in.h>
 #include <sys/socket.h>
-#include <sys/types.h>
 #include <sys/un.h>
 #include <unistd.h>
 #endif
 
-#include <cstdlib>
-#include <cstring>
-
-#include "Common/CommonFuncs.h"
 #include "Common/Logging/Log.h"
+#include "Common/Network.h"
 #include "Common/StringUtil.h"
-#include "Core/HW/EXI/EXI_Device.h"
+#include "Core/HW/EXI/BBA/TAPServerConnection.h"
+#include "SFML/Network/IpAddress.hpp"
 
 namespace ExpansionInterface
 {
@@ -34,11 +31,7 @@ using ws_ssize_t = int;
 using ws_ssize_t = ssize_t;
 #endif
 
-#ifdef __linux__
-#define SEND_FLAGS MSG_NOSIGNAL
-#else
-#define SEND_FLAGS 0
-#endif
+using Common::SEND_FLAGS;
 
 TAPServerConnection::TAPServerConnection(const std::string& destination,
                                          std::function<void(std::string&&)> recv_cb,
@@ -117,11 +110,7 @@ static int ConnectToDestination(const std::string& destination)
     return -1;
   }
 
-#ifdef __APPLE__
-  int opt_no_sigpipe = 1;
-  if (setsockopt(fd, SOL_SOCKET, SO_NOSIGPIPE, &opt_no_sigpipe, sizeof(opt_no_sigpipe)) < 0)
-    INFO_LOG_FMT(SP1, "Failed to set SO_NOSIGPIPE on socket\n");
-#endif
+  Common::SetPlatformSocketOptions(fd);
 
   if (connect(fd, reinterpret_cast<sockaddr*>(&ss), ss_size) == -1)
   {
diff --git a/Source/Core/Core/HW/EXI/BBA/TAPServerConnection.h b/Source/Core/Core/HW/EXI/BBA/TAPServerConnection.h
index dbb8c6ee7a5e..20b32dd985f4 100644
--- a/Source/Core/Core/HW/EXI/BBA/TAPServerConnection.h
+++ b/Source/Core/Core/HW/EXI/BBA/TAPServerConnection.h
@@ -7,6 +7,7 @@
 #include <string>
 #include <thread>
 
+#include "Common/CommonTypes.h"
 #include "Common/Flag.h"
 #include "Common/SocketContext.h"
 
diff --git a/Source/Core/Core/HW/EXI/BBA/TAP_Unix.cpp b/Source/Core/Core/HW/EXI/BBA/TAP_Unix.cpp
index 81ea396149c4..a147cc707368 100644
--- a/Source/Core/Core/HW/EXI/BBA/TAP_Unix.cpp
+++ b/Source/Core/Core/HW/EXI/BBA/TAP_Unix.cpp
@@ -9,20 +9,15 @@
 #include <unistd.h>
 #endif
 
-#include <fmt/format.h>
-
 #include "Common/Logging/Log.h"
 #include "Common/StringUtil.h"
-#include "Core/HW/EXI/EXI_Device.h"
 
 #ifdef __linux__
 #include <fcntl.h>
 #include <linux/if_tun.h>
 #include <net/if.h>
-#include <netinet/in.h>
 #include <sys/ioctl.h>
 #include <sys/select.h>
-#include <sys/socket.h>
 #endif
 
 namespace ExpansionInterface
diff --git a/Source/Core/Core/HW/EXI/BBA/TAP_Win32.cpp b/Source/Core/Core/HW/EXI/BBA/TAP_Win32.cpp
index fc6051969d53..c0abd75e4328 100644
--- a/Source/Core/Core/HW/EXI/BBA/TAP_Win32.cpp
+++ b/Source/Core/Core/HW/EXI/BBA/TAP_Win32.cpp
@@ -12,7 +12,7 @@
 
 namespace Win32TAPHelper
 {
-bool IsTAPDevice(const TCHAR* guid)
+static bool IsTAPDevice(const TCHAR* guid)
 {
   HKEY netcard_key;
   LONG status;
@@ -88,7 +88,7 @@ bool IsTAPDevice(const TCHAR* guid)
   return false;
 }
 
-bool GetGUIDs(std::vector<std::basic_string<TCHAR>>& guids)
+static bool GetGUIDs(std::vector<std::basic_string<TCHAR>>& guids)
 {
   LONG status;
   HKEY control_net_key;
@@ -155,7 +155,7 @@ bool GetGUIDs(std::vector<std::basic_string<TCHAR>>& guids)
   return !guids.empty();
 }
 
-bool OpenTAP(HANDLE& adapter, const std::basic_string<TCHAR>& device_guid)
+static bool OpenTAP(HANDLE& adapter, const std::basic_string<TCHAR>& device_guid)
 {
   auto const device_path = USERMODEDEVICEDIR + device_guid + TAPSUFFIX;
 
diff --git a/Source/Core/Core/HW/EXI/BBA/XLINK_KAI_BBA.cpp b/Source/Core/Core/HW/EXI/BBA/XLINK_KAI_BBA.cpp
index 4cb45d3b7772..07b7bad783b4 100644
--- a/Source/Core/Core/HW/EXI/BBA/XLINK_KAI_BBA.cpp
+++ b/Source/Core/Core/HW/EXI/BBA/XLINK_KAI_BBA.cpp
@@ -1,18 +1,13 @@
 // Copyright 2008 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "Common/Assert.h"
 #include "Common/Logging/Log.h"
-#include "Common/MsgHandler.h"
 #include "Common/StringUtil.h"
-#include "Core/HW/EXI/EXI_Device.h"
 #include "Core/HW/EXI/EXI_DeviceEthernet.h"
 
 #include "SFML/Network/IpAddress.hpp"
 #include "VideoCommon/OnScreenDisplay.h"
 
-#include <SFML/Network.hpp>
-
 #include <cstring>
 #include <optional>
 
@@ -113,7 +108,7 @@ bool CEXIETHERNET::XLinkNetworkInterface::SendFrame(const u8* frame, u32 size)
       m_bba_failure_notified = true;
     }
 
-    // Return true because this isnt an error dolphin needs to handle
+    // Return true because this isn't an error dolphin needs to handle
     return true;
   }
 
@@ -160,7 +155,7 @@ void CEXIETHERNET::XLinkNetworkInterface::ReadThreadHandler(
       ERROR_LOG_FMT(SP1, "Failed to read from BBA, err={}", bytes_read);
     }
 
-    // Make sure *anything* was recieved before going any further
+    // Make sure *anything* was received before going any further
     if (bytes_read < 1)
       continue;
 
@@ -193,7 +188,7 @@ void CEXIETHERNET::XLinkNetworkInterface::ReadThreadHandler(
         }
       }
     }
-    // Otherwise we recieved control data or junk
+    // Otherwise we received control data or junk
     else
     {
       const std::string control_msg(self->m_in_frame, self->m_in_frame + bytes_read);
diff --git a/Source/Core/Core/HW/EXI/EXI.cpp b/Source/Core/Core/HW/EXI/EXI.cpp
index d676dc48455e..144fdd57b909 100644
--- a/Source/Core/Core/HW/EXI/EXI.cpp
+++ b/Source/Core/Core/HW/EXI/EXI.cpp
@@ -66,18 +66,6 @@ void ExpansionInterfaceManager::AddMemoryCard(Slot slot)
   m_channels[SlotToEXIChannel(slot)]->AddDevice(memorycard_device, SlotToEXIDevice(slot));
 }
 
-void ExpansionInterfaceManager::AddSP1Device()
-{
-  EXIDeviceType sp1_device = EXIDeviceType::Baseboard;
-  auto& system = Core::System::GetInstance();
-  if (system.IsTriforce())
-  {
-    sp1_device = Config::Get(Config::MAIN_SERIAL_PORT_1);
-  }
-
-  m_channels[0]->AddDevice(sp1_device, SlotToEXIDevice(Slot::SP1));
-}
-
 u8 SlotToEXIChannel(Slot slot)
 {
   switch (slot)
@@ -157,9 +145,15 @@ void ExpansionInterfaceManager::Init(const Sram* override_sram)
     AddMemoryCard(slot);
 
   m_channels[0]->AddDevice(EXIDeviceType::MaskROM, 1);
-  AddSP1Device();
-  m_channels[SlotToEXIChannel(Slot::SP1)]->AddDevice(Config::Get(Config::MAIN_SERIAL_PORT_1),
-                                                     SlotToEXIDevice(Slot::SP1));
+
+  // Automatically connect the Triforce Baseboard in Triforce mode
+  EXIDeviceType sp1_device = Config::Get(Config::MAIN_SERIAL_PORT_1);
+  if (m_system.IsTriforce())
+  {
+    sp1_device = EXIDeviceType::Baseboard;
+  }
+
+  m_channels[SlotToEXIChannel(Slot::SP1)]->AddDevice(sp1_device, SlotToEXIDevice(Slot::SP1));
   m_channels[SlotToEXIChannel(Slot::SP2)]->AddDevice(Config::Get(Config::MAIN_SERIAL_PORT_2),
                                                      SlotToEXIDevice(Slot::SP2));
 
diff --git a/Source/Core/Core/HW/EXI/EXI.h b/Source/Core/Core/HW/EXI/EXI.h
index f0ea5fbfb56e..7ded905b982e 100644
--- a/Source/Core/Core/HW/EXI/EXI.h
+++ b/Source/Core/Core/HW/EXI/EXI.h
@@ -89,7 +89,6 @@ class ExpansionInterfaceManager
 
 private:
   void AddMemoryCard(Slot slot);
-  void AddSP1Device();
 
   static void ChangeDeviceCallback(Core::System& system, u64 userdata, s64 cycles_late);
   static void UpdateInterruptsCallback(Core::System& system, u64 userdata, s64 cycles_late);
diff --git a/Source/Core/Core/HW/EXI/EXI_Device.cpp b/Source/Core/Core/HW/EXI/EXI_Device.cpp
index c1300a363f1f..ab92aa5be6a8 100644
--- a/Source/Core/Core/HW/EXI/EXI_Device.cpp
+++ b/Source/Core/Core/HW/EXI/EXI_Device.cpp
@@ -6,7 +6,6 @@
 #include <memory>
 
 #include "Common/CommonTypes.h"
-#include "Common/MsgHandler.h"
 #include "Core/HW/EXI/EXI_DeviceAD16.h"
 #include "Core/HW/EXI/EXI_DeviceAGP.h"
 #include "Core/HW/EXI/EXI_DeviceBaseboard.h"
@@ -21,6 +20,8 @@
 
 #ifdef HAVE_CUBEB
 #include "Core/HW/EXI/EXI_DeviceMic.h"
+#else
+#include "Common/MsgHandler.h"
 #endif
 
 namespace ExpansionInterface
diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceAGP.cpp b/Source/Core/Core/HW/EXI/EXI_DeviceAGP.cpp
index 8b7e62d305d4..a2aba8a887b1 100644
--- a/Source/Core/Core/HW/EXI/EXI_DeviceAGP.cpp
+++ b/Source/Core/Core/HW/EXI/EXI_DeviceAGP.cpp
@@ -4,7 +4,6 @@
 #include "Core/HW/EXI/EXI_DeviceAGP.h"
 
 #include <algorithm>
-#include <memory>
 #include <string>
 #include <vector>
 
diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceBaseboard.cpp b/Source/Core/Core/HW/EXI/EXI_DeviceBaseboard.cpp
index a9200ac85a57..c285d6918927 100644
--- a/Source/Core/Core/HW/EXI/EXI_DeviceBaseboard.cpp
+++ b/Source/Core/Core/HW/EXI/EXI_DeviceBaseboard.cpp
@@ -1,21 +1,107 @@
-// Copyright 2013 Dolphin Emulator Project
+// Copyright 2025 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "Core/HW/EXI/EXI_DeviceBaseboard.h"
 
-#include "Common/Assert.h"
-#include "Common/ChunkFile.h"
+#include <numeric>
+#include <string>
+
+#include <fmt/format.h>
+
+#include "Common/BitUtils.h"
+#include "Common/Buffer.h"
 #include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/IOFile.h"
 #include "Common/Logging/Log.h"
 
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/HW/DVD/AMMediaboard.h"
+#include "Core/HW/EXI/EXI.h"
+#include "Core/HW/Memmap.h"
+#include "Core/System.h"
+
+static bool s_interrupt_set = false;
+static u32 s_irq_timer = 0;
+static u32 s_irq_status = 0;
+
+static u16 CheckSum(const u8* data, u32 length)
+{
+  return std::accumulate(data, data + length, 0);
+}
+
 namespace ExpansionInterface
 {
+
+void GenerateInterrupt(int flag)
+{
+  auto& system = Core::System::GetInstance();
+
+  s_interrupt_set = true;
+  s_irq_timer = 0;
+  s_irq_status = flag;
+
+  system.GetExpansionInterface().UpdateInterrupts();
+}
+
 CEXIBaseboard::CEXIBaseboard(Core::System& system) : IEXIDevice(system)
+{
+  std::string backup_filename(fmt::format("{}tribackup_{}.bin", File::GetUserPath(D_TRIUSER_IDX),
+                                          SConfig::GetInstance().GetGameID()));
+
+  m_backup = File::IOFile(backup_filename, "rb+");
+  if (!m_backup.IsOpen())
+  {
+    m_backup = File::IOFile(backup_filename, "wb+");
+  }
+
+  // Some games share the same ID Client/Server
+  if (!m_backup.IsGood())
+  {
+    PanicAlertFmt("Failed to open {}\nFile might be in use.", backup_filename.c_str());
+
+    std::srand(static_cast<u32>(std::time(nullptr)));
+
+    backup_filename = fmt::format("{}tribackup_tmp_{}{}.bin", File::GetUserPath(D_TRIUSER_IDX),
+                                  rand(), SConfig::GetInstance().GetGameID());
+
+    m_backup = File::IOFile(backup_filename, "wb+");
+  }
+
+  // Virtua Striker 4 and Gekitou Pro Yakyuu need a higher FIRM version
+  // Which is read from the backup data?!
+  if (AMMediaboard::GetGameType() == AMMediaboard::VirtuaStriker4 ||
+      AMMediaboard::GetGameType() == AMMediaboard::GekitouProYakyuu)
+  {
+    const u64 backup_size = m_backup.GetSize();
+    if (backup_size >= 0x20C + 0x1F4)
+    {
+      Common::UniqueBuffer<u8> data(backup_size);
+      m_backup.ReadBytes(data.data(), data.size());
+
+      // Set FIRM version
+      Common::BitCastPtr<u16>(data.data() + 0x12) = 0x1703;
+      Common::BitCastPtr<u16>(data.data() + 0x212) = 0x1703;
+
+      // Update checksum
+      Common::BitCastPtr<u16>(data.data() + 0x0A) = Common::swap16(CheckSum(&data[0xC], 0x1F4));
+      Common::BitCastPtr<u16>(data.data() + 0x20A) = Common::swap16(CheckSum(&data[0x20C], 0x1F4));
+
+      m_backup.Seek(0, File::SeekOrigin::Begin);
+      m_backup.WriteBytes(data.data(), data.size());
+      m_backup.Flush();
+    }
+  }
+}
+
+CEXIBaseboard::~CEXIBaseboard()
 {
 }
 
 void CEXIBaseboard::SetCS(int cs)
 {
+  DEBUG_LOG_FMT(SP1, "AM-BB: ChipSelect={}", cs);
   if (cs)
     m_position = 0;
 }
@@ -25,33 +111,203 @@ bool CEXIBaseboard::IsPresent() const
   return true;
 }
 
+bool CEXIBaseboard::IsInterruptSet()
+{
+  if (s_interrupt_set)
+  {
+    DEBUG_LOG_FMT(SP1, "AM-BB: IRQ");
+    if (++s_irq_timer > 12)
+      s_interrupt_set = false;
+    return true;
+  }
+
+  return false;
+}
+
+void CEXIBaseboard::DMAWrite(u32 addr, u32 size)
+{
+  const auto& system = Core::System::GetInstance();
+  const auto& memory = system.GetMemory();
+  auto span = memory.GetSpanForAddress(addr);
+
+  if (span.size() < size)
+  {
+    ERROR_LOG_FMT(SP1, "AM-BB: Backup DMA Write overflow: address=0x{:08x}, length={}, span={}",
+                  addr, size, span.size());
+    return;
+  }
+  NOTICE_LOG_FMT(SP1, "AM-BB: COMMAND: Backup DMA Write: {:08x} {:x}", addr, size);
+
+  m_backup.Seek(m_backup_offset, File::SeekOrigin::Begin);
+  m_backup.WriteBytes(span.data(), size);
+  m_backup.Flush();
+}
+
+void CEXIBaseboard::DMARead(u32 addr, u32 size)
+{
+  const auto& system = Core::System::GetInstance();
+  const auto& memory = system.GetMemory();
+  auto span = memory.GetSpanForAddress(addr);
+
+  if (span.size() < size)
+  {
+    ERROR_LOG_FMT(SP1, "AM-BB: Backup DMA Read overflow: address=0x{:08x}, length={}, span={}",
+                  addr, size, span.size());
+    return;
+  }
+  NOTICE_LOG_FMT(SP1, "AM-BB: COMMAND: Backup DMA Read: {:08x} {:x}", addr, size);
+
+  m_backup.Seek(m_backup_offset, File::SeekOrigin::Begin);
+  m_backup.ReadBytes(span.data(), size);
+}
+
 void CEXIBaseboard::TransferByte(u8& byte)
 {
-  if (m_position == 0)
+  DEBUG_LOG_FMT(SP1, "AM-BB: > {:02x}", byte);
+  if (m_position < 4)
   {
-    m_command = byte;
+    m_command[m_position] = byte;
+    byte = 0xFF;
   }
-  else
+
+  if ((m_position >= 2) && (m_command[0] == 0 && m_command[1] == 0))
   {
-    switch (m_command)
+    // Read serial ID
+    byte = "\x06\x04\x10\x00"[(m_position - 2) & 3];
+  }
+  else if (m_position == 3)
+  {
+    u32 checksum = (m_command[0] << 24) | (m_command[1] << 16) | (m_command[2] << 8);
+    u32 bit = 0x80000000UL;
+    u32 check = 0x8D800000UL;
+    while (bit >= 0x100)
     {
-    case 0x00:
+      if (checksum & bit)
+        checksum ^= check;
+      check >>= 1;
+      bit >>= 1;
+    }
+
+    if (m_command[3] != (checksum & 0xFF))
+      DEBUG_LOG_FMT(SP1, "AM-BB: cs: {:02x}, w: {:02x}", m_command[3], checksum & 0xFF);
+  }
+  else if (m_position == 4)
+  {
+    switch (m_command[0])
     {
-      static constexpr std::array<u8, 4> ID = {0x06, 0x04, 0x10, 0x00};
-      byte = ID[(m_position - 2) & 3];
+    case BackupOffsetSet:
+      m_backup_offset = (m_command[1] << 8) | m_command[2];
+      DEBUG_LOG_FMT(SP1, "AM-BB: COMMAND: BackupOffsetSet:{:04x}", m_backup_offset);
+      m_backup.Seek(m_backup_offset, File::SeekOrigin::Begin);
+      byte = 0x01;
+      break;
+    case BackupWrite:
+      DEBUG_LOG_FMT(SP1, "AM-BB: COMMAND: BackupWrite:{:04x}-{:02x}", m_backup_offset,
+                    m_command[1]);
+      m_backup.WriteBytes(&m_command[1], 1);
+      m_backup.Flush();
+      byte = 0x01;
+      break;
+    case BackupRead:
+      DEBUG_LOG_FMT(SP1, "AM-BB: COMMAND: BackupRead :{:04x}", m_backup_offset);
+      byte = 0x01;
+      break;
+    case DMAOffsetLengthSet:
+      m_backup_dma_offset = (m_command[1] << 8) | m_command[2];
+      m_backup_dma_length = m_command[3];
+      NOTICE_LOG_FMT(SP1, "AM-BB: COMMAND: DMAOffsetLengthSet :{:04x} {:02x}", m_backup_dma_offset,
+                     m_backup_dma_length);
+      byte = 0x01;
+      break;
+    case ReadISR:
+      NOTICE_LOG_FMT(SP1, "AM-BB: COMMAND: ReadISR  :{:02x} {:02x}:{:02x} {:02x}", m_command[1],
+                     m_command[2], 4, s_irq_status);
+      byte = 0x04;
+      break;
+    case WriteISR:
+      NOTICE_LOG_FMT(SP1, "AM-BB: COMMAND: WriteISR :{:02x} {:02x}", m_command[1], m_command[2]);
+      s_irq_status &= ~(m_command[2]);
+      byte = 0x04;
+      break;
+    // 2 byte out
+    case ReadIMR:
+      NOTICE_LOG_FMT(SP1, "AM-BB: COMMAND: ReadIMR  :{:02x} {:02x}", m_command[1], m_command[2]);
+      byte = 0x04;
+      break;
+    case WriteIMR:
+      NOTICE_LOG_FMT(SP1, "AM-BB: COMMAND: WriteIMR :{:02x} {:02x}", m_command[1], m_command[2]);
+      byte = 0x04;
+      break;
+    case WriteLANCNT:
+      NOTICE_LOG_FMT(SP1, "AM-BB: COMMAND: WriteLANCNT :{:02x} {:02x}", m_command[1], m_command[2]);
+      if ((m_command[1] == 0) && (m_command[2] == 0))
+      {
+        s_interrupt_set = true;
+        s_irq_timer = 0;
+        s_irq_status = 0x02;
+      }
+      if ((m_command[1] == 2) && (m_command[2] == 1))
+      {
+        s_irq_status = 0;
+      }
+      byte = 0x08;
+      break;
+    default:
+      byte = 4;
+      ERROR_LOG_FMT(SP1, "AM-BB: COMMAND: {:02x} {:02x} {:02x}", m_command[0], m_command[1],
+                    m_command[2]);
       break;
     }
+  }
+  else if (m_position > 4)
+  {
+    switch (m_command[0])
+    {
+    // 1 byte out
+    case BackupRead:
+      m_backup.ReadBytes(&byte, 1);
+      break;
+    case DMAOffsetLengthSet:
+      byte = 0x01;
+      break;
+    // 2 byte out
+    case ReadISR:
+      if (m_position == 6)
+      {
+        byte = s_irq_status;
+        s_interrupt_set = false;
+      }
+      else
+      {
+        byte = 0x04;
+      }
+      break;
+    // 2 byte out
+    case ReadIMR:
+      if (m_position == 5)
+        byte = 0xFF;
+      if (m_position == 6)
+        byte = 0x81;
+      break;
     default:
-      ERROR_LOG_FMT(EXPANSIONINTERFACE, "EXI BASEBOARD: Unhandled command {:#x} {:#x}", m_command,
-                    m_position);
+      ERROR_LOG_FMT(SP1, "Unknown AM-BB command: {:02x}", m_command[0]);
+      break;
     }
   }
+  else
+  {
+    byte = 0xFF;
+  }
+
+  DEBUG_LOG_FMT(SP1, "AM-BB < {:02x}", byte);
   m_position++;
 }
 
 void CEXIBaseboard::DoState(PointerWrap& p)
 {
   p.Do(m_position);
+  p.Do(s_interrupt_set);
   p.Do(m_command);
 }
+
 }  // namespace ExpansionInterface
diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceBaseboard.h b/Source/Core/Core/HW/EXI/EXI_DeviceBaseboard.h
index 4c534428c990..be929026e3f4 100644
--- a/Source/Core/Core/HW/EXI/EXI_DeviceBaseboard.h
+++ b/Source/Core/Core/HW/EXI/EXI_DeviceBaseboard.h
@@ -1,27 +1,59 @@
-// Copyright 2013 Dolphin Emulator Project
+// Copyright 2025 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 
+#include "Common/CommonTypes.h"
+#include "Common/IOFile.h"
 #include "Core/HW/EXI/EXI_Device.h"
 
-class PointerWrap;
+namespace Core
+{
+class System;
+}
 
 namespace ExpansionInterface
 {
-class CEXIBaseboard : public IEXIDevice
+void GenerateInterrupt(int flag);
+
+class CEXIBaseboard final : public IEXIDevice
 {
 public:
-  CEXIBaseboard(Core::System& system);
+  explicit CEXIBaseboard(Core::System& system);
+  ~CEXIBaseboard() override;
+
   void SetCS(int cs) override;
+  bool IsInterruptSet() override;
   bool IsPresent() const override;
   void DoState(PointerWrap& p) override;
+  void DMAWrite(u32 addr, u32 size) override;
+  void DMARead(u32 addr, u32 size) override;
 
 private:
-  // STATE_TO_SAVE
+  enum Command
+  {
+    BackupOffsetSet = 0x01,
+    BackupWrite = 0x02,
+    BackupRead = 0x03,
+
+    DMAOffsetLengthSet = 0x05,
+
+    ReadISR = 0x82,
+    WriteISR = 0x83,
+    ReadIMR = 0x86,
+    WriteIMR = 0x87,
+
+    WriteLANCNT = 0xFF,
+  };
+
   u32 m_position = 0;
-  u32 m_command = 0;
+  u32 m_backup_dma_offset = 0;
+  u32 m_backup_dma_length = 0;
+  std::array<u8, 4> m_command{};
+  u16 m_backup_offset = 0;
+  File::IOFile m_backup;
 
+protected:
   void TransferByte(u8& byte) override;
 };
 }  // namespace ExpansionInterface
diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceEthernet.cpp b/Source/Core/Core/HW/EXI/EXI_DeviceEthernet.cpp
index 5bd9be180b51..02297bbc567d 100644
--- a/Source/Core/Core/HW/EXI/EXI_DeviceEthernet.cpp
+++ b/Source/Core/Core/HW/EXI/EXI_DeviceEthernet.cpp
@@ -3,7 +3,6 @@
 
 #include "Core/HW/EXI/EXI_DeviceEthernet.h"
 
-#include <algorithm>
 #include <memory>
 #include <optional>
 #include <string>
diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceEthernet.h b/Source/Core/Core/HW/EXI/EXI_DeviceEthernet.h
index 8cb0e52758da..34d9ab49cc9b 100644
--- a/Source/Core/Core/HW/EXI/EXI_DeviceEthernet.h
+++ b/Source/Core/Core/HW/EXI/EXI_DeviceEthernet.h
@@ -15,13 +15,12 @@
 #endif
 
 #include <SFML/Network.hpp>
-#if defined(WIN32) || (defined(__linux__) && !defined(__ANDROID__))
+#ifdef HAVE_CPPIPC
 #include <libipc/ipc.h>
 #endif
 
 #include "Common/Flag.h"
 #include "Common/Network.h"
-#include "Common/SocketContext.h"
 #include "Core/HW/EXI/BBA/BuiltIn.h"
 #include "Core/HW/EXI/BBA/TAPServerConnection.h"
 #include "Core/HW/EXI/EXI_Device.h"
@@ -483,7 +482,7 @@ class CEXIETHERNET : public IEXIDevice
   public:
     explicit IPCBBAInterface(CEXIETHERNET* const eth_ref) : NetworkInterface(eth_ref) {}
 
-#if defined(WIN32) || (defined(__linux__) && !defined(__ANDROID__))
+#ifdef HAVE_CPPIPC
 
     bool Activate() override;
     void Deactivate() override;
diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceGecko.cpp b/Source/Core/Core/HW/EXI/EXI_DeviceGecko.cpp
index 14942bf0c870..a7bf363b7b2e 100644
--- a/Source/Core/Core/HW/EXI/EXI_DeviceGecko.cpp
+++ b/Source/Core/Core/HW/EXI/EXI_DeviceGecko.cpp
@@ -12,7 +12,6 @@
 
 #include <fmt/format.h>
 
-#include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
 #include "Common/Thread.h"
diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceIPL.cpp b/Source/Core/Core/HW/EXI/EXI_DeviceIPL.cpp
index dcce16141094..82650ff1a01e 100644
--- a/Source/Core/Core/HW/EXI/EXI_DeviceIPL.cpp
+++ b/Source/Core/Core/HW/EXI/EXI_DeviceIPL.cpp
@@ -14,7 +14,6 @@
 #include "Common/FileUtil.h"
 #include "Common/IOFile.h"
 #include "Common/Logging/Log.h"
-#include "Common/MemoryUtil.h"
 #include "Common/StringUtil.h"
 #include "Common/Swap.h"
 #include "Common/Timer.h"
diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceMemoryCard.cpp b/Source/Core/Core/HW/EXI/EXI_DeviceMemoryCard.cpp
index 13a06da652e7..4870e503ba3d 100644
--- a/Source/Core/Core/HW/EXI/EXI_DeviceMemoryCard.cpp
+++ b/Source/Core/Core/HW/EXI/EXI_DeviceMemoryCard.cpp
@@ -4,7 +4,6 @@
 #include "Core/HW/EXI/EXI_DeviceMemoryCard.h"
 
 #include <array>
-#include <cstring>
 #include <functional>
 #include <memory>
 #include <string>
@@ -18,7 +17,6 @@
 #include "Common/Config/Config.h"
 #include "Common/EnumMap.h"
 #include "Common/FileUtil.h"
-#include "Common/IniFile.h"
 #include "Common/Logging/Log.h"
 #include "Core/CommonTitles.h"
 #include "Core/Config/MainSettings.h"
diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceMic.cpp b/Source/Core/Core/HW/EXI/EXI_DeviceMic.cpp
index c0bd98fae0d9..714fdbf87063 100644
--- a/Source/Core/Core/HW/EXI/EXI_DeviceMic.cpp
+++ b/Source/Core/Core/HW/EXI/EXI_DeviceMic.cpp
@@ -10,11 +10,8 @@
 #include <cubeb/cubeb.h>
 
 #include "AudioCommon/CubebUtils.h"
-#include "Common/Common.h"
 #include "Common/CommonTypes.h"
-#include "Common/Event.h"
 #include "Common/Logging/Log.h"
-#include "Common/ScopeGuard.h"
 
 #include "Core/CoreTiming.h"
 #include "Core/HW/EXI/EXI.h"
diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceModem.cpp b/Source/Core/Core/HW/EXI/EXI_DeviceModem.cpp
index 9d8bae9d2ee0..528fbbb4538c 100644
--- a/Source/Core/Core/HW/EXI/EXI_DeviceModem.cpp
+++ b/Source/Core/Core/HW/EXI/EXI_DeviceModem.cpp
@@ -3,20 +3,14 @@
 
 #include "Core/HW/EXI/EXI_DeviceModem.h"
 
-#include <inttypes.h>
-
 #include <algorithm>
 #include <cstring>
 #include <memory>
-#include <optional>
 #include <string>
 
-#include "Common/BitUtils.h"
 #include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
-#include "Common/Network.h"
-#include "Common/StringUtil.h"
 #include "Core/Config/MainSettings.h"
 #include "Core/CoreTiming.h"
 #include "Core/HW/EXI/EXI.h"
diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceModem.h b/Source/Core/Core/HW/EXI/EXI_DeviceModem.h
index 5c2cd0b4a37c..b6e79c54cf25 100644
--- a/Source/Core/Core/HW/EXI/EXI_DeviceModem.h
+++ b/Source/Core/Core/HW/EXI/EXI_DeviceModem.h
@@ -4,11 +4,7 @@
 #pragma once
 
 #include <mutex>
-#include <thread>
-#include <vector>
 
-#include "Common/Flag.h"
-#include "Common/Network.h"
 #include "Core/HW/EXI/BBA/TAPServerConnection.h"
 #include "Core/HW/EXI/EXI_Device.h"
 
diff --git a/Source/Core/Core/HW/EXI/Modem/TAPServerModem.cpp b/Source/Core/Core/HW/EXI/Modem/TAPServerModem.cpp
index 5723146b24e7..b38104ed186b 100644
--- a/Source/Core/Core/HW/EXI/Modem/TAPServerModem.cpp
+++ b/Source/Core/Core/HW/EXI/Modem/TAPServerModem.cpp
@@ -3,8 +3,6 @@
 
 #include "Core/HW/EXI/EXI_DeviceModem.h"
 
-#include "Common/Logging/Log.h"
-
 namespace ExpansionInterface
 {
 
diff --git a/Source/Core/Core/HW/GBAPadEmu.cpp b/Source/Core/Core/HW/GBAPadEmu.cpp
index 8c1b9ec8d76e..e61a3dbb114c 100644
--- a/Source/Core/Core/HW/GBAPadEmu.cpp
+++ b/Source/Core/Core/HW/GBAPadEmu.cpp
@@ -7,7 +7,6 @@
 
 #include "Core/HW/GBAPad.h"
 
-#include "InputCommon/ControllerEmu/Control/Input.h"
 #include "InputCommon/ControllerEmu/ControlGroup/Buttons.h"
 #include "InputCommon/GCPadStatus.h"
 
diff --git a/Source/Core/Core/HW/GCKeyboard.cpp b/Source/Core/Core/HW/GCKeyboard.cpp
index e677e1d6db6c..79fd5279492f 100644
--- a/Source/Core/Core/HW/GCKeyboard.cpp
+++ b/Source/Core/Core/HW/GCKeyboard.cpp
@@ -3,15 +3,11 @@
 
 #include "Core/HW/GCKeyboard.h"
 
-#include <cstring>
-
 #include "Common/Common.h"
-#include "Common/CommonTypes.h"
 
 #include "Core/HW/GCKeyboardEmu.h"
 
 #include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h"
-#include "InputCommon/ControllerInterface/ControllerInterface.h"
 #include "InputCommon/InputConfig.h"
 #include "InputCommon/KeyboardStatus.h"
 
diff --git a/Source/Core/Core/HW/GCKeyboardEmu.cpp b/Source/Core/Core/HW/GCKeyboardEmu.cpp
index 0146b942ab95..ba022fb6f963 100644
--- a/Source/Core/Core/HW/GCKeyboardEmu.cpp
+++ b/Source/Core/Core/HW/GCKeyboardEmu.cpp
@@ -8,7 +8,6 @@
 
 #include "Core/HW/GCKeyboard.h"
 
-#include "InputCommon/ControllerEmu/Control/Input.h"
 #include "InputCommon/ControllerEmu/ControlGroup/Buttons.h"
 #include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h"
 #include "InputCommon/ControllerEmu/ControllerEmu.h"
diff --git a/Source/Core/Core/HW/GCMemcard/GCMemcard.cpp b/Source/Core/Core/HW/GCMemcard/GCMemcard.cpp
index 3dd2f5c5e7a3..69a31eb7443a 100644
--- a/Source/Core/Core/HW/GCMemcard/GCMemcard.cpp
+++ b/Source/Core/Core/HW/GCMemcard/GCMemcard.cpp
@@ -11,8 +11,6 @@
 #include "Common/Assert.h"
 #include "Common/BitUtils.h"
 #include "Common/ColorUtil.h"
-#include "Common/CommonFuncs.h"
-#include "Common/CommonPaths.h"
 #include "Common/CommonTypes.h"
 #include "Common/IOFile.h"
 #include "Common/MsgHandler.h"
@@ -165,10 +163,10 @@ std::pair<GCMemcardErrorCode, std::optional<GCMemcard>> GCMemcard::Open(std::str
   //
   // This rule only applies for errors within a single block! That is, invalid checksums for both
   // types, and free block mismatch for the BATs. Once two valid blocks have been selected but it
-  // later turns out they do not match eachother (eg. claimed block count of a file in the directory
-  // does not match the actual block count arrived at by following BAT), the card will be treated as
-  // corrupted, even if perhaps a different combination of the two blocks would result in a valid
-  // memory card.
+  // later turns out they do not match each other (eg. claimed block count of a file in the
+  // directory does not match the actual block count arrived at by following BAT), the card will be
+  // treated as corrupted, even if perhaps a different combination of the two blocks would result in
+  // a valid memory card.
 
   // can return invalid checksum, data in unused area
   GCMemcardErrorCode dir_block_0_error_code = card.m_directory_blocks[0].CheckForErrors();
@@ -821,7 +819,7 @@ GCMemcardRemoveFileRetVal GCMemcard::RemoveFile(u8 index)  // index in the direc
 
   // TODO: Deleting a file via the GC BIOS sometimes leaves behind an extra updated directory block
   // here that has an empty file with the filename "Broken File000" where the actual deleted file
-  // was. Determine when exactly this happens and if this is neccessary for anything.
+  // was. Determine when exactly this happens and if this is necessary for anything.
 
   memset(reinterpret_cast<u8*>(&UpdatedDir.m_dir_entries[index]), 0xFF, DENTRY_SIZE);
   UpdatedDir.m_update_counter = UpdatedDir.m_update_counter + 1;
diff --git a/Source/Core/Core/HW/GCMemcard/GCMemcard.h b/Source/Core/Core/HW/GCMemcard/GCMemcard.h
index 0df11157c9ac..08192b4b5cf5 100644
--- a/Source/Core/Core/HW/GCMemcard/GCMemcard.h
+++ b/Source/Core/Core/HW/GCMemcard/GCMemcard.h
@@ -177,7 +177,7 @@ struct HeaderData
   // 4 bytes at 0x001c: VI DTV status register value (u16 from 0xCC00206E)
   u32 m_dtv_status;
 
-  // 2 bytes at 0x0020: 0 if formated in slot A, 1 if formated in slot B
+  // 2 bytes at 0x0020: 0 if formatted in slot A, 1 if formatted in slot B
   Common::BigEndianValue<u16> m_device_id;
 
   // 2 bytes at 0x0022: Size of memcard in Mbits
diff --git a/Source/Core/Core/HW/GCMemcard/GCMemcardDirectory.cpp b/Source/Core/Core/HW/GCMemcard/GCMemcardDirectory.cpp
index 5698930b1990..9d3639ed0449 100644
--- a/Source/Core/Core/HW/GCMemcard/GCMemcardDirectory.cpp
+++ b/Source/Core/Core/HW/GCMemcard/GCMemcardDirectory.cpp
@@ -6,7 +6,6 @@
 #include <algorithm>
 #include <chrono>
 #include <cstring>
-#include <memory>
 #include <mutex>
 #include <string>
 #include <string_view>
@@ -26,7 +25,6 @@
 #include "Common/MsgHandler.h"
 #include "Common/StringUtil.h"
 #include "Common/Thread.h"
-#include "Common/Timer.h"
 
 #include "Core/Config/MainSettings.h"
 #include "Core/Config/SessionSettings.h"
@@ -134,7 +132,7 @@ std::vector<std::string> GCMemcardDirectory::GetFileNamesForGameID(const std::st
     game_code = Common::swap32(reinterpret_cast<const u8*>(game_id.c_str()));
 
   std::vector<Memcard::DEntry> loaded_saves;
-  for (const std::string& file_name : Common::DoFileSearch({directory}, {".gci"}))
+  for (const std::string& file_name : Common::DoFileSearch(directory, ".gci"))
   {
     File::IOFile gci_file(file_name, "rb");
     if (!gci_file)
@@ -190,7 +188,7 @@ GCMemcardDirectory::GCMemcardDirectory(const std::string& directory, ExpansionIn
   }
 
   const bool current_game_only = Config::Get(Config::SESSION_GCI_FOLDER_CURRENT_GAME_ONLY);
-  const std::vector<std::string> filenames = Common::DoFileSearch({m_save_directory}, {".gci"});
+  const std::vector<std::string> filenames = Common::DoFileSearch(m_save_directory, ".gci");
 
   // split up into files for current games we should definitely load,
   // and files for other games that we don't care too much about
@@ -575,7 +573,7 @@ s32 GCMemcardDirectory::DirectoryWrite(u32 dest_address, u32 length, const u8* s
     // first 58 bytes should always be 0xff
     // needed to update the update ctr, checksums
     // could check for writes to the 6 important bytes but doubtful that it improves performance
-    // noticably
+    // noticeably
     memcpy((u8*)(dest) + offset, src_address, length);
     SyncSaves();
   }
diff --git a/Source/Core/Core/HW/GCMemcard/GCMemcardRaw.cpp b/Source/Core/Core/HW/GCMemcard/GCMemcardRaw.cpp
index d8a2202b165d..549cda4dc020 100644
--- a/Source/Core/Core/HW/GCMemcard/GCMemcardRaw.cpp
+++ b/Source/Core/Core/HW/GCMemcard/GCMemcardRaw.cpp
@@ -13,7 +13,6 @@
 #include <fmt/format.h>
 
 #include "Common/ChunkFile.h"
-#include "Common/CommonPaths.h"
 #include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
 #include "Common/IOFile.h"
diff --git a/Source/Core/Core/HW/GCPad.cpp b/Source/Core/Core/HW/GCPad.cpp
index 15b5f8b6dafc..188882c58aff 100644
--- a/Source/Core/Core/HW/GCPad.cpp
+++ b/Source/Core/Core/HW/GCPad.cpp
@@ -3,12 +3,9 @@
 
 #include "Core/HW/GCPad.h"
 
-#include <cstring>
-
 #include "Common/Common.h"
 #include "Core/HW/GCPadEmu.h"
 #include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h"
-#include "InputCommon/ControllerInterface/ControllerInterface.h"
 #include "InputCommon/GCPadStatus.h"
 #include "InputCommon/InputConfig.h"
 
diff --git a/Source/Core/Core/HW/GCPadEmu.cpp b/Source/Core/Core/HW/GCPadEmu.cpp
index 0058bc74e44b..dff79653c37a 100644
--- a/Source/Core/Core/HW/GCPadEmu.cpp
+++ b/Source/Core/Core/HW/GCPadEmu.cpp
@@ -34,6 +34,7 @@ static const u16 trigger_bitmasks[] = {
 
 static const u16 dpad_bitmasks[] = {PAD_BUTTON_UP, PAD_BUTTON_DOWN, PAD_BUTTON_LEFT,
                                     PAD_BUTTON_RIGHT};
+static const u8 triforce_bitmask[] = {SWITCH_TEST, SWITCH_SERVICE, SWITCH_COIN};
 
 GCPad::GCPad(const unsigned int index) : m_index(index)
 {
@@ -68,6 +69,13 @@ GCPad::GCPad(const unsigned int index) : m_index(index)
     m_dpad->AddInput(Translatability::Translate, named_direction);
   }
 
+  // triforce
+  groups.emplace_back(m_triforce = new ControllerEmu::Buttons(TRIFORCE_GROUP));
+  for (const char* named_button : {TEST_BUTTON, SERVICE_BUTTON, COIN_BUTTON})
+  {
+    m_triforce->AddInput(Translatability::Translate, named_button);
+  }
+
   // Microphone
   groups.emplace_back(m_mic = new ControllerEmu::Buttons(MIC_GROUP));
   m_mic->AddInput(Translatability::Translate, _trans("Button"));
@@ -119,6 +127,8 @@ ControllerEmu::ControlGroup* GCPad::GetGroup(PadGroup group)
     return m_mic;
   case PadGroup::Options:
     return m_options;
+  case PadGroup::Triforce:
+    return m_triforce;
   default:
     return nullptr;
   }
@@ -150,6 +160,9 @@ GCPadStatus GCPad::GetInput() const
   // dpad
   m_dpad->GetState(&pad.button, dpad_bitmasks, m_input_override_function);
 
+  // triforce
+  m_triforce->GetState(&pad.switches, triforce_bitmask, m_input_override_function);
+
   // sticks
   const auto main_stick_state = m_main_stick->GetState(m_input_override_function);
   pad.stickX = MapFloat<u8>(main_stick_state.x, GCPadStatus::MAIN_STICK_CENTER_X, 1);
@@ -181,6 +194,9 @@ void GCPad::LoadDefaults(const ControllerInterface& ciface)
 #ifdef ANDROID
   // Rumble
   m_rumble->SetControlExpression(0, "`Android/0/Device Sensors:Motor 0`");
+
+  // Triforce Coin
+  m_triforce->SetControlExpression(2, "pulse(`Android/0/Device Sensors:Accel Down` > 15, 0.1)");
 #else
   // Buttons: A, B, X, Y, Z
   m_buttons->SetControlExpression(0, "`X`");
@@ -202,6 +218,11 @@ void GCPad::LoadDefaults(const ControllerInterface& ciface)
   m_dpad->SetControlExpression(2, "`F`");  // Left
   m_dpad->SetControlExpression(3, "`H`");  // Right
 
+  // Triforce
+  m_triforce->SetControlExpression(0, "`1`");  // Test
+  m_triforce->SetControlExpression(1, "`2`");  // Service
+  m_triforce->SetControlExpression(2, "`3`");  // Coin
+
   // C Stick
   m_c_stick->SetControlExpression(0, "`I`");  // Up
   m_c_stick->SetControlExpression(1, "`K`");  // Down
diff --git a/Source/Core/Core/HW/GCPadEmu.h b/Source/Core/Core/HW/GCPadEmu.h
index 2555ee05b179..906f7750f3a9 100644
--- a/Source/Core/Core/HW/GCPadEmu.h
+++ b/Source/Core/Core/HW/GCPadEmu.h
@@ -29,7 +29,8 @@ enum class PadGroup
   Triggers,
   Rumble,
   Mic,
-  Options
+  Options,
+  Triforce,
 };
 
 class GCPad : public ControllerEmu::EmulatedController
@@ -61,6 +62,7 @@ class GCPad : public ControllerEmu::EmulatedController
   static constexpr const char* RUMBLE_GROUP = _trans("Rumble");
   static constexpr const char* MIC_GROUP = _trans("Microphone");
   static constexpr const char* OPTIONS_GROUP = _trans("Options");
+  static constexpr const char* TRIFORCE_GROUP = _trans("Triforce");
 
   static constexpr const char* A_BUTTON = "A";
   static constexpr const char* B_BUTTON = "B";
@@ -69,6 +71,11 @@ class GCPad : public ControllerEmu::EmulatedController
   static constexpr const char* Z_BUTTON = "Z";
   static constexpr const char* START_BUTTON = "Start";
 
+  // Special Triforce buttons
+  static constexpr const char* TEST_BUTTON = _trans("Test");
+  static constexpr const char* SERVICE_BUTTON = _trans("Service");
+  static constexpr const char* COIN_BUTTON = _trans("Coin");
+
   // i18n: The left trigger button (labeled L on real controllers)
   static constexpr const char* L_DIGITAL = _trans("L");
   // i18n: The right trigger button (labeled R on real controllers)
@@ -87,6 +94,7 @@ class GCPad : public ControllerEmu::EmulatedController
   ControllerEmu::ControlGroup* m_rumble;
   ControllerEmu::Buttons* m_mic;
   ControllerEmu::ControlGroup* m_options;
+  ControllerEmu::Buttons* m_triforce;
 
   ControllerEmu::SettingValue<bool> m_always_connected_setting;
 
diff --git a/Source/Core/Core/HW/HSP/HSP_DeviceNull.cpp b/Source/Core/Core/HW/HSP/HSP_DeviceNull.cpp
index 669f8571242d..3527ecc77848 100644
--- a/Source/Core/Core/HW/HSP/HSP_DeviceNull.cpp
+++ b/Source/Core/Core/HW/HSP/HSP_DeviceNull.cpp
@@ -3,8 +3,6 @@
 
 #include "Core/HW/HSP/HSP_DeviceNull.h"
 
-#include <cstring>
-
 #include "Core/HW/HSP/HSP.h"
 
 namespace HSP
diff --git a/Source/Core/Core/HW/HW.cpp b/Source/Core/Core/HW/HW.cpp
index 524feab884d4..58b4beac0361 100644
--- a/Source/Core/Core/HW/HW.cpp
+++ b/Source/Core/Core/HW/HW.cpp
@@ -4,7 +4,6 @@
 #include "Core/HW/HW.h"
 
 #include "Common/ChunkFile.h"
-#include "Common/CommonTypes.h"
 
 #include "Core/Config/MainSettings.h"
 #include "Core/Core.h"
@@ -58,6 +57,8 @@ void Init(Core::System& system, const Sram* override_sram)
     system.GetWiiIPC().Init();
     IOS::HLE::Init(system);  // Depends on Memory
   }
+
+  system.GetMemory().InitMMIO(system);
 }
 
 void Shutdown(Core::System& system)
diff --git a/Source/Core/Core/HW/MMIO.cpp b/Source/Core/Core/HW/MMIO.cpp
index 4e27c170485c..e177e1ca8b23 100644
--- a/Source/Core/Core/HW/MMIO.cpp
+++ b/Source/Core/Core/HW/MMIO.cpp
@@ -263,7 +263,7 @@ ReadHandlingMethod<T>* ReadToLarger(Mapping* mmio, u32 larger_addr, u32 shift)
   });
 }
 
-// Inplementation of the ReadHandler and WriteHandler class. There is a lot of
+// Implementation of the ReadHandler and WriteHandler class. There is a lot of
 // redundant code between these two classes but trying to abstract it away
 // brings more trouble than it fixes.
 template <typename T>
diff --git a/Source/Core/Core/HW/MMIO.h b/Source/Core/Core/HW/MMIO.h
index d2082e4e48cd..cee439ab43e7 100644
--- a/Source/Core/Core/HW/MMIO.h
+++ b/Source/Core/Core/HW/MMIO.h
@@ -169,7 +169,7 @@ class Mapping
   // MMIO block ID.
   //
   // Each array contains NUM_MMIOS / sizeof (AccessType) because larger
-  // access types mean less possible adresses (assuming aligned only
+  // access types mean less possible addresses (assuming aligned only
   // accesses).
   template <typename Unit>
   struct HandlerArray
diff --git a/Source/Core/Core/HW/MagCard/C1231BR.cpp b/Source/Core/Core/HW/MagCard/C1231BR.cpp
new file mode 100644
index 000000000000..de76df183993
--- /dev/null
+++ b/Source/Core/Core/HW/MagCard/C1231BR.cpp
@@ -0,0 +1,82 @@
+// Copyright 2026 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+// Based on: https://github.com/GXTX/YACardEmu
+// Copyright (C) 2020-2023 wutno (https://github.com/GXTX)
+// Copyright (C) 2022-2023 tugpoat (https://github.com/tugpoat)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "Core/HW/MagCard/C1231BR.h"
+
+namespace MagCard
+{
+
+void C1231BR::Command_10_Initialize()
+{
+  // TODO: Not hardware tested.
+  if (!m_current_packet.empty())
+  {
+    if (InitMode(m_current_packet[0]) == InitMode::EjectAfter)
+    {
+      m_is_shutter_open = true;
+      MoveCard(R::ENTRY_SLOT);
+    }
+  }
+
+  // m_status.SoftReset(); // TODO: Needed ?
+  FinishCommand();
+}
+
+void C1231BR::Command_D0_ControlShutter()
+{
+  enum class Action : u8
+  {
+    Close = 0x30,
+    Open = 0x31,
+  };
+
+  if (m_current_packet.empty())
+  {
+    SetPError(P::SYSTEM_ERR);
+    FinishCommand();
+    return;
+  }
+
+  m_is_shutter_open = Action(m_current_packet[0]) == Action::Open;
+
+  INFO_LOG_FMT(SERIALINTERFACE_CARD, "Shutter: {}", m_is_shutter_open ? "Open" : "Close");
+
+  FinishCommand();
+}
+
+u8 C1231BR::GetPositionValue()
+{
+  // True "R" (Card Position) values.
+  // FYI: I see a 0xd0 command transition from: 11000 -> 01110 -> 00111
+  // Are these 5 bits individual sensors placed within the machine ?
+  static constexpr std::array<u8, std::size_t(R::MAX_POSITIONS)> POSITION_VALUES{
+      0b00000,  // NO_CARD
+      0b11000,  // READ_WRITE_HEAD
+      0b00111,  // THERMAL_HEAD
+      0b11100,  // DISPENSER_THERMAL
+      0b00001,  // ENTRY_SLOT
+  };
+
+  return (m_is_shutter_open ? 0x80u : 0x40u) |
+         (m_card_settings->report_dispenser_empty ? 0x00u : 0x20u) |
+         POSITION_VALUES[u8(m_status.r)];
+}
+
+void C1231BR::DoState(PointerWrap& p)
+{
+  MagneticCardReader::DoState(p);
+
+  p.Do(m_is_shutter_open);
+}
+
+bool C1231BR::IsReadyForCard()
+{
+  return !IsCardPresent() && m_is_shutter_open;
+}
+
+}  // namespace MagCard
diff --git a/Source/Core/Core/HW/MagCard/C1231BR.h b/Source/Core/Core/HW/MagCard/C1231BR.h
new file mode 100644
index 000000000000..d339b2d5bb8a
--- /dev/null
+++ b/Source/Core/Core/HW/MagCard/C1231BR.h
@@ -0,0 +1,37 @@
+// Copyright 2026 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+// Based on: https://github.com/GXTX/YACardEmu
+// Copyright (C) 2020-2023 wutno (https://github.com/GXTX)
+// Copyright (C) 2022-2023 tugpoat (https://github.com/tugpoat)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "Core/HW/MagCard/MagneticCardReader.h"
+
+namespace MagCard
+{
+
+// CRP-1231BR-10
+// Used by F-Zero AX
+class C1231BR final : public MagneticCardReader
+{
+public:
+  using MagneticCardReader::MagneticCardReader;
+
+protected:
+  // Specific to this model.
+  bool m_is_shutter_open = true;
+
+  bool IsReadyForCard() override;
+
+  u8 GetPositionValue() override;
+
+  void Command_10_Initialize() override;
+  void Command_D0_ControlShutter() override;
+
+  void DoState(PointerWrap& p) override;
+};
+
+}  // namespace MagCard
diff --git a/Source/Core/Core/HW/MagCard/C1231LR.cpp b/Source/Core/Core/HW/MagCard/C1231LR.cpp
new file mode 100644
index 000000000000..0e9c32fa15dc
--- /dev/null
+++ b/Source/Core/Core/HW/MagCard/C1231LR.cpp
@@ -0,0 +1,27 @@
+// Copyright 2026 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+// Based on: https://github.com/GXTX/YACardEmu
+// Copyright (C) 2020-2023 wutno (https://github.com/GXTX)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "Core/HW/MagCard/C1231LR.h"
+
+namespace MagCard
+{
+
+u8 C1231LR::GetPositionValue()
+{
+  // True "R" (Card Position) values.
+  static constexpr std::array<u8, std::size_t(R::MAX_POSITIONS)> POSITION_VALUES{
+      0x30,  // NO_CARD
+      0x31,  // READ_WRITE_HEAD
+      0x32,  // THERMAL_HEAD
+      0x33,  // DISPENSER_THERMAL
+      0x34,  // ENTRY_SLOT
+  };
+
+  return POSITION_VALUES[u8(m_status.r)];
+}
+
+}  // namespace MagCard
diff --git a/Source/Core/Core/HW/MagCard/C1231LR.h b/Source/Core/Core/HW/MagCard/C1231LR.h
new file mode 100644
index 000000000000..e7ee627e1b24
--- /dev/null
+++ b/Source/Core/Core/HW/MagCard/C1231LR.h
@@ -0,0 +1,26 @@
+// Copyright 2026 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+// Based on: https://github.com/GXTX/YACardEmu
+// Copyright (C) 2020-2023 wutno (https://github.com/GXTX)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "Core/HW/MagCard/MagneticCardReader.h"
+
+namespace MagCard
+{
+
+// CRP-1231LR-10NAB
+// Used by Mario Kart Arcade GP + GP2
+class C1231LR final : public MagneticCardReader
+{
+public:
+  using MagneticCardReader::MagneticCardReader;
+
+protected:
+  u8 GetPositionValue() override;
+};
+
+}  // namespace MagCard
diff --git a/Source/Core/Core/HW/MagCard/MagneticCardReader.cpp b/Source/Core/Core/HW/MagCard/MagneticCardReader.cpp
new file mode 100644
index 000000000000..abb93359e15e
--- /dev/null
+++ b/Source/Core/Core/HW/MagCard/MagneticCardReader.cpp
@@ -0,0 +1,1000 @@
+// Copyright 2026 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+// Based on: https://github.com/GXTX/YACardEmu
+// Copyright (C) 2020-2023 wutno (https://github.com/GXTX)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "Core/HW/MagCard/MagneticCardReader.h"
+
+#include <algorithm>
+#include <numeric>
+
+#include "Common/BitUtils.h"
+#include "Common/DirectIOFile.h"
+#include "Common/FileUtil.h"
+#include "Common/Lazy.h"
+#include "Common/Logging/Log.h"
+#include "Common/SmallVector.h"
+#include "Common/StringUtil.h"
+#include "Core/Core.h"
+
+namespace
+{
+
+constexpr std::string GetHexDump(const auto& data)
+{
+  const auto u8_span = Common::AsU8Span(data);
+  return HexDump(u8_span.data(), u8_span.size());
+}
+
+void AppendRange(auto* container, const auto& range)
+{
+  const auto prev_size = container->size();
+  container->resize(prev_size + range.size());
+  std::ranges::copy(range, container->data() + prev_size);
+}
+
+}  // namespace
+
+namespace MagCard
+{
+
+constexpr std::string_view VERSION_STRING = "AP:S1234-5678,OS:S9012-3456,0000";
+
+constexpr u8 START_OF_TEXT = 0x02;
+constexpr u8 END_OF_TEXT = 0x03;
+constexpr u8 ENQUIRY = 0x05;
+constexpr u8 ACK = 0x06;
+constexpr u8 NACK = 0x15;
+
+enum class BitMode : u8
+{
+  SevenBitParity = 0x30,
+  EightBitNoParity = 0x31,
+};
+
+enum class Track : u8
+{
+  Track_1 = 0x30,
+  Track_2 = 0x31,
+  Track_3 = 0x32,
+  Track_1_And_2 = 0x33,
+  Track_1_And_3 = 0x34,
+  Track_2_And_3 = 0x35,
+  Track_1_2_And_3 = 0x36,
+};
+
+static auto GetTrackIndicesForTrackType(Track track)
+{
+  Common::SmallVector<std::size_t, MagneticCardReader::NUM_TRACKS> result;
+
+  switch (track)
+  {
+  case Track::Track_1:
+  case Track::Track_2:
+  case Track::Track_3:
+    result.emplace_back(std::size_t(track) - 0x30);
+    break;
+
+  case Track::Track_1_And_2:
+  case Track::Track_1_And_3:
+  case Track::Track_2_And_3:
+    result.emplace_back((track == Track::Track_2_And_3) ? 1 : 0);
+    result.emplace_back((track == Track::Track_1_And_2) ? 1 : 2);
+    break;
+
+  case Track::Track_1_2_And_3:
+    result.emplace_back(0);
+    result.emplace_back(1);
+    result.emplace_back(2);
+    break;
+
+  default:
+    break;
+  }
+
+  return result;
+}
+
+MagneticCardReader::MagneticCardReader(MagneticCardReader::Settings* settings)
+    : m_card_settings{settings}
+{
+}
+
+MagneticCardReader::~MagneticCardReader()
+{
+  if (IsCardLoaded())
+  {
+    // Games do seem to write the entire save data in a single command.
+    // But the printed messages are another story.
+    // I suppose there's potential for data loss here.
+    WARN_LOG_FMT(SERIALINTERFACE_CARD, "Shutdown before ejecting card!");
+  }
+}
+
+void MagneticCardReader::Command_10_Initialize()
+{
+  EjectCard();
+  m_status.SoftReset();
+  FinishCommand();
+}
+
+void MagneticCardReader::Command_20_ReadStatus()
+{
+  m_status.SoftReset();
+  FinishCommand();
+}
+
+void MagneticCardReader::Command_33_ReadData()
+{
+  enum class Mode : u8
+  {
+    Standard = 0x30,      // read 69-bytes
+    ReadVariable = 0x31,  // variable length read
+    CardCapture = 0x32,   // pull in card
+  };
+
+  if (m_current_packet.size() < 3)
+  {
+    SetPError(P::SYSTEM_ERR);
+    return;
+  }
+
+  const auto mode = Mode(m_current_packet[0]);
+  // const auto bit_mode = BitMode(m_current_packet[1]);
+  const auto track = Track(m_current_packet[2]);
+
+  switch (m_current_step)
+  {
+  case 1:
+    if (mode == Mode::CardCapture)
+      INFO_LOG_FMT(SERIALINTERFACE_CARD, "Command_33_ReadData: CardCapture");
+    break;
+  case 2:
+  {
+    // Doesn't return card data.
+    if (mode == Mode::CardCapture)
+    {
+      if (!IsCardPresent())
+      {
+        m_status.s = S::WAITING_FOR_CARD;
+        --m_current_step;
+        break;
+      }
+
+      // How does hardware behave when the card is already elsewhere in the machine ?
+      if (m_status.r != R::READ_WRITE_HEAD)
+      {
+        NOTICE_LOG_FMT(SERIALINTERFACE_CARD, "Capturing Card.");
+
+        MoveCard(R::READ_WRITE_HEAD);
+        ReadCardFile();
+
+        Core::DisplayMessage("Inserted Magnetic Card", 4000);
+      }
+      break;
+    }
+
+    DEBUG_LOG_FMT(SERIALINTERFACE_CARD, "Command_33_ReadData: mode {:02x} track {:02x}", u8(mode),
+                  u8(track));
+
+    const auto track_indices = GetTrackIndicesForTrackType(track);
+
+    if (!IsCardLoaded() || track_indices.size() == 0)
+    {
+      SetPError(P::ILLEGAL_ERR);
+      return;
+    }
+
+    for (auto track_index : track_indices)
+    {
+      auto& track_data = m_card_data[track_index];
+      if (!track_data.has_value())
+      {
+        SetPError(P::READ_ERR);
+        WARN_LOG_FMT(SERIALINTERFACE_CARD, "Command_33_ReadData: Empty track {:02x}", track_index);
+        // TODO: Are we supposed to return partial data ?
+        return;
+      }
+
+      AppendRange(&m_command_payload, *track_data);
+    }
+  }
+  default:
+    break;
+  }
+
+  if (m_current_step >= 2)
+    FinishCommand();
+}
+
+void MagneticCardReader::Command_35_GetData()
+{
+  switch (m_current_step)
+  {
+  case 2:
+    if (!IsCardLoaded())
+    {
+      // TODO: Is this correct ?
+      SetPError(P::ILLEGAL_ERR);
+      return;
+    }
+
+    for (auto& track_data : m_card_data)
+    {
+      if (!track_data.has_value())
+      {
+        SetPError(P::READ_ERR);
+        // TODO: Are we supposed to return partial data ?
+        return;
+      }
+
+      AppendRange(&m_command_payload, *track_data);
+    }
+    break;
+  default:
+    break;
+  }
+
+  if (m_current_step >= 2)
+    FinishCommand();
+}
+
+void MagneticCardReader::Command_40_Cancel()
+{
+  m_status.SoftReset();
+  FinishCommand();
+}
+
+void MagneticCardReader::Command_53_WriteData()
+{
+  enum class Mode : u8
+  {
+    Standard = 0x30,  // 69-bytes
+  };
+
+  if (m_current_packet.size() < 3)
+  {
+    SetPError(P::SYSTEM_ERR);
+    return;
+  }
+
+  if (m_current_step < 2)
+    return;
+
+  const auto mode = Mode(m_current_packet[0]);
+  // const auto bit_mode = BitMode(m_current_packet[1]);
+  auto track = Track(m_current_packet[2]);
+
+  const auto track_indices = GetTrackIndicesForTrackType(track);
+  const auto proper_payload_size = track_indices.size() * TRACK_SIZE;
+  const auto payload = std::span{m_current_packet}.subspan(3);
+
+  if (mode != Mode::Standard || !IsCardLoaded() || track_indices.size() == 0 ||
+      payload.size() != proper_payload_size)
+  {
+    WARN_LOG_FMT(SERIALINTERFACE_CARD, "Command_53_WriteData: Failed.");
+    SetPError(P::ILLEGAL_ERR);
+    return;
+  }
+
+  INFO_LOG_FMT(SERIALINTERFACE_CARD, "Command_53_WriteData: Writing {} track(s) to memory.",
+               track_indices.size());
+
+  for (auto track_index : track_indices)
+  {
+    auto& track_data = m_card_data[track_index];
+    track_data.emplace();
+    std::ranges::copy(payload.subspan(track_index * TRACK_SIZE, TRACK_SIZE), track_data->data());
+  }
+
+  Core::DisplayMessage("Writing Magnetic Card", 4000);
+
+  WriteCardFile();
+
+  FinishCommand();
+}
+
+void MagneticCardReader::Command_78_PrintSettings()
+{
+  m_status.SoftReset();
+  FinishCommand();
+}
+
+void MagneticCardReader::Command_7A_RegisterFont()
+{
+  m_status.SoftReset();
+  FinishCommand();
+}
+
+void MagneticCardReader::Command_7B_PrintImage()
+{
+  // TODO: Are these print functions supposed to succeed before the card is actually grabbed ?
+  if (!IsCardPresent())
+  {
+    SetPError(P::PRINT_ERR);
+    return;
+  }
+  m_status.SoftReset();
+  FinishCommand();
+}
+
+void MagneticCardReader::Command_7C_PrintLine()
+{
+  if (m_current_packet.size() < 3)
+  {
+    SetPError(P::SYSTEM_ERR);
+    return;
+  }
+
+  switch (m_current_step)
+  {
+  case 1:
+  {
+    if (!IsCardPresent())
+    {
+      SetPError(P::PRINT_ERR);
+      return;
+    }
+
+    // FIXME: Should we only move the head when we're actually about to print?
+    MoveCard(R::THERMAL_HEAD);
+    break;
+  }
+  case 2:
+    MoveCard(R::READ_WRITE_HEAD);
+    break;
+  default:
+    break;
+  }
+
+  if (m_current_step >= 2)
+    FinishCommand();
+}
+
+void MagneticCardReader::Command_7D_Erase()
+{
+  switch (m_current_step)
+  {
+  case 1:
+    if (!IsCardPresent())
+    {
+      SetPError(P::PRINT_ERR);
+      return;
+    }
+    MoveCard(R::THERMAL_HEAD);
+    break;
+  case 2:
+    MoveCard(R::READ_WRITE_HEAD);
+    break;
+  default:
+    break;
+  }
+
+  if (m_current_step >= 2)
+    FinishCommand();
+}
+
+void MagneticCardReader::Command_7E_PrintBarcode()
+{
+  switch (m_current_step)
+  {
+  case 2:
+    if (!IsCardPresent())
+    {
+      SetPError(P::ILLEGAL_ERR);
+      return;
+    }
+    break;
+  default:
+    break;
+  }
+
+  if (m_current_step >= 2)
+    FinishCommand();
+}
+
+void MagneticCardReader::Command_80_EjectCard()
+{
+  if (m_current_step >= 3)
+  {
+    EjectCard();
+    FinishCommand();
+  }
+}
+
+void MagneticCardReader::Command_A0_Clean()
+{
+  switch (m_current_step)
+  {
+  case 2:
+    // TODO: How is this command supposed to behave if a card is already in the machine ?
+    if (!IsCardLoaded())
+    {
+      NOTICE_LOG_FMT(SERIALINTERFACE_CARD, "Inserting cleaning card.");
+      Core::DisplayMessage("Inserting cleaning card", 4000);
+      MoveCard(R::THERMAL_HEAD);
+    }
+    break;
+  case 3:
+    EjectCard();
+    break;
+  default:
+    break;
+  }
+
+  if (m_current_step >= 3)
+    FinishCommand();
+}
+
+void MagneticCardReader::Command_B0_DispenseCard()
+{
+  enum class Mode : u8
+  {
+    Dispense = 0x31,
+    CheckOnly = 0x32,
+  };
+
+  // MarioKart GP1 issues this command without options.
+  auto mode = Mode::Dispense;
+  if (!m_current_packet.empty())
+  {
+    mode = Mode(m_current_packet[0]);
+  }
+
+  switch (m_current_step)
+  {
+  case 2:
+    if (mode == Mode::CheckOnly)
+    {
+      if (m_card_settings->report_dispenser_empty)
+      {
+        m_status.s = S::DISPENSER_EMPTY;
+      }
+      else
+      {
+        m_status.s = S::CARD_FULL;
+      }
+    }
+    else
+    {
+      DispenseCard();
+    }
+    break;
+  case 3:
+    if (m_status.r == R::DISPENSER_THERMAL)
+    {
+      MoveCard(R::READ_WRITE_HEAD);
+    }
+    break;
+  default:
+    break;
+  }
+
+  if (m_current_step >= 3)
+    FinishCommand();
+}
+
+void MagneticCardReader::Command_C0_ControlLED()
+{
+  // We don't need to handle this properly but let's leave some notes.
+  enum class Mode : u8
+  {
+    Off = 0x30,
+    On = 0x31,
+    SlowBlink = 0x32,
+    FastBlink = 0x33,
+  };
+
+  m_status.SoftReset();
+  FinishCommand();
+}
+
+void MagneticCardReader::Command_C1_SetPrintRetry()
+{
+  // We don't need to handle this properly but let's leave some notes
+  // m_current_packet[0] == 0x31 NONE ~ 0x39 MAX8
+  m_status.SoftReset();
+  FinishCommand();
+}
+
+void MagneticCardReader::Command_D0_ControlShutter()
+{
+  // Only BR model supports this command.
+  SetSError(S::ILLEGAL_COMMAND);
+}
+
+void MagneticCardReader::Command_F0_GetVersion()
+{
+  AppendRange(&m_command_payload, VERSION_STRING);
+
+  m_status.SoftReset();
+  FinishCommand();
+}
+
+void MagneticCardReader::ClearCardInMemory()
+{
+  m_card_data.fill(std::nullopt);
+}
+
+void MagneticCardReader::ReadCardFile()
+{
+  NOTICE_LOG_FMT(SERIALINTERFACE_CARD, "Reading card data from: {}", m_card_settings->card_name);
+
+  ClearCardInMemory();
+
+  const std::string full_path = m_card_settings->card_path + m_card_settings->card_name;
+
+  File::DirectIOFile file{full_path, File::AccessMode::Read};
+
+  const auto file_size = file.GetSize();
+  const auto complete_track_count = file_size / TRACK_SIZE;
+  const auto excess_byte_count = file_size % TRACK_SIZE;
+
+  if (file_size == 0 || excess_byte_count != 0 || complete_track_count > NUM_TRACKS)
+  {
+    ERROR_LOG_FMT(SERIALINTERFACE_CARD, "ReadCardFile: Incorrect card file size: {}", file_size);
+  }
+
+  const auto tracks_to_read = std::min<u32>(complete_track_count, NUM_TRACKS);
+  for (u32 track_num = 0; track_num != tracks_to_read; ++track_num)
+  {
+    auto& track_data = m_card_data[track_num];
+    track_data.emplace();
+
+    if (!file.Read(*track_data))
+    {
+      ERROR_LOG_FMT(SERIALINTERFACE_CARD, "File read failed.");
+      track_data.reset();
+      break;
+    }
+  }
+
+  DEBUG_LOG_FMT(SERIALINTERFACE_CARD, "ReadCard: 0:{} 1:{} 2:{}", GetHexDump(m_card_data[0]),
+                GetHexDump(m_card_data[1]), GetHexDump(m_card_data[2]));
+}
+
+void MagneticCardReader::WriteCardFile()
+{
+  // Note: Creating empty upsets games when reinserting them later.
+  // Games expect to dispense their own blank cards, not have such cards inserted.
+  // We only write files when the game itself writes, so this won't happen.
+
+  NOTICE_LOG_FMT(SERIALINTERFACE_CARD, "Writing card data to: {}", m_card_settings->card_name);
+  DEBUG_LOG_FMT(SERIALINTERFACE_CARD, "WriteCard: 0:{} 1:{} 2:{}", GetHexDump(m_card_data[0]),
+                GetHexDump(m_card_data[1]), GetHexDump(m_card_data[2]));
+
+  auto full_path = m_card_settings->card_path + m_card_settings->card_name;
+
+  File::DirectIOFile file{full_path, File::AccessMode::Write};
+
+  for (auto& track_data : m_card_data)
+  {
+    if (track_data.has_value() && !file.Write(*track_data))
+    {
+      ERROR_LOG_FMT(SERIALINTERFACE_CARD, "File write failed.");
+      break;
+    }
+  }
+}
+
+void MagneticCardReader::SetPError(P error_code)
+{
+  WARN_LOG_FMT(SERIALINTERFACE_CARD, "SetPError: {:02x}", u8(error_code));
+  m_status.p = error_code;
+  FinishCommand();
+}
+
+void MagneticCardReader::SetSError(S error_code)
+{
+  WARN_LOG_FMT(SERIALINTERFACE_CARD, "SetSError: {:02x}", u8(error_code));
+  m_status.s = error_code;
+  FinishCommand();
+}
+
+void MagneticCardReader::Process(std::vector<u8>* read, std::vector<u8>* write)
+{
+  while (!read->empty())
+  {
+    const u8 first_byte = read->front();
+    if (first_byte == ENQUIRY)
+    {
+      // ENQUIRY
+      // The host sends this regularly.
+      // This triggers sending of the latest command buffer.
+      // We also step the state machine here.
+
+      DEBUG_LOG_FMT(SERIALINTERFACE_CARD, "Process: ENQ");
+
+      // TODO: Get time from Core rather than assuming.
+      const auto elapsed_time = std::chrono::milliseconds{50};
+
+      StepStateMachine(elapsed_time);
+      StepStatePerson(elapsed_time);
+
+      BuildPacket(*write);
+
+      read->erase(read->begin());  // TODO: SLOW !
+      continue;
+    }
+
+    if (first_byte != START_OF_TEXT)
+    {
+      ERROR_LOG_FMT(SERIALINTERFACE_CARD, "Process: Unexpected {:02x}", first_byte);
+      read->erase(read->begin());  // TODO: SLOW !
+      continue;
+    }
+
+    // START_OF_TEXT
+    // This is a command packet. The next byte provides the size.
+    // Upon read they ACK or NACK and start processing of a command.
+
+    if (read->size() < 2)
+      break;  // Wait for more data.
+
+    const std::size_t packet_size = (*read)[1];
+    if (packet_size > read->size() - 2)
+      break;  // Wait for more data.
+
+    if (ReceivePacket(std::span{*read}.subspan(2, packet_size)))
+    {
+      DEBUG_LOG_FMT(SERIALINTERFACE_CARD, "Writing ACK");
+      write->emplace_back(ACK);
+    }
+    else
+    {
+      WARN_LOG_FMT(SERIALINTERFACE_CARD, "Writing NACK");
+      write->emplace_back(NACK);
+    }
+
+    read->erase(read->begin(), read->begin() + packet_size + 2);  // TODO: SLOW !
+  }
+}
+
+bool MagneticCardReader::ReceivePacket(std::span<const u8> packet)
+{
+  DEBUG_LOG_FMT(SERIALINTERFACE_CARD, "ReceivePacket: {}", GetHexDump(packet));
+
+  if (packet.size() < 6)
+  {
+    WARN_LOG_FMT(SERIALINTERFACE_CARD, "ReceivePacket: Bad packet size!");
+    return false;
+  }
+
+  if (packet[packet.size() - 2] != END_OF_TEXT)
+  {
+    WARN_LOG_FMT(SERIALINTERFACE_CARD, "ReceivePacket: Missing END_OF_TEXT!");
+    return false;
+  }
+
+  // Checksum is XOR of the previous bytes.
+  // This includes the count byte that we already chopped off.
+  const u8 read_checksum = packet.back();
+
+  // TODO C++23:
+  // std::ranges::fold_left(packet.first(packet.size() - 1), u8(packet.size()), std::bit_xor{});
+  const auto range_to_checksum = packet.first(packet.size() - 1);
+  const auto proper_checksum = std::accumulate(range_to_checksum.begin(), range_to_checksum.end(),
+                                               u8(packet.size()), std::bit_xor{});
+
+  // Verify checksum. Skip packet if invalid.
+  if (read_checksum != proper_checksum)
+  {
+    WARN_LOG_FMT(SERIALINTERFACE_CARD, "ReceivePacket: Bad checksum!");
+    return false;
+  }
+
+  const u8 new_command = packet[0];
+
+  if (IsRunningCommand())
+  {
+    if (new_command == 0x40)  // Cancel.
+    {
+      INFO_LOG_FMT(SERIALINTERFACE_CARD, "ReceivePacket: Cancelling command: {:02x}",
+                   m_current_command);
+    }
+    else
+    {
+      // What does the real hardware do here ?
+      WARN_LOG_FMT(SERIALINTERFACE_CARD,
+                   "ReceivePacket: Running command: {:02x} interrupted by command: {:02x}",
+                   m_current_command, new_command);
+    }
+  }
+
+  m_current_command = new_command;
+
+  // Copy the payload.
+  // We're skipping the command number and the host's 3 status bytes,
+  //  and dropping the END_OF_TEXT and checksum.
+  m_current_packet.resize(packet.size() - 6);
+  std::ranges::copy(packet.subspan(4, m_current_packet.size()), m_current_packet.data());
+
+  // TODO: Is this sensible for every command ?
+  m_status.SoftReset();
+
+  // Start the new command.
+  m_status.s = S::RUNNING_COMMAND;
+  m_current_step = 1;
+  m_command_payload.clear();
+
+  return true;
+}
+
+void MagneticCardReader::StepStatePerson(DT elapsed_time)
+{
+  m_time_since_person_moved_card += elapsed_time;
+
+  // F-Zero AX: Polls for a card with command 0x20 ReadStatus().
+  //  It demands a card is removed from "ENTRY_SLOT" during boot.
+  //  It pauses and spams ReadStatus() until that happens.
+  //  When wanted, it loads a card detected at the "ENTRY_SLOT" position.
+  //  There's not a perfectly reliably way to detect when it wants a card.
+  //
+  // MarioKart GP: Polls for wanted cards with command 0x33 ReadData(Mode:CardCapture).
+  //  It does this regardless of the card being detected in the "ENTRY_SLOT" position.
+  //  This makes it easy to detect when cards are wanted.
+  //  It pauses until cards are pulled from "ENTRY_SLOT" on game over.
+
+  // This logic tries to emulate a person following those rules.
+
+  // People can't interact with cards inside the machine.
+  if (IsCardLoaded())
+    return;
+
+  Common::Lazy<bool> card_exists{[&] {
+    const auto full_path = m_card_settings->card_path + m_card_settings->card_name;
+    return File::Exists(full_path);
+  }};
+
+  if (!IsCardPresent())
+  {
+    if (m_card_settings->insert_card_when_possible && IsReadyForCard() &&
+        m_time_since_person_moved_card > std::chrono::milliseconds{500} && *card_exists)
+    {
+      // Place the card in the entry slot after a delay.
+      NOTICE_LOG_FMT(SERIALINTERFACE_CARD, "Inserting card.");
+      m_status.r = R::ENTRY_SLOT;
+      m_time_since_person_moved_card = {};
+    }
+
+    return;
+  }
+
+  const bool machine_moved_card_last =
+      m_time_since_machine_moved_card < m_time_since_person_moved_card;
+  if ((machine_moved_card_last &&
+       m_time_since_machine_moved_card > std::chrono::milliseconds{100}) ||
+      !*card_exists)
+  {
+    // Take the card from the machine when ejected or if the file is deleted.
+    NOTICE_LOG_FMT(SERIALINTERFACE_CARD, "Removing card.");
+    m_status.r = R::NO_CARD;
+    m_time_since_person_moved_card = {};
+  }
+}
+
+void MagneticCardReader::StepStateMachine(DT elapsed_time)
+{
+  m_time_since_machine_moved_card += elapsed_time;
+
+  if (!IsRunningCommand())
+    return;
+
+  DEBUG_LOG_FMT(SERIALINTERFACE_CARD, "StepStateMachine command: {:02x}", GetCurrentCommand());
+
+  switch (GetCurrentCommand())
+  {
+  case 0x10:
+    Command_10_Initialize();
+    break;
+  case 0x20:
+    Command_20_ReadStatus();
+    break;
+  case 0x33:
+    Command_33_ReadData();
+    break;
+  case 0x35:
+    Command_35_GetData();
+    break;
+  case 0x40:
+    Command_40_Cancel();
+    break;
+  case 0x53:
+    Command_53_WriteData();
+    break;
+  case 0x78:
+    Command_78_PrintSettings();
+    break;
+  case 0x7A:
+    Command_7A_RegisterFont();
+    break;
+  case 0x7B:
+    Command_7B_PrintImage();
+    break;
+  case 0x7C:
+    Command_7C_PrintLine();
+    break;
+  case 0x7D:
+    Command_7D_Erase();
+    break;
+  case 0x7E:
+    Command_7E_PrintBarcode();
+    break;
+  case 0x80:
+    Command_80_EjectCard();
+    break;
+  case 0xA0:
+    Command_A0_Clean();
+    break;
+  case 0xB0:
+    Command_B0_DispenseCard();
+    break;
+  case 0xC0:
+    Command_C0_ControlLED();
+    break;
+  case 0xC1:
+    Command_C1_SetPrintRetry();
+    break;
+  case 0xD0:
+    Command_D0_ControlShutter();
+    break;
+  case 0xF0:
+    Command_F0_GetVersion();
+    break;
+  default:
+    WARN_LOG_FMT(SERIALINTERFACE_CARD, "HandlePacket: Unhandled command {:02x}",
+                 GetCurrentCommand());
+    SetSError(S::ILLEGAL_COMMAND);
+    break;
+  }
+
+  if (IsRunningCommand())
+    ++m_current_step;
+}
+
+void MagneticCardReader::BuildPacket(std::vector<u8>& write_buffer)
+{
+  // Header and footer add 6 bytes.
+  const u8 payload_size = u8(m_command_payload.size() + 6);
+  // + START_OF_TEXT + the count byte
+  const auto total_write_size = payload_size + 2;
+
+  const auto prev_buffer_size = write_buffer.size();
+  write_buffer.resize(prev_buffer_size + total_write_size);
+
+  auto* out_ptr = write_buffer.data() + prev_buffer_size;
+  u8 packet_checksum = 0;
+
+  const auto write_and_checksum = [&](u8 value) {
+    *(out_ptr++) = value;
+    packet_checksum ^= value;
+  };
+
+  // Write the header.
+  *(out_ptr++) = START_OF_TEXT;
+  write_and_checksum(payload_size);
+  write_and_checksum(GetCurrentCommand());
+  write_and_checksum(GetPositionValue());
+  write_and_checksum(u8(m_status.p));
+  write_and_checksum(u8(m_status.s));
+
+  // Write the payload.
+  std::ranges::for_each(m_command_payload, write_and_checksum);
+
+  // Write the footer.
+  write_and_checksum(END_OF_TEXT);
+  *(out_ptr++) = packet_checksum;
+
+  DEBUG_LOG_FMT(
+      SERIALINTERFACE_CARD, "BuildPacket: {}",
+      GetHexDump(std::span{write_buffer}.subspan(write_buffer.size() - payload_size - 2)));
+}
+
+bool MagneticCardReader::IsRunningCommand() const
+{
+  return m_current_step > 0;
+}
+
+void MagneticCardReader::FinishCommand()
+{
+  m_current_step = 0;
+
+  if (m_status.s != S::ILLEGAL_COMMAND)
+    m_status.s = S::NO_JOB;
+}
+
+u8 MagneticCardReader::GetCurrentCommand() const
+{
+  return m_current_command;
+}
+
+bool MagneticCardReader::IsCardPresent() const
+{
+  return m_status.r != R::NO_CARD;
+}
+
+bool MagneticCardReader::IsCardLoaded() const
+{
+  return m_status.r != R::NO_CARD && m_status.r != R::ENTRY_SLOT;
+}
+
+void MagneticCardReader::MoveCard(R new_position)
+{
+  if (m_status.r == new_position)
+    return;
+
+  static constexpr const char* position_descriptions[] = {
+      "NO_CARD", "READ_WRITE_HEAD", "THERMAL_HEAD", "DISPENSER_THERMAL", "ENTRY_SLOT",
+  };
+
+  INFO_LOG_FMT(SERIALINTERFACE_CARD, "MoveCard: {}",
+               position_descriptions[std::size_t(new_position)]);
+
+  m_status.r = new_position;
+  m_time_since_machine_moved_card = {};
+}
+
+void MagneticCardReader::EjectCard()
+{
+  if (IsCardLoaded())
+  {
+    NOTICE_LOG_FMT(SERIALINTERFACE_CARD, "Ejecting card.");
+
+    ClearCardInMemory();
+    MoveCard(R::ENTRY_SLOT);
+
+    Core::DisplayMessage("Ejected Magnetic Card", 4000);
+  }
+}
+
+void MagneticCardReader::DispenseCard()
+{
+  // TODO: Think about how multiple card management UX should work.
+  // Since this is a new card, we maybe shouldn't be overwriting existing files.
+
+  if (IsCardLoaded())
+  {
+    SetSError(S::ILLEGAL_COMMAND);
+    return;
+  }
+
+  if (m_card_settings->report_dispenser_empty)
+  {
+    m_status.s = S::DISPENSER_EMPTY;
+    return;
+  }
+
+  NOTICE_LOG_FMT(SERIALINTERFACE_CARD, "Dispensing a new card.");
+  Core::DisplayMessage("Created Magnetic Card", 4000);
+
+  // TODO: This behavior doesn't seem to match protocol dumps.
+  MoveCard(R::DISPENSER_THERMAL);
+}
+
+bool MagneticCardReader::IsReadyForCard()
+{
+  return !IsCardPresent();
+}
+
+void MagneticCardReader::DoState(PointerWrap& p)
+{
+  // Outgoing packet.
+  p.Do(m_status);
+  p.Do(m_current_command);
+  p.Do(m_command_payload);
+
+  // Command state.
+  p.Do(m_current_packet);
+  p.Do(m_current_step);
+
+  // The card data in memory.
+  for (auto& track : m_card_data)
+    p.Do(track);
+
+  p.Do(m_time_since_machine_moved_card);
+  p.Do(m_time_since_person_moved_card);
+}
+
+}  // namespace MagCard
diff --git a/Source/Core/Core/HW/MagCard/MagneticCardReader.h b/Source/Core/Core/HW/MagCard/MagneticCardReader.h
new file mode 100644
index 000000000000..b60514a6ab51
--- /dev/null
+++ b/Source/Core/Core/HW/MagCard/MagneticCardReader.h
@@ -0,0 +1,207 @@
+// Copyright 2026 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+// Based on: https://github.com/GXTX/YACardEmu
+// Copyright (C) 2020-2023 wutno (https://github.com/GXTX)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <array>
+#include <optional>
+#include <span>
+#include <string>
+#include <vector>
+
+#include "Common/ChunkFile.h"
+#include "Common/CommonTypes.h"
+
+namespace MagCard
+{
+
+class MagneticCardReader
+{
+public:
+  static constexpr std::size_t TRACK_SIZE = 69;  // A nice amount of data.
+  static constexpr std::size_t NUM_TRACKS = 3;
+
+  // This data is not part of the card reader state.
+  struct Settings
+  {
+    std::string card_name;
+    std::string card_path;
+
+    bool insert_card_when_possible = true;
+    bool report_dispenser_empty = false;
+  };
+
+  explicit MagneticCardReader(Settings* settings);
+  virtual ~MagneticCardReader();
+
+  MagneticCardReader(const MagneticCardReader&) = delete;
+  MagneticCardReader& operator=(const MagneticCardReader&) = delete;
+  MagneticCardReader(MagneticCardReader&&) = delete;
+  MagneticCardReader& operator=(MagneticCardReader&&) = delete;
+
+  // TODO: This std:vector buffer interface is a bit funky..
+
+  //  read = MagCard <-- Baseboard.
+  // write = Magcard --> Baseboard.
+  void Process(std::vector<u8>* read, std::vector<u8>* write);
+
+  virtual void DoState(PointerWrap& p);
+
+protected:
+  // Status bytes:
+  enum class R : u8
+  {
+    // Note: Derived classes define the real values in GetPositionValue().
+    NO_CARD,
+    READ_WRITE_HEAD,
+    THERMAL_HEAD,
+    DISPENSER_THERMAL,
+    ENTRY_SLOT,
+
+    MAX_POSITIONS,
+  };
+  enum class P : u8
+  {
+    NO_ERR = 0x30,
+    READ_ERR = 0x31,
+    WRITE_ERR = 0x32,
+    CARD_JAM = 0x33,
+    MOTOR_ERR = 0x34,  // transport system motor error
+    PRINT_ERR = 0x35,
+    ILLEGAL_ERR = 0x38,  // generic error
+    BATTERY_ERR = 0x40,  // low battery voltage
+    SYSTEM_ERR = 0x41,   // reader/writer system err
+    TRACK_1_READ_ERR = 0x51,
+    TRACK_2_READ_ERR = 0x52,
+    TRACK_3_READ_ERR = 0x53,
+    TRACK_1_AND_2_READ_ERR = 0x54,
+    TRACK_1_AND_3_READ_ERR = 0x55,
+    TRACK_2_AND_3_READ_ERR = 0x56,
+  };
+  enum class S : u8
+  {
+    NO_JOB = 0x30,
+    ILLEGAL_COMMAND = 0x32,
+    RUNNING_COMMAND = 0x33,
+    WAITING_FOR_CARD = 0x34,
+    DISPENSER_EMPTY = 0x35,
+    NO_DISPENSER = 0x36,
+    CARD_FULL = 0x37,
+  };
+
+  struct Status
+  {
+    R r = R::NO_CARD;
+    P p = P::NO_ERR;
+    S s = S::NO_JOB;
+
+    void SoftReset()
+    {
+      p = P::NO_ERR;
+      s = S::NO_JOB;
+    }
+  };
+
+  enum class InitMode : u8
+  {
+    Standard = 0x30,
+    EjectAfter = 0x31,
+    ResetSpecifications = 0x32,
+  };
+
+  bool ReceivePacket(std::span<const u8> packet);
+  void BuildPacket(std::vector<u8>& write_buffer);
+
+  void StepStateMachine(DT elapsed_time);
+  void StepStatePerson(DT elapsed_time);
+
+  // This is what actually maps the "R" position value to a number.
+  virtual u8 GetPositionValue() = 0;
+
+  void SetPError(P error_code);
+  void SetSError(S error_code);
+
+  void ClearCardInMemory();
+
+  // Read/Write with host filesystem.
+  void ReadCardFile();
+  void WriteCardFile();
+
+  bool IsRunningCommand() const;
+  void FinishCommand();
+
+  u8 GetCurrentCommand() const;
+
+  // Is a card anywhere the machine can sense it ?
+  bool IsCardPresent() const;
+
+  // Is a card beyond the "ENTRY_SLOT" position ?
+  bool IsCardLoaded() const;
+
+  virtual bool IsReadyForCard();
+
+  // Move the card through the machine.
+  void MoveCard(R new_position);
+
+  // Unloads the card and moves it to the "ENTRY_SLOT" position.
+  void EjectCard();
+
+  // Feeds a new card into the machine from an internal hopper.
+  void DispenseCard();
+
+  // Commands
+  virtual void Command_10_Initialize();
+  void Command_20_ReadStatus();
+  void Command_33_ReadData();  // Multi-track read.
+  void Command_35_GetData();   // Read the entire card.
+  void Command_40_Cancel();
+  void Command_53_WriteData();  // Multi-track write.
+  void Command_78_PrintSettings();
+  void Command_7A_RegisterFont();
+  void Command_7B_PrintImage();
+  void Command_7C_PrintLine();
+  void Command_7D_Erase();  // Erase the printed image.
+  void Command_7E_PrintBarcode();
+  void Command_80_EjectCard();
+  void Command_A0_Clean();
+  void Command_B0_DispenseCard();
+  void Command_C0_ControlLED();
+  void Command_C1_SetPrintRetry();
+  virtual void Command_D0_ControlShutter();
+  void Command_F0_GetVersion();
+
+  Settings* const m_card_settings;
+
+  // R P S values that are sent in every ENQUIRY response.
+  Status m_status{};
+
+  // A byte sent in every ENQUIRY response.
+  // TODO: What's the default value on just powered up hardware ?
+  u8 m_current_command = 0;
+
+  // The data included in every ENQUIRY response.
+  std::vector<u8> m_command_payload;
+
+  // The card track data in memory.
+  using TrackData = std::optional<std::array<u8, TRACK_SIZE>>;
+  std::array<TrackData, NUM_TRACKS> m_card_data;
+
+  // The parameter data of the command being processed.
+  std::vector<u8> m_current_packet;
+
+  // The progress state of the current command.
+  // 0 == not running a command.
+  // TODO: Change this to emulated milliseconds or something.
+  s32 m_current_step = 0;
+
+  // Used to delay re-insertion of cards after ejection.
+  // This avoids having to expose card "Take"/"Insert" actions.
+  DT m_time_since_machine_moved_card{};
+  DT m_time_since_person_moved_card{};
+};
+
+}  // namespace MagCard
diff --git a/Source/Core/Core/HW/Memmap.cpp b/Source/Core/Core/HW/Memmap.cpp
index 67823c2db46e..fd405cd185c0 100644
--- a/Source/Core/Core/HW/Memmap.cpp
+++ b/Source/Core/Core/HW/Memmap.cpp
@@ -10,8 +10,11 @@
 
 #include <algorithm>
 #include <array>
+#include <bit>
 #include <cstring>
+#include <map>
 #include <memory>
+#include <set>
 #include <span>
 #include <tuple>
 
@@ -41,33 +44,44 @@
 
 namespace Memory
 {
-MemoryManager::MemoryManager(Core::System& system) : m_system(system)
+MemoryManager::MemoryManager(Core::System& system)
+    : m_page_size(static_cast<u32>(m_arena.GetPageSize())),
+      m_guest_pages_per_host_page(m_page_size / PowerPC::HW_PAGE_SIZE),
+      m_host_page_type(GetHostPageTypeForPageSize(m_page_size)), m_system(system)
 {
 }
 
 MemoryManager::~MemoryManager() = default;
 
-void MemoryManager::InitMMIO(bool is_wii)
+MemoryManager::HostPageType MemoryManager::GetHostPageTypeForPageSize(u32 page_size)
+{
+  if (!std::has_single_bit(page_size))
+    return HostPageType::Unsupported;
+
+  return page_size > PowerPC::HW_PAGE_SIZE ? HostPageType::LargePages : HostPageType::SmallPages;
+}
+
+void MemoryManager::InitMMIO(Core::System& system)
 {
   m_mmio_mapping = std::make_unique<MMIO::Mapping>();
 
-  m_system.GetCommandProcessor().RegisterMMIO(m_mmio_mapping.get(), 0x0C000000);
-  m_system.GetPixelEngine().RegisterMMIO(m_mmio_mapping.get(), 0x0C001000);
-  m_system.GetVideoInterface().RegisterMMIO(m_mmio_mapping.get(), 0x0C002000);
-  m_system.GetProcessorInterface().RegisterMMIO(m_mmio_mapping.get(), 0x0C003000);
-  m_system.GetMemoryInterface().RegisterMMIO(m_mmio_mapping.get(), 0x0C004000);
-  m_system.GetDSP().RegisterMMIO(m_mmio_mapping.get(), 0x0C005000);
-  m_system.GetDVDInterface().RegisterMMIO(m_mmio_mapping.get(), 0x0C006000, false);
-  m_system.GetSerialInterface().RegisterMMIO(m_mmio_mapping.get(), 0x0C006400);
-  m_system.GetExpansionInterface().RegisterMMIO(m_mmio_mapping.get(), 0x0C006800);
-  m_system.GetAudioInterface().RegisterMMIO(m_mmio_mapping.get(), 0x0C006C00);
-  if (is_wii)
+  system.GetCommandProcessor().RegisterMMIO(m_mmio_mapping.get(), 0x0C000000);
+  system.GetPixelEngine().RegisterMMIO(m_mmio_mapping.get(), 0x0C001000);
+  system.GetVideoInterface().RegisterMMIO(m_mmio_mapping.get(), 0x0C002000);
+  system.GetProcessorInterface().RegisterMMIO(m_mmio_mapping.get(), 0x0C003000);
+  system.GetMemoryInterface().RegisterMMIO(m_mmio_mapping.get(), 0x0C004000);
+  system.GetDSP().RegisterMMIO(m_mmio_mapping.get(), 0x0C005000);
+  system.GetDVDInterface().RegisterMMIO(m_mmio_mapping.get(), 0x0C006000, false);
+  system.GetSerialInterface().RegisterMMIO(m_mmio_mapping.get(), 0x0C006400);
+  system.GetExpansionInterface().RegisterMMIO(m_mmio_mapping.get(), 0x0C006800);
+  system.GetAudioInterface().RegisterMMIO(m_mmio_mapping.get(), 0x0C006C00);
+  if (system.IsWii())
   {
-    m_system.GetWiiIPC().RegisterMMIO(m_mmio_mapping.get(), 0x0D000000);
-    m_system.GetDVDInterface().RegisterMMIO(m_mmio_mapping.get(), 0x0D006000, true);
-    m_system.GetSerialInterface().RegisterMMIO(m_mmio_mapping.get(), 0x0D006400);
-    m_system.GetExpansionInterface().RegisterMMIO(m_mmio_mapping.get(), 0x0D006800);
-    m_system.GetAudioInterface().RegisterMMIO(m_mmio_mapping.get(), 0x0D006C00);
+    system.GetWiiIPC().RegisterMMIO(m_mmio_mapping.get(), 0x0D000000);
+    system.GetDVDInterface().RegisterMMIO(m_mmio_mapping.get(), 0x0D006000, true);
+    system.GetSerialInterface().RegisterMMIO(m_mmio_mapping.get(), 0x0D006400);
+    system.GetExpansionInterface().RegisterMMIO(m_mmio_mapping.get(), 0x0D006800);
+    system.GetAudioInterface().RegisterMMIO(m_mmio_mapping.get(), 0x0D006C00);
   }
 }
 
@@ -151,8 +165,6 @@ void MemoryManager::Init()
   m_physical_page_mappings_base = reinterpret_cast<u8*>(m_physical_page_mappings.data());
   m_logical_page_mappings_base = reinterpret_cast<u8*>(m_logical_page_mappings.data());
 
-  InitMMIO(wii);
-
   Clear();
 
   INFO_LOG_FMT(MEMMAP, "Memory system initialized. RAM at {}", fmt::ptr(m_ram));
@@ -216,8 +228,8 @@ bool MemoryManager::InitFastmemArena()
     if (!region.active)
       continue;
 
-    u8* base = m_physical_base + region.physical_address;
-    u8* view = (u8*)m_arena.MapInMemoryRegion(region.shm_position, region.size, base);
+    void* base = m_physical_base + region.physical_address;
+    void* view = m_arena.MapInMemoryRegion(region.shm_position, region.size, base, true);
 
     if (base != view)
     {
@@ -233,13 +245,15 @@ bool MemoryManager::InitFastmemArena()
   return true;
 }
 
-void MemoryManager::UpdateLogicalMemory(const PowerPC::BatTable& dbat_table)
+void MemoryManager::UpdateDBATMappings(const PowerPC::BatTable& dbat_table)
 {
-  for (auto& entry : m_logical_mapped_entries)
+  for (const auto& [logical_address, entry] : m_dbat_mapped_entries)
   {
     m_arena.UnmapFromMemoryRegion(entry.mapped_pointer, entry.mapped_size);
   }
-  m_logical_mapped_entries.clear();
+  m_dbat_mapped_entries.clear();
+
+  RemoveAllPageTableMappings();
 
   m_logical_page_mappings.fill(nullptr);
 
@@ -287,16 +301,16 @@ void MemoryManager::UpdateLogicalMemory(const PowerPC::BatTable& dbat_table)
             u8* base = m_logical_base + logical_address + intersection_start - translated_address;
             u32 mapped_size = intersection_end - intersection_start;
 
-            void* mapped_pointer = m_arena.MapInMemoryRegion(position, mapped_size, base);
+            void* mapped_pointer = m_arena.MapInMemoryRegion(position, mapped_size, base, true);
             if (!mapped_pointer)
             {
-              PanicAlertFmt(
-                  "Memory::UpdateLogicalMemory(): Failed to map memory region at 0x{:08X} "
-                  "(size 0x{:08X}) into logical fastmem region at 0x{:08X}.",
-                  intersection_start, mapped_size, logical_address);
-              exit(0);
+              PanicAlertFmt("Memory::UpdateDBATMappings(): Failed to map memory region at 0x{:08X} "
+                            "(size 0x{:08X}) into logical fastmem region at 0x{:08X}.",
+                            intersection_start, mapped_size, logical_address);
+              continue;
             }
-            m_logical_mapped_entries.push_back({mapped_pointer, mapped_size});
+            m_dbat_mapped_entries.emplace(logical_address,
+                                          LogicalMemoryView{mapped_pointer, mapped_size});
           }
 
           m_logical_page_mappings[i] =
@@ -307,6 +321,184 @@ void MemoryManager::UpdateLogicalMemory(const PowerPC::BatTable& dbat_table)
   }
 }
 
+void MemoryManager::AddPageTableMapping(u32 logical_address, u32 translated_address, bool writeable)
+{
+  if (!m_is_fastmem_arena_initialized)
+    return;
+
+  switch (m_host_page_type)
+  {
+  case HostPageType::SmallPages:
+    return AddHostPageTableMapping(logical_address, translated_address, writeable,
+                                   PowerPC::HW_PAGE_SIZE);
+  case HostPageType::LargePages:
+    return TryAddLargePageTableMapping(logical_address, translated_address, writeable);
+  default:
+    return;
+  }
+}
+
+void MemoryManager::TryAddLargePageTableMapping(u32 logical_address, u32 translated_address,
+                                                bool writeable)
+{
+  const bool add_readable =
+      TryAddLargePageTableMapping(logical_address, translated_address, m_large_readable_pages);
+
+  const bool add_writeable =
+      writeable &&
+      TryAddLargePageTableMapping(logical_address, translated_address, m_large_writeable_pages);
+
+  if (add_readable || add_writeable)
+  {
+    AddHostPageTableMapping(logical_address & ~(m_page_size - 1),
+                            translated_address & ~(m_page_size - 1), add_writeable, m_page_size);
+  }
+}
+
+bool MemoryManager::TryAddLargePageTableMapping(u32 logical_address, u32 translated_address,
+                                                std::map<u32, std::vector<u32>>& map)
+{
+  std::vector<u32>& entries = map[logical_address & ~(m_page_size - 1)];
+
+  if (entries.empty())
+    entries = std::vector<u32>(m_guest_pages_per_host_page, INVALID_MAPPING);
+
+  entries[(logical_address & (m_page_size - 1)) / PowerPC::HW_PAGE_SIZE] = translated_address;
+
+  return CanCreateHostMappingForGuestPages(entries);
+}
+
+bool MemoryManager::CanCreateHostMappingForGuestPages(const std::vector<u32>& entries) const
+{
+  const u32 translated_address = entries[0];
+  if ((translated_address & (m_page_size - 1)) != 0)
+    return false;
+
+  for (size_t i = 1; i < m_guest_pages_per_host_page; ++i)
+  {
+    if (entries[i] != translated_address + i * PowerPC::HW_PAGE_SIZE)
+      return false;
+  }
+
+  return true;
+}
+
+void MemoryManager::AddHostPageTableMapping(u32 logical_address, u32 translated_address,
+                                            bool writeable, u32 logical_size)
+{
+  for (const auto& physical_region : m_physical_regions)
+  {
+    if (!physical_region.active)
+      continue;
+
+    const u32 mapping_address = physical_region.physical_address;
+    const u32 mapping_end = mapping_address + physical_region.size;
+    const u32 intersection_start = std::max(mapping_address, translated_address);
+    const u32 intersection_end = std::min(mapping_end, translated_address + logical_size);
+    if (intersection_start >= intersection_end)
+      continue;
+
+    // Found an overlapping region; map it.
+    const u32 position = physical_region.shm_position + intersection_start - mapping_address;
+    u8* const base = m_logical_base + logical_address + intersection_start - translated_address;
+    const u32 mapped_size = intersection_end - intersection_start;
+
+    const auto it = m_page_table_mapped_entries.find(logical_address);
+    if (it != m_page_table_mapped_entries.end())
+    {
+      // Update the protection of an existing mapping.
+      if (it->second.mapped_pointer == base && it->second.mapped_size == mapped_size)
+      {
+        if (!m_arena.ChangeMappingProtection(base, mapped_size, writeable))
+        {
+          PanicAlertFmt("Memory::AddPageTableMapping(): Failed to change protection for memory "
+                        "region at 0x{:08X} (size 0x{:08X}, logical fastmem region at 0x{:08X}).",
+                        intersection_start, mapped_size, logical_address);
+        }
+      }
+    }
+    else
+    {
+      // Create a new mapping.
+      void* const mapped_pointer =
+          m_arena.MapInMemoryRegion(position, mapped_size, base, writeable);
+      if (!mapped_pointer)
+      {
+        PanicAlertFmt("Memory::AddPageTableMapping(): Failed to map memory region at 0x{:08X} "
+                      "(size 0x{:08X}) into logical fastmem region at 0x{:08X}.",
+                      intersection_start, mapped_size, logical_address);
+        continue;
+      }
+      m_page_table_mapped_entries.emplace(logical_address,
+                                          LogicalMemoryView{mapped_pointer, mapped_size});
+    }
+  }
+}
+
+void MemoryManager::RemovePageTableMappings(const std::set<u32>& mappings)
+{
+  switch (m_host_page_type)
+  {
+  case HostPageType::SmallPages:
+    return RemoveHostPageTableMappings(mappings);
+  case HostPageType::LargePages:
+    for (u32 logical_address : mappings)
+      RemoveLargePageTableMapping(logical_address);
+    return;
+  default:
+    return;
+  }
+}
+
+void MemoryManager::RemoveLargePageTableMapping(u32 logical_address)
+{
+  RemoveLargePageTableMapping(logical_address, m_large_readable_pages);
+  RemoveLargePageTableMapping(logical_address, m_large_writeable_pages);
+
+  const u32 aligned_logical_address = logical_address & ~(m_page_size - 1);
+  const auto it = m_page_table_mapped_entries.find(aligned_logical_address);
+  if (it != m_page_table_mapped_entries.end())
+  {
+    const LogicalMemoryView& entry = it->second;
+    m_arena.UnmapFromMemoryRegion(entry.mapped_pointer, entry.mapped_size);
+
+    m_page_table_mapped_entries.erase(it);
+  }
+}
+
+void MemoryManager::RemoveLargePageTableMapping(u32 logical_address,
+                                                std::map<u32, std::vector<u32>>& map)
+{
+  const auto it = map.find(logical_address & ~(m_page_size - 1));
+  if (it != map.end())
+    it->second[(logical_address & (m_page_size - 1)) / PowerPC::HW_PAGE_SIZE] = INVALID_MAPPING;
+}
+
+void MemoryManager::RemoveHostPageTableMappings(const std::set<u32>& mappings)
+{
+  if (mappings.empty())
+    return;
+
+  std::erase_if(m_page_table_mapped_entries, [this, &mappings](const auto& pair) {
+    const auto& [logical_address, entry] = pair;
+    const bool remove = mappings.contains(logical_address);
+    if (remove)
+      m_arena.UnmapFromMemoryRegion(entry.mapped_pointer, entry.mapped_size);
+    return remove;
+  });
+}
+
+void MemoryManager::RemoveAllPageTableMappings()
+{
+  for (const auto& [logical_address, entry] : m_page_table_mapped_entries)
+  {
+    m_arena.UnmapFromMemoryRegion(entry.mapped_pointer, entry.mapped_size);
+  }
+  m_page_table_mapped_entries.clear();
+  m_large_readable_pages.clear();
+  m_large_writeable_pages.clear();
+}
+
 void MemoryManager::DoState(PointerWrap& p)
 {
   const u32 current_ram_size = GetRamSize();
@@ -388,14 +580,23 @@ void MemoryManager::ShutdownFastmemArena()
     m_arena.UnmapFromMemoryRegion(base, region.size);
   }
 
-  for (auto& entry : m_logical_mapped_entries)
+  for (const auto& [logical_address, entry] : m_dbat_mapped_entries)
+  {
+    m_arena.UnmapFromMemoryRegion(entry.mapped_pointer, entry.mapped_size);
+  }
+  m_dbat_mapped_entries.clear();
+
+  for (const auto& [logical_address, entry] : m_page_table_mapped_entries)
   {
     m_arena.UnmapFromMemoryRegion(entry.mapped_pointer, entry.mapped_size);
   }
-  m_logical_mapped_entries.clear();
+  m_page_table_mapped_entries.clear();
 
   m_arena.ReleaseMemoryRegion();
 
+  m_large_readable_pages.clear();
+  m_large_writeable_pages.clear();
+
   m_fastmem_arena = nullptr;
   m_fastmem_arena_size = 0;
   m_physical_base = nullptr;
@@ -557,6 +758,13 @@ u64 MemoryManager::Read_U64(u32 address) const
   return Common::swap64(value);
 }
 
+u32 MemoryManager::Read_U32_Swap(u32 address) const
+{
+  u32 value = 0;
+  CopyFromEmu(&value, address, sizeof(value));
+  return value;
+}
+
 void MemoryManager::Write_U8(u8 value, u32 address)
 {
   CopyToEmu(address, &value, sizeof(value));
diff --git a/Source/Core/Core/HW/Memmap.h b/Source/Core/Core/HW/Memmap.h
index e0708605dbfe..4b33776a62ba 100644
--- a/Source/Core/Core/HW/Memmap.h
+++ b/Source/Core/Core/HW/Memmap.h
@@ -4,7 +4,9 @@
 #pragma once
 
 #include <array>
+#include <map>
 #include <memory>
+#include <set>
 #include <span>
 #include <string>
 #include <vector>
@@ -83,6 +85,8 @@ class MemoryManager
   u8* GetPhysicalPageMappingsBase() const { return m_physical_page_mappings_base; }
   u8* GetLogicalPageMappingsBase() const { return m_logical_page_mappings_base; }
 
+  u32 GetHostPageSize() const { return m_page_size; }
+
   // FIXME: these should not return their address, but AddressSpace wants that
   u8*& GetRAM() { return m_ram; }
   u8*& GetEXRAM() { return m_exram; }
@@ -93,13 +97,17 @@ class MemoryManager
 
   // Init and Shutdown
   bool IsInitialized() const { return m_is_initialized; }
+  void InitMMIO(Core::System& system);
   void Init();
   void Shutdown();
   bool InitFastmemArena();
   void ShutdownFastmemArena();
   void DoState(PointerWrap& p);
 
-  void UpdateLogicalMemory(const PowerPC::BatTable& dbat_table);
+  void UpdateDBATMappings(const PowerPC::BatTable& dbat_table);
+  void AddPageTableMapping(u32 logical_address, u32 translated_address, bool writeable);
+  void RemovePageTableMappings(const std::set<u32>& mappings);
+  void RemoveAllPageTableMappings();
 
   void Clear();
 
@@ -115,7 +123,6 @@ class MemoryManager
   // If the specified range is within a single valid memory region, returns a pointer to the start
   // of the corresponding range in host memory. Otherwise, returns nullptr.
   u8* GetPointerForRange(u32 address, size_t size) const;
-
   void CopyFromEmu(void* data, u32 address, size_t size) const;
   void CopyToEmu(u32 address, const void* data, size_t size);
   void Memset(u32 address, u8 value, size_t size);
@@ -123,6 +130,7 @@ class MemoryManager
   u16 Read_U16(u32 address) const;
   u32 Read_U32(u32 address) const;
   u64 Read_U64(u32 address) const;
+  u32 Read_U32_Swap(u32 address) const;
   void Write_U8(u8 var, u32 address);
   void Write_U16(u16 var, u32 address);
   void Write_U32(u32 var, u32 address);
@@ -156,6 +164,16 @@ class MemoryManager
   }
 
 private:
+  enum class HostPageType
+  {
+    // 4K or smaller
+    SmallPages,
+    // 8K or larger
+    LargePages,
+    // Required APIs aren't available, or the page size isn't a power of 2
+    Unsupported,
+  };
+
   // Base is a pointer to the base of the memory map. Yes, some MMU tricks
   // are used to set up a full GC or Wii memory map in process memory.
   // In 64-bit, this might point to "high memory" (above the 32-bit limit),
@@ -207,6 +225,10 @@ class MemoryManager
   // The MemArena class
   Common::MemArena m_arena;
 
+  const u32 m_page_size;
+  const u32 m_guest_pages_per_host_page;
+  const HostPageType m_host_page_type;
+
   // Dolphin allocates memory to represent four regions:
   // - 32MB RAM (actually 24MB on hardware), available on GameCube and Wii
   // - 64MB "EXRAM", RAM only available on Wii
@@ -247,13 +269,31 @@ class MemoryManager
   // TODO: Do we want to handle the mirrors of the GC RAM?
   std::array<PhysicalMemoryRegion, 4> m_physical_regions{};
 
-  std::vector<LogicalMemoryView> m_logical_mapped_entries;
+  // The key is the logical address
+  std::map<u32, LogicalMemoryView> m_dbat_mapped_entries;
+  std::map<u32, LogicalMemoryView> m_page_table_mapped_entries;
 
   std::array<void*, PowerPC::BAT_PAGE_COUNT> m_physical_page_mappings{};
   std::array<void*, PowerPC::BAT_PAGE_COUNT> m_logical_page_mappings{};
 
+  // If the host page size is larger than the guest page size, these two maps are used
+  // to keep track of which guest pages can be combined and mapped as one host page.
+  static constexpr u32 INVALID_MAPPING = 0xFFFFFFFF;
+  std::map<u32, std::vector<u32>> m_large_readable_pages;
+  std::map<u32, std::vector<u32>> m_large_writeable_pages;
+
   Core::System& m_system;
 
-  void InitMMIO(bool is_wii);
+  static HostPageType GetHostPageTypeForPageSize(u32 page_size);
+
+  void TryAddLargePageTableMapping(u32 logical_address, u32 translated_address, bool writeable);
+  bool TryAddLargePageTableMapping(u32 logical_address, u32 translated_address,
+                                   std::map<u32, std::vector<u32>>& map);
+  bool CanCreateHostMappingForGuestPages(const std::vector<u32>& entries) const;
+  void AddHostPageTableMapping(u32 logical_address, u32 translated_address, bool writeable,
+                               u32 logical_size);
+  void RemoveLargePageTableMapping(u32 logical_address);
+  void RemoveLargePageTableMapping(u32 logical_address, std::map<u32, std::vector<u32>>& map);
+  void RemoveHostPageTableMappings(const std::set<u32>& mappings);
 };
 }  // namespace Memory
diff --git a/Source/Core/Core/HW/MemoryInterface.cpp b/Source/Core/Core/HW/MemoryInterface.cpp
index 4841b083b4ca..27f017728757 100644
--- a/Source/Core/Core/HW/MemoryInterface.cpp
+++ b/Source/Core/Core/HW/MemoryInterface.cpp
@@ -7,7 +7,6 @@
 #include <cstring>
 #include <type_traits>
 
-#include "Common/BitField.h"
 #include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
 #include "Core/HW/MMIO.h"
diff --git a/Source/Core/Core/HW/ProcessorInterface.cpp b/Source/Core/Core/HW/ProcessorInterface.cpp
index d805d2fa0e44..7b999ac0de5c 100644
--- a/Source/Core/Core/HW/ProcessorInterface.cpp
+++ b/Source/Core/Core/HW/ProcessorInterface.cpp
@@ -3,7 +3,6 @@
 
 #include "Core/HW/ProcessorInterface.h"
 
-#include <cstdio>
 #include <memory>
 
 #include "Common/Assert.h"
diff --git a/Source/Core/Core/HW/SI/SI.h b/Source/Core/Core/HW/SI/SI.h
index 731b9b5c191d..5f8a47afd7b5 100644
--- a/Source/Core/Core/HW/SI/SI.h
+++ b/Source/Core/Core/HW/SI/SI.h
@@ -56,6 +56,7 @@ class SerialInterfaceManager
   void RemoveEvent(int device_number);
 
   void UpdateDevices();
+  u32 GetInLength() const { return m_com_csr.INLNGTH; }
 
   void RemoveDevice(int device_number);
   void AddDevice(SIDevices device, int device_number);
diff --git a/Source/Core/Core/HW/SI/SI_Device.cpp b/Source/Core/Core/HW/SI/SI_Device.cpp
index 451523624b16..8614bb156c77 100644
--- a/Source/Core/Core/HW/SI/SI_Device.cpp
+++ b/Source/Core/Core/HW/SI/SI_Device.cpp
@@ -17,6 +17,7 @@
 #ifdef HAS_LIBMGBA
 #include "Core/HW/SI/SI_DeviceGBAEmu.h"
 #endif
+#include "Core/HW/SI/SI_DeviceAMBaseboard.h"
 #include "Core/HW/SI/SI_DeviceGCAdapter.h"
 #include "Core/HW/SI/SI_DeviceGCController.h"
 #include "Core/HW/SI/SI_DeviceGCSteeringWheel.h"
@@ -149,6 +150,7 @@ bool SIDevice_IsGCController(SIDevices type)
   case SIDEVICE_GC_TARUKONGA:
   case SIDEVICE_DANCEMAT:
   case SIDEVICE_GC_STEERING:
+  case SIDEVICE_AM_BASEBOARD:
     return true;
   default:
     return false;
@@ -191,6 +193,8 @@ std::unique_ptr<ISIDevice> SIDevice_Create(Core::System& system, const SIDevices
     return std::make_unique<CSIDevice_Keyboard>(system, device, port_number);
 
   case SIDEVICE_AM_BASEBOARD:
+    return std::make_unique<CSIDevice_AMBaseboard>(system, device, port_number);
+
   case SIDEVICE_NONE:
   default:
     return std::make_unique<CSIDevice_Null>(system, device, port_number);
diff --git a/Source/Core/Core/HW/SI/SI_Device.h b/Source/Core/Core/HW/SI/SI_Device.h
index 234c475e5f3e..c3171f42e831 100644
--- a/Source/Core/Core/HW/SI/SI_Device.h
+++ b/Source/Core/Core/HW/SI/SI_Device.h
@@ -97,8 +97,6 @@ enum SIDevices : int
   SIDEVICE_GC_STEERING,
   SIDEVICE_DANCEMAT,
   SIDEVICE_GC_TARUKONGA,
-  // Was used for Triforce in the past, but the implementation is no longer in Dolphin.
-  // It's kept here so that values below will stay constant.
   SIDEVICE_AM_BASEBOARD,
   SIDEVICE_WIIU_ADAPTER,
   SIDEVICE_GC_GBA_EMULATED,
diff --git a/Source/Core/Core/HW/SI/SI_DeviceAMBaseboard.cpp b/Source/Core/Core/HW/SI/SI_DeviceAMBaseboard.cpp
new file mode 100644
index 000000000000..5532c06b879a
--- /dev/null
+++ b/Source/Core/Core/HW/SI/SI_DeviceAMBaseboard.cpp
@@ -0,0 +1,2353 @@
+// Copyright 2025 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "Core/HW/SI/SI_DeviceAMBaseboard.h"
+
+#include <algorithm>
+#include <numeric>
+#include <string>
+
+#include <fmt/format.h>
+
+#include "Common/CommonTypes.h"
+#include "Common/FileUtil.h"
+#include "Common/Logging/Log.h"
+#include "Common/MsgHandler.h"
+#include "Common/Swap.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/Core.h"
+#include "Core/CoreTiming.h"
+#include "Core/HW/DVD/AMMediaboard.h"
+#include "Core/HW/GCPad.h"
+#include "Core/HW/MagCard/C1231BR.h"
+#include "Core/HW/MagCard/C1231LR.h"
+#include "Core/HW/Memmap.h"
+#include "Core/HW/ProcessorInterface.h"
+#include "Core/HW/SI/SI.h"
+#include "Core/HW/SI/SI_Device.h"
+#include "Core/HW/SI/SI_DeviceGCController.h"
+#include "Core/HW/SystemTimers.h"
+#include "Core/Movie.h"
+#include "Core/NetPlayProto.h"
+#include "Core/System.h"
+
+#include "InputCommon/GCPadStatus.h"
+
+namespace SerialInterface
+{
+using namespace AMMediaboard;
+
+void JVSIOMessage::Start(int node)
+{
+  m_last_start = m_pointer;
+  const u8 header[3] = {0xE0, (u8)node, 0};
+  m_checksum = 0;
+  AddData(header, 3, 1);
+}
+
+void JVSIOMessage::AddData(const u8* dst, std::size_t len, int sync = 0)
+{
+  if (m_pointer + len >= sizeof(m_message))
+  {
+    PanicAlertFmt("JVSIOMessage overrun!");
+    return;
+  }
+
+  while (len--)
+  {
+    const u8 c = *dst++;
+    if (!sync && ((c == 0xE0) || (c == 0xD0)))
+    {
+      if (m_pointer + 2 > sizeof(m_message))
+      {
+        PanicAlertFmt("JVSIOMessage overrun!");
+        break;
+      }
+      m_message[m_pointer++] = 0xD0;
+      m_message[m_pointer++] = c - 1;
+    }
+    else
+    {
+      if (m_pointer >= sizeof(m_message))
+      {
+        PanicAlertFmt("JVSIOMessage overrun!");
+        break;
+      }
+      m_message[m_pointer++] = c;
+    }
+
+    if (!sync)
+      m_checksum += c;
+    sync = 0;
+  }
+}
+
+void JVSIOMessage::AddData(const void* data, std::size_t len)
+{
+  AddData(static_cast<const u8*>(data), len);
+}
+
+void JVSIOMessage::AddData(const char* data)
+{
+  AddData(data, strlen(data));
+}
+
+void JVSIOMessage::AddData(u32 n)
+{
+  const u8 cs = n;
+  AddData(&cs, 1);
+}
+
+void JVSIOMessage::End()
+{
+  const u32 len = m_pointer - m_last_start;
+  if (m_last_start + 2 < sizeof(m_message) && len >= 3)
+  {
+    m_message[m_last_start + 2] = len - 2;  // assuming len <0xD0
+    AddData(m_checksum + len - 2);
+  }
+  else
+  {
+    PanicAlertFmt("JVSIOMessage: Not enough space for checksum!");
+  }
+}
+
+static constexpr u8 CheckSumXOR(const u8* data, u32 length)
+{
+  return std::accumulate(data, data + length, u8{}, std::bit_xor());
+}
+
+static constexpr char s_cdr_program_version[] = {"           Version 1.22,2003/09/19,171-8213B"};
+static constexpr char s_cdr_boot_version[] = {"           Version 1.04,2003/06/17,171-8213B"};
+static constexpr u8 s_cdr_card_data[] = {
+    0x00, 0x6E, 0x00, 0x00, 0x01, 0x00, 0x00, 0x06, 0x00, 0x00, 0x07, 0x00, 0x00, 0x0B,
+    0x00, 0x00, 0x0E, 0x00, 0x00, 0x10, 0x00, 0x00, 0x17, 0x00, 0x00, 0x19, 0x00, 0x00,
+    0x1A, 0x00, 0x00, 0x1B, 0x00, 0x00, 0x1D, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x20, 0x00,
+    0x00, 0x22, 0x00, 0x00, 0x23, 0x00, 0x00, 0x24, 0x00, 0x00, 0x27, 0x00, 0x00, 0x28,
+    0x00, 0x00, 0x2C, 0x00, 0x00, 0x2F, 0x00, 0x00, 0x34, 0x00, 0x00, 0x35, 0x00, 0x00,
+    0x37, 0x00, 0x00, 0x38, 0x00, 0x00, 0x39, 0x00, 0x00, 0x3D, 0x00};
+
+const constexpr u8 s_region_flags[] = "\x00\x00\x30\x00"
+                                      //   "\x01\xfe\x00\x00"  // JAPAN
+                                      "\x02\xfd\x00\x00"  // USA
+                                      //"\x03\xfc\x00\x00"  // export
+                                      "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff";
+// AM-Baseboard device on SI
+CSIDevice_AMBaseboard::CSIDevice_AMBaseboard(Core::System& system, SIDevices device,
+                                             int device_number)
+    : ISIDevice(system, device, device_number)
+{
+  // Card ID
+  m_ic_card_data[0x20] = 0x95;
+  m_ic_card_data[0x21] = 0x71;
+
+  if (AMMediaboard::GetGameType() == KeyOfAvalon)
+  {
+    m_ic_card_data[0x22] = 0x26;
+    m_ic_card_data[0x23] = 0x40;
+  }
+  else if (AMMediaboard::GetGameType() == VirtuaStriker4)
+  {
+    m_ic_card_data[0x22] = 0x44;
+    m_ic_card_data[0x23] = 0x00;
+  }
+
+  // Use count
+  m_ic_card_data[0x28] = 0xFF;
+  m_ic_card_data[0x29] = 0xFF;
+
+  // Magnetic Card Reader
+  m_mag_card_settings.card_path = File::GetUserPath(D_TRIUSER_IDX);
+  m_mag_card_settings.card_name = fmt::format("tricard_{}.bin", SConfig::GetInstance().GetGameID());
+
+  // TODO: Do any other games use the Magnetic Card Reader ?
+  switch (AMMediaboard::GetGameType())
+  {
+  case FZeroAX:
+    m_mag_card_reader = std::make_unique<MagCard::C1231BR>(&m_mag_card_settings);
+    break;
+
+  case MarioKartGP:
+  case MarioKartGP2:
+    m_mag_card_reader = std::make_unique<MagCard::C1231LR>(&m_mag_card_settings);
+    break;
+
+  default:
+    break;
+  }
+}
+
+constexpr u32 SI_XFER_LENGTH_MASK = 0x7f;
+
+// Translate [0,1,2,...,126,127] to [128,1,2,...,126,127]
+constexpr s32 ConvertSILengthField(u32 field)
+{
+  return ((field - 1) & SI_XFER_LENGTH_MASK) + 1;
+}
+
+void CSIDevice_AMBaseboard::ICCardSendReply(ICCommand* iccommand, u8* buffer, u32* length)
+{
+  iccommand->status = Common::swap16(iccommand->status);
+
+  const auto iccommand_data = reinterpret_cast<const u8*>(iccommand);
+  const u8 crc = CheckSumXOR(iccommand_data + 2, iccommand->pktlen - 1);
+
+  for (u32 i = 0; i <= iccommand->pktlen; ++i)
+  {
+    buffer[(*length)++] = iccommand_data[i];
+  }
+
+  buffer[(*length)++] = crc;
+}
+
+void CSIDevice_AMBaseboard::SwapBuffers(u8* buffer, u32* buffer_length)
+{
+  memcpy(m_last[1], buffer, 0x80);     // Save current buffer
+  memcpy(buffer, m_last[0], 0x80);     // Load previous buffer
+  memcpy(m_last[0], m_last[1], 0x80);  // Update history
+
+  m_lastptr[1] = *buffer_length;  // Swap lengths
+  *buffer_length = m_lastptr[0];
+  m_lastptr[0] = m_lastptr[1];
+}
+
+int CSIDevice_AMBaseboard::RunBuffer(u8* buffer, int request_length)
+{
+  const auto& serial_interface = m_system.GetSerialInterface();
+  u32 buffer_length = ConvertSILengthField(serial_interface.GetInLength());
+
+  // Debug logging
+  ISIDevice::RunBuffer(buffer, buffer_length);
+
+  u32 buffer_position = 0;
+  while (buffer_position < buffer_length)
+  {
+    const auto bb_command = static_cast<BaseBoardCommand>(buffer[buffer_position]);
+    buffer_position++;
+
+    switch (bb_command)
+    {
+    case BaseBoardCommand::GCAM_Reset:  // Returns ID and dip switches
+    {
+      const u32 id = Common::swap32(SI_AM_BASEBOARD | 0x100);
+      std::memcpy(buffer, &id, sizeof(id));
+      return sizeof(id);
+    }
+    break;
+    case BaseBoardCommand::GCAM_Command:
+    {
+      u32 checksum = 0;
+      for (u32 i = 0; i < buffer_length; ++i)
+        checksum += buffer[i];
+
+      std::array<u8, 0x80> data_out{};
+      u32 data_offset = 0;
+
+      data_out[data_offset++] = 1;
+      data_out[data_offset++] = 1;
+
+      u8* data_in = buffer + 2;
+      if (buffer_position >= buffer_length)
+      {
+        ERROR_LOG_FMT(SERIALINTERFACE_AMBB, "GC-AM: buffer overflow (position={}, length={})",
+                      buffer_position, buffer_length);
+        buffer_position = buffer_length;
+        break;
+      }
+
+      const u32 requested_size = buffer[buffer_position] + 2;
+      if (requested_size > buffer_length)
+      {
+        ERROR_LOG_FMT(SERIALINTERFACE_AMBB, "GC-AM: requested size ({}) bigger than buffer's ({})",
+                      requested_size, buffer_length);
+        buffer_position = buffer_length;
+        break;
+      }
+      u8* const data_in_end = buffer + requested_size;
+
+      // Helper to check that iterating over data n times is safe,
+      // i.e. *data++ at most lead to data.end()
+      auto validate_data_in_out = [&](u32 n_in, u32 n_out, std::string_view command) -> bool {
+        if (data_in + n_in > data_in_end)
+          ERROR_LOG_FMT(SERIALINTERFACE_AMBB, "GC-AM: data_in overflow in {}", command);
+        else if (u64{data_offset} + n_out > data_out.size())
+          ERROR_LOG_FMT(SERIALINTERFACE_AMBB, "GC-AM: data_out overflow in {}", command);
+        else
+          return true;
+        ERROR_LOG_FMT(SERIALINTERFACE_AMBB,
+                      "Overflow details:\n"
+                      " - data_in(begin={}, current={}, end={}, n_in={})\n"
+                      " - data_out(offset={}, size={}, n_out={})\n"
+                      " - buffer(position={}, length={})",
+                      fmt::ptr(buffer + 2), fmt::ptr(data_in), fmt::ptr(data_in_end), n_in,
+                      data_offset, data_out.size(), n_out, buffer_position, buffer_length);
+        data_in = data_in_end;
+        return false;
+      };
+
+      while (data_in < data_in_end)
+      {
+        const u32 gcam_command = *data_in++;
+        switch (GCAMCommand(gcam_command))
+        {
+        case GCAMCommand::StatusSwitches:
+        {
+          if (!validate_data_in_out(1, 4, "StatusSwitches"))
+            break;
+
+          const u8 status = *data_in++;
+          DEBUG_LOG_FMT(SERIALINTERFACE_AMBB, "GC-AM: Command 0x10, {:02x} (READ STATUS&SWITCHES)",
+                        status);
+
+          data_out[data_offset++] = gcam_command;
+          data_out[data_offset++] = 0x2;
+
+          // We read Test/Service from the JVS-I/O SwitchesInput instead
+          //
+          // const GCPadStatus pad_status = Pad::GetStatus(ISIDevice::m_device_number);
+          // baseboard test/service switches
+          // if (pad_status.button & PAD_BUTTON_Y)	// Test
+          //  dip_switch_0 &= ~0x80;
+          // if (pad_status.button & PAD_BUTTON_X)	// Service
+          //  dip_switch_0 &= ~0x40;
+
+          // Horizontal Scanning Frequency switch
+          // Required for F-Zero AX booting via Sega Boot
+          if (AMMediaboard::GetGameType() == FZeroAX ||
+              AMMediaboard::GetGameType() == FZeroAXMonster)
+          {
+            m_dip_switch_0 &= ~0x20;
+          }
+
+          // Disable camera in MKGP1/2
+          if (AMMediaboard::GetGameType() == MarioKartGP ||
+              AMMediaboard::GetGameType() == MarioKartGP2)
+          {
+            m_dip_switch_0 &= ~0x10;
+          }
+
+          data_out[data_offset++] = m_dip_switch_0;
+          data_out[data_offset++] = m_dip_switch_1;
+          break;
+        }
+        case GCAMCommand::SerialNumber:
+        {
+          if (!validate_data_in_out(1, 18, "SerialNumber"))
+            break;
+
+          NOTICE_LOG_FMT(SERIALINTERFACE_AMBB, "GC-AM: Command 0x11, {:02x} (READ SERIAL NR)",
+                         *data_in);
+          data_in++;
+
+          data_out[data_offset++] = gcam_command;
+          data_out[data_offset++] = 16;
+          memcpy(data_out.data() + data_offset, "AADE-01B98394904", 16);
+
+          data_offset += 16;
+          break;
+        }
+        case GCAMCommand::Unknown_12:
+          if (!validate_data_in_out(2, 2, "Unknown_12"))
+            break;
+
+          NOTICE_LOG_FMT(SERIALINTERFACE_AMBB, "GC-AM: Command 0x12, {:02x} {:02x}", data_in[0],
+                         data_in[1]);
+
+          data_out[data_offset++] = gcam_command;
+          data_out[data_offset++] = 0x00;
+
+          data_in += 2;
+          break;
+        case GCAMCommand::Unknown_14:
+          if (!validate_data_in_out(2, 2, "Unknown_14"))
+            break;
+
+          NOTICE_LOG_FMT(SERIALINTERFACE_AMBB, "GC-AM: Command 0x14, {:02x} {:02x}", data_in[0],
+                         data_in[1]);
+
+          data_out[data_offset++] = gcam_command;
+          data_out[data_offset++] = 0x00;
+
+          data_in += 2;
+          break;
+        case GCAMCommand::FirmVersion:
+          if (!validate_data_in_out(1, 4, "FirmVersion"))
+            break;
+
+          NOTICE_LOG_FMT(SERIALINTERFACE_AMBB, "GC-AM: Command 0x15, {:02x} (READ FIRM VERSION)",
+                         *data_in);
+          data_in++;
+
+          data_out[data_offset++] = gcam_command;
+          data_out[data_offset++] = 0x02;
+          // 00.26
+          data_out[data_offset++] = 0x00;
+          data_out[data_offset++] = 0x26;
+          break;
+        case GCAMCommand::FPGAVersion:
+          if (!validate_data_in_out(1, 4, "FPGAVersion"))
+            break;
+
+          NOTICE_LOG_FMT(SERIALINTERFACE_AMBB, "GC-AM: Command 0x16, {:02x} (READ FPGA VERSION)",
+                         *data_in);
+          data_in++;
+
+          data_out[data_offset++] = gcam_command;
+          data_out[data_offset++] = 0x02;
+          // 07.06
+          data_out[data_offset++] = 0x07;
+          data_out[data_offset++] = 0x06;
+          break;
+        case GCAMCommand::RegionSettings:
+        {
+          if (!validate_data_in_out(5, 0x16, "RegionSettings"))
+            break;
+
+          // Used by SegaBoot for region checks (dev mode skips this check)
+          // In some games this also controls the displayed language
+          NOTICE_LOG_FMT(SERIALINTERFACE_AMBB,
+                         "GC-AM: Command 0x1F, {:02x} {:02x} {:02x} {:02x} {:02x} (REGION)",
+                         data_in[0], data_in[1], data_in[2], data_in[3], data_in[4]);
+
+          data_out[data_offset++] = gcam_command;
+          data_out[data_offset++] = 0x14;
+
+          for (int i = 0; i < 0x14; ++i)
+            data_out[data_offset++] = s_region_flags[i];
+
+          data_in += 5;
+        }
+        break;
+        // No reply
+        // Note: Always sends three bytes even though size is set to two
+        case GCAMCommand::Unknown_21:
+        {
+          if (!validate_data_in_out(4, 0, "Unknown_21"))
+            break;
+
+          DEBUG_LOG_FMT(SERIALINTERFACE_AMBB, "GC-AM: Command 0x21, {:02x}, {:02x}, {:02x}, {:02x}",
+                        data_in[0], data_in[1], data_in[2], data_in[3]);
+          data_in += 4;
+        }
+        break;
+        // No reply
+        // Note: Always sends six bytes
+        case GCAMCommand::Unknown_22:
+        {
+          if (!validate_data_in_out(7, 0, "Unknown_22"))
+            break;
+
+          DEBUG_LOG_FMT(
+              SERIALINTERFACE_AMBB,
+              "GC-AM: Command 0x22, {:02x}, {:02x}, {:02x}, {:02x}, {:02x}, {:02x}, {:02x}",
+              data_in[0], data_in[1], data_in[2], data_in[3], data_in[4], data_in[5], data_in[6]);
+
+          const u32 in_size = data_in[0] + 1;
+          if (!validate_data_in_out(in_size, 0, "Unknown_22"))
+            break;
+          data_in += in_size;
+        }
+        break;
+        case GCAMCommand::Unknown_23:
+          if (!validate_data_in_out(2, 2, "Unknown_23"))
+            break;
+
+          DEBUG_LOG_FMT(SERIALINTERFACE_AMBB, "GC-AM: Command 0x23, {:02x} {:02x}", data_in[0],
+                        data_in[1]);
+
+          data_out[data_offset++] = gcam_command;
+          data_out[data_offset++] = 0x00;
+
+          data_in += 2;
+          break;
+        case GCAMCommand::Unknown_24:
+          if (!validate_data_in_out(2, 2, "Unknown_24"))
+            break;
+
+          DEBUG_LOG_FMT(SERIALINTERFACE_AMBB, "GC-AM: Command 0x24, {:02x} {:02x}", data_in[0],
+                        data_in[1]);
+
+          data_out[data_offset++] = gcam_command;
+          data_out[data_offset++] = 0x00;
+
+          data_in += 2;
+          break;
+        case GCAMCommand::SerialA:
+        {
+          if (!validate_data_in_out(1, 0, "SerialA"))
+            break;
+
+          const u32 length = *data_in++;
+          if (length)
+          {
+            if (!validate_data_in_out(length, 0, "SerialA"))
+              break;
+
+            INFO_LOG_FMT(SERIALINTERFACE_AMBB, "GC-AM: Command 0x31, length=0x{:02x}, hexdump:\n{}",
+                         length, HexDump(data_in, length));
+
+            // Serial - Wheel
+            if (AMMediaboard::GetGameType() == MarioKartGP ||
+                AMMediaboard::GetGameType() == MarioKartGP2)
+            {
+              if (!validate_data_in_out(10, 2, "SerialA (Wheel)"))
+                break;
+
+              INFO_LOG_FMT(SERIALINTERFACE_AMBB,
+                           "GC-AM: Command 0x31, (WHEEL) {:02x}{:02x} {:02x}{:02x} {:02x} {:02x} "
+                           "{:02x} {:02x} {:02x} {:02x}",
+                           data_in[0], data_in[1], data_in[2], data_in[3], data_in[4], data_in[5],
+                           data_in[6], data_in[7], data_in[8], data_in[9]);
+
+              data_out[data_offset++] = gcam_command;
+              data_out[data_offset++] = 0x03;
+
+              switch (m_wheel_init)
+              {
+              case 0:
+                if (!validate_data_in_out(0, 3, "SerialA (Wheel)"))
+                  break;
+                data_out[data_offset++] = 'E';  // Error
+                data_out[data_offset++] = '0';
+                data_out[data_offset++] = '0';
+                m_wheel_init++;
+                break;
+              case 1:
+                if (!validate_data_in_out(0, 3, "SerialA (Wheel)"))
+                  break;
+                data_out[data_offset++] = 'C';  // Power Off
+                data_out[data_offset++] = '0';
+                data_out[data_offset++] = '6';
+                // Only turn on when a wheel is connected
+                if (serial_interface.GetDeviceType(1) == SerialInterface::SIDEVICE_GC_STEERING)
+                {
+                  m_wheel_init++;
+                }
+                break;
+              case 2:
+                if (!validate_data_in_out(0, 3, "SerialA (Wheel)"))
+                  break;
+                data_out[data_offset++] = 'C';  // Power On
+                data_out[data_offset++] = '0';
+                data_out[data_offset++] = '1';
+                break;
+              default:
+                break;
+              }
+
+              // u16 CenteringForce= ptr(6);
+              // u16 FrictionForce = ptr(8);
+              // u16 Roll          = ptr(10);
+              if (!validate_data_in_out(length, 0, "SerialA (Wheel)"))
+                break;
+              data_in += length;
+              break;
+            }
+
+            // Serial - Unknown
+            if (AMMediaboard::GetGameType() == GekitouProYakyuu)
+            {
+              if (!validate_data_in_out(sizeof(u32), 0, "SerialA (Unknown)"))
+                break;
+              const u32 serial_command = Common::BitCastPtr<u32>(data_in);
+
+              if (serial_command == 0x00001000)
+              {
+                if (!validate_data_in_out(0, 5, "SerialA (Unknown)"))
+                  break;
+                data_out[data_offset++] = gcam_command;
+                data_out[data_offset++] = 0x03;
+                data_out[data_offset++] = 1;
+                data_out[data_offset++] = 2;
+                data_out[data_offset++] = 3;
+              }
+
+              if (!validate_data_in_out(length, 0, "SerialA (Unknown)"))
+                break;
+              data_in += length;
+              break;
+            }
+
+            // Serial IC-CARD / Serial Deck Reader
+            if (AMMediaboard::GetGameType() == VirtuaStriker4 ||
+                AMMediaboard::GetGameType() == VirtuaStriker4_2006 ||
+                AMMediaboard::GetGameType() == KeyOfAvalon)
+            {
+              if (!validate_data_in_out(2, 0, "SerialA (IC-CARD)"))
+                break;
+              u32 serial_command = data_in[1];
+
+              ICCommand icco;
+
+              // Set default reply
+              icco.pktcmd = gcam_command;
+              icco.pktlen = 7;
+              icco.fixed = 0x10;
+              icco.command = serial_command;
+              icco.flag = 0;
+              icco.length = 2;
+              icco.status = 0;
+              icco.extlen = 0;
+
+              // Check for rest of data from the write pages command
+              if (m_ic_write_size && m_ic_write_offset)
+              {
+                const u32 size = data_in[1];
+
+                if (!validate_data_in_out(size + 2, 0, "SerialA (IC-CARD)"))
+                  break;
+                DEBUG_LOG_FMT(SERIALINTERFACE_CARD, "Command: {}", HexDump(data_in, size + 2));
+
+                INFO_LOG_FMT(
+                    SERIALINTERFACE_CARD,
+                    "GC-AM: Command 25 (IC-CARD) Write Pages: Off:{:x} Size:{:x} PSize:{:x}",
+                    m_ic_write_offset, m_ic_write_size, size);
+
+                if (u64{m_ic_write_offset} + size > sizeof(m_ic_write_buffer))
+                {
+                  ERROR_LOG_FMT(SERIALINTERFACE_CARD,
+                                "GC-AM: Command 25 (IC-CARD) m_ic_write_buffer overflow:\n"
+                                " - m_ic_write_buffer(offset={}, size={})\n"
+                                " - size={}\n",
+                                m_ic_write_offset, sizeof(m_ic_write_buffer), size);
+                  data_in = data_in_end;
+                  break;
+                }
+                memcpy(m_ic_write_buffer + m_ic_write_offset, data_in + 2, size);
+
+                m_ic_write_offset += size;
+
+                if (m_ic_write_offset > m_ic_write_size)
+                {
+                  m_ic_write_offset = 0;
+
+                  const u16 page = m_ic_write_buffer[5];
+                  const u16 count = m_ic_write_buffer[7];
+                  const u32 write_size = u32(count) * 8;
+                  const u32 write_offset = u32(page) * 8;
+
+                  if ((write_size + write_offset) > sizeof(m_ic_card_data) ||
+                      (10 + write_size) > sizeof(m_ic_write_buffer))
+                  {
+                    ERROR_LOG_FMT(SERIALINTERFACE_CARD,
+                                  "GC-AM: Command 25 (IC-CARD) Write Pages overflow:\n"
+                                  " - m_ic_card_data(offset={}, size={})\n"
+                                  " - m_ic_write_buffer(offset={}, size={})\n"
+                                  " - size={}, page={}, count={}\n",
+                                  write_offset, sizeof(m_ic_card_data), 10,
+                                  sizeof(m_ic_write_buffer), write_size, page, count);
+                    data_in = data_in_end;
+                    break;
+                  }
+                  memcpy(m_ic_card_data + write_offset, m_ic_write_buffer + 10, write_size);
+
+                  INFO_LOG_FMT(SERIALINTERFACE_CARD,
+                               "GC-AM: Command 25 (IC-CARD) Write Pages:{} Count:{}({:x})", page,
+                               count, size);
+
+                  icco.command = WritePages;
+
+                  if (!validate_data_in_out(0, icco.pktlen + 2, "SerialA (IC-CARD)"))
+                    break;
+                  ICCardSendReply(&icco, data_out.data(), &data_offset);
+                }
+                if (!validate_data_in_out(length, 0, "SerialA (IC-CARD)"))
+                  break;
+                data_in += length;
+                break;
+              }
+
+              switch (ICCARDCommand(serial_command))
+              {
+              case ICCARDCommand::GetStatus:
+                icco.status = m_ic_card_state;
+
+                INFO_LOG_FMT(SERIALINTERFACE_CARD,
+                             "GC-AM: Command 0x31 (IC-CARD) Get Status:{:02x}", m_ic_card_state);
+                break;
+              case ICCARDCommand::SetBaudrate:
+                INFO_LOG_FMT(SERIALINTERFACE_CARD, "GC-AM: Command 0x31 (IC-CARD) Set Baudrate");
+                break;
+              case ICCARDCommand::FieldOn:
+                m_ic_card_state |= 0x10;
+                INFO_LOG_FMT(SERIALINTERFACE_CARD, "GC-AM: Command 0x31 (IC-CARD) Field On");
+                break;
+              case ICCARDCommand::InsertCheck:
+                icco.status = m_ic_card_status;
+                INFO_LOG_FMT(SERIALINTERFACE_CARD,
+                             "GC-AM: Command 0x31 (IC-CARD) Insert Check:{:02x}", m_ic_card_status);
+                break;
+              case ICCARDCommand::AntiCollision:
+                icco.extlen = 8;
+                icco.length += icco.extlen;
+                icco.pktlen += icco.extlen;
+
+                // Card ID
+                icco.extdata[0] = 0x00;
+                icco.extdata[1] = 0x00;
+                icco.extdata[2] = 0x54;
+                icco.extdata[3] = 0x4D;
+                icco.extdata[4] = 0x50;
+                icco.extdata[5] = 0x00;
+                icco.extdata[6] = 0x00;
+                icco.extdata[7] = 0x00;
+
+                INFO_LOG_FMT(SERIALINTERFACE_CARD, "GC-AM: Command 0x31 (IC-CARD) Anti Collision");
+                break;
+              case ICCARDCommand::SelectCard:
+                icco.extlen = 8;
+                icco.length += icco.extlen;
+                icco.pktlen += icco.extlen;
+
+                // Session
+                icco.extdata[0] = 0x00;
+                icco.extdata[1] = m_ic_card_session;
+                icco.extdata[2] = 0x00;
+                icco.extdata[3] = 0x00;
+                icco.extdata[4] = 0x00;
+                icco.extdata[5] = 0x00;
+                icco.extdata[6] = 0x00;
+                icco.extdata[7] = 0x00;
+
+                INFO_LOG_FMT(SERIALINTERFACE_CARD, "GC-AM: Command 0x31 (IC-CARD) Select Card:{}",
+                             m_ic_card_session);
+                break;
+              case ICCARDCommand::ReadPage:
+              case ICCARDCommand::ReadUseCount:
+              {
+                if (!validate_data_in_out(8, 0, "SerialA (IC-CARD)"))
+                  break;
+                const u16 page = Common::swap16(data_in + 6) & 0xFF;  // 255 is max page
+
+                icco.extlen = 8;
+                icco.length += icco.extlen;
+                icco.pktlen += icco.extlen;
+
+                memcpy(icco.extdata, m_ic_card_data + page * 8, 8);
+
+                INFO_LOG_FMT(SERIALINTERFACE_CARD, "GC-AM: Command 31 (IC-CARD) Read Page:{}",
+                             page);
+                break;
+              }
+              case ICCARDCommand::WritePage:
+              {
+                if (!validate_data_in_out(10, 0, "SerialA (IC-CARD)"))
+                  break;
+                const u16 page = Common::swap16(data_in + 8) & 0xFF;  // 255 is max page
+
+                // Write only one page
+                if (page == 4)
+                {
+                  icco.status = 0x80;
+                }
+                else
+                {
+                  if (!validate_data_in_out(18, 0, "SerialA (IC-CARD)"))
+                    break;
+                  memcpy(m_ic_card_data + page * 8, data_in + 10, 8);
+                }
+
+                INFO_LOG_FMT(SERIALINTERFACE_CARD, "GC-AM: Command 0x31 (IC-CARD) Write Page:{}",
+                             page);
+                break;
+              }
+              case ICCARDCommand::DecreaseUseCount:
+              {
+                if (!validate_data_in_out(8, 0, "SerialA (IC-CARD)"))
+                  break;
+                const u16 page = Common::swap16(data_in + 6) & 0xFF;  // 255 is max page
+
+                icco.extlen = 2;
+                icco.length += icco.extlen;
+                icco.pktlen += icco.extlen;
+
+                auto ic_card_data = Common::BitCastPtr<u16>(m_ic_card_data + 0x28);
+                ic_card_data = ic_card_data - 1;
+
+                // Counter
+                icco.extdata[0] = m_ic_card_data[0x28];
+                icco.extdata[1] = m_ic_card_data[0x29];
+
+                INFO_LOG_FMT(SERIALINTERFACE_CARD,
+                             "GC-AM: Command 31 (IC-CARD) Decrease Use Count:{}", page);
+                break;
+              }
+              case ICCARDCommand::ReadPages:
+              {
+                if (!validate_data_in_out(10, 0, "SerialA (IC-CARD)"))
+                  break;
+                const u16 page = Common::swap16(data_in + 6) & 0xFF;  // 255 is max page
+                const u16 count = Common::swap16(data_in + 8);
+
+                const u32 offs = page * 8;
+                u32 cnt = count * 8;
+
+                // Limit read size to not overwrite the reply buffer
+                const std::size_t reply_buffer_size = sizeof(icco.extdata) - 1;
+                if (data_offset > reply_buffer_size)
+                {
+                  ERROR_LOG_FMT(SERIALINTERFACE_CARD,
+                                "GC-AM: Command 31 (IC-CARD) Read Pages overflow:"
+                                " offset={} > buffer_size={}",
+                                data_offset, reply_buffer_size);
+                  data_in = data_in_end;
+                  break;
+                }
+                if (cnt > reply_buffer_size - data_offset)
+                {
+                  cnt = 5 * 8;
+                }
+
+                icco.extlen = cnt;
+                icco.length += icco.extlen;
+                icco.pktlen += icco.extlen;
+
+                if (offs + cnt > sizeof(icco.extdata))
+                {
+                  ERROR_LOG_FMT(SERIALINTERFACE_CARD,
+                                "GC-AM: Command 31 (IC-CARD) Read Pages overflow:"
+                                " offset={} + count={} > buffer_size={}",
+                                offs, cnt, sizeof(icco.extdata));
+                  data_in = data_in_end;
+                  break;
+                }
+                memcpy(icco.extdata, m_ic_card_data + offs, cnt);
+
+                INFO_LOG_FMT(SERIALINTERFACE_CARD,
+                             "GC-AM: Command 31 (IC-CARD) Read Pages:{} Count:{}", page, count);
+                break;
+              }
+              case ICCARDCommand::WritePages:
+              {
+                if (!validate_data_in_out(10, 0, "SerialA (IC-CARD)"))
+                  break;
+                const u16 pksize = length;
+                const u16 size = Common::swap16(data_in + 2);
+                const u16 page = Common::swap16(data_in + 6) & 0xFF;  // 255 is max page
+                const u16 count = Common::swap16(data_in + 8);
+                const u32 write_size = u32(count) * 8;
+                const u32 write_offset = u32(page) * 8;
+
+                // We got a complete packet
+                if (pksize - 5 == size)
+                {
+                  if (page == 4)  // Read Only Page, must return error
+                  {
+                    icco.status = 0x80;
+                  }
+                  else
+                  {
+                    if (write_size + write_offset > sizeof(m_ic_card_data))
+                    {
+                      ERROR_LOG_FMT(
+                          SERIALINTERFACE_CARD,
+                          "GC-AM: Command 0x31 (IC-CARD) Data overflow: Pages:{} Count:{}({:x})",
+                          page, count, size);
+                    }
+                    else
+                    {
+                      if (!validate_data_in_out(13 + write_size, 0, "SerialA (IC-CARD)"))
+                        break;
+                      memcpy(m_ic_card_data + write_offset, data_in + 13, write_size);
+                    }
+                  }
+
+                  INFO_LOG_FMT(SERIALINTERFACE_CARD,
+                               "GC-AM: Command 0x31 (IC-CARD) Write Pages:{} Count:{}({:x})", page,
+                               count, size);
+                }
+                // VirtuaStriker 4 splits the writes over multiple packets
+                else
+                {
+                  if (!validate_data_in_out(2 + pksize, 0, "SerialA (IC-CARD)"))
+                    break;
+                  memcpy(m_ic_write_buffer, data_in + 2, pksize);
+                  m_ic_write_offset += pksize;
+                  m_ic_write_size = size;
+                }
+                break;
+              }
+              default:
+                // Handle Deck Reader commands
+                if (!validate_data_in_out(1, 0, "SerialA (DECK READER)"))
+                  break;
+                serial_command = data_in[0];
+                icco.command = serial_command;
+                icco.flag = 0;
+                switch (CDReaderCommand(serial_command))
+                {
+                case CDReaderCommand::ProgramVersion:
+                  INFO_LOG_FMT(SERIALINTERFACE_CARD,
+                               "GC-AM: Command 0x31 (DECK READER) Program Version");
+
+                  icco.extlen = (u32)strlen(s_cdr_program_version);
+                  icco.length += icco.extlen;
+                  icco.pktlen += icco.extlen;
+
+                  memcpy(icco.extdata, s_cdr_program_version, icco.extlen);
+                  break;
+                case CDReaderCommand::BootVersion:
+                  INFO_LOG_FMT(SERIALINTERFACE_CARD,
+                               "GC-AM: Command 0x31 (DECK READER) Boot Version");
+
+                  icco.extlen = (u32)strlen(s_cdr_boot_version);
+                  icco.length += icco.extlen;
+                  icco.pktlen += icco.extlen;
+
+                  memcpy(icco.extdata, s_cdr_boot_version, icco.extlen);
+                  break;
+                case CDReaderCommand::ShutterGet:
+                  INFO_LOG_FMT(SERIALINTERFACE_CARD,
+                               "GC-AM: Command 0x31 (DECK READER) Shutter Get");
+
+                  icco.extlen = 4;
+                  icco.length += icco.extlen;
+                  icco.pktlen += icco.extlen;
+
+                  icco.extdata[0] = 0;
+                  icco.extdata[1] = 0;
+                  icco.extdata[2] = 0;
+                  icco.extdata[3] = 0;
+                  break;
+                case CDReaderCommand::CameraCheck:
+                  INFO_LOG_FMT(SERIALINTERFACE_CARD,
+                               "GC-AM: Command 0x31 (DECK READER) Camera Check");
+
+                  icco.extlen = 6;
+                  icco.length += icco.extlen;
+                  icco.pktlen += icco.extlen;
+
+                  icco.extdata[0] = 0x23;
+                  icco.extdata[1] = 0x28;
+                  icco.extdata[2] = 0x45;
+                  icco.extdata[3] = 0x29;
+                  icco.extdata[4] = 0x45;
+                  icco.extdata[5] = 0x29;
+                  break;
+                case CDReaderCommand::ProgramChecksum:
+                  INFO_LOG_FMT(SERIALINTERFACE_CARD,
+                               "GC-AM: Command 0x31 (DECK READER) Program Checksum");
+
+                  icco.extlen = 4;
+                  icco.length += icco.extlen;
+                  icco.pktlen += icco.extlen;
+
+                  icco.extdata[0] = 0x23;
+                  icco.extdata[1] = 0x28;
+                  icco.extdata[2] = 0x45;
+                  icco.extdata[3] = 0x29;
+                  break;
+                case CDReaderCommand::BootChecksum:
+                  INFO_LOG_FMT(SERIALINTERFACE_CARD,
+                               "GC-AM: Command 0x31 (DECK READER) Boot Checksum");
+
+                  icco.extlen = 4;
+                  icco.length += icco.extlen;
+                  icco.pktlen += icco.extlen;
+
+                  icco.extdata[0] = 0x23;
+                  icco.extdata[1] = 0x28;
+                  icco.extdata[2] = 0x45;
+                  icco.extdata[3] = 0x29;
+                  break;
+                case CDReaderCommand::SelfTest:
+                  INFO_LOG_FMT(SERIALINTERFACE_CARD, "GC-AM: Command 0x31 (DECK READER) Self Test");
+                  icco.flag = 0x00;
+                  break;
+                case CDReaderCommand::SensLock:
+                  INFO_LOG_FMT(SERIALINTERFACE_CARD, "GC-AM: Command 0x31 (DECK READER) Sens Lock");
+                  icco.flag = 0x01;
+                  break;
+                case CDReaderCommand::SensCard:
+                  INFO_LOG_FMT(SERIALINTERFACE_CARD, "GC-AM: Command 0x31 (DECK READER) Sens Card");
+                  break;
+                case CDReaderCommand::ShutterCard:
+                  INFO_LOG_FMT(SERIALINTERFACE_CARD,
+                               "GC-AM: Command 0x31 (DECK READER) Shutter Card");
+                  break;
+                case CDReaderCommand::ReadCard:
+                  INFO_LOG_FMT(SERIALINTERFACE_CARD, "GC-AM: Command 0x31 (DECK READER) Read Card");
+
+                  icco.fixed = 0xAA;
+                  icco.flag = 0xAA;
+                  icco.extlen = sizeof(s_cdr_card_data);
+                  icco.length = 0x72;
+                  icco.status = Common::swap16(icco.extlen);
+
+                  icco.pktlen += icco.extlen;
+
+                  memcpy(icco.extdata, s_cdr_card_data, sizeof(s_cdr_card_data));
+
+                  break;
+                default:
+                  if (!validate_data_in_out(14, 0, "SerialA (DECK READER)"))
+                    break;
+                  WARN_LOG_FMT(SERIALINTERFACE_CARD,
+                               "GC-AM: Command 0x31 (IC-Card) {:02x} {:02x} {:02x} {:02x} {:02x} "
+                               "{:02x} {:02x} {:02x} {:02x} {:02x} {:02x} {:02x}",
+                               data_in[2], data_in[3], data_in[4], data_in[5], data_in[6],
+                               data_in[7], data_in[8], data_in[9], data_in[10], data_in[11],
+                               data_in[12], data_in[13]);
+                  break;
+                }
+                break;
+              }
+
+              if (!validate_data_in_out(0, icco.pktlen + 2, "SerialA (IC-CARD)"))
+                break;
+              ICCardSendReply(&icco, data_out.data(), &data_offset);
+
+              if (!validate_data_in_out(2, 0, "SerialA (IC-CARD)"))
+                break;
+              data_in += length;
+              break;
+            }
+          }
+
+          u32 command_offset = 0;
+          while (command_offset < length)
+          {
+            // All commands are OR'd with 0x80
+            // Last byte is checksum which we don't care about
+            if (!validate_data_in_out(command_offset + 4, 0, "SerialA"))
+              break;
+            const u32 serial_command = Common::swap32(data_in + command_offset) ^ 0x80000000;
+
+            if (AMMediaboard::GetGameType() == FZeroAX ||
+                AMMediaboard::GetGameType() == FZeroAXMonster)
+            {
+              INFO_LOG_FMT(SERIALINTERFACE_AMBB,
+                           "GC-AM: Command 0x31 (MOTOR) Length:{:02x} Command:{:04x}({:02x})",
+                           length, (serial_command >> 8) & 0xFFFF, serial_command >> 24);
+            }
+            else
+            {
+              INFO_LOG_FMT(SERIALINTERFACE_AMBB, "GC-AM: Command 0x31 (SERIAL) Command:{:06x}",
+                           serial_command);
+
+              if (serial_command == 0x801000)
+              {
+                if (!validate_data_in_out(0, 4, "SerialA"))
+                  break;
+                data_out[data_offset++] = 0x31;
+                data_out[data_offset++] = 0x02;
+                data_out[data_offset++] = 0xFF;
+                data_out[data_offset++] = 0x01;
+              }
+            }
+
+            command_offset += sizeof(u32);
+
+            if (AMMediaboard::GetGameType() == FZeroAX ||
+                AMMediaboard::GetGameType() == FZeroAXMonster)
+            {
+              if (command_offset + 5 >= std::size(m_motor_reply))
+              {
+                ERROR_LOG_FMT(
+                    SERIALINTERFACE_AMBB,
+                    "GC-AM: Command 0x31 (MOTOR) overflow: offset={} >= motor_reply_size={}",
+                    command_offset + 5, std::size(m_motor_reply));
+                data_in = data_in_end;
+                break;
+              }
+
+              // Status
+              m_motor_reply[command_offset + 2] = 0;
+              m_motor_reply[command_offset + 3] = 0;
+
+              // Error
+              m_motor_reply[command_offset + 4] = 0;
+
+              switch (serial_command >> 24)
+              {
+              case 0:
+              case 1:  // Set Maximum?
+              case 2:
+                break;
+
+              // 0x00-0x40: left
+              // 0x40-0x80: right
+              case 4:  // Move Steering Wheel
+                // Left
+                if (serial_command & 0x010000)
+                {
+                  m_motor_force_y = -((s16)serial_command & 0xFF00);
+                }
+                else  // Right
+                {
+                  m_motor_force_y = (serial_command - 0x4000) & 0xFF00;
+                }
+
+                m_motor_force_y *= 2;
+
+                // FFB
+                if (m_motor_init == 2)
+                {
+                  if (serial_interface.GetDeviceType(1) == SerialInterface::SIDEVICE_GC_STEERING)
+                  {
+                    const GCPadStatus pad_status = Pad::GetStatus(1);
+                    if (pad_status.isConnected)
+                    {
+                      const ControlState mapped_strength = (double)(m_motor_force_y >> 8) / 127.f;
+
+                      Pad::Rumble(1, mapped_strength);
+                      INFO_LOG_FMT(SERIALINTERFACE_AMBB,
+                                   "GC-AM: Command 0x31 (MOTOR) mapped_strength:{}",
+                                   mapped_strength);
+                    }
+                  }
+                }
+                break;
+              case 6:  // nice
+              case 9:
+              default:
+                break;
+              // Switch back to normal controls
+              case 7:
+                m_motor_init = 2;
+                break;
+              // Reset
+              case 0x7F:
+                m_motor_init = 1;
+                memset(m_motor_reply, 0, sizeof(m_motor_reply));
+                break;
+              }
+
+              // Checksum
+              m_motor_reply[command_offset + 5] = m_motor_reply[command_offset + 2] ^
+                                                  m_motor_reply[command_offset + 3] ^
+                                                  m_motor_reply[command_offset + 4];
+            }
+          }
+
+          if (length == 0)
+          {
+            if (!validate_data_in_out(length, 2, "SerialA"))
+              break;
+            data_out[data_offset++] = gcam_command;
+            data_out[data_offset++] = 0x00;
+          }
+          else
+          {
+            if (m_motor_init)
+            {
+              // Motor
+              m_motor_reply[0] = gcam_command;
+              m_motor_reply[1] = length;  // Same out as in size
+
+              const u32 reply_size = m_motor_reply[1] + 2;
+              if (!validate_data_in_out(length, reply_size, "SerialA"))
+                break;
+
+              if (reply_size > sizeof(m_motor_reply))
+              {
+                ERROR_LOG_FMT(SERIALINTERFACE_AMBB,
+                              "GC-AM: Command SerialA, reply_size={} too big for m_motor_reply",
+                              reply_size);
+                data_in = data_in_end;
+                break;
+              }
+              memcpy(data_out.data() + data_offset, m_motor_reply, reply_size);
+              data_offset += reply_size;
+            }
+          }
+
+          if (!validate_data_in_out(length, 0, "SerialA"))
+          {
+            break;
+          }
+          data_in += length;
+          break;
+        }
+        case GCAMCommand::SerialB:
+        {
+          DEBUG_LOG_FMT(SERIALINTERFACE_AMBB, "GC-AM: Command 32 (CARD-Interface)");
+
+          if (!validate_data_in_out(1, 0, "SerialB"))
+            break;
+          const u32 in_length = *data_in++;
+
+          static constexpr u32 max_packet_size = 0x2f;
+
+          // Also accounting for the 2-byte header.
+          if (!validate_data_in_out(in_length, max_packet_size + 2, "SerialB"))
+            break;
+
+          if (m_mag_card_reader)
+          {
+            // Append the data to our buffer.
+            const auto prev_size = m_mag_card_in_buffer.size();
+            m_mag_card_in_buffer.resize(prev_size + in_length);
+            std::ranges::copy(std::span{data_in, in_length},
+                              m_mag_card_in_buffer.data() + prev_size);
+
+            // Send and receive data with the magnetic card reader.
+            m_mag_card_reader->Process(&m_mag_card_in_buffer, &m_mag_card_out_buffer);
+          }
+
+          data_in += in_length;
+          const auto out_length = std::min(u32(m_mag_card_out_buffer.size()), max_packet_size);
+
+          // Write the 2-byte header.
+          data_out[data_offset++] = gcam_command;
+          data_out[data_offset++] = u8(out_length);
+
+          // Write the data.
+          std::copy_n(m_mag_card_out_buffer.data(), out_length, data_out.data() + data_offset);
+          data_offset += out_length;
+
+          // Remove the data from our buffer.
+          m_mag_card_out_buffer.erase(m_mag_card_out_buffer.begin(),
+                                      m_mag_card_out_buffer.begin() + s32(out_length));
+          break;
+        }
+        case GCAMCommand::JVSIOA:
+        case GCAMCommand::JVSIOB:
+        {
+          if (!validate_data_in_out(4, 0, "JVSIO"))
+            break;
+
+          JVSIOMessage message;
+
+          const u8* const frame = &data_in[0];
+          const u8 nr_bytes = frame[3];  // Byte after E0 xx
+          u32 frame_len = nr_bytes + 3;  // Header(2) + length byte + payload + checksum
+
+          u8 jvs_buf[0x80];
+
+          frame_len = std::min<u32>(frame_len, sizeof(jvs_buf));
+
+          if (!validate_data_in_out(frame_len, 0, "JVSIO"))
+            break;
+          DEBUG_LOG_FMT(SERIALINTERFACE_JVSIO, "GC-AM: Command {:02x} (JVS IO), hexdump:\n{}",
+                        gcam_command, HexDump(data_in, frame_len));
+
+          memcpy(jvs_buf, frame, frame_len);
+
+          // Extract node and payload pointers
+          u8 node = jvs_buf[2];
+          u8* jvs_io = jvs_buf + 4;                 // First payload byte
+          u8* const jvs_end = jvs_buf + frame_len;  // One byte before checksum
+          u8* const jvs_begin = jvs_io;
+
+          message.Start(0);
+          message.AddData(1);
+
+          // Helper to check that iterating over jvs_io n times is safe,
+          // i.e. *jvs_io++ at most lead to jvs_end
+          auto validate_jvs_io = [&](u32 n, std::string_view command) -> bool {
+            if (jvs_io + n > jvs_end)
+              ERROR_LOG_FMT(SERIALINTERFACE_JVSIO, "JVS-IO: overflow in {}", command);
+            else
+              return true;
+            ERROR_LOG_FMT(SERIALINTERFACE_JVSIO,
+                          "Overflow details:\n"
+                          " - jvs_io(begin={}, current={}, end={}, n={})\n"
+                          " - delay={}, node={}\n"
+                          " - frame(begin={}, len={})",
+                          fmt::ptr(jvs_begin), fmt::ptr(jvs_io), fmt::ptr(jvs_end), n, m_delay,
+                          node, fmt::ptr(frame), frame_len);
+            jvs_io = jvs_end;
+            return false;
+          };
+
+          // Now iterate over the payload
+          while (jvs_io < jvs_end)
+          {
+            const u8 jvsio_command = *jvs_io++;
+            DEBUG_LOG_FMT(SERIALINTERFACE_JVSIO, "JVS-IO:node={}, command={:02x}", node,
+                          jvsio_command);
+
+            switch (JVSIOCommand(jvsio_command))
+            {
+            case JVSIOCommand::IOID:
+              message.AddData(StatusOkay);
+              switch (AMMediaboard::GetGameType())
+              {
+              case FZeroAX:
+                // Specific version that enables DX mode on AX machines, all this does is enable the
+                // motion of a chair
+                message.AddData("SEGA ENTERPRISES,LTD.;837-13844-01 I/O CNTL BD2 ;");
+                break;
+              case FZeroAXMonster:
+              case MarioKartGP:
+              case MarioKartGP2:
+              default:
+                message.AddData("namco ltd.;FCA-1;Ver1.01;JPN,Multipurpose + Rotary Encoder");
+                break;
+              case VirtuaStriker3:
+              case VirtuaStriker4:
+              case VirtuaStriker4_2006:
+                message.AddData("SEGA ENTERPRISES,LTD.;I/O BD JVS;837-13551;Ver1.00");
+                break;
+              }
+              NOTICE_LOG_FMT(SERIALINTERFACE_JVSIO, "JVS-IO: Command 0x10, BoardID");
+              message.AddData((u32)0);
+              break;
+            case JVSIOCommand::CommandRevision:
+              message.AddData(StatusOkay);
+              message.AddData(0x11);
+              NOTICE_LOG_FMT(SERIALINTERFACE_JVSIO, "JVS-IO: Command 0x11, CommandRevision");
+              break;
+            case JVSIOCommand::JVRevision:
+              message.AddData(StatusOkay);
+              message.AddData(0x20);
+              NOTICE_LOG_FMT(SERIALINTERFACE_JVSIO, "JVS-IO: Command 0x12, JVRevision");
+              break;
+            case JVSIOCommand::CommunicationVersion:
+              message.AddData(StatusOkay);
+              message.AddData(0x10);
+              NOTICE_LOG_FMT(SERIALINTERFACE_JVSIO, "JVS-IO: Command 0x13, CommunicationVersion");
+              break;
+
+            // Slave features:
+            //
+            // Inputs:
+            // 0x01: Switch input:  players,  buttons
+            // 0x02: Coin input:    slots
+            // 0x03: Analog input:  channels, bits
+            // 0x04: Rotary input: channels
+            // 0x05: Keycode input: 0,0,0 ?
+            // 0x06: Screen position input: X bits, Y bits, channels
+            //
+            // Outputs:
+            // 0x10: Card system: slots
+            // 0x11: Medal hopper: channels
+            // 0x12: GPO-out: slots
+            // 0x13: Analog output: channels
+            // 0x14: Character output: width, height, type
+            // 0x15: Backup
+            case JVSIOCommand::CheckFunctionality:
+              message.AddData(StatusOkay);
+              switch (AMMediaboard::GetGameType())
+              {
+              case FZeroAX:
+              case FZeroAXMonster:
+                // 2 Player (12bit) (p2=paddles), 1 Coin slot, 6 Analog-in
+                // message.AddData((void *)"\x01\x02\x0C\x00", 4);
+                // message.AddData((void *)"\x02\x01\x00\x00", 4);
+                // message.AddData((void *)"\x03\x06\x00\x00", 4);
+                // message.AddData((void *)"\x00\x00\x00\x00", 4);
+                //
+                // DX Version: 2 Player (22bit) (p2=paddles), 2 Coin slot, 8 Analog-in,
+                // 22 Driver-out
+                message.AddData("\x01\x02\x12\x00", 4);
+                message.AddData("\x02\x02\x00\x00", 4);
+                message.AddData("\x03\x08\x0A\x00", 4);
+                message.AddData("\x12\x16\x00\x00", 4);
+                message.AddData("\x00\x00\x00\x00", 4);
+                break;
+              case VirtuaStriker3:
+                // 2 Player (13bit), 2 Coin slot, 4 Analog-in, 1 CARD, 8 Driver-out
+                message.AddData("\x01\x02\x0D\x00", 4);
+                message.AddData("\x02\x02\x00\x00", 4);
+                message.AddData("\x10\x01\x00\x00", 4);
+                message.AddData("\x12\x08\x00\x00", 4);
+                message.AddData("\x00\x00\x00\x00", 4);
+                break;
+              case GekitouProYakyuu:
+                // 2 Player (13bit), 2 Coin slot, 4 Analog-in, 1 CARD, 8 Driver-out
+                message.AddData("\x01\x02\x0D\x00", 4);
+                message.AddData("\x02\x02\x00\x00", 4);
+                message.AddData("\x03\x04\x00\x00", 4);
+                message.AddData("\x10\x01\x00\x00", 4);
+                message.AddData("\x12\x08\x00\x00", 4);
+                message.AddData("\x00\x00\x00\x00", 4);
+                break;
+              case VirtuaStriker4:
+              case VirtuaStriker4_2006:
+                // 2 Player (13bit), 1 Coin slot, 4 Analog-in, 1 CARD
+                message.AddData("\x01\x02\x0D\x00", 4);
+                message.AddData("\x02\x01\x00\x00", 4);
+                message.AddData("\x03\x04\x00\x00", 4);
+                message.AddData("\x10\x01\x00\x00", 4);
+                message.AddData("\x00\x00\x00\x00", 4);
+                break;
+              case KeyOfAvalon:
+                // 1 Player (15bit), 1 Coin slot, 3 Analog-in, Touch, 1 CARD, 1 Driver-out
+                // (Unconfirmed)
+                message.AddData("\x01\x01\x0F\x00", 4);
+                message.AddData("\x02\x01\x00\x00", 4);
+                message.AddData("\x03\x03\x00\x00", 4);
+                message.AddData("\x06\x10\x10\x01", 4);
+                message.AddData("\x10\x01\x00\x00", 4);
+                message.AddData("\x12\x01\x00\x00", 4);
+                message.AddData("\x00\x00\x00\x00", 4);
+                break;
+              case MarioKartGP:
+              case MarioKartGP2:
+              default:
+                // 1 Player (15bit), 1 Coin slot, 3 Analog-in, 1 CARD, 1 Driver-out
+                message.AddData("\x01\x01\x0F\x00", 4);
+                message.AddData("\x02\x01\x00\x00", 4);
+                message.AddData("\x03\x03\x00\x00", 4);
+                message.AddData("\x10\x01\x00\x00", 4);
+                message.AddData("\x12\x01\x00\x00", 4);
+                message.AddData("\x00\x00\x00\x00", 4);
+                break;
+              }
+              NOTICE_LOG_FMT(SERIALINTERFACE_JVSIO, "JVS-IO: Command 0x14, CheckFunctionality");
+              break;
+            case JVSIOCommand::MainID:
+            {
+              const u8* const main_id = jvs_io;
+              while (jvs_io < jvs_end && *jvs_io++)
+              {
+              }
+              if (main_id < jvs_io)
+              {
+                DEBUG_LOG_FMT(SERIALINTERFACE_JVSIO, "JVS-IO: Command MainId:\n{}",
+                              HexDump(main_id, jvs_io - main_id));
+              }
+              message.AddData(StatusOkay);
+              break;
+            }
+            case JVSIOCommand::SwitchesInput:
+            {
+              if (!validate_jvs_io(2, "SwitchesInput"))
+                break;
+              const u32 player_count = *jvs_io++;
+              const u32 player_byte_count = *jvs_io++;
+
+              DEBUG_LOG_FMT(SERIALINTERFACE_JVSIO, "JVS-IO:  Command 0x20, SwitchInputs: {} {}",
+                            player_count, player_byte_count);
+
+              message.AddData(StatusOkay);
+
+              GCPadStatus pad_status = Pad::GetStatus(0);
+
+              // Test button
+              if (pad_status.switches & SWITCH_TEST)
+              {
+                // Trying to access the test menu without SegaBoot present will cause a crash
+                if (AMMediaboard::GetTestMenu())
+                {
+                  message.AddData(0x80);
+                }
+                else
+                {
+                  PanicAlertFmt("Test menu is disabled due to missing SegaBoot");
+                }
+              }
+              else
+              {
+                message.AddData((u32)0x00);
+              }
+
+              for (u32 i = 0; i < player_count; ++i)
+              {
+                std::array<u8, 3> player_data{};
+
+                // Service button
+                if (pad_status.switches & SWITCH_SERVICE)
+                  player_data[0] |= 0x40;
+
+                switch (AMMediaboard::GetGameType())
+                {
+                // Controller configuration for F-Zero AX (DX)
+                case FZeroAX:
+                  if (i == 0)
+                  {
+                    if (m_fzdx_seatbelt)
+                    {
+                      player_data[0] |= 0x01;
+                    }
+
+                    // Start
+                    if (pad_status.button & PAD_BUTTON_START)
+                      player_data[0] |= 0x80;
+                    // Boost
+                    if (pad_status.button & PAD_BUTTON_A)
+                      player_data[0] |= 0x02;
+                    // View Change 1
+                    if (pad_status.button & PAD_BUTTON_RIGHT)
+                      player_data[0] |= 0x20;
+                    // View Change 2
+                    if (pad_status.button & PAD_BUTTON_LEFT)
+                      player_data[0] |= 0x10;
+                    // View Change 3
+                    if (pad_status.button & PAD_BUTTON_UP)
+                      player_data[0] |= 0x08;
+                    // View Change 4
+                    if (pad_status.button & PAD_BUTTON_DOWN)
+                      player_data[0] |= 0x04;
+                    player_data[1] = m_rx_reply & 0xF0;
+                  }
+                  else if (i == 1)
+                  {
+                    //  Paddle left
+                    if (pad_status.button & PAD_BUTTON_X)
+                      player_data[0] |= 0x20;
+                    //  Paddle right
+                    if (pad_status.button & PAD_BUTTON_Y)
+                      player_data[0] |= 0x10;
+
+                    if (m_fzdx_motion_stop)
+                    {
+                      player_data[0] |= 2;
+                    }
+                    if (m_fzdx_sensor_right)
+                    {
+                      player_data[0] |= 4;
+                    }
+                    if (m_fzdx_sensor_left)
+                    {
+                      player_data[0] |= 8;
+                    }
+
+                    player_data[1] = m_rx_reply << 4;
+                  }
+                  break;
+                // Controller configuration for F-Zero AX MonsterRide
+                case FZeroAXMonster:
+                  if (i == 0)
+                  {
+                    if (m_fzcc_sensor)
+                    {
+                      player_data[0] |= 0x01;
+                    }
+
+                    // Start
+                    if (pad_status.button & PAD_BUTTON_START)
+                      player_data[0] |= 0x80;
+                    // Boost
+                    if (pad_status.button & PAD_BUTTON_A)
+                      player_data[0] |= 0x02;
+                    // View Change 1
+                    if (pad_status.button & PAD_BUTTON_RIGHT)
+                      player_data[0] |= 0x20;
+                    // View Change 2
+                    if (pad_status.button & PAD_BUTTON_LEFT)
+                      player_data[0] |= 0x10;
+                    // View Change 3
+                    if (pad_status.button & PAD_BUTTON_UP)
+                      player_data[0] |= 0x08;
+                    // View Change 4
+                    if (pad_status.button & PAD_BUTTON_DOWN)
+                      player_data[0] |= 0x04;
+
+                    player_data[1] = m_rx_reply & 0xF0;
+                  }
+                  else if (i == 1)
+                  {
+                    //  Paddle left
+                    if (pad_status.button & PAD_BUTTON_X)
+                      player_data[0] |= 0x20;
+                    //  Paddle right
+                    if (pad_status.button & PAD_BUTTON_Y)
+                      player_data[0] |= 0x10;
+
+                    if (m_fzcc_seatbelt)
+                    {
+                      player_data[0] |= 2;
+                    }
+                    if (m_fzcc_service)
+                    {
+                      player_data[0] |= 4;
+                    }
+                    if (m_fzcc_emergency)
+                    {
+                      player_data[0] |= 8;
+                    }
+                  }
+                  break;
+                // Controller configuration for Virtua Striker 3 games
+                case VirtuaStriker3:
+                  pad_status = Pad::GetStatus(i);
+                  // Start
+                  if (pad_status.button & PAD_BUTTON_START)
+                    player_data[0] |= 0x80;
+                  // Shoot
+                  if (pad_status.button & PAD_BUTTON_B)
+                    player_data[0] |= 0x01;
+                  // Short Pass
+                  if (pad_status.button & PAD_BUTTON_A)
+                    player_data[1] |= 0x80;
+                  // Long Pass
+                  if (pad_status.button & PAD_BUTTON_X)
+                    player_data[0] |= 0x02;
+                  // Left
+                  if (pad_status.button & PAD_BUTTON_LEFT)
+                    player_data[0] |= 0x08;
+                  // Up
+                  if (pad_status.button & PAD_BUTTON_UP)
+                    player_data[0] |= 0x20;
+                  // Right
+                  if (pad_status.button & PAD_BUTTON_RIGHT)
+                    player_data[0] |= 0x04;
+                  // Down
+                  if (pad_status.button & PAD_BUTTON_DOWN)
+                    player_data[0] |= 0x10;
+                  break;
+                // Controller configuration for Virtua Striker 4 games
+                case VirtuaStriker4:
+                case VirtuaStriker4_2006:
+                {
+                  pad_status = Pad::GetStatus(i);
+                  // Start
+                  if (pad_status.button & PAD_BUTTON_START)
+                    player_data[0] |= 0x80;
+                  // Long Pass
+                  if (pad_status.button & PAD_BUTTON_X)
+                    player_data[0] |= 0x01;
+                  // Short Pass
+                  if (pad_status.button & PAD_BUTTON_A)
+                    player_data[0] |= 0x02;
+                  // Shoot
+                  if (pad_status.button & PAD_BUTTON_B)
+                    player_data[1] |= 0x80;
+                  // Dash
+                  if (pad_status.button & PAD_BUTTON_Y)
+                    player_data[1] |= 0x40;
+                  // Tactics (U)
+                  if (pad_status.button & PAD_BUTTON_LEFT)
+                    player_data[0] |= 0x20;
+                  // Tactics (M)
+                  if (pad_status.button & PAD_BUTTON_UP)
+                    player_data[0] |= 0x08;
+                  // Tactics (D)
+                  if (pad_status.button & PAD_BUTTON_RIGHT)
+                    player_data[0] |= 0x04;
+
+                  if (i == 0)
+                  {
+                    player_data[0] |= 0x10;  // IC-Card Switch ON
+
+                    // IC-Card Lock
+                    if (pad_status.button & PAD_BUTTON_DOWN)
+                      player_data[1] |= 0x20;
+                  }
+                }
+                break;
+                // Controller configuration for Gekitou Pro Yakyuu
+                case GekitouProYakyuu:
+                  pad_status = Pad::GetStatus(i);
+                  // Start
+                  if (pad_status.button & PAD_BUTTON_START)
+                    player_data[0] |= 0x80;
+                  //  A
+                  if (pad_status.button & PAD_BUTTON_B)
+                    player_data[0] |= 0x01;
+                  //  B
+                  if (pad_status.button & PAD_BUTTON_A)
+                    player_data[0] |= 0x02;
+                  //  Gekitou
+                  if (pad_status.button & PAD_TRIGGER_L)
+                    player_data[1] |= 0x80;
+                  // Left
+                  if (pad_status.button & PAD_BUTTON_LEFT)
+                    player_data[0] |= 0x08;
+                  // Up
+                  if (pad_status.button & PAD_BUTTON_UP)
+                    player_data[0] |= 0x20;
+                  // Right
+                  if (pad_status.button & PAD_BUTTON_RIGHT)
+                    player_data[0] |= 0x04;
+                  // Down
+                  if (pad_status.button & PAD_BUTTON_DOWN)
+                    player_data[0] |= 0x10;
+                  break;
+                // Controller configuration for Mario Kart and other games
+                default:
+                case MarioKartGP:
+                case MarioKartGP2:
+                {
+                  // Start
+                  if (pad_status.button & PAD_BUTTON_START)
+                    player_data[0] |= 0x80;
+                  // Item button
+                  if (pad_status.button & PAD_BUTTON_A)
+                    player_data[1] |= 0x20;
+                  // VS-Cancel button
+                  if (pad_status.button & PAD_BUTTON_B)
+                    player_data[1] |= 0x02;
+                }
+                break;
+                case KeyOfAvalon:
+                {
+                  // Debug On
+                  if (pad_status.button & PAD_BUTTON_START)
+                    player_data[0] |= 0x80;
+                  // Switch 1
+                  if (pad_status.button & PAD_BUTTON_A)
+                    player_data[0] |= 0x04;
+                  // Switch 2
+                  if (pad_status.button & PAD_BUTTON_B)
+                    player_data[0] |= 0x08;
+                  // Toggle inserted card
+                  if (pad_status.button & PAD_TRIGGER_L)
+                  {
+                    m_ic_card_status ^= ICCARDStatus::NoCard;
+                  }
+                }
+                break;
+                }
+
+                if (player_byte_count > player_data.size())
+                {
+                  WARN_LOG_FMT(SERIALINTERFACE_JVSIO,
+                               "JVS-IO:  Command 0x20, SwitchInputs: invalid player_byte_count={}",
+                               player_byte_count);
+                }
+                const u32 data_size = std::min(player_byte_count, u32(player_data.size()));
+                for (u32 j = 0; j < data_size; ++j)
+                  message.AddData(player_data[j]);
+              }
+              break;
+            }
+            case JVSIOCommand::CoinInput:
+            {
+              if (!validate_jvs_io(1, "CoinInput"))
+                break;
+              const u32 slots = *jvs_io++;
+              message.AddData(StatusOkay);
+              static_assert(std::tuple_size<decltype(m_coin)>{} == 2 &&
+                            std::tuple_size<decltype(m_coin_pressed)>{} == 2);
+              if (slots > 2)
+              {
+                WARN_LOG_FMT(SERIALINTERFACE_JVSIO,
+                             "JVS-IO: Command 0x21, CoinInput: invalid slots {}", slots);
+              }
+              const u32 max_slots = std::min(slots, 2u);
+              for (u32 i = 0; i < max_slots; i++)
+              {
+                GCPadStatus pad_status = Pad::GetStatus(i);
+                if ((pad_status.switches & SWITCH_COIN) && !m_coin_pressed[i])
+                {
+                  m_coin[i]++;
+                }
+                m_coin_pressed[i] = pad_status.switches & SWITCH_COIN;
+                message.AddData((m_coin[i] >> 8) & 0x3f);
+                message.AddData(m_coin[i] & 0xff);
+              }
+              DEBUG_LOG_FMT(SERIALINTERFACE_JVSIO, "JVS-IO: Command 0x21, CoinInput: {}", slots);
+              break;
+            }
+            case JVSIOCommand::AnalogInput:
+            {
+              if (!validate_jvs_io(1, "AnalogInput"))
+                break;
+              message.AddData(StatusOkay);
+
+              const u32 analogs = *jvs_io++;
+              GCPadStatus pad_status = Pad::GetStatus(0);
+
+              DEBUG_LOG_FMT(SERIALINTERFACE_JVSIO, "JVS-IO: Command 0x22, AnalogInput: {}",
+                            analogs);
+
+              switch (AMMediaboard::GetGameType())
+              {
+              case FZeroAX:
+              case FZeroAXMonster:
+                // Steering
+                if (m_motor_init == 1)
+                {
+                  if (m_motor_force_y > 0)
+                  {
+                    message.AddData(0x80 - (m_motor_force_y >> 8));
+                  }
+                  else
+                  {
+                    message.AddData((m_motor_force_y >> 8));
+                  }
+                  message.AddData((u8)0);
+
+                  message.AddData(pad_status.stickY);
+                  message.AddData((u8)0);
+                }
+                else
+                {
+                  // The center for the Y axis is expected to be 78h this adjusts that
+                  message.AddData(pad_status.stickX - 12);
+                  message.AddData((u8)0);
+
+                  message.AddData(pad_status.stickY);
+                  message.AddData((u8)0);
+                }
+
+                // Unused
+                message.AddData((u8)0);
+                message.AddData((u8)0);
+                message.AddData((u8)0);
+                message.AddData((u8)0);
+
+                // Gas
+                message.AddData(pad_status.triggerRight);
+                message.AddData((u8)0);
+
+                // Brake
+                message.AddData(pad_status.triggerLeft);
+                message.AddData((u8)0);
+
+                message.AddData((u8)0x80);  // Motion Stop
+                message.AddData((u8)0);
+
+                message.AddData((u8)0);
+                message.AddData((u8)0);
+
+                break;
+              case VirtuaStriker4:
+              case VirtuaStriker4_2006:
+              {
+                message.AddData(-pad_status.stickY);
+                message.AddData((u8)0);
+                message.AddData(pad_status.stickX);
+                message.AddData((u8)0);
+
+                pad_status = Pad::GetStatus(1);
+
+                message.AddData(-pad_status.stickY);
+                message.AddData((u8)0);
+                message.AddData(pad_status.stickX);
+                message.AddData((u8)0);
+              }
+              break;
+              default:
+              case MarioKartGP:
+              case MarioKartGP2:
+                // Steering
+                message.AddData(pad_status.stickX);
+                message.AddData((u8)0);
+
+                // Gas
+                message.AddData(pad_status.triggerRight);
+                message.AddData((u8)0);
+
+                // Brake
+                message.AddData(pad_status.triggerLeft);
+                message.AddData((u8)0);
+                break;
+              }
+              break;
+            }
+            case JVSIOCommand::PositionInput:
+            {
+              if (!validate_jvs_io(1, "PositionInput"))
+                break;
+              const u32 channel = *jvs_io++;
+
+              const GCPadStatus pad_status = Pad::GetStatus(0);
+
+              if (pad_status.button & PAD_TRIGGER_R)
+              {
+                // Tap at center of screen (~320,240)
+                message.AddData("\x01\x00\x8C\x01\x95",
+                                5);  // X=320 (0x0140), Y=240 (0x00F0)
+              }
+              else
+              {
+                message.AddData("\x01\xFF\xFF\xFF\xFF", 5);
+              }
+
+              DEBUG_LOG_FMT(SERIALINTERFACE_JVSIO, "JVS-IO: Command 0x25, PositionInput:{}",
+                            channel);
+              break;
+            }
+            case JVSIOCommand::CoinSubOutput:
+            {
+              if (!validate_jvs_io(3, "CoinSubOutput"))
+                break;
+              const u32 slot = *jvs_io++;
+              const u8 coinh = *jvs_io++;
+              const u8 coinl = *jvs_io++;
+
+              if (slot < m_coin.size())
+              {
+                m_coin[slot] -= (coinh << 8) | coinl;
+              }
+              else
+              {
+                WARN_LOG_FMT(SERIALINTERFACE_JVSIO,
+                             "JVS-IO: Command 0x30, CoinSubOutput: invalid slot {}", slot);
+              }
+
+              message.AddData(StatusOkay);
+              DEBUG_LOG_FMT(SERIALINTERFACE_JVSIO, "JVS-IO: Command 0x30, CoinSubOutput: {}", slot);
+              break;
+            }
+            case JVSIOCommand::GeneralDriverOutput:
+            {
+              if (!validate_jvs_io(1, "GeneralDriverOutput"))
+                break;
+              const u32 bytes = *jvs_io++;
+
+              if (bytes)
+              {
+                message.AddData(StatusOkay);
+
+                // The lamps are controlled via this
+                if (AMMediaboard::GetGameType() == MarioKartGP)
+                {
+                  if (!validate_jvs_io(1, "GeneralDriverOutput (MarioKartGP)"))
+                    break;
+                  const u32 status = *jvs_io++;
+                  if (status & 4)
+                  {
+                    DEBUG_LOG_FMT(SERIALINTERFACE_JVSIO, "JVS-IO: Command 32, Item Button ON");
+                  }
+                  else
+                  {
+                    DEBUG_LOG_FMT(SERIALINTERFACE_JVSIO, "JVS-IO: Command 32, Item Button OFF");
+                  }
+                  if (status & 8)
+                  {
+                    DEBUG_LOG_FMT(SERIALINTERFACE_JVSIO, "JVS-IO: Command 32, Cancel Button ON");
+                  }
+                  else
+                  {
+                    DEBUG_LOG_FMT(SERIALINTERFACE_JVSIO, "JVS-IO: Command 32, Cancel Button OFF");
+                  }
+                  break;
+                }
+
+                if (!validate_jvs_io(bytes, "GeneralDriverOutput"))
+                  break;
+
+                INFO_LOG_FMT(SERIALINTERFACE_JVSIO,
+                             "JVS-IO: Command 0x32, GPO: delay=0x{:02x}, rx_reply=0x{:02x},"
+                             " bytes={}, buffer:\n{}",
+                             m_delay, m_rx_reply, bytes, HexDump(jvs_io, bytes));
+
+                if (bytes < 3)
+                {
+                  jvs_io += bytes;
+                  break;
+                }
+
+                // Handling of the motion seat used in F-Zero AXs DX version
+                const u16 seat_state = Common::swap16(jvs_io + 1) >> 2;
+                jvs_io += bytes;
+
+                switch (seat_state)
+                {
+                case 0x70:
+                  m_delay++;
+                  if ((m_delay % 10) == 0)
+                  {
+                    m_rx_reply = 0xFB;
+                  }
+                  break;
+                case 0xF0:
+                  m_rx_reply = 0xF0;
+                  break;
+                default:
+                case 0xA0:
+                case 0x60:
+                  break;
+                }
+              }
+              break;
+            }
+            case JVSIOCommand::CoinAddOutput:
+            {
+              if (!validate_jvs_io(3, "CoinAddOutput"))
+                break;
+              const u32 slot = *jvs_io++;
+              const u8 coinh = *jvs_io++;
+              const u8 coinl = *jvs_io++;
+
+              m_coin[slot] += (coinh << 8) | coinl;
+
+              message.AddData(StatusOkay);
+              DEBUG_LOG_FMT(SERIALINTERFACE_JVSIO, "JVS-IO: Command 0x35, CoinAddOutput: {}", slot);
+              break;
+            }
+            case JVSIOCommand::NAMCOCommand:
+            {
+              if (!validate_jvs_io(1, "NAMCOCommand"))
+                break;
+              const u32 namco_command = *jvs_io++;
+
+              if (namco_command == 0x18)
+              {
+                if (!validate_jvs_io(4, "NAMCOCommand(0x18) / ID check"))
+                  break;
+                // ID check
+                jvs_io += 4;
+                message.AddData(StatusOkay);
+                message.AddData(0xff);
+              }
+              else
+              {
+                message.AddData(StatusOkay);
+                ERROR_LOG_FMT(SERIALINTERFACE_JVSIO, "JVS-IO: Unknown:{:02x}", namco_command);
+              }
+              break;
+            }
+            case JVSIOCommand::Reset:
+              if (!validate_jvs_io(1, "Reset"))
+                break;
+              if (*jvs_io++ == 0xD9)
+              {
+                NOTICE_LOG_FMT(SERIALINTERFACE_JVSIO, "JVS-IO: Command 0xF0, Reset");
+                m_delay = 0;
+                m_wheel_init = 0;
+                m_ic_card_state = 0x20;
+              }
+              message.AddData(StatusOkay);
+
+              m_dip_switch_1 |= 1;
+              break;
+            case JVSIOCommand::SetAddress:
+              if (!validate_jvs_io(1, "SetAddress"))
+                break;
+              node = *jvs_io++;
+              NOTICE_LOG_FMT(SERIALINTERFACE_JVSIO, "JVS-IO: Command 0xF1, SetAddress: node={}",
+                             node);
+              message.AddData(node == 1);
+              m_dip_switch_1 &= ~1u;
+              break;
+            default:
+              ERROR_LOG_FMT(SERIALINTERFACE_JVSIO, "JVS-IO: Unhandled: node={}, command={:02x}",
+                            node, jvsio_command);
+              break;
+            }
+          }
+
+          message.End();
+
+          if (!validate_data_in_out(0, 2, "JVSIO"))
+            break;
+          data_out[data_offset++] = gcam_command;
+
+          const u8* buf = message.m_message.data();
+          const u32 len = message.m_pointer;
+          data_out[data_offset++] = len;
+          const u32 in_size = frame[0] + 1;
+
+          if (!validate_data_in_out(in_size, len, "JVSIO"))
+            break;
+          for (u32 i = 0; i < len; ++i)
+            data_out[data_offset++] = buf[i];
+
+          data_in += in_size;
+          break;
+        }
+        case GCAMCommand::Unknown_60:
+        {
+          if (!validate_data_in_out(3, 0, "Unknown_60"))
+            break;
+
+          NOTICE_LOG_FMT(SERIALINTERFACE_AMBB, "GC-AM: Command 0x60, {:02x} {:02x} {:02x}",
+                         data_in[0], data_in[1], data_in[2]);
+
+          const u32 in_size = data_in[0] + 1;
+          if (!validate_data_in_out(in_size, 0, "Unknown_60"))
+            break;
+          data_in += in_size;
+        }
+        break;
+        default:
+          if (!validate_data_in_out(5, 0, fmt::format("Unknown_{}", gcam_command)))
+            break;
+          ERROR_LOG_FMT(SERIALINTERFACE_AMBB,
+                        "GC-AM: Command {:02x} (unknown) {:02x} {:02x} {:02x} {:02x} {:02x}",
+                        gcam_command, data_in[0], data_in[1], data_in[2], data_in[3], data_in[4]);
+          break;
+        }
+      }
+
+      memset(buffer, 0, buffer_length);
+
+      data_in = buffer;
+      data_out[1] = data_offset - 2;
+      checksum = 0;
+
+      if (buffer_length >= 0x80)
+      {
+        for (int i = 0; i < 0x7F; ++i)
+        {
+          checksum += data_in[i] = data_out[i];
+        }
+        data_in[0x7f] = ~checksum;
+        DEBUG_LOG_FMT(SERIALINTERFACE_AMBB, "Command send back: {}",
+                      HexDump(data_out.data(), 0x7F));
+      }
+      else
+      {
+        ERROR_LOG_FMT(SERIALINTERFACE_AMBB, "GC-AM: overflow in GCAM_Command's checksum");
+      }
+
+      SwapBuffers(buffer, &buffer_length);
+
+      buffer_position = buffer_length;
+      break;
+    }
+    default:
+    {
+      ERROR_LOG_FMT(SERIALINTERFACE, "Unknown SI command (0x{:08x})", (u32)bb_command);
+      PanicAlertFmt("SI: Unknown command");
+      buffer_position = buffer_length;
+    }
+    break;
+    }
+  }
+
+  return buffer_position;
+}
+
+u32 CSIDevice_AMBaseboard::MapPadStatus(const GCPadStatus& pad_status)
+{
+  // Thankfully changing mode does not change the high bits ;)
+  u32 hi = 0;
+  hi = pad_status.stickY;
+  hi |= pad_status.stickX << 8;
+  hi |= (pad_status.button | PAD_USE_ORIGIN) << 16;
+  return hi;
+}
+
+CSIDevice_AMBaseboard::EButtonCombo
+CSIDevice_AMBaseboard::HandleButtonCombos(const GCPadStatus& pad_status)
+{
+  // Keep track of the special button combos (embedded in controller hardware... :( )
+  EButtonCombo temp_combo = COMBO_NONE;
+  if ((pad_status.button & 0xff00) == (PAD_BUTTON_Y | PAD_BUTTON_X | PAD_BUTTON_START))
+    temp_combo = COMBO_ORIGIN;
+  else if ((pad_status.button & 0xff00) == (PAD_BUTTON_B | PAD_BUTTON_X | PAD_BUTTON_START))
+    temp_combo = COMBO_RESET;
+
+  if (temp_combo != m_last_button_combo)
+  {
+    m_last_button_combo = temp_combo;
+    if (m_last_button_combo != COMBO_NONE)
+      m_timer_button_combo_start = m_system.GetCoreTiming().GetTicks();
+  }
+
+  if (m_last_button_combo != COMBO_NONE)
+  {
+    const u64 current_time = m_system.GetCoreTiming().GetTicks();
+    const u32 ticks_per_second = m_system.GetSystemTimers().GetTicksPerSecond();
+    if (u32(current_time - m_timer_button_combo_start) > ticks_per_second * 3)
+    {
+      if (m_last_button_combo == COMBO_RESET)
+      {
+        INFO_LOG_FMT(SERIALINTERFACE, "PAD - COMBO_RESET");
+        m_system.GetProcessorInterface().ResetButton_Tap();
+      }
+      else if (m_last_button_combo == COMBO_ORIGIN)
+      {
+        INFO_LOG_FMT(SERIALINTERFACE, "PAD - COMBO_ORIGIN");
+        SetOrigin(pad_status);
+      }
+
+      m_last_button_combo = COMBO_NONE;
+      return temp_combo;
+    }
+  }
+
+  return COMBO_NONE;
+}
+
+// GetData
+
+// Return true on new data (max 7 Bytes and 6 bits ;)
+// [00?SYXBA] [1LRZUDRL] [x] [y] [cx] [cy] [l] [r]
+//  |\_ ERR_LATCH (error latched - check SISR)
+//  |_ ERR_STATUS (error on last GetData or SendCmd?)
+DataResponse CSIDevice_AMBaseboard::GetData(u32& hi, u32& low)
+{
+  GCPadStatus pad_status = GetPadStatus();
+
+  if (!pad_status.isConnected)
+    return DataResponse::ErrorNoResponse;
+
+  if (HandleButtonCombos(pad_status) == COMBO_ORIGIN)
+    pad_status.button |= PAD_GET_ORIGIN;
+
+  hi = MapPadStatus(pad_status);
+
+  // Low bits are packed differently per mode
+  if (m_mode == 0 || m_mode == 5 || m_mode == 6 || m_mode == 7)
+  {
+    low = (pad_status.analogB >> 4);               // Top 4 bits
+    low |= ((pad_status.analogA >> 4) << 4);       // Top 4 bits
+    low |= ((pad_status.triggerRight >> 4) << 8);  // Top 4 bits
+    low |= ((pad_status.triggerLeft >> 4) << 12);  // Top 4 bits
+    low |= ((pad_status.substickY) << 16);         // All 8 bits
+    low |= ((pad_status.substickX) << 24);         // All 8 bits
+  }
+  else if (m_mode == 1)
+  {
+    low = (pad_status.analogB >> 4);             // Top 4 bits
+    low |= ((pad_status.analogA >> 4) << 4);     // Top 4 bits
+    low |= (pad_status.triggerRight << 8);       // All 8 bits
+    low |= (pad_status.triggerLeft << 16);       // All 8 bits
+    low |= ((pad_status.substickY >> 4) << 24);  // Top 4 bits
+    low |= ((pad_status.substickX >> 4) << 28);  // Top 4 bits
+  }
+  else if (m_mode == 2)
+  {
+    low = pad_status.analogB;                       // All 8 bits
+    low |= pad_status.analogA << 8;                 // All 8 bits
+    low |= ((pad_status.triggerRight >> 4) << 16);  // Top 4 bits
+    low |= ((pad_status.triggerLeft >> 4) << 20);   // Top 4 bits
+    low |= ((pad_status.substickY >> 4) << 24);     // Top 4 bits
+    low |= ((pad_status.substickX >> 4) << 28);     // Top 4 bits
+  }
+  else if (m_mode == 3)
+  {
+    // Analog A/B are always 0
+    low = pad_status.triggerRight;         // All 8 bits
+    low |= (pad_status.triggerLeft << 8);  // All 8 bits
+    low |= (pad_status.substickY << 16);   // All 8 bits
+    low |= (pad_status.substickX << 24);   // All 8 bits
+  }
+  else if (m_mode == 4)
+  {
+    low = pad_status.analogB;        // All 8 bits
+    low |= pad_status.analogA << 8;  // All 8 bits
+    // triggerLeft/Right are always 0
+    low |= pad_status.substickY << 16;  // All 8 bits
+    low |= pad_status.substickX << 24;  // All 8 bits
+  }
+
+  return DataResponse::Success;
+}
+
+void CSIDevice_AMBaseboard::SendCommand(u32 command, u8 poll)
+{
+  UCommand controller_command(command);
+
+  if (static_cast<EDirectCommands>(controller_command.command) == EDirectCommands::CMD_WRITE)
+  {
+    const u32 type = controller_command.parameter1;  // 0 = stop, 1 = rumble, 2 = stop hard
+
+    // get the correct pad number that should rumble locally when using netplay
+    const int pad_num = NetPlay_InGamePadToLocalPad(m_device_number);
+
+    if (pad_num < 4)
+    {
+      const SIDevices device = m_system.GetSerialInterface().GetDeviceType(pad_num);
+      if (type == 1)
+        CSIDevice_GCController::Rumble(pad_num, 1.0, device);
+      else
+        CSIDevice_GCController::Rumble(pad_num, 0.0, device);
+    }
+
+    if (poll == 0)
+    {
+      m_mode = controller_command.parameter2;
+      INFO_LOG_FMT(SERIALINTERFACE, "PAD {} set to mode {}", m_device_number, m_mode);
+    }
+  }
+  else if (controller_command.command != 0x00)
+  {
+    // Costis sent 0x00 in some demos :)
+    ERROR_LOG_FMT(SERIALINTERFACE, "Unknown direct command     ({:#x})", command);
+    PanicAlertFmt("SI: Unknown direct command");
+  }
+}
+
+void CSIDevice_AMBaseboard::SetOrigin(const GCPadStatus& pad_status)
+{
+  m_origin.origin_stick_x = pad_status.stickX;
+  m_origin.origin_stick_y = pad_status.stickY;
+  m_origin.substick_x = pad_status.substickX;
+  m_origin.substick_y = pad_status.substickY;
+  m_origin.trigger_left = pad_status.triggerLeft;
+  m_origin.trigger_right = pad_status.triggerRight;
+}
+
+void CSIDevice_AMBaseboard::HandleMoviePadStatus(Movie::MovieManager& movie, int device_number,
+                                                 GCPadStatus* pad_status)
+{
+  movie.SetPolledDevice();
+  if (NetPlay_GetInput(device_number, pad_status))
+  {
+  }
+  else if (movie.IsPlayingInput())
+  {
+    movie.PlayController(pad_status, device_number);
+    movie.InputUpdate();
+  }
+  else if (movie.IsRecordingInput())
+  {
+    movie.RecordInput(pad_status, device_number);
+    movie.InputUpdate();
+  }
+  else
+  {
+    movie.CheckPadStatus(pad_status, device_number);
+  }
+}
+
+GCPadStatus CSIDevice_AMBaseboard::GetPadStatus()
+{
+  GCPadStatus pad_status = {};
+
+  // For netplay, the local controllers are polled in GetNetPads(), and
+  // the remote controllers receive their status there as well
+  if (!NetPlay::IsNetPlayRunning())
+  {
+    pad_status = Pad::GetStatus(m_device_number);
+  }
+
+  // Our GCAdapter code sets PAD_GET_ORIGIN when a new device has been connected.
+  // Watch for this to calibrate real controllers on connection.
+  if (pad_status.button & PAD_GET_ORIGIN)
+    SetOrigin(pad_status);
+
+  return pad_status;
+}
+
+void CSIDevice_AMBaseboard::DoState(PointerWrap& p)
+{
+  p.Do(m_origin);
+  p.Do(m_mode);
+  p.Do(m_timer_button_combo_start);
+  p.Do(m_last_button_combo);
+
+  p.Do(m_last);
+  p.Do(m_lastptr);
+
+  p.Do(m_coin);
+  p.Do(m_coin_pressed);
+
+  p.Do(m_ic_card_data);
+
+  // Setup IC-card
+  p.Do(m_ic_card_state);
+  p.Do(m_ic_card_status);
+  p.Do(m_ic_card_session);
+
+  p.Do(m_ic_write_buffer);
+  p.Do(m_ic_write_offset);
+  p.Do(m_ic_write_size);
+
+  // Magnetic Card Reader
+  if (m_mag_card_reader)
+  {
+    m_mag_card_reader->DoState(p);
+
+    p.Do(m_mag_card_in_buffer);
+    p.Do(m_mag_card_out_buffer);
+  }
+
+  // Serial
+  p.Do(m_wheel_init);
+
+  p.Do(m_motor_init);
+  p.Do(m_motor_reply);
+  p.Do(m_motor_force_y);
+
+  // F-Zero AX (DX)
+  p.Do(m_fzdx_seatbelt);
+  p.Do(m_fzdx_motion_stop);
+  p.Do(m_fzdx_sensor_right);
+  p.Do(m_fzdx_sensor_left);
+  p.Do(m_rx_reply);
+
+  // F-Zero AX (CyCraft)
+  p.Do(m_fzcc_seatbelt);
+  p.Do(m_fzcc_sensor);
+  p.Do(m_fzcc_emergency);
+  p.Do(m_fzcc_service);
+
+  p.Do(m_dip_switch_1);
+  p.Do(m_dip_switch_0);
+
+  p.Do(m_delay);
+}
+
+}  // namespace SerialInterface
diff --git a/Source/Core/Core/HW/SI/SI_DeviceAMBaseboard.h b/Source/Core/Core/HW/SI/SI_DeviceAMBaseboard.h
new file mode 100644
index 000000000000..31ed04053c63
--- /dev/null
+++ b/Source/Core/Core/HW/SI/SI_DeviceAMBaseboard.h
@@ -0,0 +1,315 @@
+// Copyright 2025 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "Core/HW/GCPad.h"
+#include "Core/HW/MagCard/MagneticCardReader.h"
+#include "Core/HW/SI/SI_Device.h"
+
+#include "InputCommon/GCPadStatus.h"
+
+namespace Movie
+{
+class MovieManager;
+}
+
+namespace SerialInterface
+{
+
+// "JAMMA Video Standard" I/O
+class JVSIOMessage
+{
+public:
+  void Start(int node);
+  void AddData(const u8* dst, std::size_t len, int sync);
+  void AddData(const void* data, std::size_t len);
+  void AddData(const char* data);
+  void AddData(u32 n);
+  void End();
+
+  u32 m_pointer = 0;
+  std::array<u8, 0x80> m_message;
+
+private:
+  u32 m_last_start = 0;
+  u32 m_checksum = 0;
+};
+
+// Triforce (GC-AM) baseboard
+class CSIDevice_AMBaseboard : public ISIDevice
+{
+  enum EButtonCombo
+  {
+    COMBO_NONE = 0,
+    COMBO_ORIGIN,
+    COMBO_RESET
+  };
+
+public:
+  // constructor
+  CSIDevice_AMBaseboard(Core::System& system, SIDevices device, int device_number);
+
+  // run the SI Buffer
+  int RunBuffer(u8* buffer, int request_length) override;
+
+  // Reply has to be delayed due a bug in the parser
+  void SwapBuffers(u8* buffer, u32* buffer_length);
+
+  // return true on new data
+  DataResponse GetData(u32& hi, u32& low) override;
+
+  // send a command directly
+  void SendCommand(u32 command, u8 poll) override;
+
+  virtual GCPadStatus GetPadStatus();
+  virtual u32 MapPadStatus(const GCPadStatus& pad_status);
+  virtual EButtonCombo HandleButtonCombos(const GCPadStatus& pad_status);
+
+  static void HandleMoviePadStatus(Movie::MovieManager& movie, int device_number,
+                                   GCPadStatus* pad_status);
+
+  // Send and Receive pad input from network
+  static bool NetPlay_GetInput(int pad_num, GCPadStatus* status);
+  static int NetPlay_InGamePadToLocalPad(int pad_num);
+
+  void DoState(PointerWrap&) override;
+
+protected:
+  struct SOrigin
+  {
+    u16 button;
+    u8 origin_stick_x;
+    u8 origin_stick_y;
+    u8 substick_x;
+    u8 substick_y;
+    u8 trigger_left;
+    u8 trigger_right;
+    u8 unk_4;
+    u8 unk_5;
+  };
+
+  // struct to compare input against
+  // Set on connection to perfect neutral values
+  // (standard pad only) Set on button combo to current input state
+  SOrigin m_origin = {};
+
+  // PADAnalogMode
+  // Dunno if we need to do this, game/lib should set it?
+  u8 m_mode = 0x3;
+
+  // Timer to track special button combos:
+  // y, X, start for 3 seconds updates origin with current status
+  //   Technically, the above is only on standard pad, wavebird does not support it for example
+  // b, x, start for 3 seconds triggers reset (PI reset button interrupt)
+  u64 m_timer_button_combo_start = 0;
+  // Type of button combo from the last/current poll
+  EButtonCombo m_last_button_combo = COMBO_NONE;
+  void SetOrigin(const GCPadStatus& pad_status);
+
+private:
+  enum BaseBoardCommand
+  {
+    GCAM_Reset = 0x00,
+    GCAM_Command = 0x70,
+  };
+
+  enum GCAMCommand
+  {
+    StatusSwitches = 0x10,
+    SerialNumber = 0x11,
+    Unknown_12 = 0x12,
+    Unknown_14 = 0x14,
+    FirmVersion = 0x15,
+    FPGAVersion = 0x16,
+    RegionSettings = 0x1F,
+
+    Unknown_21 = 0x21,
+    Unknown_22 = 0x22,
+    Unknown_23 = 0x23,
+    Unknown_24 = 0x24,
+
+    SerialA = 0x31,
+    SerialB = 0x32,
+
+    JVSIOA = 0x40,
+    JVSIOB = 0x41,
+
+    Unknown_60 = 0x60,
+  };
+
+  enum JVSIOCommand
+  {
+    IOID = 0x10,
+    CommandRevision = 0x11,
+    JVRevision = 0x12,
+    CommunicationVersion = 0x13,
+    CheckFunctionality = 0x14,
+    MainID = 0x15,
+
+    SwitchesInput = 0x20,
+    CoinInput = 0x21,
+    AnalogInput = 0x22,
+    RotaryInput = 0x23,
+    KeyCodeInput = 0x24,
+    PositionInput = 0x25,
+    GeneralSwitchInput = 0x26,
+
+    PayoutRemain = 0x2E,
+    Retrans = 0x2F,
+    CoinSubOutput = 0x30,
+    PayoutAddOutput = 0x31,
+    GeneralDriverOutput = 0x32,
+    AnalogOutput = 0x33,
+    CharacterOutput = 0x34,
+    CoinAddOutput = 0x35,
+    PayoutSubOutput = 0x36,
+    GeneralDriverOutput2 = 0x37,
+    GeneralDriverOutput3 = 0x38,
+
+    NAMCOCommand = 0x70,
+
+    Reset = 0xF0,
+    SetAddress = 0xF1,
+    ChangeComm = 0xF2,
+  };
+
+  enum JVSIOStatusCode
+  {
+    StatusOkay = 1,
+    UnsupportedCommand = 2,
+    ChecksumError = 3,
+    AcknowledgeOverflow = 4,
+  };
+
+  enum CARDCommand
+  {
+    Init = 0x10,
+    GetState = 0x20,
+    Read = 0x33,
+    IsPresent = 0x40,
+    Write = 0x53,
+    SetPrintParam = 0x78,
+    RegisterFont = 0x7A,
+    WriteInfo = 0x7C,
+    Erase = 0x7D,
+    Eject = 0x80,
+    Clean = 0xA0,
+    Load = 0xB0,
+    SetShutter = 0xD0,
+  };
+
+  enum ICCARDCommand
+  {
+    GetStatus = 0x10,
+    SetBaudrate = 0x11,
+    FieldOn = 0x14,
+    FieldOff = 0x15,
+    InsertCheck = 0x20,
+    AntiCollision = 0x21,
+    SelectCard = 0x22,
+    ReadPage = 0x24,
+    WritePage = 0x25,
+    DecreaseUseCount = 0x26,
+    ReadUseCount = 0x33,
+    ReadPages = 0x34,
+    WritePages = 0x35,
+  };
+
+  enum ICCARDStatus
+  {
+    Okay = 0,
+    NoCard = 0x8000,
+    Unknown = 0x800E,
+    BadCard = 0xFFFF,
+  };
+
+  enum CDReaderCommand
+  {
+    ShutterAuto = 0x61,
+    BootVersion = 0x62,
+    SensLock = 0x63,
+    SensCard = 0x65,
+    FirmwareUpdate = 0x66,
+    ShutterGet = 0x67,
+    CameraCheck = 0x68,
+    ShutterCard = 0x69,
+    ProgramChecksum = 0x6B,
+    BootChecksum = 0x6D,
+    ShutterLoad = 0x6F,
+    ReadCard = 0x72,
+    ShutterSave = 0x73,
+    SelfTest = 0x74,
+    ProgramVersion = 0x76,
+  };
+
+  // NOTE: Used to be an union with `u8 data[81 + 4 + 4 + 4]`
+  // TODO: Should the struct be packed?
+  struct ICCommand
+  {
+    u32 pktcmd : 8;
+    u32 pktlen : 8;
+    u32 fixed : 8;
+    u32 command : 8;
+    u32 flag : 8;
+    u32 length : 8;
+    u32 status : 16;
+
+    u8 extdata[81] = {};
+    u32 extlen;
+  };
+
+  u8 m_last[2][0x80] = {};
+  u32 m_lastptr[2] = {};
+
+  std::array<u16, 2> m_coin{};
+  std::array<u32, 2> m_coin_pressed{};
+
+  u8 m_ic_card_data[2048] = {};
+
+  // Setup IC-card
+  u16 m_ic_card_state = 0x20;
+  u16 m_ic_card_status = ICCARDStatus::Okay;
+  u16 m_ic_card_session = 0x23;
+
+  u8 m_ic_write_buffer[512] = {};
+  u32 m_ic_write_offset = 0;
+  u32 m_ic_write_size = 0;
+
+  // Magnetic Card Reader
+  MagCard::MagneticCardReader::Settings m_mag_card_settings;
+
+  std::vector<u8> m_mag_card_in_buffer;
+  std::vector<u8> m_mag_card_out_buffer;
+
+  std::unique_ptr<MagCard::MagneticCardReader> m_mag_card_reader;
+
+  // Serial
+  u32 m_wheel_init = 0;
+
+  u32 m_motor_init = 0;
+  u8 m_motor_reply[64] = {};
+  s16 m_motor_force_y = 0;
+
+  // F-Zero AX (DX)
+  bool m_fzdx_seatbelt = true;
+  bool m_fzdx_motion_stop = false;
+  bool m_fzdx_sensor_right = false;
+  bool m_fzdx_sensor_left = false;
+  u8 m_rx_reply = 0xF0;
+
+  // F-Zero AX (CyCraft)
+  bool m_fzcc_seatbelt = true;
+  bool m_fzcc_sensor = false;
+  bool m_fzcc_emergency = false;
+  bool m_fzcc_service = false;
+
+  u32 m_dip_switch_1 = 0xFE;
+  u32 m_dip_switch_0 = 0xFF;
+
+  int m_delay = 0;
+
+  void ICCardSendReply(ICCommand* iccommand, u8* buffer, u32* length);
+};
+
+}  // namespace SerialInterface
diff --git a/Source/Core/Core/HW/SI/SI_DeviceGBA.cpp b/Source/Core/Core/HW/SI/SI_DeviceGBA.cpp
index f9be6953a916..ef8b90802689 100644
--- a/Source/Core/Core/HW/SI/SI_DeviceGBA.cpp
+++ b/Source/Core/Core/HW/SI/SI_DeviceGBA.cpp
@@ -10,12 +10,9 @@
 #include <queue>
 #include <thread>
 
-#include <SFML/Network.hpp>
-
 #include "Common/CommonTypes.h"
 #include "Common/Flag.h"
 #include "Common/Logging/Log.h"
-#include "Common/Swap.h"
 #include "Common/Thread.h"
 #include "Core/CoreTiming.h"
 #include "Core/HW/SI/SI_Device.h"
diff --git a/Source/Core/Core/HW/SI/SI_DeviceGCController.cpp b/Source/Core/Core/HW/SI/SI_DeviceGCController.cpp
index 270e75f56ad6..1f7a7b631b7d 100644
--- a/Source/Core/Core/HW/SI/SI_DeviceGCController.cpp
+++ b/Source/Core/Core/HW/SI/SI_DeviceGCController.cpp
@@ -3,13 +3,10 @@
 
 #include "Core/HW/SI/SI_DeviceGCController.h"
 
-#include <cstring>
-
 #include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"
-#include "Common/Swap.h"
 #include "Core/Config/MainSettings.h"
 #include "Core/CoreTiming.h"
 #include "Core/HW/GCPad.h"
@@ -99,7 +96,7 @@ int CSIDevice_GCController::RunBuffer(u8* buffer, int request_length)
   }
 
   // GameID packet, no response needed, nothing to do
-  // On real hardware, this is used to configure the BlueRetro controler
+  // On real hardware, this is used to configure the BlueRetro controller
   // adapter, while licensed accessories ignore this command.
   case EBufferCommands::CMD_SET_GAME_ID:
   {
diff --git a/Source/Core/Core/HW/SI/SI_DeviceGCSteeringWheel.cpp b/Source/Core/Core/HW/SI/SI_DeviceGCSteeringWheel.cpp
index a3ca7e9ebefe..70cd90c20585 100644
--- a/Source/Core/Core/HW/SI/SI_DeviceGCSteeringWheel.cpp
+++ b/Source/Core/Core/HW/SI/SI_DeviceGCSteeringWheel.cpp
@@ -4,12 +4,9 @@
 #include "Core/HW/SI/SI_DeviceGCSteeringWheel.h"
 
 #include <algorithm>
-#include <cmath>
-#include <cstring>
 
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
-#include "Common/Swap.h"
 #include "Core/HW/GCPad.h"
 
 namespace SerialInterface
@@ -77,7 +74,7 @@ DataResponse CSIDevice_GCSteeringWheel::GetData(u32& hi, u32& low)
                                      GCPadStatus::MAIN_STICK_CENTER_Y - pad_status.stickY);
 
     // We must double these values because we are mapping half of a stick range to a 0..255 value.
-    // We're only getting half the precison we could potentially have,
+    // We're only getting half the precision we could potentially have,
     // but we'll have to redesign our GameCube controller input to fix that.
 
     // All 8 bits (Accelerate)
diff --git a/Source/Core/Core/HW/SI/SI_DeviceKeyboard.h b/Source/Core/Core/HW/SI/SI_DeviceKeyboard.h
index 1d2ca62c070d..2f7b23225776 100644
--- a/Source/Core/Core/HW/SI/SI_DeviceKeyboard.h
+++ b/Source/Core/Core/HW/SI/SI_DeviceKeyboard.h
@@ -36,7 +36,7 @@ class CSIDevice_Keyboard final : public ISIDevice
 
   KeyArray MapKeys(const KeyboardStatus& key_status) const;
 
-  // Internal counter synchonizing GC and keyboard
+  // Internal counter synchronizing GC and keyboard
   u8 m_counter = 0;
 };
 }  // namespace SerialInterface
diff --git a/Source/Core/Core/HW/SystemTimers.cpp b/Source/Core/Core/HW/SystemTimers.cpp
index c318ca08d417..2b89d22d1615 100644
--- a/Source/Core/Core/HW/SystemTimers.cpp
+++ b/Source/Core/Core/HW/SystemTimers.cpp
@@ -44,10 +44,6 @@ IPC_HLE_PERIOD: For the Wii Remote this is the call schedule:
 
 #include "Core/HW/SystemTimers.h"
 
-#include <cfloat>
-#include <cmath>
-#include <cstdlib>
-
 #include "AudioCommon/Mixer.h"
 #include "Common/CommonTypes.h"
 #include "Common/Timer.h"
diff --git a/Source/Core/Core/HW/VideoInterface.cpp b/Source/Core/Core/HW/VideoInterface.cpp
index 48b81916a5c6..3d46a345ee69 100644
--- a/Source/Core/Core/HW/VideoInterface.cpp
+++ b/Source/Core/Core/HW/VideoInterface.cpp
@@ -163,7 +163,9 @@ void VideoInterfaceManager::Preset(bool _bNTSC)
 
   // Say component cable is plugged
   m_dtv_status.component_plugged = Config::Get(Config::SYSCONF_PROGRESSIVE_SCAN);
-  m_dtv_status.ntsc_j = region == DiscIO::Region::NTSC_J;
+
+  // Triforce IPL requires the DTV NTSC-J flag to be set.
+  m_dtv_status.ntsc_j = m_system.IsTriforce() || region == DiscIO::Region::NTSC_J;
 
   m_fb_width.Hex = 0;
   m_border_hblank.Hex = 0;
@@ -491,7 +493,7 @@ float VideoInterfaceManager::GetAspectRatio() const
   // but it's only 4:3 if the picture fill the entire active area.
   // All games configure VideoInterface to add padding in both the horizontal and vertical
   // directions and most games also do a slight horizontal scale.
-  // This means that XFB never fills the entire active area and is therefor almost never 4:3
+  // This means that XFB never fills the entire active area and is therefore almost never 4:3
 
   // To work out the correct aspect ratio of the XFB, we need to know how VideoInterface's
   // currently configured active area compares to the active area of a stock PAL or NTSC
@@ -980,7 +982,7 @@ void VideoInterfaceManager::Update(u64 ticks)
     m_ticks_last_line_start = ticks;
   }
 
-  // TODO: Findout why skipping interrupts acts as a frameskip
+  // TODO: Find out why skipping interrupts acts as a frameskip
   if (core_timing.GetVISkip())
     return;
 
diff --git a/Source/Core/Core/HW/VideoInterface.h b/Source/Core/Core/HW/VideoInterface.h
index 8a5424366002..6bf762aeab30 100644
--- a/Source/Core/Core/HW/VideoInterface.h
+++ b/Source/Core/Core/HW/VideoInterface.h
@@ -203,7 +203,7 @@ union UVIFBInfoRegister
     // POFF only seems to exist in the top reg. XOFF, unknown.
     u32 XOFF : 4;  // Horizontal Offset of the left-most pixel within the first word of the fetched
                    // picture
-    u32 POFF : 1;  // Page offest: 1: fb address is (address>>5)
+    u32 POFF : 1;  // Page offset: 1: fb address is (address>>5)
     u32 CLRPOFF : 3;  // ? setting bit 31 clears POFF
   };
 };
diff --git a/Source/Core/Core/HW/WiiSave.cpp b/Source/Core/Core/HW/WiiSave.cpp
index b636fb0b2cf0..051a0a89361f 100644
--- a/Source/Core/Core/HW/WiiSave.cpp
+++ b/Source/Core/Core/HW/WiiSave.cpp
@@ -30,7 +30,6 @@
 #include "Common/Lazy.h"
 #include "Common/Logging/Log.h"
 #include "Common/NandPaths.h"
-#include "Common/StringUtil.h"
 #include "Common/Swap.h"
 #include "Core/CommonTitles.h"
 #include "Core/HW/WiiSaveStructs.h"
diff --git a/Source/Core/Core/HW/Wiimote.cpp b/Source/Core/Core/HW/Wiimote.cpp
index ca9917d81d4c..1679ffd15152 100644
--- a/Source/Core/Core/HW/Wiimote.cpp
+++ b/Source/Core/Core/HW/Wiimote.cpp
@@ -18,7 +18,6 @@
 #include "Core/IOS/USB/Bluetooth/BTEmu.h"
 #include "Core/IOS/USB/Bluetooth/WiimoteDevice.h"
 #include "Core/Movie.h"
-#include "Core/NetPlayClient.h"
 #include "Core/System.h"
 #include "Core/WiiUtils.h"
 
diff --git a/Source/Core/Core/HW/WiimoteCommon/DataReport.cpp b/Source/Core/Core/HW/WiimoteCommon/DataReport.cpp
index 9bac2e934855..5d53506e56bf 100644
--- a/Source/Core/Core/HW/WiimoteCommon/DataReport.cpp
+++ b/Source/Core/Core/HW/WiimoteCommon/DataReport.cpp
@@ -5,7 +5,6 @@
 
 #include "Common/Assert.h"
 #include "Common/BitUtils.h"
-#include "Common/MathUtil.h"
 
 namespace WiimoteCommon
 {
diff --git a/Source/Core/Core/HW/WiimoteEmu/Camera.cpp b/Source/Core/Core/HW/WiimoteEmu/Camera.cpp
index 1dcdb7795200..c42afb2119a0 100644
--- a/Source/Core/Core/HW/WiimoteEmu/Camera.cpp
+++ b/Source/Core/Core/HW/WiimoteEmu/Camera.cpp
@@ -11,8 +11,6 @@
 #include "Common/MathUtil.h"
 #include "Common/Matrix.h"
 
-#include "Core/HW/WiimoteCommon/WiimoteReport.h"
-
 namespace WiimoteEmu
 {
 void CameraLogic::Reset()
diff --git a/Source/Core/Core/HW/WiimoteEmu/Camera.h b/Source/Core/Core/HW/WiimoteEmu/Camera.h
index 23e21cc84e43..5f020343586e 100644
--- a/Source/Core/Core/HW/WiimoteEmu/Camera.h
+++ b/Source/Core/Core/HW/WiimoteEmu/Camera.h
@@ -5,9 +5,8 @@
 
 #include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
-#include "Core/HW/WiimoteEmu/Dynamics.h"
+#include "Common/Matrix.h"
 #include "Core/HW/WiimoteEmu/I2CBus.h"
-#include "InputCommon/ControllerEmu/ControlGroup/Cursor.h"
 
 namespace Common
 {
diff --git a/Source/Core/Core/HW/WiimoteEmu/Dynamics.cpp b/Source/Core/Core/HW/WiimoteEmu/Dynamics.cpp
index 05df72bec757..ebf24f735c08 100644
--- a/Source/Core/Core/HW/WiimoteEmu/Dynamics.cpp
+++ b/Source/Core/Core/HW/WiimoteEmu/Dynamics.cpp
@@ -10,7 +10,6 @@
 #include "Common/MathUtil.h"
 #include "Core/Config/SYSCONFSettings.h"
 #include "Core/HW/WiimoteEmu/WiimoteEmu.h"
-#include "InputCommon/ControllerEmu/ControlGroup/Buttons.h"
 #include "InputCommon/ControllerEmu/ControlGroup/Cursor.h"
 #include "InputCommon/ControllerEmu/ControlGroup/Force.h"
 #include "InputCommon/ControllerEmu/ControlGroup/IMUAccelerometer.h"
@@ -67,7 +66,7 @@ Common::Quaternion ComplementaryFilter(const Common::Quaternion& gyroscope,
 
   const auto cos_angle = normalized_accel.Dot(gyro_vec);
 
-  // If gyro to accel angle difference is betwen 0 and 180 degrees we make an adjustment.
+  // If gyro to accel angle difference is between 0 and 180 degrees we make an adjustment.
   const auto abs_cos_angle = std::abs(cos_angle);
   if (abs_cos_angle > 0 && abs_cos_angle < 1)
   {
diff --git a/Source/Core/Core/HW/WiimoteEmu/Dynamics.h b/Source/Core/Core/HW/WiimoteEmu/Dynamics.h
index 08b3cbda9a0a..8f35c306da20 100644
--- a/Source/Core/Core/HW/WiimoteEmu/Dynamics.h
+++ b/Source/Core/Core/HW/WiimoteEmu/Dynamics.h
@@ -3,19 +3,15 @@
 
 #pragma once
 
-#include <array>
-
 #include "Common/MathUtil.h"
 #include "Common/Matrix.h"
-#include "Core/HW/WiimoteCommon/DataReport.h"
-#include "InputCommon/ControllerEmu/ControlGroup/Buttons.h"
+#include "Core/HW/WiimoteCommon/WiimoteReport.h"
 #include "InputCommon/ControllerEmu/ControlGroup/Cursor.h"
 #include "InputCommon/ControllerEmu/ControlGroup/Force.h"
 #include "InputCommon/ControllerEmu/ControlGroup/IMUAccelerometer.h"
 #include "InputCommon/ControllerEmu/ControlGroup/IMUCursor.h"
 #include "InputCommon/ControllerEmu/ControlGroup/IMUGyroscope.h"
 #include "InputCommon/ControllerEmu/ControlGroup/Tilt.h"
-#include "InputCommon/ControllerEmu/ControllerEmu.h"
 
 namespace WiimoteEmu
 {
diff --git a/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp b/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp
index 46a4c417d8f2..22fbe7d23470 100644
--- a/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp
+++ b/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp
@@ -3,19 +3,19 @@
 
 #include "Core/HW/WiimoteEmu/WiimoteEmu.h"
 
-#include <cmath>
 #include <iterator>
+#include <utility>
 
 #include "Common/BitUtils.h"
 #include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
-#include "Common/EnumUtils.h"
 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"
 #include "Common/Swap.h"
 
 #include "Core/Core.h"
 #include "Core/HW/Wiimote.h"
+#include "Core/HW/WiimoteCommon/DataReport.h"
 #include "Core/HW/WiimoteCommon/WiimoteHid.h"
 
 namespace WiimoteEmu
@@ -208,7 +208,7 @@ void Wiimote::HandleExtensionSwap(ExtensionNumber desired_extension_number,
     else
     {
       INFO_LOG_FMT(WIIMOTE, "Switching to Extension {} (Wiimote {} in slot {})",
-                   Common::ToUnderlying(desired_extension_number), m_index, m_bt_device_index);
+                   std::to_underlying(desired_extension_number), m_index, m_bt_device_index);
 
       m_active_extension = desired_extension_number;
     }
@@ -305,7 +305,7 @@ void Wiimote::HandleWriteData(const OutputReportWriteData& wd)
     auto const bytes_written = m_i2c_bus.BusWrite(wd.slave_address, (u8)address, wd.size, wd.data);
     if (bytes_written != wd.size)
     {
-      // A real wiimote gives error 7 for failed write to i2c bus (mainly a non-existant slave)
+      // A real wiimote gives error 7 for failed write to i2c bus (mainly a non-existent slave)
       error_code = ErrorCode::Nack;
     }
   }
@@ -463,7 +463,7 @@ bool Wiimote::ProcessReadDataRequest()
       // error code 8
 
       // The real Wiimote generate an error for the first
-      // request to 0x1770 if we dont't replicate that the game will never
+      // request to 0x1770 if we don't replicate that the game will never
       // read the calibration data at the beginning of Eeprom.
       error_code = ErrorCode::InvalidAddress;
     }
diff --git a/Source/Core/Core/HW/WiimoteEmu/Encryption.cpp b/Source/Core/Core/HW/WiimoteEmu/Encryption.cpp
index f41540812671..4876c648d187 100644
--- a/Source/Core/Core/HW/WiimoteEmu/Encryption.cpp
+++ b/Source/Core/Core/HW/WiimoteEmu/Encryption.cpp
@@ -499,7 +499,7 @@ EncryptionKey KeyGen::GenerateFromExtensionKeyData(const ExtKeyData& ext_key) co
   }
 
   // Retail games never hit this path but some homebrew fills encryption key with 0x00.
-  // Real extensions seem to then use entirely differnet "sboxes" for table generation.
+  // Real extensions seem to then use entirely different "sboxes" for table generation.
   WARN_LOG_FMT(WIIMOTE, "Extension key gen did not match any idx. Generating fallback tables.");
   return GenerateFallbackTables(rand, key);
 }
diff --git a/Source/Core/Core/HW/WiimoteEmu/Extension/Drums.cpp b/Source/Core/Core/HW/WiimoteEmu/Extension/Drums.cpp
index 51399c68b89a..067402b06e79 100644
--- a/Source/Core/Core/HW/WiimoteEmu/Extension/Drums.cpp
+++ b/Source/Core/Core/HW/WiimoteEmu/Extension/Drums.cpp
@@ -163,7 +163,7 @@ void Drums::Update(const DesiredExtensionState& target_state)
 
       velocity = desired_state.softness;
 
-      // A drum-pad hit causes the relevent bit to be triggered for the next 10 frames.
+      // A drum-pad hit causes the relevant bit to be triggered for the next 10 frames.
       constexpr u8 HIT_FRAME_COUNT = 10;
 
       m_pad_remaining_frames[i] = HIT_FRAME_COUNT;
@@ -178,7 +178,7 @@ void Drums::Update(const DesiredExtensionState& target_state)
   drum_data.velocity4 = velocity >> 4;
 
   // Figure out which drum-pad bits to send.
-  // Note: Relevent bits are not set until after velocity data has been sent.
+  // Note: Relevant bits are not set until after velocity data has been sent.
   // My drums never exposed simultaneous hits. One pad bit was always sent before the other.
   for (std::size_t i = 0; i != drum_pad_bitmasks.size(); ++i)
   {
diff --git a/Source/Core/Core/HW/WiimoteEmu/Extension/Extension.cpp b/Source/Core/Core/HW/WiimoteEmu/Extension/Extension.cpp
index f990ce334a05..90a9965aa340 100644
--- a/Source/Core/Core/HW/WiimoteEmu/Extension/Extension.cpp
+++ b/Source/Core/Core/HW/WiimoteEmu/Extension/Extension.cpp
@@ -3,8 +3,6 @@
 
 #include "Core/HW/WiimoteEmu/Extension/Extension.h"
 
-#include <cstring>
-
 #include "Common/CommonTypes.h"
 
 #include "Core/HW/Wiimote.h"
diff --git a/Source/Core/Core/HW/WiimoteEmu/Extension/Guitar.cpp b/Source/Core/Core/HW/WiimoteEmu/Extension/Guitar.cpp
index 27e9e931963b..0a1abf384498 100644
--- a/Source/Core/Core/HW/WiimoteEmu/Extension/Guitar.cpp
+++ b/Source/Core/Core/HW/WiimoteEmu/Extension/Guitar.cpp
@@ -4,7 +4,6 @@
 #include "Core/HW/WiimoteEmu/Extension/Guitar.h"
 
 #include <array>
-#include <cstring>
 #include <map>
 
 #include "Common/Assert.h"
diff --git a/Source/Core/Core/HW/WiimoteEmu/Extension/Nunchuk.cpp b/Source/Core/Core/HW/WiimoteEmu/Extension/Nunchuk.cpp
index b4cf363b79f5..67456021af27 100644
--- a/Source/Core/Core/HW/WiimoteEmu/Extension/Nunchuk.cpp
+++ b/Source/Core/Core/HW/WiimoteEmu/Extension/Nunchuk.cpp
@@ -4,7 +4,6 @@
 #include "Core/HW/WiimoteEmu/Extension/Nunchuk.h"
 
 #include <array>
-#include <cstring>
 
 #include "Common/Assert.h"
 #include "Common/Common.h"
diff --git a/Source/Core/Core/HW/WiimoteEmu/Extension/TaTaCon.cpp b/Source/Core/Core/HW/WiimoteEmu/Extension/TaTaCon.cpp
index 1efe6829a6fb..49aba90ea3d4 100644
--- a/Source/Core/Core/HW/WiimoteEmu/Extension/TaTaCon.cpp
+++ b/Source/Core/Core/HW/WiimoteEmu/Extension/TaTaCon.cpp
@@ -4,7 +4,6 @@
 #include "Core/HW/WiimoteEmu/Extension/TaTaCon.h"
 
 #include <array>
-#include <cstring>
 
 #include "Common/Assert.h"
 #include "Common/Common.h"
diff --git a/Source/Core/Core/HW/WiimoteEmu/Extension/Turntable.cpp b/Source/Core/Core/HW/WiimoteEmu/Extension/Turntable.cpp
index 64a292ced3a3..852179fef004 100644
--- a/Source/Core/Core/HW/WiimoteEmu/Extension/Turntable.cpp
+++ b/Source/Core/Core/HW/WiimoteEmu/Extension/Turntable.cpp
@@ -4,7 +4,6 @@
 #include "Core/HW/WiimoteEmu/Extension/Turntable.h"
 
 #include <array>
-#include <cstring>
 
 #include "Common/Assert.h"
 #include "Common/Common.h"
diff --git a/Source/Core/Core/HW/WiimoteEmu/Extension/UDrawTablet.cpp b/Source/Core/Core/HW/WiimoteEmu/Extension/UDrawTablet.cpp
index 49ecd0418032..10dd776f3432 100644
--- a/Source/Core/Core/HW/WiimoteEmu/Extension/UDrawTablet.cpp
+++ b/Source/Core/Core/HW/WiimoteEmu/Extension/UDrawTablet.cpp
@@ -6,14 +6,12 @@
 #include <array>
 
 #include "Common/Assert.h"
-#include "Common/BitUtils.h"
 #include "Common/Common.h"
 #include "Common/CommonTypes.h"
 
 #include "Core/HW/WiimoteEmu/Extension/DesiredExtensionState.h"
 #include "Core/HW/WiimoteEmu/WiimoteEmu.h"
 
-#include "InputCommon/ControllerEmu/Control/Input.h"
 #include "InputCommon/ControllerEmu/ControlGroup/AnalogStick.h"
 #include "InputCommon/ControllerEmu/ControlGroup/Buttons.h"
 #include "InputCommon/ControllerEmu/ControlGroup/Triggers.h"
diff --git a/Source/Core/Core/HW/WiimoteEmu/ExtensionPort.cpp b/Source/Core/Core/HW/WiimoteEmu/ExtensionPort.cpp
index 97e73ea4bc90..b039aa51fe26 100644
--- a/Source/Core/Core/HW/WiimoteEmu/ExtensionPort.cpp
+++ b/Source/Core/Core/HW/WiimoteEmu/ExtensionPort.cpp
@@ -3,8 +3,6 @@
 
 #include "Core/HW/WiimoteEmu/ExtensionPort.h"
 
-#include "Common/ChunkFile.h"
-
 namespace WiimoteEmu
 {
 ExtensionPort::ExtensionPort(I2CBus* i2c_bus) : m_i2c_bus(*i2c_bus)
diff --git a/Source/Core/Core/HW/WiimoteEmu/ExtensionPort.h b/Source/Core/Core/HW/WiimoteEmu/ExtensionPort.h
index 86b1fd31f962..7a566cafb8f7 100644
--- a/Source/Core/Core/HW/WiimoteEmu/ExtensionPort.h
+++ b/Source/Core/Core/HW/WiimoteEmu/ExtensionPort.h
@@ -31,7 +31,7 @@ enum ExtensionNumber : u8
 class ExtensionPort
 {
 public:
-  // The real wiimote reads extension data from i2c slave 0x52 addres 0x00:
+  // The real wiimote reads extension data from i2c slave 0x52 address 0x00:
   static constexpr u8 REPORT_I2C_SLAVE = 0x52;
   static constexpr u8 REPORT_I2C_ADDR = 0x00;
 
diff --git a/Source/Core/Core/HW/WiimoteEmu/I2CBus.cpp b/Source/Core/Core/HW/WiimoteEmu/I2CBus.cpp
index 1c231f794446..9a96673d32aa 100644
--- a/Source/Core/Core/HW/WiimoteEmu/I2CBus.cpp
+++ b/Source/Core/Core/HW/WiimoteEmu/I2CBus.cpp
@@ -3,8 +3,6 @@
 
 #include "Core/HW/WiimoteEmu/I2CBus.h"
 
-#include <algorithm>
-
 namespace WiimoteEmu
 {
 void I2CBus::AddSlave(I2CSlave* slave)
diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp
index 98f52a09f14c..7fc81f632165 100644
--- a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp
+++ b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp
@@ -4,6 +4,7 @@
 #include "Core/HW/WiimoteEmu/WiimoteEmu.h"
 
 #include <algorithm>
+#include <fstream>
 #include <memory>
 #include <optional>
 #include <string_view>
@@ -22,6 +23,7 @@
 #include "Core/Core.h"
 #include "Core/HW/Wiimote.h"
 
+#include "Core/HW/WiimoteCommon/DataReport.h"
 #include "Core/HW/WiimoteCommon/WiimoteConstants.h"
 #include "Core/HW/WiimoteCommon/WiimoteHid.h"
 #include "Core/HW/WiimoteEmu/DesiredWiimoteState.h"
diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h
index 94da0a563c77..1e07e2abca40 100644
--- a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h
+++ b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.h
@@ -11,11 +11,11 @@
 #include "Common/Common.h"
 #include "Common/Config/Config.h"
 
+#include "Core/HW/WiimoteCommon/WiimoteHid.h"
 #include "Core/HW/WiimoteCommon/WiimoteReport.h"
 
 #include "Core/HW/WiimoteEmu/Camera.h"
 #include "Core/HW/WiimoteEmu/Dynamics.h"
-#include "Core/HW/WiimoteEmu/Encryption.h"
 #include "Core/HW/WiimoteEmu/ExtensionPort.h"
 #include "Core/HW/WiimoteEmu/I2CBus.h"
 #include "Core/HW/WiimoteEmu/MotionPlus.h"
diff --git a/Source/Core/Core/HW/WiimoteReal/IOLinux.cpp b/Source/Core/Core/HW/WiimoteReal/IOLinux.cpp
index 7f992af360e5..c37aa42fc994 100644
--- a/Source/Core/Core/HW/WiimoteReal/IOLinux.cpp
+++ b/Source/Core/Core/HW/WiimoteReal/IOLinux.cpp
@@ -11,10 +11,8 @@
 #include <bluetooth/hci_lib.h>
 #include <bluetooth/l2cap.h>
 
-#include <sys/eventfd.h>
 #include <sys/ioctl.h>
 #include <sys/poll.h>
-#include <sys/signalfd.h>
 
 #include <unistd.h>
 
diff --git a/Source/Core/Core/HW/WiimoteReal/IOWin.cpp b/Source/Core/Core/HW/WiimoteReal/IOWin.cpp
index 4ad6f0276e3f..cd7997e48cdd 100644
--- a/Source/Core/Core/HW/WiimoteReal/IOWin.cpp
+++ b/Source/Core/Core/HW/WiimoteReal/IOWin.cpp
@@ -5,17 +5,21 @@
 
 #include <algorithm>
 #include <array>
+#include <bit>
 #include <optional>
 #include <vector>
 
 #include <windows.h>
 #include <bluetoothapis.h>
 #include <cfgmgr32.h>
-#include <initguid.h>
 #include <hidclass.h>
 #include <hidsdi.h>
-// initguid.h must be included before Devpkey.h
+#include <initguid.h>
+#include <wtypes.h>
+// initguid.h must be included before devpkey.h
 #include <devpkey.h>
+// wtypes.h must be included before propkey.h
+#include <propkey.h>
 
 #include "Common/CommonFuncs.h"
 #include "Common/CommonTypes.h"
@@ -24,7 +28,6 @@
 #include "Common/ScopeGuard.h"
 #include "Common/StringUtil.h"
 #include "Common/Thread.h"
-#include "Common/WindowsDevice.h"
 
 #include "Core/HW/WiimoteCommon/DataReport.h"
 #include "Core/HW/WiimoteCommon/WiimoteConstants.h"
@@ -32,6 +35,12 @@
 
 #pragma comment(lib, "Bthprops.lib")
 
+#if defined(__MINGW64_VERSION_MAJOR) && __MINGW64_VERSION_MAJOR < 13
+static const PROPERTYKEY PKEY_Devices_Aep_AepId = {
+    { 0x3b2ce006, 0x5e61, 0x4fde, { 0xba, 0xb8, 0x9b, 0x8a, 0xac, 0x9b, 0x26, 0xdf } }, 8
+};
+#endif
+
 namespace WiimoteReal
 {
 constexpr u8 DEFAULT_INQUIRY_LENGTH = 3;
@@ -66,8 +75,9 @@ enum class AuthenticationMethod : bool
 // BluetoothAuthenticateDeviceEx requires a bunch of rigmarole.. maybe some other day.
 #pragma warning(push)
 #pragma warning(disable : 4995)
-bool AuthenticateWiimote(HANDLE radio_handle, const BLUETOOTH_RADIO_INFO& radio_info,
-                         BLUETOOTH_DEVICE_INFO_STRUCT* btdi, AuthenticationMethod auth_method)
+static bool AuthenticateWiimote(HANDLE radio_handle, const BLUETOOTH_RADIO_INFO& radio_info,
+                                BLUETOOTH_DEVICE_INFO_STRUCT* btdi,
+                                AuthenticationMethod auth_method)
 {
   // When pressing the sync button, the remote expects the host's address as the pass key.
   // When pressing 1+2 it expects its own address.
@@ -103,7 +113,7 @@ bool AuthenticateWiimote(HANDLE radio_handle, const BLUETOOTH_RADIO_INFO& radio_
 }
 #pragma warning(pop)
 
-std::optional<USBUtils::DeviceInfo> GetDeviceInfo(const WCHAR* hid_iface)
+static std::optional<USBUtils::DeviceInfo> GetDeviceInfo(const WCHAR* hid_iface)
 {
   // libusb opens without read/write access to get attributes, so we'll do that too.
   constexpr auto open_access = 0;
@@ -126,7 +136,7 @@ std::optional<USBUtils::DeviceInfo> GetDeviceInfo(const WCHAR* hid_iface)
   return USBUtils::DeviceInfo{attributes.VendorID, attributes.ProductID};
 }
 
-static std::optional<std::string> GetParentDeviceDescription(const WCHAR* hid_iface)
+static std::optional<DEVINST> GetInst(const WCHAR* hid_iface)
 {
   auto dev_inst_id =
       Common::GetDeviceInterfaceStringProperty(hid_iface, &DEVPKEY_Device_InstanceId);
@@ -142,6 +152,11 @@ static std::optional<std::string> GetParentDeviceDescription(const WCHAR* hid_if
     return std::nullopt;
   }
 
+  return dev_inst;
+}
+
+static std::optional<DEVINST> GetParentInst(DEVINST dev_inst)
+{
   DEVINST parent_inst{};
   if (CM_Get_Parent(&parent_inst, dev_inst, 0) != CR_SUCCESS)
   {
@@ -149,13 +164,39 @@ static std::optional<std::string> GetParentDeviceDescription(const WCHAR* hid_if
     return std::nullopt;
   }
 
-  const auto description =
-      Common::GetDevNodeStringProperty(parent_inst, &DEVPKEY_Device_BusReportedDeviceDesc);
+  return parent_inst;
+}
+
+static std::optional<std::string> GetBluetoothName(DEVINST dev_inst)
+{
+  // Association Endpoint ID.
+  const auto aep_id_key = std::bit_cast<DEVPROPKEY>(PKEY_Devices_Aep_AepId);
+
+  // This provides a string like "Bluetooth#Bluetoothbc:fc:e7:2d:83:72-d8:6b:f7:32:db:46".
+  const auto aep_id = Common::GetDevNodeStringProperty(dev_inst, &aep_id_key);
+  if (!aep_id.has_value())
+    return std::nullopt;
+
+  // Traverse all siblings and find the "Bluetooth" class device with a matching AepID.
+  const auto parent_inst = GetParentInst(dev_inst);
+  if (!parent_inst.has_value())
+    return std::nullopt;
+
+  DEVINST child;
+  if (CM_Get_Child(&child, *parent_inst, 0) != CR_SUCCESS)
+    return std::nullopt;
 
-  if (description.has_value())
-    return WStringToUTF8(*description);
+  while (true)
+  {
+    if (Common::GetDevNodeStringProperty(child, &DEVPKEY_Device_Class) == L"Bluetooth" &&
+        *aep_id == Common::GetDevNodeStringProperty(child, &aep_id_key))
+    {
+      return Common::GetDevNodeStringProperty(child, &DEVPKEY_NAME).transform(WStringToUTF8);
+    }
 
-  return std::nullopt;
+    if (CM_Get_Sibling(&child, child, 0) != CR_SUCCESS)
+      return std::nullopt;
+  }
 }
 
 void EnumerateRadios(std::invocable<HANDLE> auto&& enumeration_callback)
@@ -262,15 +303,15 @@ u32 RemoveWiimoteBluetoothDevices(std::invocable<BLUETOOTH_DEVICE_INFO> auto&& s
 // If they are *not* authenticated there's apparently no feasible way to reconnect them.
 // We remove these problematic remembered devices so we can reconnect them.
 // Otherwise, the user would need to manually deleting the device in control panel.
-u32 RemoveUnusableWiimoteBluetoothDevices()
+static u32 RemoveUnusableWiimoteBluetoothDevices()
 {
   return RemoveWiimoteBluetoothDevices([](const BLUETOOTH_DEVICE_INFO& btdi) {
     return btdi.fRemembered && !btdi.fConnected && !btdi.fAuthenticated;
   });
 }
 
-u32 DiscoverAndPairWiimotes(u8 inquiry_length,
-                            std::optional<AuthenticationMethod> auth_method = std::nullopt)
+static u32 DiscoverAndPairWiimotes(u8 inquiry_length,
+                                   std::optional<AuthenticationMethod> auth_method = std::nullopt)
 {
   u32 success_count = 0;
   EnumerateBluetoothWiimotes(
@@ -328,14 +369,19 @@ void WiimoteScannerWindows::RemoveRememberedWiimotes()
   NOTICE_LOG_FMT(WIIMOTE, "Removed remembered Wiimotes: {}", forget_count);
 }
 
-WiimoteScannerWindows::WiimoteScannerWindows() = default;
+WiimoteScannerWindows::WiimoteScannerWindows()
+{
+  m_device_change_notification.Register([this](Common::DeviceChangeNotification::EventType) {
+    m_devices_changed.store(true, std::memory_order_release);
+  });
+}
 
 void WiimoteScannerWindows::Update()
 {
 }
 
 // See http://wiibrew.org/wiki/Wiimote for the Report IDs and its sizes
-size_t GetReportSize(u8 rid)
+static size_t GetReportSize(u8 rid)
 {
   using namespace WiimoteCommon;
 
@@ -576,41 +622,40 @@ int WiimoteWindows::IOWrite(const u8* buf, size_t len)
   return write_result;
 }
 
-auto WiimoteScannerWindows::FindWiimoteHIDDevices() -> FindResults
+static std::vector<WiimoteScannerWindows::EnumeratedWiimoteInterface> GetAllWiimoteHIDInterfaces()
 {
-  FindResults results;
+  std::vector<WiimoteScannerWindows::EnumeratedWiimoteInterface> results;
 
   // Enumerate connected HID interfaces IDs.
   auto class_guid = GUID_DEVINTERFACE_HID;
   constexpr ULONG flags = CM_GET_DEVICE_INTERFACE_LIST_PRESENT;
-  ULONG list_size = 0;
-  CM_Get_Device_Interface_List_Size(&list_size, &class_guid, nullptr, flags);
-
-  const auto buffer = std::make_unique_for_overwrite<WCHAR[]>(list_size);
-  const auto list_result =
-      CM_Get_Device_Interface_List(&class_guid, nullptr, buffer.get(), list_size, flags);
-  if (list_result != CR_SUCCESS)
-  {
-    ERROR_LOG_FMT(WIIMOTE, "CM_Get_Device_Interface_List: {}", list_result);
-    return results;
-  }
 
-  for (const WCHAR* hid_iface = buffer.get(); *hid_iface != L'\0';
-       hid_iface += wcslen(hid_iface) + 1)
+  for (auto* hid_iface : Common::GetDeviceInterfaceList(&class_guid, nullptr, flags))
   {
-    // TODO: WiimoteWindows::GetId() does a redundant conversion.
-    const auto hid_iface_utf8 = WStringToUTF8(hid_iface);
-    DEBUG_LOG_FMT(WIIMOTE, "Found HID interface: {}", hid_iface_utf8);
-
-    // Are we already using this device?
-    if (!IsNewWiimote(hid_iface_utf8))
-      continue;
-
-    // When connected via Bluetooth, this has a proper name like "Nintendo RVL-CNT-01".
-    const auto parent_description = GetParentDeviceDescription(hid_iface);
-
-    if (parent_description.has_value())
-      DEBUG_LOG_FMT(WIIMOTE, "HID description: {}", *parent_description);
+    DEBUG_LOG_FMT(WIIMOTE, "Found HID interface.");
+
+    const auto parent_inst = GetInst(hid_iface).and_then(GetParentInst);
+
+    // This provides a proper name like "Nintendo RVL-CNT-01" or "Nintendo RVL-WBC-01".
+    const auto bluetooth_name = parent_inst.and_then(GetBluetoothName);
+    DEBUG_LOG_FMT(WIIMOTE, " BluetoothName: {}", bluetooth_name.value_or("<error>"));
+
+    // For some reason, a Balance Board `BusReportedDeviceDesc` is "Nintendo RVL-CNT-01".
+    const auto device_description =
+        parent_inst
+#ifdef __MINGW32__
+              .and_then([&](auto&& devnode) {
+                return Common::GetDevNodeStringProperty(
+                    std::forward<decltype(devnode)>(devnode),
+                    &DEVPKEY_Device_BusReportedDeviceDesc
+                );
+            })
+#else
+            .and_then(std::bind_back(Common::GetDevNodeStringProperty,
+                                     &DEVPKEY_Device_BusReportedDeviceDesc))
+#endif
+            .transform(WStringToUTF8);
+    DEBUG_LOG_FMT(WIIMOTE, " BusReportedDeviceDesc: {}", device_description.value_or("<error>"));
 
     // Mayflash has confirmed in email that every revision of the DolphinBar
     //  advertises this descriptor and a VID:PID of 057e:0306.
@@ -627,23 +672,25 @@ auto WiimoteScannerWindows::FindWiimoteHIDDevices() -> FindResults
     std::optional<bool> is_balance_board;
 
     bool is_relevant_description = false;
-    if (parent_description.has_value())
+    if (bluetooth_name.has_value())
     {
-      if (IsBalanceBoardName(*parent_description))
-      {
-        is_relevant_description = true;
-        is_balance_board = true;
-      }
-      else if (IsWiimoteName(*parent_description))
+      if (IsWiimoteName(*bluetooth_name))
       {
         is_relevant_description = true;
         is_balance_board = false;
       }
-      else if (*parent_description == dolphinbar_device_description)
+      else if (IsBalanceBoardName(*bluetooth_name))
       {
         is_relevant_description = true;
+        is_balance_board = true;
       }
     }
+    else if (device_description.has_value() &&
+             (*device_description == dolphinbar_device_description ||
+              IsValidDeviceName(*device_description)))
+    {
+      is_relevant_description = true;
+    }
 
     // Whelp, if the description didn't match, let's check the VID/PID ?
     // This is potentially unnecessary. Checking the description should be enough.
@@ -662,6 +709,27 @@ auto WiimoteScannerWindows::FindWiimoteHIDDevices() -> FindResults
     }
 
     // Once here, we are confident that this is a Wii device.
+    results.push_back({hid_iface, is_balance_board});
+  }
+
+  return results;
+}
+
+auto WiimoteScannerWindows::FindWiimoteHIDDevices() -> FindResults
+{
+  if (m_devices_changed.exchange(false, std::memory_order_acquire))
+  {
+    m_wiimote_hid_interfaces = GetAllWiimoteHIDInterfaces();
+    INFO_LOG_FMT(WIIMOTE, "Found {} HID interface(s).", m_wiimote_hid_interfaces.size());
+  }
+
+  FindResults results;
+
+  for (auto& [hid_iface, is_balance_board] : m_wiimote_hid_interfaces)
+  {
+    // Are we already using this device?
+    if (!IsNewWiimote(WStringToUTF8(hid_iface)))
+      continue;
 
     DEBUG_LOG_FMT(WIIMOTE, "Creating WiimoteWindows");
 
diff --git a/Source/Core/Core/HW/WiimoteReal/IOWin.h b/Source/Core/Core/HW/WiimoteReal/IOWin.h
index b8bc29a86fe8..aa7b4262887f 100644
--- a/Source/Core/Core/HW/WiimoteReal/IOWin.h
+++ b/Source/Core/Core/HW/WiimoteReal/IOWin.h
@@ -6,7 +6,12 @@
 #ifdef _WIN32
 #include <windows.h>
 
+#include <atomic>
+#include <vector>
+
 #include "Common/SocketContext.h"
+#include "Common/WindowsDevice.h"
+
 #include "Core/HW/WiimoteReal/WiimoteReal.h"
 #include "Core/USBUtils.h"
 
@@ -50,6 +55,12 @@ class WiimoteWindows final : public Wiimote
 class WiimoteScannerWindows final : public WiimoteScannerBackend
 {
 public:
+  struct EnumeratedWiimoteInterface
+  {
+    std::wstring hid_iface;
+    std::optional<bool> is_balance_board;
+  };
+
   WiimoteScannerWindows();
   bool IsReady() const override;
 
@@ -64,6 +75,12 @@ class WiimoteScannerWindows final : public WiimoteScannerBackend
 
 private:
   FindResults FindWiimoteHIDDevices();
+
+  // This vector is updated after we receive a device change notification.
+  std::vector<EnumeratedWiimoteInterface> m_wiimote_hid_interfaces;
+  std::atomic_bool m_devices_changed{true};
+
+  Common::DeviceChangeNotification m_device_change_notification;
 };
 }  // namespace WiimoteReal
 
diff --git a/Source/Core/Core/HW/WiimoteReal/IOhidapi.cpp b/Source/Core/Core/HW/WiimoteReal/IOhidapi.cpp
index 4f38c4a94993..9f4bb4c251f1 100644
--- a/Source/Core/Core/HW/WiimoteReal/IOhidapi.cpp
+++ b/Source/Core/Core/HW/WiimoteReal/IOhidapi.cpp
@@ -182,7 +182,8 @@ int WiimoteHidapi::IORead(u8* buf)
 {
   int timeout = 200;  // ms
   int result = hid_read_timeout(m_handle, buf + 1, MAX_PAYLOAD - 1, timeout);
-  // TODO: If and once we use hidapi across plaforms, change our internal API to clean up this mess.
+  // TODO: If and once we use hidapi across platforms, change our internal API to clean up this
+  // mess.
   if (result == -1)
   {
     ERROR_LOG_FMT(WIIMOTE, "Failed to read from {}.", m_device_path);
diff --git a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp
index 603ad9ed0fe9..639e467bd6b1 100644
--- a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp
+++ b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp
@@ -1052,7 +1052,13 @@ void HandleWiimoteSourceChange(unsigned int index)
 
   {
     const Core::CPUThreadGuard guard(Core::System::GetInstance());
-    if (auto removed_wiimote = std::move(g_wiimotes[index]))
+    auto removed_wiimote = std::move(g_wiimotes[index]);
+
+    // The Wiimote pool isn't currently designed to handle Balance Boards.
+    // Refactoring will be needed to differentiate between remotes/boards.
+    const bool is_balance_board = index == WIIMOTE_BALANCE_BOARD;
+
+    if (removed_wiimote != nullptr && !is_balance_board)
       AddWiimoteToPool(std::move(removed_wiimote));
   }
   g_controller_interface.PlatformPopulateDevices([] { ProcessWiimotePool(); });
diff --git a/Source/Core/Core/Host.h b/Source/Core/Core/Host.h
index a05508bae2c9..2c19e99f4c9d 100644
--- a/Source/Core/Core/Host.h
+++ b/Source/Core/Core/Host.h
@@ -43,8 +43,6 @@ enum class HostMessageID
 {
   // Begin at 10 in case there is already messages with wParam = 0, 1, 2 and so on
   WMUserStop = 10,
-  WMUserCreate,
-  WMUserSetCursor,
   WMUserJobDispatch,
 };
 
diff --git a/Source/Core/Core/HotkeyManager.cpp b/Source/Core/Core/HotkeyManager.cpp
index ea2173ed2f2a..92c6f2b831bf 100644
--- a/Source/Core/Core/HotkeyManager.cpp
+++ b/Source/Core/Core/HotkeyManager.cpp
@@ -11,16 +11,13 @@
 #include <fmt/format.h>
 #include <fmt/ranges.h>
 
+#include "Common/Assert.h"
 #include "Common/Common.h"
 #include "Common/CommonTypes.h"
-#include "Common/FileUtil.h"
-#include "Common/IniFile.h"
 
-#include "InputCommon/ControllerEmu/Control/Input.h"
 #include "InputCommon/ControllerEmu/ControlGroup/Buttons.h"
 #include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h"
 #include "InputCommon/ControllerInterface/ControllerInterface.h"
-#include "InputCommon/GCPadStatus.h"
 
 // clang-format off
 constexpr std::array<const char*, NUM_HOTKEYS> s_hotkey_labels{{
@@ -254,43 +251,6 @@ bool IsPressed(int id, bool held)
   return false;
 }
 
-// This function exists to load the old "Keys" group so pre-existing configs don't break.
-// TODO: Remove this at a future date when we're confident most configs are migrated.
-static void LoadLegacyConfig(ControllerEmu::EmulatedController* controller)
-{
-  Common::IniFile inifile;
-  if (inifile.Load(File::GetUserPath(D_CONFIG_IDX) + "Hotkeys.ini"))
-  {
-    if (!inifile.Exists("Hotkeys") && inifile.Exists("Hotkeys1"))
-    {
-      auto sec = inifile.GetOrCreateSection("Hotkeys1");
-
-      {
-        std::string defdev;
-        sec->Get("Device", &defdev, "");
-        controller->SetDefaultDevice(defdev);
-      }
-
-      for (auto& group : controller->groups)
-      {
-        for (auto& control : group->controls)
-        {
-          std::string key("Keys/" + control->name);
-
-          if (sec->Exists(key))
-          {
-            std::string expression;
-            sec->Get(key, &expression, "");
-            control->control_ref->SetExpression(std::move(expression));
-          }
-        }
-      }
-
-      controller->UpdateReferences(g_controller_interface);
-    }
-  }
-}
-
 void Initialize()
 {
   if (s_config.ControllersNeedToBeCreated())
@@ -309,7 +269,6 @@ void Initialize()
 void LoadConfig()
 {
   s_config.LoadConfig();
-  LoadLegacyConfig(s_config.GetController(0));
 }
 
 ControllerEmu::ControlGroup* GetHotkeyGroup(HotkeyGroup group)
@@ -398,17 +357,18 @@ InputConfig* HotkeyManager::GetConfig() const
 
 void HotkeyManager::GetInput(HotkeyStatus* kb, bool ignore_focus)
 {
+  std::array<u32, 32> bitmasks;
+  for (size_t key = 0; key < bitmasks.size(); key++)
+    bitmasks[key] = static_cast<u32>(1 << key);
+
   const auto lock = GetStateLock();
   for (std::size_t group = 0; group < s_groups_info.size(); group++)
   {
     if (s_groups_info[group].ignore_focus != ignore_focus)
       continue;
 
-    const int group_count = (s_groups_info[group].last - s_groups_info[group].first) + 1;
-    std::vector<u32> bitmasks(group_count);
-    for (size_t key = 0; key < bitmasks.size(); key++)
-      bitmasks[key] = static_cast<u32>(1 << key);
-
+    const size_t group_count = (s_groups_info[group].last - s_groups_info[group].first) + 1;
+    ASSERT(group_count <= bitmasks.size());
     kb->button[group] = 0;
     m_keys[group]->GetState(&kb->button[group], bitmasks.data());
   }
diff --git a/Source/Core/Core/HotkeyManager.h b/Source/Core/Core/HotkeyManager.h
index cdcc149309fa..7fb4fb77ac8b 100644
--- a/Source/Core/Core/HotkeyManager.h
+++ b/Source/Core/Core/HotkeyManager.h
@@ -12,7 +12,6 @@
 
 namespace ControllerEmu
 {
-class ControllerEmu;
 class Buttons;
 }  // namespace ControllerEmu
 
diff --git a/Source/Core/Core/IOS/Crypto/AesDevice.cpp b/Source/Core/Core/IOS/Crypto/AesDevice.cpp
index caf787982588..4d88b11a58c5 100644
--- a/Source/Core/Core/IOS/Crypto/AesDevice.cpp
+++ b/Source/Core/Core/IOS/Crypto/AesDevice.cpp
@@ -5,13 +5,10 @@
 
 #include <algorithm>
 #include <array>
-#include <iterator>
 #include <memory>
 #include <optional>
 #include <vector>
 
-#include "Common/Assert.h"
-#include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
 #include "Common/Crypto/AES.h"
 #include "Core/HW/MMIO.h"
diff --git a/Source/Core/Core/IOS/Crypto/Sha.cpp b/Source/Core/Core/IOS/Crypto/Sha.cpp
index a39927157ca8..0395be0d2dfe 100644
--- a/Source/Core/Core/IOS/Crypto/Sha.cpp
+++ b/Source/Core/Core/IOS/Crypto/Sha.cpp
@@ -6,14 +6,11 @@
 #include <algorithm>
 #include <array>
 #include <iterator>
-#include <memory>
 #include <optional>
 #include <vector>
 
 #include <mbedtls/sha1.h>
 
-#include "Common/Assert.h"
-#include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
 #include "Core/HW/MMIO.h"
 #include "Core/HW/Memmap.h"
diff --git a/Source/Core/Core/IOS/DI/DI.cpp b/Source/Core/Core/IOS/DI/DI.cpp
index 6f4ea1f8e661..4a32c443249c 100644
--- a/Source/Core/Core/IOS/DI/DI.cpp
+++ b/Source/Core/Core/IOS/DI/DI.cpp
@@ -6,7 +6,6 @@
 #include <memory>
 #include <vector>
 
-#include "Common/Assert.h"
 #include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
diff --git a/Source/Core/Core/IOS/Device.cpp b/Source/Core/Core/IOS/Device.cpp
index bf75bff1b51b..933d7a2081b1 100644
--- a/Source/Core/Core/IOS/Device.cpp
+++ b/Source/Core/Core/IOS/Device.cpp
@@ -6,7 +6,6 @@
 #include <algorithm>
 #include <map>
 
-#include "Common/Assert.h"
 #include "Common/Logging/Log.h"
 #include "Common/StringUtil.h"
 #include "Core/HW/Memmap.h"
diff --git a/Source/Core/Core/IOS/DeviceStub.h b/Source/Core/Core/IOS/DeviceStub.h
index ba065af53354..6e65e03ef91e 100644
--- a/Source/Core/Core/IOS/DeviceStub.h
+++ b/Source/Core/Core/IOS/DeviceStub.h
@@ -3,9 +3,6 @@
 
 #pragma once
 
-#include <string>
-
-#include "Common/CommonTypes.h"
 #include "Core/IOS/Device.h"
 #include "Core/IOS/IOS.h"
 
diff --git a/Source/Core/Core/IOS/DolphinDevice.cpp b/Source/Core/Core/IOS/DolphinDevice.cpp
index c240b922b72a..42e0dcad86f0 100644
--- a/Source/Core/Core/IOS/DolphinDevice.cpp
+++ b/Source/Core/Core/IOS/DolphinDevice.cpp
@@ -9,8 +9,6 @@
 #include "Common/CommonPaths.h"
 #include "Common/FileUtil.h"
 #include "Common/IOFile.h"
-#include "Common/Logging/Log.h"
-#include "Common/NandPaths.h"
 #include "Common/SettingsHandler.h"
 #include "Common/Timer.h"
 #include "Common/Version.h"
diff --git a/Source/Core/Core/IOS/ES/ES.cpp b/Source/Core/Core/IOS/ES/ES.cpp
index de13cf9bd11c..962394872ed4 100644
--- a/Source/Core/Core/IOS/ES/ES.cpp
+++ b/Source/Core/Core/IOS/ES/ES.cpp
@@ -12,7 +12,6 @@
 #include <fmt/format.h>
 
 #include "Common/ChunkFile.h"
-#include "Common/EnumUtils.h"
 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"
 #include "Common/NandPaths.h"
@@ -96,7 +95,7 @@ ESCore::ESCore(Kernel& ios) : m_ios(ios)
     if (result != FS::ResultCode::Success && result != FS::ResultCode::AlreadyExists)
     {
       ERROR_LOG_FMT(IOS_ES, "Failed to create {}: error {}", directory.path,
-                    Common::ToUnderlying(FS::ConvertResult(result)));
+                    std::to_underlying(FS::ConvertResult(result)));
     }
 
     // Now update the UID/GID and other attributes.
@@ -162,7 +161,7 @@ void ESDevice::FinishInit()
     if (launch_file)
     {
       u64 id;
-      if (launch_file->Read(&id, 1).Succeeded())
+      if (launch_file->Read(&id, 1).has_value())
         pending_launch_title_id = id;
     }
   }
@@ -256,11 +255,10 @@ IPCReply ESDevice::GetTitleId(const IOCtlVRequest& request)
   return IPCReply(IPC_SUCCESS);
 }
 
-static bool UpdateUIDAndGID(EmulationKernel& kernel, const ES::TMDReader& tmd)
+static bool UpdateUIDAndGID(EmulationKernel& kernel, ES::UIDSys* uid_sys, const ES::TMDReader& tmd)
 {
-  ES::UIDSys uid_sys{kernel.GetFSCore()};
   const u64 title_id = tmd.GetTitleId();
-  const u32 uid = uid_sys.GetOrInsertUIDForTitle(title_id);
+  const u32 uid = uid_sys->GetOrInsertUIDForTitle(title_id);
   if (uid == 0)
   {
     ERROR_LOG_FMT(IOS_ES, "Failed to get UID for title {:016x}", title_id);
@@ -271,11 +269,10 @@ static bool UpdateUIDAndGID(EmulationKernel& kernel, const ES::TMDReader& tmd)
   return true;
 }
 
-static ReturnCode CheckIsAllowedToSetUID(EmulationKernel& kernel, const u32 caller_uid,
-                                         const ES::TMDReader& active_tmd)
+static ReturnCode CheckIsAllowedToSetUID(EmulationKernel& kernel, ES::UIDSys* uid_sys,
+                                         const u32 caller_uid, const ES::TMDReader& active_tmd)
 {
-  ES::UIDSys uid_map{kernel.GetFSCore()};
-  const u32 system_menu_uid = uid_map.GetOrInsertUIDForTitle(Titles::SYSTEM_MENU);
+  const u32 system_menu_uid = uid_sys->GetOrInsertUIDForTitle(Titles::SYSTEM_MENU);
   if (!system_menu_uid)
     return ES_SHORT_READ;
 
@@ -303,24 +300,31 @@ IPCReply ESDevice::SetUID(u32 uid, const IOCtlVRequest& request)
 
   const u64 title_id = memory.Read_U64(request.in_vectors[0].address);
 
-  const s32 ret = CheckIsAllowedToSetUID(GetEmulationKernel(), uid, m_core.m_title_context.tmd);
+  auto& kernel = GetEmulationKernel();
+  ES::UIDSys uid_sys{kernel.GetFSCore()};
+  const s32 ret = CheckIsAllowedToSetUID(kernel, &uid_sys, uid, m_core.m_title_context.tmd);
   if (ret < 0)
   {
     ERROR_LOG_FMT(IOS_ES, "SetUID: Permission check failed with error {}", ret);
     return IPCReply(ret);
   }
 
-  const auto tmd = m_core.FindInstalledTMD(title_id);
+  // The IPCReply delay is calculated within FindInstalledTMD.
+  // No clue if this is close to accurate, but our default delay of 4000
+  //  isn't enough time to actually do the work and is too hard to emulate at 100% speed.
+  u64 delay_ticks = 0;
+
+  const auto tmd = m_core.FindInstalledTMD(title_id, Ticks{&delay_ticks});
   if (!tmd.IsValid())
-    return IPCReply(FS_ENOENT);
+    return IPCReply(FS_ENOENT, delay_ticks);
 
-  if (!UpdateUIDAndGID(GetEmulationKernel(), tmd))
+  if (!UpdateUIDAndGID(kernel, &uid_sys, tmd))
   {
     ERROR_LOG_FMT(IOS_ES, "SetUID: Failed to get UID for title {:016x}", title_id);
-    return IPCReply(ES_SHORT_READ);
+    return IPCReply(ES_SHORT_READ, delay_ticks);
   }
 
-  return IPCReply(IPC_SUCCESS);
+  return IPCReply(IPC_SUCCESS, delay_ticks);
 }
 
 bool ESDevice::LaunchTitle(u64 title_id, HangPPC hang_ppc)
@@ -436,8 +440,10 @@ bool ESDevice::LaunchPPCTitle(u64 title_id)
   // To keep track of the PPC title launch, a temporary launch file (LAUNCH_FILE_PATH) is used
   // to store the title ID of the title to launch and its TMD.
   // The launch file not existing means an IOS reload is required.
-  if (const auto launch_file_fd = GetEmulationKernel().GetFSCore().Open(
-          PID_KERNEL, PID_KERNEL, LAUNCH_FILE_PATH, FS::Mode::Read, {}, &ticks);
+  auto& kernel = GetEmulationKernel();
+  auto& fs_core = kernel.GetFSCore();
+  if (const auto launch_file_fd =
+          fs_core.Open(PID_KERNEL, PID_KERNEL, LAUNCH_FILE_PATH, FS::Mode::Read, {}, &ticks);
       launch_file_fd.Get() < 0)
   {
     if (WriteLaunchFile(tmd, &ticks) != IPC_SUCCESS)
@@ -456,7 +462,7 @@ bool ESDevice::LaunchPPCTitle(u64 title_id)
 
   // Otherwise, assume that the PPC title can now be launched directly.
   // Unlike IOS, we won't bother checking the title ID in the launch file. (It's not useful.)
-  GetEmulationKernel().GetFSCore().DeleteFile(PID_KERNEL, PID_KERNEL, LAUNCH_FILE_PATH, &ticks);
+  fs_core.DeleteFile(PID_KERNEL, PID_KERNEL, LAUNCH_FILE_PATH, &ticks);
   WriteSystemFile(SPACE_FILE_PATH, std::vector<u8>(SPACE_FILE_SIZE), &ticks);
 
   m_core.m_title_context.Update(tmd, ticket, DiscIO::Platform::WiiWAD);
@@ -464,7 +470,8 @@ bool ESDevice::LaunchPPCTitle(u64 title_id)
 
   // Note: the UID/GID is also updated for IOS titles, but since we have no guarantee IOS titles
   // are installed, we can only do this for PPC titles.
-  if (!UpdateUIDAndGID(GetEmulationKernel(), m_core.m_title_context.tmd))
+  ES::UIDSys uid_sys{fs_core};
+  if (!UpdateUIDAndGID(kernel, &uid_sys, m_core.m_title_context.tmd))
   {
     m_core.m_title_context.Clear();
     INFO_LOG_FMT(IOS_ES, "LaunchPPCTitle: Title context changed: (none)");
@@ -804,7 +811,7 @@ static ReturnCode WriteTmdForDiVerify(FS::FileSystem* fs, const ES::TMDReader& t
   {
     const auto file = fs->CreateAndOpenFile(PID_KERNEL, PID_KERNEL, temp_path, internal_modes);
     if (!file)
-      return FS::ConvertResult(file.Error());
+      return FS::ConvertResult(file.error());
     if (!file->Write(tmd.GetBytes().data(), tmd.GetBytes().size()))
       return ES_EIO;
   }
@@ -837,7 +844,8 @@ ReturnCode ESDevice::DIVerify(const ES::TMDReader& tmd, const ES::TicketReader&
   // XXX: We are supposed to verify the TMD and ticket here, but cannot because
   // this may cause issues with custom/patched games.
 
-  const auto fs = GetEmulationKernel().GetFS();
+  auto& kernel = GetEmulationKernel();
+  const auto fs = kernel.GetFS();
   if (!m_core.FindInstalledTMD(tmd.GetTitleId()).IsValid())
   {
     if (const ReturnCode ret = WriteTmdForDiVerify(fs.get(), tmd))
@@ -847,7 +855,8 @@ ReturnCode ESDevice::DIVerify(const ES::TMDReader& tmd, const ES::TicketReader&
     }
   }
 
-  if (!UpdateUIDAndGID(GetEmulationKernel(), m_core.m_title_context.tmd))
+  ES::UIDSys uid_sys{kernel.GetFSCore()};
+  if (!UpdateUIDAndGID(kernel, &uid_sys, m_core.m_title_context.tmd))
   {
     return ES_SHORT_READ;
   }
@@ -856,8 +865,8 @@ ReturnCode ESDevice::DIVerify(const ES::TMDReader& tmd, const ES::TicketReader&
   // Might already exist, so we only need to check whether the second operation succeeded.
   constexpr FS::Modes data_dir_modes{FS::Mode::ReadWrite, FS::Mode::None, FS::Mode::None};
   fs->CreateDirectory(PID_KERNEL, PID_KERNEL, data_dir, 0, data_dir_modes);
-  return FS::ConvertResult(fs->SetMetadata(0, data_dir, GetEmulationKernel().GetUidForPPC(),
-                                           GetEmulationKernel().GetGidForPPC(), 0, data_dir_modes));
+  return FS::ConvertResult(fs->SetMetadata(0, data_dir, kernel.GetUidForPPC(),
+                                           kernel.GetGidForPPC(), 0, data_dir_modes));
 }
 
 ReturnCode ESCore::CheckStreamKeyPermissions(const u32 uid, const u8* ticket_view,
@@ -1030,7 +1039,7 @@ ReturnCode ESCore::ReadCertStore(std::vector<u8>* buffer) const
   const auto store_file =
       m_ios.GetFS()->OpenFile(PID_KERNEL, PID_KERNEL, CERT_STORE_PATH, FS::Mode::Read);
   if (!store_file)
-    return FS::ConvertResult(store_file.Error());
+    return FS::ConvertResult(store_file.error());
 
   buffer->resize(store_file->GetStatus()->size);
   if (!store_file->Read(buffer->data(), buffer->size()))
@@ -1106,7 +1115,7 @@ ReturnCode ESCore::VerifyContainer(VerifyContainerType type, VerifyMode mode,
   if (ret != IPC_SUCCESS)
   {
     ERROR_LOG_FMT(IOS_ES, "VerifyContainer: IOSC_ImportCertificate(ca) failed with error {}",
-                  Common::ToUnderlying(ret));
+                  std::to_underlying(ret));
     return ret;
   }
 
@@ -1122,7 +1131,7 @@ ReturnCode ESCore::VerifyContainer(VerifyContainerType type, VerifyMode mode,
   if (ret != IPC_SUCCESS)
   {
     ERROR_LOG_FMT(IOS_ES, "VerifyContainer: IOSC_ImportCertificate(issuer) failed with error {}",
-                  Common::ToUnderlying(ret));
+                  std::to_underlying(ret));
     return ret;
   }
 
@@ -1132,7 +1141,7 @@ ReturnCode ESCore::VerifyContainer(VerifyContainerType type, VerifyMode mode,
   if (ret != IPC_SUCCESS)
   {
     ERROR_LOG_FMT(IOS_ES, "VerifyContainer: IOSC_VerifyPublicKeySign failed with error {}",
-                  Common::ToUnderlying(ret));
+                  std::to_underlying(ret));
     return ret;
   }
 
@@ -1142,13 +1151,13 @@ ReturnCode ESCore::VerifyContainer(VerifyContainerType type, VerifyMode mode,
     if (ret != IPC_SUCCESS)
     {
       ERROR_LOG_FMT(IOS_ES, "VerifyContainer: Writing the issuer cert failed with return code {}",
-                    Common::ToUnderlying(ret));
+                    std::to_underlying(ret));
     }
 
     ret = WriteNewCertToStore(ca_cert);
     if (ret != IPC_SUCCESS)
       ERROR_LOG_FMT(IOS_ES, "VerifyContainer: Writing the CA cert failed with return code {}",
-                    Common::ToUnderlying(ret));
+                    std::to_underlying(ret));
   }
 
   if (ret == IPC_SUCCESS && issuer_handle_out)
diff --git a/Source/Core/Core/IOS/ES/Formats.cpp b/Source/Core/Core/IOS/ES/Formats.cpp
index 29f68adcf692..93d4e6606e36 100644
--- a/Source/Core/Core/IOS/ES/Formats.cpp
+++ b/Source/Core/Core/IOS/ES/Formats.cpp
@@ -21,7 +21,6 @@
 #include "Common/CommonTypes.h"
 #include "Common/Crypto/SHA1.h"
 #include "Common/Logging/Log.h"
-#include "Common/NandPaths.h"
 #include "Common/Projection.h"
 #include "Common/StringUtil.h"
 #include "Common/Swap.h"
diff --git a/Source/Core/Core/IOS/ES/Identity.cpp b/Source/Core/Core/IOS/ES/Identity.cpp
index 454e912f5a89..6bfb8082f320 100644
--- a/Source/Core/Core/IOS/ES/Identity.cpp
+++ b/Source/Core/Core/IOS/ES/Identity.cpp
@@ -3,11 +3,11 @@
 
 #include "Core/IOS/ES/ES.h"
 
+#include <utility>
 #include <vector>
 
 #include "Common/Crypto/SHA1.h"
 #include "Common/Crypto/ec.h"
-#include "Common/EnumUtils.h"
 #include "Common/Logging/Log.h"
 #include "Common/ScopeGuard.h"
 #include "Common/StringUtil.h"
@@ -165,7 +165,7 @@ ReturnCode ESCore::VerifySign(const std::vector<u8>& hash, const std::vector<u8>
   if (ret != IPC_SUCCESS)
   {
     ERROR_LOG_FMT(IOS_ES, "VerifySign: VerifyContainer(ng) failed with error {}",
-                  Common::ToUnderlying(ret));
+                  std::to_underlying(ret));
     return ret;
   }
 
@@ -173,7 +173,7 @@ ReturnCode ESCore::VerifySign(const std::vector<u8>& hash, const std::vector<u8>
   if (ret != IPC_SUCCESS)
   {
     ERROR_LOG_FMT(IOS_ES, "VerifySign: IOSC_VerifyPublicKeySign(ap) failed with error {}",
-                  Common::ToUnderlying(ret));
+                  std::to_underlying(ret));
     return ret;
   }
 
@@ -187,7 +187,7 @@ ReturnCode ESCore::VerifySign(const std::vector<u8>& hash, const std::vector<u8>
   if (ret != IPC_SUCCESS)
   {
     ERROR_LOG_FMT(IOS_ES, "VerifySign: IOSC_ImportPublicKey(ap) failed with error {}",
-                  Common::ToUnderlying(ret));
+                  std::to_underlying(ret));
     return ret;
   }
 
@@ -196,7 +196,7 @@ ReturnCode ESCore::VerifySign(const std::vector<u8>& hash, const std::vector<u8>
   if (ret != IPC_SUCCESS)
   {
     ERROR_LOG_FMT(IOS_ES, "VerifySign: IOSC_VerifyPublicKeySign(data) failed with error {}",
-                  Common::ToUnderlying(ret));
+                  std::to_underlying(ret));
     return ret;
   }
 
diff --git a/Source/Core/Core/IOS/ES/NandUtils.cpp b/Source/Core/Core/IOS/ES/NandUtils.cpp
index ad58d0806e8d..ee26f37e1459 100644
--- a/Source/Core/Core/IOS/ES/NandUtils.cpp
+++ b/Source/Core/Core/IOS/ES/NandUtils.cpp
@@ -5,8 +5,6 @@
 
 #include <algorithm>
 #include <array>
-#include <cctype>
-#include <functional>
 #include <string>
 #include <unordered_set>
 #include <vector>
@@ -17,7 +15,6 @@
 #include "Common/Crypto/SHA1.h"
 #include "Common/Logging/Log.h"
 #include "Common/NandPaths.h"
-#include "Common/ScopeGuard.h"
 #include "Common/StringUtil.h"
 #include "Core/IOS/ES/Formats.h"
 #include "Core/IOS/FS/FileSystemProxy.h"
@@ -198,7 +195,7 @@ ESCore::GetStoredContentsFromTMD(const ES::TMDReader& tmd,
 
                  // Check whether the content file exists.
                  const auto file = fs->OpenFile(PID_KERNEL, PID_KERNEL, path, FS::Mode::Read);
-                 if (!file.Succeeded())
+                 if (!file.has_value())
                    return false;
 
                  // If content hash checks are disabled, all we have to do is check for existence.
@@ -237,7 +234,7 @@ static bool DeleteDirectoriesIfEmpty(FS::FileSystem* fs, const std::string& path
   {
     const auto directory = fs->ReadDirectory(PID_KERNEL, PID_KERNEL, path.substr(0, position));
     if ((directory && directory->empty()) ||
-        (!directory && directory.Error() != FS::ResultCode::NotFound))
+        (!directory && directory.error() != FS::ResultCode::NotFound))
     {
       if (fs->Delete(PID_KERNEL, PID_KERNEL, path.substr(0, position)) != FS::ResultCode::Success)
         return false;
@@ -268,7 +265,7 @@ bool ESCore::CreateTitleDirectories(u64 title_id, u16 group_id) const
 
   const std::string data_dir = Common::GetTitleDataPath(title_id);
   const auto data_dir_contents = fs->ReadDirectory(PID_KERNEL, PID_KERNEL, data_dir);
-  if (!data_dir_contents && (data_dir_contents.Error() != FS::ResultCode::NotFound ||
+  if (!data_dir_contents && (data_dir_contents.error() != FS::ResultCode::NotFound ||
                              fs->CreateDirectory(PID_KERNEL, PID_KERNEL, data_dir, 0,
                                                  data_dir_modes) != FS::ResultCode::Success))
   {
diff --git a/Source/Core/Core/IOS/ES/TitleInformation.cpp b/Source/Core/Core/IOS/ES/TitleInformation.cpp
index 368325295bcb..4e312505f780 100644
--- a/Source/Core/Core/IOS/ES/TitleInformation.cpp
+++ b/Source/Core/Core/IOS/ES/TitleInformation.cpp
@@ -4,7 +4,6 @@
 #include "Core/IOS/ES/ES.h"
 
 #include <cstdio>
-#include <string>
 #include <vector>
 
 #include "Common/Logging/Log.h"
diff --git a/Source/Core/Core/IOS/ES/TitleManagement.cpp b/Source/Core/Core/IOS/ES/TitleManagement.cpp
index 25e4f3ad660c..eca3a43ac601 100644
--- a/Source/Core/Core/IOS/ES/TitleManagement.cpp
+++ b/Source/Core/Core/IOS/ES/TitleManagement.cpp
@@ -12,7 +12,6 @@
 
 #include "Common/Align.h"
 #include "Common/Crypto/SHA1.h"
-#include "Common/EnumUtils.h"
 #include "Common/Logging/Log.h"
 #include "Common/NandPaths.h"
 #include "Core/CommonTitles.h"
@@ -34,7 +33,7 @@ static ReturnCode WriteTicket(FS::FileSystem* fs, const ES::TicketReader& ticket
   fs->CreateFullPath(PID_KERNEL, PID_KERNEL, path, 0, ticket_modes);
   const auto file = fs->CreateAndOpenFile(PID_KERNEL, PID_KERNEL, path, ticket_modes);
   if (!file)
-    return FS::ConvertResult(file.Error());
+    return FS::ConvertResult(file.error());
 
   const std::vector<u8>& raw_ticket = ticket.GetBytes();
   return file->Write(raw_ticket.data(), raw_ticket.size()) ? IPC_SUCCESS : ES_EIO;
@@ -73,7 +72,7 @@ ReturnCode ESCore::ImportTicket(const std::vector<u8>& ticket_bytes,
     if (ret < 0)
     {
       ERROR_LOG_FMT(IOS_ES, "ImportTicket: Failed to unpersonalise ticket for {:016x} ({})",
-                    ticket.GetTitleId(), Common::ToUnderlying(ret));
+                    ticket.GetTitleId(), std::to_underlying(ret));
       return ret;
     }
   }
@@ -163,7 +162,7 @@ ReturnCode ESCore::ImportTmd(Context& context, const std::vector<u8>& tmd_bytes,
   if (ret != IPC_SUCCESS)
   {
     ERROR_LOG_FMT(IOS_ES, "ImportTmd: VerifyContainer failed with error {}",
-                  Common::ToUnderlying(ret));
+                  std::to_underlying(ret));
     return ret;
   }
 
@@ -177,8 +176,7 @@ ReturnCode ESCore::ImportTmd(Context& context, const std::vector<u8>& tmd_bytes,
                       &context.title_import_export.key_handle);
   if (ret != IPC_SUCCESS)
   {
-    ERROR_LOG_FMT(IOS_ES, "ImportTmd: InitBackupKey failed with error {}",
-                  Common::ToUnderlying(ret));
+    ERROR_LOG_FMT(IOS_ES, "ImportTmd: InitBackupKey failed with error {}", std::to_underlying(ret));
     return ret;
   }
 
@@ -474,7 +472,7 @@ static bool HasAllRequiredContents(Kernel& ios, const ES::TMDReader& tmd)
     // Note: the import hasn't been finalised yet, so the whole title directory
     // is still in /import, not /title.
     const std::string path = GetImportContentPath(title_id, content.id);
-    return ios.GetFS()->GetMetadata(PID_KERNEL, PID_KERNEL, path).Succeeded();
+    return ios.GetFS()->GetMetadata(PID_KERNEL, PID_KERNEL, path).has_value();
   });
 }
 
@@ -642,7 +640,7 @@ ReturnCode ESCore::DeleteTitleContent(u64 title_id) const
   const std::string content_dir = Common::GetTitleContentPath(title_id);
   const auto files = m_ios.GetFS()->ReadDirectory(PID_KERNEL, PID_KERNEL, content_dir);
   if (!files)
-    return FS::ConvertResult(files.Error());
+    return FS::ConvertResult(files.error());
 
   for (const std::string& file_name : *files)
   {
diff --git a/Source/Core/Core/IOS/ES/Views.cpp b/Source/Core/Core/IOS/ES/Views.cpp
index 988e19d86c9f..bcb2be8634a1 100644
--- a/Source/Core/Core/IOS/ES/Views.cpp
+++ b/Source/Core/Core/IOS/ES/Views.cpp
@@ -9,7 +9,6 @@
 #include <vector>
 
 #include "Common/Logging/Log.h"
-#include "Common/NandPaths.h"
 #include "Core/CommonTitles.h"
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
diff --git a/Source/Core/Core/IOS/FS/FileSystem.h b/Source/Core/Core/IOS/FS/FileSystem.h
index 8a8201a83d33..3e85b4b6f077 100644
--- a/Source/Core/Core/IOS/FS/FileSystem.h
+++ b/Source/Core/Core/IOS/FS/FileSystem.h
@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include <expected>
 #include <memory>
 #include <optional>
 #include <string>
@@ -15,7 +16,6 @@
 #endif
 
 #include "Common/CommonTypes.h"
-#include "Common/Result.h"
 
 class PointerWrap;
 
@@ -49,7 +49,7 @@ enum class ResultCode
 };
 
 template <typename T>
-using Result = Common::Result<ResultCode, T>;
+using Result = std::expected<T, ResultCode>;
 
 using Uid = u32;
 using Gid = u16;
@@ -289,9 +289,9 @@ Result<size_t> FileHandle::Read(T* ptr, size_t count) const
   const Result<u32> bytes = m_fs->ReadBytesFromFile(*m_fd, reinterpret_cast<u8*>(ptr),
                                                     static_cast<u32>(sizeof(T) * count));
   if (!bytes)
-    return bytes.Error();
+    return bytes;
   if (*bytes != sizeof(T) * count)
-    return ResultCode::ShortRead;
+    return std::unexpected{ResultCode::ShortRead};
   return count;
 }
 
@@ -301,7 +301,7 @@ Result<size_t> FileHandle::Write(const T* ptr, size_t count) const
   const auto result = m_fs->WriteBytesToFile(*m_fd, reinterpret_cast<const u8*>(ptr),
                                              static_cast<u32>(sizeof(T) * count));
   if (!result)
-    return result.Error();
+    return result;
   return count;
 }
 
diff --git a/Source/Core/Core/IOS/FS/FileSystemCommon.cpp b/Source/Core/Core/IOS/FS/FileSystemCommon.cpp
index 077e5c6d28e2..471f7cd82831 100644
--- a/Source/Core/Core/IOS/FS/FileSystemCommon.cpp
+++ b/Source/Core/Core/IOS/FS/FileSystemCommon.cpp
@@ -4,6 +4,7 @@
 #include "Core/IOS/FS/FileSystem.h"
 
 #include <algorithm>
+#include <expected>
 
 #include "Common/Assert.h"
 #include "Common/FileUtil.h"
@@ -100,7 +101,7 @@ Result<FileHandle> FileSystem::CreateAndOpenFile(Uid uid, Gid gid, const std::st
 
   const ResultCode result = CreateFile(uid, gid, path, 0, modes);
   if (result != ResultCode::Success)
-    return result;
+    return std::unexpected{result};
 
   return OpenFile(uid, gid, path, Mode::ReadWrite);
 }
@@ -117,8 +118,8 @@ ResultCode FileSystem::CreateFullPath(Uid uid, Gid gid, const std::string& path,
 
     const std::string subpath = path.substr(0, position);
     const Result<Metadata> metadata = GetMetadata(uid, gid, subpath);
-    if (!metadata && metadata.Error() != ResultCode::NotFound)
-      return metadata.Error();
+    if (!metadata && metadata.error() != ResultCode::NotFound)
+      return metadata.error();
     if (metadata && metadata->is_file)
       return ResultCode::Invalid;
 
diff --git a/Source/Core/Core/IOS/FS/FileSystemProxy.cpp b/Source/Core/Core/IOS/FS/FileSystemProxy.cpp
index f2cb61e1992e..7b37ceb40bb6 100644
--- a/Source/Core/Core/IOS/FS/FileSystemProxy.cpp
+++ b/Source/Core/Core/IOS/FS/FileSystemProxy.cpp
@@ -5,13 +5,13 @@
 
 #include <algorithm>
 #include <cstring>
+#include <expected>
 #include <string_view>
+#include <utility>
 
 #include <fmt/format.h>
 
 #include "Common/ChunkFile.h"
-#include "Common/EnumUtils.h"
-#include "Common/StringUtil.h"
 #include "Common/Swap.h"
 #include "Core/HW/Memmap.h"
 #include "Core/HW/SystemTimers.h"
@@ -120,13 +120,13 @@ static void LogResult(ResultCode code, fmt::format_string<Args...> format, Args&
       code == ResultCode::Success ? Common::Log::LogLevel::LINFO : Common::Log::LogLevel::LERROR;
 
   GENERIC_LOG_FMT(Common::Log::LogType::IOS_FS, type, "Command: {}: Result {}", command,
-                  Common::ToUnderlying(ConvertResult(code)));
+                  std::to_underlying(ConvertResult(code)));
 }
 
 template <typename T, typename... Args>
 static void LogResult(const Result<T>& result, fmt::format_string<Args...> format, Args&&... args)
 {
-  const auto result_code = result.Succeeded() ? ResultCode::Success : result.Error();
+  const auto result_code = result.has_value() ? ResultCode::Success : result.error();
   LogResult(result_code, format, std::forward<Args>(args)...);
 }
 
@@ -202,7 +202,7 @@ FSCore::ScopedFd FSCore::Open(FS::Uid uid, FS::Gid gid, const std::string& path,
   auto backend_fd = m_ios.GetFS()->OpenFile(uid, gid, path, mode);
   LogResult(backend_fd, "OpenFile({})", path);
   if (!backend_fd)
-    return {this, ConvertResult(backend_fd.Error()), ticks};
+    return {this, ConvertResult(backend_fd.error()), ticks};
 
   auto& handle = m_fd_map[fd] = {gid, uid, backend_fd->Release()};
   std::strncpy(handle.name.data(), path.c_str(), handle.name.size());
@@ -347,7 +347,7 @@ s32 FSCore::Read(u64 fd, u8* data, u32 size, std::optional<u32> ipc_buffer_addr,
     LogResult(result, "Read({}, 0x{:08x}, {})", handle.name.data(), *ipc_buffer_addr, size);
 
   if (!result)
-    return ConvertResult(result.Error());
+    return ConvertResult(result.error());
 
   return *result;
 }
@@ -378,7 +378,7 @@ s32 FSCore::Write(u64 fd, const u8* data, u32 size, std::optional<u32> ipc_buffe
     LogResult(result, "Write({}, 0x{:08x}, {})", handle.name.data(), *ipc_buffer_addr, size);
 
   if (!result)
-    return ConvertResult(result.Error());
+    return ConvertResult(result.error());
 
   return *result;
 }
@@ -401,7 +401,7 @@ s32 FSCore::Seek(u64 fd, u32 offset, FS::SeekMode mode, Ticks ticks)
   const Result<u32> result = m_ios.GetFS()->SeekFile(handle.fs_fd, offset, mode);
   LogResult(result, "Seek({}, 0x{:08x}, {})", handle.name.data(), offset, static_cast<int>(mode));
   if (!result)
-    return ConvertResult(result.Error());
+    return ConvertResult(result.error());
   return *result;
 }
 
@@ -437,7 +437,7 @@ template <typename T>
 static Result<T> GetParams(Memory::MemoryManager& memory, const IOCtlRequest& request)
 {
   if (request.buffer_in_size < sizeof(T))
-    return ResultCode::Invalid;
+    return std::unexpected{ResultCode::Invalid};
 
   T params;
   memory.CopyFromEmu(&params, request.buffer_in, sizeof(params));
@@ -513,7 +513,7 @@ IPCReply FSDevice::GetStats(const Handle& handle, const IOCtlRequest& request)
   const Result<NandStats> stats = m_ios.GetFS()->GetNandStats();
   LogResult(stats, "GetNandStats");
   if (!stats)
-    return IPCReply(ConvertResult(stats.Error()));
+    return IPCReply(ConvertResult(stats.error()));
 
   auto& system = GetSystem();
   auto& memory = system.GetMemory();
@@ -534,7 +534,7 @@ IPCReply FSDevice::CreateDirectory(const Handle& handle, const IOCtlRequest& req
 {
   const auto params = GetParams<ISFSParams>(GetSystem().GetMemory(), request);
   if (!params)
-    return GetFSReply(ConvertResult(params.Error()));
+    return GetFSReply(ConvertResult(params.error()));
 
   const ResultCode result = m_ios.GetFS()->CreateDirectory(handle.uid, handle.gid, params->path,
                                                            params->attribute, params->modes);
@@ -579,7 +579,7 @@ IPCReply FSDevice::ReadDirectory(const Handle& handle, const IOCtlVRequest& requ
       m_ios.GetFS()->ReadDirectory(handle.uid, handle.gid, directory);
   LogResult(list, "ReadDirectory({})", directory);
   if (!list)
-    return GetFSReply(ConvertResult(list.Error()));
+    return GetFSReply(ConvertResult(list.error()));
 
   if (!file_list_address)
   {
@@ -603,7 +603,7 @@ IPCReply FSDevice::SetAttribute(const Handle& handle, const IOCtlRequest& reques
 {
   const auto params = GetParams<ISFSParams>(GetSystem().GetMemory(), request);
   if (!params)
-    return GetFSReply(ConvertResult(params.Error()));
+    return GetFSReply(ConvertResult(params.error()));
 
   const ResultCode result = m_ios.GetFS()->SetMetadata(
       handle.uid, params->path, params->uid, params->gid, params->attribute, params->modes);
@@ -624,7 +624,7 @@ IPCReply FSDevice::GetAttribute(const Handle& handle, const IOCtlRequest& reques
   const Result<Metadata> metadata = m_ios.GetFS()->GetMetadata(handle.uid, handle.gid, path);
   LogResult(metadata, "GetMetadata({})", path);
   if (!metadata)
-    return GetFSReply(ConvertResult(metadata.Error()), ticks);
+    return GetFSReply(ConvertResult(metadata.error()), ticks);
 
   // Yes, the other members aren't copied at all. Actually, IOS does not even memset
   // the struct at all, which means uninitialised bytes from the stack are returned.
@@ -703,7 +703,7 @@ IPCReply FSDevice::CreateFile(const Handle& handle, const IOCtlRequest& request)
 {
   const auto params = GetParams<ISFSParams>(GetSystem().GetMemory(), request);
   if (!params)
-    return GetFSReply(ConvertResult(params.Error()));
+    return GetFSReply(ConvertResult(params.error()));
   return MakeIPCReply([&](Ticks ticks) {
     return ConvertResult(
         m_core.CreateFile(handle.uid, handle.gid, params->path, params->attribute, params->modes));
@@ -714,7 +714,7 @@ IPCReply FSDevice::SetFileVersionControl(const Handle& handle, const IOCtlReques
 {
   const auto params = GetParams<ISFSParams>(GetSystem().GetMemory(), request);
   if (!params)
-    return GetFSReply(ConvertResult(params.Error()));
+    return GetFSReply(ConvertResult(params.error()));
 
   // FS_SetFileVersionControl(ctx->uid, params->path, params->attribute)
   ERROR_LOG_FMT(IOS_FS, "SetFileVersionControl({}, {:#x}): Stubbed", params->path,
@@ -730,7 +730,7 @@ IPCReply FSDevice::GetFileStats(const Handle& handle, const IOCtlRequest& reques
   return MakeIPCReply([&](Ticks ticks) {
     const Result<FileStatus> status = m_core.GetFileStatus(request.fd, ticks);
     if (!status)
-      return ConvertResult(status.Error());
+      return ConvertResult(status.error());
 
     auto& system = GetSystem();
     auto& memory = system.GetMemory();
@@ -748,7 +748,7 @@ FS::Result<FS::FileStatus> FSCore::GetFileStatus(u64 fd, Ticks ticks)
   ticks.Add(IPC_OVERHEAD_TICKS);
   const auto& handle = m_fd_map[fd];
   if (handle.fs_fd == INVALID_FD)
-    return ResultCode::Invalid;
+    return std::unexpected{ResultCode::Invalid};
 
   auto status = m_ios.GetFS()->GetFileStatus(handle.fs_fd);
   LogResult(status, "GetFileStatus({})", handle.name.data());
@@ -770,7 +770,7 @@ IPCReply FSDevice::GetUsage(const Handle& handle, const IOCtlVRequest& request)
   const Result<DirectoryStats> stats = m_ios.GetFS()->GetDirectoryStats(directory);
   LogResult(stats, "GetDirectoryStats({})", directory);
   if (!stats)
-    return GetFSReply(ConvertResult(stats.Error()));
+    return GetFSReply(ConvertResult(stats.error()));
 
   memory.Write_U32(stats->used_clusters, request.io_vectors[0].address);
   memory.Write_U32(stats->used_inodes, request.io_vectors[1].address);
diff --git a/Source/Core/Core/IOS/FS/HostBackend/FS.cpp b/Source/Core/Core/IOS/FS/HostBackend/FS.cpp
index 36ba4186c0c3..df4eafbd6d83 100644
--- a/Source/Core/Core/IOS/FS/HostBackend/FS.cpp
+++ b/Source/Core/Core/IOS/FS/HostBackend/FS.cpp
@@ -4,7 +4,7 @@
 #include "Core/IOS/FS/HostBackend/FS.h"
 
 #include <algorithm>
-#include <cmath>
+#include <expected>
 #include <optional>
 #include <string_view>
 #include <type_traits>
@@ -652,17 +652,17 @@ Result<std::vector<std::string>> HostFileSystem::ReadDirectory(Uid uid, Gid gid,
                                                                const std::string& path)
 {
   if (!IsValidPath(path))
-    return ResultCode::Invalid;
+    return std::unexpected{ResultCode::Invalid};
 
   const FstEntry* entry = GetFstEntryForPath(path);
   if (!entry)
-    return ResultCode::NotFound;
+    return std::unexpected{ResultCode::NotFound};
 
   if (!entry->CheckPermission(uid, gid, Mode::Read))
-    return ResultCode::AccessDenied;
+    return std::unexpected{ResultCode::AccessDenied};
 
   if (entry->data.is_file)
-    return ResultCode::Invalid;
+    return std::unexpected{ResultCode::Invalid};
 
   const std::string host_path = BuildFilename(path).host_path;
   File::FSTEntry host_entry = File::ScanDirectoryTree(host_path, false);
@@ -712,19 +712,19 @@ Result<Metadata> HostFileSystem::GetMetadata(Uid uid, Gid gid, const std::string
   else
   {
     if (!IsValidNonRootPath(path))
-      return ResultCode::Invalid;
+      return std::unexpected{ResultCode::Invalid};
 
     const auto split_path = SplitPathAndBasename(path);
     const FstEntry* parent = GetFstEntryForPath(split_path.parent);
     if (!parent)
-      return ResultCode::NotFound;
+      return std::unexpected{ResultCode::NotFound};
     if (!parent->CheckPermission(uid, gid, Mode::Read))
-      return ResultCode::AccessDenied;
+      return std::unexpected{ResultCode::AccessDenied};
     entry = GetFstEntryForPath(path);
   }
 
   if (!entry)
-    return ResultCode::NotFound;
+    return std::unexpected{ResultCode::NotFound};
 
   Metadata metadata = entry->data;
   metadata.size = File::GetSize(BuildFilename(path).host_path);
@@ -780,7 +780,7 @@ Result<NandStats> HostFileSystem::GetNandStats()
 {
   const auto root_stats = GetDirectoryStats("/");
   if (!root_stats)
-    return root_stats.Error();  // TODO: is this right? can this fail on hardware?
+    return std::unexpected{root_stats.error()};  // TODO: is this right? can this fail on hardware?
 
   NandStats stats{};
   stats.cluster_size = CLUSTER_SIZE;
@@ -798,7 +798,7 @@ Result<DirectoryStats> HostFileSystem::GetDirectoryStats(const std::string& wii_
 {
   const auto result = GetExtendedDirectoryStats(wii_path);
   if (!result)
-    return result.Error();
+    return std::unexpected{result.error()};
 
   DirectoryStats stats{};
   stats.used_inodes = static_cast<u32>(std::min<u64>(result->used_inodes, TOTAL_INODES));
@@ -810,14 +810,14 @@ Result<ExtendedDirectoryStats>
 HostFileSystem::GetExtendedDirectoryStats(const std::string& wii_path)
 {
   if (!IsValidPath(wii_path))
-    return ResultCode::Invalid;
+    return std::unexpected{ResultCode::Invalid};
 
   ExtendedDirectoryStats stats{};
   std::string path(BuildFilename(wii_path).host_path);
   File::FileInfo info(path);
   if (!info.Exists())
   {
-    return ResultCode::NotFound;
+    return std::unexpected{ResultCode::NotFound};
   }
   if (info.IsDirectory())
   {
@@ -830,7 +830,7 @@ HostFileSystem::GetExtendedDirectoryStats(const std::string& wii_path)
   }
   else
   {
-    return ResultCode::Invalid;
+    return std::unexpected{ResultCode::Invalid};
   }
   return stats;
 }
diff --git a/Source/Core/Core/IOS/FS/HostBackend/File.cpp b/Source/Core/Core/IOS/FS/HostBackend/File.cpp
index 17e42e0aec43..5ae6d3cc32da 100644
--- a/Source/Core/Core/IOS/FS/HostBackend/File.cpp
+++ b/Source/Core/Core/IOS/FS/HostBackend/File.cpp
@@ -4,6 +4,7 @@
 #include "Core/IOS/FS/HostBackend/FS.h"
 
 #include <algorithm>
+#include <expected>
 #include <memory>
 
 #include "Common/FileUtil.h"
@@ -78,26 +79,26 @@ Result<FileHandle> HostFileSystem::OpenFile(Uid, Gid, const std::string& path, M
 {
   Handle* handle = AssignFreeHandle();
   if (!handle)
-    return ResultCode::NoFreeHandle;
+    return std::unexpected{ResultCode::NoFreeHandle};
 
   const std::string host_path = BuildFilename(path).host_path;
   if (File::IsDirectory(host_path))
   {
     *handle = Handle{};
-    return ResultCode::Invalid;
+    return std::unexpected{ResultCode::Invalid};
   }
 
   if (!File::IsFile(host_path))
   {
     *handle = Handle{};
-    return ResultCode::NotFound;
+    return std::unexpected{ResultCode::NotFound};
   }
 
   handle->host_file = OpenHostFile(host_path);
   if (!handle->host_file)
   {
     *handle = Handle{};
-    return ResultCode::AccessDenied;
+    return std::unexpected{ResultCode::AccessDenied};
   }
 
   handle->wii_path = path;
@@ -122,10 +123,10 @@ Result<u32> HostFileSystem::ReadBytesFromFile(Fd fd, u8* ptr, u32 count)
 {
   Handle* handle = GetHandleFromFd(fd);
   if (!handle || !handle->host_file->IsOpen())
-    return ResultCode::Invalid;
+    return std::unexpected{ResultCode::Invalid};
 
   if ((u8(handle->mode) & u8(Mode::Read)) == 0)
-    return ResultCode::AccessDenied;
+    return std::unexpected{ResultCode::AccessDenied};
 
   const u32 file_size = static_cast<u32>(handle->host_file->GetSize());
   // IOS has this check in the read request handler.
@@ -137,7 +138,7 @@ Result<u32> HostFileSystem::ReadBytesFromFile(Fd fd, u8* ptr, u32 count)
   const u32 actually_read = static_cast<u32>(fread(ptr, 1, count, handle->host_file->GetHandle()));
 
   if (actually_read != count && ferror(handle->host_file->GetHandle()))
-    return ResultCode::AccessDenied;
+    return std::unexpected{ResultCode::AccessDenied};
 
   // IOS returns the number of bytes read and adds that value to the seek position,
   // instead of adding the *requested* read length.
@@ -149,15 +150,15 @@ Result<u32> HostFileSystem::WriteBytesToFile(Fd fd, const u8* ptr, u32 count)
 {
   Handle* handle = GetHandleFromFd(fd);
   if (!handle || !handle->host_file->IsOpen())
-    return ResultCode::Invalid;
+    return std::unexpected{ResultCode::Invalid};
 
   if ((u8(handle->mode) & u8(Mode::Write)) == 0)
-    return ResultCode::AccessDenied;
+    return std::unexpected{ResultCode::AccessDenied};
 
   // File might be opened twice, need to seek before we read
   handle->host_file->Seek(handle->file_offset, File::SeekOrigin::Begin);
   if (!handle->host_file->WriteBytes(ptr, count))
-    return ResultCode::AccessDenied;
+    return std::unexpected{ResultCode::AccessDenied};
 
   handle->file_offset += count;
   return count;
@@ -167,7 +168,7 @@ Result<u32> HostFileSystem::SeekFile(Fd fd, std::uint32_t offset, SeekMode mode)
 {
   Handle* handle = GetHandleFromFd(fd);
   if (!handle || !handle->host_file->IsOpen())
-    return ResultCode::Invalid;
+    return std::unexpected{ResultCode::Invalid};
 
   u32 new_position = 0;
   switch (mode)
@@ -182,12 +183,12 @@ Result<u32> HostFileSystem::SeekFile(Fd fd, std::uint32_t offset, SeekMode mode)
     new_position = handle->host_file->GetSize() + offset;
     break;
   default:
-    return ResultCode::Invalid;
+    return std::unexpected{ResultCode::Invalid};
   }
 
   // This differs from POSIX behaviour which allows seeking past the end of the file.
   if (handle->host_file->GetSize() < new_position)
-    return ResultCode::Invalid;
+    return std::unexpected{ResultCode::Invalid};
 
   handle->file_offset = new_position;
   return handle->file_offset;
@@ -197,7 +198,7 @@ Result<FileStatus> HostFileSystem::GetFileStatus(Fd fd)
 {
   const Handle* handle = GetHandleFromFd(fd);
   if (!handle || !handle->host_file->IsOpen())
-    return ResultCode::Invalid;
+    return std::unexpected{ResultCode::Invalid};
 
   FileStatus status;
   status.size = handle->host_file->GetSize();
diff --git a/Source/Core/Core/IOS/IOS.cpp b/Source/Core/Core/IOS/IOS.cpp
index 7449ba69bbe6..d3986775b67c 100644
--- a/Source/Core/Core/IOS/IOS.cpp
+++ b/Source/Core/Core/IOS/IOS.cpp
@@ -5,7 +5,6 @@
 
 #include <algorithm>
 #include <array>
-#include <deque>
 #include <map>
 #include <memory>
 #include <string>
@@ -14,7 +13,6 @@
 #include "Common/Assert.h"
 #include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
-#include "Common/EnumUtils.h"
 #include "Common/Logging/Log.h"
 #include "Common/Timer.h"
 
@@ -662,8 +660,8 @@ std::shared_ptr<Device> EmulationKernel::GetDeviceByFileDescriptor(const u32 fd)
 std::optional<IPCReply> EmulationKernel::OpenDevice(OpenRequest& request)
 {
   const s32 new_fd = GetFreeDeviceID();
-  INFO_LOG_FMT(IOS, "Opening {} (mode {}, fd {})", request.path,
-               Common::ToUnderlying(request.flags), new_fd);
+  INFO_LOG_FMT(IOS, "Opening {} (mode {}, fd {})", request.path, std::to_underlying(request.flags),
+               new_fd);
   if (new_fd < 0 || new_fd >= IPC_MAX_FDS)
   {
     ERROR_LOG_FMT(IOS, "Couldn't get a free fd, too many open files");
@@ -749,7 +747,7 @@ std::optional<IPCReply> EmulationKernel::HandleIPCCommand(const Request& request
     ret = device->IOCtlV(IOCtlVRequest{GetSystem(), request.address});
     break;
   default:
-    ASSERT_MSG(IOS, false, "Unexpected command: {:#x}", Common::ToUnderlying(request.command));
+    ASSERT_MSG(IOS, false, "Unexpected command: {:#x}", std::to_underlying(request.command));
     ret = IPCReply{IPC_EINVAL, 978_tbticks};
     break;
   }
diff --git a/Source/Core/Core/IOS/IOS.h b/Source/Core/Core/IOS/IOS.h
index de67d5398096..a79c1bdf5184 100644
--- a/Source/Core/Core/IOS/IOS.h
+++ b/Source/Core/Core/IOS/IOS.h
@@ -10,7 +10,6 @@
 #include <optional>
 #include <string>
 #include <string_view>
-#include <vector>
 
 #include "Common/CommonTypes.h"
 #include "Core/CoreTiming.h"
diff --git a/Source/Core/Core/IOS/MIOS.cpp b/Source/Core/Core/IOS/MIOS.cpp
index 56c27c6a7894..4cf5b60c3d0e 100644
--- a/Source/Core/Core/IOS/MIOS.cpp
+++ b/Source/Core/Core/IOS/MIOS.cpp
@@ -4,14 +4,11 @@
 #include "Core/IOS/MIOS.h"
 
 #include <cstring>
-#include <utility>
 
 #include "Common/Assert.h"
 #include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
 #include "Common/Logging/Log.h"
-#include "Common/MsgHandler.h"
-#include "Common/Swap.h"
 
 #include "Core/Config/MainSettings.h"
 #include "Core/ConfigManager.h"
diff --git a/Source/Core/Core/IOS/Network/IP/Top.cpp b/Source/Core/Core/IOS/Network/IP/Top.cpp
index 8baa81aef770..e9677d5ef9b3 100644
--- a/Source/Core/Core/IOS/Network/IP/Top.cpp
+++ b/Source/Core/Core/IOS/Network/IP/Top.cpp
@@ -7,7 +7,6 @@
 #include <array>
 #include <cstddef>
 #include <cstring>
-#include <memory>
 #include <optional>
 #include <string>
 #include <utility>
@@ -21,12 +20,10 @@
 #include <fmt/format.h>
 
 #include "Common/Assert.h"
-#include "Common/BitUtils.h"
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
 #include "Common/Network.h"
 #include "Common/ScopeGuard.h"
-#include "Common/StringUtil.h"
 
 #include "Core/Core.h"
 #include "Core/HW/Memmap.h"
@@ -49,7 +46,6 @@
 #include <netinet/in.h>
 #include <resolv.h>
 #include <sys/socket.h>
-#include <sys/types.h>
 #include <unistd.h>
 #endif
 
@@ -388,7 +384,7 @@ static std::optional<DefaultInterface> GetSystemDefaultInterface()
   const u32 prefix_length = GetNetworkPrefixLength();
   const u32 netmask = (1 << prefix_length) - 1;
   const u32 gateway = GetNetworkGateway();
-  // this isnt fully correct, but this will make calls to get the routing table at least return the
+  // this isn't fully correct, but this will make calls to get the routing table at least return the
   // gateway
   if (routing_table.empty())
     routing_table = {{0, 0, 0, gateway}};
@@ -433,7 +429,7 @@ static std::optional<DefaultInterface> GetSystemDefaultInterface()
     if (iface->ifa_addr && iface->ifa_addr->sa_family == AF_INET &&
         get_addr(iface->ifa_addr).s_addr == default_interface_address->s_addr)
     {
-      // this isnt fully correct, but this will make calls to get the routing table at least return
+      // this isn't fully correct, but this will make calls to get the routing table at least return
       // the gateway
       if (routing_table.empty())
         routing_table = {{0, {}, {}, get_addr(iface->ifa_dstaddr)}};
diff --git a/Source/Core/Core/IOS/Network/KD/Mail/WC24FriendList.h b/Source/Core/Core/IOS/Network/KD/Mail/WC24FriendList.h
index ee3fe047fcfa..99d899f8e353 100644
--- a/Source/Core/Core/IOS/Network/KD/Mail/WC24FriendList.h
+++ b/Source/Core/Core/IOS/Network/KD/Mail/WC24FriendList.h
@@ -10,8 +10,6 @@
 
 #include "Common/CommonPaths.h"
 #include "Common/CommonTypes.h"
-#include "Common/Logging/Log.h"
-#include "Common/Swap.h"
 #include "Core/IOS/Network/KD/NWC24Config.h"
 
 namespace IOS::HLE
diff --git a/Source/Core/Core/IOS/Network/KD/Mail/WC24Send.h b/Source/Core/Core/IOS/Network/KD/Mail/WC24Send.h
index d839b2b1027d..d6de3b70250d 100644
--- a/Source/Core/Core/IOS/Network/KD/Mail/WC24Send.h
+++ b/Source/Core/Core/IOS/Network/KD/Mail/WC24Send.h
@@ -12,8 +12,6 @@
 
 #include "Common/CommonPaths.h"
 #include "Common/CommonTypes.h"
-#include "Common/Logging/Log.h"
-#include "Common/Swap.h"
 #include "Core/IOS/Network/KD/Mail/MailCommon.h"
 #include "Core/IOS/Network/KD/Mail/WC24FriendList.h"
 #include "Core/IOS/Network/KD/NWC24Config.h"
diff --git a/Source/Core/Core/IOS/Network/KD/NetKDRequest.cpp b/Source/Core/Core/IOS/Network/KD/NetKDRequest.cpp
index d0d49fef9b40..97edbbcef93d 100644
--- a/Source/Core/Core/IOS/Network/KD/NetKDRequest.cpp
+++ b/Source/Core/Core/IOS/Network/KD/NetKDRequest.cpp
@@ -13,7 +13,6 @@
 #include "Common/CommonPaths.h"
 #include "Common/CommonTypes.h"
 #include "Common/Crypto/HMAC.h"
-#include "Common/FileUtil.h"
 #include "Common/Logging/Log.h"
 #include "Common/NandPaths.h"
 #include "Common/Projection.h"
diff --git a/Source/Core/Core/IOS/Network/KD/NetKDRequest.h b/Source/Core/Core/IOS/Network/KD/NetKDRequest.h
index 9ae50fa81f82..e41b554d5d8f 100644
--- a/Source/Core/Core/IOS/Network/KD/NetKDRequest.h
+++ b/Source/Core/Core/IOS/Network/KD/NetKDRequest.h
@@ -8,7 +8,6 @@
 #include <queue>
 #include <string>
 
-#include "Common/CommonPaths.h"
 #include "Common/CommonTypes.h"
 #include "Common/Event.h"
 #include "Common/HttpRequest.h"
diff --git a/Source/Core/Core/IOS/Network/KD/VFF/VFFUtil.cpp b/Source/Core/Core/IOS/Network/KD/VFF/VFFUtil.cpp
index c7ddffbc1574..702aaddae01d 100644
--- a/Source/Core/Core/IOS/Network/KD/VFF/VFFUtil.cpp
+++ b/Source/Core/Core/IOS/Network/KD/VFF/VFFUtil.cpp
@@ -4,12 +4,10 @@
 #include "Core/IOS/Network/KD/VFF/VFFUtil.h"
 
 #include <algorithm>
-#include <cmath>
 #include <limits>
+#include <utility>
 #include <vector>
 
-#include <fmt/format.h>
-
 // Does not compile if diskio.h is included first.
 // clang-format off
 #include "ff.h"
@@ -17,7 +15,6 @@
 // clang-format on
 
 #include "Common/Align.h"
-#include "Common/EnumUtils.h"
 #include "Common/FatFsUtil.h"
 #include "Common/Logging/Log.h"
 #include "Common/ScopeGuard.h"
@@ -212,7 +209,7 @@ static ErrorCode WriteFile(const std::string& filename, std::span<const u8> tmp_
     if (write_error_code != FR_OK)
     {
       ERROR_LOG_FMT(IOS_WC24, "Failed to write file {} to VFF: {}", filename,
-                    Common::ToUnderlying(write_error_code));
+                    std::to_underlying(write_error_code));
       return WC24_ERR_FILE_WRITE;
     }
 
diff --git a/Source/Core/Core/IOS/Network/MACUtils.cpp b/Source/Core/Core/IOS/Network/MACUtils.cpp
index d9db1a8c8422..2ab6445e3fc9 100644
--- a/Source/Core/Core/IOS/Network/MACUtils.cpp
+++ b/Source/Core/Core/IOS/Network/MACUtils.cpp
@@ -6,7 +6,6 @@
 #include <optional>
 #include <string>
 
-#include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
 #include "Common/Network.h"
 
diff --git a/Source/Core/Core/IOS/Network/NCD/WiiNetConfig.cpp b/Source/Core/Core/IOS/Network/NCD/WiiNetConfig.cpp
index 22ad09d01df3..ca294e6d7391 100644
--- a/Source/Core/Core/IOS/Network/NCD/WiiNetConfig.cpp
+++ b/Source/Core/Core/IOS/Network/NCD/WiiNetConfig.cpp
@@ -5,7 +5,6 @@
 
 #include <cstring>
 
-#include "Common/CommonPaths.h"
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
 #include "Core/HW/Memmap.h"
diff --git a/Source/Core/Core/IOS/Network/NCD/WiiNetConfig.h b/Source/Core/Core/IOS/Network/NCD/WiiNetConfig.h
index 20dc11430ce9..ae5245ee85b4 100644
--- a/Source/Core/Core/IOS/Network/NCD/WiiNetConfig.h
+++ b/Source/Core/Core/IOS/Network/NCD/WiiNetConfig.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <string>
 #include "Common/CommonTypes.h"
 
 namespace Memory
diff --git a/Source/Core/Core/IOS/Network/SSL.cpp b/Source/Core/Core/IOS/Network/SSL.cpp
index 36caab63057a..d3146084d79d 100644
--- a/Source/Core/Core/IOS/Network/SSL.cpp
+++ b/Source/Core/Core/IOS/Network/SSL.cpp
@@ -5,7 +5,6 @@
 
 #include <array>
 #include <cstring>
-#include <memory>
 #include <vector>
 
 #include <mbedtls/md.h>
diff --git a/Source/Core/Core/IOS/Network/Socket.cpp b/Source/Core/Core/IOS/Network/Socket.cpp
index 46ee116311f3..6baf371204e2 100644
--- a/Source/Core/Core/IOS/Network/Socket.cpp
+++ b/Source/Core/Core/IOS/Network/Socket.cpp
@@ -16,7 +16,6 @@
 #include <sys/select.h>
 #endif
 
-#include "Common/BitUtils.h"
 #include "Common/FileUtil.h"
 #include "Common/IOFile.h"
 #include "Common/Network.h"
@@ -894,11 +893,7 @@ s32 WiiSockMan::AddSocket(s32 fd, bool is_rw)
     sock.SetWiiFd(wii_fd);
     m_ios.GetSystem().GetPowerPC().GetDebugInterface().NetworkLogger()->OnNewSocket(fd);
 
-#ifdef __APPLE__
-    int opt_no_sigpipe = 1;
-    if (setsockopt(fd, SOL_SOCKET, SO_NOSIGPIPE, &opt_no_sigpipe, sizeof(opt_no_sigpipe)) < 0)
-      ERROR_LOG_FMT(IOS_NET, "Failed to set SO_NOSIGPIPE on socket");
-#endif
+    Common::SetPlatformSocketOptions(fd);
 
     // Wii UDP sockets can use broadcast address by default
     if (!is_rw)
diff --git a/Source/Core/Core/IOS/Network/Socket.h b/Source/Core/Core/IOS/Network/Socket.h
index 75a25b30dc16..64cc28ff55e1 100644
--- a/Source/Core/Core/IOS/Network/Socket.h
+++ b/Source/Core/Core/IOS/Network/Socket.h
@@ -26,33 +26,26 @@ typedef pollfd pollfd_t;
 #else
 #include <sys/fcntl.h>
 #endif
-#include <errno.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <poll.h>
-#include <string.h>
 
 typedef struct pollfd pollfd_t;
 #else
-#include <errno.h>
 #include <netinet/in.h>
 #include <sys/fcntl.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 #endif
 
-#include <algorithm>
 #include <chrono>
-#include <cstdio>
 #include <list>
 #include <optional>
-#include <string>
 #include <string_view>
 #include <unordered_map>
 #include <utility>
 
 #include "Common/CommonTypes.h"
-#include "Common/EnumUtils.h"
 #include "Common/Logging/Log.h"
 #include "Core/HW/Memmap.h"
 #include "Core/IOS/IOS.h"
@@ -291,7 +284,7 @@ class WiiSockMan
     if (socket_entry == WiiSockets.end())
     {
       ERROR_LOG_FMT(IOS_NET, "DoSock: Error, fd not found ({:08x}, {:08X}, {:08X})", sock,
-                    request.address, Common::ToUnderlying(type));
+                    request.address, std::to_underlying(type));
       EnqueueIPCReply(request, -SO_EBADF);
     }
     else
diff --git a/Source/Core/Core/IOS/SDIO/SDIOSlot0.cpp b/Source/Core/Core/IOS/SDIO/SDIOSlot0.cpp
index 6047c8808811..fc61db694ce1 100644
--- a/Source/Core/Core/IOS/SDIO/SDIOSlot0.cpp
+++ b/Source/Core/Core/IOS/SDIO/SDIOSlot0.cpp
@@ -4,7 +4,6 @@
 #include "Core/IOS/SDIO/SDIOSlot0.h"
 
 #include <cstdio>
-#include <cstring>
 #include <memory>
 #include <vector>
 
@@ -17,7 +16,6 @@
 
 #include "Core/CPUThreadConfigCallback.h"
 #include "Core/Config/MainSettings.h"
-#include "Core/Config/SessionSettings.h"
 #include "Core/Core.h"
 #include "Core/HW/Memmap.h"
 #include "Core/IOS/IOS.h"
diff --git a/Source/Core/Core/IOS/STM/STM.h b/Source/Core/Core/IOS/STM/STM.h
index f249c66d95fd..a0daad9b8668 100644
--- a/Source/Core/Core/IOS/STM/STM.h
+++ b/Source/Core/Core/IOS/STM/STM.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#include <string>
-
 #include "Common/CommonTypes.h"
 #include "Core/IOS/Device.h"
 #include "Core/IOS/IOS.h"
diff --git a/Source/Core/Core/IOS/USB/Bluetooth/BTBase.cpp b/Source/Core/Core/IOS/USB/Bluetooth/BTBase.cpp
index 79cfe6a4b7e4..51151b739a71 100644
--- a/Source/Core/Core/IOS/USB/Bluetooth/BTBase.cpp
+++ b/Source/Core/Core/IOS/USB/Bluetooth/BTBase.cpp
@@ -3,7 +3,6 @@
 
 #include "Core/IOS/USB/Bluetooth/BTBase.h"
 
-#include <memory>
 #include <string>
 #include <vector>
 
diff --git a/Source/Core/Core/IOS/USB/Bluetooth/LibUSBBluetoothAdapter.cpp b/Source/Core/Core/IOS/USB/Bluetooth/LibUSBBluetoothAdapter.cpp
index 5c0d1477924d..cb8bd3e38e1e 100644
--- a/Source/Core/Core/IOS/USB/Bluetooth/LibUSBBluetoothAdapter.cpp
+++ b/Source/Core/Core/IOS/USB/Bluetooth/LibUSBBluetoothAdapter.cpp
@@ -11,7 +11,6 @@
 #include <thread>
 #include <utility>
 
-#include <fmt/format.h>
 #include <libusb.h>
 
 #include "Common/BitUtils.h"
diff --git a/Source/Core/Core/IOS/USB/Bluetooth/RealtekFirmwareLoader.cpp b/Source/Core/Core/IOS/USB/Bluetooth/RealtekFirmwareLoader.cpp
index 255cef65ee1b..30bcad24d99e 100644
--- a/Source/Core/Core/IOS/USB/Bluetooth/RealtekFirmwareLoader.cpp
+++ b/Source/Core/Core/IOS/USB/Bluetooth/RealtekFirmwareLoader.cpp
@@ -10,8 +10,6 @@
 
 #include <algorithm>
 
-#include <fmt/format.h>
-
 #include "Common/BitUtils.h"
 #include "Common/FileUtil.h"
 #include "Common/HttpRequest.h"
diff --git a/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp b/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp
index 481d3e449876..4c522e370f85 100644
--- a/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp
+++ b/Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp
@@ -4,9 +4,7 @@
 #include "Core/IOS/USB/Bluetooth/WiimoteDevice.h"
 
 #include <cstring>
-#include <memory>
 #include <utility>
-#include <vector>
 
 #include <fmt/format.h>
 
@@ -15,7 +13,6 @@
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"
-#include "Common/StringUtil.h"
 #include "Common/Swap.h"
 #include "Core/Core.h"
 #include "Core/HW/WII_IPC.h"
diff --git a/Source/Core/Core/IOS/USB/Common.h b/Source/Core/Core/IOS/USB/Common.h
index a26d204fa584..a558c4fbe108 100644
--- a/Source/Core/Core/IOS/USB/Common.h
+++ b/Source/Core/Core/IOS/USB/Common.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #include <cstddef>
-#include <functional>
 #include <memory>
 #include <string>
 #include <vector>
@@ -174,7 +173,7 @@ class Device
   virtual DeviceDescriptor GetDeviceDescriptor() const = 0;
   virtual std::vector<ConfigDescriptor> GetConfigurations() const = 0;
   virtual std::vector<InterfaceDescriptor> GetInterfaces(u8 config) const = 0;
-  virtual std::vector<EndpointDescriptor> GetEndpoints(u8 config, u8 interface, u8 alt) const = 0;
+  virtual std::vector<EndpointDescriptor> GetEndpoints(u8 config, u8 iface, u8 alt) const = 0;
 
   virtual std::string GetErrorName(int error_code) const;
   /// Ensure the device is ready to use.
@@ -183,10 +182,10 @@ class Device
   ///
   /// This may reset the active alt setting, so prefer using Attach when interface changes
   /// are unnecessary (e.g. for control requests).
-  virtual bool AttachAndChangeInterface(u8 interface) = 0;
+  virtual bool AttachAndChangeInterface(u8 iface) = 0;
   virtual int CancelTransfer(u8 endpoint) = 0;
-  virtual int ChangeInterface(u8 interface) = 0;
-  virtual int GetNumberOfAltSettings(u8 interface) = 0;
+  virtual int ChangeInterface(u8 iface) = 0;
+  virtual int GetNumberOfAltSettings(u8 iface) = 0;
   virtual int SetAltSetting(u8 alt_setting) = 0;
   virtual int SubmitTransfer(std::unique_ptr<CtrlMessage> message) = 0;
   virtual int SubmitTransfer(std::unique_ptr<BulkMessage> message) = 0;
diff --git a/Source/Core/Core/IOS/USB/Emulated/Infinity.cpp b/Source/Core/Core/IOS/USB/Emulated/Infinity.cpp
index fcfa20374289..442c0ef59df7 100644
--- a/Source/Core/Core/IOS/USB/Emulated/Infinity.cpp
+++ b/Source/Core/Core/IOS/USB/Emulated/Infinity.cpp
@@ -5,7 +5,6 @@
 
 #include <array>
 #include <bit>
-#include <map>
 #include <mutex>
 #include <span>
 #include <vector>
@@ -15,7 +14,6 @@
 #include "Common/Logging/Log.h"
 #include "Common/Random.h"
 #include "Common/StringUtil.h"
-#include "Common/Timer.h"
 #include "Core/Core.h"
 #include "Core/HW/Memmap.h"
 #include "Core/System.h"
@@ -168,7 +166,7 @@ std::vector<InterfaceDescriptor> InfinityUSB::GetInterfaces(u8 config) const
   return m_interface_descriptor;
 }
 
-std::vector<EndpointDescriptor> InfinityUSB::GetEndpoints(u8 config, u8 interface, u8 alt) const
+std::vector<EndpointDescriptor> InfinityUSB::GetEndpoints(u8 config, u8 iface, u8 alt) const
 {
   return m_endpoint_descriptor;
 }
@@ -184,13 +182,13 @@ bool InfinityUSB::Attach()
   return true;
 }
 
-bool InfinityUSB::AttachAndChangeInterface(const u8 interface)
+bool InfinityUSB::AttachAndChangeInterface(const u8 iface)
 {
   if (!Attach())
     return false;
 
-  if (interface != m_active_interface)
-    return ChangeInterface(interface) == 0;
+  if (iface != m_active_interface)
+    return ChangeInterface(iface) == 0;
 
   return true;
 }
@@ -203,15 +201,15 @@ int InfinityUSB::CancelTransfer(const u8 endpoint)
   return IPC_SUCCESS;
 }
 
-int InfinityUSB::ChangeInterface(const u8 interface)
+int InfinityUSB::ChangeInterface(const u8 iface)
 {
   DEBUG_LOG_FMT(IOS_USB, "[{:04x}:{:04x} {}] Changing interface to {}", m_vid, m_pid,
-                m_active_interface, interface);
-  m_active_interface = interface;
+                m_active_interface, iface);
+  m_active_interface = iface;
   return 0;
 }
 
-int InfinityUSB::GetNumberOfAltSettings(u8 interface)
+int InfinityUSB::GetNumberOfAltSettings(u8 iface)
 {
   return 0;
 }
diff --git a/Source/Core/Core/IOS/USB/Emulated/Infinity.h b/Source/Core/Core/IOS/USB/Emulated/Infinity.h
index 8bafefd64bb0..7ec67035fad3 100644
--- a/Source/Core/Core/IOS/USB/Emulated/Infinity.h
+++ b/Source/Core/Core/IOS/USB/Emulated/Infinity.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #include <array>
-#include <map>
 #include <mutex>
 #include <queue>
 #include <span>
@@ -37,12 +36,12 @@ class InfinityUSB final : public Device
   DeviceDescriptor GetDeviceDescriptor() const override;
   std::vector<ConfigDescriptor> GetConfigurations() const override;
   std::vector<InterfaceDescriptor> GetInterfaces(u8 config) const override;
-  std::vector<EndpointDescriptor> GetEndpoints(u8 config, u8 interface, u8 alt) const override;
+  std::vector<EndpointDescriptor> GetEndpoints(u8 config, u8 iface, u8 alt) const override;
   bool Attach() override;
-  bool AttachAndChangeInterface(u8 interface) override;
+  bool AttachAndChangeInterface(u8 iface) override;
   int CancelTransfer(u8 endpoint) override;
-  int ChangeInterface(u8 interface) override;
-  int GetNumberOfAltSettings(u8 interface) override;
+  int ChangeInterface(u8 iface) override;
+  int GetNumberOfAltSettings(u8 iface) override;
   int SetAltSetting(u8 alt_setting) override;
   int SubmitTransfer(std::unique_ptr<CtrlMessage> message) override;
   int SubmitTransfer(std::unique_ptr<BulkMessage> message) override;
diff --git a/Source/Core/Core/IOS/USB/Emulated/LogitechMic.cpp b/Source/Core/Core/IOS/USB/Emulated/LogitechMic.cpp
index 8380c533dcc9..42cc7b1602d5 100644
--- a/Source/Core/Core/IOS/USB/Emulated/LogitechMic.cpp
+++ b/Source/Core/Core/IOS/USB/Emulated/LogitechMic.cpp
@@ -4,6 +4,7 @@
 #include "Core/IOS/USB/Emulated/LogitechMic.h"
 
 #include <algorithm>
+#include <utility>
 
 #include "Core/Config/MainSettings.h"
 #include "Core/HW/Memmap.h"
@@ -161,13 +162,13 @@ bool LogitechMic::Attach()
   return true;
 }
 
-bool LogitechMic::AttachAndChangeInterface(const u8 interface)
+bool LogitechMic::AttachAndChangeInterface(const u8 iface)
 {
   if (!Attach())
     return false;
 
-  if (interface != m_active_interface)
-    return ChangeInterface(interface) == 0;
+  if (iface != m_active_interface)
+    return ChangeInterface(iface) == 0;
 
   return true;
 }
@@ -180,17 +181,17 @@ int LogitechMic::CancelTransfer(const u8 endpoint)
   return IPC_SUCCESS;
 }
 
-int LogitechMic::ChangeInterface(const u8 interface)
+int LogitechMic::ChangeInterface(const u8 iface)
 {
   DEBUG_LOG_FMT(IOS_USB, "[{:04x}:{:04x} {}:{}] Changing interface to {}", m_vid, m_pid, m_index,
-                m_active_interface, interface);
-  m_active_interface = interface;
+                m_active_interface, iface);
+  m_active_interface = iface;
   return 0;
 }
 
-int LogitechMic::GetNumberOfAltSettings(u8 interface)
+int LogitechMic::GetNumberOfAltSettings(u8 iface)
 {
-  if (interface == 1)
+  if (iface == 1)
     return 2;
 
   return 0;
@@ -208,12 +209,12 @@ static constexpr u32 USBGETAID(u8 cs, u8 request, u16 index)
 
 static constexpr u32 USBGETAID(FeatureUnitControlSelector cs, RequestCode request, u16 index)
 {
-  return USBGETAID(Common::ToUnderlying(cs), Common::ToUnderlying(request), index);
+  return USBGETAID(std::to_underlying(cs), std::to_underlying(request), index);
 }
 
 static constexpr u32 USBGETAID(EndpointControlSelector cs, RequestCode request, u16 index)
 {
-  return USBGETAID(Common::ToUnderlying(cs), Common::ToUnderlying(request), index);
+  return USBGETAID(std::to_underlying(cs), std::to_underlying(request), index);
 }
 
 int LogitechMic::GetAudioControl(std::unique_ptr<CtrlMessage>& cmd)
@@ -228,7 +229,7 @@ int LogitechMic::GetAudioControl(std::unique_ptr<CtrlMessage>& cmd)
   DEBUG_LOG_FMT(IOS_USB,
                 "GetAudioControl: bCs={:02x} bCn={:02x} bRequestType={:02x} bRequest={:02x} "
                 "bIndex={:02x} aid={:08x}",
-                Common::ToUnderlying(cs), cn, cmd->request_type, Common::ToUnderlying(request),
+                std::to_underlying(cs), cn, cmd->request_type, std::to_underlying(request),
                 cmd->index, aid);
   switch (aid)
   {
@@ -281,7 +282,7 @@ int LogitechMic::GetAudioControl(std::unique_ptr<CtrlMessage>& cmd)
     WARN_LOG_FMT(IOS_USB,
                  "GetAudioControl: Unknown request: bCs={:02x} bCn={:02x} bRequestType={:02x} "
                  "bRequest={:02x} bIndex={:02x} aid={:08x}",
-                 Common::ToUnderlying(cs), cn, cmd->request_type, Common::ToUnderlying(request),
+                 std::to_underlying(cs), cn, cmd->request_type, std::to_underlying(request),
                  cmd->index, aid);
     break;
   }
@@ -301,7 +302,7 @@ int LogitechMic::SetAudioControl(std::unique_ptr<CtrlMessage>& cmd)
   DEBUG_LOG_FMT(IOS_USB,
                 "SetAudioControl: bCs={:02x} bCn={:02x} bRequestType={:02x} bRequest={:02x} "
                 "bIndex={:02x} aid={:08x}",
-                Common::ToUnderlying(cs), cn, cmd->request_type, Common::ToUnderlying(request),
+                std::to_underlying(cs), cn, cmd->request_type, std::to_underlying(request),
                 cmd->index, aid);
   switch (aid)
   {
@@ -344,7 +345,7 @@ int LogitechMic::SetAudioControl(std::unique_ptr<CtrlMessage>& cmd)
     WARN_LOG_FMT(IOS_USB,
                  "SetAudioControl: Unknown request: bCs={:02x} bCn={:02x} bRequestType={:02x} "
                  "bRequest={:02x} bIndex={:02x} aid={:08x}",
-                 Common::ToUnderlying(cs), cn, cmd->request_type, Common::ToUnderlying(request),
+                 std::to_underlying(cs), cn, cmd->request_type, std::to_underlying(request),
                  cmd->index, aid);
     break;
   }
@@ -364,7 +365,7 @@ int LogitechMic::EndpointAudioControl(std::unique_ptr<CtrlMessage>& cmd)
   DEBUG_LOG_FMT(IOS_USB,
                 "EndpointAudioControl: bCs={:02x} bCn={:02x} bRequestType={:02x} bRequest={:02x} "
                 "bIndex={:02x} aid:{:08x}",
-                Common::ToUnderlying(cs), cn, cmd->request_type, Common::ToUnderlying(request),
+                std::to_underlying(cs), cn, cmd->request_type, std::to_underlying(request),
                 cmd->index, aid);
   switch (aid)
   {
@@ -406,7 +407,7 @@ int LogitechMic::EndpointAudioControl(std::unique_ptr<CtrlMessage>& cmd)
     WARN_LOG_FMT(IOS_USB,
                  "SetAudioControl: Unknown request: bCs={:02x} bCn={:02x} bRequestType={:02x} "
                  "bRequest={:02x} bIndex={:02x} aid={:08x}",
-                 Common::ToUnderlying(cs), cn, cmd->request_type, Common::ToUnderlying(request),
+                 std::to_underlying(cs), cn, cmd->request_type, std::to_underlying(request),
                  cmd->index, aid);
     break;
   }
@@ -544,7 +545,7 @@ static constexpr std::array<u8, 121> FULL_DESCRIPTOR = {
 
 static constexpr u16 LogitechUSBHDR(u8 dir, u8 type, u8 recipient, RequestCode request)
 {
-  return USBHDR(dir, type, recipient, Common::ToUnderlying(request));
+  return USBHDR(dir, type, recipient, std::to_underlying(request));
 }
 
 int LogitechMic::SubmitTransfer(std::unique_ptr<CtrlMessage> cmd)
diff --git a/Source/Core/Core/IOS/USB/Emulated/LogitechMic.h b/Source/Core/Core/IOS/USB/Emulated/LogitechMic.h
index 3ae5810344c3..a8319604f49e 100644
--- a/Source/Core/Core/IOS/USB/Emulated/LogitechMic.h
+++ b/Source/Core/Core/IOS/USB/Emulated/LogitechMic.h
@@ -37,12 +37,12 @@ class LogitechMic final : public Device
   DeviceDescriptor GetDeviceDescriptor() const override;
   std::vector<ConfigDescriptor> GetConfigurations() const override;
   std::vector<InterfaceDescriptor> GetInterfaces(u8 config) const override;
-  std::vector<EndpointDescriptor> GetEndpoints(u8 config, u8 interface, u8 alt) const override;
+  std::vector<EndpointDescriptor> GetEndpoints(u8 config, u8 iface, u8 alt) const override;
   bool Attach() override;
-  bool AttachAndChangeInterface(u8 interface) override;
+  bool AttachAndChangeInterface(u8 iface) override;
   int CancelTransfer(u8 endpoint) override;
-  int ChangeInterface(u8 interface) override;
-  int GetNumberOfAltSettings(u8 interface) override;
+  int ChangeInterface(u8 iface) override;
+  int GetNumberOfAltSettings(u8 iface) override;
   int SetAltSetting(u8 alt_setting) override;
   int SubmitTransfer(std::unique_ptr<CtrlMessage> cmd) override;
   int SubmitTransfer(std::unique_ptr<BulkMessage> cmd) override;
diff --git a/Source/Core/Core/IOS/USB/Emulated/Skylanders/Skylander.cpp b/Source/Core/Core/IOS/USB/Emulated/Skylanders/Skylander.cpp
index 02b16194d50b..14017eecb5cd 100644
--- a/Source/Core/Core/IOS/USB/Emulated/Skylanders/Skylander.cpp
+++ b/Source/Core/Core/IOS/USB/Emulated/Skylanders/Skylander.cpp
@@ -9,12 +9,8 @@
 
 #include "AudioCommon/AudioCommon.h"
 #include "Common/Logging/Log.h"
-#include "Common/Random.h"
-#include "Common/StringUtil.h"
-#include "Common/Timer.h"
 #include "Core/Core.h"
 #include "Core/HW/Memmap.h"
-#include "Core/IOS/USB/Emulated/Skylanders/SkylanderCrypto.h"
 #include "Core/System.h"
 
 namespace IOS::HLE::USB
@@ -644,7 +640,7 @@ std::vector<InterfaceDescriptor> SkylanderUSB::GetInterfaces(u8 config) const
   return m_interface_descriptor;
 }
 
-std::vector<EndpointDescriptor> SkylanderUSB::GetEndpoints(u8 config, u8 interface, u8 alt) const
+std::vector<EndpointDescriptor> SkylanderUSB::GetEndpoints(u8 config, u8 iface, u8 alt) const
 {
   return m_endpoint_descriptor;
 }
@@ -660,13 +656,13 @@ bool SkylanderUSB::Attach()
   return true;
 }
 
-bool SkylanderUSB::AttachAndChangeInterface(const u8 interface)
+bool SkylanderUSB::AttachAndChangeInterface(const u8 iface)
 {
   if (!Attach())
     return false;
 
-  if (interface != m_active_interface)
-    return ChangeInterface(interface) == 0;
+  if (iface != m_active_interface)
+    return ChangeInterface(iface) == 0;
 
   return true;
 }
@@ -679,15 +675,15 @@ int SkylanderUSB::CancelTransfer(const u8 endpoint)
   return IPC_SUCCESS;
 }
 
-int SkylanderUSB::ChangeInterface(const u8 interface)
+int SkylanderUSB::ChangeInterface(const u8 iface)
 {
   DEBUG_LOG_FMT(IOS_USB, "[{:04x}:{:04x} {}] Changing interface to {}", m_vid, m_pid,
-                m_active_interface, interface);
-  m_active_interface = interface;
+                m_active_interface, iface);
+  m_active_interface = iface;
   return 0;
 }
 
-int SkylanderUSB::GetNumberOfAltSettings(u8 interface)
+int SkylanderUSB::GetNumberOfAltSettings(u8 iface)
 {
   return 0;
 }
@@ -1394,7 +1390,7 @@ Type NormalizeSkylanderType(Type type)
   case Type::Trap:
   case Type::Vehicle:
   case Type::Unknown:
-    // until these get seperate data logic (except unknown and item since items don't save data and
+    // until these get separate data logic (except unknown and item since items don't save data and
     // unknown is unknown)
     return Type::Unknown;
   }
diff --git a/Source/Core/Core/IOS/USB/Emulated/Skylanders/Skylander.h b/Source/Core/Core/IOS/USB/Emulated/Skylanders/Skylander.h
index f9f8f8f61607..9de058f59fda 100644
--- a/Source/Core/Core/IOS/USB/Emulated/Skylanders/Skylander.h
+++ b/Source/Core/Core/IOS/USB/Emulated/Skylanders/Skylander.h
@@ -77,12 +77,12 @@ class SkylanderUSB final : public Device
   DeviceDescriptor GetDeviceDescriptor() const override;
   std::vector<ConfigDescriptor> GetConfigurations() const override;
   std::vector<InterfaceDescriptor> GetInterfaces(u8 config) const override;
-  std::vector<EndpointDescriptor> GetEndpoints(u8 config, u8 interface, u8 alt) const override;
+  std::vector<EndpointDescriptor> GetEndpoints(u8 config, u8 iface, u8 alt) const override;
   bool Attach() override;
-  bool AttachAndChangeInterface(u8 interface) override;
+  bool AttachAndChangeInterface(u8 iface) override;
   int CancelTransfer(u8 endpoint) override;
-  int ChangeInterface(u8 interface) override;
-  int GetNumberOfAltSettings(u8 interface) override;
+  int ChangeInterface(u8 iface) override;
+  int GetNumberOfAltSettings(u8 iface) override;
   int SetAltSetting(u8 alt_setting) override;
   int SubmitTransfer(std::unique_ptr<CtrlMessage> message) override;
   int SubmitTransfer(std::unique_ptr<BulkMessage> message) override;
diff --git a/Source/Core/Core/IOS/USB/Emulated/Skylanders/SkylanderCrypto.cpp b/Source/Core/Core/IOS/USB/Emulated/Skylanders/SkylanderCrypto.cpp
index 3361498b805d..904b31553eba 100644
--- a/Source/Core/Core/IOS/USB/Emulated/Skylanders/SkylanderCrypto.cpp
+++ b/Source/Core/Core/IOS/USB/Emulated/Skylanders/SkylanderCrypto.cpp
@@ -5,7 +5,6 @@
 
 #include <array>
 #include <span>
-#include <string>
 
 #include "Common/BitUtils.h"
 #include "Common/CommonTypes.h"
diff --git a/Source/Core/Core/IOS/USB/Emulated/Skylanders/SkylanderFigure.cpp b/Source/Core/Core/IOS/USB/Emulated/Skylanders/SkylanderFigure.cpp
index 9bfa31c92809..60edb515ed7f 100644
--- a/Source/Core/Core/IOS/USB/Emulated/Skylanders/SkylanderFigure.cpp
+++ b/Source/Core/Core/IOS/USB/Emulated/Skylanders/SkylanderFigure.cpp
@@ -3,7 +3,6 @@
 
 #include "Core/IOS/USB/Emulated/Skylanders/SkylanderFigure.h"
 
-#include <algorithm>
 #include <array>
 #include <cstring>
 #include <span>
diff --git a/Source/Core/Core/IOS/USB/Emulated/WiiSpeak.cpp b/Source/Core/Core/IOS/USB/Emulated/WiiSpeak.cpp
index eaaadacc9452..3b519c4c6e3d 100644
--- a/Source/Core/Core/IOS/USB/Emulated/WiiSpeak.cpp
+++ b/Source/Core/Core/IOS/USB/Emulated/WiiSpeak.cpp
@@ -77,7 +77,7 @@ std::vector<InterfaceDescriptor> WiiSpeak::GetInterfaces(u8 config) const
   return m_interface_descriptor;
 }
 
-std::vector<EndpointDescriptor> WiiSpeak::GetEndpoints(u8 config, u8 interface, u8 alt) const
+std::vector<EndpointDescriptor> WiiSpeak::GetEndpoints(u8 config, u8 iface, u8 alt) const
 {
   return m_endpoint_descriptor;
 }
@@ -97,13 +97,13 @@ bool WiiSpeak::Attach()
   return true;
 }
 
-bool WiiSpeak::AttachAndChangeInterface(const u8 interface)
+bool WiiSpeak::AttachAndChangeInterface(const u8 iface)
 {
   if (!Attach())
     return false;
 
-  if (interface != m_active_interface)
-    return ChangeInterface(interface) == 0;
+  if (iface != m_active_interface)
+    return ChangeInterface(iface) == 0;
 
   return true;
 }
@@ -116,15 +116,15 @@ int WiiSpeak::CancelTransfer(const u8 endpoint)
   return IPC_SUCCESS;
 }
 
-int WiiSpeak::ChangeInterface(const u8 interface)
+int WiiSpeak::ChangeInterface(const u8 iface)
 {
   DEBUG_LOG_FMT(IOS_USB, "[{:04x}:{:04x} {}] Changing interface to {}", m_vid, m_pid,
-                m_active_interface, interface);
-  m_active_interface = interface;
+                m_active_interface, iface);
+  m_active_interface = iface;
   return 0;
 }
 
-int WiiSpeak::GetNumberOfAltSettings(u8 interface)
+int WiiSpeak::GetNumberOfAltSettings(u8 iface)
 {
   return 0;
 }
diff --git a/Source/Core/Core/IOS/USB/Emulated/WiiSpeak.h b/Source/Core/Core/IOS/USB/Emulated/WiiSpeak.h
index 9a0ae136746b..ef48883d29bc 100644
--- a/Source/Core/Core/IOS/USB/Emulated/WiiSpeak.h
+++ b/Source/Core/Core/IOS/USB/Emulated/WiiSpeak.h
@@ -40,12 +40,12 @@ class WiiSpeak final : public Device
   DeviceDescriptor GetDeviceDescriptor() const override;
   std::vector<ConfigDescriptor> GetConfigurations() const override;
   std::vector<InterfaceDescriptor> GetInterfaces(u8 config) const override;
-  std::vector<EndpointDescriptor> GetEndpoints(u8 config, u8 interface, u8 alt) const override;
+  std::vector<EndpointDescriptor> GetEndpoints(u8 config, u8 iface, u8 alt) const override;
   bool Attach() override;
-  bool AttachAndChangeInterface(u8 interface) override;
+  bool AttachAndChangeInterface(u8 f) override;
   int CancelTransfer(u8 endpoint) override;
-  int ChangeInterface(u8 interface) override;
-  int GetNumberOfAltSettings(u8 interface) override;
+  int ChangeInterface(u8 iface) override;
+  int GetNumberOfAltSettings(u8 iface) override;
   int SetAltSetting(u8 alt_setting) override;
   int SubmitTransfer(std::unique_ptr<CtrlMessage> message) override;
   int SubmitTransfer(std::unique_ptr<BulkMessage> message) override;
diff --git a/Source/Core/Core/IOS/USB/LibusbDevice.cpp b/Source/Core/Core/IOS/USB/LibusbDevice.cpp
index da127b70d578..9df0c90cd78e 100644
--- a/Source/Core/Core/IOS/USB/LibusbDevice.cpp
+++ b/Source/Core/Core/IOS/USB/LibusbDevice.cpp
@@ -10,7 +10,6 @@
 #include <map>
 #include <memory>
 #include <mutex>
-#include <ranges>
 #include <utility>
 #include <vector>
 
@@ -19,7 +18,6 @@
 #include "Common/Assert.h"
 #include "Common/Config/Config.h"
 #include "Common/Logging/Log.h"
-#include "Common/StringUtil.h"
 #include "Core/Config/MainSettings.h"
 #include "Core/HW/Memmap.h"
 #include "Core/IOS/Device.h"
@@ -163,13 +161,13 @@ bool LibusbDevice::Attach()
   return true;
 }
 
-bool LibusbDevice::AttachAndChangeInterface(const u8 interface)
+bool LibusbDevice::AttachAndChangeInterface(const u8 iface)
 {
   if (!Attach())
     return false;
 
-  if (interface != m_active_interface)
-    return ChangeInterface(interface) == LIBUSB_SUCCESS;
+  if (iface != m_active_interface)
+    return ChangeInterface(iface) == LIBUSB_SUCCESS;
 
   return true;
 }
@@ -185,11 +183,11 @@ int LibusbDevice::CancelTransfer(const u8 endpoint)
   return IPC_SUCCESS;
 }
 
-int LibusbDevice::ChangeInterface(const u8 interface)
+int LibusbDevice::ChangeInterface(const u8 iface)
 {
   INFO_LOG_FMT(IOS_USB, "[{:04x}:{:04x} {}] Changing interface to {}", m_vid, m_pid,
-               m_active_interface, interface);
-  m_active_interface = interface;
+               m_active_interface, iface);
+  m_active_interface = iface;
   return LIBUSB_SUCCESS;
 }
 
diff --git a/Source/Core/Core/IOS/USB/LibusbDevice.h b/Source/Core/Core/IOS/USB/LibusbDevice.h
index e6151b11e2bc..e36175493c60 100644
--- a/Source/Core/Core/IOS/USB/LibusbDevice.h
+++ b/Source/Core/Core/IOS/USB/LibusbDevice.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #if defined(__LIBUSB__)
-#include <cstddef>
 #include <functional>
 #include <map>
 #include <memory>
@@ -31,13 +30,13 @@ class LibusbDevice final : public Device
   DeviceDescriptor GetDeviceDescriptor() const override;
   std::vector<ConfigDescriptor> GetConfigurations() const override;
   std::vector<InterfaceDescriptor> GetInterfaces(u8 config) const override;
-  std::vector<EndpointDescriptor> GetEndpoints(u8 config, u8 interface, u8 alt) const override;
+  std::vector<EndpointDescriptor> GetEndpoints(u8 config, u8 iface, u8 alt) const override;
   std::string GetErrorName(int error_code) const override;
   bool Attach() override;
-  bool AttachAndChangeInterface(u8 interface) override;
+  bool AttachAndChangeInterface(u8 iface) override;
   int CancelTransfer(u8 endpoint) override;
-  int ChangeInterface(u8 interface) override;
-  int GetNumberOfAltSettings(u8 interface) override;
+  int ChangeInterface(u8 iface) override;
+  int GetNumberOfAltSettings(u8 iface) override;
   int SetAltSetting(u8 alt_setting) override;
   int SubmitTransfer(std::unique_ptr<CtrlMessage> message) override;
   int SubmitTransfer(std::unique_ptr<BulkMessage> message) override;
diff --git a/Source/Core/Core/IOS/USB/OH0/OH0.cpp b/Source/Core/Core/IOS/USB/OH0/OH0.cpp
index f1b500fc091a..0b6051499b27 100644
--- a/Source/Core/Core/IOS/USB/OH0/OH0.cpp
+++ b/Source/Core/Core/IOS/USB/OH0/OH0.cpp
@@ -4,10 +4,6 @@
 #include "Core/IOS/USB/OH0/OH0.h"
 
 #include <algorithm>
-#include <cstring>
-#include <istream>
-#include <sstream>
-#include <tuple>
 #include <utility>
 
 #include "Common/ChunkFile.h"
diff --git a/Source/Core/Core/IOS/USB/OH0/OH0.h b/Source/Core/Core/IOS/USB/OH0/OH0.h
index 19f501a1fc17..d002c79d1228 100644
--- a/Source/Core/Core/IOS/USB/OH0/OH0.h
+++ b/Source/Core/Core/IOS/USB/OH0/OH0.h
@@ -9,7 +9,6 @@
 #include <set>
 #include <string>
 #include <utility>
-#include <vector>
 
 #include "Common/CommonTypes.h"
 #include "Core/IOS/Device.h"
diff --git a/Source/Core/Core/IOS/USB/USBV0.h b/Source/Core/Core/IOS/USB/USBV0.h
index 089969a74e16..8f57ce83ed21 100644
--- a/Source/Core/Core/IOS/USB/USBV0.h
+++ b/Source/Core/Core/IOS/USB/USBV0.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include "Common/CommonTypes.h"
 #include "Core/IOS/USB/Common.h"
 
 // Used by early USB interfaces, such as /dev/usb/oh0 (except in IOS57, 58, 59) and /dev/usb/oh1.
diff --git a/Source/Core/Core/IOS/USB/USB_HID/HIDv5.cpp b/Source/Core/Core/IOS/USB/USB_HID/HIDv5.cpp
index 930fda33b7c5..3150dbad0f49 100644
--- a/Source/Core/Core/IOS/USB/USB_HID/HIDv5.cpp
+++ b/Source/Core/Core/IOS/USB/USB_HID/HIDv5.cpp
@@ -4,7 +4,6 @@
 #include "Core/IOS/USB/USB_HID/HIDv5.h"
 
 #include <algorithm>
-#include <cstddef>
 #include <memory>
 #include <mutex>
 
diff --git a/Source/Core/Core/IOS/USB/USB_KBD.cpp b/Source/Core/Core/IOS/USB/USB_KBD.cpp
index c0bf361e2f07..97a81268e63c 100644
--- a/Source/Core/Core/IOS/USB/USB_KBD.cpp
+++ b/Source/Core/Core/IOS/USB/USB_KBD.cpp
@@ -139,7 +139,7 @@ constexpr std::array<u8, 256> s_key_codes_azerty{
     0x55,  // Multiply
     0x57,  // Add
     0x00,  // Separator
-    0x56,  // Substract
+    0x56,  // Subtract
     0x63,  // Decimal
     0x54,  // Divide
     // F1 -> F12
diff --git a/Source/Core/Core/IOS/WFS/WFSI.cpp b/Source/Core/Core/IOS/WFS/WFSI.cpp
index d362c3d312bc..566956832a4f 100644
--- a/Source/Core/Core/IOS/WFS/WFSI.cpp
+++ b/Source/Core/Core/IOS/WFS/WFSI.cpp
@@ -12,7 +12,6 @@
 
 #include "Common/CommonTypes.h"
 #include "Common/Crypto/AES.h"
-#include "Common/EnumUtils.h"
 #include "Common/FileUtil.h"
 #include "Common/IOFile.h"
 #include "Common/Logging/Log.h"
@@ -144,7 +143,7 @@ std::optional<IPCReply> WFSIDevice::IOCtl(const IOCtlRequest& request)
     m_continue_install = memory.Read_U32(request.buffer_in + 36);
 
     INFO_LOG_FMT(IOS_WFS, "IOCTL_WFSI_IMPORT_TITLE_INIT: patch type {}, continue install: {}",
-                 Common::ToUnderlying(m_patch_type), m_continue_install ? "true" : "false");
+                 std::to_underlying(m_patch_type), m_continue_install ? "true" : "false");
 
     if (m_patch_type == PatchType::PATCH_TYPE_2)
     {
diff --git a/Source/Core/Core/MemTools.cpp b/Source/Core/Core/MemTools.cpp
index 232aae16931e..92cb7bcf5497 100644
--- a/Source/Core/Core/MemTools.cpp
+++ b/Source/Core/Core/MemTools.cpp
@@ -3,16 +3,10 @@
 
 #include "Core/MemTools.h"
 
-#include <cstdio>
 #include <cstdlib>
-#include <cstring>
-#include <vector>
 
-#include "Common/Assert.h"
 #include "Common/CommonFuncs.h"
-#include "Common/CommonTypes.h"
 #include "Common/MsgHandler.h"
-#include "Common/Thread.h"
 
 #include "Core/MachineContext.h"
 #include "Core/PowerPC/JitInterface.h"
@@ -25,6 +19,13 @@
 #include <unistd.h>  // Needed for _POSIX_VERSION
 #endif
 
+#ifdef _WIN32
+#include "Common/Assert.h"
+#endif
+#if defined(__APPLE__) && !defined(USE_SIGACTION_ON_APPLE)
+#include "Common/Thread.h"
+#endif
+
 #if defined(__APPLE__)
 #include <TargetConditionals.h>
 #ifdef _M_X86_64
@@ -259,73 +260,51 @@ bool IsExceptionHandlerSupported()
 #elif defined(_POSIX_VERSION) && !defined(_M_GENERIC) && !(defined(TARGET_OS_TV) && TARGET_OS_TV)
 
 static struct sigaction old_sa_segv;
+#if defined(__APPLE__)
 static struct sigaction old_sa_bus;
+#endif
 
 static void sigsegv_handler(int sig, siginfo_t* info, void* raw_context)
 {
-  if (sig != SIGSEGV && sig != SIGBUS)
+  if (sig != SIGSEGV
+#if defined(__APPLE__)
+      && sig != SIGBUS
+#endif
+  )
   {
     // We are not interested in other signals - handle it as usual.
     return;
   }
-  ucontext_t* context = (ucontext_t*)raw_context;
-  int sicode = info->si_code;
+  auto* const context = static_cast<ucontext_t*>(raw_context);
+  const int sicode = info->si_code;
   if (sicode != SEGV_MAPERR && sicode != SEGV_ACCERR)
   {
     // Huh? Return.
     return;
   }
-  uintptr_t bad_address = (uintptr_t)info->si_addr;
+  const auto bad_address = reinterpret_cast<uintptr_t>(info->si_addr);
 
 // Get all the information we can out of the context.
 #ifdef __OpenBSD__
-  ucontext_t* ctx = context;
+  SContext* const ctx = context;
+#elif defined(__APPLE__)
+  // `uc_mcontext` is already a pointer here.
+  SContext* const ctx = context->uc_mcontext;
 #else
-  mcontext_t* ctx = &context->uc_mcontext;
+  SContext* const ctx = &context->uc_mcontext;
 #endif
-  // assume it's not a write
-  if (!Core::System::GetInstance().GetJitInterface().HandleFault(bad_address,
-#ifdef __APPLE__
-                                                                 *ctx
-#else
-                                                                 ctx
+  if (Core::System::GetInstance().GetJitInterface().HandleFault(bad_address, ctx))
+    return;
+
+  // If JIT didn't handle the signal, restore the original handler and invoke it.
+  const auto& old_sa =
+#if defined(__APPLE__)
+      (sig == SIGBUS) ? old_sa_bus :
 #endif
-                                                                 ))
-  {
-    // retry and crash
-    // According to the sigaction man page, if sa_flags "SA_SIGINFO" is set to the sigaction
-    // function pointer, otherwise sa_handler contains one of:
-    // SIG_DEF: The 'default' action is performed
-    // SIG_IGN: The signal is ignored
-    // Any other value is a function pointer to a signal handler
-
-    struct sigaction* old_sa;
-    if (sig == SIGSEGV)
-    {
-      old_sa = &old_sa_segv;
-    }
-    else
-    {
-      old_sa = &old_sa_bus;
-    }
+                        old_sa_segv;
 
-    if (old_sa->sa_flags & SA_SIGINFO)
-    {
-      old_sa->sa_sigaction(sig, info, raw_context);
-      return;
-    }
-    if (old_sa->sa_handler == SIG_DFL)
-    {
-      signal(sig, SIG_DFL);
-      return;
-    }
-    if (old_sa->sa_handler == SIG_IGN)
-    {
-      // Ignore signal
-      return;
-    }
-    old_sa->sa_handler(sig);
-  }
+  sigaction(sig, &old_sa, nullptr);
+  raise(sig);
 }
 
 void InstallExceptionHandler()
@@ -338,10 +317,9 @@ void InstallExceptionHandler()
 #endif
   signal_stack.ss_size = SIGSTKSZ;
   signal_stack.ss_flags = 0;
-  if (sigaltstack(&signal_stack, nullptr))
-    PanicAlertFmt("sigaltstack failed");
-  struct sigaction sa;
-  sa.sa_handler = nullptr;
+  if (sigaltstack(&signal_stack, nullptr) != 0)
+    PanicAlertFmt("sigaltstack failed: {}", Common::LastStrerrorString());
+  struct sigaction sa{};
   sa.sa_sigaction = &sigsegv_handler;
   sa.sa_flags = SA_SIGINFO;
   sigemptyset(&sa.sa_mask);
@@ -353,7 +331,8 @@ void InstallExceptionHandler()
 
 void UninstallExceptionHandler()
 {
-  stack_t signal_stack, old_stack;
+  stack_t signal_stack;
+  stack_t old_stack;
   signal_stack.ss_flags = SS_DISABLE;
   if (!sigaltstack(&signal_stack, &old_stack) && !(old_stack.ss_flags & SS_DISABLE))
   {
diff --git a/Source/Core/Core/MemoryWatcher.cpp b/Source/Core/Core/MemoryWatcher.cpp
index 770906b7e116..0a89450eb04c 100644
--- a/Source/Core/Core/MemoryWatcher.cpp
+++ b/Source/Core/Core/MemoryWatcher.cpp
@@ -10,7 +10,6 @@
 #include <unistd.h>
 
 #include "Common/FileUtil.h"
-#include "Core/HW/SystemTimers.h"
 #include "Core/PowerPC/MMU.h"
 
 MemoryWatcher::MemoryWatcher()
diff --git a/Source/Core/Core/Movie.cpp b/Source/Core/Core/Movie.cpp
index c62130e18c97..deaa8088b880 100644
--- a/Source/Core/Core/Movie.cpp
+++ b/Source/Core/Core/Movie.cpp
@@ -5,11 +5,9 @@
 
 #include <algorithm>
 #include <array>
-#include <cctype>
 #include <cstring>
 #include <iterator>
 #include <locale>
-#include <mbedtls/config.h>
 #include <mbedtls/md.h>
 #include <mutex>
 #include <thread>
diff --git a/Source/Core/Core/Movie.h b/Source/Core/Core/Movie.h
index e842ec9d7b7c..02329df03068 100644
--- a/Source/Core/Core/Movie.h
+++ b/Source/Core/Core/Movie.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #include <array>
-#include <cstring>
 #include <mutex>
 #include <optional>
 #include <string>
diff --git a/Source/Core/Core/NetPlayClient.cpp b/Source/Core/Core/NetPlayClient.cpp
index 3f4344ad8816..028799d56f96 100644
--- a/Source/Core/Core/NetPlayClient.cpp
+++ b/Source/Core/Core/NetPlayClient.cpp
@@ -7,7 +7,6 @@
 #include <array>
 #include <cstddef>
 #include <cstring>
-#include <fstream>
 #include <functional>
 #include <memory>
 #include <mutex>
@@ -31,7 +30,6 @@
 #include "Common/NandPaths.h"
 #include "Common/QoSSession.h"
 #include "Common/SFMLHelper.h"
-#include "Common/StringUtil.h"
 #include "Common/Timer.h"
 #include "Common/Version.h"
 
@@ -54,30 +52,25 @@
 #include "Core/HW/GCPad.h"
 #include "Core/HW/SI/SI.h"
 #include "Core/HW/SI/SI_Device.h"
+#include "Core/HW/SI/SI_DeviceAMBaseboard.h"
 #include "Core/HW/SI/SI_DeviceGCController.h"
 #include "Core/HW/Sram.h"
 #include "Core/HW/WiiSave.h"
 #include "Core/HW/WiiSaveStructs.h"
+#include "Core/HW/Wiimote.h"
 #include "Core/HW/WiimoteEmu/DesiredWiimoteState.h"
-#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
-#include "Core/HW/WiimoteReal/WiimoteReal.h"
 #include "Core/IOS/FS/FileSystem.h"
 #include "Core/IOS/FS/HostBackend/FS.h"
-#include "Core/IOS/USB/Bluetooth/BTEmu.h"
 #include "Core/IOS/Uids.h"
 #include "Core/Movie.h"
 #include "Core/NetPlayCommon.h"
-#include "Core/PowerPC/PowerPC.h"
 #include "Core/SyncIdentifier.h"
 #include "Core/System.h"
 #include "DiscIO/Blob.h"
 
-#include "InputCommon/ControllerEmu/ControlGroup/Attachments.h"
 #include "InputCommon/GCAdapter.h"
-#include "InputCommon/InputConfig.h"
 #include "UICommon/GameFile.h"
 #include "VideoCommon/OnScreenDisplay.h"
-#include "VideoCommon/VideoConfig.h"
 
 namespace NetPlay
 {
@@ -1891,6 +1884,8 @@ void NetPlayClient::UpdateDevices()
   auto& si = Core::System::GetInstance().GetSerialInterface();
   for (auto player_id : m_pad_map)
   {
+    const SerialInterface::SIDevices si_device = Config::Get(Config::GetInfoForSIDevice(local_pad));
+
     if (m_gba_config[pad].enabled && player_id > 0)
     {
       si.ChangeDevice(SerialInterface::SIDEVICE_GC_GBA_EMULATED, pad);
@@ -1898,8 +1893,6 @@ void NetPlayClient::UpdateDevices()
     else if (player_id == m_local_player->pid)
     {
       // Use local controller types for local controllers if they are compatible
-      const SerialInterface::SIDevices si_device =
-          Config::Get(Config::GetInfoForSIDevice(local_pad));
       if (SerialInterface::SIDevice_IsGCController(si_device))
       {
         si.ChangeDevice(si_device, pad);
@@ -1917,7 +1910,8 @@ void NetPlayClient::UpdateDevices()
     }
     else if (player_id > 0)
     {
-      si.ChangeDevice(SerialInterface::SIDEVICE_GC_CONTROLLER, pad);
+      if (si_device != SerialInterface::SIDEVICE_AM_BASEBOARD)
+        si.ChangeDevice(SerialInterface::SIDEVICE_GC_CONTROLLER, pad);
     }
     else
     {
@@ -2780,6 +2774,16 @@ bool SerialInterface::CSIDevice_GCController::NetPlay_GetInput(int pad_num, GCPa
   return false;
 }
 
+bool SerialInterface::CSIDevice_AMBaseboard::NetPlay_GetInput(int pad_num, GCPadStatus* status)
+{
+  std::lock_guard lk(NetPlay::crit_netplay_client);
+
+  if (NetPlay::netplay_client)
+    return NetPlay::netplay_client->GetNetPads(pad_num, NetPlay::s_si_poll_batching, status);
+
+  return false;
+}
+
 bool NetPlay::NetPlay_GetWiimoteData(const std::span<NetPlayClient::WiimoteDataBatchEntry>& entries)
 {
   std::lock_guard lk(crit_netplay_client);
@@ -2843,12 +2847,21 @@ u64 ExpansionInterface::CEXIIPL::NetPlay_GetEmulatedTime()
 
 // called from ---CPU--- thread
 // return the local pad num that should rumble given a ingame pad num
-int SerialInterface::CSIDevice_GCController::NetPlay_InGamePadToLocalPad(int numPAD)
+int SerialInterface::CSIDevice_GCController::NetPlay_InGamePadToLocalPad(int pad_num)
+{
+  std::lock_guard lk(NetPlay::crit_netplay_client);
+
+  if (NetPlay::netplay_client)
+    return NetPlay::netplay_client->InGamePadToLocalPad(pad_num);
+
+  return pad_num;
+}
+int SerialInterface::CSIDevice_AMBaseboard::NetPlay_InGamePadToLocalPad(int pad_num)
 {
   std::lock_guard lk(NetPlay::crit_netplay_client);
 
   if (NetPlay::netplay_client)
-    return NetPlay::netplay_client->InGamePadToLocalPad(numPAD);
+    return NetPlay::netplay_client->InGamePadToLocalPad(pad_num);
 
-  return numPAD;
+  return pad_num;
 }
diff --git a/Source/Core/Core/NetPlayProto.h b/Source/Core/Core/NetPlayProto.h
index 62a9aba9a4e6..d7df4e279a38 100644
--- a/Source/Core/Core/NetPlayProto.h
+++ b/Source/Core/Core/NetPlayProto.h
@@ -5,7 +5,6 @@
 
 #include <array>
 #include <string>
-#include <vector>
 
 #include "Common/CommonTypes.h"
 #include "Common/EnumMap.h"
@@ -68,6 +67,7 @@ struct NetSettings
   bool divide_by_zero_exceptions = false;
   bool fprf = false;
   bool accurate_nans = false;
+  bool accurate_fmadds = false;
   bool disable_icache = false;
   bool sync_on_skip_idle = false;
   bool sync_gpu = false;
diff --git a/Source/Core/Core/NetPlayServer.cpp b/Source/Core/Core/NetPlayServer.cpp
index 948dabebcd52..d26cc399c145 100644
--- a/Source/Core/Core/NetPlayServer.cpp
+++ b/Source/Core/Core/NetPlayServer.cpp
@@ -12,8 +12,8 @@
 #include <optional>
 #include <ranges>
 #include <string>
+#include <string_view>
 #include <thread>
-#include <type_traits>
 #include <unordered_set>
 #include <utility>
 #include <vector>
@@ -51,13 +51,10 @@
 #endif
 #include "Core/HW/GCMemcard/GCMemcard.h"
 #include "Core/HW/GCMemcard/GCMemcardDirectory.h"
-#include "Core/HW/GCMemcard/GCMemcardRaw.h"
 #include "Core/HW/Sram.h"
 #include "Core/HW/WiiSave.h"
 #include "Core/HW/WiiSaveStructs.h"
 #include "Core/HW/WiimoteEmu/DesiredWiimoteState.h"
-#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
-#include "Core/HW/WiimoteReal/WiimoteReal.h"
 #include "Core/IOS/ES/ES.h"
 #include "Core/IOS/FS/FileSystem.h"
 #include "Core/IOS/IOS.h"
@@ -69,7 +66,6 @@
 #include "DiscIO/Enums.h"
 #include "DiscIO/RiivolutionPatcher.h"
 
-#include "InputCommon/ControllerEmu/ControlGroup/Attachments.h"
 #include "InputCommon/GCPadStatus.h"
 #include "InputCommon/InputConfig.h"
 
@@ -77,7 +73,6 @@
 
 #if !defined(_WIN32)
 #include <sys/socket.h>
-#include <sys/types.h>
 #ifdef __HAIKU__
 #define _BSD_SOURCE
 #include <bsd/ifaddrs.h>
@@ -1425,6 +1420,7 @@ bool NetPlayServer::SetupNetSettings()
   settings.divide_by_zero_exceptions = Config::Get(Config::MAIN_DIVIDE_BY_ZERO_EXCEPTIONS);
   settings.fprf = Config::Get(Config::MAIN_FPRF);
   settings.accurate_nans = Config::Get(Config::MAIN_ACCURATE_NANS);
+  settings.accurate_fmadds = Config::Get(Config::MAIN_ACCURATE_FMADDS);
   settings.disable_icache = Config::Get(Config::MAIN_DISABLE_ICACHE);
   settings.sync_on_skip_idle = Config::Get(Config::MAIN_SYNC_ON_SKIP_IDLE);
   settings.sync_gpu = Config::Get(Config::MAIN_SYNC_GPU);
@@ -2060,7 +2056,7 @@ bool NetPlayServer::SyncCodes()
   }
 
   // Find all INI files
-  const auto game_id = game->GetGameID();
+  const std::string_view game_id = game->GetGameID();
   const auto revision = game->GetRevision();
   Common::IniFile globalIni;
   for (const std::string& filename : ConfigLoaders::GetGameIniFilenames(game_id, revision))
diff --git a/Source/Core/Core/NetPlayServer.h b/Source/Core/Core/NetPlayServer.h
index da32b64d4b35..ebd2669ed507 100644
--- a/Source/Core/Core/NetPlayServer.h
+++ b/Source/Core/Core/NetPlayServer.h
@@ -6,11 +6,8 @@
 #include <SFML/Network/Packet.hpp>
 
 #include <map>
-#include <memory>
 #include <mutex>
 #include <optional>
-#include <queue>
-#include <sstream>
 #include <thread>
 #include <unordered_map>
 #include <unordered_set>
@@ -23,7 +20,6 @@
 #include "Common/TraversalClient.h"
 #include "Core/NetPlayProto.h"
 #include "Core/SyncIdentifier.h"
-#include "InputCommon/GCPadStatus.h"
 #include "UICommon/NetPlayIndex.h"
 
 namespace NetPlay
diff --git a/Source/Core/Core/NetworkCaptureLogger.cpp b/Source/Core/Core/NetworkCaptureLogger.cpp
index b6706fc59f95..5c8b77dd11b3 100644
--- a/Source/Core/Core/NetworkCaptureLogger.cpp
+++ b/Source/Core/Core/NetworkCaptureLogger.cpp
@@ -4,9 +4,7 @@
 #include "Core/NetworkCaptureLogger.h"
 
 #include <array>
-#include <cerrno>
 #include <cstring>
-#include <iterator>
 
 #include <fmt/chrono.h>
 #include <fmt/format.h>
diff --git a/Source/Core/Core/NetworkCaptureLogger.h b/Source/Core/Core/NetworkCaptureLogger.h
index ec99489b1cb6..7642e8676c0c 100644
--- a/Source/Core/Core/NetworkCaptureLogger.h
+++ b/Source/Core/Core/NetworkCaptureLogger.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <array>
 #include <cstddef>
 #include <map>
 #include <memory>
diff --git a/Source/Core/Core/PowerPC/BreakPoints.cpp b/Source/Core/Core/PowerPC/BreakPoints.cpp
index c806c906ff35..3cf564663ec9 100644
--- a/Source/Core/Core/PowerPC/BreakPoints.cpp
+++ b/Source/Core/Core/PowerPC/BreakPoints.cpp
@@ -18,7 +18,7 @@
 #include "Core/PowerPC/Expression.h"
 #include "Core/PowerPC/JitInterface.h"
 #include "Core/PowerPC/MMU.h"
-#include "Core/PowerPC/PowerPC.h"
+#include "Core/PowerPC/PPCSymbolDB.h"
 #include "Core/System.h"
 
 BreakPoints::BreakPoints(Core::System& system) : m_system(system)
diff --git a/Source/Core/Core/PowerPC/BreakPoints.h b/Source/Core/Core/PowerPC/BreakPoints.h
index 03fc0e039a57..de22192f7af8 100644
--- a/Source/Core/Core/PowerPC/BreakPoints.h
+++ b/Source/Core/Core/PowerPC/BreakPoints.h
@@ -67,7 +67,7 @@ class BreakPoints
   void AddFromStrings(const TBreakPointsStr& bp_strings);
 
   bool IsAddressBreakPoint(u32 address) const;
-  bool IsBreakPointEnable(u32 adresss) const;
+  bool IsBreakPointEnable(u32 address) const;
   // Get the breakpoint in this address (for most purposes)
   const TBreakPoint* GetBreakpoint(u32 address) const;
   // Get the breakpoint in this address (ignore temporary breakpoint, e.g. for editing purposes)
diff --git a/Source/Core/Core/PowerPC/CachedInterpreter/CachedInterpreter.cpp b/Source/Core/Core/PowerPC/CachedInterpreter/CachedInterpreter.cpp
index a8733b91b604..3ec24a30162d 100644
--- a/Source/Core/Core/PowerPC/CachedInterpreter/CachedInterpreter.cpp
+++ b/Source/Core/Core/PowerPC/CachedInterpreter/CachedInterpreter.cpp
@@ -7,7 +7,6 @@
 #include <sstream>
 #include <utility>
 
-#include <fmt/format.h>
 #include <fmt/ostream.h>
 
 #include "Common/CommonTypes.h"
@@ -68,12 +67,12 @@ void CachedInterpreter::ExecuteOneBlock()
     const auto callback = *reinterpret_cast<const AnyCallback*>(normal_entry);
     const u8* payload = normal_entry + sizeof(callback);
     // Direct dispatch to the most commonly used callbacks for better performance
-    if (callback == reinterpret_cast<AnyCallback>(CallbackCast(Interpret<false>))) [[likely]]
+    if (callback == AnyCallbackCast(Interpret<false>)) [[likely]]
     {
       Interpret<false>(ppc_state, *reinterpret_cast<const InterpretOperands*>(payload));
       normal_entry = payload + sizeof(InterpretOperands);
     }
-    else if (callback == reinterpret_cast<AnyCallback>(CallbackCast(Interpret<true>)))
+    else if (callback == AnyCallbackCast(Interpret<true>))
     {
       Interpret<true>(ppc_state, *reinterpret_cast<const InterpretOperands*>(payload));
       normal_entry = payload + sizeof(InterpretOperands);
diff --git a/Source/Core/Core/PowerPC/CachedInterpreter/CachedInterpreterEmitter.cpp b/Source/Core/Core/PowerPC/CachedInterpreter/CachedInterpreterEmitter.cpp
index ffd104259409..08fb70e68379 100644
--- a/Source/Core/Core/PowerPC/CachedInterpreter/CachedInterpreterEmitter.cpp
+++ b/Source/Core/Core/PowerPC/CachedInterpreter/CachedInterpreterEmitter.cpp
@@ -7,7 +7,6 @@
 #include <cstring>
 
 #include "Common/Assert.h"
-#include "Common/MsgHandler.h"
 
 void CachedInterpreterEmitter::Write(AnyCallback callback, const void* operands, std::size_t size)
 {
diff --git a/Source/Core/Core/PowerPC/CachedInterpreter/CachedInterpreterEmitter.h b/Source/Core/Core/PowerPC/CachedInterpreter/CachedInterpreterEmitter.h
index 7b1554ffc10f..9a07cc61d593 100644
--- a/Source/Core/Core/PowerPC/CachedInterpreter/CachedInterpreterEmitter.h
+++ b/Source/Core/Core/PowerPC/CachedInterpreter/CachedInterpreterEmitter.h
@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include <bit>
 #include <cstddef>
 #include <iosfwd>
 #include <type_traits>
@@ -33,7 +34,7 @@ class CachedInterpreterEmitter
   template <class Operands>
   static AnyCallback AnyCallbackCast(Callback<Operands> callback)
   {
-    return reinterpret_cast<AnyCallback>(callback);
+    return std::bit_cast<AnyCallback>(callback);
   }
   static consteval AnyCallback AnyCallbackCast(AnyCallback callback) { return callback; }
 
@@ -45,7 +46,7 @@ class CachedInterpreterEmitter
   template <class Operands>
   static AnyDisassemble AnyDisassembleCast(Disassemble<Operands> disassemble)
   {
-    return reinterpret_cast<AnyDisassemble>(disassemble);
+    return std::bit_cast<AnyDisassemble>(disassemble);
   }
   static consteval AnyDisassemble AnyDisassembleCast(AnyDisassemble disassemble)
   {
diff --git a/Source/Core/Core/PowerPC/CachedInterpreter/CachedInterpreter_Disassembler.cpp b/Source/Core/Core/PowerPC/CachedInterpreter/CachedInterpreter_Disassembler.cpp
index bc62f9204cc7..665329729eb6 100644
--- a/Source/Core/Core/PowerPC/CachedInterpreter/CachedInterpreter_Disassembler.cpp
+++ b/Source/Core/Core/PowerPC/CachedInterpreter/CachedInterpreter_Disassembler.cpp
@@ -8,7 +8,6 @@
 #include <mutex>
 #include <utility>
 
-#include <fmt/format.h>
 #include <fmt/ostream.h>
 
 #include "Core/HLE/HLE.h"
diff --git a/Source/Core/Core/PowerPC/Expression.cpp b/Source/Core/Core/PowerPC/Expression.cpp
index dd477a5f4300..7b1669ed2d22 100644
--- a/Source/Core/Core/PowerPC/Expression.cpp
+++ b/Source/Core/Core/PowerPC/Expression.cpp
@@ -5,8 +5,7 @@
 
 #include <algorithm>
 #include <array>
-#include <cstdlib>
-#include <fmt/format.h>
+#include <cmath>
 #include <optional>
 #include <string>
 #include <string_view>
diff --git a/Source/Core/Core/PowerPC/GDBStub.cpp b/Source/Core/Core/PowerPC/GDBStub.cpp
index 933bd7a02d9b..daab72a526d1 100644
--- a/Source/Core/Core/PowerPC/GDBStub.cpp
+++ b/Source/Core/Core/PowerPC/GDBStub.cpp
@@ -7,9 +7,6 @@
 
 #include <fmt/format.h>
 #include <optional>
-#include <signal.h>
-#include <stdint.h>
-#include <stdio.h>
 #include <string.h>
 #ifdef _WIN32
 #include <winsock2.h>
@@ -26,16 +23,15 @@ typedef SSIZE_T ssize_t;
 #endif
 
 #include "Common/Assert.h"
-#include "Common/Event.h"
 #include "Common/Logging/Log.h"
 #include "Common/SocketContext.h"
-#include "Common/StringUtil.h"
 #include "Core/Core.h"
 #include "Core/HW/CPU.h"
 #include "Core/HW/Memmap.h"
 #include "Core/Host.h"
 #include "Core/PowerPC/BreakPoints.h"
 #include "Core/PowerPC/Gekko.h"
+#include "Core/PowerPC/MMU.h"
 #include "Core/PowerPC/PPCCache.h"
 #include "Core/PowerPC/PowerPC.h"
 #include "Core/System.h"
@@ -648,6 +644,7 @@ static void WriteRegister()
   else if (id >= 71 && id < 87)
   {
     ppc_state.sr[id - 71] = re32hex(bufptr);
+    system.GetMMU().SRUpdated();
   }
   else if (id >= 88 && id < 104)
   {
diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp
index d38ba08809a2..5ff6fa08cb29 100644
--- a/Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp
+++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter.cpp
@@ -12,15 +12,12 @@
 #include "Common/CommonTypes.h"
 #include "Common/GekkoDisassembler.h"
 #include "Common/Logging/Log.h"
-#include "Common/StringUtil.h"
 #include "Core/Config/MainSettings.h"
 #include "Core/Core.h"
 #include "Core/CoreTiming.h"
 #include "Core/Debugger/Debugger_SymbolMap.h"
 #include "Core/HLE/HLE.h"
 #include "Core/HW/CPU.h"
-#include "Core/Host.h"
-#include "Core/PowerPC/GDBStub.h"
 #include "Core/PowerPC/Interpreter/ExceptionUtils.h"
 #include "Core/PowerPC/MMU.h"
 #include "Core/PowerPC/PPCTables.h"
diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_FPUtils.h b/Source/Core/Core/PowerPC/Interpreter/Interpreter_FPUtils.h
index 0727df26ae88..d01087fe1df4 100644
--- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_FPUtils.h
+++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_FPUtils.h
@@ -342,12 +342,12 @@ inline FPResult NI_madd_msub(PowerPC::PowerPCState& ppc_state, double a, double
   //    - This will cause `d` to round to 100...00, meaning it will tie then round upwards.
   // 3. Tying up to even because `c` is too small
   //    a. The highest bit of `d` is 1, the rest of the bits of `d` are 0 (this means it ties)
-  //    b. The lowest bit of `f` is 1 (this means it ties to even downwards)
+  //    b. The lowest bit of `f` is 1 (this means it ties to even upwards)
   //    c. `c` is negative and does not round `d` downwards
   //    -  This is similar to the first one but in reverse, rounding up instead of down.
   // 4. Tying down because `d` rounded down
   //    a. The highest and lowest bits of `d` are 1, the rest of the bits of `d` are 0
-  //    b. The lowest bit of `f` is 0 (this means it ties to even upwards)
+  //    b. The lowest bit of `f` is 0 (this means it ties to even downwards)
   //    c. `c` is negative, and the highest bit of c is 1,
   //       and at least one other bit of c is nonzero
   //    - The backwards counterpart to case 2, this will cause `d` to round back down to 100..00,
@@ -375,12 +375,6 @@ inline FPResult NI_madd_msub(PowerPC::PowerPCState& ppc_state, double a, double
   // - Correct ordering of NaN checking (for both double and single precision)
   // - Rounding frC up
   // - Rounding only once for single precision inputs (this will be the large majority of cases!)
-  //   - Currently this is interpreter-only.
-  //     This can be implemented in the JIT just as easily, though.
-  //     Eventually the JITs should hopefully support detecting back to back
-  //     single-precision operations, which will lead to no overhead at all.
-  //     In the cases where JITs can't do this, an alternative method is used, as
-  //     is done in the interpreter as well.
   // - Rounding only once for double precision inputs
   //   - This is a side effect of how we handle single-precision inputs: By doing
   //     error calculations rather than checking if every input is a float, we ensure that we know
@@ -421,7 +415,7 @@ inline FPResult NI_madd_msub(PowerPC::PowerPCState& ppc_state, double a, double
     const double b_sign = sub ? -b : b;
     result.value = std::fma(a, c_round, b_sign);
 
-    // We then check if we're currently tying in rounding directioh
+    // We then check if we're currently tying in rounding direction
     const u64 result_bits = std::bit_cast<u64>(result.value);
 
     // The mask of the `d` bits as shown in the above comments
@@ -432,9 +426,8 @@ inline FPResult NI_madd_msub(PowerPC::PowerPCState& ppc_state, double a, double
 
     // Because we check this entire mask which includes a 1 bit, we can be sure that
     // if this result passes, the input is not an infinity that would become a NaN.
-    // This means that, for the JITs, if they only wanted to check for a subset of these
-    // bits (e.g. only checking if the last one was 0), then using the zero flag for a branch,
-    // they would have to check if the result was NaN before here.
+    // If we had only checked for a subset of these bits (e.g. only checking if the last
+    // one was 0), we would have needed to also check if the exponent was all ones.
     if ((result_bits & D_MASK) == EVEN_TIE)
     {
       // Because we have a tie, we now compute any error in the FMA calculation
diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp
index 134cae495c95..641a2330b9bb 100644
--- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp
+++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_FloatingPoint.cpp
@@ -4,11 +4,10 @@
 #include "Core/PowerPC/Interpreter/Interpreter.h"
 
 #include <cmath>
-#include <limits>
+#include <utility>
 
 #include "Common/CommonTypes.h"
 #include "Common/FloatUtils.h"
-#include "Common/Unreachable.h"
 #include "Core/PowerPC/Gekko.h"
 #include "Core/PowerPC/Interpreter/Interpreter_FPUtils.h"
 #include "Core/PowerPC/PowerPC.h"
@@ -81,7 +80,7 @@ void ConvertToInteger(PowerPC::PowerPCState& ppc_state, UGeckoInstruction inst,
     rounded = std::floor(b);
     break;
   default:
-    Common::Unreachable();
+    std::unreachable();
   }
 
   if (std::isnan(b))
diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Integer.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Integer.cpp
index f1fef874fd53..975f40806860 100644
--- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Integer.cpp
+++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Integer.cpp
@@ -5,7 +5,6 @@
 
 #include <bit>
 
-#include "Common/BitUtils.h"
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
 #include "Core/PowerPC/Interpreter/ExceptionUtils.h"
diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp
index 990656f5d91f..df195de68337 100644
--- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp
+++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_LoadStorePaired.cpp
@@ -11,7 +11,6 @@
 
 #include "Common/Assert.h"
 #include "Common/CommonTypes.h"
-#include "Common/MathUtil.h"
 #include "Core/PowerPC/Interpreter/ExceptionUtils.h"
 #include "Core/PowerPC/Interpreter/Interpreter_FPUtils.h"
 #include "Core/PowerPC/MMU.h"
diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Paired.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Paired.cpp
index 85d919195bc6..0e0a0eec0665 100644
--- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Paired.cpp
+++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Paired.cpp
@@ -5,7 +5,6 @@
 
 #include <cmath>
 
-#include "Common/CommonTypes.h"
 #include "Common/FloatUtils.h"
 #include "Core/PowerPC/Interpreter/Interpreter_FPUtils.h"
 #include "Core/PowerPC/PowerPC.h"
diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp
index e632ab403d21..8f30be84f4fb 100644
--- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp
+++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp
@@ -203,7 +203,8 @@ void Interpreter::mtsr(Interpreter& interpreter, UGeckoInstruction inst)
 
   const u32 index = inst.SR;
   const u32 value = ppc_state.gpr[inst.RS];
-  ppc_state.SetSR(index, value);
+  ppc_state.sr[index] = value;
+  interpreter.m_system.GetMMU().SRUpdated();
 }
 
 void Interpreter::mtsrin(Interpreter& interpreter, UGeckoInstruction inst)
@@ -217,7 +218,8 @@ void Interpreter::mtsrin(Interpreter& interpreter, UGeckoInstruction inst)
 
   const u32 index = (ppc_state.gpr[inst.RB] >> 28) & 0xF;
   const u32 value = ppc_state.gpr[inst.RS];
-  ppc_state.SetSR(index, value);
+  ppc_state.sr[index] = value;
+  interpreter.m_system.GetMMU().SRUpdated();
 }
 
 void Interpreter::mftb(Interpreter& interpreter, UGeckoInstruction inst)
diff --git a/Source/Core/Core/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/PowerPC/Jit64/Jit.cpp
index 1cdaf8c55ac9..0b976eb1c8b9 100644
--- a/Source/Core/Core/PowerPC/Jit64/Jit.cpp
+++ b/Source/Core/Core/PowerPC/Jit64/Jit.cpp
@@ -7,6 +7,7 @@
 #include <span>
 #include <sstream>
 #include <string>
+#include <utility>
 
 #include <fmt/format.h>
 #include <fmt/ostream.h>
@@ -17,12 +18,10 @@
 #endif
 
 #include "Common/CommonTypes.h"
-#include "Common/EnumUtils.h"
 #include "Common/GekkoDisassembler.h"
 #include "Common/HostDisassembler.h"
 #include "Common/IOFile.h"
 #include "Common/Logging/Log.h"
-#include "Common/StringUtil.h"
 #include "Common/Swap.h"
 #include "Common/x64ABI.h"
 #include "Core/Core.h"
@@ -514,6 +513,8 @@ void Jit64::MSRUpdated(const OpArg& msr, X64Reg scratch_reg)
 {
   ASSERT(!msr.IsSimpleReg(scratch_reg));
 
+  constexpr u32 dr_bit = 1 << UReg_MSR{}.DR.StartBit();
+
   // Update mem_ptr
   auto& memory = m_system.GetMemory();
   if (msr.IsImm())
@@ -525,7 +526,7 @@ void Jit64::MSRUpdated(const OpArg& msr, X64Reg scratch_reg)
   {
     MOV(64, R(RMEM), ImmPtr(memory.GetLogicalBase()));
     MOV(64, R(scratch_reg), ImmPtr(memory.GetPhysicalBase()));
-    TEST(32, msr, Imm32(1 << (31 - 27)));
+    TEST(32, msr, Imm32(dr_bit));
     CMOVcc(64, RMEM, R(scratch_reg), CC_Z);
   }
   MOV(64, PPCSTATE(mem_ptr), R(RMEM));
@@ -549,6 +550,25 @@ void Jit64::MSRUpdated(const OpArg& msr, X64Reg scratch_reg)
       OR(32, R(scratch_reg), Imm32(other_feature_flags));
     MOV(32, PPCSTATE(feature_flags), R(scratch_reg));
   }
+
+  // Call PageTableUpdatedFromJit if needed
+  if (!msr.IsImm() || UReg_MSR(msr.Imm32()).DR)
+  {
+    gpr.Flush();
+    fpr.Flush();
+    FixupBranch dr_unset;
+    if (!msr.IsImm())
+    {
+      TEST(32, msr, Imm32(dr_bit));
+      dr_unset = J_CC(CC_Z);
+    }
+    CMP(8, PPCSTATE(pagetable_update_pending), Imm8(0));
+    FixupBranch update_not_pending = J_CC(CC_E);
+    ABI_CallFunctionP(&PowerPC::MMU::PageTableUpdatedFromJit, &m_system.GetMMU());
+    SetJumpTarget(update_not_pending);
+    if (!msr.IsImm())
+      SetJumpTarget(dr_unset);
+  }
 }
 
 void Jit64::WriteExit(u32 destination, bool bl, u32 after)
@@ -1047,13 +1067,12 @@ bool Jit64::DoJit(u32 em_address, JitBlock* b, u32 nextPC)
 
     if (op.skip)
     {
-      if (IsDebuggingEnabled())
+      if (IsBranchWatchEnabled())
       {
         // The only thing that currently sets op.skip is the BLR following optimization.
         // If any non-branch instruction starts setting that too, this will need to be changed.
         ASSERT(op.inst.hex == 0x4e800020);
-        WriteBranchWatch<true>(op.address, op.branchTo, op.inst, RSCRATCH, RSCRATCH2,
-                               CallerSavedRegistersInUse());
+        WriteBranchWatch<true>(op.address, op.branchTo, op.inst, CallerSavedRegistersInUse());
       }
     }
     else
@@ -1071,7 +1090,7 @@ bool Jit64::DoJit(u32 em_address, JitBlock* b, u32 nextPC)
         ABI_CallFunctionP(PowerPC::CheckAndHandleBreakPointsFromJIT, &power_pc);
         ABI_PopRegistersAndAdjustStack({}, 0);
         MOV(64, R(RSCRATCH), ImmPtr(cpu.GetStatePtr()));
-        CMP(32, MatR(RSCRATCH), Imm32(Common::ToUnderlying(CPU::State::Running)));
+        CMP(32, MatR(RSCRATCH), Imm32(std::to_underlying(CPU::State::Running)));
         FixupBranch noBreakpoint = J_CC(CC_E);
 
         Cleanup();
@@ -1284,9 +1303,9 @@ BitSet8 Jit64::ComputeStaticGQRs(const PPCAnalyst::CodeBlock& cb) const
   return cb.m_gqr_used & ~cb.m_gqr_modified;
 }
 
-BitSet32 Jit64::CallerSavedRegistersInUse() const
+BitSet32 Jit64::CallerSavedRegistersInUse(BitSet32 additional_registers) const
 {
-  BitSet32 in_use = gpr.RegistersInUse() | (fpr.RegistersInUse() << 16);
+  BitSet32 in_use = gpr.RegistersInUse() | (fpr.RegistersInUse() << 16) | additional_registers;
   return in_use & ABI_ALL_CALLER_SAVED;
 }
 
diff --git a/Source/Core/Core/PowerPC/Jit64/Jit.h b/Source/Core/Core/PowerPC/Jit64/Jit.h
index ad5db1fa1033..2d8ef2be5544 100644
--- a/Source/Core/Core/PowerPC/Jit64/Jit.h
+++ b/Source/Core/Core/PowerPC/Jit64/Jit.h
@@ -22,7 +22,6 @@
 #include <rangeset/rangesizeset.h>
 
 #include "Common/CommonTypes.h"
-#include "Common/x64ABI.h"
 #include "Common/x64Emitter.h"
 #include "Core/PowerPC/Jit64/JitAsm.h"
 #include "Core/PowerPC/Jit64/RegCache/FPURegCache.h"
@@ -77,7 +76,7 @@ class Jit64 : public JitBase, public QuantizedMemoryRoutines
   // Returns false if no free memory region can be found for either of the two.
   bool SetEmitterStateToFreeCodeRegion();
 
-  BitSet32 CallerSavedRegistersInUse() const;
+  BitSet32 CallerSavedRegistersInUse(BitSet32 additional_registers = {}) const;
   BitSet8 ComputeStaticGQRs(const PPCAnalyst::CodeBlock&) const;
 
   void IntializeSpeculativeConstants();
@@ -111,10 +110,8 @@ class Jit64 : public JitBase, public QuantizedMemoryRoutines
   void WriteRfiExitDestInRSCRATCH();
   void WriteIdleExit(u32 destination);
   template <bool condition>
-  void WriteBranchWatch(u32 origin, u32 destination, UGeckoInstruction inst, Gen::X64Reg reg_a,
-                        Gen::X64Reg reg_b, BitSet32 caller_save);
-  void WriteBranchWatchDestInRSCRATCH(u32 origin, UGeckoInstruction inst, Gen::X64Reg reg_a,
-                                      Gen::X64Reg reg_b, BitSet32 caller_save);
+  void WriteBranchWatch(u32 origin, u32 destination, UGeckoInstruction inst, BitSet32 caller_save);
+  void WriteBranchWatchDestInRSCRATCH(u32 origin, UGeckoInstruction inst, BitSet32 caller_save);
 
   bool Cleanup();
 
@@ -153,9 +150,10 @@ class Jit64 : public JitBase, public QuantizedMemoryRoutines
   void FinalizeSingleResult(Gen::X64Reg output, const Gen::OpArg& input, bool packed = true,
                             bool duplicate = false);
   void FinalizeDoubleResult(Gen::X64Reg output, const Gen::OpArg& input);
-  void HandleNaNs(UGeckoInstruction inst, Gen::X64Reg xmm, Gen::X64Reg clobber,
-                  std::optional<Gen::OpArg> Ra, std::optional<Gen::OpArg> Rb,
-                  std::optional<Gen::OpArg> Rc);
+  [[nodiscard]] Gen::FixupBranch HandleNaNs(UGeckoInstruction inst, Gen::X64Reg xmm,
+                                            Gen::X64Reg clobber, std::optional<Gen::OpArg> Ra,
+                                            std::optional<Gen::OpArg> Rb,
+                                            std::optional<Gen::OpArg> Rc);
 
   void MultiplyImmediate(u32 imm, int a, int d, bool overflow);
 
diff --git a/Source/Core/Core/PowerPC/Jit64/JitAsm.cpp b/Source/Core/Core/PowerPC/Jit64/JitAsm.cpp
index eea2e75b0c32..7594d0e90e38 100644
--- a/Source/Core/Core/PowerPC/Jit64/JitAsm.cpp
+++ b/Source/Core/Core/PowerPC/Jit64/JitAsm.cpp
@@ -4,9 +4,9 @@
 #include "Core/PowerPC/Jit64/JitAsm.h"
 
 #include <climits>
+#include <utility>
 
 #include "Common/CommonTypes.h"
-#include "Common/EnumUtils.h"
 #include "Common/JitRegister.h"
 #include "Common/x64ABI.h"
 #include "Common/x64Emitter.h"
@@ -16,7 +16,6 @@
 #include "Core/HW/Memmap.h"
 #include "Core/PowerPC/Jit64/Jit.h"
 #include "Core/PowerPC/Jit64Common/Jit64PowerPCState.h"
-#include "Core/PowerPC/PowerPC.h"
 #include "Core/System.h"
 
 using namespace Gen;
@@ -99,7 +98,7 @@ void Jit64AsmRoutineManager::Generate()
   if (enable_debugging)
   {
     MOV(64, R(RSCRATCH), ImmPtr(system.GetCPU().GetStatePtr()));
-    CMP(32, MatR(RSCRATCH), Imm32(Common::ToUnderlying(CPU::State::Running)));
+    CMP(32, MatR(RSCRATCH), Imm32(std::to_underlying(CPU::State::Running)));
     dbg_exit = J_CC(CC_NE, Jump::Near);
   }
 
@@ -230,7 +229,7 @@ void Jit64AsmRoutineManager::Generate()
   // Check the state pointer to see if we are exiting
   // Gets checked on at the end of every slice
   MOV(64, R(RSCRATCH), ImmPtr(system.GetCPU().GetStatePtr()));
-  CMP(32, MatR(RSCRATCH), Imm32(Common::ToUnderlying(CPU::State::Running)));
+  CMP(32, MatR(RSCRATCH), Imm32(std::to_underlying(CPU::State::Running)));
   J_CC(CC_E, outerLoop);
 
   // Landing pad for drec space
@@ -265,6 +264,10 @@ void Jit64AsmRoutineManager::GenerateCommon()
   GenMfcr();
   cdts = AlignCode4();
   GenConvertDoubleToSingle();
+  fmadds_eft = AlignCode4();
+  GenerateFmaddsEft();
+  ps_madd_eft = AlignCode4();
+  GeneratePsMaddEft();
 
   GenQuantizedLoads();
   GenQuantizedSingleLoads();
diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_Branch.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_Branch.cpp
index bd611e2c7b5a..4667238720bc 100644
--- a/Source/Core/Core/PowerPC/Jit64/Jit_Branch.cpp
+++ b/Source/Core/Core/PowerPC/Jit64/Jit_Branch.cpp
@@ -6,7 +6,6 @@
 #include "Common/Assert.h"
 #include "Common/CommonTypes.h"
 #include "Common/x64Emitter.h"
-#include "Core/CoreTiming.h"
 #include "Core/Debugger/BranchWatch.h"
 #include "Core/PowerPC/Gekko.h"
 #include "Core/PowerPC/Jit64/RegCache/JitRegCache.h"
@@ -68,65 +67,42 @@ void Jit64::rfi(UGeckoInstruction inst)
 }
 
 template <bool condition>
-void Jit64::WriteBranchWatch(u32 origin, u32 destination, UGeckoInstruction inst, X64Reg reg_a,
-                             X64Reg reg_b, BitSet32 caller_save)
+void Jit64::WriteBranchWatch(u32 origin, u32 destination, UGeckoInstruction inst,
+                             BitSet32 caller_save)
 {
-  MOV(64, R(reg_a), ImmPtr(&m_branch_watch));
-  MOVZX(32, 8, reg_b, MDisp(reg_a, Core::BranchWatch::GetOffsetOfRecordingActive()));
-  TEST(32, R(reg_b), R(reg_b));
-
-  FixupBranch branch_in = J_CC(CC_NZ, Jump::Near);
-  SwitchToFarCode();
-  SetJumpTarget(branch_in);
-
-  ABI_PushRegistersAndAdjustStack(caller_save, 0);
-  // Some call sites have an optimization to use ABI_PARAM1 as a scratch register.
-  if (reg_a != ABI_PARAM1)
-    MOV(64, R(ABI_PARAM1), R(reg_a));
-  MOV(64, R(ABI_PARAM2), Imm64(Core::FakeBranchWatchCollectionKey{origin, destination}));
-  MOV(32, R(ABI_PARAM3), Imm32(inst.hex));
-  ABI_CallFunction(m_ppc_state.msr.IR ? (condition ? &Core::BranchWatch::HitVirtualTrue_fk :
-                                                     &Core::BranchWatch::HitVirtualFalse_fk) :
-                                        (condition ? &Core::BranchWatch::HitPhysicalTrue_fk :
-                                                     &Core::BranchWatch::HitPhysicalFalse_fk));
-  ABI_PopRegistersAndAdjustStack(caller_save, 0);
-
-  FixupBranch branch_out = J(Jump::Near);
-  SwitchToNearCode();
-  SetJumpTarget(branch_out);
+  if (IsBranchWatchEnabled())
+  {
+    ABI_PushRegistersAndAdjustStack(caller_save, 0);
+    MOV(64, R(ABI_PARAM1), ImmPtr(&m_branch_watch));
+    MOV(64, R(ABI_PARAM2), Imm64(Core::FakeBranchWatchCollectionKey{origin, destination}));
+    MOV(32, R(ABI_PARAM3), Imm32(inst.hex));
+    ABI_CallFunction(m_ppc_state.msr.IR ? (condition ? &Core::BranchWatch::HitVirtualTrue_fk :
+                                                       &Core::BranchWatch::HitVirtualFalse_fk) :
+                                          (condition ? &Core::BranchWatch::HitPhysicalTrue_fk :
+                                                       &Core::BranchWatch::HitPhysicalFalse_fk));
+    ABI_PopRegistersAndAdjustStack(caller_save, 0);
+  }
 }
 
-template void Jit64::WriteBranchWatch<true>(u32, u32, UGeckoInstruction, X64Reg, X64Reg, BitSet32);
-template void Jit64::WriteBranchWatch<false>(u32, u32, UGeckoInstruction, X64Reg, X64Reg, BitSet32);
+template void Jit64::WriteBranchWatch<true>(u32, u32, UGeckoInstruction, BitSet32);
+template void Jit64::WriteBranchWatch<false>(u32, u32, UGeckoInstruction, BitSet32);
 
-void Jit64::WriteBranchWatchDestInRSCRATCH(u32 origin, UGeckoInstruction inst, X64Reg reg_a,
-                                           X64Reg reg_b, BitSet32 caller_save)
+void Jit64::WriteBranchWatchDestInRSCRATCH(u32 origin, UGeckoInstruction inst, BitSet32 caller_save)
 {
-  MOV(64, R(reg_a), ImmPtr(&m_branch_watch));
-  MOVZX(32, 8, reg_b, MDisp(reg_a, Core::BranchWatch::GetOffsetOfRecordingActive()));
-  TEST(32, R(reg_b), R(reg_b));
-
-  FixupBranch branch_in = J_CC(CC_NZ, Jump::Near);
-  SwitchToFarCode();
-  SetJumpTarget(branch_in);
-
-  // Assert RSCRATCH won't be clobbered before it is moved from.
-  static_assert(ABI_PARAM1 != RSCRATCH);
-
-  ABI_PushRegistersAndAdjustStack(caller_save, 0);
-  // Some call sites have an optimization to use ABI_PARAM1 as a scratch register.
-  if (reg_a != ABI_PARAM1)
-    MOV(64, R(ABI_PARAM1), R(reg_a));
-  MOV(32, R(ABI_PARAM3), R(RSCRATCH));
-  MOV(32, R(ABI_PARAM2), Imm32(origin));
-  MOV(32, R(ABI_PARAM4), Imm32(inst.hex));
-  ABI_CallFunction(m_ppc_state.msr.IR ? &Core::BranchWatch::HitVirtualTrue :
-                                        &Core::BranchWatch::HitPhysicalTrue);
-  ABI_PopRegistersAndAdjustStack(caller_save, 0);
-
-  FixupBranch branch_out = J(Jump::Near);
-  SwitchToNearCode();
-  SetJumpTarget(branch_out);
+  if (IsBranchWatchEnabled())
+  {
+    // Assert RSCRATCH won't be clobbered before it is moved from.
+    static_assert(ABI_PARAM1 != RSCRATCH);
+
+    ABI_PushRegistersAndAdjustStack(caller_save, 0);
+    MOV(64, R(ABI_PARAM1), ImmPtr(&m_branch_watch));
+    MOV(32, R(ABI_PARAM3), R(RSCRATCH));
+    MOV(32, R(ABI_PARAM2), Imm32(origin));
+    MOV(32, R(ABI_PARAM4), Imm32(inst.hex));
+    ABI_CallFunction(m_ppc_state.msr.IR ? &Core::BranchWatch::HitVirtualTrue :
+                                          &Core::BranchWatch::HitPhysicalTrue);
+    ABI_PopRegistersAndAdjustStack(caller_save, 0);
+  }
 }
 
 void Jit64::bx(UGeckoInstruction inst)
@@ -144,11 +120,7 @@ void Jit64::bx(UGeckoInstruction inst)
   // Because PPCAnalyst::Flatten() merged the blocks.
   if (!js.isLastInstruction)
   {
-    if (IsDebuggingEnabled())
-    {
-      WriteBranchWatch<true>(js.compilerPC, js.op->branchTo, inst, RSCRATCH, RSCRATCH2,
-                             CallerSavedRegistersInUse());
-    }
+    WriteBranchWatch<true>(js.compilerPC, js.op->branchTo, inst, CallerSavedRegistersInUse());
     if (inst.LK && !js.op->skipLRStack)
     {
       // We have to fake the stack as the RET instruction was not
@@ -162,11 +134,7 @@ void Jit64::bx(UGeckoInstruction inst)
   gpr.Flush();
   fpr.Flush();
 
-  if (IsDebuggingEnabled())
-  {
-    // ABI_PARAM1 is safe to use after a GPR flush for an optimization in this function.
-    WriteBranchWatch<true>(js.compilerPC, js.op->branchTo, inst, ABI_PARAM1, RSCRATCH, {});
-  }
+  WriteBranchWatch<true>(js.compilerPC, js.op->branchTo, inst, {});
 #ifdef ACID_TEST
   if (inst.LK)
     AND(32, PPCSTATE(cr), Imm32(~(0xFF000000)));
@@ -217,11 +185,7 @@ void Jit64::bcx(UGeckoInstruction inst)
   if (!js.isLastInstruction && (inst.BO & BO_DONT_DECREMENT_FLAG) &&
       (inst.BO & BO_DONT_CHECK_CONDITION))
   {
-    if (IsDebuggingEnabled())
-    {
-      WriteBranchWatch<true>(js.compilerPC, js.op->branchTo, inst, RSCRATCH, RSCRATCH2,
-                             CallerSavedRegistersInUse());
-    }
+    WriteBranchWatch<true>(js.compilerPC, js.op->branchTo, inst, CallerSavedRegistersInUse());
     if (inst.LK && !js.op->skipLRStack)
     {
       // We have to fake the stack as the RET instruction was not
@@ -238,11 +202,7 @@ void Jit64::bcx(UGeckoInstruction inst)
     gpr.Flush();
     fpr.Flush();
 
-    if (IsDebuggingEnabled())
-    {
-      // ABI_PARAM1 is safe to use after a GPR flush for an optimization in this function.
-      WriteBranchWatch<true>(js.compilerPC, js.op->branchTo, inst, ABI_PARAM1, RSCRATCH, {});
-    }
+    WriteBranchWatch<true>(js.compilerPC, js.op->branchTo, inst, {});
     if (js.op->branchIsIdleLoop)
     {
       WriteIdleExit(js.op->branchTo);
@@ -262,18 +222,10 @@ void Jit64::bcx(UGeckoInstruction inst)
   {
     gpr.Flush();
     fpr.Flush();
-    if (IsDebuggingEnabled())
-    {
-      // ABI_PARAM1 is safe to use after a GPR flush for an optimization in this function.
-      WriteBranchWatch<false>(js.compilerPC, js.compilerPC + 4, inst, ABI_PARAM1, RSCRATCH, {});
-    }
+    WriteBranchWatch<false>(js.compilerPC, js.compilerPC + 4, inst, {});
     WriteExit(js.compilerPC + 4);
   }
-  else if (IsDebuggingEnabled())
-  {
-    WriteBranchWatch<false>(js.compilerPC, js.compilerPC + 4, inst, RSCRATCH, RSCRATCH2,
-                            CallerSavedRegistersInUse());
-  }
+  WriteBranchWatch<false>(js.compilerPC, js.compilerPC + 4, inst, CallerSavedRegistersInUse());
 }
 
 void Jit64::bcctrx(UGeckoInstruction inst)
@@ -297,12 +249,7 @@ void Jit64::bcctrx(UGeckoInstruction inst)
     if (inst.LK_3)
       MOV(32, PPCSTATE_LR, Imm32(js.compilerPC + 4));  // LR = PC + 4;
     AND(32, R(RSCRATCH), Imm32(0xFFFFFFFC));
-    if (IsDebuggingEnabled())
-    {
-      // ABI_PARAM1 is safe to use after a GPR flush for an optimization in this function.
-      WriteBranchWatchDestInRSCRATCH(js.compilerPC, inst, ABI_PARAM1, RSCRATCH2,
-                                     BitSet32{RSCRATCH});
-    }
+    WriteBranchWatchDestInRSCRATCH(js.compilerPC, inst, BitSet32{RSCRATCH});
     WriteExitDestInRSCRATCH(inst.LK_3, js.compilerPC + 4);
   }
   else
@@ -325,12 +272,7 @@ void Jit64::bcctrx(UGeckoInstruction inst)
       RCForkGuard fpr_guard = fpr.Fork();
       gpr.Flush();
       fpr.Flush();
-      if (IsDebuggingEnabled())
-      {
-        // ABI_PARAM1 is safe to use after a GPR flush for an optimization in this function.
-        WriteBranchWatchDestInRSCRATCH(js.compilerPC, inst, ABI_PARAM1, RSCRATCH2,
-                                       BitSet32{RSCRATCH});
-      }
+      WriteBranchWatchDestInRSCRATCH(js.compilerPC, inst, BitSet32{RSCRATCH});
       WriteExitDestInRSCRATCH(inst.LK_3, js.compilerPC + 4);
       // Would really like to continue the block here, but it ends. TODO.
     }
@@ -340,18 +282,10 @@ void Jit64::bcctrx(UGeckoInstruction inst)
     {
       gpr.Flush();
       fpr.Flush();
-      if (IsDebuggingEnabled())
-      {
-        // ABI_PARAM1 is safe to use after a GPR flush for an optimization in this function.
-        WriteBranchWatch<false>(js.compilerPC, js.compilerPC + 4, inst, ABI_PARAM1, RSCRATCH, {});
-      }
+      WriteBranchWatch<false>(js.compilerPC, js.compilerPC + 4, inst, {});
       WriteExit(js.compilerPC + 4);
     }
-    else if (IsDebuggingEnabled())
-    {
-      WriteBranchWatch<false>(js.compilerPC, js.compilerPC + 4, inst, RSCRATCH, RSCRATCH2,
-                              CallerSavedRegistersInUse());
-    }
+    WriteBranchWatch<false>(js.compilerPC, js.compilerPC + 4, inst, CallerSavedRegistersInUse());
   }
 }
 
@@ -400,21 +334,12 @@ void Jit64::bclrx(UGeckoInstruction inst)
 
     if (js.op->branchIsIdleLoop)
     {
-      if (IsDebuggingEnabled())
-      {
-        // ABI_PARAM1 is safe to use after a GPR flush for an optimization in this function.
-        WriteBranchWatch<true>(js.compilerPC, js.op->branchTo, inst, ABI_PARAM1, RSCRATCH, {});
-      }
+      WriteBranchWatch<true>(js.compilerPC, js.op->branchTo, inst, {});
       WriteIdleExit(js.op->branchTo);
     }
     else
     {
-      if (IsDebuggingEnabled())
-      {
-        // ABI_PARAM1 is safe to use after a GPR flush for an optimization in this function.
-        WriteBranchWatchDestInRSCRATCH(js.compilerPC, inst, ABI_PARAM1, RSCRATCH2,
-                                       BitSet32{RSCRATCH});
-      }
+      WriteBranchWatchDestInRSCRATCH(js.compilerPC, inst, BitSet32{RSCRATCH});
       WriteBLRExit();
     }
   }
@@ -428,16 +353,11 @@ void Jit64::bclrx(UGeckoInstruction inst)
   {
     gpr.Flush();
     fpr.Flush();
-    if (IsDebuggingEnabled())
-    {
-      // ABI_PARAM1 is safe to use after a GPR flush for an optimization in this function.
-      WriteBranchWatch<false>(js.compilerPC, js.compilerPC + 4, inst, ABI_PARAM1, RSCRATCH, {});
-    }
+    WriteBranchWatch<false>(js.compilerPC, js.compilerPC + 4, inst, {});
     WriteExit(js.compilerPC + 4);
   }
-  else if (IsDebuggingEnabled())
+  else
   {
-    WriteBranchWatch<false>(js.compilerPC, js.compilerPC + 4, inst, RSCRATCH, RSCRATCH2,
-                            CallerSavedRegistersInUse());
+    WriteBranchWatch<false>(js.compilerPC, js.compilerPC + 4, inst, CallerSavedRegistersInUse());
   }
 }
diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp
index 75cfbed3d638..86f9e4917877 100644
--- a/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp
+++ b/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp
@@ -3,7 +3,6 @@
 
 #include "Core/PowerPC/Jit64/Jit.h"
 
-#include <algorithm>
 #include <cmath>
 #include <limits>
 #include <optional>
@@ -15,12 +14,9 @@
 #include "Common/SmallVector.h"
 #include "Common/x64Emitter.h"
 #include "Core/Config/SessionSettings.h"
-#include "Core/ConfigManager.h"
-#include "Core/Core.h"
 #include "Core/PowerPC/Jit64/RegCache/JitRegCache.h"
 #include "Core/PowerPC/Jit64Common/Jit64PowerPCState.h"
 #include "Core/PowerPC/PPCAnalyst.h"
-#include "Core/PowerPC/PowerPC.h"
 
 using namespace Gen;
 
@@ -93,8 +89,9 @@ void Jit64::FinalizeDoubleResult(X64Reg output, const OpArg& input)
   SetFPRFIfNeeded(input, false);
 }
 
-void Jit64::HandleNaNs(UGeckoInstruction inst, X64Reg xmm, X64Reg clobber, std::optional<OpArg> Ra,
-                       std::optional<OpArg> Rb, std::optional<OpArg> Rc)
+FixupBranch Jit64::HandleNaNs(UGeckoInstruction inst, X64Reg xmm, X64Reg clobber,
+                              std::optional<OpArg> Ra, std::optional<OpArg> Rb,
+                              std::optional<OpArg> Rc)
 {
   //                      | PowerPC  | x86
   // ---------------------+----------+---------
@@ -104,9 +101,6 @@ void Jit64::HandleNaNs(UGeckoInstruction inst, X64Reg xmm, X64Reg clobber, std::
   // Dragon Ball: Revenge of King Piccolo requires generated NaNs
   // to be positive, so we'll have to handle them manually.
 
-  if (!m_accurate_nans)
-    return;
-
   if (inst.OPCD != 4)
   {
     // not paired-single
@@ -140,7 +134,7 @@ void Jit64::HandleNaNs(UGeckoInstruction inst, X64Reg xmm, X64Reg clobber, std::
 
     FixupBranch done = J(Jump::Near);
     SwitchToNearCode();
-    SetJumpTarget(done);
+    return done;
   }
   else
   {
@@ -217,7 +211,7 @@ void Jit64::HandleNaNs(UGeckoInstruction inst, X64Reg xmm, X64Reg clobber, std::
 
     FixupBranch done = J(Jump::Near);
     SwitchToNearCode();
-    SetJumpTarget(done);
+    return done;
   }
 }
 
@@ -329,14 +323,21 @@ void Jit64::fp_arith(UGeckoInstruction inst)
     }
   }
 
-  switch (inst.SUBOP5)
+  if (m_accurate_nans)
   {
-  case 18:
-    HandleNaNs(inst, dest, XMM0, Ra, Rarg2, std::nullopt);
-    break;
-  case 25:
-    HandleNaNs(inst, dest, XMM0, Ra, std::nullopt, Rarg2);
-    break;
+    std::optional<FixupBranch> handled_nans;
+    switch (inst.SUBOP5)
+    {
+    case 18:
+      handled_nans = HandleNaNs(inst, dest, XMM0, Ra, Rarg2, std::nullopt);
+      break;
+    case 25:
+      handled_nans = HandleNaNs(inst, dest, XMM0, Ra, std::nullopt, Rarg2);
+      break;
+    }
+
+    if (handled_nans)
+      SetJumpTarget(*handled_nans);
   }
 
   if (single)
@@ -368,51 +369,87 @@ void Jit64::fmaddXX(UGeckoInstruction inst)
   const bool use_fma = Config::Get(Config::SESSION_USE_FMA);
   const bool software_fma = use_fma && !cpu_info.bFMA;
 
-  int a = inst.FA;
-  int b = inst.FB;
-  int c = inst.FC;
-  int d = inst.FD;
-  bool single = inst.OPCD == 4 || inst.OPCD == 59;
-  bool round_input = single && !js.op->fprIsSingle[c];
-  bool preserve_inputs = m_accurate_nans;
-  bool preserve_d = preserve_inputs && (a == d || b == d || c == d);
-  bool packed =
-      inst.OPCD == 4 || (!cpu_info.bAtom && !software_fma && single && js.op->fprIsDuplicated[a] &&
-                         js.op->fprIsDuplicated[b] && js.op->fprIsDuplicated[c]);
+  const int a = inst.FA;
+  const int b = inst.FB;
+  const int c = inst.FC;
+  const int d = inst.FD;
 
   const bool subtract = inst.SUBOP5 == 28 || inst.SUBOP5 == 30;  // msub, nmsub
   const bool negate = inst.SUBOP5 == 30 || inst.SUBOP5 == 31;    // nmsub, nmadd
   const bool madds0 = inst.SUBOP5 == 14;
   const bool madds1 = inst.SUBOP5 == 15;
-  const bool madds_accurate_nans = m_accurate_nans && (madds0 || madds1);
+  const bool single = inst.OPCD == 4 || inst.OPCD == 59;
+  const bool round_input = single && !js.op->fprIsSingle[c];
+
+  const bool error_free_transformation = single && m_accurate_fmadds;
+  const bool packed =
+      inst.OPCD == 4 ||
+      (!cpu_info.bAtom && !software_fma && !error_free_transformation && single &&
+       js.op->fprIsDuplicated[a] && js.op->fprIsDuplicated[b] && js.op->fprIsDuplicated[c]);
+
+  const bool want_rc_rounded =
+      (error_free_transformation || (software_fma && packed)) && round_input;
+  const bool error_free_transformation_wants_rc_duplicated =
+      (error_free_transformation && !want_rc_rounded) && (madds0 || madds1);
+  const bool accurate_nans_wants_rc_duplicated = m_accurate_nans && (madds0 || madds1);
+  const bool want_rc_duplicated =
+      error_free_transformation_wants_rc_duplicated || accurate_nans_wants_rc_duplicated;
+
+  const bool preserve_d_due_to_a_or_b =
+      (m_accurate_nans || error_free_transformation) && (a == d || b == d);
+  const bool preserve_d_due_to_c =
+      c == d && ((m_accurate_nans && (!want_rc_duplicated || software_fma)) ||
+                 (error_free_transformation && !want_rc_rounded));
+  const bool preserve_d = preserve_d_due_to_a_or_b || preserve_d_due_to_c;
 
   X64Reg scratch_xmm = XMM0;
   X64Reg result_xmm = XMM1;
   X64Reg Rc_duplicated = XMM2;
+  X64Reg Rc_rounded = XMM3;
+
+  BitSet32 scratch_registers{XMM0 + 16, XMM1 + 16};
+
+  RCX64Reg xmm2_guard;
+  RCX64Reg xmm3_guard;
+  if (error_free_transformation)
+  {
+    xmm2_guard = fpr.Scratch(XMM2);
+    xmm3_guard = fpr.Scratch(XMM3);
+    RegCache::Realize(xmm2_guard, xmm3_guard);
+    scratch_registers[XMM2 + 16] = true;
+    scratch_registers[XMM3 + 16] = true;
+  }
+  else if (software_fma)
+  {
+    xmm2_guard = fpr.Scratch(XMM2);
+    RegCache::Realize(xmm2_guard);
+    scratch_registers[XMM2 + 16] = true;
+  }
 
   RCOpArg Ra;
   RCOpArg Rb;
   RCOpArg Rc;
   RCX64Reg Rd;
-  RCX64Reg xmm2_guard;
   RCX64Reg result_xmm_guard;
   RCX64Reg Rc_duplicated_guard;
   if (software_fma)
   {
-    xmm2_guard = fpr.Scratch(XMM2);
-    Ra = packed ? fpr.Bind(a, RCMode::Read) : fpr.Use(a, RCMode::Read);
-    Rb = packed ? fpr.Bind(b, RCMode::Read) : fpr.Use(b, RCMode::Read);
-    Rc = packed ? fpr.Bind(c, RCMode::Read) : fpr.Use(c, RCMode::Read);
+    Ra = packed || error_free_transformation ? fpr.Bind(a, RCMode::Read) : fpr.Use(a, RCMode::Read);
+    Rb = packed || error_free_transformation ? fpr.Bind(b, RCMode::Read) : fpr.Use(b, RCMode::Read);
+    Rc = packed || (error_free_transformation && !want_rc_rounded && !want_rc_duplicated) ?
+             fpr.Bind(c, RCMode::Read) :
+             fpr.Use(c, RCMode::Read);
     Rd = fpr.Bind(d, single ? RCMode::Write : RCMode::ReadWrite);
     if (preserve_d && packed)
     {
       result_xmm_guard = fpr.Scratch();
-      RegCache::Realize(Ra, Rb, Rc, Rd, xmm2_guard, result_xmm_guard);
+      RegCache::Realize(Ra, Rb, Rc, Rd, result_xmm_guard);
       result_xmm = Gen::X64Reg(result_xmm_guard);
+      scratch_registers[result_xmm + 16] = true;
     }
     else
     {
-      RegCache::Realize(Ra, Rb, Rc, Rd, xmm2_guard);
+      RegCache::Realize(Ra, Rb, Rc, Rd);
       result_xmm = packed ? Gen::X64Reg(Rd) : XMM0;
     }
   }
@@ -421,48 +458,88 @@ void Jit64::fmaddXX(UGeckoInstruction inst)
     // For use_fma == true:
     //   Statistics suggests b is a lot less likely to be unbound in practice, so
     //   if we have to pick one of a or b to bind, let's make it b.
-    Ra = fpr.Use(a, RCMode::Read);
-    Rb = use_fma ? fpr.Bind(b, RCMode::Read) : fpr.Use(b, RCMode::Read);
-    Rc = fpr.Use(c, RCMode::Read);
+    Ra = error_free_transformation ? fpr.Bind(a, RCMode::Read) : fpr.Use(a, RCMode::Read);
+    Rb =
+        use_fma || error_free_transformation ? fpr.Bind(b, RCMode::Read) : fpr.Use(b, RCMode::Read);
+    Rc = error_free_transformation && !want_rc_rounded && !want_rc_duplicated ?
+             fpr.Bind(c, RCMode::Read) :
+             fpr.Use(c, RCMode::Read);
     Rd = fpr.Bind(d, single ? RCMode::Write : RCMode::ReadWrite);
     RegCache::Realize(Ra, Rb, Rc, Rd);
+  }
 
-    if (madds_accurate_nans)
-    {
-      Rc_duplicated_guard = fpr.Scratch();
-      RegCache::Realize(Rc_duplicated_guard);
-      Rc_duplicated = Rc_duplicated_guard;
-    }
+  if (error_free_transformation_wants_rc_duplicated ||
+      (accurate_nans_wants_rc_duplicated &&
+       ((!software_fma && !error_free_transformation) || (error_free_transformation && packed))))
+  {
+    Rc_duplicated_guard = fpr.Scratch();
+    RegCache::Realize(Rc_duplicated_guard);
+    Rc_duplicated = Rc_duplicated_guard;
+    scratch_registers[Rc_duplicated + 16] = true;
   }
 
+  const auto registers_to_save = [&](BitSet32 scratch_registers_to_save) {
+    const BitSet32 scratch_registers_not_to_save = scratch_registers & ~scratch_registers_to_save;
+    return CallerSavedRegistersInUse(scratch_registers_to_save) & ~scratch_registers_not_to_save;
+  };
+
   if (software_fma)
   {
+    if (want_rc_rounded)
+    {
+      if (error_free_transformation && madds0)
+      {
+        MOVDDUP(Rc_rounded, Rc);
+        Force25BitPrecision(Rc_rounded, R(Rc_rounded), XMM2);
+      }
+      else if (error_free_transformation && madds1)
+      {
+        avx_op(&XEmitter::VSHUFPD, &XEmitter::SHUFPD, Rc_rounded, Rc, Rc, 3);
+        Force25BitPrecision(Rc_rounded, R(Rc_rounded), XMM2);
+      }
+      else
+      {
+        Force25BitPrecision(Rc_rounded, Rc, XMM2);
+      }
+    }
+
     for (size_t i = (packed ? 1 : 0); i != std::numeric_limits<size_t>::max(); --i)
     {
-      if ((i == 0 || madds0) && !madds1)
+      if (madds0 || (i == 0 && !madds1) || (want_rc_rounded && error_free_transformation && madds1))
       {
-        if (round_input)
+        if (want_rc_rounded)
+          MOVAPD(XMM1, R(Rc_rounded));
+        else if (round_input)
           Force25BitPrecision(XMM1, Rc, XMM2);
+        else if (Rc.IsSimpleReg())
+          MOVAPD(XMM1, Rc);
         else
           MOVSD(XMM1, Rc);
       }
       else
       {
-        MOVHLPS(XMM1, Rc.GetSimpleReg());
-        if (round_input)
+        MOVHLPS(XMM1, want_rc_rounded ? Rc_rounded : Rc.GetSimpleReg());
+        if (round_input && !want_rc_rounded)
           Force25BitPrecision(XMM1, R(XMM1), XMM2);
       }
 
       // Write the result from the previous loop iteration into result_xmm so we don't lose it.
       // It's important that this is done after reading Rc above, in case we have madds1 and
-      // result_xmm == Rd == Rc.
+      // !want_rc_rounded and result_xmm == Rd == Rc.
       if (packed && i == 0)
         MOVLHPS(result_xmm, XMM0);
 
       if (i == 0)
       {
-        MOVSD(XMM0, Ra);
-        MOVSD(XMM2, Rb);
+        if (Ra.IsSimpleReg())
+          MOVAPD(XMM0, Ra);
+        else
+          MOVSD(XMM0, Ra);
+
+        if (Rb.IsSimpleReg())
+          MOVAPD(XMM2, Rb);
+        else
+          MOVSD(XMM2, Rb);
       }
       else
       {
@@ -473,23 +550,36 @@ void Jit64::fmaddXX(UGeckoInstruction inst)
       if (subtract)
         XORPS(XMM2, MConst(psSignBits));
 
-      BitSet32 registers_in_use = CallerSavedRegistersInUse();
+      BitSet32 scratch_registers_to_save{};
+      if (packed && i == 0)
+        scratch_registers_to_save[result_xmm + 16] = true;
+      if (want_rc_rounded && (error_free_transformation || i == 1))
+        scratch_registers_to_save[Rc_rounded + 16] = true;
+
+      const BitSet32 registers_in_use = registers_to_save(scratch_registers_to_save);
       ABI_PushRegistersAndAdjustStack(registers_in_use, 0);
       ABI_CallFunction(static_cast<double (*)(double, double, double)>(&std::fma));
       ABI_PopRegistersAndAdjustStack(registers_in_use, 0);
     }
 
     if (packed)
+    {
+      // result_xmm's upper lane has the result of the first loop iteration
       MOVSD(R(result_xmm), XMM0);
+    }
     else
+    {
       DEBUG_ASSERT(result_xmm == XMM0);
+    }
 
-    if (madds_accurate_nans)
+    if (want_rc_duplicated)
     {
       if (madds0)
         MOVDDUP(Rc_duplicated, Rc);
-      else
+      else if (madds1)
         avx_op(&XEmitter::VSHUFPD, &XEmitter::SHUFPD, Rc_duplicated, Rc, Rc, 3);
+      else
+        DEBUG_ASSERT(false);
     }
   }
   else
@@ -497,7 +587,7 @@ void Jit64::fmaddXX(UGeckoInstruction inst)
     if (madds0)
     {
       MOVDDUP(result_xmm, Rc);
-      if (madds_accurate_nans)
+      if (want_rc_duplicated)
         MOVAPD(R(Rc_duplicated), result_xmm);
       if (round_input)
         Force25BitPrecision(result_xmm, R(result_xmm), scratch_xmm);
@@ -505,18 +595,21 @@ void Jit64::fmaddXX(UGeckoInstruction inst)
     else if (madds1)
     {
       avx_op(&XEmitter::VSHUFPD, &XEmitter::SHUFPD, result_xmm, Rc, Rc, 3);
-      if (madds_accurate_nans)
+      if (want_rc_duplicated)
         MOVAPD(R(Rc_duplicated), result_xmm);
       if (round_input)
         Force25BitPrecision(result_xmm, R(result_xmm), scratch_xmm);
     }
     else
     {
+      DEBUG_ASSERT(!want_rc_duplicated);
       if (round_input)
         Force25BitPrecision(result_xmm, Rc, scratch_xmm);
       else
         MOVAPD(result_xmm, Rc);
     }
+    if (want_rc_rounded)
+      MOVAPD(R(Rc_rounded), result_xmm);
 
     if (use_fma)
     {
@@ -556,6 +649,160 @@ void Jit64::fmaddXX(UGeckoInstruction inst)
     }
   }
 
+  if (m_accurate_nans && result_xmm == XMM0)
+  {
+    // HandleNaNs needs to clobber XMM0
+    result_xmm = error_free_transformation ? XMM1 : Rd;
+    MOVAPD(result_xmm, R(XMM0));
+    DEBUG_ASSERT(!preserve_d);
+  }
+
+  std::optional<FixupBranch> handled_nans;
+  if (!packed && m_accurate_nans)
+  {
+    // The clobber register is unused when not packed.
+    handled_nans =
+        HandleNaNs(inst, result_xmm, XMM0, Ra, Rb, want_rc_duplicated ? R(Rc_duplicated) : Rc);
+  }
+
+  // Read the comment in the interpreter function NI_madd_msub to find out what's going on here.
+  if (error_free_transformation)
+  {
+    if (result_xmm != XMM1)
+    {
+      MOVAPD(XMM1, R(result_xmm));
+      result_xmm = XMM1;
+    }
+
+    X64Reg Rc_rounded_duplicated = Rc.GetSimpleReg();
+    BitSet32 scratch_registers_to_save = {XMM1 + 16, XMM2 + 16};
+    if (want_rc_rounded)
+    {
+      Rc_rounded_duplicated = Rc_rounded;
+      scratch_registers_to_save[Rc_rounded] = true;
+    }
+    else if (want_rc_duplicated)
+    {
+      Rc_rounded_duplicated = Rc_duplicated;
+      scratch_registers_to_save[want_rc_duplicated] = true;
+    }
+
+    // We've calculated s := a + b, with a = Ra * Rc_rounded_duplicated, b = subtract ? -Rb : Rb
+
+    if (packed)
+    {
+      // a' := s - b
+      if (subtract)
+        avx_op(&XEmitter::VADDPD, &XEmitter::ADDPD, XMM0, R(XMM1), Rb);
+      else
+        avx_op(&XEmitter::VSUBPD, &XEmitter::SUBPD, XMM0, R(XMM1), Rb);
+
+      // b' := s - a'
+      avx_op(&XEmitter::VSUBPD, &XEmitter::SUBPD, XMM2, R(XMM1), R(XMM0));
+
+      // da := a - a'
+      if (software_fma)
+      {
+        scratch_registers_to_save[XMM0 + 16] = true;
+        const BitSet32 registers_in_use_1 = registers_to_save(scratch_registers_to_save);
+        ABI_PushRegistersAndAdjustStack(registers_in_use_1, 0);
+
+        avx_op(&XEmitter::VXORPS, &XEmitter::XORPS, XMM2, R(XMM0), MConst(psSignBits));
+        MOVAPD(XMM0, R(Rc_rounded_duplicated));
+        MOVAPD(XMM1, Ra);
+
+        ABI_CallFunction(static_cast<double (*)(double, double, double)>(&std::fma));
+
+        // We will read from the upper lane of Rc_rounded_duplicated later,
+        // so we need to make sure that that lane isn't overwritten.
+        if (Rc_rounded_duplicated == XMM3)
+          MOVSD(XMM3, R(XMM0));
+        else
+          MOVAPD(XMM3, R(XMM0));
+
+        ABI_PopRegistersAndAdjustStack(registers_in_use_1, 0);
+
+        scratch_registers_to_save[XMM0 + 16] = false;
+        scratch_registers_to_save[XMM3 + 16] = true;
+        const BitSet32 registers_in_use_2 = registers_to_save(scratch_registers_to_save);
+        ABI_PushRegistersAndAdjustStack(registers_in_use_2, 0);
+
+        MOVHLPS(XMM2, XMM0);
+        XORPS(XMM2, MConst(psSignBits));
+        MOVHLPS(XMM0, Rc_rounded_duplicated);
+        MOVHLPS(XMM1, Ra.GetSimpleReg());
+
+        ABI_CallFunction(static_cast<double (*)(double, double, double)>(&std::fma));
+
+        ABI_PopRegistersAndAdjustStack(registers_in_use_2, 0);
+
+        UNPCKLPD(XMM0, R(XMM3));
+      }
+      else if (use_fma)
+      {
+        VFMSUB231PD(XMM0, Rc_rounded_duplicated, Ra);
+      }
+      else
+      {
+        avx_op(&XEmitter::VMULPD, &XEmitter::MULPD, XMM3, R(Rc_rounded_duplicated), Ra);
+        avx_op(&XEmitter::VSUBPD, &XEmitter::SUBPD, XMM0, R(XMM3), R(XMM0), true, false, XMM3);
+      }
+
+      // db := b - b'
+      // (Transformed into -db := b' - b)
+      if (subtract)
+        avx_op(&XEmitter::VADDPD, &XEmitter::ADDPD, XMM2, R(XMM2), Rb);
+      else
+        avx_op(&XEmitter::VSUBPD, &XEmitter::SUBPD, XMM2, R(XMM2), Rb);
+
+      CALL(GetAsmRoutines()->ps_madd_eft);
+    }
+    else
+    {
+      // a' := s - b
+      if (subtract)
+        avx_op(&XEmitter::VADDSD, &XEmitter::ADDSD, XMM0, R(XMM1), Rb, false);
+      else
+        avx_op(&XEmitter::VSUBSD, &XEmitter::SUBSD, XMM0, R(XMM1), Rb, false);
+
+      // b' := s - a'
+      avx_op(&XEmitter::VSUBSD, &XEmitter::SUBSD, XMM2, R(XMM1), R(XMM0), false);
+
+      // da := a - a'
+      if (software_fma)
+      {
+        const BitSet32 registers_in_use = registers_to_save(scratch_registers_to_save);
+        ABI_PushRegistersAndAdjustStack(registers_in_use, 0);
+
+        avx_op(&XEmitter::VXORPS, &XEmitter::XORPS, XMM2, R(XMM0), MConst(psSignBits));
+        MOVAPD(XMM0, R(Rc_rounded_duplicated));
+        MOVAPD(XMM1, Ra);
+
+        ABI_CallFunction(static_cast<double (*)(double, double, double)>(&std::fma));
+
+        ABI_PopRegistersAndAdjustStack(registers_in_use, 0);
+      }
+      else if (use_fma)
+      {
+        VFMSUB231SD(XMM0, Rc_rounded_duplicated, Ra);
+      }
+      else
+      {
+        avx_op(&XEmitter::VMULSD, &XEmitter::MULSD, XMM3, R(Rc_rounded_duplicated), Ra, false);
+        avx_op(&XEmitter::VSUBSD, &XEmitter::SUBSD, XMM0, R(XMM3), R(XMM0), false, false, XMM3);
+      }
+
+      // db := b - b'
+      // (Transformed into -db := b' - b)
+      if (subtract)
+        ADDSD(XMM2, Rb);
+      else
+        SUBSD(XMM2, Rb);
+
+      CALL(GetAsmRoutines()->fmadds_eft);
+    }
+  }
+
   // Using x64's nmadd/nmsub would require us to swap the sign of the addend
   // (i.e. PPC nmadd maps to x64 nmsub), which can cause problems with signed zeroes.
   // Also, PowerPC's nmadd/nmsub round before the final negation unlike x64's nmadd/nmsub.
@@ -563,16 +810,19 @@ void Jit64::fmaddXX(UGeckoInstruction inst)
   if (negate)
     XORPD(result_xmm, MConst(packed ? psSignBits2 : psSignBits));
 
-  if (m_accurate_nans && result_xmm == XMM0)
+  if (packed && m_accurate_nans)
   {
-    // HandleNaNs needs to clobber XMM0
-    MOVAPD(Rd, R(result_xmm));
-    result_xmm = Rd;
-    DEBUG_ASSERT(!preserve_d);
+    // If packed, the clobber register must be XMM0.
+    handled_nans =
+        HandleNaNs(inst, result_xmm, XMM0, Ra, Rb, want_rc_duplicated ? R(Rc_duplicated) : Rc);
   }
 
-  // If packed, the clobber register must be XMM0. If not packed, the clobber register is unused.
-  HandleNaNs(inst, result_xmm, XMM0, Ra, Rb, madds_accurate_nans ? R(Rc_duplicated) : Rc);
+  // If the handled_nans branch was taken in the non-packed case, that means the result is NaN,
+  // so we can skip the XORPD and the error-free transformation. If the handled_nans branch was
+  // taken in the packed case, we don't know if both of the results were NaN or only one, so we
+  // can't skip anything.
+  if (handled_nans)
+    SetJumpTarget(*handled_nans);
 
   if (single)
     FinalizeSingleResult(Rd, R(result_xmm), packed, true);
diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp
index 21db558bdb03..f3c329cef4c7 100644
--- a/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp
+++ b/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp
@@ -8,22 +8,18 @@
 #include <limits>
 
 #include "Common/Assert.h"
-#include "Common/BitUtils.h"
 #include "Common/CPUDetect.h"
 #include "Common/CommonTypes.h"
 #include "Common/MathUtil.h"
 #include "Common/SmallVector.h"
 #include "Common/x64Emitter.h"
 
-#include "Core/CoreTiming.h"
 #include "Core/PowerPC/ConditionRegister.h"
 #include "Core/PowerPC/Interpreter/ExceptionUtils.h"
-#include "Core/PowerPC/Interpreter/Interpreter.h"
 #include "Core/PowerPC/Jit64/RegCache/JitRegCache.h"
 #include "Core/PowerPC/Jit64Common/Jit64PowerPCState.h"
 #include "Core/PowerPC/JitCommon/DivUtils.h"
 #include "Core/PowerPC/PPCAnalyst.h"
-#include "Core/PowerPC/PowerPC.h"
 
 using namespace Gen;
 using namespace JitCommon;
@@ -391,11 +387,7 @@ void Jit64::DoMergedBranch()
       MOV(32, PPCSTATE_SPR(SPR_LR), Imm32(nextPC + 4));
 
     const u32 destination = js.op[1].branchTo;
-    if (IsDebuggingEnabled())
-    {
-      // ABI_PARAM1 is safe to use after a GPR flush for an optimization in this function.
-      WriteBranchWatch<true>(nextPC, destination, next, ABI_PARAM1, RSCRATCH, {});
-    }
+    WriteBranchWatch<true>(nextPC, destination, next, {});
     WriteIdleExit(destination);
   }
   else if (next.OPCD == 16)  // bcx
@@ -404,11 +396,7 @@ void Jit64::DoMergedBranch()
       MOV(32, PPCSTATE_SPR(SPR_LR), Imm32(nextPC + 4));
 
     const u32 destination = js.op[1].branchTo;
-    if (IsDebuggingEnabled())
-    {
-      // ABI_PARAM1 is safe to use after a GPR flush for an optimization in this function.
-      WriteBranchWatch<true>(nextPC, destination, next, ABI_PARAM1, RSCRATCH, {});
-    }
+    WriteBranchWatch<true>(nextPC, destination, next, {});
     WriteExit(destination, next.LK, nextPC + 4);
   }
   else if ((next.OPCD == 19) && (next.SUBOP10 == 528))  // bcctrx
@@ -417,11 +405,7 @@ void Jit64::DoMergedBranch()
       MOV(32, PPCSTATE_SPR(SPR_LR), Imm32(nextPC + 4));
     MOV(32, R(RSCRATCH), PPCSTATE_SPR(SPR_CTR));
     AND(32, R(RSCRATCH), Imm32(0xFFFFFFFC));
-    if (IsDebuggingEnabled())
-    {
-      // ABI_PARAM1 is safe to use after a GPR flush for an optimization in this function.
-      WriteBranchWatchDestInRSCRATCH(nextPC, next, ABI_PARAM1, RSCRATCH2, BitSet32{RSCRATCH});
-    }
+    WriteBranchWatchDestInRSCRATCH(nextPC, next, BitSet32{RSCRATCH});
     WriteExitDestInRSCRATCH(next.LK, nextPC + 4);
   }
   else if ((next.OPCD == 19) && (next.SUBOP10 == 16))  // bclrx
@@ -431,11 +415,7 @@ void Jit64::DoMergedBranch()
       AND(32, R(RSCRATCH), Imm32(0xFFFFFFFC));
     if (next.LK)
       MOV(32, PPCSTATE_SPR(SPR_LR), Imm32(nextPC + 4));
-    if (IsDebuggingEnabled())
-    {
-      // ABI_PARAM1 is safe to use after a GPR flush for an optimization in this function.
-      WriteBranchWatchDestInRSCRATCH(nextPC, next, ABI_PARAM1, RSCRATCH2, BitSet32{RSCRATCH});
-    }
+    WriteBranchWatchDestInRSCRATCH(nextPC, next, BitSet32{RSCRATCH});
     WriteBLRExit();
   }
   else
@@ -492,17 +472,12 @@ void Jit64::DoMergedBranchCondition()
   {
     gpr.Flush();
     fpr.Flush();
-    if (IsDebuggingEnabled())
-    {
-      // ABI_PARAM1 is safe to use after a GPR flush for an optimization in this function.
-      WriteBranchWatch<false>(nextPC, nextPC + 4, next, ABI_PARAM1, RSCRATCH, {});
-    }
+    WriteBranchWatch<false>(nextPC, nextPC + 4, next, {});
     WriteExit(nextPC + 4);
   }
-  else if (IsDebuggingEnabled())
+  else
   {
-    WriteBranchWatch<false>(nextPC, nextPC + 4, next, RSCRATCH, RSCRATCH2,
-                            CallerSavedRegistersInUse());
+    WriteBranchWatch<false>(nextPC, nextPC + 4, next, CallerSavedRegistersInUse());
   }
 }
 
@@ -544,17 +519,12 @@ void Jit64::DoMergedBranchImmediate(s64 val)
   {
     gpr.Flush();
     fpr.Flush();
-    if (IsDebuggingEnabled())
-    {
-      // ABI_PARAM1 is safe to use after a GPR flush for an optimization in this function.
-      WriteBranchWatch<false>(nextPC, nextPC + 4, next, ABI_PARAM1, RSCRATCH, {});
-    }
+    WriteBranchWatch<false>(nextPC, nextPC + 4, next, {});
     WriteExit(nextPC + 4);
   }
-  else if (IsDebuggingEnabled())
+  else
   {
-    WriteBranchWatch<false>(nextPC, nextPC + 4, next, RSCRATCH, RSCRATCH2,
-                            CallerSavedRegistersInUse());
+    WriteBranchWatch<false>(nextPC, nextPC + 4, next, CallerSavedRegistersInUse());
   }
 }
 
diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_LoadStore.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_LoadStore.cpp
index ec3be83438c0..b4a3b4ef43e5 100644
--- a/Source/Core/Core/PowerPC/Jit64/Jit_LoadStore.cpp
+++ b/Source/Core/Core/PowerPC/Jit64/Jit_LoadStore.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 // TODO(ector): Tons of pshufb optimization of the loads/stores, for SSSE3+, possibly SSE4, only.
-// Should give a very noticable speed boost to paired single heavy code.
+// Should give a very noticeable speed boost to paired single heavy code.
 
 #include "Core/PowerPC/Jit64/Jit.h"
 
@@ -305,25 +305,16 @@ void Jit64::dcbx(UGeckoInstruction inst)
     // Load the loop_counter register with the amount of invalidations to execute.
     LEA(32, loop_counter, MDisp(RSCRATCH2, 1));
 
-    if (IsDebuggingEnabled())
+    if (IsBranchWatchEnabled())
     {
-      const X64Reg bw_reg_a = reg_cycle_count, bw_reg_b = reg_downcount;
       const BitSet32 bw_caller_save = (CallerSavedRegistersInUse() | BitSet32{RSCRATCH2}) &
-                                      ~BitSet32{int(bw_reg_a), int(bw_reg_b)};
-
-      MOV(64, R(bw_reg_a), ImmPtr(&m_branch_watch));
-      MOVZX(32, 8, bw_reg_b, MDisp(bw_reg_a, Core::BranchWatch::GetOffsetOfRecordingActive()));
-      TEST(32, R(bw_reg_b), R(bw_reg_b));
-
-      FixupBranch branch_in = J_CC(CC_NZ, Jump::Near);
-      SwitchToFarCode();
-      SetJumpTarget(branch_in);
+                                      ~BitSet32{int(reg_cycle_count), int(reg_downcount)};
 
       // Assert RSCRATCH2 won't be clobbered before it is moved from.
       static_assert(RSCRATCH2 != ABI_PARAM1);
 
       ABI_PushRegistersAndAdjustStack(bw_caller_save, 0);
-      MOV(64, R(ABI_PARAM1), R(bw_reg_a));
+      MOV(64, R(ABI_PARAM1), ImmPtr(&m_branch_watch));
       // RSCRATCH2 holds the amount of faked branch watch hits. Move RSCRATCH2 first, because
       // ABI_PARAM2 clobbers RSCRATCH2 on Windows and ABI_PARAM3 clobbers RSCRATCH2 on Linux!
       MOV(32, R(ABI_PARAM4), R(RSCRATCH2));
@@ -333,10 +324,6 @@ void Jit64::dcbx(UGeckoInstruction inst)
       ABI_CallFunction(m_ppc_state.msr.IR ? &Core::BranchWatch::HitVirtualTrue_fk_n :
                                             &Core::BranchWatch::HitPhysicalTrue_fk_n);
       ABI_PopRegistersAndAdjustStack(bw_caller_save, 0);
-
-      FixupBranch branch_out = J(Jump::Near);
-      SwitchToNearCode();
-      SetJumpTarget(branch_out);
     }
   }
 
diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_LoadStoreFloating.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_LoadStoreFloating.cpp
index 7b347a374288..4d64010838f7 100644
--- a/Source/Core/Core/PowerPC/Jit64/Jit_LoadStoreFloating.cpp
+++ b/Source/Core/Core/PowerPC/Jit64/Jit_LoadStoreFloating.cpp
@@ -7,7 +7,7 @@
 #include "Common/CommonTypes.h"
 #include "Common/x64Emitter.h"
 #include "Core/PowerPC/Jit64/RegCache/JitRegCache.h"
-#include "Core/PowerPC/Jit64Common/Jit64PowerPCState.h"
+#include "Core/PowerPC/Jit64Common/Jit64Constants.h"
 
 using namespace Gen;
 
diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_LoadStorePaired.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_LoadStorePaired.cpp
index 78b00b99f0b8..8dfee9239be4 100644
--- a/Source/Core/Core/PowerPC/Jit64/Jit_LoadStorePaired.cpp
+++ b/Source/Core/Core/PowerPC/Jit64/Jit_LoadStorePaired.cpp
@@ -10,7 +10,6 @@
 #include "Common/x64Emitter.h"
 #include "Core/PowerPC/Jit64/RegCache/JitRegCache.h"
 #include "Core/PowerPC/Jit64Common/Jit64PowerPCState.h"
-#include "Core/PowerPC/JitCommon/JitAsmCommon.h"
 #include "Core/PowerPC/PowerPC.h"
 
 using namespace Gen;
diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_Paired.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_Paired.cpp
index 930757cdadd8..2e1b05cb427d 100644
--- a/Source/Core/Core/PowerPC/Jit64/Jit_Paired.cpp
+++ b/Source/Core/Core/PowerPC/Jit64/Jit_Paired.cpp
@@ -5,8 +5,6 @@
 
 #include <optional>
 
-#include "Common/CPUDetect.h"
-#include "Common/CommonTypes.h"
 #include "Common/MsgHandler.h"
 #include "Common/x64Emitter.h"
 #include "Core/PowerPC/Jit64/RegCache/JitRegCache.h"
@@ -100,12 +98,19 @@ void Jit64::ps_muls(UGeckoInstruction inst)
   default:
     PanicAlertFmt("ps_muls WTF!!!");
   }
+
   if (round_input)
     Force25BitPrecision(XMM1, R(Rc_duplicated), XMM0);
   else if (XMM1 != Rc_duplicated)
     MOVAPD(XMM1, Rc_duplicated);
   MULPD(XMM1, Ra);
-  HandleNaNs(inst, XMM1, XMM0, Ra, std::nullopt, Rc_duplicated);
+
+  if (m_accurate_nans)
+  {
+    const FixupBranch handled_nans = HandleNaNs(inst, XMM1, XMM0, Ra, std::nullopt, Rc_duplicated);
+    SetJumpTarget(handled_nans);
+  }
+
   FinalizeSingleResult(Rd, R(XMM1));
 }
 
diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_SystemRegisters.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_SystemRegisters.cpp
index 63313583594a..70eb2e402799 100644
--- a/Source/Core/Core/PowerPC/Jit64/Jit_SystemRegisters.cpp
+++ b/Source/Core/Core/PowerPC/Jit64/Jit_SystemRegisters.cpp
@@ -436,11 +436,14 @@ void Jit64::mtmsr(UGeckoInstruction inst)
   FALLBACK_IF(jo.fp_exceptions);
 
   {
-    RCOpArg Rs = gpr.BindOrImm(inst.RS, RCMode::Read);
-    RegCache::Realize(Rs);
-    MOV(32, PPCSTATE(msr), Rs);
-
-    MSRUpdated(Rs, RSCRATCH2);
+    OpArg Rs_op_arg;
+    {
+      RCOpArg Rs = gpr.BindOrImm(inst.RS, RCMode::Read);
+      RegCache::Realize(Rs);
+      MOV(32, PPCSTATE(msr), Rs);
+      Rs_op_arg = Rs;
+    }
+    MSRUpdated(Rs_op_arg, RSCRATCH2);
   }
 
   gpr.Flush();
@@ -595,7 +598,7 @@ void Jit64::crXXX(UGeckoInstruction inst)
   JITDISABLE(bJITSystemRegistersOff);
   DEBUG_ASSERT_MSG(DYNA_REC, inst.OPCD == 19, "Invalid crXXX");
 
-  // TODO(merry): Futher optimizations can be performed here. For example,
+  // TODO(merry): Further optimizations can be performed here. For example,
   // instead of extracting each CR field bit then setting it, the operation
   // could be performed on the internal format directly instead and the
   // relevant bit result can be masked out.
diff --git a/Source/Core/Core/PowerPC/Jit64/RegCache/JitRegCache.cpp b/Source/Core/Core/PowerPC/Jit64/RegCache/JitRegCache.cpp
index 2a787f312074..4de0cea62135 100644
--- a/Source/Core/Core/PowerPC/Jit64/RegCache/JitRegCache.cpp
+++ b/Source/Core/Core/PowerPC/Jit64/RegCache/JitRegCache.cpp
@@ -12,14 +12,11 @@
 #include "Common/Assert.h"
 #include "Common/BitSet.h"
 #include "Common/CommonTypes.h"
-#include "Common/EnumUtils.h"
-#include "Common/MsgHandler.h"
 #include "Common/VariantUtil.h"
 #include "Common/x64Emitter.h"
 #include "Core/PowerPC/Jit64/Jit.h"
 #include "Core/PowerPC/Jit64/RegCache/CachedReg.h"
 #include "Core/PowerPC/Jit64/RegCache/RCMode.h"
-#include "Core/PowerPC/PowerPC.h"
 
 using namespace Gen;
 using namespace PowerPC;
@@ -132,47 +129,6 @@ void RCOpArg::Unlock()
   contents = std::monostate{};
 }
 
-bool RCOpArg::IsImm() const
-{
-  if (const preg_t* preg = std::get_if<preg_t>(&contents))
-  {
-    return rc->IsImm(*preg);
-  }
-  else if (std::holds_alternative<u32>(contents))
-  {
-    return true;
-  }
-  return false;
-}
-
-s32 RCOpArg::SImm32() const
-{
-  if (const preg_t* preg = std::get_if<preg_t>(&contents))
-  {
-    return rc->SImm32(*preg);
-  }
-  else if (const u32* imm = std::get_if<u32>(&contents))
-  {
-    return static_cast<s32>(*imm);
-  }
-  ASSERT(false);
-  return 0;
-}
-
-u32 RCOpArg::Imm32() const
-{
-  if (const preg_t* preg = std::get_if<preg_t>(&contents))
-  {
-    return rc->Imm32(*preg);
-  }
-  else if (const u32* imm = std::get_if<u32>(&contents))
-  {
-    return *imm;
-  }
-  ASSERT(false);
-  return 0;
-}
-
 RCX64Reg::RCX64Reg() = default;
 
 RCX64Reg::RCX64Reg(RegCache* rc_, preg_t preg) : rc(rc_), contents(preg)
@@ -366,7 +322,7 @@ void RegCache::Discard(BitSet32 pregs)
   for (preg_t i : pregs)
   {
     ASSERT_MSG(DYNA_REC, !m_regs[i].IsLocked(), "Someone forgot to unlock PPC reg {} (X64 reg {}).",
-               i, Common::ToUnderlying(RX(i)));
+               i, std::to_underlying(RX(i)));
     ASSERT_MSG(DYNA_REC, !m_regs[i].IsRevertable(), "Register transaction is in progress for {}!",
                i);
 
@@ -382,7 +338,7 @@ void RegCache::Flush(BitSet32 pregs, IgnoreDiscardedRegisters ignore_discarded_r
   for (preg_t i : pregs)
   {
     ASSERT_MSG(DYNA_REC, !m_regs[i].IsLocked(), "Someone forgot to unlock PPC reg {} (X64 reg {}).",
-               i, Common::ToUnderlying(RX(i)));
+               i, std::to_underlying(RX(i)));
     ASSERT_MSG(DYNA_REC, !m_regs[i].IsRevertable(), "Register transaction is in progress for {}!",
                i);
 
@@ -451,7 +407,7 @@ BitSet32 RegCache::RegistersInUse() const
 void RegCache::FlushX(X64Reg reg)
 {
   ASSERT_MSG(DYNA_REC, reg < m_xregs.size(), "Flushing non-existent reg {}",
-             Common::ToUnderlying(reg));
+             std::to_underlying(reg));
   ASSERT(!m_xregs[reg].IsLocked());
   if (!m_xregs[reg].IsFree())
   {
@@ -489,7 +445,7 @@ void RegCache::BindToRegister(preg_t i, bool doLoad, bool makeDirty)
                                     [xr](const auto& r) {
                                       return r.IsInHostRegister() && r.GetHostRegister() == xr;
                                     }),
-               "Xreg {} already bound", Common::ToUnderlying(xr));
+               "Xreg {} already bound", std::to_underlying(xr));
 
     m_regs[i].SetInHostRegister(xr, makeDirty);
   }
@@ -505,7 +461,7 @@ void RegCache::BindToRegister(preg_t i, bool doLoad, bool makeDirty)
     DiscardImm(i);
 
   ASSERT_MSG(DYNA_REC, !m_xregs[RX(i)].IsLocked(),
-             "WTF, this reg ({} -> {}) should have been flushed", i, Common::ToUnderlying(RX(i)));
+             "WTF, this reg ({} -> {}) should have been flushed", i, std::to_underlying(RX(i)));
 }
 
 void RegCache::StoreFromRegister(preg_t i, FlushMode mode,
diff --git a/Source/Core/Core/PowerPC/Jit64/RegCache/JitRegCache.h b/Source/Core/Core/PowerPC/Jit64/RegCache/JitRegCache.h
index 0a7ab3836d2a..41bdeb08c3f9 100644
--- a/Source/Core/Core/PowerPC/Jit64/RegCache/JitRegCache.h
+++ b/Source/Core/Core/PowerPC/Jit64/RegCache/JitRegCache.h
@@ -11,7 +11,6 @@
 
 #include "Common/x64Emitter.h"
 #include "Core/PowerPC/Jit64/RegCache/CachedReg.h"
-#include "Core/PowerPC/PPCAnalyst.h"
 
 class Jit64;
 enum class RCMode;
@@ -49,9 +48,9 @@ class RCOpArg
 
   void Unlock();
 
-  bool IsImm() const;
-  s32 SImm32() const;
-  u32 Imm32() const;
+  bool IsImm() const { return Location().IsImm(); }
+  s32 SImm32() const { return Location().SImm32(); }
+  u32 Imm32() const { return Location().Imm32(); }
   bool IsZero() const { return IsImm() && Imm32() == 0; }
 
 private:
diff --git a/Source/Core/Core/PowerPC/Jit64Common/ConstantPool.cpp b/Source/Core/Core/PowerPC/Jit64Common/ConstantPool.cpp
index 8aaa164f43b6..519936aa6444 100644
--- a/Source/Core/Core/PowerPC/Jit64Common/ConstantPool.cpp
+++ b/Source/Core/Core/PowerPC/Jit64Common/ConstantPool.cpp
@@ -8,6 +8,7 @@
 #include <utility>
 
 #include "Common/Assert.h"
+#include "Common/CommonTypes.h"
 
 ConstantPool::ConstantPool() = default;
 
diff --git a/Source/Core/Core/PowerPC/Jit64Common/EmuCodeBlock.cpp b/Source/Core/Core/PowerPC/Jit64Common/EmuCodeBlock.cpp
index 58b34698adfb..1019aa7d0a7a 100644
--- a/Source/Core/Core/PowerPC/Jit64Common/EmuCodeBlock.cpp
+++ b/Source/Core/Core/PowerPC/Jit64Common/EmuCodeBlock.cpp
@@ -4,7 +4,6 @@
 #include "Core/PowerPC/Jit64Common/EmuCodeBlock.h"
 
 #include <functional>
-#include <limits>
 
 #include "Common/Assert.h"
 #include "Common/CPUDetect.h"
@@ -355,7 +354,7 @@ void EmuCodeBlock::SafeLoadToReg(X64Reg reg_value, const Gen::OpArg& opAddress,
     {
       NOP(padding);
     }
-    info.len = static_cast<u32>(GetCodePtr() - info.start);
+    info.len = static_cast<u16>(GetCodePtr() - info.start);
 
     js.fastmemLoadStore = mov.address;
     return;
@@ -527,7 +526,7 @@ void EmuCodeBlock::SafeWriteRegToReg(OpArg reg_value, X64Reg reg_addr, int acces
     {
       NOP(padding);
     }
-    info.len = static_cast<u32>(GetCodePtr() - info.start);
+    info.len = static_cast<u16>(GetCodePtr() - info.start);
 
     js.fastmemLoadStore = mov.address;
 
@@ -741,7 +740,8 @@ void EmuCodeBlock::JitClearCA()
 // Abstract between AVX and SSE: automatically handle 3-operand instructions
 void EmuCodeBlock::avx_op(void (XEmitter::*avxOp)(X64Reg, X64Reg, const OpArg&),
                           void (XEmitter::*sseOp)(X64Reg, const OpArg&), X64Reg regOp,
-                          const OpArg& arg1, const OpArg& arg2, bool packed, bool reversible)
+                          const OpArg& arg1, const OpArg& arg2, bool packed, bool reversible,
+                          X64Reg scratch)
 {
   if (arg1.IsSimpleReg(regOp))
   {
@@ -778,19 +778,19 @@ void EmuCodeBlock::avx_op(void (XEmitter::*avxOp)(X64Reg, X64Reg, const OpArg&),
   else
   {
     // The ugly case: Not reversible, and we have regOp == arg2 without AVX or with arg1 == memory
-    if (!arg1.IsSimpleReg(XMM0))
-      MOVAPD(XMM0, arg1);
+    if (!arg1.IsSimpleReg(scratch))
+      MOVAPD(scratch, arg1);
     if (cpu_info.bAVX)
     {
-      (this->*avxOp)(regOp, XMM0, arg2);
+      (this->*avxOp)(regOp, scratch, arg2);
     }
     else
     {
-      (this->*sseOp)(XMM0, arg2);
+      (this->*sseOp)(scratch, arg2);
       if (packed)
-        MOVAPD(regOp, R(XMM0));
+        MOVAPD(regOp, R(scratch));
       else
-        MOVSD(regOp, R(XMM0));
+        MOVSD(regOp, R(scratch));
     }
   }
 }
@@ -798,7 +798,7 @@ void EmuCodeBlock::avx_op(void (XEmitter::*avxOp)(X64Reg, X64Reg, const OpArg&),
 // Abstract between AVX and SSE: automatically handle 3-operand instructions
 void EmuCodeBlock::avx_op(void (XEmitter::*avxOp)(X64Reg, X64Reg, const OpArg&, u8),
                           void (XEmitter::*sseOp)(X64Reg, const OpArg&, u8), X64Reg regOp,
-                          const OpArg& arg1, const OpArg& arg2, u8 imm)
+                          const OpArg& arg1, const OpArg& arg2, u8 imm, X64Reg scratch)
 {
   if (arg1.IsSimpleReg(regOp))
   {
@@ -816,21 +816,40 @@ void EmuCodeBlock::avx_op(void (XEmitter::*avxOp)(X64Reg, X64Reg, const OpArg&,
   else
   {
     // The ugly case: regOp == arg2 without AVX, or with arg1 == memory
-    if (!arg1.IsSimpleReg(XMM0))
-      MOVAPD(XMM0, arg1);
+    if (!arg1.IsSimpleReg(scratch))
+      MOVAPD(scratch, arg1);
     if (cpu_info.bAVX)
     {
-      (this->*avxOp)(regOp, XMM0, arg2, imm);
+      (this->*avxOp)(regOp, scratch, arg2, imm);
     }
     else
     {
-      (this->*sseOp)(XMM0, arg2, imm);
-      if (regOp != XMM0)
-        MOVAPD(regOp, R(XMM0));
+      (this->*sseOp)(scratch, arg2, imm);
+      if (regOp != scratch)
+        MOVAPD(regOp, R(scratch));
     }
   }
 }
 
+// Abstract between AVX and SSE: automatically handle 3-operand instructions
+void EmuCodeBlock::avx_op(void (XEmitter::*avxOp)(X64Reg, X64Reg, u8),
+                          void (XEmitter::*sseOp)(X64Reg, u8), X64Reg regOp1, X64Reg regOp2, u8 imm)
+{
+  if (regOp1 == regOp2)
+  {
+    (this->*sseOp)(regOp1, imm);
+  }
+  else if (cpu_info.bAVX)
+  {
+    (this->*avxOp)(regOp1, regOp2, imm);
+  }
+  else
+  {
+    MOVAPD(regOp1, R(regOp2));
+    (this->*sseOp)(regOp1, imm);
+  }
+}
+
 alignas(16) static const u64 psMantissaTruncate[2] = {0xFFFFFFFFF8000000ULL, 0xFFFFFFFFF8000000ULL};
 alignas(16) static const u64 psRoundBit[2] = {0x8000000, 0x8000000};
 
@@ -842,8 +861,9 @@ void EmuCodeBlock::Force25BitPrecision(X64Reg output, const OpArg& input, X64Reg
 {
   if (m_jit.jo.accurateSinglePrecision)
   {
+    DEBUG_ASSERT(output != tmp);
     // mantissa = (mantissa & ~0xFFFFFFF) + ((mantissa & (1ULL << 27)) << 1);
-    if (input.IsSimpleReg() && cpu_info.bAVX)
+    if (input.IsSimpleReg() && !input.IsSimpleReg(tmp) && cpu_info.bAVX)
     {
       VPAND(tmp, input.GetSimpleReg(), MConst(psRoundBit));
       VPAND(output, input.GetSimpleReg(), MConst(psMantissaTruncate));
diff --git a/Source/Core/Core/PowerPC/Jit64Common/EmuCodeBlock.h b/Source/Core/Core/PowerPC/Jit64Common/EmuCodeBlock.h
index 54cade23c5ad..b53b5da67b4b 100644
--- a/Source/Core/Core/PowerPC/Jit64Common/EmuCodeBlock.h
+++ b/Source/Core/Core/PowerPC/Jit64Common/EmuCodeBlock.h
@@ -113,10 +113,14 @@ class EmuCodeBlock : public Gen::X64CodeBlock
   void avx_op(void (Gen::XEmitter::*avxOp)(Gen::X64Reg, Gen::X64Reg, const Gen::OpArg&),
               void (Gen::XEmitter::*sseOp)(Gen::X64Reg, const Gen::OpArg&), Gen::X64Reg regOp,
               const Gen::OpArg& arg1, const Gen::OpArg& arg2, bool packed = true,
-              bool reversible = false);
+              bool reversible = false, Gen::X64Reg scratch = Gen::XMM0);
   void avx_op(void (Gen::XEmitter::*avxOp)(Gen::X64Reg, Gen::X64Reg, const Gen::OpArg&, u8),
               void (Gen::XEmitter::*sseOp)(Gen::X64Reg, const Gen::OpArg&, u8), Gen::X64Reg regOp,
-              const Gen::OpArg& arg1, const Gen::OpArg& arg2, u8 imm);
+              const Gen::OpArg& arg1, const Gen::OpArg& arg2, u8 imm,
+              Gen::X64Reg scratch = Gen::XMM0);
+  void avx_op(void (Gen::XEmitter::*avxOp)(Gen::X64Reg, Gen::X64Reg, u8),
+              void (Gen::XEmitter::*sseOp)(Gen::X64Reg, u8), Gen::X64Reg regOp1, Gen::X64Reg regOp2,
+              u8 imm);
 
   void Force25BitPrecision(Gen::X64Reg output, const Gen::OpArg& input, Gen::X64Reg tmp);
 
diff --git a/Source/Core/Core/PowerPC/Jit64Common/Jit64AsmCommon.cpp b/Source/Core/Core/PowerPC/Jit64Common/Jit64AsmCommon.cpp
index a08aaad0f4bb..4e7e6fe0762e 100644
--- a/Source/Core/Core/PowerPC/Jit64Common/Jit64AsmCommon.cpp
+++ b/Source/Core/Core/PowerPC/Jit64Common/Jit64AsmCommon.cpp
@@ -4,20 +4,18 @@
 #include "Core/PowerPC/Jit64Common/Jit64AsmCommon.h"
 
 #include <array>
+#include <utility>
 
 #include "Common/CPUDetect.h"
 #include "Common/CommonTypes.h"
-#include "Common/EnumUtils.h"
 #include "Common/FloatUtils.h"
 #include "Common/Intrinsics.h"
 #include "Common/JitRegister.h"
 #include "Common/x64ABI.h"
 #include "Common/x64Emitter.h"
 #include "Core/PowerPC/Gekko.h"
-#include "Core/PowerPC/Jit64/Jit.h"
 #include "Core/PowerPC/Jit64Common/Jit64Constants.h"
 #include "Core/PowerPC/Jit64Common/Jit64PowerPCState.h"
-#include "Core/PowerPC/PowerPC.h"
 
 #define QUANTIZED_REGS_TO_SAVE                                                                     \
   (ABI_ALL_CALLER_SAVED & ~BitSet32{RSCRATCH, RSCRATCH2, RSCRATCH_EXTRA, XMM0 + 16, XMM1 + 16})
@@ -81,7 +79,7 @@ void CommonAsmRoutines::GenConvertDoubleToSingle()
     PAND(XMM0, MConst(double_bottom_bits));
     PSRLQ(XMM0, 29);
 
-    // OR them togther
+    // OR them together
     POR(XMM0, R(XMM1));
     MOVD_xmm(R(RSCRATCH), XMM0);
   }
@@ -326,6 +324,98 @@ void CommonAsmRoutines::GenMfcr()
   Common::JitRegister::Register(start, GetCodePtr(), "JIT_Mfcr");
 }
 
+// Inputs:
+// XMM0: First error term
+// XMM1: Result with potentially incorrect rounding
+// XMM2: Second error term, negated
+//
+// Outputs result with corrected rounding in XMM1.
+// Clobbers RSCRATCH, RSCRATCH2, XMM0, XMM2, and flags.
+void CommonAsmRoutines::GenerateFmaddsEft()
+{
+  // Check if XMM1 is an even tie, i.e. check (input & 0x1fffffff) == 0x10000000
+  MOVQ_xmm(R(RSCRATCH), XMM1);
+  MOV(32, R(RSCRATCH2), Imm32(0x80000000));
+  LEA(32, RSCRATCH2, MComplex(RSCRATCH2, RSCRATCH, SCALE_8, 0));
+  TEST(32, R(RSCRATCH2), R(RSCRATCH2));
+  FixupBranch even_tie = J_CC(CCFlags::CC_Z);
+
+  const u8* ret = GetCodePtr();
+  RET();
+
+  // Check if the error is 0
+  SetJumpTarget(even_tie);
+  SUBSD(XMM0, R(XMM2));
+  XORPD(XMM2, R(XMM2));
+  UCOMISD(XMM0, R(XMM2));
+  J_CC(CCFlags::CC_E, ret);
+
+  // Round XMM1 up or down
+  MOVQ_xmm(R(RSCRATCH2), XMM0);
+  XOR(64, R(RSCRATCH2), R(RSCRATCH));
+  SAR(64, R(RSCRATCH2), Imm8(63));
+  OR(64, R(RSCRATCH2), Imm8(1));
+  ADD(64, R(RSCRATCH), R(RSCRATCH2));
+  MOVQ_xmm(XMM1, R(RSCRATCH));
+  RET();
+}
+
+alignas(16) static const __m128i double_msb = _mm_set_epi64x(0x8000000000000000,
+                                                             0x8000000000000000);
+alignas(16) static const __m128i double_lsb = _mm_set_epi64x(1, 1);
+
+// Inputs:
+// XMM0: First error terms
+// XMM1: Results with potentially incorrect rounding
+// XMM2: Second error terms, negated
+//
+// Outputs results with corrected rounding in XMM1. Clobbers RSCRATCH, XMM0-XMM3, and flags.
+void CommonAsmRoutines::GeneratePsMaddEft()
+{
+  // Check if XMM1 has an even tie, i.e. check (input & 0x1fffffff) == 0x10000000
+  avx_op(&XEmitter::VPSLLQ, &XEmitter::PSLLQ, XMM3, XMM1, 35);
+  if (cpu_info.bSSE4_1)
+  {
+    PCMPEQQ(XMM3, MConst(double_msb));
+  }
+  else
+  {
+    PCMPEQW(XMM3, MConst(double_msb));
+    PSHUFD(XMM3, R(XMM3), 0xF5);
+  }
+
+  // Just for performance, exit early if there is no even tie
+  if (cpu_info.bSSE4_1)
+  {
+    PTEST(XMM3, R(XMM3));
+  }
+  else
+  {
+    PMOVMSKB(RSCRATCH, R(XMM3));
+    TEST(32, R(RSCRATCH), R(RSCRATCH));
+  }
+  FixupBranch even_tie = J_CC(CCFlags::CC_NZ);
+  RET();
+  SetJumpTarget(even_tie);
+
+  // Check if the error is zero
+  SUBPD(XMM0, R(XMM2));
+  XORPD(XMM2, R(XMM2));
+  CMPPD(XMM2, R(XMM0), CMP_EQ);
+
+  // Store -1 or 1 in XMM0 depending on whether we're rounding down or up
+  PXOR(XMM0, R(XMM1));
+  PSRAD(XMM0, 31);
+  PSHUFD(XMM0, R(XMM0), 0xF5);
+  POR(XMM0, MConst(double_lsb));
+
+  // Round the elements that have both a non-zero error and an even tie
+  PANDN(XMM2, R(XMM3));
+  PAND(XMM0, R(XMM2));
+  PADDQ(XMM1, R(XMM0));
+  RET();
+}
+
 // Safe + Fast Quantizers, originally from JITIL by magumagu
 alignas(16) static const float m_65535[4] = {65535.0f, 65535.0f, 65535.0f, 65535.0f};
 alignas(16) static const float m_32767 = 32767.0f;
@@ -368,7 +458,7 @@ const u8* CommonAsmRoutines::GenQuantizedStoreRuntime(bool single, EQuantizeType
   GenQuantizedStore(single, type, -1);
   RET();
   Common::JitRegister::Register(start, GetCodePtr(), "JIT_QuantizedStore_{}_{}",
-                                Common::ToUnderlying(type), single);
+                                std::to_underlying(type), single);
 
   return load;
 }
@@ -400,7 +490,7 @@ const u8* CommonAsmRoutines::GenQuantizedLoadRuntime(bool single, EQuantizeType
   GenQuantizedLoad(single, type, -1);
   RET();
   Common::JitRegister::Register(start, GetCodePtr(), "JIT_QuantizedLoad_{}_{}",
-                                Common::ToUnderlying(type), single);
+                                std::to_underlying(type), single);
 
   return load;
 }
diff --git a/Source/Core/Core/PowerPC/Jit64Common/Jit64AsmCommon.h b/Source/Core/Core/PowerPC/Jit64Common/Jit64AsmCommon.h
index ffac2da1a1c5..8d60b005b355 100644
--- a/Source/Core/Core/PowerPC/Jit64Common/Jit64AsmCommon.h
+++ b/Source/Core/Core/PowerPC/Jit64Common/Jit64AsmCommon.h
@@ -33,6 +33,8 @@ class CommonAsmRoutines : public CommonAsmRoutinesBase, public QuantizedMemoryRo
 
 protected:
   void GenConvertDoubleToSingle();
+  void GenerateFmaddsEft();
+  void GeneratePsMaddEft();
   const u8* GenQuantizedLoadRuntime(bool single, EQuantizeType type);
   const u8* GenQuantizedStoreRuntime(bool single, EQuantizeType type);
   void GenQuantizedLoads();
diff --git a/Source/Core/Core/PowerPC/Jit64Common/TrampolineCache.cpp b/Source/Core/Core/PowerPC/Jit64Common/TrampolineCache.cpp
index f43535ab7d40..df16c177a231 100644
--- a/Source/Core/Core/PowerPC/Jit64Common/TrampolineCache.cpp
+++ b/Source/Core/Core/PowerPC/Jit64Common/TrampolineCache.cpp
@@ -3,17 +3,11 @@
 
 #include "Core/PowerPC/Jit64Common/TrampolineCache.h"
 
-#include <string>
-
 #include "Common/CommonTypes.h"
 #include "Common/JitRegister.h"
 #include "Common/MsgHandler.h"
 #include "Common/x64Emitter.h"
-#include "Core/PowerPC/Jit64/Jit.h"
-#include "Core/PowerPC/Jit64Common/Jit64Constants.h"
-#include "Core/PowerPC/Jit64Common/Jit64PowerPCState.h"
 #include "Core/PowerPC/Jit64Common/TrampolineInfo.h"
-#include "Core/PowerPC/PowerPC.h"
 
 #ifdef _WIN32
 #include <windows.h>
diff --git a/Source/Core/Core/PowerPC/Jit64Common/TrampolineInfo.h b/Source/Core/Core/PowerPC/Jit64Common/TrampolineInfo.h
index bdf1a1badd26..d76d3f724f40 100644
--- a/Source/Core/Core/PowerPC/Jit64Common/TrampolineInfo.h
+++ b/Source/Core/Core/PowerPC/Jit64Common/TrampolineInfo.h
@@ -16,21 +16,7 @@ struct TrampolineInfo final
   u8* start = nullptr;
 
   // The start + len = end of the store operation (points to the next instruction)
-  u32 len = 0;
-
-  // The PPC PC for the current load/store block
-  u32 pc = 0;
-
-  // Saved because we need these to make the ABI call in the trampoline
-  BitSet32 registersInUse{};
-
-  // The MOV operation
-  Gen::X64Reg nonAtomicSwapStoreSrc{};
-
-  // src/dest for load/store
-  s32 offset = 0;
-  Gen::X64Reg op_reg{};
-  Gen::OpArg op_arg{};
+  u16 len = 0;
 
   // Original SafeLoadXXX/SafeStoreXXX flags
   u8 flags = 0;
@@ -46,4 +32,18 @@ struct TrampolineInfo final
 
   // Set to true if we added the offset to the address and need to undo it
   bool offsetAddedToAddress : 1 = false;
+
+  // The PPC PC for the current load/store block
+  u32 pc = 0;
+
+  // Saved because we need these to make the ABI call in the trampoline
+  BitSet32 registersInUse{};
+
+  // The MOV operation
+  Gen::X64Reg nonAtomicSwapStoreSrc{};
+
+  // src/dest for load/store
+  s32 offset = 0;
+  Gen::X64Reg op_reg{};
+  Gen::OpArg op_arg{};
 };
diff --git a/Source/Core/Core/PowerPC/JitArm64/Jit.cpp b/Source/Core/Core/PowerPC/JitArm64/Jit.cpp
index 353ec9673946..e61d285f41f5 100644
--- a/Source/Core/Core/PowerPC/JitArm64/Jit.cpp
+++ b/Source/Core/Core/PowerPC/JitArm64/Jit.cpp
@@ -7,13 +7,13 @@
 #include <optional>
 #include <span>
 #include <sstream>
+#include <utility>
 
 #include <fmt/format.h>
 #include <fmt/ostream.h>
 
 #include "Common/Arm64Emitter.h"
 #include "Common/CommonTypes.h"
-#include "Common/EnumUtils.h"
 #include "Common/GekkoDisassembler.h"
 #include "Common/HostDisassembler.h"
 #include "Common/Logging/Log.h"
@@ -452,10 +452,27 @@ void JitArm64::MSRUpdated(u32 msr)
     MOVI2R(WA, feature_flags);
     STR(IndexType::Unsigned, WA, PPC_REG, PPCSTATE_OFF(feature_flags));
   }
+
+  // Call PageTableUpdatedFromJit if needed
+  if (UReg_MSR(msr).DR)
+  {
+    gpr.Flush(FlushMode::All, ARM64Reg::INVALID_REG);
+    fpr.Flush(FlushMode::All, ARM64Reg::INVALID_REG);
+
+    auto WA = gpr.GetScopedReg();
+
+    static_assert(PPCSTATE_OFF(pagetable_update_pending) < 0x1000);
+    LDRB(IndexType::Unsigned, WA, PPC_REG, PPCSTATE_OFF(pagetable_update_pending));
+    FixupBranch update_not_pending = CBZ(WA);
+    ABI_CallFunction(&PowerPC::MMU::PageTableUpdatedFromJit, &m_system.GetMMU());
+    SetJumpTarget(update_not_pending);
+  }
 }
 
 void JitArm64::MSRUpdated(ARM64Reg msr)
 {
+  constexpr LogicalImm dr_bit(1ULL << UReg_MSR{}.DR.StartBit(), GPRSize::B32);
+
   auto WA = gpr.GetScopedReg();
   ARM64Reg XA = EncodeRegTo64(WA);
 
@@ -463,7 +480,7 @@ void JitArm64::MSRUpdated(ARM64Reg msr)
   auto& memory = m_system.GetMemory();
   MOVP2R(MEM_REG, jo.fastmem ? memory.GetLogicalBase() : memory.GetLogicalPageMappingsBase());
   MOVP2R(XA, jo.fastmem ? memory.GetPhysicalBase() : memory.GetPhysicalPageMappingsBase());
-  TST(msr, LogicalImm(1 << (31 - 27), GPRSize::B32));
+  TST(msr, dr_bit);
   CSEL(MEM_REG, MEM_REG, XA, CCFlags::CC_NEQ);
   STR(IndexType::Unsigned, MEM_REG, PPC_REG, PPCSTATE_OFF(mem_ptr));
 
@@ -477,6 +494,18 @@ void JitArm64::MSRUpdated(ARM64Reg msr)
   if (other_feature_flags != 0)
     ORR(WA, WA, LogicalImm(other_feature_flags, GPRSize::B32));
   STR(IndexType::Unsigned, WA, PPC_REG, PPCSTATE_OFF(feature_flags));
+
+  // Call PageTableUpdatedFromJit if needed
+  MOV(WA, msr);
+  gpr.Flush(FlushMode::All, ARM64Reg::INVALID_REG);
+  fpr.Flush(FlushMode::All, ARM64Reg::INVALID_REG);
+  FixupBranch dr_unset = TBZ(WA, dr_bit);
+  static_assert(PPCSTATE_OFF(pagetable_update_pending) < 0x1000);
+  LDRB(IndexType::Unsigned, WA, PPC_REG, PPCSTATE_OFF(pagetable_update_pending));
+  FixupBranch update_not_pending = CBZ(WA);
+  ABI_CallFunction(&PowerPC::MMU::PageTableUpdatedFromJit, &m_system.GetMMU());
+  SetJumpTarget(update_not_pending);
+  SetJumpTarget(dr_unset);
 }
 
 void JitArm64::WriteExit(u32 destination, bool LK, u32 exit_address_after_return,
@@ -1267,16 +1296,13 @@ bool JitArm64::DoJit(u32 em_address, JitBlock* b, u32 nextPC)
 
     if (op.skip)
     {
-      if (IsDebuggingEnabled())
+      if (IsBranchWatchEnabled())
       {
         // The only thing that currently sets op.skip is the BLR following optimization.
         // If any non-branch instruction starts setting that too, this will need to be changed.
         ASSERT(op.inst.hex == 0x4e800020);
-        const auto bw_reg_a = gpr.GetScopedReg(), bw_reg_b = gpr.GetScopedReg();
-        const BitSet32 gpr_caller_save =
-            gpr.GetCallerSavedUsed() & ~BitSet32{DecodeReg(bw_reg_a), DecodeReg(bw_reg_b)};
-        WriteBranchWatch<true>(op.address, op.branchTo, op.inst, bw_reg_a, bw_reg_b,
-                               gpr_caller_save, fpr.GetCallerSavedUsed());
+        WriteBranchWatch<true>(op.address, op.branchTo, op.inst, gpr.GetCallerSavedUsed(),
+                               fpr.GetCallerSavedUsed());
       }
     }
     else
@@ -1297,7 +1323,7 @@ bool JitArm64::DoJit(u32 em_address, JitBlock* b, u32 nextPC)
 
         LDR(IndexType::Unsigned, ARM64Reg::W0, ARM64Reg::X0,
             MOVPage2R(ARM64Reg::X0, cpu.GetStatePtr()));
-        static_assert(Common::ToUnderlying(CPU::State::Running) == 0);
+        static_assert(std::to_underlying(CPU::State::Running) == 0);
         FixupBranch no_breakpoint = CBZ(ARM64Reg::W0);
 
         Cleanup();
diff --git a/Source/Core/Core/PowerPC/JitArm64/Jit.h b/Source/Core/Core/PowerPC/JitArm64/Jit.h
index e98f950d42fd..5b42dff3dd75 100644
--- a/Source/Core/Core/PowerPC/JitArm64/Jit.h
+++ b/Source/Core/Core/PowerPC/JitArm64/Jit.h
@@ -6,13 +6,11 @@
 #include <cstddef>
 #include <map>
 #include <optional>
-#include <tuple>
 
 #include <rangeset/rangesizeset.h>
 
 #include "Common/Arm64Emitter.h"
 
-#include "Core/PowerPC/CPUCoreBase.h"
 #include "Core/PowerPC/JitArm64/JitArm64Cache.h"
 #include "Core/PowerPC/JitArm64/JitArm64_RegCache.h"
 #include "Core/PowerPC/JitArmCommon/BackPatch.h"
@@ -114,7 +112,6 @@ class JitArm64 : public JitBase, public Arm64Gen::ARM64CodeBlock, public CommonA
   void rlwimix(UGeckoInstruction inst);
   void subfex(UGeckoInstruction inst);
   void subfzex(UGeckoInstruction inst);
-  void subfcx(UGeckoInstruction inst);
   void subfic(UGeckoInstruction inst);
   void addex(UGeckoInstruction inst);
   void divwux(UGeckoInstruction inst);
@@ -125,9 +122,7 @@ class JitArm64 : public JitBase, public Arm64Gen::ARM64CodeBlock, public CommonA
   void mcrf(UGeckoInstruction inst);
   void mcrxr(UGeckoInstruction inst);
   void mfsr(UGeckoInstruction inst);
-  void mtsr(UGeckoInstruction inst);
   void mfsrin(UGeckoInstruction inst);
-  void mtsrin(UGeckoInstruction inst);
   void twx(UGeckoInstruction inst);
   void mfspr(UGeckoInstruction inst);
   void mftb(UGeckoInstruction inst);
@@ -327,6 +322,8 @@ class JitArm64 : public JitBase, public Arm64Gen::ARM64CodeBlock, public CommonA
   void GenerateConvertDoubleToSingle();
   void GenerateConvertSingleToDouble();
   void GenerateFPRF(bool single);
+  void GenerateFmaddsEft();
+  void GeneratePsMaddEft();
   void GenerateQuantizedLoads();
   void GenerateQuantizedStores();
 
@@ -337,11 +334,9 @@ class JitArm64 : public JitBase, public Arm64Gen::ARM64CodeBlock, public CommonA
   // Branch Watch
   template <bool condition>
   void WriteBranchWatch(u32 origin, u32 destination, UGeckoInstruction inst,
-                        Arm64Gen::ARM64Reg reg_a, Arm64Gen::ARM64Reg reg_b,
                         BitSet32 gpr_caller_save, BitSet32 fpr_caller_save);
   void WriteBranchWatchDestInRegister(u32 origin, Arm64Gen::ARM64Reg destination,
-                                      UGeckoInstruction inst, Arm64Gen::ARM64Reg reg_a,
-                                      Arm64Gen::ARM64Reg reg_b, BitSet32 gpr_caller_save,
+                                      UGeckoInstruction inst, BitSet32 gpr_caller_save,
                                       BitSet32 fpr_caller_save);
 
   // Exits
diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_Branch.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_Branch.cpp
index a9df905b107c..191c42387689 100644
--- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_Branch.cpp
+++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_Branch.cpp
@@ -75,67 +75,35 @@ void JitArm64::rfi(UGeckoInstruction inst)
 }
 
 template <bool condition>
-void JitArm64::WriteBranchWatch(u32 origin, u32 destination, UGeckoInstruction inst, ARM64Reg reg_a,
-                                ARM64Reg reg_b, BitSet32 gpr_caller_save, BitSet32 fpr_caller_save)
+void JitArm64::WriteBranchWatch(u32 origin, u32 destination, UGeckoInstruction inst,
+                                BitSet32 gpr_caller_save, BitSet32 fpr_caller_save)
 {
-  const ARM64Reg branch_watch = EncodeRegTo64(reg_a);
-  MOVP2R(branch_watch, &m_branch_watch);
-  LDRB(IndexType::Unsigned, reg_b, branch_watch, Core::BranchWatch::GetOffsetOfRecordingActive());
-  FixupBranch branch_over = CBZ(reg_b);
-
-  FixupBranch branch_in = B();
-  SwitchToFarCode();
-  SetJumpTarget(branch_in);
-
-  const ARM64Reg float_emit_tmp = EncodeRegTo64(reg_b);
   ABI_PushRegisters(gpr_caller_save);
-  m_float_emit.ABI_PushRegisters(fpr_caller_save, float_emit_tmp);
+  m_float_emit.ABI_PushRegisters(fpr_caller_save, ARM64Reg::X8);
   ABI_CallFunction(m_ppc_state.msr.IR ? (condition ? &Core::BranchWatch::HitVirtualTrue_fk :
                                                      &Core::BranchWatch::HitVirtualFalse_fk) :
                                         (condition ? &Core::BranchWatch::HitPhysicalTrue_fk :
                                                      &Core::BranchWatch::HitPhysicalFalse_fk),
-                   branch_watch, Core::FakeBranchWatchCollectionKey{origin, destination}, inst.hex);
-  m_float_emit.ABI_PopRegisters(fpr_caller_save, float_emit_tmp);
+                   &m_branch_watch, Core::FakeBranchWatchCollectionKey{origin, destination},
+                   inst.hex);
+  m_float_emit.ABI_PopRegisters(fpr_caller_save, ARM64Reg::X8);
   ABI_PopRegisters(gpr_caller_save);
-
-  FixupBranch branch_out = B();
-  SwitchToNearCode();
-  SetJumpTarget(branch_out);
-  SetJumpTarget(branch_over);
 }
 
-template void JitArm64::WriteBranchWatch<true>(u32, u32, UGeckoInstruction, ARM64Reg, ARM64Reg,
-                                               BitSet32, BitSet32);
-template void JitArm64::WriteBranchWatch<false>(u32, u32, UGeckoInstruction, ARM64Reg, ARM64Reg,
-                                                BitSet32, BitSet32);
+template void JitArm64::WriteBranchWatch<true>(u32, u32, UGeckoInstruction, BitSet32, BitSet32);
+template void JitArm64::WriteBranchWatch<false>(u32, u32, UGeckoInstruction, BitSet32, BitSet32);
 
 void JitArm64::WriteBranchWatchDestInRegister(u32 origin, ARM64Reg destination,
-                                              UGeckoInstruction inst, ARM64Reg reg_a,
-                                              ARM64Reg reg_b, BitSet32 gpr_caller_save,
+                                              UGeckoInstruction inst, BitSet32 gpr_caller_save,
                                               BitSet32 fpr_caller_save)
 {
-  const ARM64Reg branch_watch = EncodeRegTo64(reg_a);
-  MOVP2R(branch_watch, &m_branch_watch);
-  LDRB(IndexType::Unsigned, reg_b, branch_watch, Core::BranchWatch::GetOffsetOfRecordingActive());
-  FixupBranch branch_over = CBZ(reg_b);
-
-  FixupBranch branch_in = B();
-  SwitchToFarCode();
-  SetJumpTarget(branch_in);
-
-  const ARM64Reg float_emit_tmp = EncodeRegTo64(reg_b);
   ABI_PushRegisters(gpr_caller_save);
-  m_float_emit.ABI_PushRegisters(fpr_caller_save, float_emit_tmp);
+  m_float_emit.ABI_PushRegisters(fpr_caller_save, ARM64Reg::X8);
   ABI_CallFunction(m_ppc_state.msr.IR ? &Core::BranchWatch::HitVirtualTrue :
                                         &Core::BranchWatch::HitPhysicalTrue,
-                   branch_watch, origin, destination, inst.hex);
-  m_float_emit.ABI_PopRegisters(fpr_caller_save, float_emit_tmp);
+                   &m_branch_watch, origin, destination, inst.hex);
+  m_float_emit.ABI_PopRegisters(fpr_caller_save, ARM64Reg::X8);
   ABI_PopRegisters(gpr_caller_save);
-
-  FixupBranch branch_out = B();
-  SwitchToNearCode();
-  SetJumpTarget(branch_out);
-  SetJumpTarget(branch_over);
 }
 
 void JitArm64::bx(UGeckoInstruction inst)
@@ -153,13 +121,12 @@ void JitArm64::bx(UGeckoInstruction inst)
 
   if (!js.isLastInstruction)
   {
-    if (IsDebuggingEnabled())
+    if (IsBranchWatchEnabled())
     {
-      const auto WB = gpr.GetScopedReg(), WC = gpr.GetScopedReg();
-      BitSet32 gpr_caller_save = gpr.GetCallerSavedUsed() & ~BitSet32{DecodeReg(WB), DecodeReg(WC)};
+      BitSet32 gpr_caller_save = gpr.GetCallerSavedUsed();
       if (WA != ARM64Reg::INVALID_REG && js.op->skipLRStack)
         gpr_caller_save[DecodeReg(WA)] = false;
-      WriteBranchWatch<true>(js.compilerPC, js.op->branchTo, inst, WB, WC, gpr_caller_save,
+      WriteBranchWatch<true>(js.compilerPC, js.op->branchTo, inst, gpr_caller_save,
                              fpr.GetCallerSavedUsed());
     }
     if (inst.LK && !js.op->skipLRStack)
@@ -178,15 +145,14 @@ void JitArm64::bx(UGeckoInstruction inst)
 
   if (js.op->branchIsIdleLoop)
   {
-    if (WA == ARM64Reg::INVALID_REG)
-      WA = gpr.GetScopedReg();
-
-    if (IsDebuggingEnabled())
+    if (IsBranchWatchEnabled())
     {
-      const auto WB = gpr.GetScopedReg();
-      WriteBranchWatch<true>(js.compilerPC, js.op->branchTo, inst, WA, WB, {}, {});
+      WriteBranchWatch<true>(js.compilerPC, js.op->branchTo, inst, {}, {});
     }
 
+    if (WA == ARM64Reg::INVALID_REG)
+      WA = gpr.GetScopedReg();
+
     // make idle loops go faster
     ARM64Reg XA = EncodeRegTo64(WA);
 
@@ -198,12 +164,11 @@ void JitArm64::bx(UGeckoInstruction inst)
     return;
   }
 
-  if (IsDebuggingEnabled())
+  if (IsBranchWatchEnabled())
   {
-    const auto WB = gpr.GetScopedReg(), WC = gpr.GetScopedReg();
     const BitSet32 gpr_caller_save =
         WA != ARM64Reg::INVALID_REG ? BitSet32{DecodeReg(WA)} & CALLER_SAVED_GPRS : BitSet32{};
-    WriteBranchWatch<true>(js.compilerPC, js.op->branchTo, inst, WB, WC, gpr_caller_save, {});
+    WriteBranchWatch<true>(js.compilerPC, js.op->branchTo, inst, gpr_caller_save, {});
   }
   WriteExit(js.op->branchTo, inst.LK, js.compilerPC + 4, WA);
 }
@@ -214,14 +179,11 @@ void JitArm64::bcx(UGeckoInstruction inst)
   JITDISABLE(bJITBranchOff);
 
   auto WA = gpr.GetScopedReg();
-  auto WB = inst.LK || IsDebuggingEnabled() ? gpr.GetScopedReg() :
-                                              Arm64GPRCache::ScopedARM64Reg(WA.GetReg());
+  // If WA isn't needed for WriteExit, it can be safely clobbered.
+  auto WB = (inst.LK && !js.op->branchIsIdleLoop) ? gpr.GetScopedReg() :
+                                                    Arm64GPRCache::ScopedARM64Reg(WA.GetReg());
 
   {
-    auto WC = IsDebuggingEnabled() && inst.LK && !js.op->branchIsIdleLoop ?
-                  gpr.GetScopedReg() :
-                  Arm64GPRCache::ScopedARM64Reg(ARM64Reg::INVALID_REG);
-
     FixupBranch pCTRDontBranch;
     if ((inst.BO & BO_DONT_DECREMENT_FLAG) == 0)  // Decrement and test CTR
     {
@@ -252,18 +214,11 @@ void JitArm64::bcx(UGeckoInstruction inst)
     gpr.Flush(FlushMode::MaintainState, WB);
     fpr.Flush(FlushMode::MaintainState, ARM64Reg::INVALID_REG);
 
-    if (IsDebuggingEnabled())
+    if (IsBranchWatchEnabled())
     {
-      ARM64Reg bw_reg_a, bw_reg_b;
-      // WC is only allocated when WA is needed for WriteExit and cannot be clobbered.
-      if (WC == ARM64Reg::INVALID_REG)
-        bw_reg_a = WA, bw_reg_b = WB;
-      else
-        bw_reg_a = WB, bw_reg_b = WC;
-      const BitSet32 gpr_caller_save =
-          gpr.GetCallerSavedUsed() & ~BitSet32{DecodeReg(bw_reg_a), DecodeReg(bw_reg_b)};
-      WriteBranchWatch<true>(js.compilerPC, js.op->branchTo, inst, bw_reg_a, bw_reg_b,
-                             gpr_caller_save, fpr.GetCallerSavedUsed());
+      BitSet32 gpr_caller_save = gpr.GetCallerSavedUsed() & ~BitSet32{DecodeReg(WB)};
+      WriteBranchWatch<true>(js.compilerPC, js.op->branchTo, inst, gpr_caller_save,
+                             fpr.GetCallerSavedUsed());
     }
     if (js.op->branchIsIdleLoop)
     {
@@ -290,17 +245,15 @@ void JitArm64::bcx(UGeckoInstruction inst)
   {
     gpr.Flush(FlushMode::All, WA);
     fpr.Flush(FlushMode::All, ARM64Reg::INVALID_REG);
-    if (IsDebuggingEnabled())
+    if (IsBranchWatchEnabled())
     {
-      WriteBranchWatch<false>(js.compilerPC, js.compilerPC + 4, inst, WA, WB, {}, {});
+      WriteBranchWatch<false>(js.compilerPC, js.compilerPC + 4, inst, {}, {});
     }
     WriteExit(js.compilerPC + 4);
   }
-  else if (IsDebuggingEnabled())
+  else if (IsBranchWatchEnabled())
   {
-    const BitSet32 gpr_caller_save =
-        gpr.GetCallerSavedUsed() & ~BitSet32{DecodeReg(WA), DecodeReg(WB)};
-    WriteBranchWatch<false>(js.compilerPC, js.compilerPC + 4, inst, WA, WB, gpr_caller_save,
+    WriteBranchWatch<false>(js.compilerPC, js.compilerPC + 4, inst, gpr.GetCallerSavedUsed(),
                             fpr.GetCallerSavedUsed());
   }
 }
@@ -338,14 +291,13 @@ void JitArm64::bcctrx(UGeckoInstruction inst)
   LDR(IndexType::Unsigned, WA, PPC_REG, PPCSTATE_OFF_SPR(SPR_CTR));
   AND(WA, WA, LogicalImm(~0x3, GPRSize::B32));
 
-  if (IsDebuggingEnabled())
+  if (IsBranchWatchEnabled())
   {
-    const auto WC = gpr.GetScopedReg(), WD = gpr.GetScopedReg();
     BitSet32 gpr_caller_save = BitSet32{DecodeReg(WA)};
     if (WB != ARM64Reg::INVALID_REG)
       gpr_caller_save[DecodeReg(WB)] = true;
     gpr_caller_save &= CALLER_SAVED_GPRS;
-    WriteBranchWatchDestInRegister(js.compilerPC, WA, inst, WC, WD, gpr_caller_save, {});
+    WriteBranchWatchDestInRegister(js.compilerPC, WA, inst, gpr_caller_save, {});
   }
   WriteExit(WA, inst.LK_3, js.compilerPC + 4, WB);
 }
@@ -360,18 +312,10 @@ void JitArm64::bclrx(UGeckoInstruction inst)
 
   auto WA = gpr.GetScopedReg();
   Arm64GPRCache::ScopedARM64Reg WB;
-  if (conditional || inst.LK || IsDebuggingEnabled())
-  {
+  if (conditional || inst.LK)
     WB = gpr.GetScopedReg();
-  }
 
   {
-    Arm64GPRCache::ScopedARM64Reg WC;
-    if (IsDebuggingEnabled())
-    {
-      WC = gpr.GetScopedReg();
-    }
-
     FixupBranch pCTRDontBranch;
     if ((inst.BO & BO_DONT_DECREMENT_FLAG) == 0)  // Decrement and test CTR
     {
@@ -404,13 +348,13 @@ void JitArm64::bclrx(UGeckoInstruction inst)
     gpr.Flush(conditional ? FlushMode::MaintainState : FlushMode::All, WB);
     fpr.Flush(conditional ? FlushMode::MaintainState : FlushMode::All, ARM64Reg::INVALID_REG);
 
-    if (IsDebuggingEnabled())
+    if (IsBranchWatchEnabled())
     {
       BitSet32 gpr_caller_save;
       BitSet32 fpr_caller_save;
       if (conditional)
       {
-        gpr_caller_save = gpr.GetCallerSavedUsed() & ~BitSet32{DecodeReg(WB), DecodeReg(WC)};
+        gpr_caller_save = gpr.GetCallerSavedUsed();
         if (js.op->branchIsIdleLoop)
           gpr_caller_save[DecodeReg(WA)] = false;
         fpr_caller_save = fpr.GetCallerSavedUsed();
@@ -421,8 +365,7 @@ void JitArm64::bclrx(UGeckoInstruction inst)
             js.op->branchIsIdleLoop ? BitSet32{} : BitSet32{DecodeReg(WA)} & CALLER_SAVED_GPRS;
         fpr_caller_save = {};
       }
-      WriteBranchWatchDestInRegister(js.compilerPC, WA, inst, WB, WC, gpr_caller_save,
-                                     fpr_caller_save);
+      WriteBranchWatchDestInRegister(js.compilerPC, WA, inst, gpr_caller_save, fpr_caller_save);
     }
     if (js.op->branchIsIdleLoop)
     {
@@ -449,17 +392,16 @@ void JitArm64::bclrx(UGeckoInstruction inst)
   {
     gpr.Flush(FlushMode::All, WA);
     fpr.Flush(FlushMode::All, ARM64Reg::INVALID_REG);
-    if (IsDebuggingEnabled())
+    if (IsBranchWatchEnabled())
     {
-      WriteBranchWatch<false>(js.compilerPC, js.compilerPC + 4, inst, WA, WB, {}, {});
+      WriteBranchWatch<false>(js.compilerPC, js.compilerPC + 4, inst, {}, {});
     }
     WriteExit(js.compilerPC + 4);
   }
-  else if (IsDebuggingEnabled())
+  else if (IsBranchWatchEnabled())
   {
-    const BitSet32 gpr_caller_save =
-        gpr.GetCallerSavedUsed() & ~BitSet32{DecodeReg(WA), DecodeReg(WB)};
-    WriteBranchWatch<false>(js.compilerPC, js.compilerPC + 4, inst, WA, WB, gpr_caller_save,
+    const BitSet32 gpr_caller_save = gpr.GetCallerSavedUsed() & ~BitSet32{DecodeReg(WA)};
+    WriteBranchWatch<false>(js.compilerPC, js.compilerPC + 4, inst, gpr_caller_save,
                             fpr.GetCallerSavedUsed());
   }
 }
diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_FloatingPoint.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_FloatingPoint.cpp
index 4f66b9470263..f2ac356fc56e 100644
--- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_FloatingPoint.cpp
+++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_FloatingPoint.cpp
@@ -75,28 +75,40 @@ void JitArm64::fp_arith(UGeckoInstruction inst)
   const u32 d = inst.FD;
   const u32 op5 = inst.SUBOP5;
 
-  const bool use_c = op5 >= 25;  // fmul and all kind of fmaddXX
+  const bool use_c = op5 >= 25;  // fmul and all kinds of fmaddXX
   const bool use_b = op5 != 25;  // fmul uses no B
   const bool fma = use_b && use_c;
   const bool negate_result = (op5 & ~0x1) == 30;
+  const bool negate_b = op5 == 28 || op5 == 30;
 
   const bool output_is_single = inst.OPCD == 59;
-  const bool inaccurate_fma = op5 > 25 && !Config::Get(Config::SESSION_USE_FMA);
-  const bool round_c = use_c && output_is_single && !js.op->fprIsSingle[inst.FC];
+  const bool nonfused_requested = fma && !Config::Get(Config::SESSION_USE_FMA);
+  const bool error_free_transformation_requested = fma && m_accurate_fmadds;
+  const bool round_c = use_c && output_is_single && !js.op->fprIsSingle[c];
 
   const auto inputs_are_singles_func = [&] {
     return fpr.IsSingle(a, true) && (!use_b || fpr.IsSingle(b, true)) &&
            (!use_c || fpr.IsSingle(c, true));
   };
-  const bool inputs_are_singles = inputs_are_singles_func();
 
-  const bool single = inputs_are_singles && output_is_single;
+  const bool single = inputs_are_singles_func() && output_is_single &&
+                      (error_free_transformation_requested || !nonfused_requested);
   const RegType type = single ? RegType::LowerPairSingle : RegType::LowerPair;
-  const RegType type_out =
-      output_is_single ? (inputs_are_singles ? RegType::DuplicatedSingle : RegType::Duplicated) :
-                         RegType::LowerPair;
+  const RegType type_out = output_is_single ?
+                               (single ? RegType::DuplicatedSingle : RegType::Duplicated) :
+                               RegType::LowerPair;
   const auto reg_encoder = single ? EncodeRegToSingle : EncodeRegToDouble;
 
+  const bool nonfused = nonfused_requested && !single;
+  const bool error_free_transformation =
+      error_free_transformation_requested && !single && output_is_single;
+
+  if (error_free_transformation)
+  {
+    gpr.Lock(ARM64Reg::W0, ARM64Reg::W1, ARM64Reg::W30);
+    fpr.Lock(ARM64Reg::Q0, ARM64Reg::Q1, ARM64Reg::Q2);
+  }
+
   const ARM64Reg VA = reg_encoder(fpr.R(a, type));
   const ARM64Reg VB = use_b ? reg_encoder(fpr.R(b, type)) : ARM64Reg::INVALID_REG;
   const ARM64Reg VC = use_c ? reg_encoder(fpr.R(c, type)) : ARM64Reg::INVALID_REG;
@@ -104,33 +116,47 @@ void JitArm64::fp_arith(UGeckoInstruction inst)
 
   {
     Arm64FPRCache::ScopedARM64Reg V0Q = ARM64Reg::INVALID_REG;
-    Arm64FPRCache::ScopedARM64Reg V1Q = ARM64Reg::INVALID_REG;
 
     ARM64Reg rounded_c_reg = VC;
     if (round_c)
     {
-      ASSERT_MSG(DYNA_REC, !inputs_are_singles, "Tried to apply 25-bit precision to single");
-
       V0Q = fpr.GetScopedReg();
       rounded_c_reg = reg_encoder(V0Q);
-      Force25BitPrecision(rounded_c_reg, VC);
     }
 
-    ARM64Reg inaccurate_fma_reg = VD;
-    if (fma && inaccurate_fma && VD == VB)
+    ARM64Reg result_reg = VD;
+    ARM64Reg nonfused_reg = VD;
+    if (error_free_transformation)
     {
-      if (V0Q == ARM64Reg::INVALID_REG)
+      result_reg = reg_encoder(ARM64Reg::Q0);
+      nonfused_reg = reg_encoder(ARM64Reg::Q0);
+
+      if (nonfused && V0Q == ARM64Reg::INVALID_REG)
         V0Q = fpr.GetScopedReg();
-      inaccurate_fma_reg = reg_encoder(V0Q);
+    }
+    else
+    {
+      const bool preserve_d =
+          m_accurate_nans && (VD == VA || (use_b && VD == VB) || (use_c && VD == VC));
+      if (preserve_d)
+      {
+        if (V0Q == ARM64Reg::INVALID_REG)
+          V0Q = fpr.GetScopedReg();
+        result_reg = reg_encoder(V0Q);
+        nonfused_reg = reg_encoder(V0Q);
+      }
+      else if (fma && nonfused && VD == VB)
+      {
+        if (V0Q == ARM64Reg::INVALID_REG)
+          V0Q = fpr.GetScopedReg();
+        nonfused_reg = reg_encoder(V0Q);
+      }
     }
 
-    ARM64Reg result_reg = VD;
-    const bool preserve_d =
-        m_accurate_nans && (VD == VA || (use_b && VD == VB) || (use_c && VD == VC));
-    if (preserve_d)
+    if (round_c)
     {
-      V1Q = fpr.GetScopedReg();
-      result_reg = reg_encoder(V1Q);
+      ASSERT_MSG(DYNA_REC, !single, "Tried to apply 25-bit precision to single");
+      Force25BitPrecision(rounded_c_reg, VC);
     }
 
     switch (op5)
@@ -153,10 +179,10 @@ void JitArm64::fp_arith(UGeckoInstruction inst)
     // So, we negate using a separate FNEG instruction instead of using AArch64's nmadd/msub.
     case 28:  // fmsub: "D = A*C - B" vs "Vd = (-Va) + Vn*Vm"
     case 30:  // fnmsub: "D = -(A*C - B)" vs "Vd = -((-Va) + Vn*Vm)"
-      if (inaccurate_fma)
+      if (nonfused)
       {
-        m_float_emit.FMUL(inaccurate_fma_reg, VA, rounded_c_reg);
-        m_float_emit.FSUB(result_reg, inaccurate_fma_reg, VB);
+        m_float_emit.FMUL(nonfused_reg, VA, rounded_c_reg);
+        m_float_emit.FSUB(result_reg, nonfused_reg, VB);
       }
       else
       {
@@ -165,10 +191,10 @@ void JitArm64::fp_arith(UGeckoInstruction inst)
       break;
     case 29:  // fmadd: "D = A*C + B" vs "Vd = Va + Vn*Vm"
     case 31:  // fnmadd: "D = -(A*C + B)" vs "Vd = -(Va + Vn*Vm)"
-      if (inaccurate_fma)
+      if (nonfused)
       {
-        m_float_emit.FMUL(inaccurate_fma_reg, VA, rounded_c_reg);
-        m_float_emit.FADD(result_reg, inaccurate_fma_reg, VB);
+        m_float_emit.FMUL(nonfused_reg, VA, rounded_c_reg);
+        m_float_emit.FADD(result_reg, nonfused_reg, VB);
       }
       else
       {
@@ -181,6 +207,7 @@ void JitArm64::fp_arith(UGeckoInstruction inst)
     }
 
     Common::SmallVector<FixupBranch, 4> nan_fixups;
+    std::optional<FixupBranch> nan_early_fixup;
     if (m_accurate_nans)
     {
       // Check if we need to handle NaNs
@@ -217,7 +244,6 @@ void JitArm64::fp_arith(UGeckoInstruction inst)
         SetJumpTarget(skip);
       }
 
-      std::optional<FixupBranch> nan_early_fixup;
       if (negate_result)
       {
         // If we have a NaN, we must not execute FNEG.
@@ -231,11 +257,46 @@ void JitArm64::fp_arith(UGeckoInstruction inst)
       }
 
       SwitchToNearCode();
+    }
+
+    // Read the comment in the interpreter function NI_madd_msub to find out what's going on here
+    if (error_free_transformation)
+    {
+      // We've calculated s := a + b (with a = VA * rounded_c_reg, b = negate_b ? -VB : VB)
+
+      // a' := s - b
+      if (negate_b)
+        m_float_emit.FADD(ARM64Reg::D1, result_reg, VB);
+      else
+        m_float_emit.FSUB(ARM64Reg::D1, result_reg, VB);
 
-      if (nan_early_fixup)
-        SetJumpTarget(*nan_early_fixup);
+      // b' := s - a'
+      m_float_emit.FSUB(ARM64Reg::D2, result_reg, ARM64Reg::D1);
+
+      // da := a - a'
+      if (nonfused)
+      {
+        m_float_emit.FMUL(EncodeRegToDouble(V0Q), VA, rounded_c_reg);
+        m_float_emit.FSUB(ARM64Reg::D1, EncodeRegToDouble(V0Q), ARM64Reg::D1);
+      }
+      else
+      {
+        m_float_emit.FNMSUB(ARM64Reg::D1, VA, rounded_c_reg, ARM64Reg::D1);
+      }
+
+      // db := b - b'
+      // (Transformed into -db := b' - b)
+      if (negate_b)
+        m_float_emit.FADD(ARM64Reg::D2, ARM64Reg::D2, VB);
+      else
+        m_float_emit.FSUB(ARM64Reg::D2, ARM64Reg::D2, VB);
+
+      BL(GetAsmRoutines()->fmadds_eft);
     }
 
+    if (nan_early_fixup)
+      SetJumpTarget(*nan_early_fixup);
+
     // PowerPC's nmadd/nmsub perform rounding before the final negation, which is not the case
     // for any of AArch64's FMA instructions, so we negate using a separate instruction.
     if (negate_result)
@@ -249,13 +310,19 @@ void JitArm64::fp_arith(UGeckoInstruction inst)
 
   if (output_is_single)
   {
-    ASSERT_MSG(DYNA_REC, inputs_are_singles == inputs_are_singles_func(),
+    ASSERT_MSG(DYNA_REC, single == inputs_are_singles_func(),
                "Register allocation turned singles into doubles in the middle of fp_arith");
 
     fpr.FixSinglePrecision(d);
   }
 
+  if (error_free_transformation)
+    gpr.Unlock(ARM64Reg::W0, ARM64Reg::W1, ARM64Reg::W30);
+
   SetFPRFIfNeeded(output_is_single, VD);
+
+  if (error_free_transformation)
+    fpr.Unlock(ARM64Reg::Q0, ARM64Reg::Q1, ARM64Reg::Q2);
 }
 
 void JitArm64::fp_logic(UGeckoInstruction inst)
diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_Integer.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_Integer.cpp
index cd8b00d49f3d..e82db407563d 100644
--- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_Integer.cpp
+++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_Integer.cpp
@@ -18,15 +18,18 @@
 using namespace Arm64Gen;
 using namespace JitCommon;
 
-#define CARRY_IF_NEEDED(inst_without_carry, inst_with_carry, ...)                                  \
+#define CARRY_IF_NEEDED_COND(carry, inst_without_carry, inst_with_carry, ...)                      \
   do                                                                                               \
   {                                                                                                \
-    if (js.op->wantsCA)                                                                            \
+    if ((carry) && js.op->wantsCA)                                                                 \
       inst_with_carry(__VA_ARGS__);                                                                \
     else                                                                                           \
       inst_without_carry(__VA_ARGS__);                                                             \
   } while (0)
 
+#define CARRY_IF_NEEDED(inst_without_carry, inst_with_carry, ...)                                  \
+  CARRY_IF_NEEDED_COND(true, inst_without_carry, inst_with_carry, __VA_ARGS__)
+
 void JitArm64::ComputeRC0(ARM64Reg reg)
 {
   gpr.BindCRToRegister(0, false);
@@ -1114,20 +1117,6 @@ void JitArm64::addzex(UGeckoInstruction inst)
     ComputeRC0(gpr.R(d));
 }
 
-void JitArm64::subfx(UGeckoInstruction inst)
-{
-  INSTRUCTION_START
-  JITDISABLE(bJITIntegerOff);
-  FALLBACK_IF(inst.OE);
-
-  int a = inst.RA, b = inst.RB, d = inst.RD;
-
-  gpr.BindToRegister(d, d == a || d == b);
-  SUB(gpr.R(d), gpr.R(b), gpr.R(a));
-  if (inst.Rc)
-    ComputeRC0(gpr.R(d));
-}
-
 void JitArm64::subfex(UGeckoInstruction inst)
 {
   INSTRUCTION_START
@@ -1259,13 +1248,14 @@ void JitArm64::subfex(UGeckoInstruction inst)
     ComputeRC0(gpr.R(d));
 }
 
-void JitArm64::subfcx(UGeckoInstruction inst)
+void JitArm64::subfx(UGeckoInstruction inst)
 {
   INSTRUCTION_START
   JITDISABLE(bJITIntegerOff);
   FALLBACK_IF(inst.OE);
 
-  int a = inst.RA, b = inst.RB, d = inst.RD;
+  const int a = inst.RA, b = inst.RB, d = inst.RD;
+  const bool carry = !(inst.SUBOP10 & (1 << 5));
 
   if (gpr.IsImm(a))
   {
@@ -1278,7 +1268,8 @@ void JitArm64::subfcx(UGeckoInstruction inst)
         gpr.BindToRegister(d, false);
         MOV(gpr.R(d), gpr.R(b));
       }
-      ComputeCarry(true);
+      if (carry)
+        ComputeCarry(true);
       if (inst.Rc)
         ComputeRC0(gpr.R(d));
       return;
@@ -1289,8 +1280,10 @@ void JitArm64::subfcx(UGeckoInstruction inst)
     if (low_12 || high_12)
     {
       gpr.BindToRegister(d, d == b);
-      CARRY_IF_NEEDED(SUB, SUBS, gpr.R(d), gpr.R(b), high_12 ? imm >> 12 : imm, high_12);
-      ComputeCarry();
+      CARRY_IF_NEEDED_COND(carry, SUB, SUBS, gpr.R(d), gpr.R(b), high_12 ? imm >> 12 : imm,
+                           high_12);
+      if (carry)
+        ComputeCarry();
       if (inst.Rc)
         ComputeRC0(gpr.R(d));
       return;
@@ -1300,8 +1293,9 @@ void JitArm64::subfcx(UGeckoInstruction inst)
   if (gpr.IsImm(b, 0))
   {
     gpr.BindToRegister(d, d == a);
-    CARRY_IF_NEEDED(NEG, NEGS, gpr.R(d), gpr.R(a));
-    ComputeCarry();
+    CARRY_IF_NEEDED_COND(carry, NEG, NEGS, gpr.R(d), gpr.R(a));
+    if (carry)
+      ComputeCarry();
     if (inst.Rc)
       ComputeRC0(gpr.R(d));
     return;
@@ -1310,10 +1304,9 @@ void JitArm64::subfcx(UGeckoInstruction inst)
   gpr.BindToRegister(d, d == a || d == b);
 
   // d = b - a
-  CARRY_IF_NEEDED(SUB, SUBS, gpr.R(d), gpr.R(b), gpr.R(a));
-
-  ComputeCarry();
-
+  CARRY_IF_NEEDED_COND(carry, SUB, SUBS, gpr.R(d), gpr.R(b), gpr.R(a));
+  if (carry)
+    ComputeCarry();
   if (inst.Rc)
     ComputeRC0(gpr.R(d));
 }
diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStore.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStore.cpp
index 2da5d113aa35..bcab1ede765c 100644
--- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStore.cpp
+++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStore.cpp
@@ -826,36 +826,21 @@ void JitArm64::dcbx(UGeckoInstruction inst)
     // Load the loop_counter register with the amount of invalidations to execute.
     ADD(loop_counter, WA, 1);
 
-    if (IsDebuggingEnabled())
+    if (IsBranchWatchEnabled())
     {
-      const ARM64Reg branch_watch = EncodeRegTo64(reg_cycle_count);
-      MOVP2R(branch_watch, &m_branch_watch);
-      LDRB(IndexType::Unsigned, WB, branch_watch, Core::BranchWatch::GetOffsetOfRecordingActive());
-      FixupBranch branch_over = CBZ(WB);
-
-      FixupBranch branch_in = B();
-      SwitchToFarCode();
-      SetJumpTarget(branch_in);
-
       const BitSet32 gpr_caller_save =
           gpr.GetCallerSavedUsed() &
           ~BitSet32{DecodeReg(WB), DecodeReg(reg_cycle_count), DecodeReg(reg_downcount)};
       ABI_PushRegisters(gpr_caller_save);
-      const ARM64Reg float_emit_tmp = EncodeRegTo64(WB);
       const BitSet32 fpr_caller_save = fpr.GetCallerSavedUsed();
-      m_float_emit.ABI_PushRegisters(fpr_caller_save, float_emit_tmp);
+      m_float_emit.ABI_PushRegisters(fpr_caller_save, ARM64Reg::X8);
       const PPCAnalyst::CodeOp& op = js.op[2];
       ABI_CallFunction(m_ppc_state.msr.IR ? &Core::BranchWatch::HitVirtualTrue_fk_n :
                                             &Core::BranchWatch::HitPhysicalTrue_fk_n,
-                       branch_watch, Core::FakeBranchWatchCollectionKey{op.address, op.branchTo},
+                       &m_branch_watch, Core::FakeBranchWatchCollectionKey{op.address, op.branchTo},
                        op.inst.hex, WA);
-      m_float_emit.ABI_PopRegisters(fpr_caller_save, float_emit_tmp);
+      m_float_emit.ABI_PopRegisters(fpr_caller_save, ARM64Reg::X8);
       ABI_PopRegisters(gpr_caller_save);
-
-      FixupBranch branch_out = B();
-      SwitchToNearCode();
-      SetJumpTarget(branch_out);
-      SetJumpTarget(branch_over);
     }
   }
 
diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_Paired.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_Paired.cpp
index 7ac2c31bb914..88ba86c2affb 100644
--- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_Paired.cpp
+++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_Paired.cpp
@@ -3,11 +3,12 @@
 
 #include "Core/PowerPC/JitArm64/Jit.h"
 
+#include <utility>
+
 #include "Common/Arm64Emitter.h"
 #include "Common/CommonTypes.h"
 #include "Common/Config/Config.h"
 #include "Common/StringUtil.h"
-#include "Common/Unreachable.h"
 
 #include "Core/Config/SessionSettings.h"
 #include "Core/ConfigManager.h"
@@ -91,18 +92,30 @@ void JitArm64::ps_arith(UGeckoInstruction inst)
   const bool duplicated_c = muls || madds;
   const bool fma = use_b && use_c;
   const bool negate_result = (op5 & ~0x1) == 30;
-  const bool msub = op5 == 28 || op5 == 30;
+  const bool negate_b = op5 == 28 || op5 == 30;
+
+  const bool nonfused_requested = fma && !Config::Get(Config::SESSION_USE_FMA);
+  const bool error_free_transformation_requested = fma && m_accurate_fmadds;
+  const bool round_c = use_c && !js.op->fprIsSingle[c];
 
-  const auto singles_func = [&] {
+  const auto inputs_are_singles_func = [&] {
     return fpr.IsSingle(a) && (!use_b || fpr.IsSingle(b)) && (!use_c || fpr.IsSingle(c));
   };
-  const bool singles = singles_func();
 
-  const bool inaccurate_fma = !Config::Get(Config::SESSION_USE_FMA);
-  const bool round_c = use_c && !js.op->fprIsSingle[inst.FC];
-  const RegType type = singles ? RegType::Single : RegType::Register;
-  const u8 size = singles ? 32 : 64;
-  const auto reg_encoder = singles ? EncodeRegToDouble : EncodeRegToQuad;
+  const bool single =
+      inputs_are_singles_func() && (error_free_transformation_requested || !nonfused_requested);
+  const RegType type = single ? RegType::Single : RegType::Register;
+  const u8 size = single ? 32 : 64;
+  const auto reg_encoder = single ? EncodeRegToDouble : EncodeRegToQuad;
+
+  const bool nonfused = nonfused_requested && !single;
+  const bool error_free_transformation = error_free_transformation_requested && !single;
+
+  if (error_free_transformation)
+  {
+    gpr.Lock(ARM64Reg::W0, ARM64Reg::W30);
+    fpr.Lock(ARM64Reg::Q0, ARM64Reg::Q1, ARM64Reg::Q2, ARM64Reg::Q3, ARM64Reg::Q4);
+  }
 
   const ARM64Reg VA = reg_encoder(fpr.R(a, type));
   const ARM64Reg VB = use_b ? reg_encoder(fpr.R(b, type)) : ARM64Reg::INVALID_REG;
@@ -117,41 +130,77 @@ void JitArm64::ps_arith(UGeckoInstruction inst)
     ARM64Reg rounded_c_reg = VC;
     if (round_c)
     {
-      ASSERT_MSG(DYNA_REC, !singles, "Tried to apply 25-bit precision to single");
-
-      V0Q = fpr.GetScopedReg();
-      rounded_c_reg = reg_encoder(V0Q);
-      Force25BitPrecision(rounded_c_reg, VC);
-    }
-
-    ARM64Reg inaccurate_fma_reg = VD;
-    if (fma && inaccurate_fma && VD == VB)
-    {
-      if (V0Q == ARM64Reg::INVALID_REG)
+      if (error_free_transformation)
+      {
+        // This register happens to be free, so we can skip allocating one
+        rounded_c_reg = ARM64Reg::Q3;
+      }
+      else
+      {
         V0Q = fpr.GetScopedReg();
-      inaccurate_fma_reg = reg_encoder(V0Q);
+        rounded_c_reg = reg_encoder(V0Q);
+      }
     }
 
     ARM64Reg result_reg = VD;
-    const bool need_accurate_fma_reg =
-        fma && !inaccurate_fma && (msub || VD != VB) && (VD == VA || VD == rounded_c_reg);
-    const bool preserve_d =
-        m_accurate_nans && (VD == VA || (use_b && VD == VB) || (use_c && VD == VC));
-    if (need_accurate_fma_reg || preserve_d)
+    ARM64Reg nonfused_reg = VD;
+    if (error_free_transformation)
+    {
+      result_reg = reg_encoder(ARM64Reg::Q0);
+      nonfused_reg = reg_encoder(ARM64Reg::Q0);
+    }
+    else
     {
-      V1Q = fpr.GetScopedReg();
-      result_reg = reg_encoder(V1Q);
+      const bool need_fused_fma_reg =
+          fma && !nonfused && (negate_b || VD != VB) && (VD == VA || VD == rounded_c_reg);
+      const bool preserve_d =
+          m_accurate_nans && (VD == VA || (use_b && VD == VB) || (use_c && VD == VC));
+      if (need_fused_fma_reg || preserve_d)
+      {
+        if (V0Q == ARM64Reg::INVALID_REG)
+          V0Q = fpr.GetScopedReg();
+        result_reg = reg_encoder(V0Q);
+        nonfused_reg = reg_encoder(V0Q);
+
+        if (need_fused_fma_reg && round_c)
+        {
+          V1Q = fpr.GetScopedReg();
+          rounded_c_reg = reg_encoder(V1Q);
+        }
+      }
+      else if (fma && nonfused && VD == VB)
+      {
+        if (V0Q == ARM64Reg::INVALID_REG)
+          V0Q = fpr.GetScopedReg();
+        nonfused_reg = reg_encoder(V0Q);
+      }
     }
 
     if (m_accurate_nans)
     {
-      if (V0Q == ARM64Reg::INVALID_REG)
-        V0Q = fpr.GetScopedReg();
+      if (error_free_transformation)
+      {
+        // These registers happen to be free, so we can skip allocating new ones
+        V1Q = ARM64Reg::Q1;
+        V2Q = ARM64Reg::Q2;
+      }
+      else
+      {
+        if (V1Q == ARM64Reg::INVALID_REG)
+          V1Q = fpr.GetScopedReg();
+
+        if (duplicated_c || VD == result_reg)
+          V2Q = fpr.GetScopedReg();
+      }
+    }
 
-      if (duplicated_c || VD == result_reg)
-        V2Q = fpr.GetScopedReg();
+    if (round_c)
+    {
+      ASSERT_MSG(DYNA_REC, !single, "Tried to apply 25-bit precision to single");
+      Force25BitPrecision(rounded_c_reg, VC);
     }
 
+    std::optional<ARM64Reg> negated_b_reg;
     switch (op5)
     {
     case 12:  // ps_muls0: d = a * c.ps0
@@ -161,10 +210,10 @@ void JitArm64::ps_arith(UGeckoInstruction inst)
       m_float_emit.FMUL(size, result_reg, VA, rounded_c_reg, 1);
       break;
     case 14:  // ps_madds0: d = a * c.ps0 + b
-      if (inaccurate_fma)
+      if (nonfused)
       {
-        m_float_emit.FMUL(size, inaccurate_fma_reg, VA, rounded_c_reg, 0);
-        m_float_emit.FADD(size, result_reg, inaccurate_fma_reg, VB);
+        m_float_emit.FMUL(size, nonfused_reg, VA, rounded_c_reg, 0);
+        m_float_emit.FADD(size, result_reg, nonfused_reg, VB);
       }
       else
       {
@@ -174,10 +223,10 @@ void JitArm64::ps_arith(UGeckoInstruction inst)
       }
       break;
     case 15:  // ps_madds1: d = a * c.ps1 + b
-      if (inaccurate_fma)
+      if (nonfused)
       {
-        m_float_emit.FMUL(size, inaccurate_fma_reg, VA, rounded_c_reg, 1);
-        m_float_emit.FADD(size, result_reg, inaccurate_fma_reg, VB);
+        m_float_emit.FMUL(size, nonfused_reg, VA, rounded_c_reg, 1);
+        m_float_emit.FADD(size, result_reg, nonfused_reg, VB);
       }
       else
       {
@@ -200,23 +249,28 @@ void JitArm64::ps_arith(UGeckoInstruction inst)
       break;
     case 28:  // ps_msub:  d = a * c - b
     case 30:  // ps_nmsub: d = -(a * c - b)
-      if (inaccurate_fma)
+      if (nonfused)
       {
-        m_float_emit.FMUL(size, inaccurate_fma_reg, VA, rounded_c_reg);
-        m_float_emit.FSUB(size, result_reg, inaccurate_fma_reg, VB);
+        m_float_emit.FMUL(size, nonfused_reg, VA, rounded_c_reg);
+        m_float_emit.FSUB(size, result_reg, nonfused_reg, VB);
       }
       else
       {
         m_float_emit.FNEG(size, result_reg, VB);
+        if (error_free_transformation)
+        {
+          m_float_emit.MOV(ARM64Reg::Q4, result_reg);
+          negated_b_reg = ARM64Reg::Q4;
+        }
         m_float_emit.FMLA(size, result_reg, VA, rounded_c_reg);
       }
       break;
     case 29:  // ps_madd:  d = a * c + b
     case 31:  // ps_nmadd: d = -(a * c + b)
-      if (inaccurate_fma)
+      if (nonfused)
       {
-        m_float_emit.FMUL(size, inaccurate_fma_reg, VA, rounded_c_reg);
-        m_float_emit.FADD(size, result_reg, inaccurate_fma_reg, VB);
+        m_float_emit.FMUL(size, nonfused_reg, VA, rounded_c_reg);
+        m_float_emit.FADD(size, result_reg, nonfused_reg, VB);
       }
       else
       {
@@ -230,11 +284,80 @@ void JitArm64::ps_arith(UGeckoInstruction inst)
       break;
     }
 
+    // Read the comment in the interpreter function NI_madd_msub to find out what's going on here
+    if (error_free_transformation)
+    {
+      // We've calculated s := a + b (with a = VA * rounded_c_reg, b = negate_b ? -VB : VB)
+
+      // a' := s - b
+      // (Transformed into -a' := b - s)
+      if (negate_b)
+      {
+        if (!negated_b_reg)
+        {
+          m_float_emit.FNEG(size, ARM64Reg::Q4, VB);
+          negated_b_reg = ARM64Reg::Q4;
+        }
+        m_float_emit.FSUB(size, ARM64Reg::Q1, *negated_b_reg, result_reg);
+      }
+      else
+      {
+        m_float_emit.FSUB(size, ARM64Reg::Q1, VB, result_reg);
+      }
+
+      // b' := s - a'
+      // (Transformed into b' := s + -a')
+      m_float_emit.FADD(size, ARM64Reg::Q2, result_reg, ARM64Reg::Q1);
+
+      // da := a - a'
+      // (Transformed into da := a + -a')
+      if (nonfused)
+      {
+        switch (op5)
+        {
+        case 14:  // ps_madds0: d = a * c.ps0 + b
+          m_float_emit.FMUL(size, ARM64Reg::Q3, VA, rounded_c_reg, 0);
+          break;
+        case 15:  // ps_madds1: d = a * c.ps1 + b
+          m_float_emit.FMUL(size, ARM64Reg::Q3, VA, rounded_c_reg, 1);
+          break;
+        default:
+          m_float_emit.FMUL(size, ARM64Reg::Q3, VA, rounded_c_reg);
+          break;
+        }
+        m_float_emit.FADD(size, ARM64Reg::Q1, ARM64Reg::Q3, ARM64Reg::Q1);
+      }
+      else
+      {
+        switch (op5)
+        {
+        case 14:  // ps_madds0: d = a * c.ps0 + b
+          m_float_emit.FMLA(size, ARM64Reg::Q1, VA, rounded_c_reg, 0);
+          break;
+        case 15:  // ps_madds1: d = a * c.ps1 + b
+          m_float_emit.FMLA(size, ARM64Reg::Q1, VA, rounded_c_reg, 1);
+          break;
+        default:
+          m_float_emit.FMLA(size, ARM64Reg::Q1, VA, rounded_c_reg);
+          break;
+        }
+      }
+
+      // db := b - b'
+      // (Transformed into -db := b' - b)
+      if (negate_b)
+        m_float_emit.FADD(size, ARM64Reg::Q2, ARM64Reg::Q2, VB);
+      else
+        m_float_emit.FSUB(size, ARM64Reg::Q2, ARM64Reg::Q2, VB);
+
+      BL(GetAsmRoutines()->ps_madd_eft);
+    }
+
     FixupBranch nan_fixup;
     if (m_accurate_nans)
     {
-      const ARM64Reg nan_temp_reg = singles ? EncodeRegToSingle(V0Q) : EncodeRegToDouble(V0Q);
-      const ARM64Reg nan_temp_reg_paired = reg_encoder(V0Q);
+      const ARM64Reg nan_temp_reg = single ? EncodeRegToSingle(V1Q) : EncodeRegToDouble(V1Q);
+      const ARM64Reg nan_temp_reg_paired = reg_encoder(V1Q);
 
       // Check if we need to handle NaNs
 
@@ -299,12 +422,18 @@ void JitArm64::ps_arith(UGeckoInstruction inst)
       SetJumpTarget(nan_fixup);
   }
 
-  ASSERT_MSG(DYNA_REC, singles == singles_func(),
+  ASSERT_MSG(DYNA_REC, single == inputs_are_singles_func(),
              "Register allocation turned singles into doubles in the middle of ps_arith");
 
   fpr.FixSinglePrecision(d);
 
+  if (error_free_transformation)
+    gpr.Unlock(ARM64Reg::W0, ARM64Reg::W30);
+
   SetFPRFIfNeeded(true, VD);
+
+  if (error_free_transformation)
+    fpr.Unlock(ARM64Reg::Q0, ARM64Reg::Q1, ARM64Reg::Q2, ARM64Reg::Q3, ARM64Reg::Q4);
 }
 
 void JitArm64::ps_sel(UGeckoInstruction inst)
@@ -343,7 +472,7 @@ void JitArm64::ps_sel(UGeckoInstruction inst)
     else if (d == c)
       m_float_emit.BIF(VD, VB, V0);
     else
-      Common::Unreachable();
+      std::unreachable();
   }
 
   ASSERT_MSG(DYNA_REC, singles == (fpr.IsSingle(a) && fpr.IsSingle(b) && fpr.IsSingle(c)),
diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.cpp
index 8ba7a6a3be4e..308c14fddefe 100644
--- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.cpp
+++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.cpp
@@ -182,12 +182,9 @@ Arm64GPRCache::GuestRegInfo Arm64GPRCache::GetGuestCR(size_t preg)
 
 Arm64GPRCache::GuestRegInfo Arm64GPRCache::GetGuestByIndex(size_t index)
 {
-  // We do not need to test for `index >= GUEST_GPR_OFFSET` because
-  // GUEST_GPR_OFFSET is always 0. This otherwise raises a warning.
-  static_assert(GUEST_GPR_OFFSET == 0);
-  if (index < GUEST_GPR_OFFSET + GUEST_GPR_COUNT)
+  if (IsIndexGPR(index))
     return GetGuestGPR(index - GUEST_GPR_OFFSET);
-  if (index >= GUEST_CR_OFFSET && index < GUEST_CR_OFFSET + GUEST_CR_COUNT)
+  if (IsIndexCR(index))
     return GetGuestCR(index - GUEST_CR_OFFSET);
   ASSERT_MSG(DYNA_REC, false, "Invalid index for guest register");
   return GetGuestGPR(0);
@@ -198,7 +195,7 @@ void Arm64GPRCache::FlushRegister(size_t index, FlushMode mode, ARM64Reg tmp_reg
   GuestRegInfo guest_reg = GetGuestByIndex(index);
   OpArg& reg = guest_reg.reg;
   size_t bitsize = guest_reg.bitsize;
-  const bool is_gpr = index >= GUEST_GPR_OFFSET && index < GUEST_GPR_OFFSET + GUEST_GPR_COUNT;
+  const bool is_gpr = IsIndexGPR(index);
 
   if (reg.IsInHostRegister())
   {
@@ -349,7 +346,7 @@ ARM64Reg Arm64GPRCache::BindForRead(size_t index)
   GuestRegInfo guest_reg = GetGuestByIndex(index);
   OpArg& reg = guest_reg.reg;
   size_t bitsize = guest_reg.bitsize;
-  const bool is_gpr = index >= GUEST_GPR_OFFSET && index < GUEST_GPR_OFFSET + GUEST_GPR_COUNT;
+  const bool is_gpr = IsIndexGPR(index);
 
   IncrementAllUsed();
   reg.ResetLastUsed();
@@ -392,7 +389,7 @@ void Arm64GPRCache::BindForWrite(size_t index, bool will_read, bool will_write)
   GuestRegInfo guest_reg = GetGuestByIndex(index);
   OpArg& reg = guest_reg.reg;
   const size_t bitsize = guest_reg.bitsize;
-  const bool is_gpr = index >= GUEST_GPR_OFFSET && index < GUEST_GPR_OFFSET + GUEST_GPR_COUNT;
+  const bool is_gpr = IsIndexGPR(index);
 
   reg.ResetLastUsed();
 
diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.h b/Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.h
index d547ee9d4eed..cde4fbe6cb21 100644
--- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.h
+++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.h
@@ -33,19 +33,19 @@ constexpr Arm64Gen::ARM64Reg DISPATCHER_PC = Arm64Gen::ARM64Reg::W26;
             PowerPC::PowerPCState, elem);                                                          \
     _Pragma("GCC diagnostic pop")                                                                  \
   }())
-
-#define PPCSTATE_OFF_ARRAY(elem, i)                                                                \
-  (PPCSTATE_OFF(elem[0]) + sizeof(PowerPC::PowerPCState::elem[0]) * (i))
 #else
 #define PPCSTATE_OFF(elem) (offsetof(PowerPC::PowerPCState, elem))
+#endif
 
 #define PPCSTATE_OFF_ARRAY(elem, i)                                                                \
-  (offsetof(PowerPC::PowerPCState, elem[0]) + sizeof(PowerPC::PowerPCState::elem[0]) * (i))
-#endif
+  (PPCSTATE_OFF(elem[0]) + sizeof(PowerPC::PowerPCState::elem[0]) * (i))
+
+#define PPCSTATE_OFF_STD_ARRAY(elem, i)                                                            \
+  (PPCSTATE_OFF(elem) + sizeof(PowerPC::PowerPCState::elem[0]) * (i))
 
 #define PPCSTATE_OFF_GPR(i) PPCSTATE_OFF_ARRAY(gpr, i)
 #define PPCSTATE_OFF_CR(i) PPCSTATE_OFF_ARRAY(cr.fields, i)
-#define PPCSTATE_OFF_SR(i) PPCSTATE_OFF_ARRAY(sr, i)
+#define PPCSTATE_OFF_SR(i) PPCSTATE_OFF_STD_ARRAY(sr, i)
 #define PPCSTATE_OFF_SPR(i) PPCSTATE_OFF_ARRAY(spr, i)
 
 static_assert(std::is_same_v<decltype(PowerPC::PowerPCState::ps[0]), PowerPC::PairedSingle&>);
@@ -419,6 +419,19 @@ class Arm64GPRCache : public Arm64RegCache
   GuestRegInfo GetGuestCR(size_t preg);
   GuestRegInfo GetGuestByIndex(size_t index);
 
+  constexpr bool IsIndexGPR(size_t index)
+  {
+    // We do not need to test for `index >= GUEST_GPR_OFFSET` because
+    // GUEST_GPR_OFFSET is always 0. This otherwise raises a warning.
+    static_assert(GUEST_GPR_OFFSET == 0);
+    return index < GUEST_GPR_OFFSET + GUEST_GPR_COUNT;
+  }
+
+  constexpr bool IsIndexCR(size_t index)
+  {
+    return index >= GUEST_CR_OFFSET && index < GUEST_CR_OFFSET + GUEST_CR_COUNT;
+  }
+
   Arm64Gen::ARM64Reg BindForRead(size_t index);
   void SetImmediateInternal(size_t index, u32 imm, bool dirty);
   void BindForWrite(size_t index, bool will_read, bool will_write = true);
diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_SystemRegisters.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_SystemRegisters.cpp
index 54592951e487..21a0003887ad 100644
--- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_SystemRegisters.cpp
+++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_SystemRegisters.cpp
@@ -291,14 +291,6 @@ void JitArm64::mfsr(UGeckoInstruction inst)
   LDR(IndexType::Unsigned, gpr.R(inst.RD), PPC_REG, PPCSTATE_OFF_SR(inst.SR));
 }
 
-void JitArm64::mtsr(UGeckoInstruction inst)
-{
-  INSTRUCTION_START
-  JITDISABLE(bJITSystemRegistersOff);
-
-  STR(IndexType::Unsigned, gpr.R(inst.RS), PPC_REG, PPCSTATE_OFF_SR(inst.SR));
-}
-
 void JitArm64::mfsrin(UGeckoInstruction inst)
 {
   INSTRUCTION_START
@@ -317,24 +309,6 @@ void JitArm64::mfsrin(UGeckoInstruction inst)
   LDR(RD, addr, ArithOption(EncodeRegTo64(index), true));
 }
 
-void JitArm64::mtsrin(UGeckoInstruction inst)
-{
-  INSTRUCTION_START
-  JITDISABLE(bJITSystemRegistersOff);
-
-  u32 b = inst.RB, d = inst.RD;
-  gpr.BindToRegister(d, d == b);
-
-  ARM64Reg RB = gpr.R(b);
-  ARM64Reg RD = gpr.R(d);
-  auto index = gpr.GetScopedReg();
-  auto addr = gpr.GetScopedReg();
-
-  UBFM(index, RB, 28, 31);
-  ADDI2R(EncodeRegTo64(addr), PPC_REG, PPCSTATE_OFF_SR(0), EncodeRegTo64(addr));
-  STR(RD, EncodeRegTo64(addr), ArithOption(EncodeRegTo64(index), true));
-}
-
 void JitArm64::twx(UGeckoInstruction inst)
 {
   INSTRUCTION_START
diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp
index eb97db9b91e5..dc72083d39ea 100644
--- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp
+++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_Tables.cpp
@@ -172,8 +172,8 @@ constexpr std::array<JitArm64OpTemplate, 107> s_table31{{
     {616, &JitArm64::negx},     // negox
     {40, &JitArm64::subfx},     // subfx
     {552, &JitArm64::subfx},    // subfox
-    {8, &JitArm64::subfcx},     // subfcx
-    {520, &JitArm64::subfcx},   // subfcox
+    {8, &JitArm64::subfx},      // subfcx
+    {520, &JitArm64::subfx},    // subfcox
     {136, &JitArm64::subfex},   // subfex
     {648, &JitArm64::subfex},   // subfeox
     {232, &JitArm64::subfex},   // subfmex
@@ -266,18 +266,18 @@ constexpr std::array<JitArm64OpTemplate, 107> s_table31{{
     {759, &JitArm64::stfXX},  // stfdux
     {983, &JitArm64::stfXX},  // stfiwx
 
-    {19, &JitArm64::mfcr},     // mfcr
-    {83, &JitArm64::mfmsr},    // mfmsr
-    {144, &JitArm64::mtcrf},   // mtcrf
-    {146, &JitArm64::mtmsr},   // mtmsr
-    {210, &JitArm64::mtsr},    // mtsr
-    {242, &JitArm64::mtsrin},  // mtsrin
-    {339, &JitArm64::mfspr},   // mfspr
-    {467, &JitArm64::mtspr},   // mtspr
-    {371, &JitArm64::mftb},    // mftb
-    {512, &JitArm64::mcrxr},   // mcrxr
-    {595, &JitArm64::mfsr},    // mfsr
-    {659, &JitArm64::mfsrin},  // mfsrin
+    {19, &JitArm64::mfcr},                    // mfcr
+    {83, &JitArm64::mfmsr},                   // mfmsr
+    {144, &JitArm64::mtcrf},                  // mtcrf
+    {146, &JitArm64::mtmsr},                  // mtmsr
+    {210, &JitArm64::FallBackToInterpreter},  // mtsr
+    {242, &JitArm64::FallBackToInterpreter},  // mtsrin
+    {339, &JitArm64::mfspr},                  // mfspr
+    {467, &JitArm64::mtspr},                  // mtspr
+    {371, &JitArm64::mftb},                   // mftb
+    {512, &JitArm64::mcrxr},                  // mcrxr
+    {595, &JitArm64::mfsr},                   // mfsr
+    {659, &JitArm64::mfsrin},                 // mfsrin
 
     {4, &JitArm64::twx},                      // tw
     {598, &JitArm64::DoNothing},              // sync
diff --git a/Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp b/Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp
index 75d4b971048e..58d0ca5b7c70 100644
--- a/Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp
+++ b/Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp
@@ -5,11 +5,12 @@
 
 #include <bit>
 #include <limits>
+#include <utility>
 
 #include "Common/Arm64Emitter.h"
+#include "Common/CPUDetect.h"
 #include "Common/CommonTypes.h"
 #include "Common/Config/Config.h"
-#include "Common/EnumUtils.h"
 #include "Common/FloatUtils.h"
 #include "Common/JitRegister.h"
 #include "Common/MathUtil.h"
@@ -89,7 +90,7 @@ void JitArm64::GenerateAsm()
   {
     LDR(IndexType::Unsigned, ARM64Reg::W8, ARM64Reg::X8,
         MOVPage2R(ARM64Reg::X8, cpu.GetStatePtr()));
-    static_assert(Common::ToUnderlying(CPU::State::Running) == 0);
+    static_assert(std::to_underlying(CPU::State::Running) == 0);
     debug_exit = CBNZ(ARM64Reg::W8);
   }
 
@@ -197,7 +198,7 @@ void JitArm64::GenerateAsm()
   // Check the state pointer to see if we are exiting
   // Gets checked on at the end of every slice
   LDR(IndexType::Unsigned, ARM64Reg::W8, ARM64Reg::X8, MOVPage2R(ARM64Reg::X8, cpu.GetStatePtr()));
-  static_assert(Common::ToUnderlying(CPU::State::Running) == 0);
+  static_assert(std::to_underlying(CPU::State::Running) == 0);
   FixupBranch exit = CBNZ(ARM64Reg::W8);
 
   SetJumpTarget(to_start_of_timing_slice);
@@ -265,6 +266,14 @@ void JitArm64::GenerateCommonAsm()
   GenerateFPRF(false);
   Common::JitRegister::Register(GetAsmRoutines()->fprf_single, GetCodePtr(), "JIT_FPRF");
 
+  GetAsmRoutines()->fmadds_eft = GetCodePtr();
+  GenerateFmaddsEft();
+  Common::JitRegister::Register(GetAsmRoutines()->fmadds_eft, GetCodePtr(), "JIT_fmadds_eft");
+
+  GetAsmRoutines()->ps_madd_eft = GetCodePtr();
+  GeneratePsMaddEft();
+  Common::JitRegister::Register(GetAsmRoutines()->ps_madd_eft, GetCodePtr(), "JIT_ps_madd_eft");
+
   GenerateQuantizedLoads();
   GenerateQuantizedStores();
 }
@@ -514,6 +523,90 @@ void JitArm64::GenerateFPRF(bool single)
   B(write_fprf_and_ret);
 }
 
+// Inputs:
+// D0: Result with potentially incorrect rounding
+// D1: First error term
+// D2: Second error term, negated
+//
+// Outputs result with corrected rounding in D0. Clobbers X0-X1, D1, and flags.
+void JitArm64::GenerateFmaddsEft()
+{
+  // Check if D0 is an even tie, i.e. check (input & 0x1fffffff) == 0x10000000
+  m_float_emit.FMOV(ARM64Reg::X0, ARM64Reg::D0);
+  MOVI2R(ARM64Reg::W1, 0x80000000);
+  CMP(ARM64Reg::W1, ARM64Reg::W0, ArithOption(ARM64Reg::W0, ShiftType::LSL, 3));
+  FixupBranch even_tie = B(CCFlags::CC_EQ);
+
+  const u8* ret = GetCodePtr();
+  RET();
+
+  // Check if the error is 0
+  SetJumpTarget(even_tie);
+  m_float_emit.FSUB(ARM64Reg::D1, ARM64Reg::D1, ARM64Reg::D2);
+  m_float_emit.FCMP(ARM64Reg::D1);
+  B(CCFlags::CC_EQ, ret);
+
+  // Round D0 up or down
+  MOVZ(ARM64Reg::X1, 1);
+  CNEG(ARM64Reg::X1, ARM64Reg::X1, CCFlags::CC_LT);
+  CMP(ARM64Reg::X0, 0);
+  CNEG(ARM64Reg::X1, ARM64Reg::X1, CCFlags::CC_LT);
+  ADD(ARM64Reg::X0, ARM64Reg::X0, ARM64Reg::X1);
+  m_float_emit.FMOV(ARM64Reg::D0, ARM64Reg::X0);
+  RET();
+}
+
+// Inputs:
+// Q0: Results with potentially incorrect rounding
+// Q1: First error terms
+// Q2: Second error terms, negated
+//
+// Outputs results with corrected rounding in Q0. Clobbers X0, Q1-Q4, and flags.
+void JitArm64::GeneratePsMaddEft()
+{
+  // Check if Q0 has an even tie, i.e. check (input & 0x1fffffff) == 0x10000000
+  MOVI2R(ARM64Reg::X0, 0x8000'0000'0000'0000);
+  m_float_emit.SHL(64, ARM64Reg::Q3, ARM64Reg::Q0, 35);
+  m_float_emit.DUP(64, ARM64Reg::Q4, ARM64Reg::X0);
+  m_float_emit.CMEQ(64, ARM64Reg::Q3, ARM64Reg::Q3, ARM64Reg::Q4);
+
+  // Just for performance, exit early if there is no even tie
+  m_float_emit.XTN(32, ARM64Reg::D4, ARM64Reg::Q3);
+  FixupBranch even_tie;
+  if (cpu_info.bAFP)
+  {
+    m_float_emit.FCMP(ARM64Reg::D4);
+    even_tie = B(CCFlags::CC_NEQ);
+  }
+  else
+  {
+    // If we don't have AFP and the emulated software has NI set, subnormals will compare equal to
+    // zero, so we can't use FCMP unless we were to put some shuffle instruction before it.
+    // FMOV is a little slower than FCMP, but it's faster than adding an extra instruction.
+    m_float_emit.FMOV(ARM64Reg::X0, ARM64Reg::D4);
+    even_tie = CBNZ(ARM64Reg::X0);
+  }
+  RET();
+  SetJumpTarget(even_tie);
+
+  // Check if the error is zero
+  m_float_emit.FSUB(64, ARM64Reg::Q1, ARM64Reg::Q1, ARM64Reg::Q2);
+  MOVZ(ARM64Reg::X0, 1);
+  m_float_emit.FCMEQ(64, ARM64Reg::Q2, ARM64Reg::Q1);
+
+  // Store -1 or 1 in Q1 depending on whether we're rounding down or up
+  m_float_emit.EOR(ARM64Reg::Q1, ARM64Reg::Q1, ARM64Reg::Q0);
+  m_float_emit.DUP(64, ARM64Reg::Q4, ARM64Reg::X0);
+  m_float_emit.SSHR(64, ARM64Reg::Q1, ARM64Reg::Q1, 63);
+  m_float_emit.ORR(ARM64Reg::Q1, ARM64Reg::Q1, ARM64Reg::Q4);
+
+  // Round the elements that have both a non-zero error and an even tie
+  m_float_emit.BIC(ARM64Reg::Q2, ARM64Reg::Q3, ARM64Reg::Q2);
+  m_float_emit.AND(ARM64Reg::Q1, ARM64Reg::Q1, ARM64Reg::Q2);
+  m_float_emit.ADD(64, ARM64Reg::Q0, ARM64Reg::Q0, ARM64Reg::Q1);
+  RET();
+}
+
 void JitArm64::GenerateQuantizedLoads()
 {
   // X0 is a temporary
diff --git a/Source/Core/Core/PowerPC/JitCommon/JitAsmCommon.h b/Source/Core/Core/PowerPC/JitCommon/JitAsmCommon.h
index 4fd58bc89737..88132bdd6ab5 100644
--- a/Source/Core/Core/PowerPC/JitCommon/JitAsmCommon.h
+++ b/Source/Core/Core/PowerPC/JitCommon/JitAsmCommon.h
@@ -30,6 +30,8 @@ struct CommonAsmRoutinesBase
   const u8* cstd;
   const u8* fprf_single;
   const u8* fprf_double;
+  const u8* fmadds_eft;
+  const u8* ps_madd_eft;
 
   // In: array index: GQR to use.
   // In: ECX: Address to read from.
diff --git a/Source/Core/Core/PowerPC/JitCommon/JitBase.cpp b/Source/Core/Core/PowerPC/JitCommon/JitBase.cpp
index d2de2895a751..d0ecd0a2b452 100644
--- a/Source/Core/Core/PowerPC/JitCommon/JitBase.cpp
+++ b/Source/Core/Core/PowerPC/JitCommon/JitBase.cpp
@@ -19,6 +19,7 @@
 #include "Core/CoreTiming.h"
 #include "Core/HW/CPU.h"
 #include "Core/MemTools.h"
+#include "Core/PowerPC/MMU.h"
 #include "Core/PowerPC/PPCAnalyst.h"
 #include "Core/PowerPC/PowerPC.h"
 #include "Core/System.h"
@@ -57,7 +58,7 @@
 // After resetting the stack to the top, we call _resetstkoflw() to restore
 // the guard page at the 256kb mark.
 
-const std::array<std::pair<bool JitBase::*, const Config::Info<bool>*>, 23> JitBase::JIT_SETTINGS{{
+const std::array<std::pair<bool JitBase::*, const Config::Info<bool>*>, 24> JitBase::JIT_SETTINGS{{
     {&JitBase::bJITOff, &Config::MAIN_DEBUG_JIT_OFF},
     {&JitBase::bJITLoadStoreOff, &Config::MAIN_DEBUG_JIT_LOAD_STORE_OFF},
     {&JitBase::bJITLoadStorelXzOff, &Config::MAIN_DEBUG_JIT_LOAD_STORE_LXZ_OFF},
@@ -79,6 +80,7 @@ const std::array<std::pair<bool JitBase::*, const Config::Info<bool>*>, 23> JitB
     {&JitBase::m_low_dcbz_hack, &Config::MAIN_LOW_DCBZ_HACK},
     {&JitBase::m_fprf, &Config::MAIN_FPRF},
     {&JitBase::m_accurate_nans, &Config::MAIN_ACCURATE_NANS},
+    {&JitBase::m_accurate_fmadds, &Config::MAIN_ACCURATE_FMADDS},
     {&JitBase::m_fastmem_enabled, &Config::MAIN_FASTMEM},
     {&JitBase::m_accurate_cpu_cache_enabled, &Config::MAIN_ACCURATE_CPU_CACHE},
 }};
@@ -119,6 +121,8 @@ bool JitBase::DoesConfigNeedRefresh() const
 
 void JitBase::RefreshConfig()
 {
+  const bool wanted_page_table_mappings = WantsPageTableMappings();
+
   for (const auto& [member, config_info] : JIT_SETTINGS)
     this->*member = Config::Get(*config_info);
 
@@ -140,6 +144,18 @@ void JitBase::RefreshConfig()
   jo.memcheck = m_system.IsMMUMode() || m_system.IsPauseOnPanicMode() || any_watchpoints;
   jo.fp_exceptions = m_enable_float_exceptions;
   jo.div_by_zero_exceptions = m_enable_div_by_zero_exceptions;
+
+  if (!wanted_page_table_mappings && WantsPageTableMappings())
+  {
+    // Mustn't call this if we're still initializing
+    if (Core::IsRunning(m_system))
+      m_system.GetMMU().PageTableUpdated();
+  }
+}
+
+bool JitBase::WantsPageTableMappings() const
+{
+  return jo.fastmem;
 }
 
 void JitBase::InitFastmemArena()
diff --git a/Source/Core/Core/PowerPC/JitCommon/JitBase.h b/Source/Core/Core/PowerPC/JitCommon/JitBase.h
index cb78fcc6fe29..2f366ad07f73 100644
--- a/Source/Core/Core/PowerPC/JitCommon/JitBase.h
+++ b/Source/Core/Core/PowerPC/JitCommon/JitBase.h
@@ -23,6 +23,7 @@
 #include "Core/PowerPC/JitCommon/JitAsmCommon.h"
 #include "Core/PowerPC/JitCommon/JitCache.h"
 #include "Core/PowerPC/PPCAnalyst.h"
+#include "Core/PowerPC/PowerPC.h"
 
 namespace Core
 {
@@ -158,6 +159,7 @@ class JitBase : public CPUCoreBase
   bool m_low_dcbz_hack = false;
   bool m_fprf = false;
   bool m_accurate_nans = false;
+  bool m_accurate_fmadds = false;
   bool m_fastmem_enabled = false;
   bool m_accurate_cpu_cache_enabled = false;
 
@@ -165,7 +167,7 @@ class JitBase : public CPUCoreBase
   bool m_cleanup_after_stackfault = false;
   u8* m_stack_guard = nullptr;
 
-  static const std::array<std::pair<bool JitBase::*, const Config::Info<bool>*>, 23> JIT_SETTINGS;
+  static const std::array<std::pair<bool JitBase::*, const Config::Info<bool>*>, 24> JIT_SETTINGS;
 
   bool DoesConfigNeedRefresh() const;
   void RefreshConfig();
@@ -199,6 +201,11 @@ class JitBase : public CPUCoreBase
 
   bool IsProfilingEnabled() const { return m_enable_profiling && m_enable_debugging; }
   bool IsDebuggingEnabled() const { return m_enable_debugging; }
+  bool IsBranchWatchEnabled() const
+  {
+    auto& branch_watch = m_system.GetPowerPC().GetBranchWatch();
+    return branch_watch.GetRecordingActive();
+  }
 
   static const u8* Dispatch(JitBase& jit);
   virtual JitBaseBlockCache* GetBlockCache() = 0;
@@ -216,6 +223,8 @@ class JitBase : public CPUCoreBase
 
   virtual const CommonAsmRoutinesBase* GetAsmRoutines() = 0;
 
+  virtual bool WantsPageTableMappings() const;
+
   virtual bool HandleFault(uintptr_t access_address, SContext* ctx) = 0;
   bool HandleStackFault();
 
diff --git a/Source/Core/Core/PowerPC/JitInterface.cpp b/Source/Core/Core/PowerPC/JitInterface.cpp
index 52e62cf1fcfa..62b65b6c2db3 100644
--- a/Source/Core/Core/PowerPC/JitInterface.cpp
+++ b/Source/Core/Core/PowerPC/JitInterface.cpp
@@ -3,16 +3,12 @@
 
 #include "Core/PowerPC/JitInterface.h"
 
-#include <algorithm>
 #include <string>
 #include <unordered_set>
 
-#include <fmt/format.h>
-
 #include "Common/Assert.h"
 #include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
-#include "Common/MsgHandler.h"
 
 #include "Core/Core.h"
 #include "Core/PowerPC/CPUCoreBase.h"
@@ -81,6 +77,16 @@ CPUCoreBase* JitInterface::GetCore() const
   return m_jit.get();
 }
 
+#ifndef _ARCH_32
+bool JitInterface::WantsPageTableMappings() const
+{
+  if (!m_jit)
+    return false;
+
+  return m_jit->WantsPageTableMappings();
+}
+#endif
+
 void JitInterface::UpdateMembase()
 {
   if (!m_jit)
diff --git a/Source/Core/Core/PowerPC/JitInterface.h b/Source/Core/Core/PowerPC/JitInterface.h
index a382fb1ba4a9..65b6060ba291 100644
--- a/Source/Core/Core/PowerPC/JitInterface.h
+++ b/Source/Core/Core/PowerPC/JitInterface.h
@@ -45,6 +45,12 @@ class JitInterface
   CPUCoreBase* InitJitCore(PowerPC::CPUCore core);
   CPUCoreBase* GetCore() const;
 
+#ifdef _ARCH_32
+  constexpr bool WantsPageTableMappings() const { return false; }
+#else
+  bool WantsPageTableMappings() const;
+#endif
+
   void UpdateMembase();
   void JitBlockLogDump(const Core::CPUThreadGuard& guard, std::FILE* file) const;
   void WipeBlockProfilingData(const Core::CPUThreadGuard& guard);
diff --git a/Source/Core/Core/PowerPC/MMU.cpp b/Source/Core/Core/PowerPC/MMU.cpp
index ad14ebbc2c7b..07f8993be141 100644
--- a/Source/Core/Core/PowerPC/MMU.cpp
+++ b/Source/Core/Core/PowerPC/MMU.cpp
@@ -25,14 +25,22 @@
 
 #include "Core/PowerPC/MMU.h"
 
+#include <algorithm>
 #include <bit>
 #include <cstddef>
 #include <cstring>
+#include <memory>
 #include <string>
+#include <utility>
+
+#ifdef _M_X86_64
+#include <emmintrin.h>
+#endif
 
 #include "Common/Align.h"
 #include "Common/Assert.h"
 #include "Common/BitUtils.h"
+#include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
 
@@ -58,6 +66,43 @@ MMU::MMU(Core::System& system, Memory::MemoryManager& memory, PowerPC::PowerPCMa
 
 MMU::~MMU() = default;
 
+void MMU::Reset()
+{
+  ClearPageTable();
+}
+
+void MMU::DoState(PointerWrap& p, bool sr_changed)
+{
+  // Instead of storing m_page_table in savestates, we *could* refetch it from memory
+  // here in DoState, but this could lead to us getting a more up-to-date set of page mappings
+  // than we had when the savestate was created, which could be a problem for TAS determinism.
+  if (p.IsReadMode())
+  {
+    if (!m_system.GetJitInterface().WantsPageTableMappings())
+    {
+      // Clear page table mappings if we have any.
+      p.Do(m_page_table);
+      ClearPageTable();
+    }
+    else if (sr_changed)
+    {
+      // Non-incremental update of page table mappings.
+      p.Do(m_page_table);
+      SRUpdated();
+    }
+    else
+    {
+      // Incremental update of page table mappings.
+      p.Do(m_temp_page_table);
+      PageTableUpdated(m_temp_page_table);
+    }
+  }
+  else
+  {
+    p.Do(m_page_table);
+  }
+}
+
 // Overloaded byteswap functions, for use within the templated functions below.
 [[maybe_unused]] static u8 bswap(u8 val)
 {
@@ -129,7 +174,7 @@ static void EFB_Write(u32 data, u32 addr)
   if (addr & 0x00800000)
   {
     // It's possible to do a z-tested write to EFB by writing a 64bit value to this address range.
-    // Not much is known, but let's at least get some loging.
+    // Not much is known, but let's at least get some logging.
     ERROR_LOG_FMT(MEMMAP, "Unimplemented Z+Color EFB write. {:08x} @ {:#010x}", data, addr);
   }
   else if (addr & 0x00400000)
@@ -1216,7 +1261,17 @@ void MMU::SDRUpdated()
     WARN_LOG_FMT(POWERPC, "Invalid HTABORG: htaborg=0x{:08x} htabmask=0x{:08x}", htaborg, htabmask);
 
   m_ppc_state.pagetable_base = htaborg << 16;
-  m_ppc_state.pagetable_hashmask = ((htabmask << 10) | 0x3ff);
+  m_ppc_state.pagetable_mask = (htabmask << 16) | 0xffc0;
+
+  PageTableUpdated();
+}
+
+void MMU::SRUpdated()
+{
+  // Our incremental handling of page table updates can't handle SR changing, so throw away all
+  // existing mappings and then reparse the whole page table.
+  m_memory.RemoveAllPageTableMappings();
+  ReloadPageTable();
 }
 
 enum class TLBLookupResult
@@ -1306,6 +1361,397 @@ void MMU::InvalidateTLBEntry(u32 address)
 
   m_ppc_state.tlb[PowerPC::DATA_TLB_INDEX][entry_index].Invalidate();
   m_ppc_state.tlb[PowerPC::INST_TLB_INDEX][entry_index].Invalidate();
+
+  if (m_ppc_state.msr.DR)
+    PageTableUpdated();
+  else
+    m_ppc_state.pagetable_update_pending = true;
+}
+
+void MMU::ClearPageTable()
+{
+  // If we've skipped processing any update to the page table, we need to remove all host mappings,
+  // because we don't know which of them are still valid.
+  m_memory.RemoveAllPageTableMappings();
+
+  // Because we removed host mappings, incremental updates won't work correctly.
+  // Start over from scratch.
+  m_page_mappings.clear();
+  m_page_table.clear();
+}
+
+void MMU::ReloadPageTable()
+{
+  m_page_mappings.clear();
+
+  m_temp_page_table.clear();
+  std::swap(m_page_table, m_temp_page_table);
+
+  if (m_system.GetJitInterface().WantsPageTableMappings())
+    PageTableUpdated(m_temp_page_table);
+  else
+    m_memory.RemoveAllPageTableMappings();
+}
+
+void MMU::PageTableUpdated()
+{
+  m_ppc_state.pagetable_update_pending = false;
+
+  if (!m_system.GetJitInterface().WantsPageTableMappings())
+  {
+    // If the JIT has no use for page table mappings, setting them up would be a waste of time.
+    ClearPageTable();
+    return;
+  }
+
+  const u32 page_table_base = m_ppc_state.pagetable_base;
+  const u32 page_table_end =
+      Common::AlignUp(page_table_base | m_ppc_state.pagetable_mask, PAGE_TABLE_MIN_SIZE);
+  const u32 page_table_size = page_table_end - page_table_base;
+
+  u8* page_table_view = m_system.GetMemory().GetPointerForRange(page_table_base, page_table_size);
+  if (!page_table_view)
+  {
+    WARN_LOG_FMT(POWERPC, "Failed to read page table at {:#010x}-{:#010x}", page_table_base,
+                 page_table_end);
+    ClearPageTable();
+    return;
+  }
+
+  PageTableUpdated(std::span(page_table_view, page_table_size));
+}
+
+void MMU::PageTableUpdated(std::span<const u8> page_table)
+{
+  // PowerPC's priority order for PTEs that have the same logical adress is as follows:
+  //
+  // * Primary PTEs (H=0) take priority over secondary PTEs (H=1).
+  // * If two PTEs have equal H values, they must be in the same PTEG due to how the hash
+  //   incorporates the logical address and H. The PTE located first in the PTEG takes priority.
+
+  if (page_table.size() % PAGE_TABLE_MIN_SIZE != 0)
+  {
+    // Should only happen if a maliciously crafted savestate was loaded
+    PanicAlertFmt("Impossible page table size {}", page_table.size());
+    ClearPageTable();
+    return;
+  }
+
+  m_removed_mappings.clear();
+  m_added_readonly_mappings.clear();
+  m_added_readwrite_mappings.clear();
+
+  if (m_page_table.size() != page_table.size())
+  {
+    m_memory.RemoveAllPageTableMappings();
+    m_page_mappings.clear();
+    m_page_table.resize(0);
+    m_page_table.resize(page_table.size(), 0);
+  }
+
+  u8* old_page_table = m_page_table.data();
+  const u8* new_page_table = page_table.data();
+
+  constexpr auto compare_64_bytes = [](const u8* a, const u8* b) -> bool {
+#ifdef _M_X86_64
+    // MSVC (x64) doesn't want to optimize the memcmp call. This has a large performance impact
+    // in GameCube games that use page tables, so let's use our own vectorized version instead.
+    const __m128i a1 = _mm_load_si128(reinterpret_cast<const __m128i*>(a));
+    const __m128i b1 = _mm_load_si128(reinterpret_cast<const __m128i*>(b));
+    const __m128i cmp1 = _mm_cmpeq_epi8(a1, b1);
+    const __m128i a2 = _mm_load_si128(reinterpret_cast<const __m128i*>(a + 0x10));
+    const __m128i b2 = _mm_load_si128(reinterpret_cast<const __m128i*>(b + 0x10));
+    const __m128i cmp2 = _mm_cmpeq_epi8(a2, b2);
+    const __m128i cmp12 = _mm_and_si128(cmp1, cmp2);
+    const __m128i a3 = _mm_load_si128(reinterpret_cast<const __m128i*>(a + 0x20));
+    const __m128i b3 = _mm_load_si128(reinterpret_cast<const __m128i*>(b + 0x20));
+    const __m128i cmp3 = _mm_cmpeq_epi8(a3, b3);
+    const __m128i a4 = _mm_load_si128(reinterpret_cast<const __m128i*>(a + 0x30));
+    const __m128i b4 = _mm_load_si128(reinterpret_cast<const __m128i*>(b + 0x30));
+    const __m128i cmp4 = _mm_cmpeq_epi8(a4, b4);
+    const __m128i cmp34 = _mm_and_si128(cmp3, cmp4);
+    const __m128i cmp1234 = _mm_and_si128(cmp12, cmp34);
+    return _mm_movemask_epi8(cmp1234) == 0xFFFF;
+#else
+    return std::memcmp(std::assume_aligned<64>(a), std::assume_aligned<64>(b), 64) == 0;
+#endif
+  };
+
+  const auto get_page_index = [this](UPTE_Lo pte1, u32 hash) -> std::optional<EffectiveAddress> {
+    u32 page_index_from_hash = hash ^ pte1.VSID;
+    if (pte1.H)
+      page_index_from_hash = ~page_index_from_hash;
+
+    // Due to hash masking, the upper bits of page_index_from_hash might not match the actual
+    // page index. But these bits fully overlap with the API (abbreviated page index), so we can
+    // overwrite these bits with the API from pte1 and thereby get the correct page index.
+    //
+    // In other words: logical_address.API must be written to after logical_address.page_index!
+    EffectiveAddress logical_address;
+    logical_address.offset = 0;
+    logical_address.page_index = page_index_from_hash;
+    logical_address.API = pte1.API;
+
+    // If the hash mask is large enough that one or more bits specified in pte1.API can also be
+    // obtained from page_index_from_hash, check that those bits match.
+    const u32 api_mask = ((m_ppc_state.pagetable_mask & ~m_ppc_state.pagetable_base) >> 16) & 0x3f;
+    if ((pte1.API & api_mask) != ((page_index_from_hash >> 10) & api_mask))
+      return std::nullopt;
+
+    return logical_address;
+  };
+
+  const auto fixup_shadowed_mappings = [this, old_page_table, new_page_table](
+                                           UPTE_Lo pte1, u32 page_table_offset, bool* run_pass_2) {
+    DEBUG_ASSERT(pte1.V == 1);
+
+    bool switched_to_secondary = false;
+
+    while (true)
+    {
+      const u32 big_endian_pte1 = Common::swap32(pte1.Hex);
+      const u32 pteg_start = Common::AlignDown(page_table_offset, 64);
+      const u32 pteg_end = pteg_start + 64;
+      for (u32 i = page_table_offset; i < pteg_end; i += 8)
+      {
+        if (std::memcmp(new_page_table + i, &big_endian_pte1, sizeof(big_endian_pte1)) == 0)
+        {
+          // We've found a PTE that has V set and has the same logical address as the passed-in PTE.
+          // The found PTE was previously skipped over because the passed-in PTE had priority, but
+          // the passed-in PTE is being changed, so now we need to re-check the found PTE. This will
+          // happen naturally later in the loop that's calling this function, but only if the 8-byte
+          // memcmp reports that the PTE has changed. Therefore, if the PTE currently compares
+          // equal, change an unused bit in the PTE.
+          if (std::memcmp(old_page_table + i, new_page_table + i, 8) == 0)
+          {
+            UPTE_Hi pte2(Common::swap32(old_page_table + i + 4));
+            pte2.reserved_1 = pte2.reserved_1 ^ 1;
+            const u32 big_endian_pte2 = Common::swap32(pte2.Hex);
+            std::memcpy(old_page_table + i + 4, &big_endian_pte2, sizeof(big_endian_pte2));
+
+            if (switched_to_secondary)
+              *run_pass_2 = true;
+          }
+          // This PTE has priority over any later PTEs we might find, so no need to keep scanning.
+          return;
+        }
+      }
+
+      if (pte1.H == 1)
+      {
+        // We've scanned the secondary PTEG. Nothing left to do.
+        return;
+      }
+      else
+      {
+        // We've scanned the primary PTEG. Now let's scan the secondary PTEG.
+        pte1.H = 1;
+        page_table_offset =
+            ((~pteg_start & m_ppc_state.pagetable_mask) | m_ppc_state.pagetable_base) -
+            m_ppc_state.pagetable_base;
+        switched_to_secondary = true;
+      }
+    }
+  };
+
+  const auto try_add_mapping = [this, &get_page_index](UPTE_Lo pte1, UPTE_Hi pte2,
+                                                       u32 page_table_offset) {
+    std::optional<EffectiveAddress> logical_address = get_page_index(pte1, page_table_offset / 64);
+    if (!logical_address)
+      return;
+
+    for (u32 i = 0; i < std::size(m_ppc_state.sr); ++i)
+    {
+      const auto sr = UReg_SR{m_ppc_state.sr[i]};
+      if (sr.VSID != pte1.VSID || sr.T != 0)
+        continue;
+
+      logical_address->SR = i;
+
+      bool host_mapping = true;
+
+      const bool wi = (pte2.WIMG & 0b1100) != 0;
+      if (wi)
+      {
+        // There are quirks related to uncached memory that can't be correctly emulated by fast
+        // accesses, so we don't map uncached memory. (However, no software at all is known to
+        // trigger these quirks through page address translation, only through block address
+        // translation.)
+        host_mapping = false;
+      }
+      else if (m_dbat_table[logical_address->Hex >> PowerPC::BAT_INDEX_SHIFT] &
+               PowerPC::BAT_MAPPED_BIT)
+      {
+        // Block address translation takes priority over page address translation.
+        host_mapping = false;
+      }
+      else if (m_power_pc.GetMemChecks().OverlapsMemcheck(logical_address->Hex,
+                                                          PowerPC::HW_PAGE_SIZE))
+      {
+        // Fast accesses don't support memchecks, so force slow accesses by removing fastmem
+        // mappings for all overlapping virtual pages.
+        host_mapping = false;
+      }
+
+      const u32 priority = (page_table_offset % 64 / 8) | (pte1.H << 3);
+      const PageMapping page_mapping(pte2.RPN, host_mapping, priority);
+
+      const auto it = m_page_mappings.find(logical_address->Hex);
+      if (it == m_page_mappings.end()) [[likely]]
+      {
+        // There's no existing mapping for this logical address. Add a new mapping.
+        m_page_mappings.emplace(logical_address->Hex, page_mapping);
+      }
+      else
+      {
+        if (it->second.priority < priority)
+        {
+          // An existing mapping has priority.
+          continue;
+        }
+
+        // The new mapping has priority over an existing mapping. Replace the existing mapping.
+        if (it->second.host_mapping)
+          m_removed_mappings.emplace(it->first);
+        it->second.Hex = page_mapping.Hex;
+      }
+
+      // If the R bit isn't set yet, the actual host mapping will be created once
+      // TranslatePageAddress sets the R bit.
+      if (host_mapping && pte2.R)
+      {
+        const u32 physical_address = pte2.RPN << 12;
+        (pte2.C ? m_added_readwrite_mappings : m_added_readonly_mappings)
+            .emplace(logical_address->Hex, physical_address);
+      }
+    }
+  };
+
+  bool run_pass_2 = false;
+
+  // Pass 1: Remove old mappings and add new primary (H=0) mappings.
+  for (u32 i = 0; i < page_table.size(); i += PAGE_TABLE_MIN_SIZE)
+  {
+    if ((i & m_ppc_state.pagetable_mask) != i || (i & m_ppc_state.pagetable_base) != 0)
+      continue;
+
+    for (u32 j = 0; j < PAGE_TABLE_MIN_SIZE; j += 64)
+    {
+      if (compare_64_bytes(old_page_table + i + j, new_page_table + i + j)) [[likely]]
+        continue;
+
+      for (u32 k = 0; k < 64; k += 8)
+      {
+        if (std::memcmp(old_page_table + i + j + k, new_page_table + i + j + k, 8) == 0) [[likely]]
+          continue;
+
+        // Remove old mappings.
+        UPTE_Lo old_pte1(Common::swap32(old_page_table + i + j + k));
+        if (old_pte1.V)
+        {
+          const u32 priority = (k / 8) | (old_pte1.H << 3);
+          std::optional<EffectiveAddress> logical_address = get_page_index(old_pte1, (i + j) / 64);
+          if (!logical_address)
+            continue;
+
+          for (u32 l = 0; l < std::size(m_ppc_state.sr); ++l)
+          {
+            const auto sr = UReg_SR{m_ppc_state.sr[l]};
+            if (sr.VSID != old_pte1.VSID || sr.T != 0)
+              continue;
+
+            logical_address->SR = l;
+
+            const auto it = m_page_mappings.find(logical_address->Hex);
+            if (it != m_page_mappings.end() && priority == it->second.priority)
+            {
+              if (it->second.host_mapping)
+                m_removed_mappings.emplace(logical_address->Hex);
+              m_page_mappings.erase(it);
+
+              // It's unlikely but possible that this was shadowing another PTE that's using the
+              // same logical address but has a lower priority. If this happens, we must make sure
+              // that we don't skip over that other PTE because of the 8-byte memcmp.
+              fixup_shadowed_mappings(old_pte1, i + j + k, &run_pass_2);
+            }
+          }
+        }
+
+        // Add new primary (H=0) mappings.
+        UPTE_Lo new_pte1(Common::swap32(new_page_table + i + j + k));
+        UPTE_Hi new_pte2(Common::swap32(new_page_table + i + j + k + 4));
+        if (new_pte1.V)
+        {
+          if (new_pte1.H)
+          {
+            run_pass_2 = true;
+            continue;
+          }
+
+          try_add_mapping(new_pte1, new_pte2, i + j + k);
+        }
+
+        // Update our copy of the page table.
+        std::memcpy(old_page_table + i + j + k, new_page_table + i + j + k, 8);
+      }
+    }
+  }
+
+  // Pass 2: Add new secondary (H=1) mappings. This is a separate pass because before we can process
+  // whether a mapping should be added, we first need to check all PTEs that have equal or higher
+  // priority to see if their mappings should be removed. For adding primary mappings, this ordering
+  // comes naturally from doing a linear scan of the page table from start to finish. But for adding
+  // secondary mappings, the primary PTEG that has priority over a given secondary PTEG is in the
+  // other half of the page table, so we need more than one pass through the page table. But most of
+  // the time, there are no secondary mappings, letting us skip the second pass.
+  if (run_pass_2) [[unlikely]]
+  {
+    for (u32 i = 0; i < page_table.size(); i += PAGE_TABLE_MIN_SIZE)
+    {
+      if ((i & m_ppc_state.pagetable_mask) != i || (i & m_ppc_state.pagetable_base) != 0)
+        continue;
+
+      for (u32 j = 0; j < PAGE_TABLE_MIN_SIZE; j += 64)
+      {
+        if (compare_64_bytes(old_page_table + i + j, new_page_table + i + j)) [[likely]]
+          continue;
+
+        for (u32 k = 0; k < 64; k += 8)
+        {
+          if (std::memcmp(old_page_table + i + j + k, new_page_table + i + j + k, 8) == 0)
+              [[likely]]
+          {
+            continue;
+          }
+
+          UPTE_Lo new_pte1(Common::swap32(new_page_table + i + j + k));
+          UPTE_Hi new_pte2(Common::swap32(new_page_table + i + j + k + 4));
+
+          // We don't need to check new_pte1.V and new_pte1.H. If the memcmp above returned nonzero,
+          // pass 1 must have skipped running memcpy, which only happens if V and H are both set.
+          DEBUG_ASSERT(new_pte1.V == 1);
+          DEBUG_ASSERT(new_pte1.H == 1);
+          try_add_mapping(new_pte1, new_pte2, i + j + k);
+
+          std::memcpy(old_page_table + i + j + k, new_page_table + i + j + k, 8);
+        }
+      }
+    }
+  }
+
+  if (!m_removed_mappings.empty())
+    m_memory.RemovePageTableMappings(m_removed_mappings);
+
+  for (const auto& [logical_address, physical_address] : m_added_readonly_mappings)
+    m_memory.AddPageTableMapping(logical_address, physical_address, false);
+
+  for (const auto& [logical_address, physical_address] : m_added_readwrite_mappings)
+    m_memory.AddPageTableMapping(logical_address, physical_address, true);
+}
+
+void MMU::PageTableUpdatedFromJit(MMU* mmu)
+{
+  mmu->PageTableUpdated();
 }
 
 // Page Address Translation
@@ -1359,7 +1805,7 @@ MMU::TranslateAddressResult MMU::TranslatePageAddress(const EffectiveAddress add
       pte1.H = 1;
     }
 
-    u32 pteg_addr = ((hash & m_ppc_state.pagetable_hashmask) << 6) | m_ppc_state.pagetable_base;
+    u32 pteg_addr = ((hash << 6) & m_ppc_state.pagetable_mask) | m_ppc_state.pagetable_base;
 
     for (int i = 0; i < 8; i++, pteg_addr += 8)
     {
@@ -1370,6 +1816,7 @@ MMU::TranslateAddressResult MMU::TranslatePageAddress(const EffectiveAddress add
       if (pte1.Hex == pteg)
       {
         UPTE_Hi pte2(ReadFromHardware<pte_read_flag, u32, true>(pteg_addr + 4));
+        const UPTE_Hi old_pte2 = pte2;
 
         // set the access bits
         switch (flag)
@@ -1389,9 +1836,29 @@ MMU::TranslateAddressResult MMU::TranslatePageAddress(const EffectiveAddress add
           break;
         }
 
-        if (!IsNoExceptionFlag(flag))
+        if (!IsNoExceptionFlag(flag) && pte2.Hex != old_pte2.Hex)
         {
           m_memory.Write_U32(pte2.Hex, pteg_addr + 4);
+
+          const u32 page_logical_address = address.Hex & ~HW_PAGE_MASK;
+          const auto it = m_page_mappings.find(page_logical_address);
+          if (it != m_page_mappings.end())
+          {
+            const u32 priority = (pteg_addr % 64 / 8) | (pte1.H << 3);
+            if (it->second.Hex == PageMapping(pte2.RPN, true, priority).Hex)
+            {
+              const u32 swapped_pte1 = Common::swap32(reinterpret_cast<u8*>(&pte1));
+              std::memcpy(m_page_table.data() + pteg_addr - m_ppc_state.pagetable_base,
+                          &swapped_pte1, sizeof(swapped_pte1));
+
+              const u32 swapped_pte2 = Common::swap32(reinterpret_cast<u8*>(&pte2));
+              std::memcpy(m_page_table.data() + pteg_addr + 4 - m_ppc_state.pagetable_base,
+                          &swapped_pte2, sizeof(swapped_pte2));
+
+              const u32 page_translated_address = pte2.RPN << 12;
+              m_memory.AddPageTableMapping(page_logical_address, page_translated_address, pte2.C);
+            }
+          }
         }
 
         // We already updated the TLB entry if this was caused by a C bit.
@@ -1533,7 +2000,13 @@ void MMU::DBATUpdated()
   }
 
 #ifndef _ARCH_32
-  m_memory.UpdateLogicalMemory(m_dbat_table);
+  m_memory.UpdateDBATMappings(m_dbat_table);
+
+  // Calling UpdateDBATMappings removes all fastmem page table mappings, so we have to recreate
+  // them. We need to go through them anyway because there may have been a change in which DBATs
+  // or memchecks are shadowing which page table mappings.
+  if (!m_page_table.empty())
+    ReloadPageTable();
 #endif
 
   // IsOptimizable*Address and dcbz depends on the BAT mapping, so we need a flush here.
diff --git a/Source/Core/Core/PowerPC/MMU.h b/Source/Core/Core/PowerPC/MMU.h
index 018657cd5f46..14196df06ddf 100644
--- a/Source/Core/Core/PowerPC/MMU.h
+++ b/Source/Core/Core/PowerPC/MMU.h
@@ -5,13 +5,19 @@
 
 #include <array>
 #include <cstddef>
+#include <map>
 #include <optional>
+#include <set>
+#include <span>
 #include <string>
+#include <vector>
 
 #include "Common/BitField.h"
 #include "Common/CommonTypes.h"
 #include "Common/TypeUtils.h"
 
+class PointerWrap;
+
 namespace Core
 {
 class CPUThreadGuard;
@@ -73,6 +79,8 @@ constexpr size_t HW_PAGE_MASK = HW_PAGE_SIZE - 1;
 constexpr u32 HW_PAGE_INDEX_SHIFT = 12;
 constexpr u32 HW_PAGE_INDEX_MASK = 0x3f;
 
+constexpr u32 PAGE_TABLE_MIN_SIZE = 0x10000;
+
 // Return value of MMU::TryReadInstruction().
 struct TryReadInstResult
 {
@@ -117,6 +125,9 @@ class MMU
   MMU& operator=(MMU&& other) = delete;
   ~MMU();
 
+  void Reset();
+  void DoState(PointerWrap& p, bool sr_changed);
+
   // Routines for debugger UI, cheats, etc. to access emulated memory from the
   // perspective of the CPU.  Not for use by core emulation routines.
   // Use "Host" prefix.
@@ -237,7 +248,10 @@ class MMU
 
   // TLB functions
   void SDRUpdated();
+  void SRUpdated();
   void InvalidateTLBEntry(u32 address);
+  void PageTableUpdated();
+  static void PageTableUpdatedFromJit(MMU* mmu);
   void DBATUpdated();
   void IBATUpdated();
 
@@ -290,6 +304,26 @@ class MMU
     explicit EffectiveAddress(u32 address) : Hex{address} {}
   };
 
+  union PageMapping
+  {
+    // A small priority number wins over a larger priority number.
+    BitField<0, 11, u32> priority;
+    // Whether we're allowed to create a host mapping for this mapping.
+    BitField<11, 1, u32> host_mapping;
+    // The physical address of the page.
+    BitField<12, 20, u32> RPN;
+
+    u32 Hex = 0;
+
+    PageMapping() = default;
+    PageMapping(u32 RPN_, bool host_mapping_, u32 priority_)
+    {
+      RPN = RPN_;
+      host_mapping = host_mapping_;
+      priority = priority_;
+    }
+  };
+
   template <const XCheckTLBFlag flag>
   TranslateAddressResult TranslateAddress(u32 address);
 
@@ -301,6 +335,10 @@ class MMU
 
   void Memcheck(u32 address, u64 var, bool write, size_t size);
 
+  void ClearPageTable();
+  void ReloadPageTable();
+  void PageTableUpdated(std::span<const u8> page_table);
+
   void UpdateBATs(BatTable& bat_table, u32 base_spr);
   void UpdateFakeMMUBat(BatTable& bat_table, u32 start_addr);
 
@@ -317,6 +355,20 @@ class MMU
   PowerPC::PowerPCManager& m_power_pc;
   PowerPC::PowerPCState& m_ppc_state;
 
+  // STATE_TO_SAVE
+  std::vector<u8> m_page_table;
+  // END STATE_TO_SAVE
+
+  // This keeps track of all valid page table mappings in m_page_table.
+  // The key is the logical address.
+  std::map<u32, PageMapping> m_page_mappings;
+
+  // These are kept around just for their memory allocations. They are always cleared before use.
+  std::vector<u8> m_temp_page_table;
+  std::set<u32> m_removed_mappings;
+  std::map<u32, u32> m_added_readonly_mappings;
+  std::map<u32, u32> m_added_readwrite_mappings;
+
   BatTable m_ibat_table;
   BatTable m_dbat_table;
 };
diff --git a/Source/Core/Core/PowerPC/PPCAnalyst.cpp b/Source/Core/Core/PowerPC/PPCAnalyst.cpp
index 49338af10b78..8c35ad49230a 100644
--- a/Source/Core/Core/PowerPC/PPCAnalyst.cpp
+++ b/Source/Core/Core/PowerPC/PPCAnalyst.cpp
@@ -5,7 +5,6 @@
 
 #include <algorithm>
 #include <map>
-#include <queue>
 #include <string>
 #include <vector>
 
@@ -14,8 +13,6 @@
 #include "Common/Assert.h"
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
-#include "Common/StringUtil.h"
-#include "Core/Config/MainSettings.h"
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 #include "Core/HLE/HLE.h"
diff --git a/Source/Core/Core/PowerPC/PPCCache.cpp b/Source/Core/Core/PowerPC/PPCCache.cpp
index 3d351f97d10a..8935c5c19d86 100644
--- a/Source/Core/Core/PowerPC/PPCCache.cpp
+++ b/Source/Core/Core/PowerPC/PPCCache.cpp
@@ -9,7 +9,6 @@
 #include "Common/ChunkFile.h"
 #include "Common/Swap.h"
 #include "Core/Config/MainSettings.h"
-#include "Core/DolphinAnalytics.h"
 #include "Core/HW/Memmap.h"
 #include "Core/PowerPC/JitInterface.h"
 #include "Core/PowerPC/PowerPC.h"
diff --git a/Source/Core/Core/PowerPC/PPCSymbolDB.cpp b/Source/Core/Core/PowerPC/PPCSymbolDB.cpp
index 250d901bc2a4..9abc4ad03a86 100644
--- a/Source/Core/Core/PowerPC/PPCSymbolDB.cpp
+++ b/Source/Core/Core/PowerPC/PPCSymbolDB.cpp
@@ -20,7 +20,6 @@
 #include "Common/IOFile.h"
 #include "Common/Logging/Log.h"
 #include "Common/StringUtil.h"
-#include "Common/Unreachable.h"
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 #include "Core/Debugger/DebugInterface.h"
@@ -558,7 +557,7 @@ bool PPCSymbolDB::LoadMap(const Core::CPUThreadGuard& guard, std::string filenam
       break;
     default:
       // Should never happen
-      Common::Unreachable();
+      std::unreachable();
       break;
     }
 
diff --git a/Source/Core/Core/PowerPC/PPCTables.cpp b/Source/Core/Core/PowerPC/PPCTables.cpp
index 6673f145137c..5e17d459eb2e 100644
--- a/Source/Core/Core/PowerPC/PPCTables.cpp
+++ b/Source/Core/Core/PowerPC/PPCTables.cpp
@@ -7,7 +7,6 @@
 #include <array>
 #include <cstddef>
 #include <cstdio>
-#include <vector>
 
 #include <fmt/format.h>
 
@@ -17,9 +16,6 @@
 #include "Common/IOFile.h"
 #include "Common/Logging/Log.h"
 #include "Common/Projection.h"
-#include "Common/StringUtil.h"
-
-#include "Core/PowerPC/PowerPC.h"
 
 namespace PPCTables
 {
diff --git a/Source/Core/Core/PowerPC/PowerPC.cpp b/Source/Core/Core/PowerPC/PowerPC.cpp
index 59f1e3d1bf24..e5ce8ffcdb0b 100644
--- a/Source/Core/Core/PowerPC/PowerPC.cpp
+++ b/Source/Core/Core/PowerPC/PowerPC.cpp
@@ -4,10 +4,9 @@
 #include "Core/PowerPC/PowerPC.h"
 
 #include <algorithm>
+#include <array>
 #include <bit>
 #include <cstring>
-#include <type_traits>
-#include <vector>
 
 #include "Common/Assert.h"
 #include "Common/ChunkFile.h"
@@ -80,6 +79,8 @@ void PowerPCManager::DoState(PointerWrap& p)
   // *((u64 *)&TL(m_ppc_state)) = SystemTimers::GetFakeTimeBase(); //works since we are little
   // endian and TL comes first :)
 
+  const std::array<u32, 16> old_sr = m_ppc_state.sr;
+
   p.DoArray(m_ppc_state.gpr);
   p.Do(m_ppc_state.pc);
   p.Do(m_ppc_state.npc);
@@ -96,7 +97,8 @@ void PowerPCManager::DoState(PointerWrap& p)
   p.DoArray(m_ppc_state.spr);
   p.DoArray(m_ppc_state.tlb);
   p.Do(m_ppc_state.pagetable_base);
-  p.Do(m_ppc_state.pagetable_hashmask);
+  p.Do(m_ppc_state.pagetable_mask);
+  p.Do(m_ppc_state.pagetable_update_pending);
 
   p.Do(m_ppc_state.reserve);
   p.Do(m_ppc_state.reserve_address);
@@ -105,8 +107,11 @@ void PowerPCManager::DoState(PointerWrap& p)
   m_ppc_state.iCache.DoState(memory, p);
   m_ppc_state.dCache.DoState(memory, p);
 
+  auto& mmu = m_system.GetMMU();
   if (p.IsReadMode())
   {
+    mmu.DoState(p, old_sr != m_ppc_state.sr);
+
     if (!m_ppc_state.m_enable_dcache)
     {
       INFO_LOG_FMT(POWERPC, "Flushing data cache");
@@ -116,10 +121,13 @@ void PowerPCManager::DoState(PointerWrap& p)
     RoundingModeUpdated(m_ppc_state);
     RecalculateAllFeatureFlags(m_ppc_state);
 
-    auto& mmu = m_system.GetMMU();
     mmu.IBATUpdated();
     mmu.DBATUpdated();
   }
+  else
+  {
+    mmu.DoState(p, false);
+  }
 
   // SystemTimers::DecrementerSet();
   // SystemTimers::TimeBaseSet();
@@ -276,12 +284,14 @@ void PowerPCManager::Init(CPUCore cpu_core)
 void PowerPCManager::Reset()
 {
   m_ppc_state.pagetable_base = 0;
-  m_ppc_state.pagetable_hashmask = 0;
+  m_ppc_state.pagetable_mask = 0;
+  m_ppc_state.pagetable_update_pending = false;
   m_ppc_state.tlb = {};
 
   ResetRegisters();
   m_ppc_state.iCache.Reset(m_system.GetJitInterface());
   m_ppc_state.dCache.Reset();
+  m_system.GetMMU().Reset();
 }
 
 void PowerPCManager::ScheduleInvalidateCacheThreadSafe(u32 address)
@@ -669,13 +679,10 @@ void PowerPCManager::MSRUpdated()
   m_ppc_state.feature_flags = static_cast<CPUEmuFeatureFlags>(
       (m_ppc_state.feature_flags & FEATURE_FLAG_PERFMON) | ((m_ppc_state.msr.Hex >> 4) & 0x3));
 
-  m_system.GetJitInterface().UpdateMembase();
-}
+  if (m_ppc_state.msr.DR && m_ppc_state.pagetable_update_pending)
+    m_system.GetMMU().PageTableUpdated();
 
-void PowerPCState::SetSR(u32 index, u32 value)
-{
-  DEBUG_LOG_FMT(POWERPC, "{:08x}: MMU: Segment register {} set to {:08x}", pc, index, value);
-  sr[index] = value;
+  m_system.GetJitInterface().UpdateMembase();
 }
 
 // FPSCR update functions
diff --git a/Source/Core/Core/PowerPC/PowerPC.h b/Source/Core/Core/PowerPC/PowerPC.h
index ea972590cb3f..8d84ed1a3036 100644
--- a/Source/Core/Core/PowerPC/PowerPC.h
+++ b/Source/Core/Core/PowerPC/PowerPC.h
@@ -122,6 +122,9 @@ struct PowerPCState
   u32 pc = 0;  // program counter
   u32 npc = 0;
 
+  // Storage for the stack pointer of the BLR optimization.
+  u8* stored_stack_pointer = nullptr;
+
   // gather pipe pointer for JIT access
   u8* gather_pipe_ptr = nullptr;
   u8* gather_pipe_base_ptr = nullptr;
@@ -157,6 +160,14 @@ struct PowerPCState
   // lscbx
   u16 xer_stringctrl = 0;
 
+  // Reservation monitor for lwarx and its friend stwcxd. These two don't really need to be
+  // this early in the struct, but due to how the padding works out, they fit nicely here.
+  u32 reserve_address;
+  bool reserve;
+
+  bool pagetable_update_pending = false;
+  bool m_enable_dcache = false;
+
 #ifdef _M_X86_64
   // This member exists only for the purpose of an assertion that its offset <= 0x100.
   std::tuple<> above_fits_in_first_0x100;
@@ -164,37 +175,28 @@ struct PowerPCState
   alignas(16) PairedSingle ps[32];
 #endif
 
-  u32 sr[16]{};  // Segment registers.
+  std::array<u32, 16> sr{};  // Segment registers.
 
   // special purpose registers - controls quantizers, DMA, and lots of other misc extensions.
   // also for power management, but we don't care about that.
   // JitArm64 needs 64-bit alignment for SPR_TL.
   alignas(8) u32 spr[1024]{};
 
-  // Storage for the stack pointer of the BLR optimization.
-  u8* stored_stack_pointer = nullptr;
   u8* mem_ptr = nullptr;
 
-  std::array<std::array<TLBEntry, TLB_SIZE / TLB_WAYS>, NUM_TLBS> tlb;
-
   u32 pagetable_base = 0;
-  u32 pagetable_hashmask = 0;
+  u32 pagetable_mask = 0;
+
+  std::array<std::array<TLBEntry, TLB_SIZE / TLB_WAYS>, NUM_TLBS> tlb;
 
   InstructionCache iCache;
-  bool m_enable_dcache = false;
   Cache dCache;
 
-  // Reservation monitor for lwarx and its friend stwcxd.
-  bool reserve;
-  u32 reserve_address;
-
   void UpdateCR1()
   {
     cr.SetField(1, (fpscr.FX << 3) | (fpscr.FEX << 2) | (fpscr.VX << 1) | fpscr.OX);
   }
 
-  void SetSR(u32 index, u32 value);
-
   void SetCarry(u32 ca) { xer_ca = ca; }
 
   u32 GetCarry() const { return xer_ca; }
diff --git a/Source/Core/Core/PowerPC/SignatureDB/SignatureDB.cpp b/Source/Core/Core/PowerPC/SignatureDB/SignatureDB.cpp
index c67000b9bb30..eb5541c44a06 100644
--- a/Source/Core/Core/PowerPC/SignatureDB/SignatureDB.cpp
+++ b/Source/Core/Core/PowerPC/SignatureDB/SignatureDB.cpp
@@ -8,7 +8,6 @@
 
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
-#include "Common/StringUtil.h"
 #include "Core/PowerPC/MMU.h"
 #include "Core/PowerPC/PPCSymbolDB.h"
 
diff --git a/Source/Core/Core/State.cpp b/Source/Core/Core/State.cpp
index 6802fc2bae26..63d8820238c5 100644
--- a/Source/Core/Core/State.cpp
+++ b/Source/Core/Core/State.cpp
@@ -4,12 +4,11 @@
 #include "Core/State.h"
 
 #include <algorithm>
-#include <condition_variable>
 #include <filesystem>
 #include <locale>
 #include <map>
-#include <memory>
 #include <mutex>
+#include <shared_mutex>
 #include <string>
 #include <utility>
 #include <vector>
@@ -20,14 +19,17 @@
 #include <lz4.h>
 #include <lzo/lzo1x.h>
 
+#include "Common/Buffer.h"
+#include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
 #include "Common/Contains.h"
-#include "Common/Event.h"
 #include "Common/FileUtil.h"
 #include "Common/IOFile.h"
+#include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"
 #include "Common/Thread.h"
 #include "Common/TimeUtil.h"
+#include "Common/TransferableSharedMutex.h"
 #include "Common/Version.h"
 #include "Common/WorkQueueThread.h"
 
@@ -39,12 +41,13 @@
 #include "Core/HW/HW.h"
 #include "Core/HW/Memmap.h"
 #include "Core/HW/Wiimote.h"
-#include "Core/Host.h"
 #include "Core/Movie.h"
 #include "Core/NetPlayProto.h"
 #include "Core/PowerPC/PowerPC.h"
 #include "Core/System.h"
 
+#include "UICommon/UICommon.h"
+
 #include "VideoCommon/FrameDumpFFMpeg.h"
 #include "VideoCommon/OnScreenDisplay.h"
 #include "VideoCommon/VideoBackendBase.h"
@@ -65,36 +68,34 @@ static unsigned char __LZO_MMODEL out[OUT_LEN];
 
 static AfterLoadCallbackFunc s_on_after_load_callback;
 
+static Common::EventHook s_flush_unsaved_data_hook;
+
 // Temporary undo state buffer
 static Common::UniqueBuffer<u8> s_undo_load_buffer;
-static std::mutex s_undo_load_buffer_mutex;
 
-static std::mutex s_load_or_save_in_progress_mutex;
+// Used to estimate buffer size for the next save.
+static u32 s_last_state_size = 0;
+
+// Shared locks are acquired for each state save task.
+// Tasks generally transition from: Calling thread -> CPU thread -> Compress/Write thread.
+// Holding an "exclusive" lock will:
+// 1. Ensure all previous save tasks have been completely written to the file systen.
+// 2. Prevent new tasks from starting.
+static Common::TransferableSharedMutex s_state_saves_in_progress;
 
-struct CompressAndDumpState_args
+struct CompressAndDumpStateArgs
 {
   Common::UniqueBuffer<u8> buffer;
   std::string filename;
-  std::shared_ptr<Common::Event> state_write_done_event;
+  std::shared_lock<decltype(s_state_saves_in_progress)> task_lock;
 };
 
-// Protects against simultaneous reads and writes to the final savestate location from multiple
-// threads.
-static std::mutex s_save_thread_mutex;
-
 // Queue for compressing and writing savestates to disk.
-static Common::WorkQueueThread<CompressAndDumpState_args> s_save_thread;
-
-// Keeps track of savestate writes that are currently happening, so we don't load a state while
-// another one is still saving. This is particularly important so if you save to a slot and then
-// immediately load from the same one, you don't accidentally load the state that's still at that
-// file path before the write is done.
-static std::mutex s_state_writes_in_queue_mutex;
-static size_t s_state_writes_in_queue;
-static std::condition_variable s_state_write_queue_is_empty;
+// Only the CPU thread manipulates this worker.
+static Common::WorkQueueThreadSP<CompressAndDumpStateArgs> s_compress_and_dump_thread;
 
 // Don't forget to increase this after doing changes on the savestate system
-constexpr u32 STATE_VERSION = 175;  // Last changed in PR 13751
+constexpr u32 STATE_VERSION = 177;  // Last changed in PR 13844
 
 // Increase this if the StateExtendedHeader definition changes
 constexpr u32 EXTENDED_HEADER_VERSION = 1;  // Last changed in PR 12217
@@ -120,20 +121,18 @@ static const std::map<u32, std::pair<std::string, std::string>> s_old_versions =
     {38, {"4.0-4963", "4.0-5267"}}, {39, {"4.0-5279", "4.0-5525"}}, {40, {"4.0-5531", "4.0-5809"}},
     {41, {"4.0-5811", "4.0-5923"}}, {42, {"4.0-5925", "4.0-5946"}}};
 
-enum
-{
-  STATE_NONE = 0,
-  STATE_SAVE = 1,
-  STATE_LOAD = 2,
-};
-
-static bool s_use_compression = true;
+static constexpr bool s_use_compression = true;
 
-void EnableCompression(bool compression)
+// Acquired for tasks that will write state save data to the filesystem.
+// This allows for later waiting on completion of said tasks when necessary.
+// We want to maintain a proper order of async operations, e.g. Save, Save, GetInfoString.
+[[nodiscard]] static auto GetStateSaveTaskLock()
 {
-  s_use_compression = compression;
+  return std::shared_lock{s_state_saves_in_progress};
 }
 
+static bool ReadHeader(const std::string& filename, StateHeader& header);
+
 #ifndef __LIBRETRO__
 static
 #endif
@@ -203,68 +202,82 @@ void DoState(Core::System& system, PointerWrap& p)
 #endif  // USE_RETRO_ACHIEVEMENTS
 }
 
-void LoadFromBuffer(Core::System& system, Common::UniqueBuffer<u8>& buffer)
+static bool CheckIfStateLoadIsAllowed(Core::System& system)
 {
+  if (!Core::IsRunningOrStarting(system))
+    return false;
+
   if (NetPlay::IsNetPlayRunning())
   {
     OSD::AddMessage("Loading savestates is disabled in Netplay to prevent desyncs");
-    return;
+    return false;
   }
 
   if (AchievementManager::GetInstance().IsHardcoreModeActive())
   {
     OSD::AddMessage("Loading savestates is disabled in RetroAchievements hardcore mode");
-    return;
+    return false;
   }
 
-  Core::RunOnCPUThread(
-      system,
-      [&] {
-        u8* ptr = buffer.data();
-        PointerWrap p(&ptr, buffer.size(), PointerWrap::Mode::Read);
-        DoState(system, p);
-      },
-      true);
+  return true;
 }
 
-void SaveToBuffer(Core::System& system, Common::UniqueBuffer<u8>& buffer)
+static bool LoadFromBuffer(Core::System& system, std::span<u8> buffer)
 {
-  Core::RunOnCPUThread(
-      system,
-      [&] {
-        u8* ptr = nullptr;
-        PointerWrap p_measure(&ptr, 0, PointerWrap::Mode::Measure);
-        DoState(system, p_measure);
-
-        const size_t new_buffer_size = ptr - (u8*)(nullptr);
-        if (new_buffer_size > buffer.size())
-          buffer.reset(new_buffer_size);
-
-        ptr = buffer.data();
-        PointerWrap p(&ptr, buffer.size(), PointerWrap::Mode::Write);
-        DoState(system, p);
-      },
-      true);
+  u8* ptr = buffer.data();
+  PointerWrap p(&ptr, buffer.size(), PointerWrap::Mode::Read);
+  DoState(system, p);
+  return p.IsReadMode();
+}
+
+// Returns the required size, or 0 on failure.
+static std::size_t SaveToBuffer(Core::System& system, Common::UniqueBuffer<u8>& buffer)
+{
+  // Attempt to save to our provided buffer as-is.
+  // If buffer isn't large enough, PointerWrap transitions to MeasureMode,
+  //  and then we have our measurement for a second attempt.
+  u8* ptr = buffer.data();
+  PointerWrap pointer_wrap(&ptr, buffer.size(), PointerWrap::Mode::Write);
+  DoState(system, pointer_wrap);
+  const auto measured_size = pointer_wrap.GetOffsetFromPreviousPosition(buffer.data());
+
+  if (pointer_wrap.IsWriteMode())
+  {
+    s_last_state_size = measured_size;
+    return measured_size;
+  }
+
+  if (measured_size > buffer.size())
+  {
+    DEBUG_LOG_FMT(CORE, "SaveToBuffer: Growing buffer from size {} to measured size {}",
+                  buffer.size(), measured_size);
+    buffer.reset(measured_size);
+    return SaveToBuffer(system, buffer);
+  }
+
+  // Buffer was large enough but we still failed for some other reason.
+  return 0;
 }
 
 namespace
 {
 struct SlotWithTimestamp
 {
+  // 1-based indexing.
   int slot;
   double timestamp;
 };
 }  // namespace
 
-// returns first slot number not in the vector, or -1 if all are in the vector
-static int GetEmptySlot(const std::vector<SlotWithTimestamp>& used_slots)
+// Returns first slot number (1-based indexing) not in the vector.
+static std::optional<int> GetEmptySlot(const std::vector<SlotWithTimestamp>& used_slots)
 {
-  for (int i = 1; i <= (int)NUM_STATES; i++)
+  for (int i = 1; i <= int(NUM_STATES); ++i)
   {
     if (!Common::Contains(used_slots, i, &SlotWithTimestamp::slot))
       return i;
   }
-  return -1;
+  return std::nullopt;
 }
 
 // Arbitrarily chosen value (38 years) that is subtracted in GetSystemTimeAsDouble()
@@ -291,40 +304,41 @@ static std::string SystemTimeAsDoubleToString(double time)
   return fmt::format(std::locale{""}, "{:%x %X}", *local_time);
 }
 
-static std::string MakeStateFilename(int number);
+static std::string MakeStateFilename(int number)
+{
+  return fmt::format("{}{}.s{:02d}", File::GetUserPath(D_STATESAVES_IDX),
+                     SConfig::GetInstance().GetGameID(), number);
+}
 
 static std::vector<SlotWithTimestamp> GetUsedSlotsWithTimestamp()
 {
   std::vector<SlotWithTimestamp> result;
   StateHeader header;
-  for (int i = 1; i <= (int)NUM_STATES; i++)
+  for (int i = 1; i <= int(NUM_STATES); ++i)
   {
     std::string filename = MakeStateFilename(i);
-    if (File::Exists(filename))
-    {
-      if (ReadHeader(filename, header))
-      {
-        result.emplace_back(SlotWithTimestamp{.slot = i, .timestamp = header.legacy_header.time});
-      }
-    }
+    if (!File::Exists(filename) || !ReadHeader(filename, header))
+      continue;
+
+    result.emplace_back(SlotWithTimestamp{.slot = i, .timestamp = header.legacy_header.time});
   }
   return result;
 }
 
-static void CompressBufferToFile(const u8* raw_buffer, u64 size, File::IOFile& f)
+static void CompressBufferToFile(std::span<const u8> raw_buffer, File::IOFile& f)
 {
   u64 total_bytes_compressed = 0;
 
   while (true)
   {
-    const u64 bytes_left_to_compress = size - total_bytes_compressed;
+    const u64 bytes_left_to_compress = raw_buffer.size() - total_bytes_compressed;
 
     const int bytes_to_compress =
         static_cast<int>(std::min(static_cast<u64>(LZ4_MAX_INPUT_SIZE), bytes_left_to_compress));
     Common::UniqueBuffer<char> compressed_buffer(LZ4_compressBound(bytes_to_compress));
     const int compressed_len = LZ4_compress_default(
-        reinterpret_cast<const char*>(raw_buffer) + total_bytes_compressed, compressed_buffer.get(),
-        bytes_to_compress, int(compressed_buffer.size()));
+        reinterpret_cast<const char*>(raw_buffer.data()) + total_bytes_compressed,
+        compressed_buffer.get(), bytes_to_compress, int(compressed_buffer.size()));
 
     if (compressed_len == 0)
     {
@@ -337,7 +351,7 @@ static void CompressBufferToFile(const u8* raw_buffer, u64 size, File::IOFile& f
     f.WriteBytes(compressed_buffer.get(), compressed_len);
 
     total_bytes_compressed += bytes_to_compress;
-    if (total_bytes_compressed == size)
+    if (total_bytes_compressed == raw_buffer.size())
       break;
   }
 }
@@ -376,17 +390,17 @@ static void WriteHeadersToFile(size_t uncompressed_size, File::IOFile& f)
   // If StateExtendedHeader is amended to include more than the base, add WriteBytes() calls here.
 }
 
-static void CompressAndDumpState(Core::System& system, CompressAndDumpState_args& save_args)
+static void CompressAndDumpState(Core::System& system, const CompressAndDumpStateArgs& save_args)
 {
-  const u8* const buffer_data = save_args.buffer.data();
-  const size_t buffer_size = save_args.buffer.size();
+  const auto& buffer = save_args.buffer;
   const std::string& filename = save_args.filename;
 
   // Find free temporary filename.
-  // TODO: The file exists check and the actual opening of the file should be atomic, we don't have
-  // functions for that.
+
+  // TODO: The file exists check and the actual opening of the file should be atomic.
+  // This is only an issue for multiple instances of dolphin operating on the same user folder.
   std::string temp_filename;
-  size_t temp_counter = static_cast<size_t>(Common::CurrentThreadId());
+  auto temp_counter = static_cast<size_t>(Common::CurrentThreadId());
   do
   {
     temp_filename = fmt::format("{}{}.tmp", filename, temp_counter);
@@ -400,12 +414,12 @@ static void CompressAndDumpState(Core::System& system, CompressAndDumpState_args
     return;
   }
 
-  WriteHeadersToFile(buffer_size, f);
+  WriteHeadersToFile(buffer.size(), f);
 
   if (s_use_compression)
-    CompressBufferToFile(buffer_data, buffer_size, f);
+    CompressBufferToFile(buffer, f);
   else
-    f.WriteBytes(buffer_data, buffer_size);
+    f.WriteBytes(buffer.data(), buffer.size());
 
   if (!f.IsGood())
     Core::DisplayMessage("Failed to write state file", 2000);
@@ -414,111 +428,80 @@ static void CompressAndDumpState(Core::System& system, CompressAndDumpState_args
   const std::string last_state_dtmname = last_state_filename + ".dtm";
   const std::string dtmname = filename + ".dtm";
 
+  // Backup existing state (overwriting an existing backup, if any).
+  if (File::Exists(filename))
   {
-    std::lock_guard lk(s_save_thread_mutex);
+    if (File::Exists(last_state_filename))
+      File::Delete((last_state_filename));
+    if (File::Exists(last_state_dtmname))
+      File::Delete((last_state_dtmname));
 
-    // Backup existing state (overwriting an existing backup, if any).
-    if (File::Exists(filename))
+    if (!File::Rename(filename, last_state_filename))
     {
-      if (File::Exists(last_state_filename))
-        File::Delete((last_state_filename));
-      if (File::Exists(last_state_dtmname))
-        File::Delete((last_state_dtmname));
-
-      if (!File::Rename(filename, last_state_filename))
-      {
-        Core::DisplayMessage("Failed to move previous state to state undo backup", 1000);
-      }
-      else if (File::Exists(dtmname))
-      {
-        if (!File::Rename(dtmname, last_state_dtmname))
-          Core::DisplayMessage("Failed to move previous state's dtm to state undo backup", 1000);
-      }
+      Core::DisplayMessage("Failed to move previous state to state undo backup", 1000);
     }
-
-    auto& movie = system.GetMovie();
-    if ((movie.IsMovieActive()) && !movie.IsJustStartingRecordingInputFromSaveState())
-      movie.SaveRecording(dtmname);
-    else if (!movie.IsMovieActive())
-      File::Delete(dtmname);
-
-    // Move written state to final location.
-    // TODO: This should also be atomic. This is possible on all systems, but needs a special
-    // implementation of IOFile on Windows.
-    if (!f.Close())
-      Core::DisplayMessage("Failed to close state file", 2000);
-
-    if (!File::Rename(temp_filename, filename))
+    else if (File::Exists(dtmname))
     {
-      Core::DisplayMessage("Failed to rename state file", 2000);
-    }
-    else
-    {
-      const std::filesystem::path temp_path(filename);
-      Core::DisplayMessage(fmt::format("Saved State to {}", temp_path.filename().string()), 2000);
+      if (!File::Rename(dtmname, last_state_dtmname))
+        Core::DisplayMessage("Failed to move previous state's dtm to state undo backup", 1000);
     }
   }
+
+  auto& movie = system.GetMovie();
+  if ((movie.IsMovieActive()) && !movie.IsJustStartingRecordingInputFromSaveState())
+    movie.SaveRecording(dtmname);
+  else if (!movie.IsMovieActive())
+    File::Delete(dtmname);
+
+  // Move written state to final location.
+  // TODO: This should also be atomic. This is possible on all systems, but needs a special
+  // implementation of IOFile on Windows.
+  if (!f.Close())
+    Core::DisplayMessage("Failed to close state file", 2000);
+
+  if (!File::Rename(temp_filename, filename))
+  {
+    Core::DisplayMessage("Failed to rename state file", 2000);
+  }
+  else
+  {
+    const std::filesystem::path temp_path(filename);
+    Core::DisplayMessage(fmt::format("Saved State to {}", temp_path.filename().string()), 2000);
+  }
 }
 
-void SaveAs(Core::System& system, const std::string& filename, bool wait)
+static void SaveAsFromCore(Core::System& system, std::string filename)
 {
-  std::unique_lock lk(s_load_or_save_in_progress_mutex, std::try_to_lock);
-  if (!lk)
-    return;
+  // Try with a buffer a bit larger than the previous state.
+  // This will often avoid the "Measure" step.
+  const auto buffer_size_estimate = std::size_t(s_last_state_size) * 110 / 100;
+  Common::UniqueBuffer<u8> buffer{buffer_size_estimate};
+
+  if (const auto actual_size = SaveToBuffer(system, buffer))
+  {
+    // Adjust the oversized buffer down to the actual size.
+    buffer.assign(buffer.extract().first, actual_size);
+
+    CompressAndDumpStateArgs dump_args{
+        .buffer = std::move(buffer),
+        .filename = std::move(filename),
+        .task_lock = GetStateSaveTaskLock(),
+    };
+    Core::DisplayMessage("Saving State...", 1000);
+    s_compress_and_dump_thread.EmplaceItem(std::move(dump_args));
+  }
+  else
+  {
+    Core::DisplayMessage("Unable to save: Internal DoState Error", 4000);
+  }
+}
 
+void SaveAs(Core::System& system, std::string filename)
+{
   Core::RunOnCPUThread(
-      system,
-      [&] {
-        {
-          std::lock_guard lk_(s_state_writes_in_queue_mutex);
-          ++s_state_writes_in_queue;
-        }
-
-        // Measure the size of the buffer.
-        u8* ptr = nullptr;
-        PointerWrap p_measure(&ptr, 0, PointerWrap::Mode::Measure);
-        DoState(system, p_measure);
-        const size_t buffer_size = ptr - (u8*)(nullptr);
-
-        // Then actually do the write.
-        Common::UniqueBuffer<u8> current_buffer(buffer_size);
-        ptr = current_buffer.data();
-        PointerWrap p(&ptr, buffer_size, PointerWrap::Mode::Write);
-        DoState(system, p);
-
-        if (p.IsWriteMode())
-        {
-          Core::DisplayMessage("Saving State...", 1000);
-
-          std::shared_ptr<Common::Event> sync_event;
-
-          CompressAndDumpState_args save_args;
-          save_args.buffer = std::move(current_buffer);
-          save_args.filename = filename;
-          if (wait)
-          {
-            sync_event = std::make_shared<Common::Event>();
-            save_args.state_write_done_event = sync_event;
-          }
-
-          s_save_thread.EmplaceItem(std::move(save_args));
-
-          if (sync_event)
-            sync_event->Wait();
-        }
-        else
-        {
-          // someone aborted the save by changing the mode?
-          {
-            // Note: The worker thread takes care of this in the other branch.
-            std::lock_guard lk_(s_state_writes_in_queue_mutex);
-            if (--s_state_writes_in_queue == 0)
-              s_state_write_queue_is_empty.notify_all();
-          }
-          Core::DisplayMessage("Unable to save: Internal DoState Error", 4000);
-        }
-      },
-      true);
+      system, [&system, filename = std::move(filename), lock = GetStateSaveTaskLock()]() mutable {
+        SaveAsFromCore(system, std::move(filename));
+      });
 }
 
 static bool GetVersionFromLZO(StateHeader& header, File::IOFile& f)
@@ -618,18 +601,17 @@ static bool ReadStateHeaderFromFile(StateHeader& header, File::IOFile& f,
   return true;
 }
 
-bool ReadHeader(const std::string& filename, StateHeader& header)
+static bool ReadHeader(const std::string& filename, StateHeader& header)
 {
-  // ensure that the savestate write thread isn't moving around states while we do this
-  std::lock_guard lk(s_save_thread_mutex);
-
   File::IOFile f(filename, "rb");
-  bool get_version_header = false;
+  constexpr bool get_version_header = false;
   return ReadStateHeaderFromFile(header, f, get_version_header);
 }
 
 std::string GetInfoStringOfSlot(int slot, bool translate)
 {
+  std::lock_guard lk{s_state_saves_in_progress};
+
   std::string filename = MakeStateFilename(slot);
   if (!File::Exists(filename))
     return translate ? Common::GetStringT("Empty") : "Empty";
@@ -643,6 +625,8 @@ std::string GetInfoStringOfSlot(int slot, bool translate)
 
 u64 GetUnixTimeOfSlot(int slot)
 {
+  std::lock_guard lk{s_state_saves_in_progress};
+
   State::StateHeader header;
   if (!ReadHeader(MakeStateFilename(slot), header))
     return 0;
@@ -659,7 +643,7 @@ static bool DecompressLZ4(Common::UniqueBuffer<u8>& raw_buffer, u64 size, File::
   u64 total_bytes_read = 0;
   while (true)
   {
-    s32 compressed_data_len;
+    s32 compressed_data_len = 0;
     if (!f.ReadArray(&compressed_data_len, 1))
     {
       PanicAlertFmt("Could not read state data length");
@@ -679,8 +663,8 @@ static bool DecompressLZ4(Common::UniqueBuffer<u8>& raw_buffer, u64 size, File::
       return false;
     }
 
-    u32 max_decompress_size =
-        static_cast<u32>(std::min((u64)LZ4_MAX_INPUT_SIZE, size - total_bytes_read));
+    const auto max_decompress_size =
+        static_cast<int>(std::min((u64)LZ4_MAX_INPUT_SIZE, size - total_bytes_read));
 
     int bytes_read = LZ4_decompress_safe(
         compressed_data.get(), reinterpret_cast<char*>(raw_buffer.data()) + total_bytes_read,
@@ -699,7 +683,8 @@ static bool DecompressLZ4(Common::UniqueBuffer<u8>& raw_buffer, u64 size, File::
     {
       return true;
     }
-    else if (total_bytes_read > size)
+
+    if (total_bytes_read > size)
     {
       PanicAlertFmtT("Internal LZ4 Error - payload size mismatch ({0} / {1}))", total_bytes_read,
                      size);
@@ -713,7 +698,7 @@ static bool ValidateHeaders(const StateHeader& header)
   bool success = true;
 
   // Game ID
-  if (strncmp(SConfig::GetInstance().GetGameID().c_str(), header.legacy_header.game_id, 6))
+  if (strncmp(SConfig::GetInstance().GetGameID().c_str(), header.legacy_header.game_id, 6) != 0)
   {
     Core::DisplayMessage(fmt::format("State belongs to a different game (ID {})",
                                      std::string_view{header.legacy_header.game_id,
@@ -722,8 +707,8 @@ static bool ValidateHeaders(const StateHeader& header)
     return false;
   }
 
-  // Check both the state version and the revision string
-  std::string current_str = Common::GetScmRevStr();
+  // Check the state version.
+  // FYI: We don't require an exact revision string match.
   std::string loaded_str = header.version_string;
   const u32 loaded_version = header.version_header.version_cookie - COOKIE_BASE;
 
@@ -758,22 +743,7 @@ static bool ValidateHeaders(const StateHeader& header)
 static void LoadFileStateData(const std::string& filename, Common::UniqueBuffer<u8>& ret_data)
 {
   File::IOFile f;
-
-  {
-    // If a state is currently saving, wait for that to end or time out.
-    std::unique_lock lk(s_state_writes_in_queue_mutex);
-    if (s_state_writes_in_queue != 0)
-    {
-      if (!s_state_write_queue_is_empty.wait_for(lk, std::chrono::seconds(3),
-                                                 [] { return s_state_writes_in_queue == 0; }))
-      {
-        Core::DisplayMessage(
-            "A previous state saving operation is still in progress, cancelling load.", 2000);
-        return;
-      }
-    }
-    f.Open(filename, "rb");
-  }
+  f.Open(filename, "rb");
 
   StateHeader header;
   if (!ReadStateHeaderFromFile(header, f) || !ValidateHeaders(header))
@@ -837,87 +807,76 @@ static void LoadFileStateData(const std::string& filename, Common::UniqueBuffer<
   ret_data.swap(buffer);
 }
 
-void LoadAs(Core::System& system, const std::string& filename)
+static void LoadAsFromCore(Core::System& system, std::string filename)
 {
-  if (!Core::IsRunningOrStarting(system))
-    return;
+  // Ensure all data has reached the filesystem before trying to use it.
+  s_compress_and_dump_thread.WaitForCompletion();
 
-  if (NetPlay::IsNetPlayRunning())
+  // Save temp buffer for undo load state
+  auto& movie = system.GetMovie();
+  if (!movie.IsJustStartingRecordingInputFromSaveState())
   {
-    OSD::AddMessage("Loading savestates is disabled in Netplay to prevent desyncs");
-    return;
+    SaveToBuffer(system, s_undo_load_buffer);
+    const std::string dtmpath = File::GetUserPath(D_STATESAVES_IDX) + "undo.dtm";
+    if (movie.IsMovieActive())
+      movie.SaveRecording(dtmpath);
+    else if (File::Exists(dtmpath))
+      File::Delete(dtmpath);
   }
 
-  if (AchievementManager::GetInstance().IsHardcoreModeActive())
+  bool was_file_read = false;
+  bool loaded_successfully = false;
+
+  // brackets here are so buffer gets freed ASAP
   {
-    OSD::AddMessage("Loading savestates is disabled in RetroAchievements hardcore mode");
-    return;
+    Common::UniqueBuffer<u8> buffer;
+    LoadFileStateData(filename, buffer);
+
+    if (!buffer.empty())
+    {
+      was_file_read = true;
+      loaded_successfully = LoadFromBuffer(system, buffer);
+    }
   }
 
-  std::unique_lock lk(s_load_or_save_in_progress_mutex, std::try_to_lock);
-  if (!lk)
+  if (was_file_read)
+  {
+    if (loaded_successfully)
+    {
+      std::filesystem::path temp_filename(std::move(filename));
+      Core::DisplayMessage(fmt::format("Loaded State from {}", temp_filename.filename().string()),
+                           2000);
+      if (File::Exists(filename + ".dtm"))
+      {
+        movie.LoadInput(filename + ".dtm");
+      }
+      else if (!movie.IsJustStartingRecordingInputFromSaveState() &&
+               !movie.IsJustStartingPlayingInputFromSaveState())
+      {
+        movie.EndPlayInput(false);
+      }
+    }
+    else
+    {
+      Core::DisplayMessage("The savestate could not be loaded", OSD::Duration::NORMAL);
+
+      // since we could be in an inconsistent state now (and might crash or whatever), undo.
+      UndoLoadState(system);
+    }
+  }
+
+  if (s_on_after_load_callback)
+    s_on_after_load_callback();
+}
+
+void LoadAs(Core::System& system, std::string filename)
+{
+  if (!CheckIfStateLoadIsAllowed(system))
     return;
 
-  Core::RunOnCPUThread(
-      system,
-      [&] {
-        // Save temp buffer for undo load state
-        auto& movie = system.GetMovie();
-        if (!movie.IsJustStartingRecordingInputFromSaveState())
-        {
-          std::lock_guard lk2(s_undo_load_buffer_mutex);
-          SaveToBuffer(system, s_undo_load_buffer);
-          const std::string dtmpath = File::GetUserPath(D_STATESAVES_IDX) + "undo.dtm";
-          if (movie.IsMovieActive())
-            movie.SaveRecording(dtmpath);
-          else if (File::Exists(dtmpath))
-            File::Delete(dtmpath);
-        }
-
-        bool loaded = false;
-        bool loadedSuccessfully = false;
-
-        // brackets here are so buffer gets freed ASAP
-        {
-          Common::UniqueBuffer<u8> buffer;
-          LoadFileStateData(filename, buffer);
-
-          if (!buffer.empty())
-          {
-            u8* ptr = buffer.data();
-            PointerWrap p(&ptr, buffer.size(), PointerWrap::Mode::Read);
-            DoState(system, p);
-            loaded = true;
-            loadedSuccessfully = p.IsReadMode();
-          }
-        }
-
-        if (loaded)
-        {
-          if (loadedSuccessfully)
-          {
-            std::filesystem::path tempfilename(filename);
-            Core::DisplayMessage(
-                fmt::format("Loaded State from {}", tempfilename.filename().string()), 2000);
-            if (File::Exists(filename + ".dtm"))
-              movie.LoadInput(filename + ".dtm");
-            else if (!movie.IsJustStartingRecordingInputFromSaveState() &&
-                     !movie.IsJustStartingPlayingInputFromSaveState())
-              movie.EndPlayInput(false);
-          }
-          else
-          {
-            Core::DisplayMessage("The savestate could not be loaded", OSD::Duration::NORMAL);
-
-            // since we could be in an inconsistent state now (and might crash or whatever), undo.
-            UndoLoadState(system);
-          }
-        }
-
-        if (s_on_after_load_callback)
-          s_on_after_load_callback();
-      },
-      true);
+  Core::RunOnCPUThread(system, [&system, filename = std::move(filename)]() mutable {
+    LoadAsFromCore(system, std::move(filename));
+  });
 }
 
 void SetOnAfterLoadCallback(AfterLoadCallbackFunc callback)
@@ -927,37 +886,25 @@ void SetOnAfterLoadCallback(AfterLoadCallbackFunc callback)
 
 void Init(Core::System& system)
 {
-  s_save_thread.Reset("Savestate Worker", [&system](CompressAndDumpState_args args) {
-    CompressAndDumpState(system, args);
-
-    {
-      std::lock_guard lk(s_state_writes_in_queue_mutex);
-      if (--s_state_writes_in_queue == 0)
-        s_state_write_queue_is_empty.notify_all();
-    }
+  s_compress_and_dump_thread.Reset("Savestate Worker",
+                                   std::bind_front(&CompressAndDumpState, std::ref(system)));
 
-    if (args.state_write_done_event)
-      args.state_write_done_event->Set();
+  s_flush_unsaved_data_hook = UICommon::AddFlushUnsavedDataCallback([] {
+    // Holding the lock for any amount of time means there are no pending state save tasks.
+    std::lock_guard lk{s_state_saves_in_progress};
   });
 }
 
 void Shutdown()
 {
-  s_save_thread.Shutdown();
-
-  std::lock_guard lk(s_undo_load_buffer_mutex);
+  s_compress_and_dump_thread.Shutdown();
   s_undo_load_buffer.reset();
+  s_flush_unsaved_data_hook.reset();
 }
 
-static std::string MakeStateFilename(int number)
-{
-  return fmt::format("{}{}.s{:02d}", File::GetUserPath(D_STATESAVES_IDX),
-                     SConfig::GetInstance().GetGameID(), number);
-}
-
-void Save(Core::System& system, int slot, bool wait)
+void Save(Core::System& system, int slot)
 {
-  SaveAs(system, MakeStateFilename(slot), wait);
+  SaveAs(system, MakeStateFilename(slot));
 }
 
 void Load(Core::System& system, int slot)
@@ -967,48 +914,61 @@ void Load(Core::System& system, int slot)
 
 void LoadLastSaved(Core::System& system, int i)
 {
-  if (i <= 0)
-  {
-    Core::DisplayMessage("State doesn't exist", 2000);
+  if (!CheckIfStateLoadIsAllowed(system))
     return;
-  }
 
-  std::vector<SlotWithTimestamp> used_slots = GetUsedSlotsWithTimestamp();
-  if (static_cast<size_t>(i) > used_slots.size())
-  {
-    Core::DisplayMessage("State doesn't exist", 2000);
-    return;
-  }
+  Core::RunOnCPUThread(system, [&system, i] {
+    // Data must reach the filesystem for up to date "UsedSlots".
+    s_compress_and_dump_thread.WaitForCompletion();
 
-  std::ranges::stable_sort(used_slots, {}, &SlotWithTimestamp::timestamp);
-  Load(system, (used_slots.end() - i)->slot);
+    std::vector<SlotWithTimestamp> used_slots = GetUsedSlotsWithTimestamp();
+    if (std::size_t(i) > used_slots.size())
+    {
+      Core::DisplayMessage("State doesn't exist", 2000);
+      return;
+    }
+
+    std::ranges::stable_sort(used_slots, std::ranges::greater{}, &SlotWithTimestamp::timestamp);
+    LoadAsFromCore(system, MakeStateFilename(used_slots[i].slot));
+  });
 }
 
-// must wait for state to be written because it must know if all slots are taken
 void SaveFirstSaved(Core::System& system)
 {
-  std::vector<SlotWithTimestamp> used_slots = GetUsedSlotsWithTimestamp();
-  if (used_slots.size() < NUM_STATES)
-  {
-    // save to an empty slot
-    Save(system, GetEmptySlot(used_slots), true);
-    return;
-  }
+  Core::RunOnCPUThread(system, [&system, lock = GetStateSaveTaskLock()] {
+    // Data must reach the filesystem for up to date "UsedSlots".
+    s_compress_and_dump_thread.WaitForCompletion();
+
+    std::vector<SlotWithTimestamp> used_slots = GetUsedSlotsWithTimestamp();
+    auto slot = GetEmptySlot(used_slots);
+    if (!slot.has_value())
+    {
+      // overwrite the oldest state
+      std::ranges::stable_sort(used_slots, {}, &SlotWithTimestamp::timestamp);
+      slot = used_slots.front().slot;
+    }
 
-  // overwrite the oldest state
-  std::ranges::stable_sort(used_slots, {}, &SlotWithTimestamp::timestamp);
-  Save(system, used_slots.front().slot, true);
+    SaveAsFromCore(system, MakeStateFilename(*slot));
+  });
 }
 
 // Load the last state before loading the state
 void UndoLoadState(Core::System& system)
 {
-  std::lock_guard lk(s_undo_load_buffer_mutex);
-  if (!s_undo_load_buffer.empty())
-  {
+  if (!CheckIfStateLoadIsAllowed(system))
+    return;
+
+  Core::RunOnCPUThread(system, [&system] {
+    if (s_undo_load_buffer.empty())
+    {
+      PanicAlertFmtT("There is nothing to undo!");
+      return;
+    }
+
     auto& movie = system.GetMovie();
     if (movie.IsMovieActive())
     {
+      // Note: Only the CPU thread writes to "undo.dtm".
       const std::string dtmpath = File::GetUserPath(D_STATESAVES_IDX) + "undo.dtm";
       if (File::Exists(dtmpath))
       {
@@ -1024,11 +984,7 @@ void UndoLoadState(Core::System& system)
     {
       LoadFromBuffer(system, s_undo_load_buffer);
     }
-  }
-  else
-  {
-    PanicAlertFmtT("There is nothing to undo!");
-  }
+  });
 }
 
 // Load the state that the last save state overwritten on
diff --git a/Source/Core/Core/State.h b/Source/Core/Core/State.h
index 9a877042c546..a7495c6a685e 100644
--- a/Source/Core/Core/State.h
+++ b/Source/Core/Core/State.h
@@ -10,7 +10,6 @@
 #include <string>
 #include <type_traits>
 
-#include "Common/Buffer.h"
 #include "Common/CommonTypes.h"
 #ifdef __LIBRETRO__
 #include "Common/ChunkFile.h"
@@ -84,13 +83,8 @@ struct StateExtendedHeader
 };
 
 void Init(Core::System& system);
-
 void Shutdown();
 
-void EnableCompression(bool compression);
-
-bool ReadHeader(const std::string& filename, StateHeader& header);
-
 // Returns a string containing information of the savestate in the given slot
 // which can be presented to the user for identification purposes
 std::string GetInfoStringOfSlot(int slot, bool translate = true);
@@ -100,17 +94,12 @@ u64 GetUnixTimeOfSlot(int slot);
 
 // These don't happen instantly - they get scheduled as events.
 // ...But only if we're not in the main CPU thread.
-//    If we're in the main CPU thread then they run immediately instead
-//    because some things (like Lua) need them to run immediately.
-// Slots from 0-99.
-void Save(Core::System& system, int slot, bool wait = false);
+//    If we're in the main CPU thread then they run immediately instead.
+void Save(Core::System& system, int slot);
 void Load(Core::System& system, int slot);
 
-void SaveAs(Core::System& system, const std::string& filename, bool wait = false);
-void LoadAs(Core::System& system, const std::string& filename);
-
-void SaveToBuffer(Core::System& system, Common::UniqueBuffer<u8>& buffer);
-void LoadFromBuffer(Core::System& system, Common::UniqueBuffer<u8>& buffer);
+void SaveAs(Core::System& system, std::string filename);
+void LoadAs(Core::System& system, std::string filename);
 
 void LoadLastSaved(Core::System& system, int i = 1);
 void SaveFirstSaved(Core::System& system);
diff --git a/Source/Core/Core/SysConf.cpp b/Source/Core/Core/SysConf.cpp
index bef12fe0146a..9381f274f395 100644
--- a/Source/Core/Core/SysConf.cpp
+++ b/Source/Core/Core/SysConf.cpp
@@ -7,10 +7,7 @@
 #include <array>
 #include <cstdio>
 
-#include "Common/CommonPaths.h"
 #include "Common/CommonTypes.h"
-#include "Common/FileUtil.h"
-#include "Common/IOFile.h"
 #include "Common/Logging/Log.h"
 #include "Common/Swap.h"
 #include "Core/IOS/FS/FileSystem.h"
@@ -66,29 +63,29 @@ void SysConf::Load()
 
 bool SysConf::LoadFromFile(const IOS::HLE::FS::FileHandle& file)
 {
-  file.Seek(4, IOS::HLE::FS::SeekMode::Set);
+  (void)file.Seek(4, IOS::HLE::FS::SeekMode::Set);
   u16 number_of_entries;
-  file.Read(&number_of_entries, 1);
+  (void)file.Read(&number_of_entries, 1);
   number_of_entries = Common::swap16(number_of_entries);
 
   std::vector<u16> offsets(number_of_entries);
   for (u16& offset : offsets)
   {
-    file.Read(&offset, 1);
+    (void)file.Read(&offset, 1);
     offset = Common::swap16(offset);
   }
 
   for (const u16 offset : offsets)
   {
-    file.Seek(offset, IOS::HLE::FS::SeekMode::Set);
+    (void)file.Seek(offset, IOS::HLE::FS::SeekMode::Set);
 
     // Metadata
     u8 description = 0;
-    file.Read(&description, 1);
+    (void)file.Read(&description, 1);
     const Entry::Type type = static_cast<Entry::Type>((description & 0xe0) >> 5);
     const u8 name_length = (description & 0x1f) + 1;
     std::string name(name_length, '\0');
-    file.Read(&name[0], name.size());
+    (void)file.Read(name.data(), name.size());
 
     // Data
     std::vector<u8> data;
@@ -97,7 +94,7 @@ bool SysConf::LoadFromFile(const IOS::HLE::FS::FileHandle& file)
     case Entry::Type::BigArray:
     {
       u16 data_length = 0;
-      file.Read(&data_length, 1);
+      (void)file.Read(&data_length, 1);
       // The stored u16 is length - 1, not length.
       data.resize(Common::swap16(data_length) + 1);
       break;
@@ -105,7 +102,7 @@ bool SysConf::LoadFromFile(const IOS::HLE::FS::FileHandle& file)
     case Entry::Type::SmallArray:
     {
       u8 data_length = 0;
-      file.Read(&data_length, 1);
+      (void)file.Read(&data_length, 1);
       data.resize(data_length + 1);
       break;
     }
@@ -122,7 +119,7 @@ bool SysConf::LoadFromFile(const IOS::HLE::FS::FileHandle& file)
       return false;
     }
 
-    file.Read(data.data(), data.size());
+    (void)file.Read(data.data(), data.size());
     AddEntry({type, name, std::move(data)});
   }
   return true;
diff --git a/Source/Core/Core/System.cpp b/Source/Core/Core/System.cpp
index 75853ee47cc3..63550baa1888 100644
--- a/Source/Core/Core/System.cpp
+++ b/Source/Core/Core/System.cpp
@@ -33,12 +33,12 @@
 #include "IOS/USB/Emulated/Infinity.h"
 #include "IOS/USB/Emulated/Skylanders/Skylander.h"
 #include "IOS/USB/USBScanner.h"
-#include "VideoCommon/Assets/CustomResourceManager.h"
 #include "VideoCommon/CommandProcessor.h"
 #include "VideoCommon/Fifo.h"
 #include "VideoCommon/GeometryShaderManager.h"
 #include "VideoCommon/PixelEngine.h"
 #include "VideoCommon/PixelShaderManager.h"
+#include "VideoCommon/Resources/CustomResourceManager.h"
 #include "VideoCommon/VertexShaderManager.h"
 #include "VideoCommon/XFStateManager.h"
 
diff --git a/Source/Core/Core/TitleDatabase.cpp b/Source/Core/Core/TitleDatabase.cpp
index 4609cfddb10c..41ad0e0e7ee9 100644
--- a/Source/Core/Core/TitleDatabase.cpp
+++ b/Source/Core/Core/TitleDatabase.cpp
@@ -5,11 +5,9 @@
 
 #include <cstddef>
 #include <fstream>
-#include <functional>
 #include <string>
 #include <string_view>
 #include <unordered_map>
-#include <utility>
 
 #include <fmt/format.h>
 
@@ -17,7 +15,6 @@
 #include "Common/MsgHandler.h"
 #include "Common/StringUtil.h"
 #include "Core/Config/MainSettings.h"
-#include "Core/IOS/ES/Formats.h"
 #include "DiscIO/Enums.h"
 
 namespace Core
@@ -94,32 +91,8 @@ TitleDatabase::TitleDatabase()
 TitleDatabase::~TitleDatabase() = default;
 
 const std::string& TitleDatabase::GetTitleName(const std::string& gametdb_id,
-                                               const std::string& triforce_id,
                                                DiscIO::Language language) const
 {
-  if (triforce_id != "")
-  {
-    const Map& map = *m_triforce_title_maps.at(DiscIO::Language::English);
-    auto it = map.find(triforce_id);
-    if (it != map.end())
-      return it->second;
-
-    // This code has been commented out as there is currently only a english title map, and all
-    // Triforce games are detected as Japanese.
-
-    // if (language != DiscIO::Language::English)
-    //{
-    //  const Map& english_triforce_map = *m_triforce_title_maps.at(DiscIO::Language::English);
-    //  it = english_triforce_map.find(triforce_id);
-    //  if (it != english_triforce_map.end())
-    //    return it->second;
-    //}
-
-    // it = m_base_map.find(triforce_id);
-    // if (it != m_base_map.end())
-    //  return it->second;
-  }
-
   auto it = m_user_title_map.find(gametdb_id);
   if (it != m_user_title_map.end())
     return it->second;
@@ -152,12 +125,12 @@ const std::string& TitleDatabase::GetChannelName(u64 title_id, DiscIO::Language
   const std::string id{
       {static_cast<char>((title_id >> 24) & 0xff), static_cast<char>((title_id >> 16) & 0xff),
        static_cast<char>((title_id >> 8) & 0xff), static_cast<char>(title_id & 0xff)}};
-  return GetTitleName(id, "", language);
+  return GetTitleName(id, language);
 }
 
 std::string TitleDatabase::Describe(const std::string& gametdb_id, DiscIO::Language language) const
 {
-  const std::string& title_name = GetTitleName(gametdb_id, "", language);
+  const std::string& title_name = GetTitleName(gametdb_id, language);
   if (title_name.empty())
     return gametdb_id;
   return fmt::format("{} ({})", title_name, gametdb_id);
diff --git a/Source/Core/Core/TitleDatabase.h b/Source/Core/Core/TitleDatabase.h
index dff9a56dfe83..d1163d80a669 100644
--- a/Source/Core/Core/TitleDatabase.h
+++ b/Source/Core/Core/TitleDatabase.h
@@ -25,8 +25,7 @@ class TitleDatabase final
 
   // Get a user friendly title name for a GameTDB ID.
   // This falls back to returning an empty string if none could be found.
-  const std::string& GetTitleName(const std::string& gametdb_id, const std::string& triforce_id,
-                                  DiscIO::Language language) const;
+  const std::string& GetTitleName(const std::string& gametdb_id, DiscIO::Language language) const;
 
   // Same as above, but takes a title ID instead of a GameTDB ID, and only works for channels.
   const std::string& GetChannelName(u64 title_id, DiscIO::Language language) const;
diff --git a/Source/Core/Core/USBUtils.cpp b/Source/Core/Core/USBUtils.cpp
index 06734ea4476c..29fe3f862d11 100644
--- a/Source/Core/Core/USBUtils.cpp
+++ b/Source/Core/Core/USBUtils.cpp
@@ -3,6 +3,7 @@
 
 #include "Core/USBUtils.h"
 
+#include <array>
 #include <charconv>
 #include <cwchar>
 #include <functional>
@@ -13,7 +14,6 @@
 #include <vector>
 
 #include <fmt/format.h>
-#include <fmt/xchar.h>
 #ifdef HAVE_LIBUDEV
 #include <libudev.h>
 #endif
@@ -21,9 +21,13 @@
 #include <libusb.h>
 #endif
 #ifdef _WIN32
-#include <setupapi.h>
 #include <cfgmgr32.h>
 #include <devpkey.h>
+#include <initguid.h>
+// initguid.h must be included before usbiodef.h
+#include <usbiodef.h>
+
+#include <fmt/xchar.h>
 
 #include "Common/StringUtil.h"
 #include "Common/WindowsDevice.h"
@@ -119,43 +123,36 @@ static std::optional<std::string> GetDeviceNameUsingKnownDevices(u16 vid, u16 pi
 }
 
 #ifdef _WIN32
-static std::optional<std::string> GetDeviceNameUsingSetupAPI(u16 vid, u16 pid)
+static std::optional<std::string> GetDeviceNameUsingCfgMgr32(u16 vid, u16 pid)
 {
-  std::optional<std::string> device_name;
+  auto class_guid = GUID_DEVINTERFACE_USB_DEVICE;
+  const ULONG flags = CM_GET_DEVICE_INTERFACE_LIST_PRESENT;
   const std::wstring filter = fmt::format(L"VID_{:04X}&PID_{:04X}", vid, pid);
 
-  HDEVINFO dev_info =
-      SetupDiGetClassDevs(nullptr, nullptr, nullptr, DIGCF_PRESENT | DIGCF_ALLCLASSES);
-  if (dev_info == INVALID_HANDLE_VALUE)
-    return std::nullopt;
-  SP_DEVINFO_DATA dev_info_data;
-  dev_info_data.cbSize = sizeof(SP_DEVINFO_DATA);
-
-  for (DWORD i = 0; SetupDiEnumDeviceInfo(dev_info, i, &dev_info_data); ++i)
+  for (auto* iface : Common::GetDeviceInterfaceList(&class_guid, nullptr, flags))
   {
-    TCHAR instance_id[MAX_DEVICE_ID_LEN];
-    if (CM_Get_Device_ID(dev_info_data.DevInst, instance_id, MAX_DEVICE_ID_LEN, 0) != CR_SUCCESS)
+    if (!std::basic_string_view{iface}.contains(filter))
       continue;
 
-    const std::wstring_view id_wstr(instance_id);
-    if (id_wstr.find(filter) == std::wstring::npos)
-      continue;
+    auto dev_inst_id = Common::GetDeviceInterfaceStringProperty(iface, &DEVPKEY_Device_InstanceId);
+    if (!dev_inst_id.has_value())
+      return std::nullopt;
 
-    std::wstring property_value =
-        Common::GetDeviceProperty(dev_info, &dev_info_data, &DEVPKEY_Device_FriendlyName);
-    if (property_value.empty())
+    DEVINST dev_inst{};
+    if (CM_Locate_DevNode(&dev_inst, dev_inst_id->data(), CM_LOCATE_DEVNODE_NORMAL) != CR_SUCCESS)
     {
-      property_value =
-          Common::GetDeviceProperty(dev_info, &dev_info_data, &DEVPKEY_Device_DeviceDesc);
+      ERROR_LOG_FMT(COMMON, "CM_Locate_DevNode");
+      return std::nullopt;
     }
 
-    if (!property_value.empty())
-      device_name = WStringToUTF8(property_value);
-    break;
+    // FYI: BusReportedDeviceDesc seems to be more of a friendly name
+    //  while DeviceDesc tends to be something more like "USB Input Device".
+    return Common::GetDevNodeStringProperty(dev_inst, &DEVPKEY_Device_BusReportedDeviceDesc)
+        .or_else(std::bind(Common::GetDevNodeStringProperty, dev_inst, &DEVPKEY_Device_DeviceDesc))
+        .transform(WStringToUTF8);
   }
 
-  SetupDiDestroyDeviceInfoList(dev_info);
-  return device_name;
+  return std::nullopt;
 }
 #endif
 
@@ -245,7 +242,7 @@ std::optional<std::string> GetDeviceNameFromVIDPID(u16 vid, u16 pid)
       &GetDeviceNameUsingHWDB,
 #endif
 #ifdef _WIN32
-      &GetDeviceNameUsingSetupAPI,
+      &GetDeviceNameUsingCfgMgr32,
 #endif
 #if defined(__LIBUSB__) && !defined(_WIN32)
       &GetDeviceNameUsingLibUSB,
diff --git a/Source/Core/Core/WiiRoot.cpp b/Source/Core/Core/WiiRoot.cpp
index 9fae6a467b03..0f3397f536a7 100644
--- a/Source/Core/Core/WiiRoot.cpp
+++ b/Source/Core/Core/WiiRoot.cpp
@@ -18,7 +18,6 @@
 #include "Common/StringUtil.h"
 #include "Core/Boot/Boot.h"
 #include "Core/CommonTitles.h"
-#include "Core/Config/SessionSettings.h"
 #include "Core/ConfigManager.h"
 #include "Core/HW/WiiSave.h"
 #include "Core/IOS/ES/ES.h"
@@ -300,7 +299,7 @@ static bool CopySysmenuFilesToFS(FS::FileSystem* fs, const std::string& host_sou
     else
     {
       // Do not overwrite any existing files.
-      if (fs->GetMetadata(IOS::SYSMENU_UID, IOS::SYSMENU_UID, nand_path).Succeeded())
+      if (fs->GetMetadata(IOS::SYSMENU_UID, IOS::SYSMENU_UID, nand_path).has_value())
         continue;
 
       File::IOFile host_file{host_path, "rb"};
diff --git a/Source/Core/Core/WiiUtils.cpp b/Source/Core/Core/WiiUtils.cpp
index 3dc6aa9f4384..3ac5e222cfe8 100644
--- a/Source/Core/Core/WiiUtils.cpp
+++ b/Source/Core/Core/WiiUtils.cpp
@@ -22,7 +22,6 @@
 #include "Common/Assert.h"
 #include "Common/CommonTypes.h"
 #include "Common/Contains.h"
-#include "Common/EnumUtils.h"
 #include "Common/FileUtil.h"
 #include "Common/HttpRequest.h"
 #include "Common/Logging/Log.h"
@@ -80,7 +79,7 @@ static bool ImportWAD(IOS::HLE::Kernel& ios, const DiscIO::VolumeWAD& wad,
     if (ret != IOS::HLE::IOSC_FAIL_CHECKVALUE)
     {
       PanicAlertFmtT("WAD installation failed: Could not initialise title import (error {0}).",
-                     Common::ToUnderlying(ret));
+                     std::to_underlying(ret));
     }
     return false;
   }
@@ -546,7 +545,7 @@ UpdateResult OnlineSystemUpdater::InstallTitleFromNUS(const std::string& prefix_
   auto& es = m_ios.GetESCore();
   if ((ret = es.ImportTicket(ticket.first, ticket.second)) < 0)
   {
-    ERROR_LOG_FMT(CORE, "Failed to import ticket: error {}", Common::ToUnderlying(ret));
+    ERROR_LOG_FMT(CORE, "Failed to import ticket: error {}", std::to_underlying(ret));
     return UpdateResult::ImportFailed;
   }
 
@@ -578,7 +577,7 @@ UpdateResult OnlineSystemUpdater::InstallTitleFromNUS(const std::string& prefix_
   IOS::HLE::ESCore::Context context;
   if ((ret = es.ImportTitleInit(context, tmd.first.GetBytes(), tmd.second)) < 0)
   {
-    ERROR_LOG_FMT(CORE, "Failed to initialise title import: error {}", Common::ToUnderlying(ret));
+    ERROR_LOG_FMT(CORE, "Failed to initialise title import: error {}", std::to_underlying(ret));
     return UpdateResult::ImportFailed;
   }
 
@@ -597,7 +596,7 @@ UpdateResult OnlineSystemUpdater::InstallTitleFromNUS(const std::string& prefix_
       if ((ret = es.ImportContentBegin(context, title.id, content.id)) < 0)
       {
         ERROR_LOG_FMT(CORE, "Failed to initialise import for content {:08x}: error {}", content.id,
-                      Common::ToUnderlying(ret));
+                      std::to_underlying(ret));
         return UpdateResult::ImportFailed;
       }
 
@@ -622,7 +621,7 @@ UpdateResult OnlineSystemUpdater::InstallTitleFromNUS(const std::string& prefix_
   if ((all_contents_imported && (ret = es.ImportTitleDone(context)) < 0) ||
       (!all_contents_imported && (ret = es.ImportTitleCancel(context)) < 0))
   {
-    ERROR_LOG_FMT(CORE, "Failed to finalise title import: error {}", Common::ToUnderlying(ret));
+    ERROR_LOG_FMT(CORE, "Failed to finalise title import: error {}", std::to_underlying(ret));
     return UpdateResult::ImportFailed;
   }
 
diff --git a/Source/Core/Core/WiiUtils.h b/Source/Core/Core/WiiUtils.h
index c8f86d7253c0..8dbcb21faf12 100644
--- a/Source/Core/Core/WiiUtils.h
+++ b/Source/Core/Core/WiiUtils.h
@@ -5,7 +5,6 @@
 
 #include <cstddef>
 #include <functional>
-#include <optional>
 #include <string>
 #include <unordered_set>
 
diff --git a/Source/Core/DiscIO/Blob.h b/Source/Core/DiscIO/Blob.h
index 841a827b976a..3551c31d44d5 100644
--- a/Source/Core/DiscIO/Blob.h
+++ b/Source/Core/DiscIO/Blob.h
@@ -97,6 +97,9 @@ class BlobReader
     return false;
   }
 
+  // Returns true only for CachedBlobReader.
+  virtual bool IsCached() const { return false; }
+
 protected:
   BlobReader() {}
 };
diff --git a/Source/Core/DiscIO/CMakeLists.txt b/Source/Core/DiscIO/CMakeLists.txt
index 884f3de4f2dc..bfec96dd9d7d 100644
--- a/Source/Core/DiscIO/CMakeLists.txt
+++ b/Source/Core/DiscIO/CMakeLists.txt
@@ -3,6 +3,8 @@ add_library(discio
   Blob.h
   CISOBlob.cpp
   CISOBlob.h
+  CachedBlob.cpp
+  CachedBlob.h
   CompressedBlob.cpp
   CompressedBlob.h
   DirectoryBlob.cpp
@@ -75,7 +77,7 @@ PUBLIC
 
 PRIVATE
   fmt::fmt
-  minizip-ng::minizip-ng
+  MINIZIP::minizip-ng
   pugixml
   ZLIB::ZLIB
 )
diff --git a/Source/Core/DiscIO/CachedBlob.cpp b/Source/Core/DiscIO/CachedBlob.cpp
new file mode 100644
index 000000000000..f1bbf055ee55
--- /dev/null
+++ b/Source/Core/DiscIO/CachedBlob.cpp
@@ -0,0 +1,247 @@
+// Copyright 2025 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "DiscIO/CachedBlob.h"
+
+#include <atomic>
+#include <chrono>
+#include <thread>
+
+#include "Common/CommonTypes.h"
+#include "Common/Logging/Log.h"
+#include "Common/MemArena.h"
+
+#include "DiscIO/DiscScrubber.h"
+#include "DiscIO/Volume.h"
+
+namespace DiscIO
+{
+class CacheFiller final
+{
+public:
+  explicit CacheFiller(std::unique_ptr<BlobReader> reader, bool attempt_to_scrub)
+      : m_thread{&CacheFiller::ThreadFunc, this, std::move(reader), attempt_to_scrub}
+  {
+  }
+
+  ~CacheFiller()
+  {
+    m_stop_thread.store(true, std::memory_order_relaxed);
+    m_thread.join();
+  }
+
+  bool Read(u64 offset, u64 size, u8* out_ptr)
+  {
+    if (size == 0)
+    {
+      // Just return early to safely handle a read of zero if that were to happen.
+      // This avoids a m_memory_region_data initialization race.
+      return true;
+    }
+
+    switch (GetCacheState(offset, size))
+    {
+    case CacheState::Cached:
+      std::memcpy(out_ptr, m_memory_region_data + offset, size);
+      return true;
+
+    case CacheState::Scrubbed:
+      WARN_LOG_FMT(DISCIO,
+                   "CachedBlobReader: Read({}, {}) hits a scrubbed cluster which is not cached.",
+                   offset, size);
+      return false;
+
+    default:
+      return false;
+    }
+  }
+
+private:
+  enum class CacheState
+  {
+    Cached,
+    NotCached,
+    Scrubbed,
+  };
+
+  CacheState GetCacheState(u64 offset, u64 size)
+  {
+    const auto cache_pos = m_cache_filled_pos.load(std::memory_order_acquire);
+
+    const auto end_pos = offset + size;
+    if (end_pos > cache_pos)
+      return CacheState::NotCached;
+
+    for (u64 i = offset; i < end_pos; i += DiscScrubber::CLUSTER_SIZE)
+    {
+      if (m_scrubber.CanBlockBeScrubbed(i))
+        return CacheState::Scrubbed;
+    }
+
+    return CacheState::Cached;
+  }
+
+  void ThreadFunc(std::unique_ptr<BlobReader> reader, bool attempt_to_scrub)
+  {
+    static constexpr auto PERIODIC_LOG_TIME = std::chrono::seconds{1};
+
+    const auto start_time = Clock::now();
+    const u64 total_size = reader->GetDataSize();
+
+    m_memory_region_data = static_cast<u8*>(m_memory_region.Create(total_size));
+    if (m_memory_region_data == nullptr)
+    {
+      ERROR_LOG_FMT(DISCIO, "CachedBlobReader: Failed to create memory region.");
+      return;
+    }
+
+    // Returns CLUSTER_SIZE or smaller at the end of the file.
+    const auto get_read_size = [&](u64 pos) {
+      return std::min<u64>(total_size - pos, DiscScrubber::CLUSTER_SIZE);
+    };
+
+    // Used for periodic progress logging.
+    u64 total_bytes_to_commit = total_size;
+
+    if (attempt_to_scrub)
+    {
+      const auto volume = CreateVolume(reader->CopyReader());
+      if (volume != nullptr && m_scrubber.SetupScrub(*volume))
+      {
+        for (u64 i = 0; i < total_size; i += DiscScrubber::CLUSTER_SIZE)
+        {
+          if (m_scrubber.CanBlockBeScrubbed(i))
+            total_bytes_to_commit -= get_read_size(i);
+        }
+      }
+      else
+      {
+        WARN_LOG_FMT(DISCIO, "CachedBlobReader: Failed to scrub. The entire file will be cached.");
+      }
+    }
+
+    auto next_log_time = start_time + PERIODIC_LOG_TIME;
+    u64 read_offset = 0;
+    u64 committed_count = 0;
+
+    while (true)
+    {
+      if (m_stop_thread.load(std::memory_order_relaxed))
+      {
+        INFO_LOG_FMT(DISCIO, "CachedBlobReader: Stopped");
+        break;
+      }
+
+      const auto read_size = get_read_size(read_offset);
+      if (read_size == 0)
+      {
+        const auto total_time = DT_s{Clock::now() - start_time}.count();
+
+        static constexpr auto mib_scale = double(1 << 20);
+
+        NOTICE_LOG_FMT(
+            DISCIO, "CachedBlobReader: Completed. Cached {:.2f} of {:.2f} MiB in {:.2f} seconds.",
+            committed_count / mib_scale, total_size / mib_scale, total_time);
+        break;
+      }
+
+      if (!m_scrubber.CanBlockBeScrubbed(read_offset))
+      {
+        m_memory_region.EnsureMemoryPagesWritable(read_offset, read_size);
+
+        if (!reader->Read(read_offset, read_size, m_memory_region_data + read_offset))
+        {
+          ERROR_LOG_FMT(DISCIO, "CachedBlobReader: Read({}, {}) failed.", read_offset, read_size);
+          break;
+        }
+
+        committed_count += read_size;
+      }
+
+      read_offset += read_size;
+      m_cache_filled_pos.store(read_offset, std::memory_order_release);
+
+      if (const auto now = Clock::now(); now >= next_log_time)
+      {
+        INFO_LOG_FMT(DISCIO, "CachedBlobReader: Progress: {}%",
+                     committed_count * 100 / total_bytes_to_commit);
+        next_log_time = now + PERIODIC_LOG_TIME;
+      }
+    }
+  }
+
+  // The thread has read non-scrubbed bytes into memory up to this point.
+  std::atomic<u64> m_cache_filled_pos{};
+
+  Common::LazyMemoryRegion m_memory_region;
+  u8* m_memory_region_data{};
+
+  DiscScrubber m_scrubber;
+
+  std::atomic_bool m_stop_thread{};
+  std::thread m_thread;
+};
+
+class CachedBlobReader final : public BlobReader
+{
+public:
+  explicit CachedBlobReader(std::unique_ptr<BlobReader> reader, bool attempt_to_scrub)
+      : m_cache_filler{std::make_shared<CacheFiller>(reader->CopyReader(), attempt_to_scrub)},
+        m_reader{std::move(reader)}
+
+  {
+    INFO_LOG_FMT(DISCIO, "CachedBlobReader: Created");
+  }
+
+  CachedBlobReader(std::shared_ptr<CacheFiller> cache_filler, std::unique_ptr<BlobReader> reader)
+      : m_cache_filler{std::move(cache_filler)}, m_reader{std::move(reader)}
+  {
+    INFO_LOG_FMT(DISCIO, "CachedBlobReader: Copied");
+  }
+
+  std::unique_ptr<BlobReader> CopyReader() const override
+  {
+    return std::make_unique<CachedBlobReader>(m_cache_filler, m_reader->CopyReader());
+  }
+
+  BlobType GetBlobType() const override { return m_reader->GetBlobType(); }
+  u64 GetRawSize() const override { return GetDataSize(); }
+  u64 GetDataSize() const override { return m_reader->GetDataSize(); }
+  DataSizeType GetDataSizeType() const override { return m_reader->GetDataSizeType(); }
+
+  u64 GetBlockSize() const override { return 0; }
+  bool HasFastRandomAccessInBlock() const override { return true; }
+  std::string GetCompressionMethod() const override { return {}; }
+  std::optional<int> GetCompressionLevel() const override { return std::nullopt; }
+
+  bool Read(u64 offset, u64 size, u8* out_ptr) override
+  {
+    return m_cache_filler->Read(offset, size, out_ptr) || m_reader->Read(offset, size, out_ptr);
+  }
+
+  bool IsCached() const override { return true; }
+
+private:
+  // A shared object does the cache filling for sensible CopyReader behavior.
+  const std::shared_ptr<CacheFiller> m_cache_filler;
+
+  const std::unique_ptr<BlobReader> m_reader;
+};
+
+std::unique_ptr<BlobReader> CreateCachedBlobReader(std::unique_ptr<BlobReader> reader)
+{
+  if (reader->IsCached())  // This is already CachedBlobReader.
+    return reader;
+
+  return std::make_unique<CachedBlobReader>(std::move(reader), false);
+}
+
+std::unique_ptr<BlobReader> CreateScrubbingCachedBlobReader(std::unique_ptr<BlobReader> reader)
+{
+  if (reader->IsCached())  // This reader is already a CachedBlobReader.
+    return reader;
+
+  return std::make_unique<CachedBlobReader>(std::move(reader), true);
+}
+
+}  // namespace DiscIO
diff --git a/Source/Core/DiscIO/CachedBlob.h b/Source/Core/DiscIO/CachedBlob.h
new file mode 100644
index 000000000000..f99ad552bbbe
--- /dev/null
+++ b/Source/Core/DiscIO/CachedBlob.h
@@ -0,0 +1,16 @@
+// Copyright 2025 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <memory>
+
+#include "DiscIO/Blob.h"
+
+namespace DiscIO
+{
+
+std::unique_ptr<BlobReader> CreateCachedBlobReader(std::unique_ptr<BlobReader> reader);
+std::unique_ptr<BlobReader> CreateScrubbingCachedBlobReader(std::unique_ptr<BlobReader> reader);
+
+}  // namespace DiscIO
diff --git a/Source/Core/DiscIO/CompressedBlob.cpp b/Source/Core/DiscIO/CompressedBlob.cpp
index 7f86ee23881d..ed0d313963e1 100644
--- a/Source/Core/DiscIO/CompressedBlob.cpp
+++ b/Source/Core/DiscIO/CompressedBlob.cpp
@@ -5,6 +5,7 @@
 
 #include <algorithm>
 #include <cstring>
+#include <expected>
 #include <memory>
 #include <string>
 #include <utility>
@@ -25,7 +26,6 @@
 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"
 #include "DiscIO/Blob.h"
-#include "DiscIO/DiscScrubber.h"
 #include "DiscIO/MultithreadedCompressor.h"
 #include "DiscIO/Volume.h"
 
@@ -210,7 +210,7 @@ static ConversionResult<OutputParameters> Compress(CompressThreadState* state,
   if (retval != Z_OK)
   {
     ERROR_LOG_FMT(DISCIO, "Deflate failed");
-    return ConversionResultCode::InternalError;
+    return std::unexpected{ConversionResultCode::InternalError};
   }
 
   const int status = deflate(&state->z, Z_FINISH);
diff --git a/Source/Core/DiscIO/DirectoryBlob.h b/Source/Core/DiscIO/DirectoryBlob.h
index baea8d9e85b5..01cb5d160629 100644
--- a/Source/Core/DiscIO/DirectoryBlob.h
+++ b/Source/Core/DiscIO/DirectoryBlob.h
@@ -48,7 +48,7 @@ struct ContentFile
 typedef std::shared_ptr<std::vector<u8>> ContentMemory;
 
 // Content chunk that loads data from a DirectoryBlobReader.
-// Intented for representing a partition within a disc.
+// Intended for representing a partition within a disc.
 struct ContentPartition
 {
   // Offset from the start of the partition for the first byte represented by this chunk.
diff --git a/Source/Core/DiscIO/DiscExtractor.h b/Source/Core/DiscIO/DiscExtractor.h
index 50c02d421542..57a3b1830bb5 100644
--- a/Source/Core/DiscIO/DiscExtractor.h
+++ b/Source/Core/DiscIO/DiscExtractor.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #include <functional>
-#include <optional>
 #include <string>
 #include <string_view>
 
diff --git a/Source/Core/DiscIO/DiscScrubber.cpp b/Source/Core/DiscIO/DiscScrubber.cpp
index b6688170a897..83f140557fc2 100644
--- a/Source/Core/DiscIO/DiscScrubber.cpp
+++ b/Source/Core/DiscIO/DiscScrubber.cpp
@@ -3,15 +3,11 @@
 
 #include "DiscIO/DiscScrubber.h"
 
-#include <algorithm>
 #include <cstddef>
-#include <memory>
 #include <optional>
-#include <string>
 #include <vector>
 
 #include "Common/Align.h"
-#include "Common/Assert.h"
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
 
diff --git a/Source/Core/DiscIO/DiscScrubber.h b/Source/Core/DiscIO/DiscScrubber.h
index cf69615fdd03..2000b3060c4c 100644
--- a/Source/Core/DiscIO/DiscScrubber.h
+++ b/Source/Core/DiscIO/DiscScrubber.h
@@ -7,8 +7,6 @@
 
 #pragma once
 
-#include <array>
-#include <string>
 #include <vector>
 #include "Common/CommonTypes.h"
 
diff --git a/Source/Core/DiscIO/DiscUtils.cpp b/Source/Core/DiscIO/DiscUtils.cpp
index aa97304adaaf..a22b97a46648 100644
--- a/Source/Core/DiscIO/DiscUtils.cpp
+++ b/Source/Core/DiscIO/DiscUtils.cpp
@@ -4,7 +4,6 @@
 #include "DiscIO/DiscUtils.h"
 
 #include <algorithm>
-#include <locale>
 #include <optional>
 #include <string>
 #include <vector>
diff --git a/Source/Core/DiscIO/Enums.cpp b/Source/Core/DiscIO/Enums.cpp
index 7a467f7c22bd..919b10b9409d 100644
--- a/Source/Core/DiscIO/Enums.cpp
+++ b/Source/Core/DiscIO/Enums.cpp
@@ -6,7 +6,6 @@
 #include <map>
 #include <string>
 
-#include "Common/Assert.h"
 #include "Common/Common.h"
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
@@ -408,7 +407,7 @@ std::string GetSysMenuVersionString(u16 title_version, bool is_vwii)
   case Region::NTSC_K:
     region_letter = 'K';
     break;
-  case Region::Unknown:
+  default:
     WARN_LOG_FMT(DISCIO, "Unknown region for Wii Menu version {}", title_version);
     break;
   }
diff --git a/Source/Core/DiscIO/Enums.h b/Source/Core/DiscIO/Enums.h
index 9b5e274de939..62ad9e846a83 100644
--- a/Source/Core/DiscIO/Enums.h
+++ b/Source/Core/DiscIO/Enums.h
@@ -19,7 +19,7 @@ enum class Platform
   WiiDisc,
   WiiWAD,
   ELFOrDOL,
-  NumberOfPlatforms
+  NumberOfPlatforms,
 };
 
 enum class Country
@@ -38,7 +38,7 @@ enum class Country
   Taiwan,
   World,
   Unknown,
-  NumberOfCountries
+  NumberOfCountries,
 };
 
 // This numbering matches Nintendo's GameCube/Wii region numbering.
@@ -48,7 +48,8 @@ enum class Region
   NTSC_U = 1,   // Mainly North America
   PAL = 2,      // Mainly Europe and Oceania
   Unknown = 3,  // Nintendo uses this to mean region free, but we also use it for unknown regions
-  NTSC_K = 4    // South Korea (Wii only)
+  NTSC_K = 4,   // South Korea (Wii only)
+  DEV = 5,      // Triforce has no regions
 };
 
 // Languages 0 - 9 match Nintendo's Wii language numbering.
@@ -66,7 +67,7 @@ enum class Language
   SimplifiedChinese = 7,   // Not selectable on any unmodded retail Wii
   TraditionalChinese = 8,  // Not selectable on any unmodded retail Wii
   Korean = 9,
-  Unknown
+  Unknown,
 };
 
 std::string GetName(Country country, bool translate);
diff --git a/Source/Core/DiscIO/FileSystemGCWii.cpp b/Source/Core/DiscIO/FileSystemGCWii.cpp
index 7680c47abb42..2dca65cf7365 100644
--- a/Source/Core/DiscIO/FileSystemGCWii.cpp
+++ b/Source/Core/DiscIO/FileSystemGCWii.cpp
@@ -6,7 +6,6 @@
 #include <algorithm>
 #include <cstddef>
 #include <cstring>
-#include <locale>
 #include <map>
 #include <memory>
 #include <optional>
@@ -14,11 +13,8 @@
 #include <string_view>
 #include <vector>
 
-#include "Common/CommonFuncs.h"
 #include "Common/CommonTypes.h"
-#include "Common/IOFile.h"
 #include "Common/Logging/Log.h"
-#include "Common/MsgHandler.h"
 #include "Common/StringUtil.h"
 #include "DiscIO/DiscUtils.h"
 #include "DiscIO/Filesystem.h"
diff --git a/Source/Core/DiscIO/FileSystemGCWii.h b/Source/Core/DiscIO/FileSystemGCWii.h
index b25f2e295ee3..48b122a70723 100644
--- a/Source/Core/DiscIO/FileSystemGCWii.h
+++ b/Source/Core/DiscIO/FileSystemGCWii.h
@@ -3,10 +3,8 @@
 
 #pragma once
 
-#include <cstddef>
 #include <map>
 #include <memory>
-#include <optional>
 #include <string>
 #include <string_view>
 #include <vector>
diff --git a/Source/Core/DiscIO/Filesystem.h b/Source/Core/DiscIO/Filesystem.h
index dd85b6282d81..a4164f754ace 100644
--- a/Source/Core/DiscIO/Filesystem.h
+++ b/Source/Core/DiscIO/Filesystem.h
@@ -5,10 +5,8 @@
 
 #include <iterator>
 #include <memory>
-#include <optional>
 #include <string>
 #include <string_view>
-#include <vector>
 
 #include "Common/CommonTypes.h"
 #include "DiscIO/Volume.h"
diff --git a/Source/Core/DiscIO/MultithreadedCompressor.h b/Source/Core/DiscIO/MultithreadedCompressor.h
index 736d177de536..5afaa1cca568 100644
--- a/Source/Core/DiscIO/MultithreadedCompressor.h
+++ b/Source/Core/DiscIO/MultithreadedCompressor.h
@@ -4,16 +4,14 @@
 #pragma once
 
 #include <atomic>
+#include <expected>
 #include <functional>
 #include <memory>
 #include <thread>
 #include <utility>
-#include <variant>
-#include <vector>
 
 #include "Common/Assert.h"
 #include "Common/Event.h"
-#include "Common/Result.h"
 
 namespace DiscIO
 {
@@ -27,7 +25,7 @@ enum class ConversionResultCode
 };
 
 template <typename T>
-using ConversionResult = Common::Result<ConversionResultCode, T>;
+using ConversionResult = std::expected<T, ConversionResultCode>;
 
 // This class starts a number of compression threads and one output thread.
 // The set_up_compress_thread_state function is called at the start of each compression thread.
@@ -167,7 +165,7 @@ class MultithreadedCompressor
       }
       else
       {
-        SetError(result.Error());
+        SetError(result.error());
       }
 
       state->compress_done_event.Set();
diff --git a/Source/Core/DiscIO/NANDImporter.cpp b/Source/Core/DiscIO/NANDImporter.cpp
index f7e233579c0a..54122d06261b 100644
--- a/Source/Core/DiscIO/NANDImporter.cpp
+++ b/Source/Core/DiscIO/NANDImporter.cpp
@@ -244,7 +244,7 @@ bool NANDImporter::ExtractCertificates()
 
     if (search_result.empty())
     {
-      ERROR_LOG_FMT(DISCIO, "ExtractCertificates: Could not find offset for certficate '{}'",
+      ERROR_LOG_FMT(DISCIO, "ExtractCertificates: Could not find offset for certificate '{}'",
                     certificate.filename);
       return false;
     }
diff --git a/Source/Core/DiscIO/RiivolutionParser.cpp b/Source/Core/DiscIO/RiivolutionParser.cpp
index 6fbb4d41c4ac..c76274927a6b 100644
--- a/Source/Core/DiscIO/RiivolutionParser.cpp
+++ b/Source/Core/DiscIO/RiivolutionParser.cpp
@@ -313,7 +313,7 @@ std::vector<Patch> Disc::GeneratePatches(const std::string& game_id) const
         replacements.emplace_back(std::pair{"{$__region}", game_region});
         replacements.emplace_back(std::pair{"{$__maker}", game_developer});
         for (const auto& param : patch_ref.m_params)
-          replacements.emplace_back(std::pair{"{$" + param.first + "}", param.second});
+          replacements.emplace_back("{$" + param.first + "}", param.second);
 
         Patch& new_patch = active_patches.emplace_back(*patch);
         new_patch.m_root = replace_variables(new_patch.m_root, replacements);
@@ -399,7 +399,7 @@ std::vector<Patch> GenerateRiivolutionPatchesFromConfig(const std::string& root_
   const std::optional<Config> config = ParseConfigFile(
       fmt::format("{}/riivolution/config/{}.xml", root_directory, game_id.substr(0, 4)));
 
-  for (const std::string& path : Common::DoFileSearch({root_directory + "riivolution"}, {".xml"}))
+  for (const std::string& path : Common::DoFileSearch(root_directory + "riivolution", ".xml"))
   {
     std::optional<Disc> parsed = ParseFile(path);
     if (!parsed || !parsed->IsValidForGame(game_id, revision, disc_number))
diff --git a/Source/Core/DiscIO/RiivolutionPatcher.cpp b/Source/Core/DiscIO/RiivolutionPatcher.cpp
index 04d07b2c95e2..da162aae1f27 100644
--- a/Source/Core/DiscIO/RiivolutionPatcher.cpp
+++ b/Source/Core/DiscIO/RiivolutionPatcher.cpp
@@ -4,7 +4,6 @@
 #include "DiscIO/RiivolutionPatcher.h"
 
 #include <algorithm>
-#include <locale>
 #include <string>
 #include <string_view>
 #include <vector>
@@ -18,7 +17,6 @@
 #include "Core/Core.h"
 #include "Core/HLE/HLE.h"
 #include "Core/HW/Memmap.h"
-#include "Core/IOS/FS/FileSystem.h"
 #include "Core/PowerPC/MMU.h"
 #include "Core/System.h"
 #include "DiscIO/DirectoryBlob.h"
diff --git a/Source/Core/DiscIO/Volume.cpp b/Source/Core/DiscIO/Volume.cpp
index b6d84254f01f..15ce4fe088de 100644
--- a/Source/Core/DiscIO/Volume.cpp
+++ b/Source/Core/DiscIO/Volume.cpp
@@ -3,7 +3,7 @@
 
 #include "DiscIO/Volume.h"
 
-#include <algorithm>
+#include <functional>
 #include <map>
 #include <memory>
 #include <optional>
@@ -16,8 +16,11 @@
 #include "Common/Crypto/SHA1.h"
 #include "Common/StringUtil.h"
 
+#include "Core/Config/MainSettings.h"
 #include "Core/IOS/ES/Formats.h"
+
 #include "DiscIO/Blob.h"
+#include "DiscIO/CachedBlob.h"
 #include "DiscIO/DiscUtils.h"
 #include "DiscIO/Enums.h"
 #include "DiscIO/VolumeDisc.h"
@@ -84,16 +87,21 @@ std::map<Language, std::string> Volume::ReadWiiNames(const std::vector<char16_t>
   return names;
 }
 
-static std::unique_ptr<VolumeDisc> TryCreateDisc(std::unique_ptr<BlobReader>& reader)
+template <typename T = std::identity>
+static std::unique_ptr<VolumeDisc> TryCreateDisc(std::unique_ptr<BlobReader>& reader,
+                                                 const T& reader_adapter_factory = {})
 {
   if (!reader)
     return nullptr;
 
+  // `reader_adapter_factory` is used *after* successful magic word read.
+  // This prevents `CachedBlobReader` from showing warnings when failing to scrub a .dol file.
+
   if (reader->ReadSwapped<u32>(0x18) == WII_DISC_MAGIC)
-    return std::make_unique<VolumeWii>(std::move(reader));
+    return std::make_unique<VolumeWii>(reader_adapter_factory(std::move(reader)));
 
   if (reader->ReadSwapped<u32>(0x1C) == GAMECUBE_DISC_MAGIC)
-    return std::make_unique<VolumeGC>(std::move(reader));
+    return std::make_unique<VolumeGC>(reader_adapter_factory(std::move(reader)));
 
   // No known magic words found
   return nullptr;
@@ -109,6 +117,16 @@ std::unique_ptr<VolumeDisc> CreateDisc(const std::string& path)
   return CreateDisc(CreateBlobReader(path));
 }
 
+std::unique_ptr<VolumeDisc> CreateDiscForCore(const std::string& path)
+{
+  auto reader = CreateBlobReader(path);
+
+  if (Config::Get(Config::MAIN_LOAD_GAME_INTO_MEMORY))
+    return TryCreateDisc(reader, CreateScrubbingCachedBlobReader);
+
+  return TryCreateDisc(reader);
+}
+
 static std::unique_ptr<VolumeWAD> TryCreateWAD(std::unique_ptr<BlobReader>& reader)
 {
   if (!reader)
diff --git a/Source/Core/DiscIO/Volume.h b/Source/Core/DiscIO/Volume.h
index a7273b0f0ebb..32f8e8d71f28 100644
--- a/Source/Core/DiscIO/Volume.h
+++ b/Source/Core/DiscIO/Volume.h
@@ -8,6 +8,7 @@
 #include <map>
 #include <memory>
 #include <optional>
+#include <span>
 #include <string>
 #include <vector>
 
@@ -96,7 +97,6 @@ class Volume
   }
   virtual std::string GetGameID(const Partition& partition = PARTITION_NONE) const = 0;
   virtual std::string GetGameTDBID(const Partition& partition = PARTITION_NONE) const = 0;
-  virtual std::string GetTriforceID() const { return ""; }
   virtual std::string GetMakerID(const Partition& partition = PARTITION_NONE) const = 0;
   virtual std::optional<u16> GetRevision(const Partition& partition = PARTITION_NONE) const = 0;
   virtual std::string GetInternalName(const Partition& partition = PARTITION_NONE) const = 0;
@@ -144,16 +144,15 @@ class Volume
   virtual std::array<u8, 20> GetSyncHash() const = 0;
 
 protected:
-  template <u32 N>
-  std::string DecodeString(const char (&data)[N]) const
+  std::string DecodeString(std::span<const char> data) const
   {
     // strnlen to trim NULLs
-    std::string string(data, strnlen(data, sizeof(data)));
+    std::string string(data.data(), strnlen(data.data(), data.size()));
 
     if (GetRegion() == Region::NTSC_J)
       return SHIFTJISToUTF8(string);
-    else
-      return CP1252ToUTF8(string);
+
+    return CP1252ToUTF8(string);
   }
 
   void ReadAndAddToSyncHash(Common::SHA1::Context* context, u64 offset, u64 length,
@@ -176,6 +175,9 @@ class Volume
 
 std::unique_ptr<VolumeDisc> CreateDisc(std::unique_ptr<BlobReader> reader);
 std::unique_ptr<VolumeDisc> CreateDisc(const std::string& path);
+// This version enables caching when the "Load Games into Memory" setting is enabled.
+std::unique_ptr<VolumeDisc> CreateDiscForCore(const std::string& path);
+
 std::unique_ptr<VolumeWAD> CreateWAD(std::unique_ptr<BlobReader> reader);
 std::unique_ptr<VolumeWAD> CreateWAD(const std::string& path);
 std::unique_ptr<Volume> CreateVolume(std::unique_ptr<BlobReader> reader);
diff --git a/Source/Core/DiscIO/VolumeDisc.cpp b/Source/Core/DiscIO/VolumeDisc.cpp
index b32ddc6d178c..ecbb4a9dc986 100644
--- a/Source/Core/DiscIO/VolumeDisc.cpp
+++ b/Source/Core/DiscIO/VolumeDisc.cpp
@@ -6,19 +6,52 @@
 #include <memory>
 #include <optional>
 #include <string>
-#include <vector>
 
 #include "Common/CommonTypes.h"
 #include "Common/Crypto/SHA1.h"
 #include "DiscIO/DiscUtils.h"
 #include "DiscIO/Enums.h"
 #include "DiscIO/Filesystem.h"
+#include "DiscIO/VolumeGC.h"
 
 namespace DiscIO
 {
 std::string VolumeDisc::GetGameID(const Partition& partition) const
 {
-  char id[6];
+  char id[6]{};
+
+  if (GetVolumeType() == Platform::Triforce)
+  {
+    // Triforce games have their Game ID stored in the boot.id file
+    const BootID* boot_id = static_cast<const VolumeGC*>(this)->GetTriforceBootID();
+
+    // Construct game ID from the BTID
+    id[0] = 'G';
+
+    memcpy(id + 1, boot_id->game_id.data() + 2, 2);
+
+    switch (GetCountry())
+    {
+    default:
+    case Country::Japan:
+      id[3] = 'J';
+      break;
+    case Country::Taiwan:
+      id[3] = 'W';
+      break;
+    case Country::USA:
+      id[3] = 'E';
+      break;
+    case Country::Europe:
+      id[3] = 'P';
+      break;
+    }
+
+    const std::string maker_id{GetMakerID()};
+    memcpy(id + 4, maker_id.c_str(), std::min<std::size_t>(maker_id.size(), 2));
+
+    return DecodeString(id);
+  }
 
   if (!Read(0, sizeof(id), reinterpret_cast<u8*>(id), partition))
     return std::string();
@@ -28,8 +61,35 @@ std::string VolumeDisc::GetGameID(const Partition& partition) const
 
 Country VolumeDisc::GetCountry(const Partition& partition) const
 {
-  // The 0 that we use as a default value is mapped to Country::Unknown and Region::Unknown
-  const u8 country_byte = ReadSwapped<u8>(3, partition).value_or(0);
+  u8 country_byte = 0;
+
+  if (GetVolumeType() == Platform::Triforce)
+  {
+    const BootID* boot_id = static_cast<const VolumeGC*>(this)->GetTriforceBootID();
+
+    switch (boot_id->region_flags)
+    {
+    default:
+    case 0x02:  // JAPAN
+      country_byte = 'J';
+      break;
+    case 0x08:  // ASIA
+      country_byte = 'W';
+      break;
+    case 0x0E:  // USA
+      country_byte = 'E';
+      break;
+    case 0x0C:  // EXPORT
+      country_byte = 'P';
+      break;
+    }
+  }
+  else
+  {
+    // The 0 that we use as a default value is mapped to Country::Unknown and Region::Unknown
+    country_byte = ReadSwapped<u8>(3, partition).value_or(0);
+  }
+
   const Region region = GetRegion();
   const std::optional<u16> revision = GetRevision();
 
@@ -52,6 +112,29 @@ std::string VolumeDisc::GetMakerID(const Partition& partition) const
 {
   char maker_id[2];
 
+  // Triforce games have their maker stored in the boot.id file as an actual string
+  if (GetVolumeType() == Platform::Triforce)
+  {
+    const BootID* boot_id = static_cast<const VolumeGC*>(this)->GetTriforceBootID();
+
+    // There only seem to be three different makers here,
+    // so we can just check the first char to difference between them.
+    //
+    // NAMCO CORPORATION, SEGA CORPORATION and Hitmaker co,ltd.
+
+    switch (boot_id->manufacturer[0])
+    {
+    case 'S':  // SEGA CORPORATION
+    case 'H':  // Hitmaker co,ltd
+      return DecodeString("6E");
+    case 'N':  // NAMCO CORPORATION
+      return DecodeString("82");
+    default:
+      break;
+    }
+    // Fall back to normal maker from header
+  }
+
   if (!Read(0x4, sizeof(maker_id), reinterpret_cast<u8*>(&maker_id), partition))
     return std::string();
 
@@ -67,6 +150,14 @@ std::optional<u16> VolumeDisc::GetRevision(const Partition& partition) const
 std::string VolumeDisc::GetInternalName(const Partition& partition) const
 {
   char name[0x60];
+
+  // Triforce games have their Title stored in the boot.id file
+  if (GetVolumeType() == Platform::Triforce)
+  {
+    const BootID* boot_id = static_cast<const VolumeGC*>(this)->GetTriforceBootID();
+    return DecodeString(boot_id->game_name);
+  }
+
   if (!Read(0x20, sizeof(name), reinterpret_cast<u8*>(&name), partition))
     return std::string();
 
diff --git a/Source/Core/DiscIO/VolumeDisc.h b/Source/Core/DiscIO/VolumeDisc.h
index 17c76ae689d7..f630522e6811 100644
--- a/Source/Core/DiscIO/VolumeDisc.h
+++ b/Source/Core/DiscIO/VolumeDisc.h
@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include <array>
 #include <optional>
 #include <string>
 
@@ -15,6 +16,30 @@ namespace DiscIO
 class VolumeDisc : public Volume
 {
 public:
+  struct BootID
+  {
+    u32 magic;  // 0x00 (Always BTID)
+    std::array<uint32_t, 3> unknown0;
+    std::array<uint32_t, 4> unknown1;
+    std::array<char, 4> mediaboard_type;  // 0x20 (GCAM for Triforce)
+    uint32_t unknown2;
+    uint16_t year;       // 0x28
+    uint8_t month;       // 0x2A
+    uint8_t day;         // 0x2B
+    uint8_t video_mode;  // 0x2C unknown bitmask, resolutions + horizontal/vertical
+    uint8_t unknown3;
+    uint8_t type_3_compatible;  // 0x2E (Type-3 compatible titles have this set to 1)
+    uint8_t unknown4;
+    std::array<char, 8> game_id;  // 0x30
+    uint32_t region_flags;        // 0x38
+    std::array<uint32_t, 9> unknown6;
+    std::array<char, 0x20> manufacturer;                 // 0x60
+    std::array<char, 0x20> game_name;                    // 0x80
+    std::array<char, 0x20> game_executable;              // 0xA0
+    std::array<char, 0x20> test_executable;              // 0xC0
+    std::array<std::array<char, 0x20>, 8> credit_types;  // 0xE0
+  };
+
   std::string GetGameID(const Partition& partition = PARTITION_NONE) const override;
   Country GetCountry(const Partition& partition = PARTITION_NONE) const override;
   std::string GetMakerID(const Partition& partition = PARTITION_NONE) const override;
@@ -29,4 +54,6 @@ class VolumeDisc : public Volume
   void AddGamePartitionToSyncHash(Common::SHA1::Context* context) const;
 };
 
+static_assert(sizeof(VolumeDisc::BootID) == 480);
+
 }  // namespace DiscIO
diff --git a/Source/Core/DiscIO/VolumeFileBlobReader.cpp b/Source/Core/DiscIO/VolumeFileBlobReader.cpp
index 7cbc06e58934..92eb9b4ae291 100644
--- a/Source/Core/DiscIO/VolumeFileBlobReader.cpp
+++ b/Source/Core/DiscIO/VolumeFileBlobReader.cpp
@@ -33,6 +33,11 @@ VolumeFileBlobReader::VolumeFileBlobReader(const Volume& volume, const Partition
 {
 }
 
+// This is defined here instead of the header so that the definition of FileInfo is visible when
+// m_file_info is destroyed, preventing a compile error caused by calling unique_ptr's destructor
+// with an incomplete type.
+VolumeFileBlobReader::~VolumeFileBlobReader() = default;
+
 std::unique_ptr<BlobReader> VolumeFileBlobReader::CopyReader() const
 {
   ASSERT_MSG(DISCIO, false, "Unimplemented");
diff --git a/Source/Core/DiscIO/VolumeFileBlobReader.h b/Source/Core/DiscIO/VolumeFileBlobReader.h
index 58d349a0d44a..49fe4cd2001e 100644
--- a/Source/Core/DiscIO/VolumeFileBlobReader.h
+++ b/Source/Core/DiscIO/VolumeFileBlobReader.h
@@ -20,6 +20,7 @@ class VolumeFileBlobReader final : public BlobReader
 public:
   static std::unique_ptr<VolumeFileBlobReader>
   Create(const Volume& volume, const Partition& partition, std::string_view file_path);
+  ~VolumeFileBlobReader();
 
   BlobType GetBlobType() const override { return BlobType::PLAIN; }
   std::unique_ptr<BlobReader> CopyReader() const override;
diff --git a/Source/Core/DiscIO/VolumeGC.cpp b/Source/Core/DiscIO/VolumeGC.cpp
index 8cc255570ae7..5d3d372dcfef 100644
--- a/Source/Core/DiscIO/VolumeGC.cpp
+++ b/Source/Core/DiscIO/VolumeGC.cpp
@@ -3,7 +3,6 @@
 
 #include "DiscIO/VolumeGC.h"
 
-#include <cstddef>
 #include <map>
 #include <memory>
 #include <optional>
@@ -16,8 +15,6 @@
 #include "Common/CommonTypes.h"
 #include "Common/Crypto/SHA1.h"
 #include "Common/Logging/Log.h"
-#include "Common/MsgHandler.h"
-#include "Common/StringUtil.h"
 
 #include "DiscIO/Blob.h"
 #include "DiscIO/DiscExtractor.h"
@@ -48,13 +45,11 @@ VolumeGC::VolumeGC(std::unique_ptr<BlobReader> reader)
     std::unique_ptr<FileInfo> file_info = tmp_fs->FindFileInfo("boot.id");
     if (!file_info)
       return;
-    BootID triforce_header;
     const u64 file_size = ReadFile(*this, PARTITION_NONE, file_info.get(),
-                                   reinterpret_cast<u8*>(&triforce_header), sizeof(BootID));
-    if (file_size >= 4 && triforce_header.magic == BTID_MAGIC)
+                                   reinterpret_cast<u8*>(&m_triforce_header), sizeof(BootID));
+    if (file_size >= 4 && m_triforce_header.magic == BTID_MAGIC)
     {
       m_is_triforce = true;
-      m_triforce_id = triforce_header.id;
     }
   }
 }
@@ -93,16 +88,23 @@ std::string VolumeGC::GetGameTDBID(const Partition& partition) const
   return GetGameID(partition);
 }
 
-std::string VolumeGC::GetTriforceID() const
+Region VolumeGC::GetRegion() const
 {
   if (m_is_triforce)
-    return (std::string(m_triforce_id.data(), m_triforce_id.size()));
-  else
-    return "";
-}
+  {
+    switch (m_triforce_header.region_flags)
+    {
+    default:
+    case 0x02:  // JAPAN
+    case 0x08:  // ASIA
+      return Region::NTSC_J;
+    case 0x0E:  // USA
+      return Region::NTSC_U;
+    case 0x0C:  // EXPORT
+      return Region::PAL;
+    }
+  }
 
-Region VolumeGC::GetRegion() const
-{
   return RegionCodeToRegion(m_reader->ReadSwapped<u32>(0x458));
 }
 
@@ -187,6 +189,12 @@ std::array<u8, 20> VolumeGC::GetSyncHash() const
 
 VolumeGC::ConvertedGCBanner VolumeGC::LoadBannerFile() const
 {
+  // There is at least one Triforce game that has an opening.bnr file but from a different game.
+  if (m_is_triforce)
+  {
+    return {};
+  }
+
   GCBanner banner_file;
   const u64 file_size = ReadFile(*this, PARTITION_NONE, "opening.bnr",
                                  reinterpret_cast<u8*>(&banner_file), sizeof(GCBanner));
diff --git a/Source/Core/DiscIO/VolumeGC.h b/Source/Core/DiscIO/VolumeGC.h
index ff768c2e2a06..2f85a7553563 100644
--- a/Source/Core/DiscIO/VolumeGC.h
+++ b/Source/Core/DiscIO/VolumeGC.h
@@ -34,7 +34,6 @@ class VolumeGC final : public VolumeDisc
             const Partition& partition = PARTITION_NONE) const override;
   const FileSystem* GetFileSystem(const Partition& partition = PARTITION_NONE) const override;
   std::string GetGameTDBID(const Partition& partition = PARTITION_NONE) const override;
-  std::string GetTriforceID() const override;
   std::map<Language, std::string> GetShortNames() const override;
   std::map<Language, std::string> GetLongNames() const override;
   std::map<Language, std::string> GetShortMakers() const override;
@@ -50,9 +49,10 @@ class VolumeGC final : public VolumeDisc
   DataSizeType GetDataSizeType() const override;
   u64 GetRawSize() const override;
   const BlobReader& GetBlobReader() const override;
-
   std::array<u8, 20> GetSyncHash() const override;
 
+  const BootID* GetTriforceBootID() const { return &m_triforce_header; }
+
 private:
   static constexpr u32 GC_BANNER_WIDTH = 96;
   static constexpr u32 GC_BANNER_HEIGHT = 32;
@@ -77,13 +77,6 @@ class VolumeGC final : public VolumeDisc
                                                     // (only one for BNR1 type)
   };
 
-  struct BootID
-  {
-    u32 magic;  // "BTID"
-    u32 padding[11];
-    std::array<char, 4> id;
-  };
-
   struct ConvertedGCBanner
   {
     ConvertedGCBanner();
@@ -112,8 +105,9 @@ class VolumeGC final : public VolumeDisc
 
   std::unique_ptr<BlobReader> m_reader;
 
+  BootID m_triforce_header;
+
   bool m_is_triforce;
-  std::array<char, 4> m_triforce_id;
 };
 
 }  // namespace DiscIO
diff --git a/Source/Core/DiscIO/VolumeVerifier.cpp b/Source/Core/DiscIO/VolumeVerifier.cpp
index 40e71d48ddd3..7fd4ce276890 100644
--- a/Source/Core/DiscIO/VolumeVerifier.cpp
+++ b/Source/Core/DiscIO/VolumeVerifier.cpp
@@ -5,12 +5,10 @@
 
 #include <algorithm>
 #include <future>
-#include <limits>
 #include <memory>
 #include <optional>
 #include <string>
 #include <string_view>
-#include <unordered_set>
 
 #include <mbedtls/md5.h>
 #include <mz.h>
diff --git a/Source/Core/DiscIO/VolumeWad.cpp b/Source/Core/DiscIO/VolumeWad.cpp
index 61848a421800..ff98b5579143 100644
--- a/Source/Core/DiscIO/VolumeWad.cpp
+++ b/Source/Core/DiscIO/VolumeWad.cpp
@@ -4,8 +4,6 @@
 #include "DiscIO/VolumeWad.h"
 
 #include <algorithm>
-#include <cstddef>
-#include <cstring>
 #include <map>
 #include <memory>
 #include <optional>
@@ -19,7 +17,6 @@
 #include "Common/Crypto/AES.h"
 #include "Common/Crypto/SHA1.h"
 #include "Common/Logging/Log.h"
-#include "Common/MsgHandler.h"
 #include "Common/StringUtil.h"
 #include "Core/IOS/IOSC.h"
 #include "DiscIO/Blob.h"
diff --git a/Source/Core/DiscIO/VolumeWii.cpp b/Source/Core/DiscIO/VolumeWii.cpp
index 3ba843378894..8ee8396d41db 100644
--- a/Source/Core/DiscIO/VolumeWii.cpp
+++ b/Source/Core/DiscIO/VolumeWii.cpp
@@ -22,7 +22,6 @@
 #include "Common/Crypto/AES.h"
 #include "Common/Crypto/SHA1.h"
 #include "Common/Logging/Log.h"
-#include "Common/Swap.h"
 
 #include "DiscIO/Blob.h"
 #include "DiscIO/DiscExtractor.h"
diff --git a/Source/Core/DiscIO/WIABlob.cpp b/Source/Core/DiscIO/WIABlob.cpp
index 743eade500fa..31000deb0271 100644
--- a/Source/Core/DiscIO/WIABlob.cpp
+++ b/Source/Core/DiscIO/WIABlob.cpp
@@ -6,6 +6,7 @@
 #include <algorithm>
 #include <array>
 #include <cstring>
+#include <expected>
 #include <limits>
 #include <map>
 #include <memory>
@@ -1578,7 +1579,7 @@ WIARVZFileReader<RVZ>::ProcessAndCompress(CompressThreadState* state, CompressPa
     if (state->compressor)
     {
       if (!state->compressor->Start(entry.exception_lists.size() + entry.main_data.size()))
-        return ConversionResultCode::InternalError;
+        return std::unexpected{ConversionResultCode::InternalError};
     }
 
     if (!entry.exception_lists.empty())
@@ -1588,7 +1589,7 @@ WIARVZFileReader<RVZ>::ProcessAndCompress(CompressThreadState* state, CompressPa
         if (!state->compressor->Compress(entry.exception_lists.data(),
                                          entry.exception_lists.size()))
         {
-          return ConversionResultCode::InternalError;
+          return std::unexpected{ConversionResultCode::InternalError};
         }
       }
       else
@@ -1601,7 +1602,7 @@ WIARVZFileReader<RVZ>::ProcessAndCompress(CompressThreadState* state, CompressPa
           if (!state->compressor->AddPrecedingDataOnlyForPurgeHashing(entry.exception_lists.data(),
                                                                       entry.exception_lists.size()))
           {
-            return ConversionResultCode::InternalError;
+            return std::unexpected{ConversionResultCode::InternalError};
           }
         }
       }
@@ -1610,9 +1611,9 @@ WIARVZFileReader<RVZ>::ProcessAndCompress(CompressThreadState* state, CompressPa
     if (state->compressor)
     {
       if (!state->compressor->Compress(entry.main_data.data(), entry.main_data.size()))
-        return ConversionResultCode::InternalError;
+        return std::unexpected{ConversionResultCode::InternalError};
       if (!state->compressor->End())
-        return ConversionResultCode::InternalError;
+        return std::unexpected{ConversionResultCode::InternalError};
     }
 
     bool compressed = !!state->compressor;
@@ -1792,7 +1793,7 @@ WIARVZFileReader<RVZ>::Convert(BlobReader* infile, const VolumeDisc* infile_volu
 
     // Compared to WIA, RVZ adds an extra member to the GroupEntry struct. This added data usually
     // compresses well, so we'll assume the compression ratio for RVZ GroupEntries is 9 / 16 or
-    // better. This constant is somehwat arbitrarily chosen, but no games were found that get a
+    // better. This constant is somewhat arbitrarily chosen, but no games were found that get a
     // worse compression ratio than that. There are some games that get a worse ratio than 1 / 2,
     // such as Metroid: Other M (PAL) with the default settings.
     if (RVZ && compression_type > WIARVZCompressionType::Purge)
diff --git a/Source/Core/DiscIO/WIACompression.cpp b/Source/Core/DiscIO/WIACompression.cpp
index cb8fdee38906..ec2ef6de990b 100644
--- a/Source/Core/DiscIO/WIACompression.cpp
+++ b/Source/Core/DiscIO/WIACompression.cpp
@@ -6,7 +6,6 @@
 #include <algorithm>
 #include <cstddef>
 #include <cstring>
-#include <limits>
 #include <memory>
 #include <optional>
 #include <vector>
diff --git a/Source/Core/DiscIO/WiiEncryptionCache.h b/Source/Core/DiscIO/WiiEncryptionCache.h
index 3516d3b5387a..d08f36f0c7c7 100644
--- a/Source/Core/DiscIO/WiiEncryptionCache.h
+++ b/Source/Core/DiscIO/WiiEncryptionCache.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #include <array>
-#include <limits>
 #include <memory>
 
 #include "Common/CommonTypes.h"
diff --git a/Source/Core/DiscIO/WiiSaveBanner.cpp b/Source/Core/DiscIO/WiiSaveBanner.cpp
index 203b03327176..54afc5b40196 100644
--- a/Source/Core/DiscIO/WiiSaveBanner.cpp
+++ b/Source/Core/DiscIO/WiiSaveBanner.cpp
@@ -3,14 +3,12 @@
 
 #include "DiscIO/WiiSaveBanner.h"
 
-#include <fmt/format.h>
 #include <iterator>
 #include <string>
 #include <vector>
 
 #include "Common/ColorUtil.h"
 #include "Common/CommonTypes.h"
-#include "Common/FileUtil.h"
 #include "Common/IOFile.h"
 #include "Common/NandPaths.h"
 #include "Common/StringUtil.h"
diff --git a/Source/Core/DolphinLib.props b/Source/Core/DolphinLib.props
index 5e81cea3a636..34e4b83f134d 100644
--- a/Source/Core/DolphinLib.props
+++ b/Source/Core/DolphinLib.props
@@ -56,7 +56,6 @@
     <ClInclude Include="Common\ENet.h" />
     <ClInclude Include="Common\EnumFormatter.h" />
     <ClInclude Include="Common\EnumMap.h" />
-    <ClInclude Include="Common\EnumUtils.h" />
     <ClInclude Include="Common\Event.h" />
     <ClInclude Include="Common\FatFsUtil.h" />
     <ClInclude Include="Common\FileSearch.h" />
@@ -155,7 +154,6 @@
     <ClInclude Include="Common\Projection.h" />
     <ClInclude Include="Common\QoSSession.h" />
     <ClInclude Include="Common\Random.h" />
-    <ClInclude Include="Common\Result.h" />
     <ClInclude Include="Common\scmrev.h" />
     <ClInclude Include="Common\ScopeGuard.h" />
     <ClInclude Include="Common\SDCardUtil.h" />
@@ -173,10 +171,10 @@
     <ClInclude Include="Common\Thread.h" />
     <ClInclude Include="Common\Timer.h" />
     <ClInclude Include="Common\TimeUtil.h" />
+    <ClInclude Include="Common\TransferableSharedMutex.h" />
     <ClInclude Include="Common\TraversalClient.h" />
     <ClInclude Include="Common\TraversalProto.h" />
     <ClInclude Include="Common\TypeUtils.h" />
-    <ClInclude Include="Common\Unreachable.h" />
     <ClInclude Include="Common\UPnP.h" />
     <ClInclude Include="Common\VariantUtil.h" />
     <ClInclude Include="Common\Version.h" />
@@ -251,7 +249,6 @@
     <ClInclude Include="Core\FifoPlayer\FifoDataFile.h" />
     <ClInclude Include="Core\FifoPlayer\FifoPlayer.h" />
     <ClInclude Include="Core\FifoPlayer\FifoRecorder.h" />
-    <ClInclude Include="Core\FreeLookConfig.h" />
     <ClInclude Include="Core\FreeLookManager.h" />
     <ClInclude Include="Core\GeckoCode.h" />
     <ClInclude Include="Core\GeckoCodeConfig.h" />
@@ -282,6 +279,7 @@
     <ClInclude Include="Core\HW\DSPLLE\DSPDebugInterface.h" />
     <ClInclude Include="Core\HW\DSPLLE\DSPLLE.h" />
     <ClInclude Include="Core\HW\DSPLLE\DSPSymbols.h" />
+    <ClInclude Include="Core\HW\DVD\AMMediaboard.h" />
     <ClInclude Include="Core\HW\DVD\DVDInterface.h" />
     <ClInclude Include="Core\HW\DVD\DVDMath.h" />
     <ClInclude Include="Core\HW\DVD\DVDThread.h" />
@@ -319,12 +317,16 @@
     <ClInclude Include="Core\HW\HSP\HSP_DeviceARAMExpansion.h" />
     <ClInclude Include="Core\HW\HSP\HSP_DeviceNull.h" />
     <ClInclude Include="Core\HW\HW.h" />
+    <ClInclude Include="Core\HW\MagCard\C1231BR.h" />
+    <ClInclude Include="Core\HW\MagCard\C1231LR.h" />
+    <ClInclude Include="Core\HW\MagCard\MagneticCardReader.h" />
     <ClInclude Include="Core\HW\Memmap.h" />
     <ClInclude Include="Core\HW\MemoryInterface.h" />
     <ClInclude Include="Core\HW\MMIO.h" />
     <ClInclude Include="Core\HW\MMIOHandlers.h" />
     <ClInclude Include="Core\HW\ProcessorInterface.h" />
     <ClInclude Include="Core\HW\SI\SI_Device.h" />
+    <ClInclude Include="Core\HW\SI\SI_DeviceAMBaseboard.h" />
     <ClInclude Include="Core\HW\SI\SI_DeviceDanceMat.h" />
     <ClInclude Include="Core\HW\SI\SI_DeviceGBA.h" />
     <ClInclude Include="Core\HW\SI\SI_DeviceGBAEmu.h" />
@@ -485,6 +487,7 @@
     <ClInclude Include="Core\WiiUtils.h" />
     <ClInclude Include="DiscIO\Blob.h" />
     <ClInclude Include="DiscIO\CISOBlob.h" />
+    <ClInclude Include="DiscIO\CachedBlob.h" />
     <ClInclude Include="DiscIO\CompressedBlob.h" />
     <ClInclude Include="DiscIO\DirectoryBlob.h" />
     <ClInclude Include="DiscIO\DiscExtractor.h" />
@@ -674,10 +677,11 @@
     <ClInclude Include="VideoCommon\AbstractShader.h" />
     <ClInclude Include="VideoCommon\AbstractStagingTexture.h" />
     <ClInclude Include="VideoCommon\AbstractTexture.h" />
+    <ClInclude Include="VideoCommon\Assets\AssetListener.h" />
     <ClInclude Include="VideoCommon\Assets\CustomAsset.h" />
+    <ClInclude Include="VideoCommon\Assets\CustomAssetCache.h" />
     <ClInclude Include="VideoCommon\Assets\CustomAssetLibrary.h" />
     <ClInclude Include="VideoCommon\Assets\CustomAssetLoader.h" />
-    <ClInclude Include="VideoCommon\Assets\CustomResourceManager.h" />
     <ClInclude Include="VideoCommon\Assets\CustomTextureData.h" />
     <ClInclude Include="VideoCommon\Assets\DirectFilesystemAssetLibrary.h" />
     <ClInclude Include="VideoCommon\Assets\MaterialAsset.h" />
@@ -747,12 +751,21 @@
     <ClInclude Include="VideoCommon\PerfQueryBase.h" />
     <ClInclude Include="VideoCommon\PerformanceMetrics.h" />
     <ClInclude Include="VideoCommon\PerformanceTracker.h" />
+    <ClInclude Include="VideoCommon\PipelineUtils.h" />
     <ClInclude Include="VideoCommon\PixelEngine.h" />
     <ClInclude Include="VideoCommon\PixelShaderGen.h" />
     <ClInclude Include="VideoCommon\PixelShaderManager.h" />
     <ClInclude Include="VideoCommon\PostProcessing.h" />
     <ClInclude Include="VideoCommon\Present.h" />
     <ClInclude Include="VideoCommon\RenderState.h" />
+    <ClInclude Include="VideoCommon\Resources\CustomResourceManager.h" />
+    <ClInclude Include="VideoCommon\Resources\InvalidTextures.h" />
+    <ClInclude Include="VideoCommon\Resources\MaterialResource.h" />
+    <ClInclude Include="VideoCommon\Resources\Resource.h" />
+    <ClInclude Include="VideoCommon\Resources\ShaderResource.h" />
+    <ClInclude Include="VideoCommon\Resources\TextureAndSampler.h" />
+    <ClInclude Include="VideoCommon\Resources\TextureDataResource.h" />
+    <ClInclude Include="VideoCommon\Resources\TexturePool.h" />
     <ClInclude Include="VideoCommon\ShaderCache.h" />
     <ClInclude Include="VideoCommon\ShaderCompileUtils.h" />
     <ClInclude Include="VideoCommon\ShaderGenCommon.h" />
@@ -936,7 +949,6 @@
     <ClCompile Include="Core\FifoPlayer\FifoDataFile.cpp" />
     <ClCompile Include="Core\FifoPlayer\FifoPlayer.cpp" />
     <ClCompile Include="Core\FifoPlayer\FifoRecorder.cpp" />
-    <ClCompile Include="Core\FreeLookConfig.cpp" />
     <ClCompile Include="Core\FreeLookManager.cpp" />
     <ClCompile Include="Core\GeckoCode.cpp" />
     <ClCompile Include="Core\GeckoCodeConfig.cpp" />
@@ -964,6 +976,7 @@
     <ClCompile Include="Core\HW\DSPLLE\DSPHost.cpp" />
     <ClCompile Include="Core\HW\DSPLLE\DSPLLE.cpp" />
     <ClCompile Include="Core\HW\DSPLLE\DSPSymbols.cpp" />
+    <ClCompile Include="Core\HW\DVD\AMMediaboard.cpp" />
     <ClCompile Include="Core\HW\DVD\DVDInterface.cpp" />
     <ClCompile Include="Core\HW\DVD\DVDMath.cpp" />
     <ClCompile Include="Core\HW\DVD\DVDThread.cpp" />
@@ -1005,11 +1018,15 @@
     <ClCompile Include="Core\HW\HSP\HSP_DeviceARAMExpansion.cpp" />
     <ClCompile Include="Core\HW\HSP\HSP_DeviceNull.cpp" />
     <ClCompile Include="Core\HW\HW.cpp" />
+    <ClCompile Include="Core\HW\MagCard\C1231BR.cpp" />
+    <ClCompile Include="Core\HW\MagCard\C1231LR.cpp" />
+    <ClCompile Include="Core\HW\MagCard\MagneticCardReader.cpp" />
     <ClCompile Include="Core\HW\Memmap.cpp" />
     <ClCompile Include="Core\HW\MemoryInterface.cpp" />
     <ClCompile Include="Core\HW\MMIO.cpp" />
     <ClCompile Include="Core\HW\ProcessorInterface.cpp" />
     <ClCompile Include="Core\HW\SI\SI_Device.cpp" />
+    <ClCompile Include="Core\HW\SI\SI_DeviceAMBaseboard.cpp" />
     <ClCompile Include="Core\HW\SI\SI_DeviceDanceMat.cpp" />
     <ClCompile Include="Core\HW\SI\SI_DeviceGBA.cpp" />
     <ClCompile Include="Core\HW\SI\SI_DeviceGBAEmu.cpp" />
@@ -1170,6 +1187,7 @@
     <ClCompile Include="Core\WC24PatchEngine.cpp" />
     <ClCompile Include="DiscIO\Blob.cpp" />
     <ClCompile Include="DiscIO\CISOBlob.cpp" />
+    <ClCompile Include="DiscIO\CachedBlob.cpp" />
     <ClCompile Include="DiscIO\CompressedBlob.cpp" />
     <ClCompile Include="DiscIO\DirectoryBlob.cpp" />
     <ClCompile Include="DiscIO\DiscExtractor.cpp" />
@@ -1342,8 +1360,8 @@
     <ClCompile Include="VideoCommon\AbstractStagingTexture.cpp" />
     <ClCompile Include="VideoCommon\AbstractTexture.cpp" />
     <ClCompile Include="VideoCommon\Assets\CustomAsset.cpp" />
+    <ClCompile Include="VideoCommon\Assets\CustomAssetCache.cpp" />
     <ClCompile Include="VideoCommon\Assets\CustomAssetLoader.cpp" />
-    <ClCompile Include="VideoCommon\Assets\CustomResourceManager.cpp" />
     <ClCompile Include="VideoCommon\Assets\CustomTextureData.cpp" />
     <ClCompile Include="VideoCommon\Assets\DirectFilesystemAssetLibrary.cpp" />
     <ClCompile Include="VideoCommon\Assets\MaterialAsset.cpp" />
@@ -1398,12 +1416,21 @@
     <ClCompile Include="VideoCommon\PerfQueryBase.cpp" />
     <ClCompile Include="VideoCommon\PerformanceMetrics.cpp" />
     <ClCompile Include="VideoCommon\PerformanceTracker.cpp" />
+    <ClCompile Include="VideoCommon\PipelineUtils.cpp" />
     <ClCompile Include="VideoCommon\PixelEngine.cpp" />
     <ClCompile Include="VideoCommon\PixelShaderGen.cpp" />
     <ClCompile Include="VideoCommon\PixelShaderManager.cpp" />
     <ClCompile Include="VideoCommon\PostProcessing.cpp" />
     <ClCompile Include="VideoCommon\Present.cpp" />
     <ClCompile Include="VideoCommon\RenderState.cpp" />
+    <ClCompile Include="VideoCommon\Resources\CustomResourceManager.cpp" />
+    <ClCompile Include="VideoCommon\Resources\InvalidTextures.cpp" />
+    <ClCompile Include="VideoCommon\Resources\MaterialResource.cpp" />
+    <ClCompile Include="VideoCommon\Resources\Resource.cpp" />
+    <ClCompile Include="VideoCommon\Resources\ShaderResource.cpp" />
+    <ClCompile Include="VideoCommon\Resources\TextureAndSamplerResource.cpp" />
+    <ClCompile Include="VideoCommon\Resources\TextureDataResource.cpp" />
+    <ClCompile Include="VideoCommon\Resources\TexturePool.cpp" />
     <ClCompile Include="VideoCommon\ShaderCache.cpp" />
     <ClCompile Include="VideoCommon\ShaderCompileUtils.cpp" />
     <ClCompile Include="VideoCommon\ShaderGenCommon.cpp" />
diff --git a/Source/Core/DolphinLibretro/Boot.cpp b/Source/Core/DolphinLibretro/Boot.cpp
index b2a04b049690..dfbdcca77ec7 100644
--- a/Source/Core/DolphinLibretro/Boot.cpp
+++ b/Source/Core/DolphinLibretro/Boot.cpp
@@ -15,6 +15,7 @@
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 #include "Core/HW/DVD/DVDInterface.h"
+#include "Core/HW/EXI/EXI_Device.h"
 #include "Core/HW/VideoInterface.h"
 #include "Core/HW/WiimoteReal/WiimoteReal.h"
 #include "Core/PowerPC/PowerPC.h"
@@ -31,7 +32,7 @@
 #include "VideoCommon/AsyncRequests.h"
 #include "VideoCommon/VideoBackendBase.h"
 #include "VideoCommon/VideoConfig.h"
-#include "VideoCommon/Assets/CustomResourceManager.h"
+#include "VideoCommon/Resources/CustomResourceManager.h"
 #include "VideoCommon/Fifo.h"
 #include "VideoCommon/OnScreenDisplay.h"
 
@@ -199,6 +200,20 @@ bool retro_load_game(const struct retro_game_info* game)
   Config::SetBase(Config::MAIN_BLUETOOTH_PASSTHROUGH_ENABLED,
     Libretro::GetOption<bool>(Libretro::Options::main_bluetooth::BLUETOOTH_PASSTHROUGH, /*def=*/false));
 
+  // SYSCONF (GC)
+  {
+    const std::string value =
+      Libretro::GetOption<std::string>(
+        sysconf_gc::SP1_DEVICE,
+        "255" // ExpansionInterface::EXIDeviceType::None
+      );
+
+    const int device_int = std::stoi(value);
+    const auto device = static_cast<ExpansionInterface::EXIDeviceType>(device_int);
+
+    Config::SetBase(Config::MAIN_SERIAL_PORT_1, device);
+  }
+
   // SYSCONF.IPL
   Config::SetBase(Config::SYSCONF_WIDESCREEN,
                  Libretro::GetOption<bool>(sysconf::WIDESCREEN, /*def=*/true));
@@ -455,7 +470,6 @@ void retro_unload_game(void)
     g_video_backend->Shutdown();
 
   // these are disabled in Shutdown on fullscreen/window toggle
-  system.GetCustomResourceManager().Shutdown();
   system.GetFifo().Shutdown();
 
   // Rest of shutdown
diff --git a/Source/Core/DolphinLibretro/Common/Options.cpp b/Source/Core/DolphinLibretro/Common/Options.cpp
index fc1f0f1224b7..6719071702a6 100644
--- a/Source/Core/DolphinLibretro/Common/Options.cpp
+++ b/Source/Core/DolphinLibretro/Common/Options.cpp
@@ -14,6 +14,7 @@ static std::unordered_map<std::string, bool> optionDirty;
 static constexpr const char* CATEGORY_CORE = "core";
 static constexpr const char* CATEGORY_AUDIO = "audio";
 static constexpr const char* CATEGORY_INTERFACE = "interface";
+static constexpr const char* CATEGORY_GC = "sysconf_gc";
 static constexpr const char* CATEGORY_SYSCONF = "sysconf";
 static constexpr const char* CATEGORY_GFX_HARDWARE = "graphics_hardware";
 static constexpr const char* CATEGORY_GFX_SETTINGS = "graphics_settings";
@@ -38,9 +39,14 @@ static const struct retro_core_option_v2_category option_cats[] = {
     "Interface",
     "Configure on-screen display and logging."
   },
+  {
+    CATEGORY_GC,
+    "System Configuration - Gamecube",
+    "Configure Gamecube system settings."
+  },
   {
     CATEGORY_SYSCONF,
-    "System Configuration",
+    "System Configuration - Wii",
     "Configure Wii system settings."
   },
   {
@@ -412,6 +418,31 @@ static struct retro_core_option_v2_definition option_defs[] = {
     "0"
   },
 
+  // ========== SYSCONF (GC) ==========
+  {
+    Libretro::Options::sysconf_gc::SP1_DEVICE,
+    "System Configuration (GC) > SP1 Device",
+    "SP1 Device",
+    "Select the device connected to the GameCube SP1 slot.",
+    nullptr,
+    CATEGORY_GC,
+    {
+        { "255", "None" },              // EXIDeviceType::None
+        { "0",   "Dummy" },             // EXIDeviceType::Dummy
+        { "5",   "Ethernet" },          // EXIDeviceType::Ethernet
+        { "10",  "Ethernet XLink" },    // EXIDeviceType::EthernetXLink
+        { "11",  "Ethernet TapServer" },// EXIDeviceType::EthernetTapServer
+        { "12",  "Ethernet Built-In" }, // EXIDeviceType::EthernetBuiltIn
+#ifdef HAVE_CPPIPC
+        { "14",  "Ethernet IPC" },      // EXIDeviceType::EthernetIPC
+#endif
+        { "13",  "Modem TapServer" },   // EXIDeviceType::ModemTapServer
+        { "6",   "Baseboard" },         // EXIDeviceType::Baseboard
+        { nullptr, nullptr }
+    },
+    "255" // default: None
+  },
+
   // ========== SYSCONF.IPL ==========
   {
     Libretro::Options::sysconf::WIDESCREEN,
diff --git a/Source/Core/DolphinLibretro/Common/Options.h b/Source/Core/DolphinLibretro/Common/Options.h
index 52373dc5ab5d..f73393bf971d 100644
--- a/Source/Core/DolphinLibretro/Common/Options.h
+++ b/Source/Core/DolphinLibretro/Common/Options.h
@@ -158,7 +158,14 @@ namespace main_bluetooth {
 }  // namespace bluetooth
 
 // ======================================================
-// System Configuration (SYSCONF)
+// System Configuration (SYSCONF) - GC
+// ======================================================
+namespace sysconf_gc {
+  constexpr const char SP1_DEVICE[] = "dolphin_gc_sp1";
+}
+
+// ======================================================
+// System Configuration (SYSCONF) - Wii
 // ======================================================
 namespace sysconf {
   constexpr const char WIDESCREEN[] = "dolphin_widescreen";
diff --git a/Source/Core/DolphinLibretro/Input.cpp b/Source/Core/DolphinLibretro/Input.cpp
index 902acaedef11..29df14445522 100644
--- a/Source/Core/DolphinLibretro/Input.cpp
+++ b/Source/Core/DolphinLibretro/Input.cpp
@@ -75,6 +75,8 @@ static struct retro_input_descriptor descGC[] = {
     {0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_L3, "L-Analog"},
     {0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R3, "R-Analog"},
     {0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R, "Z"},
+    {0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_L, "Triforce - Test"},
+    {0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT, "Triforce - Coin"},
     {0, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START, "Start"},
     {0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X,
     "Control Stick X"},
@@ -727,7 +729,10 @@ void retro_set_controller_port_device_gc(unsigned port, unsigned device)
   if (device == RETRO_DEVICE_GC_ON_WII) // Disconnect Wii device if we're using GC controller as device type to avoid conflict
     WiimoteCommon::OnSourceChanged(port, WiimoteSource::None);
 
-  Config::SetBaseOrCurrent(Config::GetInfoForSIDevice(port > 3 ? port - 4 : port), SerialInterface::SIDEVICE_GC_CONTROLLER);
+  Core::System& system = Core::System::GetInstance();
+
+  Config::SetBaseOrCurrent(Config::GetInfoForSIDevice(port > 3 ? port - 4 : port),
+    system.IsTriforce() ? SerialInterface::SIDEVICE_AM_BASEBOARD : SerialInterface::SIDEVICE_GC_CONTROLLER);
   si.ChangeDevice(Config::Get(Config::GetInfoForSIDevice(port > 3 ? port - 4 : port)), port > 3 ? port - 4 : port);
 
   GCPad* gcPad = (GCPad*)Pad::GetConfig()->GetController(port > 3 ? port - 4 : port);
@@ -743,6 +748,7 @@ void retro_set_controller_port_device_gc(unsigned port, unsigned device)
   ControllerEmu::ControlGroup* gcTriggers = gcPad->GetGroup(PadGroup::Triggers);
   ControllerEmu::ControlGroup* gcRumble = gcPad->GetGroup(PadGroup::Rumble);
   ControllerEmu::ControlGroup* gcOptions = gcPad->GetGroup(PadGroup::Options);
+  ControllerEmu::ControlGroup* gcTriforce = gcPad->GetGroup(PadGroup::Triforce);
 #if 0
   ControllerEmu::ControlGroup* gcMic = gcPad->GetGroup(PadGroup::Mic);
 #endif
@@ -772,6 +778,10 @@ void retro_set_controller_port_device_gc(unsigned port, unsigned device)
                                    "`" + devAnalog + ":Trigger0+`|L3");  // L-trigger Soft Press
   gcTriggers->SetControlExpression(3,
                                    "`" + devAnalog + ":Trigger1+`|R3");  // R-trigger Soft Press
+  gcTriforce->SetControlExpression(0, "L");  // Test
+  gcTriforce->SetControlExpression(1, "`" + devAnalog + ":Trigger0+`&`" + devAnalog + ":Trigger1+`");  // Service
+  gcTriforce->SetControlExpression(2, "Select"); // Coin
+
   bool enableRumble = Libretro::Options::GetCached<bool>(Libretro::Options::sysconf::ENABLE_RUMBLE);
   if (enableRumble)
     gcRumble->SetControlExpression(0, "Rumble");
diff --git a/Source/Core/DolphinLibretro/Main.cpp b/Source/Core/DolphinLibretro/Main.cpp
index 14260d26e7e1..34dcb6083c5c 100644
--- a/Source/Core/DolphinLibretro/Main.cpp
+++ b/Source/Core/DolphinLibretro/Main.cpp
@@ -333,8 +333,11 @@ bool retro_unserialize(const void* data, size_t size)
 
 unsigned retro_get_region(void)
 {
+  Core::System& system = Core::System::GetInstance();
+
   if (DiscIO::IsNTSC(SConfig::GetInstance().m_region) ||
-      (Core::System::GetInstance().IsWii() && Config::Get(Config::SYSCONF_PAL60)))
+      (Core::System::GetInstance().IsWii() && Config::Get(Config::SYSCONF_PAL60)) ||
+       system.IsTriforce())
     return RETRO_REGION_NTSC;
 
   return RETRO_REGION_PAL;
diff --git a/Source/Core/DolphinNoGUI/CMakeLists.txt b/Source/Core/DolphinNoGUI/CMakeLists.txt
index 566a643c8969..9dad1b5f86b4 100644
--- a/Source/Core/DolphinNoGUI/CMakeLists.txt
+++ b/Source/Core/DolphinNoGUI/CMakeLists.txt
@@ -23,7 +23,16 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
   target_sources(dolphin-nogui PRIVATE PlatformFBDev.cpp)
 endif()
 
-set_target_properties(dolphin-nogui PROPERTIES OUTPUT_NAME dolphin-emu-nogui)
+if (WIN32)
+  target_sources(dolphin-nogui PRIVATE DolphinNoGUI.exe.manifest DolphinNoGUI.rc)
+
+  set_target_properties(dolphin-nogui PROPERTIES
+    DEBUG_POSTFIX    D
+    OUTPUT_NAME      DolphinNoGUI
+  )
+else()
+  set_target_properties(dolphin-nogui PROPERTIES OUTPUT_NAME dolphin-emu-nogui)
+endif()
 
 target_link_libraries(dolphin-nogui
 PRIVATE
diff --git a/Source/Core/DolphinNoGUI/MainNoGUI.cpp b/Source/Core/DolphinNoGUI/MainNoGUI.cpp
index a0ceb174f748..3bf40ea0d42b 100644
--- a/Source/Core/DolphinNoGUI/MainNoGUI.cpp
+++ b/Source/Core/DolphinNoGUI/MainNoGUI.cpp
@@ -16,7 +16,6 @@
 #endif
 
 #include "Common/ScopeGuard.h"
-#include "Common/StringUtil.h"
 #include "Core/Boot/Boot.h"
 #include "Core/BootManager.h"
 #include "Core/Core.h"
@@ -30,8 +29,6 @@
 #endif
 #include "UICommon/UICommon.h"
 
-#include "VideoCommon/VideoBackendBase.h"
-
 static std::unique_ptr<Platform> s_platform;
 
 static void signal_handler(int)
diff --git a/Source/Core/DolphinNoGUI/PlatformFBDev.cpp b/Source/Core/DolphinNoGUI/PlatformFBDev.cpp
index 53312bfa0872..249ef20a03c4 100644
--- a/Source/Core/DolphinNoGUI/PlatformFBDev.cpp
+++ b/Source/Core/DolphinNoGUI/PlatformFBDev.cpp
@@ -5,23 +5,15 @@
 
 #include "DolphinNoGUI/Platform.h"
 
-#include "Common/MsgHandler.h"
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 #include "Core/State.h"
 #include "Core/System.h"
 
-#include <climits>
 #include <cstdio>
 #include <thread>
 
 #include <fcntl.h>
-#include <linux/fb.h>
-#include <linux/kd.h>
-#include <linux/vt.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <termios.h>
 #include <unistd.h>
 
 namespace
diff --git a/Source/Core/DolphinNoGUI/PlatformX11.cpp b/Source/Core/DolphinNoGUI/PlatformX11.cpp
index 8fed2c8c87bd..090fadf77e8b 100644
--- a/Source/Core/DolphinNoGUI/PlatformX11.cpp
+++ b/Source/Core/DolphinNoGUI/PlatformX11.cpp
@@ -17,8 +17,6 @@ static constexpr auto X_None = None;
 #include "Core/State.h"
 #include "Core/System.h"
 
-#include <climits>
-#include <cstdio>
 #include <cstring>
 #include <thread>
 
diff --git a/Source/Core/DolphinQt/Achievements/AchievementBox.cpp b/Source/Core/DolphinQt/Achievements/AchievementBox.cpp
index 39eefb048463..463e4e6e0b91 100644
--- a/Source/Core/DolphinQt/Achievements/AchievementBox.cpp
+++ b/Source/Core/DolphinQt/Achievements/AchievementBox.cpp
@@ -13,10 +13,7 @@
 #include <QVBoxLayout>
 #include <QWidget>
 
-#include <rcheevos/include/rc_api_runtime.h>
-
 #include "Core/AchievementManager.h"
-#include "Core/Config/AchievementSettings.h"
 
 #include "DolphinQt/QtUtils/FromStdString.h"
 
diff --git a/Source/Core/DolphinQt/Achievements/AchievementBox.h b/Source/Core/DolphinQt/Achievements/AchievementBox.h
index 7d6e163641aa..060fe564e035 100644
--- a/Source/Core/DolphinQt/Achievements/AchievementBox.h
+++ b/Source/Core/DolphinQt/Achievements/AchievementBox.h
@@ -6,7 +6,7 @@
 #ifdef USE_RETRO_ACHIEVEMENTS
 #include <QGroupBox>
 
-#include "Core/AchievementManager.h"
+#include "rcheevos/include/rc_client.h"
 
 class QLabel;
 class QProgressBar;
diff --git a/Source/Core/DolphinQt/Achievements/AchievementHeaderWidget.cpp b/Source/Core/DolphinQt/Achievements/AchievementHeaderWidget.cpp
index 79ed1e15f027..582017c16093 100644
--- a/Source/Core/DolphinQt/Achievements/AchievementHeaderWidget.cpp
+++ b/Source/Core/DolphinQt/Achievements/AchievementHeaderWidget.cpp
@@ -15,10 +15,8 @@
 
 #include "Core/AchievementManager.h"
 #include "Core/Config/AchievementSettings.h"
-#include "Core/Core.h"
 
 #include "DolphinQt/QtUtils/FromStdString.h"
-#include "DolphinQt/Settings.h"
 
 AchievementHeaderWidget::AchievementHeaderWidget(QWidget* parent) : QWidget(parent)
 {
diff --git a/Source/Core/DolphinQt/Achievements/AchievementHeaderWidget.h b/Source/Core/DolphinQt/Achievements/AchievementHeaderWidget.h
index 65731f8d18ad..1d337c5d3727 100644
--- a/Source/Core/DolphinQt/Achievements/AchievementHeaderWidget.h
+++ b/Source/Core/DolphinQt/Achievements/AchievementHeaderWidget.h
@@ -6,8 +6,6 @@
 #ifdef USE_RETRO_ACHIEVEMENTS
 #include <QWidget>
 
-#include "Core/AchievementManager.h"
-
 class QGroupBox;
 class QLabel;
 class QProgressBar;
diff --git a/Source/Core/DolphinQt/Achievements/AchievementLeaderboardWidget.cpp b/Source/Core/DolphinQt/Achievements/AchievementLeaderboardWidget.cpp
index 092e892bb7cd..4b33a9030716 100644
--- a/Source/Core/DolphinQt/Achievements/AchievementLeaderboardWidget.cpp
+++ b/Source/Core/DolphinQt/Achievements/AchievementLeaderboardWidget.cpp
@@ -12,12 +12,8 @@
 
 #include "Common/CommonTypes.h"
 #include "Core/AchievementManager.h"
-#include "Core/Config/AchievementSettings.h"
-#include "Core/Config/MainSettings.h"
-#include "Core/Core.h"
 
 #include "DolphinQt/QtUtils/ClearLayoutRecursively.h"
-#include "DolphinQt/Settings.h"
 
 AchievementLeaderboardWidget::AchievementLeaderboardWidget(QWidget* parent) : QWidget(parent)
 {
diff --git a/Source/Core/DolphinQt/Achievements/AchievementProgressWidget.cpp b/Source/Core/DolphinQt/Achievements/AchievementProgressWidget.cpp
index 9a69cdb66b71..70b42144e34c 100644
--- a/Source/Core/DolphinQt/Achievements/AchievementProgressWidget.cpp
+++ b/Source/Core/DolphinQt/Achievements/AchievementProgressWidget.cpp
@@ -11,16 +11,10 @@
 #include <QString>
 #include <QVBoxLayout>
 
-#include <rcheevos/include/rc_api_runtime.h>
-
 #include "Core/AchievementManager.h"
-#include "Core/Config/AchievementSettings.h"
-#include "Core/Config/MainSettings.h"
-#include "Core/Core.h"
 
 #include "DolphinQt/Achievements/AchievementBox.h"
 #include "DolphinQt/QtUtils/ClearLayoutRecursively.h"
-#include "DolphinQt/Settings.h"
 
 AchievementProgressWidget::AchievementProgressWidget(QWidget* parent) : QWidget(parent)
 {
diff --git a/Source/Core/DolphinQt/Achievements/AchievementSettingsWidget.cpp b/Source/Core/DolphinQt/Achievements/AchievementSettingsWidget.cpp
index 152b4f0371f3..0e4ce1feccd4 100644
--- a/Source/Core/DolphinQt/Achievements/AchievementSettingsWidget.cpp
+++ b/Source/Core/DolphinQt/Achievements/AchievementSettingsWidget.cpp
@@ -6,13 +6,12 @@
 
 #include <QLabel>
 #include <QLineEdit>
+#include <QPushButton>
 #include <QString>
 #include <QVBoxLayout>
 
 #include "Core/AchievementManager.h"
 #include "Core/Config/AchievementSettings.h"
-#include "Core/Config/FreeLookSettings.h"
-#include "Core/Config/MainSettings.h"
 #include "Core/Config/UISettings.h"
 #include "Core/Core.h"
 #include "Core/Movie.h"
@@ -22,7 +21,6 @@
 #include "DolphinQt/Config/ControllerInterface/ControllerInterfaceWindow.h"
 #include "DolphinQt/Config/ToolTipControls/ToolTipCheckBox.h"
 #include "DolphinQt/QtUtils/ModalMessageBox.h"
-#include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
 #include "DolphinQt/QtUtils/SignalBlocking.h"
 #include "DolphinQt/Settings.h"
 
diff --git a/Source/Core/DolphinQt/CMakeLists.txt b/Source/Core/DolphinQt/CMakeLists.txt
index cd49f7f10805..c61edc244b52 100644
--- a/Source/Core/DolphinQt/CMakeLists.txt
+++ b/Source/Core/DolphinQt/CMakeLists.txt
@@ -1,8 +1,3 @@
-if(POLICY CMP0084)
-  # Disable trying to search for Qt3/4 if what we actually want is not found
-  cmake_policy(SET CMP0084 NEW)
-endif()
-
 if (MSVC)
   if(_M_ARM_64)
     list(APPEND CMAKE_PREFIX_PATH "${CMAKE_SOURCE_DIR}/Externals/Qt/Qt6.5.1/ARM64")
@@ -377,10 +372,12 @@ add_executable(dolphin-emu
   Settings/GeneralPane.h
   Settings/InterfacePane.cpp
   Settings/InterfacePane.h
-	Settings/OnScreenDisplayPane.cpp
-	Settings/OnScreenDisplayPane.h
+  Settings/OnScreenDisplayPane.cpp
+  Settings/OnScreenDisplayPane.h
   Settings/PathPane.cpp
   Settings/PathPane.h
+  Settings/TriforcePane.cpp
+  Settings/TriforcePane.h
   Settings/USBDevicePicker.cpp
   Settings/USBDevicePicker.h
   Settings/WiiPane.cpp
@@ -522,6 +519,13 @@ if(WIN32)
     COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/qt.conf.win" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/qt.conf"
   )
 
+  if (ENABLE_AUTOUPDATE)
+    # Copy build_info.txt
+    add_custom_command(TARGET dolphin-emu POST_BUILD
+      COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_BINARY_DIR}/build_info.txt" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/build_info.txt"
+    )
+  endif()
+
   # Delegate to Qt's official deployment binary on Windows to copy over the necessary Qt-specific libraries, etc.
   get_target_property(MOC_EXECUTABLE_LOCATION Qt6::moc IMPORTED_LOCATION)
   get_filename_component(QT_BINARY_DIRECTORY "${MOC_EXECUTABLE_LOCATION}" DIRECTORY)
@@ -669,7 +673,7 @@ if(APPLE)
     endif()
   endif()
 
-  if(NOT SKIP_POSTPROCESS_BUNDLE)
+  if(POSTPROCESS_BUNDLE)
     # Update library references to make the bundle portable
     include(DolphinPostprocessBundle)
     dolphin_postprocess_bundle(dolphin-emu)
diff --git a/Source/Core/DolphinQt/CheatSearchWidget.cpp b/Source/Core/DolphinQt/CheatSearchWidget.cpp
index 7d8146ba9b72..629d8dbafbc4 100644
--- a/Source/Core/DolphinQt/CheatSearchWidget.cpp
+++ b/Source/Core/DolphinQt/CheatSearchWidget.cpp
@@ -3,7 +3,6 @@
 
 #include "DolphinQt/CheatSearchWidget.h"
 
-#include <functional>
 #include <optional>
 #include <string>
 #include <unordered_map>
@@ -27,17 +26,11 @@
 
 #include <fmt/format.h>
 
-#include "Common/Align.h"
-#include "Common/BitUtils.h"
-#include "Common/StringUtil.h"
-#include "Common/Swap.h"
-
 #include "Core/ActionReplay.h"
 #include "Core/CheatGeneration.h"
 #include "Core/CheatSearch.h"
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
-#include "Core/PowerPC/PowerPC.h"
 #include "Core/System.h"
 
 #include "DolphinQt/Config/CheatCodeEditor.h"
@@ -45,8 +38,6 @@
 #include "DolphinQt/QtUtils/WrapInScrollArea.h"
 #include "DolphinQt/Settings.h"
 
-#include "UICommon/GameFile.h"
-
 constexpr size_t TABLE_MAX_ROWS = 1000;
 
 constexpr int ADDRESS_TABLE_ADDRESS_ROLE = Qt::UserRole;
@@ -553,7 +544,7 @@ void CheatSearchWidget::GenerateARCodes()
     }
     else
     {
-      const auto new_error_code = result.Error();
+      const auto new_error_code = result.error();
       if (!error_code.has_value())
       {
         error_code = new_error_code;
diff --git a/Source/Core/DolphinQt/Config/CommonControllersWidget.cpp b/Source/Core/DolphinQt/Config/CommonControllersWidget.cpp
index e988509f6a1f..7a5e1256afd4 100644
--- a/Source/Core/DolphinQt/Config/CommonControllersWidget.cpp
+++ b/Source/Core/DolphinQt/Config/CommonControllersWidget.cpp
@@ -9,7 +9,6 @@
 #include <QVBoxLayout>
 
 #include "Core/Config/MainSettings.h"
-#include "Core/Core.h"
 
 #include "DolphinQt/Config/ControllerInterface/ControllerInterfaceWindow.h"
 #include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
diff --git a/Source/Core/DolphinQt/Config/CommonControllersWidget.h b/Source/Core/DolphinQt/Config/CommonControllersWidget.h
index 90129bbf69d8..42d23f74a4d1 100644
--- a/Source/Core/DolphinQt/Config/CommonControllersWidget.h
+++ b/Source/Core/DolphinQt/Config/CommonControllersWidget.h
@@ -5,8 +5,6 @@
 
 #include <QWidget>
 
-#include <array>
-
 class QCheckBox;
 class QGroupBox;
 class QVBoxLayout;
diff --git a/Source/Core/DolphinQt/Config/FreeLookWidget.cpp b/Source/Core/DolphinQt/Config/FreeLookWidget.cpp
index a28091f61fcc..7d622a752941 100644
--- a/Source/Core/DolphinQt/Config/FreeLookWidget.cpp
+++ b/Source/Core/DolphinQt/Config/FreeLookWidget.cpp
@@ -9,10 +9,7 @@
 #include <QVBoxLayout>
 
 #include "Core/AchievementManager.h"
-#include "Core/Config/AchievementSettings.h"
 #include "Core/Config/FreeLookSettings.h"
-#include "Core/ConfigManager.h"
-#include "Core/Core.h"
 
 #include "DolphinQt/Config/ConfigControls/ConfigBool.h"
 #include "DolphinQt/Config/ConfigControls/ConfigChoice.h"
diff --git a/Source/Core/DolphinQt/Config/GamecubeControllersWidget.cpp b/Source/Core/DolphinQt/Config/GamecubeControllersWidget.cpp
index f45b51e9eef5..33c54edbd66f 100644
--- a/Source/Core/DolphinQt/Config/GamecubeControllersWidget.cpp
+++ b/Source/Core/DolphinQt/Config/GamecubeControllersWidget.cpp
@@ -12,7 +12,6 @@
 
 #include <optional>
 #include <utility>
-#include <vector>
 
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
@@ -43,6 +42,7 @@ static constexpr std::array s_gc_types = {
 #endif
     SIDeviceName{SerialInterface::SIDEVICE_GC_GBA, _trans("GBA (TCP)")},
     SIDeviceName{SerialInterface::SIDEVICE_GC_KEYBOARD, _trans("Keyboard Controller")},
+    SIDeviceName{SerialInterface::SIDEVICE_AM_BASEBOARD, _trans("Triforce Baseboard")},
 };
 
 static std::optional<int> ToGCMenuIndex(const SerialInterface::SIDevices sidevice)
@@ -157,6 +157,9 @@ void GamecubeControllersWidget::OnGCPadConfigure(size_t index)
   case SerialInterface::SIDEVICE_GC_KEYBOARD:
     type = MappingWindow::Type::MAPPING_GC_KEYBOARD;
     break;
+  case SerialInterface::SIDEVICE_AM_BASEBOARD:
+    type = MappingWindow::Type::MAPPING_AM_BASEBOARD;
+    break;
   default:
     return;
   }
diff --git a/Source/Core/DolphinQt/Config/Graphics/ColorCorrectionConfigWindow.cpp b/Source/Core/DolphinQt/Config/Graphics/ColorCorrectionConfigWindow.cpp
index 735462a360ac..f4dac2574f1e 100644
--- a/Source/Core/DolphinQt/Config/Graphics/ColorCorrectionConfigWindow.cpp
+++ b/Source/Core/DolphinQt/Config/Graphics/ColorCorrectionConfigWindow.cpp
@@ -17,8 +17,6 @@
 #include "DolphinQt/Config/ConfigControls/ConfigFloatSlider.h"
 #include "DolphinQt/QtUtils/WrapInScrollArea.h"
 
-#include "VideoCommon/VideoConfig.h"
-
 ColorCorrectionConfigWindow::ColorCorrectionConfigWindow(QWidget* parent) : QDialog(parent)
 {
   setWindowTitle(tr("Color Correction Configuration"));
diff --git a/Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.cpp b/Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.cpp
index 0aa77d53110e..57a7eb634f6e 100644
--- a/Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.cpp
+++ b/Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.cpp
@@ -3,6 +3,8 @@
 
 #include "DolphinQt/Config/Graphics/EnhancementsWidget.h"
 
+#include <utility>
+
 #include <QGridLayout>
 #include <QGroupBox>
 #include <QLabel>
@@ -10,7 +12,6 @@
 #include <QVBoxLayout>
 
 #include "Common/CommonTypes.h"
-#include "Common/EnumUtils.h"
 
 #include "Core/Config/GraphicsSettings.h"
 
@@ -47,14 +48,14 @@ EnhancementsWidget::EnhancementsWidget(GraphicsPane* gfx_pane)
   });
 }
 
-constexpr int ANISO_1x = Common::ToUnderlying(AnisotropicFilteringMode::Force1x);
-constexpr int ANISO_2X = Common::ToUnderlying(AnisotropicFilteringMode::Force2x);
-constexpr int ANISO_4X = Common::ToUnderlying(AnisotropicFilteringMode::Force4x);
-constexpr int ANISO_8X = Common::ToUnderlying(AnisotropicFilteringMode::Force8x);
-constexpr int ANISO_16X = Common::ToUnderlying(AnisotropicFilteringMode::Force16x);
-constexpr int FILTERING_DEFAULT = Common::ToUnderlying(TextureFilteringMode::Default);
-constexpr int FILTERING_NEAREST = Common::ToUnderlying(TextureFilteringMode::Nearest);
-constexpr int FILTERING_LINEAR = Common::ToUnderlying(TextureFilteringMode::Linear);
+constexpr int ANISO_1x = std::to_underlying(AnisotropicFilteringMode::Force1x);
+constexpr int ANISO_2X = std::to_underlying(AnisotropicFilteringMode::Force2x);
+constexpr int ANISO_4X = std::to_underlying(AnisotropicFilteringMode::Force4x);
+constexpr int ANISO_8X = std::to_underlying(AnisotropicFilteringMode::Force8x);
+constexpr int ANISO_16X = std::to_underlying(AnisotropicFilteringMode::Force16x);
+constexpr int FILTERING_DEFAULT = std::to_underlying(TextureFilteringMode::Default);
+constexpr int FILTERING_NEAREST = std::to_underlying(TextureFilteringMode::Nearest);
+constexpr int FILTERING_LINEAR = std::to_underlying(TextureFilteringMode::Linear);
 
 void EnhancementsWidget::CreateWidgets()
 {
diff --git a/Source/Core/DolphinQt/Config/Graphics/PostProcessingConfigWindow.cpp b/Source/Core/DolphinQt/Config/Graphics/PostProcessingConfigWindow.cpp
index 5376e33f093c..7070b6088781 100644
--- a/Source/Core/DolphinQt/Config/Graphics/PostProcessingConfigWindow.cpp
+++ b/Source/Core/DolphinQt/Config/Graphics/PostProcessingConfigWindow.cpp
@@ -22,7 +22,6 @@
 
 #include "VideoCommon/PostProcessing.h"
 #include "VideoCommon/Present.h"
-#include "VideoCommon/VideoConfig.h"
 
 using ConfigurationOption = VideoCommon::PostProcessingConfiguration::ConfigurationOption;
 using OptionType = ConfigurationOption::OptionType;
diff --git a/Source/Core/DolphinQt/Config/InfoWidget.cpp b/Source/Core/DolphinQt/Config/InfoWidget.cpp
index 53785d3cd097..4ee3f63bd6db 100644
--- a/Source/Core/DolphinQt/Config/InfoWidget.cpp
+++ b/Source/Core/DolphinQt/Config/InfoWidget.cpp
@@ -15,7 +15,6 @@
 
 #include "Core/ConfigManager.h"
 
-#include "DiscIO/Blob.h"
 #include "DiscIO/Enums.h"
 #include "DiscIO/Volume.h"
 #include "DiscIO/WiiSaveBanner.h"
@@ -123,12 +122,6 @@ QGroupBox* InfoWidget::CreateGameDetails()
                          m_game.GetMakerID() + ")");
 
   layout->addRow(tr("Name:"), internal_name);
-  if (m_game.GetPlatform() == DiscIO::Platform::Triforce)
-  {
-    const auto triforce_id_string = QString::fromStdString(m_game.GetTriforceID());
-    auto* const triforce_id = CreateValueDisplay(triforce_id_string);
-    layout->addRow(tr("Triforce ID:"), triforce_id);
-  }
   layout->addRow(tr("Game ID:"), game_id);
   layout->addRow(tr("Country:"), country);
   layout->addRow(tr("Maker:"), maker);
diff --git a/Source/Core/DolphinQt/Config/LogConfigWidget.cpp b/Source/Core/DolphinQt/Config/LogConfigWidget.cpp
index 9b940c99ed53..94a69b5e0dde 100644
--- a/Source/Core/DolphinQt/Config/LogConfigWidget.cpp
+++ b/Source/Core/DolphinQt/Config/LogConfigWidget.cpp
@@ -12,12 +12,9 @@
 #include <QRadioButton>
 #include <QVBoxLayout>
 
-#include "Common/FileUtil.h"
 #include "Common/Logging/Log.h"
 #include "Common/Logging/LogManager.h"
 
-#include "Core/ConfigManager.h"
-
 #include "DolphinQt/Settings.h"
 
 LogConfigWidget::LogConfigWidget(QWidget* parent) : QDockWidget(parent)
diff --git a/Source/Core/DolphinQt/Config/LogWidget.cpp b/Source/Core/DolphinQt/Config/LogWidget.cpp
index 9e53852e60d4..d076b3a9acf0 100644
--- a/Source/Core/DolphinQt/Config/LogWidget.cpp
+++ b/Source/Core/DolphinQt/Config/LogWidget.cpp
@@ -12,8 +12,6 @@
 #include <QPushButton>
 #include <QTimer>
 
-#include "Core/ConfigManager.h"
-
 #include "DolphinQt/Settings.h"
 
 // Delay in ms between calls of UpdateLog()
diff --git a/Source/Core/DolphinQt/Config/Mapping/GCPadEmu.cpp b/Source/Core/DolphinQt/Config/Mapping/GCPadEmu.cpp
index d3c9f8ccfcc4..a8af07379276 100644
--- a/Source/Core/DolphinQt/Config/Mapping/GCPadEmu.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/GCPadEmu.cpp
@@ -9,22 +9,27 @@
 #include "Core/HW/GCPad.h"
 #include "Core/HW/GCPadEmu.h"
 
-#include "InputCommon/ControllerEmu/Setting/NumericSetting.h"
 #include "InputCommon/InputConfig.h"
 
-GCPadEmu::GCPadEmu(MappingWindow* window) : MappingWidget(window)
+GCPadEmu::GCPadEmu(MappingWindow* window, SubType sub_type) : MappingWidget(window)
 {
-  CreateMainLayout();
+  CreateMainLayout(sub_type);
 }
 
-void GCPadEmu::CreateMainLayout()
+void GCPadEmu::CreateMainLayout(SubType sub_type)
 {
   auto* layout = new QGridLayout;
 
   layout->addWidget(CreateGroupBox(tr("Buttons"), Pad::GetGroup(GetPort(), PadGroup::Buttons)), 0,
                     0);
-  layout->addWidget(CreateGroupBox(tr("D-Pad"), Pad::GetGroup(GetPort(), PadGroup::DPad)), 1, 0, -1,
-                    1);
+  layout->addWidget(CreateGroupBox(tr("D-Pad"), Pad::GetGroup(GetPort(), PadGroup::DPad)), 1, 0);
+
+  if (sub_type == SubType::AMBaseboard)
+  {
+    layout->addWidget(CreateGroupBox(tr("Triforce"), Pad::GetGroup(GetPort(), PadGroup::Triforce)),
+                      2, 0);
+  }
+
   layout->addWidget(
       CreateGroupBox(tr("Control Stick"), Pad::GetGroup(GetPort(), PadGroup::MainStick)), 0, 1, -1,
       1);
diff --git a/Source/Core/DolphinQt/Config/Mapping/GCPadEmu.h b/Source/Core/DolphinQt/Config/Mapping/GCPadEmu.h
index dad55b4c76e2..6b315b2a2c35 100644
--- a/Source/Core/DolphinQt/Config/Mapping/GCPadEmu.h
+++ b/Source/Core/DolphinQt/Config/Mapping/GCPadEmu.h
@@ -9,12 +9,28 @@ class GCPadEmu final : public MappingWidget
 {
   Q_OBJECT
 public:
-  explicit GCPadEmu(MappingWindow* window);
+  enum class SubType
+  {
+    StandardController,
+    AMBaseboard,
+  };
+
+  GCPadEmu(MappingWindow* window, SubType sub_type);
 
   InputConfig* GetConfig() override;
 
 private:
   void LoadSettings() override;
   void SaveSettings() override;
-  void CreateMainLayout();
+  void CreateMainLayout(SubType sub_type);
 };
+
+[[nodiscard]] inline auto CreateStandardControllerMappingWidget(MappingWindow* parent)
+{
+  return new GCPadEmu{parent, GCPadEmu::SubType::StandardController};
+}
+
+[[nodiscard]] inline auto CreateAMBaseboardMappingWidget(MappingWindow* parent)
+{
+  return new GCPadEmu{parent, GCPadEmu::SubType::AMBaseboard};
+}
diff --git a/Source/Core/DolphinQt/Config/Mapping/GCPadWiiUConfigDialog.cpp b/Source/Core/DolphinQt/Config/Mapping/GCPadWiiUConfigDialog.cpp
index 82b39d28e38d..8a1870d8d4dd 100644
--- a/Source/Core/DolphinQt/Config/Mapping/GCPadWiiUConfigDialog.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/GCPadWiiUConfigDialog.cpp
@@ -6,11 +6,10 @@
 #include <QCheckBox>
 #include <QDialogButtonBox>
 #include <QLabel>
+#include <QTimer>
 #include <QVBoxLayout>
 
 #include "Core/Config/MainSettings.h"
-#include "Core/ConfigManager.h"
-#include "DolphinQt/QtUtils/QueueOnObject.h"
 
 #include "InputCommon/GCAdapter.h"
 
@@ -23,27 +22,25 @@ GCPadWiiUConfigDialog::GCPadWiiUConfigDialog(int port, QWidget* parent)
   ConnectWidgets();
 }
 
-GCPadWiiUConfigDialog::~GCPadWiiUConfigDialog()
-{
-  GCAdapter::SetAdapterCallback(nullptr);
-}
-
 void GCPadWiiUConfigDialog::CreateLayout()
 {
   setWindowTitle(tr("GameCube Controller Adapter at Port %1").arg(m_port + 1));
 
   m_layout = new QVBoxLayout();
   m_status_label = new QLabel();
+  m_poll_rate_label = new QLabel;
   m_rumble = new QCheckBox(tr("Enable Rumble"));
   m_simulate_bongos = new QCheckBox(tr("Simulate DK Bongos"));
   m_button_box = new QDialogButtonBox(QDialogButtonBox::Ok);
 
   UpdateAdapterStatus();
 
-  auto callback = [this] { QueueOnObject(this, &GCPadWiiUConfigDialog::UpdateAdapterStatus); };
-  GCAdapter::SetAdapterCallback(callback);
+  auto* const timer = new QTimer{this};
+  connect(timer, &QTimer::timeout, this, &GCPadWiiUConfigDialog::UpdateAdapterStatus);
+  timer->start(std::chrono::milliseconds{500});
 
   m_layout->addWidget(m_status_label);
+  m_layout->addWidget(m_poll_rate_label);
   m_layout->addWidget(m_rumble);
   m_layout->addWidget(m_simulate_bongos);
   m_layout->addWidget(m_button_box);
@@ -79,6 +76,12 @@ void GCPadWiiUConfigDialog::UpdateAdapterStatus()
 
   m_status_label->setText(status_text);
 
+  const auto poll_rate = GCAdapter::GetCurrentPollRate();
+  if (poll_rate != 0)
+    m_poll_rate_label->setText(tr("Poll Rate: %1 Hz").arg(poll_rate, 0, 'f', 2));
+  else
+    m_poll_rate_label->clear();
+
   m_rumble->setEnabled(detected);
   m_simulate_bongos->setEnabled(detected);
 }
diff --git a/Source/Core/DolphinQt/Config/Mapping/GCPadWiiUConfigDialog.h b/Source/Core/DolphinQt/Config/Mapping/GCPadWiiUConfigDialog.h
index f18510d3c54a..d71d23761880 100644
--- a/Source/Core/DolphinQt/Config/Mapping/GCPadWiiUConfigDialog.h
+++ b/Source/Core/DolphinQt/Config/Mapping/GCPadWiiUConfigDialog.h
@@ -15,7 +15,6 @@ class GCPadWiiUConfigDialog final : public QDialog
   Q_OBJECT
 public:
   explicit GCPadWiiUConfigDialog(int port, QWidget* parent = nullptr);
-  ~GCPadWiiUConfigDialog() override;
 
 private:
   void LoadSettings();
@@ -31,6 +30,7 @@ class GCPadWiiUConfigDialog final : public QDialog
 
   QVBoxLayout* m_layout;
   QLabel* m_status_label;
+  QLabel* m_poll_rate_label;
   QDialogButtonBox* m_button_box;
 
   // Checkboxes
diff --git a/Source/Core/DolphinQt/Config/Mapping/IOWindow.cpp b/Source/Core/DolphinQt/Config/Mapping/IOWindow.cpp
index 53da173bba3c..3412022f6b78 100644
--- a/Source/Core/DolphinQt/Config/Mapping/IOWindow.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/IOWindow.cpp
@@ -821,7 +821,7 @@ static void PaintStateIndicator(QPainter& painter, const QRect& region, ControlS
   QRect meter_region = region;
   meter_region.setWidth(region.width() * std::clamp(state, 0.0, 1.0));
 
-  // Create a temporary indicator object to retreive color constants.
+  // Create a temporary indicator object to retrieve color constants.
   MappingIndicator indicator;
 
   // Normal text.
diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp
index 0f86c79d56fa..8ad8ed8e0c67 100644
--- a/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp
@@ -23,6 +23,7 @@
 #include "InputCommon/ControllerEmu/ControlGroup/Cursor.h"
 #include "InputCommon/ControllerEmu/ControlGroup/Force.h"
 #include "InputCommon/ControllerEmu/ControlGroup/MixedTriggers.h"
+#include "InputCommon/ControllerInterface/ControllerInterface.h"
 #include "InputCommon/ControllerInterface/CoreDevice.h"
 #include "InputCommon/ControllerInterface/MappingCommon.h"
 
diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingNumeric.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingNumeric.cpp
index c6e05abd4e48..d1d00778d315 100644
--- a/Source/Core/DolphinQt/Config/Mapping/MappingNumeric.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/MappingNumeric.cpp
@@ -7,9 +7,6 @@
 
 #include "DolphinQt/Config/Mapping/MappingWidget.h"
 
-#include "InputCommon/ControllerEmu/ControllerEmu.h"
-#include "InputCommon/ControllerInterface/ControllerInterface.h"
-
 MappingDouble::MappingDouble(MappingWidget* parent, ControllerEmu::NumericSetting<double>* setting)
     : QDoubleSpinBox(parent), m_setting(*setting)
 {
diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp
index 23ce80a489c4..d52e950a2705 100644
--- a/Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/MappingWindow.cpp
@@ -26,6 +26,9 @@
 #include "Common/IniFile.h"
 #include "Common/StringUtil.h"
 
+#include "Core/HW/SI/SI.h"
+#include "Core/HW/SI/SI_DeviceAMBaseboard.h"
+
 #include "DolphinQt/Config/Mapping/FreeLookGeneral.h"
 #include "DolphinQt/Config/Mapping/FreeLookRotation.h"
 #include "DolphinQt/Config/Mapping/GBAPadEmu.h"
@@ -457,7 +460,7 @@ void MappingWindow::SetMappingType(MappingWindow::Type type)
   case Type::MAPPING_GC_STEERINGWHEEL:
   case Type::MAPPING_GC_DANCEMAT:
   case Type::MAPPING_GCPAD:
-    widget = new GCPadEmu(this);
+    widget = CreateStandardControllerMappingWidget(this);
     setWindowTitle(tr("GameCube Controller at Port %1").arg(GetPort() + 1));
     AddWidget(tr("GameCube Controller"), widget);
     break;
@@ -516,6 +519,11 @@ void MappingWindow::SetMappingType(MappingWindow::Type type)
     setWindowTitle(tr("Free Look Controller %1").arg(GetPort() + 1));
   }
   break;
+  case Type::MAPPING_AM_BASEBOARD:
+    widget = CreateAMBaseboardMappingWidget(this);
+    setWindowTitle(tr("Triforce Baseboard at Port %1").arg(GetPort() + 1));
+    AddWidget(tr("Triforce Baseboard"), widget);
+    break;
   default:
     return;
   }
@@ -534,7 +542,7 @@ void MappingWindow::PopulateProfileSelection()
   m_profiles_combo->clear();
 
   const std::string profiles_path = m_config->GetUserProfileDirectoryPath();
-  for (const auto& filename : Common::DoFileSearch({profiles_path}, {".ini"}))
+  for (const auto& filename : Common::DoFileSearch(profiles_path, ".ini"))
   {
     std::string basename;
     SplitPath(filename, nullptr, &basename, nullptr);
@@ -544,8 +552,7 @@ void MappingWindow::PopulateProfileSelection()
 
   m_profiles_combo->insertSeparator(m_profiles_combo->count());
 
-  for (const auto& filename :
-       Common::DoFileSearch({m_config->GetSysProfileDirectoryPath()}, {".ini"}))
+  for (const auto& filename : Common::DoFileSearch(m_config->GetSysProfileDirectoryPath(), ".ini"))
   {
     std::string basename;
     SplitPath(filename, nullptr, &basename, nullptr);
diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingWindow.h b/Source/Core/DolphinQt/Config/Mapping/MappingWindow.h
index 222d3e3a58ad..40789b84699d 100644
--- a/Source/Core/DolphinQt/Config/Mapping/MappingWindow.h
+++ b/Source/Core/DolphinQt/Config/Mapping/MappingWindow.h
@@ -45,6 +45,8 @@ class MappingWindow final : public QDialog
     MAPPING_HOTKEYS,
     // Freelook
     MAPPING_FREELOOK,
+    // Triforce
+    MAPPING_AM_BASEBOARD,
   };
 
   explicit MappingWindow(QWidget* parent, Type type, int port_num);
diff --git a/Source/Core/DolphinQt/Config/Mapping/WiimoteEmuExtensionMotionInput.h b/Source/Core/DolphinQt/Config/Mapping/WiimoteEmuExtensionMotionInput.h
index d4ce2a3b03ff..32a1ae2021a6 100644
--- a/Source/Core/DolphinQt/Config/Mapping/WiimoteEmuExtensionMotionInput.h
+++ b/Source/Core/DolphinQt/Config/Mapping/WiimoteEmuExtensionMotionInput.h
@@ -5,8 +5,6 @@
 
 #include "DolphinQt/Config/Mapping/MappingWidget.h"
 
-#include "Core/HW/WiimoteEmu/ExtensionPort.h"
-
 class QGroupBox;
 class QHBoxLayout;
 
diff --git a/Source/Core/DolphinQt/Config/Mapping/WiimoteEmuExtensionMotionSimulation.h b/Source/Core/DolphinQt/Config/Mapping/WiimoteEmuExtensionMotionSimulation.h
index b5778f90d1b0..42cf8ff80e21 100644
--- a/Source/Core/DolphinQt/Config/Mapping/WiimoteEmuExtensionMotionSimulation.h
+++ b/Source/Core/DolphinQt/Config/Mapping/WiimoteEmuExtensionMotionSimulation.h
@@ -5,8 +5,6 @@
 
 #include "DolphinQt/Config/Mapping/MappingWidget.h"
 
-#include "Core/HW/WiimoteEmu/ExtensionPort.h"
-
 class QGroupBox;
 class QHBoxLayout;
 
diff --git a/Source/Core/DolphinQt/Config/PatchesWidget.cpp b/Source/Core/DolphinQt/Config/PatchesWidget.cpp
index 529e5299c181..168ff0880eca 100644
--- a/Source/Core/DolphinQt/Config/PatchesWidget.cpp
+++ b/Source/Core/DolphinQt/Config/PatchesWidget.cpp
@@ -9,7 +9,6 @@
 
 #include "Common/FileUtil.h"
 #include "Common/IniFile.h"
-#include "Common/StringUtil.h"
 
 #include "Core/ConfigManager.h"
 #include "Core/PatchEngine.h"
diff --git a/Source/Core/DolphinQt/Config/SettingsWindow.cpp b/Source/Core/DolphinQt/Config/SettingsWindow.cpp
index 947edb39181c..e80b1fa7ff71 100644
--- a/Source/Core/DolphinQt/Config/SettingsWindow.cpp
+++ b/Source/Core/DolphinQt/Config/SettingsWindow.cpp
@@ -3,6 +3,8 @@
 
 #include "DolphinQt/Config/SettingsWindow.h"
 
+#include <utility>
+
 #include <QApplication>
 #include <QColor>
 #include <QDialogButtonBox>
@@ -14,8 +16,6 @@
 #include <QTabWidget>
 #include <QVBoxLayout>
 
-#include "Common/EnumUtils.h"
-
 #include "DolphinQt/Config/ControllersPane.h"
 #include "DolphinQt/Config/Graphics/GraphicsPane.h"
 #include "DolphinQt/MainWindow.h"
@@ -29,6 +29,7 @@
 #include "DolphinQt/Settings/InterfacePane.h"
 #include "DolphinQt/Settings/OnScreenDisplayPane.h"
 #include "DolphinQt/Settings/PathPane.h"
+#include "DolphinQt/Settings/TriforcePane.h"
 #include "DolphinQt/Settings/WiiPane.h"
 
 StackedSettingsWindow::StackedSettingsWindow(QWidget* parent) : QDialog{parent}
@@ -197,8 +198,9 @@ SettingsWindow::SettingsWindow(MainWindow* parent) : StackedSettingsWindow{paren
   AddWrappedPane(new OnScreenDisplayPane, tr("On-Screen Display"));
   AddWrappedPane(new AudioPane, tr("Audio"));
   AddWrappedPane(new PathPane, tr("Paths"));
-  AddWrappedPane(new GameCubePane, tr("GameCube"));
+  AddWrappedPane(new GameCubePane{parent}, tr("GameCube"));
   AddWrappedPane(new WiiPane, tr("Wii"));
+  AddWrappedPane(new TriforcePane, tr("Triforce"));
   AddWrappedPane(new AdvancedPane, tr("Advanced"));
 
   OnDoneCreatingPanes();
@@ -206,5 +208,5 @@ SettingsWindow::SettingsWindow(MainWindow* parent) : StackedSettingsWindow{paren
 
 void SettingsWindow::SelectPane(SettingsWindowPaneIndex index)
 {
-  ActivatePane(Common::ToUnderlying(index));
+  ActivatePane(std::to_underlying(index));
 }
diff --git a/Source/Core/DolphinQt/Config/SettingsWindow.h b/Source/Core/DolphinQt/Config/SettingsWindow.h
index 9048e8338530..3874c75ae06e 100644
--- a/Source/Core/DolphinQt/Config/SettingsWindow.h
+++ b/Source/Core/DolphinQt/Config/SettingsWindow.h
@@ -49,6 +49,7 @@ enum class SettingsWindowPaneIndex : int
   Paths,
   GameCube,
   Wii,
+  Triforce,
   Advanced,
 };
 
diff --git a/Source/Core/DolphinQt/Debugger/AssemblyEditor.cpp b/Source/Core/DolphinQt/Debugger/AssemblyEditor.cpp
index 113c59fa07af..4e74465bca0e 100644
--- a/Source/Core/DolphinQt/Debugger/AssemblyEditor.cpp
+++ b/Source/Core/DolphinQt/Debugger/AssemblyEditor.cpp
@@ -10,7 +10,6 @@
 
 #include <filesystem>
 
-#include "Common/Assembler/GekkoParser.h"
 #include "Common/StringUtil.h"
 #include "DolphinQt/Debugger/GekkoSyntaxHighlight.h"
 
diff --git a/Source/Core/DolphinQt/Debugger/BranchWatchDialog.cpp b/Source/Core/DolphinQt/Debugger/BranchWatchDialog.cpp
index c67645b7f38c..09b52e0ac941 100644
--- a/Source/Core/DolphinQt/Debugger/BranchWatchDialog.cpp
+++ b/Source/Core/DolphinQt/Debugger/BranchWatchDialog.cpp
@@ -29,12 +29,10 @@
 #include <QVariant>
 #include <fmt/format.h>
 
-#include "Common/Assert.h"
 #include "Common/CommonFuncs.h"
 #include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
 #include "Common/IOFile.h"
-#include "Common/Unreachable.h"
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 #include "Core/Debugger/BranchWatch.h"
@@ -1217,7 +1215,7 @@ QMenu* BranchWatchDialog::GetTableContextMenu(const QModelIndex& index) const
     return m_mnu_table_context_symbol;
   }
   static_assert(Column::NumberOfColumns == 8);
-  Common::Unreachable();
+  std::unreachable();
 }
 
 void BranchWatchDialog::RefreshVisibleContextMenuActions(bool core_initialized) const
diff --git a/Source/Core/DolphinQt/Debugger/BranchWatchTableModel.cpp b/Source/Core/DolphinQt/Debugger/BranchWatchTableModel.cpp
index 2a3f4cb3d144..2325f4093390 100644
--- a/Source/Core/DolphinQt/Debugger/BranchWatchTableModel.cpp
+++ b/Source/Core/DolphinQt/Debugger/BranchWatchTableModel.cpp
@@ -3,15 +3,14 @@
 
 #include "DolphinQt/Debugger/BranchWatchTableModel.h"
 
-#include <algorithm>
 #include <array>
 #include <cstddef>
+#include <utility>
 
 #include <QBrush>
 
 #include "Common/Assert.h"
 #include "Common/GekkoDisassembler.h"
-#include "Common/Unreachable.h"
 #include "Core/Debugger/BranchWatch.h"
 #include "Core/PowerPC/PPCSymbolDB.h"
 
@@ -352,7 +351,7 @@ QVariant BranchWatchTableModel::DisplayRoleData(const QModelIndex& index) const
     return QString::number(kv->second.total_hits);
   }
   static_assert(Column::NumberOfColumns == 8);
-  Common::Unreachable();
+  std::unreachable();
 }
 
 QVariant BranchWatchTableModel::FontRoleData(const QModelIndex& index) const
@@ -402,7 +401,7 @@ QVariant BranchWatchTableModel::TextAlignmentRoleData(const QModelIndex& index)
     return QVariant::fromValue(Qt::AlignLeft | Qt::AlignVCenter);
   }
   static_assert(Column::NumberOfColumns == 8);
-  Common::Unreachable();
+  std::unreachable();
 }
 
 QVariant BranchWatchTableModel::ForegroundRoleData(const QModelIndex& index) const
@@ -495,5 +494,5 @@ QVariant BranchWatchTableModel::SortRoleData(const QModelIndex& index) const
     return qulonglong{kv->second.total_hits};
   }
   static_assert(Column::NumberOfColumns == 8);
-  Common::Unreachable();
+  std::unreachable();
 }
diff --git a/Source/Core/DolphinQt/Debugger/BreakpointDialog.cpp b/Source/Core/DolphinQt/Debugger/BreakpointDialog.cpp
index b7ffee2cf0be..7c30654b694b 100644
--- a/Source/Core/DolphinQt/Debugger/BreakpointDialog.cpp
+++ b/Source/Core/DolphinQt/Debugger/BreakpointDialog.cpp
@@ -17,7 +17,6 @@
 
 #include "Core/PowerPC/BreakPoints.h"
 #include "Core/PowerPC/Expression.h"
-#include "Core/PowerPC/PowerPC.h"
 #include "DolphinQt/Debugger/BreakpointWidget.h"
 #include "DolphinQt/QtUtils/ModalMessageBox.h"
 
diff --git a/Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp b/Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp
index abbf59c4ce3a..ce02b6baa5a3 100644
--- a/Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp
+++ b/Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp
@@ -27,7 +27,6 @@
 
 #include "Common/Assert.h"
 #include "Common/GekkoDisassembler.h"
-#include "Common/StringUtil.h"
 #include "Core/Core.h"
 #include "Core/Debugger/CodeTrace.h"
 #include "Core/Debugger/PPCDebugInterface.h"
@@ -676,7 +675,7 @@ void CodeViewWidget::OnContextMenu()
 
   auto* note = m_ppc_symbol_db.GetNoteFromAddr(addr);
   note_edit_action->setEnabled(note != nullptr);
-  // A note cannot be added ontop of the starting address of another note.
+  // A note cannot be added on top of the starting address of another note.
   if (note != nullptr && note->address == addr)
     note_add_action->setEnabled(false);
 
diff --git a/Source/Core/DolphinQt/Debugger/JITWidget.cpp b/Source/Core/DolphinQt/Debugger/JITWidget.cpp
index bc60545c1331..9a9fdff058bc 100644
--- a/Source/Core/DolphinQt/Debugger/JITWidget.cpp
+++ b/Source/Core/DolphinQt/Debugger/JITWidget.cpp
@@ -20,7 +20,6 @@
 #include <QTableView>
 #include <QVBoxLayout>
 
-#include <fmt/format.h>
 #include <fmt/ostream.h>
 
 #include "Common/CommonFuncs.h"
diff --git a/Source/Core/DolphinQt/Debugger/JitBlockTableModel.cpp b/Source/Core/DolphinQt/Debugger/JitBlockTableModel.cpp
index 3911b6c311ef..25701d26f40b 100644
--- a/Source/Core/DolphinQt/Debugger/JitBlockTableModel.cpp
+++ b/Source/Core/DolphinQt/Debugger/JitBlockTableModel.cpp
@@ -5,9 +5,9 @@
 
 #include <array>
 #include <span>
+#include <utility>
 
 #include "Common/Assert.h"
-#include "Common/Unreachable.h"
 #include "Core/Core.h"
 #include "Core/PowerPC/JitInterface.h"
 #include "Core/PowerPC/PPCSymbolDB.h"
@@ -284,7 +284,7 @@ QVariant JitBlockTableModel::DisplayRoleData(const QModelIndex& index) const
   }
   }
   static_assert(Column::NumberOfColumns == 14);
-  Common::Unreachable();
+  std::unreachable();
 }
 
 QVariant JitBlockTableModel::TextAlignmentRoleData(const QModelIndex& index) const
@@ -310,7 +310,7 @@ QVariant JitBlockTableModel::TextAlignmentRoleData(const QModelIndex& index) con
     return QVariant::fromValue(Qt::AlignLeft | Qt::AlignVCenter);
   }
   static_assert(Column::NumberOfColumns == 14);
-  Common::Unreachable();
+  std::unreachable();
 }
 
 QVariant JitBlockTableModel::SortRoleData(const QModelIndex& index) const
@@ -358,7 +358,7 @@ QVariant JitBlockTableModel::SortRoleData(const QModelIndex& index) const
     return static_cast<double>(profile_data->time_spent.count()) / profile_data->run_count;
   }
   static_assert(Column::NumberOfColumns == 14);
-  Common::Unreachable();
+  std::unreachable();
 }
 
 QVariant JitBlockTableModel::data(const QModelIndex& index, int role) const
diff --git a/Source/Core/DolphinQt/Debugger/MemoryViewWidget.cpp b/Source/Core/DolphinQt/Debugger/MemoryViewWidget.cpp
index 0b8ffe1d1e0f..a5f5ef6eeaa7 100644
--- a/Source/Core/DolphinQt/Debugger/MemoryViewWidget.cpp
+++ b/Source/Core/DolphinQt/Debugger/MemoryViewWidget.cpp
@@ -19,11 +19,8 @@
 #include <QTableWidget>
 #include <QtGlobal>
 
-#include <fmt/printf.h>
-
 #include "Common/Align.h"
 #include "Common/BitUtils.h"
-#include "Common/FloatUtils.h"
 #include "Common/StringUtil.h"
 #include "Common/Swap.h"
 #include "Core/Core.h"
@@ -984,7 +981,7 @@ void MemoryViewWidget::ToggleHighlights(bool enabled)
   }
   else
   {
-    // Treated as being interchangable with Qt::transparent.
+    // Treated as being interchangeable with Qt::transparent.
     m_highlight_color.setAlpha(0);
 
     // Immediately remove highlights when paused.
@@ -1220,7 +1217,7 @@ void MemoryViewWidget::OnContextMenu(const QPoint& pos)
 
   auto* note = m_ppc_symbol_db.GetNoteFromAddr(addr);
   note_edit_action->setEnabled(note != nullptr);
-  // A note cannot be added ontop of the starting address of another note.
+  // A note cannot be added on top of the starting address of another note.
   if (note != nullptr && note->address == addr)
     note_add_action->setEnabled(false);
 
diff --git a/Source/Core/DolphinQt/Debugger/MemoryWidget.cpp b/Source/Core/DolphinQt/Debugger/MemoryWidget.cpp
index 087247751008..575c1facba7a 100644
--- a/Source/Core/DolphinQt/Debugger/MemoryWidget.cpp
+++ b/Source/Core/DolphinQt/Debugger/MemoryWidget.cpp
@@ -7,8 +7,6 @@
 #include <optional>
 #include <string>
 
-#include <fmt/printf.h>
-
 #include <QButtonGroup>
 #include <QCheckBox>
 #include <QComboBox>
@@ -27,7 +25,6 @@
 #include <QTableWidget>
 #include <QVBoxLayout>
 
-#include "Common/BitUtils.h"
 #include "Common/FileUtil.h"
 #include "Common/IOFile.h"
 #include "Core/ConfigManager.h"
diff --git a/Source/Core/DolphinQt/Debugger/MemoryWidget.h b/Source/Core/DolphinQt/Debugger/MemoryWidget.h
index e1b0118844cb..385ba085db58 100644
--- a/Source/Core/DolphinQt/Debugger/MemoryWidget.h
+++ b/Source/Core/DolphinQt/Debugger/MemoryWidget.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#include <vector>
-
 #include <QByteArray>
 #include <QDockWidget>
 
diff --git a/Source/Core/DolphinQt/Debugger/NetworkWidget.cpp b/Source/Core/DolphinQt/Debugger/NetworkWidget.cpp
index 3d75cca71dd6..c32f55c1b537 100644
--- a/Source/Core/DolphinQt/Debugger/NetworkWidget.cpp
+++ b/Source/Core/DolphinQt/Debugger/NetworkWidget.cpp
@@ -19,12 +19,15 @@
 #include <winsock2.h>
 #else
 #include <sys/socket.h>
-#include <sys/types.h>
 #endif
 
+#include <bit>
+
 #include "Common/FileUtil.h"
+#include "Common/Network.h"
 #include "Core/Config/MainSettings.h"
 #include "Core/Core.h"
+#include "Core/HW/DVD/AMMediaboard.h"
 #include "Core/IOS/Network/SSL.h"
 #include "Core/IOS/Network/Socket.h"
 #include "Core/System.h"
@@ -97,7 +100,7 @@ QTableWidgetItem* GetSocketState(s32 host_fd)
   return new QTableWidgetItem(QTableWidget::tr("Unbound"));
 }
 
-static QTableWidgetItem* GetSocketBlocking(const IOS::HLE::WiiSockMan& socket_manager, s32 wii_fd)
+QTableWidgetItem* GetSocketBlocking(const IOS::HLE::WiiSockMan& socket_manager, s32 wii_fd)
 {
   if (socket_manager.GetHostSocket(wii_fd) < 0)
     return new QTableWidgetItem();
@@ -105,7 +108,7 @@ static QTableWidgetItem* GetSocketBlocking(const IOS::HLE::WiiSockMan& socket_ma
   return new QTableWidgetItem(is_blocking ? QTableWidget::tr("Yes") : QTableWidget::tr("No"));
 }
 
-static QString GetAddressAndPort(const sockaddr_in& addr)
+QString GetAddressAndPort(const sockaddr_in& addr)
 {
   char buffer[16];
   const char* addr_str = inet_ntop(AF_INET, &addr.sin_addr, buffer, sizeof(buffer));
@@ -140,6 +143,50 @@ QTableWidgetItem* GetSocketName(s32 host_fd)
 
   return new QTableWidgetItem(QStringLiteral("%1->%2").arg(sock_name).arg(peer_name));
 }
+
+QTableWidgetItem* GetSocketRedirections(s32 host_fd,
+                                        const AMMediaboard::IPRedirections& ip_redirections)
+{
+  if (host_fd < 0 || ip_redirections.empty())
+    return new QTableWidgetItem();
+
+  sockaddr_in sock_addr;
+  socklen_t sock_addr_len = sizeof(sockaddr_in);
+  if (getsockname(host_fd, reinterpret_cast<sockaddr*>(&sock_addr), &sock_addr_len) != 0)
+    return new QTableWidgetItem();
+  const Common::IPv4Port sock_ip_port{std::bit_cast<Common::IPAddress>(sock_addr.sin_addr),
+                                      sock_addr.sin_port};
+
+  sockaddr_in peer_addr;
+  socklen_t peer_addr_len = sizeof(sockaddr_in);
+  bool has_peer =
+      getpeername(host_fd, reinterpret_cast<sockaddr*>(&peer_addr), &peer_addr_len) == 0;
+  const Common::IPv4Port peer_ip_port =
+      has_peer ? Common::IPv4Port{std::bit_cast<Common::IPAddress>(peer_addr.sin_addr),
+                                  peer_addr.sin_port} :
+                 Common::IPv4Port{};
+
+  QStringList sock_rules;
+  QStringList peer_rules;
+  for (const auto& rule : ip_redirections)
+  {
+    if (rule.replacement.IsMatch(sock_ip_port))
+      sock_rules << QString::fromStdString(rule.ToString());
+    if (!has_peer)
+      continue;
+    if (rule.replacement.IsMatch(peer_ip_port))
+      peer_rules << QString::fromStdString(rule.ToString());
+  }
+
+  if (sock_rules.isEmpty() && peer_rules.isEmpty())
+    return new QTableWidgetItem();
+  if (peer_rules.isEmpty())
+    return new QTableWidgetItem(sock_rules.join(QStringLiteral("\n")));
+  return new QTableWidgetItem(QStringLiteral("Sock rules:\n%1\n"
+                                             "\nPeer rules:%2")
+                                  .arg(sock_rules.join(QStringLiteral("\n")))
+                                  .arg(peer_rules.join(QStringLiteral("\n"))));
+}
 }  // namespace
 
 NetworkWidget::NetworkWidget(QWidget* parent) : QDockWidget(parent)
@@ -185,7 +232,7 @@ void NetworkWidget::closeEvent(QCloseEvent*)
   Settings::Instance().SetNetworkVisible(false);
 }
 
-void NetworkWidget::showEvent(QShowEvent* event)
+void NetworkWidget::showEvent(QShowEvent*)
 {
   Update();
 }
@@ -209,45 +256,34 @@ void NetworkWidget::ConnectWidgets()
 {
   connect(m_dump_format_combo, &QComboBox::currentIndexChanged, this,
           &NetworkWidget::OnDumpFormatComboChanged);
+
 #if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
-  connect(m_dump_ssl_read_checkbox, &QCheckBox::checkStateChanged, [](Qt::CheckState state) {
-    Config::SetBaseOrCurrent(Config::MAIN_NETWORK_SSL_DUMP_READ, state == Qt::Checked);
-  });
-  connect(m_dump_ssl_write_checkbox, &QCheckBox::checkStateChanged, [](Qt::CheckState state) {
-    Config::SetBaseOrCurrent(Config::MAIN_NETWORK_SSL_DUMP_WRITE, state == Qt::Checked);
-  });
-  connect(m_dump_root_ca_checkbox, &QCheckBox::checkStateChanged, [](Qt::CheckState state) {
-    Config::SetBaseOrCurrent(Config::MAIN_NETWORK_SSL_DUMP_ROOT_CA, state == Qt::Checked);
-  });
-  connect(m_dump_peer_cert_checkbox, &QCheckBox::checkStateChanged, [](Qt::CheckState state) {
-    Config::SetBaseOrCurrent(Config::MAIN_NETWORK_SSL_DUMP_PEER_CERT, state == Qt::Checked);
-  });
-  connect(m_verify_certificates_checkbox, &QCheckBox::checkStateChanged, [](Qt::CheckState state) {
-    Config::SetBaseOrCurrent(Config::MAIN_NETWORK_SSL_VERIFY_CERTIFICATES, state == Qt::Checked);
-  });
-  connect(m_dump_bba_checkbox, &QCheckBox::checkStateChanged, [](Qt::CheckState state) {
-    Config::SetBaseOrCurrent(Config::MAIN_NETWORK_DUMP_BBA, state == Qt::Checked);
-  });
+  using CheckState = Qt::CheckState;
+  static constexpr auto checkStateChanged = &QCheckBox::checkStateChanged;
 #else
-  connect(m_dump_ssl_read_checkbox, &QCheckBox::stateChanged, [](int state) {
+  using CheckState = int;
+  static constexpr auto checkStateChanged = &QCheckBox::stateChanged;
+#endif
+
+  connect(m_dump_ssl_read_checkbox, checkStateChanged, [](CheckState state) {
     Config::SetBaseOrCurrent(Config::MAIN_NETWORK_SSL_DUMP_READ, state == Qt::Checked);
   });
-  connect(m_dump_ssl_write_checkbox, &QCheckBox::stateChanged, [](int state) {
+  connect(m_dump_ssl_write_checkbox, checkStateChanged, [](CheckState state) {
     Config::SetBaseOrCurrent(Config::MAIN_NETWORK_SSL_DUMP_WRITE, state == Qt::Checked);
   });
-  connect(m_dump_root_ca_checkbox, &QCheckBox::stateChanged, [](int state) {
+  connect(m_dump_root_ca_checkbox, checkStateChanged, [](CheckState state) {
     Config::SetBaseOrCurrent(Config::MAIN_NETWORK_SSL_DUMP_ROOT_CA, state == Qt::Checked);
   });
-  connect(m_dump_peer_cert_checkbox, &QCheckBox::stateChanged, [](int state) {
+  connect(m_dump_peer_cert_checkbox, checkStateChanged, [](CheckState state) {
     Config::SetBaseOrCurrent(Config::MAIN_NETWORK_SSL_DUMP_PEER_CERT, state == Qt::Checked);
   });
-  connect(m_verify_certificates_checkbox, &QCheckBox::stateChanged, [](int state) {
+  connect(m_verify_certificates_checkbox, checkStateChanged, [](CheckState state) {
     Config::SetBaseOrCurrent(Config::MAIN_NETWORK_SSL_VERIFY_CERTIFICATES, state == Qt::Checked);
   });
-  connect(m_dump_bba_checkbox, &QCheckBox::stateChanged, [](int state) {
+  connect(m_dump_bba_checkbox, checkStateChanged, [](CheckState state) {
     Config::SetBaseOrCurrent(Config::MAIN_NETWORK_DUMP_BBA, state == Qt::Checked);
   });
-#endif
+
   connect(m_open_dump_folder, &QPushButton::clicked, [] {
     const std::string location = File::GetUserPath(D_DUMPSSL_IDX);
     const QUrl url = QUrl::fromLocalFile(QString::fromStdString(location));
@@ -255,24 +291,12 @@ void NetworkWidget::ConnectWidgets()
   });
 }
 
-void NetworkWidget::Update()
+void NetworkWidget::UpdateWiiSocketTable(Core::System& system)
 {
-  if (!isVisible())
-    return;
-
-  auto& system = Core::System::GetInstance();
-  if (Core::GetState(system) != Core::State::Paused)
-  {
-    m_socket_table->setDisabled(true);
-    m_ssl_table->setDisabled(true);
-    return;
-  }
-
-  m_socket_table->setDisabled(false);
-  m_ssl_table->setDisabled(false);
-
-  // needed because there's a race condition on the IOS instance otherwise
-  const Core::CPUThreadGuard guard(system);
+  // Show Wii socket blocking state
+  m_socket_table->showColumn(4);
+  // Hide Triforce IP redirections
+  m_socket_table->hideColumn(6);
 
   auto* ios = system.GetIOS();
   if (!ios)
@@ -282,7 +306,6 @@ void NetworkWidget::Update()
   if (!socket_manager)
     return;
 
-  m_socket_table->setRowCount(0);
   for (s32 wii_fd = 0; wii_fd < IOS::HLE::WII_SOCKET_FD_MAX; wii_fd++)
   {
     m_socket_table->insertRow(wii_fd);
@@ -294,9 +317,7 @@ void NetworkWidget::Update()
     m_socket_table->setItem(wii_fd, 4, GetSocketBlocking(*socket_manager, wii_fd));
     m_socket_table->setItem(wii_fd, 5, GetSocketName(host_fd));
   }
-  m_socket_table->resizeColumnsToContents();
 
-  m_ssl_table->setRowCount(0);
   for (s32 ssl_id = 0; ssl_id < IOS::HLE::NET_SSL_MAXINSTANCES; ssl_id++)
   {
     m_ssl_table->insertRow(ssl_id);
@@ -313,6 +334,58 @@ void NetworkWidget::Update()
     m_ssl_table->setItem(ssl_id, 3, GetSocketState(host_fd));
     m_ssl_table->setItem(ssl_id, 4, GetSocketName(host_fd));
   }
+}
+
+void NetworkWidget::UpdateTriforceSocketTable()
+{
+  // No easy way to get socket blocking state on Windows
+  m_socket_table->hideColumn(4);
+  // Show active IP redirections
+  m_socket_table->showColumn(6);
+  const auto ip_redirections = AMMediaboard::GetIPRedirections();
+  for (s32 triforce_fd = 0; triforce_fd != AMMediaboard::SOCKET_FD_MAX; ++triforce_fd)
+  {
+    m_socket_table->insertRow(triforce_fd);
+    const s32 host_fd = AMMediaboard::DebuggerGetSocket(triforce_fd);
+    m_socket_table->setItem(triforce_fd, 0, new QTableWidgetItem(QString::number(triforce_fd)));
+    m_socket_table->setItem(triforce_fd, 1, GetSocketDomain(host_fd));
+    m_socket_table->setItem(triforce_fd, 2, GetSocketType(host_fd));
+    m_socket_table->setItem(triforce_fd, 3, GetSocketState(host_fd));
+    m_socket_table->setItem(triforce_fd, 4, new QTableWidgetItem(QTableWidget::tr("Unknown")));
+    m_socket_table->setItem(triforce_fd, 5, GetSocketName(host_fd));
+    m_socket_table->setItem(triforce_fd, 6, GetSocketRedirections(host_fd, ip_redirections));
+  }
+}
+
+void NetworkWidget::Update()
+{
+  if (!isVisible())
+    return;
+
+  auto& system = Core::System::GetInstance();
+  if (Core::GetState(system) != Core::State::Paused)
+  {
+    m_socket_table->setDisabled(true);
+    m_ssl_table->setDisabled(true);
+    return;
+  }
+
+  // needed because there's a race condition on the IOS instance otherwise
+  const Core::CPUThreadGuard guard(system);
+  m_socket_table->setDisabled(false);
+  m_socket_table->setRowCount(0);
+  m_ssl_table->setRowCount(0);
+  if (system.IsTriforce())
+  {
+    UpdateTriforceSocketTable();
+  }
+  else if (system.IsWii())
+  {
+    m_ssl_table->setDisabled(false);
+    UpdateWiiSocketTable(system);
+  }
+  m_socket_table->resizeColumnsToContents();
+  m_socket_table->resizeRowsToContents();
   m_ssl_table->resizeColumnsToContents();
 
   const bool is_pcap = Config::Get(Config::MAIN_NETWORK_DUMP_AS_PCAP);
@@ -329,27 +402,31 @@ void NetworkWidget::Update()
   const int combo_index = int([is_pcap, is_ssl_read, is_ssl_write]() -> FormatComboId {
     if (is_pcap)
       return FormatComboId::PCAP;
-    else if (is_ssl_read && is_ssl_write)
+
+    if (is_ssl_read && is_ssl_write)
       return FormatComboId::BinarySSL;
-    else if (is_ssl_read)
+
+    if (is_ssl_read)
       return FormatComboId::BinarySSLRead;
-    else if (is_ssl_write)
+
+    if (is_ssl_write)
       return FormatComboId::BinarySSLWrite;
-    else
-      return FormatComboId::None;
+
+    return FormatComboId::None;
   }());
   m_dump_format_combo->setCurrentIndex(combo_index);
 }
 
 QGroupBox* NetworkWidget::CreateSocketTableGroup()
 {
-  QGroupBox* socket_table_group = new QGroupBox(tr("Socket table"));
-  QGridLayout* socket_table_layout = new QGridLayout;
+  auto* const socket_table_group = new QGroupBox(tr("Socket table"));
+  auto* const socket_table_layout = new QGridLayout;
   socket_table_group->setLayout(socket_table_layout);
 
   m_socket_table = new QTableWidget();
   // i18n: FD stands for file descriptor (and in this case refers to sockets, not regular files)
-  QStringList header{tr("FD"), tr("Domain"), tr("Type"), tr("State"), tr("Blocking"), tr("Name")};
+  QStringList header{tr("FD"),       tr("Domain"), tr("Type"),        tr("State"),
+                     tr("Blocking"), tr("Name"),   tr("Redirections")};
   m_socket_table->setColumnCount(static_cast<int>(header.size()));
 
   m_socket_table->setHorizontalHeaderLabels(header);
@@ -366,8 +443,8 @@ QGroupBox* NetworkWidget::CreateSocketTableGroup()
 
 QGroupBox* NetworkWidget::CreateSSLContextGroup()
 {
-  QGroupBox* ssl_context_group = new QGroupBox(tr("SSL context"));
-  QGridLayout* ssl_context_layout = new QGridLayout;
+  auto* const ssl_context_group = new QGroupBox(tr("SSL context"));
+  auto* const ssl_context_layout = new QGridLayout;
   ssl_context_group->setLayout(ssl_context_layout);
 
   m_ssl_table = new QTableWidget();
@@ -388,8 +465,8 @@ QGroupBox* NetworkWidget::CreateSSLContextGroup()
 
 QGroupBox* NetworkWidget::CreateDumpOptionsGroup()
 {
-  auto* dump_options_group = new QGroupBox(tr("Dump options"));
-  auto* dump_options_layout = new QVBoxLayout;
+  auto* const dump_options_group = new QGroupBox(tr("Dump options"));
+  auto* const dump_options_layout = new QVBoxLayout;
   dump_options_group->setLayout(dump_options_layout);
 
   m_dump_format_combo = CreateDumpFormatCombo();
@@ -403,9 +480,9 @@ QGroupBox* NetworkWidget::CreateDumpOptionsGroup()
   m_open_dump_folder = new QPushButton(tr("Open dump folder"));
   m_open_dump_folder->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
 
-  auto* combo_label = new QLabel(tr("Network dump format:"));
+  auto* const combo_label = new QLabel(tr("Network dump format:"));
   combo_label->setBuddy(m_dump_format_combo);
-  auto* combo_layout = new QHBoxLayout;
+  auto* const combo_layout = new QHBoxLayout;
   combo_layout->addWidget(combo_label);
   const int combo_label_space =
       combo_label->fontMetrics().boundingRect(QStringLiteral("__")).width();
@@ -427,8 +504,8 @@ QGroupBox* NetworkWidget::CreateDumpOptionsGroup()
 
 QGroupBox* NetworkWidget::CreateSecurityOptionsGroup()
 {
-  auto* security_options_group = new QGroupBox(tr("Security options"));
-  auto* security_options_layout = new QVBoxLayout;
+  auto* const security_options_group = new QGroupBox(tr("Security options"));
+  auto* const security_options_layout = new QVBoxLayout;
   security_options_group->setLayout(security_options_layout);
 
   m_verify_certificates_checkbox = new QCheckBox(tr("Verify certificates"));
diff --git a/Source/Core/DolphinQt/Debugger/NetworkWidget.h b/Source/Core/DolphinQt/Debugger/NetworkWidget.h
index c1b1e564d9ca..c2bb13e1d6cb 100644
--- a/Source/Core/DolphinQt/Debugger/NetworkWidget.h
+++ b/Source/Core/DolphinQt/Debugger/NetworkWidget.h
@@ -5,8 +5,6 @@
 
 #include <QDockWidget>
 
-#include "Common/CommonTypes.h"
-
 class QCheckBox;
 class QCloseEvent;
 class QComboBox;
@@ -16,6 +14,11 @@ class QShowEvent;
 class QTableWidget;
 class QTableWidgetItem;
 
+namespace Core
+{
+class System;
+}
+
 class NetworkWidget : public QDockWidget
 {
   Q_OBJECT
@@ -31,6 +34,8 @@ class NetworkWidget : public QDockWidget
   void CreateWidgets();
   void ConnectWidgets();
 
+  void UpdateWiiSocketTable(Core::System& system);
+  void UpdateTriforceSocketTable();
   void Update();
 
   QGroupBox* CreateSocketTableGroup();
diff --git a/Source/Core/DolphinQt/Debugger/RegisterColumn.h b/Source/Core/DolphinQt/Debugger/RegisterColumn.h
index 9547becce25f..53323ae043f7 100644
--- a/Source/Core/DolphinQt/Debugger/RegisterColumn.h
+++ b/Source/Core/DolphinQt/Debugger/RegisterColumn.h
@@ -31,7 +31,7 @@ enum class RegisterType
   int_mask,    // ???
   int_cause,   // ???
   dsisr,       // Defines the cause of data / alignment exceptions
-  dar,         // Data adress register
+  dar,         // Data address register
   pt_hashmask  // ???
 };
 
diff --git a/Source/Core/DolphinQt/Debugger/RegisterWidget.cpp b/Source/Core/DolphinQt/Debugger/RegisterWidget.cpp
index 8bb9d882916d..80cd55f6745b 100644
--- a/Source/Core/DolphinQt/Debugger/RegisterWidget.cpp
+++ b/Source/Core/DolphinQt/Debugger/RegisterWidget.cpp
@@ -15,6 +15,7 @@
 #include "Core/Core.h"
 #include "Core/Debugger/CodeTrace.h"
 #include "Core/HW/ProcessorInterface.h"
+#include "Core/PowerPC/MMU.h"
 #include "Core/PowerPC/PowerPC.h"
 #include "Core/System.h"
 #include "DolphinQt/Host.h"
@@ -405,7 +406,10 @@ void RegisterWidget::PopulateTable()
     AddRegister(
         i, 7, RegisterType::sr, "SR" + std::to_string(i),
         [this, i] { return m_system.GetPPCState().sr[i]; },
-        [this, i](u64 value) { m_system.GetPPCState().sr[i] = value; });
+        [this, i](u64 value) {
+          m_system.GetPPCState().sr[i] = value;
+          m_system.GetMMU().SRUpdated();
+        });
   }
 
   // Special registers
@@ -490,7 +494,7 @@ void RegisterWidget::PopulateTable()
       31, 5, RegisterType::pt_hashmask, "Hash Mask",
       [this] {
         const auto& ppc_state = m_system.GetPPCState();
-        return (ppc_state.pagetable_hashmask << 6) | ppc_state.pagetable_base;
+        return ppc_state.pagetable_mask | ppc_state.pagetable_base;
       },
       nullptr);
 
diff --git a/Source/Core/DolphinQt/DiscordHandler.cpp b/Source/Core/DolphinQt/DiscordHandler.cpp
index 49363321dbd0..f52d31b2ce89 100644
--- a/Source/Core/DolphinQt/DiscordHandler.cpp
+++ b/Source/Core/DolphinQt/DiscordHandler.cpp
@@ -6,7 +6,6 @@
 #include "DolphinQt/DiscordHandler.h"
 
 #include <chrono>
-#include <iterator>
 
 #include <QApplication>
 
diff --git a/Source/Core/DolphinQt/DolphinQt.vcxproj b/Source/Core/DolphinQt/DolphinQt.vcxproj
index f91dab20f938..9df5caf41305 100644
--- a/Source/Core/DolphinQt/DolphinQt.vcxproj
+++ b/Source/Core/DolphinQt/DolphinQt.vcxproj
@@ -223,6 +223,7 @@
     <ClCompile Include="Settings\GeneralPane.cpp" />
     <ClCompile Include="Settings\InterfacePane.cpp" />
     <ClCompile Include="Settings\OnScreenDisplayPane.cpp" />
+    <ClCompile Include="Settings\TriforcePane.cpp" />
     <ClCompile Include="Settings\PathPane.cpp" />
     <ClCompile Include="Settings\USBDevicePicker.cpp" />
     <ClCompile Include="Settings\WiiPane.cpp" />
@@ -439,6 +440,7 @@
     <QtMoc Include="Settings\GeneralPane.h" />
     <QtMoc Include="Settings\InterfacePane.h" />
     <QtMoc Include="Settings\PathPane.h" />
+    <QtMoc Include="Settings\TriforcePane.h" />
     <QtMoc Include="Settings\USBDevicePicker.h" />
     <QtMoc Include="Settings\WiiPane.h" />
     <QtMoc Include="SkylanderPortal\SkylanderPortalWindow.h" />
@@ -508,16 +510,19 @@
   <!--Copy Exe, Data directory and DLLs which should be located in the executable directory-->
   <ItemGroup>
     <DataSysFiles Include="$(DolphinRootDir)Data\**\Sys\**\*.*" />
-    <DataTxtFiles Include="$(DolphinRootDir)Data\license.txt" />
+    <DataTxtFiles Include="$(DolphinRootDir)\COPYING" />
+    <DataLicenseFiles Include="$(DolphinRootDir)\LICENSES\*.*" />
     <BinaryFiles Include="$(TargetPath)" />
-    <AllInputFiles Include="@(DataSysFiles);@(DataTxtFiles);@(BinaryFiles)" />
+    <AllInputFiles Include="@(DataSysFiles);@(DataTxtFiles);@(DataLicenseFiles);@(BinaryFiles)" />
   </ItemGroup>
   <Target Name="AfterBuild" Inputs="@(AllInputFiles)" Outputs="@(AllInputFiles -> '$(BinaryOutputDir)%(RecursiveDir)%(Filename)%(Extension)')">
     <Message Text="Copying Data directory..." Importance="High" />
     <RemoveDir Directories="$(BinaryOutputDir)Sys" />
     <Copy SourceFiles="@(DataSysFiles)" DestinationFolder="$(BinaryOutputDir)%(RecursiveDir)" SkipUnchangedFiles="True" />
     <Copy SourceFiles="@(DataTxtFiles)" DestinationFolder="$(BinaryOutputDir)" SkipUnchangedFiles="True" />
+    <RemoveDir Directories="$(BinaryOutputDir)LICENSES" />
+    <Copy SourceFiles="@(DataLicenseFiles)" DestinationFolder="$(BinaryOutputDir)LICENSES" SkipUnchangedFiles="True" />
     <Message Text="Copy: @(BinaryFiles) -&gt; $(BinaryOutputDir)" Importance="High" />
     <Copy SourceFiles="@(BinaryFiles)" DestinationFolder="$(BinaryOutputDir)" />
   </Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Source/Core/DolphinQt/EmulatedUSB/LogitechMicWindow.cpp b/Source/Core/DolphinQt/EmulatedUSB/LogitechMicWindow.cpp
index 04b4a8b16e06..1c1954cd5f20 100644
--- a/Source/Core/DolphinQt/EmulatedUSB/LogitechMicWindow.cpp
+++ b/Source/Core/DolphinQt/EmulatedUSB/LogitechMicWindow.cpp
@@ -114,7 +114,7 @@ void LogitechMicWindow::CreateMicrophoneConfigurationGroup(QVBoxLayout* main_lay
 
     m_mic_device_comboboxes[index] = new QComboBox();
 #ifndef HAVE_CUBEB
-    m_combobox_microphone[index]->addItem(
+    m_mic_device_comboboxes[index]->addItem(
         QLatin1String("(%1)").arg(tr("Audio backend unsupported")), QString{});
 #else
     m_mic_device_comboboxes[index]->addItem(
diff --git a/Source/Core/DolphinQt/EmulatedUSB/WiiSpeakWindow.cpp b/Source/Core/DolphinQt/EmulatedUSB/WiiSpeakWindow.cpp
index 303b63088167..1bc41b19febe 100644
--- a/Source/Core/DolphinQt/EmulatedUSB/WiiSpeakWindow.cpp
+++ b/Source/Core/DolphinQt/EmulatedUSB/WiiSpeakWindow.cpp
@@ -20,12 +20,14 @@
 #include "Core/Config/MainSettings.h"
 #include "Core/Core.h"
 #include "Core/System.h"
+#include "DolphinQt/Resources.h"
 #include "DolphinQt/Settings.h"
 
 WiiSpeakWindow::WiiSpeakWindow(QWidget* parent) : QWidget(parent)
 {
   // i18n: Window for managing the Wii Speak microphone
   setWindowTitle(tr("Wii Speak Manager"));
+  setWindowIcon(Resources::GetAppIcon());
   setObjectName(QStringLiteral("wii_speak_manager"));
   setMinimumSize(QSize(700, 200));
 
diff --git a/Source/Core/DolphinQt/FIFO/FIFOAnalyzer.cpp b/Source/Core/DolphinQt/FIFO/FIFOAnalyzer.cpp
index ae06a30dfc76..3df9dfcbbc8e 100644
--- a/Source/Core/DolphinQt/FIFO/FIFOAnalyzer.cpp
+++ b/Source/Core/DolphinQt/FIFO/FIFOAnalyzer.cpp
@@ -6,6 +6,7 @@
 #include <algorithm>
 #include <bit>
 #include <ranges>
+#include <utility>
 
 #include <QGroupBox>
 #include <QHBoxLayout>
@@ -20,7 +21,6 @@
 #include <QTreeWidgetItem>
 
 #include "Common/Assert.h"
-#include "Common/EnumUtils.h"
 #include "Common/Swap.h"
 #include "Core/FifoPlayer/FifoPlayer.h"
 
@@ -30,7 +30,6 @@
 #include "VideoCommon/BPMemory.h"
 #include "VideoCommon/CPMemory.h"
 #include "VideoCommon/OpcodeDecoding.h"
-#include "VideoCommon/VertexLoaderBase.h"
 #include "VideoCommon/XFStructs.h"
 
 // Values range from 0 to number of frames - 1
@@ -264,7 +263,7 @@ class DetailCallback : public OpcodeDecoder::Callback
     const u32 object_prim_size = num_vertices * vertex_size;
 
     const u8 opcode =
-        0x80 | Common::ToUnderlying(primitive) << OpcodeDecoder::GX_PRIMITIVE_SHIFT | vat;
+        0x80 | std::to_underlying(primitive) << OpcodeDecoder::GX_PRIMITIVE_SHIFT | vat;
     text = QStringLiteral("PRIMITIVE %1 (%2)  %3 vertices %4 bytes/vertex %5 total bytes")
                .arg(QString::fromStdString(name))
                .arg(opcode, 2, 16, QLatin1Char('0'))
diff --git a/Source/Core/DolphinQt/FIFO/FIFOPlayerWindow.cpp b/Source/Core/DolphinQt/FIFO/FIFOPlayerWindow.cpp
index d1309d709ff8..26f89637c188 100644
--- a/Source/Core/DolphinQt/FIFO/FIFOPlayerWindow.cpp
+++ b/Source/Core/DolphinQt/FIFO/FIFOPlayerWindow.cpp
@@ -17,8 +17,6 @@
 #include <QTabWidget>
 #include <QVBoxLayout>
 
-#include <algorithm>
-
 #include "Core/Core.h"
 #include "Core/FifoPlayer/FifoDataFile.h"
 #include "Core/FifoPlayer/FifoPlayer.h"
diff --git a/Source/Core/DolphinQt/GBAWidget.cpp b/Source/Core/DolphinQt/GBAWidget.cpp
index d375b3c8c22d..af319b890ead 100644
--- a/Source/Core/DolphinQt/GBAWidget.cpp
+++ b/Source/Core/DolphinQt/GBAWidget.cpp
@@ -37,34 +37,28 @@
 
 static void RestartCore(const std::weak_ptr<HW::GBA::Core>& core, std::string_view rom_path = {})
 {
-  Core::RunOnCPUThread(
-      Core::System::GetInstance(),
-      [core, rom_path = std::string(rom_path)] {
-        if (auto core_ptr = core.lock())
-        {
-          auto& info = Config::MAIN_GBA_ROM_PATHS[core_ptr->GetCoreInfo().device_number];
-          core_ptr->Stop();
-          Config::SetCurrent(info, rom_path);
-          auto& system = Core::System::GetInstance();
-          auto& core_timing = system.GetCoreTiming();
-          if (core_ptr->Start(core_timing.GetTicks()))
-            return;
-          Config::SetCurrent(info, Config::GetBase(info));
-          core_ptr->Start(core_timing.GetTicks());
-        }
-      },
-      false);
+  Core::RunOnCPUThread(Core::System::GetInstance(), [core, rom_path = std::string(rom_path)] {
+    if (auto core_ptr = core.lock())
+    {
+      auto& info = Config::MAIN_GBA_ROM_PATHS[core_ptr->GetCoreInfo().device_number];
+      core_ptr->Stop();
+      Config::SetCurrent(info, rom_path);
+      auto& system = Core::System::GetInstance();
+      auto& core_timing = system.GetCoreTiming();
+      if (core_ptr->Start(core_timing.GetTicks()))
+        return;
+      Config::SetCurrent(info, Config::GetBase(info));
+      core_ptr->Start(core_timing.GetTicks());
+    }
+  });
 }
 
 static void QueueEReaderCard(const std::weak_ptr<HW::GBA::Core>& core, std::string_view card_path)
 {
-  Core::RunOnCPUThread(
-      Core::System::GetInstance(),
-      [core, card_path = std::string(card_path)] {
-        if (auto core_ptr = core.lock())
-          core_ptr->EReaderQueueCard(card_path);
-      },
-      false);
+  Core::RunOnCPUThread(Core::System::GetInstance(), [core, card_path = std::string(card_path)] {
+    if (auto core_ptr = core.lock())
+      core_ptr->EReaderQueueCard(card_path);
+  });
 }
 
 GBAWidget::GBAWidget(std::weak_ptr<HW::GBA::Core> core, const HW::GBA::CoreInfo& info,
@@ -161,13 +155,11 @@ void GBAWidget::ToggleDisconnect()
 
   m_force_disconnect = !m_force_disconnect;
 
-  Core::RunOnCPUThread(
-      Core::System::GetInstance(),
-      [core = m_core, force_disconnect = m_force_disconnect] {
-        if (auto core_ptr = core.lock())
-          core_ptr->SetForceDisconnect(force_disconnect);
-      },
-      false);
+  Core::RunOnCPUThread(Core::System::GetInstance(),
+                       [core = m_core, force_disconnect = m_force_disconnect] {
+                         if (auto core_ptr = core.lock())
+                           core_ptr->SetForceDisconnect(force_disconnect);
+                       });
 }
 
 void GBAWidget::LoadROM()
@@ -224,18 +216,16 @@ void GBAWidget::DoState(bool export_state)
   if (state_path.isEmpty())
     return;
 
-  Core::RunOnCPUThread(
-      Core::System::GetInstance(),
-      [export_state, core = m_core, state_path = state_path.toStdString()] {
-        if (auto core_ptr = core.lock())
-        {
-          if (export_state)
-            core_ptr->ExportState(state_path);
-          else
-            core_ptr->ImportState(state_path);
-        }
-      },
-      false);
+  Core::RunOnCPUThread(Core::System::GetInstance(),
+                       [export_state, core = m_core, state_path = state_path.toStdString()] {
+                         if (auto core_ptr = core.lock())
+                         {
+                           if (export_state)
+                             core_ptr->ExportState(state_path);
+                           else
+                             core_ptr->ImportState(state_path);
+                         }
+                       });
 }
 
 void GBAWidget::ImportExportSave(bool export_save)
@@ -255,18 +245,16 @@ void GBAWidget::ImportExportSave(bool export_save)
   if (save_path.isEmpty())
     return;
 
-  Core::RunOnCPUThread(
-      Core::System::GetInstance(),
-      [export_save, core = m_core, save_path = save_path.toStdString()] {
-        if (auto core_ptr = core.lock())
-        {
-          if (export_save)
-            core_ptr->ExportSave(save_path);
-          else
-            core_ptr->ImportSave(save_path);
-        }
-      },
-      false);
+  Core::RunOnCPUThread(Core::System::GetInstance(),
+                       [export_save, core = m_core, save_path = save_path.toStdString()] {
+                         if (auto core_ptr = core.lock())
+                         {
+                           if (export_save)
+                             core_ptr->ExportSave(save_path);
+                           else
+                             core_ptr->ImportSave(save_path);
+                         }
+                       });
 }
 
 void GBAWidget::Resize(int scale)
diff --git a/Source/Core/DolphinQt/GCMemcardCreateNewDialog.cpp b/Source/Core/DolphinQt/GCMemcardCreateNewDialog.cpp
index dc370178304f..86b316564a79 100644
--- a/Source/Core/DolphinQt/GCMemcardCreateNewDialog.cpp
+++ b/Source/Core/DolphinQt/GCMemcardCreateNewDialog.cpp
@@ -11,7 +11,6 @@
 #include <QRadioButton>
 
 #include "Common/FileUtil.h"
-#include "Common/MsgHandler.h"
 #include "Common/Timer.h"
 
 #include "Core/HW/EXI/EXI_DeviceIPL.h"
diff --git a/Source/Core/DolphinQt/GCMemcardManager.cpp b/Source/Core/DolphinQt/GCMemcardManager.cpp
index c14a6653f63b..63f3538c0c7a 100644
--- a/Source/Core/DolphinQt/GCMemcardManager.cpp
+++ b/Source/Core/DolphinQt/GCMemcardManager.cpp
@@ -30,8 +30,6 @@
 #include "Common/CommonPaths.h"
 #include "Common/Config/Config.h"
 #include "Common/FileUtil.h"
-#include "Common/MsgHandler.h"
-#include "Common/StringUtil.h"
 #include "Common/VariantUtil.h"
 
 #include "Core/Config/MainSettings.h"
diff --git a/Source/Core/DolphinQt/GameList/GameList.cpp b/Source/Core/DolphinQt/GameList/GameList.cpp
index 334134dfc037..3834a6fffde4 100644
--- a/Source/Core/DolphinQt/GameList/GameList.cpp
+++ b/Source/Core/DolphinQt/GameList/GameList.cpp
@@ -25,8 +25,6 @@
 #include <cmath>
 #include <utility>
 
-#include <fmt/format.h>
-
 #include <QDesktopServices>
 #include <QDir>
 #include <QErrorMessage>
@@ -45,8 +43,9 @@
 #include <QTableView>
 #include <QUrl>
 
-#include "Common/CommonPaths.h"
+#ifdef _WIN32
 #include "Common/Contains.h"
+#endif
 #include "Common/FileUtil.h"
 
 #include "Core/Config/MainSettings.h"
@@ -58,7 +57,6 @@
 #include "Core/System.h"
 #include "Core/WiiUtils.h"
 
-#include "DiscIO/Blob.h"
 #include "DiscIO/Enums.h"
 
 #include "DolphinQt/Config/PropertiesDialog.h"
@@ -70,7 +68,6 @@
 #include "DolphinQt/QtUtils/DoubleClickEventFilter.h"
 #include "DolphinQt/QtUtils/ModalMessageBox.h"
 #include "DolphinQt/QtUtils/NonAutodismissibleMenu.h"
-#include "DolphinQt/QtUtils/ParallelProgressDialog.h"
 #include "DolphinQt/Resources.h"
 #include "DolphinQt/Settings.h"
 #include "DolphinQt/WiiUpdate.h"
diff --git a/Source/Core/DolphinQt/Host.cpp b/Source/Core/DolphinQt/Host.cpp
index 9407e5424b8b..ea7b1920c6cd 100644
--- a/Source/Core/DolphinQt/Host.cpp
+++ b/Source/Core/DolphinQt/Host.cpp
@@ -16,15 +16,12 @@
 #include <windows.h>
 #endif
 
-#include "Common/Common.h"
-
 #include "Core/Config/MainSettings.h"
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 #include "Core/Debugger/PPCDebugInterface.h"
 #include "Core/Host.h"
 #include "Core/NetPlayProto.h"
-#include "Core/PowerPC/PowerPC.h"
 #include "Core/State.h"
 #include "Core/System.h"
 
diff --git a/Source/Core/DolphinQt/HotkeyScheduler.cpp b/Source/Core/DolphinQt/HotkeyScheduler.cpp
index 26a762377cec..e2722e9cfe2b 100644
--- a/Source/Core/DolphinQt/HotkeyScheduler.cpp
+++ b/Source/Core/DolphinQt/HotkeyScheduler.cpp
@@ -18,33 +18,28 @@
 #include "Common/Thread.h"
 
 #include "Core/AchievementManager.h"
-#include "Core/Config/AchievementSettings.h"
 #include "Core/Config/FreeLookSettings.h"
 #include "Core/Config/GraphicsSettings.h"
 #include "Core/Config/MainSettings.h"
 #include "Core/Config/UISettings.h"
 #include "Core/Core.h"
 #include "Core/FreeLookManager.h"
-#include "Core/Host.h"
 #include "Core/HotkeyManager.h"
 #include "Core/IOS/IOS.h"
-#include "Core/IOS/USB/Bluetooth/BTBase.h"
-#include "Core/IOS/USB/Bluetooth/BTReal.h"
 #include "Core/State.h"
 #include "Core/System.h"
 #include "Core/WiiUtils.h"
 
 #ifdef HAS_LIBMGBA
 #include "DolphinQt/GBAWidget.h"
-#endif
 #include "DolphinQt/QtUtils/QueueOnObject.h"
+#endif
 #include "DolphinQt/Settings.h"
 
 #include "InputCommon/ControlReference/ControlReference.h"
 #include "InputCommon/ControllerInterface/ControllerInterface.h"
 
 #include "VideoCommon/OnScreenDisplay.h"
-#include "VideoCommon/VertexShaderManager.h"
 #include "VideoCommon/VideoConfig.h"
 
 constexpr const char* DUBOIS_ALGORITHM_SHADER = "dubois";
diff --git a/Source/Core/DolphinQt/Info.plist.in b/Source/Core/DolphinQt/Info.plist.in
index 0550533969dc..034d472a1dd7 100644
--- a/Source/Core/DolphinQt/Info.plist.in
+++ b/Source/Core/DolphinQt/Info.plist.in
@@ -50,5 +50,7 @@
     <true/>
     <key>CSResourcesFileMapped</key>
     <true/>
+    <key>UIDesignRequiresCompatibility</key>
+    <true/>
 </dict>
 </plist>
diff --git a/Source/Core/DolphinQt/Main.cpp b/Source/Core/DolphinQt/Main.cpp
index 5f4657c0cd31..6ebff534625b 100644
--- a/Source/Core/DolphinQt/Main.cpp
+++ b/Source/Core/DolphinQt/Main.cpp
@@ -36,7 +36,9 @@
 #include "DolphinQt/QtUtils/AnalyticsPrompt.h"
 #include "DolphinQt/QtUtils/ModalMessageBox.h"
 #include "DolphinQt/QtUtils/RunOnObject.h"
+#ifdef _WIN32
 #include "DolphinQt/QtUtils/SetWindowDecorations.h"
+#endif
 #include "DolphinQt/Resources.h"
 #include "DolphinQt/Settings.h"
 #include "DolphinQt/Translation.h"
diff --git a/Source/Core/DolphinQt/MainWindow.cpp b/Source/Core/DolphinQt/MainWindow.cpp
index 73049054427a..962f75e96c88 100644
--- a/Source/Core/DolphinQt/MainWindow.cpp
+++ b/Source/Core/DolphinQt/MainWindow.cpp
@@ -45,7 +45,6 @@
 #include "Core/BootManager.h"
 #include "Core/CommonTitles.h"
 #include "Core/Config/AchievementSettings.h"
-#include "Core/Config/FreeLookSettings.h"
 #include "Core/Config/MainSettings.h"
 #include "Core/Config/NetplaySettings.h"
 #include "Core/Config/UISettings.h"
@@ -59,10 +58,8 @@
 #include "Core/HW/ProcessorInterface.h"
 #include "Core/HW/SI/SI_Device.h"
 #include "Core/HW/Wiimote.h"
-#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
 #include "Core/HotkeyManager.h"
 #include "Core/IOS/USB/Bluetooth/BTEmu.h"
-#include "Core/IOS/USB/Bluetooth/WiimoteDevice.h"
 #include "Core/Movie.h"
 #include "Core/NetPlayClient.h"
 #include "Core/NetPlayProto.h"
@@ -127,19 +124,14 @@
 #include "DolphinQt/ToolBar.h"
 #include "DolphinQt/WiiUpdate.h"
 
-#include "InputCommon/ControllerInterface/ControllerInterface.h"
-#include "InputCommon/GCAdapter.h"
-
 #include "UICommon/DiscordPresence.h"
 #include "UICommon/GameFile.h"
 #include "UICommon/ResourcePack/Manager.h"
-#include "UICommon/ResourcePack/Manifest.h"
 #include "UICommon/ResourcePack/ResourcePack.h"
 
 #include "UICommon/UICommon.h"
 
 #include "VideoCommon/NetPlayChatUI.h"
-#include "VideoCommon/VideoConfig.h"
 
 #ifdef HAVE_XRANDR
 #include "UICommon/X11Utils.h"
@@ -530,6 +522,8 @@ void MainWindow::ConnectMenuBar()
   connect(m_menu_bar, &MenuBar::EjectDisc, this, &MainWindow::EjectDisc);
   connect(m_menu_bar, &MenuBar::ChangeDisc, this, &MainWindow::ChangeDisc);
   connect(m_menu_bar, &MenuBar::OpenUserFolder, this, &MainWindow::OpenUserFolder);
+  connect(m_menu_bar, &MenuBar::OpenConfigFolder, this, &MainWindow::OpenConfigFolder);
+  connect(m_menu_bar, &MenuBar::OpenCacheFolder, this, &MainWindow::OpenCacheFolder);
 
   // Emulation
   connect(m_menu_bar, &MenuBar::Pause, this, &MainWindow::Pause);
@@ -827,6 +821,22 @@ void MainWindow::OpenUserFolder()
   QDesktopServices::openUrl(url);
 }
 
+void MainWindow::OpenConfigFolder()
+{
+  std::string path = File::GetUserPath(D_CONFIG_IDX);
+
+  QUrl url = QUrl::fromLocalFile(QString::fromStdString(path));
+  QDesktopServices::openUrl(url);
+}
+
+void MainWindow::OpenCacheFolder()
+{
+  std::string path = File::GetUserPath(D_CACHE_IDX);
+
+  QUrl url = QUrl::fromLocalFile(QString::fromStdString(path));
+  QDesktopServices::openUrl(url);
+}
+
 void MainWindow::Open()
 {
   QStringList files = PromptFileNames();
@@ -1141,6 +1151,32 @@ void MainWindow::StartGame(std::unique_ptr<BootParameters>&& parameters)
       if (!NKitWarningDialog::ShowUnlessDisabled())
         return;
     }
+
+    const auto volume_type =
+        std::get<BootParameters::Disc>(parameters->parameters).volume->GetVolumeType();
+    if (volume_type != DiscIO::Platform::Triforce)
+    {
+      const bool triforce_hardware_sp1 =
+          Config::Get(Config::MAIN_SERIAL_PORT_1) == ExpansionInterface::EXIDeviceType::Baseboard;
+      const bool triforce_hardware_port_1 = Config::Get(Config::GetInfoForSIDevice(0)) ==
+                                            SerialInterface::SIDevices::SIDEVICE_AM_BASEBOARD;
+
+      // Some Triforce tools don't include a boot.id file, but they can still be launched.
+      if (triforce_hardware_sp1)
+      {
+        ModalMessageBox::warning(this, tr("Warning"),
+                                 tr("Non-Triforce games cannot be booted with Triforce hardware "
+                                    "attached.\nPlease remove the Triforce Baseboard from SP1."),
+                                 QMessageBox::Ok);
+      }
+      if (triforce_hardware_port_1)
+      {
+        ModalMessageBox::warning(this, tr("Warning"),
+                                 tr("Non-Triforce games cannot be booted with Triforce hardware "
+                                    "attached.\nPlease remove the Triforce Baseboard from Port 1."),
+                                 QMessageBox::Ok);
+      }
+    }
   }
 
   // If we're running, only start a new game once we've stopped the last.
@@ -1279,6 +1315,12 @@ void MainWindow::ShowControllersWindow()
   m_settings_window->SelectPane(SettingsWindowPaneIndex::Controllers);
 }
 
+void MainWindow::ShowTriforceWindow()
+{
+  ShowSettingsWindow();
+  m_settings_window->SelectPane(SettingsWindowPaneIndex::Triforce);
+}
+
 void MainWindow::ShowFreeLookWindow()
 {
   if (!m_freelook_window)
diff --git a/Source/Core/DolphinQt/MainWindow.h b/Source/Core/DolphinQt/MainWindow.h
index a089935f612f..c0d5bd110e98 100644
--- a/Source/Core/DolphinQt/MainWindow.h
+++ b/Source/Core/DolphinQt/MainWindow.h
@@ -92,6 +92,8 @@ class MainWindow final : public QMainWindow
   bool eventFilter(QObject* object, QEvent* event) override;
   QMenu* createPopupMenu() override;
 
+  void ShowTriforceWindow();
+
 signals:
   void ReadOnlyModeChanged(bool read_only);
   void RecordingStatusChanged(bool recording);
@@ -216,6 +218,8 @@ class MainWindow final : public QMainWindow
   void EjectDisc();
 
   void OpenUserFolder();
+  void OpenConfigFolder();
+  void OpenCacheFolder();
 
   QStringList PromptFileNames();
 
diff --git a/Source/Core/DolphinQt/MenuBar.cpp b/Source/Core/DolphinQt/MenuBar.cpp
index dfb3eb9ff068..04c1b3eecdac 100644
--- a/Source/Core/DolphinQt/MenuBar.cpp
+++ b/Source/Core/DolphinQt/MenuBar.cpp
@@ -3,7 +3,6 @@
 
 #include "DolphinQt/MenuBar.h"
 
-#include <cinttypes>
 #include <future>
 
 #include <QAction>
@@ -22,11 +21,9 @@
 #include "Common/CommonPaths.h"
 #include "Common/FileUtil.h"
 #include "Common/IOFile.h"
-#include "Common/StringUtil.h"
 
 #include "Core/AchievementManager.h"
 #include "Core/CommonTitles.h"
-#include "Core/Config/AchievementSettings.h"
 #include "Core/Config/MainSettings.h"
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
@@ -35,7 +32,6 @@
 #include "Core/HW/AddressSpace.h"
 #include "Core/HW/Memmap.h"
 #include "Core/HW/WiiSave.h"
-#include "Core/HW/Wiimote.h"
 #include "Core/IOS/ES/ES.h"
 #include "Core/IOS/FS/FileSystem.h"
 #include "Core/IOS/IOS.h"
@@ -50,21 +46,20 @@
 #include "Core/PowerPC/SignatureDB/SignatureDB.h"
 #include "Core/State.h"
 #include "Core/System.h"
-#include "Core/TitleDatabase.h"
 #include "Core/WiiUtils.h"
 
 #include "DiscIO/Enums.h"
 #include "DiscIO/NANDImporter.h"
-#include "DiscIO/WiiSaveBanner.h"
 
-#include "DolphinQt/AboutDialog.h"
 #include "DolphinQt/Host.h"
 #include "DolphinQt/NANDRepairDialog.h"
 #include "DolphinQt/QtUtils/DolphinFileDialog.h"
 #include "DolphinQt/QtUtils/ModalMessageBox.h"
 #include "DolphinQt/QtUtils/NonAutodismissibleMenu.h"
 #include "DolphinQt/QtUtils/ParallelProgressDialog.h"
+#ifdef RC_CLIENT_SUPPORTS_RAINTEGRATION
 #include "DolphinQt/QtUtils/QueueOnObject.h"
+#endif
 #include "DolphinQt/QtUtils/SignalBlocking.h"
 #include "DolphinQt/Settings.h"
 #include "DolphinQt/Updater.h"
@@ -260,6 +255,18 @@ void MenuBar::AddFileMenu()
   m_open_user_folder =
       file_menu->addAction(tr("Open &User Folder"), this, &MenuBar::OpenUserFolder);
 
+  const std::string user_path = File::GetUserPath(D_USER_IDX);
+  if (user_path + CONFIG_DIR DIR_SEP != File::GetUserPath(D_CONFIG_IDX))
+  {
+    m_open_config_folder =
+        file_menu->addAction(tr("Open &Config Folder"), this, &MenuBar::OpenConfigFolder);
+  }
+  if (user_path + CACHE_DIR DIR_SEP != File::GetUserPath(D_CACHE_IDX))
+  {
+    m_open_cache_folder =
+        file_menu->addAction(tr("Open C&ache Folder"), this, &MenuBar::OpenCacheFolder);
+  }
+
   file_menu->addSeparator();
 
   m_exit_action = file_menu->addAction(tr("E&xit"), this, &MenuBar::Exit);
@@ -312,6 +319,9 @@ void MenuBar::AddToolsMenu()
   m_pal_ipl =
       gc_ipl->addAction(tr("PAL"), this, [this] { emit BootGameCubeIPL(DiscIO::Region::PAL); });
 
+  m_dev_ipl = gc_ipl->addAction(tr("Triforce"), this,
+                                [this] { emit BootGameCubeIPL(DiscIO::Region::Unknown); });
+
   tools_menu->addAction(tr("Memory Card Manager"), this, [this] { emit ShowMemcardManager(); });
 
   tools_menu->addSeparator();
@@ -1084,6 +1094,7 @@ void MenuBar::UpdateToolsMenu(const Core::State state)
   m_ntscj_ipl->setEnabled(is_uninitialized && File::Exists(Config::GetBootROMPath(JAP_DIR)));
   m_ntscu_ipl->setEnabled(is_uninitialized && File::Exists(Config::GetBootROMPath(USA_DIR)));
   m_pal_ipl->setEnabled(is_uninitialized && File::Exists(Config::GetBootROMPath(EUR_DIR)));
+  m_dev_ipl->setEnabled(is_uninitialized && File::Exists(Config::GetBootROMPath(DEV_DIR)));
   m_wad_install_action->setEnabled(is_uninitialized);
   m_import_backup->setEnabled(is_uninitialized);
   m_check_nand->setEnabled(is_uninitialized);
diff --git a/Source/Core/DolphinQt/MenuBar.h b/Source/Core/DolphinQt/MenuBar.h
index 1f2abd3a3b88..2cd56f4e5477 100644
--- a/Source/Core/DolphinQt/MenuBar.h
+++ b/Source/Core/DolphinQt/MenuBar.h
@@ -62,6 +62,8 @@ class MenuBar final : public QMenuBar
   void ChangeDisc();
   void EjectDisc();
   void OpenUserFolder();
+  void OpenConfigFolder();
+  void OpenCacheFolder();
 
   // Emulation
   void Play();
@@ -211,6 +213,8 @@ class MenuBar final : public QMenuBar
   QAction* m_eject_disc;
   QMenu* m_backup_menu;
   QAction* m_open_user_folder;
+  QAction* m_open_config_folder;
+  QAction* m_open_cache_folder;
 
   // Tools
   QAction* m_wad_install_action;
@@ -223,6 +227,7 @@ class MenuBar final : public QMenuBar
   QAction* m_ntscj_ipl;
   QAction* m_ntscu_ipl;
   QAction* m_pal_ipl;
+  QAction* m_dev_ipl;
   QMenu* m_manage_nand_menu;
   QAction* m_import_backup;
   QAction* m_check_nand;
diff --git a/Source/Core/DolphinQt/NetPlay/ChunkedProgressDialog.cpp b/Source/Core/DolphinQt/NetPlay/ChunkedProgressDialog.cpp
index 1815344761bb..b24c2563ff0e 100644
--- a/Source/Core/DolphinQt/NetPlay/ChunkedProgressDialog.cpp
+++ b/Source/Core/DolphinQt/NetPlay/ChunkedProgressDialog.cpp
@@ -3,9 +3,7 @@
 
 #include "DolphinQt/NetPlay/ChunkedProgressDialog.h"
 
-#include <algorithm>
 #include <cmath>
-#include <functional>
 
 #include <fmt/format.h>
 
diff --git a/Source/Core/DolphinQt/NetPlay/ChunkedProgressDialog.h b/Source/Core/DolphinQt/NetPlay/ChunkedProgressDialog.h
index ab81be935ec8..0d63e180ccbe 100644
--- a/Source/Core/DolphinQt/NetPlay/ChunkedProgressDialog.h
+++ b/Source/Core/DolphinQt/NetPlay/ChunkedProgressDialog.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #include <map>
-#include <string>
 #include <vector>
 
 #include <QDialog>
diff --git a/Source/Core/DolphinQt/NetPlay/NetPlayBrowser.cpp b/Source/Core/DolphinQt/NetPlay/NetPlayBrowser.cpp
index 67a35817dbc5..c6f11a64e574 100644
--- a/Source/Core/DolphinQt/NetPlay/NetPlayBrowser.cpp
+++ b/Source/Core/DolphinQt/NetPlay/NetPlayBrowser.cpp
@@ -22,7 +22,6 @@
 #include "Common/Version.h"
 
 #include "Core/Config/NetplaySettings.h"
-#include "Core/ConfigManager.h"
 
 #include "DolphinQt/QtUtils/ModalMessageBox.h"
 #include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
diff --git a/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp b/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp
index c27f8ad48192..d50cee2b9afd 100644
--- a/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp
+++ b/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp
@@ -23,11 +23,11 @@
 #include <QTextBrowser>
 
 #include <algorithm>
-#include <sstream>
 
+#ifdef HAS_LIBMGBA
 #include <fmt/ranges.h>
+#endif
 
-#include "Common/CommonPaths.h"
 #include "Common/Config/Config.h"
 #include "Common/HttpRequest.h"
 #include "Common/Logging/Log.h"
@@ -35,7 +35,6 @@
 
 #include "Core/Boot/Boot.h"
 #include "Core/Config/GraphicsSettings.h"
-#include "Core/Config/MainSettings.h"
 #include "Core/Config/NetplaySettings.h"
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
@@ -65,7 +64,6 @@
 
 #include "VideoCommon/NetPlayChatUI.h"
 #include "VideoCommon/NetPlayGolfUI.h"
-#include "VideoCommon/VideoConfig.h"
 
 namespace
 {
diff --git a/Source/Core/DolphinQt/QtUtils/SignalDaemon.cpp b/Source/Core/DolphinQt/QtUtils/SignalDaemon.cpp
index c3e6039ccce8..70640899345e 100644
--- a/Source/Core/DolphinQt/QtUtils/SignalDaemon.cpp
+++ b/Source/Core/DolphinQt/QtUtils/SignalDaemon.cpp
@@ -4,7 +4,6 @@
 #include "DolphinQt/QtUtils/SignalDaemon.h"
 
 #include <sys/socket.h>
-#include <sys/types.h>
 #include <unistd.h>
 
 #include <QSocketNotifier>
diff --git a/Source/Core/DolphinQt/RenderWidget.cpp b/Source/Core/DolphinQt/RenderWidget.cpp
index 2280b79b963d..49680b848230 100644
--- a/Source/Core/DolphinQt/RenderWidget.cpp
+++ b/Source/Core/DolphinQt/RenderWidget.cpp
@@ -3,8 +3,6 @@
 
 #include "DolphinQt/RenderWidget.h"
 
-#include <array>
-
 #include <QApplication>
 #include <QDragEnterEvent>
 #include <QDropEvent>
@@ -31,9 +29,7 @@
 
 #include "InputCommon/ControllerInterface/ControllerInterface.h"
 
-#include "VideoCommon/OnScreenUI.h"
 #include "VideoCommon/Present.h"
-#include "VideoCommon/VideoConfig.h"
 
 #ifdef _WIN32
 #include <windows.h>
diff --git a/Source/Core/DolphinQt/ResourcePackManager.cpp b/Source/Core/DolphinQt/ResourcePackManager.cpp
index 4c8085e60f16..90739da45f15 100644
--- a/Source/Core/DolphinQt/ResourcePackManager.cpp
+++ b/Source/Core/DolphinQt/ResourcePackManager.cpp
@@ -162,7 +162,7 @@ void ResourcePackManager::RepopulateTable()
   SelectionChanged();
 }
 
-// Revert the indicies as to be more intuitive for users
+// Revert the indices as to be more intuitive for users
 int ResourcePackManager::GetResourcePackIndex(QTableWidgetItem* item) const
 {
   return m_table_widget->rowCount() - 1 - item->row();
diff --git a/Source/Core/DolphinQt/Resources.cpp b/Source/Core/DolphinQt/Resources.cpp
index 015074142d03..b32d7ac7ac6b 100644
--- a/Source/Core/DolphinQt/Resources.cpp
+++ b/Source/Core/DolphinQt/Resources.cpp
@@ -13,8 +13,6 @@
 
 #include "Core/Config/MainSettings.h"
 
-#include "DolphinQt/Settings.h"
-
 bool Resources::m_svg_supported;
 QList<QIcon> Resources::m_platforms;
 QList<QIcon> Resources::m_countries;
diff --git a/Source/Core/DolphinQt/RiivolutionBootWidget.cpp b/Source/Core/DolphinQt/RiivolutionBootWidget.cpp
index aedb42c903ef..ce8dbdbe971e 100644
--- a/Source/Core/DolphinQt/RiivolutionBootWidget.cpp
+++ b/Source/Core/DolphinQt/RiivolutionBootWidget.cpp
@@ -109,7 +109,7 @@ void RiivolutionBootWidget::LoadMatchingXMLs()
 {
   const std::string& riivolution_dir = File::GetUserPath(D_RIIVOLUTION_IDX);
   const auto config = LoadConfigXML(riivolution_dir);
-  for (const std::string& path : Common::DoFileSearch({riivolution_dir + "riivolution"}, {".xml"}))
+  for (const std::string& path : Common::DoFileSearch(riivolution_dir + "riivolution", ".xml"))
   {
     auto parsed = DiscIO::Riivolution::ParseFile(path);
     if (!parsed || !parsed->IsValidForGame(m_game_id, m_revision, m_disc_number))
diff --git a/Source/Core/DolphinQt/SearchBar.h b/Source/Core/DolphinQt/SearchBar.h
index 07b009f87770..c09e9309df59 100644
--- a/Source/Core/DolphinQt/SearchBar.h
+++ b/Source/Core/DolphinQt/SearchBar.h
@@ -18,7 +18,7 @@ class SearchBar : public QWidget
   void Hide();
 
 signals:
-  void Search(const QString& serach);
+  void Search(const QString& search);
 
 private:
   void CreateWidgets();
diff --git a/Source/Core/DolphinQt/Settings.cpp b/Source/Core/DolphinQt/Settings.cpp
index f74c6589cc19..3046009fbb79 100644
--- a/Source/Core/DolphinQt/Settings.cpp
+++ b/Source/Core/DolphinQt/Settings.cpp
@@ -25,7 +25,6 @@
 #include "Common/Config/Config.h"
 #include "Common/Contains.h"
 #include "Common/FileUtil.h"
-#include "Common/StringUtil.h"
 
 #include "Core/AchievementManager.h"
 #include "Core/Config/GraphicsSettings.h"
@@ -37,11 +36,9 @@
 #include "Core/NetPlayServer.h"
 #include "Core/System.h"
 
-#include "DolphinQt/Host.h"
 #include "DolphinQt/QtUtils/QueueOnObject.h"
 
 #include "InputCommon/ControllerInterface/ControllerInterface.h"
-#include "InputCommon/InputConfig.h"
 
 #include "VideoCommon/NetPlayChatUI.h"
 #include "VideoCommon/NetPlayGolfUI.h"
@@ -414,7 +411,7 @@ void Settings::SetStyleType(StyleType type)
 {
   GetQSettings().setValue(QStringLiteral("userstyle/styletype"), static_cast<int>(type));
 
-  // also set the old setting so that the config is correctly intepreted by older Dolphin builds
+  // also set the old setting so that the config is correctly interpreted by older Dolphin builds
   GetQSettings().setValue(QStringLiteral("userstyle/enabled"), type == StyleType::User);
 }
 
diff --git a/Source/Core/DolphinQt/Settings.h b/Source/Core/DolphinQt/Settings.h
index e91fb130fa47..97d3b751cd73 100644
--- a/Source/Core/DolphinQt/Settings.h
+++ b/Source/Core/DolphinQt/Settings.h
@@ -11,9 +11,9 @@
 #include <QSettings>
 
 #include "Common/Config/Config.h"
+#include "Common/HookableEvent.h"
 #include "Core/Config/MainSettings.h"
 #include "DiscIO/Enums.h"
-#include "InputCommon/ControllerInterface/ControllerInterface.h"
 
 namespace Core
 {
diff --git a/Source/Core/DolphinQt/Settings/AdvancedPane.cpp b/Source/Core/DolphinQt/Settings/AdvancedPane.cpp
index b96d2b24eaa3..ddb47bc76798 100644
--- a/Source/Core/DolphinQt/Settings/AdvancedPane.cpp
+++ b/Source/Core/DolphinQt/Settings/AdvancedPane.cpp
@@ -156,7 +156,7 @@ void AdvancedPane::CreateLayout()
   cpu_clock_override_slider_layout->setContentsMargins(0, 0, 0, 0);
   clock_override_layout->addLayout(cpu_clock_override_slider_layout);
 
-  m_cpu_clock_override_slider = new ConfigFloatSlider(0.01f, 4.0f, Config::MAIN_OVERCLOCK, 0.01f);
+  m_cpu_clock_override_slider = new ConfigFloatSlider(0.01f, 5.0f, Config::MAIN_OVERCLOCK, 0.01f);
   cpu_clock_override_slider_layout->addWidget(m_cpu_clock_override_slider);
 
   m_cpu_label = new QLabel();
diff --git a/Source/Core/DolphinQt/Settings/AudioPane.cpp b/Source/Core/DolphinQt/Settings/AudioPane.cpp
index 8384a74dc7a1..435e8f24d58e 100644
--- a/Source/Core/DolphinQt/Settings/AudioPane.cpp
+++ b/Source/Core/DolphinQt/Settings/AudioPane.cpp
@@ -19,7 +19,6 @@
 #include <QVBoxLayout>
 
 #include "AudioCommon/AudioCommon.h"
-#include "AudioCommon/Enums.h"
 #include "AudioCommon/WASAPIStream.h"
 
 #include "Core/Config/MainSettings.h"
@@ -27,10 +26,8 @@
 #include "Core/System.h"
 #include "DolphinQt/Config/ConfigControls/ConfigBool.h"
 #include "DolphinQt/Config/ConfigControls/ConfigChoice.h"
-#include "DolphinQt/Config/ConfigControls/ConfigRadio.h"
 #include "DolphinQt/Config/ConfigControls/ConfigSlider.h"
 
-#include "DolphinQt/Config/SettingsWindow.h"
 #include "DolphinQt/Settings.h"
 
 static QString GetVolumeLabelText(int volume_level)
@@ -89,7 +86,7 @@ void AudioPane::CreateWidgets()
   const QFontMetrics font_metrics{font()};
   const int label_width = font_metrics.boundingRect(GetVolumeLabelText(100)).width();
   // Ensure the label is at least as wide as the QGroupBox title.
-  // This prevents [-Volume] title uglyness on Windows.
+  // This prevents [-Volume] title ugliness on Windows.
   const int title_width = font_metrics.boundingRect(volume_box->title()).width();
   m_volume_indicator->setFixedWidth(std::max(label_width, title_width));
 
@@ -184,6 +181,9 @@ void AudioPane::CreateWidgets()
 
   m_audio_fill_gaps = new ConfigBool(tr("Fill Audio Gaps"), Config::MAIN_AUDIO_FILL_GAPS);
 
+  m_audio_preserve_pitch =
+      new ConfigBool(tr("Preserve Audio Pitch"), Config::MAIN_AUDIO_PRESERVE_PITCH);
+
   m_speed_up_mute_enable = new ConfigBool(tr("Mute When Disabling Speed Limit"),
                                           Config::MAIN_AUDIO_MUTE_ON_DISABLED_SPEED_LIMIT);
 
@@ -195,8 +195,9 @@ void AudioPane::CreateWidgets()
 
   playback_layout->addLayout(buffer_layout, 0, 0);
   playback_layout->addWidget(m_audio_fill_gaps, 1, 0);
-  playback_layout->addWidget(m_speed_up_mute_enable, 2, 0);
-  playback_layout->setRowStretch(3, 1);
+  playback_layout->addWidget(m_audio_preserve_pitch, 2, 0);
+  playback_layout->addWidget(m_speed_up_mute_enable, 3, 0);
+  playback_layout->setRowStretch(4, 1);
   playback_box->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
 
   auto* const main_vbox_layout = new QVBoxLayout;
@@ -320,6 +321,10 @@ void AudioPane::AddDescriptions()
   static const char TR_FILL_AUDIO_GAPS_DESCRIPTION[] = QT_TR_NOOP(
       "Repeat existing audio during lag spikes to prevent stuttering.<br><br><dolphin_emphasis>If "
       "unsure, leave this checked.</dolphin_emphasis>");
+  static const char TR_PRESERVE_AUDIO_PITCH_DESCRIPTION[] = QT_TR_NOOP(
+      "Keeps audio at normal pitch when changing emulation speed. Without this, audio pitch "
+      "changes proportionally with speed.<br><br><dolphin_emphasis>If unsure, leave this "
+      "unchecked.</dolphin_emphasis>");
   static const char TR_SPEED_UP_MUTE_DESCRIPTION[] =
       QT_TR_NOOP("Mutes the audio when overriding the emulation speed limit (default hotkey: Tab). "
                  "<br><br><dolphin_emphasis>If unsure, leave this unchecked.</dolphin_emphasis>");
@@ -360,4 +365,7 @@ void AudioPane::AddDescriptions()
 
   m_audio_fill_gaps->SetTitle(tr("Fill Audio Gaps"));
   m_audio_fill_gaps->SetDescription(tr(TR_FILL_AUDIO_GAPS_DESCRIPTION));
+
+  m_audio_preserve_pitch->SetTitle(tr("Preserve Audio Pitch"));
+  m_audio_preserve_pitch->SetDescription(tr(TR_PRESERVE_AUDIO_PITCH_DESCRIPTION));
 }
diff --git a/Source/Core/DolphinQt/Settings/AudioPane.h b/Source/Core/DolphinQt/Settings/AudioPane.h
index 40c8c4edb1e1..4896f0e446ba 100644
--- a/Source/Core/DolphinQt/Settings/AudioPane.h
+++ b/Source/Core/DolphinQt/Settings/AudioPane.h
@@ -66,5 +66,6 @@ class AudioPane final : public QWidget
 
   // Misc Settings
   ConfigBool* m_audio_fill_gaps;
+  ConfigBool* m_audio_preserve_pitch;
   ConfigBool* m_speed_up_mute_enable;
 };
diff --git a/Source/Core/DolphinQt/Settings/GameCubePane.cpp b/Source/Core/DolphinQt/Settings/GameCubePane.cpp
index 98460f6be07e..b4ee1f25ad3d 100644
--- a/Source/Core/DolphinQt/Settings/GameCubePane.cpp
+++ b/Source/Core/DolphinQt/Settings/GameCubePane.cpp
@@ -31,13 +31,18 @@
 #include "Core/Core.h"
 #include "Core/HW/EXI/EXI.h"
 #include "Core/HW/GCMemcard/GCMemcard.h"
+#include "DolphinQt/Config/SettingsWindow.h"
+#ifdef HAS_LIBMGBA
 #include "Core/NetPlayServer.h"
+#endif
 #include "Core/System.h"
 
 #include "DolphinQt/Config/ConfigControls/ConfigBool.h"
 #include "DolphinQt/Config/ConfigControls/ConfigChoice.h"
+#ifdef HAS_LIBMGBA
 #include "DolphinQt/Config/ConfigControls/ConfigText.h"
 #include "DolphinQt/Config/ConfigControls/ConfigUserPath.h"
+#endif
 #include "DolphinQt/Config/Mapping/MappingWindow.h"
 #include "DolphinQt/GCMemcardManager.h"
 #include "DolphinQt/QtUtils/DolphinFileDialog.h"
@@ -46,15 +51,18 @@
 #include "DolphinQt/QtUtils/SignalBlocking.h"
 #include "DolphinQt/Settings.h"
 #include "DolphinQt/Settings/BroadbandAdapterSettingsDialog.h"
+#include "DolphinQt/Settings/TriforcePane.h"
 
 constexpr std::initializer_list<ExpansionInterface::Slot> GUI_SLOTS = {
     ExpansionInterface::Slot::A, ExpansionInterface::Slot::B, ExpansionInterface::Slot::SP1};
 
-GameCubePane::GameCubePane()
+GameCubePane::GameCubePane(MainWindow* main_window)
 {
   CreateWidgets();
   LoadSettings();
   ConnectWidgets();
+
+  connect(this, &GameCubePane::ShowTriforceWindow, main_window, &MainWindow::ShowTriforceWindow);
 }
 
 void GameCubePane::CreateWidgets()
@@ -143,10 +151,11 @@ void GameCubePane::CreateWidgets()
            EXIDeviceType::EthernetXLink,
            EXIDeviceType::EthernetTapServer,
            EXIDeviceType::EthernetBuiltIn,
-#if defined(WIN32) || (defined(__linux__) && !defined(__ANDROID__))
+#ifdef HAVE_CPPIPC
            EXIDeviceType::EthernetIPC,
 #endif
            EXIDeviceType::ModemTapServer,
+           EXIDeviceType::Baseboard,
        })
   {
     m_slot_combos[ExpansionInterface::Slot::SP1]->addItem(tr(fmt::format("{:n}", device).c_str()),
@@ -346,11 +355,12 @@ void GameCubePane::UpdateButton(ExpansionInterface::Slot slot)
     break;
   }
   case ExpansionInterface::Slot::SP1:
-    has_config = (device == ExpansionInterface::EXIDeviceType::Ethernet ||
-                  device == ExpansionInterface::EXIDeviceType::EthernetXLink ||
-                  device == ExpansionInterface::EXIDeviceType::EthernetTapServer ||
-                  device == ExpansionInterface::EXIDeviceType::EthernetBuiltIn ||
-                  device == ExpansionInterface::EXIDeviceType::ModemTapServer);
+    has_config = device == ExpansionInterface::EXIDeviceType::Ethernet ||
+                 device == ExpansionInterface::EXIDeviceType::EthernetXLink ||
+                 device == ExpansionInterface::EXIDeviceType::EthernetTapServer ||
+                 device == ExpansionInterface::EXIDeviceType::EthernetBuiltIn ||
+                 device == ExpansionInterface::EXIDeviceType::ModemTapServer ||
+                 device == ExpansionInterface::EXIDeviceType::Baseboard;
     break;
   case ExpansionInterface::Slot::SP2:
     has_config = false;
@@ -414,6 +424,11 @@ void GameCubePane::OnConfigPressed(ExpansionInterface::Slot slot)
     dialog.exec();
     return;
   }
+  case ExpansionInterface::EXIDeviceType::Baseboard:
+  {
+    ShowTriforceWindow();
+    return;
+  }
   default:
     PanicAlertFmt("Unknown settings pressed for {}", device);
     return;
@@ -448,19 +463,23 @@ bool GameCubePane::SetMemcard(ExpansionInterface::Slot slot, const QString& file
   const std::string jp_path = Config::GetMemcardPath(raw_path, slot, DiscIO::Region::NTSC_J);
   const std::string us_path = Config::GetMemcardPath(raw_path, slot, DiscIO::Region::NTSC_U);
   const std::string eu_path = Config::GetMemcardPath(raw_path, slot, DiscIO::Region::PAL);
-  const bool raw_path_valid = raw_path == jp_path || raw_path == us_path || raw_path == eu_path;
+  const std::string dv_path = Config::GetMemcardPath(raw_path, slot, DiscIO::Region::DEV);
+  const bool raw_path_valid =
+      raw_path == jp_path || raw_path == us_path || raw_path == eu_path || raw_path == dv_path;
 
   if (!raw_path_valid)
   {
     // TODO: We could try to autodetect the card region here and offer automatic renaming.
-    ModalMessageBox::critical(this, tr("Error"),
-                              tr("The filename %1 does not conform to Dolphin's region code format "
-                                 "for memory cards. Please rename this file to either %2, %3, or "
-                                 "%4, matching the region of the save files that are on it.")
-                                  .arg(QString::fromStdString(PathToFileName(raw_path)))
-                                  .arg(QString::fromStdString(PathToFileName(us_path)))
-                                  .arg(QString::fromStdString(PathToFileName(eu_path)))
-                                  .arg(QString::fromStdString(PathToFileName(jp_path))));
+    ModalMessageBox::critical(
+        this, tr("Error"),
+        tr("The filename %1 does not conform to Dolphin's region code format "
+           "for memory cards. Please rename this file to either %2, %3, %4, or "
+           "%5, matching the region of the save files that are on it.")
+            .arg(QString::fromStdString(PathToFileName(raw_path)))
+            .arg(QString::fromStdString(PathToFileName(us_path)))
+            .arg(QString::fromStdString(PathToFileName(eu_path)))
+            .arg(QString::fromStdString(PathToFileName(jp_path)))
+            .arg(QString::fromStdString(PathToFileName(dv_path))));
     return false;
   }
 
@@ -552,8 +571,9 @@ bool GameCubePane::SetGCIFolder(ExpansionInterface::Slot slot, const QString& pa
   const std::string default_jp_path = Config::GetGCIFolderPath("", slot, DiscIO::Region::NTSC_J);
   const std::string default_us_path = Config::GetGCIFolderPath("", slot, DiscIO::Region::NTSC_U);
   const std::string default_eu_path = Config::GetGCIFolderPath("", slot, DiscIO::Region::PAL);
-  const bool is_default_path =
-      raw_path == default_jp_path || raw_path == default_us_path || raw_path == default_eu_path;
+  const std::string default_dv_path = Config::GetGCIFolderPath("", slot, DiscIO::Region::DEV);
+  const bool is_default_path = raw_path == default_jp_path || raw_path == default_us_path ||
+                               raw_path == default_eu_path || raw_path == default_dv_path;
 
   bool path_changed;
   if (is_default_path)
@@ -570,7 +590,9 @@ bool GameCubePane::SetGCIFolder(ExpansionInterface::Slot slot, const QString& pa
     const std::string jp_path = Config::GetGCIFolderPath(raw_path, slot, DiscIO::Region::NTSC_J);
     const std::string us_path = Config::GetGCIFolderPath(raw_path, slot, DiscIO::Region::NTSC_U);
     const std::string eu_path = Config::GetGCIFolderPath(raw_path, slot, DiscIO::Region::PAL);
-    const bool raw_path_valid = raw_path == jp_path || raw_path == us_path || raw_path == eu_path;
+    const std::string dv_path = Config::GetGCIFolderPath(raw_path, slot, DiscIO::Region::DEV);
+    const bool raw_path_valid =
+        raw_path == jp_path || raw_path == us_path || raw_path == eu_path || raw_path == dv_path;
 
     if (!raw_path_valid)
     {
@@ -578,12 +600,13 @@ bool GameCubePane::SetGCIFolder(ExpansionInterface::Slot slot, const QString& pa
       ModalMessageBox::critical(
           this, tr("Error"),
           tr("The folder %1 does not conform to Dolphin's region code format "
-             "for GCI folders. Please rename this folder to either %2, %3, or "
-             "%4, matching the region of the save files that are in it.")
+             "for GCI folders. Please rename this folder to either %2, %3, %4, or "
+             "%5, matching the region of the save files that are in it.")
               .arg(QString::fromStdString(PathToFileName(raw_path)))
               .arg(QString::fromStdString(PathToFileName(us_path)))
               .arg(QString::fromStdString(PathToFileName(eu_path)))
-              .arg(QString::fromStdString(PathToFileName(jp_path))));
+              .arg(QString::fromStdString(PathToFileName(jp_path)))
+              .arg(QString::fromStdString(PathToFileName(dv_path))));
       return false;
     }
 
diff --git a/Source/Core/DolphinQt/Settings/GameCubePane.h b/Source/Core/DolphinQt/Settings/GameCubePane.h
index bf7c7c2e6ded..a97e82af3ff1 100644
--- a/Source/Core/DolphinQt/Settings/GameCubePane.h
+++ b/Source/Core/DolphinQt/Settings/GameCubePane.h
@@ -11,6 +11,7 @@
 
 #include "Common/EnumMap.h"
 #include "Core/HW/EXI/EXI.h"
+#include "DolphinQt/MainWindow.h"
 
 class ConfigBool;
 class ConfigChoice;
@@ -28,10 +29,13 @@ class GameCubePane : public QWidget
 {
   Q_OBJECT
 public:
-  explicit GameCubePane();
+  explicit GameCubePane(MainWindow* main_window);
 
   static std::string GetOpenGBARom(std::string_view title);
 
+signals:
+  void ShowTriforceWindow();
+
 private:
   void CreateWidgets();
   void ConnectWidgets();
diff --git a/Source/Core/DolphinQt/Settings/GeneralPane.cpp b/Source/Core/DolphinQt/Settings/GeneralPane.cpp
index 93e3d0d9c827..802292f688c5 100644
--- a/Source/Core/DolphinQt/Settings/GeneralPane.cpp
+++ b/Source/Core/DolphinQt/Settings/GeneralPane.cpp
@@ -3,8 +3,6 @@
 
 #include "DolphinQt/Settings/GeneralPane.h"
 
-#include <map>
-
 #include <QCheckBox>
 #include <QComboBox>
 #include <QFormLayout>
@@ -21,7 +19,6 @@
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 #include "Core/DolphinAnalytics.h"
-#include "Core/PowerPC/PowerPC.h"
 #include "Core/System.h"
 
 #include "DolphinQt/Config/ConfigControls/ConfigBool.h"
@@ -90,6 +87,7 @@ void GeneralPane::OnEmulationStateChanged(Core::State state)
 
   m_checkbox_dualcore->setEnabled(!running);
   m_checkbox_cheats->setEnabled(!running);
+  m_checkbox_load_games_into_memory->setEnabled(!running);
   m_checkbox_override_region_settings->setEnabled(!running);
 #ifdef USE_DISCORD_PRESENCE
   m_checkbox_discord_presence->setEnabled(!running);
@@ -147,6 +145,15 @@ void GeneralPane::CreateBasic()
   m_checkbox_cheats = new ConfigBool(tr("Enable Cheats"), Config::MAIN_ENABLE_CHEATS);
   basic_group_layout->addWidget(m_checkbox_cheats);
 
+  m_checkbox_load_games_into_memory =
+      new ConfigBool(tr("Load Whole Game Into Memory"), Config::MAIN_LOAD_GAME_INTO_MEMORY);
+  basic_group_layout->addWidget(m_checkbox_load_games_into_memory);
+  m_checkbox_load_games_into_memory->SetDescription(
+      tr("Loads the running game into memory in the background."
+         "<br><br>This may improve performance with slow or high-latency storage."
+         "<br>System memory requirements will be much higher with this setting enabled."
+         "<br><br><dolphin_emphasis>If unsure, leave this unchecked.</dolphin_emphasis>"));
+
   m_checkbox_override_region_settings =
       new ConfigBool(tr("Allow Mismatched Region Settings"), Config::MAIN_OVERRIDE_REGION_SETTINGS);
   basic_group_layout->addWidget(m_checkbox_override_region_settings);
diff --git a/Source/Core/DolphinQt/Settings/GeneralPane.h b/Source/Core/DolphinQt/Settings/GeneralPane.h
index 17d80f7c3851..b482172b0950 100644
--- a/Source/Core/DolphinQt/Settings/GeneralPane.h
+++ b/Source/Core/DolphinQt/Settings/GeneralPane.h
@@ -48,6 +48,7 @@ class GeneralPane final : public QWidget
   ToolTipComboBox* m_combobox_fallback_region;
   ConfigBool* m_checkbox_dualcore;
   ConfigBool* m_checkbox_cheats;
+  ConfigBool* m_checkbox_load_games_into_memory;
   ConfigBool* m_checkbox_override_region_settings;
   ConfigBool* m_checkbox_auto_disc_change;
 #ifdef USE_DISCORD_PRESENCE
diff --git a/Source/Core/DolphinQt/Settings/InterfacePane.cpp b/Source/Core/DolphinQt/Settings/InterfacePane.cpp
index f12689cb3112..c9b5cfd89dfe 100644
--- a/Source/Core/DolphinQt/Settings/InterfacePane.cpp
+++ b/Source/Core/DolphinQt/Settings/InterfacePane.cpp
@@ -16,7 +16,6 @@
 #include "Common/CommonPaths.h"
 #include "Common/FileSearch.h"
 #include "Common/FileUtil.h"
-#include "Common/MsgHandler.h"
 #include "Common/StringUtil.h"
 
 #include "Core/AchievementManager.h"
@@ -34,8 +33,6 @@
 #include "DolphinQt/QtUtils/SignalBlocking.h"
 #include "DolphinQt/Settings.h"
 
-#include "UICommon/GameFile.h"
-
 static ConfigStringChoice* MakeLanguageComboBox()
 {
   using QPair = std::pair<QString, QString>;
@@ -131,9 +128,9 @@ void InterfacePane::CreateUI()
   m_combobox_language = MakeLanguageComboBox();
   combobox_layout->addRow(tr("&Language:"), m_combobox_language);
 
-  // List avalable themes
-  auto theme_paths =
-      Common::DoFileSearch({File::GetUserPath(D_THEMES_IDX), File::GetSysDirectory() + THEMES_DIR});
+  // List available themes
+  auto theme_paths = Common::DoFileSearch(
+      {{File::GetUserPath(D_THEMES_IDX), File::GetSysDirectory() + THEMES_DIR}});
   std::vector<std::string> theme_names;
   theme_names.reserve(theme_paths.size());
   std::ranges::transform(theme_paths, std::back_inserter(theme_names), PathToFileName);
@@ -147,7 +144,7 @@ void InterfacePane::CreateUI()
   m_label_userstyle = new QLabel(tr("Style:"));
   combobox_layout->addRow(m_label_userstyle, m_combobox_userstyle);
 
-  auto userstyle_search_results = Common::DoFileSearch({File::GetUserPath(D_STYLES_IDX)});
+  auto userstyle_search_results = Common::DoFileSearch(File::GetUserPath(D_STYLES_IDX));
 
   m_combobox_userstyle->addItem(tr("(System)"), static_cast<int>(Settings::StyleType::System));
 
diff --git a/Source/Core/DolphinQt/Settings/OnScreenDisplayPane.cpp b/Source/Core/DolphinQt/Settings/OnScreenDisplayPane.cpp
index 6b344f946f99..9ff343d00e0e 100644
--- a/Source/Core/DolphinQt/Settings/OnScreenDisplayPane.cpp
+++ b/Source/Core/DolphinQt/Settings/OnScreenDisplayPane.cpp
@@ -34,6 +34,7 @@ void OnScreenDisplayPane::CreateLayout()
 
   general_layout->addWidget(m_enable_osd, 0, 0);
   general_layout->addWidget(new QLabel(tr("Font Size:")), 1, 0);
+  m_font_size->SetTitle(tr("Font Size"));
   general_layout->addWidget(m_font_size, 1, 1);
 
   // Performance
@@ -48,9 +49,7 @@ void OnScreenDisplayPane::CreateLayout()
   m_show_speed = new ConfigBool(tr("Show % Speed"), Config::GFX_SHOW_SPEED);
   m_show_graph = new ConfigBool(tr("Show Performance Graphs"), Config::GFX_SHOW_GRAPHS);
   m_speed_colors = new ConfigBool(tr("Show Speed Colors"), Config::GFX_SHOW_SPEED_COLORS);
-  auto* const perf_sample_window_label = new QLabel(tr("Performance Sample Window (ms)"));
   m_perf_sample_window = new ConfigInteger(0, 10000, Config::GFX_PERF_SAMP_WINDOW, 100);
-  m_perf_sample_window->SetTitle(perf_sample_window_label->text());
 
   performance_layout->addWidget(m_show_fps, 0, 0);
   performance_layout->addWidget(m_show_ftimes, 0, 1);
@@ -59,7 +58,8 @@ void OnScreenDisplayPane::CreateLayout()
   performance_layout->addWidget(m_show_speed, 2, 0);
   performance_layout->addWidget(m_show_graph, 2, 1);
   performance_layout->addWidget(m_speed_colors, 3, 0);
-  performance_layout->addWidget(perf_sample_window_label, 4, 0);
+  performance_layout->addWidget(new QLabel(tr("Performance Sample Window (ms):")), 4, 0);
+  m_perf_sample_window->SetTitle(tr("Performance Sample Window (ms)"));
   performance_layout->addWidget(m_perf_sample_window, 4, 1);
 
   // Movie
diff --git a/Source/Core/DolphinQt/Settings/TriforcePane.cpp b/Source/Core/DolphinQt/Settings/TriforcePane.cpp
new file mode 100644
index 000000000000..025bbe0bd168
--- /dev/null
+++ b/Source/Core/DolphinQt/Settings/TriforcePane.cpp
@@ -0,0 +1,221 @@
+// Copyright 2026 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "DolphinQt/Settings/TriforcePane.h"
+
+#include <QDialogButtonBox>
+#include <QGroupBox>
+#include <QHeaderView>
+#include <QPushButton>
+#include <QTableWidget>
+#include <QVBoxLayout>
+
+#include <fmt/format.h>
+#include <fmt/ranges.h>
+
+#include "Common/Logging/Log.h"
+
+#include "Core/Config/MainSettings.h"
+#include "Core/HW/DVD/AMMediaboard.h"
+
+#include "DolphinQt/Config/Mapping/MappingWindow.h"
+#include "DolphinQt/QtUtils/NonDefaultQPushButton.h"
+#include "DolphinQt/QtUtils/QtUtils.h"
+
+namespace
+{
+
+constexpr int COLUMN_EMULATED = 0;
+constexpr int COLUMN_REAL = 1;
+constexpr int COLUMN_DESCRIPTION = 2;
+
+class IPRedirectionsDialog final : public QDialog
+{
+public:
+  explicit IPRedirectionsDialog(QWidget* parent);
+
+private:
+  void LoadConfig();
+  void SaveConfig() const;
+
+  void LoadDefault();
+  void OnClear();
+
+  QTableWidget* m_ip_redirections_table;
+};
+
+}  // namespace
+
+TriforcePane::TriforcePane()
+{
+  auto* const main_layout = new QVBoxLayout{this};
+
+  auto* const controllers_group = new QGroupBox{tr("Controllers")};
+  main_layout->addWidget(controllers_group);
+
+  auto* const controllers_layout = new QVBoxLayout{controllers_group};
+
+  auto* const configure_controllers_button = new NonDefaultQPushButton{tr("Configure")};
+  controllers_layout->addWidget(configure_controllers_button);
+
+  connect(configure_controllers_button, &QPushButton::clicked, this, [this] {
+    auto* const window = new MappingWindow(this, MappingWindow::Type::MAPPING_AM_BASEBOARD, 0);
+    window->setAttribute(Qt::WA_DeleteOnClose, true);
+    window->setWindowModality(Qt::WindowModality::WindowModal);
+    window->show();
+  });
+
+  auto* const ip_redirection_group = new QGroupBox{tr("IP Address Redirections")};
+  main_layout->addWidget(ip_redirection_group);
+
+  auto* const ip_redirection_layout = new QVBoxLayout{ip_redirection_group};
+
+  auto* const configure_ip_redirections_button = new NonDefaultQPushButton{tr("Configure")};
+  ip_redirection_layout->addWidget(configure_ip_redirections_button);
+
+  connect(configure_ip_redirections_button, &QPushButton::clicked, this, [this] {
+    auto* const ip_redirections = new IPRedirectionsDialog{this};
+    ip_redirections->setAttribute(Qt::WA_DeleteOnClose);
+    ip_redirections->open();
+  });
+
+  main_layout->addStretch(1);
+}
+
+IPRedirectionsDialog::IPRedirectionsDialog(QWidget* parent) : QDialog{parent}
+{
+  setWindowTitle(tr("IP Address Redirections"));
+
+  auto* const main_layout = new QVBoxLayout{this};
+
+  auto* const load_default_button = new QPushButton(tr("Default"));
+  connect(load_default_button, &QPushButton::clicked, this, &IPRedirectionsDialog::LoadDefault);
+
+  auto* const clear_button = new QPushButton(tr("Clear"));
+  connect(clear_button, &QPushButton::clicked, this, &IPRedirectionsDialog::OnClear);
+
+  m_ip_redirections_table = new QTableWidget;
+  main_layout->addWidget(m_ip_redirections_table);
+
+  m_ip_redirections_table->setColumnCount(3);
+  m_ip_redirections_table->setHorizontalHeaderLabels(
+      {tr("Emulated"), tr("Real"), tr("Description")});
+  m_ip_redirections_table->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
+  m_ip_redirections_table->setSizeAdjustPolicy(QTableWidget::AdjustToContents);
+
+  m_ip_redirections_table->setEditTriggers(QAbstractItemView::DoubleClicked |
+                                           QAbstractItemView::EditKeyPressed);
+
+  auto* const button_box = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
+  main_layout->addWidget(button_box);
+
+  button_box->addButton(load_default_button, QDialogButtonBox::ActionRole);
+  button_box->addButton(clear_button, QDialogButtonBox::ActionRole);
+
+  connect(button_box, &QDialogButtonBox::accepted, this, &IPRedirectionsDialog::accept);
+  connect(button_box, &QDialogButtonBox::rejected, this, &IPRedirectionsDialog::reject);
+
+  connect(this, &IPRedirectionsDialog::accepted, this, &IPRedirectionsDialog::SaveConfig);
+
+  connect(m_ip_redirections_table, &QTableWidget::itemChanged, this,
+          [this](QTableWidgetItem* item) {
+            const int row_count = m_ip_redirections_table->rowCount();
+            const bool is_last_row = item->row() == row_count - 1;
+            if (is_last_row)
+            {
+              if (!item->text().isEmpty())
+                m_ip_redirections_table->insertRow(row_count);
+            }
+            else if (item->column() != COLUMN_DESCRIPTION && item->text().isEmpty())
+            {
+              // Just remove inner rows that have text erased.
+              // This UX could be less weird, but it's good enough for now.
+              m_ip_redirections_table->removeRow(item->row());
+            }
+          });
+
+  LoadConfig();
+
+  QtUtils::AdjustSizeWithinScreen(this);
+}
+
+void IPRedirectionsDialog::LoadConfig()
+{
+  m_ip_redirections_table->setRowCount(0);
+
+  // Add the final empty row.
+  m_ip_redirections_table->insertRow(0);
+
+  int row = 0;
+
+  const auto ip_redirections_str = Config::Get(Config::MAIN_TRIFORCE_IP_REDIRECTIONS);
+  for (auto&& ip_pair : ip_redirections_str | std::views::split(','))
+  {
+    const auto ip_pair_str = std::string_view{ip_pair};
+    const auto parsed = AMMediaboard::ParseIPRedirection(ip_pair_str);
+    if (!parsed.has_value())
+    {
+      ERROR_LOG_FMT(COMMON, "Bad IP redirection string: {}", ip_pair_str);
+      continue;
+    }
+
+    m_ip_redirections_table->insertRow(row);
+
+    m_ip_redirections_table->setItem(row, COLUMN_EMULATED,
+                                     new QTableWidgetItem(QString::fromUtf8(parsed->original)));
+    m_ip_redirections_table->setItem(row, COLUMN_REAL,
+                                     new QTableWidgetItem(QString::fromUtf8(parsed->replacement)));
+    m_ip_redirections_table->setItem(row, COLUMN_DESCRIPTION,
+                                     new QTableWidgetItem(QString::fromUtf8(parsed->description)));
+
+    ++row;
+  }
+}
+
+void IPRedirectionsDialog::SaveConfig() const
+{
+  // Ignore our empty row.
+  const int row_count = m_ip_redirections_table->rowCount() - 1;
+
+  std::vector<std::string> replacements(row_count);
+  for (int row = 0; row < row_count; ++row)
+  {
+    auto* const original_item = m_ip_redirections_table->item(row, COLUMN_EMULATED);
+    auto* const replacement_item = m_ip_redirections_table->item(row, COLUMN_REAL);
+
+    // Skip incomplete rows.
+    if (original_item == nullptr || replacement_item == nullptr)
+      continue;
+
+    replacements[row] = fmt::format("{}={}", StripWhitespace(original_item->text().toStdString()),
+                                    replacement_item->text().toStdString());
+
+    auto* const description_item = m_ip_redirections_table->item(row, COLUMN_DESCRIPTION);
+    if (description_item == nullptr)
+      continue;
+
+    const auto description = description_item->text().toStdString();
+
+    if (!description.empty())
+      (replacements[row] += ' ') += description;
+  }
+
+  Config::SetBaseOrCurrent(Config::MAIN_TRIFORCE_IP_REDIRECTIONS,
+                           fmt::format("{}", fmt::join(replacements, ",")));
+}
+
+void IPRedirectionsDialog::LoadDefault()
+{
+  // This alters the config before "OK" is pressed. Bad UX..
+
+  Config::SetBaseOrCurrent(Config::MAIN_TRIFORCE_IP_REDIRECTIONS, Config::DefaultState{});
+
+  LoadConfig();
+}
+
+void IPRedirectionsDialog::OnClear()
+{
+  m_ip_redirections_table->setRowCount(0);
+  // Add the final empty row.
+  m_ip_redirections_table->insertRow(0);
+}
diff --git a/Source/Core/DolphinQt/Settings/TriforcePane.h b/Source/Core/DolphinQt/Settings/TriforcePane.h
new file mode 100644
index 000000000000..49038b3c5cc7
--- /dev/null
+++ b/Source/Core/DolphinQt/Settings/TriforcePane.h
@@ -0,0 +1,14 @@
+// Copyright 2026 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <QWidget>
+
+class TriforcePane final : public QWidget
+{
+  Q_OBJECT
+
+public:
+  TriforcePane();
+};
diff --git a/Source/Core/DolphinQt/TAS/GBATASInputWindow.cpp b/Source/Core/DolphinQt/TAS/GBATASInputWindow.cpp
index a9dc7a0a410a..afc73a9f780c 100644
--- a/Source/Core/DolphinQt/TAS/GBATASInputWindow.cpp
+++ b/Source/Core/DolphinQt/TAS/GBATASInputWindow.cpp
@@ -11,8 +11,6 @@
 #include <QSpinBox>
 #include <QVBoxLayout>
 
-#include "Common/CommonTypes.h"
-
 #include "Core/HW/GBAPad.h"
 #include "Core/HW/GBAPadEmu.h"
 
diff --git a/Source/Core/DolphinQt/TAS/GCTASInputWindow.cpp b/Source/Core/DolphinQt/TAS/GCTASInputWindow.cpp
index 67c3d9a3d7a7..b544cf0fd282 100644
--- a/Source/Core/DolphinQt/TAS/GCTASInputWindow.cpp
+++ b/Source/Core/DolphinQt/TAS/GCTASInputWindow.cpp
@@ -11,8 +11,6 @@
 #include <QSpinBox>
 #include <QVBoxLayout>
 
-#include "Common/CommonTypes.h"
-
 #include "Core/HW/GCPad.h"
 #include "Core/HW/GCPadEmu.h"
 
diff --git a/Source/Core/DolphinQt/TAS/TASControlState.cpp b/Source/Core/DolphinQt/TAS/TASControlState.cpp
index a961d8e4377d..0706c2ae18d3 100644
--- a/Source/Core/DolphinQt/TAS/TASControlState.cpp
+++ b/Source/Core/DolphinQt/TAS/TASControlState.cpp
@@ -5,8 +5,6 @@
 
 #include <atomic>
 
-#include "Common/CommonTypes.h"
-
 int TASControlState::GetValue() const
 {
   const State ui_thread_state = m_ui_thread_state.load(std::memory_order_relaxed);
diff --git a/Source/Core/DolphinQt/TAS/TASInputWindow.cpp b/Source/Core/DolphinQt/TAS/TASInputWindow.cpp
index 00e2679c3aa1..8c2318f1e989 100644
--- a/Source/Core/DolphinQt/TAS/TASInputWindow.cpp
+++ b/Source/Core/DolphinQt/TAS/TASInputWindow.cpp
@@ -198,7 +198,7 @@ TASSpinBox* TASInputWindow::CreateSliderValuePair(
 }
 
 // The shortcut_widget argument needs to specify the container widget that will be hidden/shown.
-// This is done to avoid ambigous shortcuts
+// This is done to avoid ambiguous shortcuts
 TASSpinBox* TASInputWindow::CreateSliderValuePair(QBoxLayout* layout, int default_, int max,
                                                   QKeySequence shortcut_key_sequence,
                                                   Qt::Orientation orientation,
diff --git a/Source/Core/DolphinQt/TAS/WiiTASInputWindow.cpp b/Source/Core/DolphinQt/TAS/WiiTASInputWindow.cpp
index ce3aa5b8836a..c00c6d0206ff 100644
--- a/Source/Core/DolphinQt/TAS/WiiTASInputWindow.cpp
+++ b/Source/Core/DolphinQt/TAS/WiiTASInputWindow.cpp
@@ -24,7 +24,6 @@
 #include "Core/HW/WiimoteEmu/Extension/Nunchuk.h"
 #include "Core/HW/WiimoteEmu/MotionPlus.h"
 #include "Core/HW/WiimoteEmu/WiimoteEmu.h"
-#include "Core/HW/WiimoteReal/WiimoteReal.h"
 #include "Core/System.h"
 
 #include "DolphinQt/QtUtils/AspectRatioWidget.h"
diff --git a/Source/Core/DolphinQt/ToolBar.cpp b/Source/Core/DolphinQt/ToolBar.cpp
index 9c8350f9f847..57ab64d159eb 100644
--- a/Source/Core/DolphinQt/ToolBar.cpp
+++ b/Source/Core/DolphinQt/ToolBar.cpp
@@ -10,7 +10,6 @@
 #include <QIcon>
 
 #include "Core/Core.h"
-#include "Core/NetPlayProto.h"
 #include "Core/System.h"
 #include "DolphinQt/Host.h"
 #include "DolphinQt/Resources.h"
diff --git a/Source/Core/DolphinQt/Translation.cpp b/Source/Core/DolphinQt/Translation.cpp
index 118634ebf0d2..1b93536ac90f 100644
--- a/Source/Core/DolphinQt/Translation.cpp
+++ b/Source/Core/DolphinQt/Translation.cpp
@@ -18,7 +18,6 @@
 #include "Common/IOFile.h"
 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"
-#include "Common/StringUtil.h"
 
 #include "Core/Config/MainSettings.h"
 
diff --git a/Source/Core/DolphinQt/WiiUpdate.cpp b/Source/Core/DolphinQt/WiiUpdate.cpp
index e44cbc296a2d..0361b6369ceb 100644
--- a/Source/Core/DolphinQt/WiiUpdate.cpp
+++ b/Source/Core/DolphinQt/WiiUpdate.cpp
@@ -11,10 +11,8 @@
 #include <QPushButton>
 
 #include "Common/Assert.h"
-#include "Common/FileUtil.h"
 #include "Common/Flag.h"
 
-#include "Core/Core.h"
 #include "Core/WiiUtils.h"
 
 #include "DiscIO/NANDImporter.h"
diff --git a/Source/Core/DolphinTool/CMakeLists.txt b/Source/Core/DolphinTool/CMakeLists.txt
index e907fb9bbdd0..562ba1dc0a51 100644
--- a/Source/Core/DolphinTool/CMakeLists.txt
+++ b/Source/Core/DolphinTool/CMakeLists.txt
@@ -11,7 +11,14 @@ add_executable(dolphin-tool
   ToolMain.cpp
 )
 
-set_target_properties(dolphin-tool PROPERTIES OUTPUT_NAME dolphin-tool)
+if (WIN32)
+  target_sources(dolphin-tool PRIVATE DolphinTool.exe.manifest DolphinTool.rc)
+
+  set_target_properties(dolphin-tool PROPERTIES
+    DEBUG_POSTFIX    D
+    OUTPUT_NAME      DolphinTool
+  )
+endif()
 
 target_link_libraries(dolphin-tool
 PRIVATE
diff --git a/Source/Core/DolphinTool/ConvertCommand.cpp b/Source/Core/DolphinTool/ConvertCommand.cpp
index 210e608d2ac5..a590c3071c80 100644
--- a/Source/Core/DolphinTool/ConvertCommand.cpp
+++ b/Source/Core/DolphinTool/ConvertCommand.cpp
@@ -11,7 +11,6 @@
 #include <vector>
 
 #include <OptionParser.h>
-#include <fmt/format.h>
 #include <fmt/ostream.h>
 
 #include "Common/CommonTypes.h"
@@ -19,7 +18,6 @@
 #include "DiscIO/DiscUtils.h"
 #include "DiscIO/ScrubbedBlob.h"
 #include "DiscIO/Volume.h"
-#include "DiscIO/VolumeDisc.h"
 #include "DiscIO/WIABlob.h"
 #include "UICommon/UICommon.h"
 
diff --git a/Source/Core/DolphinTool/ExtractCommand.cpp b/Source/Core/DolphinTool/ExtractCommand.cpp
index b9beed24c162..e1803a7242d0 100644
--- a/Source/Core/DolphinTool/ExtractCommand.cpp
+++ b/Source/Core/DolphinTool/ExtractCommand.cpp
@@ -4,7 +4,6 @@
 #include "DolphinTool/ExtractCommand.h"
 
 #include <filesystem>
-#include <future>
 #include <iostream>
 
 #include <fmt/format.h>
diff --git a/Source/Core/DolphinTool/HeaderCommand.cpp b/Source/Core/DolphinTool/HeaderCommand.cpp
index 3156c67b9b74..71e4772cba85 100644
--- a/Source/Core/DolphinTool/HeaderCommand.cpp
+++ b/Source/Core/DolphinTool/HeaderCommand.cpp
@@ -9,13 +9,11 @@
 #include <vector>
 
 #include <OptionParser.h>
-#include <fmt/format.h>
 #include <fmt/ostream.h>
 #include <picojson.h>
 
 #include "DiscIO/Blob.h"
 #include "DiscIO/Volume.h"
-#include "DiscIO/VolumeDisc.h"
 
 namespace DolphinTool
 {
diff --git a/Source/Core/DolphinTool/ToolHeadlessPlatform.cpp b/Source/Core/DolphinTool/ToolHeadlessPlatform.cpp
index 787209bd3e7c..9861376574d1 100644
--- a/Source/Core/DolphinTool/ToolHeadlessPlatform.cpp
+++ b/Source/Core/DolphinTool/ToolHeadlessPlatform.cpp
@@ -1,17 +1,9 @@
 // Copyright 2021 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include <cstdio>
-#include <thread>
-
 #include <memory>
 #include <string>
 
-#include "Common/Flag.h"
-#include "Common/WindowSystemInfo.h"
-
-#include "Core/Core.h"
-#include "Core/DolphinAnalytics.h"
 #include "Core/Host.h"
 
 // Begin stubs needed to satisfy Core dependencies
diff --git a/Source/Core/DolphinTool/ToolMain.cpp b/Source/Core/DolphinTool/ToolMain.cpp
index 058bccc7b5bf..95cc7c6aaa52 100644
--- a/Source/Core/DolphinTool/ToolMain.cpp
+++ b/Source/Core/DolphinTool/ToolMain.cpp
@@ -1,24 +1,23 @@
 // Copyright 2021 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include <cstdio>
 #include <cstdlib>
 #include <iostream>
 #include <string>
 #include <string_view>
 #include <vector>
 
-#include <fmt/format.h>
 #include <fmt/ostream.h>
 
-#include "Common/StringUtil.h"
-#include "Core/Core.h"
-
 #include "DolphinTool/ConvertCommand.h"
 #include "DolphinTool/ExtractCommand.h"
 #include "DolphinTool/HeaderCommand.h"
 #include "DolphinTool/VerifyCommand.h"
 
+#ifdef _WIN32
+#include "Common/StringUtil.h"
+#endif
+
 static void PrintUsage()
 {
   fmt::print(std::cerr, "usage: dolphin-tool COMMAND -h\n"
diff --git a/Source/Core/DolphinTool/VerifyCommand.cpp b/Source/Core/DolphinTool/VerifyCommand.cpp
index fcaa31b8196f..975cfde14d57 100644
--- a/Source/Core/DolphinTool/VerifyCommand.cpp
+++ b/Source/Core/DolphinTool/VerifyCommand.cpp
@@ -8,10 +8,8 @@
 #include <vector>
 
 #include <OptionParser.h>
-#include <fmt/format.h>
 #include <fmt/ostream.h>
 
-#include "Common/StringUtil.h"
 #include "Core/AchievementManager.h"
 #include "DiscIO/Volume.h"
 #include "DiscIO/VolumeVerifier.h"
diff --git a/Source/Core/InputCommon/ControlReference/ExpressionParser.cpp b/Source/Core/InputCommon/ControlReference/ExpressionParser.cpp
index f20f777f86b2..f4e3a7f0bbd5 100644
--- a/Source/Core/InputCommon/ControlReference/ExpressionParser.cpp
+++ b/Source/Core/InputCommon/ControlReference/ExpressionParser.cpp
@@ -130,11 +130,11 @@ Lexer::Lexer(std::string expr_) : expr(std::move(expr_))
   it = expr.begin();
 }
 
-Token Lexer::GetDelimitedToken(TokenType type, char delimeter)
+Token Lexer::GetDelimitedToken(TokenType type, char delimiter)
 {
-  const std::string value = FetchCharsWhile([&](char c) { return c != delimeter && c != '\n'; });
+  const std::string value = FetchCharsWhile([&](char c) { return c != delimiter && c != '\n'; });
 
-  if (it == expr.end() || *it != delimeter)
+  if (it == expr.end() || *it != delimiter)
     return Token(TOK_INVALID);
 
   ++it;
@@ -639,7 +639,8 @@ class HotkeyExpression : public Expression
 // right-hand child. Its intended use is for supporting old-style barewords expressions.
 // Note that if you have a keyboard device as default device and the expression is a single digit
 // number, this will usually resolve in a numerical key instead of a numerical value.
-// Though if this expression belongs to NumericSetting, it will likely be simplifed back to a value.
+// Though if this expression belongs to NumericSetting, it will likely be simplified back to a
+// value.
 class CoalesceExpression : public Expression
 {
 public:
diff --git a/Source/Core/InputCommon/ControlReference/ExpressionParser.h b/Source/Core/InputCommon/ControlReference/ExpressionParser.h
index 2bb970906333..b36fef1daf07 100644
--- a/Source/Core/InputCommon/ControlReference/ExpressionParser.h
+++ b/Source/Core/InputCommon/ControlReference/ExpressionParser.h
@@ -96,7 +96,7 @@ class Lexer
   }
 
   std::string FetchWordChars();
-  Token GetDelimitedToken(TokenType type, char delimeter);
+  Token GetDelimitedToken(TokenType type, char delimiter);
   Token GetDelimitedLiteral();
   Token GetVariable();
   Token GetFullyQualifiedControl();
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp
index 7cc204ab1000..9ff06d405600 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp
@@ -3,15 +3,12 @@
 
 #include "InputCommon/ControllerEmu/ControlGroup/AnalogStick.h"
 
-#include <cmath>
 #include <optional>
 
 #include "Common/Common.h"
 #include "Common/MathUtil.h"
 
-#include "InputCommon/ControlReference/ControlReference.h"
 #include "InputCommon/ControllerEmu/Control/Control.h"
-#include "InputCommon/ControllerEmu/Control/Input.h"
 #include "InputCommon/ControllerEmu/ControllerEmu.h"
 #include "InputCommon/ControllerEmu/Setting/NumericSetting.h"
 
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Buttons.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Buttons.cpp
index a91cf8be859b..612310a47041 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Buttons.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Buttons.cpp
@@ -3,12 +3,8 @@
 
 #include "InputCommon/ControllerEmu/ControlGroup/Buttons.h"
 
-#include <memory>
 #include <string>
 
-#include "Common/Common.h"
-#include "InputCommon/ControllerEmu/Setting/NumericSetting.h"
-
 namespace ControllerEmu
 {
 Buttons::Buttons(const std::string& name_) : Buttons(name_, name_)
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Buttons.h b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Buttons.h
index 652f64ae5fac..db61f1b8b2a9 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Buttons.h
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Buttons.h
@@ -6,10 +6,8 @@
 #include <cmath>
 #include <string>
 
-#include "InputCommon/ControlReference/ControlReference.h"
 #include "InputCommon/ControllerEmu/Control/Control.h"
 #include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h"
-#include "InputCommon/ControllerEmu/Setting/NumericSetting.h"
 
 namespace ControllerEmu
 {
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.cpp
index 0ba4bfa3ea4d..169846c9471a 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.cpp
@@ -14,7 +14,6 @@
 
 #include "InputCommon/ControlReference/ControlReference.h"
 #include "InputCommon/ControllerEmu/Control/Control.h"
-#include "InputCommon/ControllerEmu/Control/Input.h"
 #include "InputCommon/ControllerEmu/ControllerEmu.h"
 #include "InputCommon/ControllerEmu/Setting/NumericSetting.h"
 
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.h b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.h
index a59826124a9b..85a9cf1a75bc 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.h
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.h
@@ -6,8 +6,8 @@
 #include <chrono>
 #include <string>
 
+#include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h"
 #include "InputCommon/ControllerEmu/StickGate.h"
-#include "InputCommon/ControllerInterface/CoreDevice.h"
 
 namespace ControllerEmu
 {
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.cpp
index 8ff82e2b3399..d74c4df5eb12 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.cpp
@@ -8,8 +8,6 @@
 #include "Common/Common.h"
 #include "Common/MathUtil.h"
 
-#include "InputCommon/ControlReference/ControlReference.h"
-#include "InputCommon/ControllerEmu/Control/Input.h"
 #include "InputCommon/ControllerEmu/ControllerEmu.h"
 #include "InputCommon/ControllerEmu/Setting/NumericSetting.h"
 
@@ -28,7 +26,7 @@ Force::Force(const std::string& name_) : ReshapableInput(name_, name_, GroupType
              {_trans("Distance"),
               // i18n: The symbol/abbreviation for centimeters.
               _trans("cm"),
-              // i18n: Refering to emulated wii remote swing movement.
+              // i18n: Referring to emulated wii remote swing movement.
               _trans("Distance of travel from neutral position.")},
              50, 1, 100);
 
@@ -42,7 +40,7 @@ Force::Force(const std::string& name_) : ReshapableInput(name_, name_, GroupType
              {_trans("Speed"),
               // i18n: The symbol/abbreviation for meters per second.
               _trans("m/s"),
-              // i18n: Refering to emulated wii remote swing movement.
+              // i18n: Referring to emulated wii remote swing movement.
               _trans("Peak velocity of outward swing movements.")},
              16, 1, 40);
 
@@ -51,7 +49,7 @@ Force::Force(const std::string& name_) : ReshapableInput(name_, name_, GroupType
              {_trans("Return Speed"),
               // i18n: The symbol/abbreviation for meters per second.
               _trans("m/s"),
-              // i18n: Refering to emulated wii remote swing movement.
+              // i18n: Referring to emulated wii remote swing movement.
               _trans("Peak velocity of movements to neutral position.")},
              2, 1, 40);
 
@@ -59,7 +57,7 @@ Force::Force(const std::string& name_) : ReshapableInput(name_, name_, GroupType
              {_trans("Angle"),
               // i18n: The symbol/abbreviation for degrees (unit of angular measure).
               _trans("°"),
-              // i18n: Refering to emulated wii remote swing movement.
+              // i18n: Referring to emulated wii remote swing movement.
               _trans("Rotation applied at extremities of swing.")},
              90, 1, 180);
 }
@@ -141,7 +139,7 @@ Shake::Shake(const std::string& name_, ControlState default_intensity_scale)
              {_trans("Intensity"),
               // i18n: The symbol/abbreviation for centimeters.
               _trans("cm"),
-              // i18n: Refering to emulated wii remote movement.
+              // i18n: Referring to emulated wii remote movement.
               _trans("Total travel distance.")},
              10 * default_intensity_scale, -50, 50);
 
@@ -151,7 +149,7 @@ Shake::Shake(const std::string& name_, ControlState default_intensity_scale)
              {_trans("Frequency"),
               // i18n: The symbol/abbreviation for hertz (cycles per second).
               _trans("Hz"),
-              // i18n: Refering to emulated wii remote movement.
+              // i18n: Referring to emulated wii remote movement.
               _trans("Number of shakes per second.")},
              6, 1, 20);
 }
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUCursor.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUCursor.cpp
index 713ad59cc5d5..f9a2b0fba0db 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUCursor.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUCursor.cpp
@@ -3,15 +3,12 @@
 
 #include "InputCommon/ControllerEmu/ControlGroup/IMUCursor.h"
 
-#include <memory>
 #include <string>
 
 #include "Common/Common.h"
 #include "Common/MathUtil.h"
 
-#include "InputCommon/ControlReference/ControlReference.h"
 #include "InputCommon/ControllerEmu/Control/Control.h"
-#include "InputCommon/ControllerEmu/Control/Input.h"
 
 namespace ControllerEmu
 {
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/MixedTriggers.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/MixedTriggers.cpp
index e87d5ebadf6c..2807603f6f9d 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/MixedTriggers.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/MixedTriggers.cpp
@@ -6,13 +6,11 @@
 #include <algorithm>
 #include <cmath>
 #include <cstddef>
-#include <memory>
 #include <string>
 
 #include "Common/Common.h"
 #include "Common/CommonTypes.h"
 
-#include "InputCommon/ControlReference/ControlReference.h"
 #include "InputCommon/ControllerEmu/Control/Control.h"
 
 namespace ControllerEmu
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/ModifySettingsButton.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/ModifySettingsButton.cpp
index 570c5451fc62..7a34d1c597b7 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/ModifySettingsButton.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/ModifySettingsButton.cpp
@@ -8,11 +8,7 @@
 #include <string>
 #include <utility>
 
-#include "Common/Common.h"
-#include "InputCommon/ControlReference/ControlReference.h"
 #include "InputCommon/ControllerEmu/Control/Control.h"
-#include "InputCommon/ControllerEmu/Control/Input.h"
-#include "InputCommon/ControllerEmu/Setting/NumericSetting.h"
 #include "VideoCommon/OnScreenDisplay.h"
 
 namespace ControllerEmu
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp
index c764b0214ba6..b27449029b4b 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp
@@ -3,14 +3,10 @@
 
 #include "InputCommon/ControllerEmu/ControlGroup/Slider.h"
 
-#include <cmath>
-#include <memory>
 #include <string>
 
 #include "Common/Common.h"
-#include "InputCommon/ControlReference/ControlReference.h"
 #include "InputCommon/ControllerEmu/Control/Control.h"
-#include "InputCommon/ControllerEmu/Control/Input.h"
 #include "InputCommon/ControllerEmu/ControllerEmu.h"
 
 namespace ControllerEmu
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.cpp
index a59ffb0eb948..5c604ef3d1d4 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.cpp
@@ -8,9 +8,7 @@
 #include "Common/Common.h"
 #include "Common/MathUtil.h"
 
-#include "InputCommon/ControlReference/ControlReference.h"
 #include "InputCommon/ControllerEmu/Control/Control.h"
-#include "InputCommon/ControllerEmu/Control/Input.h"
 #include "InputCommon/ControllerEmu/Setting/NumericSetting.h"
 
 namespace ControllerEmu
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Triggers.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Triggers.cpp
index 321c9272d018..109915bbe70b 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Triggers.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Triggers.cpp
@@ -5,12 +5,9 @@
 
 #include <algorithm>
 #include <cstddef>
-#include <memory>
 #include <optional>
 #include <string>
 
-#include "Common/Common.h"
-#include "InputCommon/ControlReference/ControlReference.h"
 #include "InputCommon/ControllerEmu/Control/Control.h"
 #include "InputCommon/ControllerEmu/Setting/NumericSetting.h"
 
diff --git a/Source/Core/InputCommon/ControllerEmu/StickGate.cpp b/Source/Core/InputCommon/ControllerEmu/StickGate.cpp
index c1e8a29b2de2..660ee939bef7 100644
--- a/Source/Core/InputCommon/ControllerEmu/StickGate.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/StickGate.cpp
@@ -34,7 +34,7 @@ std::optional<double> GetRayLineIntersection(Common::DVec2 ray, Common::DVec2 po
   const auto dot = diff.Dot({-ray.y, ray.x});
   if (std::abs(dot) < 0.00001)
   {
-    // Both points are on top of eachother.
+    // Both points are on top of each other.
     return std::nullopt;
   }
 
@@ -169,7 +169,7 @@ ControlState ReshapableInput::GetCalibrationDataRadiusAtAngle(const CalibrationD
                              GetPointFromAngleAndLength(sample1_angle, data[sample1_index]),
                              GetPointFromAngleAndLength(sample2_angle, data[sample2_index]));
 
-  // Intersection has no value when points are on top of eachother.
+  // Intersection has no value when points are on top of each other.
   return intersection.value_or(data[sample1_index]);
 }
 
diff --git a/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp b/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp
index 48eebbb7f6d0..0b0609f01082 100644
--- a/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp
@@ -31,6 +31,8 @@
 
 namespace
 {
+std::string SOURCE = "Android";
+
 jclass s_list_class;
 jmethodID s_list_get;
 jmethodID s_list_size;
@@ -468,13 +470,13 @@ namespace ciface::Android
 class InputBackend final : public ciface::InputBackend
 {
 public:
-  InputBackend(ControllerInterface* controller_interface);
+  explicit InputBackend(ControllerInterface* controller_interface);
   ~InputBackend();
   void PopulateDevices() override;
 
-private:
-  void AddDevice(JNIEnv* env, int device_id);
-  void AddSensorDevice(JNIEnv* env);
+  static void AddDevice(JNIEnv* env, int device_id);
+  static void AddSensorDevice(JNIEnv* env);
+  static void RemoveDevice(int device_id);
 };
 
 std::unique_ptr<ciface::InputBackend> CreateInputBackend(ControllerInterface* controller_interface)
@@ -611,10 +613,11 @@ class AndroidMotor : public Core::Device::Output
 class AndroidDevice final : public Core::Device
 {
 public:
-  AndroidDevice(JNIEnv* env, jobject input_device)
+  AndroidDevice(JNIEnv* env, jint device_id, jobject input_device)
       : m_sensor_event_listener(AddSensors(env, input_device)),
         m_source(env->CallIntMethod(input_device, s_input_device_get_sources)),
-        m_controller_number(env->CallIntMethod(input_device, s_input_device_get_controller_number))
+        m_controller_number(env->CallIntMethod(input_device, s_input_device_get_controller_number)),
+        m_device_id(device_id)
   {
     jstring j_name =
         reinterpret_cast<jstring>(env->CallObjectMethod(input_device, s_input_device_get_name));
@@ -631,7 +634,7 @@ class AndroidDevice final : public Core::Device
   // Constructor for the device added by Dolphin to contain sensor inputs
   AndroidDevice(JNIEnv* env, std::string name)
       : m_sensor_event_listener(AddSensors(env, nullptr)), m_source(AINPUT_SOURCE_SENSOR),
-        m_controller_number(0), m_name(std::move(name))
+        m_controller_number(0), m_device_id(std::nullopt), m_name(std::move(name))
   {
     AddSystemMotors(env);
   }
@@ -644,7 +647,7 @@ class AndroidDevice final : public Core::Device
 
   std::string GetName() const override { return m_name; }
 
-  std::string GetSource() const override { return "Android"; }
+  std::string GetSource() const override { return SOURCE; }
 
   std::optional<int> GetPreferredId() const override
   {
@@ -666,6 +669,8 @@ class AndroidDevice final : public Core::Device
     return -3;
   }
 
+  std::optional<jint> GetDeviceID() const { return m_device_id; }
+
   jobject GetSensorEventListener() { return m_sensor_event_listener; }
 
 private:
@@ -801,6 +806,7 @@ class AndroidDevice final : public Core::Device
   const jobject m_sensor_event_listener;
   const int m_source;
   const int m_controller_number;
+  const std::optional<jint> m_device_id;
   std::string m_name;
 };
 
@@ -944,8 +950,12 @@ InputBackend::~InputBackend()
   env->DeleteGlobalRef(s_keycodes_array);
 }
 
-void InputBackend::AddDevice(JNIEnv* env, int device_id)
+void InputBackend::AddDevice(JNIEnv* env, jint device_id)
 {
+  // Remove the device in case it already exists (maybe it's possible for a device to connect,
+  // be processed by PopulateDevices, and then be processed by onInputDeviceAdded)
+  RemoveDevice(device_id);
+
   jobject input_device =
       env->CallStaticObjectMethod(s_input_device_class, s_input_device_get_device, device_id);
 
@@ -955,14 +965,14 @@ void InputBackend::AddDevice(JNIEnv* env, int device_id)
     return;
   }
 
-  auto device = std::make_shared<AndroidDevice>(env, input_device);
+  auto device = std::make_shared<AndroidDevice>(env, device_id, input_device);
 
   env->DeleteLocalRef(input_device);
 
   if (device->Inputs().empty() && device->Outputs().empty())
     return;
 
-  GetControllerInterface().AddDevice(device);
+  g_controller_interface.AddDevice(device);
 
   Core::DeviceQualifier qualifier;
   qualifier.FromDevice(device.get());
@@ -987,7 +997,7 @@ void InputBackend::AddSensorDevice(JNIEnv* env)
   if (device->Inputs().empty() && device->Outputs().empty())
     return;
 
-  GetControllerInterface().AddDevice(device);
+  g_controller_interface.AddDevice(device);
 
   Core::DeviceQualifier qualifier;
   qualifier.FromDevice(device.get());
@@ -1000,6 +1010,16 @@ void InputBackend::AddSensorDevice(JNIEnv* env)
   env->DeleteLocalRef(j_qualifier);
 }
 
+void InputBackend::RemoveDevice(jint device_id)
+{
+  g_controller_interface.RemoveDevice([device_id](const ciface::Core::Device* device) {
+    return device->GetSource() == SOURCE &&
+           static_cast<const AndroidDevice*>(device)->GetDeviceID() == device_id;
+  });
+
+  s_device_id_to_device_qualifier.erase(device_id);
+}
+
 void InputBackend::PopulateDevices()
 {
   INFO_LOG_FMT(CONTROLLERINTERFACE, "Android populating devices");
@@ -1163,17 +1183,32 @@ Java_org_dolphinemu_dolphinemu_features_input_model_ControllerInterface_notifySe
 }
 
 JNIEXPORT void JNICALL
-Java_org_dolphinemu_dolphinemu_features_input_model_ControllerInterface_refreshDevices(JNIEnv* env,
-                                                                                       jclass)
+Java_org_dolphinemu_dolphinemu_features_input_model_ControllerInterface_00024InputDeviceListener_onInputDeviceAdded(
+    JNIEnv* env, jobject, jint device_id)
+{
+  ciface::Android::InputBackend::AddDevice(env, device_id);
+}
+
+JNIEXPORT void JNICALL
+Java_org_dolphinemu_dolphinemu_features_input_model_ControllerInterface_00024InputDeviceListener_onInputDeviceRemoved(
+    JNIEnv*, jobject, jint device_id)
+{
+  ciface::Android::InputBackend::RemoveDevice(device_id);
+}
+
+JNIEXPORT void JNICALL
+Java_org_dolphinemu_dolphinemu_features_input_model_ControllerInterface_00024InputDeviceListener_onInputDeviceChanged(
+    JNIEnv* env, jobject, jint device_id)
 {
-  g_controller_interface.RefreshDevices();
+  // AddDevice will automatically remove the existing device
+  ciface::Android::InputBackend::AddDevice(env, device_id);
 }
 
 JNIEXPORT jobjectArray JNICALL
 Java_org_dolphinemu_dolphinemu_features_input_model_ControllerInterface_getAllDeviceStrings(
     JNIEnv* env, jclass)
 {
-  return VectorToJStringArray(env, g_controller_interface.GetAllDeviceStrings());
+  return SpanToJStringArray(env, g_controller_interface.GetAllDeviceStrings());
 }
 
 JNIEXPORT jobject JNICALL
diff --git a/Source/Core/InputCommon/ControllerInterface/CoreDevice.cpp b/Source/Core/InputCommon/ControllerInterface/CoreDevice.cpp
index 41ef16c330c4..7197aa1fed14 100644
--- a/Source/Core/InputCommon/ControllerInterface/CoreDevice.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/CoreDevice.cpp
@@ -13,7 +13,6 @@
 #include <fmt/format.h>
 
 #include "Common/MathUtil.h"
-#include "Common/Thread.h"
 
 namespace ciface::Core
 {
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp
index 847eb72ccad9..92ebf355fcd7 100644
--- a/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp
@@ -144,7 +144,8 @@ KeyboardMouse::KeyboardMouse(const LPDIRECTINPUTDEVICE8 kb_device,
   mouse_caps.dwSize = sizeof(mouse_caps);
   m_mo_device->GetCapabilities(&mouse_caps);
   // mouse buttons
-  for (u8 i = 0; i < mouse_caps.dwButtons; ++i)
+  // We don't use caps here due to reporting inconsistencies
+  for (u8 i = 0; i < std::size(m_state_in.mouse.rgbButtons); ++i)
     AddInput(new Button(i, m_state_in.mouse.rgbButtons[i]));
   // mouse axes
   for (unsigned int i = 0; i < mouse_caps.dwAxes; ++i)
diff --git a/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.cpp b/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.cpp
index cac67e1b8aa9..2247dabbdafc 100644
--- a/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.cpp
@@ -20,7 +20,6 @@
 #include "Common/ScopeGuard.h"
 #include "Common/StringUtil.h"
 #include "Common/Thread.h"
-#include "Core/CoreTiming.h"
 #include "InputCommon/ControllerInterface/ControllerInterface.h"
 #include "InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPProto.h"
 #include "SFML/Network/IpAddress.hpp"
diff --git a/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.h b/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.h
index 7f2d62fb583e..f913e1521a41 100644
--- a/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.h
+++ b/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.h
@@ -3,7 +3,8 @@
 
 #pragma once
 
-#include "Common/Config/Config.h"
+#include "Common/CommonTypes.h"
+#include "Common/Config/ConfigInfo.h"
 #include "InputCommon/ControllerInterface/InputBackend.h"
 
 namespace ciface::DualShockUDPClient
diff --git a/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPProto.h b/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPProto.h
index aca2176e6d7c..1fa0438a9068 100644
--- a/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPProto.h
+++ b/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPProto.h
@@ -9,6 +9,7 @@
 
 #include "Common/CommonTypes.h"
 #include "Common/Hash.h"
+#include "Common/Logging/Log.h"
 
 namespace ciface::DualShockUDPClient::Proto
 {
@@ -240,7 +241,7 @@ struct Message
   std::optional<ToMsgType> CheckAndCastTo()
   {
     const u32 crc32_in_header = m_message.header.crc32;
-    // zero out the crc32 in the packet once we got it since that's whats needed for calculation
+    // zero out the crc32 in the packet once we got it since that's what's needed for calculation
     m_message.header.crc32 = 0;
     const u32 crc32_calculated =
         Common::ComputeCRC32(reinterpret_cast<const u8*>(&m_message), sizeof(ToMsgType));
diff --git a/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.cpp b/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.cpp
index 50175ebaf7b5..20baa74be987 100644
--- a/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.cpp
@@ -12,7 +12,6 @@
 #include <map>
 #include <sstream>
 #include <string>
-#include <sys/stat.h>
 #include <unistd.h>
 #include <vector>
 
diff --git a/Source/Core/InputCommon/ControllerInterface/SteamDeck/SteamDeck.cpp b/Source/Core/InputCommon/ControllerInterface/SteamDeck/SteamDeck.cpp
index f8615d138b99..b78c56afc65b 100644
--- a/Source/Core/InputCommon/ControllerInterface/SteamDeck/SteamDeck.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/SteamDeck/SteamDeck.cpp
@@ -3,8 +3,6 @@
 
 #include "InputCommon/ControllerInterface/SteamDeck/SteamDeck.h"
 
-#include <type_traits>
-
 #include <hidapi.h>
 
 #include "Common/CommonTypes.h"
diff --git a/Source/Core/InputCommon/ControllerInterface/WGInput/WGInput.cpp b/Source/Core/InputCommon/ControllerInterface/WGInput/WGInput.cpp
index e78cf651c5be..fe897f8bc580 100644
--- a/Source/Core/InputCommon/ControllerInterface/WGInput/WGInput.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/WGInput/WGInput.cpp
@@ -363,7 +363,7 @@ class Device : public Core::Device
       if (m_switch == WGI::GameControllerSwitchPosition::Center)
         return 0.0;
 
-      // All of the "inbetween" states (e.g. Up-Right) are one-off from the four cardinal
+      // All of the "in between" states (e.g. Up-Right) are one-off from the four cardinal
       // directions. This tests that the current switch state value is within 1 of the desired
       // state.
       const auto direction_diff = std::abs(static_cast<int32_t>(m_switch) - m_direction);
diff --git a/Source/Core/InputCommon/ControllerInterface/Wiimote/WiimoteController.cpp b/Source/Core/InputCommon/ControllerInterface/Wiimote/WiimoteController.cpp
index 9b5fe3c1e961..b062684100b8 100644
--- a/Source/Core/InputCommon/ControllerInterface/Wiimote/WiimoteController.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/Wiimote/WiimoteController.cpp
@@ -737,7 +737,7 @@ void Device::ProcessExtensionID(u8 id_0, u8 id_4, u8 id_5)
   }
   else
   {
-    // This is a normal occurance before extension initialization.
+    // This is a normal occurrence before extension initialization.
     DEBUG_LOG_FMT(WIIMOTE, "WiiRemote: Unknown extension: {} {} {}.", id_0, id_4, id_5);
     m_extension_id = ExtensionID::Unsupported;
   }
@@ -1328,7 +1328,7 @@ void Device::IRState::ProcessData(const DataReportManipulator& manipulator)
   if (points.Count() >= 2)
   {
     const auto variance = points.PopulationVariance();
-    // Adjusts Y coorinate to match horizontal FOV.
+    // Adjusts Y coordinate to match horizontal FOV.
     const auto separation =
         Common::Vec2(std::sqrt(variance.x), std::sqrt(variance.y)) /
         Common::Vec2(WiimoteEmu::CameraLogic::CAMERA_RES_X,
diff --git a/Source/Core/InputCommon/DynamicInputTextureManager.cpp b/Source/Core/InputCommon/DynamicInputTextureManager.cpp
index af5214bd37a7..be5c96340994 100644
--- a/Source/Core/InputCommon/DynamicInputTextureManager.cpp
+++ b/Source/Core/InputCommon/DynamicInputTextureManager.cpp
@@ -9,12 +9,10 @@
 #include "Common/FileSearch.h"
 #include "Common/FileUtil.h"
 #include "Core/ConfigManager.h"
-#include "Core/Core.h"
 
 #include "InputCommon/DynamicInputTextures/DITConfiguration.h"
 #include "InputCommon/ImageOperations.h"
 #include "VideoCommon/HiresTextures.h"
-#include "VideoCommon/TextureCacheBase.h"
 
 namespace InputCommon
 {
@@ -32,7 +30,7 @@ void DynamicInputTextureManager::Load()
 
   for (const auto& dynamic_input_directory : dynamic_input_directories)
   {
-    const auto json_files = Common::DoFileSearch({dynamic_input_directory}, {".json"});
+    const auto json_files = Common::DoFileSearch(dynamic_input_directory, ".json");
     for (auto& file : json_files)
     {
       m_configuration.emplace_back(file);
diff --git a/Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.cpp b/Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.cpp
index 9ccd98dbc243..250881ccc26a 100644
--- a/Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.cpp
+++ b/Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.cpp
@@ -4,18 +4,15 @@
 #include "InputCommon/DynamicInputTextures/DITConfiguration.h"
 
 #include <optional>
-#include <sstream>
 #include <string>
 
 #include <picojson.h>
 
-#include "Common/CommonPaths.h"
 #include "Common/IniFile.h"
 #include "Common/JsonUtil.h"
 #include "Common/Logging/Log.h"
 #include "Common/StringUtil.h"
 #include "Core/ConfigManager.h"
-#include "InputCommon/ControllerEmu/ControllerEmu.h"
 #include "InputCommon/DynamicInputTextures/DITSpecification.h"
 #include "InputCommon/ImageOperations.h"
 
diff --git a/Source/Core/InputCommon/DynamicInputTextures/DITSpecification.cpp b/Source/Core/InputCommon/DynamicInputTextures/DITSpecification.cpp
index 70c4651a2429..7b2b15a80b0d 100644
--- a/Source/Core/InputCommon/DynamicInputTextures/DITSpecification.cpp
+++ b/Source/Core/InputCommon/DynamicInputTextures/DITSpecification.cpp
@@ -6,7 +6,6 @@
 #include <fmt/format.h>
 
 #include "Common/FileUtil.h"
-#include "Common/IOFile.h"
 #include "Common/Logging/Log.h"
 #include "Core/ConfigManager.h"
 
diff --git a/Source/Core/InputCommon/GCAdapter.cpp b/Source/Core/InputCommon/GCAdapter.cpp
index b1294f280c6c..d1fcaceb262f 100644
--- a/Source/Core/InputCommon/GCAdapter.cpp
+++ b/Source/Core/InputCommon/GCAdapter.cpp
@@ -17,7 +17,6 @@
 #define GCADAPTER_USE_ANDROID_IMPLEMENTATION false
 #endif
 
-#include <algorithm>
 #include <array>
 #include <mutex>
 #include <optional>
@@ -169,6 +168,8 @@ static std::optional<Config::ConfigChangedCallbackID> s_config_callback_id = std
 static bool s_is_adapter_wanted = false;
 static std::array<bool, SerialInterface::MAX_SI_CHANNELS> s_config_rumble_enabled{};
 
+static std::atomic<double> s_adapter_poll_rate{};
+
 #if GCADAPTER_USE_LIBUSB_IMPLEMENTATION || GCADAPTER_USE_ANDROID_IMPLEMENTATION
 static void ReadThreadFunc()
 {
@@ -206,6 +207,11 @@ static void ReadThreadFunc()
   // Reset rumble once on initial reading
   ResetRumble();
 
+  // Measure poll rate for display in UI.
+  constexpr int POLL_RATE_MEASUREMENT_SAMPLE_COUNT = 50;
+  auto poll_rate_measurement_start_time = Clock::now();
+  int poll_rate_measurement_count = 0;
+
   while (s_read_adapter_thread_running.IsSet())
   {
 #if GCADAPTER_USE_LIBUSB_IMPLEMENTATION
@@ -249,6 +255,19 @@ static void ReadThreadFunc()
     }
 #endif
 
+    // Update poll rate measurement.
+    if (++poll_rate_measurement_count == POLL_RATE_MEASUREMENT_SAMPLE_COUNT)
+    {
+      const auto now = Clock::now();
+
+      const auto poll_rate =
+          POLL_RATE_MEASUREMENT_SAMPLE_COUNT / DT_s(now - poll_rate_measurement_start_time).count();
+      s_adapter_poll_rate.store(poll_rate, std::memory_order_relaxed);
+
+      poll_rate_measurement_start_time = now;
+      poll_rate_measurement_count = 0;
+    }
+
     Common::YieldCPU();
   }
 
@@ -266,6 +285,8 @@ static void ReadThreadFunc()
   s_detected = false;
 #endif
 
+  s_adapter_poll_rate.store(0.0, std::memory_order_relaxed);
+
   NOTICE_LOG_FMT(CONTROLLERINTERFACE, "GCAdapter read thread stopped");
 }
 #endif
@@ -624,7 +645,7 @@ static bool CheckDeviceAccess(libusb_device* device)
   }
   else if (ret != 0)  // 0: kernel driver is not active, but otherwise no error.
   {
-    // Neither 0 nor 1 means an error occured.
+    // Neither 0 nor 1 means an error occurred.
     ERROR_LOG_FMT(CONTROLLERINTERFACE, "libusb_kernel_driver_active failed: {}",
                   LibusbUtils::ErrorWrap(ret));
   }
@@ -1029,4 +1050,9 @@ bool IsDetected(const char** error_message)
   return false;
 }
 
+double GetCurrentPollRate()
+{
+  return s_adapter_poll_rate.load(std::memory_order_relaxed);
+}
+
 }  // namespace GCAdapter
diff --git a/Source/Core/InputCommon/GCAdapter.h b/Source/Core/InputCommon/GCAdapter.h
index e6f62e035b40..50e24ae9402b 100644
--- a/Source/Core/InputCommon/GCAdapter.h
+++ b/Source/Core/InputCommon/GCAdapter.h
@@ -28,4 +28,7 @@ bool DeviceConnected(int chan);
 void ResetDeviceType(int chan);
 bool UseAdapter();
 
+// Callable from any thread. Returns 0 when the adapter is not detected.
+double GetCurrentPollRate();
+
 }  // namespace GCAdapter
diff --git a/Source/Core/InputCommon/GCPadStatus.h b/Source/Core/InputCommon/GCPadStatus.h
index 74849e5594a7..b6bbf804b433 100644
--- a/Source/Core/InputCommon/GCPadStatus.h
+++ b/Source/Core/InputCommon/GCPadStatus.h
@@ -28,6 +28,13 @@ enum PadButton
   PAD_BUTTON_START = 0x1000,
 };
 
+enum SwitchButton
+{
+  SWITCH_TEST = 0x0001,
+  SWITCH_SERVICE = 0x0002,
+  SWITCH_COIN = 0x0004,
+};
+
 struct GCPadStatus
 {
   u16 button = 0;       // Or-ed PAD_BUTTON_* and PAD_TRIGGER_* bits
@@ -39,6 +46,8 @@ struct GCPadStatus
   u8 triggerRight = 0;  // 0 <= triggerRight <= 255
   u8 analogA = 0;       // 0 <= analogA      <= 255
   u8 analogB = 0;       // 0 <= analogB      <= 255
+  // Triforce
+  u8 switches = 0;
   bool isConnected = true;
 
   static const u8 MAIN_STICK_CENTER_X = 0x80;
diff --git a/Source/Core/InputCommon/InputConfig.cpp b/Source/Core/InputCommon/InputConfig.cpp
index ffdf0e12e498..8c9a42df44cb 100644
--- a/Source/Core/InputCommon/InputConfig.cpp
+++ b/Source/Core/InputCommon/InputConfig.cpp
@@ -5,7 +5,6 @@
 
 #include <vector>
 
-#include "Common/Config/Config.h"
 #include "Common/FileUtil.h"
 #include "Common/IniFile.h"
 #include "Common/MsgHandler.h"
@@ -13,9 +12,7 @@
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 #include "Core/HW/Wiimote.h"
-#include "InputCommon/ControllerEmu/ControlGroup/ControlGroup.h"
 #include "InputCommon/ControllerEmu/ControllerEmu.h"
-#include "InputCommon/ControllerEmu/Setting/NumericSetting.h"
 #include "InputCommon/ControllerInterface/ControllerInterface.h"
 #include "InputCommon/InputProfile.h"
 
@@ -73,7 +70,6 @@ bool InputConfig::LoadConfig()
   {
     int n = 0;
 
-    std::vector<std::string> controller_names;
     for (auto& controller : m_controllers)
     {
       Common::IniFile::Section config;
@@ -95,7 +91,6 @@ bool InputConfig::LoadConfig()
       }
       controller->LoadConfig(&config);
       controller->UpdateReferences(g_controller_interface);
-      controller_names.push_back(controller->GetName());
 
       // Next profile
       n++;
@@ -128,11 +123,9 @@ void InputConfig::SaveConfig()
   Common::IniFile inifile;
   inifile.Load(ini_filename);
 
-  std::vector<std::string> controller_names;
   for (auto& controller : m_controllers)
   {
     controller->SaveConfig(inifile.GetOrCreateSection(controller->GetName()));
-    controller_names.push_back(controller->GetName());
   }
 
   inifile.Save(ini_filename);
diff --git a/Source/Core/InputCommon/InputProfile.cpp b/Source/Core/InputCommon/InputProfile.cpp
index 0bb452ac1e3b..f483e8a9c37e 100644
--- a/Source/Core/InputCommon/InputProfile.cpp
+++ b/Source/Core/InputCommon/InputProfile.cpp
@@ -15,8 +15,8 @@
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 #include "Core/HW/Wiimote.h"
-#include "Core/HotkeyManager.h"
 
+#include "InputCommon/ControllerEmu/ControllerEmu.h"
 #include "InputCommon/ControllerInterface/ControllerInterface.h"
 #include "InputCommon/InputConfig.h"
 
@@ -37,7 +37,7 @@ std::vector<std::string> GetProfilesFromSetting(const std::string& setting, cons
     const std::string path = root + std::string(StripWhitespace(setting_choice));
     if (File::IsDirectory(path))
     {
-      const auto files_under_directory = Common::DoFileSearch({path}, {".ini"}, true);
+      const auto files_under_directory = Common::DoFileSearch(path, ".ini", true);
       result.insert(result.end(), files_under_directory.begin(), files_under_directory.end());
     }
     else
@@ -57,7 +57,7 @@ std::vector<std::string> ProfileCycler::GetProfilesForDevice(InputConfig* device
 {
   const std::string device_profile_root_location(
       device_configuration->GetUserProfileDirectoryPath());
-  return Common::DoFileSearch({device_profile_root_location}, {".ini"}, true);
+  return Common::DoFileSearch(device_profile_root_location, ".ini", true);
 }
 
 std::string ProfileCycler::GetProfile(CycleDirection cycle_direction, int& profile_index,
diff --git a/Source/Core/MacUpdater/CMakeLists.txt b/Source/Core/MacUpdater/CMakeLists.txt
index da6d052fa5c2..459531d39aa4 100644
--- a/Source/Core/MacUpdater/CMakeLists.txt
+++ b/Source/Core/MacUpdater/CMakeLists.txt
@@ -24,12 +24,12 @@ target_sources(MacUpdater PRIVATE "${CMAKE_SOURCE_DIR}/Data/Dolphin.icns")
 set_source_files_properties("${CMAKE_SOURCE_DIR}/Data/Dolphin.icns" PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
 
 target_link_libraries(MacUpdater PRIVATE
-    "-framework Cocoa"
-    "-framework AppKit"
-    "-framework CoreData"
-    "-framework Foundation"
-    uicommon
-    updatercommon
+  "-framework Cocoa"
+  "-framework AppKit"
+  "-framework CoreData"
+  "-framework Foundation"
+  uicommon
+  updatercommon
 )
 
 # Compile storyboards (Adapted from https://gitlab.kitware.com/cmake/community/wikis/doc/tutorials/OSX-InterfaceBuilderFiles)
@@ -47,14 +47,13 @@ foreach(sb ${STORYBOARDS})
   set(input  ${CMAKE_CURRENT_SOURCE_DIR}/${sb})
   add_custom_command(TARGET MacUpdater POST_BUILD
     COMMAND ${IBTOOL} --errors --warnings --notices --output-format human-readable-text --compile ${output} ${input}
-    DEPENDS ${input}
     COMMENT "Compiling Storyboard ${sb}...")
 endforeach()
 
 include(DolphinInjectVersionInfo)
 dolphin_inject_version_info(MacUpdater)
 
-if(NOT SKIP_POSTPROCESS_BUNDLE)
+if(POSTPROCESS_BUNDLE)
   # Update library references to make the bundle portable
   include(DolphinPostprocessBundle)
   dolphin_postprocess_bundle(MacUpdater)
diff --git a/Source/Core/UICommon/AutoUpdate.cpp b/Source/Core/UICommon/AutoUpdate.cpp
index 381a6b8eaf64..21a5341fd579 100644
--- a/Source/Core/UICommon/AutoUpdate.cpp
+++ b/Source/Core/UICommon/AutoUpdate.cpp
@@ -9,9 +9,6 @@
 #include <fmt/format.h>
 #include <picojson.h>
 
-#include "Common/CommonFuncs.h"
-#include "Common/CommonPaths.h"
-#include "Common/FileUtil.h"
 #include "Common/HttpRequest.h"
 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"
@@ -21,7 +18,6 @@
 #ifdef _WIN32
 #include <windows.h>
 #else
-#include <sys/types.h>
 #include <unistd.h>
 #endif
 
@@ -31,6 +27,9 @@
 
 #if defined(_WIN32) || defined(__APPLE__)
 #define OS_SUPPORTS_UPDATER
+#include "Common/CommonFuncs.h"
+#include "Common/CommonPaths.h"
+#include "Common/FileUtil.h"
 #endif
 
 // Refer to docs/autoupdate_overview.md for a detailed overview of the autoupdate process
diff --git a/Source/Core/UICommon/CMakeLists.txt b/Source/Core/UICommon/CMakeLists.txt
index 2f248e1066b4..e141eab6f940 100644
--- a/Source/Core/UICommon/CMakeLists.txt
+++ b/Source/Core/UICommon/CMakeLists.txt
@@ -26,7 +26,7 @@ PUBLIC
   common
   core
   cpp-optparse
-  minizip-ng::minizip-ng
+  MINIZIP::minizip-ng
   pugixml
 
 PRIVATE
diff --git a/Source/Core/UICommon/DiscordPresence.cpp b/Source/Core/UICommon/DiscordPresence.cpp
index 67870999aac3..80436f643977 100644
--- a/Source/Core/UICommon/DiscordPresence.cpp
+++ b/Source/Core/UICommon/DiscordPresence.cpp
@@ -9,17 +9,13 @@
 
 #ifdef USE_DISCORD_PRESENCE
 
-#include <algorithm>
 #include <ctime>
-#include <set>
 #include <string>
 
 #include <discord_rpc.h>
 #include <fmt/format.h>
 
 #include "Common/Hash.h"
-#include "Common/HttpRequest.h"
-#include "Common/StringUtil.h"
 
 #include "Core/AchievementManager.h"
 #include "Core/Config/AchievementSettings.h"
@@ -274,7 +270,7 @@ void UpdateDiscordPresence(int party_size, SecretType type, const std::string& s
   std::string secret_final;
   if (type != SecretType::Empty)
   {
-    // Declearing party_id or secret_final here will deallocate the variable before passing the
+    // Declaring party_id or secret_final here will deallocate the variable before passing the
     // values over to Discord_UpdatePresence.
 
     const size_t secret_length = secret.length();
diff --git a/Source/Core/UICommon/GameFile.cpp b/Source/Core/UICommon/GameFile.cpp
index d548c55fbb68..4acab314d12d 100644
--- a/Source/Core/UICommon/GameFile.cpp
+++ b/Source/Core/UICommon/GameFile.cpp
@@ -7,12 +7,10 @@
 #include <array>
 #include <cstdio>
 #include <cstring>
-#include <iterator>
 #include <map>
 #include <memory>
 #include <string>
 #include <string_view>
-#include <tuple>
 #include <utility>
 #include <vector>
 
@@ -29,7 +27,6 @@
 #include "Common/HttpRequest.h"
 #include "Common/IOFile.h"
 #include "Common/Image.h"
-#include "Common/IniFile.h"
 #include "Common/MsgHandler.h"
 #include "Common/NandPaths.h"
 #include "Common/StringUtil.h"
@@ -131,7 +128,6 @@ GameFile::GameFile(std::string path) : m_file_path(std::move(path))
       m_internal_name = volume->GetInternalName();
       m_game_id = volume->GetGameID();
       m_gametdb_id = volume->GetGameTDBID();
-      m_triforce_id = volume->GetTriforceID();
       m_title_id = volume->GetTitleID().value_or(0);
       m_maker_id = volume->GetMakerID();
       m_revision = volume->GetRevision().value_or(0);
@@ -312,7 +308,6 @@ void GameFile::DoState(PointerWrap& p)
   p.Do(m_internal_name);
   p.Do(m_game_id);
   p.Do(m_gametdb_id);
-  p.Do(m_triforce_id);
   p.Do(m_title_id);
   p.Do(m_maker_id);
 
@@ -501,8 +496,7 @@ const std::string& GameFile::GetName(const Core::TitleDatabase& title_database)
   if (IsModDescriptor())
     return GetName(Variant::LongAndPossiblyCustom);
 
-  const std::string& database_name =
-      title_database.GetTitleName(m_gametdb_id, m_triforce_id, GetConfigLanguage());
+  const std::string& database_name = title_database.GetTitleName(m_gametdb_id, GetConfigLanguage());
   return database_name.empty() ? GetName(Variant::LongAndPossiblyCustom) : database_name;
 }
 
diff --git a/Source/Core/UICommon/GameFile.h b/Source/Core/UICommon/GameFile.h
index f015fa972578..e43950143b32 100644
--- a/Source/Core/UICommon/GameFile.h
+++ b/Source/Core/UICommon/GameFile.h
@@ -76,7 +76,6 @@ class GameFile final
   const std::string& GetInternalName() const { return m_internal_name; }
   const std::string& GetGameID() const { return m_game_id; }
   const std::string& GetGameTDBID() const { return m_gametdb_id; }
-  std::string GetTriforceID() const { return m_triforce_id; }
   u64 GetTitleID() const { return m_title_id; }
   const std::string& GetMakerID() const { return m_maker_id; }
   u16 GetRevision() const { return m_revision; }
@@ -160,7 +159,6 @@ class GameFile final
   std::string m_internal_name;
   std::string m_game_id;
   std::string m_gametdb_id;
-  std::string m_triforce_id;
   u64 m_title_id{};
   std::string m_maker_id;
 
diff --git a/Source/Core/UICommon/GameFileCache.cpp b/Source/Core/UICommon/GameFileCache.cpp
index f72f47c11ee6..898e8188527f 100644
--- a/Source/Core/UICommon/GameFileCache.cpp
+++ b/Source/Core/UICommon/GameFileCache.cpp
@@ -5,10 +5,7 @@
 
 #include <algorithm>
 #include <cstddef>
-#include <functional>
-#include <list>
 #include <memory>
-#include <mutex>
 #include <string>
 #include <unordered_set>
 #include <utility>
@@ -26,14 +23,14 @@
 
 namespace UICommon
 {
-static constexpr u32 CACHE_REVISION = 26;  // Last changed in PR 10084
+static constexpr u32 CACHE_REVISION = 27;  // Last changed in PR 13844
 
-std::vector<std::string> FindAllGamePaths(const std::vector<std::string>& directories_to_scan,
+std::vector<std::string> FindAllGamePaths(std::span<const std::string_view> directories_to_scan,
                                           bool recursive_scan)
 {
-  static const std::vector<std::string> search_extensions = {
-      ".gcm", ".tgc", ".bin", ".iso", ".ciso", ".gcz", ".wbfs",
-      ".wia", ".rvz", ".nfs", ".wad", ".dol",  ".elf", ".json"};
+  constexpr auto search_extensions =
+      std::to_array<std::string_view>({".gcm", ".tgc", ".bin", ".iso", ".ciso", ".gcz", ".wbfs",
+                                       ".wia", ".rvz", ".nfs", ".wad", ".dol", ".elf", ".json"});
 
   // TODO: We could process paths iteratively as they are found
   return Common::DoFileSearch(directories_to_scan, search_extensions, recursive_scan);
diff --git a/Source/Core/UICommon/GameFileCache.h b/Source/Core/UICommon/GameFileCache.h
index 5544b3a14321..4c4ab155575a 100644
--- a/Source/Core/UICommon/GameFileCache.h
+++ b/Source/Core/UICommon/GameFileCache.h
@@ -19,7 +19,7 @@ namespace UICommon
 {
 class GameFile;
 
-std::vector<std::string> FindAllGamePaths(const std::vector<std::string>& directories_to_scan,
+std::vector<std::string> FindAllGamePaths(std::span<const std::string_view> directories_to_scan,
                                           bool recursive_scan);
 
 class GameFileCache
diff --git a/Source/Core/UICommon/NetPlayIndex.cpp b/Source/Core/UICommon/NetPlayIndex.cpp
index aaaa4549a8a0..f6f3b577542b 100644
--- a/Source/Core/UICommon/NetPlayIndex.cpp
+++ b/Source/Core/UICommon/NetPlayIndex.cpp
@@ -11,7 +11,6 @@
 
 #include "Common/Common.h"
 #include "Common/HttpRequest.h"
-#include "Common/Thread.h"
 #include "Common/Version.h"
 
 #include "Core/Config/NetplaySettings.h"
@@ -289,7 +288,7 @@ std::optional<std::string> NetPlaySession::DecryptID(std::string_view password)
   if (password.empty())
     return {};
 
-  // If the length of an encrypted session id is not divisble by two, it's invalid
+  // If the length of an encrypted session id is not divisible by two, it's invalid
   if (server_id.empty() || server_id.size() % 2 != 0)
     return {};
 
diff --git a/Source/Core/UICommon/ResourcePack/Manager.cpp b/Source/Core/UICommon/ResourcePack/Manager.cpp
index b1fd555c8593..f3abf44ebc73 100644
--- a/Source/Core/UICommon/ResourcePack/Manager.cpp
+++ b/Source/Core/UICommon/ResourcePack/Manager.cpp
@@ -32,7 +32,7 @@ bool Init()
 {
   packs.clear();
   const std::vector<std::string> pack_list =
-      Common::DoFileSearch({File::GetUserPath(D_RESOURCEPACK_IDX)}, {".zip"});
+      Common::DoFileSearch(File::GetUserPath(D_RESOURCEPACK_IDX), ".zip");
 
   Common::IniFile file = GetPackConfig();
 
diff --git a/Source/Core/UICommon/ResourcePack/ResourcePack.cpp b/Source/Core/UICommon/ResourcePack/ResourcePack.cpp
index 73f271c6bcf0..e4037062ed3d 100644
--- a/Source/Core/UICommon/ResourcePack/ResourcePack.cpp
+++ b/Source/Core/UICommon/ResourcePack/ResourcePack.cpp
@@ -97,10 +97,9 @@ ResourcePack::ResourcePack(const std::string& path) : m_path(path)
 
   do
   {
-    std::string filename(256, '\0');
-
     mz_zip_file* texture_info;
     mz_zip_reader_entry_get_info(zip_reader, &texture_info);
+    std::string filename(texture_info->filename);
 
     if (!filename.starts_with("textures/") || texture_info->uncompressed_size == 0)
       continue;
@@ -305,7 +304,7 @@ bool ResourcePack::Uninstall(const std::string& path)
 
     while (dir.length() > (path + TEXTURE_PATH).length())
     {
-      auto is_empty = Common::DoFileSearch({dir}).empty();
+      const auto is_empty = Common::DoFileSearch(dir).empty();
 
       if (is_empty)
         File::DeleteDir(dir);
diff --git a/Source/Core/UICommon/UICommon.cpp b/Source/Core/UICommon/UICommon.cpp
index 1bcdb5dedd25..8f5c677d419c 100644
--- a/Source/Core/UICommon/UICommon.cpp
+++ b/Source/Core/UICommon/UICommon.cpp
@@ -6,10 +6,8 @@
 #include <algorithm>
 #include <clocale>
 #include <cmath>
-#include <iomanip>
 #include <locale>
 #include <memory>
-#include <sstream>
 #ifdef _WIN32
 #include <shlobj.h>  // for SHGetFolderPath
 #ifdef __MINGW32__
@@ -24,11 +22,9 @@
 #include "Common/CommonPaths.h"
 #include "Common/Config/Config.h"
 #include "Common/FileUtil.h"
-#include "Common/IniFile.h"
 #include "Common/Logging/LogManager.h"
 #include "Common/MathUtil.h"
 #include "Common/MsgHandler.h"
-#include "Common/StringUtil.h"
 
 #include "Core/Config/MainSettings.h"
 #include "Core/ConfigLoaders/BaseConfigLoader.h"
@@ -44,7 +40,6 @@
 #include "Core/IOS/IOS.h"
 #include "Core/IOS/STM/STM.h"
 #include "Core/System.h"
-#include "Core/USBUtils.h"
 #include "Core/WiiRoot.h"
 
 #include "InputCommon/ControllerInterface/ControllerInterface.h"
@@ -67,6 +62,7 @@
 namespace UICommon
 {
 static Config::ConfigChangedCallbackID s_config_changed_callback_id;
+static Common::HookableEvent<> s_flush_unsaved_data_event_hook;
 
 static void CreateDumpPath(std::string path)
 {
@@ -164,6 +160,17 @@ void Shutdown()
   Config::Shutdown();
 }
 
+[[nodiscard]] Common::EventHook AddFlushUnsavedDataCallback(std::function<void()> callback)
+{
+  return s_flush_unsaved_data_event_hook.Register(std::move(callback));
+}
+
+void FlushUnsavedData()
+{
+  INFO_LOG_FMT(CORE, "Flushing unsaved data...");
+  s_flush_unsaved_data_event_hook.Trigger();
+}
+
 void InitControllers(const WindowSystemInfo& wsi)
 {
   if (g_controller_interface.IsInit())
@@ -277,6 +284,7 @@ void CreateDirectories()
   File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX) + USA_DIR DIR_SEP);
   File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX) + EUR_DIR DIR_SEP);
   File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX) + JAP_DIR DIR_SEP);
+  File::CreateFullPath(File::GetUserPath(D_TRIUSER_IDX));
   File::CreateFullPath(File::GetUserPath(D_HIRESTEXTURES_IDX));
   File::CreateFullPath(File::GetUserPath(D_GRAPHICSMOD_IDX));
   File::CreateFullPath(File::GetUserPath(D_MAPS_IDX));
diff --git a/Source/Core/UICommon/UICommon.h b/Source/Core/UICommon/UICommon.h
index 2de62627bd76..893543677856 100644
--- a/Source/Core/UICommon/UICommon.h
+++ b/Source/Core/UICommon/UICommon.h
@@ -10,6 +10,7 @@
 #endif
 
 #include "Common/CommonTypes.h"
+#include "Common/HookableEvent.h"
 
 struct WindowSystemInfo;
 
@@ -18,6 +19,10 @@ namespace UICommon
 void Init();
 void Shutdown();
 
+// Triggered from the Host-thread on Android before a potential process termination.
+[[nodiscard]] Common::EventHook AddFlushUnsavedDataCallback(std::function<void()> callback);
+void FlushUnsavedData();
+
 void InitControllers(const WindowSystemInfo& wsi);
 void ShutdownControllers();
 
diff --git a/Source/Core/UICommon/X11Utils.cpp b/Source/Core/UICommon/X11Utils.cpp
index 26f8a0ce0973..0fbb50149ae1 100644
--- a/Source/Core/UICommon/X11Utils.cpp
+++ b/Source/Core/UICommon/X11Utils.cpp
@@ -3,22 +3,16 @@
 
 #include "UICommon/X11Utils.h"
 
-#include <algorithm>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
-#include <spawn.h>
 #include <string>
-#include <sys/wait.h>
-#include <unistd.h>
 
 #include <fmt/format.h>
 
 #include "Common/Contains.h"
 #include "Common/Logging/Log.h"
-#include "Common/StringUtil.h"
 #include "Core/Config/MainSettings.h"
-#include "Core/Core.h"
 
 extern char** environ;
 
@@ -107,7 +101,7 @@ void XRRConfiguration::Update()
   }
   fullMode = 0;
 
-  // Get the resolution setings for fullscreen mode
+  // Get the resolution settings for fullscreen mode
   unsigned int fullWidth, fullHeight;
   char* output_name = nullptr;
   char auxFlag = '\0';
diff --git a/Source/Core/UpdaterCommon/UpdaterCommon.cpp b/Source/Core/UpdaterCommon/UpdaterCommon.cpp
index 3dddf530b3b5..4f91dc1acd9c 100644
--- a/Source/Core/UpdaterCommon/UpdaterCommon.cpp
+++ b/Source/Core/UpdaterCommon/UpdaterCommon.cpp
@@ -59,7 +59,7 @@ void LogToFile(const char* fmt, ...)
   va_end(args);
 }
 
-bool ProgressCallback(s64 total, s64 now, s64, s64)
+static bool ProgressCallback(s64 total, s64 now, s64, s64)
 {
   UI::SetCurrentProgress(static_cast<int>(now), static_cast<int>(total));
   return true;
@@ -78,7 +78,7 @@ std::string HexEncode(const u8* buffer, size_t size)
   return out;
 }
 
-bool HexDecode(const std::string& hex, u8* buffer, size_t size)
+static bool HexDecode(const std::string& hex, u8* buffer, size_t size)
 {
   if (hex.size() != size * 2)
     return false;
@@ -107,7 +107,7 @@ bool HexDecode(const std::string& hex, u8* buffer, size_t size)
   return true;
 }
 
-std::optional<std::string> GzipInflate(const std::string& data)
+static std::optional<std::string> GzipInflate(const std::string& data)
 {
   z_stream zstrm;
   zstrm.zalloc = nullptr;
@@ -155,7 +155,7 @@ Manifest::Hash ComputeHash(const std::string& contents)
   return out;
 }
 
-bool VerifySignature(const std::string& data, const std::string& b64_signature)
+static bool VerifySignature(const std::string& data, const std::string& b64_signature)
 {
   u8 signature[64];  // ed25519 sig size.
   size_t sig_size;
@@ -174,7 +174,7 @@ bool VerifySignature(const std::string& data, const std::string& b64_signature)
                         pub_key.data());
 }
 
-void FlushLog()
+static void FlushLog()
 {
   log_file.Flush();
   log_file.Close();
@@ -204,8 +204,8 @@ void TodoList::Log() const
   }
 }
 
-bool DownloadContent(const std::vector<TodoList::DownloadOp>& to_download,
-                     const std::string& content_base_url, const std::string& temp_path)
+static bool DownloadContent(const std::vector<TodoList::DownloadOp>& to_download,
+                            const std::string& content_base_url, const std::string& temp_path)
 {
   Common::HttpRequest req(std::chrono::seconds(30), ProgressCallback);
 
@@ -266,14 +266,14 @@ bool DownloadContent(const std::vector<TodoList::DownloadOp>& to_download,
   return true;
 }
 
-bool PlatformVersionCheck(const std::vector<TodoList::UpdateOp>& to_update,
-                          const std::string& install_base_path, const std::string& temp_dir)
+static bool PlatformVersionCheck(const std::vector<TodoList::UpdateOp>& to_update,
+                                 const std::string& install_base_path, const std::string& temp_dir)
 {
   UI::SetDescription("Checking platform...");
   return Platform::VersionCheck(to_update, install_base_path, temp_dir);
 }
 
-TodoList ComputeActionsToDo(Manifest this_manifest, Manifest next_manifest)
+static TodoList ComputeActionsToDo(Manifest this_manifest, Manifest next_manifest)
 {
   TodoList todo;
 
@@ -317,7 +317,7 @@ TodoList ComputeActionsToDo(Manifest this_manifest, Manifest next_manifest)
   return todo;
 }
 
-void CleanUpTempDir(const std::string& temp_dir, const TodoList& todo)
+static void CleanUpTempDir(const std::string& temp_dir, const TodoList& todo)
 {
   // This is best-effort cleanup, we ignore most errors.
   for (const auto& download : todo.to_download)
@@ -325,20 +325,20 @@ void CleanUpTempDir(const std::string& temp_dir, const TodoList& todo)
   File::DeleteDir(temp_dir);
 }
 
-bool BackupFile(const std::string& path)
+static bool BackupFile(const std::string& path)
 {
   std::string backup_path = path + ".bak";
   LogToFile("Backing up existing %s to .bak.\n", path.c_str());
   if (!File::Rename(path, backup_path))
   {
-    LogToFile("Cound not rename %s to %s for backup.\n", path.c_str(), backup_path.c_str());
+    LogToFile("Could not rename %s to %s for backup.\n", path.c_str(), backup_path.c_str());
     return false;
   }
   return true;
 }
 
-bool DeleteObsoleteFiles(const std::vector<TodoList::DeleteOp>& to_delete,
-                         const std::string& install_base_path)
+static bool DeleteObsoleteFiles(const std::vector<TodoList::DeleteOp>& to_delete,
+                                const std::string& install_base_path)
 {
   for (const auto& op : to_delete)
   {
@@ -370,8 +370,8 @@ bool DeleteObsoleteFiles(const std::vector<TodoList::DeleteOp>& to_delete,
   return true;
 }
 
-bool UpdateFiles(const std::vector<TodoList::UpdateOp>& to_update,
-                 const std::string& install_base_path, const std::string& temp_path)
+static bool UpdateFiles(const std::vector<TodoList::UpdateOp>& to_update,
+                        const std::string& install_base_path, const std::string& temp_path)
 {
 #ifdef _WIN32
   const auto self_path = std::filesystem::path(Common::GetModuleName(nullptr).value());
@@ -479,8 +479,8 @@ bool UpdateFiles(const std::vector<TodoList::UpdateOp>& to_update,
   return true;
 }
 
-bool PerformUpdate(const TodoList& todo, const std::string& install_base_path,
-                   const std::string& content_base_url, const std::string& temp_path)
+static bool PerformUpdate(const TodoList& todo, const std::string& install_base_path,
+                          const std::string& content_base_url, const std::string& temp_path)
 {
   LogToFile("Starting download step...\n");
   if (!DownloadContent(todo.to_download, content_base_url, temp_path))
@@ -505,7 +505,7 @@ bool PerformUpdate(const TodoList& todo, const std::string& install_base_path,
   return true;
 }
 
-void FatalError(const std::string& message)
+static void FatalError(const std::string& message)
 {
   LogToFile("%s\n", message.c_str());
 
@@ -513,7 +513,7 @@ void FatalError(const std::string& message)
   UI::Error(message);
 }
 
-std::optional<Manifest> ParseManifest(const std::string& manifest)
+static std::optional<Manifest> ParseManifest(const std::string& manifest)
 {
   Manifest parsed;
   size_t pos = 0;
@@ -556,7 +556,7 @@ std::optional<Manifest> ParseManifest(const std::string& manifest)
 }
 
 // Not showing a progress bar here because this part is just too quick
-std::optional<Manifest> FetchAndParseManifest(const std::string& url)
+static std::optional<Manifest> FetchAndParseManifest(const std::string& url)
 {
   Common::HttpRequest http;
 
@@ -614,7 +614,7 @@ struct Options
   std::optional<std::string> log_file;
 };
 
-std::optional<Options> ParseCommandLine(std::vector<std::string>& args)
+static std::optional<Options> ParseCommandLine(std::vector<std::string>& args)
 {
   using optparse::OptionParser;
 
diff --git a/Source/Core/VideoBackends/D3D/D3DBase.cpp b/Source/Core/VideoBackends/D3D/D3DBase.cpp
index 78d654ca2137..c67b142be07a 100644
--- a/Source/Core/VideoBackends/D3D/D3DBase.cpp
+++ b/Source/Core/VideoBackends/D3D/D3DBase.cpp
@@ -64,7 +64,7 @@ bool Create(u32 adapter_index, bool enable_debug_layer)
   }
 
   ComPtr<IDXGIAdapter> adapter;
-  HRESULT hr = dxgi_factory->EnumAdapters(adapter_index, adapter.GetAddressOf());
+  HRESULT hr = dxgi_factory->EnumAdapters(adapter_index, &adapter);
   if (FAILED(hr))
   {
     WARN_LOG_FMT(VIDEO, "Adapter {} not found, using default: {}", adapter_index, DX11HRWrap(hr));
@@ -75,10 +75,10 @@ bool Create(u32 adapter_index, bool enable_debug_layer)
   // version of the DirectX SDK. If it does, simply fallback to a non-debug device.
   if (enable_debug_layer)
   {
-    hr = d3d11_create_device(
-        adapter.Get(), D3D_DRIVER_TYPE_UNKNOWN, nullptr, D3D11_CREATE_DEVICE_DEBUG,
-        s_supported_feature_levels.data(), static_cast<UINT>(s_supported_feature_levels.size()),
-        D3D11_SDK_VERSION, device.GetAddressOf(), &feature_level, context.GetAddressOf());
+    hr = d3d11_create_device(adapter.Get(), D3D_DRIVER_TYPE_UNKNOWN, nullptr,
+                             D3D11_CREATE_DEVICE_DEBUG, s_supported_feature_levels.data(),
+                             static_cast<UINT>(s_supported_feature_levels.size()),
+                             D3D11_SDK_VERSION, &device, &feature_level, &context);
 
     // Debugbreak on D3D error
     if (SUCCEEDED(hr) && SUCCEEDED(hr = device.As(&s_debug)))
@@ -105,10 +105,10 @@ bool Create(u32 adapter_index, bool enable_debug_layer)
 
   if (!enable_debug_layer || FAILED(hr))
   {
-    hr = d3d11_create_device(
-        adapter.Get(), D3D_DRIVER_TYPE_UNKNOWN, nullptr, 0, s_supported_feature_levels.data(),
-        static_cast<UINT>(s_supported_feature_levels.size()), D3D11_SDK_VERSION,
-        device.GetAddressOf(), &feature_level, context.GetAddressOf());
+    hr = d3d11_create_device(adapter.Get(), D3D_DRIVER_TYPE_UNKNOWN, nullptr, 0,
+                             s_supported_feature_levels.data(),
+                             static_cast<UINT>(s_supported_feature_levels.size()),
+                             D3D11_SDK_VERSION, &device, &feature_level, &context);
   }
 
   if (FAILED(hr))
@@ -184,7 +184,7 @@ std::vector<u32> GetAAModes(u32 adapter_index)
       return {};
 
     ComPtr<IDXGIAdapter> adapter;
-    temp_dxgi_factory->EnumAdapters(adapter_index, adapter.GetAddressOf());
+    temp_dxgi_factory->EnumAdapters(adapter_index, &adapter);
 
     PFN_D3D11_CREATE_DEVICE d3d11_create_device;
     if (!temp_lib.Open("d3d11.dll") ||
@@ -193,10 +193,10 @@ std::vector<u32> GetAAModes(u32 adapter_index)
       return {};
     }
 
-    HRESULT hr = d3d11_create_device(
-        adapter.Get(), D3D_DRIVER_TYPE_UNKNOWN, nullptr, 0, s_supported_feature_levels.data(),
-        static_cast<UINT>(s_supported_feature_levels.size()), D3D11_SDK_VERSION,
-        temp_device.GetAddressOf(), &temp_feature_level, nullptr);
+    HRESULT hr = d3d11_create_device(adapter.Get(), D3D_DRIVER_TYPE_UNKNOWN, nullptr, 0,
+                                     s_supported_feature_levels.data(),
+                                     static_cast<UINT>(s_supported_feature_levels.size()),
+                                     D3D11_SDK_VERSION, &temp_device, &temp_feature_level, nullptr);
     if (FAILED(hr))
       return {};
   }
@@ -246,7 +246,7 @@ bool SupportsLogicOp(u32 adapter_index)
       return false;
 
     ComPtr<IDXGIAdapter> adapter;
-    temp_dxgi_factory->EnumAdapters(adapter_index, adapter.GetAddressOf());
+    temp_dxgi_factory->EnumAdapters(adapter_index, &adapter);
 
     PFN_D3D11_CREATE_DEVICE d3d11_create_device;
     if (!temp_lib.Open("d3d11.dll") ||
@@ -255,10 +255,10 @@ bool SupportsLogicOp(u32 adapter_index)
       return false;
     }
 
-    HRESULT hr = d3d11_create_device(
-        adapter.Get(), D3D_DRIVER_TYPE_UNKNOWN, nullptr, 0, s_supported_feature_levels.data(),
-        static_cast<UINT>(s_supported_feature_levels.size()), D3D11_SDK_VERSION,
-        temp_device.GetAddressOf(), nullptr, nullptr);
+    HRESULT hr = d3d11_create_device(adapter.Get(), D3D_DRIVER_TYPE_UNKNOWN, nullptr, 0,
+                                     s_supported_feature_levels.data(),
+                                     static_cast<UINT>(s_supported_feature_levels.size()),
+                                     D3D11_SDK_VERSION, &temp_device, nullptr, nullptr);
     if (FAILED(hr))
       return false;
 
diff --git a/Source/Core/VideoBackends/D3D/D3DNativeVertexFormat.cpp b/Source/Core/VideoBackends/D3D/D3DNativeVertexFormat.cpp
index 0f81db9aaab0..fbb5611528cd 100644
--- a/Source/Core/VideoBackends/D3D/D3DNativeVertexFormat.cpp
+++ b/Source/Core/VideoBackends/D3D/D3DNativeVertexFormat.cpp
@@ -23,7 +23,7 @@ Gfx::CreateNativeVertexFormat(const PortableVertexDeclaration& vtx_decl)
   return std::make_unique<D3DVertexFormat>(vtx_decl);
 }
 
-DXGI_FORMAT VarToD3D(ComponentFormat t, int size, bool integer)
+static DXGI_FORMAT VarToD3D(ComponentFormat t, int size, bool integer)
 {
   using FormatMap = Common::EnumMap<DXGI_FORMAT, ComponentFormat::InvalidFloat7>;
   static constexpr auto f = [](FormatMap a) { return a; };  // Deduction helper
diff --git a/Source/Core/VideoBackends/D3D/D3DState.cpp b/Source/Core/VideoBackends/D3D/D3DState.cpp
index d1822f27dd80..7485fc18056f 100644
--- a/Source/Core/VideoBackends/D3D/D3DState.cpp
+++ b/Source/Core/VideoBackends/D3D/D3DState.cpp
@@ -378,7 +378,7 @@ ID3D11SamplerState* StateCache::Get(SamplerState state)
   }
 
   ComPtr<ID3D11SamplerState> res;
-  HRESULT hr = D3D::device->CreateSamplerState(&sampdc, res.GetAddressOf());
+  HRESULT hr = D3D::device->CreateSamplerState(&sampdc, &res);
   ASSERT_MSG(VIDEO, SUCCEEDED(hr), "Creating D3D sampler state failed: {}", DX11HRWrap(hr));
   return m_sampler.emplace(state, std::move(res)).first->second.Get();
 }
@@ -412,7 +412,7 @@ ID3D11BlendState* StateCache::Get(BlendingState state)
     tdesc.LogicOp = logic_ops[u32(state.logic_mode.Value())];
 
     ComPtr<ID3D11BlendState1> res;
-    HRESULT hr = D3D::device1->CreateBlendState1(&desc, res.GetAddressOf());
+    HRESULT hr = D3D::device1->CreateBlendState1(&desc, &res);
     if (SUCCEEDED(hr))
     {
       return m_blend.emplace(state.hex, std::move(res)).first->second.Get();
@@ -455,7 +455,7 @@ ID3D11BlendState* StateCache::Get(BlendingState state)
   tdesc.BlendOpAlpha = state.subtract_alpha ? D3D11_BLEND_OP_REV_SUBTRACT : D3D11_BLEND_OP_ADD;
 
   ComPtr<ID3D11BlendState> res;
-  HRESULT hr = D3D::device->CreateBlendState(&desc, res.GetAddressOf());
+  HRESULT hr = D3D::device->CreateBlendState(&desc, &res);
   ASSERT_MSG(VIDEO, SUCCEEDED(hr), "Creating D3D blend state failed: {}", DX11HRWrap(hr));
   return m_blend.emplace(state.hex, std::move(res)).first->second.Get();
 }
@@ -476,7 +476,7 @@ ID3D11RasterizerState* StateCache::Get(RasterizationState state)
   desc.ScissorEnable = TRUE;
 
   ComPtr<ID3D11RasterizerState> res;
-  HRESULT hr = D3D::device->CreateRasterizerState(&desc, res.GetAddressOf());
+  HRESULT hr = D3D::device->CreateRasterizerState(&desc, &res);
   ASSERT_MSG(VIDEO, SUCCEEDED(hr), "Creating D3D rasterizer state failed: {}", DX11HRWrap(hr));
   return m_raster.emplace(state.hex, std::move(res)).first->second.Get();
 }
@@ -518,7 +518,7 @@ ID3D11DepthStencilState* StateCache::Get(DepthState state)
   }
 
   ComPtr<ID3D11DepthStencilState> res;
-  HRESULT hr = D3D::device->CreateDepthStencilState(&depthdc, res.GetAddressOf());
+  HRESULT hr = D3D::device->CreateDepthStencilState(&depthdc, &res);
   ASSERT_MSG(VIDEO, SUCCEEDED(hr), "Creating D3D depth stencil state failed: {}", DX11HRWrap(hr));
   return m_depth.emplace(state.hex, std::move(res)).first->second.Get();
 }
diff --git a/Source/Core/VideoBackends/D3D/DXTexture.cpp b/Source/Core/VideoBackends/D3D/DXTexture.cpp
index ecbe7c7e7d0c..20167ba90762 100644
--- a/Source/Core/VideoBackends/D3D/DXTexture.cpp
+++ b/Source/Core/VideoBackends/D3D/DXTexture.cpp
@@ -50,7 +50,7 @@ std::unique_ptr<DXTexture> DXTexture::Create(const TextureConfig& config, std::s
       D3D11_USAGE_DEFAULT, 0, config.samples, 0,
       config.type == AbstractTextureType::Texture_CubeMap ? D3D11_RESOURCE_MISC_TEXTURECUBE : 0);
   ComPtr<ID3D11Texture2D> d3d_texture;
-  HRESULT hr = D3D::device->CreateTexture2D(&desc, nullptr, d3d_texture.GetAddressOf());
+  HRESULT hr = D3D::device->CreateTexture2D(&desc, nullptr, &d3d_texture);
   if (FAILED(hr))
   {
     PanicAlertFmt("Failed to create {}x{}x{} D3D backing texture: {}", config.width, config.height,
@@ -122,7 +122,7 @@ bool DXTexture::CreateSRV()
     dimension, D3DCommon::GetSRVFormatForAbstractFormat(m_config.format), 0,
     m_config.levels, 0, m_config.layers);
   DEBUG_ASSERT(!m_srv);
-  HRESULT hr = D3D::device->CreateShaderResourceView(m_texture.Get(), &desc, m_srv.GetAddressOf());
+  HRESULT hr = D3D::device->CreateShaderResourceView(m_texture.Get(), &desc, &m_srv);
   if (FAILED(hr))
   {
     PanicAlertFmt("Failed to create {}x{}x{} D3D SRV: {}", m_config.width, m_config.height,
@@ -139,7 +139,7 @@ bool DXTexture::CreateUAV()
       m_texture.Get(), D3D11_UAV_DIMENSION_TEXTURE2DARRAY,
       D3DCommon::GetSRVFormatForAbstractFormat(m_config.format), 0, 0, m_config.layers);
   DEBUG_ASSERT(!m_uav);
-  HRESULT hr = D3D::device->CreateUnorderedAccessView(m_texture.Get(), &desc, m_uav.GetAddressOf());
+  HRESULT hr = D3D::device->CreateUnorderedAccessView(m_texture.Get(), &desc, &m_uav);
   if (FAILED(hr))
   {
     PanicAlertFmt("Failed to create {}x{}x{} D3D UAV: {}", m_config.width, m_config.height,
@@ -177,8 +177,8 @@ void DXTexture::ResolveFromTexture(const AbstractTexture* src, const MathUtil::R
                                    u32 layer, u32 level)
 {
   const DXTexture* srcentry = static_cast<const DXTexture*>(src);
-  DEBUG_ASSERT(m_config.samples > 1 && m_config.width == srcentry->m_config.width &&
-               m_config.height == srcentry->m_config.height && m_config.samples == 1);
+  DEBUG_ASSERT(m_config.samples == 1 && m_config.width == srcentry->m_config.width &&
+               m_config.height == srcentry->m_config.height && srcentry->m_config.samples > 1);
   DEBUG_ASSERT(rect.left + rect.GetWidth() <= static_cast<int>(srcentry->m_config.width) &&
                rect.top + rect.GetHeight() <= static_cast<int>(srcentry->m_config.height));
 
@@ -236,7 +236,7 @@ std::unique_ptr<DXStagingTexture> DXStagingTexture::Create(StagingTextureType ty
                              config.width, config.height, 1, 1, bind_flags, usage, cpu_flags);
 
   ComPtr<ID3D11Texture2D> texture;
-  HRESULT hr = D3D::device->CreateTexture2D(&desc, nullptr, texture.GetAddressOf());
+  HRESULT hr = D3D::device->CreateTexture2D(&desc, nullptr, &texture);
   ASSERT_MSG(VIDEO, SUCCEEDED(hr), "Failed to create staging texture: {}", DX11HRWrap(hr));
   if (FAILED(hr))
     return nullptr;
@@ -447,8 +447,8 @@ DXFramebuffer::Create(DXTexture* color_attachment, DXTexture* depth_attachment,
                                              D3D11_RTV_DIMENSION_TEXTURE2DARRAY,
         D3DCommon::GetRTVFormatForAbstractFormat(color_attachment->GetFormat(), false), 0, 0,
         color_attachment->GetLayers());
-    HRESULT hr = D3D::device->CreateRenderTargetView(color_attachment->GetD3DTexture(), &desc,
-                                                     rtv.GetAddressOf());
+    HRESULT hr =
+        D3D::device->CreateRenderTargetView(color_attachment->GetD3DTexture(), &desc, &rtv);
     ASSERT_MSG(VIDEO, SUCCEEDED(hr), "Failed to create render target view for framebuffer: {}",
                DX11HRWrap(hr));
     if (FAILED(hr))
@@ -461,7 +461,7 @@ DXFramebuffer::Create(DXTexture* color_attachment, DXTexture* depth_attachment,
     {
       desc.Format = integer_format;
       hr = D3D::device->CreateRenderTargetView(color_attachment->GetD3DTexture(), &desc,
-                                               integer_rtv.GetAddressOf());
+                                               &integer_rtv);
       ASSERT_MSG(VIDEO, SUCCEEDED(hr),
                  "Failed to create integer render target view for framebuffer: {}", DX11HRWrap(hr));
     }
@@ -478,7 +478,7 @@ DXFramebuffer::Create(DXTexture* color_attachment, DXTexture* depth_attachment,
         0, 0, 1);
     HRESULT hr = D3D::device->CreateRenderTargetView(
         static_cast<DXTexture*>(additional_color_attachment)->GetD3DTexture(), &desc,
-        additional_rtv.GetAddressOf());
+        &additional_rtv);
     ASSERT_MSG(VIDEO, SUCCEEDED(hr), "Create render target view for framebuffer: {}",
                DX11HRWrap(hr));
     if (FAILED(hr))
@@ -494,8 +494,8 @@ DXFramebuffer::Create(DXTexture* color_attachment, DXTexture* depth_attachment,
                                                          D3D11_DSV_DIMENSION_TEXTURE2DARRAY,
         D3DCommon::GetDSVFormatForAbstractFormat(depth_attachment->GetFormat()), 0, 0,
         depth_attachment->GetLayers(), 0);
-    HRESULT hr = D3D::device->CreateDepthStencilView(depth_attachment->GetD3DTexture(), &desc,
-                                                     dsv.GetAddressOf());
+    HRESULT hr =
+        D3D::device->CreateDepthStencilView(depth_attachment->GetD3DTexture(), &desc, &dsv);
     ASSERT_MSG(VIDEO, SUCCEEDED(hr), "Failed to create depth stencil view for framebuffer: {}",
                DX11HRWrap(hr));
     if (FAILED(hr))
diff --git a/Source/Core/VideoBackends/D3D12/DX12Context.cpp b/Source/Core/VideoBackends/D3D12/DX12Context.cpp
index 6dc0c670f650..8ee903fd1972 100644
--- a/Source/Core/VideoBackends/D3D12/DX12Context.cpp
+++ b/Source/Core/VideoBackends/D3D12/DX12Context.cpp
@@ -449,14 +449,14 @@ bool DXContext::CreateCommandLists()
   for (u32 i = 0; i < NUM_COMMAND_LISTS; i++)
   {
     CommandListResources& res = m_command_lists[i];
-    HRESULT hr = m_device->CreateCommandAllocator(
-        D3D12_COMMAND_LIST_TYPE_DIRECT, IID_PPV_ARGS(res.command_allocator.GetAddressOf()));
+    HRESULT hr = m_device->CreateCommandAllocator(D3D12_COMMAND_LIST_TYPE_DIRECT,
+                                                  IID_PPV_ARGS(&res.command_allocator));
     ASSERT_MSG(VIDEO, SUCCEEDED(hr), "Failed to create command allocator: {}", DX12HRWrap(hr));
     if (FAILED(hr))
       return false;
 
     hr = m_device->CreateCommandList(1, D3D12_COMMAND_LIST_TYPE_DIRECT, res.command_allocator.Get(),
-                                     nullptr, IID_PPV_ARGS(res.command_list.GetAddressOf()));
+                                     nullptr, IID_PPV_ARGS(&res.command_list));
     ASSERT_MSG(VIDEO, SUCCEEDED(hr), "Failed to create command list: {}", DX12HRWrap(hr));
     if (FAILED(hr))
     {
diff --git a/Source/Core/VideoBackends/D3D12/DX12Texture.h b/Source/Core/VideoBackends/D3D12/DX12Texture.h
index 14bf55415b54..e31a78d4b930 100644
--- a/Source/Core/VideoBackends/D3D12/DX12Texture.h
+++ b/Source/Core/VideoBackends/D3D12/DX12Texture.h
@@ -43,7 +43,7 @@ class DXTexture final : public AbstractTexture
 
   void TransitionToState(D3D12_RESOURCE_STATES state) const;
 
-  // Destoys the resource backing this texture. The resource must not be in use by the GPU.
+  // Destroys the resource backing this texture. The resource must not be in use by the GPU.
   void DestroyResource();
 
 private:
diff --git a/Source/Core/VideoBackends/D3DCommon/D3DCommon.cpp b/Source/Core/VideoBackends/D3DCommon/D3DCommon.cpp
index 0658f1df8ced..d987107123da 100644
--- a/Source/Core/VideoBackends/D3DCommon/D3DCommon.cpp
+++ b/Source/Core/VideoBackends/D3DCommon/D3DCommon.cpp
@@ -81,13 +81,13 @@ Microsoft::WRL::ComPtr<IDXGIFactory> CreateDXGIFactory(bool debug_device)
   // Use Win8.1 version if available.
   if (create_dxgi_factory2 &&
       SUCCEEDED(create_dxgi_factory2(debug_device ? DXGI_CREATE_FACTORY_DEBUG : 0,
-                                     IID_PPV_ARGS(factory.GetAddressOf()))))
+                                     IID_PPV_ARGS(&factory))))
   {
     return factory;
   }
 
   // Fallback to original version, without debug support.
-  HRESULT hr = create_dxgi_factory(IID_PPV_ARGS(factory.ReleaseAndGetAddressOf()));
+  HRESULT hr = create_dxgi_factory(IID_PPV_ARGS(&factory));
   if (FAILED(hr))
   {
     PanicAlertFmt("CreateDXGIFactory() failed: {}", Common::HRWrap(hr));
@@ -100,14 +100,14 @@ Microsoft::WRL::ComPtr<IDXGIFactory> CreateDXGIFactory(bool debug_device)
 std::vector<std::string> GetAdapterNames()
 {
   Microsoft::WRL::ComPtr<IDXGIFactory> factory;
-  HRESULT hr = create_dxgi_factory(IID_PPV_ARGS(factory.GetAddressOf()));
+  HRESULT hr = create_dxgi_factory(IID_PPV_ARGS(&factory));
   if (FAILED(hr))
     return {};
 
   std::vector<std::string> adapters;
   Microsoft::WRL::ComPtr<IDXGIAdapter> adapter;
-  while (factory->EnumAdapters(static_cast<UINT>(adapters.size()),
-                               adapter.ReleaseAndGetAddressOf()) != DXGI_ERROR_NOT_FOUND)
+  while (factory->EnumAdapters(static_cast<UINT>(adapters.size()), &adapter) !=
+         DXGI_ERROR_NOT_FOUND)
   {
     std::string name;
     DXGI_ADAPTER_DESC desc;
@@ -297,12 +297,12 @@ void SetDebugObjectName(IUnknown* resource, std::string_view name)
 
   Microsoft::WRL::ComPtr<ID3D11DeviceChild> child11;
   Microsoft::WRL::ComPtr<ID3D12DeviceChild> child12;
-  if (SUCCEEDED(resource->QueryInterface(IID_PPV_ARGS(child11.GetAddressOf()))))
+  if (SUCCEEDED(resource->QueryInterface(IID_PPV_ARGS(&child11))))
   {
     child11->SetPrivateData(WKPDID_D3DDebugObjectName, static_cast<UINT>(name.length()),
                             name.data());
   }
-  else if (SUCCEEDED(resource->QueryInterface(IID_PPV_ARGS(child12.GetAddressOf()))))
+  else if (SUCCEEDED(resource->QueryInterface(IID_PPV_ARGS(&child12))))
   {
     child12->SetPrivateData(WKPDID_D3DDebugObjectName, static_cast<UINT>(name.length()),
                             name.data());
diff --git a/Source/Core/VideoBackends/D3DCommon/SwapChain.cpp b/Source/Core/VideoBackends/D3DCommon/SwapChain.cpp
index dee780e46508..5631020a979a 100644
--- a/Source/Core/VideoBackends/D3DCommon/SwapChain.cpp
+++ b/Source/Core/VideoBackends/D3DCommon/SwapChain.cpp
@@ -155,7 +155,7 @@ bool SwapChain::CreateSwapChain(bool stereo, bool hdr)
     // Only try to activate HDR here, to avoid failing when creating the swapchain
     // (we can't know if the format is supported upfront)
     Microsoft::WRL::ComPtr<IDXGISwapChain4> swap_chain4;
-    hr = m_swap_chain->QueryInterface(IID_PPV_ARGS(&swap_chain4));
+    hr = m_swap_chain.As(&swap_chain4);
     if (SUCCEEDED(hr))
     {
       UINT color_space_support = 0;
@@ -214,7 +214,7 @@ bool SwapChain::ResizeSwapChain()
     WARN_LOG_FMT(VIDEO, "ResizeBuffers() failed: {}", Common::HRWrap(hr));
 
   Microsoft::WRL::ComPtr<IDXGISwapChain4> swap_chain4;
-  hr = m_swap_chain->QueryInterface(IID_PPV_ARGS(&swap_chain4));
+  hr = m_swap_chain.As(&swap_chain4);
   if (SUCCEEDED(hr))
     hr = swap_chain4->SetColorSpace1(m_hdr ? DXGI_COLOR_SPACE_RGB_FULL_G10_NONE_P709 :
                                              DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P709);
@@ -316,7 +316,7 @@ bool SwapChain::ChangeSurface(void* native_handle)
 {
   DestroySwapChain();
   m_wsi.render_surface = native_handle;
-  // We only keep the swap chain settings (HDR/Stereo) that had successfully applied beofre
+  // We only keep the swap chain settings (HDR/Stereo) that had successfully applied before
   return CreateSwapChain(m_stereo, m_hdr);
 }
 
diff --git a/Source/Core/VideoBackends/Metal/MTLObjectCache.mm b/Source/Core/VideoBackends/Metal/MTLObjectCache.mm
index c4ecfc07134b..7dce7a0f3400 100644
--- a/Source/Core/VideoBackends/Metal/MTLObjectCache.mm
+++ b/Source/Core/VideoBackends/Metal/MTLObjectCache.mm
@@ -27,16 +27,6 @@
 static void SetupDepthStencil(
     MRCOwned<id<MTLDepthStencilState>> (&dss)[Metal::DepthStencilSelector::N_VALUES]);
 
-Metal::ObjectCache::ObjectCache()
-{
-  m_internal = std::make_unique<Internal>();
-  SetupDepthStencil(m_dss);
-}
-
-Metal::ObjectCache::~ObjectCache()
-{
-}
-
 void Metal::ObjectCache::Initialize(MRCOwned<id<MTLDevice>> device)
 {
   g_device = std::move(device);
@@ -554,6 +544,17 @@ void ShaderDestroyed(const Shader* shader)
   }
 };
 
+Metal::ObjectCache::ObjectCache()
+{
+  m_internal = std::make_unique<Internal>();
+  SetupDepthStencil(m_dss);
+}
+
+// This is defined here instead of the header so that the definition of Internal is visible when
+// m_internal is destroyed, preventing a compile error caused by calling unique_ptr's destructor
+// with an incomplete type.
+Metal::ObjectCache::~ObjectCache() = default;
+
 std::unique_ptr<AbstractPipeline>
 Metal::ObjectCache::CreatePipeline(const AbstractPipelineConfig& config)
 {
diff --git a/Source/Core/VideoBackends/Metal/MTLStateTracker.mm b/Source/Core/VideoBackends/Metal/MTLStateTracker.mm
index 755da35249f0..f4d56346367b 100644
--- a/Source/Core/VideoBackends/Metal/MTLStateTracker.mm
+++ b/Source/Core/VideoBackends/Metal/MTLStateTracker.mm
@@ -891,7 +891,7 @@ static NSRange RangeOfBits(u32 value)
   {
     m_dirty_textures &= ~pipe->GetTextures();
     // Since there's two sets of textures, it's likely there'll be a few in each
-    // Check each set separately to avoid doing too many unneccessary bindings
+    // Check each set separately to avoid doing too many unnecessary bindings
     constexpr u32 lo_mask = (1 << VideoCommon::MAX_COMPUTE_SHADER_SAMPLERS) - 1;
     if (u32 lo = dirty & lo_mask)
     {
diff --git a/Source/Core/VideoBackends/OGL/OGLBoundingBox.h b/Source/Core/VideoBackends/OGL/OGLBoundingBox.h
index 70de8197d9e8..854f21765807 100644
--- a/Source/Core/VideoBackends/OGL/OGLBoundingBox.h
+++ b/Source/Core/VideoBackends/OGL/OGLBoundingBox.h
@@ -4,7 +4,7 @@
 #pragma once
 
 #include "Common/CommonTypes.h"
-#include "Common/GL/GLUtil.h"
+#include "Common/GL/GLExtensions/GLExtensions.h"
 
 #include "VideoCommon/BoundingBox.h"
 
diff --git a/Source/Core/VideoBackends/OGL/OGLConfig.cpp b/Source/Core/VideoBackends/OGL/OGLConfig.cpp
index 1da407e664d1..1cc404339c19 100644
--- a/Source/Core/VideoBackends/OGL/OGLConfig.cpp
+++ b/Source/Core/VideoBackends/OGL/OGLConfig.cpp
@@ -13,11 +13,8 @@
 #include "Common/Assert.h"
 #include "Common/GL/GLContext.h"
 #include "Common/GL/GLExtensions/GLExtensions.h"
-#include "Common/Logging/LogManager.h"
 #include "Common/MsgHandler.h"
 
-#include "Core/Config/GraphicsSettings.h"
-
 #include "VideoBackends/OGL/OGLTexture.h"
 
 #include "VideoCommon/DriverDetails.h"
@@ -274,7 +271,7 @@ bool PopulateConfig(GLContext* m_main_gl_context)
 
     if (!GLExtensions::Supports("GL_ARB_sampler_objects"))
     {
-      // Our sampler cache uses this extension. It could easyly be workaround and it's by far the
+      // Our sampler cache uses this extension. It could easily be workaround and it's by far the
       // highest requirement, but it seems that no driver lacks support for it.
       PanicAlertFmtT("GPU: OGL ERROR: Need GL_ARB_sampler_objects.\n"
                      "GPU: Does your video card support OpenGL 3.3?");
diff --git a/Source/Core/VideoBackends/OGL/OGLConfig.h b/Source/Core/VideoBackends/OGL/OGLConfig.h
index 2b78c35c2b09..6387dc079578 100644
--- a/Source/Core/VideoBackends/OGL/OGLConfig.h
+++ b/Source/Core/VideoBackends/OGL/OGLConfig.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#include "Common/CommonTypes.h"
-
 class GLContext;
 
 namespace OGL
diff --git a/Source/Core/VideoBackends/OGL/OGLGfx.cpp b/Source/Core/VideoBackends/OGL/OGLGfx.cpp
index 064856804f49..27e18a3a0374 100644
--- a/Source/Core/VideoBackends/OGL/OGLGfx.cpp
+++ b/Source/Core/VideoBackends/OGL/OGLGfx.cpp
@@ -5,10 +5,9 @@
 
 #include "Common/GL/GLContext.h"
 #include "Common/GL/GLExtensions/GLExtensions.h"
+#include "Common/GL/GLUtil.h"
 #include "Common/Logging/LogManager.h"
 
-#include "Core/Config/GraphicsSettings.h"
-
 #include "VideoBackends/OGL/OGLConfig.h"
 #include "VideoBackends/OGL/OGLPipeline.h"
 #include "VideoBackends/OGL/OGLShader.h"
@@ -18,7 +17,6 @@
 
 #include "VideoCommon/AsyncShaderCompiler.h"
 #include "VideoCommon/DriverDetails.h"
-#include "VideoCommon/OnScreenDisplay.h"
 #include "VideoCommon/Present.h"
 #include "VideoCommon/VideoConfig.h"
 
diff --git a/Source/Core/VideoBackends/OGL/OGLMain.cpp b/Source/Core/VideoBackends/OGL/OGLMain.cpp
index e47eaaf94018..bb1f9158df6e 100644
--- a/Source/Core/VideoBackends/OGL/OGLMain.cpp
+++ b/Source/Core/VideoBackends/OGL/OGLMain.cpp
@@ -54,7 +54,6 @@ Make AA apply instantly during gameplay if possible
 #include "VideoBackends/OGL/ProgramShaderCache.h"
 #include "VideoBackends/OGL/SamplerCache.h"
 
-#include "VideoCommon/FramebufferManager.h"
 #include "VideoCommon/TextureCacheBase.h"
 #include "VideoCommon/VideoCommon.h"
 #include "VideoCommon/VideoConfig.h"
@@ -133,7 +132,7 @@ bool VideoBackend::FillBackendInfo(GLContext* context)
   g_backend_info.bSupportsPipelineCacheData = false;
   g_backend_info.bSupportsLodBiasInSampler = true;
   g_backend_info.bSupportsPartialMultisampleResolve = true;
-  // Unneccessary since OGL doesn't use pipelines
+  // Unnecessary since OGL doesn't use pipelines
   g_backend_info.bSupportsDynamicVertexLoader = false;
 
   // TODO: There is a bug here, if texel buffers or SSBOs/atomics are not supported the graphics
diff --git a/Source/Core/VideoBackends/OGL/OGLNativeVertexFormat.cpp b/Source/Core/VideoBackends/OGL/OGLNativeVertexFormat.cpp
index 7e478843b662..921ef61b4033 100644
--- a/Source/Core/VideoBackends/OGL/OGLNativeVertexFormat.cpp
+++ b/Source/Core/VideoBackends/OGL/OGLNativeVertexFormat.cpp
@@ -3,7 +3,6 @@
 
 #include "Common/CommonTypes.h"
 #include "Common/EnumMap.h"
-#include "Common/GL/GLUtil.h"
 #include "Common/MsgHandler.h"
 
 #include "VideoBackends/OGL/OGLGfx.h"
diff --git a/Source/Core/VideoBackends/OGL/OGLPerfQuery.cpp b/Source/Core/VideoBackends/OGL/OGLPerfQuery.cpp
index 453e234b6c44..022b4de70efb 100644
--- a/Source/Core/VideoBackends/OGL/OGLPerfQuery.cpp
+++ b/Source/Core/VideoBackends/OGL/OGLPerfQuery.cpp
@@ -8,7 +8,6 @@
 #include "Common/CommonTypes.h"
 #include "Common/GL/GLExtensions/GLExtensions.h"
 
-#include "VideoBackends/OGL/OGLGfx.h"
 #include "VideoCommon/FramebufferManager.h"
 #include "VideoCommon/VideoCommon.h"
 #include "VideoCommon/VideoConfig.h"
diff --git a/Source/Core/VideoBackends/OGL/OGLPipeline.cpp b/Source/Core/VideoBackends/OGL/OGLPipeline.cpp
index aabfd4fce124..e2c61264c475 100644
--- a/Source/Core/VideoBackends/OGL/OGLPipeline.cpp
+++ b/Source/Core/VideoBackends/OGL/OGLPipeline.cpp
@@ -3,8 +3,6 @@
 
 #include "VideoBackends/OGL/OGLPipeline.h"
 
-#include "Common/Assert.h"
-
 #include "VideoBackends/OGL/OGLShader.h"
 #include "VideoBackends/OGL/OGLVertexManager.h"
 #include "VideoBackends/OGL/ProgramShaderCache.h"
diff --git a/Source/Core/VideoBackends/OGL/OGLPipeline.h b/Source/Core/VideoBackends/OGL/OGLPipeline.h
index 5f4af831756d..f4dddc681c07 100644
--- a/Source/Core/VideoBackends/OGL/OGLPipeline.h
+++ b/Source/Core/VideoBackends/OGL/OGLPipeline.h
@@ -5,7 +5,6 @@
 
 #include <memory>
 
-#include "Common/GL/GLUtil.h"
 #include "VideoBackends/OGL/ProgramShaderCache.h"
 #include "VideoCommon/AbstractPipeline.h"
 #include "VideoCommon/RenderState.h"
diff --git a/Source/Core/VideoBackends/OGL/OGLShader.h b/Source/Core/VideoBackends/OGL/OGLShader.h
index 2554c744b85f..1626ba2eac37 100644
--- a/Source/Core/VideoBackends/OGL/OGLShader.h
+++ b/Source/Core/VideoBackends/OGL/OGLShader.h
@@ -3,13 +3,12 @@
 
 #pragma once
 
-#include <cstddef>
 #include <memory>
 #include <string>
 #include <string_view>
 
 #include "Common/CommonTypes.h"
-#include "Common/GL/GLUtil.h"
+#include "Common/GL/GLExtensions/GLExtensions.h"
 #include "VideoCommon/AbstractShader.h"
 
 namespace OGL
diff --git a/Source/Core/VideoBackends/OGL/OGLStreamBuffer.cpp b/Source/Core/VideoBackends/OGL/OGLStreamBuffer.cpp
index 1a14833f2863..2eec58418c7b 100644
--- a/Source/Core/VideoBackends/OGL/OGLStreamBuffer.cpp
+++ b/Source/Core/VideoBackends/OGL/OGLStreamBuffer.cpp
@@ -4,14 +4,12 @@
 #include "VideoBackends/OGL/OGLStreamBuffer.h"
 
 #include "Common/Align.h"
-#include "Common/GL/GLUtil.h"
 #include "Common/MathUtil.h"
 #include "Common/MemoryUtil.h"
 
 #include "VideoBackends/OGL/OGLConfig.h"
 
 #include "VideoCommon/DriverDetails.h"
-#include "VideoCommon/OnScreenDisplay.h"
 
 namespace OGL
 {
@@ -42,7 +40,7 @@ StreamBuffer::~StreamBuffer()
  * The next three functions are to create/delete/use the OpenGL synchronization.
  * ARB_sync (OpenGL 3.2) is used and required.
  *
- * To reduce overhead, the complete buffer is splitted up into SYNC_POINTS chunks.
+ * To reduce overhead, the complete buffer is split up into SYNC_POINTS chunks.
  * For each of this chunks, there is a fence which checks if this chunk is still in use.
  *
  * As our API allows to alloc more memory then it has to use, we have to catch how much is already
diff --git a/Source/Core/VideoBackends/OGL/OGLStreamBuffer.h b/Source/Core/VideoBackends/OGL/OGLStreamBuffer.h
index 3b8b7daf89c8..efbb8263ae50 100644
--- a/Source/Core/VideoBackends/OGL/OGLStreamBuffer.h
+++ b/Source/Core/VideoBackends/OGL/OGLStreamBuffer.h
@@ -8,7 +8,7 @@
 #include <utility>
 
 #include "Common/CommonTypes.h"
-#include "Common/GL/GLUtil.h"
+#include "Common/GL/GLExtensions/GLExtensions.h"
 
 namespace OGL
 {
diff --git a/Source/Core/VideoBackends/OGL/OGLTexture.cpp b/Source/Core/VideoBackends/OGL/OGLTexture.cpp
index 0d7c78d0bda7..003a7ec4420f 100644
--- a/Source/Core/VideoBackends/OGL/OGLTexture.cpp
+++ b/Source/Core/VideoBackends/OGL/OGLTexture.cpp
@@ -5,11 +5,11 @@
 
 #include "Common/Assert.h"
 #include "Common/CommonTypes.h"
+#include "Common/GL/GLUtil.h"
 #include "Common/MsgHandler.h"
 
 #include "VideoBackends/OGL/OGLConfig.h"
 #include "VideoBackends/OGL/OGLGfx.h"
-#include "VideoBackends/OGL/SamplerCache.h"
 
 #include "VideoCommon/VideoConfig.h"
 
@@ -269,8 +269,8 @@ void OGLTexture::ResolveFromTexture(const AbstractTexture* src,
                                     const MathUtil::Rectangle<int>& rect, u32 layer, u32 level)
 {
   const OGLTexture* srcentry = static_cast<const OGLTexture*>(src);
-  DEBUG_ASSERT(m_config.samples > 1 && m_config.width == srcentry->m_config.width &&
-               m_config.height == srcentry->m_config.height && m_config.samples == 1);
+  DEBUG_ASSERT(m_config.samples == 1 && m_config.width == srcentry->m_config.width &&
+               m_config.height == srcentry->m_config.height && srcentry->m_config.samples > 1);
   DEBUG_ASSERT(rect.left + rect.GetWidth() <= static_cast<int>(srcentry->m_config.width) &&
                rect.top + rect.GetHeight() <= static_cast<int>(srcentry->m_config.height));
   BlitFramebuffer(const_cast<OGLTexture*>(srcentry), rect, layer, level, rect, layer, level);
diff --git a/Source/Core/VideoBackends/OGL/OGLTexture.h b/Source/Core/VideoBackends/OGL/OGLTexture.h
index 4f0dcf018ad2..eb574f30b589 100644
--- a/Source/Core/VideoBackends/OGL/OGLTexture.h
+++ b/Source/Core/VideoBackends/OGL/OGLTexture.h
@@ -8,7 +8,7 @@
 #include <string_view>
 #include <vector>
 
-#include "Common/GL/GLUtil.h"
+#include "Common/GL/GLExtensions/GLExtensions.h"
 
 #include "VideoCommon/AbstractFramebuffer.h"
 #include "VideoCommon/AbstractStagingTexture.h"
diff --git a/Source/Core/VideoBackends/OGL/OGLVertexManager.cpp b/Source/Core/VideoBackends/OGL/OGLVertexManager.cpp
index 9c08b238da56..c5382cf35849 100644
--- a/Source/Core/VideoBackends/OGL/OGLVertexManager.cpp
+++ b/Source/Core/VideoBackends/OGL/OGLVertexManager.cpp
@@ -3,17 +3,14 @@
 
 #include "VideoBackends/OGL/OGLVertexManager.h"
 
-#include <fstream>
 #include <memory>
-#include <string>
-#include <vector>
 
 #include "Common/Align.h"
 #include "Common/CommonTypes.h"
 #include "Common/GL/GLExtensions/GLExtensions.h"
+#include "Common/GL/GLUtil.h"
 
 #include "VideoBackends/OGL/OGLGfx.h"
-#include "VideoBackends/OGL/OGLPipeline.h"
 #include "VideoBackends/OGL/OGLStreamBuffer.h"
 #include "VideoBackends/OGL/ProgramShaderCache.h"
 
diff --git a/Source/Core/VideoBackends/OGL/OGLVertexManager.h b/Source/Core/VideoBackends/OGL/OGLVertexManager.h
index f597b159c5fe..55a3ef14adc7 100644
--- a/Source/Core/VideoBackends/OGL/OGLVertexManager.h
+++ b/Source/Core/VideoBackends/OGL/OGLVertexManager.h
@@ -7,7 +7,7 @@
 #include <memory>
 
 #include "Common/CommonTypes.h"
-#include "Common/GL/GLUtil.h"
+#include "Common/GL/GLExtensions/GLExtensions.h"
 #include "VideoCommon/NativeVertexFormat.h"
 #include "VideoCommon/VertexManagerBase.h"
 
diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp
index 3241d217e06f..1dfd02681003 100644
--- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp
+++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp
@@ -5,6 +5,7 @@
 
 #include <array>
 #include <atomic>
+#include <fstream>
 #include <memory>
 #include <string>
 
@@ -15,6 +16,7 @@
 #include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
 #include "Common/GL/GLContext.h"
+#include "Common/GL/GLUtil.h"
 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"
 #include "Common/Version.h"
@@ -28,11 +30,9 @@
 #include "VideoBackends/OGL/OGLStreamBuffer.h"
 #include "VideoBackends/OGL/OGLVertexManager.h"
 
-#include "VideoCommon/AsyncShaderCompiler.h"
 #include "VideoCommon/GeometryShaderManager.h"
 #include "VideoCommon/PixelShaderManager.h"
 #include "VideoCommon/Statistics.h"
-#include "VideoCommon/VertexLoaderManager.h"
 #include "VideoCommon/VertexShaderManager.h"
 #include "VideoCommon/VideoBackendBase.h"
 #include "VideoCommon/VideoConfig.h"
diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.h b/Source/Core/VideoBackends/OGL/ProgramShaderCache.h
index c9a1b91f10c6..1454385c3b15 100644
--- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.h
+++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.h
@@ -9,7 +9,7 @@
 #include <string_view>
 #include <unordered_map>
 
-#include "Common/GL/GLUtil.h"
+#include "Common/GL/GLExtensions/GLExtensions.h"
 #include "VideoCommon/AsyncShaderCompiler.h"
 
 namespace OGL
diff --git a/Source/Core/VideoBackends/OGL/SamplerCache.h b/Source/Core/VideoBackends/OGL/SamplerCache.h
index 5d87c4daa231..a7c6ae988f4b 100644
--- a/Source/Core/VideoBackends/OGL/SamplerCache.h
+++ b/Source/Core/VideoBackends/OGL/SamplerCache.h
@@ -8,7 +8,7 @@
 #include <memory>
 
 #include "Common/CommonTypes.h"
-#include "Common/GL/GLUtil.h"
+#include "Common/GL/GLExtensions/GLExtensions.h"
 #include "VideoCommon/Constants.h"
 #include "VideoCommon/RenderState.h"
 
diff --git a/Source/Core/VideoBackends/Software/SWGfx.cpp b/Source/Core/VideoBackends/Software/SWGfx.cpp
index fba9faf7e5ed..ed152aef955f 100644
--- a/Source/Core/VideoBackends/Software/SWGfx.cpp
+++ b/Source/Core/VideoBackends/Software/SWGfx.cpp
@@ -129,7 +129,7 @@ void SWGfx::SetScissorRect(const MathUtil::Rectangle<int>& rc)
 {
   // BPFunctions calls SetScissorRect with the "best" scissor rect whenever the viewport or scissor
   // changes.  However, the software renderer is actually able to use multiple scissor rects (which
-  // is necessary in a few renderering edge cases, such as with Major Minor's Majestic March).
+  // is necessary in a few rendering edge cases, such as with Major Minor's Majestic March).
   // Thus, we use this as a signal to update the list of scissor rects, but ignore the parameter.
   Rasterizer::ScissorChanged();
 }
diff --git a/Source/Core/VideoBackends/Software/SWTexture.cpp b/Source/Core/VideoBackends/Software/SWTexture.cpp
index 0ada0502f033..85197316a88f 100644
--- a/Source/Core/VideoBackends/Software/SWTexture.cpp
+++ b/Source/Core/VideoBackends/Software/SWTexture.cpp
@@ -5,8 +5,6 @@
 
 #include <cstring>
 
-#include "Common/Assert.h"
-
 #include "VideoBackends/Software/CopyRegion.h"
 #include "VideoBackends/Software/SWGfx.h"
 
diff --git a/Source/Core/VideoBackends/Software/SWVertexLoader.cpp b/Source/Core/VideoBackends/Software/SWVertexLoader.cpp
index c79596508438..8759de597afc 100644
--- a/Source/Core/VideoBackends/Software/SWVertexLoader.cpp
+++ b/Source/Core/VideoBackends/Software/SWVertexLoader.cpp
@@ -8,7 +8,6 @@
 
 #include "Common/Assert.h"
 #include "Common/CommonTypes.h"
-#include "Common/Logging/Log.h"
 
 #include "Core/System.h"
 
@@ -22,9 +21,7 @@
 #include "VideoCommon/DataReader.h"
 #include "VideoCommon/IndexGenerator.h"
 #include "VideoCommon/OpcodeDecoding.h"
-#include "VideoCommon/PixelShaderManager.h"
 #include "VideoCommon/Statistics.h"
-#include "VideoCommon/VertexLoaderBase.h"
 #include "VideoCommon/VertexLoaderManager.h"
 #include "VideoCommon/VertexShaderManager.h"
 #include "VideoCommon/VideoConfig.h"
diff --git a/Source/Core/VideoBackends/Software/SWmain.cpp b/Source/Core/VideoBackends/Software/SWmain.cpp
index 2f51789ae499..66c96f5a161d 100644
--- a/Source/Core/VideoBackends/Software/SWmain.cpp
+++ b/Source/Core/VideoBackends/Software/SWmain.cpp
@@ -3,7 +3,6 @@
 
 #include "VideoBackends/Software/VideoBackend.h"
 
-#include <cstring>
 #include <memory>
 #include <string>
 #include <utility>
diff --git a/Source/Core/VideoBackends/Software/TextureSampler.cpp b/Source/Core/VideoBackends/Software/TextureSampler.cpp
index ceb6c0225667..000dfc632bcf 100644
--- a/Source/Core/VideoBackends/Software/TextureSampler.cpp
+++ b/Source/Core/VideoBackends/Software/TextureSampler.cpp
@@ -4,7 +4,6 @@
 #include "VideoBackends/Software/TextureSampler.h"
 
 #include <algorithm>
-#include <cmath>
 #include <span>
 
 #include "Common/CommonTypes.h"
diff --git a/Source/Core/VideoBackends/Vulkan/CommandBufferManager.cpp b/Source/Core/VideoBackends/Vulkan/CommandBufferManager.cpp
index b325b1428c91..c82417eb8c8e 100644
--- a/Source/Core/VideoBackends/Vulkan/CommandBufferManager.cpp
+++ b/Source/Core/VideoBackends/Vulkan/CommandBufferManager.cpp
@@ -8,7 +8,6 @@
 
 #include "Common/Assert.h"
 #include "Common/MsgHandler.h"
-#include "Common/Thread.h"
 
 #include "VideoBackends/Vulkan/VulkanContext.h"
 #include "VideoCommon/Constants.h"
diff --git a/Source/Core/VideoBackends/Vulkan/CommandBufferManager.h b/Source/Core/VideoBackends/Vulkan/CommandBufferManager.h
index 90e62bb80570..45a322c2703e 100644
--- a/Source/Core/VideoBackends/Vulkan/CommandBufferManager.h
+++ b/Source/Core/VideoBackends/Vulkan/CommandBufferManager.h
@@ -42,7 +42,7 @@ class CommandBufferManager
   // Fence "counters" are used to track which commands have been completed by the GPU.
   // If the last completed fence counter is greater or equal to N, it means that the work
   // associated counter N has been completed by the GPU. The value of N to associate with
-  // commands can be retreived by calling GetCurrentFenceCounter().
+  // commands can be retrieved by calling GetCurrentFenceCounter().
   u64 GetCompletedFenceCounter() const { return m_completed_fence_counter; }
 
   // Gets the fence that will be signaled when the currently executing command buffer is
diff --git a/Source/Core/VideoBackends/Vulkan/ObjectCache.cpp b/Source/Core/VideoBackends/Vulkan/ObjectCache.cpp
index 128c24cd1a0e..965721decf77 100644
--- a/Source/Core/VideoBackends/Vulkan/ObjectCache.cpp
+++ b/Source/Core/VideoBackends/Vulkan/ObjectCache.cpp
@@ -7,19 +7,12 @@
 #include <array>
 #include <type_traits>
 
-#include "Common/Assert.h"
-#include "Common/CommonFuncs.h"
 #include "Common/FileUtil.h"
 #include "Common/LinearDiskCache.h"
 #include "Common/MsgHandler.h"
 
-#include "Core/ConfigManager.h"
-
-#include "VideoBackends/Vulkan/CommandBufferManager.h"
-#include "VideoBackends/Vulkan/ShaderCompiler.h"
 #include "VideoBackends/Vulkan/VKStreamBuffer.h"
 #include "VideoBackends/Vulkan/VKTexture.h"
-#include "VideoBackends/Vulkan/VKVertexFormat.h"
 #include "VideoBackends/Vulkan/VulkanContext.h"
 #include "VideoCommon/Constants.h"
 #include "VideoCommon/VideoCommon.h"
diff --git a/Source/Core/VideoBackends/Vulkan/StagingBuffer.cpp b/Source/Core/VideoBackends/Vulkan/StagingBuffer.cpp
index 4c61b5f60929..8f70ae823592 100644
--- a/Source/Core/VideoBackends/Vulkan/StagingBuffer.cpp
+++ b/Source/Core/VideoBackends/Vulkan/StagingBuffer.cpp
@@ -3,7 +3,6 @@
 
 #include "VideoBackends/Vulkan/StagingBuffer.h"
 
-#include <algorithm>
 #include <cstring>
 
 #include "Common/Assert.h"
diff --git a/Source/Core/VideoBackends/Vulkan/StateTracker.cpp b/Source/Core/VideoBackends/Vulkan/StateTracker.cpp
index 5ba70c58452a..623b01f3aef2 100644
--- a/Source/Core/VideoBackends/Vulkan/StateTracker.cpp
+++ b/Source/Core/VideoBackends/Vulkan/StateTracker.cpp
@@ -11,7 +11,6 @@
 #include "VideoBackends/Vulkan/VKPipeline.h"
 #include "VideoBackends/Vulkan/VKShader.h"
 #include "VideoBackends/Vulkan/VKTexture.h"
-#include "VideoBackends/Vulkan/VKVertexFormat.h"
 #include "VideoBackends/Vulkan/VulkanContext.h"
 #include "VideoCommon/Constants.h"
 
diff --git a/Source/Core/VideoBackends/Vulkan/StateTracker.h b/Source/Core/VideoBackends/Vulkan/StateTracker.h
index 8de5fd54cca0..da0e4d8387d9 100644
--- a/Source/Core/VideoBackends/Vulkan/StateTracker.h
+++ b/Source/Core/VideoBackends/Vulkan/StateTracker.h
@@ -66,7 +66,7 @@ class StateTracker
   void SetViewport(const VkViewport& viewport);
   void SetScissor(const VkRect2D& scissor);
 
-  // Binds all dirty state to the commmand buffer.
+  // Binds all dirty state to the command buffer.
   // If this returns false, you should not issue the draw.
   bool Bind();
 
diff --git a/Source/Core/VideoBackends/Vulkan/VKBoundingBox.cpp b/Source/Core/VideoBackends/Vulkan/VKBoundingBox.cpp
index af512935007a..de3ad0556dbe 100644
--- a/Source/Core/VideoBackends/Vulkan/VKBoundingBox.cpp
+++ b/Source/Core/VideoBackends/Vulkan/VKBoundingBox.cpp
@@ -5,8 +5,6 @@
 
 #include <vector>
 
-#include "Common/Logging/Log.h"
-
 #include "VideoBackends/Vulkan/CommandBufferManager.h"
 #include "VideoBackends/Vulkan/ObjectCache.h"
 #include "VideoBackends/Vulkan/StagingBuffer.h"
diff --git a/Source/Core/VideoBackends/Vulkan/VKGfx.cpp b/Source/Core/VideoBackends/Vulkan/VKGfx.cpp
index 5b9b82544cb3..4677fbcbe3f1 100644
--- a/Source/Core/VideoBackends/Vulkan/VKGfx.cpp
+++ b/Source/Core/VideoBackends/Vulkan/VKGfx.cpp
@@ -5,9 +5,9 @@
 
 #include <cstddef>
 #include <cstdio>
+#include <utility>
 
 #include "Common/CommonTypes.h"
-#include "Common/EnumUtils.h"
 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"
 
@@ -291,7 +291,7 @@ bool VKGfx::BindBackbuffer(const ClearColor& clear_color)
     else
     {
       ERROR_LOG_FMT(VIDEO, "Unknown present error {:#010X} {}, please report.",
-                    Common::ToUnderlying(res), VkResultToString(res));
+                    std::to_underlying(res), VkResultToString(res));
       m_swap_chain->RecreateSwapChain();
     }
 
@@ -304,8 +304,8 @@ bool VKGfx::BindBackbuffer(const ClearColor& clear_color)
       }
       else
       {
-        PanicAlertFmt("Failed to grab image from swap chain: {:#010X} {}",
-                      Common::ToUnderlying(res), VkResultToString(res));
+        PanicAlertFmt("Failed to grab image from swap chain: {:#010X} {}", std::to_underlying(res),
+                      VkResultToString(res));
       }
     }
   }
diff --git a/Source/Core/VideoBackends/Vulkan/VKPerfQuery.cpp b/Source/Core/VideoBackends/Vulkan/VKPerfQuery.cpp
index c6aee79327af..9949535d8870 100644
--- a/Source/Core/VideoBackends/Vulkan/VKPerfQuery.cpp
+++ b/Source/Core/VideoBackends/Vulkan/VKPerfQuery.cpp
@@ -3,12 +3,9 @@
 
 #include "VideoBackends/Vulkan/VKPerfQuery.h"
 
-#include <algorithm>
 #include <cstring>
-#include <functional>
 
 #include "Common/Assert.h"
-#include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"
 
 #include "VideoBackends/Vulkan/CommandBufferManager.h"
diff --git a/Source/Core/VideoBackends/Vulkan/VKPipeline.cpp b/Source/Core/VideoBackends/Vulkan/VKPipeline.cpp
index ecd79493b7e3..6dbd9e5bfc14 100644
--- a/Source/Core/VideoBackends/Vulkan/VKPipeline.cpp
+++ b/Source/Core/VideoBackends/Vulkan/VKPipeline.cpp
@@ -15,8 +15,6 @@
 #include "VideoBackends/Vulkan/VKVertexFormat.h"
 #include "VideoBackends/Vulkan/VulkanContext.h"
 
-#include "VideoCommon/DriverDetails.h"
-
 namespace Vulkan
 {
 VKPipeline::VKPipeline(const AbstractPipelineConfig& config, VkPipeline pipeline,
diff --git a/Source/Core/VideoBackends/Vulkan/VKShader.cpp b/Source/Core/VideoBackends/Vulkan/VKShader.cpp
index 17e13fa79528..9132085748ac 100644
--- a/Source/Core/VideoBackends/Vulkan/VKShader.cpp
+++ b/Source/Core/VideoBackends/Vulkan/VKShader.cpp
@@ -4,7 +4,6 @@
 #include "VideoBackends/Vulkan/VKShader.h"
 
 #include "Common/Align.h"
-#include "Common/Assert.h"
 
 #include "VideoBackends/Vulkan/ObjectCache.h"
 #include "VideoBackends/Vulkan/ShaderCompiler.h"
diff --git a/Source/Core/VideoBackends/Vulkan/VKStreamBuffer.cpp b/Source/Core/VideoBackends/Vulkan/VKStreamBuffer.cpp
index a098302e6fdf..69ce9d6e5e9b 100644
--- a/Source/Core/VideoBackends/Vulkan/VKStreamBuffer.cpp
+++ b/Source/Core/VideoBackends/Vulkan/VKStreamBuffer.cpp
@@ -3,10 +3,6 @@
 
 #include "VideoBackends/Vulkan/VKStreamBuffer.h"
 
-#include <algorithm>
-#include <cstdint>
-#include <functional>
-
 #include "Common/Align.h"
 #include "Common/Assert.h"
 #include "Common/MsgHandler.h"
diff --git a/Source/Core/VideoBackends/Vulkan/VKSwapChain.cpp b/Source/Core/VideoBackends/Vulkan/VKSwapChain.cpp
index 589d9a447ba1..370e22d15cc6 100644
--- a/Source/Core/VideoBackends/Vulkan/VKSwapChain.cpp
+++ b/Source/Core/VideoBackends/Vulkan/VKSwapChain.cpp
@@ -7,7 +7,6 @@
 #include <cstdint>
 
 #include "Common/Assert.h"
-#include "Common/CommonFuncs.h"
 #include "Common/Contains.h"
 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"
diff --git a/Source/Core/VideoBackends/Vulkan/VKVertexFormat.cpp b/Source/Core/VideoBackends/Vulkan/VKVertexFormat.cpp
index 8fb49f0afdb3..c607bd1eb1d2 100644
--- a/Source/Core/VideoBackends/Vulkan/VKVertexFormat.cpp
+++ b/Source/Core/VideoBackends/Vulkan/VKVertexFormat.cpp
@@ -6,7 +6,6 @@
 #include "Common/Assert.h"
 #include "Common/EnumMap.h"
 
-#include "VideoBackends/Vulkan/CommandBufferManager.h"
 #include "VideoBackends/Vulkan/ObjectCache.h"
 
 #include "VideoCommon/VertexLoaderManager.h"
diff --git a/Source/Core/VideoBackends/Vulkan/VKVertexManager.cpp b/Source/Core/VideoBackends/Vulkan/VKVertexManager.cpp
index dea5df2ea9b2..18c5ad560c7c 100644
--- a/Source/Core/VideoBackends/Vulkan/VKVertexManager.cpp
+++ b/Source/Core/VideoBackends/Vulkan/VKVertexManager.cpp
@@ -12,20 +12,16 @@
 
 #include "Core/System.h"
 
-#include "VideoBackends/Vulkan/CommandBufferManager.h"
 #include "VideoBackends/Vulkan/StateTracker.h"
 #include "VideoBackends/Vulkan/VKGfx.h"
 #include "VideoBackends/Vulkan/VKStreamBuffer.h"
-#include "VideoBackends/Vulkan/VKVertexFormat.h"
 #include "VideoBackends/Vulkan/VulkanContext.h"
 
 #include "VideoCommon/GeometryShaderManager.h"
 #include "VideoCommon/IndexGenerator.h"
 #include "VideoCommon/PixelShaderManager.h"
 #include "VideoCommon/Statistics.h"
-#include "VideoCommon/VertexLoaderManager.h"
 #include "VideoCommon/VertexShaderManager.h"
-#include "VideoCommon/VideoConfig.h"
 
 namespace Vulkan
 {
diff --git a/Source/Core/VideoBackends/Vulkan/VulkanLoader.cpp b/Source/Core/VideoBackends/Vulkan/VulkanLoader.cpp
index 2d3c691f69f1..063d9626e878 100644
--- a/Source/Core/VideoBackends/Vulkan/VulkanLoader.cpp
+++ b/Source/Core/VideoBackends/Vulkan/VulkanLoader.cpp
@@ -4,21 +4,19 @@
 #define VMA_IMPLEMENTATION
 #include "VideoBackends/Vulkan/VulkanLoader.h"
 
-#include <atomic>
-#include <cstdarg>
-#include <cstdlib>
-
 #if defined(ANDROID)
 #include <adrenotools/driver.h>
 #include <dlfcn.h>
 #endif
 
-#include "Common/CommonFuncs.h"
 #include "Common/DynamicLibrary.h"
+#if defined(__APPLE__)
+#include "Common/FileUtil.h"
+#elif defined(ANDROID) && _M_ARM_64
 #include "Common/FileUtil.h"
-#include "Common/StringUtil.h"
 
 #include "VideoCommon/VideoConfig.h"
+#endif
 
 #define VULKAN_MODULE_ENTRY_POINT(name, required) PFN_##name name;
 #define VULKAN_INSTANCE_ENTRY_POINT(name, required) PFN_##name name;
diff --git a/Source/Core/VideoCommon/AbstractGfx.cpp b/Source/Core/VideoCommon/AbstractGfx.cpp
index 0e7e05e0f00e..851dc485fd2a 100644
--- a/Source/Core/VideoCommon/AbstractGfx.cpp
+++ b/Source/Core/VideoCommon/AbstractGfx.cpp
@@ -12,7 +12,6 @@
 #include "VideoCommon/ShaderCache.h"
 #include "VideoCommon/VertexManagerBase.h"
 #include "VideoCommon/VideoConfig.h"
-#include "VideoCommon/XFMemory.h"
 
 std::unique_ptr<AbstractGfx> g_gfx;
 
@@ -34,10 +33,15 @@ void AbstractGfx::BeginUtilityDrawing()
 
 void AbstractGfx::EndUtilityDrawing()
 {
-  // Reset framebuffer/scissor/viewport. Pipeline will be reset at next draw.
+  // Reset framebuffer. Pipeline will be reset at next draw.
   g_framebuffer_manager->BindEFBFramebuffer();
-  BPFunctions::SetScissorAndViewport(g_framebuffer_manager.get(), bpmem.scissorTL, bpmem.scissorBR,
-                                     bpmem.scissorOffset, xfmem.viewport);
+
+  // Reset our viewport and scissor to the last stored value
+  SetViewport(m_viewport_and_scissor.viewport_x, m_viewport_and_scissor.viewport_y,
+              m_viewport_and_scissor.viewport_width, m_viewport_and_scissor.viewport_height,
+              m_viewport_and_scissor.viewport_near_depth,
+              m_viewport_and_scissor.viewport_far_depth);
+  SetScissorRect(m_viewport_and_scissor.scissor_rect);
 }
 
 void AbstractGfx::SetFramebuffer(AbstractFramebuffer* framebuffer)
@@ -87,6 +91,11 @@ void AbstractGfx::ClearRegion(const MathUtil::Rectangle<int>& target_rc, bool co
   EndUtilityDrawing();
 }
 
+void AbstractGfx::StoreViewportAndScissor(const ViewportAndScissor& viewport_and_scissor)
+{
+  m_viewport_and_scissor = viewport_and_scissor;
+}
+
 void AbstractGfx::SetViewportAndScissor(const MathUtil::Rectangle<int>& rect, float min_depth,
                                         float max_depth)
 {
diff --git a/Source/Core/VideoCommon/AbstractGfx.h b/Source/Core/VideoCommon/AbstractGfx.h
index d9d14e1a1204..3a3c72c68439 100644
--- a/Source/Core/VideoCommon/AbstractGfx.h
+++ b/Source/Core/VideoCommon/AbstractGfx.h
@@ -126,6 +126,20 @@ class AbstractGfx
 
   AbstractFramebuffer* GetCurrentFramebuffer() const { return m_current_framebuffer; }
 
+  struct ViewportAndScissor
+  {
+    MathUtil::Rectangle<int> scissor_rect;
+    float viewport_x = 0;
+    float viewport_y = 0;
+    float viewport_width = 0;
+    float viewport_height = 0;
+    float viewport_near_depth = 0;
+    float viewport_far_depth = 0;
+  };
+
+  // Stores the last viewport and scissor, the stored data is restored in 'EndUtilityDrawing'
+  void StoreViewportAndScissor(const ViewportAndScissor& viewport_and_scissor);
+
   // Sets viewport and scissor to the specified rectangle. rect is assumed to be in framebuffer
   // coordinates, i.e. lower-left origin in OpenGL.
   void SetViewportAndScissor(const MathUtil::Rectangle<int>& rect, float min_depth = 0.0f,
@@ -177,6 +191,7 @@ class AbstractGfx
 
 private:
   Common::EventHook m_config_changed;
+  ViewportAndScissor m_viewport_and_scissor;
 };
 
 extern std::unique_ptr<AbstractGfx> g_gfx;
diff --git a/Source/Core/VideoCommon/AbstractStagingTexture.cpp b/Source/Core/VideoCommon/AbstractStagingTexture.cpp
index fdfb2807fbc9..c436226499a7 100644
--- a/Source/Core/VideoCommon/AbstractStagingTexture.cpp
+++ b/Source/Core/VideoCommon/AbstractStagingTexture.cpp
@@ -7,7 +7,6 @@
 #include <cstring>
 
 #include "Common/Assert.h"
-#include "Common/MsgHandler.h"
 #include "VideoCommon/AbstractTexture.h"
 
 AbstractStagingTexture::AbstractStagingTexture(StagingTextureType type, const TextureConfig& c)
diff --git a/Source/Core/VideoCommon/Assets/AssetListener.h b/Source/Core/VideoCommon/Assets/AssetListener.h
new file mode 100644
index 000000000000..d543a2bb14b9
--- /dev/null
+++ b/Source/Core/VideoCommon/Assets/AssetListener.h
@@ -0,0 +1,23 @@
+// Copyright 2025 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+namespace VideoCommon
+{
+class AssetListener
+{
+public:
+  AssetListener() = default;
+  virtual ~AssetListener() = default;
+
+  AssetListener(const AssetListener&) = default;
+  AssetListener(AssetListener&&) = default;
+  AssetListener& operator=(const AssetListener&) = default;
+  AssetListener& operator=(AssetListener&&) = default;
+
+  virtual void NotifyAssetLoadSuccess() = 0;
+  virtual void NotifyAssetLoadFailed() = 0;
+  virtual void AssetUnloaded() = 0;
+};
+}  // namespace VideoCommon
diff --git a/Source/Core/VideoCommon/Assets/CustomResourceManager.cpp b/Source/Core/VideoCommon/Assets/CustomAssetCache.cpp
similarity index 60%
rename from Source/Core/VideoCommon/Assets/CustomResourceManager.cpp
rename to Source/Core/VideoCommon/Assets/CustomAssetCache.cpp
index 6f8d3557bb19..3b15d5733e9f 100644
--- a/Source/Core/VideoCommon/Assets/CustomResourceManager.cpp
+++ b/Source/Core/VideoCommon/Assets/CustomAssetCache.cpp
@@ -1,7 +1,7 @@
 // Copyright 2025 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "VideoCommon/Assets/CustomResourceManager.h"
+#include "VideoCommon/Assets/CustomAssetCache.h"
 
 #include "Common/Logging/Log.h"
 #include "Common/MemoryUtil.h"
@@ -9,12 +9,10 @@
 #include "UICommon/UICommon.h"
 
 #include "VideoCommon/Assets/CustomAsset.h"
-#include "VideoCommon/Assets/TextureAsset.h"
-#include "VideoCommon/VideoEvents.h"
 
 namespace VideoCommon
 {
-void CustomResourceManager::Initialize()
+void CustomAssetCache::Initialize()
 {
   // Use half of available system memory but leave at least 2GiB unused for system stability.
   constexpr size_t must_keep_unused = 2 * size_t(1024 * 1024 * 1024);
@@ -28,19 +26,16 @@ void CustomResourceManager::Initialize()
     ERROR_LOG_FMT(VIDEO, "Not enough system memory for custom resources.");
 
   m_asset_loader.Initialize();
-
-  m_xfb_event =
-      GetVideoEvents().after_frame_event.Register([this](Core::System&) { XFBTriggered(); });
 }
 
-void CustomResourceManager::Shutdown()
+void CustomAssetCache::Shutdown()
 {
   Reset();
 
   m_asset_loader.Shutdown();
 }
 
-void CustomResourceManager::Reset()
+void CustomAssetCache::Reset()
 {
   m_asset_loader.Reset(true);
 
@@ -48,66 +43,27 @@ void CustomResourceManager::Reset()
   m_pending_assets = {};
   m_asset_handle_to_data.clear();
   m_asset_id_to_handle.clear();
-  m_texture_data_asset_cache.clear();
   m_dirty_assets.clear();
   m_ram_used = 0;
 }
 
-void CustomResourceManager::MarkAssetDirty(const CustomAssetLibrary::AssetID& asset_id)
+void CustomAssetCache::MarkAssetDirty(const CustomAssetLibrary::AssetID& asset_id)
 {
   std::lock_guard guard(m_dirty_mutex);
   m_dirty_assets.insert(asset_id);
 }
 
-CustomResourceManager::TextureTimePair CustomResourceManager::GetTextureDataFromAsset(
-    const CustomAssetLibrary::AssetID& asset_id,
-    std::shared_ptr<VideoCommon::CustomAssetLibrary> library)
+void CustomAssetCache::MarkAssetPending(CustomAsset* asset)
 {
-  auto& resource = m_texture_data_asset_cache[asset_id];
-  if (resource.asset_data != nullptr &&
-      resource.asset_data->load_status == AssetData::LoadStatus::ResourceDataAvailable)
-  {
-    m_active_assets.MakeAssetHighestPriority(resource.asset->GetHandle(), resource.asset);
-    return {resource.texture_data, resource.asset->GetLastLoadedTime()};
-  }
-
-  // If there is an error, don't try and load again until the error is fixed
-  if (resource.asset_data != nullptr && resource.asset_data->has_load_error)
-    return {};
-
-  LoadTextureDataAsset(asset_id, std::move(library), &resource);
-  m_active_assets.MakeAssetHighestPriority(resource.asset->GetHandle(), resource.asset);
-
-  return {};
+  m_pending_assets.MakeAssetHighestPriority(asset->GetHandle(), asset);
 }
 
-void CustomResourceManager::LoadTextureDataAsset(
-    const CustomAssetLibrary::AssetID& asset_id,
-    std::shared_ptr<VideoCommon::CustomAssetLibrary> library, InternalTextureDataResource* resource)
+void CustomAssetCache::MarkAssetActive(CustomAsset* asset)
 {
-  if (!resource->asset)
-  {
-    resource->asset =
-        CreateAsset<TextureAsset>(asset_id, AssetData::AssetType::TextureData, std::move(library));
-    resource->asset_data = &m_asset_handle_to_data[resource->asset->GetHandle()];
-  }
-
-  auto texture_data = resource->asset->GetData();
-  if (!texture_data || resource->asset_data->load_status == AssetData::LoadStatus::PendingReload)
-  {
-    // Tell the system we are still interested in loading this asset
-    const auto asset_handle = resource->asset->GetHandle();
-    m_pending_assets.MakeAssetHighestPriority(asset_handle,
-                                              m_asset_handle_to_data[asset_handle].asset.get());
-  }
-  else if (resource->asset_data->load_status == AssetData::LoadStatus::LoadFinished)
-  {
-    resource->texture_data = std::move(texture_data);
-    resource->asset_data->load_status = AssetData::LoadStatus::ResourceDataAvailable;
-  }
+  m_active_assets.MakeAssetHighestPriority(asset->GetHandle(), asset);
 }
 
-void CustomResourceManager::XFBTriggered()
+void CustomAssetCache::Update()
 {
   ProcessDirtyAssets();
   ProcessLoadedAssets();
@@ -127,7 +83,7 @@ void CustomResourceManager::XFBTriggered()
   m_asset_loader.ScheduleAssetsToLoad(m_pending_assets.Elements(), allowed_memory);
 }
 
-void CustomResourceManager::ProcessDirtyAssets()
+void CustomAssetCache::ProcessDirtyAssets()
 {
   decltype(m_dirty_assets) dirty_assets;
 
@@ -154,7 +110,7 @@ void CustomResourceManager::ProcessDirtyAssets()
   }
 }
 
-void CustomResourceManager::ProcessLoadedAssets()
+void CustomAssetCache::ProcessLoadedAssets()
 {
   const auto load_results = m_asset_loader.TakeLoadResults();
 
@@ -189,10 +145,18 @@ void CustomResourceManager::ProcessLoadedAssets()
       m_active_assets.InsertAsset(handle, asset_data.asset.get());
       asset_data.load_status = AssetData::LoadStatus::LoadFinished;
     }
+
+    for (const auto& listener : asset_data.listeners)
+    {
+      if (load_successful)
+        listener->NotifyAssetLoadSuccess();
+      else
+        listener->NotifyAssetLoadFailed();
+    }
   }
 }
 
-void CustomResourceManager::RemoveAssetsUntilBelowMemoryLimit()
+void CustomAssetCache::RemoveAssetsUntilBelowMemoryLimit()
 {
   const u64 threshold_ram = m_max_ram_available * 8 / 10;
 
@@ -209,11 +173,11 @@ void CustomResourceManager::RemoveAssetsUntilBelowMemoryLimit()
 
     AssetData& asset_data = m_asset_handle_to_data[asset->GetHandle()];
 
-    // Remove the resource manager's cached entry with its asset data
-    if (asset_data.type == AssetData::AssetType::TextureData)
+    for (const auto& listener : asset_data.listeners)
     {
-      m_texture_data_asset_cache.erase(asset->GetAssetId());
+      listener->AssetUnloaded();
     }
+
     // Remove the asset's copy
     const std::size_t bytes_unloaded = asset_data.asset->Unload();
     m_ram_used -= bytes_unloaded;
diff --git a/Source/Core/VideoCommon/Assets/CustomResourceManager.h b/Source/Core/VideoCommon/Assets/CustomAssetCache.h
similarity index 72%
rename from Source/Core/VideoCommon/Assets/CustomResourceManager.h
rename to Source/Core/VideoCommon/Assets/CustomAssetCache.h
index 6a2b5cbbe303..169c0faaf8a3 100644
--- a/Source/Core/VideoCommon/Assets/CustomResourceManager.h
+++ b/Source/Core/VideoCommon/Assets/CustomAssetCache.h
@@ -10,108 +10,96 @@
 #include <vector>
 
 #include "Common/CommonTypes.h"
-#include "Common/HookableEvent.h"
 
+#include "VideoCommon/Assets/AssetListener.h"
 #include "VideoCommon/Assets/CustomAsset.h"
 #include "VideoCommon/Assets/CustomAssetLibrary.h"
 #include "VideoCommon/Assets/CustomAssetLoader.h"
-#include "VideoCommon/Assets/CustomTextureData.h"
 
 namespace VideoCommon
 {
-class TextureAsset;
-
-// The resource manager manages custom resources (textures, shaders, meshes)
-// called assets.  These assets are loaded using a priority system,
+// The asset cache manages custom assets (textures, shaders, meshes).
+// These assets are loaded using a priority system,
 // where assets requested more often gets loaded first.  This system
 // also tracks memory usage and if memory usage goes over a calculated limit,
 // then assets will be purged with older assets being targeted first.
-class CustomResourceManager
+class CustomAssetCache
 {
 public:
-  void Initialize();
-  void Shutdown();
-
-  void Reset();
-
-  // Request that an asset be reloaded
-  void MarkAssetDirty(const CustomAssetLibrary::AssetID& asset_id);
-
-  void XFBTriggered();
-
-  using TextureTimePair = std::pair<std::shared_ptr<CustomTextureData>, CustomAsset::TimeType>;
-
-  // Returns a pair with the custom texture data and the time it was last loaded
-  // Callees are not expected to hold onto the shared_ptr as that will prevent
-  // the resource manager from being able to properly release data
-  TextureTimePair GetTextureDataFromAsset(const CustomAssetLibrary::AssetID& asset_id,
-                                          std::shared_ptr<VideoCommon::CustomAssetLibrary> library);
-
-private:
-  // A generic interface to describe an assets' type
+  // A generic interface to describe an asset
   // and load state
   struct AssetData
   {
     std::unique_ptr<CustomAsset> asset;
+
+    std::vector<AssetListener*> listeners;
+
     CustomAsset::TimeType load_request_time = {};
     bool has_load_error = false;
 
-    enum class AssetType
-    {
-      TextureData
-    };
-    AssetType type;
-
     enum class LoadStatus
     {
       PendingReload,
       LoadFinished,
-      ResourceDataAvailable,
       Unloaded,
     };
     LoadStatus load_status = LoadStatus::PendingReload;
   };
 
-  // A structure to represent some raw texture data
-  // (this data hasn't hit the GPU yet, used for custom textures)
-  struct InternalTextureDataResource
-  {
-    AssetData* asset_data = nullptr;
-    VideoCommon::TextureAsset* asset = nullptr;
-    std::shared_ptr<CustomTextureData> texture_data;
-  };
-
-  void LoadTextureDataAsset(const CustomAssetLibrary::AssetID& asset_id,
-                            std::shared_ptr<VideoCommon::CustomAssetLibrary> library,
-                            InternalTextureDataResource* resource);
-
-  void ProcessDirtyAssets();
-  void ProcessLoadedAssets();
-  void RemoveAssetsUntilBelowMemoryLimit();
-
   template <typename T>
-  T* CreateAsset(const CustomAssetLibrary::AssetID& asset_id, AssetData::AssetType asset_type,
-                 std::shared_ptr<VideoCommon::CustomAssetLibrary> library)
+  T* CreateAsset(const CustomAssetLibrary::AssetID& asset_id,
+                 std::shared_ptr<VideoCommon::CustomAssetLibrary> library, AssetListener* listener)
   {
     const auto [it, added] =
         m_asset_id_to_handle.try_emplace(asset_id, m_asset_handle_to_data.size());
-
     if (added)
     {
       AssetData asset_data;
-      asset_data.asset = std::make_unique<T>(library, asset_id, it->second);
-      asset_data.type = asset_type;
+      asset_data.asset = std::make_unique<T>(std::move(library), asset_id, it->second);
       asset_data.load_request_time = {};
       asset_data.has_load_error = false;
 
       m_asset_handle_to_data.insert_or_assign(it->second, std::move(asset_data));
     }
+
     auto& asset_data_from_handle = m_asset_handle_to_data[it->second];
+    asset_data_from_handle.listeners.push_back(listener);
     asset_data_from_handle.load_status = AssetData::LoadStatus::PendingReload;
 
     return static_cast<T*>(asset_data_from_handle.asset.get());
   }
 
+  AssetData* GetAssetData(const CustomAssetLibrary::AssetID& asset_id)
+  {
+    const auto it_handle = m_asset_id_to_handle.find(asset_id);
+    if (it_handle == m_asset_id_to_handle.end())
+      return nullptr;
+    return &m_asset_handle_to_data[it_handle->second];
+  }
+
+  void Initialize();
+  void Shutdown();
+
+  void Reset();
+
+  // Request that an asset be reloaded
+  void MarkAssetDirty(const CustomAssetLibrary::AssetID& asset_id);
+
+  // Notify the system that we are interested in this asset and
+  // are waiting for it to be loaded
+  void MarkAssetPending(CustomAsset* asset);
+
+  // Notify the system we are interested in this asset and
+  // it has seen activity
+  void MarkAssetActive(CustomAsset* asset);
+
+  void Update();
+
+private:
+  void ProcessDirtyAssets();
+  void ProcessLoadedAssets();
+  void RemoveAssetsUntilBelowMemoryLimit();
+
   // Maintains a priority-sorted list of assets.
   // Used to figure out which assets to load or unload first.
   // Most recently used assets get marked with highest priority.
@@ -202,14 +190,10 @@ class CustomResourceManager
   // A calculated amount of memory to avoid exceeding.
   u64 m_max_ram_available = 0;
 
-  std::map<CustomAssetLibrary::AssetID, InternalTextureDataResource> m_texture_data_asset_cache;
-
   std::mutex m_dirty_mutex;
   std::set<CustomAssetLibrary::AssetID> m_dirty_assets;
 
   CustomAssetLoader m_asset_loader;
-
-  Common::EventHook m_xfb_event;
 };
 
 }  // namespace VideoCommon
diff --git a/Source/Core/VideoCommon/Assets/DirectFilesystemAssetLibrary.cpp b/Source/Core/VideoCommon/Assets/DirectFilesystemAssetLibrary.cpp
index 5e400f3de509..58b72ef110e5 100644
--- a/Source/Core/VideoCommon/Assets/DirectFilesystemAssetLibrary.cpp
+++ b/Source/Core/VideoCommon/Assets/DirectFilesystemAssetLibrary.cpp
@@ -3,24 +3,24 @@
 
 #include "VideoCommon/Assets/DirectFilesystemAssetLibrary.h"
 
-#include <algorithm>
 #include <vector>
 
 #include <fmt/std.h>
 
+#include "Common/CommonPaths.h"
 #include "Common/FileUtil.h"
 #include "Common/IOFile.h"
 #include "Common/JsonUtil.h"
 #include "Common/Logging/Log.h"
 #include "Common/StringUtil.h"
 #include "Core/System.h"
-#include "VideoCommon/Assets/CustomResourceManager.h"
 #include "VideoCommon/Assets/MaterialAsset.h"
 #include "VideoCommon/Assets/MeshAsset.h"
 #include "VideoCommon/Assets/ShaderAsset.h"
 #include "VideoCommon/Assets/TextureAsset.h"
 #include "VideoCommon/Assets/TextureAssetUtils.h"
 #include "VideoCommon/RenderState.h"
+#include "VideoCommon/Resources/CustomResourceManager.h"
 
 namespace VideoCommon
 {
@@ -150,6 +150,12 @@ DirectFilesystemAssetLibrary::LoadRasterSurfaceShader(const AssetID& asset_id,
   if (!RasterSurfaceShaderData::FromJson(asset_id, root_obj, data))
     return {};
 
+  const std::string graphics_mod_builtin =
+      File::GetSysDirectory() + GRAPHICSMOD_DIR + "/Builtin" + "/Shaders";
+
+  data->shader_includer = std::make_unique<VideoCommon::ShaderIncluder>(
+      PathToString(pixel_shader->second.parent_path()), graphics_mod_builtin);
+
   return LoadInfo{approx_mem_size};
 }
 
diff --git a/Source/Core/VideoCommon/Assets/MaterialAsset.cpp b/Source/Core/VideoCommon/Assets/MaterialAsset.cpp
index 5f5c97a9f1bd..200bccf333f4 100644
--- a/Source/Core/VideoCommon/Assets/MaterialAsset.cpp
+++ b/Source/Core/VideoCommon/Assets/MaterialAsset.cpp
@@ -197,7 +197,12 @@ void MaterialProperty::WriteToMemory(u8*& buffer, const MaterialProperty& proper
           [&](const std::array<float, 2>& value) { write_memory(value.data(), sizeof(float) * 2); },
           [&](const std::array<float, 3>& value) { write_memory(value.data(), sizeof(float) * 3); },
           [&](const std::array<float, 4>& value) { write_memory(value.data(), sizeof(float) * 4); },
-          [&](bool value) { write_memory(&value, sizeof(bool)); }},
+
+          // Bool has the size of an int in the shader
+          [&](bool value) {
+            u32 val = static_cast<u32>(value);
+            write_memory(&val, sizeof(u32));
+          }},
       property.m_value);
 }
 
diff --git a/Source/Core/VideoCommon/Assets/MaterialAsset.h b/Source/Core/VideoCommon/Assets/MaterialAsset.h
index 0ba786087a59..4be99169d07f 100644
--- a/Source/Core/VideoCommon/Assets/MaterialAsset.h
+++ b/Source/Core/VideoCommon/Assets/MaterialAsset.h
@@ -5,7 +5,6 @@
 
 #include <array>
 #include <optional>
-#include <string>
 #include <variant>
 #include <vector>
 
diff --git a/Source/Core/VideoCommon/Assets/MeshAsset.cpp b/Source/Core/VideoCommon/Assets/MeshAsset.cpp
index bde8c8aab6de..133184aa33bf 100644
--- a/Source/Core/VideoCommon/Assets/MeshAsset.cpp
+++ b/Source/Core/VideoCommon/Assets/MeshAsset.cpp
@@ -3,7 +3,6 @@
 
 #include "VideoCommon/Assets/MeshAsset.h"
 
-#include <algorithm>
 #include <array>
 #include <utility>
 
@@ -11,7 +10,6 @@
 
 #include "Common/IOFile.h"
 #include "Common/Logging/Log.h"
-#include "Common/StringUtil.h"
 #include "VideoCommon/Assets/CustomAssetLibrary.h"
 
 namespace VideoCommon
diff --git a/Source/Core/VideoCommon/Assets/ShaderAsset.cpp b/Source/Core/VideoCommon/Assets/ShaderAsset.cpp
index 99c9ed4ab086..04a91392125c 100644
--- a/Source/Core/VideoCommon/Assets/ShaderAsset.cpp
+++ b/Source/Core/VideoCommon/Assets/ShaderAsset.cpp
@@ -256,7 +256,7 @@ bool RasterSurfaceShaderData::FromJson(const VideoCommon::CustomAssetLibrary::As
 
   const auto parse_samplers =
       [&](const char* name,
-          std::vector<VideoCommon::RasterSurfaceShaderData::SamplerData>* samplers) -> bool {
+          std::vector<VideoCommon::RasterSurfaceShaderData::SamplerData>* samplers_out) -> bool {
     const auto samplers_iter = json.find(name);
     if (samplers_iter == json.end())
     {
@@ -309,7 +309,7 @@ bool RasterSurfaceShaderData::FromJson(const VideoCommon::CustomAssetLibrary::As
                       asset_id);
         return false;
       }
-      samplers->push_back(std::move(sampler));
+      samplers_out->push_back(std::move(sampler));
     }
 
     return true;
diff --git a/Source/Core/VideoCommon/Assets/ShaderAsset.h b/Source/Core/VideoCommon/Assets/ShaderAsset.h
index 81631fa0b34c..3a785ad31046 100644
--- a/Source/Core/VideoCommon/Assets/ShaderAsset.h
+++ b/Source/Core/VideoCommon/Assets/ShaderAsset.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <array>
+#include <memory>
 #include <span>
 #include <string>
 #include <string_view>
@@ -13,6 +14,7 @@
 #include <picojson.h>
 
 #include "VideoCommon/Assets/CustomAsset.h"
+#include "VideoCommon/ShaderCompileUtils.h"
 #include "VideoCommon/TextureConfig.h"
 
 class ShaderCode;
@@ -45,13 +47,20 @@ struct ShaderProperty
 
 struct RasterSurfaceShaderData
 {
+  RasterSurfaceShaderData() = default;
+  RasterSurfaceShaderData(const RasterSurfaceShaderData&) = delete;
+  RasterSurfaceShaderData(RasterSurfaceShaderData&&) = default;
+  ~RasterSurfaceShaderData() = default;
+  RasterSurfaceShaderData& operator=(const RasterSurfaceShaderData&) = delete;
+  RasterSurfaceShaderData& operator=(RasterSurfaceShaderData&&) = default;
+
   static bool FromJson(const CustomAssetLibrary::AssetID& asset_id, const picojson::object& json,
                        RasterSurfaceShaderData* data);
   static void ToJson(picojson::object& obj, const RasterSurfaceShaderData& data);
 
   // These shader properties describe the input that the
   // shader expects to expose.  The key is text
-  // expected to be in the shader code and the propery
+  // expected to be in the shader code and the property
   // describes various details about the input
   std::vector<ShaderProperty> uniform_properties;
   std::string vertex_source;
@@ -65,6 +74,8 @@ struct RasterSurfaceShaderData
     bool operator==(const SamplerData&) const = default;
   };
   std::vector<SamplerData> samplers;
+
+  std::unique_ptr<VideoCommon::ShaderIncluder> shader_includer;
 };
 
 class RasterSurfaceShaderAsset final : public CustomLoadableAsset<RasterSurfaceShaderData>
diff --git a/Source/Core/VideoCommon/Assets/TextureSamplerValue.h b/Source/Core/VideoCommon/Assets/TextureSamplerValue.h
index 11896559f531..9b21b6bf8d26 100644
--- a/Source/Core/VideoCommon/Assets/TextureSamplerValue.h
+++ b/Source/Core/VideoCommon/Assets/TextureSamplerValue.h
@@ -20,7 +20,7 @@ struct TextureSamplerValue
   // If 'Asset' is used, the sampler is pulled
   // directly from the asset properties
   // If 'TextureHash' is chosen, the sampler is pulled
-  // from the game with the cooresponding texture hash
+  // from the game with the corresponding texture hash
   enum class SamplerOrigin
   {
     Asset,
diff --git a/Source/Core/VideoCommon/AsyncShaderCompiler.cpp b/Source/Core/VideoCommon/AsyncShaderCompiler.cpp
index c69354628d20..83eaa2e23e83 100644
--- a/Source/Core/VideoCommon/AsyncShaderCompiler.cpp
+++ b/Source/Core/VideoCommon/AsyncShaderCompiler.cpp
@@ -35,7 +35,7 @@ void AsyncShaderCompiler::QueueWorkItem(WorkItemPtr item, u32 priority)
   }
   else
   {
-    std::lock_guard<std::mutex> guard(m_pending_work_lock);
+    std::lock_guard guard(m_pending_work_lock);
     m_pending_work.emplace(priority, std::move(item));
     m_worker_thread_wake.notify_one();
   }
@@ -45,7 +45,7 @@ void AsyncShaderCompiler::RetrieveWorkItems()
 {
   std::deque<WorkItemPtr> completed_work;
   {
-    std::lock_guard<std::mutex> guard(m_completed_work_lock);
+    std::lock_guard guard(m_completed_work_lock);
     m_completed_work.swap(completed_work);
   }
 
@@ -58,16 +58,29 @@ void AsyncShaderCompiler::RetrieveWorkItems()
 
 bool AsyncShaderCompiler::HasPendingWork()
 {
-  std::lock_guard<std::mutex> guard(m_pending_work_lock);
+  std::lock_guard guard(m_pending_work_lock);
   return !m_pending_work.empty() || m_busy_workers.load() != 0;
 }
 
 bool AsyncShaderCompiler::HasCompletedWork()
 {
-  std::lock_guard<std::mutex> guard(m_completed_work_lock);
+  std::lock_guard guard(m_completed_work_lock);
   return !m_completed_work.empty();
 }
 
+void AsyncShaderCompiler::ClearAllWork()
+{
+  {
+    std::lock_guard guard(m_pending_work_lock);
+    m_pending_work.clear();
+  }
+
+  {
+    std::lock_guard guard(m_completed_work_lock);
+    m_completed_work.clear();
+  }
+}
+
 bool AsyncShaderCompiler::WaitUntilCompletion(
     const std::function<void(size_t, size_t)>& progress_callback)
 {
@@ -89,8 +102,8 @@ bool AsyncShaderCompiler::WaitUntilCompletion(
   size_t total_items;
   {
     // Safe to hold both locks here, since nowhere else does.
-    std::lock_guard<std::mutex> pending_guard(m_pending_work_lock);
-    std::lock_guard<std::mutex> completed_guard(m_completed_work_lock);
+    std::lock_guard pending_guard(m_pending_work_lock);
+    std::lock_guard completed_guard(m_completed_work_lock);
     total_items = m_completed_work.size() + m_pending_work.size() + m_busy_workers.load() + 1;
   }
 
@@ -99,7 +112,7 @@ bool AsyncShaderCompiler::WaitUntilCompletion(
   {
     size_t remaining_items;
     {
-      std::lock_guard<std::mutex> pending_guard(m_pending_work_lock);
+      std::lock_guard pending_guard(m_pending_work_lock);
       if (m_pending_work.empty() && !m_busy_workers.load())
         return true;
       remaining_items = m_pending_work.size();
@@ -164,7 +177,7 @@ void AsyncShaderCompiler::StopWorkerThreads()
 
   // Signal worker threads to stop, and wake all of them.
   {
-    std::lock_guard<std::mutex> guard(m_pending_work_lock);
+    std::lock_guard guard(m_pending_work_lock);
     m_exit_flag.Set();
     m_worker_thread_wake.notify_all();
   }
@@ -213,7 +226,7 @@ void AsyncShaderCompiler::WorkerThreadEntryPoint(void* param)
 
 void AsyncShaderCompiler::WorkerThreadRun()
 {
-  std::unique_lock<std::mutex> pending_lock(m_pending_work_lock);
+  std::unique_lock pending_lock(m_pending_work_lock);
   while (!m_exit_flag.IsSet())
   {
     m_worker_thread_wake.wait(pending_lock);
@@ -228,7 +241,7 @@ void AsyncShaderCompiler::WorkerThreadRun()
 
       if (item->Compile())
       {
-        std::lock_guard<std::mutex> completed_guard(m_completed_work_lock);
+        std::lock_guard completed_guard(m_completed_work_lock);
         m_completed_work.push_back(std::move(item));
       }
 
diff --git a/Source/Core/VideoCommon/AsyncShaderCompiler.h b/Source/Core/VideoCommon/AsyncShaderCompiler.h
index 8773891d6198..ffcca0c4ec17 100644
--- a/Source/Core/VideoCommon/AsyncShaderCompiler.h
+++ b/Source/Core/VideoCommon/AsyncShaderCompiler.h
@@ -49,6 +49,9 @@ class AsyncShaderCompiler
   bool HasPendingWork();
   bool HasCompletedWork();
 
+  // Clears both pending and completed work
+  void ClearAllWork();
+
   // Calls progress_callback periodically, with completed_items, and total_items.
   // Returns false if interrupted.
   bool WaitUntilCompletion(const std::function<void(size_t, size_t)>& progress_callback);
diff --git a/Source/Core/VideoCommon/BPFunctions.cpp b/Source/Core/VideoCommon/BPFunctions.cpp
index 660d85c59897..134a14f8d471 100644
--- a/Source/Core/VideoCommon/BPFunctions.cpp
+++ b/Source/Core/VideoCommon/BPFunctions.cpp
@@ -265,6 +265,14 @@ void SetScissorAndViewport(FramebufferManager* frame_buffer_manager, ScissorPos
     y = static_cast<float>(g_gfx->GetCurrentFramebuffer()->GetHeight()) - y - height;
 
   g_gfx->SetViewport(x, y, width, height, near_depth, far_depth);
+
+  g_gfx->StoreViewportAndScissor(AbstractGfx::ViewportAndScissor{.scissor_rect = converted_rc,
+                                                                 .viewport_x = x,
+                                                                 .viewport_y = y,
+                                                                 .viewport_width = width,
+                                                                 .viewport_height = height,
+                                                                 .viewport_near_depth = near_depth,
+                                                                 .viewport_far_depth = far_depth});
 }
 
 void SetDepthMode()
diff --git a/Source/Core/VideoCommon/CMakeLists.txt b/Source/Core/VideoCommon/CMakeLists.txt
index 73b9221c4b52..69a0968e4d88 100644
--- a/Source/Core/VideoCommon/CMakeLists.txt
+++ b/Source/Core/VideoCommon/CMakeLists.txt
@@ -8,13 +8,14 @@ add_library(videocommon
   AbstractStagingTexture.h
   AbstractTexture.cpp
   AbstractTexture.h
+  Assets/AssetListener.h
   Assets/CustomAsset.cpp
   Assets/CustomAsset.h
+  Assets/CustomAssetCache.cpp
+  Assets/CustomAssetCache.h
   Assets/CustomAssetLibrary.h
   Assets/CustomAssetLoader.cpp
   Assets/CustomAssetLoader.h
-  Assets/CustomResourceManager.cpp
-  Assets/CustomResourceManager.h
   Assets/CustomTextureData.cpp
   Assets/CustomTextureData.h
   Assets/DirectFilesystemAssetLibrary.cpp
@@ -133,6 +134,8 @@ add_library(videocommon
   PerformanceMetrics.h
   PerformanceTracker.cpp
   PerformanceTracker.h
+  PipelineUtils.cpp
+  PipelineUtils.h
   PixelEngine.cpp
   PixelEngine.h
   PixelShaderGen.cpp
@@ -145,6 +148,22 @@ add_library(videocommon
   Present.h
   RenderState.cpp
   RenderState.h
+  Resources/CustomResourceManager.cpp
+  Resources/CustomResourceManager.h
+  Resources/InvalidTextures.cpp
+  Resources/InvalidTextures.h
+  Resources/MaterialResource.cpp
+  Resources/MaterialResource.h
+  Resources/Resource.cpp
+  Resources/Resource.h
+  Resources/ShaderResource.cpp
+  Resources/ShaderResource.h
+  Resources/TextureAndSamplerResource.cpp
+  Resources/TextureAndSamplerResource.h
+  Resources/TextureDataResource.cpp
+  Resources/TextureDataResource.h
+  Resources/TexturePool.cpp
+  Resources/TexturePool.h
   ShaderCache.cpp
   ShaderCache.h
   ShaderCompileUtils.cpp
diff --git a/Source/Core/VideoCommon/CPMemory.cpp b/Source/Core/VideoCommon/CPMemory.cpp
index 9b47a13da016..62c2eec4f3eb 100644
--- a/Source/Core/VideoCommon/CPMemory.cpp
+++ b/Source/Core/VideoCommon/CPMemory.cpp
@@ -5,14 +5,12 @@
 
 #include <cstring>
 #include <type_traits>
+#include <utility>
 
-#include "Common/ChunkFile.h"
-#include "Common/EnumUtils.h"
 #include "Common/Logging/Log.h"
 #include "Core/DolphinAnalytics.h"
 #include "Core/System.h"
 #include "VideoCommon/CommandProcessor.h"
-#include "VideoCommon/VertexLoaderManager.h"
 
 // CP state
 CPState g_main_cp_state;
@@ -112,7 +110,7 @@ void CPState::LoadCPReg(u8 sub_cmd, u32 value)
       WARN_LOG_FMT(VIDEO,
                    "CP MATINDEX_A: an exact value of {:02x} was expected "
                    "but instead a value of {:02x} was seen",
-                   Common::ToUnderlying(MATINDEX_A), sub_cmd);
+                   std::to_underlying(MATINDEX_A), sub_cmd);
     }
 
     matrix_index_a.Hex = value;
@@ -125,7 +123,7 @@ void CPState::LoadCPReg(u8 sub_cmd, u32 value)
       WARN_LOG_FMT(VIDEO,
                    "CP MATINDEX_B: an exact value of {:02x} was expected "
                    "but instead a value of {:02x} was seen",
-                   Common::ToUnderlying(MATINDEX_B), sub_cmd);
+                   std::to_underlying(MATINDEX_B), sub_cmd);
     }
 
     matrix_index_b.Hex = value;
@@ -138,7 +136,7 @@ void CPState::LoadCPReg(u8 sub_cmd, u32 value)
       WARN_LOG_FMT(VIDEO,
                    "CP VCD_LO: an exact value of {:02x} was expected "
                    "but instead a value of {:02x} was seen",
-                   Common::ToUnderlying(VCD_LO), sub_cmd);
+                   std::to_underlying(VCD_LO), sub_cmd);
     }
 
     vtx_desc.low.Hex = value;
@@ -151,7 +149,7 @@ void CPState::LoadCPReg(u8 sub_cmd, u32 value)
       WARN_LOG_FMT(VIDEO,
                    "CP VCD_HI: an exact value of {:02x} was expected "
                    "but instead a value of {:02x} was seen",
-                   Common::ToUnderlying(VCD_HI), sub_cmd);
+                   std::to_underlying(VCD_HI), sub_cmd);
     }
 
     vtx_desc.high.Hex = value;
diff --git a/Source/Core/VideoCommon/CPUCull.cpp b/Source/Core/VideoCommon/CPUCull.cpp
index 8158e23a7e17..d46923537107 100644
--- a/Source/Core/VideoCommon/CPUCull.cpp
+++ b/Source/Core/VideoCommon/CPUCull.cpp
@@ -12,9 +12,7 @@
 #include "VideoCommon/CPMemory.h"
 #include "VideoCommon/VertexManagerBase.h"
 #include "VideoCommon/VertexShaderManager.h"
-#include "VideoCommon/VideoConfig.h"
 #include "VideoCommon/XFMemory.h"
-#include "VideoCommon/XFStateManager.h"
 
 // We really want things like c.w * a.x - a.w * c.x to stay symmetric, so they cancel to zero on
 // degenerate triangles.  Make sure the compiler doesn't optimize in fmas where not requested.
@@ -153,7 +151,7 @@ bool CPUCull::AreAllVerticesCulled(VertexLoaderBase* loader, OpcodeDecoder::Prim
         Common::AllocateAlignedMemory(new_size * sizeof(TransformedVertex), 32)));
   }
 
-  // transform functions need the projection matrix to tranform to clip space
+  // transform functions need the projection matrix to transform to clip space
   auto& system = Core::System::GetInstance();
   system.GetVertexShaderManager().SetProjectionMatrix(system.GetXFStateManager());
 
diff --git a/Source/Core/VideoCommon/CommandProcessor.cpp b/Source/Core/VideoCommon/CommandProcessor.cpp
index 8342bfb6fb78..0d9128403883 100644
--- a/Source/Core/VideoCommon/CommandProcessor.cpp
+++ b/Source/Core/VideoCommon/CommandProcessor.cpp
@@ -4,7 +4,6 @@
 #include "VideoCommon/CommandProcessor.h"
 
 #include <atomic>
-#include <cstring>
 #include <fmt/format.h>
 
 #include "Common/Assert.h"
diff --git a/Source/Core/VideoCommon/DriverDetails.cpp b/Source/Core/VideoCommon/DriverDetails.cpp
index 1f6b702bf3a0..001cfe0f11ba 100644
--- a/Source/Core/VideoCommon/DriverDetails.cpp
+++ b/Source/Core/VideoCommon/DriverDetails.cpp
@@ -5,7 +5,6 @@
 
 #include <map>
 
-#include "Common/Logging/LogManager.h"
 #include "Core/DolphinAnalytics.h"
 
 namespace DriverDetails
diff --git a/Source/Core/VideoCommon/DriverDetails.h b/Source/Core/VideoCommon/DriverDetails.h
index 17fe981542f7..8f6207f3f800 100644
--- a/Source/Core/VideoCommon/DriverDetails.h
+++ b/Source/Core/VideoCommon/DriverDetails.h
@@ -326,7 +326,7 @@ enum Bug
 
   // BUG: Some driver and Apple Silicon GPU combinations have problems with fragment discard when
   // early depth test is enabled. Discarded fragments may appear corrupted (Super Mario Sunshine,
-  // Sonic Adventure 2: Battle, Phantasy Star Online Epsiodes 1 & 2, etc).
+  // Sonic Adventure 2: Battle, Phantasy Star Online Episodes 1 & 2, etc).
   // Affected devices: Apple Silicon GPUs of Apple family 4 and newer.
   // Started version: -1
   // Ended version: -1
diff --git a/Source/Core/VideoCommon/EFBInterface.cpp b/Source/Core/VideoCommon/EFBInterface.cpp
index 6ce256ff47b3..c38774d669a4 100644
--- a/Source/Core/VideoCommon/EFBInterface.cpp
+++ b/Source/Core/VideoCommon/EFBInterface.cpp
@@ -4,11 +4,8 @@
 #include "VideoCommon/EFBInterface.h"
 
 #include <algorithm>
-#include <cmath>
 #include <memory>
 
-#include <fmt/format.h>
-
 #include "Common/MsgHandler.h"
 
 #include "Core/ConfigManager.h"
diff --git a/Source/Core/VideoCommon/FreeLookCamera.cpp b/Source/Core/VideoCommon/FreeLookCamera.cpp
index 2bc7d11bb920..ba6be77d6ce7 100644
--- a/Source/Core/VideoCommon/FreeLookCamera.cpp
+++ b/Source/Core/VideoCommon/FreeLookCamera.cpp
@@ -4,18 +4,13 @@
 #include "VideoCommon/FreeLookCamera.h"
 
 #include <algorithm>
-#include <math.h>
 
 #include <fmt/format.h>
 
-#include "Common/MathUtil.h"
-
 #include "Common/ChunkFile.h"
-#include "Core/ConfigManager.h"
+#include "Common/Config/Config.h"
 #include "Core/Core.h"
 
-#include "VideoCommon/VideoCommon.h"
-
 FreeLookCamera g_freelook_camera;
 
 namespace
@@ -260,21 +255,18 @@ float CameraControllerInput::GetSpeed() const
 
 FreeLookCamera::FreeLookCamera()
 {
-  SetControlType(FreeLook::ControlType::SixAxis);
+  RefreshConfig();
 }
 
-void FreeLookCamera::SetControlType(FreeLook::ControlType type)
+void FreeLookCamera::RefreshConfig()
 {
-  if (m_current_type && *m_current_type == type)
-  {
+  m_is_enabled = Config::Get(Config::FREE_LOOK_ENABLED);
+  const auto type = Config::Get(Config::FL1_CONTROL_TYPE);
+
+  if (m_current_type == type)
     return;
-  }
 
-  if (type == FreeLook::ControlType::SixAxis)
-  {
-    m_camera_controller = std::make_unique<SixAxisController>();
-  }
-  else if (type == FreeLook::ControlType::Orbital)
+  if (type == FreeLook::ControlType::Orbital)
   {
     m_camera_controller = std::make_unique<OrbitalController>();
   }
@@ -282,6 +274,10 @@ void FreeLookCamera::SetControlType(FreeLook::ControlType type)
   {
     m_camera_controller = std::make_unique<FPSController>();
   }
+  else
+  {
+    m_camera_controller = std::make_unique<SixAxisController>();
+  }
 
   m_current_type = type;
 }
@@ -330,7 +326,7 @@ void FreeLookCamera::DoState(PointerWrap& p)
 
 bool FreeLookCamera::IsActive() const
 {
-  return FreeLook::GetActiveConfig().enabled;
+  return m_is_enabled;
 }
 
 CameraController* FreeLookCamera::GetController() const
diff --git a/Source/Core/VideoCommon/FreeLookCamera.h b/Source/Core/VideoCommon/FreeLookCamera.h
index f1ae46ce4d2a..91c296ad16e1 100644
--- a/Source/Core/VideoCommon/FreeLookCamera.h
+++ b/Source/Core/VideoCommon/FreeLookCamera.h
@@ -7,7 +7,7 @@
 #include <optional>
 
 #include "Common/Matrix.h"
-#include "Core/FreeLookConfig.h"
+#include "Core/Config/FreeLookSettings.h"
 
 class PointerWrap;
 
@@ -79,7 +79,9 @@ class FreeLookCamera
 {
 public:
   FreeLookCamera();
-  void SetControlType(FreeLook::ControlType type);
+
+  void RefreshConfig();
+
   Common::Matrix44 GetView() const;
   Common::Vec2 GetFieldOfViewMultiplier() const;
 
@@ -90,8 +92,10 @@ class FreeLookCamera
   CameraController* GetController() const;
 
 private:
-  std::optional<FreeLook::ControlType> m_current_type;
   std::unique_ptr<CameraController> m_camera_controller;
+
+  bool m_is_enabled{};
+  std::optional<FreeLook::ControlType> m_current_type;
 };
 
 extern FreeLookCamera g_freelook_camera;
diff --git a/Source/Core/VideoCommon/GeometryShaderGen.cpp b/Source/Core/VideoCommon/GeometryShaderGen.cpp
index 2d6170ed129c..1dbbbd29e996 100644
--- a/Source/Core/VideoCommon/GeometryShaderGen.cpp
+++ b/Source/Core/VideoCommon/GeometryShaderGen.cpp
@@ -3,8 +3,6 @@
 
 #include "VideoCommon/GeometryShaderGen.h"
 
-#include <cmath>
-
 #include "Common/CommonTypes.h"
 #include "Common/EnumMap.h"
 #include "VideoCommon/DriverDetails.h"
diff --git a/Source/Core/VideoCommon/GeometryShaderManager.cpp b/Source/Core/VideoCommon/GeometryShaderManager.cpp
index 43c934ed2841..b7af797203de 100644
--- a/Source/Core/VideoCommon/GeometryShaderManager.cpp
+++ b/Source/Core/VideoCommon/GeometryShaderManager.cpp
@@ -3,8 +3,6 @@
 
 #include "VideoCommon/GeometryShaderManager.h"
 
-#include <cstring>
-
 #include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
 #include "VideoCommon/BPMemory.h"
@@ -18,7 +16,7 @@ void GeometryShaderManager::Init()
 {
   constants = {};
 
-  // Init any intial constants which aren't zero when bpmem is zero.
+  // Init any initial constants which aren't zero when bpmem is zero.
   SetViewportChanged();
   SetProjectionChanged();
 
diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsMod.cpp b/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsMod.cpp
index ef71ba6eb844..c8fe390e4cb6 100644
--- a/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsMod.cpp
+++ b/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsMod.cpp
@@ -5,7 +5,6 @@
 
 #include <fmt/format.h>
 
-#include "Common/CommonPaths.h"
 #include "Common/FileUtil.h"
 #include "Common/JsonUtil.h"
 #include "Common/Logging/Log.h"
diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsModGroup.cpp b/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsModGroup.cpp
index 3c234e9ec1e8..e3cf5b9a1041 100644
--- a/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsModGroup.cpp
+++ b/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsModGroup.cpp
@@ -3,19 +3,17 @@
 
 #include "VideoCommon/GraphicsModSystem/Config/GraphicsModGroup.h"
 
+#include <fstream>
 #include <map>
-#include <sstream>
 #include <string>
 
 #include <picojson.h>
 
 #include "Common/CommonPaths.h"
-#include "Common/FileSearch.h"
 #include "Common/FileUtil.h"
 #include "Common/JsonUtil.h"
 #include "Common/Logging/Log.h"
 #include "Common/StringUtil.h"
-#include "Core/ConfigManager.h"
 
 #include "VideoCommon/GraphicsModSystem/Config/GraphicsMod.h"
 #include "VideoCommon/GraphicsModSystem/Constants.h"
diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/Actions/CustomPipelineAction.cpp b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/Actions/CustomPipelineAction.cpp
index 7366ad7ff7cf..4e22d5b3f88d 100644
--- a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/Actions/CustomPipelineAction.cpp
+++ b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/Actions/CustomPipelineAction.cpp
@@ -3,22 +3,7 @@
 
 #include "VideoCommon/GraphicsModSystem/Runtime/Actions/CustomPipelineAction.h"
 
-#include <algorithm>
-#include <array>
-#include <optional>
-
-#include <fmt/format.h>
-
-#include "Common/FileUtil.h"
 #include "Common/Logging/Log.h"
-#include "Common/StringUtil.h"
-#include "Common/VariantUtil.h"
-#include "Core/System.h"
-
-#include "VideoCommon/AbstractGfx.h"
-#include "VideoCommon/Assets/DirectFilesystemAssetLibrary.h"
-#include "VideoCommon/ShaderGenCommon.h"
-#include "VideoCommon/TextureCacheBase.h"
 
 std::unique_ptr<CustomPipelineAction>
 CustomPipelineAction::Create(std::shared_ptr<VideoCommon::CustomAssetLibrary> library)
diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/CustomPipeline.cpp b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/CustomPipeline.cpp
index aa392f0a9662..bb09a8432855 100644
--- a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/CustomPipeline.cpp
+++ b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/CustomPipeline.cpp
@@ -3,35 +3,11 @@
 
 #include "VideoCommon/GraphicsModSystem/Runtime/CustomPipeline.h"
 
-#include <algorithm>
-#include <array>
-#include <variant>
+#include <memory>
+#include <span>
 
-#include "Common/Contains.h"
-#include "Common/Logging/Log.h"
-#include "Common/VariantUtil.h"
-
-#include "VideoCommon/AbstractGfx.h"
-
-namespace
-{
-bool IsQualifier(std::string_view value)
-{
-  static constexpr std::array<std::string_view, 7> qualifiers = {
-      "attribute", "const", "highp", "lowp", "mediump", "uniform", "varying",
-  };
-  return Common::Contains(qualifiers, value);
-}
-
-bool IsBuiltInMacro(std::string_view value)
-{
-  static constexpr std::array<std::string_view, 5> built_in = {
-      "__LINE__", "__FILE__", "__VERSION__", "GL_core_profile", "GL_compatibility_profile",
-  };
-  return Common::Contains(built_in, value);
-}
-
-}  // namespace
+#include "Common/CommonTypes.h"
+#include "VideoCommon/Assets/CustomAssetLibrary.h"
 
 void CustomPipeline::UpdatePixelData(std::shared_ptr<VideoCommon::CustomAssetLibrary>,
                                      std::span<const u32>,
diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/CustomPipeline.h b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/CustomPipeline.h
index 7165c9291fd4..3aa7b6641c6c 100644
--- a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/CustomPipeline.h
+++ b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/CustomPipeline.h
@@ -4,18 +4,10 @@
 #pragma once
 
 #include <memory>
-#include <optional>
 #include <span>
-#include <string>
-#include <string_view>
-#include <vector>
 
-#include "VideoCommon/AbstractTexture.h"
+#include "Common/CommonTypes.h"
 #include "VideoCommon/Assets/CustomAssetLibrary.h"
-#include "VideoCommon/Assets/MaterialAsset.h"
-#include "VideoCommon/Assets/ShaderAsset.h"
-#include "VideoCommon/Assets/TextureAsset.h"
-#include "VideoCommon/ShaderGenCommon.h"
 
 struct CustomPipeline
 {
diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/CustomShaderCache.cpp b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/CustomShaderCache.cpp
index a3c98ee9d7c3..54b0d786f2bb 100644
--- a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/CustomShaderCache.cpp
+++ b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/CustomShaderCache.cpp
@@ -5,6 +5,7 @@
 
 #include "VideoCommon/AbstractGfx.h"
 #include "VideoCommon/VideoConfig.h"
+#include "VideoCommon/VideoEvents.h"
 
 CustomShaderCache::CustomShaderCache()
 {
@@ -24,10 +25,16 @@ CustomShaderCache::CustomShaderCache()
 CustomShaderCache::~CustomShaderCache()
 {
   if (m_async_shader_compiler)
+  {
     m_async_shader_compiler->StopWorkerThreads();
+    m_async_shader_compiler->ClearAllWork();
+  }
 
   if (m_async_uber_shader_compiler)
+  {
     m_async_uber_shader_compiler->StopWorkerThreads();
+    m_async_uber_shader_compiler->ClearAllWork();
+  }
 }
 
 void CustomShaderCache::RetrieveAsyncShaders()
diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/CustomShaderCache.h b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/CustomShaderCache.h
index ff2aba282379..7890cafeb644 100644
--- a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/CustomShaderCache.h
+++ b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/CustomShaderCache.h
@@ -3,13 +3,12 @@
 
 #pragma once
 
-#include <array>
 #include <list>
 #include <map>
 #include <memory>
 #include <optional>
-#include <string>
-#include <string_view>
+
+#include "Common/HookableEvent.h"
 
 #include "VideoCommon/AbstractPipeline.h"
 #include "VideoCommon/AbstractShader.h"
@@ -18,7 +17,6 @@
 #include "VideoCommon/PixelShaderGen.h"
 #include "VideoCommon/ShaderGenCommon.h"
 #include "VideoCommon/UberShaderPixel.h"
-#include "VideoCommon/VideoEvents.h"
 
 struct CustomShaderInstance
 {
diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModActionData.h b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModActionData.h
index f7c12fe6e511..a4e883ffc2b5 100644
--- a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModActionData.h
+++ b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModActionData.h
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include <array>
 #include <optional>
 #include <span>
 #include <string_view>
@@ -13,7 +12,7 @@
 #include "Common/Matrix.h"
 #include "Common/SmallVector.h"
 #include "VideoCommon/Assets/TextureAsset.h"
-#include "VideoCommon/PixelShaderGen.h"
+#include "VideoCommon/ShaderGenCommon.h"
 
 namespace GraphicsModActionData
 {
diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.cpp b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.cpp
index 3caaa999fd70..79f19fe3253d 100644
--- a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.cpp
+++ b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.cpp
@@ -18,8 +18,8 @@
 #include "VideoCommon/GraphicsModSystem/Config/GraphicsModAsset.h"
 #include "VideoCommon/GraphicsModSystem/Config/GraphicsModGroup.h"
 #include "VideoCommon/GraphicsModSystem/Runtime/GraphicsModActionFactory.h"
-#include "VideoCommon/TextureInfo.h"
 #include "VideoCommon/VideoConfig.h"
+#include "VideoCommon/VideoEvents.h"
 
 std::unique_ptr<GraphicsModManager> g_graphics_mod_manager;
 
diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.h b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.h
index 2d67b4db7658..98c121fc5ea4 100644
--- a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.h
+++ b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.h
@@ -10,10 +10,10 @@
 #include <unordered_set>
 #include <vector>
 
+#include "Common/HookableEvent.h"
+
 #include "VideoCommon/GraphicsModSystem/Runtime/FBInfo.h"
 #include "VideoCommon/GraphicsModSystem/Runtime/GraphicsModAction.h"
-#include "VideoCommon/TextureInfo.h"
-#include "VideoCommon/VideoEvents.h"
 #include "VideoCommon/XFMemory.h"
 
 class GraphicsModGroupConfig;
diff --git a/Source/Core/VideoCommon/HiresTextures.cpp b/Source/Core/VideoCommon/HiresTextures.cpp
index 8acc3aff039d..1e423a8aa697 100644
--- a/Source/Core/VideoCommon/HiresTextures.cpp
+++ b/Source/Core/VideoCommon/HiresTextures.cpp
@@ -3,15 +3,11 @@
 
 #include "VideoCommon/HiresTextures.h"
 
-#include <algorithm>
 #include <memory>
-#include <mutex>
 #include <string>
 #include <string_view>
-#include <thread>
 #include <unordered_map>
 #include <utility>
-#include <vector>
 #include <xxhash.h>
 
 #include <fmt/format.h>
@@ -21,12 +17,11 @@
 #include "Common/FileUtil.h"
 #include "Common/Logging/Log.h"
 #include "Common/StringUtil.h"
-#include "Core/Config/GraphicsSettings.h"
 #include "Core/ConfigManager.h"
 #include "Core/System.h"
-#include "VideoCommon/Assets/CustomAsset.h"
 #include "VideoCommon/Assets/DirectFilesystemAssetLibrary.h"
 #include "VideoCommon/OnScreenDisplay.h"
+#include "VideoCommon/Resources/CustomResourceManager.h"
 #include "VideoCommon/VideoConfig.h"
 
 constexpr std::string_view s_format_prefix{"tex1_"};
@@ -92,7 +87,7 @@ void HiresTexture::Update()
   const std::string& game_id = SConfig::GetInstance().GetGameID();
   const std::set<std::string> texture_directories =
       GetTextureDirectoriesWithGameId(File::GetUserPath(D_HIRESTEXTURES_IDX), game_id);
-  const std::vector<std::string> extensions{".png", ".dds"};
+  constexpr auto extensions = std::to_array<std::string_view>({".png", ".dds"});
 
   for (const auto& texture_directory : texture_directories)
   {
@@ -100,7 +95,7 @@ void HiresTexture::Update()
     s_file_library->Watch(texture_directory);
 
     const auto texture_paths =
-        Common::DoFileSearch({texture_directory}, extensions, /*recursive*/ true);
+        Common::DoFileSearch(texture_directory, extensions, /*recursive*/ true);
 
     bool failed_insert = false;
     for (auto& path : texture_paths)
@@ -191,7 +186,7 @@ HiresTexture::HiresTexture(bool has_arbitrary_mipmaps, std::string id)
 {
 }
 
-VideoCommon::CustomResourceManager::TextureTimePair HiresTexture::LoadTexture() const
+VideoCommon::TextureDataResource* HiresTexture::LoadTexture() const
 {
   auto& system = Core::System::GetInstance();
   auto& custom_resource_manager = system.GetCustomResourceManager();
@@ -226,7 +221,7 @@ std::set<std::string> GetTextureDirectoriesWithGameId(const std::string& root_di
   };
 
   // Look for any other directories that might be specific to the given gameid
-  const auto files = Common::DoFileSearch({root_directory}, {".txt"}, true);
+  const auto files = Common::DoFileSearch(root_directory, ".txt", true);
   for (const auto& file : files)
   {
     if (match_gameid_or_all(file))
diff --git a/Source/Core/VideoCommon/HiresTextures.h b/Source/Core/VideoCommon/HiresTextures.h
index e99a3fc966f7..f577aebd786e 100644
--- a/Source/Core/VideoCommon/HiresTextures.h
+++ b/Source/Core/VideoCommon/HiresTextures.h
@@ -8,12 +8,13 @@
 #include <string>
 #include <vector>
 
-#include "Common/CommonTypes.h"
-#include "VideoCommon/Assets/CustomResourceManager.h"
-#include "VideoCommon/Assets/CustomTextureData.h"
-#include "VideoCommon/TextureConfig.h"
 #include "VideoCommon/TextureInfo.h"
 
+namespace VideoCommon
+{
+class TextureDataResource;
+}
+
 enum class TextureFormat;
 
 std::set<std::string> GetTextureDirectoriesWithGameId(const std::string& root_directory,
@@ -30,7 +31,7 @@ class HiresTexture
   HiresTexture(bool has_arbitrary_mipmaps, std::string id);
 
   bool HasArbitraryMipmaps() const { return m_has_arbitrary_mipmaps; }
-  VideoCommon::CustomResourceManager::TextureTimePair LoadTexture() const;
+  VideoCommon::TextureDataResource* LoadTexture() const;
   const std::string& GetId() const { return m_id; }
 
 private:
diff --git a/Source/Core/VideoCommon/IndexGenerator.cpp b/Source/Core/VideoCommon/IndexGenerator.cpp
index 91db42095001..4decd2b4103e 100644
--- a/Source/Core/VideoCommon/IndexGenerator.cpp
+++ b/Source/Core/VideoCommon/IndexGenerator.cpp
@@ -3,8 +3,6 @@
 
 #include "VideoCommon/IndexGenerator.h"
 
-#include <array>
-#include <cstddef>
 #include <cstring>
 
 #include "Common/CommonTypes.h"
diff --git a/Source/Core/VideoCommon/LightingShaderGen.cpp b/Source/Core/VideoCommon/LightingShaderGen.cpp
index be9d10c78ac1..6c515b763247 100644
--- a/Source/Core/VideoCommon/LightingShaderGen.cpp
+++ b/Source/Core/VideoCommon/LightingShaderGen.cpp
@@ -6,7 +6,6 @@
 #include "Common/Assert.h"
 #include "Common/CommonTypes.h"
 
-#include "VideoCommon/NativeVertexFormat.h"
 #include "VideoCommon/ShaderGenCommon.h"
 #include "VideoCommon/XFMemory.h"
 
diff --git a/Source/Core/VideoCommon/OpcodeDecoding.cpp b/Source/Core/VideoCommon/OpcodeDecoding.cpp
index 768356aea8a9..fc6f896cd703 100644
--- a/Source/Core/VideoCommon/OpcodeDecoding.cpp
+++ b/Source/Core/VideoCommon/OpcodeDecoding.cpp
@@ -29,7 +29,6 @@
 #include "VideoCommon/VertexLoaderManager.h"
 #include "VideoCommon/XFMemory.h"
 #include "VideoCommon/XFStateManager.h"
-#include "VideoCommon/XFStructs.h"
 
 namespace OpcodeDecoder
 {
diff --git a/Source/Core/VideoCommon/PerformanceTracker.cpp b/Source/Core/VideoCommon/PerformanceTracker.cpp
index 7113f388d192..725d6b26e31e 100644
--- a/Source/Core/VideoCommon/PerformanceTracker.cpp
+++ b/Source/Core/VideoCommon/PerformanceTracker.cpp
@@ -12,7 +12,6 @@
 #include "Common/CommonTypes.h"
 #include "Common/FileUtil.h"
 #include "Common/MathUtil.h"
-#include "Core/Core.h"
 #include "VideoCommon/VideoConfig.h"
 
 static constexpr double SAMPLE_RC_RATIO = 0.25;
diff --git a/Source/Core/VideoCommon/PipelineUtils.cpp b/Source/Core/VideoCommon/PipelineUtils.cpp
new file mode 100644
index 000000000000..40d9d08458b1
--- /dev/null
+++ b/Source/Core/VideoCommon/PipelineUtils.cpp
@@ -0,0 +1,171 @@
+// Copyright 2025 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "VideoCommon/PipelineUtils.h"
+
+#include "Common/Assert.h"
+#include "Common/Logging/Log.h"
+
+#include "VideoCommon/BPMemory.h"
+#include "VideoCommon/ConstantManager.h"
+#include "VideoCommon/DriverDetails.h"
+#include "VideoCommon/GeometryShaderGen.h"
+#include "VideoCommon/PixelShaderGen.h"
+#include "VideoCommon/RenderState.h"
+#include "VideoCommon/VertexShaderGen.h"
+#include "VideoCommon/VideoConfig.h"
+
+namespace VideoCommon
+{
+/// Edits the UID based on driver bugs and other special configurations
+GXPipelineUid ApplyDriverBugs(const GXPipelineUid& in)
+{
+  GXPipelineUid out;
+  // TODO: static_assert(std::is_trivially_copyable_v<GXPipelineUid>);
+  // GXPipelineUid is not trivially copyable because RasterizationState and BlendingState aren't
+  // either, but we can pretend it is for now. This will be improved after PR #10848 is finished.
+  memcpy(static_cast<void*>(&out), static_cast<const void*>(&in), sizeof(out));  // copy padding
+  pixel_shader_uid_data* ps = out.ps_uid.GetUidData();
+  BlendingState& blend = out.blending_state;
+
+  if (ps->ztest == EmulatedZ::ForcedEarly && !out.depth_state.update_enable)
+  {
+    // No need to force early depth test if you're not writing z
+    ps->ztest = EmulatedZ::Early;
+  }
+
+  // If framebuffer fetch is available, we can emulate logic ops in the fragment shader
+  // and don't need the below blend approximation
+  if (blend.logic_op_enable && !g_backend_info.bSupportsLogicOp &&
+      !g_backend_info.bSupportsFramebufferFetch)
+  {
+    if (!blend.LogicOpApproximationIsExact())
+      WARN_LOG_FMT(VIDEO,
+                   "Approximating logic op with blending, this will produce incorrect rendering.");
+    if (blend.LogicOpApproximationWantsShaderHelp())
+    {
+      ps->emulate_logic_op_with_blend = true;
+      ps->logic_op_mode = static_cast<u32>(blend.logic_mode.Value());
+    }
+    blend.ApproximateLogicOpWithBlending();
+  }
+
+  const bool benefits_from_ps_dual_source_off =
+      (!g_backend_info.bSupportsDualSourceBlend && g_backend_info.bSupportsFramebufferFetch) ||
+      DriverDetails::HasBug(DriverDetails::BUG_BROKEN_DUAL_SOURCE_BLENDING);
+  if (benefits_from_ps_dual_source_off && !blend.RequiresDualSrc())
+  {
+    // Only use dual-source blending when required on drivers that don't support it very well.
+    ps->no_dual_src = true;
+    blend.use_dual_src = false;
+  }
+
+  if (g_backend_info.bSupportsFramebufferFetch)
+  {
+    bool fbfetch_blend = false;
+    if ((DriverDetails::HasBug(DriverDetails::BUG_BROKEN_DISCARD_WITH_EARLY_Z) ||
+         !g_backend_info.bSupportsEarlyZ) &&
+        ps->ztest == EmulatedZ::ForcedEarly)
+    {
+      ps->ztest = EmulatedZ::EarlyWithFBFetch;
+      fbfetch_blend |= static_cast<bool>(out.blending_state.blend_enable);
+      ps->no_dual_src = true;
+    }
+    fbfetch_blend |= blend.logic_op_enable && !g_backend_info.bSupportsLogicOp;
+    fbfetch_blend |= blend.use_dual_src && !g_backend_info.bSupportsDualSourceBlend;
+    if (fbfetch_blend)
+    {
+      ps->no_dual_src = true;
+      if (blend.logic_op_enable)
+      {
+        ps->logic_op_enable = true;
+        ps->logic_op_mode = static_cast<u32>(blend.logic_mode.Value());
+        blend.logic_op_enable = false;
+      }
+      if (blend.blend_enable)
+      {
+        ps->blend_enable = true;
+        ps->blend_src_factor = blend.src_factor;
+        ps->blend_src_factor_alpha = blend.src_factor_alpha;
+        ps->blend_dst_factor = blend.dst_factor;
+        ps->blend_dst_factor_alpha = blend.dst_factor_alpha;
+        ps->blend_subtract = blend.subtract;
+        ps->blend_subtract_alpha = blend.subtract_alpha;
+        blend.blend_enable = false;
+      }
+    }
+  }
+
+  // force dual src off if we can't support it
+  if (!g_backend_info.bSupportsDualSourceBlend)
+  {
+    ps->no_dual_src = true;
+    blend.use_dual_src = false;
+  }
+
+  if (ps->ztest == EmulatedZ::ForcedEarly && !g_backend_info.bSupportsEarlyZ)
+  {
+    // These things should be false
+    ASSERT(!ps->zfreeze);
+    // ZCOMPLOC HACK:
+    // The only way to emulate alpha test + early-z is to force early-z in the shader.
+    // As this isn't available on all drivers and as we can't emulate this feature otherwise,
+    // we are only able to choose which one we want to respect more.
+    // Tests seem to have proven that writing depth even when the alpha test fails is more
+    // important that a reliable alpha test, so we just force the alpha test to always succeed.
+    // At least this seems to be less buggy.
+    ps->ztest = EmulatedZ::EarlyWithZComplocHack;
+  }
+
+  if (g_ActiveConfig.UseVSForLinePointExpand() &&
+      (out.rasterization_state.primitive == PrimitiveType::Points ||
+       out.rasterization_state.primitive == PrimitiveType::Lines))
+  {
+    // All primitives are expanded to triangles in the vertex shader
+    vertex_shader_uid_data* vs = out.vs_uid.GetUidData();
+    const PortableVertexDeclaration& decl = out.vertex_format->GetVertexDeclaration();
+    vs->position_has_3_elems = decl.position.components >= 3;
+    vs->texcoord_elem_count = 0;
+    for (int i = 0; i < 8; i++)
+    {
+      if (decl.texcoords[i].enable)
+      {
+        ASSERT(decl.texcoords[i].components <= 3);
+        vs->texcoord_elem_count |= decl.texcoords[i].components << (i * 2);
+      }
+    }
+    out.vertex_format = nullptr;
+    if (out.rasterization_state.primitive == PrimitiveType::Points)
+      vs->vs_expand = VSExpand::Point;
+    else
+      vs->vs_expand = VSExpand::Line;
+    PrimitiveType prim = g_backend_info.bSupportsPrimitiveRestart ? PrimitiveType::TriangleStrip :
+                                                                    PrimitiveType::Triangles;
+    out.rasterization_state.primitive = prim;
+    out.gs_uid.GetUidData()->primitive_type = static_cast<u32>(prim);
+  }
+
+  return out;
+}
+
+std::size_t PipelineToHash(const GXPipelineUid& in)
+{
+  XXH3_state_t pipeline_hash_state;
+  XXH3_INITSTATE(&pipeline_hash_state);
+  XXH3_64bits_reset_withSeed(&pipeline_hash_state, static_cast<XXH64_hash_t>(1));
+  UpdateHashWithPipeline(in, &pipeline_hash_state);
+  return XXH3_64bits_digest(&pipeline_hash_state);
+}
+
+void UpdateHashWithPipeline(const GXPipelineUid& in, XXH3_state_t* hash_state)
+{
+  XXH3_64bits_update(hash_state, &in.vertex_format->GetVertexDeclaration(),
+                     sizeof(PortableVertexDeclaration));
+  XXH3_64bits_update(hash_state, &in.blending_state, sizeof(BlendingState));
+  XXH3_64bits_update(hash_state, &in.depth_state, sizeof(DepthState));
+  XXH3_64bits_update(hash_state, &in.rasterization_state, sizeof(RasterizationState));
+  XXH3_64bits_update(hash_state, &in.gs_uid, sizeof(GeometryShaderUid));
+  XXH3_64bits_update(hash_state, &in.ps_uid, sizeof(PixelShaderUid));
+  XXH3_64bits_update(hash_state, &in.vs_uid, sizeof(VertexShaderUid));
+}
+}  // namespace VideoCommon
diff --git a/Source/Core/VideoCommon/PipelineUtils.h b/Source/Core/VideoCommon/PipelineUtils.h
new file mode 100644
index 000000000000..4a9b7b169609
--- /dev/null
+++ b/Source/Core/VideoCommon/PipelineUtils.h
@@ -0,0 +1,22 @@
+// Copyright 2025 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <xxh3.h>
+
+#include "VideoCommon/GXPipelineTypes.h"
+
+namespace VideoCommon
+{
+GXPipelineUid ApplyDriverBugs(const GXPipelineUid& in);
+
+// Returns a hash of the pipeline, hashing the
+// vertex declarations instead of the native vertex format
+// object
+std::size_t PipelineToHash(const GXPipelineUid& in);
+
+// Updates an existing hash with the hash of the pipeline
+void UpdateHashWithPipeline(const GXPipelineUid& in, XXH3_state_t* hash_state);
+
+}  // namespace VideoCommon
diff --git a/Source/Core/VideoCommon/PixelShaderGen.cpp b/Source/Core/VideoCommon/PixelShaderGen.cpp
index f7b554a3fc6a..5ce120e9ff58 100644
--- a/Source/Core/VideoCommon/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/PixelShaderGen.cpp
@@ -3,11 +3,6 @@
 
 #include "VideoCommon/PixelShaderGen.h"
 
-#include <algorithm>
-#include <cmath>
-#include <cstdio>
-#include <fmt/format.h>
-
 #include "Common/Assert.h"
 #include "Common/CommonTypes.h"
 #include "Common/EnumMap.h"
@@ -16,9 +11,7 @@
 #include "VideoCommon/BoundingBox.h"
 #include "VideoCommon/DriverDetails.h"
 #include "VideoCommon/LightingShaderGen.h"
-#include "VideoCommon/NativeVertexFormat.h"
 #include "VideoCommon/RenderState.h"
-#include "VideoCommon/VertexLoaderManager.h"
 #include "VideoCommon/VideoCommon.h"
 #include "VideoCommon/VideoConfig.h"
 #include "VideoCommon/XFMemory.h"  // for texture projection mode
diff --git a/Source/Core/VideoCommon/PixelShaderManager.cpp b/Source/Core/VideoCommon/PixelShaderManager.cpp
index 950f07f5092d..d2bdadb9c842 100644
--- a/Source/Core/VideoCommon/PixelShaderManager.cpp
+++ b/Source/Core/VideoCommon/PixelShaderManager.cpp
@@ -16,7 +16,7 @@ void PixelShaderManager::Init()
 {
   constants = {};
 
-  // Init any intial constants which aren't zero when bpmem is zero.
+  // Init any initial constants which aren't zero when bpmem is zero.
   m_fog_range_adjusted_changed = true;
   m_viewport_changed = false;
 
@@ -51,9 +51,9 @@ void PixelShaderManager::Init()
     constants.konst[10][component] = 0;
     constants.konst[11][component] = 0;
 
-    // Annoyingly, alpha reads zero values for the .rgb colors (offically
+    // Annoyingly, alpha reads zero values for the .rgb colors (officially
     // defined as invalid)
-    // If it wasn't for this, we could just use one of the first 3 colunms
+    // If it wasn't for this, we could just use one of the first 3 columns
     // instead of
     // wasting an entire 4th column just for alpha.
     if (component == 3)
diff --git a/Source/Core/VideoCommon/PostProcessing.cpp b/Source/Core/VideoCommon/PostProcessing.cpp
index e1cc6e0e60ca..804c24eef6cd 100644
--- a/Source/Core/VideoCommon/PostProcessing.cpp
+++ b/Source/Core/VideoCommon/PostProcessing.cpp
@@ -24,7 +24,6 @@
 #include "VideoCommon/AbstractPipeline.h"
 #include "VideoCommon/AbstractShader.h"
 #include "VideoCommon/AbstractTexture.h"
-#include "VideoCommon/FramebufferManager.h"
 #include "VideoCommon/Present.h"
 #include "VideoCommon/ShaderCache.h"
 #include "VideoCommon/ShaderCompileUtils.h"
@@ -387,9 +386,9 @@ PostProcessing::~PostProcessing()
 static std::vector<std::string> GetShaders(const std::string& sub_dir = "")
 {
   std::vector<std::string> paths =
-      Common::DoFileSearch({File::GetUserPath(D_SHADERS_IDX) + sub_dir,
-                            File::GetSysDirectory() + SHADERS_DIR DIR_SEP + sub_dir},
-                           {".glsl"});
+      Common::DoFileSearch({{File::GetUserPath(D_SHADERS_IDX) + sub_dir,
+                             File::GetSysDirectory() + SHADERS_DIR DIR_SEP + sub_dir}},
+                           ".glsl");
   std::vector<std::string> result;
   for (std::string path : paths)
   {
@@ -908,7 +907,7 @@ void PostProcessing::FillUniformBuffer(const MathUtil::Rectangle<int>& src,
       g_ActiveConfig.color_correction.fSDRDisplayCustomGamma;
   // scRGB (RGBA16F) expects linear values as opposed to sRGB gamma
   builtin_uniforms.linear_space_output = m_framebuffer_format == AbstractTextureFormat::RGBA16F;
-  // Implies ouput values can be beyond the 0-1 range
+  // Implies output values can be beyond the 0-1 range
   builtin_uniforms.hdr_output = m_framebuffer_format == AbstractTextureFormat::RGBA16F;
   builtin_uniforms.hdr_paper_white_nits = g_ActiveConfig.color_correction.fHDRPaperWhiteNits;
   // A value of 1 1 1 usually matches 80 nits in HDR
diff --git a/Source/Core/VideoCommon/Present.cpp b/Source/Core/VideoCommon/Present.cpp
index ad7bc69a027f..a9571551bb18 100644
--- a/Source/Core/VideoCommon/Present.cpp
+++ b/Source/Core/VideoCommon/Present.cpp
@@ -103,8 +103,13 @@ static void TryToSnapToXFBSize(int& width, int& height, int xfb_width, int xfb_h
 
 Presenter::Presenter()
 {
+  auto& video_events = GetVideoEvents();
+
   m_config_changed =
-      GetVideoEvents().config_changed_event.Register([this](u32 bits) { ConfigChanged(bits); });
+      video_events.config_changed_event.Register([this](u32 bits) { ConfigChanged(bits); });
+
+  m_end_field_hook = video_events.vi_end_field_event.Register(
+      [this] { m_immediate_swap_happened_this_field.store(false, std::memory_order_relaxed); });
 }
 
 Presenter::~Presenter()
@@ -117,6 +122,8 @@ bool Presenter::Initialize()
 {
   UpdateDrawRectangle();
 
+  m_immediate_swap_happened_this_field.store(false, std::memory_order_relaxed);
+
   if (!g_gfx->IsHeadless())
   {
     SetBackbuffer(g_gfx->GetSurfaceInfo());
@@ -230,6 +237,12 @@ void Presenter::ViSwap(u32 xfb_addr, u32 fb_width, u32 fb_stride, u32 fb_height,
 
 void Presenter::ImmediateSwap(u32 xfb_addr, u32 fb_width, u32 fb_stride, u32 fb_height)
 {
+  if (m_immediate_swap_happened_this_field.exchange(true, std::memory_order_relaxed) &&
+      Config::Get(Config::GFX_HACK_CAP_IMMEDIATE_XFB))
+  {
+    return;
+  }
+
   const u64 ticks = m_next_swap_estimated_ticks;
 
   FetchXFB(xfb_addr, fb_width, fb_stride, fb_height, ticks);
@@ -631,7 +644,7 @@ std::tuple<float, float> Presenter::ApplyStandardAspectCrop(float width, float h
   // For the custom (relative) case, we want to crop from the native aspect ratio
   // to the specific target one, as they likely have a small difference
   case AspectMode::Custom:
-  // There should be no cropping needed in the custom strech case,
+  // There should be no cropping needed in the custom stretch case,
   // as output should always exactly match the target aspect ratio
   case AspectMode::CustomStretch:
     expected_aspect = g_ActiveConfig.GetCustomAspectRatio();
@@ -1006,6 +1019,8 @@ void Presenter::DoState(PointerWrap& p)
     m_next_swap_estimated_ticks = m_last_xfb_ticks;
     m_next_swap_estimated_time = Clock::now();
 
+    m_immediate_swap_happened_this_field.store(false, std::memory_order_relaxed);
+
 #ifdef __LIBRETRO__
     if (g_video_backend && g_video_backend->GetConfigName() != "OGL")
 #endif
diff --git a/Source/Core/VideoCommon/Present.h b/Source/Core/VideoCommon/Present.h
index 0fb3e89d923e..54610bb17f27 100644
--- a/Source/Core/VideoCommon/Present.h
+++ b/Source/Core/VideoCommon/Present.h
@@ -172,6 +172,7 @@ class Presenter
   u32 m_last_xfb_height = MAX_XFB_HEIGHT;
 
   Common::EventHook m_config_changed;
+  Common::EventHook m_end_field_hook;
 
   // Updates state for the SmoothEarlyPresentation setting if enabled.
   // Returns the desired presentation time regardless.
@@ -184,6 +185,8 @@ class Presenter
   // Can be used for presentation of ImmediateXFB swaps which don't have timing information.
   u64 m_next_swap_estimated_ticks = 0;
   TimePoint m_next_swap_estimated_time{Clock::now()};
+
+  std::atomic_bool m_immediate_swap_happened_this_field{};
 };
 
 }  // namespace VideoCommon
diff --git a/Source/Core/VideoCommon/RenderState.cpp b/Source/Core/VideoCommon/RenderState.cpp
index 0276c6da08b1..47fb5d7a0310 100644
--- a/Source/Core/VideoCommon/RenderState.cpp
+++ b/Source/Core/VideoCommon/RenderState.cpp
@@ -76,7 +76,7 @@ static DstBlendFactor RemoveDstAlphaUsage(DstBlendFactor factor)
 }
 
 // We separate the blending parameter for rgb and alpha. For blending
-// the alpha component, CLR and ALPHA are indentical. So just always
+// the alpha component, CLR and ALPHA are identical. So just always
 // use ALPHA as this makes it easier for the backends to use the second
 // alpha value of dual source blending.
 static DstBlendFactor RemoveSrcColorUsage(DstBlendFactor factor)
diff --git a/Source/Core/VideoCommon/Resources/CustomResourceManager.cpp b/Source/Core/VideoCommon/Resources/CustomResourceManager.cpp
new file mode 100644
index 000000000000..ffb16b055a43
--- /dev/null
+++ b/Source/Core/VideoCommon/Resources/CustomResourceManager.cpp
@@ -0,0 +1,165 @@
+// Copyright 2025 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "VideoCommon/Resources/CustomResourceManager.h"
+
+#include "VideoCommon/AbstractGfx.h"
+#include "VideoCommon/PipelineUtils.h"
+#include "VideoCommon/Resources/InvalidTextures.h"
+#include "VideoCommon/VideoEvents.h"
+
+namespace VideoCommon
+{
+void CustomResourceManager::Initialize()
+{
+  m_asset_cache.Initialize();
+  m_worker_thread.Reset("resource-worker");
+  m_host_config.bits = ShaderHostConfig::GetCurrent().bits;
+  m_async_shader_compiler = g_gfx->CreateAsyncShaderCompiler();
+
+  m_async_shader_compiler->StartWorkerThreads(1);  // TODO expose to config
+
+  m_xfb_event =
+      GetVideoEvents().after_frame_event.Register([this](Core::System&) { XFBTriggered(); });
+
+  m_invalid_array_texture = CreateInvalidArrayTexture();
+  m_invalid_color_texture = CreateInvalidColorTexture();
+  m_invalid_cubemap_texture = CreateInvalidCubemapTexture();
+  m_invalid_transparent_texture = CreateInvalidTransparentTexture();
+}
+
+void CustomResourceManager::Shutdown()
+{
+  if (m_async_shader_compiler)
+  {
+    m_async_shader_compiler->StopWorkerThreads();
+    m_async_shader_compiler->ClearAllWork();
+  }
+
+  m_asset_cache.Shutdown();
+  m_worker_thread.Shutdown();
+  Reset();
+}
+
+void CustomResourceManager::Reset()
+{
+  m_material_resources.clear();
+  m_shader_resources.clear();
+  m_texture_data_resources.clear();
+  m_texture_sampler_resources.clear();
+
+  m_invalid_transparent_texture.reset();
+  m_invalid_color_texture.reset();
+  m_invalid_cubemap_texture.reset();
+  m_invalid_array_texture.reset();
+
+  m_asset_cache.Reset();
+  m_texture_pool.Reset();
+  m_worker_thread.Reset("resource-worker");
+}
+
+void CustomResourceManager::MarkAssetDirty(const CustomAssetLibrary::AssetID& asset_id)
+{
+  m_asset_cache.MarkAssetDirty(asset_id);
+}
+
+void CustomResourceManager::XFBTriggered()
+{
+  m_asset_cache.Update();
+}
+
+void CustomResourceManager::SetHostConfig(const ShaderHostConfig& host_config)
+{
+  for (auto& [id, shader_resources] : m_shader_resources)
+  {
+    for (auto& [key, shader_resource] : shader_resources)
+    {
+      shader_resource->SetHostConfig(host_config);
+
+      // Hack to get access to resource internals
+      Resource* resource = shader_resource.get();
+
+      // Tell shader and references to trigger a reload
+      // on next usage
+      resource->NotifyAssetChanged(false);
+    }
+  }
+
+  m_host_config.bits = host_config.bits;
+}
+
+TextureDataResource* CustomResourceManager::GetTextureDataFromAsset(
+    const CustomAssetLibrary::AssetID& asset_id,
+    std::shared_ptr<VideoCommon::CustomAssetLibrary> library)
+{
+  auto& resource = m_texture_data_resources[asset_id];
+  if (resource == nullptr)
+  {
+    resource =
+        std::make_unique<TextureDataResource>(CreateResourceContext(asset_id, std::move(library)));
+  }
+  resource->Process();
+  return resource.get();
+}
+
+MaterialResource* CustomResourceManager::GetMaterialFromAsset(
+    const CustomAssetLibrary::AssetID& asset_id, const GXPipelineUid& pipeline_uid,
+    std::shared_ptr<VideoCommon::CustomAssetLibrary> library)
+{
+  auto& resource = m_material_resources[asset_id][PipelineToHash(pipeline_uid)];
+  if (resource == nullptr)
+  {
+    resource = std::make_unique<MaterialResource>(
+        CreateResourceContext(asset_id, std::move(library)), pipeline_uid);
+  }
+  resource->Process();
+  return resource.get();
+}
+
+ShaderResource*
+CustomResourceManager::GetShaderFromAsset(const CustomAssetLibrary::AssetID& asset_id,
+                                          std::size_t shader_key, const GXPipelineUid& pipeline_uid,
+                                          const std::string& preprocessor_settings,
+                                          std::shared_ptr<VideoCommon::CustomAssetLibrary> library)
+{
+  auto& resource = m_shader_resources[asset_id][shader_key];
+  if (resource == nullptr)
+  {
+    resource = std::make_unique<ShaderResource>(CreateResourceContext(asset_id, std::move(library)),
+                                                pipeline_uid, preprocessor_settings, m_host_config);
+  }
+  resource->Process();
+  return resource.get();
+}
+
+TextureAndSamplerResource* CustomResourceManager::GetTextureAndSamplerFromAsset(
+    const CustomAssetLibrary::AssetID& asset_id,
+    std::shared_ptr<VideoCommon::CustomAssetLibrary> library)
+{
+  auto& resource = m_texture_sampler_resources[asset_id];
+  if (resource == nullptr)
+  {
+    resource = std::make_unique<TextureAndSamplerResource>(
+        CreateResourceContext(asset_id, std::move(library)));
+  }
+  resource->Process();
+  return resource.get();
+}
+
+Resource::ResourceContext CustomResourceManager::CreateResourceContext(
+    const CustomAssetLibrary::AssetID& asset_id,
+    std::shared_ptr<VideoCommon::CustomAssetLibrary> library)
+{
+  return Resource::ResourceContext{asset_id,
+                                   std::move(library),
+                                   &m_asset_cache,
+                                   this,
+                                   &m_texture_pool,
+                                   &m_worker_thread,
+                                   m_async_shader_compiler.get(),
+                                   m_invalid_array_texture.get(),
+                                   m_invalid_color_texture.get(),
+                                   m_invalid_cubemap_texture.get(),
+                                   m_invalid_transparent_texture.get()};
+}
+}  // namespace VideoCommon
diff --git a/Source/Core/VideoCommon/Resources/CustomResourceManager.h b/Source/Core/VideoCommon/Resources/CustomResourceManager.h
new file mode 100644
index 000000000000..04eaa4694254
--- /dev/null
+++ b/Source/Core/VideoCommon/Resources/CustomResourceManager.h
@@ -0,0 +1,82 @@
+// Copyright 2025 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <map>
+#include <memory>
+
+#include "Common/HookableEvent.h"
+#include "Common/WorkQueueThread.h"
+
+#include "VideoCommon/AbstractTexture.h"
+#include "VideoCommon/Assets/CustomAssetCache.h"
+#include "VideoCommon/AsyncShaderCompiler.h"
+#include "VideoCommon/Resources/MaterialResource.h"
+#include "VideoCommon/Resources/ShaderResource.h"
+#include "VideoCommon/Resources/TextureAndSamplerResource.h"
+#include "VideoCommon/Resources/TextureDataResource.h"
+#include "VideoCommon/Resources/TexturePool.h"
+
+namespace VideoCommon
+{
+class CustomResourceManager
+{
+public:
+  void Initialize();
+  void Shutdown();
+
+  void Reset();
+
+  // Request that an asset be reloaded
+  void MarkAssetDirty(const CustomAssetLibrary::AssetID& asset_id);
+
+  void XFBTriggered();
+  void SetHostConfig(const ShaderHostConfig& host_config);
+
+  TextureDataResource*
+  GetTextureDataFromAsset(const CustomAssetLibrary::AssetID& asset_id,
+                          std::shared_ptr<VideoCommon::CustomAssetLibrary> library);
+  MaterialResource* GetMaterialFromAsset(const CustomAssetLibrary::AssetID& asset_id,
+                                         const GXPipelineUid& pipeline_uid,
+                                         std::shared_ptr<VideoCommon::CustomAssetLibrary> library);
+
+  ShaderResource* GetShaderFromAsset(const CustomAssetLibrary::AssetID& asset_id,
+                                     std::size_t shader_key, const GXPipelineUid& pipeline_uid,
+                                     const std::string& preprocessor_settings,
+                                     std::shared_ptr<VideoCommon::CustomAssetLibrary> library);
+  TextureAndSamplerResource*
+  GetTextureAndSamplerFromAsset(const CustomAssetLibrary::AssetID& asset_id,
+                                std::shared_ptr<VideoCommon::CustomAssetLibrary> library);
+
+private:
+  Resource::ResourceContext
+  CreateResourceContext(const CustomAssetLibrary::AssetID& asset_id,
+                        std::shared_ptr<VideoCommon::CustomAssetLibrary> library);
+  CustomAssetCache m_asset_cache;
+  TexturePool m_texture_pool;
+  Common::AsyncWorkThreadSP m_worker_thread;
+  std::unique_ptr<AsyncShaderCompiler> m_async_shader_compiler;
+
+  using PipelineIdToMaterial = std::map<std::size_t, std::unique_ptr<MaterialResource>>;
+  std::map<CustomAssetLibrary::AssetID, PipelineIdToMaterial> m_material_resources;
+
+  using ShaderKeyToShader = std::map<std::size_t, std::unique_ptr<ShaderResource>>;
+  std::map<CustomAssetLibrary::AssetID, ShaderKeyToShader> m_shader_resources;
+
+  std::map<CustomAssetLibrary::AssetID, std::unique_ptr<TextureDataResource>>
+      m_texture_data_resources;
+
+  std::map<CustomAssetLibrary::AssetID, std::unique_ptr<TextureAndSamplerResource>>
+      m_texture_sampler_resources;
+
+  ShaderHostConfig m_host_config;
+
+  Common::EventHook m_xfb_event;
+
+  std::unique_ptr<AbstractTexture> m_invalid_transparent_texture;
+  std::unique_ptr<AbstractTexture> m_invalid_color_texture;
+  std::unique_ptr<AbstractTexture> m_invalid_cubemap_texture;
+  std::unique_ptr<AbstractTexture> m_invalid_array_texture;
+};
+}  // namespace VideoCommon
diff --git a/Source/Core/VideoCommon/Resources/InvalidTextures.cpp b/Source/Core/VideoCommon/Resources/InvalidTextures.cpp
new file mode 100644
index 000000000000..b27630660e93
--- /dev/null
+++ b/Source/Core/VideoCommon/Resources/InvalidTextures.cpp
@@ -0,0 +1,58 @@
+// Copyright 2025 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "VideoCommon/Resources/InvalidTextures.h"
+
+#include "VideoCommon/AbstractGfx.h"
+#include "VideoCommon/TextureConfig.h"
+
+namespace VideoCommon
+{
+std::unique_ptr<AbstractTexture> CreateInvalidTransparentTexture()
+{
+  const TextureConfig tex_config{
+      1, 1, 1, 1, 1, AbstractTextureFormat::RGBA8, 0, AbstractTextureType::Texture_2D};
+  auto texture = g_gfx->CreateTexture(tex_config, "Invalid Transparent Texture");
+  const std::array<u8, 4> pixel{0, 0, 0, 0};
+  texture->Load(0, 1, 1, 1, pixel.data(), pixel.size());
+  return texture;
+}
+
+std::unique_ptr<AbstractTexture> CreateInvalidColorTexture()
+{
+  const TextureConfig tex_config{
+      1, 1, 1, 1, 1, AbstractTextureFormat::RGBA8, 0, AbstractTextureType::Texture_2D};
+  auto texture = g_gfx->CreateTexture(tex_config, "Invalid Color Texture");
+  const std::array<u8, 4> pixel{255, 0, 255, 255};
+  texture->Load(0, 1, 1, 1, pixel.data(), pixel.size());
+  return texture;
+}
+
+std::unique_ptr<AbstractTexture> CreateInvalidCubemapTexture()
+{
+#ifdef __APPLE__
+  // TODO: figure out cube map oddness on Apple (specifically Metal)
+  return nullptr;
+#else
+  const TextureConfig tex_config{
+      1, 1, 1, 6, 1, AbstractTextureFormat::RGBA8, 0, AbstractTextureType::Texture_CubeMap};
+  auto texture = g_gfx->CreateTexture(tex_config, "Invalid Cubemap Texture");
+  const std::array<u8, 4> pixel{255, 0, 255, 255};
+  for (u32 i = 0; i < tex_config.layers; i++)
+  {
+    texture->Load(0, tex_config.width, tex_config.height, 1, pixel.data(), pixel.size(), i);
+  }
+  return texture;
+#endif
+}
+
+std::unique_ptr<AbstractTexture> CreateInvalidArrayTexture()
+{
+  const TextureConfig tex_config{
+      1, 1, 1, 1, 1, AbstractTextureFormat::RGBA8, 0, AbstractTextureType::Texture_2DArray};
+  auto texture = g_gfx->CreateTexture(tex_config, "Invalid Array Texture");
+  const std::array<u8, 4> pixel{255, 0, 255, 255};
+  texture->Load(0, 1, 1, 1, pixel.data(), pixel.size());
+  return texture;
+}
+}  // namespace VideoCommon
diff --git a/Source/Core/VideoCommon/Resources/InvalidTextures.h b/Source/Core/VideoCommon/Resources/InvalidTextures.h
new file mode 100644
index 000000000000..532f7e010265
--- /dev/null
+++ b/Source/Core/VideoCommon/Resources/InvalidTextures.h
@@ -0,0 +1,16 @@
+// Copyright 2025 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <memory>
+
+#include "VideoCommon/AbstractTexture.h"
+
+namespace VideoCommon
+{
+std::unique_ptr<AbstractTexture> CreateInvalidTransparentTexture();
+std::unique_ptr<AbstractTexture> CreateInvalidColorTexture();
+std::unique_ptr<AbstractTexture> CreateInvalidCubemapTexture();
+std::unique_ptr<AbstractTexture> CreateInvalidArrayTexture();
+}  // namespace VideoCommon
diff --git a/Source/Core/VideoCommon/Resources/MaterialResource.cpp b/Source/Core/VideoCommon/Resources/MaterialResource.cpp
new file mode 100644
index 000000000000..38486d793221
--- /dev/null
+++ b/Source/Core/VideoCommon/Resources/MaterialResource.cpp
@@ -0,0 +1,387 @@
+// Copyright 2025 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "VideoCommon/Resources/MaterialResource.h"
+
+#include <utility>
+
+#include <xxh3.h>
+
+#include "Common/VariantUtil.h"
+
+#include "VideoCommon/AbstractGfx.h"
+#include "VideoCommon/Assets/CustomAssetCache.h"
+#include "VideoCommon/AsyncShaderCompiler.h"
+#include "VideoCommon/FramebufferManager.h"
+#include "VideoCommon/PipelineUtils.h"
+#include "VideoCommon/Resources/CustomResourceManager.h"
+#include "VideoCommon/VideoConfig.h"
+
+namespace
+{
+// TODO: absorb this with TextureCacheBase
+bool IsAnisotropicEnhancementSafe(const SamplerState::TM0& tm0)
+{
+  return !(tm0.min_filter == FilterMode::Near && tm0.mag_filter == FilterMode::Near);
+}
+
+// TODO: absorb this with TextureCacheBase
+SamplerState CalculateSamplerAnisotropy(const SamplerState& initial_sampler)
+{
+  SamplerState state = initial_sampler;
+  if (g_ActiveConfig.iMaxAnisotropy != AnisotropicFilteringMode::Default &&
+      IsAnisotropicEnhancementSafe(state.tm0))
+  {
+    state.tm0.anisotropic_filtering = std::to_underlying(g_ActiveConfig.iMaxAnisotropy);
+  }
+
+  if (state.tm0.anisotropic_filtering != 0)
+  {
+    // https://www.opengl.org/registry/specs/EXT/texture_filter_anisotropic.txt
+    // For predictable results on all hardware/drivers, only use one of:
+    //	GL_LINEAR + GL_LINEAR (No Mipmaps [Bilinear])
+    //	GL_LINEAR + GL_LINEAR_MIPMAP_LINEAR (w/ Mipmaps [Trilinear])
+    // Letting the game set other combinations will have varying arbitrary results;
+    // possibly being interpreted as equal to bilinear/trilinear, implicitly
+    // disabling anisotropy, or changing the anisotropic algorithm employed.
+    state.tm0.min_filter = FilterMode::Linear;
+    state.tm0.mag_filter = FilterMode::Linear;
+    state.tm0.mipmap_filter = FilterMode::Linear;
+  }
+  return state;
+}
+}  // namespace
+
+namespace VideoCommon
+{
+MaterialResource::MaterialResource(Resource::ResourceContext resource_context,
+                                   const GXPipelineUid& pipeline_uid)
+    : Resource(std::move(resource_context)), m_uid(pipeline_uid)
+{
+  m_material_asset = m_resource_context.asset_cache->CreateAsset<MaterialAsset>(
+      m_resource_context.primary_asset_id, m_resource_context.asset_library, this);
+  m_uid_vertex_format_copy =
+      g_gfx->CreateNativeVertexFormat(m_uid.vertex_format->GetVertexDeclaration());
+  m_uid.vertex_format = m_uid_vertex_format_copy.get();
+}
+
+void MaterialResource::ResetData()
+{
+  if (m_current_data)
+  {
+    m_current_data->m_shader_resource->RemoveReference(this);
+    for (const auto& texture_like_resource : m_current_data->m_texture_like_resources)
+    {
+      if (texture_like_resource)
+        texture_like_resource->RemoveReference(this);
+    }
+    if (m_current_data->m_next_material)
+      m_current_data->m_next_material->RemoveReference(this);
+  }
+  m_load_data = std::make_shared<Data>();
+  m_processing_load_data = false;
+}
+
+Resource::TaskComplete MaterialResource::CollectPrimaryData()
+{
+  const auto material_data = m_material_asset->GetData();
+  if (!material_data) [[unlikely]]
+  {
+    return Resource::TaskComplete::No;
+  }
+  m_load_data->m_material_data = material_data;
+
+  // A shader asset is required to function
+  if (m_load_data->m_material_data->shader_asset == "")
+  {
+    return Resource::TaskComplete::Error;
+  }
+
+  CreateTextureData(m_load_data.get());
+  SetShaderKey(m_load_data.get(), &m_uid);
+
+  return Resource::TaskComplete::Yes;
+}
+
+Resource::TaskComplete MaterialResource::CollectDependencyData()
+{
+  bool loaded = true;
+  {
+    auto* const shader_resource = m_resource_context.resource_manager->GetShaderFromAsset(
+        m_load_data->m_material_data->shader_asset, m_load_data->m_shader_key, m_uid,
+        m_load_data->m_preprocessor_settings, m_resource_context.asset_library);
+    shader_resource->AddReference(this);
+    m_load_data->m_shader_resource = shader_resource;
+    const auto data_processed = shader_resource->IsDataProcessed();
+    if (data_processed == TaskComplete::Error)
+      return TaskComplete::Error;
+
+    loaded &= data_processed == TaskComplete::Yes;
+  }
+
+  for (std::size_t i = 0; i < m_load_data->m_material_data->textures.size(); i++)
+  {
+    const auto& texture_and_sampler = m_load_data->m_material_data->textures[i];
+    if (texture_and_sampler.asset == "")
+      continue;
+
+    const auto texture = m_resource_context.resource_manager->GetTextureAndSamplerFromAsset(
+        texture_and_sampler.asset, m_resource_context.asset_library);
+    m_load_data->m_texture_like_resources[i] = texture;
+    m_load_data->m_texture_like_data[i] = texture->GetData();
+    texture->AddReference(this);
+
+    const auto data_processed = texture->IsDataProcessed();
+    if (data_processed == TaskComplete::Error)
+      return TaskComplete::Error;
+
+    loaded &= data_processed == TaskComplete::Yes;
+  }
+
+  if (m_load_data->m_material_data->next_material_asset != "")
+  {
+    m_load_data->m_next_material = m_resource_context.resource_manager->GetMaterialFromAsset(
+        m_load_data->m_material_data->next_material_asset, m_uid, m_resource_context.asset_library);
+    m_load_data->m_next_material->AddReference(this);
+    const auto data_processed = m_load_data->m_next_material->IsDataProcessed();
+    if (data_processed == TaskComplete::Error)
+      return TaskComplete::Error;
+
+    loaded &= data_processed == TaskComplete::Yes;
+  }
+
+  return loaded ? TaskComplete::Yes : TaskComplete::No;
+}
+
+Resource::TaskComplete MaterialResource::ProcessData()
+{
+  auto shader_data = m_load_data->m_shader_resource->GetData();
+
+  if (!shader_data) [[unlikely]]
+    return Resource::TaskComplete::Error;
+
+  for (std::size_t i = 0; i < m_load_data->m_texture_like_data.size(); i++)
+  {
+    auto& texture_like_reference = m_load_data->m_texture_like_references[i];
+    const auto& texture_and_sampler = m_load_data->m_material_data->textures[i];
+
+    // If the texture doesn't exist, use one of the placeholders
+    if (texture_and_sampler.asset == "")
+    {
+      const auto texture_type = shader_data->GetTextureType(i);
+      if (texture_type == AbstractTextureType::Texture_2D)
+        texture_like_reference.texture = m_resource_context.invalid_color_texture;
+      else if (texture_type == AbstractTextureType::Texture_2DArray)
+        texture_like_reference.texture = m_resource_context.invalid_array_texture;
+      else if (texture_type == AbstractTextureType::Texture_CubeMap)
+        texture_like_reference.texture = m_resource_context.invalid_cubemap_texture;
+
+      if (texture_like_reference.texture == nullptr)
+      {
+        PanicAlertFmt("Invalid texture (texture_type={}) is not found during material "
+                      "resource processing (asset_id={})",
+                      texture_type, m_resource_context.primary_asset_id);
+      }
+
+      continue;
+    }
+
+    auto& texture_like_data = m_load_data->m_texture_like_data[i];
+
+    std::visit(overloaded{[&](const std::shared_ptr<TextureAndSamplerResource::Data>& data) {
+                 texture_like_reference.texture = data->GetTexture();
+                 texture_like_reference.sampler = CalculateSamplerAnisotropy(data->GetSampler());
+                 ;
+               }},
+               texture_like_data);
+  }
+
+  class WorkItem final : public VideoCommon::AsyncShaderCompiler::WorkItem
+  {
+  public:
+    WorkItem(std::shared_ptr<MaterialResource::Data> material_resource_data,
+             std::shared_ptr<ShaderResource::Data> shader_resource_data,
+             VideoCommon::GXPipelineUid* uid, FramebufferState frame_buffer_state)
+        : m_material_resource_data(std::move(material_resource_data)),
+          m_shader_resource_data(std::move(shader_resource_data)), m_uid(uid),
+          m_frame_buffer_state(frame_buffer_state)
+    {
+    }
+
+    bool Compile() override
+    {
+      // Sanity check
+      if (!m_shader_resource_data->IsCompiled())
+      {
+        m_material_resource_data->m_processing_finished = true;
+        return false;
+      }
+
+      AbstractPipelineConfig config;
+      config.vertex_shader = m_shader_resource_data->GetVertexShader();
+      config.pixel_shader = m_shader_resource_data->GetPixelShader();
+      config.geometry_shader = m_shader_resource_data->GetGeometryShader();
+
+      const auto actual_uid = ApplyDriverBugs(*m_uid);
+
+      if (m_material_resource_data->m_material_data->blending_state)
+        config.blending_state = *m_material_resource_data->m_material_data->blending_state;
+      else
+        config.blending_state = actual_uid.blending_state;
+
+      if (m_material_resource_data->m_material_data->depth_state)
+        config.depth_state = *m_material_resource_data->m_material_data->depth_state;
+      else
+        config.depth_state = actual_uid.depth_state;
+
+      config.framebuffer_state = std::move(m_frame_buffer_state);
+      config.framebuffer_state.additional_color_attachment_count = 0;
+
+      config.rasterization_state = actual_uid.rasterization_state;
+      if (m_material_resource_data->m_material_data->cull_mode)
+      {
+        config.rasterization_state.cull_mode =
+            *m_material_resource_data->m_material_data->cull_mode;
+      }
+
+      config.vertex_format = actual_uid.vertex_format;
+      config.usage = AbstractPipelineUsage::GX;
+
+      m_material_resource_data->m_pipeline = g_gfx->CreatePipeline(config);
+
+      if (m_material_resource_data->m_pipeline)
+      {
+        WriteUniforms(m_material_resource_data.get());
+      }
+      m_material_resource_data->m_processing_finished = true;
+      return true;
+    }
+    void Retrieve() override {}
+
+  private:
+    std::shared_ptr<MaterialResource::Data> m_material_resource_data;
+    std::shared_ptr<ShaderResource::Data> m_shader_resource_data;
+    VideoCommon::GXPipelineUid* m_uid;
+    FramebufferState m_frame_buffer_state;
+  };
+
+  if (!m_processing_load_data)
+  {
+    auto wi = m_resource_context.shader_compiler->CreateWorkItem<WorkItem>(
+        m_load_data, std::move(shader_data), &m_uid,
+        g_framebuffer_manager->GetEFBFramebufferState());
+
+    // We don't need priority, that is already handled by the resource system
+    m_resource_context.shader_compiler->QueueWorkItem(std::move(wi), 0);
+    m_processing_load_data = true;
+  }
+
+  if (!m_load_data->m_processing_finished)
+    return TaskComplete::No;
+
+  if (!m_load_data->m_pipeline)
+  {
+    return TaskComplete::Error;
+  }
+
+  std::swap(m_current_data, m_load_data);
+  return TaskComplete::Yes;
+}
+
+void MaterialResource::MarkAsActive()
+{
+  if (!m_current_data) [[unlikely]]
+    return;
+
+  m_resource_context.asset_cache->MarkAssetActive(m_material_asset);
+  for (const auto& texture_like_resource : m_current_data->m_texture_like_resources)
+  {
+    if (texture_like_resource)
+      texture_like_resource->MarkAsActive();
+  }
+  if (m_current_data->m_shader_resource)
+    m_current_data->m_shader_resource->MarkAsActive();
+  if (m_current_data->m_next_material)
+    m_current_data->m_next_material->MarkAsActive();
+}
+
+void MaterialResource::MarkAsPending()
+{
+  m_resource_context.asset_cache->MarkAssetPending(m_material_asset);
+}
+
+void MaterialResource::CreateTextureData(Data* data)
+{
+  ShaderCode preprocessor_settings;
+
+  const auto& material_data = *data->m_material_data;
+  data->m_texture_like_data.clear();
+  data->m_texture_like_resources.clear();
+  data->m_texture_like_references.clear();
+  const u32 custom_sampler_index_offset = 8;
+  for (u32 i = 0; i < static_cast<u32>(material_data.textures.size()); i++)
+  {
+    const auto& texture_and_sampler = material_data.textures[i];
+    data->m_texture_like_references.push_back(TextureLikeReference{});
+
+    TextureAndSamplerResource* value = nullptr;
+    data->m_texture_like_resources.push_back(value);
+    data->m_texture_like_data.push_back(std::shared_ptr<TextureAndSamplerResource::Data>{});
+
+    auto& texture_like_reference = data->m_texture_like_references[i];
+
+    if (texture_and_sampler.asset == "")
+    {
+      preprocessor_settings.Write("#define HAS_SAMPLER_{} 0\n", i);
+
+      // For an invalid asset, force the sampler to use the default sampler
+      texture_like_reference.sampler_origin =
+          VideoCommon::TextureSamplerValue::SamplerOrigin::Asset;
+      texture_like_reference.texture_hash = "";
+    }
+    else
+    {
+      preprocessor_settings.Write("#define HAS_SAMPLER_{} 1\n", i);
+
+      texture_like_reference.sampler_origin = texture_and_sampler.sampler_origin;
+      texture_like_reference.texture_hash = texture_and_sampler.texture_hash;
+    }
+
+    texture_like_reference.sampler_index = i + custom_sampler_index_offset;
+    texture_like_reference.texture = nullptr;
+  }
+
+  data->m_preprocessor_settings = preprocessor_settings.GetBuffer();
+}
+
+void MaterialResource::SetShaderKey(Data* data, GXPipelineUid* uid)
+{
+  XXH3_state_t shader_key_hash;
+  XXH3_INITSTATE(&shader_key_hash);
+  XXH3_64bits_reset_withSeed(&shader_key_hash, static_cast<XXH64_hash_t>(1));
+
+  UpdateHashWithPipeline(*uid, &shader_key_hash);
+  XXH3_64bits_update(&shader_key_hash, data->m_preprocessor_settings.c_str(),
+                     data->m_preprocessor_settings.size());
+
+  data->m_shader_key = XXH3_64bits_digest(&shader_key_hash);
+}
+
+void MaterialResource::WriteUniforms(Data* data)
+{
+  // Calculate the size in memory of the buffer
+  std::size_t max_uniformdata_size = 0;
+  for (const auto& property : data->m_material_data->properties)
+  {
+    max_uniformdata_size += VideoCommon::MaterialProperty::GetMemorySize(property);
+  }
+  data->m_uniform_data = Common::UniqueBuffer<u8>(max_uniformdata_size);
+
+  // Now write the memory
+  u8* uniform_data = data->m_uniform_data.data();
+  for (const auto& property : data->m_material_data->properties)
+  {
+    VideoCommon::MaterialProperty::WriteToMemory(uniform_data, property);
+  }
+}
+}  // namespace VideoCommon
diff --git a/Source/Core/VideoCommon/Resources/MaterialResource.h b/Source/Core/VideoCommon/Resources/MaterialResource.h
new file mode 100644
index 000000000000..4842f000ea49
--- /dev/null
+++ b/Source/Core/VideoCommon/Resources/MaterialResource.h
@@ -0,0 +1,99 @@
+// Copyright 2025 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <atomic>
+#include <memory>
+#include <string_view>
+#include <variant>
+#include <vector>
+
+#include "Common/Buffer.h"
+#include "Common/SmallVector.h"
+
+#include "VideoCommon/AbstractPipeline.h"
+#include "VideoCommon/Assets/MaterialAsset.h"
+#include "VideoCommon/Assets/TextureSamplerValue.h"
+#include "VideoCommon/Constants.h"
+#include "VideoCommon/GXPipelineTypes.h"
+#include "VideoCommon/RenderState.h"
+#include "VideoCommon/Resources/Resource.h"
+#include "VideoCommon/Resources/ShaderResource.h"
+#include "VideoCommon/Resources/TextureAndSamplerResource.h"
+
+namespace VideoCommon
+{
+class MaterialResource final : public Resource
+{
+public:
+  MaterialResource(Resource::ResourceContext resource_context, const GXPipelineUid& pipeline_uid);
+
+  struct TextureLikeReference
+  {
+    SamplerState sampler;
+    u32 sampler_index;
+    TextureSamplerValue::SamplerOrigin sampler_origin;
+    std::string_view texture_hash;
+    AbstractTexture* texture;
+  };
+
+  class Data
+  {
+  public:
+    AbstractPipeline* GetPipeline() const { return m_pipeline.get(); }
+    std::span<const u8> GetUniforms() const { return m_uniform_data; }
+    std::span<const TextureLikeReference> GetTextures() const { return m_texture_like_references; }
+    MaterialResource* GetNextMaterial() const { return m_next_material; }
+
+  private:
+    friend class MaterialResource;
+    std::unique_ptr<AbstractPipeline> m_pipeline = nullptr;
+    Common::UniqueBuffer<u8> m_uniform_data;
+    std::shared_ptr<MaterialData> m_material_data = nullptr;
+    ShaderResource* m_shader_resource = nullptr;
+
+    using TextureLikeResource = Resource*;
+    Common::SmallVector<TextureLikeResource, VideoCommon::MAX_PIXEL_SHADER_SAMPLERS>
+        m_texture_like_resources;
+
+    // Variant for future expansion...
+    using TextureLikeData = std::variant<std::shared_ptr<TextureAndSamplerResource::Data>>;
+    Common::SmallVector<TextureLikeData, VideoCommon::MAX_PIXEL_SHADER_SAMPLERS>
+        m_texture_like_data;
+
+    Common::SmallVector<TextureLikeReference, VideoCommon::MAX_PIXEL_SHADER_SAMPLERS>
+        m_texture_like_references;
+
+    MaterialResource* m_next_material = nullptr;
+    std::size_t m_shader_key;
+    std::string m_preprocessor_settings;
+    std::atomic_bool m_processing_finished;
+  };
+
+  const std::shared_ptr<Data>& GetData() const { return m_current_data; }
+  void MarkAsActive() override;
+  void MarkAsPending() override;
+
+private:
+  void ResetData() override;
+  Resource::TaskComplete CollectPrimaryData() override;
+  Resource::TaskComplete CollectDependencyData() override;
+  Resource::TaskComplete ProcessData() override;
+
+  static void CreateTextureData(Data* data);
+  static void SetShaderKey(Data* data, GXPipelineUid* uid);
+  static void WriteUniforms(Data* data);
+
+  std::shared_ptr<Data> m_current_data;
+
+  std::shared_ptr<Data> m_load_data;
+  bool m_processing_load_data = false;
+
+  // Note: asset cache owns the asset, we access as a reference
+  MaterialAsset* m_material_asset = nullptr;
+
+  GXPipelineUid m_uid;
+  std::unique_ptr<NativeVertexFormat> m_uid_vertex_format_copy;
+};
+}  // namespace VideoCommon
diff --git a/Source/Core/VideoCommon/Resources/Resource.cpp b/Source/Core/VideoCommon/Resources/Resource.cpp
new file mode 100644
index 000000000000..b4376314db64
--- /dev/null
+++ b/Source/Core/VideoCommon/Resources/Resource.cpp
@@ -0,0 +1,151 @@
+// Copyright 2025 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "VideoCommon/Resources/Resource.h"
+
+#include "Common/Logging/Log.h"
+
+namespace VideoCommon
+{
+Resource::Resource(ResourceContext resource_context)
+    : m_resource_context(std::move(resource_context))
+{
+}
+
+void Resource::Process()
+{
+  MarkAsActive();
+
+  if (m_data_processed == TaskComplete::Error)
+    return;
+
+  ProcessCurrentTask();
+}
+
+void Resource::ProcessCurrentTask()
+{
+  Task next_task = m_current_task;
+  TaskComplete task_complete = TaskComplete::No;
+  switch (m_current_task)
+  {
+  case Task::ReloadData:
+    ResetData();
+    task_complete = TaskComplete::Yes;
+    next_task = Task::CollectPrimaryData;
+    break;
+  case Task::CollectPrimaryData:
+    task_complete = CollectPrimaryData();
+    next_task = Task::CollectDependencyData;
+    if (task_complete == TaskComplete::No)
+      MarkAsPending();
+    break;
+  case Task::CollectDependencyData:
+    task_complete = CollectDependencyData();
+    next_task = Task::ProcessData;
+    break;
+  case Task::ProcessData:
+    task_complete = ProcessData();
+    next_task = Task::DataAvailable;
+    break;
+  case Task::DataAvailable:
+    // Early out, we're already at our end state
+    return;
+  default:
+    ERROR_LOG_FMT(VIDEO, "Unknown task '{}' for resource '{}'", static_cast<int>(m_current_task),
+                  m_resource_context.primary_asset_id);
+    return;
+  };
+
+  if (task_complete == Resource::TaskComplete::Yes)
+  {
+    m_current_task = next_task;
+    if (next_task == Resource::Task::DataAvailable)
+    {
+      m_data_processed = task_complete;
+    }
+    else
+    {
+      // No need to wait for the next resource request
+      // process the new task immediately
+      ProcessCurrentTask();
+    }
+  }
+  else if (task_complete == Resource::TaskComplete::Error)
+  {
+    // If we failed our task due to an error,
+    // we can't service this resource request,
+    // wait for a reload and mark the whole
+    // data processing as an error
+    m_data_processed = task_complete;
+  }
+}
+
+void Resource::NotifyAssetChanged(bool has_error)
+{
+  m_data_processed = has_error ? TaskComplete::Error : TaskComplete::No;
+  m_current_task = Task::ReloadData;
+
+  for (Resource* reference : m_references)
+  {
+    reference->NotifyAssetChanged(has_error);
+  }
+}
+
+void Resource::NotifyAssetUnloaded()
+{
+  OnUnloadRequested();
+
+  for (Resource* reference : m_references)
+  {
+    reference->NotifyAssetUnloaded();
+  }
+}
+
+void Resource::AddReference(Resource* reference)
+{
+  m_references.insert(reference);
+}
+
+void Resource::RemoveReference(Resource* reference)
+{
+  m_references.erase(reference);
+}
+
+void Resource::NotifyAssetLoadSuccess()
+{
+  NotifyAssetChanged(false);
+}
+
+void Resource::NotifyAssetLoadFailed()
+{
+  NotifyAssetChanged(true);
+}
+
+void Resource::AssetUnloaded()
+{
+  NotifyAssetUnloaded();
+}
+
+void Resource::OnUnloadRequested()
+{
+}
+
+void Resource::ResetData()
+{
+}
+
+Resource::TaskComplete Resource::CollectPrimaryData()
+{
+  return TaskComplete::Yes;
+}
+
+Resource::TaskComplete Resource::CollectDependencyData()
+{
+  return TaskComplete::Yes;
+}
+
+Resource::TaskComplete Resource::ProcessData()
+{
+  return TaskComplete::Yes;
+}
+}  // namespace VideoCommon
diff --git a/Source/Core/VideoCommon/Resources/Resource.h b/Source/Core/VideoCommon/Resources/Resource.h
new file mode 100644
index 000000000000..d53460004f0d
--- /dev/null
+++ b/Source/Core/VideoCommon/Resources/Resource.h
@@ -0,0 +1,94 @@
+// Copyright 2025 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "Common/WorkQueueThread.h"
+
+#include "VideoCommon/Assets/AssetListener.h"
+#include "VideoCommon/Assets/CustomAssetLibrary.h"
+
+#include <memory>
+#include <unordered_set>
+
+class AbstractTexture;
+namespace VideoCommon
+{
+class AsyncShaderCompiler;
+class CustomAssetCache;
+class CustomResourceManager;
+class TexturePool;
+
+// A resource is an abstract object that maintains
+// relationships between assets (ex: a material that references a texture),
+// as well as a standard way of calculating the final data (ex: a material's AbstractPipeline)
+class Resource : public AssetListener
+{
+public:
+  // Everything the resource needs to manage itself
+  struct ResourceContext
+  {
+    CustomAssetLibrary::AssetID primary_asset_id;
+    std::shared_ptr<CustomAssetLibrary> asset_library;
+    CustomAssetCache* asset_cache;
+    CustomResourceManager* resource_manager;
+    TexturePool* texture_pool;
+    Common::AsyncWorkThreadSP* worker_queue;
+    AsyncShaderCompiler* shader_compiler;
+    AbstractTexture* invalid_array_texture;
+    AbstractTexture* invalid_color_texture;
+    AbstractTexture* invalid_cubemap_texture;
+    AbstractTexture* invalid_transparent_texture;
+  };
+  explicit Resource(ResourceContext resource_context);
+
+  enum class TaskComplete
+  {
+    Yes,
+    No,
+    Error,
+  };
+
+  void Process();
+  TaskComplete IsDataProcessed() const { return m_data_processed; }
+
+  void AddReference(Resource* reference);
+  void RemoveReference(Resource* reference);
+
+  virtual void MarkAsActive() = 0;
+  virtual void MarkAsPending() = 0;
+
+protected:
+  ResourceContext m_resource_context;
+
+private:
+  void ProcessCurrentTask();
+  void NotifyAssetChanged(bool has_error);
+  void NotifyAssetUnloaded();
+
+  void NotifyAssetLoadSuccess() final;
+  void NotifyAssetLoadFailed() final;
+  void AssetUnloaded() final;
+  virtual void OnUnloadRequested();
+
+  friend class CustomResourceManager;
+  virtual void ResetData();
+  virtual TaskComplete CollectPrimaryData();
+  virtual TaskComplete CollectDependencyData();
+  virtual TaskComplete ProcessData();
+
+  TaskComplete m_data_processed = TaskComplete::No;
+
+  enum class Task
+  {
+    ReloadData,
+    CollectPrimaryData,
+    CollectDependencyData,
+    ProcessData,
+    DataAvailable,
+  };
+  Task m_current_task = Task::ReloadData;
+
+  std::unordered_set<Resource*> m_references;
+};
+}  // namespace VideoCommon
diff --git a/Source/Core/VideoCommon/Resources/ShaderResource.cpp b/Source/Core/VideoCommon/Resources/ShaderResource.cpp
new file mode 100644
index 000000000000..47600f2c6abd
--- /dev/null
+++ b/Source/Core/VideoCommon/Resources/ShaderResource.cpp
@@ -0,0 +1,310 @@
+// Copyright 2025 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "VideoCommon/Resources/ShaderResource.h"
+
+#include <string_view>
+
+#include <fmt/format.h>
+
+#include "VideoCommon/AbstractGfx.h"
+#include "VideoCommon/Assets/CustomAssetCache.h"
+#include "VideoCommon/AsyncShaderCompiler.h"
+#include "VideoCommon/GeometryShaderGen.h"
+#include "VideoCommon/PipelineUtils.h"
+#include "VideoCommon/PixelShaderGen.h"
+#include "VideoCommon/VertexShaderGen.h"
+#include "VideoCommon/VideoConfig.h"
+
+namespace VideoCommon
+{
+namespace
+{
+std::unique_ptr<AbstractShader>
+CompileGeometryShader(const GeometryShaderUid& uid, APIType api_type, ShaderHostConfig host_config)
+{
+  const ShaderCode source_code =
+      GenerateGeometryShaderCode(api_type, host_config, uid.GetUidData());
+  return g_gfx->CreateShaderFromSource(ShaderStage::Geometry, source_code.GetBuffer(), nullptr,
+                                       fmt::format("Geometry shader: {}", *uid.GetUidData()));
+}
+
+std::unique_ptr<AbstractShader> CompilePixelShader(const PixelShaderUid& uid,
+                                                   std::string_view preprocessor_settings,
+                                                   APIType api_type,
+                                                   const ShaderHostConfig& host_config,
+                                                   RasterSurfaceShaderData* shader_data)
+{
+  ShaderCode shader_code;
+
+  // Write any preprocessor values that were passed in
+  shader_code.Write("{}", preprocessor_settings);
+
+  // TODO: in the future we could dynamically determine the amount of samplers
+  // available, for now just hardcode to start at 8 (the first non game
+  // sampler index available)
+  const std::size_t custom_sampler_index_offset = 8;
+  for (std::size_t i = 0; i < shader_data->samplers.size(); i++)
+  {
+    const auto& sampler = shader_data->samplers[i];
+    std::string_view sampler_type;
+    switch (sampler.type)
+    {
+    case AbstractTextureType::Texture_2D:
+      sampler_type = "sampler2D";
+      break;
+    case AbstractTextureType::Texture_2DArray:
+      sampler_type = "sampler2DArray";
+      break;
+    case AbstractTextureType::Texture_CubeMap:
+      sampler_type = "samplerCube";
+      break;
+    };
+    shader_code.Write("SAMPLER_BINDING({}) uniform {} samp_{};\n", custom_sampler_index_offset + i,
+                      sampler_type, sampler.name);
+
+    // Sampler usage is passed in from the material
+    // Write a new preprocessor value with the sampler name
+    // for easier code in the shader
+    shader_code.Write("#if HAS_SAMPLER_{} == 1\n", i);
+    shader_code.Write("#define HAS_{} 1\n", sampler.name);
+    shader_code.Write("#endif\n");
+
+    shader_code.Write("\n");
+  }
+  shader_code.Write("\n");
+
+  // Now write the custom shader
+  shader_code.Write("{}", ReplaceAll(shader_data->pixel_source, "\r\n", "\n"));
+
+  // Write out the uniform data
+  ShaderCode uniform_code;
+  for (const auto& property : shader_data->uniform_properties)
+  {
+    VideoCommon::ShaderProperty::WriteAsShaderCode(uniform_code, property);
+  }
+  if (!shader_data->uniform_properties.empty())
+    uniform_code.Write("\n\n");
+
+  // Compile the shader
+  CustomPixelContents contents{.shader = shader_code.GetBuffer(),
+                               .uniforms = uniform_code.GetBuffer()};
+  const ShaderCode source_code =
+      GeneratePixelShaderCode(api_type, host_config, uid.GetUidData(), contents);
+  ShaderIncluder* shader_includer =
+      shader_data->shader_includer ? &*shader_data->shader_includer : nullptr;
+  return g_gfx->CreateShaderFromSource(ShaderStage::Pixel, source_code.GetBuffer(), shader_includer,
+                                       "Custom Pixel Shader");
+}
+
+std::unique_ptr<AbstractShader> CompileVertexShader(const VertexShaderUid& uid,
+                                                    std::string_view preprocessor_settings,
+                                                    APIType api_type,
+                                                    const ShaderHostConfig& host_config,
+                                                    const RasterSurfaceShaderData& shader_data)
+{
+  ShaderCode shader_code;
+
+  // Write any preprocessor values that were passed in
+  shader_code.Write("{}", preprocessor_settings);
+
+  // TODO: in the future we could dynamically determine the amount of samplers
+  // available, for now just hardcode to start at 8 (the first non game
+  // sampler index available)
+  const std::size_t custom_sampler_index_offset = 8;
+  for (std::size_t i = 0; i < shader_data.samplers.size(); i++)
+  {
+    const auto& sampler = shader_data.samplers[i];
+    std::string_view sampler_type = "";
+    switch (sampler.type)
+    {
+    case AbstractTextureType::Texture_2D:
+      sampler_type = "sampler2D";
+      break;
+    case AbstractTextureType::Texture_2DArray:
+      sampler_type = "sampler2DArray";
+      break;
+    case AbstractTextureType::Texture_CubeMap:
+      sampler_type = "samplerCube";
+      break;
+    };
+    shader_code.Write("SAMPLER_BINDING({}) uniform {} samp_{};\n", custom_sampler_index_offset + i,
+                      sampler_type, sampler.name);
+
+    // Sampler usage is passed in from the material
+    // Write a new preprocessor value with the sampler name
+    // for easier code in the shader
+    shader_code.Write("#if HAS_SAMPLER_{} == 1\n", i);
+    shader_code.Write("#define HAS_{} 1\n", sampler.name);
+    shader_code.Write("#endif\n");
+
+    shader_code.Write("\n");
+  }
+  shader_code.Write("\n");
+
+  // Now write the custom shader
+  shader_code.Write("{}", ReplaceAll(shader_data.vertex_source, "\r\n", "\n"));
+
+  // Write out the uniform data
+  ShaderCode uniform_code;
+  for (const auto& property : shader_data.uniform_properties)
+  {
+    VideoCommon::ShaderProperty::WriteAsShaderCode(uniform_code, property);
+  }
+  if (!shader_data.uniform_properties.empty())
+    uniform_code.Write("\n\n");
+
+  // Compile the shader
+  CustomVertexContents contents{.shader = shader_code.GetBuffer(),
+                                .uniforms = uniform_code.GetBuffer()};
+  const ShaderCode source_code =
+      GenerateVertexShaderCode(api_type, host_config, uid.GetUidData(), contents);
+  return g_gfx->CreateShaderFromSource(ShaderStage::Vertex, source_code.GetBuffer(), nullptr,
+                                       "Custom Vertex Shader");
+}
+}  // namespace
+ShaderResource::ShaderResource(Resource::ResourceContext resource_context,
+                               const GXPipelineUid& pipeline_uid,
+                               const std::string& preprocessor_setting,
+                               const ShaderHostConfig& shader_host_config)
+    : Resource(std::move(resource_context)), m_shader_host_config{.bits = shader_host_config.bits},
+      m_uid(pipeline_uid), m_preprocessor_settings(preprocessor_setting)
+{
+  m_shader_asset = m_resource_context.asset_cache->CreateAsset<RasterSurfaceShaderAsset>(
+      m_resource_context.primary_asset_id, m_resource_context.asset_library, this);
+}
+
+void ShaderResource::SetHostConfig(const ShaderHostConfig& host_config)
+{
+  m_shader_host_config.bits = host_config.bits;
+}
+
+void ShaderResource::MarkAsPending()
+{
+  m_resource_context.asset_cache->MarkAssetPending(m_shader_asset);
+}
+
+void ShaderResource::MarkAsActive()
+{
+  m_resource_context.asset_cache->MarkAssetActive(m_shader_asset);
+}
+
+AbstractShader* ShaderResource::Data::GetVertexShader() const
+{
+  if (!m_vertex_shader)
+    return nullptr;
+  return m_vertex_shader.get();
+}
+
+AbstractShader* ShaderResource::Data::GetPixelShader() const
+{
+  if (!m_pixel_shader)
+    return nullptr;
+  return m_pixel_shader.get();
+}
+
+AbstractShader* ShaderResource::Data::GetGeometryShader() const
+{
+  if (!m_geometry_shader)
+    return nullptr;
+  return m_geometry_shader.get();
+}
+
+bool ShaderResource::Data::IsCompiled() const
+{
+  return m_vertex_shader && m_pixel_shader && (!m_needs_geometry_shader || m_geometry_shader);
+}
+
+AbstractTextureType ShaderResource::Data::GetTextureType(std::size_t index)
+{
+  // If the data doesn't exist, just pick one...
+  if (!m_shader_data || index >= m_shader_data->samplers.size()) [[unlikely]]
+    return AbstractTextureType::Texture_2D;
+
+  return m_shader_data->samplers[index].type;
+}
+
+void ShaderResource::ResetData()
+{
+  m_load_data = std::make_shared<Data>();
+  m_processing_load_data = false;
+}
+
+Resource::TaskComplete ShaderResource::CollectPrimaryData()
+{
+  const auto shader_data = m_shader_asset->GetData();
+  if (!shader_data) [[unlikely]]
+  {
+    return Resource::TaskComplete::No;
+  }
+  m_load_data->m_shader_data = shader_data;
+
+  return Resource::TaskComplete::Yes;
+}
+
+Resource::TaskComplete ShaderResource::ProcessData()
+{
+  class WorkItem final : public VideoCommon::AsyncShaderCompiler::WorkItem
+  {
+  public:
+    WorkItem(std::shared_ptr<ShaderResource::Data> resource_data, VideoCommon::GXPipelineUid* uid,
+             u32 shader_bits, std::string_view preprocessor_settings)
+        : m_resource_data(std::move(resource_data)), m_uid(uid), m_shader_bits(shader_bits),
+          m_preprocessor_settings(preprocessor_settings)
+    {
+    }
+
+    bool Compile() override
+    {
+      const ShaderHostConfig shader_host_config{.bits = m_shader_bits};
+      auto actual_uid = ApplyDriverBugs(*m_uid);
+
+      ClearUnusedPixelShaderUidBits(g_backend_info.api_type, shader_host_config,
+                                    &actual_uid.ps_uid);
+      m_resource_data->m_needs_geometry_shader = shader_host_config.backend_geometry_shaders &&
+                                                 !actual_uid.gs_uid.GetUidData()->IsPassthrough();
+
+      if (m_resource_data->m_needs_geometry_shader)
+      {
+        m_resource_data->m_geometry_shader =
+            CompileGeometryShader(actual_uid.gs_uid, g_backend_info.api_type, shader_host_config);
+      }
+      m_resource_data->m_pixel_shader =
+          CompilePixelShader(actual_uid.ps_uid, m_preprocessor_settings, g_backend_info.api_type,
+                             shader_host_config, m_resource_data->m_shader_data.get());
+      m_resource_data->m_vertex_shader =
+          CompileVertexShader(actual_uid.vs_uid, m_preprocessor_settings, g_backend_info.api_type,
+                              shader_host_config, *m_resource_data->m_shader_data);
+      m_resource_data->m_processing_finished = true;
+      return true;
+    }
+    void Retrieve() override {}
+
+  private:
+    std::shared_ptr<ShaderResource::Data> m_resource_data;
+    VideoCommon::GXPipelineUid* m_uid;
+    u32 m_shader_bits;
+    std::string_view m_preprocessor_settings;
+  };
+
+  if (!m_processing_load_data)
+  {
+    std::string_view preprocessor_settings = m_preprocessor_settings;
+    auto wi = m_resource_context.shader_compiler->CreateWorkItem<WorkItem>(
+        m_load_data, &m_uid, m_shader_host_config.bits, preprocessor_settings);
+
+    // We don't need priority, that is already handled by the resource system
+    m_resource_context.shader_compiler->QueueWorkItem(std::move(wi), 0);
+    m_processing_load_data = true;
+  }
+
+  if (!m_load_data->m_processing_finished)
+    return Resource::TaskComplete::No;
+
+  if (!m_load_data->IsCompiled())
+    return Resource::TaskComplete::Error;
+
+  std::swap(m_current_data, m_load_data);
+  return Resource::TaskComplete::Yes;
+}
+}  // namespace VideoCommon
diff --git a/Source/Core/VideoCommon/Resources/ShaderResource.h b/Source/Core/VideoCommon/Resources/ShaderResource.h
new file mode 100644
index 000000000000..0f91cd3714a7
--- /dev/null
+++ b/Source/Core/VideoCommon/Resources/ShaderResource.h
@@ -0,0 +1,67 @@
+// Copyright 2025 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <atomic>
+
+#include "VideoCommon/Resources/Resource.h"
+
+#include "VideoCommon/Assets/ShaderAsset.h"
+#include "VideoCommon/GXPipelineTypes.h"
+#include "VideoCommon/ShaderGenCommon.h"
+
+namespace VideoCommon
+{
+class ShaderResource final : public Resource
+{
+public:
+  ShaderResource(Resource::ResourceContext resource_context, const GXPipelineUid& pipeline_uid,
+                 const std::string& preprocessor_settings,
+                 const ShaderHostConfig& shader_host_config);
+
+  class Data
+  {
+  public:
+    AbstractShader* GetVertexShader() const;
+    AbstractShader* GetPixelShader() const;
+    AbstractShader* GetGeometryShader() const;
+
+    bool IsCompiled() const;
+    AbstractTextureType GetTextureType(std::size_t index);
+
+  private:
+    friend class ShaderResource;
+    std::unique_ptr<AbstractShader> m_vertex_shader;
+    std::unique_ptr<AbstractShader> m_pixel_shader;
+    std::unique_ptr<AbstractShader> m_geometry_shader;
+    std::shared_ptr<RasterSurfaceShaderData> m_shader_data;
+    bool m_needs_geometry_shader = false;
+    std::atomic_bool m_processing_finished;
+  };
+
+  // Changes the shader host config. Shaders should be reloaded afterwards.
+  void SetHostConfig(const ShaderHostConfig& host_config);
+  const std::shared_ptr<Data>& GetData() const { return m_current_data; }
+
+  void MarkAsActive() override;
+  void MarkAsPending() override;
+
+private:
+  void ResetData() override;
+  Resource::TaskComplete CollectPrimaryData() override;
+  TaskComplete ProcessData() override;
+
+  // Note: asset cache owns the asset, we access as a reference
+  RasterSurfaceShaderAsset* m_shader_asset = nullptr;
+
+  std::shared_ptr<Data> m_current_data;
+  std::shared_ptr<Data> m_load_data;
+
+  bool m_processing_load_data = false;
+
+  ShaderHostConfig m_shader_host_config;
+  GXPipelineUid m_uid;
+  std::string m_preprocessor_settings;
+};
+}  // namespace VideoCommon
diff --git a/Source/Core/VideoCommon/Resources/TextureAndSamplerResource.cpp b/Source/Core/VideoCommon/Resources/TextureAndSamplerResource.cpp
new file mode 100644
index 000000000000..735a64a357be
--- /dev/null
+++ b/Source/Core/VideoCommon/Resources/TextureAndSamplerResource.cpp
@@ -0,0 +1,103 @@
+// Copyright 2025 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "VideoCommon/Resources/TextureAndSamplerResource.h"
+
+#include "VideoCommon/Assets/CustomAssetCache.h"
+#include "VideoCommon/Resources/TexturePool.h"
+
+namespace VideoCommon
+{
+TextureAndSamplerResource::TextureAndSamplerResource(Resource::ResourceContext resource_context)
+    : Resource(std::move(resource_context))
+{
+  m_texture_and_sampler_asset = m_resource_context.asset_cache->CreateAsset<TextureAndSamplerAsset>(
+      m_resource_context.primary_asset_id, m_resource_context.asset_library, this);
+}
+
+void TextureAndSamplerResource::MarkAsActive()
+{
+  m_resource_context.asset_cache->MarkAssetActive(m_texture_and_sampler_asset);
+}
+
+void TextureAndSamplerResource::MarkAsPending()
+{
+  m_resource_context.asset_cache->MarkAssetPending(m_texture_and_sampler_asset);
+}
+
+const std::shared_ptr<TextureAndSamplerResource::Data>& TextureAndSamplerResource::GetData() const
+{
+  return m_current_data;
+}
+
+void TextureAndSamplerResource::ResetData()
+{
+  m_load_data = std::make_shared<Data>();
+}
+
+Resource::TaskComplete TextureAndSamplerResource::CollectPrimaryData()
+{
+  m_load_data->m_texture_and_sampler_data = m_texture_and_sampler_asset->GetData();
+  if (!m_load_data->m_texture_and_sampler_data)
+    return Resource::TaskComplete::No;
+
+  auto& texture_data = m_load_data->m_texture_and_sampler_data->texture_data;
+  if (texture_data.m_slices.empty())
+    return Resource::TaskComplete::Error;
+
+  if (texture_data.m_slices[0].m_levels.empty())
+    return Resource::TaskComplete::Error;
+
+  const auto& first_level = texture_data.m_slices[0].m_levels[0];
+
+  auto& config = m_load_data->m_config;
+  config.format = first_level.format;
+  config.flags = 0;
+  config.layers = 1;
+  config.levels = 1;
+  config.type = m_load_data->m_texture_and_sampler_data->type;
+  config.samples = 1;
+
+  config.width = first_level.width;
+  config.height = first_level.height;
+
+  return Resource::TaskComplete::Yes;
+}
+
+Resource::TaskComplete TextureAndSamplerResource::ProcessData()
+{
+  auto texture = m_resource_context.texture_pool->AllocateTexture(m_load_data->m_config);
+  if (!texture) [[unlikely]]
+    return Resource::TaskComplete::Error;
+
+  m_load_data->m_texture = std::move(texture);
+
+  auto& texture_data = m_load_data->m_texture_and_sampler_data->texture_data;
+  for (std::size_t slice_index = 0; slice_index < texture_data.m_slices.size(); slice_index++)
+  {
+    auto& slice = texture_data.m_slices[slice_index];
+    for (u32 level_index = 0; level_index < static_cast<u32>(slice.m_levels.size()); ++level_index)
+    {
+      auto& level = slice.m_levels[level_index];
+      m_load_data->m_texture->Load(level_index, level.width, level.height, level.row_length,
+                                   level.data.data(), level.data.size(),
+                                   static_cast<u32>(slice_index));
+    }
+  }
+  std::swap(m_current_data, m_load_data);
+
+  // Release old data back to the pool
+  if (m_load_data)
+    m_resource_context.texture_pool->ReleaseTexture(std::move(m_load_data->m_texture));
+
+  return Resource::TaskComplete::Yes;
+}
+
+void TextureAndSamplerResource::OnUnloadRequested()
+{
+  if (!m_current_data)
+    return;
+  m_resource_context.texture_pool->ReleaseTexture(std::move(m_current_data->m_texture));
+  m_current_data = nullptr;
+}
+}  // namespace VideoCommon
diff --git a/Source/Core/VideoCommon/Resources/TextureAndSamplerResource.h b/Source/Core/VideoCommon/Resources/TextureAndSamplerResource.h
new file mode 100644
index 000000000000..3641b8eb9128
--- /dev/null
+++ b/Source/Core/VideoCommon/Resources/TextureAndSamplerResource.h
@@ -0,0 +1,49 @@
+// Copyright 2025 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "VideoCommon/Resources/Resource.h"
+
+#include "VideoCommon/AbstractTexture.h"
+#include "VideoCommon/Assets/TextureAsset.h"
+
+namespace VideoCommon
+{
+class TextureAndSamplerResource final : public Resource
+{
+public:
+  explicit TextureAndSamplerResource(Resource::ResourceContext resource_context);
+  void MarkAsActive() override;
+  void MarkAsPending() override;
+
+  class Data
+  {
+  public:
+    AbstractTexture* GetTexture() const { return m_texture.get(); }
+    const SamplerState& GetSampler() const { return m_texture_and_sampler_data->sampler; }
+
+  private:
+    friend class TextureAndSamplerResource;
+
+    std::shared_ptr<TextureAndSamplerData> m_texture_and_sampler_data;
+    std::unique_ptr<AbstractTexture> m_texture;
+    TextureConfig m_config;
+  };
+
+  const std::shared_ptr<Data>& GetData() const;
+
+private:
+  void ResetData() override;
+  TaskComplete CollectPrimaryData() override;
+  TaskComplete ProcessData() override;
+
+  void OnUnloadRequested() override;
+
+  // Note: asset cache owns the asset, we access as a reference
+  TextureAndSamplerAsset* m_texture_and_sampler_asset = nullptr;
+
+  std::shared_ptr<Data> m_current_data;
+  std::shared_ptr<Data> m_load_data;
+};
+}  // namespace VideoCommon
diff --git a/Source/Core/VideoCommon/Resources/TextureDataResource.cpp b/Source/Core/VideoCommon/Resources/TextureDataResource.cpp
new file mode 100644
index 000000000000..d72ae8d39dcd
--- /dev/null
+++ b/Source/Core/VideoCommon/Resources/TextureDataResource.cpp
@@ -0,0 +1,48 @@
+// Copyright 2025 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "VideoCommon/Resources/TextureDataResource.h"
+
+#include "VideoCommon/Assets/CustomAssetCache.h"
+
+namespace VideoCommon
+{
+TextureDataResource::TextureDataResource(Resource::ResourceContext resource_context)
+    : Resource(std::move(resource_context))
+{
+  m_texture_asset = m_resource_context.asset_cache->CreateAsset<TextureAsset>(
+      m_resource_context.primary_asset_id, m_resource_context.asset_library, this);
+}
+
+std::shared_ptr<CustomTextureData> TextureDataResource::GetData() const
+{
+  return m_current_texture_data;
+}
+
+CustomAsset::TimeType TextureDataResource::GetLoadTime() const
+{
+  return m_current_time;
+}
+
+Resource::TaskComplete TextureDataResource::CollectPrimaryData()
+{
+  const auto last_load_time = m_texture_asset->GetLastLoadedTime();
+  const auto asset = m_texture_asset->GetData();
+  if (!asset)
+    return Resource::TaskComplete::No;
+
+  m_current_texture_data = asset;
+  m_current_time = last_load_time;
+  return Resource::TaskComplete::Yes;
+}
+
+void TextureDataResource::MarkAsActive()
+{
+  m_resource_context.asset_cache->MarkAssetActive(m_texture_asset);
+}
+
+void TextureDataResource::MarkAsPending()
+{
+  m_resource_context.asset_cache->MarkAssetPending(m_texture_asset);
+}
+}  // namespace VideoCommon
diff --git a/Source/Core/VideoCommon/Resources/TextureDataResource.h b/Source/Core/VideoCommon/Resources/TextureDataResource.h
new file mode 100644
index 000000000000..edb529d40749
--- /dev/null
+++ b/Source/Core/VideoCommon/Resources/TextureDataResource.h
@@ -0,0 +1,33 @@
+// Copyright 2025 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "VideoCommon/Resources/Resource.h"
+
+#include "VideoCommon/Assets/CustomTextureData.h"
+#include "VideoCommon/Assets/TextureAsset.h"
+
+namespace VideoCommon
+{
+class TextureDataResource final : public Resource
+{
+public:
+  explicit TextureDataResource(Resource::ResourceContext resource_context);
+
+  std::shared_ptr<CustomTextureData> GetData() const;
+  CustomAsset::TimeType GetLoadTime() const;
+
+  void MarkAsActive() override;
+  void MarkAsPending() override;
+
+private:
+  TaskComplete CollectPrimaryData() override;
+
+  // Note: asset cache owns the asset, we access as a reference
+  TextureAsset* m_texture_asset = nullptr;
+
+  std::shared_ptr<CustomTextureData> m_current_texture_data;
+  CustomAsset::TimeType m_current_time = {};
+};
+}  // namespace VideoCommon
diff --git a/Source/Core/VideoCommon/Resources/TexturePool.cpp b/Source/Core/VideoCommon/Resources/TexturePool.cpp
new file mode 100644
index 000000000000..ce76dc5b24bf
--- /dev/null
+++ b/Source/Core/VideoCommon/Resources/TexturePool.cpp
@@ -0,0 +1,43 @@
+// Copyright 2025 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "VideoCommon/Resources/TexturePool.h"
+
+#include "Common/Logging/Log.h"
+
+#include "VideoCommon/AbstractGfx.h"
+#include "VideoCommon/AbstractTexture.h"
+
+namespace VideoCommon
+{
+void TexturePool::Reset()
+{
+  m_cache.clear();
+}
+
+std::unique_ptr<AbstractTexture> TexturePool::AllocateTexture(const TextureConfig& config)
+{
+  const auto iter = m_cache.find(config);
+  if (iter != m_cache.end())
+  {
+    auto entry = std::move(iter->second);
+    m_cache.erase(iter);
+    return entry;
+  }
+
+  std::unique_ptr<AbstractTexture> texture = g_gfx->CreateTexture(config);
+  if (!texture)
+  {
+    ERROR_LOG_FMT(VIDEO, "Failed to allocate a {}x{}x{} texture", config.width, config.height,
+                  config.layers);
+    return {};
+  }
+  return texture;
+}
+
+void TexturePool::ReleaseTexture(std::unique_ptr<AbstractTexture> texture)
+{
+  auto config = texture->GetConfig();
+  (void)m_cache.emplace(config, std::move(texture));
+}
+}  // namespace VideoCommon
diff --git a/Source/Core/VideoCommon/Resources/TexturePool.h b/Source/Core/VideoCommon/Resources/TexturePool.h
new file mode 100644
index 000000000000..6040a3ae760e
--- /dev/null
+++ b/Source/Core/VideoCommon/Resources/TexturePool.h
@@ -0,0 +1,25 @@
+// Copyright 2025 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <memory>
+#include <unordered_map>
+
+#include "VideoCommon/AbstractTexture.h"
+#include "VideoCommon/TextureConfig.h"
+
+namespace VideoCommon
+{
+class TexturePool
+{
+public:
+  void Reset();
+
+  std::unique_ptr<AbstractTexture> AllocateTexture(const TextureConfig& config);
+  void ReleaseTexture(std::unique_ptr<AbstractTexture> texture);
+
+private:
+  std::unordered_multimap<TextureConfig, std::unique_ptr<AbstractTexture>> m_cache;
+};
+}  // namespace VideoCommon
diff --git a/Source/Core/VideoCommon/ShaderCache.cpp b/Source/Core/VideoCommon/ShaderCache.cpp
index a3d07368f605..22a543704640 100644
--- a/Source/Core/VideoCommon/ShaderCache.cpp
+++ b/Source/Core/VideoCommon/ShaderCache.cpp
@@ -15,6 +15,7 @@
 #include "VideoCommon/DriverDetails.h"
 #include "VideoCommon/FramebufferManager.h"
 #include "VideoCommon/FramebufferShaderGen.h"
+#include "VideoCommon/PipelineUtils.h"
 #include "VideoCommon/Present.h"
 #include "VideoCommon/Statistics.h"
 #include "VideoCommon/VertexLoaderManager.h"
@@ -109,7 +110,10 @@ void ShaderCache::Shutdown()
   // This may leave shaders uncommitted to the cache, but it's better than blocking shutdown
   // until everything has finished compiling.
   if (m_async_shader_compiler)
+  {
     m_async_shader_compiler->StopWorkerThreads();
+    m_async_shader_compiler->ClearAllWork();
+  }
 
   ClosePipelineUIDCache();
 }
@@ -604,141 +608,10 @@ AbstractPipelineConfig ShaderCache::GetGXPipelineConfig(
   return config;
 }
 
-/// Edits the UID based on driver bugs and other special configurations
-static GXPipelineUid ApplyDriverBugs(const GXPipelineUid& in)
-{
-  GXPipelineUid out;
-  // TODO: static_assert(std::is_trivially_copyable_v<GXPipelineUid>);
-  // GXPipelineUid is not trivially copyable because RasterizationState and BlendingState aren't
-  // either, but we can pretend it is for now. This will be improved after PR #10848 is finished.
-  memcpy(static_cast<void*>(&out), static_cast<const void*>(&in), sizeof(out));  // copy padding
-  pixel_shader_uid_data* ps = out.ps_uid.GetUidData();
-  BlendingState& blend = out.blending_state;
-
-  if (ps->ztest == EmulatedZ::ForcedEarly && !out.depth_state.update_enable)
-  {
-    // No need to force early depth test if you're not writing z
-    ps->ztest = EmulatedZ::Early;
-  }
-
-  // If framebuffer fetch is available, we can emulate logic ops in the fragment shader
-  // and don't need the below blend approximation
-  if (blend.logic_op_enable && !g_backend_info.bSupportsLogicOp &&
-      !g_backend_info.bSupportsFramebufferFetch)
-  {
-    if (!blend.LogicOpApproximationIsExact())
-      WARN_LOG_FMT(VIDEO,
-                   "Approximating logic op with blending, this will produce incorrect rendering.");
-    if (blend.LogicOpApproximationWantsShaderHelp())
-    {
-      ps->emulate_logic_op_with_blend = true;
-      ps->logic_op_mode = static_cast<u32>(blend.logic_mode.Value());
-    }
-    blend.ApproximateLogicOpWithBlending();
-  }
-
-  const bool benefits_from_ps_dual_source_off =
-      (!g_backend_info.bSupportsDualSourceBlend && g_backend_info.bSupportsFramebufferFetch) ||
-      DriverDetails::HasBug(DriverDetails::BUG_BROKEN_DUAL_SOURCE_BLENDING);
-  if (benefits_from_ps_dual_source_off && !blend.RequiresDualSrc())
-  {
-    // Only use dual-source blending when required on drivers that don't support it very well.
-    ps->no_dual_src = true;
-    blend.use_dual_src = false;
-  }
-
-  if (g_backend_info.bSupportsFramebufferFetch)
-  {
-    bool fbfetch_blend = false;
-    if ((DriverDetails::HasBug(DriverDetails::BUG_BROKEN_DISCARD_WITH_EARLY_Z) ||
-         !g_backend_info.bSupportsEarlyZ) &&
-        ps->ztest == EmulatedZ::ForcedEarly)
-    {
-      ps->ztest = EmulatedZ::EarlyWithFBFetch;
-      fbfetch_blend |= static_cast<bool>(out.blending_state.blend_enable);
-      ps->no_dual_src = true;
-    }
-    fbfetch_blend |= blend.logic_op_enable && !g_backend_info.bSupportsLogicOp;
-    fbfetch_blend |= blend.use_dual_src && !g_backend_info.bSupportsDualSourceBlend;
-    if (fbfetch_blend)
-    {
-      ps->no_dual_src = true;
-      if (blend.logic_op_enable)
-      {
-        ps->logic_op_enable = true;
-        ps->logic_op_mode = static_cast<u32>(blend.logic_mode.Value());
-        blend.logic_op_enable = false;
-      }
-      if (blend.blend_enable)
-      {
-        ps->blend_enable = true;
-        ps->blend_src_factor = blend.src_factor;
-        ps->blend_src_factor_alpha = blend.src_factor_alpha;
-        ps->blend_dst_factor = blend.dst_factor;
-        ps->blend_dst_factor_alpha = blend.dst_factor_alpha;
-        ps->blend_subtract = blend.subtract;
-        ps->blend_subtract_alpha = blend.subtract_alpha;
-        blend.blend_enable = false;
-      }
-    }
-  }
-
-  // force dual src off if we can't support it
-  if (!g_backend_info.bSupportsDualSourceBlend)
-  {
-    ps->no_dual_src = true;
-    blend.use_dual_src = false;
-  }
-
-  if (ps->ztest == EmulatedZ::ForcedEarly && !g_backend_info.bSupportsEarlyZ)
-  {
-    // These things should be false
-    ASSERT(!ps->zfreeze);
-    // ZCOMPLOC HACK:
-    // The only way to emulate alpha test + early-z is to force early-z in the shader.
-    // As this isn't available on all drivers and as we can't emulate this feature otherwise,
-    // we are only able to choose which one we want to respect more.
-    // Tests seem to have proven that writing depth even when the alpha test fails is more
-    // important that a reliable alpha test, so we just force the alpha test to always succeed.
-    // At least this seems to be less buggy.
-    ps->ztest = EmulatedZ::EarlyWithZComplocHack;
-  }
-
-  if (g_ActiveConfig.UseVSForLinePointExpand() &&
-      (out.rasterization_state.primitive == PrimitiveType::Points ||
-       out.rasterization_state.primitive == PrimitiveType::Lines))
-  {
-    // All primitives are expanded to triangles in the vertex shader
-    vertex_shader_uid_data* vs = out.vs_uid.GetUidData();
-    const PortableVertexDeclaration& decl = out.vertex_format->GetVertexDeclaration();
-    vs->position_has_3_elems = decl.position.components >= 3;
-    vs->texcoord_elem_count = 0;
-    for (int i = 0; i < 8; i++)
-    {
-      if (decl.texcoords[i].enable)
-      {
-        ASSERT(decl.texcoords[i].components <= 3);
-        vs->texcoord_elem_count |= decl.texcoords[i].components << (i * 2);
-      }
-    }
-    out.vertex_format = nullptr;
-    if (out.rasterization_state.primitive == PrimitiveType::Points)
-      vs->vs_expand = VSExpand::Point;
-    else
-      vs->vs_expand = VSExpand::Line;
-    PrimitiveType prim = g_backend_info.bSupportsPrimitiveRestart ? PrimitiveType::TriangleStrip :
-                                                                    PrimitiveType::Triangles;
-    out.rasterization_state.primitive = prim;
-    out.gs_uid.GetUidData()->primitive_type = static_cast<u32>(prim);
-  }
-
-  return out;
-}
-
 std::optional<AbstractPipelineConfig>
 ShaderCache::GetGXPipelineConfig(const GXPipelineUid& config_in)
 {
-  GXPipelineUid config = ApplyDriverBugs(config_in);
+  GXPipelineUid config = VideoCommon::ApplyDriverBugs(config_in);
   const AbstractShader* vs;
   auto vs_iter = m_vs_cache.shader_map.find(config.vs_uid);
   if (vs_iter != m_vs_cache.shader_map.end() && !vs_iter->second.pending)
diff --git a/Source/Core/VideoCommon/ShaderCompileUtils.cpp b/Source/Core/VideoCommon/ShaderCompileUtils.cpp
index ea17162ce9b8..297d86ea9220 100644
--- a/Source/Core/VideoCommon/ShaderCompileUtils.cpp
+++ b/Source/Core/VideoCommon/ShaderCompileUtils.cpp
@@ -3,7 +3,6 @@
 
 #include "VideoCommon/ShaderCompileUtils.h"
 
-#include <fstream>
 #include <ranges>
 
 #include "Common/FileUtil.h"
diff --git a/Source/Core/VideoCommon/ShaderGenCommon.cpp b/Source/Core/VideoCommon/ShaderGenCommon.cpp
index 26463f447658..e848beb6934b 100644
--- a/Source/Core/VideoCommon/ShaderGenCommon.cpp
+++ b/Source/Core/VideoCommon/ShaderGenCommon.cpp
@@ -5,12 +5,10 @@
 
 #include <fmt/format.h>
 
-#include "Common/Assert.h"
 #include "Common/FileUtil.h"
 #include "Core/ConfigManager.h"
 #include "VideoCommon/VideoCommon.h"
 #include "VideoCommon/VideoConfig.h"
-#include "VideoCommon/XFMemory.h"
 
 ShaderHostConfig ShaderHostConfig::GetCurrent()
 {
diff --git a/Source/Core/VideoCommon/Spirv.cpp b/Source/Core/VideoCommon/Spirv.cpp
index fce9b272beeb..9fcef18d134a 100644
--- a/Source/Core/VideoCommon/Spirv.cpp
+++ b/Source/Core/VideoCommon/Spirv.cpp
@@ -3,13 +3,13 @@
 
 #include "VideoCommon/Spirv.h"
 
+#include <fstream>
+
 #include <glslang/SPIRV/GlslangToSpv.h>
-#include <glslang/SPIRV/disassemble.h>
 
 #include "Common/FileUtil.h"
 #include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"
-#include "Common/StringUtil.h"
 #include "Common/Version.h"
 
 #include "VideoCommon/VideoBackendBase.h"
diff --git a/Source/Core/VideoCommon/TextureCacheBase.cpp b/Source/Core/VideoCommon/TextureCacheBase.cpp
index b1aac0067264..0fda9f6f410f 100644
--- a/Source/Core/VideoCommon/TextureCacheBase.cpp
+++ b/Source/Core/VideoCommon/TextureCacheBase.cpp
@@ -4,6 +4,7 @@
 #include "VideoCommon/TextureCacheBase.h"
 
 #include <algorithm>
+#include <chrono>
 #include <cmath>
 #include <cstring>
 #include <memory>
@@ -20,7 +21,6 @@
 #include "Common/Assert.h"
 #include "Common/ChunkFile.h"
 #include "Common/CommonTypes.h"
-#include "Common/EnumUtils.h"
 #include "Common/FileUtil.h"
 #include "Common/Hash.h"
 #include "Common/Logging/Log.h"
@@ -37,7 +37,6 @@
 #include "VideoCommon/AbstractFramebuffer.h"
 #include "VideoCommon/AbstractGfx.h"
 #include "VideoCommon/AbstractStagingTexture.h"
-#include "VideoCommon/Assets/CustomResourceManager.h"
 #include "VideoCommon/Assets/CustomTextureData.h"
 #include "VideoCommon/Assets/TextureAssetUtils.h"
 #include "VideoCommon/BPMemory.h"
@@ -48,6 +47,7 @@
 #include "VideoCommon/OpcodeDecoding.h"
 #include "VideoCommon/PixelShaderManager.h"
 #include "VideoCommon/Present.h"
+#include "VideoCommon/Resources/CustomResourceManager.h"
 #include "VideoCommon/ShaderCache.h"
 #include "VideoCommon/Statistics.h"
 #include "VideoCommon/TMEM.h"
@@ -269,9 +269,9 @@ bool TextureCacheBase::DidLinkedAssetsChange(const TCacheEntry& entry)
   if (!entry.hires_texture)
     return false;
 
-  const auto [texture_data, load_time] = entry.hires_texture->LoadTexture();
+  const auto* resource = entry.hires_texture->LoadTexture();
 
-  return load_time > entry.last_load_time;
+  return resource->GetLoadTime() > entry.last_load_time;
 }
 
 RcTcacheEntry TextureCacheBase::ApplyPaletteToEntry(RcTcacheEntry& entry, const u8* palette,
@@ -581,7 +581,7 @@ void TextureCacheBase::DoSaveState(PointerWrap& p)
   auto ShouldSaveEntry = [](const RcTcacheEntry& entry) {
     // We skip non-copies as they can be decoded from RAM when the state is loaded.
     // Storing them would duplicate data in the save state file, adding to decompression time.
-    // We also need to store invalidated entires, as they can't be restored from RAM.
+    // We also need to store invalidated entries, as they can't be restored from RAM.
     return entry->IsCopy() || entry->invalidated;
   };
   auto AddCacheEntryToMap = [&entry_map, &entries_to_save](const RcTcacheEntry& entry) -> u32 {
@@ -1006,7 +1006,7 @@ RcTcacheEntry TextureCacheBase::DoPartialTextureUpdates(RcTcacheEntry& entry_to_
 // then applying anisotropic filtering is equivalent to forced filtering. Point
 // mode textures are usually some sort of 2D UI billboard which will end up
 // misaligned from the correct pixels when filtered anisotropically.
-static bool IsAnisostropicEnhancementSafe(const TexMode0& tm0)
+static bool IsAnisotropicEnhancementSafe(const TexMode0& tm0)
 {
   return !(tm0.min_filter == FilterMode::Near && tm0.mag_filter == FilterMode::Near);
 }
@@ -1040,9 +1040,9 @@ SamplerState TextureCacheBase::GetSamplerState(u32 index, float custom_tex_scale
 
   // Anisotropic filtering option.
   if (g_ActiveConfig.iMaxAnisotropy != AnisotropicFilteringMode::Default &&
-      IsAnisostropicEnhancementSafe(tm0))
+      IsAnisotropicEnhancementSafe(tm0))
   {
-    state.tm0.anisotropic_filtering = Common::ToUnderlying(g_ActiveConfig.iMaxAnisotropy);
+    state.tm0.anisotropic_filtering = std::to_underlying(g_ActiveConfig.iMaxAnisotropy);
   }
 
   if (state.tm0.anisotropic_filtering != 0)
@@ -1243,9 +1243,9 @@ class ArbitraryMipmapDetector
   std::vector<Level> levels;
 };
 
-TCacheEntry* TextureCacheBase::Load(const TextureInfo& texture_info)
+TCacheEntry* TextureCacheBase::Load(u32 stage)
 {
-  if (auto entry = LoadImpl(texture_info, false))
+  if (auto entry = LoadImpl(stage, false))
   {
     if (!DidLinkedAssetsChange(*entry))
     {
@@ -1253,29 +1253,28 @@ TCacheEntry* TextureCacheBase::Load(const TextureInfo& texture_info)
     }
 
     InvalidateTexture(GetTexCacheIter(entry));
-    return LoadImpl(texture_info, true);
+    return LoadImpl(stage, true);
   }
 
   return nullptr;
 }
 
-TCacheEntry* TextureCacheBase::LoadImpl(const TextureInfo& texture_info, bool force_reload)
+TCacheEntry* TextureCacheBase::LoadImpl(u32 stage, bool force_reload)
 {
   // if this stage was not invalidated by changes to texture registers, keep the current texture
-  if (!force_reload && TMEM::IsValid(texture_info.GetStage()) &&
-      m_bound_textures[texture_info.GetStage()])
+  if (!force_reload && TMEM::IsValid(stage) && m_bound_textures[stage])
   {
-    TCacheEntry* entry = m_bound_textures[texture_info.GetStage()].get();
+    TCacheEntry* entry = m_bound_textures[stage].get();
     // If the TMEM configuration is such that this texture is more or less guaranteed to still
     // be in TMEM, then we know we can reuse the old entry without even hashing the memory
     //
-    // It's possible this texture has already been overwritten in emulated memory and therfore
+    // It's possible this texture has already been overwritten in emulated memory and therefore
     // invalidated from our texture cache, but we want to use it anyway to approximate the
     // result of the game using an overwritten texture cached in TMEM.
     //
     // Spyro: A Hero's Tail is known for (deliberately?) using such overwritten textures
     // in it's bloom effect, which breaks without giving it the invalidated texture.
-    if (TMEM::IsCached(texture_info.GetStage()))
+    if (TMEM::IsCached(stage))
     {
       return entry;
     }
@@ -1288,6 +1287,7 @@ TCacheEntry* TextureCacheBase::LoadImpl(const TextureInfo& texture_info, bool fo
     }
   }
 
+  const TextureInfo texture_info = TextureInfo::FromStage(stage);
   auto entry = GetTexture(g_ActiveConfig.iSafeTextureCache_ColorSamples, texture_info);
 
   if (!entry)
@@ -1581,7 +1581,9 @@ RcTcacheEntry TextureCacheBase::GetTexture(const int textureCacheSafetyColorSamp
     if (hires_texture)
     {
       has_arbitrary_mipmaps = hires_texture->HasArbitraryMipmaps();
-      std::tie(custom_texture_data, load_time) = hires_texture->LoadTexture();
+      const auto resource = hires_texture->LoadTexture();
+      load_time = resource->GetLoadTime();
+      custom_texture_data = resource->GetData();
       if (custom_texture_data && !VideoCommon::ValidateTextureData(
                                      hires_texture->GetId(), *custom_texture_data,
                                      texture_info.GetRawWidth(), texture_info.GetRawHeight()))
@@ -1730,32 +1732,36 @@ RcTcacheEntry TextureCacheBase::CreateTextureEntry(
       dst_buffer += decoded_texture_size;
     }
 
-    for (u32 level = 1; level != texLevels; ++level)
+    for (const auto& mip_level : texture_info.GetMipMapLevels())
     {
-      auto mip_level = texture_info.GetMipMapLevel(level - 1);
-      if (!mip_level)
+      if (!mip_level.IsDataValid())
+      {
+        ERROR_LOG_FMT(VIDEO, "Trying to use an invalid mipmap address {:#010x}",
+                      texture_info.GetRawAddress());
         continue;
+      }
 
       if (!decode_on_gpu ||
-          !DecodeTextureOnGPU(entry, level, mip_level->GetData(), mip_level->GetTextureSize(),
-                              texture_info.GetTextureFormat(), mip_level->GetRawWidth(),
-                              mip_level->GetRawHeight(), mip_level->GetExpandedWidth(),
-                              mip_level->GetExpandedHeight(),
+          !DecodeTextureOnGPU(entry, mip_level.GetLevel(), mip_level.GetData(),
+                              mip_level.GetTextureSize(), texture_info.GetTextureFormat(),
+                              mip_level.GetRawWidth(), mip_level.GetRawHeight(),
+                              mip_level.GetExpandedWidth(), mip_level.GetExpandedHeight(),
                               creation_info.bytes_per_block *
-                                  (mip_level->GetExpandedWidth() / texture_info.GetBlockWidth()),
+                                  (mip_level.GetExpandedWidth() / texture_info.GetBlockWidth()),
                               texture_info.GetTlutAddress(), texture_info.GetTlutFormat()))
       {
         // No need to call CheckTempSize here, as the whole buffer is preallocated at the beginning
         const u32 decoded_mip_size =
-            mip_level->GetExpandedWidth() * sizeof(u32) * mip_level->GetExpandedHeight();
-        TexDecoder_Decode(dst_buffer, mip_level->GetData(), mip_level->GetExpandedWidth(),
-                          mip_level->GetExpandedHeight(), texture_info.GetTextureFormat(),
+            mip_level.GetExpandedWidth() * sizeof(u32) * mip_level.GetExpandedHeight();
+        TexDecoder_Decode(dst_buffer, mip_level.GetData(), mip_level.GetExpandedWidth(),
+                          mip_level.GetExpandedHeight(), texture_info.GetTextureFormat(),
                           texture_info.GetTlutAddress(), texture_info.GetTlutFormat());
-        entry->texture->Load(level, mip_level->GetRawWidth(), mip_level->GetRawHeight(),
-                             mip_level->GetExpandedWidth(), dst_buffer, decoded_mip_size);
+        entry->texture->Load(mip_level.GetLevel(), mip_level.GetRawWidth(),
+                             mip_level.GetRawHeight(), mip_level.GetExpandedWidth(), dst_buffer,
+                             decoded_mip_size);
 
-        arbitrary_mip_detector.AddLevel(mip_level->GetRawWidth(), mip_level->GetRawHeight(),
-                                        mip_level->GetExpandedWidth(), dst_buffer);
+        arbitrary_mip_detector.AddLevel(mip_level.GetRawWidth(), mip_level.GetRawHeight(),
+                                        mip_level.GetExpandedWidth(), dst_buffer);
 
         dst_buffer += decoded_mip_size;
       }
@@ -2477,7 +2483,7 @@ void TextureCacheBase::CopyRenderTargetToTexture(
 
   if (OpcodeDecoder::g_record_fifo_data)
   {
-    // Mark the memory behind this efb copy as dynamicly generated for the Fifo log
+    // Mark the memory behind this efb copy as dynamically generated for the Fifo log
     u32 address = dstAddr;
     for (u32 i = 0; i < num_blocks_y; i++)
     {
@@ -2696,7 +2702,7 @@ TextureCacheBase::FindMatchingTextureFromPool(const TextureConfig& config)
   // Find a texture from the pool that does not have a frameCount of FRAMECOUNT_INVALID.
   // This prevents a texture from being used twice in a single frame with different data,
   // which potentially means that a driver has to maintain two copies of the texture anyway.
-  // Render-target textures are fine through, as they have to be generated in a seperated pass.
+  // Render-target textures are fine through, as they have to be generated in a separate pass.
   // As non-render-target textures are usually static, this should not matter much.
   auto range = m_texture_pool.equal_range(config);
   auto matching_iter = std::find_if(range.first, range.second, [](const auto& iter) {
diff --git a/Source/Core/VideoCommon/TextureCacheBase.h b/Source/Core/VideoCommon/TextureCacheBase.h
index 9a95400679d1..1aa67dede509 100644
--- a/Source/Core/VideoCommon/TextureCacheBase.h
+++ b/Source/Core/VideoCommon/TextureCacheBase.h
@@ -277,7 +277,7 @@ class TextureCacheBase
   void Invalidate();
   void ReleaseToPool(TCacheEntry* entry);
 
-  TCacheEntry* Load(const TextureInfo& texture_info);
+  TCacheEntry* Load(u32 stage);
   RcTcacheEntry GetTexture(const int textureCacheSafetyColorSampleSize,
                            const TextureInfo& texture_info);
   RcTcacheEntry GetXFBTexture(u32 address, u32 width, u32 height, u32 stride,
@@ -346,7 +346,7 @@ class TextureCacheBase
 
   static bool DidLinkedAssetsChange(const TCacheEntry& entry);
 
-  TCacheEntry* LoadImpl(const TextureInfo& texture_info, bool force_reload);
+  TCacheEntry* LoadImpl(u32 stage, bool force_reload);
 
   bool CreateUtilityTextures();
 
diff --git a/Source/Core/VideoCommon/TextureConverterShaderGen.cpp b/Source/Core/VideoCommon/TextureConverterShaderGen.cpp
index 9dcc4385e114..a8827fdc6f6d 100644
--- a/Source/Core/VideoCommon/TextureConverterShaderGen.cpp
+++ b/Source/Core/VideoCommon/TextureConverterShaderGen.cpp
@@ -3,7 +3,6 @@
 
 #include "VideoCommon/TextureConverterShaderGen.h"
 
-#include "Common/Assert.h"
 #include "Common/CommonTypes.h"
 #include "VideoCommon/BPMemory.h"
 #include "VideoCommon/TextureCacheBase.h"
diff --git a/Source/Core/VideoCommon/TextureDecoder_Common.cpp b/Source/Core/VideoCommon/TextureDecoder_Common.cpp
index d4139c02d9c1..3506514a54ec 100644
--- a/Source/Core/VideoCommon/TextureDecoder_Common.cpp
+++ b/Source/Core/VideoCommon/TextureDecoder_Common.cpp
@@ -3,7 +3,6 @@
 
 #include <algorithm>
 #include <array>
-#include <cmath>
 #include <cstddef>
 #include <span>
 
diff --git a/Source/Core/VideoCommon/TextureDecoder_x64.cpp b/Source/Core/VideoCommon/TextureDecoder_x64.cpp
index 3faa6c52c3be..39183615619f 100644
--- a/Source/Core/VideoCommon/TextureDecoder_x64.cpp
+++ b/Source/Core/VideoCommon/TextureDecoder_x64.cpp
@@ -3,10 +3,6 @@
 
 #include "VideoCommon/TextureDecoder.h"
 
-#include <algorithm>
-#include <cmath>
-#include <cstring>
-
 #ifdef CHECK
 #include "Common/Assert.h"
 #endif
@@ -1006,7 +1002,7 @@ static void TexDecoder_DecodeImpl_RGBA8_SSSE3(u32* dst, const u8* src, int width
                                               TextureFormat texformat, const u8* tlut,
                                               TLUTFormat tlutfmt, int Wsteps4, int Wsteps8)
 {
-  // xsacha optimized with SSSE3 instrinsics
+  // xsacha optimized with SSSE3 intrinsics
   // Produces a ~30% speed improvement over SSE2 implementation
   for (int y = 0; y < height; y += 4)
   {
@@ -1212,7 +1208,7 @@ static void TexDecoder_DecodeImpl_CMPR(u32* dst, const u8* src, int width, int h
         int cmp1 = _mm_extract_epi16(cmprgb0rgb1, 4);
 
         // green:
-        // NOTE: We start with the larger number of bits (6) firts for G and shift the mask down
+        // NOTE: We start with the larger number of bits (6) first for G and shift the mask down
         // 1 bit to get a 5-bit mask later for R and B components.
         // low6mask == _mm_set_epi32(0x0000FC00, 0x0000FC00, 0x0000FC00, 0x0000FC00)
         const __m128i low6mask = _mm_slli_epi32(_mm_srli_epi32(allFFs128, 24 + 2), 8 + 2);
diff --git a/Source/Core/VideoCommon/TextureInfo.cpp b/Source/Core/VideoCommon/TextureInfo.cpp
index 27055f462d7a..17e5107501ab 100644
--- a/Source/Core/VideoCommon/TextureInfo.cpp
+++ b/Source/Core/VideoCommon/TextureInfo.cpp
@@ -61,9 +61,9 @@ TextureInfo::TextureInfo(u32 stage, std::span<const u8> data, std::span<const u8
                          u32 address, TextureFormat texture_format, TLUTFormat tlut_format,
                          u32 width, u32 height, bool from_tmem, std::span<const u8> tmem_odd,
                          std::span<const u8> tmem_even, std::optional<u32> mip_count)
-    : m_ptr(data.data()), m_tlut_ptr(tlut_data.data()), m_address(address), m_from_tmem(from_tmem),
-      m_tmem_odd(tmem_odd.data()), m_texture_format(texture_format), m_tlut_format(tlut_format),
-      m_raw_width(width), m_raw_height(height), m_stage(stage)
+    : m_data(data), m_tlut_data(tlut_data), m_address(address), m_from_tmem(from_tmem),
+      m_tmem_even(tmem_even), m_tmem_odd(tmem_odd), m_texture_format(texture_format),
+      m_tlut_format(tlut_format), m_raw_width(width), m_raw_height(height), m_stage(stage)
 {
   const bool is_palette_texture = IsColorIndexed(m_texture_format);
   if (is_palette_texture)
@@ -103,23 +103,8 @@ TextureInfo::TextureInfo(u32 stage, std::span<const u8> data, std::span<const u8
     // the mipmap chain
     // e.g. 64x64 with 7 LODs would have the mipmap chain 64x64,32x32,16x16,8x8,4x4,2x2,1x1,0x0, so
     // we limit the mipmap count to 6 there
-    const u32 limited_mip_count =
+    m_limited_mip_count =
         std::min<u32>(MathUtil::IntLog2(std::max(width, height)) + 1, raw_mip_count + 1) - 1;
-
-    // load mips
-    std::span<const u8> src_data = Common::SafeSubspan(data, GetTextureSize());
-    tmem_even = Common::SafeSubspan(tmem_even, GetTextureSize());
-
-    for (u32 i = 0; i < limited_mip_count; i++)
-    {
-      MipLevel mip_level(i + 1, *this, m_from_tmem, &src_data, &tmem_even, &tmem_odd);
-      if (!mip_level.IsDataValid())
-      {
-        ERROR_LOG_FMT(VIDEO, "Trying to use an invalid mipmap address {:#010x}", GetRawAddress());
-        break;
-      }
-      m_mip_levels.push_back(std::move(mip_level));
-    }
   }
 }
 
@@ -133,7 +118,7 @@ TextureInfo::NameDetails TextureInfo::CalculateTextureName() const
   if (!IsDataValid())
     return NameDetails{};
 
-  const u8* tlut = m_tlut_ptr;
+  const u8* tlut = m_tlut_data.data();
   size_t tlut_size = m_palette_size ? *m_palette_size : 0;
 
   // checking for min/max on paletted textures
@@ -146,8 +131,8 @@ TextureInfo::NameDetails TextureInfo::CalculateTextureName() const
   case 16 * 2:
     for (size_t i = 0; i < m_texture_size; i++)
     {
-      const u32 low_nibble = m_ptr[i] & 0xf;
-      const u32 high_nibble = m_ptr[i] >> 4;
+      const u32 low_nibble = m_data[i] & 0xf;
+      const u32 high_nibble = m_data[i] >> 4;
 
       min = std::min({min, low_nibble, high_nibble});
       max = std::max({max, low_nibble, high_nibble});
@@ -156,7 +141,7 @@ TextureInfo::NameDetails TextureInfo::CalculateTextureName() const
   case 256 * 2:
     for (size_t i = 0; i < m_texture_size; i++)
     {
-      const u32 texture_byte = m_ptr[i];
+      const u32 texture_byte = m_data[i];
 
       min = std::min(min, texture_byte);
       max = std::max(max, texture_byte);
@@ -165,7 +150,7 @@ TextureInfo::NameDetails TextureInfo::CalculateTextureName() const
   case 16384 * 2:
     for (size_t i = 0; i < m_texture_size; i += sizeof(u16))
     {
-      const u32 texture_halfword = Common::swap16(m_ptr[i]) & 0x3fff;
+      const u32 texture_halfword = Common::swap16(m_data[i]) & 0x3fff;
 
       min = std::min(min, texture_halfword);
       max = std::max(max, texture_halfword);
@@ -180,7 +165,7 @@ TextureInfo::NameDetails TextureInfo::CalculateTextureName() const
 
   DEBUG_ASSERT(tlut_size <= m_palette_size.value_or(0));
 
-  const u64 tex_hash = XXH64(m_ptr, m_texture_size, 0);
+  const u64 tex_hash = XXH64(m_data.data(), m_texture_size, 0);
   const u64 tlut_hash = tlut_size ? XXH64(tlut, tlut_size, 0) : 0;
 
   return {.base_name = fmt::format("{}{}x{}{}", format_prefix, m_raw_width, m_raw_height,
@@ -190,112 +175,35 @@ TextureInfo::NameDetails TextureInfo::CalculateTextureName() const
           .format_name = fmt::to_string(static_cast<int>(m_texture_format))};
 }
 
-bool TextureInfo::IsDataValid() const
-{
-  return m_data_valid;
-}
-
-const u8* TextureInfo::GetData() const
-{
-  return m_ptr;
-}
-
-const u8* TextureInfo::GetTlutAddress() const
-{
-  return m_tlut_ptr;
-}
-
-u32 TextureInfo::GetRawAddress() const
-{
-  return m_address;
-}
-
-bool TextureInfo::IsFromTmem() const
-{
-  return m_from_tmem;
-}
-
-const u8* TextureInfo::GetTmemOddAddress() const
-{
-  return m_tmem_odd;
-}
-
-TextureFormat TextureInfo::GetTextureFormat() const
-{
-  return m_texture_format;
-}
-
-TLUTFormat TextureInfo::GetTlutFormat() const
-{
-  return m_tlut_format;
-}
-
-std::optional<u32> TextureInfo::GetPaletteSize() const
-{
-  return m_palette_size;
-}
-
-u32 TextureInfo::GetTextureSize() const
-{
-  return m_texture_size;
-}
-
-u32 TextureInfo::GetBlockWidth() const
-{
-  return m_block_width;
-}
-
-u32 TextureInfo::GetBlockHeight() const
-{
-  return m_block_height;
-}
-
-u32 TextureInfo::GetExpandedWidth() const
-{
-  return m_expanded_width;
-}
-
-u32 TextureInfo::GetExpandedHeight() const
+TextureInfo::MipLevels TextureInfo::GetMipMapLevels() const
 {
-  return m_expanded_height;
-}
+  MipLevelIterator begin;
+  begin.m_parent = this;
+  begin.m_from_tmem = m_from_tmem;
+  begin.m_data = Common::SafeSubspan(m_data, GetTextureSize());
+  begin.m_tmem_even = Common::SafeSubspan(m_tmem_even, GetTextureSize());
+  begin.m_tmem_odd = m_tmem_odd;
+  begin.CreateMipLevel();
 
-u32 TextureInfo::GetRawWidth() const
-{
-  return m_raw_width;
-}
+  MipLevelIterator end;
+  end.m_level_index = m_limited_mip_count;
 
-u32 TextureInfo::GetRawHeight() const
-{
-  return m_raw_height;
-}
-
-u32 TextureInfo::GetStage() const
-{
-  return m_stage;
-}
-
-bool TextureInfo::HasMipMaps() const
-{
-  return !m_mip_levels.empty();
+  return MipLevels(begin, end);
 }
 
-u32 TextureInfo::GetLevelCount() const
-{
-  return static_cast<u32>(m_mip_levels.size()) + 1;
-}
-
-const TextureInfo::MipLevel* TextureInfo::GetMipMapLevel(u32 level) const
+u32 TextureInfo::GetFullLevelSize() const
 {
-  if (level < m_mip_levels.size())
-    return &m_mip_levels[level];
-
-  return nullptr;
+  u32 all_mips_size = 0;
+  for (const auto& mip_map : GetMipMapLevels())
+  {
+    if (mip_map.IsDataValid())
+      all_mips_size += mip_map.GetTextureSize();
+  }
+  return m_texture_size + all_mips_size;
 }
 
-TextureInfo::MipLevel::MipLevel(u32 level, const TextureInfo& parent, bool from_tmem,
-                                std::span<const u8>* src_data, std::span<const u8>* tmem_even,
-                                std::span<const u8>* tmem_odd)
+TextureInfo::MipLevel::MipLevel(u32 level, const TextureInfo& parent, std::span<const u8>* data)
+    : m_level(level)
 {
   m_raw_width = std::max(parent.GetRawWidth() >> level, 1u);
   m_raw_height = std::max(parent.GetRawHeight() >> level, 1u);
@@ -305,54 +213,24 @@ TextureInfo::MipLevel::MipLevel(u32 level, const TextureInfo& parent, bool from_
   m_texture_size = TexDecoder_GetTextureSizeInBytes(m_expanded_width, m_expanded_height,
                                                     parent.GetTextureFormat());
 
-  std::span<const u8>* data = from_tmem ? ((level % 2) ? tmem_odd : tmem_even) : src_data;
   m_ptr = data->data();
   m_data_valid = data->size() >= m_texture_size;
 
   *data = Common::SafeSubspan(*data, m_texture_size);
 }
 
-u32 TextureInfo::GetFullLevelSize() const
-{
-  u32 all_mips_size = 0;
-  for (const auto& mip_map : m_mip_levels)
-  {
-    all_mips_size += mip_map.GetTextureSize();
-  }
-  return m_texture_size + all_mips_size;
-}
-
-bool TextureInfo::MipLevel::IsDataValid() const
+TextureInfo::MipLevelIterator& TextureInfo::MipLevelIterator::operator++()
 {
-  return m_data_valid;
+  ++m_level_index;
+  CreateMipLevel();
+  return *this;
 }
 
-const u8* TextureInfo::MipLevel::GetData() const
+void TextureInfo::MipLevelIterator::CreateMipLevel()
 {
-  return m_ptr;
-}
-
-u32 TextureInfo::MipLevel::GetTextureSize() const
-{
-  return m_texture_size;
-}
+  const u32 level = m_level_index + 1;
+  std::span<const u8>* data = m_from_tmem ? ((level % 2) ? &m_tmem_odd : &m_tmem_even) : &m_data;
 
-u32 TextureInfo::MipLevel::GetExpandedWidth() const
-{
-  return m_expanded_width;
-}
-
-u32 TextureInfo::MipLevel::GetExpandedHeight() const
-{
-  return m_expanded_height;
-}
-
-u32 TextureInfo::MipLevel::GetRawWidth() const
-{
-  return m_raw_width;
-}
-
-u32 TextureInfo::MipLevel::GetRawHeight() const
-{
-  return m_raw_height;
+  // The MipLevel constructor mutates the data argument so the next MipLevel gets the right data
+  m_mip_level = MipLevel(level, *m_parent, data);
 }
diff --git a/Source/Core/VideoCommon/TextureInfo.h b/Source/Core/VideoCommon/TextureInfo.h
index 49c76810c563..13291738b7a4 100644
--- a/Source/Core/VideoCommon/TextureInfo.h
+++ b/Source/Core/VideoCommon/TextureInfo.h
@@ -7,14 +7,13 @@
 #include <span>
 #include <string>
 #include <string_view>
-#include <vector>
 
 #include "Common/CommonTypes.h"
 
 enum class TextureFormat;
 enum class TLUTFormat;
 
-class TextureInfo
+class TextureInfo final
 {
 public:
   static TextureInfo FromStage(u32 stage);
@@ -34,87 +33,144 @@ class TextureInfo
   };
   NameDetails CalculateTextureName() const;
 
-  bool IsDataValid() const;
+  bool IsDataValid() const { return m_data_valid; }
 
-  const u8* GetData() const;
-  const u8* GetTlutAddress() const;
+  const u8* GetData() const { return m_data.data(); }
+  const u8* GetTlutAddress() const { return m_tlut_data.data(); }
 
-  u32 GetRawAddress() const;
+  u32 GetRawAddress() const { return m_address; }
 
-  bool IsFromTmem() const;
-  const u8* GetTmemOddAddress() const;
+  bool IsFromTmem() const { return m_from_tmem; }
+  const u8* GetTmemOddAddress() const { return m_tmem_odd.data(); }
 
-  TextureFormat GetTextureFormat() const;
-  TLUTFormat GetTlutFormat() const;
+  TextureFormat GetTextureFormat() const { return m_texture_format; }
+  TLUTFormat GetTlutFormat() const { return m_tlut_format; }
 
-  std::optional<u32> GetPaletteSize() const;
-  u32 GetTextureSize() const;
+  std::optional<u32> GetPaletteSize() const { return m_palette_size; }
+  u32 GetTextureSize() const { return m_texture_size; }
 
-  u32 GetBlockWidth() const;
-  u32 GetBlockHeight() const;
+  u32 GetBlockWidth() const { return m_block_width; }
+  u32 GetBlockHeight() const { return m_block_height; }
 
-  u32 GetExpandedWidth() const;
-  u32 GetExpandedHeight() const;
+  u32 GetExpandedWidth() const { return m_expanded_width; }
+  u32 GetExpandedHeight() const { return m_expanded_height; }
 
-  u32 GetRawWidth() const;
-  u32 GetRawHeight() const;
+  u32 GetRawWidth() const { return m_raw_width; }
+  u32 GetRawHeight() const { return m_raw_height; }
 
-  u32 GetStage() const;
+  u32 GetStage() const { return m_stage; }
 
-  class MipLevel
+  class MipLevel final
   {
   public:
-    MipLevel(u32 level, const TextureInfo& parent, bool from_tmem, std::span<const u8>* src_data,
-             std::span<const u8>* tmem_even, std::span<const u8>* tmem_odd);
+    MipLevel() = default;
+    MipLevel(u32 level, const TextureInfo& parent, std::span<const u8>* data);
 
-    bool IsDataValid() const;
+    bool IsDataValid() const { return m_data_valid; }
 
-    const u8* GetData() const;
-    u32 GetTextureSize() const;
+    const u8* GetData() const { return m_ptr; }
+    u32 GetTextureSize() const { return m_texture_size; }
 
-    u32 GetExpandedWidth() const;
-    u32 GetExpandedHeight() const;
+    u32 GetExpandedWidth() const { return m_expanded_width; }
+    u32 GetExpandedHeight() const { return m_expanded_height; }
 
-    u32 GetRawWidth() const;
-    u32 GetRawHeight() const;
+    u32 GetRawWidth() const { return m_raw_width; }
+    u32 GetRawHeight() const { return m_raw_height; }
+
+    u32 GetLevel() const { return m_level; }
 
   private:
-    bool m_data_valid;
+    bool m_data_valid = false;
 
-    const u8* m_ptr;
+    const u8* m_ptr = nullptr;
 
     u32 m_texture_size = 0;
 
-    u32 m_expanded_width;
-    u32 m_raw_width;
+    u32 m_expanded_width = 0;
+    u32 m_raw_width = 0;
+
+    u32 m_expanded_height = 0;
+    u32 m_raw_height = 0;
+
+    u32 m_level = 0;
+  };
+
+  class MipLevelIterator final
+  {
+    friend TextureInfo;
+
+  public:
+    using difference_type = u32;
+    using value_type = MipLevel;
+
+    MipLevel& operator*() { return m_mip_level; }
+
+    const MipLevel& operator*() const { return m_mip_level; }
+
+    MipLevelIterator& operator++();
+
+    MipLevelIterator operator++(int)
+    {
+      auto tmp = *this;
+      ++*this;
+      return tmp;
+    }
 
-    u32 m_expanded_height;
-    u32 m_raw_height;
+    bool operator==(const MipLevelIterator& other) const
+    {
+      return m_level_index == other.m_level_index;
+    }
+
+  private:
+    void CreateMipLevel();
+
+    MipLevel m_mip_level;
+
+    const TextureInfo* m_parent = nullptr;
+    u32 m_level_index = 0;
+    bool m_from_tmem = false;
+    std::span<const u8> m_data;
+    std::span<const u8> m_tmem_even;
+    std::span<const u8> m_tmem_odd;
+  };
+
+  class MipLevels final
+  {
+  public:
+    MipLevels(MipLevelIterator begin, MipLevelIterator end) : m_begin(begin), m_end(end) {}
+
+    MipLevelIterator begin() const { return m_begin; }
+    MipLevelIterator end() const { return m_end; }
+
+  private:
+    MipLevelIterator m_begin;
+    MipLevelIterator m_end;
   };
 
-  bool HasMipMaps() const;
-  u32 GetLevelCount() const;
-  const MipLevel* GetMipMapLevel(u32 level) const;
+  bool HasMipMaps() const { return m_limited_mip_count != 0; }
+  u32 GetLevelCount() const { return m_limited_mip_count + 1; }
+  MipLevels GetMipMapLevels() const;
   u32 GetFullLevelSize() const;
 
   static constexpr std::string_view format_prefix{"tex1_"};
 
 private:
-  const u8* m_ptr;
-  const u8* m_tlut_ptr;
+  std::span<const u8> m_data;
+  std::span<const u8> m_tlut_data;
 
   u32 m_address;
 
   bool m_data_valid;
 
   bool m_from_tmem;
-  const u8* m_tmem_odd;
+  std::span<const u8> m_tmem_even;
+  std::span<const u8> m_tmem_odd;
 
   TextureFormat m_texture_format;
   TLUTFormat m_tlut_format;
 
   bool m_mipmaps_enabled = false;
-  std::vector<MipLevel> m_mip_levels;
+  u32 m_limited_mip_count = 0;
 
   u32 m_texture_size = 0;
   std::optional<u32> m_palette_size;
diff --git a/Source/Core/VideoCommon/TextureUtils.cpp b/Source/Core/VideoCommon/TextureUtils.cpp
index 907b1ac523f0..bd4155087724 100644
--- a/Source/Core/VideoCommon/TextureUtils.cpp
+++ b/Source/Core/VideoCommon/TextureUtils.cpp
@@ -58,7 +58,7 @@ void TextureDumper::DumpTexture(const ::AbstractTexture& texture, std::string ba
     if (!File::IsDirectory(dump_dir))
       File::CreateDir(dump_dir);
 
-    for (auto& filename : Common::DoFileSearch({dump_dir}, {".png"}, true))
+    for (auto& filename : Common::DoFileSearch(dump_dir, ".png", true))
     {
       std::string name;
       SplitPath(filename, nullptr, &name, nullptr);
diff --git a/Source/Core/VideoCommon/UberShaderCommon.cpp b/Source/Core/VideoCommon/UberShaderCommon.cpp
index d35f2037376a..f605081481da 100644
--- a/Source/Core/VideoCommon/UberShaderCommon.cpp
+++ b/Source/Core/VideoCommon/UberShaderCommon.cpp
@@ -3,7 +3,8 @@
 
 #include "VideoCommon/UberShaderCommon.h"
 
-#include "Common/EnumUtils.h"
+#include <utility>
+
 #include "VideoCommon/NativeVertexFormat.h"
 #include "VideoCommon/ShaderGenCommon.h"
 #include "VideoCommon/VideoCommon.h"
@@ -120,11 +121,11 @@ void WriteVertexLighting(ShaderCode& out, APIType api_type, std::string_view wor
   out.Write("  if ({} != 0u) {{\n", BitfieldExtract<&LitChannel::enablelighting>("alphareg"));
   out.Write("    if ({} != 0u) {{\n", BitfieldExtract<&LitChannel::ambsource>("alphareg"));
   out.Write("      if ((components & ({}u << chan)) != 0u) // VB_HAS_COL0\n",
-            Common::ToUnderlying(VB_HAS_COL0));
+            std::to_underlying(VB_HAS_COL0));
   out.Write("        lacc.w = int(round(((chan == 0u) ? {}.w : {}.w) * 255.0));\n", in_color_0_var,
             in_color_1_var);
   out.Write("      else if ((components & {}u) != 0u) // VB_HAS_COLO0\n",
-            Common::ToUnderlying(VB_HAS_COL0));
+            std::to_underlying(VB_HAS_COL0));
   out.Write("        lacc.w = int(round({}.w * 255.0));\n", in_color_0_var);
   out.Write("      else\n"
             "        lacc.w = 255;\n"
diff --git a/Source/Core/VideoCommon/UberShaderPixel.cpp b/Source/Core/VideoCommon/UberShaderPixel.cpp
index 4eb41fa94e15..be6571ff7f8c 100644
--- a/Source/Core/VideoCommon/UberShaderPixel.cpp
+++ b/Source/Core/VideoCommon/UberShaderPixel.cpp
@@ -7,7 +7,6 @@
 
 #include "VideoCommon/BPMemory.h"
 #include "VideoCommon/DriverDetails.h"
-#include "VideoCommon/NativeVertexFormat.h"
 #include "VideoCommon/PixelShaderGen.h"
 #include "VideoCommon/ShaderGenCommon.h"
 #include "VideoCommon/UberShaderCommon.h"
@@ -399,9 +398,7 @@ ShaderCode GenPixelShader(APIType api_type, const ShaderHostConfig& host_config,
               "    D = D << scale;\n"
               "  }}\n"
               "\n"
-              "  // TODO: Is this rounding bias still added when the scale is divide by 2?  "
-              "Currently we "
-              "do not apply it.\n"
+              "  // This rounding bias is not added when the scale is divide by 2\n"
               "  if (scale != 3u)\n"
               "    lerp = lerp + (op ? 127 : 128);\n"
               "\n"
@@ -557,7 +554,7 @@ ShaderCode GenPixelShader(APIType api_type, const ShaderHostConfig& host_config,
   out.Write("}}\n"
             "\n");
 
-  // Since the fixed-point texture coodinate variables aren't global, we need to pass
+  // Since the fixed-point texture coordinate variables aren't global, we need to pass
   // them to the select function.  This applies to all backends.
   if (numTexgen > 0)
   {
diff --git a/Source/Core/VideoCommon/UberShaderVertex.cpp b/Source/Core/VideoCommon/UberShaderVertex.cpp
index a6c0502dfec0..6f79564eddaa 100644
--- a/Source/Core/VideoCommon/UberShaderVertex.cpp
+++ b/Source/Core/VideoCommon/UberShaderVertex.cpp
@@ -3,9 +3,9 @@
 
 #include "VideoCommon/UberShaderVertex.h"
 
-#include "Common/EnumUtils.h"
+#include <utility>
+
 #include "VideoCommon/ConstantManager.h"
-#include "VideoCommon/DriverDetails.h"
 #include "VideoCommon/NativeVertexFormat.h"
 #include "VideoCommon/UberShaderCommon.h"
 #include "VideoCommon/VertexShaderGen.h"
@@ -224,7 +224,7 @@ float3 load_input_float3_rawtex(uint vtx_offset, uint attr_offset) {{
             "float3 N2;\n"
             "\n"
             "if ((components & {}u) != 0u) {{ // VB_HAS_POSMTXIDX\n",
-            Common::ToUnderlying(VB_HAS_POSMTXIDX));
+            std::to_underlying(VB_HAS_POSMTXIDX));
   LoadVertexAttribute(out, host_config, 2, "posmtx", "uint4", "ubyte4");
   out.Write("  // Vertex format has a per-vertex matrix\n"
             "  int posidx = int(posmtx.r);\n"
@@ -256,7 +256,7 @@ float3 load_input_float3_rawtex(uint vtx_offset, uint attr_offset) {{
             "float3 _rawbinormal;\n"
             "if ((components & {}u) != 0u) // VB_HAS_NORMAL\n"
             "{{\n",
-            Common::ToUnderlying(VB_HAS_NORMAL));
+            std::to_underlying(VB_HAS_NORMAL));
   LoadVertexAttribute(out, host_config, 2, "rawnormal", "float3", "float3");
   out.Write("  _rawnormal = rawnormal;\n"
             "}}\n"
@@ -267,7 +267,7 @@ float3 load_input_float3_rawtex(uint vtx_offset, uint attr_offset) {{
             "\n"
             "if ((components & {}u) != 0u) // VB_HAS_TANGENT\n"
             "{{\n",
-            Common::ToUnderlying(VB_HAS_TANGENT));
+            std::to_underlying(VB_HAS_TANGENT));
   LoadVertexAttribute(out, host_config, 2, "rawtangent", "float3", "float3");
   out.Write("  _rawtangent = rawtangent;\n"
             "}}\n"
@@ -278,7 +278,7 @@ float3 load_input_float3_rawtex(uint vtx_offset, uint attr_offset) {{
             "\n"
             "if ((components & {}u) != 0u) // VB_HAS_BINORMAL\n"
             "{{\n",
-            Common::ToUnderlying(VB_HAS_BINORMAL));
+            std::to_underlying(VB_HAS_BINORMAL));
   LoadVertexAttribute(out, host_config, 2, "rawbinormal", "float3", "float3");
   out.Write("  _rawbinormal = rawbinormal;\n"
             "}}\n"
@@ -320,14 +320,14 @@ float3 load_input_float3_rawtex(uint vtx_offset, uint attr_offset) {{
             "}}\n"
             "else if ((components & {}u) != 0u) // VB_HAS_COL0\n"
             "{{\n",
-            Common::ToUnderlying(VB_HAS_COL0));
+            std::to_underlying(VB_HAS_COL0));
   LoadVertexAttribute(out, host_config, 2, "rawcolor0", "float4", "ubyte4");
   out.Write("  vertex_color_0 = rawcolor0;\n"
             "  vertex_color_1 = rawcolor0;\n"
             "}}\n"
             "else if ((components & {}u) != 0u) // VB_HAS_COL1\n"
             "{{\n",
-            Common::ToUnderlying(VB_HAS_COL1));
+            std::to_underlying(VB_HAS_COL1));
   LoadVertexAttribute(out, host_config, 2, "rawcolor1", "float4", "ubyte4");
   out.Write("  vertex_color_0 = rawcolor1;\n"
             "  vertex_color_1 = rawcolor1;\n"
@@ -347,7 +347,7 @@ float3 load_input_float3_rawtex(uint vtx_offset, uint attr_offset) {{
 
   if (host_config.backend_vs_point_line_expand)
   {
-    out.Write("if (vs_expand == {}u) {{ // Line\n", Common::ToUnderlying(VSExpand::Line));
+    out.Write("if (vs_expand == {}u) {{ // Line\n", std::to_underlying(VSExpand::Line));
     out.Write("  bool is_bottom = (gl_VertexID & 2) != 0;\n"
               "  bool is_right = (gl_VertexID & 1) != 0;\n"
               "  uint other_base_offset = vertex_base_offset;\n"
@@ -362,7 +362,7 @@ float3 load_input_float3_rawtex(uint vtx_offset, uint attr_offset) {{
               "  float4 other_p1 = P1;\n"
               "  float4 other_p2 = P2;\n"
               "  if ((components & {}u) != 0u) {{ // VB_HAS_POSMTXIDX\n",
-              Common::ToUnderlying(VB_HAS_POSMTXIDX));
+              std::to_underlying(VB_HAS_POSMTXIDX));
     out.Write("    uint other_posidx = load_input_uint4_ubyte4(other_base_offset, "
               "vertex_offset_posmtx).r;\n"
               "    other_p0 = " I_TRANSFORMMATRICES "[other_posidx];\n"
@@ -372,7 +372,7 @@ float3 load_input_float3_rawtex(uint vtx_offset, uint attr_offset) {{
               "  float4 other_pos = float4(dot(other_p0, other_rawpos), "
               "dot(other_p1, other_rawpos), dot(other_p2, other_rawpos), 1.0);\n");
     GenerateVSLineExpansion(out, "  ", num_texgen);
-    out.Write("}} else if (vs_expand == {}u) {{ // Point\n", Common::ToUnderlying(VSExpand::Point));
+    out.Write("}} else if (vs_expand == {}u) {{ // Point\n", std::to_underlying(VSExpand::Point));
     out.Write("  bool is_bottom = (gl_VertexID & 2) != 0;\n"
               "  bool is_right = (gl_VertexID & 1) != 0;\n");
     GenerateVSPointExpansion(out, "  ", num_texgen);
@@ -438,7 +438,7 @@ float3 load_input_float3_rawtex(uint vtx_offset, uint attr_offset) {{
   // There are two different ways to do this, when the depth range is oversized, we process
   // the depth range in the vertex shader, if not we let the host driver handle it.
   //
-  // Adjust z for the depth range. We're using an equation which incorperates a depth inversion,
+  // Adjust z for the depth range. We're using an equation which incorporates a depth inversion,
   // so we can map the console -1..0 range to the 0..1 range used in the depth buffer.
   // We have to handle the depth range in the vertex shader instead of after the perspective
   // divide, because some games will use a depth range larger than what is allowed by the
@@ -450,7 +450,7 @@ float3 load_input_float3_rawtex(uint vtx_offset, uint attr_offset) {{
   if (!host_config.backend_clip_control)
   {
     // If the graphics API doesn't support a depth range of 0..1, then we need to map z to
-    // the -1..1 range. Unfortunately we have to use a substraction, which is a lossy floating-point
+    // the -1..1 range. Unfortunately we have to use a subtraction, which is a lossy floating-point
     // operation that can introduce a round-trip error.
     out.Write("o.pos.z = o.pos.z * 2.0 - o.pos.w;\n");
   }
@@ -552,7 +552,7 @@ static void GenVertexShaderTexGens(APIType api_type, const ShaderHostConfig& hos
   out.Write("  case {:s}:\n", SourceRow::Normal);
   out.Write("    if ((components & {}u) != 0u) // VB_HAS_NORMAL\n"
             "    {{\n",
-            Common::ToUnderlying(VB_HAS_NORMAL));
+            std::to_underlying(VB_HAS_NORMAL));
   LoadVertexAttribute(out, host_config, 6, "rawnormal", "float3", "float3");
   out.Write("      coord.xyz = rawnormal.xyz;\n"
             "    }}\n"
@@ -560,7 +560,7 @@ static void GenVertexShaderTexGens(APIType api_type, const ShaderHostConfig& hos
   out.Write("  case {:s}:\n", SourceRow::BinormalT);
   out.Write("    if ((components & {}u) != 0u) // VB_HAS_TANGENT\n"
             "    {{\n",
-            Common::ToUnderlying(VB_HAS_TANGENT));
+            std::to_underlying(VB_HAS_TANGENT));
   LoadVertexAttribute(out, host_config, 6, "rawtangent", "float3", "float3");
   out.Write("      coord.xyz = rawtangent.xyz;\n"
             "    }}\n"
@@ -568,14 +568,14 @@ static void GenVertexShaderTexGens(APIType api_type, const ShaderHostConfig& hos
   out.Write("  case {:s}:\n", SourceRow::BinormalB);
   out.Write("    if ((components & {}u) != 0u) // VB_HAS_BINORMAL\n"
             "    {{\n",
-            Common::ToUnderlying(VB_HAS_BINORMAL));
+            std::to_underlying(VB_HAS_BINORMAL));
   LoadVertexAttribute(out, host_config, 6, "rawbinormal", "float3", "float3");
   out.Write("      coord.xyz = rawbinormal.xyz;\n"
             "    }}\n"
             "    break;\n\n");
   for (u32 i = 0; i < 8; i++)
   {
-    out.Write("  case {:s}:\n", static_cast<SourceRow>(Common::ToUnderlying(SourceRow::Tex0) + i));
+    out.Write("  case {:s}:\n", static_cast<SourceRow>(std::to_underlying(SourceRow::Tex0) + i));
     out.Write("    if ((components & {}u) != 0u) // VB_HAS_UV{}\n"
               "    {{\n",
               VB_HAS_UV0 << i, i);
@@ -632,7 +632,7 @@ static void GenVertexShaderTexGens(APIType api_type, const ShaderHostConfig& hos
   out.Write("  default:\n"
             "    {{\n");
   out.Write("      if ((components & ({}u /* VB_HAS_TEXMTXIDX0 */ << texgen)) != 0u) {{\n",
-            Common::ToUnderlying(VB_HAS_TEXMTXIDX0));
+            std::to_underlying(VB_HAS_TEXMTXIDX0));
   if (host_config.backend_dynamic_vertex_loader || host_config.backend_vs_point_line_expand)
   {
     out.Write("        int tmp = int(load_input_float3_rawtex(vertex_base_offset, "
diff --git a/Source/Core/VideoCommon/VertexLoaderBase.cpp b/Source/Core/VideoCommon/VertexLoaderBase.cpp
index 36b6a2a67f15..98eb651796f0 100644
--- a/Source/Core/VideoCommon/VertexLoaderBase.cpp
+++ b/Source/Core/VideoCommon/VertexLoaderBase.cpp
@@ -7,16 +7,12 @@
 #include <bit>
 #include <cstring>
 #include <memory>
-#include <string>
 #include <vector>
 
-#include <fmt/format.h>
 #include <fmt/ranges.h>
 
 #include "Common/Assert.h"
-#include "Common/BitUtils.h"
 #include "Common/CommonTypes.h"
-#include "Common/Logging/Log.h"
 #include "Common/MsgHandler.h"
 
 #include "VideoCommon/VertexLoader.h"
diff --git a/Source/Core/VideoCommon/VertexLoaderManager.cpp b/Source/Core/VideoCommon/VertexLoaderManager.cpp
index 32094b46e071..ce137015691b 100644
--- a/Source/Core/VideoCommon/VertexLoaderManager.cpp
+++ b/Source/Core/VideoCommon/VertexLoaderManager.cpp
@@ -25,7 +25,6 @@
 #include "VideoCommon/BPMemory.h"
 #include "VideoCommon/CPMemory.h"
 #include "VideoCommon/DataReader.h"
-#include "VideoCommon/IndexGenerator.h"
 #include "VideoCommon/NativeVertexFormat.h"
 #include "VideoCommon/Statistics.h"
 #include "VideoCommon/VertexLoaderBase.h"
diff --git a/Source/Core/VideoCommon/VertexLoaderX64.cpp b/Source/Core/VideoCommon/VertexLoaderX64.cpp
index 70ea700fdb2b..fd3692a9a11c 100644
--- a/Source/Core/VideoCommon/VertexLoaderX64.cpp
+++ b/Source/Core/VideoCommon/VertexLoaderX64.cpp
@@ -5,11 +5,9 @@
 
 #include <array>
 #include <cstring>
-#include <string>
 
 #include "Common/BitSet.h"
 #include "Common/CPUDetect.h"
-#include "Common/Common.h"
 #include "Common/CommonTypes.h"
 #include "Common/Intrinsics.h"
 #include "Common/JitRegister.h"
diff --git a/Source/Core/VideoCommon/VertexManagerBase.cpp b/Source/Core/VideoCommon/VertexManagerBase.cpp
index ce6c07ddb1b6..2bc6d586d78c 100644
--- a/Source/Core/VideoCommon/VertexManagerBase.cpp
+++ b/Source/Core/VideoCommon/VertexManagerBase.cpp
@@ -36,7 +36,6 @@
 #include "VideoCommon/PixelShaderManager.h"
 #include "VideoCommon/Statistics.h"
 #include "VideoCommon/TextureCacheBase.h"
-#include "VideoCommon/TextureInfo.h"
 #include "VideoCommon/VertexLoaderManager.h"
 #include "VideoCommon/VertexShaderManager.h"
 #include "VideoCommon/VideoBackendBase.h"
@@ -569,7 +568,7 @@ void VertexManagerBase::Flush()
     {
       for (const u32 i : used_textures)
       {
-        const auto cache_entry = g_texture_cache->Load(TextureInfo::FromStage(i));
+        const auto cache_entry = g_texture_cache->Load(i);
         if (!cache_entry)
           continue;
         const float custom_tex_scale = cache_entry->GetWidth() / float(cache_entry->native_width);
@@ -581,7 +580,7 @@ void VertexManagerBase::Flush()
     {
       for (const u32 i : used_textures)
       {
-        const auto cache_entry = g_texture_cache->Load(TextureInfo::FromStage(i));
+        const auto cache_entry = g_texture_cache->Load(i);
         if (cache_entry)
         {
           if (!Common::Contains(texture_names, cache_entry->texture_info_name))
@@ -965,7 +964,7 @@ void VertexManagerBase::OnDraw()
 
 void VertexManagerBase::OnCPUEFBAccess()
 {
-  // Check this isn't another access without any draws inbetween.
+  // Check this isn't another access without any draws in between.
   if (!m_cpu_accesses_this_frame.empty() && m_cpu_accesses_this_frame.back() == m_draw_counter)
     return;
 
diff --git a/Source/Core/VideoCommon/VertexShaderGen.cpp b/Source/Core/VideoCommon/VertexShaderGen.cpp
index 4dec9a3b211b..837c30c55625 100644
--- a/Source/Core/VideoCommon/VertexShaderGen.cpp
+++ b/Source/Core/VideoCommon/VertexShaderGen.cpp
@@ -792,7 +792,7 @@ ShaderCode GenerateVertexShaderCode(APIType api_type, const ShaderHostConfig& ho
   // There are two different ways to do this, when the depth range is oversized, we process
   // the depth range in the vertex shader, if not we let the host driver handle it.
   //
-  // Adjust z for the depth range. We're using an equation which incorperates a depth inversion,
+  // Adjust z for the depth range. We're using an equation which incorporates a depth inversion,
   // so we can map the console -1..0 range to the 0..1 range used in the depth buffer.
   // We have to handle the depth range in the vertex shader instead of after the perspective
   // divide, because some games will use a depth range larger than what is allowed by the
@@ -804,7 +804,7 @@ ShaderCode GenerateVertexShaderCode(APIType api_type, const ShaderHostConfig& ho
   if (!host_config.backend_clip_control)
   {
     // If the graphics API doesn't support a depth range of 0..1, then we need to map z to
-    // the -1..1 range. Unfortunately we have to use a substraction, which is a lossy floating-point
+    // the -1..1 range. Unfortunately we have to use a subtraction, which is a lossy floating-point
     // operation that can introduce a round-trip error.
     out.Write("o.pos.z = o.pos.z * 2.0 - o.pos.w;\n");
   }
diff --git a/Source/Core/VideoCommon/VideoBackendBase.cpp b/Source/Core/VideoCommon/VideoBackendBase.cpp
index 03d1a9f2358c..6cdbaa18daba 100644
--- a/Source/Core/VideoCommon/VideoBackendBase.cpp
+++ b/Source/Core/VideoCommon/VideoBackendBase.cpp
@@ -43,7 +43,6 @@
 #endif
 
 #include "VideoCommon/AbstractGfx.h"
-#include "VideoCommon/Assets/CustomResourceManager.h"
 #include "VideoCommon/AsyncRequests.h"
 #include "VideoCommon/BPStructs.h"
 #include "VideoCommon/BoundingBox.h"
@@ -59,6 +58,7 @@
 #include "VideoCommon/PixelEngine.h"
 #include "VideoCommon/PixelShaderManager.h"
 #include "VideoCommon/Present.h"
+#include "VideoCommon/Resources/CustomResourceManager.h"
 #include "VideoCommon/TMEM.h"
 #include "VideoCommon/TextureCacheBase.h"
 #include "VideoCommon/VertexLoaderManager.h"
@@ -385,10 +385,8 @@ bool VideoBackendBase::InitializeShared(std::unique_ptr<AbstractGfx> gfx,
 
 void VideoBackendBase::ShutdownShared()
 {
-#ifndef __LIBRETRO__
   auto& system = Core::System::GetInstance();
   system.GetCustomResourceManager().Shutdown();
-#endif
   g_frame_dumper.reset();
   g_presenter.reset();
 
diff --git a/Source/Core/VideoCommon/VideoConfig.cpp b/Source/Core/VideoCommon/VideoConfig.cpp
index a15331569d89..d2cacd727624 100644
--- a/Source/Core/VideoCommon/VideoConfig.cpp
+++ b/Source/Core/VideoCommon/VideoConfig.cpp
@@ -305,10 +305,9 @@ void CheckForConfigChanges()
   const auto old_hdr = g_ActiveConfig.bHDR;
 
   UpdateActiveConfig();
-  FreeLook::UpdateActiveConfig();
   g_vertex_manager->OnConfigChange();
 
-  g_freelook_camera.SetControlType(FreeLook::GetActiveConfig().camera_config.control_type);
+  g_freelook_camera.RefreshConfig();
 
   if (g_ActiveConfig.bGraphicMods && !old_graphics_mods_enabled)
   {
diff --git a/Source/Core/VideoCommon/VideoConfig.h b/Source/Core/VideoCommon/VideoConfig.h
index b826fcb78346..3f82e3afe744 100644
--- a/Source/Core/VideoCommon/VideoConfig.h
+++ b/Source/Core/VideoCommon/VideoConfig.h
@@ -4,7 +4,7 @@
 // IMPORTANT: UI etc should modify g_Config. Graphics code should read g_ActiveConfig.
 // The reason for this is to get rid of race conditions etc when the configuration
 // changes in the middle of a frame. This is done by copying g_Config to g_ActiveConfig
-// at the start of every frame. Noone should ever change members of g_ActiveConfig
+// at the start of every frame. No one should ever change members of g_ActiveConfig
 // directly.
 
 #pragma once
diff --git a/Source/Core/VideoCommon/VideoState.cpp b/Source/Core/VideoCommon/VideoState.cpp
index d5f53f4963b1..4b1892ad8f13 100644
--- a/Source/Core/VideoCommon/VideoState.cpp
+++ b/Source/Core/VideoCommon/VideoState.cpp
@@ -3,8 +3,6 @@
 
 #include "VideoCommon/VideoState.h"
 
-#include <cstring>
-
 #include "Common/ChunkFile.h"
 #include "Core/System.h"
 #include "VideoCommon/BPMemory.h"
diff --git a/Source/Core/WinUpdater/Platform.cpp b/Source/Core/WinUpdater/Platform.cpp
index 5550058a7a87..8e6d0eaf6f31 100644
--- a/Source/Core/WinUpdater/Platform.cpp
+++ b/Source/Core/WinUpdater/Platform.cpp
@@ -246,9 +246,9 @@ static VersionCheckResult OSVersionCheck(const BuildInfo& build_info)
   return result;
 }
 
-std::optional<BuildInfos> InitBuildInfos(const std::vector<TodoList::UpdateOp>& to_update,
-                                         const std::string& install_base_path,
-                                         const std::string& temp_dir)
+static std::optional<BuildInfos> InitBuildInfos(const std::vector<TodoList::UpdateOp>& to_update,
+                                                const std::string& install_base_path,
+                                                const std::string& temp_dir)
 {
   const auto op_it = std::ranges::find(to_update, "build_info.txt", &TodoList::UpdateOp::filename);
   if (op_it == to_update.cend())
@@ -278,7 +278,7 @@ std::optional<BuildInfos> InitBuildInfos(const std::vector<TodoList::UpdateOp>&
   return build_infos;
 }
 
-bool CheckBuildInfo(const BuildInfos& build_infos)
+static bool CheckBuildInfo(const BuildInfos& build_infos)
 {
   // The existing BuildInfo may have been modified. Be careful not to overly trust its contents!
 
diff --git a/Source/Core/WinUpdater/WinUI.cpp b/Source/Core/WinUpdater/WinUI.cpp
index 3c9185bd51f8..c5988881d02c 100644
--- a/Source/Core/WinUpdater/WinUI.cpp
+++ b/Source/Core/WinUpdater/WinUI.cpp
@@ -55,7 +55,7 @@ constexpr int PADDING_HEIGHT = 5;
 
 namespace UI
 {
-bool InitWindow()
+static bool InitWindow()
 {
   InitCommonControls();
 
@@ -78,7 +78,7 @@ bool InitWindow()
     return false;
 
   if (SUCCEEDED(CoCreateInstance(CLSID_TaskbarList, nullptr, CLSCTX_INPROC_SERVER,
-                                 IID_PPV_ARGS(taskbar_list.GetAddressOf()))))
+                                 IID_PPV_ARGS(&taskbar_list))))
   {
     if (FAILED(taskbar_list->HrInit()))
     {
@@ -206,7 +206,7 @@ void SetDescription(const std::string& text)
   SetWindowText(label_handle, UTF8ToWString(text).c_str());
 }
 
-void MessageLoop()
+static void MessageLoop()
 {
   HRESULT result = CoInitializeEx(nullptr, COINIT_MULTITHREADED);
 
diff --git a/Source/DSPSpy/tests/dsp_base_noirq.inc b/Source/DSPSpy/tests/dsp_base_noirq.inc
index 048926a0213f..9d1051e40ceb 100644
--- a/Source/DSPSpy/tests/dsp_base_noirq.inc
+++ b/Source/DSPSpy/tests/dsp_base_noirq.inc
@@ -236,7 +236,7 @@ dma_copy:
 	si		@DMBL, #0xfeeb
 	si		@DIRQ, #0x0001
 
-; wait for the CPU to recieve our response before we execute the next op
+; wait for the CPU to receive our response before we execute the next op
 	call	0x8078
 	andi	$ac0.m, #0x7fff
 	lrs		$ac1.m, @CMBL
diff --git a/Source/PCH/CMakeLists.txt b/Source/PCH/CMakeLists.txt
index 50f3fa234b84..9123f803e0df 100644
--- a/Source/PCH/CMakeLists.txt
+++ b/Source/PCH/CMakeLists.txt
@@ -2,7 +2,7 @@
 # Instead of having one PCH per module, dolphin has one PCH shared between all modules.
 # So we need to implement PCH manually, rather than using the PCH support built into cmake
 
-# linking against this interface libary will cause targets to enable PCH
+# linking against this interface library will cause targets to enable PCH
 add_library(use_pch INTERFACE)
 
 # Uncomment this return to disable PCH
@@ -23,37 +23,37 @@ target_compile_options(build_pch PUBLIC /Fp$<TARGET_FILE_DIR:build_pch>/dolphin.
 # Sharing a PCH breaks pdb files. So we use the /Z7 option to inline the pdb into
 # the binary. However MSVC gets noisy if you set both /Zi and /Z7
 if (POLICY CMP0141)
-    # CMake 3.25 has a policy that makes us control this somewhat sanely
-    set_property(TARGET build_pch PROPERTY MSVC_DEBUG_INFORMATION_FORMAT "$<$<CONFIG:Debug,RelWithDebInfo>:Embedded>")
+  # CMake 3.25 has a policy that makes us control this somewhat sanely
+  set_property(TARGET build_pch PROPERTY MSVC_DEBUG_INFORMATION_FORMAT "$<$<CONFIG:Debug,RelWithDebInfo>:Embedded>")
 
-    # Unfortnually, properties don't propagate. So we also set it globally via parent scope
-    set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "$<$<CONFIG:Debug,RelWithDebInfo>:Embedded>" PARENT_SCOPE)
+  # Unfortnually, properties don't propagate. So we also set it globally via parent scope
+  set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "$<$<CONFIG:Debug,RelWithDebInfo>:Embedded>" PARENT_SCOPE)
 else()
-    if (CMAKE_CXX_FLAGS_DEBUG MATCHES "/Zi")
-        # Otherwise we do an ugly string replace to remove it from FLAGS_DEBUG
-        string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
-        string(REPLACE "/Zi" "/Z7" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
+  if (CMAKE_CXX_FLAGS_DEBUG MATCHES "/Zi")
+    # Otherwise we do an ugly string replace to remove it from FLAGS_DEBUG
+    string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
+    string(REPLACE "/Zi" "/Z7" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
 
-        # and also overwrite the version in the parent scope
-        set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}" PARENT_SCOPE)
-        set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}" PARENT_SCOPE)
+    # and also overwrite the version in the parent scope
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}" PARENT_SCOPE)
+    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}" PARENT_SCOPE)
 
-        target_compile_options(build_pch PUBLIC "$<$<CONFIG:Debug,RelWithDebInfo>:/Z7>")
-    endif()
+    target_compile_options(build_pch PUBLIC "$<$<CONFIG:Debug,RelWithDebInfo>:/Z7>")
+  endif()
 endif()
 # Setting /Z7 also requires us to disable minimal rebuilds.
 target_compile_options(build_pch PUBLIC "$<$<CONFIG:Debug,RelWithDebInfo>:/Gm->")
 
 # To get this working with ninja, we need to tell it that compiling pch.cpp generates an extra output
 set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/pch.cpp PROPERTIES
-    OBJECT_OUTPUTS $<TARGET_FILE_DIR:build_pch>/dolphin.pch
+  OBJECT_OUTPUTS $<TARGET_FILE_DIR:build_pch>/dolphin.pch
 )
 
 # and then create a custom target that depends on the pch output
 # so that ninja won't start building anything that depends on this
 # target before the pch is built
 add_custom_target(force_build_pch
-    DEPENDS $<TARGET_FILE_DIR:build_pch>/dolphin.pch
+  DEPENDS $<TARGET_FILE_DIR:build_pch>/dolphin.pch
 )
 
 # link the pch into anything that depends on use_pch
diff --git a/Source/UnitTests/Common/AssemblerTest.cpp b/Source/UnitTests/Common/AssemblerTest.cpp
index ac8f98666aae..1af63b274ece 100644
--- a/Source/UnitTests/Common/AssemblerTest.cpp
+++ b/Source/UnitTests/Common/AssemblerTest.cpp
@@ -2258,7 +2258,7 @@ TEST(Assembler, InvalidNumericLabels)
   res = Assemble(forward_directive, 0);
   EXPECT_TRUE(IsFailure(res) &&
               GetFailure(res).message ==
-                  "Forward label references not supported in fully resolved expressons")
+                  "Forward label references not supported in fully resolved expressions")
       << GetFailure(res).message;
   res = Assemble(missing_backward_directive, 0);
   EXPECT_TRUE(IsFailure(res) && GetFailure(res).message == "No numeric label '0' found above here")
diff --git a/Source/UnitTests/Common/BusyLoopTest.cpp b/Source/UnitTests/Common/BusyLoopTest.cpp
index 4108876aad1a..27d04b407c69 100644
--- a/Source/UnitTests/Common/BusyLoopTest.cpp
+++ b/Source/UnitTests/Common/BusyLoopTest.cpp
@@ -1,7 +1,6 @@
 // Copyright 2014 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include <atomic>
 #include <thread>
 
 #include <gtest/gtest.h>
@@ -32,7 +31,7 @@ TEST(BusyLoopTest, MultiThreaded)
     {
       // We normally have to call Wakeup to assure the Event is triggered.
       // But this check is for an internal feature of the BlockingLoop.
-      // It's implemented to fall back to a busy loop regulary.
+      // It's implemented to fall back to a busy loop regularly.
       // If we're in the busy loop, the payload (and so the Event) is called all the time.
       // loop.Wakeup();
       e.Wait();
diff --git a/Source/UnitTests/Common/MutexTest.cpp b/Source/UnitTests/Common/MutexTest.cpp
index 222724ad5023..eb3bba6d150a 100644
--- a/Source/UnitTests/Common/MutexTest.cpp
+++ b/Source/UnitTests/Common/MutexTest.cpp
@@ -6,9 +6,11 @@
 #include <algorithm>
 #include <chrono>
 #include <mutex>
+#include <shared_mutex>
 #include <thread>
 
 #include "Common/Mutex.h"
+#include "Common/TransferableSharedMutex.h"
 
 template <typename MutexType>
 static void DoAtomicMutexTests(const char mutex_name[])
@@ -100,3 +102,123 @@ TEST(Mutex, AtomicMutex)
   DoAtomicMutexTests<Common::AtomicMutex>("AtomicMutex");
   DoAtomicMutexTests<Common::SpinMutex>("SpinMutex");
 }
+
+TEST(Mutex, TransferableSharedMutex)
+{
+  Common::TransferableSharedMutex work_mutex;
+
+  bool worker_done = false;
+
+  static constexpr auto SLEEP_TIME = std::chrono::microseconds{1};
+
+  // lock() on main thread, unlock() on worker thread.
+  std::thread thread{[&, lk = std::unique_lock{work_mutex}] {
+    std::this_thread::sleep_for(SLEEP_TIME);
+    worker_done = true;
+  }};
+
+  // lock() waits for the thread to unlock().
+  {
+    std::lock_guard lk{work_mutex};
+    EXPECT_TRUE(worker_done);
+  }
+
+  thread.join();
+
+  // Prevent below workers from incrementing `done_count`.
+  Common::TransferableSharedMutex done_mutex;
+  std::unique_lock done_lk{done_mutex};
+
+  // try_*() fails when holding an exclusive lock.
+  EXPECT_FALSE(done_mutex.try_lock());
+  EXPECT_FALSE(done_mutex.try_lock_shared());
+
+  static constexpr int THREAD_COUNT = 4;
+  static constexpr int REPEAT_COUNT = 100;
+  static constexpr int TOTAL_ITERATIONS = THREAD_COUNT * REPEAT_COUNT;
+
+  std::atomic<int> work_count = 0;
+  std::atomic<int> done_count = 0;
+  int additional_work_count = 0;
+
+  std::atomic<int> try_lock_fail_count = 0;
+  std::atomic<int> try_lock_shared_fail_count = 0;
+
+  std::vector<std::thread> threads(THREAD_COUNT);
+  for (auto& t : threads)
+  {
+    // lock_shared() multiple times on main thread.
+    t = std::thread{[&, work_lk = std::shared_lock{work_mutex}]() mutable {
+      std::this_thread::sleep_for(SLEEP_TIME);
+
+      // try_lock() fails after lock_shared().
+      EXPECT_FALSE(work_mutex.try_lock());
+
+      // Main thread already holds done_mutex.
+      EXPECT_FALSE(done_mutex.try_lock());
+      EXPECT_FALSE(done_mutex.try_lock_shared());
+
+      ++work_count;
+
+      // Signal work is done.
+      work_lk.unlock();
+
+      // lock_shared() blocks until main thread unlock()s.
+      {
+        std::shared_lock lk{done_mutex};
+        ++done_count;
+      }
+
+      // Contesting all of [try_]lock[_shared] doesn't explode.
+      for (int i = 0; i != REPEAT_COUNT; ++i)
+      {
+        while (!work_mutex.try_lock())
+        {
+          try_lock_fail_count.fetch_add(1, std::memory_order_relaxed);
+        }
+        work_mutex.unlock();
+
+        while (!work_mutex.try_lock_shared())
+        {
+          try_lock_shared_fail_count.fetch_add(1, std::memory_order_relaxed);
+        }
+        work_mutex.unlock_shared();
+        {
+          std::lock_guard lk{work_mutex};
+          ++additional_work_count;
+        }
+        std::shared_lock lk{work_mutex};
+      }
+    }};
+  }
+
+  // lock() waits for threads to unlock_shared().
+  {
+    std::lock_guard lk{work_mutex};
+    EXPECT_EQ(work_count.load(std::memory_order_relaxed), THREAD_COUNT);
+  }
+
+  std::this_thread::sleep_for(SLEEP_TIME);
+
+  // The threads are still blocking on done_mutex.
+  EXPECT_EQ(done_count, 0);
+
+  done_lk.unlock();
+  std::ranges::for_each(threads, &std::thread::join);
+
+  // The threads finished.
+  EXPECT_EQ(done_count, THREAD_COUNT);
+
+  EXPECT_EQ(additional_work_count, TOTAL_ITERATIONS);
+
+  GTEST_LOG_(INFO) << "try_lock() failure %: "
+                   << (try_lock_fail_count * 100.0 / (TOTAL_ITERATIONS + try_lock_fail_count));
+
+  GTEST_LOG_(INFO) << "try_lock_shared() failure %: "
+                   << (try_lock_shared_fail_count * 100.0 /
+                       (TOTAL_ITERATIONS + try_lock_shared_fail_count));
+
+  // Things are still sane after contesting in worker threads.
+  done_lk.lock();
+  std::lock_guard lk{work_mutex};
+}
diff --git a/Source/UnitTests/Common/StringUtilTest.cpp b/Source/UnitTests/Common/StringUtilTest.cpp
index 59ba99a43647..f7c3b9169b68 100644
--- a/Source/UnitTests/Common/StringUtilTest.cpp
+++ b/Source/UnitTests/Common/StringUtilTest.cpp
@@ -6,6 +6,7 @@
 #include <string>
 #include <vector>
 
+#include "Common/Network.h"
 #include "Common/StringUtil.h"
 #include "Common/Swap.h"
 
@@ -259,6 +260,155 @@ TEST(StringUtil, CaseInsensitiveContains_OverlappingMatches)
   EXPECT_TRUE(Common::CaseInsensitiveContains("ababababa", "bABa"));
 }
 
+TEST(StringUtil, SplitStringIntoArray)
+{
+  constexpr auto subject0 = "";
+  EXPECT_FALSE(SplitStringIntoArray<2>(subject0, '.').has_value());
+
+  constexpr auto subject1 = "hello";
+  EXPECT_FALSE(SplitStringIntoArray<2>(subject1, '.').has_value());
+
+  constexpr auto subject2 = "hello.world";
+  const auto split2 = SplitStringIntoArray<2>(subject2, '.');
+  EXPECT_TRUE(split2.has_value() && split2->at(1) == "world");
+  EXPECT_FALSE(SplitStringIntoArray<3>(subject2, '.').has_value());
+
+  constexpr auto subject3 = "hello.universe.";
+  EXPECT_FALSE(SplitStringIntoArray<2>(subject3, '.').has_value());
+  const auto split3 = SplitStringIntoArray<3>(subject3, '.');
+  EXPECT_TRUE(split3.has_value() && split3->at(2) == "");
+  EXPECT_FALSE(SplitStringIntoArray<4>(subject3, '.').has_value());
+
+  constexpr auto subject4 = "=";
+  EXPECT_TRUE(SplitStringIntoArray<2>(subject4, '=').has_value());
+}
+
+TEST(StringUtil, StringToIPv4PortRange)
+{
+  constexpr auto parse = Common::StringToIPv4PortRange;
+
+  constexpr Common::IPAddress ip_network = {192, 168, 0, 0};
+  constexpr Common::IPAddress test_ip = {192, 168, 0, 13};
+  constexpr Common::IPAddress last_ip = {192, 168, 0, 255};
+
+  EXPECT_FALSE(parse("").has_value());
+  EXPECT_FALSE(parse("1.2.3").has_value());
+  EXPECT_FALSE(parse("1.2.3.4-").has_value());
+  EXPECT_FALSE(parse("1.2.3.4.5").has_value());
+  EXPECT_FALSE(parse("1.2.3.256").has_value());
+  EXPECT_FALSE(parse("1.2.3.4/33").has_value());
+  EXPECT_FALSE(parse("1.2.3.4:65536").has_value());
+  EXPECT_FALSE(parse("1.2.3.4-1.2.3.4.5").has_value());
+  EXPECT_FALSE(parse("1.1.1.1:81-80").has_value());
+  EXPECT_FALSE(parse("1.1.1.2-1.1.1.1").has_value());
+
+  EXPECT_TRUE(parse("1.2.3.4").has_value());
+  EXPECT_TRUE(parse("1.2.3.4:80").has_value());
+  EXPECT_TRUE(parse("1.2.3.4:80-81").has_value());
+  EXPECT_TRUE(parse("1.2.3.4/16").has_value());
+  EXPECT_TRUE(parse("1.2.3.4/16:80").has_value());
+  EXPECT_TRUE(parse("1.2.3.4/16:80-81").has_value());
+  EXPECT_TRUE(parse("1.2.3.4-10").has_value());
+  EXPECT_TRUE(parse("1.2.3.4-10:80").has_value());
+  EXPECT_TRUE(parse("1.2.3.4-10:80-81").has_value());
+
+  {
+    const auto simple_result = parse("192.168.0.13").value();
+    EXPECT_EQ(simple_result.first.ip_address, test_ip);
+    EXPECT_EQ(simple_result.last.ip_address, test_ip);
+    EXPECT_EQ(simple_result.first.GetPortValue(), 0);
+    EXPECT_EQ(simple_result.last.GetPortValue(), u16(-1));
+  }
+
+  {
+    const auto port_result = parse("192.168.0.13:77").value();
+    EXPECT_EQ(port_result.first.ip_address, test_ip);
+    EXPECT_EQ(port_result.last.ip_address, test_ip);
+    EXPECT_EQ(port_result.first.GetPortValue(), 77);
+    EXPECT_EQ(port_result.last.GetPortValue(), 77);
+  }
+
+  {
+    const auto ip_range_result = parse("192.168.0.13-192.168.0.255:123").value();
+    EXPECT_EQ(ip_range_result.first.ip_address, test_ip);
+    EXPECT_EQ(ip_range_result.last.ip_address, last_ip);
+    EXPECT_EQ(ip_range_result.first.GetPortValue(), 123);
+    EXPECT_EQ(ip_range_result.last.GetPortValue(), 123);
+  }
+
+  {
+    const auto port_range_result = parse("192.168.29.151:5000-5010").value();
+    EXPECT_EQ(port_range_result.first.GetPortValue(), 5000);
+    EXPECT_EQ(port_range_result.last.GetPortValue(), 5010);
+    EXPECT_TRUE(port_range_result.IsMatch(parse("192.168.29.151:5008")->first));
+    EXPECT_FALSE(port_range_result.IsMatch(parse("127.0.0.1:5000")->first));
+  }
+
+  {
+    const auto ip_range_result = parse("192.168.0.13-255:123-999").value();
+    EXPECT_EQ(ip_range_result.first.ip_address, test_ip);
+    EXPECT_EQ(ip_range_result.last.ip_address, last_ip);
+    EXPECT_EQ(ip_range_result.first.GetPortValue(), 123);
+    EXPECT_EQ(ip_range_result.last.GetPortValue(), 999);
+  }
+
+  {
+    const auto ip_network_result = parse("192.168.0.13/24:123-999").value();
+    EXPECT_EQ(ip_network_result.first.ip_address, ip_network);
+    EXPECT_EQ(ip_network_result.last.ip_address, last_ip);
+    EXPECT_EQ(ip_network_result.first.GetPortValue(), 123);
+    EXPECT_EQ(ip_network_result.last.GetPortValue(), 999);
+  }
+
+  EXPECT_TRUE(parse("192.168.0.13/24")->IsMatch(parse("192.168.0.99")->first));
+  EXPECT_FALSE(parse("192.168.0.13/24")->IsMatch(parse("192.168.1.99")->first));
+
+  EXPECT_FALSE(parse("192.168.0.13/32")->IsMatch(parse("192.168.0.99")->first));
+  EXPECT_TRUE(parse("192.168.0.13/0")->IsMatch(parse("10.0.0.1")->first));
+
+  EXPECT_TRUE(parse("192.168.0.13")->IsMatch(parse("192.168.0.13:81")->first));
+  EXPECT_FALSE(parse("192.168.0.13:80")->IsMatch(parse("192.168.0.13:81")->first));
+  EXPECT_TRUE(parse("192.168.0.13:80")->IsMatch(parse("192.168.0.13:80")->first));
+  EXPECT_FALSE(parse("192.168.0.13:80-81")->IsMatch(parse("192.168.0.14:81")->first));
+  EXPECT_TRUE(parse("192.168.0.13-14:80-81")->IsMatch(parse("192.168.0.14:81")->first));
+}
+
+TEST(StringUtil, IPv4PortRangeToString)
+{
+  Common::IPv4PortRange subject{
+      .first = {{10, 3, 0, 127}, 0},
+      .last = {{10, 3, 0, 127}, 0},
+  };
+
+  EXPECT_EQ(subject.ToString(), "10.3.0.127");
+
+  subject.last.port = Common::swap16(80);  // First port is still zero.
+  EXPECT_EQ(subject.ToString(), "10.3.0.127");
+
+  subject.first.port = Common::swap16(80);
+  EXPECT_EQ(subject.ToString(), "10.3.0.127:80");
+
+  subject.last.port = Common::swap16(88);
+  EXPECT_EQ(subject.ToString(), "10.3.0.127:80-88");
+
+  subject.last.ip_address = {10, 3, 0, 128};
+  EXPECT_EQ(subject.ToString(), "10.3.0.127-128:80-88");
+
+  subject.last.ip_address = {10, 3, 7, 35};
+  EXPECT_EQ(subject.ToString(), "10.3.0.127-10.3.7.35:80-88");
+
+  subject.first.ip_address = {192, 168, 0, 0};
+  subject.last.ip_address = {192, 168, 0, 255};
+  EXPECT_EQ(subject.ToString(), "192.168.0.0/24:80-88");
+
+  subject.last.ip_address = {192, 168, 3, 255};
+  EXPECT_EQ(subject.ToString(), "192.168.0.0/22:80-88");
+
+  subject.first.ip_address = {};
+  subject.last.ip_address = {255, 255, 255, 255};
+  EXPECT_EQ(subject.ToString(), "0.0.0.0/0:80-88");
+}
+
 TEST(StringUtil, CharacterEncodingConversion)
 {
   // wstring
diff --git a/Source/UnitTests/Common/WorkQueueThreadTest.cpp b/Source/UnitTests/Common/WorkQueueThreadTest.cpp
index a4bfc654f228..1f35e3419f62 100644
--- a/Source/UnitTests/Common/WorkQueueThreadTest.cpp
+++ b/Source/UnitTests/Common/WorkQueueThreadTest.cpp
@@ -48,6 +48,6 @@ TEST(WorkQueueThread, Simple)
 
   worker.Push(2);
   worker.WaitForCompletion();
-  // Still running after cancelation.
+  // Still running after cancellation.
   EXPECT_EQ(x, 2);
 }
diff --git a/Source/UnitTests/Common/x64EmitterTest.cpp b/Source/UnitTests/Common/x64EmitterTest.cpp
index f38bb7c1b960..ef060e0a9352 100644
--- a/Source/UnitTests/Common/x64EmitterTest.cpp
+++ b/Source/UnitTests/Common/x64EmitterTest.cpp
@@ -4,7 +4,6 @@
 #include <cstring>
 #include <disasm.h>  // From Bochs, fallback included in Externals.
 #include <gtest/gtest.h>
-#include <map>
 #include <memory>
 #include <vector>
 
diff --git a/Source/UnitTests/Core/CMakeLists.txt b/Source/UnitTests/Core/CMakeLists.txt
index 865064ed68d9..30aeae447752 100644
--- a/Source/UnitTests/Core/CMakeLists.txt
+++ b/Source/UnitTests/Core/CMakeLists.txt
@@ -21,12 +21,15 @@ add_dolphin_test(SkylandersTest IOS/USB/SkylandersTest.cpp)
 if(_M_X86_64)
   add_dolphin_test(PowerPCTest
     PowerPC/DivUtilsTest.cpp
+    PowerPC/PageTableHostMappingTest.cpp
     PowerPC/Jit64Common/ConvertDoubleToSingle.cpp
+    PowerPC/Jit64Common/Fres.cpp
     PowerPC/Jit64Common/Frsqrte.cpp
   )
 elseif(_M_ARM_64)
   add_dolphin_test(PowerPCTest
     PowerPC/DivUtilsTest.cpp
+    PowerPC/PageTableHostMappingTest.cpp
     PowerPC/JitArm64/ConvertSingleDouble.cpp
     PowerPC/JitArm64/FPRF.cpp
     PowerPC/JitArm64/Fres.cpp
@@ -36,9 +39,11 @@ elseif(_M_ARM_64)
 else()
   add_dolphin_test(PowerPCTest
     PowerPC/DivUtilsTest.cpp
+    PowerPC/PageTableHostMappingTest.cpp
   )
 endif()
 
 target_sources(PowerPCTest PRIVATE
   PowerPC/TestValues.h
+  StubJit.h
 )
diff --git a/Source/UnitTests/Core/DSP/HermesText.cpp b/Source/UnitTests/Core/DSP/HermesText.cpp
index 64f3694810a6..1ddc30200030 100644
--- a/Source/UnitTests/Core/DSP/HermesText.cpp
+++ b/Source/UnitTests/Core/DSP/HermesText.cpp
@@ -42,7 +42,7 @@ SR:	equ	0x13
 PRODL: equ	0x14
 PRODM: equ	0x15
 PRODH: equ	0x16
-PRODM2: equ	0x17 
+PRODM2: equ	0x17
 
 AXL0:  equ	0x18
 AXL1:  equ	0x19
@@ -88,7 +88,7 @@ NUM_SAMPLES:	equ	1024	; 1024 stereo samples 16 bits
 /**************************************************************/
 /*                SOUND CHANNEL REGS                          */
 /**************************************************************/
-	
+
 MEM_REG2:	equ	0x0
 MEM_VECTH:	equ	MEM_REG2
 MEM_VECTL:	equ	MEM_REG2+1
@@ -108,10 +108,10 @@ DELAYL_SND:	equ	MEM_REG+3	// Delay samples Low word
 
 CHAN_REGS:	equ	MEM_REG+4	// specific regs for the channel
 
-FLAGSH_SMP:	equ	CHAN_REGS+0	// countain number of bytes for step (1-> Mono 8 bits, 2-> Stereo 8 bits and Mono 16 bits, 4-> Stereo 16 bits)	
+FLAGSH_SMP:	equ	CHAN_REGS+0	// contains number of bytes for step (1-> Mono 8 bits, 2-> Stereo 8 bits and Mono 16 bits, 4-> Stereo 16 bits)
 FLAGSL_SMP:	equ	CHAN_REGS+1	// 0->Mono 8 bits, 1->Stereo 8 bits, 2->Mono 16 bits 3 -> Stereo 16 bits
 
-ADDRH_SMP:	equ	CHAN_REGS+2	// start address 
+ADDRH_SMP:	equ	CHAN_REGS+2	// start address
 ADDRL_SMP:	equ	CHAN_REGS+3
 
 ADDREH_SMP:	equ	CHAN_REGS+4	// end address
@@ -156,7 +156,7 @@ data_end:	equ	MEM_SAMP+0x20
 
 MEM_SND:	equ	data_end ; it need 2048 words (4096 bytes)
 
-	
+
 
 /***  START CODE ***/
 
@@ -175,16 +175,16 @@ MEM_SND:	equ	data_end ; it need 2048 words (4096 bytes)
 
 	lri     $CONFIG, #0xff
 	lri	$SR,#0
-	s16         
-	clr15       
-	m0         
+	s16
+	clr15
+	m0
 
 /**************************************************************/
 /*                            main                            */
 /**************************************************************/
 
 main:
-	
+
 // send init token to CPU
 
 	si		@DMBH, #0xdcd1
@@ -195,7 +195,7 @@ MEM_SND:	equ	data_end ; it need 2048 words (4096 bytes)
 // check if previous mail is received from the CPU
 
 	call	wait_for_dsp_mail
-	
+
 // wait a mail from CPU
 
 	call	wait_for_cpu_mail
@@ -206,7 +206,7 @@ MEM_SND:	equ	data_end ; it need 2048 words (4096 bytes)
 	lri		$ACM0,#0xcdd1
 	cmp
 	jz		sys_command
-	
+
 	clr	$ACC1
 	lrs	$ACM1, @CMBL
 
@@ -217,7 +217,7 @@ MEM_SND:	equ	data_end ; it need 2048 words (4096 bytes)
 	jz	input_samples2
 
 	cmpi    $ACM1, #0x123  // get the address of the voice datas buffer (CHANNEL DATAS)
-	jz	get_data_addr 
+	jz	get_data_addr
 
 	cmpi    $ACM1, #0x222  // process the voice mixing the samples internally
 	jz	input_next_samples
@@ -226,14 +226,14 @@ MEM_SND:	equ	data_end ; it need 2048 words (4096 bytes)
 	jz	send_samples
 
 	cmpi    $ACM1, #0x777   // special: to dump the IROM Datas (remember disable others functions from the interrupt vector to use)
-	jz	rom_dump_word   // (CMBH+0x8000) countain the address of IROM
+	jz	rom_dump_word   // (CMBH+0x8000) contains the address of IROM
 
 	cmpi    $ACM1, #0x888	// Used for test
-	jz	polla_loca 
+	jz	polla_loca
 
 	cmpi	$ACM1, #0x999
 	jz	task_terminate
-	
+
 	si	@DMBL, #0x0004	// return 0 as ignore command
 	si	@DIRQ, #0x1 // set the interrupt
 	jmp	recv_cmd
@@ -242,19 +242,19 @@ MEM_SND:	equ	data_end ; it need 2048 words (4096 bytes)
 	si	@DMBL, #0x0003
 	si	@DIRQ, #0x1
 	jmp	recv_cmd
-	
+
 sys_command:
 	clr	$ACC1
 	lrs	$ACM1, @CMBL
-	
+
 	cmpi	$ACM1,#0x0001
 	jz		run_nexttask
-	
+
 	cmpi	$ACM1,#0x0002
 	jz		0x8000
-	
+
 	jmp		recv_cmd
-	
+
 run_nexttask:
 	s16
 	call		wait_for_cpu_mail
@@ -283,7 +283,7 @@ MEM_SND:	equ	data_end ; it need 2048 words (4096 bytes)
 	lrs			$27,@CMBL
 	sbclr		#0x05
 	sbclr		#0x06
-	jmp			0x80b5		
+	jmp			0x80b5
 	halt
 
 /**************************************************************************************************************************************/
@@ -296,7 +296,7 @@ MEM_SND:	equ	data_end ; it need 2048 words (4096 bytes)
 	lri	$AXL0, #NUM_SAMPLES*4 ; len
 	lr	$ACM0, @ADDRH_SND
     lr	$ACL0, @ADDRL_SND
-	
+
 	call	do_dma
 	si	@DMBL, #0x0004
 	si	@DIRQ, #0x1 // set the interrupt
@@ -310,10 +310,10 @@ MEM_SND:	equ	data_end ; it need 2048 words (4096 bytes)
 
 	lrs	$ACM0, @CMBH
 	lr	$ACL0, @CMBL
-     
+
 	sr	@MEM_VECTH, $ACM0
 	sr	@MEM_VECTL, $ACL0
-	
+
 	si	@DIRQ, #0x0 // clear the interrupt
 	jmp	recv_cmd
 
@@ -326,7 +326,7 @@ MEM_SND:	equ	data_end ; it need 2048 words (4096 bytes)
 	lr	$ACM0, @MEM_VECTH
 	lr	$ACL0, @MEM_VECTL
 
-	lris	$AXL0, #0x0004 
+	lris	$AXL0, #0x0004
 	sr	@RETURN, $AXL0
 	si	@DIRQ, #0x0000
 
@@ -363,7 +363,7 @@ MEM_SND:	equ	data_end ; it need 2048 words (4096 bytes)
 	lr	$ACM0, @MEM_VECTH
 	lr	$ACL0, @MEM_VECTL
 
-	lris	$AXL0, #0x0004 
+	lris	$AXL0, #0x0004
 	sr	@RETURN, $AXL0
 	si	@DIRQ, #0x0000
 
@@ -381,7 +381,7 @@ MEM_SND:	equ	data_end ; it need 2048 words (4096 bytes)
 	lri	$AR0, #MEM_SND
 	lris	$AXL1, #DMA_TO_DSP;
 	lri	$AXL0, #NUM_SAMPLES*4; len
-	
+
 	call	do_dma
 
 	jmp	start_main
@@ -390,12 +390,12 @@ MEM_SND:	equ	data_end ; it need 2048 words (4096 bytes)
 // process the voice mixing the samples internally
 
 input_next_samples:
-	
+
 	clr	$ACC0
 	lr	$ACM0, @MEM_VECTH
 	lr	$ACL0, @MEM_VECTL
 
-	lris	$AXL0, #0x0004 
+	lris	$AXL0, #0x0004
 	sr	@RETURN, $AXL0
 	si	@DIRQ, #0x0000
 
@@ -408,10 +408,10 @@ MEM_SND:	equ	data_end ; it need 2048 words (4096 bytes)
 	call	do_dma
 
 /**************************************************************************************************************************************/
-// mixing and control pitch to create 1024 Stereo Samples at 16 bits from here 
+// mixing and control pitch to create 1024 Stereo Samples at 16 bits from here
 
 start_main:
-	
+
 	lri	$R08, #48000
 
 	// load the previous samples used
@@ -426,29 +426,29 @@ MEM_SND:	equ	data_end ; it need 2048 words (4096 bytes)
 	addi	$ACM1, #sample_selector
 	mrr	$AR3, $ACM1
 	ilrr	$ACM1, @$AR3
-	mrr	$AR3, $ACM1 // AR3 countain the jump loaded from sample selector
+	mrr	$AR3, $ACM1 // AR3 contains the jump loaded from sample selector
 
 	clr	$ACC0
 
 // test for channel paused
 
-	lr	$ACM0, @FLAGSL_SMP 
-	andcf	$ACM0, #0x20 
+	lr	$ACM0, @FLAGSL_SMP
+	andcf	$ACM0, #0x20
 	jlz	end_main
-	
+
 // load the sample address
 
 	lr	$ACM0, @ADDRH_SMP
         lr	$ACL0, @ADDRL_SMP
 
 // test if ADDR_SMP & ADDR2H_SMP are zero
-	
+
 	tst	$ACC0
 	jnz	do_not_change1
 
 // set return as "change of buffer"
 
-	lris	$AXL0, #0x0004 
+	lris	$AXL0, #0x0004
 	sr	@RETURN, $AXL0
 
 // change to buffer 2 if it is possible
@@ -464,10 +464,10 @@ MEM_SND:	equ	data_end ; it need 2048 words (4096 bytes)
 
 
 // backup the external sample address
-	
+
 	mrr	$IX2, $ACM0
 	mrr	$IX3, $ACL0
-	
+
 
 // load the counter pitch
 
@@ -500,7 +500,7 @@ MEM_SND:	equ	data_end ; it need 2048 words (4096 bytes)
 	tst	$ACC0
 	jz	no_delay
 
-// samples left and right to 0	
+// samples left and right to 0
 
 	lris	$AXH0, #0
 	lris	$AXH1, #0
@@ -510,7 +510,7 @@ MEM_SND:	equ	data_end ; it need 2048 words (4096 bytes)
 	mrr	$ACM1, $AXL0
 l_delay:
 	iar	$AR1 // skip two samples
-	iar	$AR1 
+	iar	$AR1
 	decm	$ACM1
 	jz	exit_delay1 // exit1 if samples to be processed == 0
 
@@ -522,14 +522,14 @@ MEM_SND:	equ	data_end ; it need 2048 words (4096 bytes)
 
 exit_delay1:
 	decm	$ACM0
-	
+
 	sr	@DELAYH_SND, $ACH0
         sr	@DELAYL_SND, $ACM0
-	
+
 	lris	$AXL0,#0 ; exit from loop
-	
-	jmp	no_delay 
-	
+
+	jmp	no_delay
+
 
 exit_delay2:
 
@@ -551,9 +551,9 @@ MEM_SND:	equ	data_end ; it need 2048 words (4096 bytes)
                                   R"(
 /* bucle de generacion de samples */
 
-	
+
 // load the sample buffer with address aligned to 32 bytes blocks (first time)
-			
+
 	si	@DSCR, #DMA_TO_DSP // very important!: load_smp_addr_align and jump_load_smp_addr need fix this DMA Register (I gain some cycles so)
 
 // load_smp_addr_align input:  $IX2:$IX3
@@ -564,25 +564,25 @@ MEM_SND:	equ	data_end ; it need 2048 words (4096 bytes)
 
 	lr	$IX0, @LEFT_VOLUME
 	lr	$IX1, @RIGHT_VOLUME
-	
+
 // test the freq value
 
 	clr	$ACC0
 	lr	$ACH0, @FREQH_SMP
 	lr	$ACM0, @FREQL_SMP
-	
+
 	clr	$ACC1
 	;lri	$ACM1,#48000
 	mrr	$ACM1, $R08
 	cmp
-	
+
 // select the output of the routine to process stereo-mono 8/16bits samples
-	
-	lri	$AR0, #get_sample // fast method <=48000	
 
-// if  number is greater freq>48000 fix different routine 
-	
-	ifg	
+	lri	$AR0, #get_sample // fast method <=48000
+
+// if  number is greater freq>48000 fix different routine
+
+	ifg
 	lri	$AR0, #get_sample2 // slow method >48000
 
 // loops for samples to be processed
@@ -594,12 +594,12 @@ MEM_SND:	equ	data_end ; it need 2048 words (4096 bytes)
 
 // Mix right sample section
 
-	lrr	$ACL0, @$AR1 // load in ACL0 the  right sample from the internal buffer 
+	lrr	$ACL0, @$AR1 // load in ACL0 the  right sample from the internal buffer
 	movax	$ACC1, $AXL1 // big trick :)  load the current sample <<16 and sign extended
 
 	asl	$ACC0,#24    // convert sample from buffer to 24 bit number with sign extended (ACH0:ACM0)
 	asr	$ACC0,#-8
-	
+
 	add	$ACC0,$ACC1  // current_sample+buffer sample
 
 	cmpi	$ACM0,#32767 // limit to 32767
@@ -613,20 +613,20 @@ MEM_SND:	equ	data_end ; it need 2048 words (4096 bytes)
 	cmpi	$ACM0,#-32768 // limit to -32768
 	ifle
 	lri	$ACM0, #-32768
-	
-right_skip2:	
+
+right_skip2:
 
 	srri	@$AR1, $ACM0 // store the right sample mixed to the internal buffer and increment AR1
 
 // Mix left sample section
 
-	lrr	$ACL0, @$AR1 // load in ACL0 the left sample from the internal buffer 
+	lrr	$ACL0, @$AR1 // load in ACL0 the left sample from the internal buffer
 
 	movax	$ACC1, $AXL0 // big trick :)  load the current sample <<16 and sign extended
-	
+
 	asl	$ACC0, #24   // convert sample from buffer to 24 bit number with sign extended (ACH0:ACM0)
 	asr	$ACC0, #-8
-	
+
 	add	$ACC0, $ACC1 // current_sample+buffer sample
 
 	cmpi	$ACM0,#32767 // limit to 32767
@@ -640,11 +640,11 @@ MEM_SND:	equ	data_end ; it need 2048 words (4096 bytes)
 	cmpi	$ACM0,#-32768 // limit to -32768
 	ifle
 	lri	$ACM0, #-32768
-	
-left_skip2:	
+
+left_skip2:
 
 	srri	@$AR1, $ACM0 // store the left sample mixed to the internal buffer and increment AR1
-	
+
 // adds the counter with the voice frequency and test if it >=48000 to get the next sample
 
 	clr	$ACC1
@@ -653,7 +653,7 @@ MEM_SND:	equ	data_end ; it need 2048 words (4096 bytes)
 	clr	$ACC0
 	lr	$ACH0, @FREQH_SMP
 	lr	$ACM0, @FREQL_SMP
-	
+
 	add	$ACC1,$ACC0
 	clr	$ACC0
 	//lri	$ACM0,#48000
@@ -663,7 +663,7 @@ MEM_SND:	equ	data_end ; it need 2048 words (4096 bytes)
 
 	jrnc	$AR0 //get_sample or get_sample2 method
 
-	sr	@COUNTERH_SMP, $ACH1 
+	sr	@COUNTERH_SMP, $ACH1
         sr	@COUNTERL_SMP, $ACM1
 
 	jmp	loop_end
@@ -700,8 +700,8 @@ MEM_SND:	equ	data_end ; it need 2048 words (4096 bytes)
 	cmp
 
 	jle	get_sample2
-	
-	sr	@COUNTERH_SMP, $ACH1 
+
+	sr	@COUNTERH_SMP, $ACH1
         sr	@COUNTERL_SMP, $ACM1
 
 	mrr	$ACM0, $IX2 // load ADDRH_SMP
@@ -721,14 +721,14 @@ MEM_SND:	equ	data_end ; it need 2048 words (4096 bytes)
 
 // load samples from dma, return $ar2 with the addr to get the samples and return using $ar0 to the routine to process 8-16bits Mono/Stereo
 
-	jmp	jump_load_smp_addr 
+	jmp	jump_load_smp_addr
 
 // get a new sample for freq <= 48000 Hz
 
 get_sample: // fast method
-	
+
 	sub	$ACC1,$ACC0 // restore the counter
-	sr	@COUNTERH_SMP, $ACH1 
+	sr	@COUNTERH_SMP, $ACH1
         sr	@COUNTERL_SMP, $ACM1
 
 // restore the external sample buffer address
@@ -739,7 +739,7 @@ MEM_SND:	equ	data_end ; it need 2048 words (4096 bytes)
 
 	lr	$AXL1, @FLAGSH_SMP // add the step to get the next samples
 	addaxl  $ACC0, $AXL1
-	
+
 	clr	$ACC1
 	mrr	$ACM1, $r0a // load ADDREH_SMP
 	mrr	$ACL1, $r0b // load ADDREL_SMP
@@ -756,21 +756,21 @@ MEM_SND:	equ	data_end ; it need 2048 words (4096 bytes)
 
 // load samples from dma, return $ar2 with the addr and return using $ar0 to the routine to process 8-16bits Mono/Stereo or addr_get_sample_again
 
-	jmp	jump_load_smp_addr 
+	jmp	jump_load_smp_addr
 
 sample_selector:
-	cw	mono_8bits 
-	cw	mono_16bits 
-	cw	stereo_8bits 
-	cw	stereo_16bits 
+	cw	mono_8bits
+	cw	mono_16bits
+	cw	stereo_8bits
+	cw	stereo_16bits
 
 get_new_buffer:
 
 // set return as "change of buffer": it need to change the sample address
 
-	lris	$AXL0, #0x0004 
+	lris	$AXL0, #0x0004
 	sr	@RETURN, $AXL0
-	
+
 	call	change_buffer // load add from addr2
 
 // addr is 0 ? go to zero_samples and exit
@@ -785,9 +785,9 @@ MEM_SND:	equ	data_end ; it need 2048 words (4096 bytes)
 // jump_load_smp_addr:  $IX2:$IX3
 // load samples from dma, return $ar2 with the addr to get the samples and return using $ar0 to the routine to process 8-16bits Mono/Stereo
 
-	jmp	jump_load_smp_addr 
+	jmp	jump_load_smp_addr
 
-// set to 0 the current samples 
+// set to 0 the current samples
 
 zero_samples:
 
@@ -796,7 +796,7 @@ MEM_SND:	equ	data_end ; it need 2048 words (4096 bytes)
 	jmp	out_samp
 
 mono_8bits:
-	
+
 //  8 bits mono
 	mrr	$ACM1, $IX3
 	lrri	$ACL0, @$AR2
@@ -810,7 +810,7 @@ MEM_SND:	equ	data_end ; it need 2048 words (4096 bytes)
 	mrr	$AXH0,$ACL0
 	jmp	out_samp
 
-stereo_8bits:	
+stereo_8bits:
 
 // 8 bits stereo
 
@@ -838,8 +838,8 @@ MEM_SND:	equ	data_end ; it need 2048 words (4096 bytes)
 	lrri	$AXH1, @$AR2
 	lrri	$AXH0, @$AR2
 
-out_samp:	
-	
+out_samp:
+
 // multiply sample x volume
 
 	//   LEFT_VOLUME
@@ -860,7 +860,7 @@ MEM_SND:	equ	data_end ; it need 2048 words (4096 bytes)
 	nop
 
 end_process:
-	
+
 	// load the sample address
 
 	clr	$ACC0
@@ -872,7 +872,7 @@ MEM_SND:	equ	data_end ; it need 2048 words (4096 bytes)
 
 // set return as "change of buffer"
 
-	lris	$AXL0, #0x0004 
+	lris	$AXL0, #0x0004
 	sr	@RETURN, $AXL0
 
 // change to buffer 2 if it is possible
@@ -880,13 +880,13 @@ MEM_SND:	equ	data_end ; it need 2048 words (4096 bytes)
 	call	change_buffer
 
 save_datas_end:
-	
+
 	sr	@ADDRH_SMP, $IX2
         sr	@ADDRL_SMP, $IX3
-	sr	@SMP_R, $AXH0 
+	sr	@SMP_R, $AXH0
         sr	@SMP_L, $AXH1
-	
-end_main:	
+
+end_main:
 
 // program DMA to send the CHANNEL DATAS changed
 
@@ -909,35 +909,35 @@ MEM_SND:	equ	data_end ; it need 2048 words (4096 bytes)
 	jmp	recv_cmd
 
 change_buffer:
-	
+
 	clr	$ACC0
 	lr	$ACM0, @LEFT_VOLUME2
         lr	$ACL0, @RIGHT_VOLUME2
-	sr	@LEFT_VOLUME, $ACM0 
+	sr	@LEFT_VOLUME, $ACM0
         sr	@RIGHT_VOLUME, $ACL0
-	mrr	$IX0, $ACM0 
+	mrr	$IX0, $ACM0
 	mrr	$IX1, $ACL0
 
 	lr	$ACM0, @ADDR2EH_SMP
         lr	$ACL0, @ADDR2EL_SMP
-	sr	@ADDREH_SMP, $ACM0 
+	sr	@ADDREH_SMP, $ACM0
         sr	@ADDREL_SMP, $ACL0
 	mrr	$r0a, $ACM0
 	mrr	$r0b, $ACL0
 
 	lr	$ACM0, @ADDR2H_SMP
         lr	$ACL0, @ADDR2L_SMP
-	sr	@ADDRH_SMP, $ACM0 
+	sr	@ADDRH_SMP, $ACM0
         sr	@ADDRL_SMP, $ACL0
-	sr	@BACKUPH_SMP, $ACM0 
+	sr	@BACKUPH_SMP, $ACM0
         sr	@BACKUPL_SMP, $ACL0
 	mrr	$IX2, $ACM0
 	mrr	$IX3, $ACL0
-	
+
 	lr	$ACM1, @FLAGSL_SMP
 	andcf	$ACM1, #0x4
 	retlz
-        
+
 	sr	@ADDR2H_SMP, $ACH0
 	sr	@ADDR2L_SMP, $ACH0
 	sr	@ADDR2EH_SMP, $ACH0
@@ -1007,7 +1007,7 @@ MEM_SND:	equ	data_end ; it need 2048 words (4096 bytes)
 	asr	$ACC0, #-1
 	andi	$ACM0, #0xf
 	jz	jump_load_smp_dma
-	
+
 	addi	$ACM0, #MEM_SAMP
 	mrr	$AR2, $ACM0
 	jmpr	$AR3
@@ -1024,10 +1024,10 @@ MEM_SND:	equ	data_end ; it need 2048 words (4096 bytes)
 	lrs	$ACM0, @DSCR
 	andcf	$ACM0, #0x4
 	jlz	wait_dma2
-	
+
 	lri	$AR2, #MEM_SAMP
 	jmpr	$AR3
-		
+
 // exception table
 
 exception0:	// RESET
@@ -1038,7 +1038,7 @@ MEM_SND:	equ	data_end ; it need 2048 words (4096 bytes)
 
 exception2:
 	rti
-	
+
 exception3:
 	rti
 
@@ -1047,21 +1047,21 @@ MEM_SND:	equ	data_end ; it need 2048 words (4096 bytes)
 
 exception5:	// ACCELERATOR ADDRESS OVERFLOW
 	rti
-	
+
 exception6:
 	rti
 
 exception7:
 	rti
 
-// routine to read a word of the IROM space 
+// routine to read a word of the IROM space
 
 rom_dump_word:
 
 	clr $ACC0
 
 	lr	$ACM0, @CMBH
-	ori	$ACM0, #0x8000 
+	ori	$ACM0, #0x8000
 	mrr	$AR0, $ACM0
 	clr	$ACC0
 	ilrr	$ACM0, @$AR0
@@ -1076,7 +1076,7 @@ MEM_SND:	equ	data_end ; it need 2048 words (4096 bytes)
 	clr $ACC0
 	lri $acm0, #0x0
 	andf $acm0,#0x1
-	
+
 	sr	@DMBH, $sr
 	sr	@DMBL, $acm0
 	;si	@DIRQ, #0x1 // set the interrupt
diff --git a/Source/UnitTests/Core/IOS/FS/FileSystemTest.cpp b/Source/UnitTests/Core/IOS/FS/FileSystemTest.cpp
index 52afa15fd26b..37d047815a75 100644
--- a/Source/UnitTests/Core/IOS/FS/FileSystemTest.cpp
+++ b/Source/UnitTests/Core/IOS/FS/FileSystemTest.cpp
@@ -96,7 +96,7 @@ TEST_F(FileSystemTest, EssentialDirectories)
   for (const std::string path :
        {"/sys", "/ticket", "/title", "/shared1", "/shared2", "/tmp", "/import", "/meta"})
   {
-    EXPECT_TRUE(m_fs->ReadDirectory(Uid{0}, Gid{0}, path).Succeeded()) << path;
+    EXPECT_TRUE(m_fs->ReadDirectory(Uid{0}, Gid{0}, path).has_value()) << path;
   }
 }
 
@@ -109,7 +109,7 @@ TEST_F(FileSystemTest, CreateFile)
   ASSERT_EQ(m_fs->CreateFile(Uid{0}, Gid{0}, PATH, ArbitraryAttribute, modes), ResultCode::Success);
 
   const Result<Metadata> stats = m_fs->GetMetadata(Uid{0}, Gid{0}, PATH);
-  ASSERT_TRUE(stats.Succeeded());
+  ASSERT_TRUE(stats.has_value());
   EXPECT_TRUE(stats->is_file);
   EXPECT_EQ(stats->size, 0u);
   EXPECT_EQ(stats->uid, 0u);
@@ -120,7 +120,7 @@ TEST_F(FileSystemTest, CreateFile)
   ASSERT_EQ(m_fs->CreateFile(Uid{0}, Gid{0}, PATH, 0, modes), ResultCode::AlreadyExists);
 
   const Result<std::vector<std::string>> tmp_files = m_fs->ReadDirectory(Uid{0}, Gid{0}, "/tmp");
-  ASSERT_TRUE(tmp_files.Succeeded());
+  ASSERT_TRUE(tmp_files.has_value());
   EXPECT_EQ(std::ranges::count(*tmp_files, "f"), 1u);
 
   // Test invalid paths
@@ -141,7 +141,7 @@ TEST_F(FileSystemTest, CreateDirectory)
             ResultCode::Success);
 
   const Result<Metadata> stats = m_fs->GetMetadata(Uid{0}, Gid{0}, PATH);
-  ASSERT_TRUE(stats.Succeeded());
+  ASSERT_TRUE(stats.has_value());
   EXPECT_FALSE(stats->is_file);
   EXPECT_EQ(stats->uid, 0u);
   EXPECT_EQ(stats->gid, 0);
@@ -149,7 +149,7 @@ TEST_F(FileSystemTest, CreateDirectory)
   EXPECT_EQ(stats->attribute, ArbitraryAttribute);
 
   const Result<std::vector<std::string>> children = m_fs->ReadDirectory(Uid{0}, Gid{0}, PATH);
-  ASSERT_TRUE(children.Succeeded());
+  ASSERT_TRUE(children.has_value());
   EXPECT_TRUE(children->empty());
 
   EXPECT_EQ(m_fs->CreateDirectory(Uid{0}, Gid{0}, PATH, 0, modes), ResultCode::AlreadyExists);
@@ -161,9 +161,9 @@ TEST_F(FileSystemTest, CreateDirectory)
 
 TEST_F(FileSystemTest, Delete)
 {
-  EXPECT_TRUE(m_fs->ReadDirectory(Uid{0}, Gid{0}, "/tmp").Succeeded());
+  EXPECT_TRUE(m_fs->ReadDirectory(Uid{0}, Gid{0}, "/tmp").has_value());
   EXPECT_EQ(m_fs->Delete(Uid{0}, Gid{0}, "/tmp"), ResultCode::Success);
-  EXPECT_EQ(m_fs->ReadDirectory(Uid{0}, Gid{0}, "/tmp").Error(), ResultCode::NotFound);
+  EXPECT_EQ(m_fs->ReadDirectory(Uid{0}, Gid{0}, "/tmp").error(), ResultCode::NotFound);
 
   // Test recursive directory deletion.
   ASSERT_EQ(m_fs->CreateDirectory(Uid{0}, Gid{0}, "/sys/1", 0, modes), ResultCode::Success);
@@ -173,7 +173,7 @@ TEST_F(FileSystemTest, Delete)
 
   // Leave a file open. Deletion should fail while the file is in use.
   auto handle = std::make_optional(m_fs->OpenFile(Uid{0}, Gid{0}, "/sys/1/2/3", Mode::Read));
-  ASSERT_TRUE(handle->Succeeded());
+  ASSERT_TRUE(handle->has_value());
   EXPECT_EQ(m_fs->Delete(Uid{0}, Gid{0}, "/sys/1/2/3"), ResultCode::InUse);
   // A directory that contains a file that is in use is considered to be in use,
   // so this should fail too.
@@ -187,12 +187,12 @@ TEST_F(FileSystemTest, Delete)
 
 TEST_F(FileSystemTest, Rename)
 {
-  EXPECT_TRUE(m_fs->ReadDirectory(Uid{0}, Gid{0}, "/tmp").Succeeded());
+  EXPECT_TRUE(m_fs->ReadDirectory(Uid{0}, Gid{0}, "/tmp").has_value());
 
   EXPECT_EQ(m_fs->Rename(Uid{0}, Gid{0}, "/tmp", "/test"), ResultCode::Success);
 
-  EXPECT_EQ(m_fs->ReadDirectory(Uid{0}, Gid{0}, "/tmp").Error(), ResultCode::NotFound);
-  EXPECT_TRUE(m_fs->ReadDirectory(Uid{0}, Gid{0}, "/test").Succeeded());
+  EXPECT_EQ(m_fs->ReadDirectory(Uid{0}, Gid{0}, "/tmp").error(), ResultCode::NotFound);
+  EXPECT_TRUE(m_fs->ReadDirectory(Uid{0}, Gid{0}, "/test").has_value());
 
   // Rename /test back to /tmp.
   EXPECT_EQ(m_fs->Rename(Uid{0}, Gid{0}, "/test", "/tmp"), ResultCode::Success);
@@ -213,9 +213,9 @@ TEST_F(FileSystemTest, RenameWithExistingTargetDirectory)
   ASSERT_EQ(m_fs->CreateFile(Uid{0}, Gid{0}, "/tmp/d2/file", 0, modes), ResultCode::Success);
   EXPECT_EQ(m_fs->Rename(Uid{0}, Gid{0}, "/tmp/d", "/tmp/d2"), ResultCode::Success);
 
-  EXPECT_EQ(m_fs->ReadDirectory(Uid{0}, Gid{0}, "/tmp/d").Error(), ResultCode::NotFound);
+  EXPECT_EQ(m_fs->ReadDirectory(Uid{0}, Gid{0}, "/tmp/d").error(), ResultCode::NotFound);
   const Result<std::vector<std::string>> children = m_fs->ReadDirectory(Uid{0}, Gid{0}, "/tmp/d2");
-  ASSERT_TRUE(children.Succeeded());
+  ASSERT_TRUE(children.has_value());
   EXPECT_TRUE(children->empty());
 }
 
@@ -230,8 +230,8 @@ TEST_F(FileSystemTest, RenameWithExistingTargetFile)
   std::vector<u8> read_buffer(TEST_DATA.size());
   {
     const Result<FileHandle> file = m_fs->OpenFile(Uid{0}, Gid{0}, source_path, Mode::ReadWrite);
-    ASSERT_TRUE(file.Succeeded());
-    ASSERT_TRUE(file->Write(TEST_DATA.data(), TEST_DATA.size()).Succeeded());
+    ASSERT_TRUE(file.has_value());
+    ASSERT_TRUE(file->Write(TEST_DATA.data(), TEST_DATA.size()).has_value());
   }
 
   // Create the test target file and leave it empty.
@@ -240,11 +240,11 @@ TEST_F(FileSystemTest, RenameWithExistingTargetFile)
   // Rename /sys/f2 to /tmp/f2 and check that f1 replaced f2.
   EXPECT_EQ(m_fs->Rename(Uid{0}, Gid{0}, source_path, dest_path), ResultCode::Success);
 
-  ASSERT_FALSE(m_fs->GetMetadata(Uid{0}, Gid{0}, source_path).Succeeded());
-  EXPECT_EQ(m_fs->GetMetadata(Uid{0}, Gid{0}, source_path).Error(), ResultCode::NotFound);
+  ASSERT_FALSE(m_fs->GetMetadata(Uid{0}, Gid{0}, source_path).has_value());
+  EXPECT_EQ(m_fs->GetMetadata(Uid{0}, Gid{0}, source_path).error(), ResultCode::NotFound);
 
   const Result<Metadata> metadata = m_fs->GetMetadata(Uid{0}, Gid{0}, dest_path);
-  ASSERT_TRUE(metadata.Succeeded());
+  ASSERT_TRUE(metadata.has_value());
   EXPECT_TRUE(metadata->is_file);
   EXPECT_EQ(metadata->size, TEST_DATA.size());
 }
@@ -253,7 +253,7 @@ TEST_F(FileSystemTest, GetDirectoryStats)
 {
   auto check_stats = [this](const u32 clusters, const u32 inodes) {
     const Result<DirectoryStats> stats = m_fs->GetDirectoryStats("/tmp");
-    ASSERT_TRUE(stats.Succeeded());
+    ASSERT_TRUE(stats.has_value());
     EXPECT_EQ(stats->used_clusters, clusters);
     EXPECT_EQ(stats->used_inodes, inodes);
   };
@@ -266,7 +266,7 @@ TEST_F(FileSystemTest, GetDirectoryStats)
 
   {
     const Result<FileHandle> file = m_fs->OpenFile(Uid{0}, Gid{0}, "/tmp/file", Mode::Write);
-    file->Write(std::vector<u8>(20).data(), 20);
+    (void)file->Write(std::vector<u8>(20).data(), 20);
   }
   // The file should now take up one cluster.
   check_stats(1u, 2u);
@@ -277,16 +277,16 @@ TEST_F(FileSystemTest, GetDirectoryStats)
 TEST_F(FileSystemTest, NonExistingFiles)
 {
   const Result<Metadata> metadata = m_fs->GetMetadata(Uid{0}, Gid{0}, "/tmp/foo");
-  ASSERT_FALSE(metadata.Succeeded());
-  EXPECT_EQ(metadata.Error(), ResultCode::NotFound);
+  ASSERT_FALSE(metadata.has_value());
+  EXPECT_EQ(metadata.error(), ResultCode::NotFound);
 
   const Result<FileHandle> file = m_fs->OpenFile(Uid{0}, Gid{0}, "/tmp/foo", Mode::Read);
-  ASSERT_FALSE(file.Succeeded());
-  EXPECT_EQ(file.Error(), ResultCode::NotFound);
+  ASSERT_FALSE(file.has_value());
+  EXPECT_EQ(file.error(), ResultCode::NotFound);
 
   const Result<std::vector<std::string>> children = m_fs->ReadDirectory(Uid{0}, Gid{0}, "/foo");
-  ASSERT_FALSE(children.Succeeded());
-  EXPECT_EQ(children.Error(), ResultCode::NotFound);
+  ASSERT_FALSE(children.has_value());
+  EXPECT_EQ(children.error(), ResultCode::NotFound);
 }
 
 TEST_F(FileSystemTest, Seek)
@@ -296,7 +296,7 @@ TEST_F(FileSystemTest, Seek)
   ASSERT_EQ(m_fs->CreateFile(Uid{0}, Gid{0}, "/tmp/f", 0, modes), ResultCode::Success);
 
   const Result<FileHandle> file = m_fs->OpenFile(Uid{0}, Gid{0}, "/tmp/f", Mode::ReadWrite);
-  ASSERT_TRUE(file.Succeeded());
+  ASSERT_TRUE(file.has_value());
 
   // An empty file should have a size of exactly 0 bytes.
   EXPECT_EQ(file->GetStatus()->size, 0u);
@@ -304,14 +304,14 @@ TEST_F(FileSystemTest, Seek)
   EXPECT_EQ(file->GetStatus()->offset, 0u);
 
   // Write some dummy data.
-  ASSERT_TRUE(file->Write(TEST_DATA.data(), TEST_DATA.size()).Succeeded());
+  ASSERT_TRUE(file->Write(TEST_DATA.data(), TEST_DATA.size()).has_value());
   EXPECT_EQ(file->GetStatus()->size, TEST_DATA.size());
   EXPECT_EQ(file->GetStatus()->offset, TEST_DATA.size());
 
   auto seek_and_check = [&file](const u32 offset, const SeekMode mode,
                                 const u32 expected_position) {
     const Result<u32> new_offset = file->Seek(offset, mode);
-    ASSERT_TRUE(new_offset.Succeeded());
+    ASSERT_TRUE(new_offset.has_value());
     EXPECT_EQ(*new_offset, expected_position);
     EXPECT_EQ(file->GetStatus()->offset, expected_position);
   };
@@ -324,8 +324,8 @@ TEST_F(FileSystemTest, Seek)
 
   // Test past-EOF seeks.
   const Result<u32> new_position = file->Seek(11, SeekMode::Set);
-  ASSERT_FALSE(new_position.Succeeded());
-  EXPECT_EQ(new_position.Error(), ResultCode::Invalid);
+  ASSERT_FALSE(new_position.has_value());
+  EXPECT_EQ(new_position.error(), ResultCode::Invalid);
 }
 
 TEST_F(FileSystemTest, WriteAndSimpleReadback)
@@ -336,14 +336,14 @@ TEST_F(FileSystemTest, WriteAndSimpleReadback)
   ASSERT_EQ(m_fs->CreateFile(Uid{0}, Gid{0}, "/tmp/f", 0, modes), ResultCode::Success);
 
   const Result<FileHandle> file = m_fs->OpenFile(Uid{0}, Gid{0}, "/tmp/f", Mode::ReadWrite);
-  ASSERT_TRUE(file.Succeeded());
+  ASSERT_TRUE(file.has_value());
 
   // Write some test data.
-  ASSERT_TRUE(file->Write(TEST_DATA.data(), TEST_DATA.size()).Succeeded());
+  ASSERT_TRUE(file->Write(TEST_DATA.data(), TEST_DATA.size()).has_value());
 
   // Now read it back and make sure it is identical.
-  ASSERT_TRUE(file->Seek(0, SeekMode::Set).Succeeded());
-  ASSERT_TRUE(file->Read(read_buffer.data(), read_buffer.size()).Succeeded());
+  ASSERT_TRUE(file->Seek(0, SeekMode::Set).has_value());
+  ASSERT_TRUE(file->Read(read_buffer.data(), read_buffer.size()).has_value());
   EXPECT_EQ(TEST_DATA, read_buffer);
 }
 
@@ -356,31 +356,31 @@ TEST_F(FileSystemTest, WriteAndRead)
   ASSERT_EQ(m_fs->CreateFile(Uid{0}, Gid{0}, "/tmp/f", 0, modes), ResultCode::Success);
 
   Result<FileHandle> tmp_handle = m_fs->OpenFile(Uid{0}, Gid{0}, "/tmp/f", Mode::ReadWrite);
-  ASSERT_TRUE(tmp_handle.Succeeded());
+  ASSERT_TRUE(tmp_handle.has_value());
   const Fd fd = tmp_handle->Release();
 
   // Try to read from an empty file. This should do nothing.
   // See https://github.com/dolphin-emu/dolphin/pull/4942
   Result<u32> read_result = m_fs->ReadBytesFromFile(fd, buffer.data(), TEST_DATA_SIZE);
-  EXPECT_TRUE(read_result.Succeeded());
+  EXPECT_TRUE(read_result.has_value());
   EXPECT_EQ(*read_result, 0u);
   EXPECT_EQ(m_fs->GetFileStatus(fd)->offset, 0u);
 
-  ASSERT_TRUE(m_fs->WriteBytesToFile(fd, TEST_DATA.data(), TEST_DATA_SIZE).Succeeded());
+  ASSERT_TRUE(m_fs->WriteBytesToFile(fd, TEST_DATA.data(), TEST_DATA_SIZE).has_value());
   EXPECT_EQ(m_fs->GetFileStatus(fd)->offset, TEST_DATA.size());
 
   // Try to read past EOF while we are at the end of the file. This should do nothing too.
   read_result = m_fs->ReadBytesFromFile(fd, buffer.data(), TEST_DATA_SIZE);
-  EXPECT_TRUE(read_result.Succeeded());
+  EXPECT_TRUE(read_result.has_value());
   EXPECT_EQ(*read_result, 0u);
   EXPECT_EQ(m_fs->GetFileStatus(fd)->offset, TEST_DATA.size());
 
   // Go back to the start and try to read past EOF. This should read the entire file until EOF.
-  ASSERT_TRUE(m_fs->SeekFile(fd, 0, SeekMode::Set).Succeeded());
+  ASSERT_TRUE(m_fs->SeekFile(fd, 0, SeekMode::Set).has_value());
   const u32 LARGER_TEST_DATA_SIZE = TEST_DATA_SIZE + 10;
   std::vector<u8> larger_buffer(LARGER_TEST_DATA_SIZE);
   read_result = m_fs->ReadBytesFromFile(fd, larger_buffer.data(), LARGER_TEST_DATA_SIZE);
-  EXPECT_TRUE(read_result.Succeeded());
+  EXPECT_TRUE(read_result.has_value());
   EXPECT_EQ(*read_result, TEST_DATA.size());
   EXPECT_EQ(m_fs->GetFileStatus(fd)->offset, TEST_DATA.size());
 }
@@ -391,15 +391,15 @@ TEST_F(FileSystemTest, MultipleHandles)
 
   {
     const Result<FileHandle> file = m_fs->OpenFile(Uid{0}, Gid{0}, "/tmp/f", Mode::ReadWrite);
-    ASSERT_TRUE(file.Succeeded());
+    ASSERT_TRUE(file.has_value());
     // Fill it with 10 zeroes.
-    ASSERT_TRUE(file->Write(std::vector<u8>(10).data(), 10).Succeeded());
+    ASSERT_TRUE(file->Write(std::vector<u8>(10).data(), 10).has_value());
   }
 
   const Result<FileHandle> file1 = m_fs->OpenFile(Uid{0}, Gid{0}, "/tmp/f", Mode::ReadWrite);
   const Result<FileHandle> file2 = m_fs->OpenFile(Uid{0}, Gid{0}, "/tmp/f", Mode::ReadWrite);
-  ASSERT_TRUE(file1.Succeeded());
-  ASSERT_TRUE(file2.Succeeded());
+  ASSERT_TRUE(file1.has_value());
+  ASSERT_TRUE(file2.has_value());
 
   // Write some test data using one handle and make sure the data is seen by the other handle
   // (see issue 2917, 5232 and 8702 and https://github.com/dolphin-emu/dolphin/pull/2649).
@@ -407,12 +407,12 @@ TEST_F(FileSystemTest, MultipleHandles)
 
   const std::vector<u8> TEST_DATA{{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}};
   EXPECT_EQ(file1->GetStatus()->offset, 0u);
-  ASSERT_TRUE(file1->Write(TEST_DATA.data(), TEST_DATA.size()).Succeeded());
+  ASSERT_TRUE(file1->Write(TEST_DATA.data(), TEST_DATA.size()).has_value());
   EXPECT_EQ(file1->GetStatus()->offset, 10u);
 
   std::vector<u8> read_buffer(TEST_DATA.size());
   EXPECT_EQ(file2->GetStatus()->offset, 0u);
-  ASSERT_TRUE(file2->Read(read_buffer.data(), read_buffer.size()).Succeeded());
+  ASSERT_TRUE(file2->Read(read_buffer.data(), read_buffer.size()).has_value());
   EXPECT_EQ(file2->GetStatus()->offset, 10u);
   EXPECT_EQ(TEST_DATA, read_buffer);
 }
@@ -424,8 +424,8 @@ TEST_F(FileSystemTest, ReadDirectoryOnFile)
   ASSERT_EQ(m_fs->CreateFile(Uid{0}, Gid{0}, "/tmp/f", 0, modes), ResultCode::Success);
 
   const Result<std::vector<std::string>> result = m_fs->ReadDirectory(Uid{0}, Gid{0}, "/tmp/f");
-  ASSERT_FALSE(result.Succeeded());
-  EXPECT_EQ(result.Error(), ResultCode::Invalid);
+  ASSERT_FALSE(result.has_value());
+  EXPECT_EQ(result.error(), ResultCode::Invalid);
 }
 
 TEST_F(FileSystemTest, ReadDirectoryOrdering)
@@ -447,7 +447,7 @@ TEST_F(FileSystemTest, ReadDirectoryOrdering)
   // Verify that ReadDirectory returns a file list that is ordered by descending creation date
   // (issue 10234).
   const Result<std::vector<std::string>> result = m_fs->ReadDirectory(Uid{0}, Gid{0}, "/tmp/o");
-  ASSERT_TRUE(result.Succeeded());
+  ASSERT_TRUE(result.has_value());
   ASSERT_EQ(result->size(), file_names.size());
   EXPECT_TRUE(std::equal(result->begin(), result->end(), file_names.rbegin()));
 }
@@ -458,7 +458,7 @@ TEST_F(FileSystemTest, CreateFullPath)
 
   // Parent directories should be created by CreateFullPath.
   for (const std::string path : {"/tmp", "/tmp/a", "/tmp/a/b", "/tmp/a/b/c"})
-    EXPECT_TRUE(m_fs->ReadDirectory(Uid{0}, Gid{0}, path).Succeeded());
+    EXPECT_TRUE(m_fs->ReadDirectory(Uid{0}, Gid{0}, path).has_value());
 
   // If parent directories already exist, the call should still succeed.
   EXPECT_EQ(m_fs->CreateFullPath(Uid{0}, Gid{0}, "/tmp/a/b/c/d", 0, modes), ResultCode::Success);
diff --git a/Source/UnitTests/Core/PageFaultTest.cpp b/Source/UnitTests/Core/PageFaultTest.cpp
index c9c69d7d5188..8c29d31d6401 100644
--- a/Source/UnitTests/Core/PageFaultTest.cpp
+++ b/Source/UnitTests/Core/PageFaultTest.cpp
@@ -2,17 +2,16 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <chrono>
-#include <fmt/format.h>
 
 #include "Common/CommonTypes.h"
 #include "Common/ScopeGuard.h"
-#include "Common/Timer.h"
 #include "Core/Core.h"
 #include "Core/MemTools.h"
-#include "Core/PowerPC/JitCommon/JitBase.h"
 #include "Core/PowerPC/JitInterface.h"
 #include "Core/System.h"
 
+#include "StubJit.h"
+
 // include order is important
 #include <gtest/gtest.h>  // NOLINT
 
@@ -25,26 +24,11 @@ enum
 #endif
 };
 
-class PageFaultFakeJit : public JitBase
+class PageFaultFakeJit : public StubJit
 {
 public:
-  explicit PageFaultFakeJit(Core::System& system) : JitBase(system) {}
-
-  // CPUCoreBase methods
-  void Init() override {}
-  void Shutdown() override {}
-  void ClearCache() override {}
-  void Run() override {}
-  void SingleStep() override {}
-  const char* GetName() const override { return nullptr; }
-  // JitBase methods
-  JitBaseBlockCache* GetBlockCache() override { return nullptr; }
-  void Jit(u32 em_address) override {}
-  void EraseSingleBlock(const JitBlock&) override {}
-  std::vector<MemoryStats> GetMemoryStats() const override { return {}; }
-  std::size_t DisassembleNearCode(const JitBlock&, std::ostream&) const override { return 0; }
-  std::size_t DisassembleFarCode(const JitBlock&, std::ostream&) const override { return 0; }
-  const CommonAsmRoutinesBase* GetAsmRoutines() override { return nullptr; }
+  explicit PageFaultFakeJit(Core::System& system) : StubJit(system) {}
+
   bool HandleFault(uintptr_t access_address, SContext* ctx) override
   {
     m_pre_unprotect_time = std::chrono::high_resolution_clock::now();
diff --git a/Source/UnitTests/Core/PatchAllowlistTest.cpp b/Source/UnitTests/Core/PatchAllowlistTest.cpp
index 85111fb60790..4fa6f0f32801 100644
--- a/Source/UnitTests/Core/PatchAllowlistTest.cpp
+++ b/Source/UnitTests/Core/PatchAllowlistTest.cpp
@@ -3,7 +3,6 @@
 
 #ifdef USE_RETRO_ACHIEVEMENTS
 
-#include <array>
 #include <map>
 #include <string>
 #include <string_view>
@@ -17,12 +16,10 @@
 #include "Common/CommonPaths.h"
 #include "Common/Crypto/SHA1.h"
 #include "Common/FileUtil.h"
-#include "Common/IOFile.h"
 #include "Common/IniFile.h"
 #include "Common/JsonUtil.h"
 #include "Core/AchievementManager.h"
 #include "Core/ActionReplay.h"
-#include "Core/CheatCodes.h"
 #include "Core/GeckoCode.h"
 #include "Core/GeckoCodeConfig.h"
 #include "Core/PatchEngine.h"
diff --git a/Source/UnitTests/Core/PowerPC/Jit64Common/ConvertDoubleToSingle.cpp b/Source/UnitTests/Core/PowerPC/Jit64Common/ConvertDoubleToSingle.cpp
index 05c80854b2ff..36604ee735f8 100644
--- a/Source/UnitTests/Core/PowerPC/Jit64Common/ConvertDoubleToSingle.cpp
+++ b/Source/UnitTests/Core/PowerPC/Jit64Common/ConvertDoubleToSingle.cpp
@@ -1,23 +1,18 @@
 // Copyright 2019 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include <cstring>
-#include <tuple>
-
 #include "Common/CommonTypes.h"
 #include "Common/ScopeGuard.h"
 #include "Common/x64ABI.h"
 #include "Core/Core.h"
-#include "Core/PowerPC/Gekko.h"
 #include "Core/PowerPC/Interpreter/Interpreter_FPUtils.h"
 #include "Core/PowerPC/Jit64/Jit.h"
 #include "Core/PowerPC/Jit64Common/Jit64AsmCommon.h"
-#include "Core/PowerPC/Jit64Common/Jit64PowerPCState.h"
+#include "Core/PowerPC/Jit64Common/Jit64Constants.h"
 #include "Core/System.h"
 
 #include "../TestValues.h"
 
-#include <fmt/format.h>
 #include <gtest/gtest.h>
 
 namespace
@@ -64,7 +59,8 @@ TEST(Jit64, ConvertDoubleToSingle)
     const u32 expected = ConvertToSingle(input);
     const u32 actual = routines.wrapped_cdts(input);
 
-    fmt::print("{:016x} -> {:08x} == {:08x}\n", input, actual, expected);
+    if (expected != actual)
+      fmt::print("{:016x} -> {:08x} == {:08x}\n", input, actual, expected);
 
     EXPECT_EQ(expected, actual);
   }
diff --git a/Source/UnitTests/Core/PowerPC/Jit64Common/Fres.cpp b/Source/UnitTests/Core/PowerPC/Jit64Common/Fres.cpp
new file mode 100644
index 000000000000..bf92c6599953
--- /dev/null
+++ b/Source/UnitTests/Core/PowerPC/Jit64Common/Fres.cpp
@@ -0,0 +1,79 @@
+// Copyright 2025 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include <bit>
+
+#include "Common/CommonTypes.h"
+#include "Common/FloatUtils.h"
+#include "Common/ScopeGuard.h"
+#include "Common/x64ABI.h"
+#include "Core/Core.h"
+#include "Core/PowerPC/Jit64/Jit.h"
+#include "Core/PowerPC/Jit64Common/Jit64AsmCommon.h"
+#include "Core/PowerPC/Jit64Common/Jit64PowerPCState.h"
+#include "Core/System.h"
+
+#include "../TestValues.h"
+
+#include <gtest/gtest.h>
+
+namespace
+{
+class TestFres : public CommonAsmRoutines
+{
+public:
+  explicit TestFres(Core::System& system) : CommonAsmRoutines(jit), jit(system)
+  {
+    using namespace Gen;
+
+    AllocCodeSpace(4096);
+    m_const_pool.Init(AllocChildCodeSpace(1024), 1024);
+
+    const auto raw_fres = reinterpret_cast<double (*)(double)>(AlignCode4());
+    GenFres();
+
+    wrapped_fres = reinterpret_cast<u64 (*)(u64, const UReg_FPSCR&)>(AlignCode4());
+    ABI_PushRegistersAndAdjustStack(ABI_ALL_CALLEE_SAVED, 8, 16);
+
+    // We know that the only part of PowerPCState that the fres routine accesses is the fpscr.
+    // We manufacture a PPCSTATE pointer so it reads from our provided fpscr instead.
+    LEA(64, RPPCSTATE, MDisp(ABI_PARAM2, -PPCSTATE_OFF(fpscr)));
+
+    // Call
+    MOVQ_xmm(XMM0, R(ABI_PARAM1));
+    ABI_CallFunction(raw_fres);
+    MOVQ_xmm(R(ABI_RETURN), XMM0);
+
+    ABI_PopRegistersAndAdjustStack(ABI_ALL_CALLEE_SAVED, 8, 16);
+    RET();
+  }
+
+  u64 (*wrapped_fres)(u64, const UReg_FPSCR&);
+  Jit64 jit;
+};
+
+}  // namespace
+
+TEST(Jit64, Fres)
+{
+  Core::DeclareAsCPUThread();
+  Common::ScopeGuard cpu_thread_guard([] { Core::UndeclareAsCPUThread(); });
+
+  TestFres test(Core::System::GetInstance());
+
+  // FPSCR with NI set
+  const UReg_FPSCR fpscr = UReg_FPSCR(0x00000004);
+
+  for (const u64 ivalue : double_test_values)
+  {
+    const double dvalue = std::bit_cast<double>(ivalue);
+
+    const u64 expected = std::bit_cast<u64>(Common::ApproximateReciprocal(dvalue));
+    const u64 actual = test.wrapped_fres(ivalue, fpscr);
+
+    if (expected != actual)
+      fmt::print("{:016x} -> {:016x} == {:016x}\n", ivalue, actual, expected);
+
+    EXPECT_EQ(expected, actual);
+  }
+}
diff --git a/Source/UnitTests/Core/PowerPC/Jit64Common/Frsqrte.cpp b/Source/UnitTests/Core/PowerPC/Jit64Common/Frsqrte.cpp
index a59f577c7b58..5af80075f095 100644
--- a/Source/UnitTests/Core/PowerPC/Jit64Common/Frsqrte.cpp
+++ b/Source/UnitTests/Core/PowerPC/Jit64Common/Frsqrte.cpp
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <bit>
-#include <cstring>
 
 #include "Common/CommonTypes.h"
 #include "Common/FloatUtils.h"
@@ -17,7 +16,6 @@
 
 #include "../TestValues.h"
 
-#include <fmt/format.h>
 #include <gtest/gtest.h>
 
 namespace
@@ -38,12 +36,9 @@ class TestCommonAsmRoutines : public CommonAsmRoutines
     wrapped_frsqrte = reinterpret_cast<u64 (*)(u64, UReg_FPSCR&)>(AlignCode4());
     ABI_PushRegistersAndAdjustStack(ABI_ALL_CALLEE_SAVED, 8, 16);
 
-    // We know the frsqrte implementation only accesses the fpscr. We manufacture a
-    // PPCSTATE pointer so we read/write to our provided fpscr argument instead.
-    XOR(32, R(RPPCSTATE), R(RPPCSTATE));
-    LEA(64, RSCRATCH, PPCSTATE(fpscr));
-    SUB(64, R(ABI_PARAM2), R(RSCRATCH));
-    MOV(64, R(RPPCSTATE), R(ABI_PARAM2));
+    // We know that the only part of PowerPCState that the frsqrte routine accesses is the fpscr.
+    // We manufacture a PPCSTATE pointer so it reads/writes to our provided fpscr instead.
+    LEA(64, RPPCSTATE, MDisp(ABI_PARAM2, -PPCSTATE_OFF(fpscr)));
 
     // Call
     MOVQ_xmm(XMM0, R(ABI_PARAM1));
@@ -76,7 +71,8 @@ TEST(Jit64, Frsqrte)
 
     u64 actual = routines.wrapped_frsqrte(ivalue, fpscr);
 
-    fmt::print("{:016x} -> {:016x} == {:016x}\n", ivalue, actual, expected);
+    if (expected != actual)
+      fmt::print("{:016x} -> {:016x} == {:016x}\n", ivalue, actual, expected);
 
     EXPECT_EQ(expected, actual);
   }
diff --git a/Source/UnitTests/Core/PowerPC/JitArm64/Fres.cpp b/Source/UnitTests/Core/PowerPC/JitArm64/Fres.cpp
index fcfc8577a2b8..cf132215ffb8 100644
--- a/Source/UnitTests/Core/PowerPC/JitArm64/Fres.cpp
+++ b/Source/UnitTests/Core/PowerPC/JitArm64/Fres.cpp
@@ -6,6 +6,7 @@
 
 #include "Common/Arm64Emitter.h"
 #include "Common/CommonTypes.h"
+#include "Common/FloatUtils.h"
 #include "Common/ScopeGuard.h"
 #include "Core/Core.h"
 #include "Core/PowerPC/Interpreter/Interpreter_FPUtils.h"
@@ -15,6 +16,7 @@
 
 #include "../TestValues.h"
 
+#include <fmt/format.h>
 #include <gtest/gtest.h>
 
 namespace
diff --git a/Source/UnitTests/Core/PowerPC/JitArm64/Frsqrte.cpp b/Source/UnitTests/Core/PowerPC/JitArm64/Frsqrte.cpp
index 14f1fdfe786b..a6e2940343b2 100644
--- a/Source/UnitTests/Core/PowerPC/JitArm64/Frsqrte.cpp
+++ b/Source/UnitTests/Core/PowerPC/JitArm64/Frsqrte.cpp
@@ -5,8 +5,8 @@
 #include <functional>
 
 #include "Common/Arm64Emitter.h"
-#include "Common/BitUtils.h"
 #include "Common/CommonTypes.h"
+#include "Common/FloatUtils.h"
 #include "Common/ScopeGuard.h"
 #include "Core/Core.h"
 #include "Core/PowerPC/Interpreter/Interpreter_FPUtils.h"
diff --git a/Source/UnitTests/Core/PowerPC/PageTableHostMappingTest.cpp b/Source/UnitTests/Core/PowerPC/PageTableHostMappingTest.cpp
new file mode 100644
index 000000000000..fcb0071054c1
--- /dev/null
+++ b/Source/UnitTests/Core/PowerPC/PageTableHostMappingTest.cpp
@@ -0,0 +1,883 @@
+// Copyright 2026 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include <bit>
+#include <set>
+#include <utility>
+
+#include <fmt/format.h>
+
+#include "Common/Align.h"
+#include "Common/CommonTypes.h"
+#include "Common/Swap.h"
+#include "Core/Core.h"
+#include "Core/MemTools.h"
+#include "Core/PowerPC/BreakPoints.h"
+#include "Core/PowerPC/Gekko.h"
+#include "Core/PowerPC/JitInterface.h"
+#include "Core/PowerPC/MMU.h"
+#include "Core/PowerPC/PowerPC.h"
+#include "Core/System.h"
+
+#include "../StubJit.h"
+
+#include <gtest/gtest.h>
+
+// All guest addresses used in this unit test are arbitrary, aside from alignment requirements
+static constexpr u32 ALIGNED_PAGE_TABLE_BASE = 0x00020000;
+static constexpr u32 ALIGNED_PAGE_TABLE_MASK_SMALL = 0x0000ffff;
+static constexpr u32 ALIGNED_PAGE_TABLE_MASK_LARGE = 0x0001ffff;
+
+static constexpr u32 MISALIGNED_PAGE_TABLE_BASE = 0x00050000;
+static constexpr u32 MISALIGNED_PAGE_TABLE_BASE_ALIGNED = 0x00040000;
+static constexpr u32 MISALIGNED_PAGE_TABLE_MASK = 0x0003ffff;
+
+static constexpr u32 HOLE_MASK_PAGE_TABLE_BASE = 0x00080000;
+static constexpr u32 HOLE_MASK_PAGE_TABLE_MASK = 0x0002ffff;
+static constexpr u32 HOLE_MASK_PAGE_TABLE_MASK_WITHOUT_HOLE = 0x0003ffff;
+
+static constexpr u32 MISALIGNED_HOLE_MASK_PAGE_TABLE_BASE = 0x000e0000;
+static constexpr u32 MISALIGNED_HOLE_MASK_PAGE_TABLE_BASE_ALIGNED = 0x000d0000;
+static constexpr u32 MISALIGNED_HOLE_MASK_PAGE_TABLE_MASK = 0x0002ffff;
+static constexpr u32 MISALIGNED_HOLE_MASK_PAGE_TABLE_MASK_WITHOUT_HOLE = 0x0003ffff;
+
+static constexpr u32 TEMPORARY_MEMORY = 0x00000000;
+static u32 s_current_temporary_memory = TEMPORARY_MEMORY;
+
+// This is the max that the unit test can handle, not the max that Core can handle
+static constexpr u32 MAX_HOST_PAGE_SIZE = 64 * 1024;
+static u32 s_minimum_mapping_size = 0;
+
+static volatile const void* volatile s_detection_address = nullptr;
+static volatile size_t s_detection_count = 0;
+static u32 s_counter = 0;
+static std::set<u32> s_temporary_mappings;
+
+class PageFaultDetector : public StubJit
+{
+public:
+  explicit PageFaultDetector(Core::System& system) : StubJit(system), m_block_cache(*this) {}
+
+  bool HandleFault(uintptr_t access_address, SContext* ctx) override
+  {
+    if (access_address != reinterpret_cast<uintptr_t>(s_detection_address))
+    {
+      std::string logical_address;
+      auto& memory = Core::System::GetInstance().GetMemory();
+      auto logical_base = reinterpret_cast<uintptr_t>(memory.GetLogicalBase());
+      if (access_address >= logical_base && access_address < logical_base + 0x1'0000'0000)
+        logical_address = fmt::format(" (PPC {:#010x})", access_address - logical_base);
+
+      ADD_FAILURE() << fmt::format("Unexpected segfault at {:#x}{}", access_address,
+                                   logical_address);
+
+      return false;
+    }
+
+    s_detection_address = nullptr;
+    s_detection_count = s_detection_count + 1;
+
+    // After we return from the signal handler, the memory access will happen again.
+    // Let it succeed this time so the signal handler won't get called over and over.
+    auto& memory = Core::System::GetInstance().GetMemory();
+    const uintptr_t logical_base = reinterpret_cast<uintptr_t>(memory.GetLogicalBase());
+    const u32 logical_address = static_cast<u32>(access_address - logical_base);
+    const u32 mask = s_minimum_mapping_size - 1;
+    for (u32 i = logical_address & mask; i < s_minimum_mapping_size; i += PowerPC::HW_PAGE_SIZE)
+    {
+      const u32 current_logical_address = (logical_address & ~mask) + i;
+      memory.AddPageTableMapping(current_logical_address, s_current_temporary_memory + i, true);
+      s_temporary_mappings.emplace(current_logical_address);
+    }
+    return true;
+  }
+
+  bool WantsPageTableMappings() const override { return true; }
+
+  // PowerPC::MMU::DBATUpdated wants to clear blocks in the block cache,
+  // so this can't just return nullptr
+  JitBaseBlockCache* GetBlockCache() override { return &m_block_cache; }
+
+private:
+  StubBlockCache m_block_cache;
+};
+
+// This is used as a performance optimization. If several page table updates are performed while
+// DR is disabled, MMU.cpp will only have to rescan the page table one time once DR is enabled again
+// instead of after each page table update.
+class DisableDR final
+{
+public:
+  DisableDR()
+  {
+    auto& system = Core::System::GetInstance();
+    system.GetPPCState().msr.DR = 0;
+    system.GetPowerPC().MSRUpdated();
+  }
+
+  ~DisableDR()
+  {
+    auto& system = Core::System::GetInstance();
+    system.GetPPCState().msr.DR = 1;
+    system.GetPowerPC().MSRUpdated();
+  }
+};
+
+class PageTableHostMappingTest : public ::testing::Test
+{
+public:
+  static void SetUpTestSuite()
+  {
+    if (!EMM::IsExceptionHandlerSupported())
+      GTEST_SKIP() << "Skipping PageTableHostMappingTest because exception handler is unsupported.";
+
+    auto& system = Core::System::GetInstance();
+    auto& memory = system.GetMemory();
+    const u32 host_page_size = memory.GetHostPageSize();
+    s_minimum_mapping_size = std::max<u32>(host_page_size, PowerPC::HW_PAGE_SIZE);
+
+    if (!std::has_single_bit(host_page_size) || host_page_size > MAX_HOST_PAGE_SIZE)
+    {
+      GTEST_SKIP() << fmt::format(
+          "Skipping PageTableHostMappingTest because page size {} is unsupported.", host_page_size);
+    }
+
+    memory.Init();
+    if (!memory.InitFastmemArena())
+    {
+      memory.Shutdown();
+      GTEST_SKIP() << "Skipping PageTableHostMappingTest because InitFastmemArena failed.";
+    }
+
+    Core::DeclareAsCPUThread();
+    EMM::InstallExceptionHandler();
+    system.GetJitInterface().SetJit(std::make_unique<PageFaultDetector>(system));
+
+    // Make sure BATs and SRs are cleared
+    auto& power_pc = system.GetPowerPC();
+    power_pc.Reset();
+
+    // Set up an SR
+    SetSR(1, 123);
+
+    // Specify a page table
+    SetSDR(ALIGNED_PAGE_TABLE_BASE, ALIGNED_PAGE_TABLE_MASK_SMALL);
+
+    // Enable address translation
+    system.GetPPCState().msr.DR = 1;
+    system.GetPPCState().msr.IR = 1;
+    power_pc.MSRUpdated();
+  }
+
+  static void TearDownTestSuite()
+  {
+    auto& system = Core::System::GetInstance();
+
+    system.GetJitInterface().SetJit(nullptr);
+    EMM::UninstallExceptionHandler();
+    Core::UndeclareAsCPUThread();
+    system.GetMemory().Shutdown();
+  }
+
+  static void SetSR(size_t index, u32 vsid)
+  {
+    ASSERT_FALSE(index == 4 || index == 7)
+        << fmt::format("sr{} has conflicts with fake VMEM mapping", index);
+
+    UReg_SR sr{};
+    sr.VSID = vsid;
+
+    auto& system = Core::System::GetInstance();
+    system.GetPPCState().sr[index] = sr.Hex;
+    system.GetMMU().SRUpdated();
+  }
+
+  static void SetSDR(u32 page_table_base, u32 page_table_mask)
+  {
+    UReg_SDR1 sdr;
+    sdr.htabmask = page_table_mask >> 16;
+    sdr.reserved = 0;
+    sdr.htaborg = page_table_base >> 16;
+
+    auto& system = Core::System::GetInstance();
+    system.GetPPCState().spr[SPR_SDR] = sdr.Hex;
+    system.GetMMU().SDRUpdated();
+  }
+
+  static void SetBAT(u32 spr, UReg_BAT_Up batu, UReg_BAT_Lo batl)
+  {
+    auto& system = Core::System::GetInstance();
+    auto& ppc_state = system.GetPPCState();
+    auto& mmu = system.GetMMU();
+
+    ppc_state.spr[spr + 1] = batl.Hex;
+    ppc_state.spr[spr] = batu.Hex;
+
+    if ((spr >= SPR_IBAT0U && spr <= SPR_IBAT3L) || (spr >= SPR_IBAT4U && spr <= SPR_IBAT7L))
+      mmu.IBATUpdated();
+    if ((spr >= SPR_DBAT0U && spr <= SPR_DBAT3L) || (spr >= SPR_DBAT4U && spr <= SPR_DBAT7L))
+      mmu.DBATUpdated();
+  }
+
+  static void SetBAT(u32 spr, u32 logical_address, u32 physical_address, u32 size)
+  {
+    UReg_BAT_Up batu{};
+    batu.VP = 1;
+    batu.VS = 1;
+    batu.BL = (size - 1) >> PowerPC::BAT_INDEX_SHIFT;
+    batu.BEPI = logical_address >> PowerPC::BAT_INDEX_SHIFT;
+
+    UReg_BAT_Lo batl{};
+    batl.PP = 2;
+    batl.WIMG = 0;
+    batl.BRPN = physical_address >> PowerPC::BAT_INDEX_SHIFT;
+
+    SetBAT(spr, batu, batl);
+  }
+
+  static void ExpectMapped(u32 logical_address, u32 physical_address)
+  {
+    SCOPED_TRACE(
+        fmt::format("ExpectMapped({:#010x}, {:#010x})", logical_address, physical_address));
+
+    auto& memory = Core::System::GetInstance().GetMemory();
+    u8* physical_base = memory.GetPhysicalBase();
+    u8* logical_base = memory.GetLogicalBase();
+
+    auto* physical_ptr = reinterpret_cast<volatile u32*>(physical_base + physical_address);
+    auto* logical_ptr = reinterpret_cast<volatile u32*>(logical_base + logical_address);
+
+    *physical_ptr = ++s_counter;
+    EXPECT_EQ(*logical_ptr, s_counter)
+        << "Page was mapped to a different physical page than expected";
+
+    *logical_ptr = ++s_counter;
+    EXPECT_EQ(*physical_ptr, s_counter)
+        << "Page was mapped to a different physical page than expected";
+  }
+
+#ifdef _MSC_VER
+#define ASAN_DISABLE __declspec(no_sanitize_address)
+#else
+#define ASAN_DISABLE
+#endif
+
+  static void ASAN_DISABLE ExpectReadOnlyMapped(u32 logical_address, u32 physical_address)
+  {
+    SCOPED_TRACE(
+        fmt::format("ExpectReadOnlyMapped({:#010x}, {:#010x})", logical_address, physical_address));
+
+    auto& memory = Core::System::GetInstance().GetMemory();
+    u8* physical_base = memory.GetPhysicalBase();
+    u8* logical_base = memory.GetLogicalBase();
+
+    auto* physical_ptr = reinterpret_cast<volatile u32*>(physical_base + physical_address);
+    auto* logical_ptr = reinterpret_cast<volatile u32*>(logical_base + logical_address);
+
+    *physical_ptr = ++s_counter;
+    EXPECT_EQ(*logical_ptr, s_counter)
+        << "Page was mapped to a different physical page than expected";
+
+    s_detection_address = logical_ptr;
+    s_detection_count = 0;
+
+    // This line should fault
+    *logical_ptr = ++s_counter;
+
+    memory.RemovePageTableMappings(s_temporary_mappings);
+    s_temporary_mappings.clear();
+    EXPECT_EQ(s_detection_count, u32(1)) << "Page was mapped as writeable, against expectations";
+  }
+
+  static void ASAN_DISABLE ExpectNotMapped(u32 logical_address)
+  {
+    SCOPED_TRACE(fmt::format("ExpectNotMapped({:#010x})", logical_address));
+
+    auto& memory = Core::System::GetInstance().GetMemory();
+    u8* logical_base = memory.GetLogicalBase();
+
+    auto* logical_ptr = reinterpret_cast<volatile u32*>(logical_base + logical_address);
+    s_detection_address = logical_ptr;
+    s_detection_count = 0;
+
+    // This line should fault
+    *logical_ptr;
+
+    memory.RemovePageTableMappings(s_temporary_mappings);
+    s_temporary_mappings.clear();
+    EXPECT_EQ(s_detection_count, u32(1)) << "Page was mapped, against expectations";
+  }
+
+  static void ExpectMappedOnlyIf4KHostPages(u32 logical_address, u32 physical_address)
+  {
+    if (s_minimum_mapping_size > PowerPC::HW_PAGE_SIZE)
+      ExpectNotMapped(logical_address);
+    else
+      ExpectMapped(logical_address, physical_address);
+  }
+
+  static std::pair<UPTE_Lo, UPTE_Hi> GetPTE(u32 logical_address, u32 index)
+  {
+    auto& system = Core::System::GetInstance();
+    auto& ppc_state = system.GetPPCState();
+
+    const UReg_SR sr(system.GetPPCState().sr[logical_address >> 28]);
+    u32 hash = sr.VSID ^ (logical_address >> 12);
+    if ((index & 0x8) != 0)
+      hash = ~hash;
+
+    const u32 pteg_addr = ((hash << 6) & ppc_state.pagetable_mask) | ppc_state.pagetable_base;
+    const u32 pte_addr = (index & 0x7) * 8 + pteg_addr;
+
+    const u8* physical_base = system.GetMemory().GetPhysicalBase();
+    const UPTE_Lo pte1(Common::swap32(physical_base + pte_addr));
+    const UPTE_Hi pte2(Common::swap32(physical_base + pte_addr + 4));
+
+    return {pte1, pte2};
+  }
+
+  static void SetPTE(UPTE_Lo pte1, UPTE_Hi pte2, u32 logical_address, u32 index)
+  {
+    auto& system = Core::System::GetInstance();
+    auto& ppc_state = system.GetPPCState();
+
+    pte1.H = (index & 0x8) != 0;
+
+    u32 hash = pte1.VSID ^ (logical_address >> 12);
+    if (pte1.H)
+      hash = ~hash;
+
+    const u32 pteg_addr = ((hash << 6) & ppc_state.pagetable_mask) | ppc_state.pagetable_base;
+    const u32 pte_addr = (index & 0x7) * 8 + pteg_addr;
+
+    u8* physical_base = system.GetMemory().GetPhysicalBase();
+    Common::WriteSwap32(physical_base + pte_addr, pte1.Hex);
+    Common::WriteSwap32(physical_base + pte_addr + 4, pte2.Hex);
+
+    system.GetMMU().InvalidateTLBEntry(logical_address);
+  }
+
+  static std::pair<UPTE_Lo, UPTE_Hi> CreateMapping(u32 logical_address, u32 physical_address)
+  {
+    auto& ppc_state = Core::System::GetInstance().GetPPCState();
+
+    UPTE_Lo pte1{};
+    pte1.API = logical_address >> 22;
+    pte1.VSID = UReg_SR{ppc_state.sr[logical_address >> 28]}.VSID;
+    pte1.V = 1;  // Mapping is valid
+
+    UPTE_Hi pte2{};
+    pte2.C = 1;  // Page has been written to (MMU.cpp won't map as writeable without this)
+    pte2.R = 1;  // Page has been read from (MMU.cpp won't map at all without this)
+    pte2.RPN = physical_address >> 12;
+
+    return {pte1, pte2};
+  }
+
+  static void AddMapping(u32 logical_address, u32 physical_address, u32 index)
+  {
+    auto [pte1, pte2] = CreateMapping(logical_address, physical_address);
+    SetPTE(pte1, pte2, logical_address, index);
+  }
+
+  static void AddHostSizedMapping(u32 logical_address, u32 physical_address, u32 index)
+  {
+    DisableDR disable_dr;
+    for (u32 i = 0; i < s_minimum_mapping_size; i += PowerPC::HW_PAGE_SIZE)
+      AddMapping(logical_address + i, physical_address + i, index);
+  }
+
+  static void RemoveMapping(u32 logical_address, u32 physical_address, u32 index)
+  {
+    auto [pte1, pte2] = CreateMapping(logical_address, physical_address);
+    pte1.V = 0;  // Mapping is invalid
+    SetPTE(pte1, pte2, logical_address, index);
+  }
+
+  static void RemoveHostSizedMapping(u32 logical_address, u32 physical_address, u32 index)
+  {
+    DisableDR disable_dr;
+    for (u32 i = 0; i < s_minimum_mapping_size; i += PowerPC::HW_PAGE_SIZE)
+      RemoveMapping(logical_address + i, physical_address + i, index);
+  }
+};
+
+TEST_F(PageTableHostMappingTest, Basic)
+{
+  s_current_temporary_memory = 0x00100000;
+
+  // Create a basic mapping
+  for (u32 i = 0; i < s_minimum_mapping_size; i += PowerPC::HW_PAGE_SIZE)
+  {
+    ExpectNotMapped(0x10100000 + i);
+    AddMapping(0x10100000 + i, 0x00100000 + i, 0);
+  }
+  for (u32 i = 0; i < s_minimum_mapping_size; i += PowerPC::HW_PAGE_SIZE)
+    ExpectMapped(0x10100000 + i, 0x00100000 + i);
+
+  // Create another mapping pointing to the same physical address
+  for (u32 i = 0; i < s_minimum_mapping_size; i += PowerPC::HW_PAGE_SIZE)
+  {
+    ExpectNotMapped(0x10100000 + s_minimum_mapping_size + i);
+    AddMapping(0x10100000 + s_minimum_mapping_size + i, 0x00100000 + i, 0);
+  }
+  for (u32 i = 0; i < s_minimum_mapping_size; i += PowerPC::HW_PAGE_SIZE)
+  {
+    ExpectMapped(0x10100000 + i, 0x00100000 + i);
+    ExpectMapped(0x10100000 + s_minimum_mapping_size + i, 0x00100000 + i);
+  }
+
+  // Remove the first page
+  RemoveMapping(0x10100000, 0x00100000, 0);
+  ExpectNotMapped(0x10100000);
+  for (u32 i = 0; i < s_minimum_mapping_size; i += PowerPC::HW_PAGE_SIZE)
+    ExpectMapped(0x10100000 + s_minimum_mapping_size + i, 0x00100000 + i);
+
+  s_current_temporary_memory = TEMPORARY_MEMORY;
+}
+
+TEST_F(PageTableHostMappingTest, LargeHostPageMismatchedAddresses)
+{
+  {
+    DisableDR disable_dr;
+    AddMapping(0x10110000, 0x00111000, 0);
+    for (u32 i = PowerPC::HW_PAGE_SIZE; i < s_minimum_mapping_size; i += PowerPC::HW_PAGE_SIZE)
+      AddMapping(0x10110000 + i, 0x00110000 + i, 0);
+  }
+
+  ExpectMappedOnlyIf4KHostPages(0x10110000, 0x00111000);
+}
+
+TEST_F(PageTableHostMappingTest, LargeHostPageMisalignedAddresses)
+{
+  {
+    DisableDR disable_dr;
+    for (u32 i = 0; i < s_minimum_mapping_size * 2; i += PowerPC::HW_PAGE_SIZE)
+      AddMapping(0x10120000 + i, 0x00121000 + i, 0);
+  }
+
+  ExpectMappedOnlyIf4KHostPages(0x10120000, 0x00121000);
+  ExpectMappedOnlyIf4KHostPages(0x10120000 + s_minimum_mapping_size,
+                                0x00121000 + s_minimum_mapping_size);
+}
+
+TEST_F(PageTableHostMappingTest, ChangeSR)
+{
+  {
+    DisableDR disable_dr;
+    for (u32 i = 0; i < s_minimum_mapping_size; i += PowerPC::HW_PAGE_SIZE)
+    {
+      auto [pte1, pte2] = CreateMapping(0x20130000 + i, 0x00130000 + i);
+      pte1.VSID = 0xabc;
+      SetPTE(pte1, pte2, 0x20130000 + i, 0);
+    }
+  }
+  ExpectNotMapped(0x20130000);
+
+  SetSR(2, 0xabc);
+  ExpectMapped(0x20130000, 0x00130000);
+  ExpectNotMapped(0x30130000);
+
+  SetSR(3, 0xabc);
+  ExpectMapped(0x20130000, 0x00130000);
+  ExpectMapped(0x30130000, 0x00130000);
+  ExpectNotMapped(0x00130000);
+  ExpectNotMapped(0x10130000);
+}
+
+// DBAT takes priority over page table mappings.
+TEST_F(PageTableHostMappingTest, DBATPriority)
+{
+  SetSR(5, 5);
+
+  AddHostSizedMapping(0x50140000, 0x00150000, 0);
+  ExpectMapped(0x50140000, 0x00150000);
+
+  SetBAT(SPR_DBAT0U, 0x50000000, 0x00000000, 0x01000000);
+  ExpectMapped(0x50140000, 0x00140000);
+}
+
+// Host-side page table mappings are for data only, so IBAT has no effect on them.
+TEST_F(PageTableHostMappingTest, IBATPriority)
+{
+  SetSR(6, 6);
+
+  AddHostSizedMapping(0x60160000, 0x00170000, 0);
+  ExpectMapped(0x60160000, 0x00170000);
+
+  SetBAT(SPR_IBAT0U, 0x60000000, 0x00000000, 0x01000000);
+  ExpectMapped(0x60160000, 0x00170000);
+}
+
+TEST_F(PageTableHostMappingTest, Priority)
+{
+  // Secondary PTEs for 0x10180000
+
+  AddHostSizedMapping(0x10180000, 0x00180000, 10);
+  ExpectMapped(0x10180000, 0x00180000);
+
+  AddHostSizedMapping(0x10180000, 0x00190000, 12);
+  ExpectMapped(0x10180000, 0x00180000);
+
+  AddHostSizedMapping(0x10180000, 0x001a0000, 8);
+  ExpectMapped(0x10180000, 0x001a0000);
+
+  RemoveHostSizedMapping(0x10180000, 0x00180000, 10);
+  ExpectMapped(0x10180000, 0x001a0000);
+
+  RemoveHostSizedMapping(0x10180000, 0x001a0000, 8);
+  ExpectMapped(0x10180000, 0x00190000);
+
+  // Primary PTEs for 0x10180000
+
+  AddHostSizedMapping(0x10180000, 0x00180000, 2);
+  ExpectMapped(0x10180000, 0x00180000);
+
+  AddHostSizedMapping(0x10180000, 0x001a0000, 4);
+  ExpectMapped(0x10180000, 0x00180000);
+
+  AddHostSizedMapping(0x10180000, 0x001b0000, 0);
+  ExpectMapped(0x10180000, 0x001b0000);
+
+  RemoveHostSizedMapping(0x10180000, 0x00180000, 2);
+  ExpectMapped(0x10180000, 0x001b0000);
+
+  RemoveHostSizedMapping(0x10180000, 0x001b0000, 0);
+  ExpectMapped(0x10180000, 0x001a0000);
+
+  // Return to secondary PTE for 0x10180000
+
+  RemoveHostSizedMapping(0x10180000, 0x001a0000, 4);
+  ExpectMapped(0x10180000, 0x00190000);
+
+  // Secondary PTEs for 0x11180000
+
+  AddHostSizedMapping(0x11180000, 0x01180000, 11);
+  ExpectMapped(0x11180000, 0x01180000);
+
+  AddHostSizedMapping(0x11180000, 0x01190000, 13);
+  ExpectMapped(0x11180000, 0x01180000);
+
+  AddHostSizedMapping(0x11180000, 0x011a0000, 9);
+  ExpectMapped(0x11180000, 0x011a0000);
+
+  RemoveHostSizedMapping(0x11180000, 0x01180000, 11);
+  ExpectMapped(0x11180000, 0x011a0000);
+
+  RemoveHostSizedMapping(0x11180000, 0x011a0000, 9);
+  ExpectMapped(0x11180000, 0x01190000);
+
+  // Primary PTEs for 0x11180000
+
+  AddHostSizedMapping(0x11180000, 0x01180000, 3);
+  ExpectMapped(0x11180000, 0x01180000);
+
+  AddHostSizedMapping(0x11180000, 0x011a0000, 5);
+  ExpectMapped(0x11180000, 0x01180000);
+
+  AddHostSizedMapping(0x11180000, 0x011b0000, 1);
+  ExpectMapped(0x11180000, 0x011b0000);
+
+  RemoveHostSizedMapping(0x11180000, 0x01180000, 3);
+  ExpectMapped(0x11180000, 0x011b0000);
+
+  RemoveHostSizedMapping(0x11180000, 0x011b0000, 1);
+  ExpectMapped(0x11180000, 0x011a0000);
+
+  // Return to secondary PTE for 0x11180000
+
+  RemoveHostSizedMapping(0x11180000, 0x011a0000, 5);
+  ExpectMapped(0x11180000, 0x01190000);
+
+  // Check that 0x10180000 is still working properly
+
+  ExpectMapped(0x10180000, 0x00190000);
+
+  AddHostSizedMapping(0x10180000, 0x00180000, 0);
+  ExpectMapped(0x10180000, 0x00180000);
+
+  // Check that 0x11180000 is still working properly
+
+  ExpectMapped(0x11180000, 0x01190000);
+
+  AddHostSizedMapping(0x11180000, 0x01180000, 1);
+  ExpectMapped(0x11180000, 0x01180000);
+}
+
+TEST_F(PageTableHostMappingTest, ChangeAddress)
+{
+  // Initial mapping
+  AddHostSizedMapping(0x101c0000, 0x001c0000, 0);
+  ExpectMapped(0x101c0000, 0x001c0000);
+
+  // Change physical address
+  AddHostSizedMapping(0x101c0000, 0x001d0000, 0);
+  ExpectMapped(0x101c0000, 0x001d0000);
+
+  // Change logical address
+  AddHostSizedMapping(0x111c0000, 0x001d0000, 0);
+  ExpectMapped(0x111c0000, 0x001d0000);
+  ExpectNotMapped(0x101c0000);
+
+  // Change both logical address and physical address
+  AddHostSizedMapping(0x101c0000, 0x011d0000, 0);
+  ExpectMapped(0x101c0000, 0x011d0000);
+  ExpectNotMapped(0x111c0000);
+}
+
+TEST_F(PageTableHostMappingTest, InvalidPhysicalAddress)
+{
+  AddHostSizedMapping(0x101d0000, 0x0ff00000, 0);
+  ExpectNotMapped(0x101d0000);
+}
+
+TEST_F(PageTableHostMappingTest, WIMG)
+{
+  for (u32 i = 0; i < 16; ++i)
+  {
+    {
+      DisableDR disable_dr;
+      for (u32 j = 0; j < s_minimum_mapping_size; j += PowerPC::HW_PAGE_SIZE)
+      {
+        auto [pte1, pte2] = CreateMapping(0x101e0000 + j, 0x001e0000 + j);
+        pte2.WIMG = i;
+        SetPTE(pte1, pte2, 0x101e0000 + j, 0);
+      }
+    }
+
+    if ((i & 0b1100) != 0)
+      ExpectNotMapped(0x101e0000);
+    else
+      ExpectMapped(0x101e0000, 0x001e0000);
+  }
+}
+
+TEST_F(PageTableHostMappingTest, RC)
+{
+  auto& mmu = Core::System::GetInstance().GetMMU();
+
+  const auto set_up_mapping = [] {
+    DisableDR disable_dr;
+    for (u32 i = 0; i < s_minimum_mapping_size; i += PowerPC::HW_PAGE_SIZE)
+    {
+      auto [pte1, pte2] = CreateMapping(0x101f0000 + i, 0x001f0000 + i);
+      pte2.R = 0;
+      pte2.C = 0;
+      SetPTE(pte1, pte2, 0x101f0000 + i, 0);
+    }
+  };
+
+  const auto expect_rc = [](u32 r, u32 c) {
+    auto [pte1, pte2] = GetPTE(0x101f0000, 0);
+    EXPECT_TRUE(pte1.V);
+    EXPECT_EQ(pte2.R, r);
+    EXPECT_EQ(pte2.C, c);
+  };
+
+  // Start with R=0, C=0
+  set_up_mapping();
+  ExpectNotMapped(0x101f0000);
+  expect_rc(0, 0);
+
+  // Automatically set R=1, C=0
+  for (u32 i = 0; i < s_minimum_mapping_size; i += PowerPC::HW_PAGE_SIZE)
+    mmu.Read<u32>(0x101f0000 + i);
+  ExpectReadOnlyMapped(0x101f0000, 0x001f0000);
+  expect_rc(1, 0);
+
+  // Automatically set R=1, C=1
+  for (u32 i = 0; i < s_minimum_mapping_size; i += PowerPC::HW_PAGE_SIZE)
+    mmu.Write<u32>(0x12345678, 0x101f0000 + i);
+  ExpectMapped(0x101f0000, 0x001f0000);
+  expect_rc(1, 1);
+
+  // Start over with R=0, C=0
+  set_up_mapping();
+  ExpectNotMapped(0x101f0000);
+  expect_rc(0, 0);
+
+  // Automatically set R=1, C=1
+  for (u32 i = 0; i < s_minimum_mapping_size; i += PowerPC::HW_PAGE_SIZE)
+    mmu.Write<u32>(0x12345678, 0x101f0000 + i);
+  ExpectMapped(0x101f0000, 0x001f0000);
+  expect_rc(1, 1);
+}
+
+TEST_F(PageTableHostMappingTest, ResizePageTable)
+{
+  AddHostSizedMapping(0x10200000, 0x00200000, 0);
+  AddHostSizedMapping(0x10600000, 0x00210000, 1);
+  ExpectMapped(0x10200000, 0x00200000);
+  ExpectMapped(0x10600000, 0x00210000);
+
+  SetSDR(ALIGNED_PAGE_TABLE_BASE, ALIGNED_PAGE_TABLE_MASK_LARGE);
+  ExpectMapped(0x10200000, 0x00200000);
+  ExpectNotMapped(0x10600000);
+
+  AddHostSizedMapping(0x10600000, 0x00220000, 1);
+  ExpectMapped(0x10200000, 0x00200000);
+  ExpectMapped(0x10600000, 0x00220000);
+
+  AddHostSizedMapping(0x10610000, 0x00200000, 1);
+  ExpectMapped(0x10610000, 0x00200000);
+
+  SetSDR(ALIGNED_PAGE_TABLE_BASE, ALIGNED_PAGE_TABLE_MASK_SMALL);
+  ExpectMapped(0x10200000, 0x00200000);
+  ExpectMapped(0x10600000, 0x00210000);
+  ExpectNotMapped(0x10610000);
+}
+
+// The PEM says that all bits that are one in the page table mask must be zero in the page table
+// address. What it doesn't tell you is that if this isn't obeyed, the Gekko will do a logical OR of
+// the page table base and the page table offset, producing behavior that might not be intuitive.
+TEST_F(PageTableHostMappingTest, MisalignedPageTable)
+{
+  SetSDR(MISALIGNED_PAGE_TABLE_BASE + 0x10000, PowerPC::PAGE_TABLE_MIN_SIZE - 1);
+
+  AddHostSizedMapping(0x10a30000, 0x00230000, 4);
+  ExpectMapped(0x10a30000, 0x00230000);
+
+  SetSDR(MISALIGNED_PAGE_TABLE_BASE, MISALIGNED_PAGE_TABLE_MASK);
+
+  ExpectNotMapped(0x10a30000);
+
+  AddHostSizedMapping(0x10230000, 0x00240000, 0);
+  AddHostSizedMapping(0x10630000, 0x00250000, 1);
+  AddHostSizedMapping(0x10a30000, 0x00260000, 2);
+  AddHostSizedMapping(0x10e30000, 0x00270000, 3);
+
+  ExpectMapped(0x10230000, 0x00240000);
+  ExpectMapped(0x10630000, 0x00250000);
+  ExpectMapped(0x10a30000, 0x00260000);
+  ExpectMapped(0x10e30000, 0x00270000);
+
+  // Exercise the code for falling back to a secondary PTE after removing a primary PTE.
+  AddHostSizedMapping(0x10a30000, 0x00270000, 10);
+  AddHostSizedMapping(0x10e30000, 0x00260000, 11);
+  RemoveHostSizedMapping(0x10a30000, 0x00260000, 2);
+  RemoveHostSizedMapping(0x10e30000, 0x00250000, 3);
+
+  ExpectMapped(0x10230000, 0x00240000);
+  ExpectMapped(0x10630000, 0x00250000);
+  ExpectMapped(0x10a30000, 0x00270000);
+  ExpectMapped(0x10e30000, 0x00260000);
+
+  SetSDR(MISALIGNED_PAGE_TABLE_BASE_ALIGNED, MISALIGNED_PAGE_TABLE_MASK);
+
+  ExpectNotMapped(0x10230000);
+  ExpectMapped(0x10630000, 0x00250000);
+  ExpectMapped(0x10a30000, 0x00230000);
+  ExpectNotMapped(0x10e30000);
+
+  SetSDR(ALIGNED_PAGE_TABLE_BASE, ALIGNED_PAGE_TABLE_MASK_SMALL);
+}
+
+// Putting a zero in the middle of the page table mask's ones results in similar behavior
+// to the scenario described above.
+TEST_F(PageTableHostMappingTest, HoleInMask)
+{
+  SetSDR(HOLE_MASK_PAGE_TABLE_BASE + 0x10000, PowerPC::PAGE_TABLE_MIN_SIZE - 1);
+
+  AddHostSizedMapping(0x10680000, 0x00280000, 4);
+  ExpectMapped(0x10680000, 0x00280000);
+
+  SetSDR(HOLE_MASK_PAGE_TABLE_BASE, HOLE_MASK_PAGE_TABLE_MASK);
+
+  ExpectNotMapped(0x10680000);
+
+  AddHostSizedMapping(0x10280000, 0x00290000, 0);
+  AddHostSizedMapping(0x10680000, 0x002a0000, 1);
+  AddHostSizedMapping(0x10a80000, 0x002b0000, 2);
+  AddHostSizedMapping(0x10e80000, 0x002c0000, 3);
+
+  ExpectMapped(0x10280000, 0x00290000);
+  ExpectMapped(0x10680000, 0x002a0000);
+  ExpectMapped(0x10a80000, 0x002b0000);
+  ExpectMapped(0x10e80000, 0x002c0000);
+
+  // Exercise the code for falling back to a secondary PTE after removing a primary PTE.
+  AddHostSizedMapping(0x10a80000, 0x002c0000, 10);
+  AddHostSizedMapping(0x10e80000, 0x002b0000, 11);
+  RemoveHostSizedMapping(0x10a80000, 0x002b0000, 2);
+  RemoveHostSizedMapping(0x10e80000, 0x002c0000, 3);
+
+  ExpectMapped(0x10280000, 0x00290000);
+  ExpectMapped(0x10680000, 0x002a0000);
+  ExpectMapped(0x10a80000, 0x002c0000);
+  ExpectMapped(0x10e80000, 0x002b0000);
+
+  SetSDR(HOLE_MASK_PAGE_TABLE_BASE, HOLE_MASK_PAGE_TABLE_MASK_WITHOUT_HOLE);
+
+  ExpectMapped(0x10280000, 0x00290000);
+  ExpectMapped(0x10680000, 0x00280000);
+  ExpectNotMapped(0x10a80000);
+  ExpectMapped(0x10e80000, 0x002b0000);
+
+  SetSDR(ALIGNED_PAGE_TABLE_BASE, ALIGNED_PAGE_TABLE_MASK_SMALL);
+}
+
+// If we combine the two scenarios above, both making the base misaligned and putting a hole in the
+// mask, we get the same result as if we just make the base misaligned.
+TEST_F(PageTableHostMappingTest, HoleInMaskMisalignedPageTable)
+{
+  SetSDR(MISALIGNED_PAGE_TABLE_BASE + 0x10000, PowerPC::PAGE_TABLE_MIN_SIZE - 1);
+
+  AddHostSizedMapping(0x10ad0000, 0x002d0000, 4);
+  ExpectMapped(0x10ad0000, 0x002d0000);
+
+  SetSDR(MISALIGNED_PAGE_TABLE_BASE, MISALIGNED_PAGE_TABLE_MASK);
+
+  ExpectNotMapped(0x10ad0000);
+
+  AddHostSizedMapping(0x102d0000, 0x002e0000, 0);
+  AddHostSizedMapping(0x106d0000, 0x002f0000, 1);
+  AddHostSizedMapping(0x10ad0000, 0x00300000, 2);
+  AddHostSizedMapping(0x10ed0000, 0x00310000, 3);
+
+  ExpectMapped(0x102d0000, 0x002e0000);
+  ExpectMapped(0x106d0000, 0x002f0000);
+  ExpectMapped(0x10ad0000, 0x00300000);
+  ExpectMapped(0x10ed0000, 0x00310000);
+
+  // Exercise the code for falling back to a secondary PTE after removing a primary PTE.
+  AddHostSizedMapping(0x10ad0000, 0x00310000, 10);
+  AddHostSizedMapping(0x10ed0000, 0x00300000, 11);
+  RemoveHostSizedMapping(0x10ad0000, 0x00300000, 2);
+  RemoveHostSizedMapping(0x10ed0000, 0x00310000, 3);
+
+  ExpectMapped(0x102d0000, 0x002e0000);
+  ExpectMapped(0x106d0000, 0x002f0000);
+  ExpectMapped(0x10ad0000, 0x00310000);
+  ExpectMapped(0x10ed0000, 0x00300000);
+
+  SetSDR(MISALIGNED_PAGE_TABLE_BASE_ALIGNED, MISALIGNED_PAGE_TABLE_MASK);
+
+  ExpectNotMapped(0x102d0000);
+  ExpectMapped(0x106d0000, 0x002f0000);
+  ExpectMapped(0x10ad0000, 0x002d0000);
+  ExpectNotMapped(0x10ed0000);
+
+  SetSDR(ALIGNED_PAGE_TABLE_BASE, ALIGNED_PAGE_TABLE_MASK_SMALL);
+}
+
+TEST_F(PageTableHostMappingTest, MemChecks)
+{
+  AddHostSizedMapping(0x10320000, 0x00330000, 0);
+  AddHostSizedMapping(0x10330000, 0x00320000, 0);
+  ExpectMapped(0x10320000, 0x00330000);
+  ExpectMapped(0x10330000, 0x00320000);
+
+  auto& memchecks = Core::System::GetInstance().GetPowerPC().GetMemChecks();
+  TMemCheck memcheck;
+  memcheck.start_address = 0x10320000;
+  memcheck.end_address = 0x10320001;
+  memchecks.Add(std::move(memcheck));
+
+  ExpectNotMapped(0x10320000);
+  ExpectMapped(0x10330000, 0x00320000);
+
+  memchecks.Remove(0x10320000);
+
+  ExpectMapped(0x10320000, 0x00330000);
+  ExpectMapped(0x10330000, 0x00320000);
+}
diff --git a/Source/UnitTests/Core/StubJit.h b/Source/UnitTests/Core/StubJit.h
new file mode 100644
index 000000000000..50a1e6efb54e
--- /dev/null
+++ b/Source/UnitTests/Core/StubJit.h
@@ -0,0 +1,38 @@
+// Copyright 2026 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "Core/PowerPC/JitCommon/JitBase.h"
+#include "Core/PowerPC/JitCommon/JitCache.h"
+
+class StubJit : public JitBase
+{
+public:
+  explicit StubJit(Core::System& system) : JitBase(system) {}
+
+  // CPUCoreBase methods
+  void Init() override {}
+  void Shutdown() override {}
+  void ClearCache() override {}
+  void Run() override {}
+  void SingleStep() override {}
+  const char* GetName() const override { return nullptr; }
+  // JitBase methods
+  JitBaseBlockCache* GetBlockCache() override { return nullptr; }
+  void Jit(u32) override {}
+  void EraseSingleBlock(const JitBlock&) override {}
+  std::vector<MemoryStats> GetMemoryStats() const override { return {}; }
+  std::size_t DisassembleNearCode(const JitBlock&, std::ostream&) const override { return 0; }
+  std::size_t DisassembleFarCode(const JitBlock&, std::ostream&) const override { return 0; }
+  const CommonAsmRoutinesBase* GetAsmRoutines() override { return nullptr; }
+  bool HandleFault(uintptr_t, SContext*) override { return false; }
+};
+
+class StubBlockCache : public JitBaseBlockCache
+{
+public:
+  explicit StubBlockCache(JitBase& jit) : JitBaseBlockCache(jit) {}
+
+  void WriteLinkBlock(const JitBlock::LinkData&, const JitBlock*) override {}
+};
diff --git a/Source/UnitTests/UnitTests.vcxproj b/Source/UnitTests/UnitTests.vcxproj
index 698e33bc37a1..6b476dad9406 100644
--- a/Source/UnitTests/UnitTests.vcxproj
+++ b/Source/UnitTests/UnitTests.vcxproj
@@ -32,6 +32,7 @@
     <ClInclude Include="Core\DSP\HermesText.h" />
     <ClInclude Include="Core\IOS\ES\TestBinaryData.h" />
     <ClInclude Include="Core\PowerPC\TestValues.h" />
+    <ClInclude Include="Core\StubJit.h" />
   </ItemGroup>
   <ItemGroup>
     <!--gtest is rather small, so just include it into the build here-->
@@ -74,6 +75,7 @@
     <ClCompile Include="Core\PageFaultTest.cpp" />
     <ClCompile Include="Core\PatchAllowlistTest.cpp" />
     <ClCompile Include="Core\PowerPC\DivUtilsTest.cpp" />
+    <ClCompile Include="Core\PowerPC\PageTableHostMappingTest.cpp" />
     <ClCompile Include="VideoCommon\VertexLoaderTest.cpp" />
     <ClCompile Include="StubHost.cpp" />
   </ItemGroup>
@@ -81,6 +83,7 @@
   <ItemGroup Condition="'$(Platform)'=='x64'">
     <ClCompile Include="Common\x64EmitterTest.cpp" />
     <ClCompile Include="Core\PowerPC\Jit64Common\ConvertDoubleToSingle.cpp" />
+    <ClCompile Include="Core\PowerPC\Jit64Common\Fres.cpp" />
     <ClCompile Include="Core\PowerPC\Jit64Common\Frsqrte.cpp" />
   </ItemGroup>
   <ItemGroup Condition="'$(Platform)'=='ARM64'">
diff --git a/Source/UnitTests/UnitTestsMain.cpp b/Source/UnitTests/UnitTestsMain.cpp
index 3edb1c190929..12b998125c84 100644
--- a/Source/UnitTests/UnitTestsMain.cpp
+++ b/Source/UnitTests/UnitTestsMain.cpp
@@ -2,11 +2,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 // Based on gtest_main.cc
 
-#include <cstdio>
-#include <fmt/format.h>
-
 #include "Common/MsgHandler.h"
-#include "Core/Core.h"
 
 #include "gtest/gtest.h"
 
diff --git a/Source/UnitTests/VideoCommon/VertexLoaderTest.cpp b/Source/UnitTests/VideoCommon/VertexLoaderTest.cpp
index 936f2e35c18a..1b1d8f38bac9 100644
--- a/Source/UnitTests/VideoCommon/VertexLoaderTest.cpp
+++ b/Source/UnitTests/VideoCommon/VertexLoaderTest.cpp
@@ -5,12 +5,10 @@
 #include <limits>
 #include <memory>
 #include <tuple>
-#include <type_traits>
 #include <unordered_set>
 
 #include <gtest/gtest.h>  // NOLINT
 
-#include "Common/Common.h"
 #include "Common/MathUtil.h"
 #include "VideoCommon/CPMemory.h"
 #include "VideoCommon/DataReader.h"
diff --git a/Source/VSProps/Base.Dolphin.props b/Source/VSProps/Base.Dolphin.props
index 7eaaeac87199..472ff9a89ec2 100644
--- a/Source/VSProps/Base.Dolphin.props
+++ b/Source/VSProps/Base.Dolphin.props
@@ -50,6 +50,7 @@
       <PreprocessorDefinitions>RC_CLIENT_SUPPORTS_HASH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions>RC_CLIENT_SUPPORTS_RAINTEGRATION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(EnableCubeb)'!='false'">HAVE_CUBEB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>HAVE_CPPIPC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <!-- Warnings one may want to ignore when using Level4.
       4201  nonstandard extension used : nameless struct/union
diff --git a/Source/VSProps/Base.props b/Source/VSProps/Base.props
index 2717cd6a1e60..2d22925d7b10 100644
--- a/Source/VSProps/Base.props
+++ b/Source/VSProps/Base.props
@@ -53,7 +53,7 @@
         pathmap replaces path prefixes of source files with a hardcoded value, assisting with keeping output
         files uniform even if actually built from different locations. The mapped path doesn't really need full
         drive prefix, but it keeps things human readable. Note the trailing "\" is actually to be escaped by a
-        preceeding "\" in the expanded variable.
+        preceding "\" in the expanded variable.
       -->
       <AdditionalOptions>/pathmap:"$(DolphinRootDir)\"=d:\ %(AdditionalOptions)</AdditionalOptions>
       <AdditionalOptions>/pathmap:"$(WindowsSdkDir)\"=w:\ %(AdditionalOptions)</AdditionalOptions>
diff --git a/Source/VSProps/PCHCreate.props b/Source/VSProps/PCHCreate.props
index d7af57996eeb..c51d2803a6fd 100644
--- a/Source/VSProps/PCHCreate.props
+++ b/Source/VSProps/PCHCreate.props
@@ -18,7 +18,7 @@
     <Lib>
       <!--
         Clear the output path so projects referencing this one don't try to drag
-        in a nonexistant .lib file.
+        in a nonexistent .lib file.
         -->
       <OutputFile />
     </Lib>
@@ -33,4 +33,4 @@
     </PropertyGroup>
   </Target>
   <!--End .lib hacks-->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Source/VSProps/qt_tasks.targets b/Source/VSProps/qt_tasks.targets
index 27380451a1af..b87ccf039b94 100644
--- a/Source/VSProps/qt_tasks.targets
+++ b/Source/VSProps/qt_tasks.targets
@@ -437,7 +437,7 @@
                             var readyDependents = dependentsOf[workItem.Key]
                                 // ...that have not yet been queued...
                                 .Where(x => postponedItems.Contains(x)
-                                    // ...and whose dependending items have all terminated.
+                                    // ...and whose depending items have all terminated.
                                     && workItems[x].DependsOn.All(y => terminated.Contains(y)));
 
                             if (QtDebug && readyDependents.Any()) {