[chore] fix build errors

Signed-off-by: Caio Oliveira <caiooliveirafarias0@gmail.com>
[core] pin core threads to logical CPUs 0-3
2025-12-17 21:46:22 -03:00 · 2025-12-17 21:23:30 -03:00
37 changed files with 2183 additions and 3564 deletions
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/AddonAdapter.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/AddonAdapter.kt
@@ -6,15 +6,10 @@

 package org.yuzu.yuzu_emu.adapters

-import android.view.Gravity
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
-import androidx.constraintlayout.widget.ConstraintLayout
-import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.databinding.ListItemAddonBinding
 import org.yuzu.yuzu_emu.model.Patch
-import org.yuzu.yuzu_emu.model.PatchType
 import org.yuzu.yuzu_emu.model.AddonViewModel
 import org.yuzu.yuzu_emu.viewholder.AbstractViewHolder

@@ -32,95 +27,18 @@ class AddonAdapter(val addonViewModel: AddonViewModel) :
                binding.addonSwitch.performClick()
            }
            binding.title.text = model.name
-
-            binding.addonSwitch.setOnCheckedChangeListener(null)
+            binding.version.text = model.version
            binding.addonSwitch.isChecked = model.enabled
+
            binding.addonSwitch.setOnCheckedChangeListener { _, checked ->
                model.enabled = checked
            }

-            val isCheat = model.isCheat()
-            val indentPx = if (isCheat) {
-                binding.root.context.resources.getDimensionPixelSize(R.dimen.spacing_large)
-            } else {
-                0
-            }
-            (binding.addonCard.layoutParams as? ViewGroup.MarginLayoutParams)?.let {
-                it.marginStart = indentPx
-                binding.addonCard.layoutParams = it
-            }
-
-            if (isCheat) {
-                binding.version.visibility = View.GONE
-                binding.deleteCard.visibility = View.GONE
-                binding.buttonDelete.visibility = View.GONE
-
-                binding.addonSwitch.scaleX = 0.7f
-                binding.addonSwitch.scaleY = 0.7f
-
-                val compactPaddingVertical = binding.root.context.resources.getDimensionPixelSize(R.dimen.spacing_small)
-                binding.root.setPadding(
-                    binding.root.paddingLeft,
-                    compactPaddingVertical / 2,
-                    binding.root.paddingRight,
-                    compactPaddingVertical / 2
-                )
-
-                val innerLayout = binding.addonCard.getChildAt(0) as? ViewGroup
-                innerLayout?.let {
-                    val leftPadding = binding.root.context.resources.getDimensionPixelSize(R.dimen.spacing_large)
-                    val smallPadding = binding.root.context.resources.getDimensionPixelSize(R.dimen.spacing_med)
-                    it.setPadding(leftPadding, smallPadding, smallPadding, smallPadding)
-                }
-
-                binding.title.textSize = 14f
-                binding.title.gravity = Gravity.CENTER_VERTICAL
-
-                (binding.title.layoutParams as? ConstraintLayout.LayoutParams)?.let { params ->
-                    params.topToTop = ConstraintLayout.LayoutParams.PARENT_ID
-                    params.bottomToBottom = ConstraintLayout.LayoutParams.PARENT_ID
-                    params.topMargin = 0
-                    binding.title.layoutParams = params
-                }
-            } else {
-                binding.version.visibility = View.VISIBLE
-                binding.version.text = model.version
-                binding.deleteCard.visibility = View.VISIBLE
-                binding.buttonDelete.visibility = View.VISIBLE
-
-                binding.addonSwitch.scaleX = 1.0f
-                binding.addonSwitch.scaleY = 1.0f
-
-                val normalPadding = binding.root.context.resources.getDimensionPixelSize(R.dimen.spacing_med)
-                binding.root.setPadding(
-                    binding.root.paddingLeft,
-                    normalPadding,
-                    binding.root.paddingRight,
-                    normalPadding
-                )
-
-                val innerLayout = binding.addonCard.getChildAt(0) as? ViewGroup
-                innerLayout?.let {
-                    val normalInnerPadding = binding.root.context.resources.getDimensionPixelSize(R.dimen.spacing_medlarge)
-                    it.setPadding(normalInnerPadding, normalInnerPadding, normalInnerPadding, normalInnerPadding)
-                }
-
-                binding.title.textSize = 16f
-                binding.title.gravity = Gravity.START
-
-                (binding.title.layoutParams as? ConstraintLayout.LayoutParams)?.let { params ->
-                    params.topToTop = ConstraintLayout.LayoutParams.PARENT_ID
-                    params.bottomToBottom = ConstraintLayout.LayoutParams.UNSET
-                    params.topMargin = 0
-                    binding.title.layoutParams = params
-                }
-
-                val deleteAction = {
-                    addonViewModel.setAddonToDelete(model)
-                }
-                binding.deleteCard.setOnClickListener { deleteAction() }
-                binding.buttonDelete.setOnClickListener { deleteAction() }
+            val deleteAction = {
+                addonViewModel.setAddonToDelete(model)
            }
+            binding.deleteCard.setOnClickListener { deleteAction() }
+            binding.buttonDelete.setOnClickListener { deleteAction() }
        }
    }
 }
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AddonsFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AddonsFragment.kt
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 package org.yuzu.yuzu_emu.fragments
@@ -73,7 +73,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,
@@ -127,9 +127,7 @@ class AddonsFragment : Fragment() {

    override fun onDestroy() {
        super.onDestroy()
-        if (!requireActivity().isChangingConfigurations) {
-            addonViewModel.onCloseAddons()
-        }
+        addonViewModel.onCloseAddons()
    }

    val installAddon =
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/AddonViewModel.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/AddonViewModel.kt
@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@@ -31,14 +28,10 @@ class AddonViewModel : ViewModel() {
    val addonToDelete = _addonToDelete.asStateFlow()

    var game: Game? = null
-        private set

    private val isRefreshing = AtomicBoolean(false)

    fun onOpenAddons(game: Game) {
-        if (this.game?.programId == game.programId && _patchList.value.isNotEmpty()) {
-            return
-        }
        this.game = game
        refreshAddons()
    }
@@ -54,7 +47,8 @@ class AddonViewModel : ViewModel() {
                    NativeLibrary.getPatchesForFile(game!!.path, game!!.programId)
                        ?: emptyArray()
                    ).toMutableList()
-                _patchList.value = sortPatchesWithCheatsGrouped(patchList)
+                patchList.sortBy { it.name }
+                _patchList.value = patchList
                isRefreshing.set(false)
            }
        }
@@ -69,9 +63,7 @@ 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 -> {}
        }
-        _patchList.value.clear()
        refreshAddons()
    }

@@ -86,7 +78,7 @@ class AddonViewModel : ViewModel() {
                if (it.enabled) {
                    null
                } else {
-                    it.getStorageKey()
+                    it.name
                }
            }.toTypedArray()
        )
