fix qcom

.ci/linux/build.sh

@@ -0,0 +1,116 @@
+#!/bin/bash -e
+
+# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+case "$1" in
+amd64 | "")
+    echo "Making amd64-v3 optimized build of Eden"
+    ARCH="amd64_v3"
+    ARCH_FLAGS="-march=x86-64-v3"
+    export EXTRA_CMAKE_FLAGS=(-DYUZU_BUILD_PRESET=v3)
+    ;;
+steamdeck | zen2)
+    echo "Making Steam Deck (Zen 2) optimized build of Eden"
+    ARCH="steamdeck"
+    ARCH_FLAGS="-march=znver2 -mtune=znver2"
+    export EXTRA_CMAKE_FLAGS=(-DYUZU_BUILD_PRESET=zen2 -DYUZU_SYSTEM_PROFILE=steamdeck)
+    ;;
+rog-ally | allyx | zen4)
+    echo "Making ROG Ally X (Zen 4) optimized build of Eden"
+    ARCH="rog-ally-x"
+    ARCH_FLAGS="-march=znver4 -mtune=znver4"
+    export EXTRA_CMAKE_FLAGS=(-DYUZU_BUILD_PRESET=zen2 -DYUZU_SYSTEM_PROFILE=steamdeck)
+    ;;
+legacy)
+    echo "Making amd64 generic build of Eden"
+    ARCH=amd64
+    ARCH_FLAGS="-march=x86-64 -mtune=generic"
+    export EXTRA_CMAKE_FLAGS=(-DYUZU_BUILD_PRESET=generic)
+    ;;
+aarch64)
+    echo "Making armv8-a build of Eden"
+    ARCH=aarch64
+    ARCH_FLAGS="-march=armv8-a -mtune=generic -w"
+    export EXTRA_CMAKE_FLAGS=(-DYUZU_BUILD_PRESET=generic)
+    ;;
+armv9)
+    echo "Making armv9-a build of Eden"
+    ARCH=armv9
+    ARCH_FLAGS="-march=armv9-a -mtune=generic -w"
+    export EXTRA_CMAKE_FLAGS=(-DYUZU_BUILD_PRESET=armv9)
+    ;;
+native)
+    echo "Making native build of Eden"
+    ARCH="$(uname -m)"
+    ARCH_FLAGS="-march=native -mtune=native"
+    export EXTRA_CMAKE_FLAGS=(-DYUZU_BUILD_PRESET=native)
+    ;;
+*)
+    echo "Invalid target $1 specified, must be one of native, amd64, steamdeck, zen2, allyx, rog-ally, zen4, legacy, aarch64, armv9"
+    exit 1
+    ;;
+esac
+
+export ARCH_FLAGS="$ARCH_FLAGS -O3"
+
+if [ -z "$NPROC" ]; then
+    NPROC="$(nproc)"
+fi
+
+if [ "$1" != "" ]; then shift; fi
+
+if [ "$TARGET" = "appimage" ]; then
+    export EXTRA_CMAKE_FLAGS=("${EXTRA_CMAKE_FLAGS[@]}" -DCMAKE_INSTALL_PREFIX=/usr -DYUZU_ROOM=ON -DYUZU_ROOM_STANDALONE=OFF -DYUZU_CMD=OFF)
+else
+    # For the linux-fresh verification target, verify compilation without PCH as well.
+    export EXTRA_CMAKE_FLAGS=("${EXTRA_CMAKE_FLAGS[@]}" -DYUZU_USE_PRECOMPILED_HEADERS=OFF)
+fi
+
+
+if [ "$DEVEL" != "true" ]; then
+    export EXTRA_CMAKE_FLAGS=("${EXTRA_CMAKE_FLAGS[@]}" -DENABLE_UPDATE_CHECKER=ON)
+fi
+
+if [ "$USE_WEBENGINE" = "true" ]; then
+    WEBENGINE=ON
+else
+    WEBENGINE=OFF
+fi
+
+if [ "$USE_MULTIMEDIA" = "false" ]; then
+    MULTIMEDIA=OFF
+else
+    MULTIMEDIA=ON
+fi
+
+if [ -z "$BUILD_TYPE" ]; then
+    export BUILD_TYPE="Release"
+fi
+
+export EXTRA_CMAKE_FLAGS=("${EXTRA_CMAKE_FLAGS[@]}" $@)
+
+mkdir -p build && cd build
+cmake .. -G Ninja \
+    -DCMAKE_BUILD_TYPE="$BUILD_TYPE" \
+    -DENABLE_QT_TRANSLATION=ON \
+    -DUSE_DISCORD_PRESENCE=ON \
+    -DCMAKE_CXX_FLAGS="$ARCH_FLAGS" \
+    -DCMAKE_C_FLAGS="$ARCH_FLAGS" \
+    -DYUZU_USE_BUNDLED_QT=OFF \
+    -DYUZU_USE_BUNDLED_SDL2=OFF \
+    -DYUZU_USE_EXTERNAL_SDL2=ON \
+    -DYUZU_TESTS=OFF \
+    -DYUZU_USE_QT_MULTIMEDIA=$MULTIMEDIA \
+    -DYUZU_USE_QT_WEB_ENGINE=$WEBENGINE \
+    -DYUZU_USE_FASTER_LD=ON \
+    -DENABLE_LTO=ON \
+    "${EXTRA_CMAKE_FLAGS[@]}"
+
+ninja -j${NPROC}
+
+if [ -d "bin/Release" ]; then
+    strip -s bin/Release/*
+else
+    strip -s bin/*
+fi

.ci/linux/eden.dwfsprof

@@ -0,0 +1,250 @@
+AppRun
+eden.desktop
+dev.eden_emu.eden.desktop
+shared/bin/eden
+shared/lib/lib.path
+shared/lib/ld-linux-x86-64.so.2
+shared/lib/libQt6Widgets.so.6.4.2
+shared/lib/libQt6DBus.so.6.4.2
+shared/lib/libudev.so.1.7.5
+shared/lib/libbrotlienc.so.1.0.9
+shared/lib/libbrotlidec.so.1.0.9
+shared/lib/libssl.so.3
+shared/lib/libcrypto.so.3
+shared/lib/libavcodec.so.59.37.100
+shared/lib/libavutil.so.57.28.100
+shared/lib/libQt6Gui.so.6.4.2
+shared/lib/libQt6Core.so.6.4.2
+shared/lib/libstdc++.so.6.0.30
+shared/lib/libm.so.6
+shared/lib/libgcc_s.so.1
+shared/lib/libc.so.6
+shared/lib/libdbus-1.so.3.32.4
+shared/lib/libbrotlicommon.so.1.0.9
+shared/lib/libswresample.so.4.7.100
+shared/lib/libvpx.so.7.1.0
+shared/lib/libwebpmux.so.3.0.10
+shared/lib/libwebp.so.7.1.5
+shared/lib/liblzma.so.5.4.1
+shared/lib/libdav1d.so.6.6.0
+shared/lib/librsvg-2.so.2.48.0
+shared/lib/libgobject-2.0.so.0.7400.6
+shared/lib/libglib-2.0.so.0.7400.6
+shared/lib/libcairo.so.2.11600.0
+shared/lib/libzvbi.so.0.13.2
+shared/lib/libz.so.1.2.13
+shared/lib/libsnappy.so.1.1.9
+shared/lib/libaom.so.3.6.0
+shared/lib/libcodec2.so.1.0
+shared/lib/libgsm.so.1.0.19
+shared/lib/libjxl.so.0.7.0
+shared/lib/libjxl_threads.so.0.7.0
+shared/lib/libmp3lame.so.0.0.0
+shared/lib/libopenjp2.so.2.5.0
+shared/lib/libopus.so.0.8.0
+shared/lib/librav1e.so.0.5.1
+shared/lib/libshine.so.3.0.1
+shared/lib/libspeex.so.1.5.2
+shared/lib/libSvtAv1Enc.so.1.4.1
+shared/lib/libtheoraenc.so.1.1.2
+shared/lib/libtheoradec.so.1.1.4
+shared/lib/libtwolame.so.0.0.0
+shared/lib/libvorbis.so.0.4.9
+shared/lib/libvorbisenc.so.2.0.12
+shared/lib/libx264.so.164
+shared/lib/libx265.so.199
+shared/lib/libxvidcore.so.4.3
+shared/lib/libva.so.2.1700.0
+shared/lib/libmfx.so.1.35
+shared/lib/libva-drm.so.2.1700.0
+shared/lib/libva-x11.so.2.1700.0
+shared/lib/libvdpau.so.1.0.0
+shared/lib/libX11.so.6.4.0
+shared/lib/libdrm.so.2.4.0
+shared/lib/libOpenCL.so.1.0.0
+shared/lib/libEGL.so.1.1.0
+shared/lib/libfontconfig.so.1.12.0
+shared/lib/libxkbcommon.so.0.0.0
+shared/lib/libGLX.so.0.0.0
+shared/lib/libOpenGL.so.0.0.0
+shared/lib/libpng16.so.16.39.0
+shared/lib/libharfbuzz.so.0.60000.0
+shared/lib/libmd4c.so.0.4.8
+shared/lib/libfreetype.so.6.18.3
+shared/lib/libicui18n.so.72.1
+shared/lib/libicuuc.so.72.1
+shared/lib/libdouble-conversion.so.3.1
+shared/lib/libb2.so.1.0.4
+shared/lib/libpcre2-16.so.0.11.2
+shared/lib/libzstd.so.1.5.4
+shared/lib/libsystemd.so.0.35.0
+shared/lib/libsoxr.so.0.1.2
+shared/lib/libcairo-gobject.so.2.11600.0
+shared/lib/libgdk_pixbuf-2.0.so.0.4200.10
+shared/lib/libgio-2.0.so.0.7400.6
+shared/lib/libxml2.so.2.9.14
+shared/lib/libpangocairo-1.0.so.0.5000.12
+shared/lib/libpango-1.0.so.0.5000.12
+shared/lib/libffi.so.8.1.2
+shared/lib/libpcre2-8.so.0.11.2
+shared/lib/libpixman-1.so.0.42.2
+shared/lib/libxcb-shm.so.0.0.0
+shared/lib/libxcb.so.1.1.0
+shared/lib/libxcb-render.so.0.0.0
+shared/lib/libXrender.so.1.3.0
+shared/lib/libXext.so.6.4.0
+shared/lib/libhwy.so.1.0.3
+shared/lib/liblcms2.so.2.0.14
+shared/lib/libogg.so.0.8.5
+shared/lib/libnuma.so.1.0.0
+shared/lib/libpthread.so.0
+shared/lib/libXfixes.so.3.1.0
+shared/lib/libX11-xcb.so.1.0.0
+shared/lib/libxcb-dri3.so.0.1.0
+shared/lib/libGLdispatch.so.0.0.0
+shared/lib/libexpat.so.1.8.10
+shared/lib/libgraphite2.so.3.2.1
+shared/lib/libicudata.so.72.1
+shared/lib/libgomp.so.1.0.0
+shared/lib/libcap.so.2.66
+shared/lib/libgcrypt.so.20.4.1
+shared/lib/liblz4.so.1.9.4
+shared/lib/libgmodule-2.0.so.0.7400.6
+shared/lib/libjpeg.so.62.3.0
+shared/lib/libmount.so.1.1.0
+shared/lib/libselinux.so.1
+shared/lib/libpangoft2-1.0.so.0.5000.12
+shared/lib/libfribidi.so.0.4.0
+shared/lib/libthai.so.0.3.1
+shared/lib/libXau.so.6.0.0
+shared/lib/libXdmcp.so.6.0.0
+shared/lib/libgpg-error.so.0.33.1
+shared/lib/libblkid.so.1.1.0
+shared/lib/libdatrie.so.1.4.0
+shared/lib/libbsd.so.0.11.7
+shared/lib/libmd.so.0.0.5
+shared/lib/libvulkan.so.1.3.239
+share/vulkan/icd.d/intel_hasvk_icd.x86_64.json
+shared/lib/libvulkan_intel_hasvk.so
+shared/lib/libwayland-client.so.0.21.0
+shared/lib/libxcb-present.so.0.0.0
+shared/lib/libxcb-xfixes.so.0.0.0
+shared/lib/libxcb-sync.so.1.0.0
+shared/lib/libxcb-randr.so.0.1.0
+shared/lib/libxshmfence.so.1.0.0
+share/vulkan/icd.d/intel_icd.x86_64.json
+shared/lib/libvulkan_intel.so
+share/vulkan/icd.d/lvp_icd.x86_64.json
+shared/lib/libvulkan_lvp.so
+shared/lib/libLLVM-15.so.1
+shared/lib/libedit.so.2.0.70
+shared/lib/libz3.so.4
+shared/lib/libtinfo.so.6.4
+share/vulkan/icd.d/radeon_icd.x86_64.json
+shared/lib/libvulkan_radeon.so
+shared/lib/libdrm_amdgpu.so.1.0.0
+shared/lib/libelf-0.188.so
+shared/lib/libVkLayer_MESA_device_select.so
+bin/qt.conf
+shared/lib/qt6/plugins/platforms/libqeglfs.so
+shared/lib/qt6/plugins/platforms/libqlinuxfb.so
+shared/lib/qt6/plugins/platforms/libqminimal.so
+shared/lib/qt6/plugins/platforms/libqminimalegl.so
+shared/lib/qt6/plugins/platforms/libqoffscreen.so
+shared/lib/qt6/plugins/platforms/libqvkkhrdisplay.so
+shared/lib/qt6/plugins/platforms/libqvnc.so
+shared/lib/qt6/plugins/platforms/libqwayland-egl.so
+shared/lib/qt6/plugins/platforms/libqwayland-generic.so
+shared/lib/qt6/plugins/platforms/libqxcb.so
+shared/lib/libQt6WaylandClient.so.6.4.2
+shared/lib/libwayland-cursor.so.0.21.0
+shared/lib/qt6/plugins/platformthemes/libqgtk3.so
+shared/lib/libgtk-3.so.0.2406.32
+shared/lib/libgdk-3.so.0.2406.32
+shared/lib/libatk-1.0.so.0.24609.1
+shared/lib/libepoxy.so.0.0.0
+shared/lib/libXi.so.6.1.0
+shared/lib/libatk-bridge-2.0.so.0.0.0
+shared/lib/libwayland-egl.so.1.21.0
+shared/lib/libXcursor.so.1.0.2
+shared/lib/libXdamage.so.1.1.0
+shared/lib/libXcomposite.so.1.0.0
+shared/lib/libXrandr.so.2.2.0
+shared/lib/libXinerama.so.1.0.0
+shared/lib/libdl.so.2
+shared/lib/libatspi.so.0.0.1
+share/glib-2.0/schemas/gschemas.compiled
+shared/lib/gio/modules/giomodule.cache
+shared/lib/gio/modules/libdconfsettings.so
+shared/lib/gio/modules/libgvfsdbus.so
+shared/lib/gvfs/libgvfscommon.so
+share/X11/xkb/rules/evdev
+share/X11/xkb/keycodes/evdev
+share/X11/xkb/keycodes/aliases
+share/X11/xkb/types/complete
+share/X11/xkb/types/basic
+share/X11/xkb/types/mousekeys
+share/X11/xkb/types/pc
+share/X11/xkb/types/iso9995
+share/X11/xkb/types/level5
+share/X11/xkb/types/extra
+share/X11/xkb/types/numpad
+share/X11/xkb/compat/complete
+share/X11/xkb/compat/basic
+share/X11/xkb/compat/ledcaps
+share/X11/xkb/compat/lednum
+share/X11/xkb/compat/iso9995
+share/X11/xkb/compat/mousekeys
+share/X11/xkb/compat/accessx
+share/X11/xkb/compat/misc
+share/X11/xkb/compat/ledscroll
+share/X11/xkb/compat/xfree86
+share/X11/xkb/compat/level5
+share/X11/xkb/compat/caps
+share/X11/xkb/symbols/pc
+share/X11/xkb/symbols/srvr_ctrl
+share/X11/xkb/symbols/keypad
+share/X11/xkb/symbols/altwin
+share/X11/xkb/symbols/us
+share/X11/xkb/symbols/inet
+shared/lib/qt6/plugins/platforminputcontexts/libcomposeplatforminputcontextplugin.so
+shared/lib/qt6/plugins/platforminputcontexts/libibusplatforminputcontextplugin.so
+shared/lib/qt6/plugins/iconengines/libqsvgicon.so
+shared/lib/qt6/plugins/imageformats/libqgif.so
+shared/lib/qt6/plugins/imageformats/libqico.so
+shared/lib/qt6/plugins/imageformats/libqjpeg.so
+shared/lib/qt6/plugins/imageformats/libqsvg.so
+shared/lib/libQt6Svg.so.6.4.2
+etc/fonts/fonts.conf
+shared/lib/qt6/plugins/wayland-shell-integration/libfullscreen-shell-v1.so
+shared/lib/qt6/plugins/wayland-shell-integration/libivi-shell.so
+shared/lib/qt6/plugins/wayland-shell-integration/libqt-shell.so
+shared/lib/qt6/plugins/wayland-shell-integration/libwl-shell-plugin.so
+shared/lib/qt6/plugins/wayland-shell-integration/libxdg-shell.so
+shared/lib/qt6/plugins/wayland-graphics-integration-client/libdmabuf-server.so
+shared/lib/qt6/plugins/wayland-graphics-integration-client/libdrm-egl-server.so
+shared/lib/qt6/plugins/wayland-graphics-integration-client/libqt-plugin-wayland-egl.so
+shared/lib/qt6/plugins/wayland-graphics-integration-client/libshm-emulation-server.so
+shared/lib/qt6/plugins/wayland-graphics-integration-client/libvulkan-server.so
+shared/lib/libQt6WaylandEglClientHwIntegration.so.6.4.2
+shared/lib/libQt6OpenGL.so.6.4.2
+share/glvnd/egl_vendor.d/50_mesa.json
+shared/lib/libEGL_mesa.so.0.0.0
+shared/lib/libgbm.so.1.0.0
+shared/lib/libglapi.so.0.0.0
+shared/lib/libxcb-dri2.so.0.0.0
+shared/lib/libwayland-server.so.0.21.0
+shared/lib/dri/swrast_dri.so
+shared/lib/libsensors.so.5.0.0
+shared/lib/libdrm_radeon.so.1.0.1
+shared/lib/libdrm_nouveau.so.2.0.0
+shared/lib/libdrm_intel.so.1.0.0
+shared/lib/libpciaccess.so.0.11.1
+shared/lib/qt6/plugins/wayland-decoration-client/libbradient.so
+shared/lib/gtk-3.0/modules/libcanberra-gtk3-module.so
+shared/lib/libcanberra-gtk3.so.0.1.9
+shared/lib/libcanberra.so.0.2.5
+shared/lib/libvorbisfile.so.3.3.8
+shared/lib/libtdb.so.1.4.8
+shared/lib/libltdl.so.7.3.2
+shared/lib/libXss.so.1.0.0

.ci/linux/package.sh

@@ -0,0 +1,153 @@
+#!/bin/sh -e
+
+# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+# This script assumes you're in the source directory
+
+export APPIMAGE_EXTRACT_AND_RUN=1
+export BASE_ARCH="$(uname -m)"
+
+SHARUN="https://github.com/VHSgunzo/sharun/releases/latest/download/sharun-${BASE_ARCH}-aio"
+URUNTIME="https://github.com/VHSgunzo/uruntime/releases/latest/download/uruntime-appimage-dwarfs-${BASE_ARCH}"
+
+case "$1" in
+    amd64|"")
+        echo "Packaging amd64-v3 optimized build of Eden"
+        ARCH="amd64_v3"
+        ;;
+    steamdeck|zen2)
+        echo "Packaging Steam Deck (Zen 2) optimized build of Eden"
+        ARCH="steamdeck"
+        ;;
+    rog-ally|allyx|zen4)
+        echo "Packaging ROG Ally X (Zen 4) optimized build of Eden"
+        ARCH="rog-ally-x"
+        ;;
+    legacy)
+        echo "Packaging amd64 generic build of Eden"
+        ARCH=amd64
+        ;;
+    aarch64)
+        echo "Packaging armv8-a build of Eden"
+        ARCH=aarch64
+        ;;
+    armv9)
+        echo "Packaging armv9-a build of Eden"
+        ARCH=armv9
+        ;;
+		native)
+        echo "Packaging native build of Eden"
+        ARCH="$BASE_ARCH"
+        ;;
+
+esac
+
+export BUILDDIR="$2"
+
+if [ "$BUILDDIR" = '' ]
+then
+	BUILDDIR=build
+fi
+
+EDEN_TAG=$(git describe --tags --abbrev=0)
+echo "Making \"$EDEN_TAG\" build"
+# git checkout "$EDEN_TAG"
+VERSION="$(echo "$EDEN_TAG")"
+
+# NOW MAKE APPIMAGE
+mkdir -p ./AppDir
+cd ./AppDir
+
+cp ../dist/dev.eden_emu.eden.desktop .
+cp ../dist/dev.eden_emu.eden.svg .
+
+ln -sf ./dev.eden_emu.eden.svg ./.DirIcon
+
+UPINFO='gh-releases-zsync|eden-emulator|Releases|latest|*.AppImage.zsync'
+
+if [ "$DEVEL" = 'true' ]; then
+	sed -i 's|Name=Eden|Name=Eden Nightly|' ./dev.eden_emu.eden.desktop
+ 	UPINFO="$(echo "$UPINFO" | sed 's|Releases|nightly|')"
+fi
+
+LIBDIR="/usr/lib"
+
+# Workaround for Gentoo
+if [ ! -d "$LIBDIR/qt6" ]
+then
+	LIBDIR="/usr/lib64"
+fi
+
+# Workaround for Debian
+if [ ! -d "$LIBDIR/qt6" ]
+then
+    LIBDIR="/usr/lib/${BASE_ARCH}-linux-gnu"
+fi
+
+# Bundle all libs
+
+wget --retry-connrefused --tries=30 "$SHARUN" -O ./sharun-aio
+chmod +x ./sharun-aio
+xvfb-run -a ./sharun-aio l -p -v -e -s -k \
+	../$BUILDDIR/bin/eden* \
+	$LIBDIR/lib*GL*.so* \
+	$LIBDIR/dri/* \
+	$LIBDIR/vdpau/* \
+	$LIBDIR/libvulkan* \
+	$LIBDIR/libXss.so* \
+	$LIBDIR/libdecor-0.so* \
+	$LIBDIR/libgamemode.so* \
+	$LIBDIR/qt6/plugins/audio/* \
+	$LIBDIR/qt6/plugins/bearer/* \
+	$LIBDIR/qt6/plugins/imageformats/* \
+	$LIBDIR/qt6/plugins/iconengines/* \
+	$LIBDIR/qt6/plugins/platforms/* \
+	$LIBDIR/qt6/plugins/platformthemes/* \
+	$LIBDIR/qt6/plugins/platforminputcontexts/* \
+	$LIBDIR/qt6/plugins/styles/* \
+	$LIBDIR/qt6/plugins/xcbglintegrations/* \
+	$LIBDIR/qt6/plugins/wayland-*/* \
+	$LIBDIR/pulseaudio/* \
+	$LIBDIR/pipewire-0.3/* \
+	$LIBDIR/spa-0.2/*/* \
+	$LIBDIR/alsa-lib/*
+
+rm -f ./sharun-aio
+
+# Prepare sharun
+if [ "$ARCH" = 'aarch64' ]; then
+	# allow the host vulkan to be used for aarch64 given the sad situation
+	echo 'SHARUN_ALLOW_SYS_VKICD=1' > ./.env
+fi
+
+# Workaround for Gentoo
+if [ -d "shared/libproxy" ]; then
+	cp shared/libproxy/* lib/
+fi
+
+ln -f ./sharun ./AppRun
+./sharun -g
+
+# turn appdir into appimage
+cd ..
+wget -q "$URUNTIME" -O ./uruntime
+chmod +x ./uruntime
+
+#Add udpate info to runtime
+echo "Adding update information \"$UPINFO\" to runtime..."
+./uruntime --appimage-addupdinfo "$UPINFO"
+
+echo "Generating AppImage..."
+./uruntime --appimage-mkdwarfs -f \
+	--set-owner 0 --set-group 0 \
+	--no-history --no-create-timestamp \
+	--categorize=hotness --hotness-list=.ci/linux/eden.dwfsprof \
+	--compression zstd:level=22 -S26 -B32 \
+	--header uruntime \
+    -N 4 \
+	-i ./AppDir -o Eden-"$VERSION"-"$ARCH".AppImage
+
+echo "Generating zsync file..."
+zsyncmake *.AppImage -u *.AppImage
+echo "All Done!"

.ci/windows/build.sh

@@ -0,0 +1,51 @@
+#!/bin/bash -ex
+
+# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+if [ "$COMPILER" == "clang" ]
+then
+    EXTRA_CMAKE_FLAGS+=(
+        -DCMAKE_CXX_COMPILER=clang-cl
+        -DCMAKE_C_COMPILER=clang-cl
+        -DCMAKE_CXX_FLAGS="-O3"
+        -DCMAKE_C_FLAGS="-O3"
+    )
+
+    BUILD_TYPE="RelWithDebInfo"
+fi
+
+[ -z "$WINDEPLOYQT" ] && { echo "WINDEPLOYQT environment variable required."; exit 1; }
+
+echo $EXTRA_CMAKE_FLAGS
+
+mkdir -p build && cd build
+cmake .. -G Ninja \
+    -DCMAKE_BUILD_TYPE="${BUILD_TYPE:-Release}" \
+	-DENABLE_QT_TRANSLATION=ON \
+    -DUSE_DISCORD_PRESENCE=ON \
+    -DYUZU_USE_BUNDLED_SDL2=ON \
+    -DBUILD_TESTING=OFF \
+    -DYUZU_TESTS=OFF \
+    -DDYNARMIC_TESTS=OFF \
+    -DYUZU_CMD=OFF \
+    -DYUZU_ROOM_STANDALONE=OFF \
+    -DYUZU_USE_QT_MULTIMEDIA=${USE_MULTIMEDIA:-false} \
+    -DYUZU_USE_QT_WEB_ENGINE=${USE_WEBENGINE:-false} \
+    -DENABLE_LTO=ON \
+	-DCMAKE_EXE_LINKER_FLAGS=" /LTCG" \
+    -DYUZU_USE_BUNDLED_QT=${BUNDLE_QT:-false} \
+    -DUSE_CCACHE=${CCACHE:-false}  \
+    -DENABLE_UPDATE_CHECKER=${DEVEL:-true} \
+    "${EXTRA_CMAKE_FLAGS[@]}" \
+    "$@"
+
+ninja
+
+set +e
+rm -f bin/*.pdb
+set -e
+
+$WINDEPLOYQT --release --no-compiler-runtime --no-opengl-sw --no-system-dxc-compiler --no-system-d3d-compiler --dir pkg bin/eden.exe
+
+cp bin/* pkg

.ci/windows/package.sh

@@ -0,0 +1,18 @@
+GITDATE=$(git show -s --date=short --format='%ad' | tr -d "-")
+GITREV=$(git show -s --format='%h')
+
+ZIP_NAME="Eden-Windows-${ARCH}-${GITDATE}-${GITREV}.zip"
+
+ARTIFACTS_DIR="artifacts"
+PKG_DIR="build/pkg"
+
+mkdir -p "$ARTIFACTS_DIR"
+
+TMP_DIR=$(mktemp -d)
+
+cp -r "$PKG_DIR"/* "$TMP_DIR"/
+cp LICENSE* README* "$TMP_DIR"/
+
+7z a -tzip "$ARTIFACTS_DIR/$ZIP_NAME" "$TMP_DIR"/*
+
+rm -rf "$TMP_DIR"

CMakeLists.txt

@@ -169,31 +169,6 @@ if (MSVC AND NOT CXX_CLANG)
     set(CMAKE_CXX_FLAGS_INIT "${CMAKE_CXX_FLAGS_INIT} /W3 /WX-")
 endif()
 
-# Set runtime library to MD/MDd for all configurations
-if(MSVC)
-    if (YUZU_USE_BUNDLED_QT AND ARCHITECTURE_arm64)
-        set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-        set(libflag MT)
-    else()
-        set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
-        set(libflag MD)
-    endif()
-
-    # Force all projects (including external dependencies) to use the same runtime
-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /${libflag}")
-    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /${libflag}d")
-    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /${libflag}")
-    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /${libflag}d")
-
-    # Add this to ensure Cubeb uses the same runtime
-    add_compile_options(
-        $<$<COMPILE_LANGUAGE:C,CXX>:$<$<CONFIG:Debug>:/${libflag}d>>
-        $<$<COMPILE_LANGUAGE:C,CXX>:$<$<CONFIG:Release>:/${libflag}>>
-        $<$<COMPILE_LANGUAGE:C,CXX>:$<$<CONFIG:RelWithDebInfo>:/${libflag}>>
-        $<$<COMPILE_LANGUAGE:C,CXX>:$<$<CONFIG:MinSizeRel>:/${libflag}>>
-    )
-endif()
-
 # TODO(crueter): Cleanup, each dep that has a bundled option should allow to choose between bundled, external, system
 cmake_dependent_option(YUZU_USE_EXTERNAL_SDL2 "Build SDL2 from external source" OFF "NOT MSVC;NOT ANDROID" OFF)
 cmake_dependent_option(YUZU_USE_BUNDLED_SDL2 "Download bundled SDL2 build" "${MSVC}" "NOT ANDROID" OFF)
@@ -713,6 +688,25 @@ if (MSVC AND CXX_CLANG)
     link_libraries(llvm-mingw-runtime)
 endif()
 
+# Set runtime library to MD/MDd for all configurations
+if(MSVC)
+    set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
+
+    # Force all projects (including external dependencies) to use the same runtime
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD")
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MDd")
+    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MD")
+    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /MDd")
+
+    # Add this to ensure Cubeb uses the same runtime
+    add_compile_options(
+        $<$<CONFIG:Debug>:/MDd>
+        $<$<CONFIG:Release>:/MD>
+        $<$<CONFIG:RelWithDebInfo>:/MD>
+        $<$<CONFIG:MinSizeRel>:/MD>
+    )
+endif()
+
 add_subdirectory(src)
 
 # Set yuzu project or yuzu-cmd project as default StartUp Project in Visual Studio depending on whether QT is enabled or not

docs/Debug.md

@@ -9,7 +9,6 @@ When reporting issues or finding bugs, we often need backtraces, debug logs, or
 If your bug is related to a graphical issue--e.g. mismatched colors, vertex explosions, flickering, etc.--then you are required to include graphical debugging logs in your issue reports.
 
 Graphics Debugging is found in General -> Debug on desktop, and Advanced Settings -> Debug on Android. Android users are all set; however, desktop users may need to install the Vulkan Validation Layers:
-
 - Windows: Install the [Vulkan SDK](https://vulkan.lunarg.com/sdk/home)
 - Linux, BSD, etc: Install `vulkan-validation-layers`, `vulkan-layers`, or similar from your package manager. It should be located in e.g. `/usr/lib64/libVkLayer_khronos_validation.so`
 
@@ -31,16 +30,15 @@ Ignoring SIGSEGV when debugging in host:
 ### gdb
 
 You must have GDB installed for aarch64 to debug the target. Install it through your package manager, e.g.:
+* On Arch:
+  * `sudo pacman -Syu aarch64-linux-gnu-gdb`
+* On Gentoo:
+  * `sudo emerge --ask crossdev`
+  * `sudo crossdev -t aarch64-unknown-linux-gnu --ex-gdb`
 
-- On Arch:
-  - `sudo pacman -Syu aarch64-linux-gnu-gdb`
-- On Gentoo:
-  - `sudo emerge --ask crossdev`
-  - `sudo crossdev -t aarch64-unknown-linux-gnu --ex-gdb`
-
-Run `./build/bin/eden-cli -c <path to your config file (see logs where you run eden normally to see where it is)> -d -g <path to game>`, or `Enable GDB Stub` at General > Debug, then hook up an aarch64-gdb:
-
-- `target remote localhost:6543`
+Run `./build/bin/eden-cli -c <path to your config file (see logs where you run eden normally to see where it is)> -d -g <path to game>`
+Or `Enable GDB Stub` at General > Debug, then hook up an aarch64-gdb:
+* `target remote localhost:6543`
 
 Type `c` (for continue) and then if it crashes just do a `bt` (backtrace) and `layout asm`
 
@@ -71,27 +69,26 @@ For more information type `info gdb` and read [the man page](https://man7.org/li
 
 ## Simple checklist for debugging black screens using Renderdoc
 
-Renderdoc is a free, cross platform, multi-graphics API debugger. It is an invaluable tool for diagnosing issues with graphics applications, and includes support for Vulkan. Get it at [renderdoc.org](https://renderdoc.org).
+Renderdoc is a free, cross platform, multi-graphics API debugger. It is an invaluable tool for diagnosing issues with graphics applications, and includes support for Vulkan. Get it [here](https://renderdoc.org).
 
 Before using renderdoc to diagnose issues, it is always good to make sure there are no validation errors. Any errors means the behavior of the application is undefined. That said, renderdoc can help debug validation errors if you do have them.
 
 When debugging a black screen, there are many ways the application could have setup Vulkan wrong.
 Here is a short checklist of items to look at to make sure are appropriate:
-
-- Draw call counts are correct (aka not zero, or if rendering many triangles, not 3)
-- Vertex buffers are bound
-- vertex attributes are correct - Make sure the size & offset of each attribute matches what should it should be
-- Any bound push constants and descriptors have the right data - including:
-  - Matrices have correct values - double check the model, view, & projection matrices are uploaded correctly
-- Pipeline state is correct
-  - viewport range is correct - x,y are 0,0; width & height are screen dimensions, minDepth is 0, maxDepth is 1, NDCDepthRange is 0,1
-  - Fill mode matches expected - usually solid
-  - Culling mode makes sense - commonly back or none
-  - The winding direction is correct - typically CCW (counter clockwise)
-  - Scissor region is correct - usually same as viewport's x,y,width, &height
-- Blend state is correct
-- Depth state is correct - typically enabled with Function set to Less than or Equal
-- Swapchain images are bound when rendering to the swapchain
-- Image being rendered to is the same as the one being presented when rendering to the swapchain
+* Draw call counts are correct (aka not zero, or if rendering many triangles, not 3)
+* Vertex buffers are bound
+* vertex attributes are correct - Make sure the size & offset of each attribute matches what should it should be
+* Any bound push constants and descriptors have the right data - including:
+  * Matrices have correct values - double check the model, view, & projection matrices are uploaded correctly
+* Pipeline state is correct
+  * viewport range is correct - x,y are 0,0; width & height are screen dimensions, minDepth is 0, maxDepth is 1, NDCDepthRange is 0,1
+  * Fill mode matches expected - usually solid
+  * Culling mode makes sense - commonly back or none
+  * The winding direction is correct - typically CCW (counter clockwise)
+  * Scissor region is correct - usually same as viewport's x,y,width, &height
+* Blend state is correct
+* Depth state is correct - typically enabled with Function set to Less than or Equal
+* Swapchain images are bound when rendering to the swapchain
+* Image being rendered to is the same as the one being presented when rendering to the swapchain
 
 Alternatively, a [RenderDoc Extension](https://github.com/baldurk/renderdoc-contrib/tree/main/baldurk/whereismydraw) ([Archive](https://web.archive.org/web/20250000000000*/https://github.com/baldurk/renderdoc-contrib/tree/main/baldurk/whereismydraw)) exists which automates doing a lot of these manual steps.

