Android 192

Merge yuzu-emu#12659
Merge yuzu-emu#12652
2024-01-14 01:01:39 +00:00 · 2024-01-14 01:01:39 +00:00 · 2024-01-14 01:01:39 +00:00 · 2024-01-14 01:01:39 +00:00 · 2024-01-14 01:01:39 +00:00 · 2024-01-14 01:01:39 +00:00
189 changed files with 2010 additions and 3461 deletions
--- a/.ci/scripts/format/script.sh
+++ b/.ci/scripts/format/script.sh
@ -32,6 +32,3 @@ if [ ! -z "$DIFF" ]; then
    echo "$DIFF"
    exit 1
 fi
-
-cd src/android
-./gradlew ktlintCheck
--- a/.ci/yuzu-mainline-step2.yml
+++ b/.ci/yuzu-mainline-step2.yml
@ -8,7 +8,17 @@ variables:
  DisplayVersion: $[counter(variables['DisplayPrefix'], 1)]

 stages:
+- stage: format
+  displayName: 'format'
+  jobs:
+  - job: format
+    displayName: 'clang'
+    pool:
+      vmImage: ubuntu-latest
+    steps:
+    - template: ./templates/format-check.yml
 - stage: build
+  dependsOn: format
  displayName: 'build'
  jobs:
  - job: build
@ -33,6 +43,7 @@ stages:
        cache: 'true'
        version: $(DisplayVersion)
 - stage: build_win
+  dependsOn: format
  displayName: 'build-windows'
  jobs:
  - job: build
--- a/.github/workflows/verify.yml
+++ b/.github/workflows/verify.yml
@ -13,15 +13,13 @@ jobs:
  format:
    name: 'verify format'
    runs-on: ubuntu-latest
+    container:
+      image: yuzuemu/build-environments:linux-clang-format
+      options: -u 1001
    steps:
      - uses: actions/checkout@v3
        with:
          submodules: false
-      - name: set up JDK 17
-        uses: actions/setup-java@v3
-        with:
-          java-version: '17'
-          distribution: 'temurin'
      - name: 'Verify Formatting'
        run: bash -ex ./.ci/scripts/format/script.sh
  build:
--- a/README.md
+++ b/README.md
@ -1,10 +1,11 @@
 | Pull Request | Commit | Title | Author | Merged? |
 |----|----|----|----|----|