@@ -102,28 +94,4 @@ class AddonViewModel : ViewModel() {
    fun showModNoticeDialog(show: Boolean) {
        _showModNoticeDialog.value = show
    }
-
-    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
-    }
 }
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/Patch.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/Patch.kt
@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@@ -15,24 +12,5 @@ data class Patch(
    val version: String,
    val type: Int,
    val programId: String,
-    val titleId: String,
-    val parentName: String = ""  // For cheats: name of the mod folder containing them
-) {
-    /**
-     * 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()
-}
+    val titleId: String
+)
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/PatchType.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/PatchType.kt
@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
--- a/src/android/app/src/main/jni/native.cpp
+++ b/src/android/app/src/main/jni/native.cpp
@@ -1298,10 +1298,7 @@ jobjectArray Java_org_yuzu_yuzu_1emu_NativeLibrary_getPatchesForFile(JNIEnv* env
    FileSys::VirtualFile update_raw;
    loader->ReadUpdateRaw(update_raw);

-    // Get build ID for individual cheat enumeration
-    const auto build_id = pm.GetBuildID(update_raw);
-
-    auto patches = pm.GetPatches(update_raw, build_id);
+    auto patches = pm.GetPatches(update_raw);
    jobjectArray jpatchArray =
        env->NewObjectArray(patches.size(), Common::Android::GetPatchClass(), nullptr);
    int i = 0;
@@ -1311,8 +1308,7 @@ jobjectArray Java_org_yuzu_yuzu_1emu_NativeLibrary_getPatchesForFile(JNIEnv* env
            Common::Android::ToJString(env, patch.name),
            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)),
-            Common::Android::ToJString(env, patch.parent_name));
+            Common::Android::ToJString(env, std::to_string(patch.title_id)));
        env->SetObjectArrayElement(jpatchArray, i, jpatch);
        ++i;
    }
--- a/src/common/android/id_cache.cpp
+++ b/src/common/android/id_cache.cpp
@@ -515,7 +515,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;Ljava/lang/String;)V");
+                "(ZLjava/lang/String;Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;)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;");
--- a/src/common/thread.cpp
+++ b/src/common/thread.cpp
@@ -5,9 +5,11 @@
 // SPDX-License-Identifier: GPL-2.0-or-later

 #include <string>
+#include <thread>

 #include "common/error.h"
 #include "common/logging/log.h"
+#include "common/assert.h"
 #include "common/thread.h"
 #ifdef __APPLE__
 #include <mach/mach.h>
@@ -18,6 +20,8 @@
 #include "common/string_util.h"
 #else
 #if defined(__Bitrig__) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__OpenBSD__)
+#include <sys/cpuset.h>
+#include <sys/_cpuset.h>
 #include <pthread_np.h>
 #endif
 #include <pthread.h>
@@ -28,7 +32,7 @@
 #endif

 #ifdef __FreeBSD__
-#define cpu_set_t cpuset_t
+#   define cpu_set_t cpuset_t
 #endif

 namespace Common {
@@ -77,22 +81,14 @@ void SetCurrentThreadPriority(ThreadPriority new_priority) {
 #endif
 }

+void SetCurrentThreadName(const char* name) {
 #ifdef _MSC_VER
-
-// Sets the debugger-visible name of the current thread.
-void SetCurrentThreadName(const char* name) {
-    static auto pf = (decltype(&SetThreadDescription))(void*)GetProcAddress(GetModuleHandle(TEXT("KernelBase.dll")), "SetThreadDescription");
-    if (pf)
+    // Sets the debugger-visible name of the current thread.
+    if (auto pf = (decltype(&SetThreadDescription))(void*)GetProcAddress(GetModuleHandle(TEXT("KernelBase.dll")), "SetThreadDescription"); pf)
        pf(GetCurrentThread(), UTF8ToUTF16W(name).data()); // Windows 10+
-}
-
-#else // !MSVC_VER, so must be POSIX threads
-
-// MinGW with the POSIX threading model does not support pthread_setname_np
-void SetCurrentThreadName(const char* name) {
-    // See for reference
-    // https://gitlab.freedesktop.org/mesa/mesa/-/blame/main/src/util/u_thread.c?ref_type=heads#L75
-#ifdef __APPLE__
+    else
+        ; // No-op
+#elif  defined(__APPLE__)
    pthread_setname_np(name);
 #elif defined(__HAIKU__)
    rename_thread(find_thread(NULL), name);
@@ -112,13 +108,33 @@ void SetCurrentThreadName(const char* name) {
        pthread_setname_np(pthread_self(), buf);
    }
 #elif defined(_WIN32)
-    // mingw stub
+    // MinGW with the POSIX threading model does not support pthread_setname_np
+    // See for reference
+    // https://gitlab.freedesktop.org/mesa/mesa/-/blame/main/src/util/u_thread.c?ref_type=heads#L75
    (void)name;
 #else
    pthread_setname_np(pthread_self(), name);
 #endif
 }

+void PinCurrentThreadToPerformanceCore(size_t core_id) {
+    ASSERT(core_id < 4);
+    // If we set a flag for a CPU that doesn't exist, the thread may not be allowed to
+    // run in ANY processor!
+    auto const total_cores = std::thread::hardware_concurrency();
+    if (core_id < total_cores) {
+#if defined(__linux__) || defined(__FreeBSD__)
+        cpu_set_t set;
+        CPU_ZERO(&set);
+        CPU_SET(core_id, &set);
+        pthread_setaffinity_np(pthread_self(), sizeof(set), &set);
+#elif defined(_WIN32)
+        DWORD set = 1UL << core_id;
+        SetThreadAffinityMask(GetCurrentThread(), set);
+#else
+        // No pin functionality implemented
 #endif
+    }
+}

 } // namespace Common
--- a/src/common/thread.h
+++ b/src/common/thread.h
@@ -106,7 +106,7 @@ enum class ThreadPriority : u32 {
 };

 void SetCurrentThreadPriority(ThreadPriority new_priority);
-
 void SetCurrentThreadName(const char* name);
+void PinCurrentThreadToPerformanceCore(size_t core_id);

 } // namespace Common
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -611,18 +611,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
@@ -1157,6 +1145,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
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -52,12 +52,12 @@
 #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"
 #include "core/tools/renderdoc.h"
 #include "hid_core/hid_core.h"
-#include "hle/service/dmnt/cheat_process_manager.h"
 #include "network/network.h"
 #include "video_core/host1x/host1x.h"
 #include "video_core/renderer_base.h"
@@ -277,18 +277,9 @@ struct System::Impl {
        audio_core = std::make_unique<AudioCore::AudioCore>(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 =
            std::make_unique<Service::Services>(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;
@@ -352,6 +343,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);
@@ -419,6 +415,7 @@ struct System::Impl {
        services.reset();
        service_manager.reset();
        fs_controller.Reset();
+        cheat_engine.reset();
        core_timing.ClearPendingEvents();
        app_loader.reset();
        audio_core.reset();
@@ -494,6 +491,7 @@ struct System::Impl {
    bool nvdec_active{};

    Reporter reporter;
+    std::unique_ptr<Memory::CheatEngine> cheat_engine;
    std::unique_ptr<Tools::Freezer> memory_freezer;
    std::array<u8, 0x20> build_id{};

@@ -522,18 +520,6 @@ struct System::Impl {
    /// Debugger
    std::unique_ptr<Core::Debugger> debugger;

-    /// 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;
-
    SystemResultStatus status = SystemResultStatus::Success;
    std::string status_details = "";

@@ -569,61 +555,6 @@ struct System::Impl {
        general_channel_event = std::make_unique<Service::Event>(*general_channel_context);
        general_channel_initialized = true;
    }
-
-    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)} {}
@@ -869,61 +800,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 = std::make_unique<Memory::CheatEngine>(*this, list, build_id);
+    impl->cheat_engine->SetMainMemoryParameters(main_region_begin, main_region_size);
 }

 void System::SetFrontendAppletSet(Service::AM::Frontend::FrontendAppletSet&& set) {
@@ -1067,15 +948,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));
 }
--- a/src/core/core.h
+++ b/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 {
@@ -344,7 +339,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);

@@ -388,9 +383,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;

--- a/src/core/cpu_manager.cpp
+++ b/src/core/cpu_manager.cpp
@@ -7,6 +7,7 @@
 #include "common/fiber.h"
 #include "common/scope_exit.h"
 #include "common/thread.h"
+#include "common/settings.h"
 #include "core/core.h"
 #include "core/core_timing.h"
 #include "core/cpu_manager.h"
@@ -25,11 +26,8 @@ CpuManager::~CpuManager() = default;
 void CpuManager::Initialize() {
    num_cores = is_multicore ? Core::Hardware::NUM_CPU_CORES : 1;
    gpu_barrier = std::make_unique<Common::Barrier>(num_cores + 1);
-
-    for (std::size_t core = 0; core < num_cores; core++) {
-        core_data[core].host_thread =
-            std::jthread([this, core](std::stop_token token) { RunThread(token, core); });
-    }
+    for (std::size_t core = 0; core < num_cores; core++)
+        core_data[core].host_thread = std::jthread([this, core](std::stop_token token) { RunThread(token, core); });
 }

 void CpuManager::Shutdown() {
@@ -188,14 +186,10 @@ void CpuManager::ShutdownThread() {
 void CpuManager::RunThread(std::stop_token token, std::size_t core) {
    /// Initialization
    system.RegisterCoreThread(core);
-    std::string name;
-    if (is_multicore) {
-        name = "CPUCore_" + std::to_string(core);
-    } else {
-        name = "CPUThread";
-    }
+    std::string name = is_multicore ? ("CPUCore_" + std::to_string(core)) : std::string{"CPUThread"};
    Common::SetCurrentThreadName(name.c_str());
    Common::SetCurrentThreadPriority(Common::ThreadPriority::Critical);
+    Common::PinCurrentThreadToPerformanceCore(core);
    auto& data = core_data[core];
    data.host_context = Common::Fiber::ThreadToFiber();

--- a/src/core/file_sys/patch_manager.cpp
+++ b/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,35 +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) {
@@ -315,7 +316,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);
@@ -324,71 +325,36 @@ std::vector<Service::DMNT::CheatEntry> PatchManager::CreateCheatList(const Build

    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(); });

-    std::vector<Service::DMNT::CheatEntry> out;
-
-    // Load cheats from: <mod dir>/<folder>/cheats/<build_id>.txt
+    // <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
+    auto const patch_files = load_dir->GetFiles();
+    for (auto const& f : patch_files) {
+        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;
 }

@@ -515,53 +481,7 @@ 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_tid = GetUpdateTitleID(title_id);
-    const auto update = content_provider.GetEntry(update_tid, ContentRecordType::Program);
-
-    if (update != nullptr && 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 BuildID& build_id) const {
+std::vector<Patch> PatchManager::GetPatches(VirtualFile update_raw) const {
    if (title_id == 0) {
        return {};
    }
@@ -582,8 +502,7 @@ std::vector<Patch> PatchManager::GetPatches(VirtualFile update_raw, const BuildI
                          .version = "",
                          .type = PatchType::Update,
                          .program_id = title_id,
-                          .title_id = title_id,
-                          .parent_name = ""};
+                          .title_id = title_id};

    if (nacp != nullptr) {
        update_patch.version = nacp->GetVersionString();
@@ -603,15 +522,11 @@ std::vector<Patch> PatchManager::GetPatches(VirtualFile update_raw, const BuildI
        }
    }

-    // Check if we have a valid build_id for cheat enumeration
-    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);
    if (mod_dir != nullptr) {
        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)) {
@@ -640,12 +555,8 @@ std::vector<Patch> PatchManager::GetPatches(VirtualFile update_raw, const BuildI
            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 (types.empty())
                continue;
@@ -657,46 +568,7 @@ std::vector<Patch> PatchManager::GetPatches(VirtualFile update_raw, const BuildI
                           .version = types,
                           .type = PatchType::Mod,
                           .program_id = title_id,
-                           .title_id = title_id,
-                           .parent_name = ""});
-
-            // Add individual cheats as sub-entries if we have a build_id
-            if (has_cheats && has_build_id && !mod_disabled) {
-                // Try to read cheat file (uppercase 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 (const auto& cheat : *cheat_entries) {
-                        // Skip master cheat (id 0) with no readable name
-                        if (cheat.cheat_id == 0 && cheat.definition.readable_name[0] == '\0') {
-                            continue;
-                        }
-
-                        const std::string cheat_name = cheat.definition.readable_name.data();
-                        if (cheat_name.empty()) {
-                            continue;
-                        }
-
-                        // Create unique key for this cheat: "ModName::CheatName"
-                        const std::string cheat_key = mod->GetName() + "::" + cheat_name;
-                        const auto cheat_disabled =
-                            std::find(disabled.begin(), disabled.end(), cheat_key) != disabled.end();
-
-                        out.push_back({.enabled = !cheat_disabled,
-                                       .name = cheat_name,
-                                       .version = types,
-                                       .type = PatchType::Cheat,
-                                       .program_id = title_id,
-                                       .title_id = title_id,
-                                       .parent_name = mod->GetName()});
-                    }
-                }
-            }
+                           .title_id = title_id});
        }
    }

@@ -720,8 +592,7 @@ std::vector<Patch> PatchManager::GetPatches(VirtualFile update_raw, const BuildI
                           .version = types,
                           .type = PatchType::Mod,
                           .program_id = title_id,
-                           .title_id = title_id,
-                           .parent_name = ""});
+                           .title_id = title_id});
        }
    }

@@ -753,8 +624,7 @@ std::vector<Patch> PatchManager::GetPatches(VirtualFile update_raw, const BuildI
                       .version = std::move(list),
                       .type = PatchType::DLC,
                       .program_id = title_id,
-                       .title_id = dlc_match.back().title_id,
-                       .parent_name = ""});
+                       .title_id = dlc_match.back().title_id});
    }

    return out;
--- a/src/core/file_sys/patch_manager.h
+++ b/src/core/file_sys/patch_manager.h
@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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

@@ -13,6 +10,7 @@
 #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;
@@ -22,17 +20,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 };

 struct Patch {
    bool enabled;
@@ -41,7 +35,6 @@ struct Patch {
    PatchType type;
    u64 program_id;
    u64 title_id;
-    std::string parent_name;
 };

 // A centralized class to manage patches to games.
@@ -72,7 +65,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:
@@ -83,11 +76,8 @@ public:
                                         VirtualFile packed_update_raw = nullptr,
                                         bool apply_layeredfs = true) const;

-    // Returns a vector of patches including individual cheats
-    [[nodiscard]] std::vector<Patch> GetPatches(VirtualFile update_raw = nullptr,
-                                                const BuildID& build_id = {}) const;
-
-    [[nodiscard]] BuildID GetBuildID(VirtualFile update_raw = nullptr) const;
+    // Returns a vector of patches
+    [[nodiscard]] std::vector<Patch> GetPatches(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
--- a/src/core/hle/service/dmnt/cheat_interface.cpp
+++ b/src/core/hle/service/dmnt/cheat_interface.cpp
@@ -1,238 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
--- a/src/core/hle/service/dmnt/cheat_interface.h
+++ b/src/core/hle/service/dmnt/cheat_interface.h
@@ -1,88 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
--- a/src/core/hle/service/dmnt/cheat_parser.cpp
+++ b/src/core/hle/service/dmnt/cheat_parser.cpp
@@ -1,121 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
--- a/src/core/hle/service/dmnt/cheat_parser.h
+++ b/src/core/hle/service/dmnt/cheat_parser.h
@@ -1,26 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2025 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 <string_view>
-#include <vector>
-
-namespace Service::DMNT {
-    struct CheatEntry;
-
-    class CheatParser final {
-    public:
-        CheatParser();
-        ~CheatParser();
-
-        std::vector<CheatEntry> Parse(std::string_view data) const;
-
-    private:
-        std::string_view ExtractName(std::size_t& out_name_size, std::string_view data,
-                                     std::size_t start_index, char match) const;
-    };
-} // namespace Service::DMNT
--- a/src/core/hle/service/dmnt/cheat_process_manager.cpp
+++ b/src/core/hle/service/dmnt/cheat_process_manager.cpp
@@ -1,599 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2025 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/arm/debug.h"
-#include "core/core.h"
-#include "core/core_timing.h"
-#include "core/hle/service/cmif_serialization.h"
-#include "core/hle/service/dmnt/cheat_process_manager.h"
-#include "core/hle/service/dmnt/cheat_virtual_machine.h"
-#include "core/hle/service/dmnt/dmnt_results.h"
-#include "core/hle/service/hid/hid_server.h"
-#include "core/hle/service/sm/sm.h"
-#include "hid_core/resource_manager.h"
-#include "hid_core/resources/npad/npad.h"
-
-namespace Service::DMNT {
-    constexpr auto CHEAT_ENGINE_NS = std::chrono::nanoseconds{1000000000 / 12};
-
-    CheatProcessManager::CheatProcessManager(Core::System& system_)
-        : system{system_}, service_context{system_, "dmnt:cht"}, core_timing{system_.CoreTiming()} {
-        update_event = Core::Timing::CreateEvent("CheatEngine::FrameCallback",
-                                                 [this](s64 time, std::chrono::nanoseconds ns_late)
-                                                     -> std::optional<std::chrono::nanoseconds> {
-                                                     FrameCallback(ns_late);
-                                                     return std::nullopt;
-                                                 });
-
-        for (size_t i = 0; i < MaxCheatCount; i++) {
-            ResetCheatEntry(i);
-        }
-
-        cheat_vm = std::make_unique<CheatVirtualMachine>(*this);
-
-        cheat_process_event = service_context.CreateEvent("CheatProcessManager::ProcessEvent");
-        unsafe_break_event = service_context.CreateEvent("CheatProcessManager::ProcessEvent");
-    }
-
-    CheatProcessManager::~CheatProcessManager() {
-        service_context.CloseEvent(cheat_process_event);
-        service_context.CloseEvent(unsafe_break_event);
-        core_timing.UnscheduleEvent(update_event);
-    }
-
-    void CheatProcessManager::SetVirtualMachine(std::unique_ptr<CheatVirtualMachine> vm) {
-        if (vm) {
-            cheat_vm = std::move(vm);
-            SetNeedsReloadVm(true);
-        }
-    }
-
-    bool CheatProcessManager::HasActiveCheatProcess() {
-        // Note: This function *MUST* be called only with the cheat lock held.
-        bool has_cheat_process =
-            cheat_process_debug_handle != InvalidHandle &&
-            system.ApplicationProcess()->GetProcessId() == cheat_process_metadata.process_id;
-
-        if (!has_cheat_process) {
-            CloseActiveCheatProcess();
-        }
-
-        return has_cheat_process;
-    }
-
-    void CheatProcessManager::CloseActiveCheatProcess() {
-        if (cheat_process_debug_handle != InvalidHandle) {
-            broken_unsafe = false;
-            unsafe_break_event->Signal();
-            core_timing.UnscheduleEvent(update_event);
-
-            // Close resources.
-            cheat_process_debug_handle = InvalidHandle;
-
-            // Save cheat toggles.
-            if (always_save_cheat_toggles || should_save_cheat_toggles) {
-                // TODO: save cheat toggles
-                should_save_cheat_toggles = false;
-            }
-
-            cheat_process_metadata = {};
-
-            ResetAllCheatEntries();
-
-            {
-                auto it = frozen_addresses_map.begin();
-                while (it != frozen_addresses_map.end()) {
-                    it = frozen_addresses_map.erase(it);
-                }
-            }
-
-            cheat_process_event->Signal();
-        }
-    }
-
-    Result CheatProcessManager::EnsureCheatProcess() {
-        R_UNLESS(HasActiveCheatProcess(), ResultCheatNotAttached);
-        R_SUCCEED();
-    }
-
-    void CheatProcessManager::SetNeedsReloadVm(bool reload) {
-        needs_reload_vm = reload;
-    }
-
-    void CheatProcessManager::ResetCheatEntry(size_t i) {
-        if (i < MaxCheatCount) {
-            cheat_entries[i] = {};
-            cheat_entries[i].cheat_id = static_cast<u32>(i);
-
-            SetNeedsReloadVm(true);
-        }
-    }
-
-    void CheatProcessManager::ResetAllCheatEntries() {
-        for (size_t i = 0; i < MaxCheatCount; i++) {
-            ResetCheatEntry(i);
-        }
-
-        cheat_vm->ResetStaticRegisters();
-    }
-
-    CheatEntry* CheatProcessManager::GetCheatEntryById(size_t i) {
-        if (i < MaxCheatCount) {
-            return cheat_entries.data() + i;
-        }
-
-        return nullptr;
-    }
-
-    CheatEntry* CheatProcessManager::GetCheatEntryByReadableName(const char* readable_name) {
-        for (size_t i = 1; i < MaxCheatCount; i++) {
-            if (std::strncmp(cheat_entries[i].definition.readable_name.data(), readable_name,
-                             sizeof(cheat_entries[i].definition.readable_name)) == 0) {
-                return cheat_entries.data() + i;
-                             }
-        }
-        return nullptr;
-    }
-
-    CheatEntry* CheatProcessManager::GetFreeCheatEntry() {
-        // Check all non-master cheats for availability.
-        for (size_t i = 1; i < MaxCheatCount; i++) {
-            if (cheat_entries[i].definition.num_opcodes == 0) {
-                return cheat_entries.data() + i;
-            }
-        }
-
-        return nullptr;
-    }
-
-    bool CheatProcessManager::HasCheatProcess() {
-        std::scoped_lock lk(cheat_lock);
-        return HasActiveCheatProcess();
-    }
-
-    Kernel::KReadableEvent& CheatProcessManager::GetCheatProcessEvent() const {
-        return cheat_process_event->GetReadableEvent();
-    }
-
-    Result CheatProcessManager::AttachToApplicationProcess(const std::array<u8, 0x20>& build_id,
-                                                           VAddr main_region_begin,
-                                                           u64 main_region_size) {
-        std::scoped_lock lk(cheat_lock);
-
-        {
-            if (this->HasActiveCheatProcess()) {
-                this->CloseActiveCheatProcess();
-            }
-        }
-
-        cheat_process_metadata.process_id = system.ApplicationProcess()->GetProcessId();
-
-        {
-            const auto& page_table = system.ApplicationProcess()->GetPageTable();
-            cheat_process_metadata.program_id = system.GetApplicationProcessProgramID();
-            cheat_process_metadata.heap_extents = {
-                .base = GetInteger(page_table.GetHeapRegionStart()),
-                .size = page_table.GetHeapRegionSize(),
-            };
-            cheat_process_metadata.aslr_extents = {
-                .base = GetInteger(page_table.GetAliasCodeRegionStart()),
-                .size = page_table.GetAliasCodeRegionSize(),
-            };
-            cheat_process_metadata.alias_extents = {
-                .base = GetInteger(page_table.GetAliasRegionStart()),
-                .size = page_table.GetAliasRegionSize(),
-            };
-        }
-
-        {
-            cheat_process_metadata.main_nso_extents = {
-                .base = main_region_begin,
-                .size = main_region_size,
-            };
-            cheat_process_metadata.main_nso_build_id = build_id;
-        }
-
-        cheat_process_debug_handle = cheat_process_metadata.process_id;
-
-        broken_unsafe = false;
-        unsafe_break_event->Signal();
-
-        core_timing.ScheduleLoopingEvent(CHEAT_ENGINE_NS, CHEAT_ENGINE_NS, update_event);
-        LOG_INFO(CheatEngine, "Cheat engine started");
-
-        // Signal to our fans.
-        cheat_process_event->Signal();
-
-        R_SUCCEED();
-    }
-
-    Result CheatProcessManager::GetCheatProcessMetadata(CheatProcessMetadata& out_metadata) {
-        std::scoped_lock lk(cheat_lock);
-        R_TRY(EnsureCheatProcess());
-
-        out_metadata = cheat_process_metadata;
-        R_SUCCEED();
-    }
-
-    Result CheatProcessManager::ForceOpenCheatProcess() {
-        // R_RETURN(AttachToApplicationProcess(false));
-        R_SUCCEED();
-    }
-
-    Result CheatProcessManager::PauseCheatProcess() {
-        std::scoped_lock lk(cheat_lock);
-
-        R_TRY(EnsureCheatProcess());
-        R_RETURN(PauseCheatProcessUnsafe());
-    }
-
-    Result CheatProcessManager::PauseCheatProcessUnsafe() {
-        broken_unsafe = true;
-        unsafe_break_event->Clear();
-        if (system.ApplicationProcess()->IsSuspended()) {
-            R_SUCCEED();
-        }
-        R_RETURN(system.ApplicationProcess()->SetActivity(Kernel::Svc::ProcessActivity::Paused));
-    }
-
-    Result CheatProcessManager::ResumeCheatProcess() {
-        std::scoped_lock lk(cheat_lock);
-
-        R_TRY(EnsureCheatProcess());
-        R_RETURN(ResumeCheatProcessUnsafe());
-    }
-
-    Result CheatProcessManager::ResumeCheatProcessUnsafe() {
-        broken_unsafe = true;
-        unsafe_break_event->Clear();
-        if (!system.ApplicationProcess()->IsSuspended()) {
-            R_SUCCEED();
-        }
-        system.ApplicationProcess()->SetActivity(Kernel::Svc::ProcessActivity::Runnable);
-        R_SUCCEED();
-    }
-
-    Result CheatProcessManager::ForceCloseCheatProcess() {
-        CloseActiveCheatProcess();
-        R_SUCCEED();
-    }
-
-    Result CheatProcessManager::GetCheatProcessMappingCount(u64& out_count) {
-        std::scoped_lock lk(cheat_lock);
-        R_TRY(this->EnsureCheatProcess());
-
-        // TODO: Call svc::QueryDebugProcessMemory
-
-        out_count = 0;
-        R_SUCCEED();
-    }
-
-    Result CheatProcessManager::GetCheatProcessMappings(
-        u64& out_count, u64 offset, std::span<Kernel::Svc::MemoryInfo> out_mappings) {
-        std::scoped_lock lk(cheat_lock);
-        R_TRY(this->EnsureCheatProcess());
-
-        // TODO: Call svc::QueryDebugProcessMemory
-
-        out_count = 0;
-        R_SUCCEED();
-    }
-
-    Result CheatProcessManager::ReadCheatProcessMemory(u64 process_address, u64 size,
-                                                       std::span<u8> out_data) {
-        std::scoped_lock lk(cheat_lock);
-
-        R_TRY(EnsureCheatProcess());
-        R_RETURN(ReadCheatProcessMemoryUnsafe(process_address, &out_data, size));
-    }
-
-    Result CheatProcessManager::ReadCheatProcessMemoryUnsafe(u64 process_address, void* out_data,
-                                                             size_t size) {
-        if (!system.ApplicationMemory().IsValidVirtualAddress(process_address)) {
-            std::memset(out_data, 0, size);
-            R_SUCCEED();
-        }
-
-        system.ApplicationMemory().ReadBlock(process_address, out_data, size);
-        R_SUCCEED();
-    }
-
-    Result CheatProcessManager::WriteCheatProcessMemory(u64 process_address, u64 size,
-                                                        std::span<const u8> data) {
-        std::scoped_lock lk(cheat_lock);
-
-        R_TRY(EnsureCheatProcess());
-        R_RETURN(WriteCheatProcessMemoryUnsafe(process_address, &data, size));
-    }
-
-    Result CheatProcessManager::WriteCheatProcessMemoryUnsafe(u64 process_address, const void* data,
-                                                              size_t size) {
-        if (!system.ApplicationMemory().IsValidVirtualAddress(process_address)) {
-            R_SUCCEED();
-        }
-
-        if (system.ApplicationMemory().WriteBlock(process_address, data, size)) {
-            Core::InvalidateInstructionCacheRange(system.ApplicationProcess(), process_address, size);
-        }
-
-        R_SUCCEED();
-    }
-
-    Result CheatProcessManager::QueryCheatProcessMemory(Out<Kernel::Svc::MemoryInfo> mapping,
-                                                        u64 address) {
-        std::scoped_lock lk(cheat_lock);
-        R_TRY(this->EnsureCheatProcess());
-
-        // TODO: Call svc::QueryDebugProcessMemory
-        R_SUCCEED();
-    }
-
-    Result CheatProcessManager::GetCheatCount(u64& out_count) {
-        std::scoped_lock lk(cheat_lock);
-        R_TRY(EnsureCheatProcess());
-
-        out_count = std::count_if(cheat_entries.begin(), cheat_entries.end(),
-                                  [](const auto& entry) { return entry.definition.num_opcodes != 0; });
-        R_SUCCEED();
-    }
-
-    Result CheatProcessManager::GetCheats(u64& out_count, u64 offset,
-                                          std::span<CheatEntry> out_cheats) {
-        std::scoped_lock lk(cheat_lock);
-        R_TRY(EnsureCheatProcess());
-
-        size_t count = 0, total_count = 0;
-        for (size_t i = 0; i < MaxCheatCount && count < out_cheats.size(); i++) {
-            if (cheat_entries[i].definition.num_opcodes) {
-                total_count++;
-                if (total_count > offset) {
-                    out_cheats[count++] = cheat_entries[i];
-                }
-            }
-        }
-
-        out_count = count;
-        R_SUCCEED();
-    }
-
-    Result CheatProcessManager::GetCheatById(CheatEntry* out_cheat, u32 cheat_id) {
-        std::scoped_lock lk(cheat_lock);
-        R_TRY(EnsureCheatProcess());
-
-        const CheatEntry* entry = GetCheatEntryById(cheat_id);
-        R_UNLESS(entry != nullptr, ResultCheatUnknownId);
-        R_UNLESS(entry->definition.num_opcodes != 0, ResultCheatUnknownId);
-
-        *out_cheat = *entry;
-        R_SUCCEED();
-    }
-
-    Result CheatProcessManager::ToggleCheat(u32 cheat_id) {
-        std::scoped_lock lk(cheat_lock);
-        R_TRY(EnsureCheatProcess());
-
-        CheatEntry* entry = GetCheatEntryById(cheat_id);
-        R_UNLESS(entry != nullptr, ResultCheatUnknownId);
-        R_UNLESS(entry->definition.num_opcodes != 0, ResultCheatUnknownId);
-
-        R_UNLESS(cheat_id != 0, ResultCheatCannotDisable);
-
-        entry->enabled = !entry->enabled;
-
-        SetNeedsReloadVm(true);
-
-        R_SUCCEED();
-    }
-
-    Result CheatProcessManager::AddCheat(u32& out_cheat_id, bool enabled,
-                                         const CheatDefinition& cheat_definition) {
-        std::scoped_lock lk(cheat_lock);
-        R_TRY(EnsureCheatProcess());
-
-        R_UNLESS(cheat_definition.num_opcodes != 0, ResultCheatInvalid);
-        R_UNLESS(cheat_definition.num_opcodes <= cheat_definition.opcodes.size(), ResultCheatInvalid);
-
-        CheatEntry* new_entry = GetFreeCheatEntry();
-        R_UNLESS(new_entry != nullptr, ResultCheatOutOfResource);
-
-        new_entry->enabled = enabled;
-        new_entry->definition = cheat_definition;
-
-        SetNeedsReloadVm(true);
-
-        out_cheat_id = new_entry->cheat_id;
-
-        R_SUCCEED();
-    }
-
-    Result CheatProcessManager::RemoveCheat(u32 cheat_id) {
-        std::scoped_lock lk(cheat_lock);
-        R_TRY(EnsureCheatProcess());
-        R_UNLESS(cheat_id < MaxCheatCount, ResultCheatUnknownId);
-
-        ResetCheatEntry(cheat_id);
-        SetNeedsReloadVm(true);
-        R_SUCCEED();
-    }
-
-    Result CheatProcessManager::ReadStaticRegister(u64& out_value, u64 register_index) {
-        std::scoped_lock lk(cheat_lock);
-        R_TRY(EnsureCheatProcess());
-        R_UNLESS(register_index < CheatVirtualMachine::NumStaticRegisters, ResultCheatInvalid);
-
-        out_value = cheat_vm->GetStaticRegister(register_index);
-        R_SUCCEED();
-    }
-
-    Result CheatProcessManager::WriteStaticRegister(u64 register_index, u64 value) {
-        std::scoped_lock lk(cheat_lock);
-        R_TRY(EnsureCheatProcess());
-        R_UNLESS(register_index < CheatVirtualMachine::NumStaticRegisters, ResultCheatInvalid);
-
-        cheat_vm->SetStaticRegister(register_index, value);
-        R_SUCCEED();
-    }
-
-    Result CheatProcessManager::ResetStaticRegisters() {
-        std::scoped_lock lk(cheat_lock);
-        R_TRY(EnsureCheatProcess());
-
-        cheat_vm->ResetStaticRegisters();
-        R_SUCCEED();
-    }
-
-    Result CheatProcessManager::SetMasterCheat(const CheatDefinition& cheat_definition) {
-        std::scoped_lock lk(cheat_lock);
-        R_TRY(EnsureCheatProcess());
-
-        R_UNLESS(cheat_definition.num_opcodes != 0, ResultCheatInvalid);
-        R_UNLESS(cheat_definition.num_opcodes <= cheat_definition.opcodes.size(), ResultCheatInvalid);
-
-        cheat_entries[0] = {
-            .enabled = true,
-            .definition = cheat_definition,
-        };
-
-        SetNeedsReloadVm(true);
-
-        R_SUCCEED();
-    }
-
-    Result CheatProcessManager::GetFrozenAddressCount(u64& out_count) {
-        std::scoped_lock lk(cheat_lock);
-        R_TRY(EnsureCheatProcess());
-
-        out_count = std::distance(frozen_addresses_map.begin(), frozen_addresses_map.end());
-        R_SUCCEED();
-    }
-
-    Result CheatProcessManager::GetFrozenAddresses(u64& out_count, u64 offset,
-                                                   std::span<FrozenAddressEntry> out_frozen_address) {
-        std::scoped_lock lk(cheat_lock);
-        R_TRY(EnsureCheatProcess());
-
-        u64 total_count = 0, written_count = 0;
-        for (const auto& [address, value] : frozen_addresses_map) {
-            if (written_count >= out_frozen_address.size()) {
-                break;
-            }
-
-            if (offset <= total_count) {
-                out_frozen_address[written_count].address = address;
-                out_frozen_address[written_count].value = value;
-                written_count++;
-            }
-            total_count++;
-        }
-
-        out_count = written_count;
-        R_SUCCEED();
-    }
-
-    Result CheatProcessManager::GetFrozenAddress(FrozenAddressEntry& out_frozen_address_entry,
-                                                 u64 address) {
-        std::scoped_lock lk(cheat_lock);
-        R_TRY(EnsureCheatProcess());
-
-        const auto it = frozen_addresses_map.find(address);
-        R_UNLESS(it != frozen_addresses_map.end(), ResultFrozenAddressNotFound);
-
-        out_frozen_address_entry = {
-            .address = it->first,
-            .value = it->second,
-        };
-        R_SUCCEED();
-    }
-
-    Result CheatProcessManager::EnableFrozenAddress(u64& out_value, u64 address, u64 width) {
-        std::scoped_lock lk(cheat_lock);
-        R_TRY(EnsureCheatProcess());
-
-        const auto it = frozen_addresses_map.find(address);
-        R_UNLESS(it == frozen_addresses_map.end(), ResultFrozenAddressAlreadyExists);
-
-        FrozenAddressValue value{};
-        value.width = static_cast<u8>(width);
-        R_TRY(ReadCheatProcessMemoryUnsafe(address, &value.value, width));
-
-        frozen_addresses_map.insert({address, value});
-        out_value = value.value;
-        R_SUCCEED();
-    }
-
-    Result CheatProcessManager::DisableFrozenAddress(u64 address) {
-        std::scoped_lock lk(cheat_lock);
-        R_TRY(EnsureCheatProcess());
-
-        const auto it = frozen_addresses_map.find(address);
-        R_UNLESS(it != frozen_addresses_map.end(), ResultFrozenAddressNotFound);
-
-        frozen_addresses_map.erase(it);
-
-        R_SUCCEED();
-    }
-
-    u64 CheatProcessManager::HidKeysDown() const {
-        const auto hid = system.ServiceManager().GetService<Service::HID::IHidServer>("hid");
-        if (hid == nullptr) {
-            LOG_WARNING(CheatEngine, "Attempted to read input state, but hid is not initialized!");
-            return 0;
-        }
-
-        const auto applet_resource = hid->GetResourceManager();
-        if (applet_resource == nullptr || applet_resource->GetNpad() == nullptr) {
-            LOG_WARNING(CheatEngine,
-                        "Attempted to read input state, but applet resource is not initialized!");
-            return 0;
-        }
-
-        const auto press_state = applet_resource->GetNpad()->GetAndResetPressState();
-        return static_cast<u64>(press_state & Core::HID::NpadButton::All);
-    }
-
-    void CheatProcessManager::DebugLog(u8 id, u64 value) const {
-        LOG_INFO(CheatEngine, "Cheat triggered DebugLog: ID '{:01X}' Value '{:016X}'", id, value);
-    }
-
-    void CheatProcessManager::CommandLog(std::string_view data) const {
-        LOG_DEBUG(CheatEngine, "[DmntCheatVm]: {}",
-                  data.back() == '\n' ? data.substr(0, data.size() - 1) : data);
-    }
-
-    void CheatProcessManager::FrameCallback(std::chrono::nanoseconds ns_late) {
-        std::scoped_lock lk(cheat_lock);
-
-        if (cheat_vm == nullptr) {
-            LOG_DEBUG(CheatEngine, "FrameCallback: VM is null");
-            return;
-        }
-
-        if (needs_reload_vm) {
-            LOG_INFO(CheatEngine, "Reloading cheat VM with {} entries", cheat_entries.size());
-
-            size_t enabled_count = 0;
-            for (const auto& entry : cheat_entries) {
-                if (entry.enabled && entry.definition.num_opcodes > 0) {
-                    enabled_count++;
-                    LOG_INFO(CheatEngine, "  Cheat '{}': {} opcodes, enabled={}",
-                             entry.definition.readable_name.data(),
-                             entry.definition.num_opcodes, entry.enabled);
-                }
-            }
-            LOG_INFO(CheatEngine, "Total enabled cheats: {}", enabled_count);
-
-            cheat_vm->LoadProgram(cheat_entries);
-            LOG_INFO(CheatEngine, "Cheat VM loaded, program size: {}", cheat_vm->GetProgramSize());
-            needs_reload_vm = false;
-        }
-
-        if (cheat_vm->GetProgramSize() == 0) {
-            return;
-        }
-
-        cheat_vm->Execute(cheat_process_metadata);
-    }
-} // namespace Service::DMNT
--- a/src/core/hle/service/dmnt/cheat_process_manager.h
+++ b/src/core/hle/service/dmnt/cheat_process_manager.h
@@ -1,126 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2025 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 <map>
-#include <span>
-
-#include "core/hle/service/cmif_types.h"
-#include "core/hle/service/dmnt/dmnt_types.h"
-#include "core/hle/service/kernel_helpers.h"
-#include "core/hle/service/service.h"
-
-#include "common/intrusive_red_black_tree.h"
-
-namespace Core {
-    class System;
-}
-
-namespace Kernel {
-    class KEvent;
-    class KReadableEvent;
-} // namespace Kernel
-
-namespace Kernel::Svc {
-    struct MemoryInfo;
-}
-
-namespace Service::DMNT {
-    class CheatVirtualMachine;
-
-    class CheatProcessManager final {
-    public:
-        static constexpr size_t MaxCheatCount = 0x80;
-        static constexpr size_t MaxFrozenAddressCount = 0x80;
-
-        CheatProcessManager(Core::System& system_);
-        ~CheatProcessManager();
-
-        void SetVirtualMachine(std::unique_ptr<CheatVirtualMachine> vm);
-
-        bool HasCheatProcess();
-        Kernel::KReadableEvent& GetCheatProcessEvent() const;
-        Result GetCheatProcessMetadata(CheatProcessMetadata& out_metadata);
-        Result AttachToApplicationProcess(const std::array<u8, 0x20>& build_id, VAddr main_region_begin,
-                                          u64 main_region_size);
-        Result ForceOpenCheatProcess();
-        Result PauseCheatProcess();
-        Result PauseCheatProcessUnsafe();
-        Result ResumeCheatProcess();
-        Result ResumeCheatProcessUnsafe();
-        Result ForceCloseCheatProcess();
-
-        Result GetCheatProcessMappingCount(u64& out_count);
-        Result GetCheatProcessMappings(u64& out_count, u64 offset,
-                                       std::span<Kernel::Svc::MemoryInfo> out_mappings);
-        Result ReadCheatProcessMemory(u64 process_address, u64 size, std::span<u8> out_data);
-        Result ReadCheatProcessMemoryUnsafe(u64 process_address, void* out_data, size_t size);
-        Result WriteCheatProcessMemory(u64 process_address, u64 size, std::span<const u8> data);
-        Result WriteCheatProcessMemoryUnsafe(u64 process_address, const void* data, size_t size);
-
-        Result QueryCheatProcessMemory(Out<Kernel::Svc::MemoryInfo> mapping, u64 address);
-        Result GetCheatCount(u64& out_count);
-        Result GetCheats(u64& out_count, u64 offset, std::span<CheatEntry> out_cheats);
-        Result GetCheatById(CheatEntry* out_cheat, u32 cheat_id);
-        Result ToggleCheat(u32 cheat_id);
-
-        Result AddCheat(u32& out_cheat_id, bool enabled, const CheatDefinition& cheat_definition);
-        Result RemoveCheat(u32 cheat_id);
-        Result ReadStaticRegister(u64& out_value, u64 register_index);
-        Result WriteStaticRegister(u64 register_index, u64 value);
-        Result ResetStaticRegisters();
-        Result SetMasterCheat(const CheatDefinition& cheat_definition);
-        Result GetFrozenAddressCount(u64& out_count);
-        Result GetFrozenAddresses(u64& out_count, u64 offset,
-                                  std::span<FrozenAddressEntry> out_frozen_address);
-        Result GetFrozenAddress(FrozenAddressEntry& out_frozen_address_entry, u64 address);
-        Result EnableFrozenAddress(u64& out_value, u64 address, u64 width);
-        Result DisableFrozenAddress(u64 address);
-
-        u64 HidKeysDown() const;
-        void DebugLog(u8 id, u64 value) const;
-        void CommandLog(std::string_view data) const;
-
-    private:
-        bool HasActiveCheatProcess();
-        void CloseActiveCheatProcess();
-        Result EnsureCheatProcess();
-        void SetNeedsReloadVm(bool reload);
-        void ResetCheatEntry(size_t i);
-        void ResetAllCheatEntries();
-        CheatEntry* GetCheatEntryById(size_t i);
-        CheatEntry* GetCheatEntryByReadableName(const char* readable_name);
-        CheatEntry* GetFreeCheatEntry();
-
-        void FrameCallback(std::chrono::nanoseconds ns_late);
-
-        static constexpr u64 InvalidHandle = 0;
-
-        mutable std::mutex cheat_lock;
-        Kernel::KEvent* unsafe_break_event;
-
-        Kernel::KEvent* cheat_process_event;
-        u64 cheat_process_debug_handle = InvalidHandle;
-        CheatProcessMetadata cheat_process_metadata = {};
-
-        bool broken_unsafe = false;
-        bool needs_reload_vm = false;
-        std::unique_ptr<CheatVirtualMachine> cheat_vm;
-
-        bool enable_cheats_by_default = true;
-        bool always_save_cheat_toggles = false;
-        bool should_save_cheat_toggles = false;
-        std::array<CheatEntry, MaxCheatCount> cheat_entries = {};
-        // TODO: Replace with IntrusiveRedBlackTree
-        std::map<u64, FrozenAddressValue> frozen_addresses_map = {};
-
-        Core::System& system;
-        KernelHelpers::ServiceContext service_context;
-        std::shared_ptr<Core::Timing::EventType> update_event;
-        Core::Timing::CoreTiming& core_timing;
-    };
-} // namespace Service::DMNT
--- a/src/core/hle/service/dmnt/cheat_virtual_machine.cpp
+++ b/src/core/hle/service/dmnt/cheat_virtual_machine.cpp
--- a/src/core/hle/service/dmnt/cheat_virtual_machine.h
+++ b/src/core/hle/service/dmnt/cheat_virtual_machine.h
@@ -1,323 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <span>
-#include <variant>
-
-#include "common/common_types.h"
-#include "core/hle/service/dmnt/dmnt_types.h"
-
-namespace Service::DMNT {
-    class CheatProcessManager;
-
-    enum class CheatVmOpcodeType : u32 {
-        StoreStatic = 0,
-        BeginConditionalBlock = 1,
-        EndConditionalBlock = 2,
-        ControlLoop = 3,
-        LoadRegisterStatic = 4,
-        LoadRegisterMemory = 5,
-        StoreStaticToAddress = 6,
-        PerformArithmeticStatic = 7,
-        BeginKeypressConditionalBlock = 8,
-
-        // These are not implemented by Gateway's VM.
-        PerformArithmeticRegister = 9,
-        StoreRegisterToAddress = 10,
-        Reserved11 = 11,
-
-        // This is a meta entry, and not a real opcode.
-        // This is to facilitate multi-nybble instruction decoding.
-        ExtendedWidth = 12,
-
-        // Extended width opcodes.
-        BeginRegisterConditionalBlock = 0xC0,
-        SaveRestoreRegister = 0xC1,
-        SaveRestoreRegisterMask = 0xC2,
-        ReadWriteStaticRegister = 0xC3,
-
-        // This is a meta entry, and not a real opcode.
-        // This is to facilitate multi-nybble instruction decoding.
-        DoubleExtendedWidth = 0xF0,
-
-        // Double-extended width opcodes.
-        PauseProcess = 0xFF0,
-        ResumeProcess = 0xFF1,
-        DebugLog = 0xFFF,
-    };
-
-    enum class MemoryAccessType : u32 {
-        MainNso = 0,
-        Heap = 1,
-        Alias = 2,
-        Aslr = 3,
-    };
-
-    enum class ConditionalComparisonType : u32 {
-        GT = 1,
-        GE = 2,
-        LT = 3,
-        LE = 4,
-        EQ = 5,
-        NE = 6,
-    };
-
-    enum class RegisterArithmeticType : u32 {
-        Addition = 0,
-        Subtraction = 1,
-        Multiplication = 2,
-        LeftShift = 3,
-        RightShift = 4,
-
-        // These are not supported by Gateway's VM.
-        LogicalAnd = 5,
-        LogicalOr = 6,
-        LogicalNot = 7,
-        LogicalXor = 8,
-
-        None = 9,
-    };
-
-    enum class StoreRegisterOffsetType : u32 {
-        None = 0,
-        Reg = 1,
-        Imm = 2,
-        MemReg = 3,
-        MemImm = 4,
-        MemImmReg = 5,
-    };
-
-    enum class CompareRegisterValueType : u32 {
-        MemoryRelAddr = 0,
-        MemoryOfsReg = 1,
-        RegisterRelAddr = 2,
-        RegisterOfsReg = 3,
-        StaticValue = 4,
-        OtherRegister = 5,
-    };
-
-    enum class SaveRestoreRegisterOpType : u32 {
-        Restore = 0,
-        Save = 1,
-        ClearSaved = 2,
-        ClearRegs = 3,
-    };
-
-    enum class DebugLogValueType : u32 {
-        MemoryRelAddr = 0,
-        MemoryOfsReg = 1,
-        RegisterRelAddr = 2,
-        RegisterOfsReg = 3,
-        RegisterValue = 4,
-    };
-
-    union VmInt {
-        u8 bit8;
-        u16 bit16;
-        u32 bit32;
-        u64 bit64;
-    };
-
-    struct StoreStaticOpcode {
-        u32 bit_width{};
-        MemoryAccessType mem_type{};
-        u32 offset_register{};
-        u64 rel_address{};
-        VmInt value{};
-    };
-
-    struct BeginConditionalOpcode {
-        u32 bit_width{};
-        MemoryAccessType mem_type{};
-        ConditionalComparisonType cond_type{};
-        u64 rel_address{};
-        VmInt value{};
-    };
-
-    struct EndConditionalOpcode {
-        bool is_else;
-    };
-
-    struct ControlLoopOpcode {
-        bool start_loop{};
-        u32 reg_index{};
-        u32 num_iters{};
-    };
-
-    struct LoadRegisterStaticOpcode {
-        u32 reg_index{};
-        u64 value{};
-    };
-
-    struct LoadRegisterMemoryOpcode {
-        u32 bit_width{};
-        MemoryAccessType mem_type{};
-        u32 reg_index{};
-        bool load_from_reg{};
-        u64 rel_address{};
-    };
-
-    struct StoreStaticToAddressOpcode {
-        u32 bit_width{};
-        u32 reg_index{};
-        bool increment_reg{};
-        bool add_offset_reg{};
-        u32 offset_reg_index{};
-        u64 value{};
-    };
-
-    struct PerformArithmeticStaticOpcode {
-        u32 bit_width{};
-        u32 reg_index{};
-        RegisterArithmeticType math_type{};
-        u32 value{};
-    };
-
-    struct BeginKeypressConditionalOpcode {
-        u32 key_mask{};
-    };
-
-    struct PerformArithmeticRegisterOpcode {
-        u32 bit_width{};
-        RegisterArithmeticType math_type{};
-        u32 dst_reg_index{};
-        u32 src_reg_1_index{};
-        u32 src_reg_2_index{};
-        bool has_immediate{};
-        VmInt value{};
-    };
-
-    struct StoreRegisterToAddressOpcode {
-        u32 bit_width{};
-        u32 str_reg_index{};
-        u32 addr_reg_index{};
-        bool increment_reg{};
-        StoreRegisterOffsetType ofs_type{};
-        MemoryAccessType mem_type{};
-        u32 ofs_reg_index{};
-        u64 rel_address{};
-    };
-
-    struct BeginRegisterConditionalOpcode {
-        u32 bit_width{};
-        ConditionalComparisonType cond_type{};
-        u32 val_reg_index{};
-        CompareRegisterValueType comp_type{};
-        MemoryAccessType mem_type{};
-        u32 addr_reg_index{};
-        u32 other_reg_index{};
-        u32 ofs_reg_index{};
-        u64 rel_address{};
-        VmInt value{};
-    };
-
-    struct SaveRestoreRegisterOpcode {
-        u32 dst_index{};
-        u32 src_index{};
-        SaveRestoreRegisterOpType op_type{};
-    };
-
-    struct SaveRestoreRegisterMaskOpcode {
-        SaveRestoreRegisterOpType op_type{};
-        std::array<bool, 0x10> should_operate{};
-    };
-
-    struct ReadWriteStaticRegisterOpcode {
-        u32 static_idx{};
-        u32 idx{};
-    };
-
-    struct PauseProcessOpcode {};
-
-    struct ResumeProcessOpcode {};
-
-    struct DebugLogOpcode {
-        u32 bit_width{};
-        u32 log_id{};
-        DebugLogValueType val_type{};
-        MemoryAccessType mem_type{};
-        u32 addr_reg_index{};
-        u32 val_reg_index{};
-        u32 ofs_reg_index{};
-        u64 rel_address{};
-    };
-
-    struct UnrecognizedInstruction {
-        CheatVmOpcodeType opcode{};
-    };
-
-    struct CheatVmOpcode {
-        bool begin_conditional_block{};
-        std::variant<StoreStaticOpcode, BeginConditionalOpcode, EndConditionalOpcode, ControlLoopOpcode,
-                     LoadRegisterStaticOpcode, LoadRegisterMemoryOpcode, StoreStaticToAddressOpcode,
-                     PerformArithmeticStaticOpcode, BeginKeypressConditionalOpcode,
-                     PerformArithmeticRegisterOpcode, StoreRegisterToAddressOpcode,
-                     BeginRegisterConditionalOpcode, SaveRestoreRegisterOpcode,
-                     SaveRestoreRegisterMaskOpcode, ReadWriteStaticRegisterOpcode, PauseProcessOpcode,
-                     ResumeProcessOpcode, DebugLogOpcode, UnrecognizedInstruction>
-            opcode{};
-    };
-
-    class CheatVirtualMachine {
-    public:
-        static constexpr std::size_t MaximumProgramOpcodeCount = 0x400;
-        static constexpr std::size_t NumRegisters = 0x10;
-        static constexpr std::size_t NumReadableStaticRegisters = 0x80;
-        static constexpr std::size_t NumWritableStaticRegisters = 0x80;
-        static constexpr std::size_t NumStaticRegisters =
-            NumReadableStaticRegisters + NumWritableStaticRegisters;
-
-        explicit CheatVirtualMachine(CheatProcessManager& cheat_manager);
-        ~CheatVirtualMachine();
-
-        std::size_t GetProgramSize() const {
-            return this->num_opcodes;
-        }
-
-        bool LoadProgram(std::span<const CheatEntry> cheats);
-        void Execute(const CheatProcessMetadata& metadata);
-
-        u64 GetStaticRegister(std::size_t register_index) const {
-            return static_registers[register_index];
-        }
-
-        void SetStaticRegister(std::size_t register_index, u64 value) {
-            static_registers[register_index] = value;
-        }
-
-        void ResetStaticRegisters() {
-            static_registers = {};
-        }
-
-    private:
-        bool DecodeNextOpcode(CheatVmOpcode& out);
-        void SkipConditionalBlock(bool is_if);
-        void ResetState();
-
-        // For implementing the DebugLog opcode.
-        void DebugLog(u32 log_id, u64 value) const;
-
-        void LogOpcode(const CheatVmOpcode& opcode) const;
-
-        static u64 GetVmInt(VmInt value, u32 bit_width);
-        static u64 GetCheatProcessAddress(const CheatProcessMetadata& metadata,
-                                          MemoryAccessType mem_type, u64 rel_address);
-
-        CheatProcessManager& manager;
-
-        std::size_t num_opcodes = 0;
-        std::size_t instruction_ptr = 0;
-        std::size_t condition_depth = 0;
-        bool decode_success = false;
-        std::array<u32, MaximumProgramOpcodeCount> program{};
-        std::array<u64, NumRegisters> registers{};
-        std::array<u64, NumRegisters> saved_values{};
-        std::array<u64, NumStaticRegisters> static_registers{};
-        std::array<std::size_t, NumRegisters> loop_tops{};
-    };
-}// namespace Service::DMNT
--- a/src/core/hle/service/dmnt/dmnt.cpp
+++ b/src/core/hle/service/dmnt/dmnt.cpp
@@ -1,26 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2025 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/core.h"
-#include "core/hle/service/dmnt/cheat_interface.h"
-#include "core/hle/service/dmnt/cheat_process_manager.h"
-#include "core/hle/service/dmnt/cheat_virtual_machine.h"
-#include "core/hle/service/dmnt/dmnt.h"
-#include "core/hle/service/server_manager.h"
-
-namespace Service::DMNT {
-    void LoopProcess(Core::System& system) {
-        auto server_manager = std::make_unique<ServerManager>(system);
-
-        auto& cheat_manager = system.GetCheatManager();
-        auto cheat_vm = std::make_unique<CheatVirtualMachine>(cheat_manager);
-        cheat_manager.SetVirtualMachine(std::move(cheat_vm));
-
-        server_manager->RegisterNamedService("dmnt:cht",
-                                             std::make_shared<ICheatInterface>(system, cheat_manager));
-        ServerManager::RunServer(std::move(server_manager));
-    }
-} // namespace Service::DMNT
--- a/src/core/hle/service/dmnt/dmnt.h
+++ b/src/core/hle/service/dmnt/dmnt.h
@@ -1,15 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2025 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
-
-namespace Core {
-    class System;
-};
-
-namespace Service::DMNT {
-    void LoopProcess(Core::System& system);
-} // namespace Service::DMNT
--- a/src/core/hle/service/dmnt/dmnt_results.h
+++ b/src/core/hle/service/dmnt/dmnt_results.h
@@ -1,26 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2025 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/result.h"
-
-namespace Service::DMNT {
-    constexpr Result ResultDebuggingDisabled(ErrorModule::DMNT, 2);
-
-    constexpr Result ResultCheatNotAttached(ErrorModule::DMNT, 6500);
-    constexpr Result ResultCheatNullBuffer(ErrorModule::DMNT, 6501);
-    constexpr Result ResultCheatInvalidBuffer(ErrorModule::DMNT, 6502);
-    constexpr Result ResultCheatUnknownId(ErrorModule::DMNT, 6503);
-    constexpr Result ResultCheatOutOfResource(ErrorModule::DMNT, 6504);
-    constexpr Result ResultCheatInvalid(ErrorModule::DMNT, 6505);
-    constexpr Result ResultCheatCannotDisable(ErrorModule::DMNT, 6506);
-    constexpr Result ResultFrozenAddressInvalidWidth(ErrorModule::DMNT, 6600);
-    constexpr Result ResultFrozenAddressAlreadyExists(ErrorModule::DMNT, 6601);
-    constexpr Result ResultFrozenAddressNotFound(ErrorModule::DMNT, 6602);
-    constexpr Result ResultFrozenAddressOutOfResource(ErrorModule::DMNT, 6603);
-    constexpr Result ResultVirtualMachineInvalidConditionDepth(ErrorModule::DMNT, 6700);
-} // namespace Service::DMNT
--- a/src/core/hle/service/dmnt/dmnt_types.h
+++ b/src/core/hle/service/dmnt/dmnt_types.h
@@ -1,55 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "common/common_types.h"
-
-namespace Service::DMNT {
-    struct MemoryRegionExtents {
-        u64 base{};
-        u64 size{};
-    };
-    static_assert(sizeof(MemoryRegionExtents) == 0x10, "MemoryRegionExtents is an invalid size");
-
-    struct CheatProcessMetadata {
-        u64 process_id{};
-        u64 program_id{};
-        MemoryRegionExtents main_nso_extents{};
-        MemoryRegionExtents heap_extents{};
-        MemoryRegionExtents alias_extents{};
-        MemoryRegionExtents aslr_extents{};
-        std::array<u8, 0x20> main_nso_build_id{};
-    };
-    static_assert(sizeof(CheatProcessMetadata) == 0x70, "CheatProcessMetadata is an invalid size");
-
-    struct CheatDefinition {
-        std::array<char, 0x40> readable_name;
-        u32 num_opcodes;
-        std::array<u32, 0x100> opcodes;
-    };
-    static_assert(sizeof(CheatDefinition) == 0x444, "CheatDefinition is an invalid size");
-
-    struct CheatEntry {
-        bool enabled;
-        u32 cheat_id;
-        CheatDefinition definition;
-    };
-    static_assert(sizeof(CheatEntry) == 0x44C, "CheatEntry is an invalid size");
-    static_assert(std::is_trivial_v<CheatEntry>, "CheatEntry type must be trivially copyable.");
-
-    struct FrozenAddressValue {
-        u64 value;
-        u8 width;
-    };
-    static_assert(sizeof(FrozenAddressValue) == 0x10, "FrozenAddressValue is an invalid size");
-
-    struct FrozenAddressEntry {
-        u64 address;
-        FrozenAddressValue value;
-    };
-    static_assert(sizeof(FrozenAddressEntry) == 0x18, "FrozenAddressEntry is an invalid size");
-} // namespace Service::DMNT
--- a/src/core/hle/service/services.cpp
+++ b/src/core/hle/service/services.cpp
@@ -16,7 +16,6 @@
 #include "core/hle/service/btdrv/btdrv.h"
 #include "core/hle/service/btm/btm.h"
 #include "core/hle/service/caps/caps.h"
-#include "core/hle/service/dmnt/dmnt.h"
 #include "core/hle/service/erpt/erpt.h"
 #include "core/hle/service/es/es.h"
 #include "core/hle/service/eupld/eupld.h"
@@ -108,7 +107,6 @@ Services::Services(std::shared_ptr<SM::ServiceManager>& sm, Core::System& system
        {"btdrv",      &BtDrv::LoopProcess},
        {"btm",        &BTM::LoopProcess},
        {"capsrv",     &Capture::LoopProcess},
-        {"dmnt",       &DMNT::LoopProcess},
        {"erpt",       &ERPT::LoopProcess},
        {"es",         &ES::LoopProcess},
        {"eupld",      &EUPLD::LoopProcess},
--- a/src/core/memory/cheat_engine.cpp
+++ b/src/core/memory/cheat_engine.cpp
@@ -0,0 +1,286 @@
+// SPDX-FileCopyrightText: Copyright 2025 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 <locale>
+#include "common/hex_util.h"
+#include "common/swap.h"
+#include "core/arm/debug.h"
+#include "core/core.h"
+#include "core/core_timing.h"
+#include "core/hle/kernel/k_page_table.h"
+#include "core/hle/kernel/k_process.h"
+#include "core/hle/kernel/k_process_page_table.h"
+#include "core/hle/kernel/svc_types.h"
+#include "core/hle/service/hid/hid_server.h"
+#include "core/hle/service/sm/sm.h"
+#include "core/memory.h"
+#include "core/memory/cheat_engine.h"
+#include "hid_core/resource_manager.h"
+#include "hid_core/resources/npad/npad.h"
+
+namespace Core::Memory {
+namespace {
+constexpr auto CHEAT_ENGINE_NS = std::chrono::nanoseconds{1000000000 / 12};
+
+std::string_view ExtractName(std::size_t& out_name_size, std::string_view data,
+                             std::size_t start_index, char match) {
+    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);
+}
+} // Anonymous namespace
+
+StandardVmCallbacks::StandardVmCallbacks(System& system_, const CheatProcessMetadata& metadata_)
+    : metadata{metadata_}, system{system_} {}
+
+StandardVmCallbacks::~StandardVmCallbacks() = default;
+
+void StandardVmCallbacks::MemoryReadUnsafe(VAddr address, void* data, u64 size) {
+    // Return zero on invalid address
+    if (!IsAddressInRange(address) || !system.ApplicationMemory().IsValidVirtualAddress(address)) {
+        std::memset(data, 0, size);
+        return;
+    }
+
+    system.ApplicationMemory().ReadBlock(address, data, size);
+}
+
+void StandardVmCallbacks::MemoryWriteUnsafe(VAddr address, const void* data, u64 size) {
+    // Skip invalid memory write address
+    if (!IsAddressInRange(address) || !system.ApplicationMemory().IsValidVirtualAddress(address)) {
+        return;
+    }
+
+    if (system.ApplicationMemory().WriteBlock(address, data, size)) {
+        Core::InvalidateInstructionCacheRange(system.ApplicationProcess(), address, size);
+    }
+}
+
+u64 StandardVmCallbacks::HidKeysDown() {
+    const auto hid = system.ServiceManager().GetService<Service::HID::IHidServer>("hid");
+    if (hid == nullptr) {
+        LOG_WARNING(CheatEngine, "Attempted to read input state, but hid is not initialized!");
+        return 0;
+    }
+
+    const auto applet_resource = hid->GetResourceManager();
+    if (applet_resource == nullptr || applet_resource->GetNpad() == nullptr) {
+        LOG_WARNING(CheatEngine,
+                    "Attempted to read input state, but applet resource is not initialized!");
+        return 0;
+    }
+
+    const auto press_state = applet_resource->GetNpad()->GetAndResetPressState();
+    return static_cast<u64>(press_state & HID::NpadButton::All);
+}
+
+void StandardVmCallbacks::PauseProcess() {
+    if (system.ApplicationProcess()->IsSuspended()) {
+        return;
+    }
+    system.ApplicationProcess()->SetActivity(Kernel::Svc::ProcessActivity::Paused);
+}
+
+void StandardVmCallbacks::ResumeProcess() {
+    if (!system.ApplicationProcess()->IsSuspended()) {
+        return;
+    }
+    system.ApplicationProcess()->SetActivity(Kernel::Svc::ProcessActivity::Runnable);
+}
+
+void StandardVmCallbacks::DebugLog(u8 id, u64 value) {
+    LOG_INFO(CheatEngine, "Cheat triggered DebugLog: ID '{:01X}' Value '{:016X}'", id, value);
+}
+
+void StandardVmCallbacks::CommandLog(std::string_view data) {
+    LOG_DEBUG(CheatEngine, "[DmntCheatVm]: {}",
+              data.back() == '\n' ? data.substr(0, data.size() - 1) : data);
+}
+
+bool StandardVmCallbacks::IsAddressInRange(VAddr in) const {
+    if ((in < metadata.main_nso_extents.base ||
+         in >= metadata.main_nso_extents.base + metadata.main_nso_extents.size) &&
+        (in < metadata.heap_extents.base ||
+         in >= metadata.heap_extents.base + metadata.heap_extents.size) &&
+        (in < metadata.alias_extents.base ||
+         in >= metadata.alias_extents.base + metadata.alias_extents.size) &&
+        (in < metadata.aslr_extents.base ||
+         in >= metadata.aslr_extents.base + metadata.aslr_extents.size)) {
+        LOG_DEBUG(CheatEngine,
+                  "Cheat attempting to access memory at invalid address={:016X}, if this "
+                  "persists, "
+                  "the cheat may be incorrect. However, this may be normal early in execution if "
+                  "the game has not properly set up yet.",
+                  in);
+        return false; ///< Invalid addresses will hard crash
+    }
+
+    return true;
+}
+
+CheatParser::~CheatParser() = default;
+
+TextCheatParser::~TextCheatParser() = default;
+
+std::vector<CheatEntry> TextCheatParser::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 (::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 (::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 += 8;
+        } 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;
+}
+
+CheatEngine::CheatEngine(System& system_, std::vector<CheatEntry> cheats_,
+                         const std::array<u8, 0x20>& build_id_)
+    : vm{std::make_unique<StandardVmCallbacks>(system_, metadata)},
+      cheats(std::move(cheats_)), core_timing{system_.CoreTiming()}, system{system_} {
+    metadata.main_nso_build_id = build_id_;
+}
+
+CheatEngine::~CheatEngine() {
+    core_timing.UnscheduleEvent(event);
+}
+
+void CheatEngine::Initialize() {
+    event = Core::Timing::CreateEvent(
+        "CheatEngine::FrameCallback::" + Common::HexToString(metadata.main_nso_build_id),
+        [this](s64 time,
+               std::chrono::nanoseconds ns_late) -> std::optional<std::chrono::nanoseconds> {
+            FrameCallback(ns_late);
+            return std::nullopt;
+        });
+    core_timing.ScheduleLoopingEvent(CHEAT_ENGINE_NS, CHEAT_ENGINE_NS, event);
+
+    metadata.process_id = system.ApplicationProcess()->GetProcessId();
+    metadata.title_id = system.GetApplicationProcessProgramID();
+
+    const auto& page_table = system.ApplicationProcess()->GetPageTable();
+    metadata.heap_extents = {
+        .base = GetInteger(page_table.GetHeapRegionStart()),
+        .size = page_table.GetHeapRegionSize(),
+    };
+    metadata.aslr_extents = {
+        .base = GetInteger(page_table.GetAliasCodeRegionStart()),
+        .size = page_table.GetAliasCodeRegionSize(),
+    };
+    metadata.alias_extents = {
+        .base = GetInteger(page_table.GetAliasRegionStart()),
+        .size = page_table.GetAliasRegionSize(),
+    };
+
+    is_pending_reload.exchange(true);
+}
+
+void CheatEngine::SetMainMemoryParameters(VAddr main_region_begin, u64 main_region_size) {
+    metadata.main_nso_extents = {
+        .base = main_region_begin,
+        .size = main_region_size,
+    };
+}
+
+void CheatEngine::Reload(std::vector<CheatEntry> reload_cheats) {
+    cheats = std::move(reload_cheats);
+    is_pending_reload.exchange(true);
+}
+
+void CheatEngine::FrameCallback(std::chrono::nanoseconds ns_late) {
+    if (is_pending_reload.exchange(false)) {
+        vm.LoadProgram(cheats);
+    }
+
+    if (vm.GetProgramSize() == 0) {
+        return;
+    }
+
+    vm.Execute(metadata);
+}
+
+} // namespace Core::Memory
--- a/src/core/memory/cheat_engine.h
+++ b/src/core/memory/cheat_engine.h
@@ -0,0 +1,88 @@
+// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <atomic>
+#include <chrono>
+#include <memory>
+#include <vector>
+#include "common/common_types.h"
+#include "core/memory/dmnt_cheat_types.h"
+#include "core/memory/dmnt_cheat_vm.h"
+
+namespace Core {
+class System;
+}
+
+namespace Core::Timing {
+class CoreTiming;
+struct EventType;
+} // namespace Core::Timing
+
+namespace Core::Memory {
+
+class StandardVmCallbacks : public DmntCheatVm::Callbacks {
+public:
+    StandardVmCallbacks(System& system_, const CheatProcessMetadata& metadata_);
+    ~StandardVmCallbacks() override;
+
+    void MemoryReadUnsafe(VAddr address, void* data, u64 size) override;
+    void MemoryWriteUnsafe(VAddr address, const void* data, u64 size) override;
+    u64 HidKeysDown() override;
+    void PauseProcess() override;
+    void ResumeProcess() override;
+    void DebugLog(u8 id, u64 value) override;
+    void CommandLog(std::string_view data) override;
+
+private:
+    bool IsAddressInRange(VAddr address) const;
+
+    const CheatProcessMetadata& metadata;
+    Core::System& system;
+};
+
+// Intermediary class that parses a text file or other disk format for storing cheats into a
+// CheatList object, that can be used for execution.
+class CheatParser {
+public:
+    virtual ~CheatParser();
+
+    [[nodiscard]] virtual std::vector<CheatEntry> Parse(std::string_view data) const = 0;
+};
+
+// CheatParser implementation that parses text files
+class TextCheatParser final : public CheatParser {
+public:
+    ~TextCheatParser() override;
+
+    [[nodiscard]] std::vector<CheatEntry> Parse(std::string_view data) const override;
+};
+
+// Class that encapsulates a CheatList and manages its interaction with memory and CoreTiming
+class CheatEngine final {
+public:
+    CheatEngine(System& system_, std::vector<CheatEntry> cheats_,
+                const std::array<u8, 0x20>& build_id_);
+    ~CheatEngine();
+
+    void Initialize();
+    void SetMainMemoryParameters(VAddr main_region_begin, u64 main_region_size);
+
+    void Reload(std::vector<CheatEntry> reload_cheats);
+
+private:
+    void FrameCallback(std::chrono::nanoseconds ns_late);
+
+    DmntCheatVm vm;
+    CheatProcessMetadata metadata;
+
+    std::vector<CheatEntry> cheats;
+    std::atomic_bool is_pending_reload{false};
+
+    std::shared_ptr<Core::Timing::EventType> event;
+    Core::Timing::CoreTiming& core_timing;
+    Core::System& system;
+};
+
+} // namespace Core::Memory
--- a/src/core/memory/dmnt_cheat_types.h
+++ b/src/core/memory/dmnt_cheat_types.h
@@ -0,0 +1,37 @@
+// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "common/common_types.h"
+
+namespace Core::Memory {
+
+struct MemoryRegionExtents {
+    u64 base{};
+    u64 size{};
+};
+
+struct CheatProcessMetadata {
+    u64 process_id{};
+    u64 title_id{};
+    MemoryRegionExtents main_nso_extents{};
+    MemoryRegionExtents heap_extents{};
+    MemoryRegionExtents alias_extents{};
+    MemoryRegionExtents aslr_extents{};
+    std::array<u8, 0x20> main_nso_build_id{};
+};
+
+struct CheatDefinition {
+    std::array<char, 0x40> readable_name{};
+    u32 num_opcodes{};
+    std::array<u32, 0x100> opcodes{};
+};
+
+struct CheatEntry {
+    bool enabled{};
+    u32 cheat_id{};
+    CheatDefinition definition{};
+};
+
+} // namespace Core::Memory
--- a/src/core/memory/dmnt_cheat_vm.cpp
+++ b/src/core/memory/dmnt_cheat_vm.cpp
--- a/src/core/memory/dmnt_cheat_vm.h
+++ b/src/core/memory/dmnt_cheat_vm.h
@@ -0,0 +1,330 @@
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <variant>
+#include <vector>
+#include <memory>
+
+#include <fmt/printf.h>
+#include "common/common_types.h"
+#include "core/memory/dmnt_cheat_types.h"
+
+namespace Core::Memory {
+
+enum class CheatVmOpcodeType : u32 {
+    StoreStatic = 0,
+    BeginConditionalBlock = 1,
+    EndConditionalBlock = 2,
+    ControlLoop = 3,
+    LoadRegisterStatic = 4,
+    LoadRegisterMemory = 5,
+    StoreStaticToAddress = 6,
+    PerformArithmeticStatic = 7,
+    BeginKeypressConditionalBlock = 8,
+
+    // These are not implemented by Gateway's VM.
+    PerformArithmeticRegister = 9,
+    StoreRegisterToAddress = 10,
+    Reserved11 = 11,
+
+    // This is a meta entry, and not a real opcode.
+    // This is to facilitate multi-nybble instruction decoding.
+    ExtendedWidth = 12,
+
+    // Extended width opcodes.
+    BeginRegisterConditionalBlock = 0xC0,
+    SaveRestoreRegister = 0xC1,
+    SaveRestoreRegisterMask = 0xC2,
+    ReadWriteStaticRegister = 0xC3,
+
+    // This is a meta entry, and not a real opcode.
+    // This is to facilitate multi-nybble instruction decoding.
+    DoubleExtendedWidth = 0xF0,
+
+    // Double-extended width opcodes.
+    PauseProcess = 0xFF0,
+    ResumeProcess = 0xFF1,
+    DebugLog = 0xFFF,
+};
+
+enum class MemoryAccessType : u32 {
+    MainNso = 0,
+    Heap = 1,
+    Alias = 2,
+    Aslr = 3,
+};
+
+enum class ConditionalComparisonType : u32 {
+    GT = 1,
+    GE = 2,
+    LT = 3,
+    LE = 4,
+    EQ = 5,
+    NE = 6,
+};
+
+enum class RegisterArithmeticType : u32 {
+    Addition = 0,
+    Subtraction = 1,
+    Multiplication = 2,
+    LeftShift = 3,
+    RightShift = 4,
+
+    // These are not supported by Gateway's VM.
+    LogicalAnd = 5,
+    LogicalOr = 6,
+    LogicalNot = 7,
+    LogicalXor = 8,
+
+    None = 9,
+};
+
+enum class StoreRegisterOffsetType : u32 {
+    None = 0,
+    Reg = 1,
+    Imm = 2,
+    MemReg = 3,
+    MemImm = 4,
+    MemImmReg = 5,
+};
+
+enum class CompareRegisterValueType : u32 {
+    MemoryRelAddr = 0,
+    MemoryOfsReg = 1,
+    RegisterRelAddr = 2,
+    RegisterOfsReg = 3,
+    StaticValue = 4,
+    OtherRegister = 5,
+};
+
+enum class SaveRestoreRegisterOpType : u32 {
+    Restore = 0,
+    Save = 1,
+    ClearSaved = 2,
+    ClearRegs = 3,
+};
+
+enum class DebugLogValueType : u32 {
+    MemoryRelAddr = 0,
+    MemoryOfsReg = 1,
+    RegisterRelAddr = 2,
+    RegisterOfsReg = 3,
+    RegisterValue = 4,
+};
+
+union VmInt {
+    u8 bit8;
+    u16 bit16;
+    u32 bit32;
+    u64 bit64;
+};
+
+struct StoreStaticOpcode {
+    u32 bit_width{};
+    MemoryAccessType mem_type{};
+    u32 offset_register{};
+    u64 rel_address{};
+    VmInt value{};
+};
+
+struct BeginConditionalOpcode {
+    u32 bit_width{};
+    MemoryAccessType mem_type{};
+    ConditionalComparisonType cond_type{};
+    u64 rel_address{};
+    VmInt value{};
+};
+
+struct EndConditionalOpcode {
+    bool is_else;
+};
+
+struct ControlLoopOpcode {
+    bool start_loop{};
+    u32 reg_index{};
+    u32 num_iters{};
+};
+
+struct LoadRegisterStaticOpcode {
+    u32 reg_index{};
+    u64 value{};
+};
+
+struct LoadRegisterMemoryOpcode {
+    u32 bit_width{};
+    MemoryAccessType mem_type{};
+    u32 reg_index{};
+    bool load_from_reg{};
+    u64 rel_address{};
+};
+
+struct StoreStaticToAddressOpcode {
+    u32 bit_width{};
+    u32 reg_index{};
+    bool increment_reg{};
+    bool add_offset_reg{};
+    u32 offset_reg_index{};
+    u64 value{};
+};
+
+struct PerformArithmeticStaticOpcode {
+    u32 bit_width{};
+    u32 reg_index{};
+    RegisterArithmeticType math_type{};
+    u32 value{};
+};
+
+struct BeginKeypressConditionalOpcode {
+    u32 key_mask{};
+};
+
+struct PerformArithmeticRegisterOpcode {
+    u32 bit_width{};
+    RegisterArithmeticType math_type{};
+    u32 dst_reg_index{};
+    u32 src_reg_1_index{};
+    u32 src_reg_2_index{};
+    bool has_immediate{};
+    VmInt value{};
+};
+
+struct StoreRegisterToAddressOpcode {
+    u32 bit_width{};
+    u32 str_reg_index{};
+    u32 addr_reg_index{};
+    bool increment_reg{};
+    StoreRegisterOffsetType ofs_type{};
+    MemoryAccessType mem_type{};
+    u32 ofs_reg_index{};
+    u64 rel_address{};
+};
+
+struct BeginRegisterConditionalOpcode {
+    u32 bit_width{};
+    ConditionalComparisonType cond_type{};
+    u32 val_reg_index{};
+    CompareRegisterValueType comp_type{};
+    MemoryAccessType mem_type{};
+    u32 addr_reg_index{};
+    u32 other_reg_index{};
+    u32 ofs_reg_index{};
+    u64 rel_address{};
+    VmInt value{};
+};
+
+struct SaveRestoreRegisterOpcode {
+    u32 dst_index{};
+    u32 src_index{};
+    SaveRestoreRegisterOpType op_type{};
+};
+
+struct SaveRestoreRegisterMaskOpcode {
+    SaveRestoreRegisterOpType op_type{};
+    std::array<bool, 0x10> should_operate{};
+};
+
+struct ReadWriteStaticRegisterOpcode {
+    u32 static_idx{};
+    u32 idx{};
+};
+
+struct PauseProcessOpcode {};
+
+struct ResumeProcessOpcode {};
+
+struct DebugLogOpcode {
+    u32 bit_width{};
+    u32 log_id{};
+    DebugLogValueType val_type{};
+    MemoryAccessType mem_type{};
+    u32 addr_reg_index{};
+    u32 val_reg_index{};
+    u32 ofs_reg_index{};
+    u64 rel_address{};
+};
+
+struct UnrecognizedInstruction {
+    CheatVmOpcodeType opcode{};
+};
+
+struct CheatVmOpcode {
+    bool begin_conditional_block{};
+    std::variant<StoreStaticOpcode, BeginConditionalOpcode, EndConditionalOpcode, ControlLoopOpcode,
+                 LoadRegisterStaticOpcode, LoadRegisterMemoryOpcode, StoreStaticToAddressOpcode,
+                 PerformArithmeticStaticOpcode, BeginKeypressConditionalOpcode,
+                 PerformArithmeticRegisterOpcode, StoreRegisterToAddressOpcode,
+                 BeginRegisterConditionalOpcode, SaveRestoreRegisterOpcode,
+                 SaveRestoreRegisterMaskOpcode, ReadWriteStaticRegisterOpcode, PauseProcessOpcode,
+                 ResumeProcessOpcode, DebugLogOpcode, UnrecognizedInstruction>
+        opcode{};
+};
+
+class DmntCheatVm {
+public:
+    /// Helper Type for DmntCheatVm <=> yuzu Interface
+    class Callbacks {
+    public:
+        virtual ~Callbacks();
+
+        virtual void MemoryReadUnsafe(VAddr address, void* data, u64 size) = 0;
+        virtual void MemoryWriteUnsafe(VAddr address, const void* data, u64 size) = 0;
+
+        virtual u64 HidKeysDown() = 0;
+
+        virtual void PauseProcess() = 0;
+        virtual void ResumeProcess() = 0;
+
+        virtual void DebugLog(u8 id, u64 value) = 0;
+        virtual void CommandLog(std::string_view data) = 0;
+    };
+
+    static constexpr std::size_t MaximumProgramOpcodeCount = 0x400;
+    static constexpr std::size_t NumRegisters = 0x10;
+    static constexpr std::size_t NumReadableStaticRegisters = 0x80;
+    static constexpr std::size_t NumWritableStaticRegisters = 0x80;
+    static constexpr std::size_t NumStaticRegisters =
+        NumReadableStaticRegisters + NumWritableStaticRegisters;
+
+    explicit DmntCheatVm(std::unique_ptr<Callbacks> callbacks_);
+    ~DmntCheatVm();
+
+    std::size_t GetProgramSize() const {
+        return this->num_opcodes;
+    }
+
+    bool LoadProgram(const std::vector<CheatEntry>& cheats);
+    void Execute(const CheatProcessMetadata& metadata);
+
+private:
+    std::unique_ptr<Callbacks> callbacks;
+
+    std::size_t num_opcodes = 0;
+    std::size_t instruction_ptr = 0;
+    std::size_t condition_depth = 0;
+    bool decode_success = false;
+    std::array<u32, MaximumProgramOpcodeCount> program{};
+    std::array<u64, NumRegisters> registers{};
+    std::array<u64, NumRegisters> saved_values{};
+    std::array<u64, NumStaticRegisters> static_registers{};
+    std::array<std::size_t, NumRegisters> loop_tops{};
+
+    bool DecodeNextOpcode(CheatVmOpcode& out);
+    void SkipConditionalBlock(bool is_if);
+    void ResetState();
+
+    // For implementing the DebugLog opcode.
+    void DebugLog(u32 log_id, u64 value);
+
+    void LogOpcode(const CheatVmOpcode& opcode);
+
+    static u64 GetVmInt(VmInt value, u32 bit_width);
+    static u64 GetCheatProcessAddress(const CheatProcessMetadata& metadata,
+                                      MemoryAccessType mem_type, u64 rel_address);
+};
+
+}; // namespace Core::Memory
--- a/src/video_core/renderer_vulkan/vk_present_manager.cpp
+++ b/src/video_core/renderer_vulkan/vk_present_manager.cpp
@@ -146,7 +146,7 @@ PresentManager::PresentManager(const vk::Instance& instance_,
            .pNext = nullptr,
            .flags = VK_FENCE_CREATE_SIGNALED_BIT,
        });
-        free_queue.push_back(&frame);
+        free_queue.push(&frame);
    }

    if (use_present_thread) {
@@ -164,7 +164,7 @@ Frame* PresentManager::GetRenderFrame() {

    // Take the frame from the queue
    Frame* frame = free_queue.front();
-    free_queue.pop_front();
+    free_queue.pop();

    // Wait for the presentation to be finished so all frame resources are free
    frame->present_done.Wait();
@@ -174,17 +174,18 @@ Frame* PresentManager::GetRenderFrame() {
 }

 void PresentManager::Present(Frame* frame) {
-    if (use_present_thread) {
-        scheduler.Record([this, frame](vk::CommandBuffer) {
-            std::unique_lock lock{queue_mutex};
-            present_queue.push_back(frame);
-            frame_cv.notify_one();
-        });
-    } else {
+    if (!use_present_thread) {
        scheduler.WaitWorker();
        CopyToSwapchain(frame);
-        free_queue.push_back(frame);
+        free_queue.push(frame);
+        return;
    }
+
+    scheduler.Record([this, frame](vk::CommandBuffer) {
+        std::unique_lock lock{queue_mutex};
+        present_queue.push(frame);
+        frame_cv.notify_one();
+    });
 }

 void PresentManager::RecreateFrame(Frame* frame, u32 width, u32 height, VkFormat image_view_format,
@@ -276,25 +277,29 @@ void PresentManager::PresentThread(std::stop_token token) {
    Common::SetCurrentThreadName("VulkanPresent");
    while (!token.stop_requested()) {
        std::unique_lock lock{queue_mutex};
+
        // Wait for presentation frames
        frame_cv.wait(lock, token, [this] { return !present_queue.empty(); });
-        if (!token.stop_requested()) {
-            // Take the frame and notify anyone waiting
-            Frame* frame = present_queue.front();
-            present_queue.pop_front();
-            frame_cv.notify_one();
-
-            // By exchanging the lock ownership we take the swapchain lock
-            // before the queue lock goes out of scope. This way the swapchain
-            // lock in WaitPresent is guaranteed to occur after here.
-            std::exchange(lock, std::unique_lock{swapchain_mutex});
-            CopyToSwapchain(frame);
-
-            // Free the frame for reuse
-            std::scoped_lock fl{free_mutex};
-            free_queue.push_back(frame);
-            free_cv.notify_one();
+        if (token.stop_requested()) {
+            return;
        }
+
+        // Take the frame and notify anyone waiting
+        Frame* frame = present_queue.front();
+        present_queue.pop();
+        frame_cv.notify_one();
+
+        // By exchanging the lock ownership we take the swapchain lock
+        // before the queue lock goes out of scope. This way the swapchain
+        // lock in WaitPresent is guaranteed to occur after here.
+        std::exchange(lock, std::unique_lock{swapchain_mutex});
+
+        CopyToSwapchain(frame);
+
+        // Free the frame for reuse
+        std::scoped_lock fl{free_mutex};
+        free_queue.push(frame);
+        free_cv.notify_one();
    }
 }

--- a/src/video_core/renderer_vulkan/vk_present_manager.h
+++ b/src/video_core/renderer_vulkan/vk_present_manager.h
@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 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

@@ -8,7 +5,7 @@

 #include <condition_variable>
 #include <mutex>
-#include <boost/container/deque.hpp>
+#include <queue>

 #include "common/common_types.h"
 #include "common/polyfill_thread.h"
@@ -91,8 +88,8 @@ private:
 #endif
    vk::CommandPool cmdpool;
    std::vector<Frame> frames;
-    boost::container::deque<Frame*> present_queue;
-    boost::container::deque<Frame*> free_queue;
+    std::queue<Frame*> present_queue;
+    std::queue<Frame*> free_queue;
    std::condition_variable_any frame_cv;
    std::condition_variable free_cv;
    std::mutex swapchain_mutex;
--- a/src/video_core/vulkan_common/vulkan_instance.cpp
+++ b/src/video_core/vulkan_common/vulkan_instance.cpp
@@ -79,7 +79,9 @@ namespace {
 #endif
        if (enable_validation && AreExtensionsSupported(dld, *properties, std::array{VK_EXT_DEBUG_UTILS_EXTENSION_NAME}))
            extensions.push_back(VK_EXT_DEBUG_UTILS_EXTENSION_NAME);
-
+        // VK_EXT_surface_maintenance1 is required for VK_EXT_swapchain_maintenance1
+        if (window_type != Core::Frontend::WindowSystemType::Headless && AreExtensionsSupported(dld, *properties, std::array{VK_EXT_SURFACE_MAINTENANCE_1_EXTENSION_NAME}))
+            extensions.push_back(VK_EXT_SURFACE_MAINTENANCE_1_EXTENSION_NAME);
    }
    return extensions;
 }
--- a/src/yuzu/configuration/configure_per_game_addons.cpp
+++ b/src/yuzu/configuration/configure_per_game_addons.cpp
@@ -5,8 +5,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later

 #include <algorithm>
-#include <functional>
-#include <map>
 #include <memory>
 #include <utility>

@@ -75,32 +73,10 @@ ConfigurePerGameAddons::~ConfigurePerGameAddons() = default;
 void ConfigurePerGameAddons::ApplyConfiguration() {
    std::vector<std::string> disabled_addons;

-    // Helper function to recursively collect disabled items
-    std::function<void(QStandardItem*)> collect_disabled = [&](QStandardItem* item) {
-        if (item == nullptr) {
-            return;
-        }
-
-        // Check if this item is disabled
-        if (item->isCheckable() && item->checkState() == Qt::Unchecked) {
-            // Use the stored key from UserRole, falling back to text
-            const auto key = item->data(Qt::UserRole).toString();
-            if (!key.isEmpty()) {
-                disabled_addons.push_back(key.toStdString());
-            } else {
-                disabled_addons.push_back(item->text().toStdString());
-            }
-        }
-
-        // Process children (for cheats under mods)
-        for (int row = 0; row < item->rowCount(); ++row) {
-            collect_disabled(item->child(row, 0));
-        }
-    };
-
-    // Process all root items
-    for (int row = 0; row < item_model->rowCount(); ++row) {
-        collect_disabled(item_model->item(row, 0));
+    for (const auto& item : list_items) {
+        const auto disabled = item.front()->checkState() == Qt::Unchecked;
+        if (disabled)
+            disabled_addons.push_back(item.front()->text().toStdString());
    }

    auto current = Settings::values.disabled_addons[title_id];
@@ -147,61 +123,24 @@ void ConfigurePerGameAddons::LoadConfiguration() {
    FileSys::VirtualFile update_raw;
    loader->ReadUpdateRaw(update_raw);

-    // Get the build ID from the main executable for cheat enumeration
-    const auto build_id = pm.GetBuildID(update_raw);
-
    const auto& disabled = Settings::values.disabled_addons[title_id];

-    // Map to store parent items for mods (for adding cheat children)
-    std::map<std::string, QStandardItem*> mod_items;
-
-    for (const auto& patch : pm.GetPatches(update_raw, build_id)) {
+    for (const auto& patch : pm.GetPatches(update_raw)) {
        const auto name = QString::fromStdString(patch.name);

-        // For cheats, we need to use the full key (parent::name) for storage
-        std::string storage_key;
-        if (patch.type == FileSys::PatchType::Cheat && !patch.parent_name.empty()) {
-            storage_key = patch.parent_name + "::" + patch.name;
-        } else {
-            storage_key = patch.name;
-        }
-
        auto* const first_item = new QStandardItem;
        first_item->setText(name);
        first_item->setCheckable(true);

-        // Store the storage key as user data for later retrieval
-        first_item->setData(QString::fromStdString(storage_key), Qt::UserRole);
-
        const auto patch_disabled =
-            std::find(disabled.begin(), disabled.end(), storage_key) != disabled.end();
+            std::find(disabled.begin(), disabled.end(), name.toStdString()) != disabled.end();

        first_item->setCheckState(patch_disabled ? Qt::Unchecked : Qt::Checked);

-        auto* const version_item = new QStandardItem{QString::fromStdString(patch.version)};
-
-        if (patch.type == FileSys::PatchType::Cheat && !patch.parent_name.empty()) {
-            // This is a cheat - add as child of its parent mod
-            auto parent_it = mod_items.find(patch.parent_name);
-            if (parent_it != mod_items.end()) {
-                parent_it->second->appendRow(QList<QStandardItem*>{first_item, version_item});
-            } else {
-                // Parent not found (shouldn't happen), add to root
-                list_items.push_back(QList<QStandardItem*>{first_item, version_item});
-                item_model->appendRow(list_items.back());
-            }
-        } else {
-            // This is a top-level item (Update, Mod, DLC)
-            list_items.push_back(QList<QStandardItem*>{first_item, version_item});
-            item_model->appendRow(list_items.back());
-
-            // Store mod items for later cheat attachment
-            if (patch.type == FileSys::PatchType::Mod) {
-                mod_items[patch.name] = first_item;
-            }
-        }
+        list_items.push_back(QList<QStandardItem*>{
+            first_item, new QStandardItem{QString::fromStdString(patch.version)}});
+        item_model->appendRow(list_items.back());
    }

-    tree_view->expandAll();
    tree_view->resizeColumnToContents(1);
 }