docs/Development.md

@@ -1,11 +1,9 @@
 # Development guidelines
 
 ## License Headers
-
 All commits must have proper license header accreditation.
 
 You can easily add all necessary license headers by running:
-
 ```sh
 git fetch origin master:master
 .ci/license-header.sh -u -c
@@ -13,7 +11,6 @@ git push
 ```
 
 Alternatively, you may omit `-c` and do an amend commit:
-
 ```sh
 git fetch origin master:master
 .ci/license-header.sh
@@ -25,10 +22,8 @@ If the work is licensed/vendored from other people or projects, you may omit the
 For more information on the license header script, run `.ci/license-header.sh -h`.
 
 ## Pull Requests
-
 Pull requests are only to be merged by core developers when properly tested and discussions conclude on Discord or other communication channels. Labels are recommended but not required. However, all PRs MUST be namespaced and optionally typed:
-
-```txt
+```
 [cmake] refactor: CPM over submodules
 [desktop] feat: implement firmware install from ZIP
 [hle] stub fw20 functions
@@ -39,7 +34,7 @@ Pull requests are only to be merged by core developers when properly tested and
 - The level of namespacing is generally left to the committer's choice.
 - However, we never recommend going more than two levels *except* in `hle`, in which case you may go as many as four levels depending on the specificity of your changes.
 - Ocassionally, up to two additional namespaces may be provided for more clarity.
-  - Changes that affect the entire project (sans CMake changes) should be namespaced as `meta`.
+  * Changes that affect the entire project (sans CMake changes) should be namespaced as `meta`.
 - Maintainers are permitted to change namespaces at will.
 - Commits within PRs are not required to be namespaced, but it is highly recommended.
 
@@ -55,7 +50,6 @@ When adding new settings, use `tr("Setting:")` if the setting is meant to be a f
 - Try to not write "slow/fast" options unless it clearly degrades/increases performance for a given case, as most options may modify behaviour that result in different metrics accross different systems. If for example the option is an "accuracy" option, writing "High" is sufficient to imply "Slow". No need to write "High (Slow)".
 
 Some examples:
-
 - "[...] negatively affecting image quality", "[...] degrading image quality": Same wording but with less filler.
 - "[...] this may cause some glitches or crashes in some games", "[...] this may cause soft-crashes": Crashes implies there may be glitches (as crashes are technically a form of a fatal glitch). The entire sentence is structured as "may cause [...] on some games", which is redundant, because "may cause [...] in games" has the same semantic meaning ("may" is a chance that it will occur on "some" given set).
 - "FIFO Relaxed is similar to FIFO [...]", "FIFO Relaxed [...]": The name already implies similarity.
@@ -63,16 +57,13 @@ Some examples:
 - "[...] it can [...] in some cases", "[...] it can [...]": Implied probability.
 
 Before adding a new setting, consider:
-
 - Does the piece of code that the setting pertains to, make a significant difference if it's on/off?
 - Can it be auto-detected?
 
 # IDE setup
 
 ## VSCode
-
 Copy this to `.vscode/settings.json`, get CMake tools and it should be ready to build:
-
 ```json
 {
     "editor.tabSize": 4,
@@ -92,7 +83,6 @@ You may additionally need the `Qt Extension Pack` extension if building Qt.
 # Build speedup
 
 If you have an HDD, use ramdisk (build in RAM), approximatedly you need 4GB for a full build with debug symbols:
-
 ```sh
 mkdir /tmp/ramdisk
 chmod 777 /tmp/ramdisk
@@ -106,11 +96,128 @@ umount /tmp/ramdisk
 # Assets and large files
 
 A general rule of thumb, before uploading files:
-
 - PNG files: Use [optipng](https://web.archive.org/web/20240325055059/https://optipng.sourceforge.net/).
 - SVG files: Use [svgo](https://github.com/svg/svgo).
 
 May not be used but worth mentioning nonethless:
-
 - OGG files: Use [OptiVorbis](https://github.com/OptiVorbis/OptiVorbis).
 - Video files: Use ffmpeg, preferably re-encode as AV1.
+
+# Bisecting older commits
+
+Since going into the past can be tricky (especially due to the dependencies from the project being lost thru time). This should "restore" the URLs for the respective submodules.
+
+```sh
+#!/bin/sh -e
+cat > .gitmodules <<EOF
+[submodule "enet"]
+	path = externals/enet
+	url = https://github.com/lsalzman/enet.git
+[submodule "cubeb"]
+	path = externals/cubeb
+	url = https://github.com/mozilla/cubeb.git
+[submodule "dynarmic"]
+	path = externals/dynarmic
+	url = https://github.com/lioncash/dynarmic.git
+[submodule "libusb"]
+	path = externals/libusb/libusb
+	url = https://github.com/libusb/libusb.git
+[submodule "discord-rpc"]
+	path = externals/discord-rpc
+	url = https://github.com/yuzu-emu-mirror/discord-rpc.git
+[submodule "Vulkan-Headers"]
+	path = externals/Vulkan-Headers
+	url = https://github.com/KhronosGroup/Vulkan-Headers.git
+[submodule "sirit"]
+	path = externals/sirit
+	url = https://github.com/yuzu-emu-mirror/sirit.git
+[submodule "mbedtls"]
+	path = externals/mbedtls
+	url = https://github.com/yuzu-emu-mirror/mbedtls.git
+[submodule "xbyak"]
+	path = externals/xbyak
+	url = https://github.com/herumi/xbyak.git
+[submodule "opus"]
+	path = externals/opus
+	url = https://github.com/xiph/opus.git
+[submodule "SDL"]
+	path = externals/SDL
+	url = https://github.com/libsdl-org/SDL.git
+[submodule "cpp-httplib"]
+	path = externals/cpp-httplib
+	url = https://github.com/yhirose/cpp-httplib.git
+[submodule "ffmpeg"]
+	path = externals/ffmpeg/ffmpeg
+	url = https://github.com/FFmpeg/FFmpeg.git
+[submodule "vcpkg"]
+	path = externals/vcpkg
+	url = https://github.com/microsoft/vcpkg.git
+[submodule "cpp-jwt"]
+	path = externals/cpp-jwt
+	url = https://github.com/arun11299/cpp-jwt.git
+[submodule "libadrenotools"]
+	path = externals/libadrenotools
+	url = https://github.com/bylaws/libadrenotools.git
+[submodule "tzdb_to_nx"]
+	path = externals/nx_tzdb/tzdb_to_nx
+	url = https://github.com/lat9nq/tzdb_to_nx.git
+[submodule "VulkanMemoryAllocator"]
+	path = externals/VulkanMemoryAllocator
+	url = https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git
+[submodule "breakpad"]
+	path = externals/breakpad
+	url = https://github.com/yuzu-emu-mirror/breakpad.git
+[submodule "simpleini"]
+	path = externals/simpleini
+	url = https://github.com/brofield/simpleini.git
+[submodule "oaknut"]
+	path = externals/oaknut
+	url = https://github.com/merryhime/oaknut.git
+[submodule "Vulkan-Utility-Libraries"]
+	path = externals/Vulkan-Utility-Libraries
+	url = https://github.com/KhronosGroup/Vulkan-Utility-Libraries.git
+[submodule "oboe"]
+	path = externals/oboe
+	url = https://github.com/google/oboe.git
+[submodule "externals/boost-headers"]
+	path = externals/boost-headers
+	url = https://github.com/boostorg/headers.git
+EOF
+git submodule sync
+update_or_checkout () {
+    if [ $0 = 'externals/sirit' ] \
+    || [ $0 = 'externals/dynarmic' ] \
+    || [ $0 = 'externals/breakpad' ] \
+    || [ $0 = 'externals/discord-rpc' ] \
+    || [ $0 = 'externals/mbedtls' ]; then
+        [ -f $0/CMakeLists.txt ] || git submodule update --force --remote --init -- $0
+        echo $0 ':remote' && git submodule update --remote $0
+        exit
+    elif [ $0 = 'externals/nx_tzdb/tzdb_to_nx' ]; then
+        [ -f $0/CMakeLists.txt ] || git submodule update --force --remote --init -- $0
+        echo $0 ':remote' && git submodule update --remote $0
+    else
+        echo $0 ':update' && git submodule update --init $0 && exit
+        echo $0 ':remote' && git submodule update --remote $0 && exit
+        echo $0 ':failure'
+    fi
+}
+export -f update_or_checkout
+grep path .gitmodules | sed 's/.*= //' | xargs -n 1 -I {} bash -c 'update_or_checkout "$@"' {}
+# Fix for LLVM builds
+sed -i 's/src\/yuzu\/main.cpp/${CMAKE_SOURCE_DIR}\/src\/yuzu\/main.cpp/g' CMakeModules/FindLLVM.cmake
+# Only after cloning and everything - fixes issues with Zydis
+cat > externals/dynarmic/src/dynarmic/common/x64_disassemble.cpp <<EOF
+#include <cstddef>
+#include <vector>
+#include <string>
+namespace Dynarmic::Common {
+void DumpDisassembledX64(const void* ptr, size_t size) {}
+std::vector<std::string> DisassembleX64(const void* ptr, size_t size) { return {}; }
+}
+EOF
+```
+
+If having issues with older artifacts, then run `rm -r externals/dynarmic/build externals/dynarmic/externals externals/nx_tzdb/tzdb_to_nx/externals externals/sirit/externals`.
+
+Configuring CMake with `-DSIRIT_USE_SYSTEM_SPIRV_HEADERS=1 -DCMAKE_CXX_FLAGS="-Wno-error" -DCMAKE_C_FLAGS="-Wno-error -Wno-array-parameter -Wno-stringop-overflow"` is also recommended.

externals/cmake-modules/DetectPlatform.cmake

@@ -17,10 +17,6 @@
 
 if (${CMAKE_SYSTEM_NAME} STREQUAL "SunOS")
     set(PLATFORM_SUN ON)
-elseif (${CMAKE_SYSTEM_NAME} STREQUAL "OpenOrbis")
-    set(PLATFORM_PS4 ON)
-elseif (${CMAKE_SYSTEM_NAME} STREQUAL "managarm")
-    set(PLATFORM_MANAGARM ON)
 elseif (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
     set(PLATFORM_FREEBSD ON)
 elseif (${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")

externals/demangle/llvm/Demangle/ItaniumDemangle.h

@@ -1259,7 +1259,7 @@ class ParameterPack final : public Node {
   // Setup OutputBuffer for a pack expansion, unless we're already expanding
   // one.
   void initializePackExpansion(OutputBuffer &OB) const {
-    if (OB.CurrentPackMax == (std::numeric_limits<unsigned>::max)()) {
+    if (OB.CurrentPackMax == std::numeric_limits<unsigned>::max()) {
       OB.CurrentPackMax = static_cast<unsigned>(Data.size());
       OB.CurrentPackIndex = 0;
     }
@@ -1353,7 +1353,7 @@ public:
   const Node *getChild() const { return Child; }
 
   void printLeft(OutputBuffer &OB) const override {
-    constexpr unsigned Max = (std::numeric_limits<unsigned>::max)();
+    constexpr unsigned Max = std::numeric_limits<unsigned>::max();
     ScopedOverride<unsigned> SavePackIdx(OB.CurrentPackIndex, Max);
     ScopedOverride<unsigned> SavePackMax(OB.CurrentPackMax, Max);
     size_t StreamPos = OB.getCurrentPosition();

externals/demangle/llvm/Demangle/Utility.h

@@ -88,8 +88,8 @@ public:
 
   /// If a ParameterPackExpansion (or similar type) is encountered, the offset
   /// into the pack that we're currently printing.
-  unsigned CurrentPackIndex = (std::numeric_limits<unsigned>::max)();
-  unsigned CurrentPackMax = (std::numeric_limits<unsigned>::max)();
+  unsigned CurrentPackIndex = std::numeric_limits<unsigned>::max();
+  unsigned CurrentPackMax = std::numeric_limits<unsigned>::max();
 
   /// When zero, we're printing template args and '>' needs to be parenthesized.
   /// Use a counter so we can simply increment inside parentheses.

externals/ffmpeg/CMakeLists.txt

@@ -11,105 +11,63 @@ set(FFmpeg_HWACCEL_FLAGS)
 set(FFmpeg_HWACCEL_INCLUDE_DIRS)
 set(FFmpeg_HWACCEL_LDFLAGS)
 
-if (NOT YUZU_USE_BUNDLED_FFMPEG)
-    set(FFmpeg_CROSS_COMPILE_FLAGS "")
-    if (ANDROID)
-        # TODO: Maybe use CMAKE_SYSROOT? and probably provide a toolchain file for android
-        # I mean isn't that the "proper" way anyways?
-        string(TOLOWER "${CMAKE_HOST_SYSTEM_NAME}" FFmpeg_HOST_SYSTEM_NAME)
-        set(TOOLCHAIN "${ANDROID_NDK}/toolchains/llvm/prebuilt/${FFmpeg_HOST_SYSTEM_NAME}-${CMAKE_HOST_SYSTEM_PROCESSOR}")
-        set(SYSROOT "${TOOLCHAIN}/sysroot")
-        set(FFmpeg_CPU "armv8-a")
-        list(APPEND FFmpeg_CROSS_COMPILE_FLAGS
-            --enable-cross-compile
-            --arch=arm64
-            #--cpu=${FFmpeg_CPU}
-            --cross-prefix="${TOOLCHAIN}/bin/aarch64-linux-android-"
-            --sysroot="${SYSROOT}"
-            --target-os=android
-            --extra-ldflags="--ld-path=${TOOLCHAIN}/bin/ld.lld"
-            --extra-ldflags="-nostdlib"
-        )
-        set(FFmpeg_IS_CROSS_COMPILING TRUE)
-    # User attempts to do a FFmpeg cross compilation because...
-    # Here we just quickly test against host/system processors not matching
-    # TODO: Test for versions not matching as well?
-    elseif (NOT (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES CMAKE_SYSTEM_PROCESSOR
-    AND CMAKE_HOST_SYSTEM_NAME MATCHES CMAKE_SYSTEM_NAME))
-        string(TOLOWER "${CMAKE_SYSTEM_NAME}" FFmpeg_SYSTEM_NAME)
-        if (FFmpeg_SYSTEM_NAME STREQUAL "openorbis" OR FFmpeg_SYSTEM_NAME STREQUAL "managarm")
-            set(FFmpeg_SYSTEM_NAME "none")
-        endif()
-        # TODO: Can we really do better? Auto-detection? Something clever?
-        list(APPEND FFmpeg_CROSS_COMPILE_FLAGS
-            --enable-cross-compile
-            --arch="${CMAKE_SYSTEM_PROCESSOR}"
-            --target-os="${FFmpeg_SYSTEM_NAME}"
-            --sysroot="${CMAKE_SYSROOT}"
-        )
-        if (DEFINED FFmpeg_CROSS_PREFIX)
-            list(APPEND FFmpeg_CROSS_COMPILE_FLAGS --cross-prefix="${FFmpeg_CROSS_PREFIX}")
-        else()
-            message(WARNING "Please set FFmpeg_CROSS_PREFIX to your cross toolchain prefix, for example: \${CMAKE_STAGING_PREFIX}/bin/${CMAKE_SYSTEM_PROCESSOR}-${CMAKE_SYSTEM_NAME}-")
-        endif()
-        set(FFmpeg_IS_CROSS_COMPILING TRUE)
-    endif()
-endif()
-
-if (PLATFORM_PS4 OR PLATFORM_MANAGARM)
-    # Doesn't support VA-API, don't go thru the embarrassment of trying to enable it
-    list(APPEND FFmpeg_HWACCEL_FLAGS --disable-vaapi)
-elseif (UNIX AND NOT DEFINED FFmpeg_IS_CROSS_COMPILING)
+if (UNIX AND NOT ANDROID)
     find_package(PkgConfig REQUIRED)
-    pkg_check_modules(LIBVA libva)
-    pkg_check_modules(CUDA cuda)
-    pkg_check_modules(FFNVCODEC ffnvcodec)
-    pkg_check_modules(VDPAU vdpau)
+    if (NOT ANDROID)
+        pkg_check_modules(LIBVA libva)
+        pkg_check_modules(CUDA cuda)
+        pkg_check_modules(FFNVCODEC ffnvcodec)
+        pkg_check_modules(VDPAU vdpau)
+    endif()
 
-    find_package(X11)
-    if(X11_FOUND)
-        if (NOT APPLE)
-            # In Solaris needs explicit linking for ffmpeg which links to /lib/amd64/libX11.so
-            if(PLATFORM_SUN)
+    if (NOT APPLE)
+        # In Solaris needs explicit linking for ffmpeg which links to /lib/amd64/libX11.so
+        if(PLATFORM_SUN)
+            find_library(LIBDRM_LIB libdrm PATHS /usr/lib/64 /usr/lib/amd64 /usr/lib)
+            if(LIBDRM_LIB)
                 list(APPEND FFmpeg_HWACCEL_LIBRARIES
                     X11
-                    "${CMAKE_SYSROOT}/usr/lib/xorg/amd64/libdrm.so")
+                    "${LIBDRM_LIB}")
+                message(STATUS "Found libdrm at: ${LIBDRM_LIB}")
             else()
-                pkg_check_modules(LIBDRM libdrm REQUIRED)
-                list(APPEND FFmpeg_HWACCEL_LIBRARIES
-                    ${LIBDRM_LIBRARIES})
-                list(APPEND FFmpeg_HWACCEL_INCLUDE_DIRS
-                    ${LIBDRM_INCLUDE_DIRS})
+                message(WARNING "libdrm not found, disabling libdrm support")
+                list(APPEND FFmpeg_HWACCEL_FLAGS
+                    --disable-libdrm)
             endif()
+        else()
+            pkg_check_modules(LIBDRM libdrm REQUIRED)
+            list(APPEND FFmpeg_HWACCEL_LIBRARIES
+                ${LIBDRM_LIBRARIES})
+            list(APPEND FFmpeg_HWACCEL_INCLUDE_DIRS
+                ${LIBDRM_INCLUDE_DIRS})
             list(APPEND FFmpeg_HWACCEL_FLAGS
                 --enable-libdrm)
         endif()
-        if(LIBVA_FOUND)
-            pkg_check_modules(LIBVA-DRM libva-drm REQUIRED)
-            pkg_check_modules(LIBVA-X11 libva-x11 REQUIRED)
-            list(APPEND FFmpeg_HWACCEL_LIBRARIES
-                ${X11_LIBRARIES}
-                ${LIBVA-DRM_LIBRARIES}
-                ${LIBVA-X11_LIBRARIES}
-                ${LIBVA_LIBRARIES})
-            list(APPEND FFmpeg_HWACCEL_FLAGS
-                --enable-hwaccel=h264_vaapi
-                --enable-hwaccel=vp8_vaapi
-                --enable-hwaccel=vp9_vaapi)
-            list(APPEND FFmpeg_HWACCEL_INCLUDE_DIRS
-                ${X11_INCLUDE_DIRS}
-                ${LIBVA-DRM_INCLUDE_DIRS}
-                ${LIBVA-X11_INCLUDE_DIRS}
-                ${LIBVA_INCLUDE_DIRS}
-            )
-            message(STATUS "ffmpeg: va-api libraries version ${LIBVA_VERSION} found")
-        else()
-            list(APPEND FFmpeg_HWACCEL_FLAGS --disable-vaapi)
-            message(WARNING "ffmpeg: libva-dev not found, disabling Video Acceleration API (VA-API)...")
-        endif()
+    endif()
+
+    if(LIBVA_FOUND)
+        find_package(X11 REQUIRED)
+        pkg_check_modules(LIBVA-DRM libva-drm REQUIRED)
+        pkg_check_modules(LIBVA-X11 libva-x11 REQUIRED)
+        list(APPEND FFmpeg_HWACCEL_LIBRARIES
+            ${X11_LIBRARIES}
+            ${LIBVA-DRM_LIBRARIES}
+            ${LIBVA-X11_LIBRARIES}
+            ${LIBVA_LIBRARIES})
+        list(APPEND FFmpeg_HWACCEL_FLAGS
+            --enable-hwaccel=h264_vaapi
+            --enable-hwaccel=vp8_vaapi
+            --enable-hwaccel=vp9_vaapi)
+        list(APPEND FFmpeg_HWACCEL_INCLUDE_DIRS
+            ${X11_INCLUDE_DIRS}
+            ${LIBVA-DRM_INCLUDE_DIRS}
+            ${LIBVA-X11_INCLUDE_DIRS}
+            ${LIBVA_INCLUDE_DIRS}
+        )
+        message(STATUS "ffmpeg: va-api libraries version ${LIBVA_VERSION} found")
     else()
         list(APPEND FFmpeg_HWACCEL_FLAGS --disable-vaapi)
-        message(WARNING "ffmpeg: X11 libraries not found, disabling VA-API...")
+        message(WARNING "ffmpeg: libva-dev not found, disabling Video Acceleration API (VA-API)...")
     endif()
 
     if (FFNVCODEC_FOUND)
@@ -153,28 +111,6 @@ elseif (UNIX AND NOT DEFINED FFmpeg_IS_CROSS_COMPILING)
     endif()
 endif()
 
-if (PLATFORM_PS4)
-    list(APPEND FFmpeg_CROSS_COMPILE_LIBS
-        -lkernel
-        -lSceUserService
-        -lSceSysmodule
-        -lSceNet
-        -lSceLibcInternal
-    )
-    list(APPEND FFmpeg_CROSS_COMPILE_FLAGS
-        --disable-pthreads
-        --extra-cflags=${CMAKE_SYSROOT}/usr/include
-        --extra-cxxflags=${CMAKE_SYSROOT}/usr/include
-        --extra-libs="${FFmpeg_CROSS_COMPILE_LIBS}"
-    )
-elseif (PLATFORM_MANAGARM)
-    # Required for proper stuff
-    list(APPEND FFmpeg_CROSS_COMPILE_FLAGS 
-        --disable-pthreads
-        --extra-libs="${FFmpeg_CROSS_COMPILE_LIBS}"
-    )
-endif()
-
 if (YUZU_USE_BUNDLED_FFMPEG)
     AddJsonPackage(ffmpeg-ci)
 
@@ -245,6 +181,24 @@ else()
 
     find_program(BASH_PROGRAM bash REQUIRED)
 
+    set(FFmpeg_CROSS_COMPILE_FLAGS "")
+    if (ANDROID)
+        string(TOLOWER "${CMAKE_HOST_SYSTEM_NAME}" FFmpeg_HOST_SYSTEM_NAME)
+        set(TOOLCHAIN "${ANDROID_NDK}/toolchains/llvm/prebuilt/${FFmpeg_HOST_SYSTEM_NAME}-${CMAKE_HOST_SYSTEM_PROCESSOR}")
+        set(SYSROOT "${TOOLCHAIN}/sysroot")
+        set(FFmpeg_CPU "armv8-a")
+        list(APPEND FFmpeg_CROSS_COMPILE_FLAGS
+            --arch=arm64
+            #--cpu=${FFmpeg_CPU}
+            --enable-cross-compile
+            --cross-prefix=${TOOLCHAIN}/bin/aarch64-linux-android-
+            --sysroot=${SYSROOT}
+            --target-os=android
+            --extra-ldflags="--ld-path=${TOOLCHAIN}/bin/ld.lld"
+            --extra-ldflags="-nostdlib"
+        )
+    endif()
+
     # `configure` parameters builds only exactly what yuzu needs from FFmpeg
     # `--disable-vdpau` is needed to avoid linking issues
     set(FFmpeg_CC ${CMAKE_C_COMPILER_LAUNCHER}  ${CMAKE_C_COMPILER})
@@ -267,12 +221,8 @@ else()
                 --enable-decoder=vp9
                 --enable-filter=yadif,scale
                 --enable-pic
-                --cc=${FFmpeg_CC}
-                --cxx=${FFmpeg_CXX}
-                --ld=${CMAKE_LINKER}
-                --extra-cflags=${CMAKE_C_FLAGS}
-                --extra-cxxflags=${CMAKE_CXX_FLAGS}
-                --extra-ldflags=${CMAKE_C_LINK_FLAGS}
+                --cc="${FFmpeg_CC}"
+                --cxx="${FFmpeg_CXX}"
                 ${FFmpeg_HWACCEL_FLAGS}
                 ${FFmpeg_CROSS_COMPILE_FLAGS}
         WORKING_DIRECTORY

externals/tz/tz/tz.cpp

@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: 2023 yuzu Emulator Project
 // SPDX-FileCopyrightText: 1996 Arthur David Olson
 // SPDX-License-Identifier: BSD-2-Clause
@@ -469,8 +466,8 @@ CalendarTimeInternal* timesub(const time_t* timep, s64 offset, const Rule* sp,
         int signed_y = static_cast<s32>(y);
         tmp->tm_year = signed_y - TM_YEAR_BASE;
     }
-    else if ((!std::is_signed_v<time_t> || (std::numeric_limits<s32>::min)() + TM_YEAR_BASE <= y) &&
-        y - TM_YEAR_BASE <= (std::numeric_limits<s32>::max)()) {
+    else if ((!std::is_signed_v<time_t> || std::numeric_limits<s32>::min() + TM_YEAR_BASE <= y) &&
+        y - TM_YEAR_BASE <= std::numeric_limits<s32>::max()) {
         tmp->tm_year = static_cast<s32>(y - TM_YEAR_BASE);
     }
     else {
@@ -561,8 +558,8 @@ CalendarTimeInternal* localsub(Rule const* sp, time_t const* timep, s64 setname,
             else {
                 newy += years;
             }
-            if (!((std::numeric_limits<s32>::min)() <= newy &&
-                newy <= (std::numeric_limits<s32>::max)())) {
+            if (!(std::numeric_limits<s32>::min() <= newy &&
+                newy <= std::numeric_limits<s32>::max())) {
                 return nullptr;
             }
             result->tm_year = static_cast<s32>(newy);

externals/tz/tz/tz.h

@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: 2023 yuzu Emulator Project
 // SPDX-FileCopyrightText: 1996 Arthur David Olson
 // SPDX-License-Identifier: BSD-2-Clause
@@ -29,10 +26,10 @@ constexpr size_t TZ_MAX_CHARS = 50;
 constexpr size_t MY_TZNAME_MAX = 255;
 constexpr size_t TZNAME_MAXIMUM = 255;
 constexpr size_t TZ_MAX_LEAPS = 50;
-constexpr s64 TIME_T_MAX = (std::numeric_limits<s64>::max)();
-constexpr s64 TIME_T_MIN = (std::numeric_limits<s64>::min)();
+constexpr s64 TIME_T_MAX = std::numeric_limits<s64>::max();
+constexpr s64 TIME_T_MIN = std::numeric_limits<s64>::min();
 constexpr size_t CHARS_EXTRA = 3;
-constexpr size_t MAX_ZONE_CHARS = (std::max)(TZ_MAX_CHARS + CHARS_EXTRA, sizeof("UTC"));
+constexpr size_t MAX_ZONE_CHARS = std::max(TZ_MAX_CHARS + CHARS_EXTRA, sizeof("UTC"));
 constexpr size_t MAX_TZNAME_CHARS = 2 * (MY_TZNAME_MAX + 1);
 
 struct ttinfo {
@@ -54,7 +51,7 @@ struct Rule {
     std::array<s64, TZ_MAX_TIMES> ats;
     std::array<u8, TZ_MAX_TIMES> types;
     std::array<ttinfo, TZ_MAX_TYPES> ttis;
-    std::array<char, (std::max)(MAX_ZONE_CHARS, MAX_TZNAME_CHARS)> chars;
+    std::array<char, std::max(MAX_ZONE_CHARS, MAX_TZNAME_CHARS)> chars;
     s32 defaulttype;
     std::array <u8, 0x12C4> padding1;
 };

src/CMakeLists.txt

@@ -185,7 +185,7 @@ else()
         add_compile_definitions(_FILE_OFFSET_BITS=64)
     endif()
 
-    if (YUZU_STATIC_BUILD AND NOT APPLE AND NOT MSVC)
+    if (YUZU_STATIC_BUILD AND NOT APPLE)
         add_compile_options(-static)
 
         # yuzu-cmd requires us to explicitly link libpthread, libgcc, and libstdc++ as static

src/android/app/build.gradle.kts

@@ -88,6 +88,7 @@ android {
                         "-DBUILD_TESTING=OFF",
                         "-DYUZU_TESTS=OFF",
                         "-DDYNARMIC_TESTS=OFF",
+                        "-DENABLE_UPDATE_CHECKER=ON",
                         *extraCMakeArgs.toTypedArray()
                     )
                 )
@@ -192,6 +193,12 @@ android {
             manifestPlaceholders += mapOf("appNameBase" to "Eden")
             resValue("string", "app_name_suffixed", "Eden")
 
+            externalNativeBuild {
+                cmake {
+                    arguments.add("-DGENSHIN_SPOOF=ON")
+                }
+            }
+
             ndk {
                 abiFilters += listOf("arm64-v8a")
             }
@@ -203,12 +210,6 @@ android {
             resValue("string", "app_name_suffixed", "Eden Optimized")
             applicationId = "com.miHoYo.Yuanshen"
 
-            externalNativeBuild {
-                cmake {
-                    arguments.add("-DGENSHIN_SPOOF=ON")
-                }
-            }
-
             ndk {
                 abiFilters += listOf("arm64-v8a")
             }

src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt

@@ -33,7 +33,6 @@ import org.yuzu.yuzu_emu.applets.web.WebBrowser
  * with the native side of the Yuzu code.
  */
 object NativeLibrary {
-    @Keep
     data class UpdateResult(
         var tag: String = "",
         var title: String = "",

src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/AddonAdapter.kt

@@ -8,8 +8,6 @@ package org.yuzu.yuzu_emu.adapters
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import androidx.core.view.isVisible
-import androidx.core.view.updateLayoutParams
 import org.yuzu.yuzu_emu.databinding.ListItemAddonBinding
 import org.yuzu.yuzu_emu.model.Patch
 import org.yuzu.yuzu_emu.model.PatchType
@@ -26,25 +24,13 @@ class AddonAdapter(val addonViewModel: AddonViewModel) :
     inner class AddonViewHolder(val binding: ListItemAddonBinding) :
         AbstractViewHolder<Patch>(binding) {
         override fun bind(model: Patch) {
-            val isCheat = model.isCheat()
-            val isIncompatible = isCheat && model.cheatCompat == Patch.CHEAT_COMPAT_INCOMPATIBLE
-            val indentPx = if (isCheat) {
-                (32 * binding.root.context.resources.displayMetrics.density).toInt()
-            } else {
-                0
+            binding.addonCard.setOnClickListener {
+                binding.addonSwitch.performClick()
             }
-            binding.root.updateLayoutParams<ViewGroup.MarginLayoutParams> {
-                marginStart = indentPx
-            }
-            binding.addonCard.setOnClickListener(
-                if (isIncompatible) null else { { binding.addonSwitch.performClick() } }
-            )
             binding.title.text = model.name
             binding.version.text = model.version
-            binding.addonSwitch.setOnCheckedChangeListener(null)
             binding.addonSwitch.isChecked = model.enabled
-            binding.addonSwitch.isEnabled = !isIncompatible
-            binding.addonSwitch.alpha = if (isIncompatible) 0.38f else 1.0f
+
             binding.addonSwitch.setOnCheckedChangeListener { _, checked ->
                 if (PatchType.from(model.type) == PatchType.Update && checked) {
                     addonViewModel.enableOnlyThisUpdate(model)
@@ -53,9 +39,12 @@ class AddonAdapter(val addonViewModel: AddonViewModel) :
                     model.enabled = checked
                 }
             }
-            val canDelete = model.isRemovable && !isCheat
-            binding.deleteCard.isVisible = canDelete
-            binding.buttonDelete.isVisible = canDelete
+
+            val canDelete = model.isRemovable
+            binding.deleteCard.isEnabled = canDelete
+            binding.buttonDelete.isEnabled = canDelete
+            binding.deleteCard.alpha = if (canDelete) 1f else 0.38f
+
             if (canDelete) {
                 val deleteAction = {
                     addonViewModel.setAddonToDelete(model)

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.kt

@@ -18,7 +18,6 @@ enum class BooleanSetting(override val key: String) : AbstractBooleanSetting {
     SKIP_CPU_INNER_INVALIDATION("skip_cpu_inner_invalidation"),
     FIX_BLOOM_EFFECTS("fix_bloom_effects"),
     EMULATE_BGR565("emulate_bgr565"),
-    RESCALE_HACK("rescale_hack"),
     CPUOPT_UNSAFE_HOST_MMU("cpuopt_unsafe_host_mmu"),
     USE_DOCKED_MODE("use_docked_mode"),
     USE_AUTO_STUB("use_auto_stub"),

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt

@@ -747,13 +747,6 @@ abstract class SettingsItem(
                     descriptionId = R.string.fix_bloom_effects_description
                 )
             )
-            put(
-                SwitchSetting(
-                    BooleanSetting.RESCALE_HACK,
-                    titleId = R.string.rescale_hack,
-                    descriptionId = R.string.rescale_hack_description
-                )
-            )
             put(
                 SwitchSetting(
                     BooleanSetting.EMULATE_BGR565,

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt

@@ -293,7 +293,6 @@ class SettingsFragmentPresenter(
             add(BooleanSetting.SKIP_CPU_INNER_INVALIDATION.key)
             add(BooleanSetting.FIX_BLOOM_EFFECTS.key)
             add(BooleanSetting.EMULATE_BGR565.key)
-            add(BooleanSetting.RESCALE_HACK.key)
             add(BooleanSetting.RENDERER_ASYNCHRONOUS_SHADERS.key)
             add(BooleanSetting.RENDERER_ASYNCHRONOUS_GPU_EMULATION.key)
             add(BooleanSetting.RENDERER_ASYNC_PRESENTATION.key)

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AddonsFragment.kt

@@ -72,7 +72,7 @@ class AddonsFragment : Fragment() {
         }
 
         addonViewModel.addonList.collect(viewLifecycleOwner) {
-            (binding.listAddons.adapter as AddonAdapter).submitList(it.toList())
+            (binding.listAddons.adapter as AddonAdapter).submitList(it)
         }
         addonViewModel.showModInstallPicker.collect(
             viewLifecycleOwner,

src/android/app/src/main/java/org/yuzu/yuzu_emu/model/AddonViewModel.kt

@@ -31,17 +31,12 @@ class AddonViewModel : ViewModel() {
     val addonToDelete = _addonToDelete.asStateFlow()
 
     var game: Game? = null
-        private set
-
     private var loadedGameKey: String? = null
 
     private val isRefreshing = AtomicBoolean(false)
     private val pendingRefresh = AtomicBoolean(false)
 
     fun onAddonsViewCreated(game: Game) {
-        if (this.game?.programId == game.programId && _patchList.value.isNotEmpty()) {
-            return
-        }
         this.game = game
         refreshAddons(commitEmpty = false)
     }
@@ -71,7 +66,8 @@ class AddonViewModel : ViewModel() {
                     NativeLibrary.getPatchesForFile(currentGame.path, currentGame.programId)
                 } ?: return@launch
 
-                val patchList = sortPatchesWithCheatsGrouped(patches.toMutableList())
+                val patchList = patches.toMutableList()
+                patchList.sortBy { it.name }
 
                 // Ensure only one update is enabled
                 ensureSingleUpdateEnabled(patchList)
@@ -150,7 +146,6 @@ class AddonViewModel : ViewModel() {
             PatchType.Update -> NativeLibrary.removeUpdate(patch.programId)
             PatchType.DLC -> NativeLibrary.removeDLC(patch.programId)
             PatchType.Mod -> NativeLibrary.removeMod(patch.programId, patch.name)
-            PatchType.Cheat -> {}
         }
         refreshAddons(force = true)
     }
@@ -184,7 +179,7 @@ class AddonViewModel : ViewModel() {
                             it.name
                         }
                     } else {
-                        it.getStorageKey()
+                        it.name
                     }
                 }
             }.toTypedArray()
@@ -206,28 +201,4 @@ class AddonViewModel : ViewModel() {
     private fun gameKey(game: Game): String {
         return "${game.programId}|${game.path}"
     }
-
-    private fun sortPatchesWithCheatsGrouped(patches: MutableList<Patch>): MutableList<Patch> {
-        val individualCheats = patches.filter { it.isCheat() }
-        val nonCheats = patches.filter { !it.isCheat() }.sortedBy { it.name }
-
-        val cheatsByParent = individualCheats.groupBy { it.parentName }
-
-        val result = mutableListOf<Patch>()
-        for (patch in nonCheats) {
-            result.add(patch)
-            cheatsByParent[patch.name]?.sortedBy { it.name }?.let { childCheats ->
-                result.addAll(childCheats)
-            }
-        }
-
-        val knownParents = nonCheats.map { it.name }.toSet()
-        for ((parentName, orphanCheats) in cheatsByParent) {
-            if (parentName !in knownParents) {
-                result.addAll(orphanCheats.sortedBy { it.name })
-            }
-        }
-
-        return result
-    }
 }

src/android/app/src/main/java/org/yuzu/yuzu_emu/model/Patch.kt

@@ -17,9 +17,7 @@ data class Patch(
     val programId: String,
     val titleId: String,
     val numericVersion: Long = 0,
-    val source: Int = 0,
-    val parentName: String = "",  // For cheats: name of the mod folder containing them
-    val cheatCompat: Int = CHEAT_COMPAT_COMPATIBLE
+    val source: Int = 0
 ) {
     companion object {
         const val SOURCE_UNKNOWN = 0
@@ -27,31 +25,8 @@ data class Patch(
         const val SOURCE_SDMC = 2
         const val SOURCE_EXTERNAL = 3
         const val SOURCE_PACKED = 4
-
-        const val CHEAT_COMPAT_COMPATIBLE = 0
-        const val CHEAT_COMPAT_INCOMPATIBLE = 1
     }
 
     val isRemovable: Boolean
         get() = source != SOURCE_EXTERNAL && source != SOURCE_PACKED
-
-    /**
-     * Returns the storage key used for saving enabled/disabled state.
-     * For cheats with a parent, returns "ParentName::CheatName".
-     */
-    fun getStorageKey(): String {
-        return if (parentName.isNotEmpty()) {
-            "$parentName::$name"
-        } else {
-            name
-        }
-    }
-
-    /**
-     * Returns true if this patch is an individual cheat entry (not a cheat mod).
-     * Individual cheats have type=Cheat and a parent mod name.
-     */
-    fun isCheat(): Boolean = type == PatchType.Cheat.int && parentName.isNotEmpty()
-
-    fun isIncompatibleCheat(): Boolean = isCheat() && cheatCompat == CHEAT_COMPAT_INCOMPATIBLE
 }

src/android/app/src/main/java/org/yuzu/yuzu_emu/model/PatchType.kt

@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: 2024 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -9,8 +6,7 @@ package org.yuzu.yuzu_emu.model
 enum class PatchType(val int: Int) {
     Update(0),
     DLC(1),
-    Mod(2),
-    Cheat(3);
+    Mod(2);
 
     companion object {
         fun from(int: Int): PatchType = entries.firstOrNull { it.int == int } ?: Update

src/android/app/src/main/jni/native.cpp

@@ -1406,9 +1406,7 @@ jobjectArray Java_org_yuzu_yuzu_1emu_NativeLibrary_getPatchesForFile(JNIEnv* env
             Common::Android::ToJString(env, patch.version), static_cast<jint>(patch.type),
             Common::Android::ToJString(env, std::to_string(patch.program_id)),
             Common::Android::ToJString(env, std::to_string(patch.title_id)),
-            static_cast<jlong>(patch.numeric_version), static_cast<jint>(patch.source),
-            Common::Android::ToJString(env, patch.parent_name),
-            static_cast<jint>(patch.cheat_compat));
+            static_cast<jlong>(patch.numeric_version), static_cast<jint>(patch.source));
         env->SetObjectArrayElement(jpatchArray, i, jpatch);
         ++i;
     }

src/android/app/src/main/res/values-ar/strings.xml

@@ -1159,6 +1159,5 @@
     <string name="license_fidelityfx_fsr_description">تحسين الجودة بدرجة عالية من AMD</string>
     <string name="external_content">محتوى خارجي</string>
     <string name="add_folders">إضافة مجلد</string>
-    <string name="percent">%1$d%%</string>
 
 </resources>

src/android/app/src/main/res/values-es/strings.xml

@@ -1153,6 +1153,5 @@
     <string name="license_fidelityfx_fsr_description">Upscaling de alta calidad de AMD</string>
     <string name="external_content">Contenido externo</string>
     <string name="add_folders">Añadir carpeta</string>
-    <string name="percent">%1$d%%</string>
 
 </resources>

src/android/app/src/main/res/values-fr/strings.xml

@@ -413,9 +413,7 @@
     <string name="frame_limit_slider">Limiter le pourcentage de vitesse</string>
     <string name="frame_limit_slider_description">Spécifier le pourcentage pour limiter la vitesse d\'émulation. 100% correspond à la vitesse normale. Des valeurs plus élevées ou plus basses augmenteront ou diminueront la limite de vitesse.</string>
     <string name="turbo_speed_limit">Vitesse turbo</string>
-    <string name="turbo_speed_limit_description">Lorsque le mode Turbo est activé, l\'émulation s\'exécute à cette vitesse.</string>
     <string name="slow_speed_limit">Vitesse lente</string>
-    <string name="slow_speed_limit_description">Lorsque le mode Lent est activé, l\'émulation s\'exécute à cette vitesse.</string>
     <string name="cpu_backend">Backend du CPU</string>
     <string name="cpu_accuracy">Précision du CPU</string>
     <string name="value_with_units">%1$s%2$s</string>

src/android/app/src/main/res/values-ru/strings.xml

@@ -489,8 +489,6 @@
     <string name="enable_buffer_history">Включить историю буфера</string>
     <string name="enable_buffer_history_description">Позволяет обращаться к предыдущим состояниям буфера. Эта опция может повысить качество рендеринга и стабильность производительности в некоторых играх.</string>
     <string name="use_optimized_vertex_buffers">Оптимизированные вершинные буферы</string>
-    <string name="use_optimized_vertex_buffers_description">Включает оптимизированную привязку вершинного буфера для повышения производительности. Требует Mesa Turnip 26.0+ / QCOM драйверы. Приводит к вылету на старых версиях Turnip.</string>
-
     <string name="hacks">Хаки</string>
 
     <string name="fast_gpu_time">Быстрое время ГПУ</string>
@@ -498,9 +496,6 @@
     <string name="skip_cpu_inner_invalidation">Пропустить внутреннюю инвалидацию ЦП</string>
     <string name="skip_cpu_inner_invalidation_description">Пропускает некоторые инвалидации кэша на стороне ЦП при обновлениях памяти, уменьшая нагрузку на процессор и повышая производительность. Может вызывать сбои в некоторых играх.</string>
     <string name="fix_bloom_effects">Исправить эффекты размытия</string>
-    <string name="fix_bloom_effects_description">Частично убирает размытие в LA/EOW (Adreno A6XX - A7XX/ Turnip), полностью отключает его в Burnout. Внимание: может вызывать графические артефакты в других играх.</string>
-    <string name="emulate_bgr565">Эмулировать BGR565</string>
-    <string name="emulate_bgr565_description">Исправляет проблемы с инвертированными цветами в играх, а также со странными артефактами или некорректными тенями.</string>
     <string name="renderer_asynchronous_shaders">Использовать асинхронные шейдеры</string>
     <string name="renderer_asynchronous_shaders_description">Компилирует шейдеры асинхронно. Это может уменьшить подтормаживания, но также может вызвать графические артефакты.</string>
     <string name="gpu_unswizzle_settings">Настройки распаковки текстур (Unswizzle)</string>
@@ -1155,4 +1150,5 @@
     <string name="license_fidelityfx_fsr_description">Высококачественное масштабирование от AMD</string>
     <string name="external_content">Дополнительный контент</string>
     <string name="add_folders">Добавить папку</string>
-    </resources>
+
+</resources>

src/android/app/src/main/res/values-uk/strings.xml

@@ -1155,6 +1155,5 @@
     <string name="license_fidelityfx_fsr_description">Високоякісне масштабування від AMD</string>
     <string name="external_content">Зовнішній вміст</string>
     <string name="add_folders">Додати теку</string>
-    <string name="percent">%1$d%%</string>
 
 </resources>

src/android/app/src/main/res/values-zh-rCN/strings.xml

@@ -483,8 +483,6 @@
     <string name="enable_buffer_history">启用缓冲区历史</string>
     <string name="enable_buffer_history_description">启用对先前缓冲区状态的访问。此选项可在某些游戏中提升渲染质量并保持性能的一致性。</string>
     <string name="use_optimized_vertex_buffers">优化顶点缓冲区</string>
-    <string name="use_optimized_vertex_buffers_description">启用经过优化的顶点缓冲区绑定以提升性能。需要 Mesa 26.0 及以上版本的 Turnip 或 QCOM 驱动程序。若使用较旧版本的 Turnip 驱动则会导致崩溃。</string>
-
     <string name="hacks">Hacks</string>
 
     <string name="fast_gpu_time">GPU 超频频率</string>
@@ -492,9 +490,6 @@
     <string name="skip_cpu_inner_invalidation">跳过CPU内部无效化</string>
     <string name="skip_cpu_inner_invalidation_description">在内存更新期间跳过某些CPU端缓存无效化，减少CPU使用率并提高其性能。可能会导致某些游戏出现故障或崩溃。</string>
     <string name="fix_bloom_effects">修复 Bloom 效果</string>
-    <string name="fix_bloom_effects_description">减少《塞尔达传说：智慧的再现》（Adreno A6XX - A7XX/ Turnip）中的 bloom 模糊，并移除《Burnout》中的 bloom 效果。警告：可能会导致在其他游戏中出现图形异常。</string>
-    <string name="emulate_bgr565">模拟 BGR565</string>
-    <string name="emulate_bgr565_description">修复了游戏中的颜色反转以及出现的异常画面瑕疵或奇怪阴影问题</string>
     <string name="renderer_asynchronous_shaders">使用异步着色器</string>
     <string name="renderer_asynchronous_shaders_description">异步编译着色器。这可能会减少卡顿，但也可能会导致图形错误。</string>
     <string name="gpu_unswizzle_settings">GPU 还原设置</string>
@@ -1149,6 +1144,5 @@
     <string name="license_fidelityfx_fsr_description">AMD 的高品质画面增强技术</string>
     <string name="external_content">外部内容</string>
     <string name="add_folders">添加文件夹</string>
-    <string name="percent">%1$d%%</string>
 
 </resources>

src/android/app/src/main/res/values/strings.xml

@@ -511,8 +511,6 @@
     <string name="fix_bloom_effects_description">Reduces bloom blur in LA/EOW (Adreno A6XX - A7XX/ Turnip), removes bloom in Burnout. Warning: may cause graphical artifacts in other games.</string>
     <string name="emulate_bgr565">Emulate BGR565</string>
     <string name="emulate_bgr565_description">Fixes problems with inverted colors in games or strange artifacts or strange shadows.</string>
-    <string name="rescale_hack">Enable Legacy Rescale Pass</string>
-    <string name="rescale_hack_description">Enables a legacy handling for the rescale configuration pass for games by using a quick rescale path</string>
     <string name="renderer_asynchronous_shaders">Use asynchronous shaders</string>
     <string name="renderer_asynchronous_shaders_description">Compiles shaders asynchronously. This may reduce stutters but may also introduce glitches.</string>
     <string name="gpu_unswizzle_settings">GPU Unswizzle Settings</string>

src/common/android/id_cache.cpp

@@ -516,7 +516,7 @@ namespace Common::Android {
         s_patch_class = reinterpret_cast<jclass>(env->NewGlobalRef(patch_class));
         s_patch_constructor = env->GetMethodID(
                 patch_class, "<init>",
-                "(ZLjava/lang/String;Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;JILjava/lang/String;)V");
+                "(ZLjava/lang/String;Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;JI)V");
         s_patch_enabled_field = env->GetFieldID(patch_class, "enabled", "Z");
         s_patch_name_field = env->GetFieldID(patch_class, "name", "Ljava/lang/String;");
         s_patch_version_field = env->GetFieldID(patch_class, "version", "Ljava/lang/String;");

src/common/logging.cpp

@@ -349,8 +349,35 @@ struct Impl {
     // Well, I mean it's the default constructor!
     explicit Impl() noexcept : filter(Level::Trace) {}
 
-    template<typename F>
-    void ForEachBackend(F&& lambda) noexcept {
+    void StartBackendThread() noexcept {
+        backend_thread = std::jthread([this](std::stop_token stop_token) {
+            Common::SetCurrentThreadName("Logger");
+            Entry entry;
+            const auto write_logs = [this, &entry]() {
+                ForEachBackend([&entry](Backend& backend) {
+                    backend.Write(entry);
+                });
+            };
+            do {
+                message_queue.PopWait(entry, stop_token);
+                write_logs();
+            } while (!stop_token.stop_requested());
+            // Drain the logging queue. Only writes out up to MAX_LOGS_TO_WRITE to prevent a
+            // case where a system is repeatedly spamming logs even on close.
+            int max_logs_to_write = filter.IsDebug() ? INT_MAX : 100;
+            while (max_logs_to_write-- && message_queue.TryPop(entry))
+                write_logs();
+        });
+    }
+
+    void StopBackendThread() noexcept {
+        backend_thread.request_stop();
+        if (backend_thread.joinable())
+            backend_thread.join();
+        ForEachBackend([](Backend& backend) { backend.Flush(); });
+    }
+
+    void ForEachBackend(auto lambda) noexcept {
         lambda(static_cast<Backend&>(color_console_backend));
 #ifndef __OPENORBIS__
         if (file_backend)
@@ -375,7 +402,9 @@ struct Impl {
 #ifdef ANDROID
     LogcatBackend lc_backend{};
 #endif
+    MPSCQueue<Entry> message_queue{};
     std::chrono::steady_clock::time_point time_origin{std::chrono::steady_clock::now()};
+    std::jthread backend_thread;
 };
 } // namespace
 
@@ -399,11 +428,13 @@ void Initialize() {
 }
 
 void Start() {
+    if (logging_instance)
+        logging_instance->StartBackendThread();
 }
 
 void Stop() {
     if (logging_instance)
-        logging_instance->ForEachBackend([](Backend& backend) { backend.Flush(); });
+        logging_instance->StopBackendThread();
 }
 
 void SetGlobalFilter(const Filter& filter) {
@@ -418,19 +449,14 @@ void SetColorConsoleBackendEnabled(bool enabled) {
 
 void FmtLogMessageImpl(Class log_class, Level log_level, const char* filename, unsigned int line_num, const char* function, fmt::string_view format, const fmt::format_args& args) {
     if (logging_instance && logging_instance->filter.CheckMessage(log_class, log_level)) {
-        auto const flush = ::Settings::values.log_flush_line.GetValue();
-        logging_instance->ForEachBackend([=](Backend& backend) {
-            backend.Write(Entry{
-                .message = fmt::vformat(format, args),
-                .timestamp = std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::steady_clock::now() - logging_instance->time_origin),
-                .log_class = log_class,
-                .log_level = log_level,
-                .filename = TrimSourcePath(filename),
-                .function = function,
-                .line_num = line_num,
-            });
-            if (flush)
-                backend.Flush();
+        logging_instance->message_queue.EmplaceWait(Entry{
+            .message = fmt::vformat(format, args),
+            .timestamp = std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::steady_clock::now() - logging_instance->time_origin),
+            .log_class = log_class,
+            .log_level = log_level,
+            .filename = TrimSourcePath(filename),
+            .function = function,
+            .line_num = line_num,
         });
     }
 }

src/common/settings.h

@@ -554,13 +554,8 @@ struct Values {
     SwitchableSetting<bool> emulate_bgr565{linkage, false, "emulate_bgr565",
                                             Category::RendererHacks};
 
-    SwitchableSetting<bool> rescale_hack{linkage,
-#ifdef __ANDROID__
-        true,
-#else
-        false,
-#endif
-        "rescale_hack", Category::RendererHacks};
+    SwitchableSetting<bool> rescale_hack{linkage, false, "rescale_hack",
+                                                     Category::RendererHacks};
 
     SwitchableSetting<bool> use_asynchronous_shaders{linkage, false, "use_asynchronous_shaders",
                                                      Category::RendererHacks};

src/core/CMakeLists.txt

@@ -616,18 +616,6 @@ add_library(core STATIC
     hle/service/caps/caps_u.h
     hle/service/cmif_serialization.h
     hle/service/cmif_types.h
-    hle/service/dmnt/cheat_interface.cpp
-    hle/service/dmnt/cheat_interface.h
-    hle/service/dmnt/cheat_parser.cpp
-    hle/service/dmnt/cheat_parser.h
-    hle/service/dmnt/cheat_process_manager.cpp
-    hle/service/dmnt/cheat_process_manager.h
-    hle/service/dmnt/cheat_virtual_machine.cpp
-    hle/service/dmnt/cheat_virtual_machine.h
-    hle/service/dmnt/dmnt.cpp
-    hle/service/dmnt/dmnt.h
-    hle/service/dmnt/dmnt_results.h
-    hle/service/dmnt/dmnt_types.h
     hle/service/erpt/erpt.cpp
     hle/service/erpt/erpt.h
     hle/service/es/es.cpp
@@ -1165,6 +1153,11 @@ add_library(core STATIC
     loader/xci.h
     memory.cpp
     memory.h
+    memory/cheat_engine.cpp
+    memory/cheat_engine.h
+    memory/dmnt_cheat_types.h
+    memory/dmnt_cheat_vm.cpp
+    memory/dmnt_cheat_vm.h
     perf_stats.cpp
     perf_stats.h
     reporter.cpp

src/core/arm/nce/interpreter_visitor.cpp

@@ -761,7 +761,8 @@ bool InterpreterVisitor::LDR_reg_fpsimd(Imm<2> size, Imm<1> opc_1, Reg Rm, Imm<3
     return this->SIMDOffset(scale, shift, opc_0, Rm, option, Rn, Vt);
 }
 
-std::optional<u64> MatchAndExecuteOneInstruction(Core::Memory::Memory& memory, mcontext_t* context, fpsimd_context* fpsimd_context) {
+std::optional<u64> MatchAndExecuteOneInstruction(Core::Memory::Memory& memory, mcontext_t* context,
+                                                 fpsimd_context* fpsimd_context) {
     std::span<u64, 31> regs(reinterpret_cast<u64*>(context->regs), 31);
     std::span<u128, 32> vregs(reinterpret_cast<u128*>(fpsimd_context->vregs), 32);
     u64& sp = *reinterpret_cast<u64*>(&context->sp);
@@ -771,9 +772,9 @@ std::optional<u64> MatchAndExecuteOneInstruction(Core::Memory::Memory& memory, m
     u32 instruction = memory.Read32(pc);
     bool was_executed = false;
 
-    auto decoder = Dynarmic::A64::Decode<VisitorBase, bool>(visitor, instruction);
+    auto decoder = Dynarmic::A64::Decode<VisitorBase>(instruction);
     if (decoder) {
-        was_executed = *decoder;
+        was_executed = decoder->get().call(visitor, instruction);
     } else {
         was_executed = false;
     }

src/core/core.cpp

@@ -40,7 +40,6 @@
 #include "core/hle/service/am/frontend/applets.h"
 #include "core/hle/service/am/process_creation.h"
 #include "core/hle/service/apm/apm_controller.h"
-#include "core/hle/service/dmnt/cheat_process_manager.h"
 #include "core/hle/service/filesystem/filesystem.h"
 #include "core/hle/service/glue/glue_manager.h"
 #include "core/hle/service/glue/time/static.h"
@@ -55,6 +54,7 @@
 #include "core/internal_network/network.h"
 #include "core/loader/loader.h"
 #include "core/memory.h"
+#include "core/memory/cheat_engine.h"
 #include "core/perf_stats.h"
 #include "core/reporter.h"
 #include "core/tools/freezer.h"
@@ -278,17 +278,8 @@ struct System::Impl {
         audio_core.emplace(system);
 
         service_manager = std::make_shared<Service::SM::ServiceManager>(kernel);
-
-        // Create cheat_manager BEFORE services, as DMNT::LoopProcess needs it
-        cheat_manager = std::make_unique<Service::DMNT::CheatProcessManager>(system);
-
         services.emplace(service_manager, system, stop_event.get_token());
 
-        // Apply any pending cheats that were registered before cheat_manager was initialized
-        if (pending_cheats.has_pending) {
-            ApplyPendingCheats(system);
-        }
-
         is_powered_on = true;
         exit_locked = false;
         exit_requested = false;
@@ -349,6 +340,11 @@ struct System::Impl {
             return init_result;
         }
 
+        // Initialize cheat engine
+        if (cheat_engine) {
+            cheat_engine->Initialize();
+        }
+
         // Register with applet manager
         // All threads are started, begin main process execution, now that we're in the clear
         applet_manager.CreateAndInsertByFrontendAppletParameters(std::move(process), params);
@@ -409,6 +405,7 @@ struct System::Impl {
         services.reset();
         service_manager.reset();
         fs_controller.Reset();
+        cheat_engine.reset();
         core_timing.ClearPendingEvents();
         app_loader.reset();
         audio_core.reset();
@@ -418,6 +415,7 @@ struct System::Impl {
         cpu_manager.Shutdown();
         debugger.reset();
         kernel.Shutdown();
+        device_memory.reset();
         stop_event = {};
         Network::RestartSocketOperations();
 
@@ -478,6 +476,7 @@ struct System::Impl {
     std::optional<Tegra::Host1x::Host1x> host1x_core;
     std::optional<Core::DeviceMemory> device_memory;
     std::optional<AudioCore::AudioCore> audio_core;
+    std::optional<Memory::CheatEngine> cheat_engine;
     std::optional<Tools::Freezer> memory_freezer;
     std::optional<Tools::RenderdocAPI> renderdoc_api;
 
@@ -497,17 +496,6 @@ struct System::Impl {
     std::unique_ptr<Tegra::GPU> gpu_core;
     std::stop_source stop_event;
 
-    /// Cheat Manager (DMNT)
-    std::unique_ptr<Service::DMNT::CheatProcessManager> cheat_manager;
-    /// Pending cheats to register after cheat_manager is initialized
-    struct PendingCheats {
-        std::vector<Service::DMNT::CheatEntry> list;
-        std::array<u8, 32> build_id{};
-        u64 main_region_begin{};
-        u64 main_region_size{};
-        bool has_pending{false};
-    } pending_cheats;
-
     mutable std::mutex suspend_guard;
     std::mutex general_channel_mutex;
     std::atomic_bool is_paused{};
@@ -525,61 +513,6 @@ struct System::Impl {
             general_channel_event.emplace(*general_channel_context);
         }
     }
-
-    void ApplyPendingCheats(System& system) {
-        if (!pending_cheats.has_pending || !cheat_manager) {
-            return;
-        }
-
-        LOG_DEBUG(Core, "Applying {} pending cheats", pending_cheats.list.size());
-
-        const auto result = cheat_manager->AttachToApplicationProcess(
-            pending_cheats.build_id, pending_cheats.main_region_begin,
-            pending_cheats.main_region_size);
-
-        if (result.IsError()) {
-            LOG_WARNING(Core, "Failed to attach cheat process: result={}", result.raw);
-            pending_cheats = {};
-            return;
-        }
-
-        LOG_DEBUG(Core, "Cheat process attached successfully");
-
-        for (const auto& entry : pending_cheats.list) {
-            if (entry.cheat_id == 0 && entry.definition.num_opcodes != 0) {
-                LOG_DEBUG(Core, "Setting master cheat '{}' with {} opcodes",
-                         entry.definition.readable_name.data(), entry.definition.num_opcodes);
-                const auto set_result = cheat_manager->SetMasterCheat(entry.definition);
-                if (set_result.IsError()) {
-                    LOG_WARNING(Core, "Failed to set master cheat: result={}", set_result.raw);
-                }
-                break;
-            }
-        }
-
-        // Add normal cheats (cheat_id != 0)
-        for (const auto& entry : pending_cheats.list) {
-            if (entry.cheat_id == 0 || entry.definition.num_opcodes == 0) {
-                continue;
-            }
-
-            u32 assigned_id = 0;
-            LOG_DEBUG(Core, "Adding cheat '{}' (enabled={}, {} opcodes)",
-                     entry.definition.readable_name.data(), entry.enabled,
-                     entry.definition.num_opcodes);
-            const auto add_result = cheat_manager->AddCheat(assigned_id, entry.enabled,
-                                                            entry.definition);
-            if (add_result.IsError()) {
-                LOG_WARNING(Core,
-                            "Failed to add cheat (original_id={} enabled={} name='{}'): result={}",
-                            entry.cheat_id, entry.enabled,
-                            entry.definition.readable_name.data(), add_result.raw);
-            }
-        }
-
-        // Clear pending cheats
-        pending_cheats = {};
-    }
 };
 
 System::System() : impl{std::make_unique<Impl>(*this)} {}
@@ -817,61 +750,11 @@ FileSys::VirtualFilesystem System::GetFilesystem() const {
     return impl->virtual_filesystem;
 }
 
-void System::RegisterCheatList(const std::vector<Service::DMNT::CheatEntry>& list,
+void System::RegisterCheatList(const std::vector<Memory::CheatEntry>& list,
                                const std::array<u8, 32>& build_id, u64 main_region_begin,
                                u64 main_region_size) {
-    // If cheat_manager is not yet initialized, cache the cheats for later
-    if (!impl->cheat_manager) {
-        impl->pending_cheats.list = list;
-        impl->pending_cheats.build_id = build_id;
-        impl->pending_cheats.main_region_begin = main_region_begin;
-        impl->pending_cheats.main_region_size = main_region_size;
-        impl->pending_cheats.has_pending = true;
-        LOG_INFO(Core, "Cached {} cheats for later registration", list.size());
-        return;
-    }
-
-    // Attach cheat process to the current application process
-    const auto result = impl->cheat_manager->AttachToApplicationProcess(build_id, main_region_begin,
-                                                                        main_region_size);
-    if (result.IsError()) {
-        LOG_WARNING(Core, "Failed to attach cheat process: result={}", result.raw);
-        return;
-    }
-
-    // Empty list: nothing more to do
-    if (list.empty()) {
-        return;
-    }
-
-    // Set master cheat if present (cheat_id == 0)
-    for (const auto& entry : list) {
-        if (entry.cheat_id == 0 && entry.definition.num_opcodes != 0) {
-            const auto set_result = impl->cheat_manager->SetMasterCheat(entry.definition);
-            if (set_result.IsError()) {
-                LOG_WARNING(Core, "Failed to set master cheat: result={}", set_result.raw);
-            }
-            // Only one master cheat allowed
-            break;
-        }
-    }
-
-    // Add normal cheats (cheat_id != 0)
-    for (const auto& entry : list) {
-        if (entry.cheat_id == 0 || entry.definition.num_opcodes == 0) {
-            continue;
-        }
-
-        u32 assigned_id = 0;
-        const auto add_result = impl->cheat_manager->AddCheat(assigned_id, entry.enabled,
-                                                               entry.definition);
-        if (add_result.IsError()) {
-            LOG_WARNING(Core,
-                        "Failed to add cheat (original_id={} enabled={} name='{}'): result={}",
-                        entry.cheat_id, entry.enabled,
-                        entry.definition.readable_name.data(), add_result.raw);
-        }
-    }
+    impl->cheat_engine.emplace(*this, list, build_id);
+    impl->cheat_engine->SetMainMemoryParameters(main_region_begin, main_region_size);
 }
 
 void System::SetFrontendAppletSet(Service::AM::Frontend::FrontendAppletSet&& set) {
@@ -1011,14 +894,6 @@ Tools::RenderdocAPI& System::GetRenderdocAPI() {
     return *impl->renderdoc_api;
 }
 
-Service::DMNT::CheatProcessManager& System::GetCheatManager() {
-    return *impl->cheat_manager;
-}
-
-const Service::DMNT::CheatProcessManager& System::GetCheatManager() const {
-    return *impl->cheat_manager;
-}
-
 void System::RunServer(std::unique_ptr<Service::ServerManager>&& server_manager) {
     return impl->kernel.RunServer(std::move(server_manager));
 }

src/core/core.h

@@ -17,7 +17,6 @@
 
 #include "common/common_types.h"
 #include "core/file_sys/vfs/vfs_types.h"
-#include "core/hle/service/dmnt/dmnt_types.h"
 #include "core/hle/service/os/event.h"
 #include "core/hle/service/kernel_helpers.h"
 
@@ -46,14 +45,10 @@ enum class ResultStatus : u16;
 } // namespace Loader
 
 namespace Core::Memory {
+struct CheatEntry;
 class Memory;
 } // namespace Core::Memory
 
-namespace Service::DMNT {
-    class CheatProcessManager;
-    struct CheatEntry;
-}
-
 namespace Service {
 
 namespace Account {
@@ -340,7 +335,7 @@ public:
 
     [[nodiscard]] FileSys::VirtualFilesystem GetFilesystem() const;
 
-    void RegisterCheatList(const std::vector<Service::DMNT::CheatEntry>& list,
+    void RegisterCheatList(const std::vector<Memory::CheatEntry>& list,
                            const std::array<u8, 0x20>& build_id, u64 main_region_begin,
                            u64 main_region_size);
 
@@ -381,9 +376,6 @@ public:
 
     [[nodiscard]] Tools::RenderdocAPI& GetRenderdocAPI();
 
-    [[nodiscard]] Service::DMNT::CheatProcessManager& GetCheatManager();
-    [[nodiscard]] const Service::DMNT::CheatProcessManager& GetCheatManager() const;
-
     void SetExitLocked(bool locked);
     bool GetExitLocked() const;
 

src/core/file_sys/fssystem/fssystem_aes_ctr_counter_extended_storage.cpp

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
@@ -109,7 +109,7 @@ Result AesCtrCounterExtendedStorage::GetEntryList(Entry* out_entries, s32* out_e
     R_UNLESS(out_entries != nullptr || entry_count == 0, ResultNullptrArgument);
 
     // Check that our range is valid.
-    BucketTree::Offsets table_offsets{};
+    BucketTree::Offsets table_offsets;
     R_TRY(m_table.GetOffsets(std::addressof(table_offsets)));
 
     R_UNLESS(table_offsets.IsInclude(offset, size), ResultOutOfRange);
@@ -167,7 +167,7 @@ size_t AesCtrCounterExtendedStorage::Read(u8* buffer, size_t size, size_t offset
     ASSERT(Common::IsAligned(offset, BlockSize));
     ASSERT(Common::IsAligned(size, BlockSize));
 
-    BucketTree::Offsets table_offsets{};
+    BucketTree::Offsets table_offsets;
     ASSERT(R_SUCCEEDED(m_table.GetOffsets(std::addressof(table_offsets))));
 
     ASSERT(table_offsets.IsInclude(offset, size));

src/core/file_sys/fssystem/fssystem_aes_ctr_counter_extended_storage.h

@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -92,7 +89,7 @@ public:
     virtual size_t Read(u8* buffer, size_t size, size_t offset) const override;
 
     virtual size_t GetSize() const override {
-        BucketTree::Offsets offsets{};
+        BucketTree::Offsets offsets;
         ASSERT(R_SUCCEEDED(m_table.GetOffsets(std::addressof(offsets))));
 
         return offsets.end_offset;

src/core/file_sys/fssystem/fssystem_bucket_tree.cpp

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
@@ -270,7 +270,7 @@ Result BucketTree::Find(Visitor* visitor, s64 virtual_address) {
     R_UNLESS(virtual_address >= 0, ResultInvalidOffset);
     R_UNLESS(!this->IsEmpty(), ResultOutOfRange);
 
-    BucketTree::Offsets offsets{};
+    BucketTree::Offsets offsets;
     R_TRY(this->GetOffsets(std::addressof(offsets)));
 
     R_TRY(visitor->Initialize(this, offsets));

src/core/file_sys/fssystem/fssystem_compressed_storage.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
@@ -125,7 +125,7 @@ private:
             }
 
             // Get the table offsets.
-            BucketTree::Offsets table_offsets{};
+            BucketTree::Offsets table_offsets;
             R_TRY(m_table.GetOffsets(std::addressof(table_offsets)));
 
             // Validate arguments.
@@ -177,7 +177,7 @@ private:
             ASSERT(out != nullptr);
 
             // Get our table offsets.
-            BucketTree::Offsets offsets{};
+            BucketTree::Offsets offsets;
             R_TRY(m_table.GetOffsets(std::addressof(offsets)));
 
             // Set the output.
@@ -195,7 +195,7 @@ private:
             R_SUCCEED_IF(size == 0);
 
             // Get the table offsets.
-            BucketTree::Offsets table_offsets{};
+            BucketTree::Offsets table_offsets;
             R_TRY(m_table.GetOffsets(std::addressof(table_offsets)));
 
             // Validate arguments.

src/core/file_sys/fssystem/fssystem_indirect_storage.cpp

@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -55,7 +52,7 @@ Result IndirectStorage::GetEntryList(Entry* out_entries, s32* out_entry_count, s
     R_UNLESS(out_entries != nullptr || entry_count == 0, ResultNullptrArgument);
 
     // Check that our range is valid.
-    BucketTree::Offsets table_offsets{};
+    BucketTree::Offsets table_offsets;
     R_TRY(m_table.GetOffsets(std::addressof(table_offsets)));
 
     R_UNLESS(table_offsets.IsInclude(offset, size), ResultOutOfRange);

src/core/file_sys/fssystem/fssystem_indirect_storage.h

@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -167,7 +164,7 @@ Result IndirectStorage::OperatePerEntry(s64 offset, s64 size, F func) {
     R_SUCCEED_IF(size == 0);
 
     // Get the table offsets.
-    BucketTree::Offsets table_offsets{};
+    BucketTree::Offsets table_offsets;
     R_TRY(m_table.GetOffsets(std::addressof(table_offsets)));
 
     // Validate arguments.

src/core/file_sys/fssystem/fssystem_sparse_storage.cpp

@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -21,7 +18,7 @@ size_t SparseStorage::Read(u8* buffer, size_t size, size_t offset) const {
     SparseStorage* self = const_cast<SparseStorage*>(this);
 
     if (self->GetEntryTable().IsEmpty()) {
-        BucketTree::Offsets table_offsets{};
+        BucketTree::Offsets table_offsets;
         ASSERT(R_SUCCEEDED(self->GetEntryTable().GetOffsets(std::addressof(table_offsets))));
         ASSERT(table_offsets.IsInclude(offset, size));
 

src/core/file_sys/patch_manager.cpp

@@ -27,13 +27,12 @@
 #include "core/file_sys/vfs/vfs_cached.h"
 #include "core/file_sys/vfs/vfs_layered.h"
 #include "core/file_sys/vfs/vfs_vector.h"
-#include "core/hle/service/dmnt/cheat_parser.h"
-#include "core/hle/service/dmnt/dmnt_types.h"
 #include "core/hle/service/filesystem/filesystem.h"
 #include "core/hle/service/ns/language.h"
 #include "core/hle/service/set/settings_server.h"
 #include "core/loader/loader.h"
 #include "core/loader/nso.h"
+#include "core/memory/cheat_engine.h"
 
 namespace FileSys {
 namespace {
@@ -65,15 +64,16 @@ std::string FormatTitleVersion(u32 version,
     return fmt::format("v{}.{}.{}", bytes[3], bytes[2], bytes[1]);
 }
 
-// Returns a directory with name matching case-insensitively.
-// Returns nullptr if directory doesn't contain a subdirectory with the given name.
-VirtualDir FindSubdirectoryCaseless(const VirtualDir& dir, std::string_view name) {
+// Returns a directory with name matching name case-insensitive. Returns nullptr if directory
+// doesn't have a directory with name.
+VirtualDir FindSubdirectoryCaseless(const VirtualDir dir, std::string_view name) {
 #ifdef _WIN32
     return dir->GetSubdirectory(name);
 #else
-    const auto target = Common::ToLower(std::string(name));
-    for (const auto& subdir : dir->GetSubdirectories()) {
-        if (Common::ToLower(subdir->GetName()) == target) {
+    const auto subdirs = dir->GetSubdirectories();
+    for (const auto& subdir : subdirs) {
+        std::string dir_name = Common::ToLower(subdir->GetName());
+        if (dir_name == name) {
             return subdir;
         }
     }
@@ -82,36 +82,36 @@ VirtualDir FindSubdirectoryCaseless(const VirtualDir& dir, std::string_view name
 #endif
 }
 
-std::optional<std::vector<Service::DMNT::CheatEntry>> ReadCheatFileFromFolder(
+std::optional<std::vector<Core::Memory::CheatEntry>> ReadCheatFileFromFolder(
     u64 title_id, const PatchManager::BuildID& build_id_, const VirtualDir& base_path, bool upper) {
-
     const auto build_id_raw = Common::HexToString(build_id_, upper);
-    const auto build_id = build_id_raw.substr(0, std::min(build_id_raw.size(), sizeof(u64) * 2));
+    const auto build_id = build_id_raw.substr(0, sizeof(u64) * 2);
     const auto file = base_path->GetFile(fmt::format("{}.txt", build_id));
 
     if (file == nullptr) {
-        LOG_DEBUG(Common_Filesystem, "No cheats file found for title_id={:016X}, build_id={}",
-                  title_id, build_id);
+        LOG_INFO(Common_Filesystem, "No cheats file found for title_id={:016X}, build_id={}",
+                 title_id, build_id);
         return std::nullopt;
     }
 
     std::vector<u8> data(file->GetSize());
     if (file->Read(data.data(), data.size()) != data.size()) {
-        LOG_WARNING(Common_Filesystem,
-                    "Failed to read cheats file for title_id={:016X}, build_id={}", title_id,
-                    build_id);
+        LOG_INFO(Common_Filesystem, "Failed to read cheats file for title_id={:016X}, build_id={}",
+                 title_id, build_id);
         return std::nullopt;
     }
 
-    const Service::DMNT::CheatParser parser;
+    const Core::Memory::TextCheatParser parser;
     return parser.Parse(std::string_view(reinterpret_cast<const char*>(data.data()), data.size()));
 }
 
 void AppendCommaIfNotEmpty(std::string& to, std::string_view with) {
-    if (!to.empty()) {
+    if (to.empty()) {
+        to += with;
+    } else {
         to += ", ";
+        to += with;
     }
-    to += with;
 }
 
 bool IsDirValidAndNonEmpty(const VirtualDir& dir) {
@@ -130,7 +130,8 @@ std::string GetUpdateVersionStringFromSlot(const ContentProvider* provider, u64
     }
 
     auto control_nca = provider->GetEntry(update_tid, ContentRecordType::Control);
-    if (control_nca == nullptr || control_nca->GetStatus() != Loader::ResultStatus::Success) {
+    if (control_nca == nullptr ||
+        control_nca->GetStatus() != Loader::ResultStatus::Success) {
         return {};
     }
 
@@ -168,11 +169,16 @@ u64 PatchManager::GetTitleID() const {
     return title_id;
 }
 
-PatchManager::UpdateResolution PatchManager::GetActiveUpdate(ContentRecordType type) const {
-    UpdateResolution update_res{};
+VirtualDir PatchManager::PatchExeFS(VirtualDir exefs) const {
+    LOG_INFO(Loader, "Patching ExeFS for title_id={:016X}", title_id);
+
+    if (exefs == nullptr)
+        return exefs;
 
     const auto& disabled = Settings::values.disabled_addons[title_id];
 
+    bool update_disabled = true;
+    std::optional<u32> enabled_version;
     bool checked_external = false;
     bool checked_manual = false;
 
@@ -189,10 +195,8 @@ PatchManager::UpdateResolution PatchManager::GetActiveUpdate(ContentRecordType t
                 checked_external = true;
                 for (const auto& update_entry : update_versions) {
                     if (!IsVersionedExternalUpdateDisabled(disabled, update_entry.version)) {
-                        update_res.update_disabled = false;
-                        update_res.update_active_version = update_entry.version;
-                        update_res.update_active_raw = external_provider->GetEntryForVersion(
-                            update_tid, type, update_entry.version);
+                        update_disabled = false;
+                        enabled_version = update_entry.version;
                         break;
                     }
                 }
@@ -210,10 +214,8 @@ PatchManager::UpdateResolution PatchManager::GetActiveUpdate(ContentRecordType t
                     checked_manual = true;
                     for (const auto& update_entry : manual_update_versions) {
                         if (!IsVersionedExternalUpdateDisabled(disabled, update_entry.version)) {
-                            update_res.update_disabled = false;
-                            update_res.update_active_version = update_entry.version;
-                            update_res.update_active_raw = manual_provider->GetEntryForVersion(
-                                update_tid, type, update_entry.version);
+                            update_disabled = false;
+                            enabled_version = update_entry.version;
                             break;
                         }
                     }
@@ -225,41 +227,37 @@ PatchManager::UpdateResolution PatchManager::GetActiveUpdate(ContentRecordType t
     // check for original NAND style
     // Check NAND if: no external updates exist, OR all external updates are disabled
     if (!checked_external && !checked_manual) {
-        const bool nand_disabled =
-            std::find(disabled.cbegin(), disabled.cend(), "Update (NAND)") != disabled.cend();
-        const bool sdmc_disabled =
-            std::find(disabled.cbegin(), disabled.cend(), "Update (SDMC)") != disabled.cend();
-        const bool generic_disabled =
-            std::find(disabled.cbegin(), disabled.cend(), "Update") != disabled.cend();
+        // Only enable NAND update if it exists AND is not disabled
+        // We need to check if an update actually exists in the content provider
+        const bool has_nand_update = content_provider.HasEntry(update_tid, ContentRecordType::Program);
 
-        if (!nand_disabled && !sdmc_disabled && !generic_disabled) {
-            update_res.update_active_raw = content_provider.GetEntryRaw(update_tid, type);
-            update_res.update_disabled = update_res.update_active_raw == nullptr;
+        if (has_nand_update) {
+            const bool nand_disabled = std::find(disabled.cbegin(), disabled.cend(), "Update (NAND)") != disabled.cend();
+            const bool sdmc_disabled = std::find(disabled.cbegin(), disabled.cend(), "Update (SDMC)") != disabled.cend();
+            const bool generic_disabled = std::find(disabled.cbegin(), disabled.cend(), "Update") != disabled.cend();
+
+            if (!nand_disabled && !sdmc_disabled && !generic_disabled) {
+                update_disabled = false;
+            }
         }
-    } else if (update_res.update_disabled && content_union) {
-        const bool nand_disabled =
-            std::find(disabled.cbegin(), disabled.cend(), "Update (NAND)") != disabled.cend();
-        const bool sdmc_disabled =
-            std::find(disabled.cbegin(), disabled.cend(), "Update (SDMC)") != disabled.cend();
+    } else if (update_disabled && content_union) {
+        const bool nand_disabled = std::find(disabled.cbegin(), disabled.cend(), "Update (NAND)") != disabled.cend();
+        const bool sdmc_disabled = std::find(disabled.cbegin(), disabled.cend(), "Update (SDMC)") != disabled.cend();
 
         if (!nand_disabled || !sdmc_disabled) {
             const auto nand_sdmc_entries = content_union->ListEntriesFilterOrigin(
-                std::nullopt, TitleType::Update, type, update_tid);
+                std::nullopt, TitleType::Update, ContentRecordType::Program, update_tid);
 
             for (const auto& [slot, entry] : nand_sdmc_entries) {
                 if (slot == ContentProviderUnionSlot::UserNAND ||
                     slot == ContentProviderUnionSlot::SysNAND) {
                     if (!nand_disabled) {
-                        update_res.update_active_raw =
-                            content_provider.GetEntryRaw(update_tid, type);
-                        update_res.update_disabled = update_res.update_active_raw == nullptr;
+                        update_disabled = false;
                         break;
                     }
                 } else if (slot == ContentProviderUnionSlot::SDMC) {
                     if (!sdmc_disabled) {
-                        update_res.update_active_raw =
-                            content_provider.GetEntryRaw(update_tid, type);
-                        update_res.update_disabled = update_res.update_active_raw == nullptr;
+                        update_disabled = false;
                         break;
                     }
                 }
@@ -267,36 +265,44 @@ PatchManager::UpdateResolution PatchManager::GetActiveUpdate(ContentRecordType t
         }
     }
 
-    return update_res;
-}
-
-VirtualDir PatchManager::PatchExeFS(VirtualDir exefs) const {
-    LOG_INFO(Loader, "Patching ExeFS for title_id={:016X}", title_id);
-
-    if (exefs == nullptr)
-        return exefs;
-
-    const auto update_tid = GetUpdateTitleID(title_id);
-    const auto update_res = GetActiveUpdate();
-
+    // Game Updates
     std::unique_ptr<NCA> update = nullptr;
 
-    if (update_res.update_active_version.has_value() && update_res.update_active_raw != nullptr) {
-        update = std::make_unique<NCA>(update_res.update_active_raw);
+    // If we have a specific enabled version from external provider, use it
+    if (enabled_version.has_value() && content_union) {
+        const auto* external_provider = content_union->GetExternalProvider();
+        if (external_provider) {
+            auto file = external_provider->GetEntryForVersion(update_tid, ContentRecordType::Program, *enabled_version);
+            if (file != nullptr) {
+                update = std::make_unique<NCA>(file);
+            }
+        }
+
+        // Also try ManualContentProvider
+        if (update == nullptr) {
+            const auto* manual_provider = static_cast<const ManualContentProvider*>(
+                content_union->GetSlotProvider(ContentProviderUnionSlot::FrontendManual));
+            if (manual_provider) {
+                auto file = manual_provider->GetEntryForVersion(update_tid, ContentRecordType::Program, *enabled_version);
+                if (file != nullptr) {
+                    update = std::make_unique<NCA>(file);
+                }
+            }
+        }
     }
 
-    if (update == nullptr && !update_res.update_disabled) {
+    // Fallback to regular content provider if no external update was loaded
+    if (update == nullptr && !update_disabled) {
         update = content_provider.GetEntry(update_tid, ContentRecordType::Program);
     }
 
-    if (!update_res.update_disabled && update != nullptr && update->GetExeFS() != nullptr) {
+    if (!update_disabled && update != nullptr && update->GetExeFS() != nullptr) {
         LOG_INFO(Loader, "    ExeFS: Update ({}) applied successfully",
                  FormatTitleVersion(content_provider.GetEntryVersion(update_tid).value_or(0)));
         exefs = update->GetExeFS();
     }
 
     // LayeredExeFS
-    const auto& disabled = Settings::values.disabled_addons[title_id];
     const auto load_dir = fs_controller.GetModificationLoadRoot(title_id);
     const auto sdmc_load_dir = fs_controller.GetSDMCModificationLoadRoot(title_id);
 
@@ -462,8 +468,7 @@ bool PatchManager::HasNSOPatch(const BuildID& build_id_, std::string_view name)
     return !CollectPatches(patch_dirs, build_id).empty();
 }
 
-std::vector<Service::DMNT::CheatEntry> PatchManager::CreateCheatList(
-    const BuildID& build_id_) const {
+std::vector<Core::Memory::CheatEntry> PatchManager::CreateCheatList(const BuildID& build_id_) const {
     const auto load_dir = fs_controller.GetModificationLoadRoot(title_id);
     if (load_dir == nullptr) {
         LOG_ERROR(Loader, "Cannot load mods for invalid title_id={:016X}", title_id);
@@ -472,72 +477,35 @@ std::vector<Service::DMNT::CheatEntry> PatchManager::CreateCheatList(
 
     const auto& disabled = Settings::values.disabled_addons[title_id];
     auto patch_dirs = load_dir->GetSubdirectories();
-    std::sort(patch_dirs.begin(), patch_dirs.end(),
-              [](const VirtualDir& l, const VirtualDir& r) { return l->GetName() < r->GetName(); });
+    std::sort(patch_dirs.begin(), patch_dirs.end(), [](auto const& l, auto const& r) { return l->GetName() < r->GetName(); });
 
-    // Load cheats from: <mod dir>/<folder>/cheats/<build_id>.txt
-    std::vector<Service::DMNT::CheatEntry> out;
+    // <mod dir> / <folder> / cheats / <build id>.txt
+    std::vector<Core::Memory::CheatEntry> out;
     for (const auto& subdir : patch_dirs) {
-        const auto mod_name = subdir->GetName();
-
-        // Skip entirely disabled mods
-        if (std::find(disabled.cbegin(), disabled.cend(), mod_name) != disabled.cend()) {
-            continue;
-        }
-
-        auto cheats_dir = FindSubdirectoryCaseless(subdir, "cheats");
-        if (cheats_dir == nullptr) {
-            continue;
-        }
-
-        // Try uppercase build_id first, then lowercase
-        std::optional<std::vector<Service::DMNT::CheatEntry>> cheat_entries;
-        if (auto res = ReadCheatFileFromFolder(title_id, build_id_, cheats_dir, true)) {
-            cheat_entries = std::move(res);
-        } else if (auto res_lower =
-                       ReadCheatFileFromFolder(title_id, build_id_, cheats_dir, false)) {
-            cheat_entries = std::move(res_lower);
-        }
-
-        if (cheat_entries) {
-            for (auto& entry : *cheat_entries) {
-                // Check if this individual cheat is disabled
-                const std::string cheat_name = entry.definition.readable_name.data();
-                const std::string cheat_key = mod_name + "::" + cheat_name;
-
-                if (std::find(disabled.cbegin(), disabled.cend(), cheat_key) != disabled.cend()) {
-                    // Individual cheat is disabled - mark it as disabled but still include it
-                    entry.enabled = false;
-                }
-
-                out.push_back(entry);
+        if (std::find(disabled.cbegin(), disabled.cend(), subdir->GetName()) == disabled.cend()) {
+            if (auto cheats_dir = FindSubdirectoryCaseless(subdir, "cheats"); cheats_dir != nullptr) {
+                if (auto const res = ReadCheatFileFromFolder(title_id, build_id_, cheats_dir, true))
+                    std::copy(res->begin(), res->end(), std::back_inserter(out));
+                if (auto const res = ReadCheatFileFromFolder(title_id, build_id_, cheats_dir, false))
+                    std::copy(res->begin(), res->end(), std::back_inserter(out));
             }
         }
     }
-
-    // User-friendly cheat loading from: <mod dir>/cheat_*.txt
-    for (const auto& file : load_dir->GetFiles()) {
-        const auto& name = file->GetName();
-        if (!name.starts_with("cheat_")) {
-            continue;
+    // Uncareless user-friendly loading of patches (must start with 'cheat_')
+    // <mod dir> / <cheat file>.txt
+    for (auto const& f : load_dir->GetFiles()) {
+        auto const name = f->GetName();
+        if (name.starts_with("cheat_") && std::find(disabled.cbegin(), disabled.cend(), name) == disabled.cend()) {
+            std::vector<u8> data(f->GetSize());
+            if (f->Read(data.data(), data.size()) == data.size()) {
+                const Core::Memory::TextCheatParser parser;
+                auto const res = parser.Parse(std::string_view(reinterpret_cast<const char*>(data.data()), data.size()));
+                std::copy(res.begin(), res.end(), std::back_inserter(out));
+            } else {
+                LOG_INFO(Common_Filesystem, "Failed to read cheats file for title_id={:016X}", title_id);
+            }
         }
-        if (std::find(disabled.cbegin(), disabled.cend(), name) != disabled.cend()) {
-            continue;
-        }
-
-        std::vector<u8> data(file->GetSize());
-        if (file->Read(data.data(), data.size()) != static_cast<size_t>(data.size())) {
-            LOG_WARNING(Common_Filesystem, "Failed to read cheat file '{}' for title_id={:016X}",
-                        name, title_id);
-            continue;
-        }
-
-        const Service::DMNT::CheatParser parser;
-        auto entries =
-            parser.Parse(std::string_view(reinterpret_cast<const char*>(data.data()), data.size()));
-        out.insert(out.end(), entries.begin(), entries.end());
     }
-
     return out;
 }
 
@@ -629,22 +597,105 @@ VirtualFile PatchManager::PatchRomFS(const NCA* base_nca, VirtualFile base_romfs
 
     auto romfs = base_romfs;
 
+    // Game Updates
     const auto update_tid = GetUpdateTitleID(title_id);
-    const auto update_res = GetActiveUpdate(type);
+    const auto& disabled = Settings::values.disabled_addons[title_id];
 
-    if (!update_res.update_disabled && update_res.update_active_raw != nullptr &&
-        base_nca != nullptr) {
-        const auto new_nca = std::make_shared<NCA>(update_res.update_active_raw, base_nca);
+    bool update_disabled = true;
+    std::optional<u32> enabled_version;
+    VirtualFile update_raw = nullptr;
+    bool checked_external = false;
+    bool checked_manual = false;
+
+    const auto* content_union = static_cast<const ContentProviderUnion*>(&content_provider);
+    if (content_union) {
+        // First, check ExternalContentProvider
+        const auto* external_provider = content_union->GetExternalProvider();
+        if (external_provider) {
+            const auto update_versions = external_provider->ListUpdateVersions(update_tid);
+
+            if (!update_versions.empty()) {
+                checked_external = true;
+                for (const auto& update_entry : update_versions) {
+                    if (!IsVersionedExternalUpdateDisabled(disabled, update_entry.version)) {
+                        update_disabled = false;
+                        enabled_version = update_entry.version;
+                        update_raw = external_provider->GetEntryForVersion(update_tid, type, update_entry.version);
+                        break;
+                    }
+                }
+            }
+        }
+
+        if (!checked_external) {
+            const auto* manual_provider = static_cast<const ManualContentProvider*>(
+                content_union->GetSlotProvider(ContentProviderUnionSlot::FrontendManual));
+            if (manual_provider) {
+                const auto manual_update_versions = manual_provider->ListUpdateVersions(update_tid);
+
+                if (!manual_update_versions.empty()) {
+                    checked_manual = true;
+                    for (const auto& update_entry : manual_update_versions) {
+                        if (!IsVersionedExternalUpdateDisabled(disabled, update_entry.version)) {
+                            update_disabled = false;
+                            enabled_version = update_entry.version;
+                            update_raw = manual_provider->GetEntryForVersion(update_tid, type, update_entry.version);
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    if (!checked_external && !checked_manual) {
+        const bool nand_disabled = std::find(disabled.cbegin(), disabled.cend(), "Update (NAND)") != disabled.cend();
+        const bool sdmc_disabled = std::find(disabled.cbegin(), disabled.cend(), "Update (SDMC)") != disabled.cend();
+        const bool generic_disabled = std::find(disabled.cbegin(), disabled.cend(), "Update") != disabled.cend();
+
+        if (!nand_disabled && !sdmc_disabled && !generic_disabled) {
+            update_disabled = false;
+        }
+        if (!update_disabled) {
+            update_raw = content_provider.GetEntryRaw(update_tid, type);
+        }
+    } else if (update_disabled && content_union) {
+        const bool nand_disabled = std::find(disabled.cbegin(), disabled.cend(), "Update (NAND)") != disabled.cend();
+        const bool sdmc_disabled = std::find(disabled.cbegin(), disabled.cend(), "Update (SDMC)") != disabled.cend();
+
+        if (!nand_disabled || !sdmc_disabled) {
+            const auto nand_sdmc_entries = content_union->ListEntriesFilterOrigin(
+                std::nullopt, TitleType::Update, type, update_tid);
+
+            for (const auto& [slot, entry] : nand_sdmc_entries) {
+                if (slot == ContentProviderUnionSlot::UserNAND ||
+                    slot == ContentProviderUnionSlot::SysNAND) {
+                    if (!nand_disabled) {
+                        update_disabled = false;
+                        update_raw = content_provider.GetEntryRaw(update_tid, type);
+                        break;
+                    }
+                } else if (slot == ContentProviderUnionSlot::SDMC) {
+                    if (!sdmc_disabled) {
+                        update_disabled = false;
+                        update_raw = content_provider.GetEntryRaw(update_tid, type);
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    if (!update_disabled && update_raw != nullptr && base_nca != nullptr) {
+        const auto new_nca = std::make_shared<NCA>(update_raw, base_nca);
         if (new_nca->GetStatus() == Loader::ResultStatus::Success &&
             new_nca->GetRomFS() != nullptr) {
-            LOG_INFO(
-                Loader, "    RomFS: Update ({}) applied successfully",
-                update_res.update_active_version.has_value()
-                    ? FormatTitleVersion(*update_res.update_active_version)
-                    : FormatTitleVersion(content_provider.GetEntryVersion(update_tid).value_or(0)));
+            LOG_INFO(Loader, "    RomFS: Update ({}) applied successfully",
+                     enabled_version.has_value() ? FormatTitleVersion(*enabled_version) :
+                     FormatTitleVersion(content_provider.GetEntryVersion(update_tid).value_or(0)));
             romfs = new_nca->GetRomFS();
         }
-    } else if (!update_res.update_disabled && packed_update_raw != nullptr && base_nca != nullptr) {
+    } else if (!update_disabled && packed_update_raw != nullptr && base_nca != nullptr) {
         const auto new_nca = std::make_shared<NCA>(packed_update_raw, base_nca);
         if (new_nca->GetStatus() == Loader::ResultStatus::Success &&
             new_nca->GetRomFS() != nullptr) {
@@ -661,53 +712,6 @@ VirtualFile PatchManager::PatchRomFS(const NCA* base_nca, VirtualFile base_romfs
     return romfs;
 }
 
-PatchManager::BuildID PatchManager::GetBuildID(VirtualFile update_raw) const {
-    BuildID build_id{};
-
-    // Get the base NCA
-    const auto base_nca = content_provider.GetEntry(title_id, ContentRecordType::Program);
-    if (base_nca == nullptr) {
-        return build_id;
-    }
-
-    // Try to get ExeFS from update first, then base
-    VirtualDir exefs;
-    const auto update_res = GetActiveUpdate();
-    if (!update_res.update_disabled && update_res.update_active_raw != nullptr) {
-        const auto update = std::make_shared<NCA>(update_res.update_active_raw, base_nca.get());
-        if (update->GetStatus() == Loader::ResultStatus::Success && update->GetExeFS() != nullptr) {
-            exefs = update->GetExeFS();
-        }
-    } else if (update_raw != nullptr) {
-        const auto new_nca = std::make_shared<NCA>(update_raw, base_nca.get());
-        if (new_nca->GetStatus() == Loader::ResultStatus::Success &&
-            new_nca->GetExeFS() != nullptr) {
-            exefs = new_nca->GetExeFS();
-        }
-    }
-
-    if (exefs == nullptr) {
-        exefs = base_nca->GetExeFS();
-    }
-
-    if (exefs == nullptr) {
-        return build_id;
-    }
-
-    // Try to read the main NSO header
-    const auto main_file = exefs->GetFile("main");
-    if (main_file == nullptr || main_file->GetSize() < sizeof(Loader::NSOHeader)) {
-        return build_id;
-    }
-
-    Loader::NSOHeader header{};
-    if (main_file->Read(reinterpret_cast<u8*>(&header), sizeof(header)) == sizeof(header)) {
-        build_id = header.build_id;
-    }
-
-    return build_id;
-}
-
 std::vector<Patch> PatchManager::GetPatches(VirtualFile update_raw) const {
     if (title_id == 0) {
         return {};
@@ -745,8 +749,7 @@ std::vector<Patch> PatchManager::GetPatches(VirtualFile update_raw) const {
                                       .program_id = title_id,
                                       .title_id = update_tid,
                                       .source = PatchSource::External,
-                                      .numeric_version = update_entry.version,
-                                      .parent_name = ""};
+                                      .numeric_version = update_entry.version};
 
                 external_update_patches.push_back(update_patch);
             }
@@ -766,6 +769,7 @@ std::vector<Patch> PatchManager::GetPatches(VirtualFile update_raw) const {
                 const auto update_disabled =
                     IsVersionedExternalUpdateDisabled(disabled, update_entry.version);
 
+
                 Patch update_patch = {.enabled = !update_disabled,
                                       .name = "Update",
                                       .version = version_str,
@@ -810,17 +814,17 @@ std::vector<Patch> PatchManager::GetPatches(VirtualFile update_raw) const {
             std::string source_suffix;
 
             switch (slot) {
-            case ContentProviderUnionSlot::UserNAND:
-            case ContentProviderUnionSlot::SysNAND:
-                source_type = PatchSource::NAND;
-                source_suffix = " (NAND)";
-                break;
-            case ContentProviderUnionSlot::SDMC:
-                source_type = PatchSource::SDMC;
-                source_suffix = " (SDMC)";
-                break;
-            default:
-                break;
+                case ContentProviderUnionSlot::UserNAND:
+                case ContentProviderUnionSlot::SysNAND:
+                    source_type = PatchSource::NAND;
+                    source_suffix = " (NAND)";
+                    break;
+                case ContentProviderUnionSlot::SDMC:
+                    source_type = PatchSource::SDMC;
+                    source_suffix = " (SDMC)";
+                    break;
+                default:
+                    break;
             }
 
             std::string version_str;
@@ -891,137 +895,94 @@ std::vector<Patch> PatchManager::GetPatches(VirtualFile update_raw) const {
         }
     }
 
-    // Check if we have a valid build_id for cheat enumeration
-    const auto build_id = GetBuildID(update_raw);
-    const bool has_build_id =
-        std::any_of(build_id.begin(), build_id.end(), [](u8 b) { return b != 0; });
-
     // General Mods (LayeredFS and IPS)
     const auto mod_dir = fs_controller.GetModificationLoadRoot(title_id);
-    const auto sdmc_mod_dir = fs_controller.GetSDMCModificationLoadRoot(title_id);
+    if (mod_dir != nullptr) {
+        for (auto const& f : mod_dir->GetFiles())
+            if (auto const name = f->GetName(); name.starts_with("cheat_")) {
+                auto const mod_disabled = std::find(disabled.begin(), disabled.end(), name) != disabled.end();
+                out.push_back({
+                    .enabled = !mod_disabled,
+                    .name = name,
+                    .version = "Cheats",
+                    .type = PatchType::Mod,
+                    .program_id = title_id,
+                    .title_id = title_id,
+                    .source = PatchSource::Unknown,
+                    .location = f->GetFullPath(),
+                });
+            }
 
-    for (const auto& root : std::array{mod_dir, sdmc_mod_dir}) {
-        if (root == nullptr)
-            continue;
-
-        const bool is_sdmc = (root == sdmc_mod_dir);
-        const std::vector<VirtualDir> mods =
-            is_sdmc ? std::vector{root} : root->GetSubdirectories();
-
-        for (const auto& mod : mods) {
-            std::string mod_name = is_sdmc ? "SDMC" : mod->GetName();
+        for (const auto& mod : mod_dir->GetSubdirectories()) {
             std::string types;
-            bool has_cheats = false;
 
             const auto exefs_dir = FindSubdirectoryCaseless(mod, "exefs");
             if (IsDirValidAndNonEmpty(exefs_dir)) {
-                if (is_sdmc) {
-                    AppendCommaIfNotEmpty(types, "LayeredExeFS");
-                } else {
-                    bool ips = false, ipswitch = false, layeredfs = false;
-                    for (const auto& file : exefs_dir->GetFiles()) {
-                        if (file->GetExtension() == "ips")
-                            ips = true;
-                        else if (file->GetExtension() == "pchtxt")
-                            ipswitch = true;
-                        else if (std::find(EXEFS_FILE_NAMES.begin(), EXEFS_FILE_NAMES.end(),
-                                           file->GetName()) != EXEFS_FILE_NAMES.end())
-                            layeredfs = true;
-                    }
-                    if (ips)
-                        AppendCommaIfNotEmpty(types, "IPS");
-                    if (ipswitch)
-                        AppendCommaIfNotEmpty(types, "IPSwitch");
-                    if (layeredfs)
-                        AppendCommaIfNotEmpty(types, "LayeredExeFS");
-                }
-            }
+                bool ips = false;
+                bool ipswitch = false;
+                bool layeredfs = false;
 
+                for (const auto& file : exefs_dir->GetFiles()) {
+                    if (file->GetExtension() == "ips") {
+                        ips = true;
+                    } else if (file->GetExtension() == "pchtxt") {
+                        ipswitch = true;
+                    } else if (std::find(EXEFS_FILE_NAMES.begin(), EXEFS_FILE_NAMES.end(),
+                                         file->GetName()) != EXEFS_FILE_NAMES.end()) {
+                        layeredfs = true;
+                                         }
+                }
+
+                if (ips)
+                    AppendCommaIfNotEmpty(types, "IPS");
+                if (ipswitch)
+                    AppendCommaIfNotEmpty(types, "IPSwitch");
+                if (layeredfs)
+                    AppendCommaIfNotEmpty(types, "LayeredExeFS");
+            }
             if (IsDirValidAndNonEmpty(FindSubdirectoryCaseless(mod, "romfs")) ||
                 IsDirValidAndNonEmpty(FindSubdirectoryCaseless(mod, "romfslite")))
                 AppendCommaIfNotEmpty(types, "LayeredFS");
-
-            const auto cheats_dir = FindSubdirectoryCaseless(mod, "cheats");
-            if (IsDirValidAndNonEmpty(cheats_dir)) {
-                has_cheats = true;
+            if (IsDirValidAndNonEmpty(FindSubdirectoryCaseless(mod, "cheats")))
                 AppendCommaIfNotEmpty(types, "Cheats");
-            }
-            if (has_cheats && is_sdmc)
-                mod_name = "Atmosphere";
 
             if (types.empty())
                 continue;
 
-            const auto mod_disabled =
-                std::find(disabled.begin(), disabled.end(), mod_name) != disabled.end();
+            const auto mod_disabled = std::find(disabled.begin(), disabled.end(), mod->GetName()) != disabled.end();
             out.push_back({.enabled = !mod_disabled,
-                           .name = mod_name,
+                           .name = mod->GetName(),
                            .version = types,
                            .type = PatchType::Mod,
                            .program_id = title_id,
                            .title_id = title_id,
                            .source = PatchSource::Unknown,
-                           .location = mod->GetFullPath(),
-                           .parent_name = ""});
+                           .location = mod->GetFullPath()});
+        }
+    }
 
-            // Add individual cheats as sub-entries
-            if (has_cheats) {
-                std::vector<Service::DMNT::CheatEntry> cheat_entries;
-                if (has_build_id) {
-                    if (auto res = ReadCheatFileFromFolder(title_id, build_id, cheats_dir, true))
-                        cheat_entries = std::move(*res);
-                    else if (auto res_lower =
-                                 ReadCheatFileFromFolder(title_id, build_id, cheats_dir, false))
-                        cheat_entries = std::move(*res_lower);
-                }
-
-                if (!cheat_entries.empty()) {
-                    for (const auto& cheat : cheat_entries) {
-                        if (cheat.cheat_id <= 1 || cheat.definition.readable_name[0] == '\0')
-                            continue;
-                        const std::string cheat_name = cheat.definition.readable_name.data();
-                        const std::string cheat_key =
-                            (is_sdmc ? "SDMC" : mod->GetName()) + "::" + cheat_name;
-                        out.push_back({
-                            .enabled = std::find(disabled.begin(), disabled.end(), cheat_key) ==
-                                       disabled.end(),
-                            .name = cheat_name,
-                            .version = types,
-                            .type = PatchType::Cheat,
-                            .program_id = title_id,
-                            .title_id = title_id,
-                            .parent_name = mod_name,
-                            .cheat_compat = CheatCompatibility::Compatible,
-                        });
-                    }
-                } else {
-                    std::string title;
-                    for (const auto& cheat_file : cheats_dir->GetFiles()) {
-                        if (!cheat_file->GetName().ends_with(".txt"))
-                            continue;
-                        std::vector<u8> data(cheat_file->GetSize());
-                        if (cheat_file->Read(data.data(), data.size()) == data.size()) {
-                            const auto entries =
-                                Service::DMNT::CheatParser{}.Parse(std::string_view(
-                                    reinterpret_cast<const char*>(data.data()), data.size()));
-                            if (entries.size() > 1)
-                                title = entries[1].definition.readable_name.data();
-                        }
-                        break;
-                    }
-                    out.push_back({
-                        .enabled = false,
-                        .name = title.empty() ? "Incompatible cheat"
-                                              : fmt::format("Incompatible cheat: {}", title),
-                        .version = types,
-                        .type = PatchType::Cheat,
-                        .program_id = title_id,
-                        .title_id = title_id,
-                        .parent_name = mod_name,
-                        .cheat_compat = CheatCompatibility::Incompatible,
-                    });
-                }
+    // SDMC mod directory (RomFS LayeredFS)
+    const auto sdmc_mod_dir = fs_controller.GetSDMCModificationLoadRoot(title_id);
+    if (sdmc_mod_dir != nullptr) {
+        std::string types;
+        if (IsDirValidAndNonEmpty(FindSubdirectoryCaseless(sdmc_mod_dir, "exefs"))) {
+            AppendCommaIfNotEmpty(types, "LayeredExeFS");
+        }
+        if (IsDirValidAndNonEmpty(FindSubdirectoryCaseless(sdmc_mod_dir, "romfs")) ||
+            IsDirValidAndNonEmpty(FindSubdirectoryCaseless(sdmc_mod_dir, "romfslite"))) {
+            AppendCommaIfNotEmpty(types, "LayeredFS");
             }
+
+        if (!types.empty()) {
+            const auto mod_disabled =
+                std::find(disabled.begin(), disabled.end(), "SDMC") != disabled.end();
+            out.push_back({.enabled = !mod_disabled,
+                           .name = "SDMC",
+                           .version = types,
+                           .type = PatchType::Mod,
+                           .program_id = title_id,
+                           .title_id = title_id,
+                           .source = PatchSource::Unknown});
         }
     }
 
@@ -1031,8 +992,8 @@ std::vector<Patch> PatchManager::GetPatches(VirtualFile update_raw) const {
     bool has_nand_dlc = false;
     bool has_sdmc_dlc = false;
     bool has_other_dlc = false;
-    const auto dlc_entries_with_origin = content_union->ListEntriesFilterOrigin(
-        std::nullopt, TitleType::AOC, ContentRecordType::Data);
+    const auto dlc_entries_with_origin =
+        content_union->ListEntriesFilterOrigin(std::nullopt, TitleType::AOC, ContentRecordType::Data);
 
     dlc_match.reserve(dlc_entries_with_origin.size());
     for (const auto& [slot, entry] : dlc_entries_with_origin) {
@@ -1063,20 +1024,20 @@ std::vector<Patch> PatchManager::GetPatches(VirtualFile update_raw) const {
         }
 
         switch (slot) {
-        case ContentProviderUnionSlot::External:
-        case ContentProviderUnionSlot::FrontendManual:
-            has_external_dlc = true;
-            break;
-        case ContentProviderUnionSlot::UserNAND:
-        case ContentProviderUnionSlot::SysNAND:
-            has_nand_dlc = true;
-            break;
-        case ContentProviderUnionSlot::SDMC:
-            has_sdmc_dlc = true;
-            break;
-        default:
-            has_other_dlc = true;
-            break;
+            case ContentProviderUnionSlot::External:
+            case ContentProviderUnionSlot::FrontendManual:
+                has_external_dlc = true;
+                break;
+            case ContentProviderUnionSlot::UserNAND:
+            case ContentProviderUnionSlot::SysNAND:
+                has_nand_dlc = true;
+                break;
+            case ContentProviderUnionSlot::SDMC:
+                has_sdmc_dlc = true;
+                break;
+            default:
+                has_other_dlc = true;
+                break;
         }
         dlc_match.push_back(entry);
     }
@@ -1108,8 +1069,7 @@ std::vector<Patch> PatchManager::GetPatches(VirtualFile update_raw) const {
                        .type = PatchType::DLC,
                        .program_id = title_id,
                        .title_id = dlc_match.back().title_id,
-                       .source = dlc_source,
-                       .parent_name = ""});
+                       .source = dlc_source});
     }
 
     return out;

src/core/file_sys/patch_manager.h

@@ -10,10 +10,10 @@
 #include <memory>
 #include <optional>
 #include <string>
-
 #include "common/common_types.h"
 #include "core/file_sys/nca_metadata.h"
 #include "core/file_sys/vfs/vfs_types.h"
+#include "core/memory/dmnt_cheat_types.h"
 
 namespace Core {
 class System;
@@ -23,17 +23,13 @@ namespace Service::FileSystem {
 class FileSystemController;
 }
 
-namespace Service::DMNT {
-struct CheatEntry;
-}
-
 namespace FileSys {
 
 class ContentProvider;
 class NCA;
 class NACP;
 
-enum class PatchType { Update, DLC, Mod, Cheat };
+enum class PatchType { Update, DLC, Mod };
 
 enum class PatchSource {
     Unknown,
@@ -43,11 +39,6 @@ enum class PatchSource {
     Packed,
 };
 
-enum class CheatCompatibility : u8 {
-    Incompatible,
-    Compatible,
-};
-
 struct Patch {
     bool enabled;
     std::string name;
@@ -58,8 +49,6 @@ struct Patch {
     PatchSource source;
     std::string location;
     u32 numeric_version{0};
-    std::string parent_name;
-    CheatCompatibility cheat_compat{CheatCompatibility::Incompatible};
 };
 
 // A centralized class to manage patches to games.
@@ -90,7 +79,7 @@ public:
     [[nodiscard]] bool HasNSOPatch(const BuildID& build_id, std::string_view name) const;
 
     // Creates a CheatList object with all
-    [[nodiscard]] std::vector<Service::DMNT::CheatEntry> CreateCheatList(
+    [[nodiscard]] std::vector<Core::Memory::CheatEntry> CreateCheatList(
         const BuildID& build_id) const;
 
     // Currently tracked RomFS patches:
@@ -101,11 +90,9 @@ public:
                                          VirtualFile packed_update_raw = nullptr,
                                          bool apply_layeredfs = true) const;
 
-    // Returns a vector of patches including individual cheats
+    // Returns a vector of patches
     [[nodiscard]] std::vector<Patch> GetPatches(VirtualFile update_raw = nullptr) const;
 
-    [[nodiscard]] BuildID GetBuildID(VirtualFile update_raw = nullptr) const;
-
     // If the game update exists, returns the u32 version field in its Meta-type NCA. If that fails,
     // it will fallback to the Meta-type NCA of the base game. If that fails, the result will be
     // std::nullopt
@@ -122,14 +109,6 @@ private:
     [[nodiscard]] std::vector<VirtualFile> CollectPatches(const std::vector<VirtualDir>& patch_dirs,
                                                           const std::string& build_id) const;
 
-    struct UpdateResolution {
-        bool update_disabled{true};
-        VirtualFile update_active_raw;
-        std::optional<u32> update_active_version;
-    };
-    [[nodiscard]] UpdateResolution GetActiveUpdate(
-        ContentRecordType type = ContentRecordType::Program) const;
-
     u64 title_id;
     const Service::FileSystem::FileSystemController& fs_controller;
     const ContentProvider& content_provider;

src/core/file_sys/sdmc_factory.cpp

@@ -1,12 +1,7 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <memory>
-#include "common/alignment.h"
-#include "common/literals.h"
 #include "core/file_sys/registered_cache.h"
 #include "core/file_sys/sdmc_factory.h"
 #include "core/file_sys/vfs/vfs.h"
@@ -14,6 +9,8 @@
 
 namespace FileSys {
 
+constexpr u64 SDMC_TOTAL_SIZE = 0x10000000000; // 1 TiB
+
 SDMCFactory::SDMCFactory(VirtualDir sd_dir_, VirtualDir sd_mod_dir_)
     : sd_dir(std::move(sd_dir_)), sd_mod_dir(std::move(sd_mod_dir_)),
       contents(std::make_unique<RegisteredCache>(
@@ -59,11 +56,7 @@ u64 SDMCFactory::GetSDMCFreeSpace() const {
 }
 
 u64 SDMCFactory::GetSDMCTotalSpace() const {
-    // Resize the SD space automatically, always leaving around 4GiB last from next chunk block
-    using namespace Common::Literals;
-    auto const bytes_per_sector = 512;
-    auto const size_block = (sd_dir->GetSize() + 4_GiB) / 4_GiB;
-    return Common::AlignUp(size_block * 4_GiB, bytes_per_sector);
+    return SDMC_TOTAL_SIZE;
 }
 
 } // namespace FileSys

src/core/file_sys/system_archive/system_archive.cpp

@@ -15,76 +15,86 @@
 
 namespace FileSys::SystemArchive {
 
+constexpr u64 SYSTEM_ARCHIVE_BASE_TITLE_ID = 0x0100000000000800;
+constexpr std::size_t SYSTEM_ARCHIVE_COUNT = 0x28;
+
+using SystemArchiveSupplier = VirtualDir (*)();
+
 struct SystemArchiveDescriptor {
+    u64 title_id;
     const char* name;
-    VirtualDir (*supplier)();
+    SystemArchiveSupplier supplier;
 };
 
-constexpr inline SystemArchiveDescriptor GetSystemArchive(u64 title_id) {
-    switch (title_id) {
-    case 0x0100000000000800: return {"CertStore", nullptr};
-    case 0x0100000000000801: return {"ErrorMessage", nullptr};
-    case 0x0100000000000802: return {"MiiModel", &MiiModel};
-    case 0x0100000000000803: return {"BrowserDll", nullptr};
-    case 0x0100000000000804: return {"Help", nullptr};
-    case 0x0100000000000805: return {"SharedFont", nullptr};
-    case 0x0100000000000806: return {"NgWord", &NgWord1};
-    case 0x0100000000000807: return {"SsidList", nullptr};
-    case 0x0100000000000808: return {"Dictionary", nullptr};
-    case 0x0100000000000809: return {"SystemVersion", &SystemVersion};
-    case 0x010000000000080A: return {"AvatarImage", nullptr};
-    case 0x010000000000080B: return {"LocalNews", nullptr};
-    case 0x010000000000080C: return {"Eula", nullptr};
-    case 0x010000000000080D: return {"UrlBlackList", nullptr};
-    case 0x010000000000080E: return {"TimeZoneBinary", &TimeZoneBinary};
-    case 0x010000000000080F: return {"CertStoreCruiser", nullptr};
-    case 0x0100000000000810: return {"FontNintendoExtension", &FontNintendoExtension};
-    case 0x0100000000000811: return {"FontStandard", &FontStandard};
-    case 0x0100000000000812: return {"FontKorean", &FontKorean};
-    case 0x0100000000000813: return {"FontChineseTraditional", &FontChineseTraditional};
-    case 0x0100000000000814: return {"FontChineseSimple", &FontChineseSimple};
-    case 0x0100000000000815: return {"FontBfcpx", nullptr};
-    case 0x0100000000000816: return {"SystemUpdate", nullptr};
-    case 0x0100000000000817: return {"0100000000000817", nullptr};
-    case 0x0100000000000818: return {"FirmwareDebugSettings", nullptr};
-    case 0x0100000000000819: return {"BootImagePackage", nullptr};
-    case 0x010000000000081A: return {"BootImagePackageSafe", nullptr};
-    case 0x010000000000081B: return {"BootImagePackageExFat", nullptr};
-    case 0x010000000000081C: return {"BootImagePackageExFatSafe", nullptr};
-    case 0x010000000000081D: return {"FatalMessage", nullptr};
-    case 0x010000000000081E: return {"ControllerIcon", nullptr};
-    case 0x010000000000081F: return {"PlatformConfigIcosa", nullptr};
-    case 0x0100000000000820: return {"PlatformConfigCopper", nullptr};
-    case 0x0100000000000821: return {"PlatformConfigHoag", nullptr};
-    case 0x0100000000000822: return {"ControllerFirmware", nullptr};
-    case 0x0100000000000823: return {"NgWord2", &NgWord2};
-    case 0x0100000000000824: return {"PlatformConfigIcosaMariko", nullptr};
-    case 0x0100000000000825: return {"ApplicationBlackList", nullptr};
-    case 0x0100000000000826: return {"RebootlessSystemUpdateVersion", nullptr};
-    case 0x0100000000000827: return {"ContentActionTable", nullptr};
-    case 0x0100000000000828: return {"FunctionBlackList", nullptr};
-    case 0x0100000000000829: return {"PlatformConfigCalcio", nullptr};
-    case 0x0100000000000830: return {"NgWordT", nullptr};
-    case 0x0100000000000831: return {"PlatformConfigAula", nullptr};
-    case 0x0100000000000832: return {"CradleFirmware", nullptr};
-    case 0x0100000000000835: return {"ErrorMessageUtf8", nullptr};
-    case 0x0100000000000859: return {"ClientCertData", nullptr};
-    case 0x010000000000085C: return {"GameCardConfigurationData", nullptr};
-    default: return {nullptr, nullptr};
-    }
-}
+constexpr std::array<SystemArchiveDescriptor, SYSTEM_ARCHIVE_COUNT> SYSTEM_ARCHIVES{{
+    {0x0100000000000800, "CertStore", nullptr},
+    {0x0100000000000801, "ErrorMessage", nullptr},
+    {0x0100000000000802, "MiiModel", &MiiModel},
+    {0x0100000000000803, "BrowserDll", nullptr},
+    {0x0100000000000804, "Help", nullptr},
+    {0x0100000000000805, "SharedFont", nullptr},
+    {0x0100000000000806, "NgWord", &NgWord1},
+    {0x0100000000000807, "SsidList", nullptr},
+    {0x0100000000000808, "Dictionary", nullptr},
+    {0x0100000000000809, "SystemVersion", &SystemVersion},
+    {0x010000000000080A, "AvatarImage", nullptr},
+    {0x010000000000080B, "LocalNews", nullptr},
+    {0x010000000000080C, "Eula", nullptr},
+    {0x010000000000080D, "UrlBlackList", nullptr},
+    {0x010000000000080E, "TimeZoneBinary", &TimeZoneBinary},
+    {0x010000000000080F, "CertStoreCruiser", nullptr},
+    {0x0100000000000810, "FontNintendoExtension", &FontNintendoExtension},
+    {0x0100000000000811, "FontStandard", &FontStandard},
+    {0x0100000000000812, "FontKorean", &FontKorean},
+    {0x0100000000000813, "FontChineseTraditional", &FontChineseTraditional},
+    {0x0100000000000814, "FontChineseSimple", &FontChineseSimple},
+    {0x0100000000000815, "FontBfcpx", nullptr},
+    {0x0100000000000816, "SystemUpdate", nullptr},
+    {0x0100000000000817, "0100000000000817", nullptr},
+    {0x0100000000000818, "FirmwareDebugSettings", nullptr},
+    {0x0100000000000819, "BootImagePackage", nullptr},
+    {0x010000000000081A, "BootImagePackageSafe", nullptr},
+    {0x010000000000081B, "BootImagePackageExFat", nullptr},
+    {0x010000000000081C, "BootImagePackageExFatSafe", nullptr},
+    {0x010000000000081D, "FatalMessage", nullptr},
+    {0x010000000000081E, "ControllerIcon", nullptr},
+    {0x010000000000081F, "PlatformConfigIcosa", nullptr},
+    {0x0100000000000820, "PlatformConfigCopper", nullptr},
+    {0x0100000000000821, "PlatformConfigHoag", nullptr},
+    {0x0100000000000822, "ControllerFirmware", nullptr},
+    {0x0100000000000823, "NgWord2", &NgWord2},
+    {0x0100000000000824, "PlatformConfigIcosaMariko", nullptr},
+    {0x0100000000000825, "ApplicationBlackList", nullptr},
+    {0x0100000000000826, "RebootlessSystemUpdateVersion", nullptr},
+    {0x0100000000000827, "ContentActionTable", nullptr},
+}};
 
 VirtualFile SynthesizeSystemArchive(const u64 title_id) {
-    auto const desc = GetSystemArchive(title_id);
-    LOG_INFO(Service_FS, "Synthesizing system archive '{}' (0x{:016X}).", desc.name, title_id);
-    if (desc.supplier != nullptr) {
-        if (auto const dir = desc.supplier(); dir != nullptr) {
-            if (auto const romfs = CreateRomFS(dir); romfs != nullptr) {
-                LOG_INFO(Service_FS, "    - System archive generation successful!");
-                return romfs;
-            }
-        }
+    if (title_id < SYSTEM_ARCHIVES.front().title_id || title_id > SYSTEM_ARCHIVES.back().title_id) {
+        return nullptr;
     }
-    return nullptr;
+
+    const auto& desc = SYSTEM_ARCHIVES[title_id - SYSTEM_ARCHIVE_BASE_TITLE_ID];
+
+    LOG_INFO(Service_FS, "Synthesizing system archive '{}' (0x{:016X}).", desc.name, desc.title_id);
+
+    if (desc.supplier == nullptr) {
+        return nullptr;
+    }
+
+    const auto dir = desc.supplier();
+
+    if (dir == nullptr) {
+        return nullptr;
+    }
+
+    const auto romfs = CreateRomFS(dir);
+
+    if (romfs == nullptr) {
+        return nullptr;
+    }
+
+    LOG_INFO(Service_FS, "    - System archive generation successful!");
+    return romfs;
 }
 } // namespace FileSys::SystemArchive

src/core/hle/kernel/k_page_table_base.cpp

@@ -268,7 +268,6 @@ Result KPageTableBase::InitializeForProcess(Svc::CreateProcessFlag as_type, bool
     // Set other basic fields.
     m_enable_aslr = enable_aslr;
     m_enable_device_address_space_merge = enable_das_merge;
-    m_allowed_exec_device_mapping = false;
     m_address_space_start = start;
     m_address_space_end = end;
     m_is_kernel = false;

src/core/hle/kernel/k_page_table_base.h

@@ -223,7 +223,6 @@ private:
     bool m_is_kernel{};
     bool m_enable_aslr{};
     bool m_enable_device_address_space_merge{};
-    bool m_allowed_exec_device_mapping{};
     KMemoryBlockSlabManager* m_memory_block_slab_manager{};
     KBlockInfoManager* m_block_info_manager{};
     KResourceLimit* m_resource_limit{};
@@ -256,10 +255,6 @@ public:
         return m_enable_aslr;
     }
 
-    void AllowDeviceMappingOfExecPages() {
-        m_allowed_exec_device_mapping = true;
-    }
-
     bool Contains(KProcessAddress addr) const {
         return m_address_space_start <= addr && addr <= m_address_space_end - 1;
     }

src/core/hle/kernel/k_process.cpp

@@ -341,11 +341,6 @@ Result KProcess::Initialize(const Svc::CreateProcessParameter& params, const KPa
     // Initialize capabilities.
     R_TRY(m_capabilities.InitializeForKip(caps, std::addressof(m_page_table)));
 
-    // Enable mapping device pages as executable on legacy processes.
-    if (m_capabilities.GetIntendedKernelMajorVersion() < 26) {
-        m_page_table.AllowDeviceMappingOfExecPages();
-    }
-
     // Initialize the process id.
     m_process_id = m_kernel.CreateNewUserProcessID();
     ASSERT(InitialProcessIdMin <= m_process_id);
@@ -442,11 +437,6 @@ Result KProcess::Initialize(const Svc::CreateProcessParameter& params,
     // Initialize capabilities.
     R_TRY(m_capabilities.InitializeForUser(user_caps, std::addressof(m_page_table)));
 
-    // Enable mapping device pages as executable on legacy processes.
-    if (m_capabilities.GetIntendedKernelMajorVersion() < 26) {
-        m_page_table.AllowDeviceMappingOfExecPages();
-    }
-
     // Initialize the process id.
     m_process_id = m_kernel.CreateNewUserProcessID();
     ASSERT(ProcessIdMin <= m_process_id);
@@ -999,9 +989,6 @@ Result KProcess::Run(s32 priority, size_t stack_size) {
     main_thread->GetContext().r[0] = 0;
     main_thread->GetContext().r[1] = thread_handle;
 
-    // Pass the thread handle to the thread local region.
-    this->GetMemory().Write32(GetInteger(main_thread->GetTlsAddress()) + 0x110, thread_handle);
-
     // Update our state.
     this->ChangeState((state == State::Created) ? State::Running : State::RunningAttached);
     ON_RESULT_FAILURE_2 {

src/core/hle/kernel/k_process_page_table.h

@@ -33,10 +33,6 @@ public:
         m_page_table.Finalize();
     }
 
-    void AllowDeviceMappingOfExecPages() {
-        m_page_table.AllowDeviceMappingOfExecPages();
-    }
-
     [[nodiscard]] Core::Memory::Memory& GetMemory() noexcept { return m_page_table.GetMemory(); }
     [[nodiscard]] Core::Memory::Memory const& GetMemory() const noexcept { return m_page_table.GetMemory(); }
     [[nodiscard]] Common::PageTable& GetImpl() noexcept { return m_page_table.GetImpl(); }

src/core/hle/kernel/k_thread.cpp

@@ -76,13 +76,11 @@ namespace Kernel {
             std::atomic_uint16_t interrupt_flag;
             std::atomic_uint8_t cache_maintenance_flag;
             std::atomic_int64_t thread_cpu_time;
-            std::atomic_uint32_t current_thread_handle;
         };
         static_assert(offsetof(ThreadLocalRegion, disable_count) == 0x100);
         static_assert(offsetof(ThreadLocalRegion, interrupt_flag) == 0x102);
         static_assert(offsetof(ThreadLocalRegion, cache_maintenance_flag) == 0x104);
         static_assert(offsetof(ThreadLocalRegion, thread_cpu_time) == 0x108);
-        static_assert(offsetof(ThreadLocalRegion, current_thread_handle) == 0x110);
 
         class ThreadQueueImplForKThreadSleep final : public KThreadQueueWithoutEndWait {
         public:
@@ -130,24 +128,24 @@ namespace Kernel {
 
         // Next, assert things based on the type.
         switch (type) {
-        case ThreadType::Main:
-            ASSERT(arg == 0);
-            [[fallthrough]];
-        case ThreadType::User:
-            ASSERT(((owner == nullptr) ||
-                    (owner->GetCoreMask() | (1ULL << virt_core)) == owner->GetCoreMask()));
-            ASSERT(((owner == nullptr) || (prio > Svc::LowestThreadPriority) ||
-                    (owner->GetPriorityMask() | (1ULL << prio)) == owner->GetPriorityMask()));
-            break;
-        case ThreadType::HighPriority:
-        case ThreadType::Dummy:
-            break;
-        case ThreadType::Kernel:
-            UNIMPLEMENTED();
-            break;
-        default:
-            ASSERT_MSG(false, "KThread::Initialize: Unknown ThreadType {}", static_cast<u32>(type));
-            break;
+            case ThreadType::Main:
+                ASSERT(arg == 0);
+                [[fallthrough]];
+            case ThreadType::User:
+                ASSERT(((owner == nullptr) ||
+                        (owner->GetCoreMask() | (1ULL << virt_core)) == owner->GetCoreMask()));
+                ASSERT(((owner == nullptr) || (prio > Svc::LowestThreadPriority) ||
+                        (owner->GetPriorityMask() | (1ULL << prio)) == owner->GetPriorityMask()));
+                break;
+            case ThreadType::HighPriority:
+            case ThreadType::Dummy:
+                break;
+            case ThreadType::Kernel:
+                UNIMPLEMENTED();
+                break;
+            default:
+                ASSERT_MSG(false, "KThread::Initialize: Unknown ThreadType {}", static_cast<u32>(type));
+                break;
         }
         m_thread_type = type;
 

src/core/hle/kernel/kernel.cpp

@@ -372,17 +372,17 @@ struct KernelCore::Impl {
     }
 
     // Gets the dummy KThread for the caller, allocating a new one if this is the first time
-    KThread* GetHostDummyThread(ThreadLocalData& t, KThread* existing_thread) {
-        if (t.thread == nullptr) {
+    KThread* GetHostDummyThread(KThread* existing_thread) {
+        if (tls_data.thread == nullptr) {
             auto const initialize{[](KThread* thread) {
                 ASSERT(KThread::InitializeDummyThread(thread, nullptr).IsSuccess());
                 return thread;
             }};
-            t.raw_thread.emplace(system.Kernel());
-            t.thread = existing_thread ? existing_thread : initialize(&*t.raw_thread);
-            ASSERT(t.thread != nullptr);
+            tls_data.raw_thread.emplace(system.Kernel());
+            tls_data.thread = existing_thread ? existing_thread : initialize(&*tls_data.raw_thread);
+            ASSERT(tls_data.thread != nullptr);
         }
-        return t.thread;
+        return tls_data.thread;
     }
 
     /// Registers a CPU core thread by allocating a host thread ID for it
@@ -395,7 +395,7 @@ struct KernelCore::Impl {
 
     /// Registers a new host thread by allocating a host thread ID for it
     void RegisterHostThread(KThread* existing_thread) {
-        (void)GetHostDummyThread(tls_data, existing_thread);
+        (void)GetHostDummyThread(existing_thread);
     }
 
     [[nodiscard]] u32 GetCurrentHostThreadID() {
@@ -419,8 +419,9 @@ struct KernelCore::Impl {
     }
 
     KThread* GetCurrentEmuThread() {
-        auto& t = tls_data;
-        return t.current_thread ? t.current_thread : (t.current_thread = GetHostDummyThread(t, nullptr));
+        if (!tls_data.current_thread)
+            tls_data.current_thread = GetHostDummyThread(nullptr);
+        return tls_data.current_thread;
     }
 
     void SetCurrentEmuThread(KThread* thread) {

src/core/hle/kernel/svc/svc_thread.cpp

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
@@ -75,12 +75,7 @@ Result CreateThread(Core::System& system, Handle* out_handle, u64 entry_point, u
     KThread::Register(kernel, thread);
 
     // Add the thread to the handle table.
-    R_TRY(process.GetHandleTable().Add(out_handle, thread));
-
-    // Pass the thread handle to the thread local region.
-    process.GetMemory().Write32(GetInteger(thread->GetTlsAddress()) + 0x110, *out_handle);
-
-    R_SUCCEED();
+    R_RETURN(process.GetHandleTable().Add(out_handle, thread));
 }
 
 /// Starts the thread for the provided handle

src/core/hle/kernel/svc_version.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
@@ -53,8 +53,8 @@ constexpr inline u32 RequiredKernelVersion =
 
 // This is the highest SVC version supported, to be updated on new kernel releases.
 // NOTE: Official kernel versions have SVC major = SDK major + 4, SVC minor = SDK minor.
-constexpr inline u32 SupportedKernelMajorVersion = ConvertToSvcMajorVersion(22);
-constexpr inline u32 SupportedKernelMinorVersion = ConvertToSvcMinorVersion(2);
+constexpr inline u32 SupportedKernelMajorVersion = ConvertToSvcMajorVersion(20);
+constexpr inline u32 SupportedKernelMinorVersion = ConvertToSvcMinorVersion(5);
 constexpr inline u32 SupportedKernelVersion =
     EncodeKernelVersion(SupportedKernelMajorVersion, SupportedKernelMinorVersion);
 

src/core/hle/service/acc/acc.cpp

@@ -1155,14 +1155,6 @@ void Module::Interface::StoreSaveDataThumbnailSystem(HLERequestContext& ctx) {
     StoreSaveDataThumbnail(ctx, uuid, tid);
 }
 
-void Module::Interface::GetPinCodeLength(HLERequestContext& ctx) {
-    LOG_WARNING(Service_ACC, "(STUBBED) called");
-
-    IPC::ResponseBuilder rb{ctx, 3};
-    rb.Push(ResultSuccess);
-    rb.Push<u32>(0);
-}
-
 void Module::Interface::StoreSaveDataThumbnail(HLERequestContext& ctx, const Common::UUID& uuid,
                                                const u64 tid) {
     IPC::ResponseBuilder rb{ctx, 2};

src/core/hle/service/acc/acc.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
@@ -48,7 +48,6 @@ public:
         void StoreSaveDataThumbnailApplication(HLERequestContext& ctx);
         void GetBaasAccountManagerForSystemService(HLERequestContext& ctx);
         void StoreSaveDataThumbnailSystem(HLERequestContext& ctx);
-        void GetPinCodeLength(HLERequestContext& ctx);
 
     private:
         Result InitializeApplicationInfoBase();

src/core/hle/service/acc/acc_su.cpp

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
@@ -60,7 +60,7 @@ ACC_SU::ACC_SU(std::shared_ptr<Module> module_, std::shared_ptr<ProfileManager>
         {291, nullptr, "ProxyProcedureForFloatingRegistrationWithNintendoAccount"},
         {299, nullptr, "SuspendBackgroundDaemon"},
         {400, nullptr, "SetPinCode"}, // 18.0.0+
-        {401, &ACC_SU::GetPinCodeLength, "GetPinCodeLength"}, // 18.0.0+
+        {401, nullptr, "GetPinCodeLength"}, // 18.0.0+
         {402, nullptr, "GetPinCode"}, // 18.0.0+
         {410, nullptr, "GetPinCodeErrorCount"}, // 18.0.0+
         {411, nullptr, "ResetPinCodeErrorCount"}, // 18.0.0+

src/core/hle/service/acc/acc_u1.cpp

@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
@@ -43,7 +40,7 @@ ACC_U1::ACC_U1(std::shared_ptr<Module> module_, std::shared_ptr<ProfileManager>
         {152, nullptr, "LoadSignedDeviceIdentifierCacheForNintendoAccount"},
         {190, nullptr, "GetUserLastOpenedApplication"},
         {191, nullptr, "ActivateOpenContextHolder"},
-        {401, &ACC_U1::GetPinCodeLength, "GetPinCodeLength"}, // 18.0.0+
+        {401, nullptr, "GetPinCodeLength"}, // 18.0.0+
         {402, nullptr, "GetPinCode"}, // 18.0.0+
         {997, nullptr, "DebugInvalidateTokenCacheForUser"},
         {998, nullptr, "DebugSetUserStateClose"},

src/core/hle/service/am/frontend/applet_web_browser.cpp

@@ -317,12 +317,14 @@ void WebBrowser::Execute() {
         return;
     }
 
+#ifndef ANDROID
     if (Settings::values.disable_web_applet) {
         LOG_WARNING(Service_AM, "(STUBBED) called, Web Browser Applet is disabled. shim_kind={}",
                     web_arg_header.shim_kind);
         WebBrowserExit(WebExitReason::EndButtonPressed);
         return;
     }
+#endif
 
     switch (web_arg_header.shim_kind) {
     case ShimKind::Shop:

src/core/hle/service/am/service/application_creator.cpp

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
@@ -92,7 +92,7 @@ Result IApplicationCreator::CreateSystemApplication(
     std::unique_ptr<Loader::AppLoader> loader;
 
     auto process =
-        CreateProcess(system, application_id, 1, 22);
+        CreateProcess(system, application_id, 1, 21);
     R_UNLESS(process != nullptr, ResultUnknown);
 
     const auto applet = std::make_shared<Applet>(system, std::move(process), true);

src/core/hle/service/am/service/common_state_getter.cpp

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
@@ -75,8 +75,7 @@ ICommonStateGetter::ICommonStateGetter(Core::System& system_, std::shared_ptr<Ap
         {502, nullptr, "IsSleepEnabled"},
         {503, nullptr, "IsDisablingSleepSuppressed"},
         {600, nullptr, "Unknown600"}, //20.0.0+
-        {610, D<&ICommonStateGetter::Unknown610>, "Unknown610"}, //21.0.0+
-        {611, D<&ICommonStateGetter::Unknown611>, "Unknown611"}, //22.0.0+
+        {610, nullptr, "Unknown610"}, //21.0.0+
         {900, D<&ICommonStateGetter::SetRequestExitToLibraryAppletAtExecuteNextProgramEnabled>, "SetRequestExitToLibraryAppletAtExecuteNextProgramEnabled"}, //11.0.0+
         {910, nullptr, "GetLaunchRequiredTick"}, //17.0.0+
         {1000, nullptr, "BeginVrMode3d"}, //19.0.0+
@@ -363,14 +362,4 @@ Result ICommonStateGetter::SetHandlingHomeButtonShortPressedEnabled(bool enabled
     R_SUCCEED();
 }
 
-Result ICommonStateGetter::Unknown610() {
-    LOG_WARNING(Service_AM, "(STUBBED) called");
-    R_SUCCEED();
-}
-
-Result ICommonStateGetter::Unknown611() {
-    LOG_WARNING(Service_AM, "(STUBBED) called");
-    R_SUCCEED();
-}
-
 } // namespace Service::AM

src/core/hle/service/am/service/common_state_getter.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
@@ -63,8 +63,6 @@ private:
     Result SetRequestExitToLibraryAppletAtExecuteNextProgramEnabled();
     Result PushToGeneralChannel(SharedPointer<IStorage> storage); // cmd 20
     Result SetHandlingHomeButtonShortPressedEnabled(bool enabled);
-    Result Unknown610();
-    Result Unknown611();
 
     void SetCpuBoostMode(HLERequestContext& ctx);
 

src/core/hle/service/am/service/library_applet_accessor.cpp

@@ -78,7 +78,6 @@ ILibraryAppletAccessor::ILibraryAppletAccessor(Core::System& system_,
         {120, nullptr, "GetLibraryAppletInfo"},
         {150, nullptr, "RequestForAppletToGetForeground"},
         {160, D<&ILibraryAppletAccessor::GetIndirectLayerConsumerHandle>, "GetIndirectLayerConsumerHandle"}, //2.0.0+
-        {170, D<&ILibraryAppletAccessor::Unknown170>, "Unknown170"}, //22.0.0+
     };
     // clang-format on
 
@@ -218,12 +217,6 @@ Result ILibraryAppletAccessor::GetIndirectLayerConsumerHandle(Out<u64> out_handl
     R_SUCCEED();
 }
 
-Result ILibraryAppletAccessor::Unknown170(OutCopyHandle<Kernel::KReadableEvent> out_event) {
-    LOG_WARNING(Service_AM, "(STUBBED) called");
-    *out_event = m_applet->unknown_event.GetHandle();
-    R_SUCCEED();
-}
-
 void ILibraryAppletAccessor::FrontendExecute() {
     if (m_applet->frontend) {
         m_applet->frontend->Initialize();

src/core/hle/service/am/service/library_applet_accessor.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
@@ -37,7 +37,6 @@ private:
     Result GetPopOutDataEvent(OutCopyHandle<Kernel::KReadableEvent> out_event);
     Result GetPopInteractiveOutDataEvent(OutCopyHandle<Kernel::KReadableEvent> out_event);
     Result GetIndirectLayerConsumerHandle(Out<u64> out_handle);
-    Result Unknown170(OutCopyHandle<Kernel::KReadableEvent> out_event);
 
     void FrontendExecute();
     void FrontendExecuteInteractive();

src/core/hle/service/am/service/library_applet_creator.cpp

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
@@ -118,10 +118,9 @@ std::shared_ptr<ILibraryAppletAccessor> CreateGuestApplet(Core::System& system,
         Firmware1900 = 19,
         Firmware2000 = 20,
         Firmware2100 = 21,
-        Firmware2200 = 22,
     };
 
-    auto process = CreateProcess(system, program_id, Firmware1400, Firmware2200);
+    auto process = CreateProcess(system, program_id, Firmware1400, Firmware2100);
     if (!process) {
         // Couldn't initialize the guest process
         return {};

src/core/hle/service/dmnt/cheat_interface.cpp

@@ -1,238 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#include "core/hle/service/cmif_serialization.h"
-#include "core/hle/service/dmnt/cheat_interface.h"
-#include "core/hle/service/dmnt/cheat_process_manager.h"
-#include "core/hle/service/dmnt/dmnt_results.h"
-#include "core/hle/service/dmnt/dmnt_types.h"
-
-namespace Service::DMNT {
-ICheatInterface::ICheatInterface(Core::System& system_, CheatProcessManager& manager)
-    : ServiceFramework{system_, "dmnt:cht"}, cheat_process_manager{manager} {
-    // clang-format off
-        static const FunctionInfo functions[] = {
-            {65000, C<&ICheatInterface::HasCheatProcess>, "HasCheatProcess"},
-            {65001, C<&ICheatInterface::GetCheatProcessEvent>, "GetCheatProcessEvent"},
-            {65002, C<&ICheatInterface::GetCheatProcessMetadata>, "GetCheatProcessMetadata"},
-            {65003, C<&ICheatInterface::ForceOpenCheatProcess>, "ForceOpenCheatProcess"},
-            {65004, C<&ICheatInterface::PauseCheatProcess>, "PauseCheatProcess"},
-            {65005, C<&ICheatInterface::ResumeCheatProcess>, "ResumeCheatProcess"},
-            {65006, C<&ICheatInterface::ForceCloseCheatProcess>, "ForceCloseCheatProcess"},
-            {65100, C<&ICheatInterface::GetCheatProcessMappingCount>, "GetCheatProcessMappingCount"},
-            {65101, C<&ICheatInterface::GetCheatProcessMappings>, "GetCheatProcessMappings"},
-            {65102, C<&ICheatInterface::ReadCheatProcessMemory>, "ReadCheatProcessMemory"},
-            {65103, C<&ICheatInterface::WriteCheatProcessMemory>, "WriteCheatProcessMemory"},
-            {65104, C<&ICheatInterface::QueryCheatProcessMemory>, "QueryCheatProcessMemory"},
-            {65200, C<&ICheatInterface::GetCheatCount>, "GetCheatCount"},
-            {65201, C<&ICheatInterface::GetCheats>, "GetCheats"},
-            {65202, C<&ICheatInterface::GetCheatById>, "GetCheatById"},
-            {65203, C<&ICheatInterface::ToggleCheat>, "ToggleCheat"},
-            {65204, C<&ICheatInterface::AddCheat>, "AddCheat"},
-            {65205, C<&ICheatInterface::RemoveCheat>, "RemoveCheat"},
-            {65206, C<&ICheatInterface::ReadStaticRegister>, "ReadStaticRegister"},
-            {65207, C<&ICheatInterface::WriteStaticRegister>, "WriteStaticRegister"},
-            {65208, C<&ICheatInterface::ResetStaticRegisters>, "ResetStaticRegisters"},
-            {65209, C<&ICheatInterface::SetMasterCheat>, "SetMasterCheat"},
-            {65300, C<&ICheatInterface::GetFrozenAddressCount>, "GetFrozenAddressCount"},
-            {65301, C<&ICheatInterface::GetFrozenAddresses>, "GetFrozenAddresses"},
-            {65302, C<&ICheatInterface::GetFrozenAddress>, "GetFrozenAddress"},
-            {65303, C<&ICheatInterface::EnableFrozenAddress>, "EnableFrozenAddress"},
-            {65304, C<&ICheatInterface::DisableFrozenAddress>, "DisableFrozenAddress"},
-        };
-    // clang-format on
-
-    RegisterHandlers(functions);
-}
-
-ICheatInterface::~ICheatInterface() = default;
-
-Result ICheatInterface::HasCheatProcess(Out<bool> out_has_cheat) {
-    LOG_INFO(CheatEngine, "called");
-    *out_has_cheat = cheat_process_manager.HasCheatProcess();
-    R_SUCCEED();
-}
-
-Result ICheatInterface::GetCheatProcessEvent(OutCopyHandle<Kernel::KReadableEvent> out_event) {
-    LOG_INFO(CheatEngine, "called");
-    *out_event = &cheat_process_manager.GetCheatProcessEvent();
-    R_SUCCEED();
-}
-
-Result ICheatInterface::GetCheatProcessMetadata(Out<CheatProcessMetadata> out_metadata) {
-    LOG_INFO(CheatEngine, "called");
-    R_RETURN(cheat_process_manager.GetCheatProcessMetadata(*out_metadata));
-}
-
-Result ICheatInterface::ForceOpenCheatProcess() {
-    LOG_INFO(CheatEngine, "called");
-    R_UNLESS(R_SUCCEEDED(cheat_process_manager.ForceOpenCheatProcess()), ResultCheatNotAttached);
-    R_SUCCEED();
-}
-
-Result ICheatInterface::PauseCheatProcess() {
-    LOG_INFO(CheatEngine, "called");
-    R_RETURN(cheat_process_manager.PauseCheatProcess());
-}
-
-Result ICheatInterface::ResumeCheatProcess() {
-    LOG_INFO(CheatEngine, "called");
-    R_RETURN(cheat_process_manager.ResumeCheatProcess());
-}
-
-Result ICheatInterface::ForceCloseCheatProcess() {
-    LOG_WARNING(CheatEngine, "(STUBBED) called");
-    R_RETURN(cheat_process_manager.ForceCloseCheatProcess());
-}
-
-Result ICheatInterface::GetCheatProcessMappingCount(Out<u64> out_count) {
-    LOG_WARNING(CheatEngine, "(STUBBED) called");
-    R_RETURN(cheat_process_manager.GetCheatProcessMappingCount(*out_count));
-}
-
-Result ICheatInterface::GetCheatProcessMappings(
-    Out<u64> out_count, u64 offset,
-    OutArray<Kernel::Svc::MemoryInfo, BufferAttr_HipcMapAlias> out_mappings) {
-    LOG_INFO(CheatEngine, "called, offset={}", offset);
-    R_UNLESS(!out_mappings.empty(), ResultCheatNullBuffer);
-    R_RETURN(cheat_process_manager.GetCheatProcessMappings(*out_count, offset, out_mappings));
-}
-
-Result ICheatInterface::ReadCheatProcessMemory(u64 address, u64 size,
-                                               OutBuffer<BufferAttr_HipcMapAlias> out_buffer) {
-    LOG_DEBUG(CheatEngine, "called, address={}, size={}", address, size);
-    R_UNLESS(!out_buffer.empty(), ResultCheatNullBuffer);
-    R_RETURN(cheat_process_manager.ReadCheatProcessMemory(address, size, out_buffer));
-}
-
-Result ICheatInterface::WriteCheatProcessMemory(u64 address, u64 size,
-                                                InBuffer<BufferAttr_HipcMapAlias> buffer) {
-    LOG_DEBUG(CheatEngine, "called, address={}, size={}", address, size);
-    R_UNLESS(!buffer.empty(), ResultCheatNullBuffer);
-    R_RETURN(cheat_process_manager.WriteCheatProcessMemory(address, size, buffer));
-}
-
-Result ICheatInterface::QueryCheatProcessMemory(Out<Kernel::Svc::MemoryInfo> out_mapping,
-                                                u64 address) {
-    LOG_WARNING(CheatEngine, "(STUBBED) called, address={}", address);
-    R_RETURN(cheat_process_manager.QueryCheatProcessMemory(out_mapping, address));
-}
-
-Result ICheatInterface::GetCheatCount(Out<u64> out_count) {
-    LOG_INFO(CheatEngine, "called");
-    R_RETURN(cheat_process_manager.GetCheatCount(*out_count));
-}
-
-Result ICheatInterface::GetCheats(Out<u64> out_count, u64 offset,
-                                  OutArray<CheatEntry, BufferAttr_HipcMapAlias> out_cheats) {
-    LOG_INFO(CheatEngine, "called, offset={}", offset);
-    R_UNLESS(!out_cheats.empty(), ResultCheatNullBuffer);
-    R_RETURN(cheat_process_manager.GetCheats(*out_count, offset, out_cheats));
-}
-
-Result ICheatInterface::GetCheatById(OutLargeData<CheatEntry, BufferAttr_HipcMapAlias> out_cheat,
-                                     u32 cheat_id) {
-    LOG_INFO(CheatEngine, "called, cheat_id={}", cheat_id);
-    R_RETURN(cheat_process_manager.GetCheatById(out_cheat, cheat_id));
-}
-
-Result ICheatInterface::ToggleCheat(u32 cheat_id) {
-    LOG_INFO(CheatEngine, "called, cheat_id={}", cheat_id);
-    R_RETURN(cheat_process_manager.ToggleCheat(cheat_id));
-}
-
-Result ICheatInterface::AddCheat(
-    Out<u32> out_cheat_id, bool is_enabled,
-    InLargeData<CheatDefinition, BufferAttr_HipcMapAlias> cheat_definition) {
-    LOG_INFO(CheatEngine, "called, is_enabled={}", is_enabled);
-    R_RETURN(cheat_process_manager.AddCheat(*out_cheat_id, is_enabled, *cheat_definition));
-}
-
-Result ICheatInterface::RemoveCheat(u32 cheat_id) {
-    LOG_INFO(CheatEngine, "called, cheat_id={}", cheat_id);
-    R_RETURN(cheat_process_manager.RemoveCheat(cheat_id));
-}
-
-Result ICheatInterface::ReadStaticRegister(Out<u64> out_value, u8 register_index) {
-    LOG_DEBUG(CheatEngine, "called, register_index={}", register_index);
-    R_RETURN(cheat_process_manager.ReadStaticRegister(*out_value, register_index));
-}
-
-Result ICheatInterface::WriteStaticRegister(u8 register_index, u64 value) {
-    LOG_DEBUG(CheatEngine, "called, register_index={}, value={}", register_index, value);
-    R_RETURN(cheat_process_manager.WriteStaticRegister(register_index, value));
-}
-
-Result ICheatInterface::ResetStaticRegisters() {
-    LOG_INFO(CheatEngine, "called");
-    R_RETURN(cheat_process_manager.ResetStaticRegisters());
-}
-
-Result ICheatInterface::SetMasterCheat(
-    InLargeData<CheatDefinition, BufferAttr_HipcMapAlias> cheat_definition) {
-    LOG_INFO(CheatEngine, "called, name={}, num_opcodes={}", cheat_definition->readable_name.data(),
-             cheat_definition->num_opcodes);
-    R_RETURN(cheat_process_manager.SetMasterCheat(*cheat_definition));
-}
-
-Result ICheatInterface::GetFrozenAddressCount(Out<u64> out_count) {
-    LOG_INFO(CheatEngine, "called");
-    R_RETURN(cheat_process_manager.GetFrozenAddressCount(*out_count));
-}
-
-Result ICheatInterface::GetFrozenAddresses(
-    Out<u64> out_count, u64 offset,
-    OutArray<FrozenAddressEntry, BufferAttr_HipcMapAlias> out_frozen_address) {
-    LOG_INFO(CheatEngine, "called, offset={}", offset);
-    R_UNLESS(!out_frozen_address.empty(), ResultCheatNullBuffer);
-    R_RETURN(cheat_process_manager.GetFrozenAddresses(*out_count, offset, out_frozen_address));
-}
-
-Result ICheatInterface::GetFrozenAddress(Out<FrozenAddressEntry> out_frozen_address_entry,
-                                         u64 address) {
-    LOG_INFO(CheatEngine, "called, address={}", address);
-    R_RETURN(cheat_process_manager.GetFrozenAddress(*out_frozen_address_entry, address));
-}
-
-Result ICheatInterface::EnableFrozenAddress(Out<u64> out_value, u64 address, u64 width) {
-    LOG_INFO(CheatEngine, "called, address={}, width={}", address, width);
-    R_UNLESS(width > 0, ResultFrozenAddressInvalidWidth);
-    R_UNLESS(width <= sizeof(u64), ResultFrozenAddressInvalidWidth);
-    R_UNLESS((width & (width - 1)) == 0, ResultFrozenAddressInvalidWidth);
-    R_RETURN(cheat_process_manager.EnableFrozenAddress(*out_value, address, width));
-}
-
-Result ICheatInterface::DisableFrozenAddress(u64 address) {
-    LOG_INFO(CheatEngine, "called, address={}", address);
-    R_RETURN(cheat_process_manager.DisableFrozenAddress(address));
-}
-
-void ICheatInterface::InitializeCheatManager() {
-    LOG_INFO(CheatEngine, "called");
-}
-
-Result ICheatInterface::ReadCheatProcessMemoryUnsafe(u64 process_addr, std::span<u8> out_data,
-                                                     size_t size) {
-    LOG_DEBUG(CheatEngine, "called, process_addr={}, size={}", process_addr, size);
-    R_RETURN(cheat_process_manager.ReadCheatProcessMemoryUnsafe(process_addr, &out_data, size));
-}
-
-Result ICheatInterface::WriteCheatProcessMemoryUnsafe(u64 process_addr, std::span<const u8> data,
-                                                      size_t size) {
-    LOG_DEBUG(CheatEngine, "called, process_addr={}, size={}", process_addr, size);
-    R_RETURN(cheat_process_manager.WriteCheatProcessMemoryUnsafe(process_addr, &data, size));
-}
-
-Result ICheatInterface::PauseCheatProcessUnsafe() {
-    LOG_INFO(CheatEngine, "called");
-    R_RETURN(cheat_process_manager.PauseCheatProcessUnsafe());
-}
-
-Result ICheatInterface::ResumeCheatProcessUnsafe() {
-    LOG_INFO(CheatEngine, "called");
-    R_RETURN(cheat_process_manager.ResumeCheatProcessUnsafe());
-}
-} // namespace Service::DMNT

src/core/hle/service/dmnt/cheat_interface.h

@@ -1,88 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#include "core/hle/service/cmif_types.h"
-#include "core/hle/service/kernel_helpers.h"
-#include "core/hle/service/service.h"
-
-namespace Core {
-class System;
-}
-
-namespace Kernel {
-class KEvent;
-class KReadableEvent;
-} // namespace Kernel
-
-namespace Kernel::Svc {
-struct MemoryInfo;
-}
-
-namespace Service::DMNT {
-struct CheatDefinition;
-struct CheatEntry;
-struct CheatProcessMetadata;
-struct FrozenAddressEntry;
-class CheatProcessManager;
-
-class ICheatInterface final : public ServiceFramework<ICheatInterface> {
-public:
-    explicit ICheatInterface(Core::System& system_, CheatProcessManager& manager);
-    ~ICheatInterface() override;
-
-private:
-    Result HasCheatProcess(Out<bool> out_has_cheat);
-    Result GetCheatProcessEvent(OutCopyHandle<Kernel::KReadableEvent> out_event);
-    Result GetCheatProcessMetadata(Out<CheatProcessMetadata> out_metadata);
-    Result ForceOpenCheatProcess();
-    Result PauseCheatProcess();
-    Result ResumeCheatProcess();
-    Result ForceCloseCheatProcess();
-
-    Result GetCheatProcessMappingCount(Out<u64> out_count);
-    Result GetCheatProcessMappings(
-        Out<u64> out_count, u64 offset,
-        OutArray<Kernel::Svc::MemoryInfo, BufferAttr_HipcMapAlias> out_mappings);
-    Result ReadCheatProcessMemory(u64 address, u64 size,
-                                  OutBuffer<BufferAttr_HipcMapAlias> out_buffer);
-    Result WriteCheatProcessMemory(u64 address, u64 size, InBuffer<BufferAttr_HipcMapAlias> buffer);
-
-    Result QueryCheatProcessMemory(Out<Kernel::Svc::MemoryInfo> out_mapping, u64 address);
-    Result GetCheatCount(Out<u64> out_count);
-    Result GetCheats(Out<u64> out_count, u64 offset,
-                     OutArray<CheatEntry, BufferAttr_HipcMapAlias> out_cheats);
-    Result GetCheatById(OutLargeData<CheatEntry, BufferAttr_HipcMapAlias> out_cheat, u32 cheat_id);
-    Result ToggleCheat(u32 cheat_id);
-
-    Result AddCheat(Out<u32> out_cheat_id, bool enabled,
-                    InLargeData<CheatDefinition, BufferAttr_HipcMapAlias> cheat_definition);
-    Result RemoveCheat(u32 cheat_id);
-    Result ReadStaticRegister(Out<u64> out_value, u8 register_index);
-    Result WriteStaticRegister(u8 register_index, u64 value);
-    Result ResetStaticRegisters();
-    Result SetMasterCheat(InLargeData<CheatDefinition, BufferAttr_HipcMapAlias> cheat_definition);
-    Result GetFrozenAddressCount(Out<u64> out_count);
-    Result GetFrozenAddresses(
-        Out<u64> out_count, u64 offset,
-        OutArray<FrozenAddressEntry, BufferAttr_HipcMapAlias> out_frozen_address);
-    Result GetFrozenAddress(Out<FrozenAddressEntry> out_frozen_address_entry, u64 address);
-    Result EnableFrozenAddress(Out<u64> out_value, u64 address, u64 width);
-    Result DisableFrozenAddress(u64 address);
-
-private:
-    void InitializeCheatManager();
-
-    Result ReadCheatProcessMemoryUnsafe(u64 process_addr, std::span<u8> out_data, size_t size);
-    Result WriteCheatProcessMemoryUnsafe(u64 process_addr, std::span<const u8> data, size_t size);
-
-    Result PauseCheatProcessUnsafe();
-    Result ResumeCheatProcessUnsafe();
-
-    CheatProcessManager& cheat_process_manager;
-};
-} // namespace Service::DMNT

src/core/hle/service/dmnt/cheat_parser.cpp

@@ -1,121 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#include <algorithm>
-#include <cctype>
-#include <cstring>
-#include <optional>
-#include <string>
-
-#include "core/hle/service/dmnt/cheat_parser.h"
-
-#include "core/hle/service/dmnt/dmnt_types.h"
-
-namespace Service::DMNT {
-CheatParser::CheatParser() {}
-
-CheatParser::~CheatParser() = default;
-
-std::vector<CheatEntry> CheatParser::Parse(std::string_view data) const {
-    std::vector<CheatEntry> out(1);
-    std::optional<u64> current_entry;
-
-    for (std::size_t i = 0; i < data.size(); ++i) {
-        if (std::isspace(data[i])) {
-            continue;
-        }
-
-        if (data[i] == '{') {
-            current_entry = 0;
-
-            if (out[*current_entry].definition.num_opcodes > 0) {
-                return {};
-            }
-
-            std::size_t name_size{};
-            const auto name = ExtractName(name_size, data, i + 1, '}');
-            if (name.empty()) {
-                return {};
-            }
-
-            std::memcpy(out[*current_entry].definition.readable_name.data(), name.data(),
-                        std::min<std::size_t>(out[*current_entry].definition.readable_name.size(),
-                                              name.size()));
-            out[*current_entry]
-                .definition.readable_name[out[*current_entry].definition.readable_name.size() - 1] =
-                '\0';
-
-            i += name_size + 1;
-        } else if (data[i] == '[') {
-            current_entry = out.size();
-            out.emplace_back();
-
-            std::size_t name_size{};
-            const auto name = ExtractName(name_size, data, i + 1, ']');
-            if (name.empty()) {
-                return {};
-            }
-
-            std::memcpy(out[*current_entry].definition.readable_name.data(), name.data(),
-                        std::min<std::size_t>(out[*current_entry].definition.readable_name.size(),
-                                              name.size()));
-            out[*current_entry]
-                .definition.readable_name[out[*current_entry].definition.readable_name.size() - 1] =
-                '\0';
-
-            i += name_size + 1;
-        } else if (std::isxdigit(data[i])) {
-            if (!current_entry || out[*current_entry].definition.num_opcodes >=
-                                      out[*current_entry].definition.opcodes.size()) {
-                return {};
-            }
-
-            const auto hex = std::string(data.substr(i, 8));
-            if (!std::all_of(hex.begin(), hex.end(), ::isxdigit)) {
-                return {};
-            }
-
-            const auto value = static_cast<u32>(std::strtoul(hex.c_str(), nullptr, 0x10));
-            out[*current_entry].definition.opcodes[out[*current_entry].definition.num_opcodes++] =
-                value;
-
-            i += 7; // 7 because the for loop will increment by 1 more
-        } else {
-            return {};
-        }
-    }
-
-    out[0].enabled = out[0].definition.num_opcodes > 0;
-    out[0].cheat_id = 0;
-
-    for (u32 i = 1; i < out.size(); ++i) {
-        out[i].enabled = out[i].definition.num_opcodes > 0;
-        out[i].cheat_id = i;
-    }
-
-    return out;
-}
-
-std::string_view CheatParser::ExtractName(std::size_t& out_name_size, std::string_view data,
-                                          std::size_t start_index, char match) const {
-    auto end_index = start_index;
-    while (data[end_index] != match) {
-        ++end_index;
-        if (end_index > data.size()) {
-            return {};
-        }
-    }
-
-    out_name_size = end_index - start_index;
-
-    // Clamp name if it's too big
-    if (out_name_size > sizeof(CheatDefinition::readable_name)) {
-        end_index = start_index + sizeof(CheatDefinition::readable_name);
-    }
-
-    return data.substr(start_index, end_index - start_index);
-}
-} // namespace Service::DMNT