-| [12579](https://github.com/yuzu-emu/yuzu-android//pull/12579) | [`748465f5a`](https://github.com/yuzu-emu/yuzu-android//pull/12579/files) | Core: Implement Device Mapping & GPU SMMU | [FernandoS27](https://github.com/FernandoS27/) | Yes |
-| [12660](https://github.com/yuzu-emu/yuzu-android//pull/12660) | [`2cacb9d48`](https://github.com/yuzu-emu/yuzu-android//pull/12660/files) | service: hid: Fully implement abstract vibration | [german77](https://github.com/german77/) | Yes |
-| [12688](https://github.com/yuzu-emu/yuzu-android//pull/12688) | [`e9eb017aa`](https://github.com/yuzu-emu/yuzu-android//pull/12688/files) | renderer_vulkan: recreate swapchain when frame size changes | [liamwhite](https://github.com/liamwhite/) | Yes |
-| [12701](https://github.com/yuzu-emu/yuzu-android//pull/12701) | [`e4bbb24dc`](https://github.com/yuzu-emu/yuzu-android//pull/12701/files) |  vi: check layer state before opening or closing | [liamwhite](https://github.com/liamwhite/) | Yes |
-| [12715](https://github.com/yuzu-emu/yuzu-android//pull/12715) | [`47058d705`](https://github.com/yuzu-emu/yuzu-android//pull/12715/files) | android: Add uninstall addon button | [t895](https://github.com/t895/) | Yes |
+| [12579](https://github.com/yuzu-emu/yuzu-android//pull/12579) | [`66ae60a9e`](https://github.com/yuzu-emu/yuzu-android//pull/12579/files) | Core: Implement Device Mapping & GPU SMMU | [FernandoS27](https://github.com/FernandoS27/) | Yes |
+| [12610](https://github.com/yuzu-emu/yuzu-android//pull/12610) | [`200b371d1`](https://github.com/yuzu-emu/yuzu-android//pull/12610/files) | server_manager: respond to session close correctly | [liamwhite](https://github.com/liamwhite/) | Yes |
+| [12611](https://github.com/yuzu-emu/yuzu-android//pull/12611) | [`2f0b57ca1`](https://github.com/yuzu-emu/yuzu-android//pull/12611/files) | kernel: fix resource management issues | [liamwhite](https://github.com/liamwhite/) | Yes |
+| [12612](https://github.com/yuzu-emu/yuzu-android//pull/12612) | [`76880b84f`](https://github.com/yuzu-emu/yuzu-android//pull/12612/files) | fsp-srv: use program registry for SetCurrentProcess | [liamwhite](https://github.com/liamwhite/) | Yes |
+| [12652](https://github.com/yuzu-emu/yuzu-android//pull/12652) | [`2a0d707ce`](https://github.com/yuzu-emu/yuzu-android//pull/12652/files) | shader_recompiler: emulate 8-bit and 16-bit storage writes with cas loop | [liamwhite](https://github.com/liamwhite/) | Yes |
+| [12659](https://github.com/yuzu-emu/yuzu-android//pull/12659) | [`d94097478`](https://github.com/yuzu-emu/yuzu-android//pull/12659/files) | audio: fetch process object from handle table | [liamwhite](https://github.com/liamwhite/) | Yes |


 End of merge log. You can find the original README.md below the break.
--- a/src/android/app/build.gradle.kts
+++ b/src/android/app/build.gradle.kts
@ -188,15 +188,8 @@ tasks.create<Delete>("ktlintReset") {
    delete(File(buildDir.path + File.separator + "intermediates/ktLint"))
 }

-val showFormatHelp = {
-    logger.lifecycle(
-        "If this check fails, please try running \"gradlew ktlintFormat\" for automatic " +
-            "codestyle fixes"
-    )
-}
-tasks.getByPath("ktlintKotlinScriptCheck").doFirst { showFormatHelp.invoke() }
-tasks.getByPath("ktlintMainSourceSetCheck").doFirst { showFormatHelp.invoke() }
 tasks.getByPath("loadKtlintReporters").dependsOn("ktlintReset")
+tasks.getByPath("preBuild").dependsOn("ktlintCheck")

 ktlint {
    version.set("0.47.1")
@ -235,33 +228,71 @@ dependencies {
    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0")
 }

-fun runGitCommand(command: List<String>): String {
-    return try {
-        ProcessBuilder(command)
+fun getGitVersion(): String {
+    var versionName = "0.0"
+
+    try {
+        versionName = ProcessBuilder("git", "describe", "--always", "--long")
            .directory(project.rootDir)
            .redirectOutput(ProcessBuilder.Redirect.PIPE)
            .redirectError(ProcessBuilder.Redirect.PIPE)
            .start().inputStream.bufferedReader().use { it.readText() }
            .trim()
-    } catch (e: Exception) {
-        logger.error("Cannot find git")
-        ""
-    }
-}
-
-fun getGitVersion(): String {
-    val versionName = if (System.getenv("GITHUB_ACTIONS") != null) {
-        val gitTag = System.getenv("GIT_TAG_NAME") ?: ""
-        gitTag
-    } else {
-        runGitCommand(listOf("git", "describe", "--always", "--long"))
            .replace(Regex("(-0)?-[^-]+$"), "")
+    } catch (e: Exception) {
+        logger.error("Cannot find git, defaulting to dummy version number")
    }
-    return versionName.ifEmpty { "0.0" }
+
+    if (System.getenv("GITHUB_ACTIONS") != null) {
+        val gitTag = System.getenv("GIT_TAG_NAME")
+        versionName = gitTag ?: versionName
+    }
+
+    return versionName
 }

-fun getGitHash(): String =
-    runGitCommand(listOf("git", "rev-parse", "--short", "HEAD")).ifEmpty { "dummy-hash" }
+fun getGitHash(): String {
+    try {
+        val processBuilder = ProcessBuilder("git", "rev-parse", "--short", "HEAD")
+        processBuilder.directory(project.rootDir)
+        val process = processBuilder.start()
+        val inputStream = process.inputStream
+        val errorStream = process.errorStream
+        process.waitFor()

-fun getBranch(): String =
-    runGitCommand(listOf("git", "rev-parse", "--abbrev-ref", "HEAD")).ifEmpty { "dummy-hash" }
+        return if (process.exitValue() == 0) {
+            inputStream.bufferedReader()
+                .use { it.readText().trim() } // return the value of gitHash
+        } else {
+            val errorMessage = errorStream.bufferedReader().use { it.readText().trim() }
+            logger.error("Error running git command: $errorMessage")
+            "dummy-hash" // return a dummy hash value in case of an error
+        }
+    } catch (e: Exception) {
+        logger.error("$e: Cannot find git, defaulting to dummy build hash")
+        return "dummy-hash" // return a dummy hash value in case of an error
+    }
+}
+
+fun getBranch(): String {
+    try {
+        val processBuilder = ProcessBuilder("git", "rev-parse", "--abbrev-ref", "HEAD")
+        processBuilder.directory(project.rootDir)
+        val process = processBuilder.start()
+        val inputStream = process.inputStream
+        val errorStream = process.errorStream
+        process.waitFor()
+
+        return if (process.exitValue() == 0) {
+            inputStream.bufferedReader()
+                .use { it.readText().trim() } // return the value of gitHash
+        } else {
+            val errorMessage = errorStream.bufferedReader().use { it.readText().trim() }
+            logger.error("Error running git command: $errorMessage")
+            "dummy-hash" // return a dummy hash value in case of an error
+        }
+    } catch (e: Exception) {
+        logger.error("$e: Cannot find git, defaulting to dummy build hash")
+        return "dummy-hash" // return a dummy hash value in case of an error
+    }
+}
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt
@ -21,8 +21,6 @@ import org.yuzu.yuzu_emu.utils.DocumentsTree
 import org.yuzu.yuzu_emu.utils.FileUtil
 import org.yuzu.yuzu_emu.utils.Log
 import org.yuzu.yuzu_emu.utils.SerializableHelper.serializable
-import org.yuzu.yuzu_emu.model.InstallResult
-import org.yuzu.yuzu_emu.model.Patch

 /**
 * Class which contains methods that interact
@ -237,12 +235,9 @@ object NativeLibrary {
    /**
     * Installs a nsp or xci file to nand
     * @param filename String representation of file uri
-     * @return int representation of [InstallResult]
+     * @param extension Lowercase string representation of file extension without "."
     */
-    external fun installFileToNand(
-        filename: String,
-        callback: (max: Long, progress: Long) -> Boolean
-    ): Int
+    external fun installFileToNand(filename: String, extension: String): Int

    external fun doesUpdateMatchProgram(programId: String, updatePath: String): Boolean

@ -540,29 +535,9 @@ object NativeLibrary {
     *
     * @param path Path to game file. Can be a [Uri].
     * @param programId String representation of a game's program ID
-     * @return Array of available patches
+     * @return Array of pairs where the first value is the name of an addon and the second is the version
     */
-    external fun getPatchesForFile(path: String, programId: String): Array<Patch>?
-
-    /**
-     * Removes an update for a given [programId]
-     * @param programId String representation of a game's program ID
-     */
-    external fun removeUpdate(programId: String)
-
-    /**
-     * Removes DLC by its unique [titleId]
-     * @param titleId String representation of a DLC's title ID
-     */
-    external fun removeDLC(titleId: String)
-
-    /**
-     * Removes a mod installed for a given [programId]
-     * @param programId String representation of a game's program ID
-     * @param name The name of a mod as given by [getPatchesForFile]. This corresponds with the name
-     * of the mod's directory in a game's load folder.
-     */
-    external fun removeMod(programId: String, name: String)
+    external fun getAddonsForFile(path: String, programId: String): Array<Pair<String, String>>?

    /**
     * Gets the save location for a specific game
@ -634,4 +609,15 @@ object NativeLibrary {
        const val RELEASED = 0
        const val PRESSED = 1
    }
+
+    /**
+     * Result from installFileToNand
+     */
+    object InstallFileToNandResult {
+        const val Success = 0
+        const val SuccessFileOverwritten = 1
+        const val Error = 2
+        const val ErrorBaseGame = 3
+        const val ErrorFilenameExtension = 4
+    }
 }
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt
@ -49,6 +49,7 @@ import org.yuzu.yuzu_emu.utils.ForegroundService
 import org.yuzu.yuzu_emu.utils.InputHandler
 import org.yuzu.yuzu_emu.utils.Log
 import org.yuzu.yuzu_emu.utils.MemoryUtil
+import org.yuzu.yuzu_emu.utils.NativeConfig
 import org.yuzu.yuzu_emu.utils.NfcReader
 import org.yuzu.yuzu_emu.utils.ThemeHelper
 import java.text.NumberFormat
@ -170,6 +171,11 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
        stopMotionSensorListener()
    }

+    override fun onStop() {
+        super.onStop()
+        NativeConfig.saveGlobalConfig()
+    }
+
    override fun onUserLeaveHint() {
        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
            if (BooleanSetting.PICTURE_IN_PICTURE.getBoolean() && !isInPictureInPictureMode) {
--- 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,32 +6,27 @@ package org.yuzu.yuzu_emu.adapters
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import org.yuzu.yuzu_emu.databinding.ListItemAddonBinding
-import org.yuzu.yuzu_emu.model.Patch
-import org.yuzu.yuzu_emu.model.AddonViewModel
+import org.yuzu.yuzu_emu.model.Addon
 import org.yuzu.yuzu_emu.viewholder.AbstractViewHolder

-class AddonAdapter(val addonViewModel: AddonViewModel) :
-    AbstractDiffAdapter<Patch, AddonAdapter.AddonViewHolder>() {
+class AddonAdapter : AbstractDiffAdapter<Addon, AddonAdapter.AddonViewHolder>() {
    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AddonViewHolder {
        ListItemAddonBinding.inflate(LayoutInflater.from(parent.context), parent, false)
            .also { return AddonViewHolder(it) }
    }

    inner class AddonViewHolder(val binding: ListItemAddonBinding) :
-        AbstractViewHolder<Patch>(binding) {
-        override fun bind(model: Patch) {
+        AbstractViewHolder<Addon>(binding) {
+        override fun bind(model: Addon) {
            binding.root.setOnClickListener {
-                binding.addonCheckbox.isChecked = !binding.addonCheckbox.isChecked
+                binding.addonSwitch.isChecked = !binding.addonSwitch.isChecked
            }
-            binding.title.text = model.name
+            binding.title.text = model.title
            binding.version.text = model.version
-            binding.addonCheckbox.setOnCheckedChangeListener { _, checked ->
+            binding.addonSwitch.setOnCheckedChangeListener { _, checked ->
                model.enabled = checked
            }
-            binding.addonCheckbox.isChecked = model.enabled
-            binding.buttonDelete.setOnClickListener {
-                addonViewModel.setAddonToDelete(model)
-            }
+            binding.addonSwitch.isChecked = model.enabled
        }
    }
 }
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AboutFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AboutFragment.kt
@ -76,8 +76,8 @@ class AboutFragment : Fragment() {
            binding.root.findNavController().navigate(R.id.action_aboutFragment_to_licensesFragment)
        }

-        binding.textVersionName.text = BuildConfig.VERSION_NAME
-        binding.textVersionName.setOnClickListener {
+        binding.textBuildHash.text = BuildConfig.GIT_HASH
+        binding.buttonBuildHash.setOnClickListener {
            val clipBoard =
                requireContext().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
            val clip = ClipData.newPlainText(getString(R.string.build), BuildConfig.GIT_HASH)
--- 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
@ -74,7 +74,7 @@ class AddonsFragment : Fragment() {

        binding.listAddons.apply {
            layoutManager = LinearLayoutManager(requireContext())
-            adapter = AddonAdapter(addonViewModel)
+            adapter = AddonAdapter()
        }

        viewLifecycleOwner.lifecycleScope.apply {
@ -110,21 +110,6 @@ class AddonsFragment : Fragment() {
                    }
                }
            }
-            launch {
-                repeatOnLifecycle(Lifecycle.State.STARTED) {
-                    addonViewModel.addonToDelete.collect {
-                        if (it != null) {
-                            MessageDialogFragment.newInstance(
-                                requireActivity(),
-                                titleId = R.string.confirm_uninstall,
-                                descriptionId = R.string.confirm_uninstall_description,
-                                positiveAction = { addonViewModel.onDeleteAddon(it) }
-                            ).show(parentFragmentManager, MessageDialogFragment.TAG)
-                            addonViewModel.setAddonToDelete(null)
-                        }
-                    }
-                }
-            }
        }

        binding.buttonInstall.setOnClickListener {
@ -171,22 +156,22 @@ class AddonsFragment : Fragment() {
                descriptionId = R.string.invalid_directory_description
            )
            if (isValid) {
-                ProgressDialogFragment.newInstance(
+                IndeterminateProgressDialogFragment.newInstance(
                    requireActivity(),
                    R.string.installing_game_content,
                    false
-                ) { progressCallback, _ ->
+                ) {
                    val parentDirectoryName = externalAddonDirectory.name
                    val internalAddonDirectory =
                        File(args.game.addonDir + parentDirectoryName)
                    try {
-                        externalAddonDirectory.copyFilesTo(internalAddonDirectory, progressCallback)
+                        externalAddonDirectory.copyFilesTo(internalAddonDirectory)
                    } catch (_: Exception) {
                        return@newInstance errorMessage
                    }
                    addonViewModel.refreshAddons()
                    return@newInstance getString(R.string.addon_installed_successfully)
-                }.show(parentFragmentManager, ProgressDialogFragment.TAG)
+                }.show(parentFragmentManager, IndeterminateProgressDialogFragment.TAG)
            } else {
                errorMessage.show(parentFragmentManager, MessageDialogFragment.TAG)
            }
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/DriverManagerFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/DriverManagerFragment.kt
@ -173,11 +173,11 @@ class DriverManagerFragment : Fragment() {
                return@registerForActivityResult
            }

-            ProgressDialogFragment.newInstance(
+            IndeterminateProgressDialogFragment.newInstance(
                requireActivity(),
                R.string.installing_driver,
                false
-            ) { _, _ ->
+            ) {
                val driverPath =
                    "${GpuDriverHelper.driverStoragePath}${FileUtil.getFilename(result)}"
                val driverFile = File(driverPath)
@ -213,6 +213,6 @@ class DriverManagerFragment : Fragment() {
                    }
                }
                return@newInstance Any()
-            }.show(childFragmentManager, ProgressDialogFragment.TAG)
+            }.show(childFragmentManager, IndeterminateProgressDialogFragment.TAG)
        }
 }
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt
@ -554,7 +554,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
            findItem(R.id.menu_touchscreen).isChecked = BooleanSetting.TOUCHSCREEN.getBoolean()
        }

-        popup.setOnDismissListener { NativeConfig.saveGlobalConfig() }
        popup.setOnMenuItemClickListener {
            when (it.itemId) {
                R.id.menu_toggle_fps -> {
@ -721,9 +720,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
        MaterialAlertDialogBuilder(requireContext())
            .setTitle(R.string.emulation_control_adjust)
            .setView(adjustBinding.root)
-            .setPositiveButton(android.R.string.ok) { _: DialogInterface?, _: Int ->
-                NativeConfig.saveGlobalConfig()
-            }
+            .setPositiveButton(android.R.string.ok, null)
            .setNeutralButton(R.string.slider_default) { _: DialogInterface?, _: Int ->
                setControlScale(50)
                setControlOpacity(100)
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GamePropertiesFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GamePropertiesFragment.kt
@ -44,6 +44,7 @@ import org.yuzu.yuzu_emu.utils.FileUtil
 import org.yuzu.yuzu_emu.utils.GameIconUtils
 import org.yuzu.yuzu_emu.utils.GpuDriverHelper
 import org.yuzu.yuzu_emu.utils.MemoryUtil
+import java.io.BufferedInputStream
 import java.io.BufferedOutputStream
 import java.io.File

@ -356,17 +357,27 @@ class GamePropertiesFragment : Fragment() {
                return@registerForActivityResult
            }

+            val inputZip = requireContext().contentResolver.openInputStream(result)
            val savesFolder = File(args.game.saveDir)
            val cacheSaveDir = File("${requireContext().cacheDir.path}/saves/")
            cacheSaveDir.mkdir()

-            ProgressDialogFragment.newInstance(
+            if (inputZip == null) {
+                Toast.makeText(
+                    YuzuApplication.appContext,
+                    getString(R.string.fatal_error),
+                    Toast.LENGTH_LONG
+                ).show()
+                return@registerForActivityResult
+            }
+
+            IndeterminateProgressDialogFragment.newInstance(
                requireActivity(),
                R.string.save_files_importing,
                false
-            ) { _, _ ->
+            ) {
                try {
-                    FileUtil.unzipToInternalStorage(result.toString(), cacheSaveDir)
+                    FileUtil.unzipToInternalStorage(BufferedInputStream(inputZip), cacheSaveDir)
                    val files = cacheSaveDir.listFiles()
                    var savesFolderFile: File? = null
                    if (files != null) {
@ -411,7 +422,7 @@ class GamePropertiesFragment : Fragment() {
                        Toast.LENGTH_LONG
                    ).show()
                }
-            }.show(parentFragmentManager, ProgressDialogFragment.TAG)
+            }.show(parentFragmentManager, IndeterminateProgressDialogFragment.TAG)
        }

    /**
@ -425,11 +436,11 @@ class GamePropertiesFragment : Fragment() {
            return@registerForActivityResult
        }

-        ProgressDialogFragment.newInstance(
+        IndeterminateProgressDialogFragment.newInstance(
            requireActivity(),
            R.string.save_files_exporting,
            false
-        ) { _, _ ->
+        ) {
            val saveLocation = args.game.saveDir
            val zipResult = FileUtil.zipFromInternalStorage(
                File(saveLocation),
@ -441,6 +452,6 @@ class GamePropertiesFragment : Fragment() {
                TaskState.Completed -> getString(R.string.export_success)
                TaskState.Cancelled, TaskState.Failed -> getString(R.string.export_failed)
            }
-        }.show(parentFragmentManager, ProgressDialogFragment.TAG)
+        }.show(parentFragmentManager, IndeterminateProgressDialogFragment.TAG)
    }
 }
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/IndeterminateProgressDialogFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/IndeterminateProgressDialogFragment.kt
@ -23,13 +23,11 @@ import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.databinding.DialogProgressBarBinding
 import org.yuzu.yuzu_emu.model.TaskViewModel

-class ProgressDialogFragment : DialogFragment() {
+class IndeterminateProgressDialogFragment : DialogFragment() {
    private val taskViewModel: TaskViewModel by activityViewModels()

    private lateinit var binding: DialogProgressBarBinding

-    private val PROGRESS_BAR_RESOLUTION = 1000
-
    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
        val titleId = requireArguments().getInt(TITLE)
        val cancellable = requireArguments().getBoolean(CANCELLABLE)
@ -63,7 +61,6 @@ class ProgressDialogFragment : DialogFragment() {

    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
        super.onViewCreated(view, savedInstanceState)
-        binding.message.isSelected = true
        viewLifecycleOwner.lifecycleScope.apply {
            launch {
                repeatOnLifecycle(Lifecycle.State.CREATED) {
@ -100,35 +97,6 @@ class ProgressDialogFragment : DialogFragment() {
                    }
                }
            }
-            launch {
-                repeatOnLifecycle(Lifecycle.State.CREATED) {
-                    taskViewModel.progress.collect {
-                        if (it != 0.0) {
-                            binding.progressBar.apply {
-                                isIndeterminate = false
-                                progress = (
-                                    (it / taskViewModel.maxProgress.value) *
-                                        PROGRESS_BAR_RESOLUTION
-                                    ).toInt()
-                                min = 0
-                                max = PROGRESS_BAR_RESOLUTION
-                            }
-                        }
-                    }
-                }
-            }
-            launch {
-                repeatOnLifecycle(Lifecycle.State.CREATED) {
-                    taskViewModel.message.collect {
-                        if (it.isEmpty()) {
-                            binding.message.visibility = View.GONE
-                        } else {
-                            binding.message.visibility = View.VISIBLE
-                            binding.message.text = it
-                        }
-                    }
-                }
-            }
        }
    }

@ -140,7 +108,6 @@ class ProgressDialogFragment : DialogFragment() {
        val negativeButton = alertDialog.getButton(Dialog.BUTTON_NEGATIVE)
        negativeButton.setOnClickListener {
            alertDialog.setTitle(getString(R.string.cancelling))
-            binding.progressBar.isIndeterminate = true
            taskViewModel.setCancelled(true)
        }
    }
@ -155,12 +122,9 @@ class ProgressDialogFragment : DialogFragment() {
            activity: FragmentActivity,
            titleId: Int,
            cancellable: Boolean = false,
-            task: suspend (
-                progressCallback: (max: Long, progress: Long) -> Boolean,
-                messageCallback: (message: String) -> Unit
-            ) -> Any
-        ): ProgressDialogFragment {
-            val dialog = ProgressDialogFragment()
+            task: suspend () -> Any
+        ): IndeterminateProgressDialogFragment {
+            val dialog = IndeterminateProgressDialogFragment()
            val args = Bundle()
            ViewModelProvider(activity)[TaskViewModel::class.java].task = task
            args.putInt(TITLE, titleId)
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/InstallableFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/InstallableFragment.kt
@ -34,6 +34,7 @@ import org.yuzu.yuzu_emu.model.TaskState
 import org.yuzu.yuzu_emu.ui.main.MainActivity
 import org.yuzu.yuzu_emu.utils.DirectoryInitialization
 import org.yuzu.yuzu_emu.utils.FileUtil
+import java.io.BufferedInputStream
 import java.io.BufferedOutputStream
 import java.io.File
 import java.math.BigInteger
@ -194,20 +195,26 @@ class InstallableFragment : Fragment() {
                return@registerForActivityResult
            }

+            val inputZip = requireContext().contentResolver.openInputStream(result)
            val cacheSaveDir = File("${requireContext().cacheDir.path}/saves/")
            cacheSaveDir.mkdir()

-            ProgressDialogFragment.newInstance(
+            if (inputZip == null) {
+                Toast.makeText(
+                    YuzuApplication.appContext,
+                    getString(R.string.fatal_error),
+                    Toast.LENGTH_LONG
+                ).show()
+                return@registerForActivityResult
+            }
+
+            IndeterminateProgressDialogFragment.newInstance(
                requireActivity(),
                R.string.save_files_importing,
                false
-            ) { progressCallback, _ ->
+            ) {
                try {
-                    FileUtil.unzipToInternalStorage(
-                        result.toString(),
-                        cacheSaveDir,
-                        progressCallback
-                    )
+                    FileUtil.unzipToInternalStorage(BufferedInputStream(inputZip), cacheSaveDir)
                    val files = cacheSaveDir.listFiles()
                    var successfulImports = 0
                    var failedImports = 0
@ -280,7 +287,7 @@ class InstallableFragment : Fragment() {
                        Toast.LENGTH_LONG
                    ).show()
                }
-            }.show(parentFragmentManager, ProgressDialogFragment.TAG)
+            }.show(parentFragmentManager, IndeterminateProgressDialogFragment.TAG)
        }

    private val exportSaves = registerForActivityResult(
@ -290,11 +297,11 @@ class InstallableFragment : Fragment() {
            return@registerForActivityResult
        }

-        ProgressDialogFragment.newInstance(
+        IndeterminateProgressDialogFragment.newInstance(
            requireActivity(),
            R.string.save_files_exporting,
            false
-        ) { _, _ ->
+        ) {
            val cacheSaveDir = File("${requireContext().cacheDir.path}/saves/")
            cacheSaveDir.mkdir()

@ -331,6 +338,6 @@ class InstallableFragment : Fragment() {
                TaskState.Completed -> getString(R.string.export_success)
                TaskState.Cancelled, TaskState.Failed -> getString(R.string.export_failed)
            }
-        }.show(parentFragmentManager, ProgressDialogFragment.TAG)
+        }.show(parentFragmentManager, IndeterminateProgressDialogFragment.TAG)
    }
 }
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/Addon.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/Addon.kt
@ -0,0 +1,10 @@
+// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+package org.yuzu.yuzu_emu.model
+
+data class Addon(
+    var enabled: Boolean,
+    val title: String,
+    val version: String
+)
--- 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
@ -15,8 +15,8 @@ import org.yuzu.yuzu_emu.utils.NativeConfig
 import java.util.concurrent.atomic.AtomicBoolean

 class AddonViewModel : ViewModel() {
-    private val _patchList = MutableStateFlow(mutableListOf<Patch>())
-    val addonList get() = _patchList.asStateFlow()
+    private val _addonList = MutableStateFlow(mutableListOf<Addon>())
+    val addonList get() = _addonList.asStateFlow()

    private val _showModInstallPicker = MutableStateFlow(false)
    val showModInstallPicker get() = _showModInstallPicker.asStateFlow()
@ -24,9 +24,6 @@ class AddonViewModel : ViewModel() {
    private val _showModNoticeDialog = MutableStateFlow(false)
    val showModNoticeDialog get() = _showModNoticeDialog.asStateFlow()

-    private val _addonToDelete = MutableStateFlow<Patch?>(null)
-    val addonToDelete = _addonToDelete.asStateFlow()
-
    var game: Game? = null

    private val isRefreshing = AtomicBoolean(false)
@ -43,47 +40,36 @@ class AddonViewModel : ViewModel() {
        isRefreshing.set(true)
        viewModelScope.launch {
            withContext(Dispatchers.IO) {
-                val patchList = (
-                    NativeLibrary.getPatchesForFile(game!!.path, game!!.programId)
-                        ?: emptyArray()
-                    ).toMutableList()
-                patchList.sortBy { it.name }
-                _patchList.value = patchList
+                val addonList = mutableListOf<Addon>()
+                val disabledAddons = NativeConfig.getDisabledAddons(game!!.programId)
+                NativeLibrary.getAddonsForFile(game!!.path, game!!.programId)?.forEach {
+                    val name = it.first.replace("[D] ", "")
+                    addonList.add(Addon(!disabledAddons.contains(name), name, it.second))
+                }
+                addonList.sortBy { it.title }
+                _addonList.value = addonList
                isRefreshing.set(false)
            }
        }
    }

-    fun setAddonToDelete(patch: Patch?) {
-        _addonToDelete.value = patch
-    }
-
-    fun onDeleteAddon(patch: Patch) {
-        when (PatchType.from(patch.type)) {
-            PatchType.Update -> NativeLibrary.removeUpdate(patch.programId)
-            PatchType.DLC -> NativeLibrary.removeDLC(patch.titleId)
-            PatchType.Mod -> NativeLibrary.removeMod(patch.programId, patch.name)
-        }
-        refreshAddons()
-    }
-
    fun onCloseAddons() {
-        if (_patchList.value.isEmpty()) {
+        if (_addonList.value.isEmpty()) {
            return
        }

        NativeConfig.setDisabledAddons(
            game!!.programId,
-            _patchList.value.mapNotNull {
+            _addonList.value.mapNotNull {
                if (it.enabled) {
                    null
                } else {
-                    it.name
+                    it.title
                }
            }.toTypedArray()
        )
        NativeConfig.saveGlobalConfig()
-        _patchList.value.clear()
+        _addonList.value.clear()
        game = null
    }

--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/InstallResult.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/InstallResult.kt
@ -1,15 +0,0 @@
-// SPDX-FileCopyrightText: 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.model
-
-enum class InstallResult(val int: Int) {
-    Success(0),
-    Overwrite(1),
-    Failure(2),
-    BaseInstallAttempted(3);
-
-    companion object {
-        fun from(int: Int): InstallResult = entries.firstOrNull { it.int == int } ?: Success
-    }
-}
--- 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,16 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.model
-
-import androidx.annotation.Keep
-
-@Keep
-data class Patch(
-    var enabled: Boolean,
-    val name: String,
-    val version: String,
-    val type: Int,
-    val programId: String,
-    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,14 +0,0 @@
-// SPDX-FileCopyrightText: 2024 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.model
-
-enum class PatchType(val int: Int) {
-    Update(0),
-    DLC(1),
-    Mod(2);
-
-    companion object {
-        fun from(int: Int): PatchType = entries.firstOrNull { it.int == int } ?: Update
-    }
-}
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/TaskViewModel.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/TaskViewModel.kt
@ -8,7 +8,6 @@ import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch

 class TaskViewModel : ViewModel() {
@ -24,28 +23,13 @@ class TaskViewModel : ViewModel() {
    val cancelled: StateFlow<Boolean> get() = _cancelled
    private val _cancelled = MutableStateFlow(false)

-    private val _progress = MutableStateFlow(0.0)
-    val progress = _progress.asStateFlow()
-
-    private val _maxProgress = MutableStateFlow(0.0)
-    val maxProgress = _maxProgress.asStateFlow()
-
-    private val _message = MutableStateFlow("")
-    val message = _message.asStateFlow()
-
-    lateinit var task: suspend (
-        progressCallback: (max: Long, progress: Long) -> Boolean,
-        messageCallback: (message: String) -> Unit
-    ) -> Any
+    lateinit var task: suspend () -> Any

    fun clear() {
        _result.value = Any()
        _isComplete.value = false
        _isRunning.value = false
        _cancelled.value = false
-        _progress.value = 0.0
-        _maxProgress.value = 0.0
-        _message.value = ""
    }

    fun setCancelled(value: Boolean) {
@ -59,16 +43,7 @@ class TaskViewModel : ViewModel() {
        _isRunning.value = true

        viewModelScope.launch(Dispatchers.IO) {
-            val res = task(
-                { max, progress ->
-                    _maxProgress.value = max.toDouble()
-                    _progress.value = progress.toDouble()
-                    return@task cancelled.value
-                },
-                { message ->
-                    _message.value = message
-                }
-            )
+            val res = task()
            _result.value = res
            _isComplete.value = true
            _isRunning.value = false
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt
@ -38,13 +38,12 @@ import org.yuzu.yuzu_emu.activities.EmulationActivity
 import org.yuzu.yuzu_emu.databinding.ActivityMainBinding
 import org.yuzu.yuzu_emu.features.settings.model.Settings
 import org.yuzu.yuzu_emu.fragments.AddGameFolderDialogFragment
-import org.yuzu.yuzu_emu.fragments.ProgressDialogFragment
+import org.yuzu.yuzu_emu.fragments.IndeterminateProgressDialogFragment
 import org.yuzu.yuzu_emu.fragments.MessageDialogFragment
 import org.yuzu.yuzu_emu.model.AddonViewModel
 import org.yuzu.yuzu_emu.model.DriverViewModel
 import org.yuzu.yuzu_emu.model.GamesViewModel
 import org.yuzu.yuzu_emu.model.HomeViewModel
-import org.yuzu.yuzu_emu.model.InstallResult
 import org.yuzu.yuzu_emu.model.TaskState
 import org.yuzu.yuzu_emu.model.TaskViewModel
 import org.yuzu.yuzu_emu.utils.*
@ -370,23 +369,26 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                return@registerForActivityResult
            }

+            val inputZip = contentResolver.openInputStream(result)
+            if (inputZip == null) {
+                Toast.makeText(
+                    applicationContext,
+                    getString(R.string.fatal_error),
+                    Toast.LENGTH_LONG
+                ).show()
+                return@registerForActivityResult
+            }
+
            val filterNCA = FilenameFilter { _, dirName -> dirName.endsWith(".nca") }

            val firmwarePath =
                File(DirectoryInitialization.userDirectory + "/nand/system/Contents/registered/")
            val cacheFirmwareDir = File("${cacheDir.path}/registered/")

-            ProgressDialogFragment.newInstance(
-                this,
-                R.string.firmware_installing
-            ) { progressCallback, _ ->
+            val task: () -> Any = {
                var messageToShow: Any
                try {
-                    FileUtil.unzipToInternalStorage(
-                        result.toString(),
-                        cacheFirmwareDir,
-                        progressCallback
-                    )
+                    FileUtil.unzipToInternalStorage(BufferedInputStream(inputZip), cacheFirmwareDir)
                    val unfilteredNumOfFiles = cacheFirmwareDir.list()?.size ?: -1
                    val filteredNumOfFiles = cacheFirmwareDir.list(filterNCA)?.size ?: -2
                    messageToShow = if (unfilteredNumOfFiles != filteredNumOfFiles) {
@ -402,13 +404,18 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                        getString(R.string.save_file_imported_success)
                    }
                } catch (e: Exception) {
-                    Log.error("[MainActivity] Firmware install failed - ${e.message}")
                    messageToShow = getString(R.string.fatal_error)
                } finally {
                    cacheFirmwareDir.deleteRecursively()
                }
                messageToShow
-            }.show(supportFragmentManager, ProgressDialogFragment.TAG)
+            }
+
+            IndeterminateProgressDialogFragment.newInstance(
+                this,
+                R.string.firmware_installing,
+                task = task
+            ).show(supportFragmentManager, IndeterminateProgressDialogFragment.TAG)
        }

    val getAmiiboKey =
@ -467,11 +474,11 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
            return@registerForActivityResult
        }

-        ProgressDialogFragment.newInstance(
+        IndeterminateProgressDialogFragment.newInstance(
            this@MainActivity,
            R.string.verifying_content,
            false
-        ) { _, _ ->
+        ) {
            var updatesMatchProgram = true
            for (document in documents) {
                val valid = NativeLibrary.doesUpdateMatchProgram(
@ -494,42 +501,44 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                    positiveAction = { homeViewModel.setContentToInstall(documents) }
                )
            }
-        }.show(supportFragmentManager, ProgressDialogFragment.TAG)
+        }.show(supportFragmentManager, IndeterminateProgressDialogFragment.TAG)
    }

    private fun installContent(documents: List<Uri>) {
-        ProgressDialogFragment.newInstance(
+        IndeterminateProgressDialogFragment.newInstance(
            this@MainActivity,
            R.string.installing_game_content
-        ) { progressCallback, messageCallback ->
+        ) {
            var installSuccess = 0
            var installOverwrite = 0
            var errorBaseGame = 0
-            var error = 0
+            var errorExtension = 0
+            var errorOther = 0
            documents.forEach {
-                messageCallback.invoke(FileUtil.getFilename(it))
                when (
-                    InstallResult.from(
-                        NativeLibrary.installFileToNand(
-                            it.toString(),
-                            progressCallback
-                        )
+                    NativeLibrary.installFileToNand(
+                        it.toString(),
+                        FileUtil.getExtension(it)
                    )
                ) {
-                    InstallResult.Success -> {
+                    NativeLibrary.InstallFileToNandResult.Success -> {
                        installSuccess += 1
                    }

-                    InstallResult.Overwrite -> {
+                    NativeLibrary.InstallFileToNandResult.SuccessFileOverwritten -> {
                        installOverwrite += 1
                    }

-                    InstallResult.BaseInstallAttempted -> {
+                    NativeLibrary.InstallFileToNandResult.ErrorBaseGame -> {
                        errorBaseGame += 1
                    }

-                    InstallResult.Failure -> {
-                        error += 1
+                    NativeLibrary.InstallFileToNandResult.ErrorFilenameExtension -> {
+                        errorExtension += 1
+                    }
+
+                    else -> {
+                        errorOther += 1
                    }
                }
            }
@ -556,7 +565,7 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                )
                installResult.append(separator)
            }
-            val errorTotal: Int = errorBaseGame + error
+            val errorTotal: Int = errorBaseGame + errorExtension + errorOther
            if (errorTotal > 0) {
                installResult.append(separator)
                installResult.append(
@ -573,7 +582,14 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                    )
                    installResult.append(separator)
                }
-                if (error > 0) {
+                if (errorExtension > 0) {
+                    installResult.append(separator)
+                    installResult.append(
+                        getString(R.string.install_game_content_failure_file_extension)
+                    )
+                    installResult.append(separator)
+                }
+                if (errorOther > 0) {
                    installResult.append(
                        getString(R.string.install_game_content_failure_description)
                    )
@ -592,7 +608,7 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                    descriptionString = installResult.toString().trim()
                )
            }
-        }.show(supportFragmentManager, ProgressDialogFragment.TAG)
+        }.show(supportFragmentManager, IndeterminateProgressDialogFragment.TAG)
    }

    val exportUserData = registerForActivityResult(
@ -602,16 +618,16 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
            return@registerForActivityResult
        }

-        ProgressDialogFragment.newInstance(
+        IndeterminateProgressDialogFragment.newInstance(
            this,
            R.string.exporting_user_data,
            true
-        ) { progressCallback, _ ->
+        ) {
            val zipResult = FileUtil.zipFromInternalStorage(
                File(DirectoryInitialization.userDirectory!!),
                DirectoryInitialization.userDirectory!!,
                BufferedOutputStream(contentResolver.openOutputStream(result)),
-                progressCallback,
+                taskViewModel.cancelled,
                compression = false
            )
            return@newInstance when (zipResult) {
@ -619,7 +635,7 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                TaskState.Failed -> R.string.export_failed
                TaskState.Cancelled -> R.string.user_data_export_cancelled
            }
-        }.show(supportFragmentManager, ProgressDialogFragment.TAG)
+        }.show(supportFragmentManager, IndeterminateProgressDialogFragment.TAG)
    }

    val importUserData =
@ -628,10 +644,10 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                return@registerForActivityResult
            }

-            ProgressDialogFragment.newInstance(
+            IndeterminateProgressDialogFragment.newInstance(
                this,
                R.string.importing_user_data
-            ) { progressCallback, _ ->
+            ) {
                val checkStream =
                    ZipInputStream(BufferedInputStream(contentResolver.openInputStream(result)))
                var isYuzuBackup = false
@ -660,9 +676,8 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                // Copy archive to internal storage
                try {
                    FileUtil.unzipToInternalStorage(
-                        result.toString(),
-                        File(DirectoryInitialization.userDirectory!!),
-                        progressCallback
+                        BufferedInputStream(contentResolver.openInputStream(result)),
+                        File(DirectoryInitialization.userDirectory!!)
                    )
                } catch (e: Exception) {
                    return@newInstance MessageDialogFragment.newInstance(
@ -679,6 +694,6 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                driverViewModel.reloadDriverData()

                return@newInstance getString(R.string.user_data_import_success)
-            }.show(supportFragmentManager, ProgressDialogFragment.TAG)
+            }.show(supportFragmentManager, IndeterminateProgressDialogFragment.TAG)
        }
 }
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/FileUtil.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/FileUtil.kt
@ -7,6 +7,7 @@ import android.database.Cursor
 import android.net.Uri
 import android.provider.DocumentsContract
 import androidx.documentfile.provider.DocumentFile
+import kotlinx.coroutines.flow.StateFlow
 import java.io.BufferedInputStream
 import java.io.File
 import java.io.IOException
@ -18,7 +19,6 @@ import org.yuzu.yuzu_emu.YuzuApplication
 import org.yuzu.yuzu_emu.model.MinimalDocumentFile
 import org.yuzu.yuzu_emu.model.TaskState
 import java.io.BufferedOutputStream
-import java.io.OutputStream
 import java.lang.NullPointerException
 import java.nio.charset.StandardCharsets
 import java.util.zip.Deflater
@ -104,7 +104,7 @@ object FileUtil {

    /**
     * Reference:  https://stackoverflow.com/questions/42186820/documentfile-is-very-slow
-     * This function will be faster than DocumentFile.listFiles
+     * This function will be faster than DoucmentFile.listFiles
     * @param uri Directory uri.
     * @return CheapDocument lists.
     */
@ -283,34 +283,12 @@ object FileUtil {

    /**
     * Extracts the given zip file into the given directory.
-     * @param path String representation of a [Uri] or a typical path delimited by '/'
-     * @param destDir Location to unzip the contents of [path] into
-     * @param progressCallback Lambda that is called with the total number of files and the current
-     * progress through the process. Stops execution as soon as possible if this returns true.
     */
    @Throws(SecurityException::class)
-    fun unzipToInternalStorage(
-        path: String,
-        destDir: File,
-        progressCallback: (max: Long, progress: Long) -> Boolean = { _, _ -> false }
-    ) {
-        var totalEntries = 0L
-        ZipInputStream(getInputStream(path)).use { zis ->
-            var tempEntry = zis.nextEntry
-            while (tempEntry != null) {
-                tempEntry = zis.nextEntry
-                totalEntries++
-            }
-        }
-
-        var progress = 0L
-        ZipInputStream(getInputStream(path)).use { zis ->
+    fun unzipToInternalStorage(zipStream: BufferedInputStream, destDir: File) {
+        ZipInputStream(zipStream).use { zis ->
            var entry: ZipEntry? = zis.nextEntry
            while (entry != null) {
-                if (progressCallback.invoke(totalEntries, progress)) {
-                    return@use
-                }
-
                val newFile = File(destDir, entry.name)
                val destinationDirectory = if (entry.isDirectory) newFile else newFile.parentFile

@ -326,7 +304,6 @@ object FileUtil {
                    newFile.outputStream().use { fos -> zis.copyTo(fos) }
                }
                entry = zis.nextEntry
-                progress++
            }
        }
    }
@ -336,15 +313,14 @@ object FileUtil {
     * @param inputFile File representation of the item that will be zipped
     * @param rootDir Directory containing the inputFile
     * @param outputStream Stream where the zip file will be output
-     * @param progressCallback Lambda that is called with the total number of files and the current
-     * progress through the process. Stops execution as soon as possible if this returns true.
+     * @param cancelled [StateFlow] that reports whether this process has been cancelled
     * @param compression Disables compression if true
     */
    fun zipFromInternalStorage(
        inputFile: File,
        rootDir: String,
        outputStream: BufferedOutputStream,
-        progressCallback: (max: Long, progress: Long) -> Boolean = { _, _ -> false },
+        cancelled: StateFlow<Boolean>? = null,
        compression: Boolean = true
    ): TaskState {
        try {
@ -354,10 +330,8 @@ object FileUtil {
                    zos.setLevel(Deflater.NO_COMPRESSION)
                }

-                var count = 0L
-                val totalFiles = inputFile.walkTopDown().count().toLong()
                inputFile.walkTopDown().forEach { file ->
-                    if (progressCallback.invoke(totalFiles, count)) {
+                    if (cancelled?.value == true) {
                        return TaskState.Cancelled
                    }

@ -369,7 +343,6 @@ object FileUtil {
                        if (file.isFile) {
                            file.inputStream().use { fis -> fis.copyTo(zos) }
                        }
-                        count++
                    }
                }
            }
@ -383,14 +356,9 @@ object FileUtil {
    /**
     * Helper function that copies the contents of a DocumentFile folder into a [File]
     * @param file [File] representation of the folder to copy into
-     * @param progressCallback Lambda that is called with the total number of files and the current
-     * progress through the process. Stops execution as soon as possible if this returns true.
     * @throws IllegalStateException Fails when trying to copy a folder into a file and vice versa
     */
-    fun DocumentFile.copyFilesTo(
-        file: File,
-        progressCallback: (max: Long, progress: Long) -> Boolean = { _, _ -> false }
-    ) {
+    fun DocumentFile.copyFilesTo(file: File) {
        file.mkdirs()
        if (!this.isDirectory || !file.isDirectory) {
            throw IllegalStateException(
@ -398,13 +366,7 @@ object FileUtil {
            )
        }

-        var count = 0L
-        val totalFiles = this.listFiles().size.toLong()
        this.listFiles().forEach {
-            if (progressCallback.invoke(totalFiles, count)) {
-                return
-            }
-
            val newFile = File(file, it.name!!)
            if (it.isDirectory) {
                newFile.mkdirs()
@ -419,7 +381,6 @@ object FileUtil {
                    newFile.outputStream().use { os -> bos.copyTo(os) }
                }
            }
-            count++
        }
    }

@ -466,18 +427,6 @@ object FileUtil {
        }
    }

-    fun getInputStream(path: String) = if (path.contains("content://")) {
-        Uri.parse(path).inputStream()
-    } else {
-        File(path).inputStream()
-    }
-
-    fun getOutputStream(path: String) = if (path.contains("content://")) {
-        Uri.parse(path).outputStream()
-    } else {
-        File(path).outputStream()
-    }
-
    @Throws(IOException::class)
    fun getStringFromFile(file: File): String =
        String(file.readBytes(), StandardCharsets.UTF_8)
@ -485,19 +434,4 @@ object FileUtil {
    @Throws(IOException::class)
    fun getStringFromInputStream(stream: InputStream): String =
        String(stream.readBytes(), StandardCharsets.UTF_8)
-
-    fun DocumentFile.inputStream(): InputStream =
-        YuzuApplication.appContext.contentResolver.openInputStream(uri)!!
-
-    fun DocumentFile.outputStream(): OutputStream =
-        YuzuApplication.appContext.contentResolver.openOutputStream(uri)!!
-
-    fun Uri.inputStream(): InputStream =
-        YuzuApplication.appContext.contentResolver.openInputStream(this)!!
-
-    fun Uri.outputStream(): OutputStream =
-        YuzuApplication.appContext.contentResolver.openOutputStream(this)!!
-
-    fun Uri.asDocumentFile(): DocumentFile? =
-        DocumentFile.fromSingleUri(YuzuApplication.appContext, this)
 }
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GpuDriverHelper.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GpuDriverHelper.kt
@ -5,6 +5,7 @@ package org.yuzu.yuzu_emu.utils

 import android.net.Uri
 import android.os.Build
+import java.io.BufferedInputStream
 import java.io.File
 import java.io.IOException
 import org.yuzu.yuzu_emu.NativeLibrary
@ -122,7 +123,7 @@ object GpuDriverHelper {
        // Unzip the driver.
        try {
            FileUtil.unzipToInternalStorage(
-                copiedFile.path,
+                BufferedInputStream(copiedFile.inputStream()),
                File(driverInstallationPath!!)
            )
        } catch (e: SecurityException) {
@ -155,7 +156,7 @@ object GpuDriverHelper {
        // Unzip the driver to the private installation directory
        try {
            FileUtil.unzipToInternalStorage(
-                driver.path,
+                BufferedInputStream(driver.inputStream()),
                File(driverInstallationPath!!)
            )
        } catch (e: SecurityException) {
--- a/src/android/app/src/main/jni/android_common/android_common.cpp
+++ b/src/android/app/src/main/jni/android_common/android_common.cpp
@ -42,19 +42,3 @@ double GetJDouble(JNIEnv* env, jobject jdouble) {
 jobject ToJDouble(JNIEnv* env, double value) {
    return env->NewObject(IDCache::GetDoubleClass(), IDCache::GetDoubleConstructor(), value);
 }
-
-s32 GetJInteger(JNIEnv* env, jobject jinteger) {
-    return env->GetIntField(jinteger, IDCache::GetIntegerValueField());
-}
-
-jobject ToJInteger(JNIEnv* env, s32 value) {
-    return env->NewObject(IDCache::GetIntegerClass(), IDCache::GetIntegerConstructor(), value);
-}
-
-bool GetJBoolean(JNIEnv* env, jobject jboolean) {
-    return env->GetBooleanField(jboolean, IDCache::GetBooleanValueField());
-}
-
-jobject ToJBoolean(JNIEnv* env, bool value) {
-    return env->NewObject(IDCache::GetBooleanClass(), IDCache::GetBooleanConstructor(), value);
-}
--- a/src/android/app/src/main/jni/android_common/android_common.h
+++ b/src/android/app/src/main/jni/android_common/android_common.h
@ -6,7 +6,6 @@
 #include <string>

 #include <jni.h>
-#include "common/common_types.h"

 std::string GetJString(JNIEnv* env, jstring jstr);
 jstring ToJString(JNIEnv* env, std::string_view str);
@ -14,9 +13,3 @@ jstring ToJString(JNIEnv* env, std::u16string_view str);

 double GetJDouble(JNIEnv* env, jobject jdouble);
 jobject ToJDouble(JNIEnv* env, double value);
-
-s32 GetJInteger(JNIEnv* env, jobject jinteger);
-jobject ToJInteger(JNIEnv* env, s32 value);
-
-bool GetJBoolean(JNIEnv* env, jobject jboolean);
-jobject ToJBoolean(JNIEnv* env, bool value);
--- a/src/android/app/src/main/jni/android_config.cpp
+++ b/src/android/app/src/main/jni/android_config.cpp
@ -21,7 +21,7 @@ void AndroidConfig::ReloadAllValues() {
 }

 void AndroidConfig::SaveAllValues() {
-    SaveValues();
+    Save();
    SaveAndroidValues();
 }

--- a/src/android/app/src/main/jni/id_cache.cpp
+++ b/src/android/app/src/main/jni/id_cache.cpp
@ -43,27 +43,10 @@ static jfieldID s_overlay_control_data_landscape_position_field;
 static jfieldID s_overlay_control_data_portrait_position_field;
 static jfieldID s_overlay_control_data_foldable_position_field;

-static jclass s_patch_class;
-static jmethodID s_patch_constructor;
-static jfieldID s_patch_enabled_field;
-static jfieldID s_patch_name_field;
-static jfieldID s_patch_version_field;
-static jfieldID s_patch_type_field;
-static jfieldID s_patch_program_id_field;
-static jfieldID s_patch_title_id_field;
-
 static jclass s_double_class;
 static jmethodID s_double_constructor;
 static jfieldID s_double_value_field;

-static jclass s_integer_class;
-static jmethodID s_integer_constructor;
-static jfieldID s_integer_value_field;
-
-static jclass s_boolean_class;
-static jmethodID s_boolean_constructor;
-static jfieldID s_boolean_value_field;
-
 static constexpr jint JNI_VERSION = JNI_VERSION_1_6;

 namespace IDCache {
@ -203,38 +186,6 @@ jfieldID GetOverlayControlDataFoldablePositionField() {
    return s_overlay_control_data_foldable_position_field;
 }

-jclass GetPatchClass() {
-    return s_patch_class;
-}
-
-jmethodID GetPatchConstructor() {
-    return s_patch_constructor;
-}
-
-jfieldID GetPatchEnabledField() {
-    return s_patch_enabled_field;
-}
-
-jfieldID GetPatchNameField() {
-    return s_patch_name_field;
-}
-
-jfieldID GetPatchVersionField() {
-    return s_patch_version_field;
-}
-
-jfieldID GetPatchTypeField() {
-    return s_patch_type_field;
-}
-
-jfieldID GetPatchProgramIdField() {
-    return s_patch_program_id_field;
-}
-
-jfieldID GetPatchTitleIdField() {
-    return s_patch_title_id_field;
-}
-
 jclass GetDoubleClass() {
    return s_double_class;
 }
@ -247,30 +198,6 @@ jfieldID GetDoubleValueField() {
    return s_double_value_field;
 }

-jclass GetIntegerClass() {
-    return s_integer_class;
-}
-
-jmethodID GetIntegerConstructor() {
-    return s_integer_constructor;
-}
-
-jfieldID GetIntegerValueField() {
-    return s_integer_value_field;
-}
-
-jclass GetBooleanClass() {
-    return s_boolean_class;
-}
-
-jmethodID GetBooleanConstructor() {
-    return s_boolean_constructor;
-}
-
-jfieldID GetBooleanValueField() {
-    return s_boolean_value_field;
-}
-
 } // namespace IDCache

 #ifdef __cplusplus
@ -351,37 +278,12 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) {
        env->GetFieldID(overlay_control_data_class, "foldablePosition", "Lkotlin/Pair;");
    env->DeleteLocalRef(overlay_control_data_class);

-    const jclass patch_class = env->FindClass("org/yuzu/yuzu_emu/model/Patch");
-    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;)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;");
-    s_patch_type_field = env->GetFieldID(patch_class, "type", "I");
-    s_patch_program_id_field = env->GetFieldID(patch_class, "programId", "Ljava/lang/String;");
-    s_patch_title_id_field = env->GetFieldID(patch_class, "titleId", "Ljava/lang/String;");
-    env->DeleteLocalRef(patch_class);
-
    const jclass double_class = env->FindClass("java/lang/Double");
    s_double_class = reinterpret_cast<jclass>(env->NewGlobalRef(double_class));
    s_double_constructor = env->GetMethodID(double_class, "<init>", "(D)V");
    s_double_value_field = env->GetFieldID(double_class, "value", "D");
    env->DeleteLocalRef(double_class);

-    const jclass int_class = env->FindClass("java/lang/Integer");
-    s_integer_class = reinterpret_cast<jclass>(env->NewGlobalRef(int_class));
-    s_integer_constructor = env->GetMethodID(int_class, "<init>", "(I)V");
-    s_integer_value_field = env->GetFieldID(int_class, "value", "I");
-    env->DeleteLocalRef(int_class);
-
-    const jclass boolean_class = env->FindClass("java/lang/Boolean");
-    s_boolean_class = reinterpret_cast<jclass>(env->NewGlobalRef(boolean_class));
-    s_boolean_constructor = env->GetMethodID(boolean_class, "<init>", "(Z)V");
-    s_boolean_value_field = env->GetFieldID(boolean_class, "value", "Z");
-    env->DeleteLocalRef(boolean_class);
-
    // Initialize Android Storage
    Common::FS::Android::RegisterCallbacks(env, s_native_library_class);

@ -407,10 +309,7 @@ void JNI_OnUnload(JavaVM* vm, void* reserved) {
    env->DeleteGlobalRef(s_string_class);
    env->DeleteGlobalRef(s_pair_class);
    env->DeleteGlobalRef(s_overlay_control_data_class);
-    env->DeleteGlobalRef(s_patch_class);
    env->DeleteGlobalRef(s_double_class);
-    env->DeleteGlobalRef(s_integer_class);
-    env->DeleteGlobalRef(s_boolean_class);

    // UnInitialize applets
    SoftwareKeyboard::CleanupJNI(env);
--- a/src/android/app/src/main/jni/id_cache.h
+++ b/src/android/app/src/main/jni/id_cache.h
@ -43,25 +43,8 @@ jfieldID GetOverlayControlDataLandscapePositionField();
 jfieldID GetOverlayControlDataPortraitPositionField();
 jfieldID GetOverlayControlDataFoldablePositionField();

-jclass GetPatchClass();
-jmethodID GetPatchConstructor();
-jfieldID GetPatchEnabledField();
-jfieldID GetPatchNameField();
-jfieldID GetPatchVersionField();
-jfieldID GetPatchTypeField();
-jfieldID GetPatchProgramIdField();
-jfieldID GetPatchTitleIdField();
-
 jclass GetDoubleClass();
 jmethodID GetDoubleConstructor();
 jfieldID GetDoubleValueField();

-jclass GetIntegerClass();
-jmethodID GetIntegerConstructor();
-jfieldID GetIntegerValueField();
-
-jclass GetBooleanClass();
-jmethodID GetBooleanConstructor();
-jfieldID GetBooleanValueField();
-
 } // namespace IDCache
--- a/src/android/app/src/main/jni/native.cpp
+++ b/src/android/app/src/main/jni/native.cpp
@ -17,7 +17,6 @@
 #include <core/file_sys/patch_manager.h>
 #include <core/file_sys/savedata_factory.h>
 #include <core/loader/nro.h>
-#include <frontend_common/content_manager.h>
 #include <jni.h>

 #include "common/detached_tasks.h"
@ -101,6 +100,67 @@ void EmulationSession::SetNativeWindow(ANativeWindow* native_window) {
    m_native_window = native_window;
 }

+int EmulationSession::InstallFileToNand(std::string filename, std::string file_extension) {
+    jconst copy_func = [](const FileSys::VirtualFile& src, const FileSys::VirtualFile& dest,
+                          std::size_t block_size) {
+        if (src == nullptr || dest == nullptr) {
+            return false;
+        }
+        if (!dest->Resize(src->GetSize())) {
+            return false;
+        }
+
+        using namespace Common::Literals;
+        [[maybe_unused]] std::vector<u8> buffer(1_MiB);
+
+        for (std::size_t i = 0; i < src->GetSize(); i += buffer.size()) {
+            jconst read = src->Read(buffer.data(), buffer.size(), i);
+            dest->Write(buffer.data(), read, i);
+        }
+        return true;
+    };
+
+    enum InstallResult {
+        Success = 0,
+        SuccessFileOverwritten = 1,
+        InstallError = 2,
+        ErrorBaseGame = 3,
+        ErrorFilenameExtension = 4,
+    };
+
+    [[maybe_unused]] std::shared_ptr<FileSys::NSP> nsp;
+    if (file_extension == "nsp") {
+        nsp = std::make_shared<FileSys::NSP>(m_vfs->OpenFile(filename, FileSys::Mode::Read));
+        if (nsp->IsExtractedType()) {
+            return InstallError;
+        }
+    } else {
+        return ErrorFilenameExtension;
+    }
+
+    if (!nsp) {
+        return InstallError;
+    }
+
+    if (nsp->GetStatus() != Loader::ResultStatus::Success) {
+        return InstallError;
+    }
+
+    jconst res = m_system.GetFileSystemController().GetUserNANDContents()->InstallEntry(*nsp, true,
+                                                                                        copy_func);
+
+    switch (res) {
+    case FileSys::InstallResult::Success:
+        return Success;
+    case FileSys::InstallResult::OverwriteExisting:
+        return SuccessFileOverwritten;
+    case FileSys::InstallResult::ErrorBaseInstall:
+        return ErrorBaseGame;
+    default:
+        return InstallError;
+    }
+}
+
 void EmulationSession::InitializeGpuDriver(const std::string& hook_lib_dir,
                                           const std::string& custom_driver_dir,
                                           const std::string& custom_driver_name,
@ -452,20 +512,10 @@ void Java_org_yuzu_yuzu_1emu_NativeLibrary_setAppDirectory(JNIEnv* env, jobject
 }

 int Java_org_yuzu_yuzu_1emu_NativeLibrary_installFileToNand(JNIEnv* env, jobject instance,
-                                                            jstring j_file, jobject jcallback) {
-    auto jlambdaClass = env->GetObjectClass(jcallback);
-    auto jlambdaInvokeMethod = env->GetMethodID(
-        jlambdaClass, "invoke", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
-    const auto callback = [env, jcallback, jlambdaInvokeMethod](size_t max, size_t progress) {
-        auto jwasCancelled = env->CallObjectMethod(jcallback, jlambdaInvokeMethod,
-                                                   ToJDouble(env, max), ToJDouble(env, progress));
-        return GetJBoolean(env, jwasCancelled);
-    };
-
-    return static_cast<int>(
-        ContentManager::InstallNSP(&EmulationSession::GetInstance().System(),
-                                   EmulationSession::GetInstance().System().GetFilesystem().get(),
-                                   GetJString(env, j_file), callback));
+                                                            jstring j_file,
+                                                            jstring j_file_extension) {
+    return EmulationSession::GetInstance().InstallFileToNand(GetJString(env, j_file),
+                                                             GetJString(env, j_file_extension));
 }

 jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_doesUpdateMatchProgram(JNIEnv* env, jobject jobj,
@ -774,9 +824,9 @@ jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_isFirmwareAvailable(JNIEnv* env,
    return true;
 }

-jobjectArray Java_org_yuzu_yuzu_1emu_NativeLibrary_getPatchesForFile(JNIEnv* env, jobject jobj,
-                                                                     jstring jpath,
-                                                                     jstring jprogramId) {
+jobjectArray Java_org_yuzu_yuzu_1emu_NativeLibrary_getAddonsForFile(JNIEnv* env, jobject jobj,
+                                                                    jstring jpath,
+                                                                    jstring jprogramId) {
    const auto path = GetJString(env, jpath);
    const auto vFile =
        Core::GetGameFileFromPath(EmulationSession::GetInstance().System().GetFilesystem(), path);
@ -793,40 +843,20 @@ jobjectArray Java_org_yuzu_yuzu_1emu_NativeLibrary_getPatchesForFile(JNIEnv* env
    FileSys::VirtualFile update_raw;
    loader->ReadUpdateRaw(update_raw);

-    auto patches = pm.GetPatches(update_raw);
-    jobjectArray jpatchArray =
-        env->NewObjectArray(patches.size(), IDCache::GetPatchClass(), nullptr);
+    auto addons = pm.GetPatchVersionNames(update_raw);
+    auto jemptyString = ToJString(env, "");
+    auto jemptyStringPair = env->NewObject(IDCache::GetPairClass(), IDCache::GetPairConstructor(),
+                                           jemptyString, jemptyString);
+    jobjectArray jaddonsArray =
+        env->NewObjectArray(addons.size(), IDCache::GetPairClass(), jemptyStringPair);
    int i = 0;
-    for (const auto& patch : patches) {
-        jobject jpatch = env->NewObject(
-            IDCache::GetPatchClass(), IDCache::GetPatchConstructor(), patch.enabled,
-            ToJString(env, patch.name), ToJString(env, patch.version),
-            static_cast<jint>(patch.type), ToJString(env, std::to_string(patch.program_id)),
-            ToJString(env, std::to_string(patch.title_id)));
-        env->SetObjectArrayElement(jpatchArray, i, jpatch);
+    for (const auto& addon : addons) {
+        jobject jaddon = env->NewObject(IDCache::GetPairClass(), IDCache::GetPairConstructor(),
+                                        ToJString(env, addon.first), ToJString(env, addon.second));
+        env->SetObjectArrayElement(jaddonsArray, i, jaddon);
        ++i;
    }
-    return jpatchArray;
-}
-
-void Java_org_yuzu_yuzu_1emu_NativeLibrary_removeUpdate(JNIEnv* env, jobject jobj,
-                                                        jstring jprogramId) {
-    auto program_id = EmulationSession::GetProgramId(env, jprogramId);
-    ContentManager::RemoveUpdate(EmulationSession::GetInstance().System().GetFileSystemController(),
-                                 program_id);
-}
-
-void Java_org_yuzu_yuzu_1emu_NativeLibrary_removeDLC(JNIEnv* env, jobject jobj, jstring jtitleId) {
-    auto title_id = EmulationSession::GetProgramId(env, jtitleId);
-    ContentManager::RemoveDLC(EmulationSession::GetInstance().System().GetFileSystemController(),
-                              title_id);
-}
-
-void Java_org_yuzu_yuzu_1emu_NativeLibrary_removeMod(JNIEnv* env, jobject jobj, jstring jprogramId,
-                                                     jstring jname) {
-    auto program_id = EmulationSession::GetProgramId(env, jprogramId);
-    ContentManager::RemoveMod(EmulationSession::GetInstance().System().GetFileSystemController(),
-                              program_id, GetJString(env, jname));
+    return jaddonsArray;
 }

 jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getSavePath(JNIEnv* env, jobject jobj,
--- a/src/android/app/src/main/jni/native.h
+++ b/src/android/app/src/main/jni/native.h
@ -7,7 +7,6 @@
 #include "core/file_sys/registered_cache.h"
 #include "core/hle/service/acc/profile_manager.h"
 #include "core/perf_stats.h"
-#include "frontend_common/content_manager.h"
 #include "jni/applets/software_keyboard.h"
 #include "jni/emu_window/emu_window.h"
 #include "video_core/rasterizer_interface.h"
@ -30,6 +29,7 @@ public:
    void SetNativeWindow(ANativeWindow* native_window);
    void SurfaceChanged();

+    int InstallFileToNand(std::string filename, std::string file_extension);
    void InitializeGpuDriver(const std::string& hook_lib_dir, const std::string& custom_driver_dir,
                             const std::string& custom_driver_name,
                             const std::string& file_redirect_dir);
--- a/src/android/app/src/main/jni/native_config.cpp
+++ b/src/android/app/src/main/jni/native_config.cpp
@ -205,7 +205,7 @@ jboolean Java_org_yuzu_yuzu_1emu_utils_NativeConfig_getIsRuntimeModifiable(JNIEn
                                                                           jstring jkey) {
    auto setting = getSetting<std::string>(env, jkey);
    if (setting != nullptr) {
-        return setting->RuntimeModifiable();
+        return setting->RuntimeModfiable();
    }
    return true;
 }
--- a/src/android/app/src/main/res/layout-w600dp/fragment_about.xml
+++ b/src/android/app/src/main/res/layout-w600dp/fragment_about.xml
@ -147,7 +147,7 @@
                    android:layout_marginHorizontal="20dp" />

                <LinearLayout
-                    android:id="@+id/button_version_name"
+                    android:id="@+id/button_build_hash"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:background="?attr/selectableItemBackground"
@ -164,7 +164,7 @@
                        android:textAlignment="viewStart" />

                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/text_version_name"
+                        android:id="@+id/text_build_hash"
                        style="@style/TextAppearance.Material3.BodyMedium"
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
--- a/src/android/app/src/main/res/layout/dialog_progress_bar.xml
+++ b/src/android/app/src/main/res/layout/dialog_progress_bar.xml
@ -1,30 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.progressindicator.LinearProgressIndicator xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/progress_bar"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/message"
-        style="@style/TextAppearance.Material3.BodyMedium"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="24dp"
-        android:layout_marginTop="12dp"
-        android:layout_marginBottom="6dp"
-        android:ellipsize="marquee"
-        android:marqueeRepeatLimit="marquee_forever"
-        android:requiresFadingEdge="horizontal"
-        android:singleLine="true"
-        android:textAlignment="viewStart"
-        android:visibility="gone" />
-
-    <com.google.android.material.progressindicator.LinearProgressIndicator
-        android:id="@+id/progress_bar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="24dp"
-        app:trackCornerRadius="4dp" />
-
-</LinearLayout>
+    android:padding="24dp"
+    app:trackCornerRadius="4dp" />
--- a/src/android/app/src/main/res/layout/fragment_about.xml
+++ b/src/android/app/src/main/res/layout/fragment_about.xml
@ -148,7 +148,7 @@
                android:layout_marginHorizontal="20dp" />

            <LinearLayout
-                android:id="@+id/button_version_name"
+                android:id="@+id/button_build_hash"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:paddingVertical="16dp"
@ -165,7 +165,7 @@
                    android:text="@string/build" />

                <com.google.android.material.textview.MaterialTextView
-                    android:id="@+id/text_version_name"
+                    android:id="@+id/text_build_hash"
                    style="@style/TextAppearance.Material3.BodyMedium"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
--- a/src/android/app/src/main/res/layout/list_item_addon.xml
+++ b/src/android/app/src/main/res/layout/list_item_addon.xml
@ -14,11 +14,12 @@
        android:id="@+id/text_container"
        android:layout_width="0dp"
        android:layout_height="wrap_content"
-        android:orientation="vertical"
        android:layout_marginEnd="16dp"
-        app:layout_constraintEnd_toStartOf="@+id/addon_checkbox"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="@+id/addon_switch"
+        app:layout_constraintEnd_toStartOf="@+id/addon_switch"
        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintTop_toTopOf="@+id/addon_switch">

        <com.google.android.material.textview.MaterialTextView
            android:id="@+id/title"
@ -41,29 +42,16 @@

    </LinearLayout>

-    <com.google.android.material.checkbox.MaterialCheckBox
-        android:id="@+id/addon_checkbox"
+    <com.google.android.material.materialswitch.MaterialSwitch
+        android:id="@+id/addon_switch"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:focusable="true"
        android:gravity="center"
-        android:layout_marginEnd="8dp"
-        app:layout_constraintTop_toTopOf="@+id/text_container"
-        app:layout_constraintBottom_toBottomOf="@+id/text_container"
-        app:layout_constraintEnd_toStartOf="@+id/button_delete" />
-
-    <Button
-        android:id="@+id/button_delete"
-        style="@style/Widget.Material3.Button.IconButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:contentDescription="@string/delete"
-        android:tooltipText="@string/delete"
-        app:icon="@drawable/ic_delete"
-        app:iconTint="?attr/colorControlNormal"
+        android:nextFocusLeft="@id/addon_container"
+        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/addon_checkbox"
-        app:layout_constraintBottom_toBottomOf="@+id/addon_checkbox" />
+        app:layout_constraintStart_toEndOf="@id/text_container"
+        app:layout_constraintTop_toTopOf="parent" />

 </androidx.constraintlayout.widget.ConstraintLayout>
--- a/src/android/app/src/main/res/values/arrays.xml
+++ b/src/android/app/src/main/res/values/arrays.xml
@ -29,7 +29,7 @@
        <item>@string/language_dutch</item>
        <item>@string/language_english</item>
        <item>@string/language_french</item>
-        <item>@string/language_german</item>
+        <item>@string/langauge_german</item>
        <item>@string/language_italian</item>
        <item>@string/language_japanese</item>
        <item>@string/language_korean</item>
@ -228,10 +228,10 @@
        <item>R</item>
        <item>ZL</item>
        <item>ZR</item>
-        <item>L3</item>
-        <item>R3</item>
        <item>@string/gamepad_left_stick</item>
        <item>@string/gamepad_right_stick</item>
+        <item>L3</item>
+        <item>R3</item>
        <item>@string/gamepad_d_pad</item>
    </string-array>

--- a/src/android/app/src/main/res/values/strings.xml
+++ b/src/android/app/src/main/res/values/strings.xml
@ -286,7 +286,6 @@
    <string name="custom">Custom</string>
    <string name="notice">Notice</string>
    <string name="import_complete">Import complete</string>
-    <string name="more_options">More options</string>

    <!-- GPU driver installation -->
    <string name="select_gpu_driver">Select GPU driver</string>
@ -349,8 +348,6 @@
    <string name="verifying_content">Verifying content…</string>
    <string name="content_install_notice">Content install notice</string>
    <string name="content_install_notice_description">The content that you selected does not match this game.\nInstall anyway?</string>
-    <string name="confirm_uninstall">Confirm uninstall</string>
-    <string name="confirm_uninstall_description">Are you sure you want to uninstall this addon?</string>

    <!-- ROM loading errors -->
    <string name="loader_error_encrypted">Your ROM is encrypted</string>
@ -413,7 +410,7 @@
    <string name="language_japanese" translatable="false">日本語</string>
    <string name="language_english" translatable="false">English</string>
    <string name="language_french" translatable="false">Français</string>
-    <string name="language_german" translatable="false">Deutsch</string>
+    <string name="langauge_german" translatable="false">Deutsch</string>
    <string name="language_italian" translatable="false">Italiano</string>
    <string name="language_spanish" translatable="false">Español</string>
    <string name="language_chinese" translatable="false">简体中文</string>
--- a/src/audio_core/adsp/adsp.cpp
+++ b/src/audio_core/adsp/adsp.cpp
@ -11,7 +11,7 @@ ADSP::ADSP(Core::System& system, Sink::Sink& sink) {
    opus_decoder = std::make_unique<OpusDecoder::OpusDecoder>(system);
    opus_decoder->Send(Direction::DSP, OpusDecoder::Message::Start);
    if (opus_decoder->Receive(Direction::Host) != OpusDecoder::Message::StartOK) {
-        LOG_ERROR(Service_Audio, "OpusDecoder failed to initialize.");
+        LOG_ERROR(Service_Audio, "OpusDeocder failed to initialize.");
        return;
    }
 }
--- a/src/audio_core/renderer/command/command_generator.cpp
+++ b/src/audio_core/renderer/command/command_generator.cpp
@ -41,7 +41,7 @@ void CommandGenerator::GenerateDataSourceCommand(VoiceInfo& voice_info,
                                                 const VoiceState& voice_state, const s8 channel) {
    if (voice_info.mix_id == UnusedMixId) {
        if (voice_info.splitter_id != UnusedSplitterId) {
-            auto destination{splitter_context.GetDestinationData(voice_info.splitter_id, 0)};
+            auto destination{splitter_context.GetDesintationData(voice_info.splitter_id, 0)};
            u32 dest_id{0};
            while (destination != nullptr) {
                if (destination->IsConfigured()) {
@ -55,7 +55,7 @@ void CommandGenerator::GenerateDataSourceCommand(VoiceInfo& voice_info,
                    }
                }
                dest_id++;
-                destination = splitter_context.GetDestinationData(voice_info.splitter_id, dest_id);
+                destination = splitter_context.GetDesintationData(voice_info.splitter_id, dest_id);
            }
        }
    } else {
@ -234,7 +234,7 @@ void CommandGenerator::GenerateVoiceCommand(VoiceInfo& voice_info) {
        if (voice_info.mix_id == UnusedMixId) {
            if (voice_info.splitter_id != UnusedSplitterId) {
                auto i{channel};
-                auto destination{splitter_context.GetDestinationData(voice_info.splitter_id, i)};
+                auto destination{splitter_context.GetDesintationData(voice_info.splitter_id, i)};
                while (destination != nullptr) {
                    if (destination->IsConfigured()) {
                        const auto mix_id{destination->GetMixId()};
@ -249,7 +249,7 @@ void CommandGenerator::GenerateVoiceCommand(VoiceInfo& voice_info) {
                        }
                    }
                    i += voice_info.channel_count;
-                    destination = splitter_context.GetDestinationData(voice_info.splitter_id, i);
+                    destination = splitter_context.GetDesintationData(voice_info.splitter_id, i);
                }
            }
        } else {
@ -591,7 +591,7 @@ void CommandGenerator::GenerateMixCommands(MixInfo& mix_info) {
        if (mix_info.dst_splitter_id != UnusedSplitterId) {
            s16 dest_id{0};
            auto destination{
-                splitter_context.GetDestinationData(mix_info.dst_splitter_id, dest_id)};
+                splitter_context.GetDesintationData(mix_info.dst_splitter_id, dest_id)};
            while (destination != nullptr) {
                if (destination->IsConfigured()) {
                    auto splitter_mix_id{destination->GetMixId()};
@ -612,7 +612,7 @@ void CommandGenerator::GenerateMixCommands(MixInfo& mix_info) {
                }
                dest_id++;
                destination =
-                    splitter_context.GetDestinationData(mix_info.dst_splitter_id, dest_id);
+                    splitter_context.GetDesintationData(mix_info.dst_splitter_id, dest_id);
            }
        }
    } else {
--- a/src/audio_core/renderer/mix/mix_info.cpp
+++ b/src/audio_core/renderer/mix/mix_info.cpp
@ -93,7 +93,7 @@ bool MixInfo::UpdateConnection(EdgeMatrix& edge_matrix, const InParameter& in_pa

            for (u32 i = 0; i < destination_count; i++) {
                auto destination{
-                    splitter_context.GetDestinationData(in_params.dest_splitter_id, i)};
+                    splitter_context.GetDesintationData(in_params.dest_splitter_id, i)};

                if (destination) {
                    const auto destination_id{destination->GetMixId()};
--- a/src/audio_core/renderer/splitter/splitter_context.cpp
+++ b/src/audio_core/renderer/splitter/splitter_context.cpp
@ -9,7 +9,7 @@

 namespace AudioCore::Renderer {

-SplitterDestinationData* SplitterContext::GetDestinationData(const s32 splitter_id,
+SplitterDestinationData* SplitterContext::GetDesintationData(const s32 splitter_id,
                                                             const s32 destination_id) {
    return splitter_infos[splitter_id].GetData(destination_id);
 }
--- a/src/audio_core/renderer/splitter/splitter_context.h
+++ b/src/audio_core/renderer/splitter/splitter_context.h
@ -42,7 +42,7 @@ public:
     * @param destination_id - Destination index within the splitter.
     * @return Pointer to the found destination. May be nullptr.
     */
-    SplitterDestinationData* GetDestinationData(s32 splitter_id, s32 destination_id);
+    SplitterDestinationData* GetDesintationData(s32 splitter_id, s32 destination_id);

    /**
     * Get a splitter from the given index.
--- a/src/common/settings_common.cpp
+++ b/src/common/settings_common.cpp
@ -35,7 +35,7 @@ bool BasicSetting::Save() const {
    return save;
 }

-bool BasicSetting::RuntimeModifiable() const {
+bool BasicSetting::RuntimeModfiable() const {
    return runtime_modifiable;
 }

--- a/src/common/settings_common.h
+++ b/src/common/settings_common.h
@ -186,7 +186,7 @@ public:
    /**
     * @returns true if the current setting can be changed while the guest is running.
     */
-    [[nodiscard]] bool RuntimeModifiable() const;
+    [[nodiscard]] bool RuntimeModfiable() const;

    /**
     * @returns A unique number corresponding to the setting.
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@ -716,23 +716,22 @@ add_library(core STATIC
    hle/service/server_manager.h
    hle/service/service.cpp
    hle/service/service.h
-    hle/service/set/setting_formats/appln_settings.cpp
-    hle/service/set/setting_formats/appln_settings.h
-    hle/service/set/setting_formats/device_settings.cpp
-    hle/service/set/setting_formats/device_settings.h
-    hle/service/set/setting_formats/system_settings.cpp
-    hle/service/set/setting_formats/system_settings.h
-    hle/service/set/setting_formats/private_settings.cpp
-    hle/service/set/setting_formats/private_settings.h
+    hle/service/set/appln_settings.cpp
+    hle/service/set/appln_settings.h
+    hle/service/set/device_settings.cpp
+    hle/service/set/device_settings.h
    hle/service/set/factory_settings_server.cpp
    hle/service/set/factory_settings_server.h
    hle/service/set/firmware_debug_settings_server.cpp
    hle/service/set/firmware_debug_settings_server.h
+    hle/service/set/private_settings.cpp
+    hle/service/set/private_settings.h
    hle/service/set/settings.cpp
    hle/service/set/settings.h
    hle/service/set/settings_server.cpp
    hle/service/set/settings_server.h
-    hle/service/set/settings_types.h
+    hle/service/set/system_settings.cpp
+    hle/service/set/system_settings.h
    hle/service/set/system_settings_server.cpp
    hle/service/set/system_settings_server.h
    hle/service/sm/sm.cpp
--- a/src/core/arm/nce/patcher.cpp
+++ b/src/core/arm/nce/patcher.cpp
@ -22,10 +22,14 @@ using NativeExecutionParameters = Kernel::KThread::NativeExecutionParameters;
 constexpr size_t MaxRelativeBranch = 128_MiB;
 constexpr u32 ModuleCodeIndex = 0x24 / sizeof(u32);

-Patcher::Patcher() : c(m_patch_instructions) {
-    // The first word of the patch section is always a branch to the first instruction of the
-    // module.
-    c.dw(0);
+Patcher::Patcher() : c(m_patch_instructions) {}
+
+Patcher::~Patcher() = default;
+
+void Patcher::PatchText(const Kernel::PhysicalMemory& program_image,
+                        const Kernel::CodeSet::Segment& code) {
+    // Branch to the first instruction of the module.
+    this->BranchToModule(0);

    // Write save context helper function.
    c.l(m_save_context);
@ -34,25 +38,6 @@ Patcher::Patcher() : c(m_patch_instructions) {
    // Write load context helper function.
    c.l(m_load_context);
    WriteLoadContext();
-}
-
-Patcher::~Patcher() = default;
-
-bool Patcher::PatchText(const Kernel::PhysicalMemory& program_image,
-                        const Kernel::CodeSet::Segment& code) {
-    // If we have patched modules but cannot reach the new module, then it needs its own patcher.
-    const size_t image_size = program_image.size();
-    if (total_program_size + image_size > MaxRelativeBranch && total_program_size > 0) {
-        return false;
-    }
-
-    // Add a new module patch to our list
-    modules.emplace_back();
-    curr_patch = &modules.back();
-
-    // The first word of the patch section is always a branch to the first instruction of the
-    // module.
-    curr_patch->m_branch_to_module_relocations.push_back({0, 0});

    // Retrieve text segment data.
    const auto text = std::span{program_image}.subspan(code.offset, code.size);
@ -109,17 +94,16 @@ bool Patcher::PatchText(const Kernel::PhysicalMemory& program_image,
        }

        if (auto exclusive = Exclusive{inst}; exclusive.Verify()) {
-            curr_patch->m_exclusives.push_back(i);
+            m_exclusives.push_back(i);
        }
    }

    // Determine patching mode for the final relocation step
-    total_program_size += image_size;
+    const size_t image_size = program_image.size();
    this->mode = image_size > MaxRelativeBranch ? PatchMode::PreText : PatchMode::PostData;
-    return true;
 }

-bool Patcher::RelocateAndCopy(Common::ProcessAddress load_base,
+void Patcher::RelocateAndCopy(Common::ProcessAddress load_base,
                              const Kernel::CodeSet::Segment& code,
                              Kernel::PhysicalMemory& program_image,
                              EntryTrampolines* out_trampolines) {
@ -136,7 +120,7 @@ bool Patcher::RelocateAndCopy(Common::ProcessAddress load_base,
        if (mode == PatchMode::PreText) {
            rc.B(rel.patch_offset - patch_size - rel.module_offset);
        } else {
-            rc.B(total_program_size - rel.module_offset + rel.patch_offset);
+            rc.B(image_size - rel.module_offset + rel.patch_offset);
        }
    };

@ -145,7 +129,7 @@ bool Patcher::RelocateAndCopy(Common::ProcessAddress load_base,
        if (mode == PatchMode::PreText) {
            rc.B(patch_size - rel.patch_offset + rel.module_offset);
        } else {
-            rc.B(rel.module_offset - total_program_size - rel.patch_offset);
+            rc.B(rel.module_offset - image_size - rel.patch_offset);
        }
    };

@ -153,7 +137,7 @@ bool Patcher::RelocateAndCopy(Common::ProcessAddress load_base,
        if (mode == PatchMode::PreText) {
            return GetInteger(load_base) + patch_offset;
        } else {
-            return GetInteger(load_base) + total_program_size + patch_offset;
+            return GetInteger(load_base) + image_size + patch_offset;
        }
    };

@ -166,50 +150,39 @@ bool Patcher::RelocateAndCopy(Common::ProcessAddress load_base,
    };

    // We are now ready to relocate!
-    auto& patch = modules[m_relocate_module_index++];
-    for (const Relocation& rel : patch.m_branch_to_patch_relocations) {
+    for (const Relocation& rel : m_branch_to_patch_relocations) {
        ApplyBranchToPatchRelocation(text_words.data() + rel.module_offset / sizeof(u32), rel);
    }
-    for (const Relocation& rel : patch.m_branch_to_module_relocations) {
+    for (const Relocation& rel : m_branch_to_module_relocations) {
        ApplyBranchToModuleRelocation(m_patch_instructions.data() + rel.patch_offset / sizeof(u32),
                                      rel);
    }

    // Rewrite PC constants and record post trampolines
-    for (const Relocation& rel : patch.m_write_module_pc_relocations) {
+    for (const Relocation& rel : m_write_module_pc_relocations) {
        oaknut::CodeGenerator rc{m_patch_instructions.data() + rel.patch_offset / sizeof(u32)};
        rc.dx(RebasePc(rel.module_offset));
    }
-    for (const Trampoline& rel : patch.m_trampolines) {
+    for (const Trampoline& rel : m_trampolines) {
        out_trampolines->insert({RebasePc(rel.module_offset), RebasePatch(rel.patch_offset)});
    }

    // Cortex-A57 seems to treat all exclusives as ordered, but newer processors do not.
    // Convert to ordered to preserve this assumption.
-    for (const ModuleTextAddress i : patch.m_exclusives) {
+    for (const ModuleTextAddress i : m_exclusives) {
        auto exclusive = Exclusive{text_words[i]};
        text_words[i] = exclusive.AsOrdered();
    }

-    // Remove the patched module size from the total. This is done so total_program_size
-    // always represents the distance from the currently patched module to the patch section.
-    total_program_size -= image_size;
-
-    // Only copy to the program image of the last module
-    if (m_relocate_module_index == modules.size()) {
-        if (this->mode == PatchMode::PreText) {
-            ASSERT(image_size == total_program_size);
-            std::memcpy(program_image.data(), m_patch_instructions.data(),
-                        m_patch_instructions.size() * sizeof(u32));
-        } else {
-            program_image.resize(image_size + patch_size);
-            std::memcpy(program_image.data() + image_size, m_patch_instructions.data(),
-                        m_patch_instructions.size() * sizeof(u32));
-        }
-        return true;
+    // Copy to program image
+    if (this->mode == PatchMode::PreText) {
+        std::memcpy(program_image.data(), m_patch_instructions.data(),
+                    m_patch_instructions.size() * sizeof(u32));
+    } else {
+        program_image.resize(image_size + patch_size);
+        std::memcpy(program_image.data() + image_size, m_patch_instructions.data(),
+                    m_patch_instructions.size() * sizeof(u32));
    }
-
-    return false;
 }

 size_t Patcher::GetSectionSize() const noexcept {
@ -349,7 +322,7 @@ void Patcher::WriteSvcTrampoline(ModuleDestLabel module_dest, u32 svc_id) {

    // Write the post-SVC trampoline address, which will jump back to the guest after restoring its
    // state.
-    curr_patch->m_trampolines.push_back({c.offset(), module_dest});
+    m_trampolines.push_back({c.offset(), module_dest});

    // Host called this location. Save the return address so we can
    // unwind the stack properly when jumping back.
--- a/src/core/arm/nce/patcher.h
+++ b/src/core/arm/nce/patcher.h
@ -31,9 +31,9 @@ public:
    explicit Patcher();
    ~Patcher();

-    bool PatchText(const Kernel::PhysicalMemory& program_image,
+    void PatchText(const Kernel::PhysicalMemory& program_image,
                   const Kernel::CodeSet::Segment& code);
-    bool RelocateAndCopy(Common::ProcessAddress load_base, const Kernel::CodeSet::Segment& code,
+    void RelocateAndCopy(Common::ProcessAddress load_base, const Kernel::CodeSet::Segment& code,
                         Kernel::PhysicalMemory& program_image, EntryTrampolines* out_trampolines);
    size_t GetSectionSize() const noexcept;

@ -61,16 +61,16 @@ private:

 private:
    void BranchToPatch(uintptr_t module_dest) {
-        curr_patch->m_branch_to_patch_relocations.push_back({c.offset(), module_dest});
+        m_branch_to_patch_relocations.push_back({c.offset(), module_dest});
    }

    void BranchToModule(uintptr_t module_dest) {
-        curr_patch->m_branch_to_module_relocations.push_back({c.offset(), module_dest});
+        m_branch_to_module_relocations.push_back({c.offset(), module_dest});
        c.dw(0);
    }

    void WriteModulePc(uintptr_t module_dest) {
-        curr_patch->m_write_module_pc_relocations.push_back({c.offset(), module_dest});
+        m_write_module_pc_relocations.push_back({c.offset(), module_dest});
        c.dx(0);
    }

@ -84,22 +84,15 @@ private:
        uintptr_t module_offset; ///< Offset in bytes from the start of the text section.
    };

-    struct ModulePatch {
-        std::vector<Trampoline> m_trampolines;
-        std::vector<Relocation> m_branch_to_patch_relocations{};
-        std::vector<Relocation> m_branch_to_module_relocations{};
-        std::vector<Relocation> m_write_module_pc_relocations{};
-        std::vector<ModuleTextAddress> m_exclusives{};
-    };
-
    oaknut::VectorCodeGenerator c;
+    std::vector<Trampoline> m_trampolines;
+    std::vector<Relocation> m_branch_to_patch_relocations{};
+    std::vector<Relocation> m_branch_to_module_relocations{};
+    std::vector<Relocation> m_write_module_pc_relocations{};
+    std::vector<ModuleTextAddress> m_exclusives{};
    oaknut::Label m_save_context{};
    oaknut::Label m_load_context{};
    PatchMode mode{PatchMode::None};
-    size_t total_program_size{};
-    size_t m_relocate_module_index{};
-    std::vector<ModulePatch> modules;
-    ModulePatch* curr_patch;
 };

 } // namespace Core::NCE
--- a/src/core/device_memory_manager.h
+++ b/src/core/device_memory_manager.h
@ -28,10 +28,6 @@ class Memory;
 template <typename DTraits>
 struct DeviceMemoryManagerAllocator;

-struct Asid {
-    size_t id;
-};
-
 template <typename Traits>
 class DeviceMemoryManager {
    using DeviceInterface = typename Traits::DeviceInterface;
@ -47,14 +43,15 @@ public:
    void AllocateFixed(DAddr start, size_t size);
    void Free(DAddr start, size_t size);

-    void Map(DAddr address, VAddr virtual_address, size_t size, Asid asid, bool track = false);
+    void Map(DAddr address, VAddr virtual_address, size_t size, size_t process_id,
+             bool track = false);

    void Unmap(DAddr address, size_t size);

-    void TrackContinuityImpl(DAddr address, VAddr virtual_address, size_t size, Asid asid);
-    void TrackContinuity(DAddr address, VAddr virtual_address, size_t size, Asid asid) {
+    void TrackContinuityImpl(DAddr address, VAddr virtual_address, size_t size, size_t process_id);
+    void TrackContinuity(DAddr address, VAddr virtual_address, size_t size, size_t process_id) {
        std::scoped_lock lk(mapping_guard);
-        TrackContinuityImpl(address, virtual_address, size, asid);
+        TrackContinuityImpl(address, virtual_address, size, process_id);
    }

    // Write / Read
@ -108,8 +105,8 @@ public:
    void WriteBlock(DAddr address, const void* src_pointer, size_t size);
    void WriteBlockUnsafe(DAddr address, const void* src_pointer, size_t size);

-    Asid RegisterProcess(Memory::Memory* memory);
-    void UnregisterProcess(Asid id);
+    size_t RegisterProcess(Memory::Memory* memory);
+    void UnregisterProcess(size_t id);

    void UpdatePagesCachedCount(DAddr addr, size_t size, s32 delta);

@ -166,17 +163,17 @@ private:
    static constexpr size_t guest_max_as_bits = 39;
    static constexpr size_t guest_as_size = 1ULL << guest_max_as_bits;
    static constexpr size_t guest_mask = guest_as_size - 1ULL;
-    static constexpr size_t asid_start_bit = guest_max_as_bits;
+    static constexpr size_t process_id_start_bit = guest_max_as_bits;

-    std::pair<Asid, VAddr> ExtractCPUBacking(size_t page_index) {
+    std::pair<size_t, VAddr> ExtractCPUBacking(size_t page_index) {
        auto content = cpu_backing_address[page_index];
        const VAddr address = content & guest_mask;
-        const Asid asid{static_cast<size_t>(content >> asid_start_bit)};
-        return std::make_pair(asid, address);
+        const size_t process_id = static_cast<size_t>(content >> process_id_start_bit);
+        return std::make_pair(process_id, address);
    }

-    void InsertCPUBacking(size_t page_index, VAddr address, Asid asid) {
-        cpu_backing_address[page_index] = address | (asid.id << asid_start_bit);
+    void InsertCPUBacking(size_t page_index, VAddr address, size_t process_id) {
+        cpu_backing_address[page_index] = address | (process_id << process_id_start_bit);
    }

    Common::VirtualBuffer<VAddr> cpu_backing_address;
@ -208,4 +205,4 @@ private:
    std::mutex mapping_guard;
 };

-} // namespace Core
+} // namespace Core
--- a/src/core/device_memory_manager.inc
+++ b/src/core/device_memory_manager.inc
@ -215,8 +215,8 @@ void DeviceMemoryManager<Traits>::Free(DAddr start, size_t size) {

 template <typename Traits>
 void DeviceMemoryManager<Traits>::Map(DAddr address, VAddr virtual_address, size_t size,
-                                      Asid asid, bool track) {
-    Core::Memory::Memory* process_memory = registered_processes[asid.id];
+                                      size_t process_id, bool track) {
+    Core::Memory::Memory* process_memory = registered_processes[process_id];
    size_t start_page_d = address >> Memory::YUZU_PAGEBITS;
    size_t num_pages = Common::AlignUp(size, Memory::YUZU_PAGESIZE) >> Memory::YUZU_PAGEBITS;
    std::scoped_lock lk(mapping_guard);
@ -229,7 +229,7 @@ void DeviceMemoryManager<Traits>::Map(DAddr address, VAddr virtual_address, size
        }
        auto phys_addr = static_cast<u32>(GetRawPhysicalAddr(ptr) >> Memory::YUZU_PAGEBITS) + 1U;
        compressed_physical_ptr[start_page_d + i] = phys_addr;
-        InsertCPUBacking(start_page_d + i, new_vaddress, asid);
+        InsertCPUBacking(start_page_d + i, new_vaddress, process_id);
        const u32 base_dev = compressed_device_addr[phys_addr - 1U];
        const u32 new_dev = static_cast<u32>(start_page_d + i);
        if (base_dev == 0) [[likely]] {
@ -244,7 +244,7 @@ void DeviceMemoryManager<Traits>::Map(DAddr address, VAddr virtual_address, size
        impl->multi_dev_address.Register(new_dev, start_id);
    }
    if (track) {
-        TrackContinuityImpl(address, virtual_address, size, asid);
+        TrackContinuityImpl(address, virtual_address, size, process_id);
    }
 }

@ -277,8 +277,8 @@ void DeviceMemoryManager<Traits>::Unmap(DAddr address, size_t size) {
 }
 template <typename Traits>
 void DeviceMemoryManager<Traits>::TrackContinuityImpl(DAddr address, VAddr virtual_address,
-                                                      size_t size, Asid asid) {
-    Core::Memory::Memory* process_memory = registered_processes[asid.id];
+                                                      size_t size, size_t process_id) {
+    Core::Memory::Memory* process_memory = registered_processes[process_id];
    size_t start_page_d = address >> Memory::YUZU_PAGEBITS;
    size_t num_pages = Common::AlignUp(size, Memory::YUZU_PAGESIZE) >> Memory::YUZU_PAGEBITS;
    uintptr_t last_ptr = 0;
@ -488,8 +488,8 @@ void DeviceMemoryManager<Traits>::WriteBlockUnsafe(DAddr address, const void* sr
 }

 template <typename Traits>
-Asid DeviceMemoryManager<Traits>::RegisterProcess(Memory::Memory* memory_device_inter) {
-    size_t new_id{};
+size_t DeviceMemoryManager<Traits>::RegisterProcess(Memory::Memory* memory_device_inter) {
+    size_t new_id;
    if (!id_pool.empty()) {
        new_id = id_pool.front();
        id_pool.pop_front();
@ -498,23 +498,29 @@ Asid DeviceMemoryManager<Traits>::RegisterProcess(Memory::Memory* memory_device_
        registered_processes.emplace_back(memory_device_inter);
        new_id = registered_processes.size() - 1U;
    }
-    return Asid{new_id};
+    return new_id;
 }

 template <typename Traits>
-void DeviceMemoryManager<Traits>::UnregisterProcess(Asid asid) {
-    registered_processes[asid.id] = nullptr;
-    id_pool.push_front(asid.id);
+void DeviceMemoryManager<Traits>::UnregisterProcess(size_t id) {
+    registered_processes[id] = nullptr;
+    id_pool.push_front(id);
 }

 template <typename Traits>
 void DeviceMemoryManager<Traits>::UpdatePagesCachedCount(DAddr addr, size_t size, s32 delta) {
-    std::unique_lock<std::mutex> lk(counter_guard, std::defer_lock);
-    const auto Lock = [&] {
-        if (!lk) {
-            lk.lock();
+    bool locked = false;
+    auto lock = [&] {
+        if (!locked) {
+            counter_guard.lock();
+            locked = true;
        }
    };
+    SCOPE_EXIT({
+        if (locked) {
+            counter_guard.unlock();
+        }
+    });
    u64 uncache_begin = 0;
    u64 cache_begin = 0;
    u64 uncache_bytes = 0;
@ -524,9 +530,9 @@ void DeviceMemoryManager<Traits>::UpdatePagesCachedCount(DAddr addr, size_t size
    std::atomic_thread_fence(std::memory_order_acquire);
    const size_t page_end = Common::DivCeil(addr + size, Memory::YUZU_PAGESIZE);
    size_t page = addr >> Memory::YUZU_PAGEBITS;
-    auto [asid, base_vaddress] = ExtractCPUBacking(page);
+    auto [process_id, base_vaddress] = ExtractCPUBacking(page);
    size_t vpage = base_vaddress >> Memory::YUZU_PAGEBITS;
-    auto* memory_device_inter = registered_processes[asid.id];
+    auto* memory_device_inter = registered_processes[process_id];
    for (; page != page_end; ++page) {
        std::atomic_uint8_t& count = cached_pages->at(page >> 3).Count(page);

@ -549,7 +555,7 @@ void DeviceMemoryManager<Traits>::UpdatePagesCachedCount(DAddr addr, size_t size
            }
            uncache_bytes += Memory::YUZU_PAGESIZE;
        } else if (uncache_bytes > 0) {
-            Lock();
+            lock();
            MarkRegionCaching(memory_device_inter, uncache_begin << Memory::YUZU_PAGEBITS,
                              uncache_bytes, false);
            uncache_bytes = 0;
@ -560,7 +566,7 @@ void DeviceMemoryManager<Traits>::UpdatePagesCachedCount(DAddr addr, size_t size
            }
            cache_bytes += Memory::YUZU_PAGESIZE;
        } else if (cache_bytes > 0) {
-            Lock();
+            lock();
            MarkRegionCaching(memory_device_inter, cache_begin << Memory::YUZU_PAGEBITS, cache_bytes,
                              true);
            cache_bytes = 0;
@ -568,12 +574,12 @@ void DeviceMemoryManager<Traits>::UpdatePagesCachedCount(DAddr addr, size_t size
        vpage++;
    }
    if (uncache_bytes > 0) {
-        Lock();
+        lock();
        MarkRegionCaching(memory_device_inter, uncache_begin << Memory::YUZU_PAGEBITS, uncache_bytes,
                          false);
    }
    if (cache_bytes > 0) {
-        Lock();
+        lock();
        MarkRegionCaching(memory_device_inter, cache_begin << Memory::YUZU_PAGEBITS, cache_bytes,
                          true);
    }
--- a/src/core/file_sys/patch_manager.cpp
+++ b/src/core/file_sys/patch_manager.cpp
@ -466,12 +466,12 @@ VirtualFile PatchManager::PatchRomFS(const NCA* base_nca, VirtualFile base_romfs
    return romfs;
 }

-std::vector<Patch> PatchManager::GetPatches(VirtualFile update_raw) const {
+PatchManager::PatchVersionNames PatchManager::GetPatchVersionNames(VirtualFile update_raw) const {
    if (title_id == 0) {
        return {};
    }

-    std::vector<Patch> out;
+    std::map<std::string, std::string, std::less<>> out;
    const auto& disabled = Settings::values.disabled_addons[title_id];

    // Game Updates
@ -482,28 +482,20 @@ std::vector<Patch> PatchManager::GetPatches(VirtualFile update_raw) const {

    const auto update_disabled =
        std::find(disabled.cbegin(), disabled.cend(), "Update") != disabled.cend();
-    Patch update_patch = {.enabled = !update_disabled,
-                          .name = "Update",
-                          .version = "",
-                          .type = PatchType::Update,
-                          .program_id = title_id,
-                          .title_id = title_id};
+    const auto update_label = update_disabled ? "[D] Update" : "Update";

    if (nacp != nullptr) {
-        update_patch.version = nacp->GetVersionString();
-        out.push_back(update_patch);
+        out.insert_or_assign(update_label, nacp->GetVersionString());
    } else {
        if (content_provider.HasEntry(update_tid, ContentRecordType::Program)) {
            const auto meta_ver = content_provider.GetEntryVersion(update_tid);
            if (meta_ver.value_or(0) == 0) {
-                out.push_back(update_patch);
+                out.insert_or_assign(update_label, "");
            } else {
-                update_patch.version = FormatTitleVersion(*meta_ver);
-                out.push_back(update_patch);
+                out.insert_or_assign(update_label, FormatTitleVersion(*meta_ver));
            }
        } else if (update_raw != nullptr) {
-            update_patch.version = "PACKED";
-            out.push_back(update_patch);
+            out.insert_or_assign(update_label, "PACKED");
        }
    }

@ -547,12 +539,7 @@ std::vector<Patch> PatchManager::GetPatches(VirtualFile update_raw) const {

            const auto mod_disabled =
                std::find(disabled.begin(), disabled.end(), mod->GetName()) != disabled.end();
-            out.push_back({.enabled = !mod_disabled,
-                           .name = mod->GetName(),
-                           .version = types,
-                           .type = PatchType::Mod,
-                           .program_id = title_id,
-                           .title_id = title_id});
+            out.insert_or_assign(mod_disabled ? "[D] " + mod->GetName() : mod->GetName(), types);
        }
    }

@ -570,12 +557,7 @@ std::vector<Patch> PatchManager::GetPatches(VirtualFile update_raw) const {
        if (!types.empty()) {
            const auto mod_disabled =
                std::find(disabled.begin(), disabled.end(), "SDMC") != disabled.end();
-            out.push_back({.enabled = !mod_disabled,
-                           .name = "SDMC",
-                           .version = types,
-                           .type = PatchType::Mod,
-                           .program_id = title_id,
-                           .title_id = title_id});
+            out.insert_or_assign(mod_disabled ? "[D] SDMC" : "SDMC", types);
        }
    }

@ -602,12 +584,7 @@ std::vector<Patch> PatchManager::GetPatches(VirtualFile update_raw) const {

        const auto dlc_disabled =
            std::find(disabled.begin(), disabled.end(), "DLC") != disabled.end();
-        out.push_back({.enabled = !dlc_disabled,
-                       .name = "DLC",
-                       .version = std::move(list),
-                       .type = PatchType::DLC,
-                       .program_id = title_id,
-                       .title_id = dlc_match.back().title_id});
+        out.insert_or_assign(dlc_disabled ? "[D] DLC" : "DLC", std::move(list));
    }

    return out;
--- a/src/core/file_sys/patch_manager.h
+++ b/src/core/file_sys/patch_manager.h
@ -26,22 +26,12 @@ class ContentProvider;
 class NCA;
 class NACP;

-enum class PatchType { Update, DLC, Mod };
-
-struct Patch {
-    bool enabled;
-    std::string name;
-    std::string version;
-    PatchType type;
-    u64 program_id;
-    u64 title_id;
-};
-
 // A centralized class to manage patches to games.
 class PatchManager {
 public:
    using BuildID = std::array<u8, 0x20>;
    using Metadata = std::pair<std::unique_ptr<NACP>, VirtualFile>;
+    using PatchVersionNames = std::map<std::string, std::string, std::less<>>;

    explicit PatchManager(u64 title_id_,
                          const Service::FileSystem::FileSystemController& fs_controller_,
@ -76,8 +66,9 @@ public:
                                         VirtualFile packed_update_raw = nullptr,
                                         bool apply_layeredfs = true) const;

-    // Returns a vector of patches
-    [[nodiscard]] std::vector<Patch> GetPatches(VirtualFile update_raw = nullptr) const;
+    // Returns a vector of pairs between patch names and patch versions.
+    // i.e. Update 3.2.2 will return {"Update", "3.2.2"}
+    [[nodiscard]] PatchVersionNames GetPatchVersionNames(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/kernel/k_process.cpp
+++ b/src/core/hle/kernel/k_process.cpp
@ -1239,10 +1239,10 @@ void KProcess::LoadModule(CodeSet code_set, KProcessAddress base_addr) {
    ReprotectSegment(code_set.DataSegment(), Svc::MemoryPermission::ReadWrite);

 #ifdef HAS_NCE
-    const auto& patch = code_set.PatchSegment();
-    if (this->IsApplication() && Settings::IsNceEnabled() && patch.size != 0) {
+    if (this->IsApplication() && Settings::IsNceEnabled()) {
        auto& buffer = m_kernel.System().DeviceMemory().buffer;
        const auto& code = code_set.CodeSegment();
+        const auto& patch = code_set.PatchSegment();
        buffer.Protect(GetInteger(base_addr + code.addr), code.size,
                       Common::MemoryPermission::Read | Common::MemoryPermission::Execute);
        buffer.Protect(GetInteger(base_addr + patch.addr), patch.size,
--- a/src/core/hle/service/acc/profile_manager.cpp
+++ b/src/core/hle/service/acc/profile_manager.cpp
@ -11,7 +11,6 @@
 #include "common/fs/path_util.h"
 #include "common/polyfill_ranges.h"
 #include "common/settings.h"
-#include "common/string_util.h"
 #include "core/hle/service/acc/profile_manager.h"

 namespace Service::Account {
@ -62,7 +61,9 @@ ProfileManager::ProfileManager() {
    OpenUser(*GetUser(current));
 }

-ProfileManager::~ProfileManager() = default;
+ProfileManager::~ProfileManager() {
+    WriteUserSaveFile();
+}

 /// After a users creation it needs to be "registered" to the system. AddToProfiles handles the
 /// internal management of the users profiles
@ -112,8 +113,6 @@ Result ProfileManager::CreateNewUser(UUID uuid, const ProfileUsername& username)
        return ERROR_USER_ALREADY_EXISTS;
    }

-    is_save_needed = true;
-
    return AddUser({
        .user_uuid = uuid,
        .username = username,
@ -165,22 +164,6 @@ std::optional<std::size_t> ProfileManager::GetUserIndex(const ProfileInfo& user)
    return GetUserIndex(user.user_uuid);
 }

-/// Returns the first user profile seen based on username (which does not enforce uniqueness)
-std::optional<std::size_t> ProfileManager::GetUserIndex(const std::string& username) const {
-    const auto iter =
-        std::find_if(profiles.begin(), profiles.end(), [&username](const ProfileInfo& p) {
-            const std::string profile_username = Common::StringFromFixedZeroTerminatedBuffer(
-                reinterpret_cast<const char*>(p.username.data()), p.username.size());
-
-            return username.compare(profile_username) == 0;
-        });
-    if (iter == profiles.end()) {
-        return std::nullopt;
-    }
-
-    return static_cast<std::size_t>(std::distance(profiles.begin(), iter));
-}
-
 /// Returns the data structure used by the switch when GetProfileBase is called on acc:*
 bool ProfileManager::GetProfileBase(std::optional<std::size_t> index, ProfileBase& profile) const {
    if (!index || index >= MAX_USERS) {
@ -343,9 +326,6 @@ bool ProfileManager::RemoveUser(UUID uuid) {
    profiles[*index] = ProfileInfo{};
    std::stable_partition(profiles.begin(), profiles.end(),
                          [](const ProfileInfo& profile) { return profile.user_uuid.IsValid(); });
-
-    is_save_needed = true;
-
    return true;
 }

@ -360,8 +340,6 @@ bool ProfileManager::SetProfileBase(UUID uuid, const ProfileBase& profile_new) {
    profile.username = profile_new.username;
    profile.creation_time = profile_new.timestamp;

-    is_save_needed = true;
-
    return true;
 }

@ -370,7 +348,6 @@ bool ProfileManager::SetProfileBaseAndData(Common::UUID uuid, const ProfileBase&
    const auto index = GetUserIndex(uuid);
    if (index.has_value() && SetProfileBase(uuid, profile_new)) {
        profiles[*index].data = data_new;
-        is_save_needed = true;
        return true;
    }

@ -414,10 +391,6 @@ void ProfileManager::ParseUserSaveFile() {
 }

 void ProfileManager::WriteUserSaveFile() {
-    if (!is_save_needed) {
-        return;
-    }
-
    ProfileDataRaw raw{};

    for (std::size_t i = 0; i < MAX_USERS; ++i) {
@ -450,10 +423,7 @@ void ProfileManager::WriteUserSaveFile() {
    if (!save.IsOpen() || !save.SetSize(sizeof(ProfileDataRaw)) || !save.WriteObject(raw)) {
        LOG_WARNING(Service_ACC, "Failed to write save data to file... No changes to user data "
                                 "made in current session will be saved.");
-        return;
    }
-
-    is_save_needed = false;
 }

 }; // namespace Service::Account
--- a/src/core/hle/service/acc/profile_manager.h
+++ b/src/core/hle/service/acc/profile_manager.h
@ -70,7 +70,6 @@ public:
    std::optional<Common::UUID> GetUser(std::size_t index) const;
    std::optional<std::size_t> GetUserIndex(const Common::UUID& uuid) const;
    std::optional<std::size_t> GetUserIndex(const ProfileInfo& user) const;
-    std::optional<std::size_t> GetUserIndex(const std::string& username) const;
    bool GetProfileBase(std::optional<std::size_t> index, ProfileBase& profile) const;
    bool GetProfileBase(Common::UUID uuid, ProfileBase& profile) const;
    bool GetProfileBase(const ProfileInfo& user, ProfileBase& profile) const;
@ -104,7 +103,6 @@ private:
    std::optional<std::size_t> AddToProfiles(const ProfileInfo& profile);
    bool RemoveProfileAtIndex(std::size_t index);

-    bool is_save_needed{};
    std::array<ProfileInfo, MAX_USERS> profiles{};
    std::array<ProfileInfo, MAX_USERS> stored_opened_profiles{};
    std::size_t user_count{};
--- a/src/core/hle/service/hid/hid.cpp
+++ b/src/core/hle/service/hid/hid.cpp
@ -20,13 +20,12 @@ void LoopProcess(Core::System& system) {
    auto server_manager = std::make_unique<ServerManager>(system);
    std::shared_ptr<ResourceManager> resource_manager = std::make_shared<ResourceManager>(system);
    std::shared_ptr<HidFirmwareSettings> firmware_settings =
-        std::make_shared<HidFirmwareSettings>(system);
+        std::make_shared<HidFirmwareSettings>();

    // TODO: Remove this hack when am is emulated properly.
    resource_manager->Initialize();
    resource_manager->RegisterAppletResourceUserId(system.ApplicationProcess()->GetProcessId(),
                                                   true);
-    resource_manager->SetAruidValidForVibration(system.ApplicationProcess()->GetProcessId(), true);

    server_manager->RegisterNamedService(
        "hid", std::make_shared<IHidServer>(system, resource_manager, firmware_settings));
--- a/src/core/hle/service/hid/hid_server.cpp
+++ b/src/core/hle/service/hid/hid_server.cpp
@ -22,16 +22,12 @@
 #include "hid_core/resources/mouse/mouse.h"
 #include "hid_core/resources/npad/npad.h"
 #include "hid_core/resources/npad/npad_types.h"
-#include "hid_core/resources/npad/npad_vibration.h"
 #include "hid_core/resources/palma/palma.h"
 #include "hid_core/resources/six_axis/console_six_axis.h"
 #include "hid_core/resources/six_axis/seven_six_axis.h"
 #include "hid_core/resources/six_axis/six_axis.h"
 #include "hid_core/resources/touch_screen/gesture.h"
 #include "hid_core/resources/touch_screen/touch_screen.h"
-#include "hid_core/resources/vibration/gc_vibration_device.h"
-#include "hid_core/resources/vibration/n64_vibration_device.h"
-#include "hid_core/resources/vibration/vibration_device.h"

 namespace Service::HID {

@ -42,7 +38,7 @@ public:
        : ServiceFramework{system_, "IActiveVibrationDeviceList"}, resource_manager(resource) {
        // clang-format off
        static const FunctionInfo functions[] = {
-            {0, &IActiveVibrationDeviceList::ActivateVibrationDevice, "ActivateVibrationDevice"},
+            {0, &IActiveVibrationDeviceList::InitializeVibrationDevice, "InitializeVibrationDevice"},
        };
        // clang-format on

@ -50,49 +46,22 @@ public:
    }

 private:
-    void ActivateVibrationDevice(HLERequestContext& ctx) {
+    void InitializeVibrationDevice(HLERequestContext& ctx) {
        IPC::RequestParser rp{ctx};
        const auto vibration_device_handle{rp.PopRaw<Core::HID::VibrationDeviceHandle>()};

+        if (resource_manager != nullptr && resource_manager->GetNpad()) {
+            resource_manager->GetNpad()->InitializeVibrationDevice(vibration_device_handle);
+        }
+
        LOG_DEBUG(Service_HID, "called, npad_type={}, npad_id={}, device_index={}",
                  vibration_device_handle.npad_type, vibration_device_handle.npad_id,
                  vibration_device_handle.device_index);

-        const auto result = ActivateVibrationDeviceImpl(vibration_device_handle);
-
        IPC::ResponseBuilder rb{ctx, 2};
-        rb.Push(result);
+        rb.Push(ResultSuccess);
    }

-    Result ActivateVibrationDeviceImpl(const Core::HID::VibrationDeviceHandle& handle) {
-        std::scoped_lock lock{mutex};
-
-        const Result is_valid = IsVibrationHandleValid(handle);
-        if (is_valid.IsError()) {
-            return is_valid;
-        }
-
-        for (std::size_t i = 0; i < list_size; i++) {
-            if (handle.device_index == vibration_device_list[i].device_index &&
-                handle.npad_id == vibration_device_list[i].npad_id &&
-                handle.npad_type == vibration_device_list[i].npad_type) {
-                return ResultSuccess;
-            }
-        }
-        if (list_size == vibration_device_list.size()) {
-            return ResultVibrationDeviceIndexOutOfRange;
-        }
-        const Result result = resource_manager->GetVibrationDevice(handle)->Activate();
-        if (result.IsError()) {
-            return result;
-        }
-        vibration_device_list[list_size++] = handle;
-        return ResultSuccess;
-    }
-
-    mutable std::mutex mutex;
-    std::size_t list_size{};
-    std::array<Core::HID::VibrationDeviceHandle, 0x100> vibration_device_list{};
    std::shared_ptr<ResourceManager> resource_manager;
 };

@ -184,7 +153,7 @@ IHidServer::IHidServer(Core::System& system_, std::shared_ptr<ResourceManager> r
        {209, &IHidServer::BeginPermitVibrationSession, "BeginPermitVibrationSession"},
        {210, &IHidServer::EndPermitVibrationSession, "EndPermitVibrationSession"},
        {211, &IHidServer::IsVibrationDeviceMounted, "IsVibrationDeviceMounted"},
-        {212, &IHidServer::SendVibrationValueInBool, "SendVibrationValueInBool"},
+        {212, nullptr, "SendVibrationValueInBool"},
        {300, &IHidServer::ActivateConsoleSixAxisSensor, "ActivateConsoleSixAxisSensor"},
        {301, &IHidServer::StartConsoleSixAxisSensor, "StartConsoleSixAxisSensor"},
        {302, &IHidServer::StopConsoleSixAxisSensor, "StopConsoleSixAxisSensor"},
@ -1523,13 +1492,59 @@ void IHidServer::ClearNpadCaptureButtonAssignment(HLERequestContext& ctx) {
 void IHidServer::GetVibrationDeviceInfo(HLERequestContext& ctx) {
    IPC::RequestParser rp{ctx};
    const auto vibration_device_handle{rp.PopRaw<Core::HID::VibrationDeviceHandle>()};
+    const auto controller = GetResourceManager()->GetNpad();

-    Core::HID::VibrationDeviceInfo vibration_device_info{};
-    const auto result = GetResourceManager()->GetVibrationDeviceInfo(vibration_device_info,
-                                                                     vibration_device_handle);
+    Core::HID::VibrationDeviceInfo vibration_device_info;
+    bool check_device_index = false;
+
+    switch (vibration_device_handle.npad_type) {
+    case Core::HID::NpadStyleIndex::Fullkey:
+    case Core::HID::NpadStyleIndex::Handheld:
+    case Core::HID::NpadStyleIndex::JoyconDual:
+    case Core::HID::NpadStyleIndex::JoyconLeft:
+    case Core::HID::NpadStyleIndex::JoyconRight:
+        vibration_device_info.type = Core::HID::VibrationDeviceType::LinearResonantActuator;
+        check_device_index = true;
+        break;
+    case Core::HID::NpadStyleIndex::GameCube:
+        vibration_device_info.type = Core::HID::VibrationDeviceType::GcErm;
+        break;
+    case Core::HID::NpadStyleIndex::N64:
+        vibration_device_info.type = Core::HID::VibrationDeviceType::N64;
+        break;
+    default:
+        vibration_device_info.type = Core::HID::VibrationDeviceType::Unknown;
+        break;
+    }
+
+    vibration_device_info.position = Core::HID::VibrationDevicePosition::None;
+    if (check_device_index) {
+        switch (vibration_device_handle.device_index) {
+        case Core::HID::DeviceIndex::Left:
+            vibration_device_info.position = Core::HID::VibrationDevicePosition::Left;
+            break;
+        case Core::HID::DeviceIndex::Right:
+            vibration_device_info.position = Core::HID::VibrationDevicePosition::Right;
+            break;
+        case Core::HID::DeviceIndex::None:
+        default:
+            ASSERT_MSG(false, "DeviceIndex should never be None!");
+            break;
+        }
+    }
+
+    LOG_DEBUG(Service_HID, "called, vibration_device_type={}, vibration_device_position={}",
+              vibration_device_info.type, vibration_device_info.position);
+
+    const auto result = IsVibrationHandleValid(vibration_device_handle);
+    if (result.IsError()) {
+        IPC::ResponseBuilder rb{ctx, 2};
+        rb.Push(result);
+        return;
+    }

    IPC::ResponseBuilder rb{ctx, 4};
-    rb.Push(result);
+    rb.Push(ResultSuccess);
    rb.PushRaw(vibration_device_info);
 }

@ -1545,16 +1560,16 @@ void IHidServer::SendVibrationValue(HLERequestContext& ctx) {

    const auto parameters{rp.PopRaw<Parameters>()};

+    GetResourceManager()->GetNpad()->VibrateController(parameters.applet_resource_user_id,
+                                                       parameters.vibration_device_handle,
+                                                       parameters.vibration_value);
+
    LOG_DEBUG(Service_HID,
              "called, npad_type={}, npad_id={}, device_index={}, applet_resource_user_id={}",
              parameters.vibration_device_handle.npad_type,
              parameters.vibration_device_handle.npad_id,
              parameters.vibration_device_handle.device_index, parameters.applet_resource_user_id);

-    GetResourceManager()->SendVibrationValue(parameters.applet_resource_user_id,
-                                             parameters.vibration_device_handle,
-                                             parameters.vibration_value);
-
    IPC::ResponseBuilder rb{ctx, 2};
    rb.Push(ResultSuccess);
 }
@ -1576,28 +1591,10 @@ void IHidServer::GetActualVibrationValue(HLERequestContext& ctx) {
              parameters.vibration_device_handle.npad_id,
              parameters.vibration_device_handle.device_index, parameters.applet_resource_user_id);

-    bool has_active_aruid{};
-    NpadVibrationDevice* device{nullptr};
-    Core::HID::VibrationValue vibration_value{};
-    Result result = GetResourceManager()->IsVibrationAruidActive(parameters.applet_resource_user_id,
-                                                                 has_active_aruid);
-
-    if (result.IsSuccess() && has_active_aruid) {
-        result = IsVibrationHandleValid(parameters.vibration_device_handle);
-    }
-    if (result.IsSuccess() && has_active_aruid) {
-        device = GetResourceManager()->GetNSVibrationDevice(parameters.vibration_device_handle);
-    }
-    if (device != nullptr) {
-        result = device->GetActualVibrationValue(vibration_value);
-    }
-    if (result.IsError()) {
-        vibration_value = Core::HID::DEFAULT_VIBRATION_VALUE;
-    }
-
    IPC::ResponseBuilder rb{ctx, 6};
    rb.Push(ResultSuccess);
-    rb.PushRaw(vibration_value);
+    rb.PushRaw(GetResourceManager()->GetNpad()->GetLastVibration(
+        parameters.applet_resource_user_id, parameters.vibration_device_handle));
 }

 void IHidServer::CreateActiveVibrationDeviceList(HLERequestContext& ctx) {
@ -1612,27 +1609,25 @@ void IHidServer::PermitVibration(HLERequestContext& ctx) {
    IPC::RequestParser rp{ctx};
    const auto can_vibrate{rp.Pop<bool>()};

+    // nnSDK saves this value as a float. Since it can only be 1.0f or 0.0f we simplify this value
+    // by converting it to a bool
+    Settings::values.vibration_enabled.SetValue(can_vibrate);
+
    LOG_DEBUG(Service_HID, "called, can_vibrate={}", can_vibrate);

-    const auto result =
-        GetResourceManager()->GetNpad()->GetVibrationHandler()->SetVibrationMasterVolume(
-            can_vibrate ? 1.0f : 0.0f);
-
    IPC::ResponseBuilder rb{ctx, 2};
-    rb.Push(result);
+    rb.Push(ResultSuccess);
 }

 void IHidServer::IsVibrationPermitted(HLERequestContext& ctx) {
    LOG_DEBUG(Service_HID, "called");

-    f32 master_volume{};
-    const auto result =
-        GetResourceManager()->GetNpad()->GetVibrationHandler()->GetVibrationMasterVolume(
-            master_volume);
+    // nnSDK checks if a float is greater than zero. We return the bool we stored earlier
+    const auto is_enabled = Settings::values.vibration_enabled.GetValue();

    IPC::ResponseBuilder rb{ctx, 3};
-    rb.Push(result);
-    rb.Push(master_volume > 0.0f);
+    rb.Push(ResultSuccess);
+    rb.Push(is_enabled);
 }

 void IHidServer::SendVibrationValues(HLERequestContext& ctx) {
@ -1650,22 +1645,13 @@ void IHidServer::SendVibrationValues(HLERequestContext& ctx) {
    auto vibration_values = std::span(
        reinterpret_cast<const Core::HID::VibrationValue*>(vibration_data.data()), vibration_count);

+    GetResourceManager()->GetNpad()->VibrateControllers(applet_resource_user_id,
+                                                        vibration_device_handles, vibration_values);
+
    LOG_DEBUG(Service_HID, "called, applet_resource_user_id={}", applet_resource_user_id);

-    Result result = ResultSuccess;
-    if (handle_count != vibration_count) {
-        result = ResultVibrationArraySizeMismatch;
-    }
-
-    for (std::size_t i = 0; i < handle_count; i++) {
-        if (result.IsSuccess()) {
-            result = GetResourceManager()->SendVibrationValue(
-                applet_resource_user_id, vibration_device_handles[i], vibration_values[i]);
-        }
-    }
-
    IPC::ResponseBuilder rb{ctx, 2};
-    rb.Push(result);
+    rb.Push(ResultSuccess);
 }

 void IHidServer::SendVibrationGcErmCommand(HLERequestContext& ctx) {
@ -1680,6 +1666,43 @@ void IHidServer::SendVibrationGcErmCommand(HLERequestContext& ctx) {

    const auto parameters{rp.PopRaw<Parameters>()};

+    /**
+     * Note: This uses yuzu-specific behavior such that the StopHard command produces
+     * vibrations where freq_low == 0.0f and freq_high == 0.0f, as defined below,
+     * in order to differentiate between Stop and StopHard commands.
+     * This is done to reuse the controller vibration functions made for regular controllers.
+     */
+    const auto vibration_value = [parameters] {
+        switch (parameters.gc_erm_command) {
+        case Core::HID::VibrationGcErmCommand::Stop:
+            return Core::HID::VibrationValue{
+                .low_amplitude = 0.0f,
+                .low_frequency = 160.0f,
+                .high_amplitude = 0.0f,
+                .high_frequency = 320.0f,
+            };
+        case Core::HID::VibrationGcErmCommand::Start:
+            return Core::HID::VibrationValue{
+                .low_amplitude = 1.0f,
+                .low_frequency = 160.0f,
+                .high_amplitude = 1.0f,
+                .high_frequency = 320.0f,
+            };
+        case Core::HID::VibrationGcErmCommand::StopHard:
+            return Core::HID::VibrationValue{
+                .low_amplitude = 0.0f,
+                .low_frequency = 0.0f,
+                .high_amplitude = 0.0f,
+                .high_frequency = 0.0f,
+            };
+        default:
+            return Core::HID::DEFAULT_VIBRATION_VALUE;
+        }
+    }();
+
+    GetResourceManager()->GetNpad()->VibrateController(
+        parameters.applet_resource_user_id, parameters.vibration_device_handle, vibration_value);
+
    LOG_DEBUG(Service_HID,
              "called, npad_type={}, npad_id={}, device_index={}, applet_resource_user_id={}, "
              "gc_erm_command={}",
@ -1688,23 +1711,8 @@ void IHidServer::SendVibrationGcErmCommand(HLERequestContext& ctx) {
              parameters.vibration_device_handle.device_index, parameters.applet_resource_user_id,
              parameters.gc_erm_command);

-    bool has_active_aruid{};
-    NpadGcVibrationDevice* gc_device{nullptr};
-    Result result = GetResourceManager()->IsVibrationAruidActive(parameters.applet_resource_user_id,
-                                                                 has_active_aruid);
-
-    if (result.IsSuccess() && has_active_aruid) {
-        result = IsVibrationHandleValid(parameters.vibration_device_handle);
-    }
-    if (result.IsSuccess() && has_active_aruid) {
-        gc_device = GetResourceManager()->GetGcVibrationDevice(parameters.vibration_device_handle);
-    }
-    if (gc_device != nullptr) {
-        result = gc_device->SendVibrationGcErmCommand(parameters.gc_erm_command);
-    }
-
    IPC::ResponseBuilder rb{ctx, 2};
-    rb.Push(result);
+    rb.Push(ResultSuccess);
 }

 void IHidServer::GetActualVibrationGcErmCommand(HLERequestContext& ctx) {
@ -1717,31 +1725,33 @@ void IHidServer::GetActualVibrationGcErmCommand(HLERequestContext& ctx) {

    const auto parameters{rp.PopRaw<Parameters>()};

+    const auto last_vibration = GetResourceManager()->GetNpad()->GetLastVibration(
+        parameters.applet_resource_user_id, parameters.vibration_device_handle);
+
+    const auto gc_erm_command = [last_vibration] {
+        if (last_vibration.low_amplitude != 0.0f || last_vibration.high_amplitude != 0.0f) {
+            return Core::HID::VibrationGcErmCommand::Start;
+        }
+
+        /**
+         * Note: This uses yuzu-specific behavior such that the StopHard command produces
+         * vibrations where freq_low == 0.0f and freq_high == 0.0f, as defined in the HID function
+         * SendVibrationGcErmCommand, in order to differentiate between Stop and StopHard commands.
+         * This is done to reuse the controller vibration functions made for regular controllers.
+         */
+        if (last_vibration.low_frequency == 0.0f && last_vibration.high_frequency == 0.0f) {
+            return Core::HID::VibrationGcErmCommand::StopHard;
+        }
+
+        return Core::HID::VibrationGcErmCommand::Stop;
+    }();
+
    LOG_DEBUG(Service_HID,
              "called, npad_type={}, npad_id={}, device_index={}, applet_resource_user_id={}",
              parameters.vibration_device_handle.npad_type,
              parameters.vibration_device_handle.npad_id,
              parameters.vibration_device_handle.device_index, parameters.applet_resource_user_id);

-    bool has_active_aruid{};
-    NpadGcVibrationDevice* gc_device{nullptr};
-    Core::HID::VibrationGcErmCommand gc_erm_command{};
-    Result result = GetResourceManager()->IsVibrationAruidActive(parameters.applet_resource_user_id,
-                                                                 has_active_aruid);
-
-    if (result.IsSuccess() && has_active_aruid) {
-        result = IsVibrationHandleValid(parameters.vibration_device_handle);
-    }
-    if (result.IsSuccess() && has_active_aruid) {
-        gc_device = GetResourceManager()->GetGcVibrationDevice(parameters.vibration_device_handle);
-    }
-    if (gc_device != nullptr) {
-        result = gc_device->GetActualVibrationGcErmCommand(gc_erm_command);
-    }
-    if (result.IsError()) {
-        gc_erm_command = Core::HID::VibrationGcErmCommand::Stop;
-    }
-
    IPC::ResponseBuilder rb{ctx, 4};
    rb.Push(ResultSuccess);
    rb.PushEnum(gc_erm_command);
@ -1751,24 +1761,21 @@ void IHidServer::BeginPermitVibrationSession(HLERequestContext& ctx) {
    IPC::RequestParser rp{ctx};
    const auto applet_resource_user_id{rp.Pop<u64>()};

+    GetResourceManager()->GetNpad()->SetPermitVibrationSession(true);
+
    LOG_DEBUG(Service_HID, "called, applet_resource_user_id={}", applet_resource_user_id);

-    const auto result =
-        GetResourceManager()->GetNpad()->GetVibrationHandler()->BeginPermitVibrationSession(
-            applet_resource_user_id);
-
    IPC::ResponseBuilder rb{ctx, 2};
-    rb.Push(result);
+    rb.Push(ResultSuccess);
 }

 void IHidServer::EndPermitVibrationSession(HLERequestContext& ctx) {
+    GetResourceManager()->GetNpad()->SetPermitVibrationSession(false);
+
    LOG_DEBUG(Service_HID, "called");

-    const auto result =
-        GetResourceManager()->GetNpad()->GetVibrationHandler()->EndPermitVibrationSession();
-
    IPC::ResponseBuilder rb{ctx, 2};
-    rb.Push(result);
+    rb.Push(ResultSuccess);
 }

 void IHidServer::IsVibrationDeviceMounted(HLERequestContext& ctx) {
@ -1788,61 +1795,10 @@ void IHidServer::IsVibrationDeviceMounted(HLERequestContext& ctx) {
              parameters.vibration_device_handle.npad_id,
              parameters.vibration_device_handle.device_index, parameters.applet_resource_user_id);

-    bool is_mounted{};
-    NpadVibrationBase* device{nullptr};
-    Result result = IsVibrationHandleValid(parameters.vibration_device_handle);
-
-    if (result.IsSuccess()) {
-        device = GetResourceManager()->GetVibrationDevice(parameters.vibration_device_handle);
-    }
-
-    if (device != nullptr) {
-        is_mounted = device->IsVibrationMounted();
-    }
-
    IPC::ResponseBuilder rb{ctx, 3};
-    rb.Push(result);
-    rb.Push(is_mounted);
-}
-
-void IHidServer::SendVibrationValueInBool(HLERequestContext& ctx) {
-    IPC::RequestParser rp{ctx};
-    struct Parameters {
-        Core::HID::VibrationDeviceHandle vibration_device_handle;
-        INSERT_PADDING_WORDS_NOINIT(1);
-        u64 applet_resource_user_id;
-        bool is_vibrating;
-    };
-    static_assert(sizeof(Parameters) == 0x18, "Parameters has incorrect size.");
-
-    const auto parameters{rp.PopRaw<Parameters>()};
-
-    LOG_DEBUG(Service_HID,
-              "called, npad_type={}, npad_id={}, device_index={}, applet_resource_user_id={}, "
-              "is_vibrating={}",
-              parameters.vibration_device_handle.npad_type,
-              parameters.vibration_device_handle.npad_id,
-              parameters.vibration_device_handle.device_index, parameters.applet_resource_user_id,
-              parameters.is_vibrating);
-
-    bool has_active_aruid{};
-    NpadN64VibrationDevice* n64_device{nullptr};
-    Result result = GetResourceManager()->IsVibrationAruidActive(parameters.applet_resource_user_id,
-                                                                 has_active_aruid);
-
-    if (result.IsSuccess() && has_active_aruid) {
-        result = IsVibrationHandleValid(parameters.vibration_device_handle);
-    }
-    if (result.IsSuccess() && has_active_aruid) {
-        n64_device =
-            GetResourceManager()->GetN64VibrationDevice(parameters.vibration_device_handle);
-    }
-    if (n64_device != nullptr) {
-        result = n64_device->SendValueInBool(parameters.is_vibrating);
-    }
-
-    IPC::ResponseBuilder rb{ctx, 2};
-    rb.Push(result);
+    rb.Push(ResultSuccess);
+    rb.Push(GetResourceManager()->GetNpad()->IsVibrationDeviceMounted(
+        parameters.applet_resource_user_id, parameters.vibration_device_handle));
 }

 void IHidServer::ActivateConsoleSixAxisSensor(HLERequestContext& ctx) {
--- a/src/core/hle/service/hid/hid_server.h
+++ b/src/core/hle/service/hid/hid_server.h
@ -97,7 +97,6 @@ private:
    void BeginPermitVibrationSession(HLERequestContext& ctx);
    void EndPermitVibrationSession(HLERequestContext& ctx);
    void IsVibrationDeviceMounted(HLERequestContext& ctx);
-    void SendVibrationValueInBool(HLERequestContext& ctx);
    void ActivateConsoleSixAxisSensor(HLERequestContext& ctx);
    void StartConsoleSixAxisSensor(HLERequestContext& ctx);
    void StopConsoleSixAxisSensor(HLERequestContext& ctx);
--- a/src/core/hle/service/hid/hid_system_server.cpp
+++ b/src/core/hle/service/hid/hid_system_server.cpp
@ -7,7 +7,6 @@
 #include "hid_core/resource_manager.h"
 #include "hid_core/resources/npad/npad.h"
 #include "hid_core/resources/npad/npad_types.h"
-#include "hid_core/resources/npad/npad_vibration.h"
 #include "hid_core/resources/palma/palma.h"
 #include "hid_core/resources/touch_screen/touch_screen.h"

@ -68,14 +67,14 @@ IHidSystemServer::IHidSystemServer(Core::System& system_, std::shared_ptr<Resour
        {501, &IHidSystemServer::RegisterAppletResourceUserId, "RegisterAppletResourceUserId"},
        {502, &IHidSystemServer::UnregisterAppletResourceUserId, "UnregisterAppletResourceUserId"},
        {503, &IHidSystemServer::EnableAppletToGetInput, "EnableAppletToGetInput"},
-        {504, &IHidSystemServer::SetAruidValidForVibration, "SetAruidValidForVibration"},
+        {504, nullptr, "SetAruidValidForVibration"},
        {505, &IHidSystemServer::EnableAppletToGetSixAxisSensor, "EnableAppletToGetSixAxisSensor"},
        {506, &IHidSystemServer::EnableAppletToGetPadInput, "EnableAppletToGetPadInput"},
        {507, &IHidSystemServer::EnableAppletToGetTouchScreen, "EnableAppletToGetTouchScreen"},
-        {510, &IHidSystemServer::SetVibrationMasterVolume, "SetVibrationMasterVolume"},
-        {511, &IHidSystemServer::GetVibrationMasterVolume, "GetVibrationMasterVolume"},
-        {512, &IHidSystemServer::BeginPermitVibrationSession, "BeginPermitVibrationSession"},
-        {513, &IHidSystemServer::EndPermitVibrationSession, "EndPermitVibrationSession"},
+        {510, nullptr, "SetVibrationMasterVolume"},
+        {511, nullptr, "GetVibrationMasterVolume"},
+        {512, nullptr, "BeginPermitVibrationSession"},
+        {513, nullptr, "EndPermitVibrationSession"},
        {514, nullptr, "Unknown514"},
        {520, nullptr, "EnableHandheldHids"},
        {521, nullptr, "DisableHandheldHids"},
@ -157,7 +156,7 @@ IHidSystemServer::IHidSystemServer(Core::System& system_, std::shared_ptr<Resour
        {1152, nullptr, "SetTouchScreenDefaultConfiguration"},
        {1153, &IHidSystemServer::GetTouchScreenDefaultConfiguration, "GetTouchScreenDefaultConfiguration"},
        {1154, nullptr, "IsFirmwareAvailableForNotification"},
-        {1155, &IHidSystemServer::SetForceHandheldStyleVibration, "SetForceHandheldStyleVibration"},
+        {1155, nullptr, "SetForceHandheldStyleVibration"},
        {1156, nullptr, "SendConnectionTriggerWithoutTimeoutEvent"},
        {1157, nullptr, "CancelConnectionTrigger"},
        {1200, nullptr, "IsButtonConfigSupported"},
@ -539,27 +538,6 @@ void IHidSystemServer::EnableAppletToGetInput(HLERequestContext& ctx) {
    rb.Push(ResultSuccess);
 }

-void IHidSystemServer::SetAruidValidForVibration(HLERequestContext& ctx) {
-    IPC::RequestParser rp{ctx};
-    struct Parameters {
-        bool is_enabled;
-        INSERT_PADDING_WORDS_NOINIT(1);
-        u64 applet_resource_user_id;
-    };
-    static_assert(sizeof(Parameters) == 0x10, "Parameters has incorrect size.");
-
-    const auto parameters{rp.PopRaw<Parameters>()};
-
-    LOG_INFO(Service_HID, "called, is_enabled={}, applet_resource_user_id={}",
-             parameters.is_enabled, parameters.applet_resource_user_id);
-
-    GetResourceManager()->SetAruidValidForVibration(parameters.applet_resource_user_id,
-                                                    parameters.is_enabled);
-
-    IPC::ResponseBuilder rb{ctx, 2};
-    rb.Push(ResultSuccess);
-}
-
 void IHidSystemServer::EnableAppletToGetSixAxisSensor(HLERequestContext& ctx) {
    IPC::RequestParser rp{ctx};
    struct Parameters {
@ -623,57 +601,6 @@ void IHidSystemServer::EnableAppletToGetTouchScreen(HLERequestContext& ctx) {
    rb.Push(ResultSuccess);
 }

-void IHidSystemServer::SetVibrationMasterVolume(HLERequestContext& ctx) {
-    IPC::RequestParser rp{ctx};
-    const auto master_volume{rp.Pop<f32>()};
-
-    LOG_INFO(Service_HID, "called, volume={}", master_volume);
-
-    const auto result =
-        GetResourceManager()->GetNpad()->GetVibrationHandler()->SetVibrationMasterVolume(
-            master_volume);
-
-    IPC::ResponseBuilder rb{ctx, 2};
-    rb.Push(result);
-}
-
-void IHidSystemServer::GetVibrationMasterVolume(HLERequestContext& ctx) {
-    f32 master_volume{};
-    const auto result =
-        GetResourceManager()->GetNpad()->GetVibrationHandler()->GetVibrationMasterVolume(
-            master_volume);
-
-    LOG_INFO(Service_HID, "called, volume={}", master_volume);
-
-    IPC::ResponseBuilder rb{ctx, 3};
-    rb.Push(result);
-    rb.Push(master_volume);
-}
-
-void IHidSystemServer::BeginPermitVibrationSession(HLERequestContext& ctx) {
-    IPC::RequestParser rp{ctx};
-    const auto applet_resource_user_id{rp.Pop<u64>()};
-
-    LOG_INFO(Service_HID, "called, applet_resource_user_id={}", applet_resource_user_id);
-
-    const auto result =
-        GetResourceManager()->GetNpad()->GetVibrationHandler()->BeginPermitVibrationSession(
-            applet_resource_user_id);
-
-    IPC::ResponseBuilder rb{ctx, 2};
-    rb.Push(result);
-}
-
-void IHidSystemServer::EndPermitVibrationSession(HLERequestContext& ctx) {
-    LOG_INFO(Service_HID, "called");
-
-    const auto result =
-        GetResourceManager()->GetNpad()->GetVibrationHandler()->EndPermitVibrationSession();
-
-    IPC::ResponseBuilder rb{ctx, 2};
-    rb.Push(result);
-}
-
 void IHidSystemServer::IsJoyConAttachedOnAllRail(HLERequestContext& ctx) {
    const bool is_attached = true;

@ -822,19 +749,6 @@ void IHidSystemServer::GetTouchScreenDefaultConfiguration(HLERequestContext& ctx
    rb.PushRaw(touchscreen_config);
 }

-void IHidSystemServer::SetForceHandheldStyleVibration(HLERequestContext& ctx) {
-    IPC::RequestParser rp{ctx};
-    const auto is_forced{rp.Pop<bool>()};
-
-    LOG_INFO(Service_HID, "called, is_forced={}", is_forced);
-
-    GetResourceManager()->SetForceHandheldStyleVibration(is_forced);
-    GetResourceManager()->GetNpad()->UpdateHandheldAbstractState();
-
-    IPC::ResponseBuilder rb{ctx, 2};
-    rb.Push(ResultSuccess);
-}
-
 void IHidSystemServer::IsUsingCustomButtonConfig(HLERequestContext& ctx) {
    const bool is_enabled = false;

--- a/src/core/hle/service/hid/hid_system_server.h
+++ b/src/core/hle/service/hid/hid_system_server.h
@ -42,14 +42,9 @@ private:
    void RegisterAppletResourceUserId(HLERequestContext& ctx);
    void UnregisterAppletResourceUserId(HLERequestContext& ctx);
    void EnableAppletToGetInput(HLERequestContext& ctx);
-    void SetAruidValidForVibration(HLERequestContext& ctx);
    void EnableAppletToGetSixAxisSensor(HLERequestContext& ctx);
    void EnableAppletToGetPadInput(HLERequestContext& ctx);
    void EnableAppletToGetTouchScreen(HLERequestContext& ctx);
-    void SetVibrationMasterVolume(HLERequestContext& ctx);
-    void GetVibrationMasterVolume(HLERequestContext& ctx);
-    void BeginPermitVibrationSession(HLERequestContext& ctx);
-    void EndPermitVibrationSession(HLERequestContext& ctx);
    void IsJoyConAttachedOnAllRail(HLERequestContext& ctx);
    void AcquireConnectionTriggerTimeoutEvent(HLERequestContext& ctx);
    void AcquireDeviceRegisteredEventForControllerSupport(HLERequestContext& ctx);
@ -66,7 +61,6 @@ private:
    void FinalizeUsbFirmwareUpdate(HLERequestContext& ctx);
    void InitializeUsbFirmwareUpdateWithoutMemory(HLERequestContext& ctx);
    void GetTouchScreenDefaultConfiguration(HLERequestContext& ctx);
-    void SetForceHandheldStyleVibration(HLERequestContext& ctx);
    void IsUsingCustomButtonConfig(HLERequestContext& ctx);

    std::shared_ptr<ResourceManager> GetResourceManager();
--- a/src/core/hle/service/hle_ipc.cpp
+++ b/src/core/hle/service/hle_ipc.cpp
@ -24,6 +24,19 @@
 #include "core/hle/service/ipc_helpers.h"
 #include "core/memory.h"

+namespace {
+static thread_local std::array read_buffer_data_a{
+    Common::ScratchBuffer<u8>(),
+    Common::ScratchBuffer<u8>(),
+    Common::ScratchBuffer<u8>(),
+};
+static thread_local std::array read_buffer_data_x{
+    Common::ScratchBuffer<u8>(),
+    Common::ScratchBuffer<u8>(),
+    Common::ScratchBuffer<u8>(),
+};
+} // Anonymous namespace
+
 namespace Service {

 SessionRequestHandler::SessionRequestHandler(Kernel::KernelCore& kernel_, const char* service_name_)
@ -331,27 +344,48 @@ std::vector<u8> HLERequestContext::ReadBufferCopy(std::size_t buffer_index) cons
 }

 std::span<const u8> HLERequestContext::ReadBufferA(std::size_t buffer_index) const {
-    Core::Memory::CpuGuestMemory<u8, Core::Memory::GuestMemoryFlags::UnsafeRead> gm(memory, 0, 0);
+    static thread_local std::array read_buffer_a{
+        Core::Memory::CpuGuestMemory<u8, Core::Memory::GuestMemoryFlags::UnsafeRead>(memory, 0, 0),
+        Core::Memory::CpuGuestMemory<u8, Core::Memory::GuestMemoryFlags::UnsafeRead>(memory, 0, 0),
+        Core::Memory::CpuGuestMemory<u8, Core::Memory::GuestMemoryFlags::UnsafeRead>(memory, 0, 0),
+    };

    ASSERT_OR_EXECUTE_MSG(
        BufferDescriptorA().size() > buffer_index, { return {}; },
        "BufferDescriptorA invalid buffer_index {}", buffer_index);
-    return gm.Read(BufferDescriptorA()[buffer_index].Address(),
-                   BufferDescriptorA()[buffer_index].Size(), &read_buffer_data_a[buffer_index]);
+    auto& read_buffer = read_buffer_a[buffer_index];
+    return read_buffer.Read(BufferDescriptorA()[buffer_index].Address(),
+                            BufferDescriptorA()[buffer_index].Size(),
+                            &read_buffer_data_a[buffer_index]);
 }

 std::span<const u8> HLERequestContext::ReadBufferX(std::size_t buffer_index) const {
-    Core::Memory::CpuGuestMemory<u8, Core::Memory::GuestMemoryFlags::UnsafeRead> gm(memory, 0, 0);
+    static thread_local std::array read_buffer_x{
+        Core::Memory::CpuGuestMemory<u8, Core::Memory::GuestMemoryFlags::UnsafeRead>(memory, 0, 0),
+        Core::Memory::CpuGuestMemory<u8, Core::Memory::GuestMemoryFlags::UnsafeRead>(memory, 0, 0),
+        Core::Memory::CpuGuestMemory<u8, Core::Memory::GuestMemoryFlags::UnsafeRead>(memory, 0, 0),
+    };

    ASSERT_OR_EXECUTE_MSG(
        BufferDescriptorX().size() > buffer_index, { return {}; },
        "BufferDescriptorX invalid buffer_index {}", buffer_index);
-    return gm.Read(BufferDescriptorX()[buffer_index].Address(),
-                   BufferDescriptorX()[buffer_index].Size(), &read_buffer_data_x[buffer_index]);
+    auto& read_buffer = read_buffer_x[buffer_index];
+    return read_buffer.Read(BufferDescriptorX()[buffer_index].Address(),
+                            BufferDescriptorX()[buffer_index].Size(),
+                            &read_buffer_data_x[buffer_index]);
 }

 std::span<const u8> HLERequestContext::ReadBuffer(std::size_t buffer_index) const {
-    Core::Memory::CpuGuestMemory<u8, Core::Memory::GuestMemoryFlags::UnsafeRead> gm(memory, 0, 0);
+    static thread_local std::array read_buffer_a{
+        Core::Memory::CpuGuestMemory<u8, Core::Memory::GuestMemoryFlags::UnsafeRead>(memory, 0, 0),
+        Core::Memory::CpuGuestMemory<u8, Core::Memory::GuestMemoryFlags::UnsafeRead>(memory, 0, 0),
+        Core::Memory::CpuGuestMemory<u8, Core::Memory::GuestMemoryFlags::UnsafeRead>(memory, 0, 0),
+    };
+    static thread_local std::array read_buffer_x{
+        Core::Memory::CpuGuestMemory<u8, Core::Memory::GuestMemoryFlags::UnsafeRead>(memory, 0, 0),
+        Core::Memory::CpuGuestMemory<u8, Core::Memory::GuestMemoryFlags::UnsafeRead>(memory, 0, 0),
+        Core::Memory::CpuGuestMemory<u8, Core::Memory::GuestMemoryFlags::UnsafeRead>(memory, 0, 0),
+    };

    const bool is_buffer_a{BufferDescriptorA().size() > buffer_index &&
                           BufferDescriptorA()[buffer_index].Size()};
@ -368,14 +402,18 @@ std::span<const u8> HLERequestContext::ReadBuffer(std::size_t buffer_index) cons
        ASSERT_OR_EXECUTE_MSG(
            BufferDescriptorA().size() > buffer_index, { return {}; },
            "BufferDescriptorA invalid buffer_index {}", buffer_index);
-        return gm.Read(BufferDescriptorA()[buffer_index].Address(),
-                       BufferDescriptorA()[buffer_index].Size(), &read_buffer_data_a[buffer_index]);
+        auto& read_buffer = read_buffer_a[buffer_index];
+        return read_buffer.Read(BufferDescriptorA()[buffer_index].Address(),
+                                BufferDescriptorA()[buffer_index].Size(),
+                                &read_buffer_data_a[buffer_index]);
    } else {
        ASSERT_OR_EXECUTE_MSG(
            BufferDescriptorX().size() > buffer_index, { return {}; },
            "BufferDescriptorX invalid buffer_index {}", buffer_index);
-        return gm.Read(BufferDescriptorX()[buffer_index].Address(),
-                       BufferDescriptorX()[buffer_index].Size(), &read_buffer_data_x[buffer_index]);
+        auto& read_buffer = read_buffer_x[buffer_index];
+        return read_buffer.Read(BufferDescriptorX()[buffer_index].Address(),
+                                BufferDescriptorX()[buffer_index].Size(),
+                                &read_buffer_data_x[buffer_index]);
    }
 }

--- a/src/core/hle/service/hle_ipc.h
+++ b/src/core/hle/service/hle_ipc.h
@ -426,9 +426,6 @@ private:

    Kernel::KernelCore& kernel;
    Core::Memory::Memory& memory;
-
-    mutable std::array<Common::ScratchBuffer<u8>, 3> read_buffer_data_a{};
-    mutable std::array<Common::ScratchBuffer<u8>, 3> read_buffer_data_x{};
 };

 } // namespace Service
--- a/src/core/hle/service/nfc/common/device.cpp
+++ b/src/core/hle/service/nfc/common/device.cpp
@ -441,10 +441,7 @@ Result NfcDevice::Mount(NFP::ModelType model_type, NFP::MountTarget mount_target
    device_state = DeviceState::TagMounted;
    mount_target = mount_target_;

-    const bool create_backup =
-        mount_target == NFP::MountTarget::All || mount_target == NFP::MountTarget::Ram ||
-        (mount_target == NFP::MountTarget::Rom && HasBackup(encrypted_tag_data.uuid).IsError());
-    if (!is_corrupted && create_backup) {
+    if (!is_corrupted && mount_target != NFP::MountTarget::Rom) {
        std::vector<u8> data(sizeof(NFP::EncryptedNTAG215File));
        memcpy(data.data(), &encrypted_tag_data, sizeof(encrypted_tag_data));
        WriteBackupData(encrypted_tag_data.uuid, data);
--- a/src/core/hle/service/nvdrv/core/container.cpp
+++ b/src/core/hle/service/nvdrv/core/container.cpp
@ -16,8 +16,9 @@

 namespace Service::Nvidia::NvCore {

-Session::Session(SessionId id_, Kernel::KProcess* process_, Core::Asid asid_)
-    : id{id_}, process{process_}, asid{asid_}, has_preallocated_area{}, mapper{}, is_active{} {}
+Session::Session(size_t id_, Kernel::KProcess* process_, size_t smmu_id_)
+    : id{id_}, process{process_}, smmu_id{smmu_id_},
+      has_preallocated_area{}, mapper{}, is_active{} {}

 Session::~Session() = default;

@ -40,9 +41,7 @@ Container::Container(Tegra::Host1x::Host1x& host1x_) {

 Container::~Container() = default;

-SessionId Container::OpenSession(Kernel::KProcess* process) {
-    using namespace Common::Literals;
-
+size_t Container::OpenSession(Kernel::KProcess* process) {
    std::scoped_lock lk(impl->session_guard);
    for (auto& session : impl->sessions) {
        if (!session.is_active) {
@ -55,14 +54,14 @@ SessionId Container::OpenSession(Kernel::KProcess* process) {
    size_t new_id{};
    auto* memory_interface = &process->GetMemory();
    auto& smmu = impl->host1x.MemoryManager();
-    auto asid = smmu.RegisterProcess(memory_interface);
+    auto smmu_id = smmu.RegisterProcess(memory_interface);
    if (!impl->id_pool.empty()) {
        new_id = impl->id_pool.front();
        impl->id_pool.pop_front();
-        impl->sessions[new_id] = Session{SessionId{new_id}, process, asid};
+        impl->sessions[new_id] = Session{new_id, process, smmu_id};
    } else {
        new_id = impl->new_ids++;
-        impl->sessions.emplace_back(SessionId{new_id}, process, asid);
+        impl->sessions.emplace_back(new_id, process, smmu_id);
    }
    auto& session = impl->sessions[new_id];
    session.is_active = true;
@ -81,7 +80,7 @@ SessionId Container::OpenSession(Kernel::KProcess* process) {
                                          cur_addr));
            auto svc_mem_info = mem_info.GetSvcMemoryInfo();

-            // Check if this memory block is heap.
+            // check if this memory block is heap
            if (svc_mem_info.state == Kernel::Svc::MemoryState::Normal) {
                if (svc_mem_info.size > region_size) {
                    region_size = svc_mem_info.size;
@ -98,21 +97,21 @@ SessionId Container::OpenSession(Kernel::KProcess* process) {
            cur_addr = next_address;
        }
        session.has_preallocated_area = false;
-        auto start_region = region_size >= 32_MiB ? smmu.Allocate(region_size) : 0;
+        auto start_region = (region_size >> 15) >= 1024 ? smmu.Allocate(region_size) : 0;
        if (start_region != 0) {
            session.mapper = std::make_unique<HeapMapper>(region_start, start_region, region_size,
-                                                          asid, impl->host1x);
-            smmu.TrackContinuity(start_region, region_start, region_size, asid);
+                                                          smmu_id, impl->host1x);
+            smmu.TrackContinuity(start_region, region_start, region_size, smmu_id);
            session.has_preallocated_area = true;
-            LOG_DEBUG(Debug, "Preallocation created!");
+            LOG_CRITICAL(Debug, "Preallocation created!");
        }
    }
-    return SessionId{new_id};
+    return new_id;
 }

-void Container::CloseSession(SessionId session_id) {
+void Container::CloseSession(size_t id) {
    std::scoped_lock lk(impl->session_guard);
-    auto& session = impl->sessions[session_id.id];
+    auto& session = impl->sessions[id];
    auto& smmu = impl->host1x.MemoryManager();
    if (session.has_preallocated_area) {
        const DAddr region_start = session.mapper->GetRegionStart();
@ -122,13 +121,13 @@ void Container::CloseSession(SessionId session_id) {
        session.has_preallocated_area = false;
    }
    session.is_active = false;
-    smmu.UnregisterProcess(impl->sessions[session_id.id].asid);
-    impl->id_pool.emplace_front(session_id.id);
+    smmu.UnregisterProcess(impl->sessions[id].smmu_id);
+    impl->id_pool.emplace_front(id);
 }

-Session* Container::GetSession(SessionId session_id) {
+Session* Container::GetSession(size_t id) {
    std::atomic_thread_fence(std::memory_order_acquire);
-    return &impl->sessions[session_id.id];
+    return &impl->sessions[id];
 }

 NvMap& Container::GetNvMapFile() {
--- a/src/core/hle/service/nvdrv/core/container.h
+++ b/src/core/hle/service/nvdrv/core/container.h
@ -8,7 +8,6 @@
 #include <memory>
 #include <unordered_map>

-#include "core/device_memory_manager.h"
 #include "core/hle/service/nvdrv/nvdata.h"

 namespace Kernel {
@ -27,12 +26,8 @@ class SyncpointManager;

 struct ContainerImpl;

-struct SessionId {
-    size_t id;
-};
-
 struct Session {
-    Session(SessionId id_, Kernel::KProcess* process_, Core::Asid asid_);
+    Session(size_t id_, Kernel::KProcess* process_, size_t smmu_id_);
    ~Session();

    Session(const Session&) = delete;
@ -40,9 +35,9 @@ struct Session {
    Session(Session&&) = default;
    Session& operator=(Session&&) = default;

-    SessionId id;
+    size_t id;
    Kernel::KProcess* process;
-    Core::Asid asid;
+    size_t smmu_id;
    bool has_preallocated_area{};
    std::unique_ptr<HeapMapper> mapper{};
    bool is_active{};
@ -53,10 +48,10 @@ public:
    explicit Container(Tegra::Host1x::Host1x& host1x);
    ~Container();

-    SessionId OpenSession(Kernel::KProcess* process);
-    void CloseSession(SessionId id);
+    size_t OpenSession(Kernel::KProcess* process);
+    void CloseSession(size_t id);

-    Session* GetSession(SessionId id);
+    Session* GetSession(size_t id);

    NvMap& GetNvMapFile();

--- a/src/core/hle/service/nvdrv/core/heap_mapper.cpp
+++ b/src/core/hle/service/nvdrv/core/heap_mapper.cpp
@ -109,9 +109,9 @@ struct HeapMapper::HeapMapperInternal {
    std::mutex guard;
 };

-HeapMapper::HeapMapper(VAddr start_vaddress, DAddr start_daddress, size_t size, Core::Asid asid,
+HeapMapper::HeapMapper(VAddr start_vaddress, DAddr start_daddress, size_t size, size_t smmu_id,
                       Tegra::Host1x::Host1x& host1x)
-    : m_vaddress{start_vaddress}, m_daddress{start_daddress}, m_size{size}, m_asid{asid} {
+    : m_vaddress{start_vaddress}, m_daddress{start_daddress}, m_size{size}, m_smmu_id{smmu_id} {
    m_internal = std::make_unique<HeapMapperInternal>(host1x);
 }

@ -138,7 +138,7 @@ DAddr HeapMapper::Map(VAddr start, size_t size) {
            const size_t offset = inter_addr - m_vaddress;
            const size_t sub_size = inter_addr_end - inter_addr;
            m_internal->device_memory.Map(m_daddress + offset, m_vaddress + offset, sub_size,
-                                          m_asid);
+                                          m_smmu_id);
        }
    }
    m_internal->mapping_overlaps += std::make_pair(interval, 1);
@ -172,4 +172,4 @@ void HeapMapper::Unmap(VAddr start, size_t size) {
    m_internal->base_set.clear();
 }

-} // namespace Service::Nvidia::NvCore
+} // namespace Service::Nvidia::NvCore
--- a/src/core/hle/service/nvdrv/core/heap_mapper.h
+++ b/src/core/hle/service/nvdrv/core/heap_mapper.h
@ -6,7 +6,6 @@
 #include <memory>

 #include "common/common_types.h"
-#include "core/device_memory_manager.h"

 namespace Tegra::Host1x {
 class Host1x;
@ -16,7 +15,7 @@ namespace Service::Nvidia::NvCore {

 class HeapMapper {
 public:
-    HeapMapper(VAddr start_vaddress, DAddr start_daddress, size_t size, Core::Asid asid,
+    HeapMapper(VAddr start_vaddress, DAddr start_daddress, size_t size, size_t smmu_id,
               Tegra::Host1x::Host1x& host1x);
    ~HeapMapper();

@ -42,8 +41,8 @@ private:
    VAddr m_vaddress;
    DAddr m_daddress;
    size_t m_size;
-    Core::Asid m_asid;
+    size_t m_smmu_id;
    std::unique_ptr<HeapMapperInternal> m_internal;
 };

-} // namespace Service::Nvidia::NvCore
+} // namespace Service::Nvidia::NvCore
--- a/src/core/hle/service/nvdrv/core/nvmap.cpp
+++ b/src/core/hle/service/nvdrv/core/nvmap.cpp
@ -22,8 +22,7 @@ NvMap::Handle::Handle(u64 size_, Id id_)
    flags.raw = 0;
 }

-NvResult NvMap::Handle::Alloc(Flags pFlags, u32 pAlign, u8 pKind, u64 pAddress,
-                              NvCore::SessionId pSessionId) {
+NvResult NvMap::Handle::Alloc(Flags pFlags, u32 pAlign, u8 pKind, u64 pAddress, size_t pSessionId) {
    std::scoped_lock lock(mutex);
    // Handles cannot be allocated twice
    if (allocated) {
@ -224,7 +223,7 @@ DAddr NvMap::PinHandle(NvMap::Handle::Id handle, bool low_area_pin) {
            }

            handle_description->d_address = address;
-            smmu.Map(address, vaddress, map_size, session->asid, true);
+            smmu.Map(address, vaddress, map_size, session->smmu_id, true);
            handle_description->in_heap = false;
        }
    }
--- a/src/core/hle/service/nvdrv/core/nvmap.h
+++ b/src/core/hle/service/nvdrv/core/nvmap.h
@ -14,7 +14,6 @@

 #include "common/bit_field.h"
 #include "common/common_types.h"
-#include "core/hle/service/nvdrv/core/container.h"
 #include "core/hle/service/nvdrv/nvdata.h"

 namespace Tegra {
@ -72,7 +71,7 @@ public:
        u8 kind{};        //!< Used for memory compression
        bool allocated{}; //!< If the handle has been allocated with `Alloc`
        bool in_heap{};
-        NvCore::SessionId session_id{};
+        size_t session_id{};

        DAddr d_address{}; //!< The memory location in the device's AS that this handle corresponds
                           //!< to, this can also be in the nvdrv tmem
@ -84,7 +83,7 @@ public:
         * if a 0 address is passed
         */
        [[nodiscard]] NvResult Alloc(Flags pFlags, u32 pAlign, u8 pKind, u64 pAddress,
-                                     NvCore::SessionId pSessionId);
+                                     size_t pSessionId);

        /**
         * @brief Increases the dupe counter of the handle for the given session
--- a/src/core/hle/service/nvdrv/devices/nvdevice.h
+++ b/src/core/hle/service/nvdrv/devices/nvdevice.h
@ -7,7 +7,6 @@
 #include <vector>

 #include "common/common_types.h"
-#include "core/hle/service/nvdrv/core/container.h"
 #include "core/hle/service/nvdrv/nvdata.h"

 namespace Core {
@ -63,7 +62,7 @@ public:
     * Called once a device is opened
     * @param fd The device fd
     */
-    virtual void OnOpen(NvCore::SessionId session_id, DeviceFD fd) = 0;
+    virtual void OnOpen(size_t session_id, DeviceFD fd) = 0;

    /**
     * Called once a device is closed
--- a/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp
+++ b/src/core/hle/service/nvdrv/devices/nvdisp_disp0.cpp
@ -35,7 +35,7 @@ NvResult nvdisp_disp0::Ioctl3(DeviceFD fd, Ioctl command, std::span<const u8> in
    return NvResult::NotImplemented;
 }

-void nvdisp_disp0::OnOpen(NvCore::SessionId session_id, DeviceFD fd) {}
+void nvdisp_disp0::OnOpen(size_t session_id, DeviceFD fd) {}
 void nvdisp_disp0::OnClose(DeviceFD fd) {}

 void nvdisp_disp0::flip(u32 buffer_handle, u32 offset, android::PixelFormat format, u32 width,
--- a/src/core/hle/service/nvdrv/devices/nvdisp_disp0.h
+++ b/src/core/hle/service/nvdrv/devices/nvdisp_disp0.h
@ -32,7 +32,7 @@ public:
    NvResult Ioctl3(DeviceFD fd, Ioctl command, std::span<const u8> input, std::span<u8> output,
                    std::span<u8> inline_output) override;

-    void OnOpen(NvCore::SessionId session_id, DeviceFD fd) override;
+    void OnOpen(size_t session_id, DeviceFD fd) override;
    void OnClose(DeviceFD fd) override;

    /// Performs a screen flip, drawing the buffer pointed to by the handle.
--- a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp
+++ b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp
@ -86,7 +86,7 @@ NvResult nvhost_as_gpu::Ioctl3(DeviceFD fd, Ioctl command, std::span<const u8> i
    return NvResult::NotImplemented;
 }

-void nvhost_as_gpu::OnOpen(NvCore::SessionId session_id, DeviceFD fd) {}
+void nvhost_as_gpu::OnOpen(size_t session_id, DeviceFD fd) {}
 void nvhost_as_gpu::OnClose(DeviceFD fd) {}

 NvResult nvhost_as_gpu::AllocAsEx(IoctlAllocAsEx& params) {
--- a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.h
+++ b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.h
@ -55,7 +55,7 @@ public:
    NvResult Ioctl3(DeviceFD fd, Ioctl command, std::span<const u8> input, std::span<u8> output,
                    std::span<u8> inline_output) override;

-    void OnOpen(NvCore::SessionId session_id, DeviceFD fd) override;
+    void OnOpen(size_t session_id, DeviceFD fd) override;
    void OnClose(DeviceFD fd) override;

    Kernel::KEvent* QueryEvent(u32 event_id) override;
--- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp
+++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp
@ -76,7 +76,7 @@ NvResult nvhost_ctrl::Ioctl3(DeviceFD fd, Ioctl command, std::span<const u8> inp
    return NvResult::NotImplemented;
 }

-void nvhost_ctrl::OnOpen(NvCore::SessionId session_id, DeviceFD fd) {}
+void nvhost_ctrl::OnOpen(size_t session_id, DeviceFD fd) {}

 void nvhost_ctrl::OnClose(DeviceFD fd) {}

--- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.h
+++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.h
@ -32,7 +32,7 @@ public:
    NvResult Ioctl3(DeviceFD fd, Ioctl command, std::span<const u8> input, std::span<u8> output,
                    std::span<u8> inline_output) override;

-    void OnOpen(NvCore::SessionId session_id, DeviceFD fd) override;
+    void OnOpen(size_t session_id, DeviceFD fd) override;
    void OnClose(DeviceFD fd) override;

    Kernel::KEvent* QueryEvent(u32 event_id) override;
--- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp
+++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp
@ -82,7 +82,7 @@ NvResult nvhost_ctrl_gpu::Ioctl3(DeviceFD fd, Ioctl command, std::span<const u8>
    return NvResult::NotImplemented;
 }

-void nvhost_ctrl_gpu::OnOpen(NvCore::SessionId session_id, DeviceFD fd) {}
+void nvhost_ctrl_gpu::OnOpen(size_t session_id, DeviceFD fd) {}
 void nvhost_ctrl_gpu::OnClose(DeviceFD fd) {}

 NvResult nvhost_ctrl_gpu::GetCharacteristics1(IoctlCharacteristics& params) {
--- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.h
+++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.h
@ -28,7 +28,7 @@ public:
    NvResult Ioctl3(DeviceFD fd, Ioctl command, std::span<const u8> input, std::span<u8> output,
                    std::span<u8> inline_output) override;

-    void OnOpen(NvCore::SessionId session_id, DeviceFD fd) override;
+    void OnOpen(size_t session_id, DeviceFD fd) override;
    void OnClose(DeviceFD fd) override;

    Kernel::KEvent* QueryEvent(u32 event_id) override;
--- a/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp
+++ b/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp
@ -120,7 +120,7 @@ NvResult nvhost_gpu::Ioctl3(DeviceFD fd, Ioctl command, std::span<const u8> inpu
    return NvResult::NotImplemented;
 }

-void nvhost_gpu::OnOpen(NvCore::SessionId session_id, DeviceFD fd) {}
+void nvhost_gpu::OnOpen(size_t session_id, DeviceFD fd) {}
 void nvhost_gpu::OnClose(DeviceFD fd) {}

 NvResult nvhost_gpu::SetNVMAPfd(IoctlSetNvmapFD& params) {
--- a/src/core/hle/service/nvdrv/devices/nvhost_gpu.h
+++ b/src/core/hle/service/nvdrv/devices/nvhost_gpu.h
@ -47,7 +47,7 @@ public:
    NvResult Ioctl3(DeviceFD fd, Ioctl command, std::span<const u8> input, std::span<u8> output,
                    std::span<u8> inline_output) override;

-    void OnOpen(NvCore::SessionId session_id, DeviceFD fd) override;
+    void OnOpen(size_t session_id, DeviceFD fd) override;
    void OnClose(DeviceFD fd) override;

    Kernel::KEvent* QueryEvent(u32 event_id) override;
--- a/src/core/hle/service/nvdrv/devices/nvhost_nvdec.cpp
+++ b/src/core/hle/service/nvdrv/devices/nvhost_nvdec.cpp
@ -68,7 +68,7 @@ NvResult nvhost_nvdec::Ioctl3(DeviceFD fd, Ioctl command, std::span<const u8> in
    return NvResult::NotImplemented;
 }

-void nvhost_nvdec::OnOpen(NvCore::SessionId session_id, DeviceFD fd) {
+void nvhost_nvdec::OnOpen(size_t session_id, DeviceFD fd) {
    LOG_INFO(Service_NVDRV, "NVDEC video stream started");
    system.SetNVDECActive(true);
    sessions[fd] = session_id;
--- a/src/core/hle/service/nvdrv/devices/nvhost_nvdec.h
+++ b/src/core/hle/service/nvdrv/devices/nvhost_nvdec.h
@ -20,7 +20,7 @@ public:
    NvResult Ioctl3(DeviceFD fd, Ioctl command, std::span<const u8> input, std::span<u8> output,
                    std::span<u8> inline_output) override;

-    void OnOpen(NvCore::SessionId session_id, DeviceFD fd) override;
+    void OnOpen(size_t session_id, DeviceFD fd) override;
    void OnClose(DeviceFD fd) override;
 };

--- a/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.h
+++ b/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.h
@ -127,7 +127,7 @@ protected:
    NvCore::NvMap& nvmap;
    NvCore::ChannelType channel_type;
    std::array<u32, MaxSyncPoints> device_syncpoints{};
-    std::unordered_map<DeviceFD, NvCore::SessionId> sessions;
+    std::unordered_map<DeviceFD, size_t> sessions;
 };
 }; // namespace Devices
 } // namespace Service::Nvidia
--- a/src/core/hle/service/nvdrv/devices/nvhost_nvjpg.cpp
+++ b/src/core/hle/service/nvdrv/devices/nvhost_nvjpg.cpp
@ -44,7 +44,7 @@ NvResult nvhost_nvjpg::Ioctl3(DeviceFD fd, Ioctl command, std::span<const u8> in
    return NvResult::NotImplemented;
 }

-void nvhost_nvjpg::OnOpen(NvCore::SessionId session_id, DeviceFD fd) {}
+void nvhost_nvjpg::OnOpen(size_t session_id, DeviceFD fd) {}
 void nvhost_nvjpg::OnClose(DeviceFD fd) {}

 NvResult nvhost_nvjpg::SetNVMAPfd(IoctlSetNvmapFD& params) {
--- a/src/core/hle/service/nvdrv/devices/nvhost_nvjpg.h
+++ b/src/core/hle/service/nvdrv/devices/nvhost_nvjpg.h
@ -22,7 +22,7 @@ public:
    NvResult Ioctl3(DeviceFD fd, Ioctl command, std::span<const u8> input, std::span<u8> output,
                    std::span<u8> inline_output) override;

-    void OnOpen(NvCore::SessionId session_id, DeviceFD fd) override;
+    void OnOpen(size_t session_id, DeviceFD fd) override;
    void OnClose(DeviceFD fd) override;

 private:
--- a/src/core/hle/service/nvdrv/devices/nvhost_vic.cpp
+++ b/src/core/hle/service/nvdrv/devices/nvhost_vic.cpp
@ -68,7 +68,7 @@ NvResult nvhost_vic::Ioctl3(DeviceFD fd, Ioctl command, std::span<const u8> inpu
    return NvResult::NotImplemented;
 }

-void nvhost_vic::OnOpen(NvCore::SessionId session_id, DeviceFD fd) {
+void nvhost_vic::OnOpen(size_t session_id, DeviceFD fd) {
    sessions[fd] = session_id;
 }

@ -78,7 +78,10 @@ void nvhost_vic::OnClose(DeviceFD fd) {
    if (iter != host1x_file.fd_to_id.end()) {
        system.GPU().ClearCdmaInstance(iter->second);
    }
-    sessions.erase(fd);
+    auto it = sessions.find(fd);
+    if (it != sessions.end()) {
+        sessions.erase(it);
+    }
 }

 } // namespace Service::Nvidia::Devices
--- a/src/core/hle/service/nvdrv/devices/nvhost_vic.h
+++ b/src/core/hle/service/nvdrv/devices/nvhost_vic.h
@ -19,7 +19,7 @@ public:
    NvResult Ioctl3(DeviceFD fd, Ioctl command, std::span<const u8> input, std::span<u8> output,
                    std::span<u8> inline_output) override;

-    void OnOpen(NvCore::SessionId session_id, DeviceFD fd) override;
+    void OnOpen(size_t session_id, DeviceFD fd) override;
    void OnClose(DeviceFD fd) override;
 };
 } // namespace Service::Nvidia::Devices
--- a/src/core/hle/service/nvdrv/devices/nvmap.cpp
+++ b/src/core/hle/service/nvdrv/devices/nvmap.cpp
@ -67,7 +67,7 @@ NvResult nvmap::Ioctl3(DeviceFD fd, Ioctl command, std::span<const u8> input, st
    return NvResult::NotImplemented;
 }

-void nvmap::OnOpen(NvCore::SessionId session_id, DeviceFD fd) {
+void nvmap::OnOpen(size_t session_id, DeviceFD fd) {
    sessions[fd] = session_id;
 }
 void nvmap::OnClose(DeviceFD fd) {
--- a/src/core/hle/service/nvdrv/devices/nvmap.h
+++ b/src/core/hle/service/nvdrv/devices/nvmap.h
@ -33,7 +33,7 @@ public:
    NvResult Ioctl3(DeviceFD fd, Ioctl command, std::span<const u8> input, std::span<u8> output,
                    std::span<u8> inline_output) override;

-    void OnOpen(NvCore::SessionId session_id, DeviceFD fd) override;
+    void OnOpen(size_t session_id, DeviceFD fd) override;
    void OnClose(DeviceFD fd) override;

    enum class HandleParameterType : u32_le {
@ -115,7 +115,7 @@ private:

    NvCore::Container& container;
    NvCore::NvMap& file;
-    std::unordered_map<DeviceFD, NvCore::SessionId> sessions;
+    std::unordered_map<DeviceFD, size_t> sessions;
 };

 } // namespace Service::Nvidia::Devices
--- a/src/core/hle/service/nvdrv/nvdrv.cpp
+++ b/src/core/hle/service/nvdrv/nvdrv.cpp
@ -52,15 +52,15 @@ void LoopProcess(Nvnflinger::Nvnflinger& nvnflinger, Core::System& system) {
        return std::make_shared<NVDRV>(system, module, "nvdrv:a");
    };
    const auto NvdrvInterfaceFactoryForSysmodules = [&, module] {
-        return std::make_shared<NVDRV>(system, module, "nvdrv:s");
+        return std::make_shared<NVDRV>(system, module, "nvdrv:a");
    };
-    const auto NvdrvInterfaceFactoryForTesting = [&, module] {
+    const auto NvdrvInterfaceFactory = [&, module] {
        return std::make_shared<NVDRV>(system, module, "nvdrv:t");
    };
    server_manager->RegisterNamedService("nvdrv", NvdrvInterfaceFactoryForApplication);
    server_manager->RegisterNamedService("nvdrv:a", NvdrvInterfaceFactoryForApplets);
    server_manager->RegisterNamedService("nvdrv:s", NvdrvInterfaceFactoryForSysmodules);
-    server_manager->RegisterNamedService("nvdrv:t", NvdrvInterfaceFactoryForTesting);
+    server_manager->RegisterNamedService("nvdrv:t", NvdrvInterfaceFactory);
    server_manager->RegisterNamedService("nvmemp", std::make_shared<NVMEMP>(system));
    nvnflinger.SetNVDrvInstance(module);
    ServerManager::RunServer(std::move(server_manager));
@ -122,7 +122,7 @@ NvResult Module::VerifyFD(DeviceFD fd) const {
    return NvResult::Success;
 }

-DeviceFD Module::Open(const std::string& device_name, NvCore::SessionId session_id) {
+DeviceFD Module::Open(const std::string& device_name, size_t session_id) {
    auto it = builders.find(device_name);
    if (it == builders.end()) {
        LOG_ERROR(Service_NVDRV, "Trying to open unknown device {}", device_name);
--- a/src/core/hle/service/nvdrv/nvdrv.h
+++ b/src/core/hle/service/nvdrv/nvdrv.h
@ -77,7 +77,7 @@ public:
    NvResult VerifyFD(DeviceFD fd) const;

    /// Opens a device node and returns a file descriptor to it.
-    DeviceFD Open(const std::string& device_name, NvCore::SessionId session_id);
+    DeviceFD Open(const std::string& device_name, size_t session_id);

    /// Sends an ioctl command to the specified file descriptor.
    NvResult Ioctl1(DeviceFD fd, Ioctl command, std::span<const u8> input, std::span<u8> output);
--- a/src/core/hle/service/nvdrv/nvdrv_interface.h
+++ b/src/core/hle/service/nvdrv/nvdrv_interface.h
@ -35,7 +35,7 @@ private:

    u64 pid{};
    bool is_initialized{};
-    NvCore::SessionId session_id{};
+    size_t session_id{};
    Common::ScratchBuffer<u8> output_buffer;
    Common::ScratchBuffer<u8> inline_output_buffer;
 };
--- a/src/core/hle/service/nvnflinger/fb_share_buffer_manager.h
+++ b/src/core/hle/service/nvnflinger/fb_share_buffer_manager.h
@ -4,7 +4,6 @@
 #pragma once

 #include "common/math_util.h"
-#include "core/hle/service/nvdrv/core/container.h"
 #include "core/hle/service/nvdrv/nvdata.h"
 #include "core/hle/service/nvnflinger/nvnflinger.h"
 #include "core/hle/service/nvnflinger/ui/fence.h"
@ -56,7 +55,7 @@ private:
    u32 m_buffer_nvmap_handle = 0;
    SharedMemoryPoolLayout m_pool_layout = {};
    Nvidia::DeviceFD m_nvmap_fd = {};
-    Nvidia::NvCore::SessionId m_session_id = {};
+    size_t m_session_id = {};
    std::unique_ptr<Kernel::KPageGroup> m_buffer_page_group;

    std::mutex m_guard;
--- a/src/core/hle/service/nvnflinger/nvnflinger.cpp
+++ b/src/core/hle/service/nvnflinger/nvnflinger.cpp
@ -112,7 +112,9 @@ void Nvnflinger::ShutdownLayers() {
    {
        const auto lock_guard = Lock();
        for (auto& display : displays) {
-            display.Abandon();
+            for (size_t layer = 0; layer < display.GetNumLayers(); ++layer) {
+                display.GetLayer(layer).GetConsumer().Abandon();
+            }
        }

        is_abandoned = true;
@ -124,7 +126,7 @@ void Nvnflinger::ShutdownLayers() {

 void Nvnflinger::SetNVDrvInstance(std::shared_ptr<Nvidia::Module> instance) {
    nvdrv = std::move(instance);
-    disp_fd = nvdrv->Open("/dev/nvdisp_disp0", {});
+    disp_fd = nvdrv->Open("/dev/nvdisp_disp0", 0);
 }

 std::optional<u64> Nvnflinger::OpenDisplay(std::string_view name) {
@ -174,28 +176,24 @@ void Nvnflinger::CreateLayerAtId(VI::Display& display, u64 layer_id) {
    display.CreateLayer(layer_id, buffer_id, nvdrv->container);
 }

-bool Nvnflinger::OpenLayer(u64 layer_id) {
+void Nvnflinger::OpenLayer(u64 layer_id) {
    const auto lock_guard = Lock();

    for (auto& display : displays) {
        if (auto* layer = display.FindLayer(layer_id); layer) {
-            return layer->Open();
+            layer->Open();
        }
    }
-
-    return false;
 }

-bool Nvnflinger::CloseLayer(u64 layer_id) {
+void Nvnflinger::CloseLayer(u64 layer_id) {
    const auto lock_guard = Lock();

    for (auto& display : displays) {
        if (auto* layer = display.FindLayer(layer_id); layer) {
-            return layer->Close();
+            layer->Close();
        }
    }
-
-    return false;
 }

 void Nvnflinger::DestroyLayer(u64 layer_id) {
--- a/src/core/hle/service/nvnflinger/nvnflinger.h
+++ b/src/core/hle/service/nvnflinger/nvnflinger.h
@ -74,10 +74,10 @@ public:
    [[nodiscard]] std::optional<u64> CreateLayer(u64 display_id);

    /// Opens a layer on all displays for the given layer ID.
-    bool OpenLayer(u64 layer_id);
+    void OpenLayer(u64 layer_id);

    /// Closes a layer on all displays for the given layer ID.
-    bool CloseLayer(u64 layer_id);
+    void CloseLayer(u64 layer_id);

    /// Destroys the given layer ID.
    void DestroyLayer(u64 layer_id);
--- a/src/core/hle/service/set/setting_formats/appln_settings.cpp
+++ b/src/core/hle/service/set/setting_formats/appln_settings.cpp
@ -1,16 +1,12 @@
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

-#include "core/hle/service/set/setting_formats/appln_settings.h"
+#include "core/hle/service/set/appln_settings.h"

 namespace Service::Set {

 ApplnSettings DefaultApplnSettings() {
-    ApplnSettings settings{};
-
-    settings.mii_author_id = Common::UUID::MakeDefault();
-
-    return settings;
+    return {};
 }

 } // namespace Service::Set
--- a/src/core/hle/service/set/setting_formats/appln_settings.h
+++ b/src/core/hle/service/set/setting_formats/appln_settings.h
@ -7,23 +7,24 @@
 #include <cstddef>

 #include "common/common_types.h"
-#include "common/uuid.h"
-#include "core/hle/service/set/settings_types.h"

 namespace Service::Set {
 struct ApplnSettings {
-    INSERT_PADDING_BYTES(0x10); // Reserved
+    std::array<u8, 0x10> reserved_000;

    // nn::util::Uuid MiiAuthorId, copied from system settings 0x94B0
-    Common::UUID mii_author_id;
-    INSERT_PADDING_BYTES(0x30); // Reserved
+    std::array<u8, 0x10> mii_author_id;
+
+    std::array<u8, 0x30> reserved_020;

    // nn::settings::system::ServiceDiscoveryControlSettings
-    u32 service_discovery_control_settings;
-    INSERT_PADDING_BYTES(0x20); // Reserved
+    std::array<u8, 0x4> service_discovery_control_settings;
+
+    std::array<u8, 0x20> reserved_054;

    bool in_repair_process_enable_flag;
-    INSERT_PADDING_BYTES(0x3);
+
+    std::array<u8, 0x3> pad_075;
 };
 static_assert(offsetof(ApplnSettings, mii_author_id) == 0x10);
 static_assert(offsetof(ApplnSettings, service_discovery_control_settings) == 0x50);
--- a/src/core/hle/service/set/setting_formats/device_settings.cpp
+++ b/src/core/hle/service/set/setting_formats/device_settings.cpp
@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

-#include "core/hle/service/set/setting_formats/device_settings.h"
+#include "core/hle/service/set/device_settings.h"

 namespace Service::Set {

--- a/src/core/hle/service/set/setting_formats/device_settings.h
+++ b/src/core/hle/service/set/setting_formats/device_settings.h
@ -7,12 +7,10 @@
 #include <cstddef>

 #include "common/common_types.h"
-#include "common/vector_math.h"
-#include "core/hle/service/set/settings_types.h"

 namespace Service::Set {
 struct DeviceSettings {
-    INSERT_PADDING_BYTES(0x10); // Reserved
+    std::array<u8, 0x10> reserved_000;

    // nn::settings::BatteryLot
    std::array<u8, 0x18> ptm_battery_lot;
@ -21,24 +19,26 @@ struct DeviceSettings {
    u8 ptm_battery_version;
    // nn::settings::system::PtmCycleCountReliability
    u32 ptm_cycle_count_reliability;
-    INSERT_PADDING_BYTES(0x48); // Reserved
+
+    std::array<u8, 0x48> reserved_048;

    // nn::settings::system::AnalogStickUserCalibration L
    std::array<u8, 0x10> analog_user_stick_calibration_l;
    // nn::settings::system::AnalogStickUserCalibration R
    std::array<u8, 0x10> analog_user_stick_calibration_r;
-    INSERT_PADDING_BYTES(0x20); // Reserved
+
+    std::array<u8, 0x20> reserved_0B0;

    // nn::settings::system::ConsoleSixAxisSensorAccelerationBias
-    Common::Vec3<f32> console_six_axis_sensor_acceleration_bias;
+    std::array<u8, 0xC> console_six_axis_sensor_acceleration_bias;
    // nn::settings::system::ConsoleSixAxisSensorAngularVelocityBias
-    Common::Vec3<f32> console_six_axis_sensor_angular_velocity_bias;
+    std::array<u8, 0xC> console_six_axis_sensor_angular_velocity_bias;
    // nn::settings::system::ConsoleSixAxisSensorAccelerationGain
    std::array<u8, 0x24> console_six_axis_sensor_acceleration_gain;
    // nn::settings::system::ConsoleSixAxisSensorAngularVelocityGain
    std::array<u8, 0x24> console_six_axis_sensor_angular_velocity_gain;
    // nn::settings::system::ConsoleSixAxisSensorAngularVelocityTimeBias
-    Common::Vec3<f32> console_six_axis_sensor_angular_velocity_time_bias;
+    std::array<u8, 0xC> console_six_axis_sensor_angular_velocity_time_bias;
    // nn::settings::system::ConsoleSixAxisSensorAngularAcceleration
    std::array<u8, 0x24> console_six_axis_sensor_angular_acceleration;
 };
--- a/src/core/hle/service/set/setting_formats/private_settings.cpp
+++ b/src/core/hle/service/set/setting_formats/private_settings.cpp
@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

-#include "core/hle/service/set/setting_formats/private_settings.h"
+#include "core/hle/service/set/private_settings.h"

 namespace Service::Set {

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
yuzubot	ff6499872a	Android 192	2024-01-14 01:01:39 +00:00
yuzubot	3f1995ac14	Merge yuzu-emu#12659	2024-01-14 01:01:39 +00:00
yuzubot	a0ebeb20b9	Merge yuzu-emu#12652	2024-01-14 01:01:39 +00:00
yuzubot	bffc72f0bf	Merge yuzu-emu#12612	2024-01-14 01:01:39 +00:00
yuzubot	a6e7d36f7b	Merge yuzu-emu#12611	2024-01-14 01:01:39 +00:00
yuzubot	e80c938e46	Merge yuzu-emu#12610	2024-01-14 01:01:39 +00:00
yuzubot	7798494d1e	Merge yuzu-emu#12579	2024-01-14 01:01:39 +00:00