Android 182

Merge yuzu-emu#12576
Merge yuzu-emu#12560
2024-01-04 21:22:55 +00:00 · 2024-01-04 21:22:54 +00:00 · 2024-01-04 21:22:54 +00:00 · 2024-01-04 15:53:44 -05:00 · 2024-01-04 15:51:24 -05:00 · 2024-01-04 15:51:08 -05:00
62 changed files with 2398 additions and 783 deletions
--- a/.github/workflows/android-merge.js
+++ b/.github/workflows/android-merge.js
@ -10,7 +10,7 @@ const CHANGE_LABEL = 'android-merge';
 // how far back in time should we consider the changes are "recent"? (default: 24 hours)
 const DETECTION_TIME_FRAME = (parseInt(process.env.DETECTION_TIME_FRAME)) || (24 * 3600 * 1000);

-async function checkBaseChanges(github, context) {
+async function checkBaseChanges(github) {
    // query the commit date of the latest commit on this branch
    const query = `query($owner:String!, $name:String!, $ref:String!) {
        repository(name:$name, owner:$owner) {
@ -22,8 +22,8 @@ async function checkBaseChanges(github, context) {
        }
    }`;
    const variables = {
-        owner: context.repo.owner,
-        name: context.repo.repo,
+        owner: 'yuzu-emu',
+        name: 'yuzu',
        ref: 'refs/heads/master',
    };
    const result = await github.graphql(query, variables);
@ -38,8 +38,8 @@ async function checkBaseChanges(github, context) {
    return false;
 }

-async function checkAndroidChanges(github, context) {
-    if (checkBaseChanges(github, context)) return true;
+async function checkAndroidChanges(github) {
+    if (checkBaseChanges(github)) return true;
    const query = `query($owner:String!, $name:String!, $label:String!) {
        repository(name:$name, owner:$owner) {
            pullRequests(labels: [$label], states: OPEN, first: 100) {
@ -48,8 +48,8 @@ async function checkAndroidChanges(github, context) {
        }
    }`;
    const variables = {
-        owner: context.repo.owner,
-        name: context.repo.repo,
+        owner: 'yuzu-emu',
+        name: 'yuzu',
        label: CHANGE_LABEL,
    };
    const result = await github.graphql(query, variables);
@ -90,8 +90,8 @@ async function tagAndPush(github, owner, repo, execa, commit=false) {
    console.log(`New tag: ${newTag}`);
    if (commit) {
        let channelName = channel[0].toUpperCase() + channel.slice(1);
-        console.info(`Committing pending commit as ${channelName} #${tagNumber + 1}`);
-        await execa("git", ['commit', '-m', `${channelName} #${tagNumber + 1}`]);
+        console.info(`Committing pending commit as ${channelName} ${tagNumber + 1}`);
+        await execa("git", ['commit', '-m', `${channelName} ${tagNumber + 1}`]);
    }
    console.info('Pushing tags to GitHub ...');
    await execa("git", ['tag', newTag]);
@ -157,7 +157,7 @@ async function mergePullRequests(pulls, execa) {
            process1.stdout.pipe(process.stdout);
            await process1;

-            const process2 = execa("git", ["commit", "-m", `Merge PR ${pr}`]);
+            const process2 = execa("git", ["commit", "-m", `Merge yuzu-emu#${pr}`]);
            process2.stdout.pipe(process.stdout);
            await process2;

@ -182,7 +182,30 @@ async function mergePullRequests(pulls, execa) {
    return mergeResults;
 }

+async function resetBranch(execa) {
+    console.log("::group::Reset master branch");
+    let hasFailed = false;
+    try {
+        await execa("git", ["remote", "add", "source", "https://github.com/yuzu-emu/yuzu.git"]);
+        await execa("git", ["fetch", "source"]);
+        const process1 = await execa("git", ["rev-parse", "source/master"]);
+        const headCommit = process1.stdout;
+
+        await execa("git", ["reset", "--hard", headCommit]);
+    } catch (err) {
+        console.log(`::error title=Failed to reset master branch`);
+        hasFailed = true;
+    }
+    console.log("::endgroup::");
+    if (hasFailed) {
+        throw 'Failed to reset the master branch. Aborting!';
+    }
+}
+
 async function mergebot(github, context, execa) {
+    // Reset our local copy of master to what appears on yuzu-emu/yuzu - master
+    await resetBranch(execa);
+
    const query = `query ($owner:String!, $name:String!, $label:String!) {
        repository(name:$name, owner:$owner) {
            pullRequests(labels: [$label], states: OPEN, first: 100) {
@ -193,8 +216,8 @@ async function mergebot(github, context, execa) {
        }
    }`;
    const variables = {
-        owner: context.repo.owner,
-        name: context.repo.repo,
+        owner: 'yuzu-emu',
+        name: 'yuzu',
        label: CHANGE_LABEL,
    };
    const result = await github.graphql(query, variables);
@ -209,7 +232,7 @@ async function mergebot(github, context, execa) {
    await fetchPullRequests(pulls, "https://github.com/yuzu-emu/yuzu", execa);
    const mergeResults = await mergePullRequests(pulls, execa);
    await generateReadme(pulls, context, mergeResults, execa);
-    await tagAndPush(github, context.repo.owner, `${context.repo.repo}-android`, execa, true);
+    await tagAndPush(github, 'yuzu-emu', `yuzu-android`, execa, true);
 }

 module.exports.mergebot = mergebot;
--- a/.github/workflows/android-publish.yml
+++ b/.github/workflows/android-publish.yml
@ -16,7 +16,7 @@ on:
 jobs:
  android:
    runs-on: ubuntu-latest
-    if: ${{ github.event.inputs.android != 'false' && github.repository == 'yuzu-emu/yuzu' }}
+    if: ${{ github.event.inputs.android != 'false' && github.repository == 'yuzu-emu/yuzu-android' }}
    steps:
      # this checkout is required to make sure the GitHub Actions scripts are available
      - uses: actions/checkout@v3
@ -33,7 +33,7 @@ jobs:
          script: |
            if (context.payload.inputs && context.payload.inputs.android === 'true') return true;
            const checkAndroidChanges = require('./.github/workflows/android-merge.js').checkAndroidChanges;
-            return checkAndroidChanges(github, context);
+            return checkAndroidChanges(github);
      - run: npm install execa@5
        if: ${{ steps.check-changes.outputs.result == 'true' }}
      - uses: actions/checkout@v3
--- a/README.md
+++ b/README.md
@ -1,3 +1,13 @@
+| Pull Request | Commit | Title | Author | Merged? |
+|----|----|----|----|----|
+| [12560](https://github.com/yuzu-emu/yuzu-android//pull/12560) | [`e5de3d5a7`](https://github.com/yuzu-emu/yuzu-android//pull/12560/files) | android: add basic support for google game dashboard | [GayPotatoEmma](https://github.com/GayPotatoEmma/) | Yes |
+| [12576](https://github.com/yuzu-emu/yuzu-android//pull/12576) | [`53d4dbacf`](https://github.com/yuzu-emu/yuzu-android//pull/12576/files) | android: Re-add global save manager | [t895](https://github.com/t895/) | Yes |
+
+
+End of merge log. You can find the original README.md below the break.
+
+-----
+
 <!--
 SPDX-FileCopyrightText: 2018 yuzu Emulator Project
 SPDX-License-Identifier: GPL-2.0-or-later
--- a/src/android/app/src/main/AndroidManifest.xml
+++ b/src/android/app/src/main/AndroidManifest.xml
@ -31,6 +31,9 @@ SPDX-License-Identifier: GPL-3.0-or-later
        android:dataExtractionRules="@xml/data_extraction_rules_api_31"
        android:enableOnBackInvokedCallback="true">

+        <meta-data android:name="android.game_mode_config"
+            android:resource="@xml/game_mode_config" />
+
        <activity
            android:name="org.yuzu.yuzu_emu.ui.main.MainActivity"
            android:exported="true"
--- 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
@ -547,6 +547,15 @@ object NativeLibrary {
     */
    external fun getSavePath(programId: String): String

+    /**
+     * Gets the root save directory for the default profile as either
+     * /user/save/account/<user id raw string> or /user/save/000...000/<user id>
+     *
+     * @param future If true, returns the /user/save/account/... directory
+     * @return Save data path that may not exist yet
+     */
+    external fun getDefaultProfileSaveDataRoot(future: Boolean): String
+
    /**
     * Adds a file to the manual filesystem provider in our EmulationSession instance
     * @param path Path to the file we're adding. Can be a string representation of a [Uri] or
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/Settings.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/Settings.kt
@ -79,7 +79,18 @@ object Settings {
    const val PREF_THEME_MODE = "ThemeMode"
    const val PREF_BLACK_BACKGROUNDS = "BlackBackgrounds"

-    const val LayoutOption_Unspecified = 0
-    const val LayoutOption_MobilePortrait = 4
-    const val LayoutOption_MobileLandscape = 5
+    enum class EmulationOrientation(val int: Int) {
+        Unspecified(0),
+        SensorLandscape(5),
+        Landscape(1),
+        ReverseLandscape(2),
+        SensorPortrait(6),
+        Portrait(4),
+        ReversePortrait(3);
+
+        companion object {
+            fun from(int: Int): EmulationOrientation =
+                entries.firstOrNull { it.int == int } ?: Unspecified
+        }
+    }
 }
--- 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
@ -50,6 +50,7 @@ import org.yuzu.yuzu_emu.databinding.FragmentEmulationBinding
 import org.yuzu.yuzu_emu.features.settings.model.BooleanSetting
 import org.yuzu.yuzu_emu.features.settings.model.IntSetting
 import org.yuzu.yuzu_emu.features.settings.model.Settings
+import org.yuzu.yuzu_emu.features.settings.model.Settings.EmulationOrientation
 import org.yuzu.yuzu_emu.features.settings.utils.SettingsFile
 import org.yuzu.yuzu_emu.model.DriverViewModel
 import org.yuzu.yuzu_emu.model.Game
@ -99,6 +100,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
     */
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
+        updateOrientation()

        val intentUri: Uri? = requireActivity().intent.data
        var intentGame: Game? = null
@ -458,13 +460,23 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
    @SuppressLint("SourceLockedOrientationActivity")
    private fun updateOrientation() {
        emulationActivity?.let {
-            it.requestedOrientation = when (IntSetting.RENDERER_SCREEN_LAYOUT.getInt()) {
-                Settings.LayoutOption_MobileLandscape ->
+            val orientationSetting =
+                EmulationOrientation.from(IntSetting.RENDERER_SCREEN_LAYOUT.getInt())
+            it.requestedOrientation = when (orientationSetting) {
+                EmulationOrientation.Unspecified -> ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
+                EmulationOrientation.SensorLandscape ->
                    ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
-                Settings.LayoutOption_MobilePortrait ->
-                    ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT
-                Settings.LayoutOption_Unspecified -> ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
-                else -> ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
+
+                EmulationOrientation.Landscape -> ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
+                EmulationOrientation.ReverseLandscape ->
+                    ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE
+
+                EmulationOrientation.SensorPortrait ->
+                    ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT
+
+                EmulationOrientation.Portrait -> ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
+                EmulationOrientation.ReversePortrait ->
+                    ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT
            }
        }
    }
@ -651,7 +663,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
    @SuppressLint("SourceLockedOrientationActivity")
    private fun startConfiguringControls() {
        // Lock the current orientation to prevent editing inconsistencies
-        if (IntSetting.RENDERER_SCREEN_LAYOUT.getInt() == Settings.LayoutOption_Unspecified) {
+        if (IntSetting.RENDERER_SCREEN_LAYOUT.getInt() == EmulationOrientation.Unspecified.int) {
            emulationActivity?.let {
                it.requestedOrientation =
                    if (resources.configuration.orientation == Configuration.ORIENTATION_PORTRAIT) {
@ -669,7 +681,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
        binding.doneControlConfig.visibility = View.GONE
        binding.surfaceInputOverlay.setIsInEditMode(false)
        // Unlock the orientation if it was locked for editing
-        if (IntSetting.RENDERER_SCREEN_LAYOUT.getInt() == Settings.LayoutOption_Unspecified) {
+        if (IntSetting.RENDERER_SCREEN_LAYOUT.getInt() == EmulationOrientation.Unspecified.int) {
            emulationActivity?.let {
                it.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
            }
--- 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
@ -445,7 +445,8 @@ class GamePropertiesFragment : Fragment() {
            val zipResult = FileUtil.zipFromInternalStorage(
                File(saveLocation),
                saveLocation.replaceAfterLast("/", ""),
-                BufferedOutputStream(requireContext().contentResolver.openOutputStream(result))
+                BufferedOutputStream(requireContext().contentResolver.openOutputStream(result)),
+                compression = false
            )
            return@newInstance when (zipResult) {
                TaskState.Completed -> getString(R.string.export_success)
--- 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
@ -7,20 +7,39 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Toast
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
 import androidx.navigation.findNavController
 import androidx.recyclerview.widget.GridLayoutManager
 import com.google.android.material.transition.MaterialSharedAxis
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.yuzu.yuzu_emu.NativeLibrary
 import org.yuzu.yuzu_emu.R
+import org.yuzu.yuzu_emu.YuzuApplication
 import org.yuzu.yuzu_emu.adapters.InstallableAdapter
 import org.yuzu.yuzu_emu.databinding.FragmentInstallablesBinding
 import org.yuzu.yuzu_emu.model.HomeViewModel
 import org.yuzu.yuzu_emu.model.Installable
+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
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter

 class InstallableFragment : Fragment() {
    private var _binding: FragmentInstallablesBinding? = null
@ -56,6 +75,17 @@ class InstallableFragment : Fragment() {
            binding.root.findNavController().popBackStack()
        }

+        viewLifecycleOwner.lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.CREATED) {
+                homeViewModel.openImportSaves.collect {
+                    if (it) {
+                        importSaves.launch(arrayOf("application/zip"))
+                        homeViewModel.setOpenImportSaves(false)
+                    }
+                }
+            }
+        }
+
        val installables = listOf(
            Installable(
                R.string.user_data,
@ -63,6 +93,43 @@ class InstallableFragment : Fragment() {
                install = { mainActivity.importUserData.launch(arrayOf("application/zip")) },
                export = { mainActivity.exportUserData.launch("export.zip") }
            ),
+            Installable(
+                R.string.manage_save_data,
+                R.string.manage_save_data_description,
+                install = {
+                    MessageDialogFragment.newInstance(
+                        requireActivity(),
+                        titleId = R.string.import_save_warning,
+                        descriptionId = R.string.import_save_warning_description,
+                        positiveAction = { homeViewModel.setOpenImportSaves(true) }
+                    ).show(parentFragmentManager, MessageDialogFragment.TAG)
+                },
+                export = {
+                    val oldSaveDataFolder = File(
+                        "${DirectoryInitialization.userDirectory}/nand" +
+                            NativeLibrary.getDefaultProfileSaveDataRoot(false)
+                    )
+                    val futureSaveDataFolder = File(
+                        "${DirectoryInitialization.userDirectory}/nand" +
+                            NativeLibrary.getDefaultProfileSaveDataRoot(true)
+                    )
+                    if (!oldSaveDataFolder.exists() && !futureSaveDataFolder.exists()) {
+                        Toast.makeText(
+                            YuzuApplication.appContext,
+                            R.string.no_save_data_found,
+                            Toast.LENGTH_SHORT
+                        ).show()
+                        return@Installable
+                    } else {
+                        exportSaves.launch(
+                            "${getString(R.string.save_data)} " +
+                                LocalDateTime.now().format(
+                                    DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")
+                                )
+                        )
+                    }
+                }
+            ),
            Installable(
                R.string.install_game_content,
                R.string.install_game_content_description,
@ -121,4 +188,156 @@ class InstallableFragment : Fragment() {

            windowInsets
        }
+
+    private val importSaves =
+        registerForActivityResult(ActivityResultContracts.OpenDocument()) { result ->
+            if (result == null) {
+                return@registerForActivityResult
+            }
+
+            val inputZip = requireContext().contentResolver.openInputStream(result)
+            val cacheSaveDir = File("${requireContext().cacheDir.path}/saves/")
+            cacheSaveDir.mkdir()
+
+            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(BufferedInputStream(inputZip), cacheSaveDir)
+                    val files = cacheSaveDir.listFiles()
+                    var successfulImports = 0
+                    var failedImports = 0
+                    if (files != null) {
+                        for (file in files) {
+                            if (file.isDirectory) {
+                                val baseSaveDir =
+                                    NativeLibrary.getSavePath(BigInteger(file.name, 16).toString())
+                                if (baseSaveDir.isEmpty()) {
+                                    failedImports++
+                                    continue
+                                }
+
+                                val internalSaveFolder = File(
+                                    "${DirectoryInitialization.userDirectory}/nand$baseSaveDir"
+                                )
+                                internalSaveFolder.deleteRecursively()
+                                internalSaveFolder.mkdir()
+                                file.copyRecursively(target = internalSaveFolder, overwrite = true)
+                                successfulImports++
+                            }
+                        }
+                    }
+
+                    withContext(Dispatchers.Main) {
+                        if (successfulImports == 0) {
+                            MessageDialogFragment.newInstance(
+                                requireActivity(),
+                                titleId = R.string.save_file_invalid_zip_structure,
+                                descriptionId = R.string.save_file_invalid_zip_structure_description
+                            ).show(parentFragmentManager, MessageDialogFragment.TAG)
+                            return@withContext
+                        }
+                        val successString = if (failedImports > 0) {
+                            """
+                            ${
+                            requireContext().resources.getQuantityString(
+                                R.plurals.saves_import_success,
+                                successfulImports,
+                                successfulImports
+                            )
+                            }
+                            ${
+                            requireContext().resources.getQuantityString(
+                                R.plurals.saves_import_failed,
+                                failedImports,
+                                failedImports
+                            )
+                            }
+                            """
+                        } else {
+                            requireContext().resources.getQuantityString(
+                                R.plurals.saves_import_success,
+                                successfulImports,
+                                successfulImports
+                            )
+                        }
+                        MessageDialogFragment.newInstance(
+                            requireActivity(),
+                            titleId = R.string.import_complete,
+                            descriptionString = successString
+                        ).show(parentFragmentManager, MessageDialogFragment.TAG)
+                    }
+
+                    cacheSaveDir.deleteRecursively()
+                } catch (e: Exception) {
+                    Toast.makeText(
+                        YuzuApplication.appContext,
+                        getString(R.string.fatal_error),
+                        Toast.LENGTH_LONG
+                    ).show()
+                }
+            }.show(parentFragmentManager, IndeterminateProgressDialogFragment.TAG)
+        }
+
+    private val exportSaves = registerForActivityResult(
+        ActivityResultContracts.CreateDocument("application/zip")
+    ) { result ->
+        if (result == null) {
+            return@registerForActivityResult
+        }
+
+        IndeterminateProgressDialogFragment.newInstance(
+            requireActivity(),
+            R.string.save_files_exporting,
+            false
+        ) {
+            val cacheSaveDir = File("${requireContext().cacheDir.path}/saves/")
+            cacheSaveDir.mkdir()
+
+            val oldSaveDataFolder = File(
+                "${DirectoryInitialization.userDirectory}/nand" +
+                    NativeLibrary.getDefaultProfileSaveDataRoot(false)
+            )
+            if (oldSaveDataFolder.exists()) {
+                oldSaveDataFolder.copyRecursively(cacheSaveDir)
+            }
+
+            val futureSaveDataFolder = File(
+                "${DirectoryInitialization.userDirectory}/nand" +
+                    NativeLibrary.getDefaultProfileSaveDataRoot(true)
+            )
+            if (futureSaveDataFolder.exists()) {
+                futureSaveDataFolder.copyRecursively(cacheSaveDir)
+            }
+
+            val saveFilesTotal = cacheSaveDir.listFiles()?.size ?: 0
+            if (saveFilesTotal == 0) {
+                cacheSaveDir.deleteRecursively()
+                return@newInstance getString(R.string.no_save_data_found)
+            }
+
+            val zipResult = FileUtil.zipFromInternalStorage(
+                cacheSaveDir,
+                cacheSaveDir.path,
+                BufferedOutputStream(requireContext().contentResolver.openOutputStream(result))
+            )
+            cacheSaveDir.deleteRecursively()
+
+            return@newInstance when (zipResult) {
+                TaskState.Completed -> getString(R.string.export_success)
+                TaskState.Cancelled, TaskState.Failed -> getString(R.string.export_failed)
+            }
+        }.show(parentFragmentManager, IndeterminateProgressDialogFragment.TAG)
+    }
 }
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/GamesViewModel.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/GamesViewModel.kt
@ -167,13 +167,14 @@ class GamesViewModel : ViewModel() {
            }
        }

-    fun onCloseGameFoldersFragment() =
+    fun onCloseGameFoldersFragment() {
+        NativeConfig.saveGlobalConfig()
        viewModelScope.launch {
            withContext(Dispatchers.IO) {
-                NativeConfig.saveGlobalConfig()
                getGameDirs(true)
            }
        }
+    }

    private fun getGameDirs(reloadList: Boolean = false) {
        val gameDirs = NativeConfig.getGameDirs()
--- 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
@ -625,7 +625,8 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                File(DirectoryInitialization.userDirectory!!),
                DirectoryInitialization.userDirectory!!,
                BufferedOutputStream(contentResolver.openOutputStream(result)),
-                taskViewModel.cancelled
+                taskViewModel.cancelled,
+                compression = false
            )
            return@newInstance when (zipResult) {
                TaskState.Completed -> getString(R.string.user_data_export_success)
--- 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
@ -21,6 +21,7 @@ import org.yuzu.yuzu_emu.model.TaskState
 import java.io.BufferedOutputStream
 import java.lang.NullPointerException
 import java.nio.charset.StandardCharsets
+import java.util.zip.Deflater
 import java.util.zip.ZipOutputStream
 import kotlin.IllegalStateException

@ -312,15 +313,23 @@ 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 cancelled [StateFlow] that reports whether this process has been cancelled
+     * @param compression Disables compression if true
     */
    fun zipFromInternalStorage(
        inputFile: File,
        rootDir: String,
        outputStream: BufferedOutputStream,
-        cancelled: StateFlow<Boolean>? = null
+        cancelled: StateFlow<Boolean>? = null,
+        compression: Boolean = true
    ): TaskState {
        try {
            ZipOutputStream(outputStream).use { zos ->
+                if (!compression) {
+                    zos.setMethod(ZipOutputStream.DEFLATED)
+                    zos.setLevel(Deflater.NO_COMPRESSION)
+                }
+
                inputFile.walkTopDown().forEach { file ->
                    if (cancelled?.value == true) {
                        return TaskState.Cancelled
@ -338,6 +347,7 @@ object FileUtil {
                }
            }
        } catch (e: Exception) {
+            Log.error("[FileUtil] Failed creating zip file - ${e.message}")
            return TaskState.Failed
        }
        return TaskState.Completed
--- a/src/android/app/src/main/jni/android_config.cpp
+++ b/src/android/app/src/main/jni/android_config.cpp
@ -14,12 +14,6 @@ AndroidConfig::AndroidConfig(const std::string& config_name, ConfigType config_t
    }
 }

-AndroidConfig::~AndroidConfig() {
-    if (global) {
-        AndroidConfig::SaveAllValues();
-    }
-}
-
 void AndroidConfig::ReloadAllValues() {
    Reload();
    ReadAndroidValues();
--- a/src/android/app/src/main/jni/android_config.h
+++ b/src/android/app/src/main/jni/android_config.h
@ -9,7 +9,6 @@ class AndroidConfig final : public Config {
 public:
    explicit AndroidConfig(const std::string& config_name = "config",
                           ConfigType config_type = ConfigType::GlobalConfig);
-    ~AndroidConfig() override;

    void ReloadAllValues() override;
    void SaveAllValues() override;
--- a/src/android/app/src/main/jni/native.cpp
+++ b/src/android/app/src/main/jni/native.cpp
@ -862,6 +862,9 @@ jobjectArray Java_org_yuzu_yuzu_1emu_NativeLibrary_getAddonsForFile(JNIEnv* env,
 jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getSavePath(JNIEnv* env, jobject jobj,
                                                          jstring jprogramId) {
    auto program_id = EmulationSession::GetProgramId(env, jprogramId);
+    if (program_id == 0) {
+        return ToJString(env, "");
+    }

    auto& system = EmulationSession::GetInstance().System();

@ -880,6 +883,19 @@ jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getSavePath(JNIEnv* env, jobject j
    return ToJString(env, user_save_data_path);
 }

+jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getDefaultProfileSaveDataRoot(JNIEnv* env,
+                                                                            jobject jobj,
+                                                                            jboolean jfuture) {
+    Service::Account::ProfileManager manager;
+    // TODO: Pass in a selected user once we get the relevant UI working
+    const auto user_id = manager.GetUser(static_cast<std::size_t>(0));
+    ASSERT(user_id);
+
+    const auto user_save_data_root =
+        FileSys::SaveDataFactory::GetUserGameSaveDataRoot(user_id->AsU128(), jfuture);
+    return ToJString(env, user_save_data_root);
+}
+
 void Java_org_yuzu_yuzu_1emu_NativeLibrary_addFileToFilesystemProvider(JNIEnv* env, jobject jobj,
                                                                       jstring jpath) {
    EmulationSession::GetInstance().ConfigureFilesystemProvider(GetJString(env, jpath));
--- a/src/android/app/src/main/res/values/arrays.xml
+++ b/src/android/app/src/main/res/values/arrays.xml
@ -118,15 +118,23 @@
    </integer-array>

    <string-array name="rendererScreenLayoutNames">
-        <item>@string/screen_layout_landscape</item>
-        <item>@string/screen_layout_portrait</item>
        <item>@string/screen_layout_auto</item>
+        <item>@string/screen_layout_sensor_landscape</item>
+        <item>@string/screen_layout_landscape</item>
+        <item>@string/screen_layout_reverse_landscape</item>
+        <item>@string/screen_layout_sensor_portrait</item>
+        <item>@string/screen_layout_portrait</item>
+        <item>@string/screen_layout_reverse_portrait</item>
    </string-array>

    <integer-array name="rendererScreenLayoutValues">
-        <item>5</item>
-        <item>4</item>
        <item>0</item>
+        <item>5</item>
+        <item>1</item>
+        <item>2</item>
+        <item>6</item>
+        <item>4</item>
+        <item>3</item>
    </integer-array>

    <string-array name="rendererAspectRatioNames">
--- a/src/android/app/src/main/res/values/strings.xml
+++ b/src/android/app/src/main/res/values/strings.xml
@ -133,6 +133,15 @@
    <string name="add_game_folder">Add game folder</string>
    <string name="folder_already_added">This folder was already added!</string>
    <string name="game_folder_properties">Game folder properties</string>
+    <plurals name="saves_import_failed">
+        <item quantity="one">Failed to import %d save</item>
+        <item quantity="other">Failed to import %d saves</item>
+    </plurals>
+    <plurals name="saves_import_success">
+        <item quantity="one">Successfully imported %d save</item>
+        <item quantity="other">Successfully imported %d saves</item>
+    </plurals>
+    <string name="no_save_data_found">No save data found</string>

    <!-- Applet launcher strings -->
    <string name="applets">Applet launcher</string>
@ -276,6 +285,7 @@
    <string name="global">Global</string>
    <string name="custom">Custom</string>
    <string name="notice">Notice</string>
+    <string name="import_complete">Import complete</string>

    <!-- GPU driver installation -->
    <string name="select_gpu_driver">Select GPU driver</string>
@ -463,9 +473,13 @@
    <string name="anti_aliasing_smaa">SMAA</string>

    <!-- Screen Layouts -->
-    <string name="screen_layout_landscape">Landscape</string>
-    <string name="screen_layout_portrait">Portrait</string>
    <string name="screen_layout_auto">Auto</string>
+    <string name="screen_layout_sensor_landscape">Sensor landscape</string>
+    <string name="screen_layout_landscape">Landscape</string>
+    <string name="screen_layout_reverse_landscape">Reverse landscape</string>
+    <string name="screen_layout_sensor_portrait">Sensor portrait</string>
+    <string name="screen_layout_portrait">Portrait</string>
+    <string name="screen_layout_reverse_portrait">Reverse portrait</string>

    <!-- Aspect Ratios -->
    <string name="ratio_default">Default (16:9)</string>
--- a/src/android/app/src/main/res/xml/game_mode_config.xml
+++ b/src/android/app/src/main/res/xml/game_mode_config.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<game-mode-config
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:supportsBatteryGameMode="true"
+    android:supportsPerformanceGameMode="true"
+    android:allowGameDownscaling="false"
+    android:allowGameFpsOverride="false"/>
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@ -549,6 +549,10 @@ add_library(core STATIC
    hle/service/hid/xcd.cpp
    hle/service/hid/xcd.h
    hle/service/hid/errors.h
+    hle/service/hid/controllers/npad/npad_data.cpp
+    hle/service/hid/controllers/npad/npad_data.h
+    hle/service/hid/controllers/npad/npad_resource.cpp
+    hle/service/hid/controllers/npad/npad_resource.h
    hle/service/hid/controllers/types/debug_pad_types.h
    hle/service/hid/controllers/types/keyboard_types.h
    hle/service/hid/controllers/types/mouse_types.h
--- a/src/core/file_sys/savedata_factory.cpp
+++ b/src/core/file_sys/savedata_factory.cpp
@ -189,6 +189,15 @@ std::string SaveDataFactory::GetFullPath(Core::System& system, VirtualDir dir,
    }
 }

+std::string SaveDataFactory::GetUserGameSaveDataRoot(u128 user_id, bool future) {
+    if (future) {
+        Common::UUID uuid;
+        std::memcpy(uuid.uuid.data(), user_id.data(), sizeof(Common::UUID));
+        return fmt::format("/user/save/account/{}", uuid.RawString());
+    }
+    return fmt::format("/user/save/{:016X}/{:016X}{:016X}", 0, user_id[1], user_id[0]);
+}
+
 SaveDataSize SaveDataFactory::ReadSaveDataSize(SaveDataType type, u64 title_id,
                                               u128 user_id) const {
    const auto path =
--- a/src/core/file_sys/savedata_factory.h
+++ b/src/core/file_sys/savedata_factory.h
@ -101,6 +101,7 @@ public:
    static std::string GetSaveDataSpaceIdPath(SaveDataSpaceId space);
    static std::string GetFullPath(Core::System& system, VirtualDir dir, SaveDataSpaceId space,
                                   SaveDataType type, u64 title_id, u128 user_id, u64 save_id);
+    static std::string GetUserGameSaveDataRoot(u128 user_id, bool future);

    SaveDataSize ReadSaveDataSize(SaveDataType type, u64 title_id, u128 user_id) const;
    void WriteSaveDataSize(SaveDataType type, u64 title_id, u128 user_id,
--- a/src/core/hid/hid_types.h
+++ b/src/core/hid/hid_types.h
@ -267,6 +267,7 @@ enum class NpadStyleSet : u32 {
    All = 0xFFFFFFFFU,
 };
 static_assert(sizeof(NpadStyleSet) == 4, "NpadStyleSet is an invalid size");
+DECLARE_ENUM_FLAG_OPERATORS(NpadStyleSet)

 // This is nn::hid::VibrationDevicePosition
 enum class VibrationDevicePosition : u32 {
--- a/src/core/hle/kernel/k_thread.cpp
+++ b/src/core/hle/kernel/k_thread.cpp
@ -1258,11 +1258,11 @@ ThreadState KThread::RequestTerminate() {
        // Change the thread's priority to be higher than any system thread's.
        this->IncreaseBasePriority(TerminatingThreadPriority);

-        // If the thread is runnable, send a termination interrupt to other cores.
+        // If the thread is runnable, send a termination interrupt to cores it may be running on.
        if (this->GetState() == ThreadState::Runnable) {
-            if (const u64 core_mask = m_physical_affinity_mask.GetAffinityMask() &
-                                      ~(1ULL << GetCurrentCoreId(m_kernel));
-                core_mask != 0) {
+            // NOTE: We do not mask the "current core", because this code may not actually be
+            //       executing from the thread representing the "current core".
+            if (const u64 core_mask = m_physical_affinity_mask.GetAffinityMask(); core_mask != 0) {
                Kernel::KInterruptManager::SendInterProcessorInterrupt(m_kernel, core_mask);
            }
        }
--- a/src/core/hle/service/hid/controllers/applet_resource.h
+++ b/src/core/hle/service/hid/controllers/applet_resource.h
@ -25,6 +25,7 @@ class AppletResource;
 class NPadResource;

 static constexpr std::size_t AruidIndexMax = 0x20;
+static constexpr u64 SystemAruid = 0;

 enum class RegistrationStatus : u32 {
    None,
--- a/src/core/hle/service/hid/controllers/capture_button.cpp
+++ b/src/core/hle/service/hid/controllers/capture_button.cpp
@ -21,10 +21,11 @@ void CaptureButton::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
        return;
    }

+    std::scoped_lock shared_lock{*shared_mutex};
    const u64 aruid = applet_resource->GetActiveAruid();
    auto* data = applet_resource->GetAruidData(aruid);

-    if (data == nullptr) {
+    if (data == nullptr || !data->flag.is_assigned) {
        return;
    }

--- a/src/core/hle/service/hid/controllers/console_six_axis.cpp
+++ b/src/core/hle/service/hid/controllers/console_six_axis.cpp
@ -20,10 +20,11 @@ void ConsoleSixAxis::OnInit() {}
 void ConsoleSixAxis::OnRelease() {}

 void ConsoleSixAxis::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
+    std::scoped_lock shared_lock{*shared_mutex};
    const u64 aruid = applet_resource->GetActiveAruid();
    auto* data = applet_resource->GetAruidData(aruid);

-    if (data == nullptr) {
+    if (data == nullptr || !data->flag.is_assigned) {
        return;
    }

--- a/src/core/hle/service/hid/controllers/controller_base.cpp
+++ b/src/core/hle/service/hid/controllers/controller_base.cpp
@ -32,8 +32,10 @@ bool ControllerBase::IsControllerActivated() const {
    return is_activated;
 }

-void ControllerBase::SetAppletResource(std::shared_ptr<AppletResource> resource) {
+void ControllerBase::SetAppletResource(std::shared_ptr<AppletResource> resource,
+                                       std::recursive_mutex* resource_mutex) {
    applet_resource = resource;
+    shared_mutex = resource_mutex;
 }

 } // namespace Service::HID
--- a/src/core/hle/service/hid/controllers/controller_base.h
+++ b/src/core/hle/service/hid/controllers/controller_base.h
@ -42,11 +42,13 @@ public:

    bool IsControllerActivated() const;

-    void SetAppletResource(std::shared_ptr<AppletResource> resource);
+    void SetAppletResource(std::shared_ptr<AppletResource> resource,
+                           std::recursive_mutex* resource_mutex);

 protected:
    bool is_activated{false};
    std::shared_ptr<AppletResource> applet_resource{nullptr};
+    std::recursive_mutex* shared_mutex{nullptr};

    Core::HID::HIDCore& hid_core;
 };
--- a/src/core/hle/service/hid/controllers/debug_mouse.cpp
+++ b/src/core/hle/service/hid/controllers/debug_mouse.cpp
@ -21,10 +21,11 @@ void DebugMouse::OnInit() {}
 void DebugMouse::OnRelease() {}

 void DebugMouse::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
+    std::scoped_lock shared_lock{*shared_mutex};
    const u64 aruid = applet_resource->GetActiveAruid();
    auto* data = applet_resource->GetAruidData(aruid);

-    if (data == nullptr) {
+    if (data == nullptr || !data->flag.is_assigned) {
        return;
    }

--- a/src/core/hle/service/hid/controllers/debug_pad.cpp
+++ b/src/core/hle/service/hid/controllers/debug_pad.cpp
@ -23,10 +23,11 @@ void DebugPad::OnInit() {}
 void DebugPad::OnRelease() {}

 void DebugPad::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
+    std::scoped_lock shared_lock{*shared_mutex};
    const u64 aruid = applet_resource->GetActiveAruid();
    auto* data = applet_resource->GetAruidData(aruid);

-    if (data == nullptr) {
+    if (data == nullptr || !data->flag.is_assigned) {
        return;
    }

--- a/src/core/hle/service/hid/controllers/digitizer.cpp
+++ b/src/core/hle/service/hid/controllers/digitizer.cpp
@ -21,10 +21,11 @@ void Digitizer::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
        return;
    }

+    std::scoped_lock shared_lock{*shared_mutex};
    const u64 aruid = applet_resource->GetActiveAruid();
    auto* data = applet_resource->GetAruidData(aruid);

-    if (data == nullptr) {
+    if (data == nullptr || !data->flag.is_assigned) {
        return;
    }

--- a/src/core/hle/service/hid/controllers/gesture.cpp
+++ b/src/core/hle/service/hid/controllers/gesture.cpp
@ -28,10 +28,11 @@ Gesture::Gesture(Core::HID::HIDCore& hid_core_) : ControllerBase(hid_core_) {
 Gesture::~Gesture() = default;

 void Gesture::OnInit() {
+    std::scoped_lock shared_lock{*shared_mutex};
    const u64 aruid = applet_resource->GetActiveAruid();
    auto* data = applet_resource->GetAruidData(aruid);

-    if (data == nullptr) {
+    if (data == nullptr || !data->flag.is_assigned) {
        return;
    }

@ -44,10 +45,11 @@ void Gesture::OnInit() {
 void Gesture::OnRelease() {}

 void Gesture::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
+    std::scoped_lock shared_lock{*shared_mutex};
    const u64 aruid = applet_resource->GetActiveAruid();
    auto* data = applet_resource->GetAruidData(aruid);

-    if (data == nullptr) {
+    if (data == nullptr || !data->flag.is_assigned) {
        return;
    }

--- a/src/core/hle/service/hid/controllers/home_button.cpp
+++ b/src/core/hle/service/hid/controllers/home_button.cpp
@ -21,10 +21,11 @@ void HomeButton::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
        return;
    }

+    std::scoped_lock shared_lock{*shared_mutex};
    const u64 aruid = applet_resource->GetActiveAruid();
    auto* data = applet_resource->GetAruidData(aruid);

-    if (data == nullptr) {
+    if (data == nullptr || !data->flag.is_assigned) {
        return;
    }

--- a/src/core/hle/service/hid/controllers/keyboard.cpp
+++ b/src/core/hle/service/hid/controllers/keyboard.cpp
@ -22,10 +22,11 @@ void Keyboard::OnInit() {}
 void Keyboard::OnRelease() {}

 void Keyboard::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
+    std::scoped_lock shared_lock{*shared_mutex};
    const u64 aruid = applet_resource->GetActiveAruid();
    auto* data = applet_resource->GetAruidData(aruid);

-    if (data == nullptr) {
+    if (data == nullptr || !data->flag.is_assigned) {
        return;
    }

--- a/src/core/hle/service/hid/controllers/mouse.cpp
+++ b/src/core/hle/service/hid/controllers/mouse.cpp
@ -21,10 +21,11 @@ void Mouse::OnInit() {}
 void Mouse::OnRelease() {}

 void Mouse::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
+    std::scoped_lock shared_lock{*shared_mutex};
    const u64 aruid = applet_resource->GetActiveAruid();
    auto* data = applet_resource->GetAruidData(aruid);

-    if (data == nullptr) {
+    if (data == nullptr || !data->flag.is_assigned) {
        return;
    }

--- a/src/core/hle/service/hid/controllers/npad.cpp
+++ b/src/core/hle/service/hid/controllers/npad.cpp
--- a/src/core/hle/service/hid/controllers/npad.h
+++ b/src/core/hle/service/hid/controllers/npad.h
@ -11,6 +11,7 @@
 #include "common/common_types.h"
 #include "core/hid/hid_types.h"
 #include "core/hle/service/hid/controllers/controller_base.h"
+#include "core/hle/service/hid/controllers/npad/npad_resource.h"
 #include "core/hle/service/hid/controllers/types/npad_types.h"

 namespace Core::HID {
@ -35,99 +36,116 @@ struct NpadInternalState;
 struct NpadSixAxisSensorLifo;
 struct NpadSharedMemoryFormat;

-class NPad final : public ControllerBase {
+class NPad final {
 public:
    explicit NPad(Core::HID::HIDCore& hid_core_, KernelHelpers::ServiceContext& service_context_);
-    ~NPad() override;
+    ~NPad();

-    // Called when the controller is initialized
-    void OnInit() override;
+    Result Activate();
+    Result Activate(u64 aruid);

-    // When the controller is released
-    void OnRelease() override;
+    Result ActivateNpadResource();
+    Result ActivateNpadResource(u64 aruid);

    // When the controller is requesting an update for the shared memory
-    void OnUpdate(const Core::Timing::CoreTiming& core_timing) override;
+    void OnUpdate(const Core::Timing::CoreTiming& core_timing);

-    void SetSupportedStyleSet(Core::HID::NpadStyleTag style_set);
-    Core::HID::NpadStyleTag GetSupportedStyleSet() const;
+    Result SetSupportedNpadStyleSet(u64 aruid, Core::HID::NpadStyleSet supported_style_set);
+    Result GetSupportedNpadStyleSet(u64 aruid,
+                                    Core::HID::NpadStyleSet& out_supported_style_set) const;
+    Result GetMaskedSupportedNpadStyleSet(u64 aruid,
+                                          Core::HID::NpadStyleSet& out_supported_style_set) const;

-    Result SetSupportedNpadIdTypes(std::span<const u8> data);
-    void GetSupportedNpadIdTypes(u32* data, std::size_t max_length);
-    std::size_t GetSupportedNpadIdTypesSize() const;
+    Result SetSupportedNpadIdType(u64 aruid,
+                                  std::span<const Core::HID::NpadIdType> supported_npad_list);

-    void SetHoldType(NpadJoyHoldType joy_hold_type);
-    NpadJoyHoldType GetHoldType() const;
+    Result SetNpadJoyHoldType(u64 aruid, NpadJoyHoldType hold_type);
+    Result GetNpadJoyHoldType(u64 aruid, NpadJoyHoldType& out_hold_type) const;

-    void SetNpadHandheldActivationMode(NpadHandheldActivationMode activation_mode);
-    NpadHandheldActivationMode GetNpadHandheldActivationMode() const;
+    Result SetNpadHandheldActivationMode(u64 aruid, NpadHandheldActivationMode mode);
+    Result GetNpadHandheldActivationMode(u64 aruid, NpadHandheldActivationMode& out_mode) const;

-    void SetNpadCommunicationMode(NpadCommunicationMode communication_mode_);
-    NpadCommunicationMode GetNpadCommunicationMode() const;
-
-    bool SetNpadMode(Core::HID::NpadIdType& new_npad_id, Core::HID::NpadIdType npad_id,
+    bool SetNpadMode(u64 aruid, Core::HID::NpadIdType& new_npad_id, Core::HID::NpadIdType npad_id,
                     NpadJoyDeviceType npad_device_type, NpadJoyAssignmentMode assignment_mode);

-    bool VibrateControllerAtIndex(Core::HID::NpadIdType npad_id, std::size_t device_index,
+    bool VibrateControllerAtIndex(u64 aruid, Core::HID::NpadIdType npad_id,
+                                  std::size_t device_index,
                                  const Core::HID::VibrationValue& vibration_value);

-    void VibrateController(const Core::HID::VibrationDeviceHandle& vibration_device_handle,
+    void VibrateController(u64 aruid,
+                           const Core::HID::VibrationDeviceHandle& vibration_device_handle,
                           const Core::HID::VibrationValue& vibration_value);

    void VibrateControllers(
-        std::span<const Core::HID::VibrationDeviceHandle> vibration_device_handles,
+        u64 aruid, std::span<const Core::HID::VibrationDeviceHandle> vibration_device_handles,
        std::span<const Core::HID::VibrationValue> vibration_values);

    Core::HID::VibrationValue GetLastVibration(
-        const Core::HID::VibrationDeviceHandle& vibration_device_handle) const;
+        u64 aruid, const Core::HID::VibrationDeviceHandle& vibration_device_handle) const;

    void InitializeVibrationDevice(const Core::HID::VibrationDeviceHandle& vibration_device_handle);

-    void InitializeVibrationDeviceAtIndex(Core::HID::NpadIdType npad_id, std::size_t device_index);
+    void InitializeVibrationDeviceAtIndex(u64 aruid, Core::HID::NpadIdType npad_id,
+                                          std::size_t device_index);

    void SetPermitVibrationSession(bool permit_vibration_session);

    bool IsVibrationDeviceMounted(
-        const Core::HID::VibrationDeviceHandle& vibration_device_handle) const;
+        u64 aruid, const Core::HID::VibrationDeviceHandle& vibration_device_handle) const;

-    Kernel::KReadableEvent& GetStyleSetChangedEvent(Core::HID::NpadIdType npad_id);
-    void SignalStyleSetChangedEvent(Core::HID::NpadIdType npad_id) const;
+    Result AcquireNpadStyleSetUpdateEventHandle(u64 aruid, Kernel::KReadableEvent** out_event,
+                                                Core::HID::NpadIdType npad_id);

    // Adds a new controller at an index.
-    void AddNewControllerAt(Core::HID::NpadStyleIndex controller, Core::HID::NpadIdType npad_id);
+    void AddNewControllerAt(u64 aruid, Core::HID::NpadStyleIndex controller,
+                            Core::HID::NpadIdType npad_id);
    // Adds a new controller at an index with connection status.
-    void UpdateControllerAt(Core::HID::NpadStyleIndex controller, Core::HID::NpadIdType npad_id,
-                            bool connected);
+    void UpdateControllerAt(u64 aruid, Core::HID::NpadStyleIndex controller,
+                            Core::HID::NpadIdType npad_id, bool connected);

-    Result DisconnectNpad(Core::HID::NpadIdType npad_id);
+    Result DisconnectNpad(u64 aruid, Core::HID::NpadIdType npad_id);

    Result IsFirmwareUpdateAvailableForSixAxisSensor(
-        const Core::HID::SixAxisSensorHandle& sixaxis_handle, bool& is_firmware_available) const;
+        u64 aruid, const Core::HID::SixAxisSensorHandle& sixaxis_handle,
+        bool& is_firmware_available) const;
    Result ResetIsSixAxisSensorDeviceNewlyAssigned(
-        const Core::HID::SixAxisSensorHandle& sixaxis_handle);
+        u64 aruid, const Core::HID::SixAxisSensorHandle& sixaxis_handle);

    Result GetLedPattern(Core::HID::NpadIdType npad_id, Core::HID::LedPattern& pattern) const;
-    Result IsUnintendedHomeButtonInputProtectionEnabled(Core::HID::NpadIdType npad_id,
-                                                        bool& is_enabled) const;
-    Result SetUnintendedHomeButtonInputProtectionEnabled(bool is_protection_enabled,
-                                                         Core::HID::NpadIdType npad_id);
-    void SetAnalogStickUseCenterClamp(bool use_center_clamp);
+
+    Result IsUnintendedHomeButtonInputProtectionEnabled(bool& out_is_enabled, u64 aruid,
+                                                        Core::HID::NpadIdType npad_id) const;
+    Result EnableUnintendedHomeButtonInputProtection(u64 aruid, Core::HID::NpadIdType npad_id,
+                                                     bool is_enabled);
+
+    void SetNpadAnalogStickUseCenterClamp(u64 aruid, bool is_enabled);
    void ClearAllConnectedControllers();
    void DisconnectAllConnectedControllers();
    void ConnectAllDisconnectedControllers();
    void ClearAllControllers();

-    Result MergeSingleJoyAsDualJoy(Core::HID::NpadIdType npad_id_1,
+    Result MergeSingleJoyAsDualJoy(u64 aruid, Core::HID::NpadIdType npad_id_1,
                                   Core::HID::NpadIdType npad_id_2);
-    void StartLRAssignmentMode();
-    void StopLRAssignmentMode();
-    Result SwapNpadAssignment(Core::HID::NpadIdType npad_id_1, Core::HID::NpadIdType npad_id_2);
+    Result StartLrAssignmentMode(u64 aruid);
+    Result StopLrAssignmentMode(u64 aruid);
+    Result SwapNpadAssignment(u64 aruid, Core::HID::NpadIdType npad_id_1,
+                              Core::HID::NpadIdType npad_id_2);

    // Logical OR for all buttons presses on all controllers
    // Specifically for cheat engine and other features.
    Core::HID::NpadButton GetAndResetPressState();

-    void ApplyNpadSystemCommonPolicy();
+    Result ApplyNpadSystemCommonPolicy(u64 aruid);
+    Result ApplyNpadSystemCommonPolicyFull(u64 aruid);
+    Result ClearNpadSystemCommonPolicy(u64 aruid);
+
+    void SetRevision(u64 aruid, NpadRevision revision);
+    NpadRevision GetRevision(u64 aruid);
+
+    Result RegisterAppletResourceUserId(u64 aruid);
+    void UnregisterAppletResourceUserId(u64 aruid);
+    void SetNpadExternals(std::shared_ptr<AppletResource> resource,
+                          std::recursive_mutex* shared_mutex);

    AppletDetailedUiType GetAppletDetailedUiType(Core::HID::NpadIdType npad_id);

@ -139,12 +157,10 @@ private:
    };

    struct NpadControllerData {
-        Kernel::KEvent* styleset_changed_event{};
        NpadInternalState* shared_memory = nullptr;
        Core::HID::EmulatedController* device = nullptr;

        std::array<VibrationData, 2> vibration{};
-        bool unintended_home_button_input_protection{};
        bool is_connected{};

        // Dual joycons can have only one side connected
@ -159,39 +175,40 @@ private:
    };

    void ControllerUpdate(Core::HID::ControllerTriggerType type, std::size_t controller_idx);
-    void InitNewlyAddedController(Core::HID::NpadIdType npad_id);
-    bool IsControllerSupported(Core::HID::NpadStyleIndex controller) const;
-    void RequestPadStateUpdate(Core::HID::NpadIdType npad_id);
+    void InitNewlyAddedController(u64 aruid, Core::HID::NpadIdType npad_id);
+    void RequestPadStateUpdate(u64 aruid, Core::HID::NpadIdType npad_id);
    void WriteEmptyEntry(NpadInternalState* npad);

    NpadControllerData& GetControllerFromHandle(
-        const Core::HID::VibrationDeviceHandle& device_handle);
+        u64 aruid, const Core::HID::VibrationDeviceHandle& device_handle);
    const NpadControllerData& GetControllerFromHandle(
-        const Core::HID::VibrationDeviceHandle& device_handle) const;
+        u64 aruid, const Core::HID::VibrationDeviceHandle& device_handle) const;
    NpadControllerData& GetControllerFromHandle(
-        const Core::HID::SixAxisSensorHandle& device_handle);
+        u64 aruid, const Core::HID::SixAxisSensorHandle& device_handle);
    const NpadControllerData& GetControllerFromHandle(
-        const Core::HID::SixAxisSensorHandle& device_handle) const;
-    NpadControllerData& GetControllerFromNpadIdType(Core::HID::NpadIdType npad_id);
-    const NpadControllerData& GetControllerFromNpadIdType(Core::HID::NpadIdType npad_id) const;
+        u64 aruid, const Core::HID::SixAxisSensorHandle& device_handle) const;
+    NpadControllerData& GetControllerFromNpadIdType(u64 aruid, Core::HID::NpadIdType npad_id);
+    const NpadControllerData& GetControllerFromNpadIdType(u64 aruid,
+                                                          Core::HID::NpadIdType npad_id) const;

    Core::HID::SixAxisSensorProperties& GetSixaxisProperties(
-        const Core::HID::SixAxisSensorHandle& device_handle);
+        u64 aruid, const Core::HID::SixAxisSensorHandle& device_handle);
    const Core::HID::SixAxisSensorProperties& GetSixaxisProperties(
-        const Core::HID::SixAxisSensorHandle& device_handle) const;
+        u64 aruid, const Core::HID::SixAxisSensorHandle& device_handle) const;
+
+    Core::HID::HIDCore& hid_core;
+    KernelHelpers::ServiceContext& service_context;
+
+    s32 ref_counter{};
+    mutable std::mutex mutex;
+    NPadResource npad_resource;
+    AppletResourceHolder applet_resource_holder{};
+    Kernel::KEvent* input_event{nullptr};
+    std::mutex* input_mutex{nullptr};

    std::atomic<u64> press_state{};
-
-    std::array<NpadControllerData, NpadCount> controller_data{};
-    KernelHelpers::ServiceContext& service_context;
-    std::mutex mutex;
-    std::vector<Core::HID::NpadIdType> supported_npad_id_types{};
-    NpadJoyHoldType hold_type{NpadJoyHoldType::Vertical};
-    NpadHandheldActivationMode handheld_activation_mode{NpadHandheldActivationMode::Dual};
-    NpadCommunicationMode communication_mode{NpadCommunicationMode::Default};
-    bool permit_vibration_session_enabled{false};
-    bool analog_stick_use_center_clamp{false};
-    bool is_in_lr_assignment_mode{false};
-    bool is_controller_initialized{false};
+    bool permit_vibration_session_enabled;
+    std::array<std::array<NpadControllerData, MaxSupportedNpadIdTypes>, AruidIndexMax>
+        controller_data{};
 };
 } // namespace Service::HID
--- a/src/core/hle/service/hid/controllers/npad/npad_data.cpp
+++ b/src/core/hle/service/hid/controllers/npad/npad_data.cpp
@ -0,0 +1,228 @@
+// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#include "core/hle/service/hid/controllers/npad/npad_data.h"
+#include "core/hle/service/hid/hid_util.h"
+
+namespace Service::HID {
+
+NPadData::NPadData() {
+    ClearNpadSystemCommonPolicy();
+}
+
+NPadData::~NPadData() = default;
+
+NpadStatus NPadData::GetNpadStatus() const {
+    return status;
+}
+
+void NPadData::SetNpadAnalogStickUseCenterClamp(bool is_enabled) {
+    status.use_center_clamp.Assign(is_enabled);
+}
+
+bool NPadData::GetNpadAnalogStickUseCenterClamp() const {
+    return status.use_center_clamp.As<bool>();
+}
+
+void NPadData::SetNpadSystemExtStateEnabled(bool is_enabled) {
+    status.system_ext_state.Assign(is_enabled);
+}
+
+bool NPadData::GetNpadSystemExtState() const {
+    return status.system_ext_state.As<bool>();
+}
+
+Result NPadData::SetSupportedNpadIdType(std::span<const Core::HID::NpadIdType> list) {
+    // Note: Real limit is 11. But array size is 10. N's bug?
+    if (list.size() > MaxSupportedNpadIdTypes) {
+        return ResultInvalidArraySize;
+    }
+
+    supported_npad_id_types_count = list.size();
+    memcpy(supported_npad_id_types.data(), list.data(),
+           list.size() * sizeof(Core::HID::NpadIdType));
+
+    return ResultSuccess;
+}
+
+std::size_t NPadData::GetSupportedNpadIdType(std::span<Core::HID::NpadIdType> out_list) const {
+    std::size_t out_size = std::min(supported_npad_id_types_count, out_list.size());
+
+    memcpy(out_list.data(), supported_npad_id_types.data(),
+           out_size * sizeof(Core::HID::NpadIdType));
+
+    return out_size;
+}
+
+bool NPadData::IsNpadIdTypeSupported(Core::HID::NpadIdType npad_id) const {
+    for (std::size_t i = 0; i < supported_npad_id_types_count; i++) {
+        if (supported_npad_id_types[i] == npad_id) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+void NPadData::SetNpadSystemCommonPolicy(bool is_full_policy) {
+    supported_npad_style_set = Core::HID::NpadStyleSet::Fullkey | Core::HID::NpadStyleSet::JoyDual |
+                               Core::HID::NpadStyleSet::SystemExt | Core::HID::NpadStyleSet::System;
+    handheld_activation_mode = NpadHandheldActivationMode::Dual;
+
+    status.is_supported_styleset_set.Assign(true);
+    status.is_hold_type_set.Assign(true);
+    status.lr_assignment_mode.Assign(false);
+    status.is_policy.Assign(true);
+    if (is_full_policy) {
+        status.is_full_policy.Assign(true);
+    }
+
+    supported_npad_id_types_count = 10;
+    supported_npad_id_types[0] = Core::HID::NpadIdType::Player1;
+    supported_npad_id_types[1] = Core::HID::NpadIdType::Player2;
+    supported_npad_id_types[2] = Core::HID::NpadIdType::Player3;
+    supported_npad_id_types[3] = Core::HID::NpadIdType::Player4;
+    supported_npad_id_types[4] = Core::HID::NpadIdType::Player5;
+    supported_npad_id_types[5] = Core::HID::NpadIdType::Player6;
+    supported_npad_id_types[6] = Core::HID::NpadIdType::Player7;
+    supported_npad_id_types[7] = Core::HID::NpadIdType::Player8;
+    supported_npad_id_types[8] = Core::HID::NpadIdType::Other;
+    supported_npad_id_types[9] = Core::HID::NpadIdType::Handheld;
+
+    for (auto& input_protection : is_unintended_home_button_input_protection) {
+        input_protection = true;
+    }
+}
+
+void NPadData::ClearNpadSystemCommonPolicy() {
+    status.raw = 0;
+    supported_npad_style_set = Core::HID::NpadStyleSet::All;
+    npad_hold_type = NpadJoyHoldType::Vertical;
+    handheld_activation_mode = NpadHandheldActivationMode::Dual;
+
+    for (auto& button_assignment : npad_button_assignment) {
+        button_assignment = Core::HID::NpadButton::None;
+    }
+
+    supported_npad_id_types_count = 10;
+    supported_npad_id_types[0] = Core::HID::NpadIdType::Player1;
+    supported_npad_id_types[1] = Core::HID::NpadIdType::Player2;
+    supported_npad_id_types[2] = Core::HID::NpadIdType::Player3;
+    supported_npad_id_types[3] = Core::HID::NpadIdType::Player4;
+    supported_npad_id_types[4] = Core::HID::NpadIdType::Player5;
+    supported_npad_id_types[5] = Core::HID::NpadIdType::Player6;
+    supported_npad_id_types[6] = Core::HID::NpadIdType::Player7;
+    supported_npad_id_types[7] = Core::HID::NpadIdType::Player8;
+    supported_npad_id_types[8] = Core::HID::NpadIdType::Other;
+    supported_npad_id_types[9] = Core::HID::NpadIdType::Handheld;
+
+    for (auto& input_protection : is_unintended_home_button_input_protection) {
+        input_protection = true;
+    }
+}
+
+void NPadData::SetNpadJoyHoldType(NpadJoyHoldType hold_type) {
+    npad_hold_type = hold_type;
+    status.is_hold_type_set.Assign(true);
+}
+
+NpadJoyHoldType NPadData::GetNpadJoyHoldType() const {
+    return npad_hold_type;
+}
+
+void NPadData::SetHandheldActivationMode(NpadHandheldActivationMode activation_mode) {
+    handheld_activation_mode = activation_mode;
+}
+
+NpadHandheldActivationMode NPadData::GetHandheldActivationMode() const {
+    return handheld_activation_mode;
+}
+
+void NPadData::SetSupportedNpadStyleSet(Core::HID::NpadStyleSet style_set) {
+    supported_npad_style_set = style_set;
+    status.is_supported_styleset_set.Assign(true);
+    status.is_hold_type_set.Assign(true);
+}
+
+Core::HID::NpadStyleSet NPadData::GetSupportedNpadStyleSet() const {
+    return supported_npad_style_set;
+}
+
+bool NPadData::IsNpadStyleIndexSupported(Core::HID::NpadStyleIndex style_index) const {
+    Core::HID::NpadStyleTag style = {supported_npad_style_set};
+    switch (style_index) {
+    case Core::HID::NpadStyleIndex::ProController:
+        return style.fullkey.As<bool>();
+    case Core::HID::NpadStyleIndex::Handheld:
+        return style.handheld.As<bool>();
+    case Core::HID::NpadStyleIndex::JoyconDual:
+        return style.joycon_dual.As<bool>();
+    case Core::HID::NpadStyleIndex::JoyconLeft:
+        return style.joycon_left.As<bool>();
+    case Core::HID::NpadStyleIndex::JoyconRight:
+        return style.joycon_right.As<bool>();
+    case Core::HID::NpadStyleIndex::GameCube:
+        return style.gamecube.As<bool>();
+    case Core::HID::NpadStyleIndex::Pokeball:
+        return style.palma.As<bool>();
+    case Core::HID::NpadStyleIndex::NES:
+        return style.lark.As<bool>();
+    case Core::HID::NpadStyleIndex::SNES:
+        return style.lucia.As<bool>();
+    case Core::HID::NpadStyleIndex::N64:
+        return style.lagoon.As<bool>();
+    case Core::HID::NpadStyleIndex::SegaGenesis:
+        return style.lager.As<bool>();
+    default:
+        return false;
+    }
+}
+
+void NPadData::SetLrAssignmentMode(bool is_enabled) {
+    status.lr_assignment_mode.Assign(is_enabled);
+}
+
+bool NPadData::GetLrAssignmentMode() const {
+    return status.lr_assignment_mode.As<bool>();
+}
+
+void NPadData::SetAssigningSingleOnSlSrPress(bool is_enabled) {
+    status.assigning_single_on_sl_sr_press.Assign(is_enabled);
+}
+
+bool NPadData::GetAssigningSingleOnSlSrPress() const {
+    return status.assigning_single_on_sl_sr_press.As<bool>();
+}
+
+void NPadData::SetHomeProtectionEnabled(bool is_enabled, Core::HID::NpadIdType npad_id) {
+    is_unintended_home_button_input_protection[NpadIdTypeToIndex(npad_id)] = is_enabled;
+}
+
+bool NPadData::GetHomeProtectionEnabled(Core::HID::NpadIdType npad_id) const {
+    return is_unintended_home_button_input_protection[NpadIdTypeToIndex(npad_id)];
+}
+
+void NPadData::SetCaptureButtonAssignment(Core::HID::NpadButton button_assignment,
+                                          std::size_t style_index) {
+    npad_button_assignment[style_index] = button_assignment;
+}
+
+Core::HID::NpadButton NPadData::GetCaptureButtonAssignment(std::size_t style_index) const {
+    return npad_button_assignment[style_index];
+}
+
+std::size_t NPadData::GetNpadCaptureButtonAssignmentList(
+    std::span<Core::HID::NpadButton> out_list) const {
+    for (std::size_t i = 0; i < out_list.size(); i++) {
+        Core::HID::NpadStyleSet style_set = GetStylesetByIndex(i);
+        if ((style_set & supported_npad_style_set) == Core::HID::NpadStyleSet::None ||
+            npad_button_assignment[i] == Core::HID::NpadButton::None) {
+            return i;
+        }
+        out_list[i] = npad_button_assignment[i];
+    }
+
+    return out_list.size();
+}
+
+} // namespace Service::HID
--- a/src/core/hle/service/hid/controllers/npad/npad_data.h
+++ b/src/core/hle/service/hid/controllers/npad/npad_data.h
@ -0,0 +1,88 @@
+// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#pragma once
+
+#include <array>
+#include <span>
+
+#include "common/common_types.h"
+#include "core/hid/hid_types.h"
+#include "core/hle/result.h"
+#include "core/hle/service/hid/controllers/types/npad_types.h"
+
+namespace Service::HID {
+
+struct NpadStatus {
+    union {
+        u32 raw{};
+
+        BitField<0, 1, u32> is_supported_styleset_set;
+        BitField<1, 1, u32> is_hold_type_set;
+        BitField<2, 1, u32> lr_assignment_mode;
+        BitField<3, 1, u32> assigning_single_on_sl_sr_press;
+        BitField<4, 1, u32> is_full_policy;
+        BitField<5, 1, u32> is_policy;
+        BitField<6, 1, u32> use_center_clamp;
+        BitField<7, 1, u32> system_ext_state;
+    };
+};
+static_assert(sizeof(NpadStatus) == 4, "NpadStatus is an invalid size");
+
+/// Handles Npad request from HID interfaces
+class NPadData final {
+public:
+    explicit NPadData();
+    ~NPadData();
+
+    NpadStatus GetNpadStatus() const;
+
+    void SetNpadAnalogStickUseCenterClamp(bool is_enabled);
+    bool GetNpadAnalogStickUseCenterClamp() const;
+
+    void SetNpadSystemExtStateEnabled(bool is_enabled);
+    bool GetNpadSystemExtState() const;
+
+    Result SetSupportedNpadIdType(std::span<const Core::HID::NpadIdType> list);
+    std::size_t GetSupportedNpadIdType(std::span<Core::HID::NpadIdType> out_list) const;
+    bool IsNpadIdTypeSupported(Core::HID::NpadIdType npad_id) const;
+
+    void SetNpadSystemCommonPolicy(bool is_full_policy);
+    void ClearNpadSystemCommonPolicy();
+
+    void SetNpadJoyHoldType(NpadJoyHoldType hold_type);
+    NpadJoyHoldType GetNpadJoyHoldType() const;
+
+    void SetHandheldActivationMode(NpadHandheldActivationMode activation_mode);
+    NpadHandheldActivationMode GetHandheldActivationMode() const;
+
+    void SetSupportedNpadStyleSet(Core::HID::NpadStyleSet style_set);
+    Core::HID::NpadStyleSet GetSupportedNpadStyleSet() const;
+    bool IsNpadStyleIndexSupported(Core::HID::NpadStyleIndex style_index) const;
+
+    void SetLrAssignmentMode(bool is_enabled);
+    bool GetLrAssignmentMode() const;
+
+    void SetAssigningSingleOnSlSrPress(bool is_enabled);
+    bool GetAssigningSingleOnSlSrPress() const;
+
+    void SetHomeProtectionEnabled(bool is_enabled, Core::HID::NpadIdType npad_id);
+    bool GetHomeProtectionEnabled(Core::HID::NpadIdType npad_id) const;
+
+    void SetCaptureButtonAssignment(Core::HID::NpadButton button_assignment,
+                                    std::size_t style_index);
+    Core::HID::NpadButton GetCaptureButtonAssignment(std::size_t style_index) const;
+    std::size_t GetNpadCaptureButtonAssignmentList(std::span<Core::HID::NpadButton> out_list) const;
+
+private:
+    NpadStatus status{};
+    Core::HID::NpadStyleSet supported_npad_style_set{Core::HID::NpadStyleSet::All};
+    NpadJoyHoldType npad_hold_type{NpadJoyHoldType::Vertical};
+    NpadHandheldActivationMode handheld_activation_mode{};
+    std::array<Core::HID::NpadIdType, MaxSupportedNpadIdTypes> supported_npad_id_types{};
+    std::array<Core::HID::NpadButton, StyleIndexCount> npad_button_assignment{};
+    std::size_t supported_npad_id_types_count{};
+    std::array<bool, MaxSupportedNpadIdTypes> is_unintended_home_button_input_protection{};
+};
+
+} // namespace Service::HID
--- a/src/core/hle/service/hid/controllers/npad/npad_resource.cpp
+++ b/src/core/hle/service/hid/controllers/npad/npad_resource.cpp
@ -0,0 +1,685 @@
+// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#include "core/hle/kernel/k_event.h"
+#include "core/hle/kernel/k_readable_event.h"
+#include "core/hle/service/hid/controllers/npad/npad_resource.h"
+#include "core/hle/service/hid/controllers/types/npad_types.h"
+#include "core/hle/service/hid/errors.h"
+#include "core/hle/service/hid/hid_util.h"
+
+namespace Service::HID {
+
+NPadResource::NPadResource(KernelHelpers::ServiceContext& context) : service_context{context} {}
+
+NPadResource::~NPadResource() = default;
+
+Result NPadResource::RegisterAppletResourceUserId(u64 aruid) {
+    const auto aruid_index = GetIndexFromAruid(aruid);
+    if (aruid_index < AruidIndexMax) {
+        return ResultAruidAlreadyRegistered;
+    }
+
+    std::size_t data_index = AruidIndexMax;
+    for (std::size_t i = 0; i < AruidIndexMax; i++) {
+        if (!state[i].flag.is_initialized) {
+            data_index = i;
+            break;
+        }
+    }
+
+    if (data_index == AruidIndexMax) {
+        return ResultAruidNoAvailableEntries;
+    }
+
+    auto& aruid_data = state[data_index];
+
+    aruid_data.aruid = aruid;
+    aruid_data.flag.is_initialized.Assign(true);
+
+    data_index = AruidIndexMax;
+    for (std::size_t i = 0; i < AruidIndexMax; i++) {
+        if (registration_list.flag[i] == RegistrationStatus::Initialized) {
+            if (registration_list.aruid[i] != aruid) {
+                continue;
+            }
+            data_index = i;
+            break;
+        }
+        if (registration_list.flag[i] == RegistrationStatus::None) {
+            data_index = i;
+            break;
+        }
+    }
+
+    if (data_index == AruidIndexMax) {
+        return ResultSuccess;
+    }
+
+    registration_list.flag[data_index] = RegistrationStatus::Initialized;
+    registration_list.aruid[data_index] = aruid;
+
+    return ResultSuccess;
+}
+
+void NPadResource::UnregisterAppletResourceUserId(u64 aruid) {
+    const u64 aruid_index = GetIndexFromAruid(aruid);
+
+    DestroyStyleSetUpdateEvents(aruid);
+    if (aruid_index < AruidIndexMax) {
+        state[aruid_index] = {};
+        registration_list.flag[aruid_index] = RegistrationStatus::PendingDelete;
+    }
+}
+
+void NPadResource::DestroyStyleSetUpdateEvents(u64 aruid) {
+    const u64 aruid_index = GetIndexFromAruid(aruid);
+
+    if (aruid_index >= AruidIndexMax) {
+        return;
+    }
+
+    for (auto& controller_state : state[aruid_index].controller_state) {
+        if (!controller_state.is_styleset_update_event_initialized) {
+            continue;
+        }
+        service_context.CloseEvent(controller_state.style_set_update_event);
+        controller_state.is_styleset_update_event_initialized = false;
+    }
+}
+
+Result NPadResource::Activate(u64 aruid) {
+    const u64 aruid_index = GetIndexFromAruid(aruid);
+
+    if (aruid_index >= AruidIndexMax) {
+        return ResultSuccess;
+    }
+
+    auto& state_data = state[aruid_index];
+
+    if (state_data.flag.is_assigned) {
+        return ResultAruidAlreadyRegistered;
+    }
+
+    state_data.flag.is_assigned.Assign(true);
+    state_data.data.ClearNpadSystemCommonPolicy();
+    state_data.npad_revision = NpadRevision::Revision0;
+    state_data.button_config = {};
+
+    if (active_data_aruid == aruid) {
+        default_hold_type = active_data.GetNpadJoyHoldType();
+        active_data.SetNpadJoyHoldType(default_hold_type);
+    }
+    return ResultSuccess;
+}
+
+Result NPadResource::Activate() {
+    if (ref_counter == std::numeric_limits<s32>::max() - 1) {
+        return ResultAppletResourceOverflow;
+    }
+    if (ref_counter == 0) {
+        RegisterAppletResourceUserId(SystemAruid);
+        Activate(SystemAruid);
+    }
+    ref_counter++;
+    return ResultSuccess;
+}
+
+Result NPadResource::Deactivate() {
+    if (ref_counter == 0) {
+        return ResultAppletResourceNotInitialized;
+    }
+
+    UnregisterAppletResourceUserId(SystemAruid);
+    ref_counter--;
+    return ResultSuccess;
+}
+
+NPadData* NPadResource::GetActiveData() {
+    return &active_data;
+}
+
+u64 NPadResource::GetActiveDataAruid() {
+    return active_data_aruid;
+}
+
+void NPadResource::SetAppletResourceUserId(u64 aruid) {
+    if (active_data_aruid == aruid) {
+        return;
+    }
+
+    active_data_aruid = aruid;
+    default_hold_type = active_data.GetNpadJoyHoldType();
+    const u64 aruid_index = GetIndexFromAruid(aruid);
+
+    if (aruid_index >= AruidIndexMax) {
+        return;
+    }
+
+    auto& data = state[aruid_index].data;
+    if (data.GetNpadStatus().is_policy || data.GetNpadStatus().is_full_policy) {
+        data.SetNpadJoyHoldType(default_hold_type);
+    }
+
+    active_data = data;
+    if (data.GetNpadStatus().is_hold_type_set) {
+        active_data.SetNpadJoyHoldType(default_hold_type);
+    }
+}
+
+std::size_t NPadResource::GetIndexFromAruid(u64 aruid) const {
+    for (std::size_t i = 0; i < AruidIndexMax; i++) {
+        if (registration_list.flag[i] == RegistrationStatus::Initialized &&
+            registration_list.aruid[i] == aruid) {
+            return i;
+        }
+    }
+    return AruidIndexMax;
+}
+
+Result NPadResource::ApplyNpadSystemCommonPolicy(u64 aruid, bool is_full_policy) {
+    const u64 aruid_index = GetIndexFromAruid(aruid);
+    if (aruid_index >= AruidIndexMax) {
+        return ResultNpadNotConnected;
+    }
+
+    auto& data = state[aruid_index].data;
+    data.SetNpadSystemCommonPolicy(is_full_policy);
+    data.SetNpadJoyHoldType(default_hold_type);
+    if (active_data_aruid == aruid) {
+        active_data.SetNpadSystemCommonPolicy(is_full_policy);
+        active_data.SetNpadJoyHoldType(default_hold_type);
+    }
+    return ResultSuccess;
+}
+
+Result NPadResource::ClearNpadSystemCommonPolicy(u64 aruid) {
+    const u64 aruid_index = GetIndexFromAruid(aruid);
+    if (aruid_index >= AruidIndexMax) {
+        return ResultNpadNotConnected;
+    }
+
+    state[aruid_index].data.ClearNpadSystemCommonPolicy();
+    if (active_data_aruid == aruid) {
+        active_data.ClearNpadSystemCommonPolicy();
+    }
+    return ResultSuccess;
+}
+
+Result NPadResource::SetSupportedNpadStyleSet(u64 aruid, Core::HID::NpadStyleSet style_set) {
+    const u64 aruid_index = GetIndexFromAruid(aruid);
+    if (aruid_index >= AruidIndexMax) {
+        return ResultNpadNotConnected;
+    }
+
+    auto& data = state[aruid_index].data;
+    data.SetSupportedNpadStyleSet(style_set);
+    if (active_data_aruid == aruid) {
+        active_data.SetSupportedNpadStyleSet(style_set);
+        active_data.SetNpadJoyHoldType(data.GetNpadJoyHoldType());
+    }
+    return ResultSuccess;
+}
+
+Result NPadResource::GetSupportedNpadStyleSet(Core::HID::NpadStyleSet& out_style_Set,
+                                              u64 aruid) const {
+    const u64 aruid_index = GetIndexFromAruid(aruid);
+    if (aruid_index >= AruidIndexMax) {
+        return ResultNpadNotConnected;
+    }
+
+    auto& data = state[aruid_index].data;
+    if (!data.GetNpadStatus().is_supported_styleset_set) {
+        return ResultUndefinedStyleset;
+    }
+
+    out_style_Set = data.GetSupportedNpadStyleSet();
+    return ResultSuccess;
+}
+
+Result NPadResource::GetMaskedSupportedNpadStyleSet(Core::HID::NpadStyleSet& out_style_set,
+                                                    u64 aruid) const {
+    if (aruid == SystemAruid) {
+        out_style_set = Core::HID::NpadStyleSet::Fullkey | Core::HID::NpadStyleSet::Handheld |
+                        Core::HID::NpadStyleSet::JoyDual | Core::HID::NpadStyleSet::JoyLeft |
+                        Core::HID::NpadStyleSet::JoyRight | Core::HID::NpadStyleSet::Palma |
+                        Core::HID::NpadStyleSet::SystemExt | Core::HID::NpadStyleSet::System;
+        return ResultSuccess;
+    }
+
+    const u64 aruid_index = GetIndexFromAruid(aruid);
+    if (aruid_index >= AruidIndexMax) {
+        return ResultNpadNotConnected;
+    }
+
+    auto& data = state[aruid_index].data;
+    if (!data.GetNpadStatus().is_supported_styleset_set) {
+        return ResultUndefinedStyleset;
+    }
+
+    Core::HID::NpadStyleSet mask{Core::HID::NpadStyleSet::None};
+    out_style_set = data.GetSupportedNpadStyleSet();
+
+    switch (state[aruid_index].npad_revision) {
+    case NpadRevision::Revision1:
+        mask = Core::HID::NpadStyleSet::Fullkey | Core::HID::NpadStyleSet::Handheld |
+               Core::HID::NpadStyleSet::JoyDual | Core::HID::NpadStyleSet::JoyLeft |
+               Core::HID::NpadStyleSet::JoyRight | Core::HID::NpadStyleSet::Gc |
+               Core::HID::NpadStyleSet::Palma | Core::HID::NpadStyleSet::SystemExt |
+               Core::HID::NpadStyleSet::System;
+        break;
+    case NpadRevision::Revision2:
+        mask = Core::HID::NpadStyleSet::Fullkey | Core::HID::NpadStyleSet::Handheld |
+               Core::HID::NpadStyleSet::JoyDual | Core::HID::NpadStyleSet::JoyLeft |
+               Core::HID::NpadStyleSet::JoyRight | Core::HID::NpadStyleSet::Gc |
+               Core::HID::NpadStyleSet::Palma | Core::HID::NpadStyleSet::Lark |
+               Core::HID::NpadStyleSet::SystemExt | Core::HID::NpadStyleSet::System;
+        break;
+    case NpadRevision::Revision3:
+        mask = Core::HID::NpadStyleSet::Fullkey | Core::HID::NpadStyleSet::Handheld |
+               Core::HID::NpadStyleSet::JoyDual | Core::HID::NpadStyleSet::JoyLeft |
+               Core::HID::NpadStyleSet::JoyRight | Core::HID::NpadStyleSet::Gc |
+               Core::HID::NpadStyleSet::Palma | Core::HID::NpadStyleSet::Lark |
+               Core::HID::NpadStyleSet::HandheldLark | Core::HID::NpadStyleSet::Lucia |
+               Core::HID::NpadStyleSet::Lagoon | Core::HID::NpadStyleSet::Lager |
+               Core::HID::NpadStyleSet::SystemExt | Core::HID::NpadStyleSet::System;
+        break;
+    default:
+        mask = Core::HID::NpadStyleSet::Fullkey | Core::HID::NpadStyleSet::Handheld |
+               Core::HID::NpadStyleSet::JoyDual | Core::HID::NpadStyleSet::JoyLeft |
+               Core::HID::NpadStyleSet::JoyRight | Core::HID::NpadStyleSet::SystemExt |
+               Core::HID::NpadStyleSet::System;
+        break;
+    }
+
+    out_style_set = out_style_set & mask;
+    return ResultSuccess;
+}
+
+Result NPadResource::GetAvailableStyleset(Core::HID::NpadStyleSet& out_style_set, u64 aruid) const {
+    const u64 aruid_index = GetIndexFromAruid(aruid);
+    if (aruid_index >= AruidIndexMax) {
+        return ResultNpadNotConnected;
+    }
+
+    auto& data = state[aruid_index].data;
+    if (!data.GetNpadStatus().is_supported_styleset_set) {
+        return ResultUndefinedStyleset;
+    }
+
+    Core::HID::NpadStyleSet mask{Core::HID::NpadStyleSet::None};
+    out_style_set = data.GetSupportedNpadStyleSet();
+
+    switch (state[aruid_index].npad_revision) {
+    case NpadRevision::Revision1:
+        mask = Core::HID::NpadStyleSet::Fullkey | Core::HID::NpadStyleSet::Handheld |
+               Core::HID::NpadStyleSet::JoyDual | Core::HID::NpadStyleSet::JoyLeft |
+               Core::HID::NpadStyleSet::JoyRight | Core::HID::NpadStyleSet::Gc |
+               Core::HID::NpadStyleSet::Palma | Core::HID::NpadStyleSet::SystemExt |
+               Core::HID::NpadStyleSet::System;
+        break;
+    case NpadRevision::Revision2:
+        mask = Core::HID::NpadStyleSet::Fullkey | Core::HID::NpadStyleSet::Handheld |
+               Core::HID::NpadStyleSet::JoyDual | Core::HID::NpadStyleSet::JoyLeft |
+               Core::HID::NpadStyleSet::JoyRight | Core::HID::NpadStyleSet::Gc |
+               Core::HID::NpadStyleSet::Palma | Core::HID::NpadStyleSet::Lark |
+               Core::HID::NpadStyleSet::SystemExt | Core::HID::NpadStyleSet::System;
+        break;
+    case NpadRevision::Revision3:
+        mask = Core::HID::NpadStyleSet::Fullkey | Core::HID::NpadStyleSet::Handheld |
+               Core::HID::NpadStyleSet::JoyDual | Core::HID::NpadStyleSet::JoyLeft |
+               Core::HID::NpadStyleSet::JoyRight | Core::HID::NpadStyleSet::Gc |
+               Core::HID::NpadStyleSet::Palma | Core::HID::NpadStyleSet::Lark |
+               Core::HID::NpadStyleSet::HandheldLark | Core::HID::NpadStyleSet::Lucia |
+               Core::HID::NpadStyleSet::Lagoon | Core::HID::NpadStyleSet::Lager |
+               Core::HID::NpadStyleSet::SystemExt | Core::HID::NpadStyleSet::System;
+        break;
+    default:
+        mask = Core::HID::NpadStyleSet::Fullkey | Core::HID::NpadStyleSet::Handheld |
+               Core::HID::NpadStyleSet::JoyDual | Core::HID::NpadStyleSet::JoyLeft |
+               Core::HID::NpadStyleSet::JoyRight | Core::HID::NpadStyleSet::SystemExt |
+               Core::HID::NpadStyleSet::System;
+        break;
+    }
+
+    out_style_set = out_style_set & mask;
+    return ResultSuccess;
+}
+
+NpadRevision NPadResource::GetNpadRevision(u64 aruid) const {
+    const u64 aruid_index = GetIndexFromAruid(aruid);
+    if (aruid_index >= AruidIndexMax) {
+        return NpadRevision::Revision0;
+    }
+
+    return state[aruid_index].npad_revision;
+}
+
+Result NPadResource::IsSupportedNpadStyleSet(bool& is_set, u64 aruid) {
+    const u64 aruid_index = GetIndexFromAruid(aruid);
+    if (aruid_index >= AruidIndexMax) {
+        return ResultNpadNotConnected;
+    }
+
+    is_set = state[aruid_index].data.GetNpadStatus().is_supported_styleset_set.Value() != 0;
+    return ResultSuccess;
+}
+
+Result NPadResource::SetNpadJoyHoldType(u64 aruid, NpadJoyHoldType hold_type) {
+    const u64 aruid_index = GetIndexFromAruid(aruid);
+    if (aruid_index >= AruidIndexMax) {
+        return ResultNpadNotConnected;
+    }
+
+    state[aruid_index].data.SetNpadJoyHoldType(hold_type);
+    if (active_data_aruid == aruid) {
+        active_data.SetNpadJoyHoldType(hold_type);
+    }
+    return ResultSuccess;
+}
+
+Result NPadResource::GetNpadJoyHoldType(NpadJoyHoldType& hold_type, u64 aruid) const {
+    const u64 aruid_index = GetIndexFromAruid(aruid);
+    if (aruid_index >= AruidIndexMax) {
+        return ResultNpadNotConnected;
+    }
+
+    auto& data = state[aruid_index].data;
+    if (data.GetNpadStatus().is_policy || data.GetNpadStatus().is_full_policy) {
+        hold_type = active_data.GetNpadJoyHoldType();
+        return ResultSuccess;
+    }
+    hold_type = data.GetNpadJoyHoldType();
+    return ResultSuccess;
+}
+
+Result NPadResource::SetNpadHandheldActivationMode(u64 aruid,
+                                                   NpadHandheldActivationMode activation_mode) {
+    const u64 aruid_index = GetIndexFromAruid(aruid);
+    if (aruid_index >= AruidIndexMax) {
+        return ResultNpadNotConnected;
+    }
+
+    state[aruid_index].data.SetHandheldActivationMode(activation_mode);
+    if (active_data_aruid == aruid) {
+        active_data.SetHandheldActivationMode(activation_mode);
+    }
+    return ResultSuccess;
+}
+
+Result NPadResource::GetNpadHandheldActivationMode(NpadHandheldActivationMode& activation_mode,
+                                                   u64 aruid) const {
+    const u64 aruid_index = GetIndexFromAruid(aruid);
+    if (aruid_index >= AruidIndexMax) {
+        return ResultNpadNotConnected;
+    }
+
+    activation_mode = state[aruid_index].data.GetHandheldActivationMode();
+    return ResultSuccess;
+}
+
+Result NPadResource::SetSupportedNpadIdType(
+    u64 aruid, std::span<const Core::HID::NpadIdType> supported_npad_list) {
+    const u64 aruid_index = GetIndexFromAruid(aruid);
+    if (aruid_index >= AruidIndexMax) {
+        return ResultNpadNotConnected;
+    }
+    if (supported_npad_list.size() > MaxSupportedNpadIdTypes) {
+        return ResultInvalidArraySize;
+    }
+
+    Result result = state[aruid_index].data.SetSupportedNpadIdType(supported_npad_list);
+    if (result.IsSuccess() && active_data_aruid == aruid) {
+        result = active_data.SetSupportedNpadIdType(supported_npad_list);
+    }
+
+    return result;
+}
+
+bool NPadResource::IsControllerSupported(u64 aruid, Core::HID::NpadStyleIndex style_index) const {
+    const u64 aruid_index = GetIndexFromAruid(aruid);
+    if (aruid_index >= AruidIndexMax) {
+        return false;
+    }
+    return state[aruid_index].data.IsNpadStyleIndexSupported(style_index);
+}
+
+Result NPadResource::SetLrAssignmentMode(u64 aruid, bool is_enabled) {
+    const u64 aruid_index = GetIndexFromAruid(aruid);
+    if (aruid_index >= AruidIndexMax) {
+        return ResultNpadNotConnected;
+    }
+
+    state[aruid_index].data.SetLrAssignmentMode(is_enabled);
+    if (active_data_aruid == aruid) {
+        active_data.SetLrAssignmentMode(is_enabled);
+    }
+    return ResultSuccess;
+}
+
+Result NPadResource::GetLrAssignmentMode(bool& is_enabled, u64 aruid) const {
+    const u64 aruid_index = GetIndexFromAruid(aruid);
+    if (aruid_index >= AruidIndexMax) {
+        return ResultNpadNotConnected;
+    }
+
+    is_enabled = state[aruid_index].data.GetLrAssignmentMode();
+    return ResultSuccess;
+}
+
+Result NPadResource::SetAssigningSingleOnSlSrPress(u64 aruid, bool is_enabled) {
+    const u64 aruid_index = GetIndexFromAruid(aruid);
+    if (aruid_index >= AruidIndexMax) {
+        return ResultNpadNotConnected;
+    }
+
+    state[aruid_index].data.SetAssigningSingleOnSlSrPress(is_enabled);
+    if (active_data_aruid == aruid) {
+        active_data.SetAssigningSingleOnSlSrPress(is_enabled);
+    }
+    return ResultSuccess;
+}
+
+Result NPadResource::IsAssigningSingleOnSlSrPressEnabled(bool& is_enabled, u64 aruid) const {
+    const u64 aruid_index = GetIndexFromAruid(aruid);
+    if (aruid_index >= AruidIndexMax) {
+        return ResultNpadNotConnected;
+    }
+
+    is_enabled = state[aruid_index].data.GetAssigningSingleOnSlSrPress();
+    return ResultSuccess;
+}
+
+Result NPadResource::AcquireNpadStyleSetUpdateEventHandle(u64 aruid,
+                                                          Kernel::KReadableEvent** out_event,
+                                                          Core::HID::NpadIdType npad_id) {
+    const u64 aruid_index = GetIndexFromAruid(aruid);
+    if (aruid_index >= AruidIndexMax) {
+        return ResultNpadNotConnected;
+    }
+
+    auto& controller_state = state[aruid_index].controller_state[NpadIdTypeToIndex(npad_id)];
+    if (!controller_state.is_styleset_update_event_initialized) {
+        // Auto clear = true
+        controller_state.style_set_update_event =
+            service_context.CreateEvent("NpadResource:StylesetUpdateEvent");
+
+        // Assume creating the event succeeds otherwise crash the system here
+        controller_state.is_styleset_update_event_initialized = true;
+    }
+
+    *out_event = &controller_state.style_set_update_event->GetReadableEvent();
+
+    if (controller_state.is_styleset_update_event_initialized) {
+        controller_state.style_set_update_event->Signal();
+    }
+
+    return ResultSuccess;
+}
+
+Result NPadResource::SignalStyleSetUpdateEvent(u64 aruid, Core::HID::NpadIdType npad_id) {
+    const u64 aruid_index = GetIndexFromAruid(aruid);
+    if (aruid_index >= AruidIndexMax) {
+        return ResultNpadNotConnected;
+    }
+    auto controller = state[aruid_index].controller_state[NpadIdTypeToIndex(npad_id)];
+    if (controller.is_styleset_update_event_initialized) {
+        controller.style_set_update_event->Signal();
+    }
+    return ResultSuccess;
+}
+
+Result NPadResource::GetHomeProtectionEnabled(bool& is_enabled, u64 aruid,
+                                              Core::HID::NpadIdType npad_id) const {
+    const u64 aruid_index = GetIndexFromAruid(aruid);
+    if (aruid_index >= AruidIndexMax) {
+        return ResultNpadNotConnected;
+    }
+
+    is_enabled = state[aruid_index].data.GetHomeProtectionEnabled(npad_id);
+    return ResultSuccess;
+}
+
+Result NPadResource::SetHomeProtectionEnabled(u64 aruid, Core::HID::NpadIdType npad_id,
+                                              bool is_enabled) {
+    const u64 aruid_index = GetIndexFromAruid(aruid);
+    if (aruid_index >= AruidIndexMax) {
+        return ResultNpadNotConnected;
+    }
+
+    state[aruid_index].data.SetHomeProtectionEnabled(is_enabled, npad_id);
+    if (active_data_aruid == aruid) {
+        active_data.SetHomeProtectionEnabled(is_enabled, npad_id);
+    }
+    return ResultSuccess;
+}
+
+Result NPadResource::SetNpadAnalogStickUseCenterClamp(u64 aruid, bool is_enabled) {
+    const u64 aruid_index = GetIndexFromAruid(aruid);
+    if (aruid_index >= AruidIndexMax) {
+        return ResultNpadNotConnected;
+    }
+
+    state[aruid_index].data.SetNpadAnalogStickUseCenterClamp(is_enabled);
+    if (active_data_aruid == aruid) {
+        active_data.SetNpadAnalogStickUseCenterClamp(is_enabled);
+    }
+    return ResultSuccess;
+}
+
+Result NPadResource::SetButtonConfig(u64 aruid, Core::HID::NpadIdType npad_id, std::size_t index,
+                                     Core::HID::NpadButton button_config) {
+    const u64 aruid_index = GetIndexFromAruid(aruid);
+    if (aruid_index >= AruidIndexMax) {
+        return ResultNpadNotConnected;
+    }
+
+    state[aruid_index].button_config[NpadIdTypeToIndex(npad_id)][index] = button_config;
+    return ResultSuccess;
+}
+
+Core::HID::NpadButton NPadResource::GetButtonConfig(u64 aruid, Core::HID::NpadIdType npad_id,
+                                                    std::size_t index, Core::HID::NpadButton mask,
+                                                    bool is_enabled) {
+    const u64 aruid_index = GetIndexFromAruid(aruid);
+    if (aruid_index >= AruidIndexMax) {
+        return Core::HID::NpadButton::None;
+    }
+
+    auto& button_config = state[aruid_index].button_config[NpadIdTypeToIndex(npad_id)][index];
+    if (is_enabled) {
+        button_config = button_config | mask;
+        return button_config;
+    }
+
+    button_config = Core::HID::NpadButton::None;
+    return Core::HID::NpadButton::None;
+}
+
+void NPadResource::ResetButtonConfig() {
+    for (auto& selected_state : state) {
+        selected_state.button_config = {};
+    }
+}
+
+Result NPadResource::SetNpadCaptureButtonAssignment(u64 aruid,
+                                                    Core::HID::NpadStyleSet npad_style_set,
+                                                    Core::HID::NpadButton button_assignment) {
+    const u64 aruid_index = GetIndexFromAruid(aruid);
+    if (aruid_index >= AruidIndexMax) {
+        return ResultNpadNotConnected;
+    }
+
+    // Must be a power of two
+    const auto raw_styleset = static_cast<u32>(npad_style_set);
+    if (raw_styleset == 0 && (raw_styleset & (raw_styleset - 1)) != 0) {
+        return ResultMultipleStyleSetSelected;
+    }
+
+    std::size_t style_index{};
+    Core::HID::NpadStyleSet style_selected{};
+    for (style_index = 0; style_index < StyleIndexCount; ++style_index) {
+        style_selected = GetStylesetByIndex(style_index);
+        if (npad_style_set == style_selected) {
+            break;
+        }
+    }
+
+    if (style_selected == Core::HID::NpadStyleSet::None) {
+        return ResultMultipleStyleSetSelected;
+    }
+
+    state[aruid_index].data.SetCaptureButtonAssignment(button_assignment, style_index);
+    if (active_data_aruid == aruid) {
+        active_data.SetCaptureButtonAssignment(button_assignment, style_index);
+    }
+    return ResultSuccess;
+}
+
+Result NPadResource::ClearNpadCaptureButtonAssignment(u64 aruid) {
+    const u64 aruid_index = GetIndexFromAruid(aruid);
+    if (aruid_index >= AruidIndexMax) {
+        return ResultNpadNotConnected;
+    }
+
+    for (std::size_t i = 0; i < StyleIndexCount; i++) {
+        state[aruid_index].data.SetCaptureButtonAssignment(Core::HID::NpadButton::None, i);
+        if (active_data_aruid == aruid) {
+            active_data.SetCaptureButtonAssignment(Core::HID::NpadButton::None, i);
+        }
+    }
+    return ResultSuccess;
+}
+
+std::size_t NPadResource::GetNpadCaptureButtonAssignment(std::span<Core::HID::NpadButton> out_list,
+                                                         u64 aruid) const {
+    const u64 aruid_index = GetIndexFromAruid(aruid);
+    if (aruid_index >= AruidIndexMax) {
+        return 0;
+    }
+    return state[aruid_index].data.GetNpadCaptureButtonAssignmentList(out_list);
+}
+
+void NPadResource::SetNpadRevision(u64 aruid, NpadRevision revision) {
+    const u64 aruid_index = GetIndexFromAruid(aruid);
+    if (aruid_index >= AruidIndexMax) {
+        return;
+    }
+
+    state[aruid_index].npad_revision = revision;
+}
+
+Result NPadResource::SetNpadSystemExtStateEnabled(u64 aruid, bool is_enabled) {
+    const u64 aruid_index = GetIndexFromAruid(aruid);
+    if (aruid_index >= AruidIndexMax) {
+        return ResultNpadNotConnected;
+    }
+
+    state[aruid_index].data.SetNpadAnalogStickUseCenterClamp(is_enabled);
+    if (active_data_aruid == aruid) {
+        active_data.SetNpadAnalogStickUseCenterClamp(is_enabled);
+    }
+    return ResultSuccess;
+}
+
+} // namespace Service::HID
--- a/src/core/hle/service/hid/controllers/npad/npad_resource.h
+++ b/src/core/hle/service/hid/controllers/npad/npad_resource.h
@ -0,0 +1,132 @@
+// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#pragma once
+
+#include <array>
+#include <mutex>
+#include <span>
+
+#include "common/common_types.h"
+#include "core/hid/hid_types.h"
+#include "core/hle/result.h"
+#include "core/hle/service/hid/controllers/applet_resource.h"
+#include "core/hle/service/hid/controllers/npad/npad_data.h"
+#include "core/hle/service/hid/controllers/types/npad_types.h"
+#include "core/hle/service/kernel_helpers.h"
+
+namespace Core {
+class System;
+}
+
+namespace Kernel {
+class KReadableEvent;
+}
+
+namespace Service::HID {
+struct DataStatusFlag;
+
+struct NpadControllerState {
+    bool is_styleset_update_event_initialized{};
+    INSERT_PADDING_BYTES(0x7);
+    Kernel::KEvent* style_set_update_event{nullptr};
+    INSERT_PADDING_BYTES(0x27);
+};
+
+struct NpadState {
+    DataStatusFlag flag{};
+    u64 aruid{};
+    NPadData data{};
+    std::array<std::array<Core::HID::NpadButton, StyleIndexCount>, MaxSupportedNpadIdTypes>
+        button_config;
+    std::array<NpadControllerState, MaxSupportedNpadIdTypes> controller_state;
+    NpadRevision npad_revision;
+};
+
+/// Handles Npad request from HID interfaces
+class NPadResource final {
+public:
+    explicit NPadResource(KernelHelpers::ServiceContext& context);
+    ~NPadResource();
+
+    NPadData* GetActiveData();
+    u64 GetActiveDataAruid();
+
+    Result RegisterAppletResourceUserId(u64 aruid);
+    void UnregisterAppletResourceUserId(u64 aruid);
+
+    void DestroyStyleSetUpdateEvents(u64 aruid);
+
+    Result Activate(u64 aruid);
+    Result Activate();
+    Result Deactivate();
+
+    void SetAppletResourceUserId(u64 aruid);
+    std::size_t GetIndexFromAruid(u64 aruid) const;
+
+    Result ApplyNpadSystemCommonPolicy(u64 aruid, bool is_full_policy);
+    Result ClearNpadSystemCommonPolicy(u64 aruid);
+
+    Result SetSupportedNpadStyleSet(u64 aruid, Core::HID::NpadStyleSet style_set);
+    Result GetSupportedNpadStyleSet(Core::HID::NpadStyleSet& out_style_Set, u64 aruid) const;
+    Result GetMaskedSupportedNpadStyleSet(Core::HID::NpadStyleSet& out_style_set, u64 aruid) const;
+    Result GetAvailableStyleset(Core::HID::NpadStyleSet& out_style_set, u64 aruid) const;
+
+    NpadRevision GetNpadRevision(u64 aruid) const;
+    void SetNpadRevision(u64 aruid, NpadRevision revision);
+
+    Result IsSupportedNpadStyleSet(bool& is_set, u64 aruid);
+
+    Result SetNpadJoyHoldType(u64 aruid, NpadJoyHoldType hold_type);
+    Result GetNpadJoyHoldType(NpadJoyHoldType& hold_type, u64 aruid) const;
+
+    Result SetNpadHandheldActivationMode(u64 aruid, NpadHandheldActivationMode activation_mode);
+    Result GetNpadHandheldActivationMode(NpadHandheldActivationMode& activation_mode,
+                                         u64 aruid) const;
+
+    Result SetSupportedNpadIdType(u64 aruid,
+                                  std::span<const Core::HID::NpadIdType> supported_npad_list);
+    bool IsControllerSupported(u64 aruid, Core::HID::NpadStyleIndex style_index) const;
+
+    Result SetLrAssignmentMode(u64 aruid, bool is_enabled);
+    Result GetLrAssignmentMode(bool& is_enabled, u64 aruid) const;
+
+    Result SetAssigningSingleOnSlSrPress(u64 aruid, bool is_enabled);
+    Result IsAssigningSingleOnSlSrPressEnabled(bool& is_enabled, u64 aruid) const;
+
+    Result AcquireNpadStyleSetUpdateEventHandle(u64 aruid, Kernel::KReadableEvent** out_event,
+                                                Core::HID::NpadIdType npad_id);
+    Result SignalStyleSetUpdateEvent(u64 aruid, Core::HID::NpadIdType npad_id);
+
+    Result GetHomeProtectionEnabled(bool& is_enabled, u64 aruid,
+                                    Core::HID::NpadIdType npad_id) const;
+    Result SetHomeProtectionEnabled(u64 aruid, Core::HID::NpadIdType npad_id, bool is_enabled);
+
+    Result SetNpadAnalogStickUseCenterClamp(u64 aruid, bool is_enabled);
+
+    Result SetButtonConfig(u64 aruid, Core::HID::NpadIdType npad_id, std::size_t index,
+                           Core::HID::NpadButton button_config);
+    Core::HID::NpadButton GetButtonConfig(u64 aruid, Core::HID::NpadIdType npad_id,
+                                          std::size_t index, Core::HID::NpadButton mask,
+                                          bool is_enabled);
+    void ResetButtonConfig();
+
+    Result SetNpadCaptureButtonAssignment(u64 aruid, Core::HID::NpadStyleSet npad_style_set,
+                                          Core::HID::NpadButton button_assignment);
+    Result ClearNpadCaptureButtonAssignment(u64 aruid);
+    std::size_t GetNpadCaptureButtonAssignment(std::span<Core::HID::NpadButton> out_list,
+                                               u64 aruid) const;
+
+    Result SetNpadSystemExtStateEnabled(u64 aruid, bool is_enabled);
+
+private:
+    NPadData active_data{};
+    AruidRegisterList registration_list{};
+    std::array<NpadState, AruidIndexMax> state{};
+    u64 active_data_aruid{};
+    NpadJoyHoldType default_hold_type{};
+    s32 ref_counter{};
+
+    KernelHelpers::ServiceContext& service_context;
+};
+} // namespace Service::HID
--- a/src/core/hle/service/hid/controllers/six_axis.cpp
+++ b/src/core/hle/service/hid/controllers/six_axis.cpp
@ -27,10 +27,11 @@ void SixAxis::OnInit() {}
 void SixAxis::OnRelease() {}

 void SixAxis::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
+    std::scoped_lock shared_lock{*shared_mutex};
    const u64 aruid = applet_resource->GetActiveAruid();
    auto* data = applet_resource->GetAruidData(aruid);

-    if (data == nullptr) {
+    if (data == nullptr || !data->flag.is_assigned) {
        return;
    }

--- a/src/core/hle/service/hid/controllers/sleep_button.cpp
+++ b/src/core/hle/service/hid/controllers/sleep_button.cpp
@ -21,10 +21,11 @@ void SleepButton::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
        return;
    }

+    std::scoped_lock shared_lock{*shared_mutex};
    const u64 aruid = applet_resource->GetActiveAruid();
    auto* data = applet_resource->GetAruidData(aruid);

-    if (data == nullptr) {
+    if (data == nullptr || !data->flag.is_assigned) {
        return;
    }

--- a/src/core/hle/service/hid/controllers/touchscreen.cpp
+++ b/src/core/hle/service/hid/controllers/touchscreen.cpp
@ -30,7 +30,7 @@ void TouchScreen::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
    const u64 aruid = applet_resource->GetActiveAruid();
    auto* data = applet_resource->GetAruidData(aruid);

-    if (data == nullptr) {
+    if (data == nullptr || !data->flag.is_assigned) {
        return;
    }

--- a/src/core/hle/service/hid/controllers/types/npad_types.h
+++ b/src/core/hle/service/hid/controllers/types/npad_types.h
@ -9,7 +9,8 @@
 #include "core/hid/hid_types.h"

 namespace Service::HID {
-static constexpr std::size_t NpadCount = 10;
+static constexpr std::size_t MaxSupportedNpadIdTypes = 10;
+static constexpr std::size_t StyleIndexCount = 7;

 // This is nn::hid::NpadJoyHoldType
 enum class NpadJoyHoldType : u64 {
--- a/src/core/hle/service/hid/controllers/types/shared_memory_format.h
+++ b/src/core/hle/service/hid/controllers/types/shared_memory_format.h
@ -171,7 +171,7 @@ static_assert(sizeof(NpadSharedMemoryEntry) == 0x5000, "NpadSharedMemoryEntry is

 // This is nn::hid::detail::NpadSharedMemoryFormat
 struct NpadSharedMemoryFormat {
-    std::array<NpadSharedMemoryEntry, NpadCount> npad_entry;
+    std::array<NpadSharedMemoryEntry, MaxSupportedNpadIdTypes> npad_entry;
 };
 static_assert(sizeof(NpadSharedMemoryFormat) == 0x32000,
              "NpadSharedMemoryFormat is an invalid size");
--- a/src/core/hle/service/hid/controllers/unique_pad.cpp
+++ b/src/core/hle/service/hid/controllers/unique_pad.cpp
@ -24,7 +24,7 @@ void UniquePad::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
    const u64 aruid = applet_resource->GetActiveAruid();
    auto* data = applet_resource->GetAruidData(aruid);

-    if (data == nullptr) {
+    if (data == nullptr || !data->flag.is_assigned) {
        return;
    }

--- a/src/core/hle/service/hid/errors.h
+++ b/src/core/hle/service/hid/errors.h
@ -10,15 +10,32 @@ namespace Service::HID {
 constexpr Result PalmaResultSuccess{ErrorModule::HID, 0};
 constexpr Result NpadInvalidHandle{ErrorModule::HID, 100};
 constexpr Result NpadDeviceIndexOutOfRange{ErrorModule::HID, 107};
-constexpr Result VibrationInvalidStyleIndex{ErrorModule::HID, 122};
-constexpr Result VibrationInvalidNpadId{ErrorModule::HID, 123};
-constexpr Result VibrationDeviceIndexOutOfRange{ErrorModule::HID, 124};
+
+constexpr Result ResultVibrationNotInitialized{ErrorModule::HID, 121};
+constexpr Result ResultVibrationInvalidStyleIndex{ErrorModule::HID, 122};
+constexpr Result ResultVibrationInvalidNpadId{ErrorModule::HID, 123};
+constexpr Result ResultVibrationDeviceIndexOutOfRange{ErrorModule::HID, 124};
+constexpr Result ResultVibrationStrenghtOutOfRange{ErrorModule::HID, 126};
+constexpr Result ResultVibrationArraySizeMismatch{ErrorModule::HID, 131};
+
 constexpr Result InvalidSixAxisFusionRange{ErrorModule::HID, 423};
+
+constexpr Result ResultNfcIsNotReady{ErrorModule::HID, 461};
+constexpr Result ResultNfcXcdHandleIsNotInitialized{ErrorModule::HID, 464};
+constexpr Result ResultIrSensorIsNotReady{ErrorModule::HID, 501};
+constexpr Result ResultMcuIsNotReady{ErrorModule::HID, 541};
+
 constexpr Result NpadIsDualJoycon{ErrorModule::HID, 601};
 constexpr Result NpadIsSameType{ErrorModule::HID, 602};
-constexpr Result InvalidNpadId{ErrorModule::HID, 709};
-constexpr Result NpadNotConnected{ErrorModule::HID, 710};
-constexpr Result InvalidArraySize{ErrorModule::HID, 715};
+constexpr Result ResultNpadIsNotProController{ErrorModule::HID, 604};
+
+constexpr Result ResultInvalidNpadId{ErrorModule::HID, 709};
+constexpr Result ResultNpadNotConnected{ErrorModule::HID, 710};
+constexpr Result ResultNpadHandlerOverflow{ErrorModule::HID, 711};
+constexpr Result ResultNpadHandlerNotInitialized{ErrorModule::HID, 712};
+constexpr Result ResultInvalidArraySize{ErrorModule::HID, 715};
+constexpr Result ResultUndefinedStyleset{ErrorModule::HID, 716};
+constexpr Result ResultMultipleStyleSetSelected{ErrorModule::HID, 717};

 constexpr Result ResultAppletResourceOverflow{ErrorModule::HID, 1041};
 constexpr Result ResultAppletResourceNotInitialized{ErrorModule::HID, 1042};
@ -27,6 +44,9 @@ constexpr Result ResultAruidNoAvailableEntries{ErrorModule::HID, 1044};
 constexpr Result ResultAruidAlreadyRegistered{ErrorModule::HID, 1046};
 constexpr Result ResultAruidNotRegistered{ErrorModule::HID, 1047};

+constexpr Result ResultNpadResourceOverflow{ErrorModule::HID, 2001};
+constexpr Result ResultNpadResourceNotInitialized{ErrorModule::HID, 2002};
+
 constexpr Result InvalidPalmaHandle{ErrorModule::HID, 3302};

 } // namespace Service::HID
--- a/src/core/hle/service/hid/hid.cpp
+++ b/src/core/hle/service/hid/hid.cpp
@ -25,6 +25,7 @@ void LoopProcess(Core::System& system) {
    // TODO: Remove this hack until this service is emulated properly.
    const auto process_list = system.Kernel().GetProcessList();
    if (!process_list.empty()) {
+        resouce_manager->Initialize();
        resouce_manager->RegisterAppletResourceUserId(process_list[0]->GetId(), true);
    }

--- a/src/core/hle/service/hid/hid_server.cpp
+++ b/src/core/hle/service/hid/hid_server.cpp
@ -785,8 +785,8 @@ void IHidServer::IsFirmwareUpdateAvailableForSixAxisSensor(HLERequestContext& ct

    bool is_firmware_available{};
    auto controller = GetResourceManager()->GetNpad();
-    controller->IsFirmwareUpdateAvailableForSixAxisSensor(parameters.sixaxis_handle,
-                                                          is_firmware_available);
+    controller->IsFirmwareUpdateAvailableForSixAxisSensor(
+        parameters.applet_resource_user_id, parameters.sixaxis_handle, is_firmware_available);

    LOG_WARNING(
        Service_HID,
@ -924,8 +924,8 @@ void IHidServer::ResetIsSixAxisSensorDeviceNewlyAssigned(HLERequestContext& ctx)
    const auto parameters{rp.PopRaw<Parameters>()};

    auto controller = GetResourceManager()->GetNpad();
-    const auto result =
-        controller->ResetIsSixAxisSensorDeviceNewlyAssigned(parameters.sixaxis_handle);
+    const auto result = controller->ResetIsSixAxisSensorDeviceNewlyAssigned(
+        parameters.applet_resource_user_id, parameters.sixaxis_handle);

    LOG_WARNING(
        Service_HID,
@ -970,7 +970,7 @@ void IHidServer::ActivateGesture(HLERequestContext& ctx) {
 void IHidServer::SetSupportedNpadStyleSet(HLERequestContext& ctx) {
    IPC::RequestParser rp{ctx};
    struct Parameters {
-        Core::HID::NpadStyleSet supported_styleset;
+        Core::HID::NpadStyleSet supported_style_set;
        INSERT_PADDING_WORDS_NOINIT(1);
        u64 applet_resource_user_id;
    };
@ -978,13 +978,25 @@ void IHidServer::SetSupportedNpadStyleSet(HLERequestContext& ctx) {

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

-    GetResourceManager()->GetNpad()->SetSupportedStyleSet({parameters.supported_styleset});
+    LOG_DEBUG(Service_HID, "called, supported_style_set={}, applet_resource_user_id={}",
+              parameters.supported_style_set, parameters.applet_resource_user_id);

-    LOG_DEBUG(Service_HID, "called, supported_styleset={}, applet_resource_user_id={}",
-              parameters.supported_styleset, parameters.applet_resource_user_id);
+    const auto npad = GetResourceManager()->GetNpad();
+    const Result result = npad->SetSupportedNpadStyleSet(parameters.applet_resource_user_id,
+                                                         parameters.supported_style_set);
+
+    if (result.IsSuccess()) {
+        Core::HID::NpadStyleTag style_tag{parameters.supported_style_set};
+        const auto revision = npad->GetRevision(parameters.applet_resource_user_id);
+
+        if (style_tag.palma != 0 && revision < NpadRevision::Revision3) {
+            // GetResourceManager()->GetPalma()->EnableBoostMode(parameters.applet_resource_user_id,
+            //                                                   true);
+        }
+    }

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

 void IHidServer::GetSupportedNpadStyleSet(HLERequestContext& ctx) {
@ -993,19 +1005,31 @@ void IHidServer::GetSupportedNpadStyleSet(HLERequestContext& ctx) {

    LOG_DEBUG(Service_HID, "called, applet_resource_user_id={}", applet_resource_user_id);

+    Core::HID::NpadStyleSet supported_style_set{};
+    const auto npad = GetResourceManager()->GetNpad();
+    const auto result =
+        npad->GetSupportedNpadStyleSet(applet_resource_user_id, supported_style_set);
+
    IPC::ResponseBuilder rb{ctx, 3};
-    rb.Push(ResultSuccess);
-    rb.PushEnum(GetResourceManager()->GetNpad()->GetSupportedStyleSet().raw);
+    rb.Push(result);
+    rb.PushEnum(supported_style_set);
 }

 void IHidServer::SetSupportedNpadIdType(HLERequestContext& ctx) {
    IPC::RequestParser rp{ctx};
    const auto applet_resource_user_id{rp.Pop<u64>()};
-
-    const auto result = GetResourceManager()->GetNpad()->SetSupportedNpadIdTypes(ctx.ReadBuffer());
+    const auto buffer = ctx.ReadBuffer();
+    const std::size_t elements = ctx.GetReadBufferNumElements<Core::HID::NpadIdType>();

    LOG_DEBUG(Service_HID, "called, applet_resource_user_id={}", applet_resource_user_id);

+    std::vector<Core::HID::NpadIdType> supported_npad_list(elements);
+    memcpy(supported_npad_list.data(), buffer.data(), buffer.size());
+
+    const auto npad = GetResourceManager()->GetNpad();
+    const Result result =
+        npad->SetSupportedNpadIdType(applet_resource_user_id, supported_npad_list);
+
    IPC::ResponseBuilder rb{ctx, 2};
    rb.Push(result);
 }
@ -1018,7 +1042,7 @@ void IHidServer::ActivateNpad(HLERequestContext& ctx) {

    auto npad = GetResourceManager()->GetNpad();

-    // TODO: npad->SetRevision(applet_resource_user_id, NpadRevision::Revision0);
+    npad->SetRevision(applet_resource_user_id, NpadRevision::Revision0);
    const Result result = npad->Activate(applet_resource_user_id);

    IPC::ResponseBuilder rb{ctx, 2};
@ -1052,13 +1076,13 @@ void IHidServer::AcquireNpadStyleSetUpdateEventHandle(HLERequestContext& ctx) {
    LOG_DEBUG(Service_HID, "called, npad_id={}, applet_resource_user_id={}, unknown={}",
              parameters.npad_id, parameters.applet_resource_user_id, parameters.unknown);

-    // Games expect this event to be signaled after calling this function
-    GetResourceManager()->GetNpad()->SignalStyleSetChangedEvent(parameters.npad_id);
+    Kernel::KReadableEvent* style_set_update_event;
+    const auto result = GetResourceManager()->GetNpad()->AcquireNpadStyleSetUpdateEventHandle(
+        parameters.applet_resource_user_id, &style_set_update_event, parameters.npad_id);

    IPC::ResponseBuilder rb{ctx, 2, 1};
-    rb.Push(ResultSuccess);
-    rb.PushCopyObjects(
-        GetResourceManager()->GetNpad()->GetStyleSetChangedEvent(parameters.npad_id));
+    rb.Push(result);
+    rb.PushCopyObjects(style_set_update_event);
 }

 void IHidServer::DisconnectNpad(HLERequestContext& ctx) {
@ -1073,7 +1097,7 @@ void IHidServer::DisconnectNpad(HLERequestContext& ctx) {
    const auto parameters{rp.PopRaw<Parameters>()};

    auto controller = GetResourceManager()->GetNpad();
-    controller->DisconnectNpad(parameters.npad_id);
+    controller->DisconnectNpad(parameters.applet_resource_user_id, parameters.npad_id);

    LOG_DEBUG(Service_HID, "called, npad_id={}, applet_resource_user_id={}", parameters.npad_id,
              parameters.applet_resource_user_id);
@ -1113,7 +1137,7 @@ void IHidServer::ActivateNpadWithRevision(HLERequestContext& ctx) {

    auto npad = GetResourceManager()->GetNpad();

-    // TODO: npad->SetRevision(applet_resource_user_id, revision);
+    npad->SetRevision(parameters.applet_resource_user_id, parameters.revision);
    const auto result = npad->Activate(parameters.applet_resource_user_id);

    IPC::ResponseBuilder rb{ctx, 2};
@ -1125,13 +1149,19 @@ void IHidServer::SetNpadJoyHoldType(HLERequestContext& ctx) {
    const auto applet_resource_user_id{rp.Pop<u64>()};
    const auto hold_type{rp.PopEnum<NpadJoyHoldType>()};

-    GetResourceManager()->GetNpad()->SetHoldType(hold_type);
-
    LOG_DEBUG(Service_HID, "called, applet_resource_user_id={}, hold_type={}",
              applet_resource_user_id, hold_type);

+    if (hold_type != NpadJoyHoldType::Horizontal && hold_type != NpadJoyHoldType::Vertical) {
+        // This should crash console
+        ASSERT_MSG(false, "Invalid npad joy hold type");
+    }
+
+    const auto npad = GetResourceManager()->GetNpad();
+    const auto result = npad->SetNpadJoyHoldType(applet_resource_user_id, hold_type);
+
    IPC::ResponseBuilder rb{ctx, 2};
-    rb.Push(ResultSuccess);
+    rb.Push(result);
 }

 void IHidServer::GetNpadJoyHoldType(HLERequestContext& ctx) {
@ -1140,9 +1170,13 @@ void IHidServer::GetNpadJoyHoldType(HLERequestContext& ctx) {

    LOG_DEBUG(Service_HID, "called, applet_resource_user_id={}", applet_resource_user_id);

+    NpadJoyHoldType hold_type{};
+    const auto npad = GetResourceManager()->GetNpad();
+    const auto result = npad->GetNpadJoyHoldType(applet_resource_user_id, hold_type);
+
    IPC::ResponseBuilder rb{ctx, 4};
-    rb.Push(ResultSuccess);
-    rb.PushEnum(GetResourceManager()->GetNpad()->GetHoldType());
+    rb.Push(result);
+    rb.PushEnum(hold_type);
 }

 void IHidServer::SetNpadJoyAssignmentModeSingleByDefault(HLERequestContext& ctx) {
@ -1158,8 +1192,8 @@ void IHidServer::SetNpadJoyAssignmentModeSingleByDefault(HLERequestContext& ctx)

    Core::HID::NpadIdType new_npad_id{};
    auto controller = GetResourceManager()->GetNpad();
-    controller->SetNpadMode(new_npad_id, parameters.npad_id, NpadJoyDeviceType::Left,
-                            NpadJoyAssignmentMode::Single);
+    controller->SetNpadMode(parameters.applet_resource_user_id, new_npad_id, parameters.npad_id,
+                            NpadJoyDeviceType::Left, NpadJoyAssignmentMode::Single);

    LOG_INFO(Service_HID, "called, npad_id={}, applet_resource_user_id={}", parameters.npad_id,
             parameters.applet_resource_user_id);
@ -1182,8 +1216,8 @@ void IHidServer::SetNpadJoyAssignmentModeSingle(HLERequestContext& ctx) {

    Core::HID::NpadIdType new_npad_id{};
    auto controller = GetResourceManager()->GetNpad();
-    controller->SetNpadMode(new_npad_id, parameters.npad_id, parameters.npad_joy_device_type,
-                            NpadJoyAssignmentMode::Single);
+    controller->SetNpadMode(parameters.applet_resource_user_id, new_npad_id, parameters.npad_id,
+                            parameters.npad_joy_device_type, NpadJoyAssignmentMode::Single);

    LOG_INFO(Service_HID, "called, npad_id={}, applet_resource_user_id={}, npad_joy_device_type={}",
             parameters.npad_id, parameters.applet_resource_user_id,
@ -1206,7 +1240,8 @@ void IHidServer::SetNpadJoyAssignmentModeDual(HLERequestContext& ctx) {

    Core::HID::NpadIdType new_npad_id{};
    auto controller = GetResourceManager()->GetNpad();
-    controller->SetNpadMode(new_npad_id, parameters.npad_id, {}, NpadJoyAssignmentMode::Dual);
+    controller->SetNpadMode(parameters.applet_resource_user_id, new_npad_id, parameters.npad_id, {},
+                            NpadJoyAssignmentMode::Dual);

    LOG_DEBUG(Service_HID, "called, npad_id={}, applet_resource_user_id={}", parameters.npad_id,
              parameters.applet_resource_user_id); // Spams a lot when controller applet is open
@ -1222,7 +1257,8 @@ void IHidServer::MergeSingleJoyAsDualJoy(HLERequestContext& ctx) {
    const auto applet_resource_user_id{rp.Pop<u64>()};

    auto controller = GetResourceManager()->GetNpad();
-    const auto result = controller->MergeSingleJoyAsDualJoy(npad_id_1, npad_id_2);
+    const auto result =
+        controller->MergeSingleJoyAsDualJoy(applet_resource_user_id, npad_id_1, npad_id_2);

    LOG_DEBUG(Service_HID, "called, npad_id_1={}, npad_id_2={}, applet_resource_user_id={}",
              npad_id_1, npad_id_2, applet_resource_user_id);
@ -1235,10 +1271,10 @@ void IHidServer::StartLrAssignmentMode(HLERequestContext& ctx) {
    IPC::RequestParser rp{ctx};
    const auto applet_resource_user_id{rp.Pop<u64>()};

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

+    GetResourceManager()->GetNpad()->StartLrAssignmentMode(applet_resource_user_id);
+
    IPC::ResponseBuilder rb{ctx, 2};
    rb.Push(ResultSuccess);
 }
@ -1247,10 +1283,10 @@ void IHidServer::StopLrAssignmentMode(HLERequestContext& ctx) {
    IPC::RequestParser rp{ctx};
    const auto applet_resource_user_id{rp.Pop<u64>()};

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

+    GetResourceManager()->GetNpad()->StopLrAssignmentMode(applet_resource_user_id);
+
    IPC::ResponseBuilder rb{ctx, 2};
    rb.Push(ResultSuccess);
 }
@ -1260,13 +1296,23 @@ void IHidServer::SetNpadHandheldActivationMode(HLERequestContext& ctx) {
    const auto applet_resource_user_id{rp.Pop<u64>()};
    const auto activation_mode{rp.PopEnum<NpadHandheldActivationMode>()};

-    GetResourceManager()->GetNpad()->SetNpadHandheldActivationMode(activation_mode);
-
    LOG_DEBUG(Service_HID, "called, applet_resource_user_id={}, activation_mode={}",
              applet_resource_user_id, activation_mode);

+    if (activation_mode >= NpadHandheldActivationMode::MaxActivationMode) {
+        // Console should crash here
+        ASSERT_MSG(false, "Activation mode should be always None, Single or Dual");
+        IPC::ResponseBuilder rb{ctx, 2};
+        rb.Push(ResultSuccess);
+        return;
+    }
+
+    const auto npad = GetResourceManager()->GetNpad();
+    const auto result =
+        npad->SetNpadHandheldActivationMode(applet_resource_user_id, activation_mode);
+
    IPC::ResponseBuilder rb{ctx, 2};
-    rb.Push(ResultSuccess);
+    rb.Push(result);
 }

 void IHidServer::GetNpadHandheldActivationMode(HLERequestContext& ctx) {
@ -1275,9 +1321,14 @@ void IHidServer::GetNpadHandheldActivationMode(HLERequestContext& ctx) {

    LOG_DEBUG(Service_HID, "called, applet_resource_user_id={}", applet_resource_user_id);

+    NpadHandheldActivationMode activation_mode{};
+    const auto npad = GetResourceManager()->GetNpad();
+    const auto result =
+        npad->GetNpadHandheldActivationMode(applet_resource_user_id, activation_mode);
+
    IPC::ResponseBuilder rb{ctx, 4};
-    rb.Push(ResultSuccess);
-    rb.PushEnum(GetResourceManager()->GetNpad()->GetNpadHandheldActivationMode());
+    rb.Push(result);
+    rb.PushEnum(activation_mode);
 }

 void IHidServer::SwapNpadAssignment(HLERequestContext& ctx) {
@ -1286,12 +1337,12 @@ void IHidServer::SwapNpadAssignment(HLERequestContext& ctx) {
    const auto npad_id_2{rp.PopEnum<Core::HID::NpadIdType>()};
    const auto applet_resource_user_id{rp.Pop<u64>()};

-    auto controller = GetResourceManager()->GetNpad();
-    const auto result = controller->SwapNpadAssignment(npad_id_1, npad_id_2);
-
    LOG_DEBUG(Service_HID, "called, npad_id_1={}, npad_id_2={}, applet_resource_user_id={}",
              npad_id_1, npad_id_2, applet_resource_user_id);

+    const auto npad = GetResourceManager()->GetNpad();
+    const auto result = npad->SwapNpadAssignment(applet_resource_user_id, npad_id_1, npad_id_2);
+
    IPC::ResponseBuilder rb{ctx, 2};
    rb.Push(result);
 }
@ -1307,13 +1358,19 @@ void IHidServer::IsUnintendedHomeButtonInputProtectionEnabled(HLERequestContext&

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

-    bool is_enabled = false;
-    auto controller = GetResourceManager()->GetNpad();
-    const auto result =
-        controller->IsUnintendedHomeButtonInputProtectionEnabled(parameters.npad_id, is_enabled);
+    LOG_INFO(Service_HID, "called, npad_id={}, applet_resource_user_id={}", parameters.npad_id,
+             parameters.applet_resource_user_id);

-    LOG_WARNING(Service_HID, "(STUBBED) called, npad_id={}, applet_resource_user_id={}",
-                parameters.npad_id, parameters.applet_resource_user_id);
+    if (!IsNpadIdValid(parameters.npad_id)) {
+        IPC::ResponseBuilder rb{ctx, 3};
+        rb.Push(ResultInvalidNpadId);
+        return;
+    }
+
+    bool is_enabled{};
+    const auto npad = GetResourceManager()->GetNpad();
+    const auto result = npad->IsUnintendedHomeButtonInputProtectionEnabled(
+        is_enabled, parameters.applet_resource_user_id, parameters.npad_id);

    IPC::ResponseBuilder rb{ctx, 3};
    rb.Push(result);
@ -1332,13 +1389,18 @@ void IHidServer::EnableUnintendedHomeButtonInputProtection(HLERequestContext& ct

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

-    auto controller = GetResourceManager()->GetNpad();
-    const auto result = controller->SetUnintendedHomeButtonInputProtectionEnabled(
-        parameters.is_enabled, parameters.npad_id);
+    LOG_INFO(Service_HID, "called, is_enabled={}, npad_id={}, applet_resource_user_id={}",
+             parameters.is_enabled, parameters.npad_id, parameters.applet_resource_user_id);

-    LOG_DEBUG(Service_HID,
-              "(STUBBED) called, is_enabled={}, npad_id={}, applet_resource_user_id={}",
-              parameters.is_enabled, parameters.npad_id, parameters.applet_resource_user_id);
+    if (!IsNpadIdValid(parameters.npad_id)) {
+        IPC::ResponseBuilder rb{ctx, 3};
+        rb.Push(ResultInvalidNpadId);
+        return;
+    }
+
+    const auto npad = GetResourceManager()->GetNpad();
+    const auto result = npad->EnableUnintendedHomeButtonInputProtection(
+        parameters.applet_resource_user_id, parameters.npad_id, parameters.is_enabled);

    IPC::ResponseBuilder rb{ctx, 2};
    rb.Push(result);
@ -1359,8 +1421,8 @@ void IHidServer::SetNpadJoyAssignmentModeSingleWithDestination(HLERequestContext
    Core::HID::NpadIdType new_npad_id{};
    auto controller = GetResourceManager()->GetNpad();
    const auto is_reassigned =
-        controller->SetNpadMode(new_npad_id, parameters.npad_id, parameters.npad_joy_device_type,
-                                NpadJoyAssignmentMode::Single);
+        controller->SetNpadMode(parameters.applet_resource_user_id, new_npad_id, parameters.npad_id,
+                                parameters.npad_joy_device_type, NpadJoyAssignmentMode::Single);

    LOG_INFO(Service_HID, "called, npad_id={}, applet_resource_user_id={}, npad_joy_device_type={}",
             parameters.npad_id, parameters.applet_resource_user_id,
@ -1375,7 +1437,7 @@ void IHidServer::SetNpadJoyAssignmentModeSingleWithDestination(HLERequestContext
 void IHidServer::SetNpadAnalogStickUseCenterClamp(HLERequestContext& ctx) {
    IPC::RequestParser rp{ctx};
    struct Parameters {
-        bool analog_stick_use_center_clamp;
+        bool use_center_clamp;
        INSERT_PADDING_BYTES_NOINIT(7);
        u64 applet_resource_user_id;
    };
@ -1383,12 +1445,11 @@ void IHidServer::SetNpadAnalogStickUseCenterClamp(HLERequestContext& ctx) {

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

-    GetResourceManager()->GetNpad()->SetAnalogStickUseCenterClamp(
-        parameters.analog_stick_use_center_clamp);
+    LOG_WARNING(Service_HID, "(STUBBED) called, use_center_clamp={}, applet_resource_user_id={}",
+                parameters.use_center_clamp, parameters.applet_resource_user_id);

-    LOG_WARNING(Service_HID,
-                "(STUBBED) called, analog_stick_use_center_clamp={}, applet_resource_user_id={}",
-                parameters.analog_stick_use_center_clamp, parameters.applet_resource_user_id);
+    GetResourceManager()->GetNpad()->SetNpadAnalogStickUseCenterClamp(
+        parameters.applet_resource_user_id, parameters.use_center_clamp);

    IPC::ResponseBuilder rb{ctx, 2};
    rb.Push(ResultSuccess);
@ -1496,7 +1557,8 @@ void IHidServer::SendVibrationValue(HLERequestContext& ctx) {

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

-    GetResourceManager()->GetNpad()->VibrateController(parameters.vibration_device_handle,
+    GetResourceManager()->GetNpad()->VibrateController(parameters.applet_resource_user_id,
+                                                       parameters.vibration_device_handle,
                                                       parameters.vibration_value);

    LOG_DEBUG(Service_HID,
@ -1528,8 +1590,8 @@ void IHidServer::GetActualVibrationValue(HLERequestContext& ctx) {

    IPC::ResponseBuilder rb{ctx, 6};
    rb.Push(ResultSuccess);
-    rb.PushRaw(
-        GetResourceManager()->GetNpad()->GetLastVibration(parameters.vibration_device_handle));
+    rb.PushRaw(GetResourceManager()->GetNpad()->GetLastVibration(
+        parameters.applet_resource_user_id, parameters.vibration_device_handle));
 }

 void IHidServer::CreateActiveVibrationDeviceList(HLERequestContext& ctx) {
@ -1580,7 +1642,8 @@ void IHidServer::SendVibrationValues(HLERequestContext& ctx) {
    auto vibration_values = std::span(
        reinterpret_cast<const Core::HID::VibrationValue*>(vibration_data.data()), vibration_count);

-    GetResourceManager()->GetNpad()->VibrateControllers(vibration_device_handles, vibration_values);
+    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);

@ -1634,8 +1697,8 @@ void IHidServer::SendVibrationGcErmCommand(HLERequestContext& ctx) {
        }
    }();

-    GetResourceManager()->GetNpad()->VibrateController(parameters.vibration_device_handle,
-                                                       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={}, "
@ -1659,8 +1722,8 @@ void IHidServer::GetActualVibrationGcErmCommand(HLERequestContext& ctx) {

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

-    const auto last_vibration =
-        GetResourceManager()->GetNpad()->GetLastVibration(parameters.vibration_device_handle);
+    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) {
@ -1732,7 +1795,7 @@ void IHidServer::IsVibrationDeviceMounted(HLERequestContext& ctx) {
    IPC::ResponseBuilder rb{ctx, 3};
    rb.Push(ResultSuccess);
    rb.Push(GetResourceManager()->GetNpad()->IsVibrationDeviceMounted(
-        parameters.vibration_device_handle));
+        parameters.applet_resource_user_id, parameters.vibration_device_handle));
 }

 void IHidServer::ActivateConsoleSixAxisSensor(HLERequestContext& ctx) {
@ -2315,10 +2378,10 @@ void IHidServer::SetNpadCommunicationMode(HLERequestContext& ctx) {
    const auto applet_resource_user_id{rp.Pop<u64>()};
    const auto communication_mode{rp.PopEnum<NpadCommunicationMode>()};

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

-    LOG_WARNING(Service_HID, "(STUBBED) called, applet_resource_user_id={}, communication_mode={}",
-                applet_resource_user_id, communication_mode);
+    // This function has been stubbed since 2.0.0+

    IPC::ResponseBuilder rb{ctx, 2};
    rb.Push(ResultSuccess);
@ -2326,12 +2389,15 @@ void IHidServer::SetNpadCommunicationMode(HLERequestContext& ctx) {

 void IHidServer::GetNpadCommunicationMode(HLERequestContext& ctx) {
    IPC::RequestParser rp{ctx};
+    const auto applet_resource_user_id{rp.Pop<u64>()};

-    LOG_WARNING(Service_HID, "(STUBBED) called");
+    LOG_DEBUG(Service_HID, "called, applet_resource_user_id={}", applet_resource_user_id);
+
+    // This function has been stubbed since 2.0.0+

    IPC::ResponseBuilder rb{ctx, 4};
    rb.Push(ResultSuccess);
-    rb.PushEnum(GetResourceManager()->GetNpad()->GetNpadCommunicationMode());
+    rb.PushEnum(NpadCommunicationMode::Default);
 }

 void IHidServer::SetTouchScreenConfiguration(HLERequestContext& ctx) {
--- a/src/core/hle/service/hid/hid_system_server.cpp
+++ b/src/core/hle/service/hid/hid_system_server.cpp
@ -240,9 +240,12 @@ IHidSystemServer::~IHidSystemServer() {
 };

 void IHidSystemServer::ApplyNpadSystemCommonPolicy(HLERequestContext& ctx) {
-    LOG_WARNING(Service_HID, "called");
+    IPC::RequestParser rp{ctx};
+    const auto applet_resource_user_id{rp.Pop<u64>()};

-    GetResourceManager()->GetNpad()->ApplyNpadSystemCommonPolicy();
+    LOG_INFO(Service_HID, "called, applet_resource_user_id={}", applet_resource_user_id);
+
+    GetResourceManager()->GetNpad()->ApplyNpadSystemCommonPolicy(applet_resource_user_id);

    IPC::ResponseBuilder rb{ctx, 2};
    rb.Push(ResultSuccess);
@ -271,9 +274,12 @@ void IHidSystemServer::GetLastActiveNpad(HLERequestContext& ctx) {
 }

 void IHidSystemServer::ApplyNpadSystemCommonPolicyFull(HLERequestContext& ctx) {
-    LOG_WARNING(Service_HID, "called");
+    IPC::RequestParser rp{ctx};
+    const auto applet_resource_user_id{rp.Pop<u64>()};

-    GetResourceManager()->GetNpad()->ApplyNpadSystemCommonPolicy();
+    LOG_INFO(Service_HID, "called, applet_resource_user_id={}", applet_resource_user_id);
+
+    GetResourceManager()->GetNpad()->ApplyNpadSystemCommonPolicyFull(applet_resource_user_id);

    IPC::ResponseBuilder rb{ctx, 2};
    rb.Push(ResultSuccess);
@ -298,28 +304,32 @@ void IHidSystemServer::GetNpadFullKeyGripColor(HLERequestContext& ctx) {

 void IHidSystemServer::GetMaskedSupportedNpadStyleSet(HLERequestContext& ctx) {
    IPC::RequestParser rp{ctx};
+    const auto applet_resource_user_id{rp.Pop<u64>()};

-    LOG_INFO(Service_HID, "(STUBBED) called");
+    LOG_INFO(Service_HID, "called, applet_resource_user_id={}", applet_resource_user_id);

-    Core::HID::NpadStyleSet supported_styleset =
-        GetResourceManager()->GetNpad()->GetSupportedStyleSet().raw;
+    Core::HID::NpadStyleSet supported_styleset{};
+    const auto& npad = GetResourceManager()->GetNpad();
+    const Result result =
+        npad->GetMaskedSupportedNpadStyleSet(applet_resource_user_id, supported_styleset);

    IPC::ResponseBuilder rb{ctx, 3};
-    rb.Push(ResultSuccess);
+    rb.Push(result);
    rb.PushEnum(supported_styleset);
 }

 void IHidSystemServer::SetSupportedNpadStyleSetAll(HLERequestContext& ctx) {
    IPC::RequestParser rp{ctx};
+    const auto applet_resource_user_id{rp.Pop<u64>()};

-    LOG_INFO(Service_HID, "(STUBBED) called");
+    LOG_DEBUG(Service_HID, "called, applet_resource_user_id={}", applet_resource_user_id);

-    Core::HID::NpadStyleSet supported_styleset =
-        GetResourceManager()->GetNpad()->GetSupportedStyleSet().raw;
+    const auto& npad = GetResourceManager()->GetNpad();
+    const auto result =
+        npad->SetSupportedNpadStyleSet(applet_resource_user_id, Core::HID::NpadStyleSet::All);

-    IPC::ResponseBuilder rb{ctx, 3};
-    rb.Push(ResultSuccess);
-    rb.PushEnum(supported_styleset);
+    IPC::ResponseBuilder rb{ctx, 2};
+    rb.Push(result);
 }

 void IHidSystemServer::GetAppletDetailedUiType(HLERequestContext& ctx) {
--- a/src/core/hle/service/hid/hid_util.h
+++ b/src/core/hle/service/hid/hid_util.h
@ -31,7 +31,7 @@ constexpr Result IsSixaxisHandleValid(const Core::HID::SixAxisSensorHandle& hand
    const bool device_index = handle.device_index < Core::HID::DeviceIndex::MaxDeviceIndex;

    if (!npad_id) {
-        return InvalidNpadId;
+        return ResultInvalidNpadId;
    }
    if (!device_index) {
        return NpadDeviceIndexOutOfRange;
@ -54,15 +54,15 @@ constexpr Result IsVibrationHandleValid(const Core::HID::VibrationDeviceHandle&
        // These support vibration
        break;
    default:
-        return VibrationInvalidStyleIndex;
+        return ResultVibrationInvalidStyleIndex;
    }

    if (!IsNpadIdValid(static_cast<Core::HID::NpadIdType>(handle.npad_id))) {
-        return VibrationInvalidNpadId;
+        return ResultVibrationInvalidNpadId;
    }

    if (handle.device_index >= Core::HID::DeviceIndex::MaxDeviceIndex) {
-        return VibrationDeviceIndexOutOfRange;
+        return ResultVibrationDeviceIndexOutOfRange;
    }

    return ResultSuccess;
--- a/src/core/hle/service/hid/irs.cpp
+++ b/src/core/hle/service/hid/irs.cpp
@ -315,7 +315,7 @@ void IRS::GetNpadIrCameraHandle(HLERequestContext& ctx) {
    if (npad_id > Core::HID::NpadIdType::Player8 && npad_id != Core::HID::NpadIdType::Invalid &&
        npad_id != Core::HID::NpadIdType::Handheld) {
        IPC::ResponseBuilder rb{ctx, 2};
-        rb.Push(Service::HID::InvalidNpadId);
+        rb.Push(Service::HID::ResultInvalidNpadId);
        return;
    }

--- a/src/core/hle/service/hid/resource_manager.cpp
+++ b/src/core/hle/service/hid/resource_manager.cpp
@ -129,12 +129,12 @@ std::shared_ptr<UniquePad> ResourceManager::GetUniquePad() const {
 }

 Result ResourceManager::CreateAppletResource(u64 aruid) {
-    if (aruid == 0) {
+    if (aruid == SystemAruid) {
        const auto result = RegisterCoreAppletResource();
        if (result.IsError()) {
            return result;
        }
-        return GetNpad()->Activate();
+        return GetNpad()->ActivateNpadResource();
    }

    const auto result = CreateAppletResourceImpl(aruid);
@ -147,7 +147,7 @@ Result ResourceManager::CreateAppletResource(u64 aruid) {
    six_axis->Activate();
    touch_screen->Activate();

-    return GetNpad()->Activate(aruid);
+    return GetNpad()->ActivateNpadResource(aruid);
 }

 Result ResourceManager::CreateAppletResourceImpl(u64 aruid) {
@ -171,31 +171,31 @@ void ResourceManager::InitializeHidCommonSampler() {
    palma = std::make_shared<Palma>(system.HIDCore(), service_context);
    six_axis = std::make_shared<SixAxis>(system.HIDCore(), npad);

-    debug_pad->SetAppletResource(applet_resource);
-    digitizer->SetAppletResource(applet_resource);
-    keyboard->SetAppletResource(applet_resource);
-    npad->SetAppletResource(applet_resource);
-    six_axis->SetAppletResource(applet_resource);
-    mouse->SetAppletResource(applet_resource);
-    debug_mouse->SetAppletResource(applet_resource);
-    home_button->SetAppletResource(applet_resource);
-    sleep_button->SetAppletResource(applet_resource);
-    capture_button->SetAppletResource(applet_resource);
+    debug_pad->SetAppletResource(applet_resource, &shared_mutex);
+    digitizer->SetAppletResource(applet_resource, &shared_mutex);
+    keyboard->SetAppletResource(applet_resource, &shared_mutex);
+    npad->SetNpadExternals(applet_resource, &shared_mutex);
+    six_axis->SetAppletResource(applet_resource, &shared_mutex);
+    mouse->SetAppletResource(applet_resource, &shared_mutex);
+    debug_mouse->SetAppletResource(applet_resource, &shared_mutex);
+    home_button->SetAppletResource(applet_resource, &shared_mutex);
+    sleep_button->SetAppletResource(applet_resource, &shared_mutex);
+    capture_button->SetAppletResource(applet_resource, &shared_mutex);
 }

 void ResourceManager::InitializeTouchScreenSampler() {
    gesture = std::make_shared<Gesture>(system.HIDCore());
    touch_screen = std::make_shared<TouchScreen>(system.HIDCore());

-    touch_screen->SetAppletResource(applet_resource);
-    gesture->SetAppletResource(applet_resource);
+    touch_screen->SetAppletResource(applet_resource, &shared_mutex);
+    gesture->SetAppletResource(applet_resource, &shared_mutex);
 }

 void ResourceManager::InitializeConsoleSixAxisSampler() {
    console_six_axis = std::make_shared<ConsoleSixAxis>(system.HIDCore());
    seven_six_axis = std::make_shared<SevenSixAxis>(system);

-    console_six_axis->SetAppletResource(applet_resource);
+    console_six_axis->SetAppletResource(applet_resource, &shared_mutex);
 }

 void ResourceManager::InitializeAHidSampler() {
@ -214,7 +214,11 @@ Result ResourceManager::UnregisterCoreAppletResource() {

 Result ResourceManager::RegisterAppletResourceUserId(u64 aruid, bool bool_value) {
    std::scoped_lock lock{shared_mutex};
-    return applet_resource->RegisterAppletResourceUserId(aruid, bool_value);
+    auto result = applet_resource->RegisterAppletResourceUserId(aruid, bool_value);
+    if (result.IsSuccess()) {
+        result = npad->RegisterAppletResourceUserId(aruid);
+    }
+    return result;
 }

 void ResourceManager::UnregisterAppletResourceUserId(u64 aruid) {
--- a/src/core/hle/service/hid/resource_manager.h
+++ b/src/core/hle/service/hid/resource_manager.h
@ -93,7 +93,7 @@ private:

    bool is_initialized{false};

-    mutable std::mutex shared_mutex;
+    mutable std::recursive_mutex shared_mutex;
    std::shared_ptr<AppletResource> applet_resource = nullptr;

    std::shared_ptr<CaptureButton> capture_button = nullptr;
--- a/src/frontend_common/config.cpp
+++ b/src/frontend_common/config.cpp
@ -762,17 +762,6 @@ void Config::WriteBooleanSetting(const std::string& key, const bool& value,
    WritePreparedSetting(key, AdjustOutputString(ToString(value)), string_default, use_global);
 }

-template <typename T>
-std::enable_if_t<std::is_integral_v<T>> Config::WriteIntegerSetting(
-    const std::string& key, const T& value, const std::optional<T>& default_value,
-    const std::optional<bool>& use_global) {
-    std::optional<std::string> string_default = std::nullopt;
-    if (default_value.has_value()) {
-        string_default = std::make_optional(ToString(default_value.value()));
-    }
-    WritePreparedSetting(key, AdjustOutputString(ToString(value)), string_default, use_global);
-}
-
 void Config::WriteDoubleSetting(const std::string& key, const double& value,
                                const std::optional<double>& default_value,
                                const std::optional<bool>& use_global) {
@ -894,9 +883,10 @@ void Config::WriteSettingGeneric(const Settings::BasicSetting* const setting) {
            WriteBooleanSetting(std::string(key).append("\\use_global"), setting->UsingGlobal());
        }
        if (global || !setting->UsingGlobal()) {
+            auto value = global ? setting->ToStringGlobal() : setting->ToString();
            WriteBooleanSetting(std::string(key).append("\\default"),
-                                setting->ToString() == setting->DefaultToString());
-            WriteStringSetting(key, setting->ToString());
+                                value == setting->DefaultToString());
+            WriteStringSetting(key, value);
        }
    } else if (global) {
        WriteBooleanSetting(std::string(key).append("\\default"),
--- a/src/frontend_common/config.h
+++ b/src/frontend_common/config.h
@ -157,17 +157,23 @@ protected:
    void WriteBooleanSetting(const std::string& key, const bool& value,
                             const std::optional<bool>& default_value = std::nullopt,
                             const std::optional<bool>& use_global = std::nullopt);
-    template <typename T>
-    std::enable_if_t<std::is_integral_v<T>> WriteIntegerSetting(
-        const std::string& key, const T& value,
-        const std::optional<T>& default_value = std::nullopt,
-        const std::optional<bool>& use_global = std::nullopt);
    void WriteDoubleSetting(const std::string& key, const double& value,
                            const std::optional<double>& default_value = std::nullopt,
                            const std::optional<bool>& use_global = std::nullopt);
    void WriteStringSetting(const std::string& key, const std::string& value,
                            const std::optional<std::string>& default_value = std::nullopt,
                            const std::optional<bool>& use_global = std::nullopt);
+    template <typename T>
+    std::enable_if_t<std::is_integral_v<T>> WriteIntegerSetting(
+        const std::string& key, const T& value,
+        const std::optional<T>& default_value = std::nullopt,
+        const std::optional<bool>& use_global = std::nullopt) {
+        std::optional<std::string> string_default = std::nullopt;
+        if (default_value.has_value()) {
+            string_default = std::make_optional(ToString(default_value.value()));
+        }
+        WritePreparedSetting(key, AdjustOutputString(ToString(value)), string_default, use_global);
+    }

    void ReadCategory(Settings::Category category);
    void WriteCategory(Settings::Category category);
--- a/src/shader_recompiler/backend/glsl/emit_glsl_image.cpp
+++ b/src/shader_recompiler/backend/glsl/emit_glsl_image.cpp
@ -449,7 +449,7 @@ void EmitImageGatherDref(EmitContext& ctx, IR::Inst& inst, const IR::Value& inde
 }

 void EmitImageFetch(EmitContext& ctx, IR::Inst& inst, const IR::Value& index,
-                    std::string_view coords, std::string_view offset, std::string_view lod,
+                    std::string_view coords, const IR::Value& offset, std::string_view lod,
                    std::string_view ms) {
    const auto info{inst.Flags<IR::TextureInstInfo>()};
    if (info.has_bias) {
@ -470,9 +470,9 @@ void EmitImageFetch(EmitContext& ctx, IR::Inst& inst, const IR::Value& index,
        const auto int_coords{CoordsCastToInt(coords, info)};
        if (!ms.empty()) {
            ctx.Add("{}=texelFetch({},{},int({}));", texel, texture, int_coords, ms);
-        } else if (!offset.empty()) {
+        } else if (!offset.IsEmpty()) {
            ctx.Add("{}=texelFetchOffset({},{},int({}),{});", texel, texture, int_coords, lod,
-                    CoordsCastToInt(offset, info));
+                    GetOffsetVec(ctx, offset));
        } else {
            if (info.type == TextureType::Buffer) {
                ctx.Add("{}=texelFetch({},int({}));", texel, texture, coords);
@ -485,10 +485,10 @@ void EmitImageFetch(EmitContext& ctx, IR::Inst& inst, const IR::Value& index,
    if (!ms.empty()) {
        throw NotImplementedException("EmitImageFetch Sparse MSAA samples");
    }
-    if (!offset.empty()) {
+    if (!offset.IsEmpty()) {
        ctx.AddU1("{}=sparseTexelsResidentARB(sparseTexelFetchOffsetARB({},{},int({}),{},{}));",
-                  *sparse_inst, texture, CastToIntVec(coords, info), lod,
-                  CastToIntVec(offset, info), texel);
+                  *sparse_inst, texture, CastToIntVec(coords, info), lod, GetOffsetVec(ctx, offset),
+                  texel);
    } else {
        ctx.AddU1("{}=sparseTexelsResidentARB(sparseTexelFetchARB({},{},int({}),{}));",
                  *sparse_inst, texture, CastToIntVec(coords, info), lod, texel);
--- a/src/shader_recompiler/backend/glsl/emit_glsl_instructions.h
+++ b/src/shader_recompiler/backend/glsl/emit_glsl_instructions.h
@ -651,7 +651,7 @@ void EmitImageGatherDref(EmitContext& ctx, IR::Inst& inst, const IR::Value& inde
                         std::string_view coords, const IR::Value& offset, const IR::Value& offset2,
                         std::string_view dref);
 void EmitImageFetch(EmitContext& ctx, IR::Inst& inst, const IR::Value& index,
-                    std::string_view coords, std::string_view offset, std::string_view lod,
+                    std::string_view coords, const IR::Value& offset, std::string_view lod,
                    std::string_view ms);
 void EmitImageQueryDimensions(EmitContext& ctx, IR::Inst& inst, const IR::Value& index,
                              std::string_view lod, const IR::Value& skip_mips);
--- a/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp
+++ b/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp
@ -1440,7 +1440,7 @@ void EmitContext::DefineInputs(const IR::Program& program) {
        if (profile.support_vertex_instance_id) {
            instance_id = DefineInput(*this, U32[1], true, spv::BuiltIn::InstanceId);
            if (loads[IR::Attribute::BaseInstance]) {
-                base_instance = DefineInput(*this, U32[1], true, spv::BuiltIn::BaseVertex);
+                base_instance = DefineInput(*this, U32[1], true, spv::BuiltIn::BaseInstance);
            }
        } else {
            instance_index = DefineInput(*this, U32[1], true, spv::BuiltIn::InstanceIndex);
--- a/src/video_core/renderer_opengl/gl_device.cpp
+++ b/src/video_core/renderer_opengl/gl_device.cpp
@ -195,9 +195,9 @@ Device::Device(Core::Frontend::EmuWindow& emu_window) {
    has_texture_shadow_lod = HasExtension(extensions, "GL_EXT_texture_shadow_lod");
    has_astc = !has_slow_software_astc && IsASTCSupported();
    has_variable_aoffi = TestVariableAoffi();
-    has_component_indexing_bug = is_amd;
+    has_component_indexing_bug = false;
    has_precise_bug = TestPreciseBug();
-    has_broken_texture_view_formats = is_amd || (!is_linux && is_intel);
+    has_broken_texture_view_formats = (!is_linux && is_intel);
    has_nv_viewport_array2 = GLAD_GL_NV_viewport_array2;
    has_derivative_control = GLAD_GL_ARB_derivative_control;
    has_vertex_buffer_unified_memory = GLAD_GL_NV_vertex_buffer_unified_memory;
@ -238,10 +238,11 @@ Device::Device(Core::Frontend::EmuWindow& emu_window) {
    has_lmem_perf_bug = is_nvidia;

    strict_context_required = emu_window.StrictContextRequired();
-    // Blocks AMD and Intel OpenGL drivers on Windows from using asynchronous shader compilation.
+    // Blocks Intel OpenGL drivers on Windows from using asynchronous shader compilation.
    // Blocks EGL on Wayland from using asynchronous shader compilation.
-    use_asynchronous_shaders = Settings::values.use_asynchronous_shaders.GetValue() &&
-                               !(is_amd || (is_intel && !is_linux)) && !strict_context_required;
+    const bool blacklist_async_shaders = (is_intel && !is_linux) || strict_context_required;
+    use_asynchronous_shaders =
+        Settings::values.use_asynchronous_shaders.GetValue() && !blacklist_async_shaders;
    use_driver_cache = is_nvidia;
    supports_conditional_barriers = !is_intel;

--- a/src/yuzu/configuration/shared_translation.cpp
+++ b/src/yuzu/configuration/shared_translation.cpp
@ -228,7 +228,7 @@ std::unique_ptr<ComboboxTranslationMap> ComboboxEnumeration(QWidget* parent) {
         {
             PAIR(ShaderBackend, Glsl, tr("GLSL")),
             PAIR(ShaderBackend, Glasm, tr("GLASM (Assembly Shaders, NVIDIA Only)")),
-             PAIR(ShaderBackend, SpirV, tr("SPIR-V (Experimental, Mesa Only)")),
+             PAIR(ShaderBackend, SpirV, tr("SPIR-V (Experimental, AMD/Mesa Only)")),
         }});
    translations->insert({Settings::EnumMetadata<Settings::GpuAccuracy>::Index(),
                          {
Author	SHA1	Message	Date
yuzubot	4634c092d1	Android 182	2024-01-04 21:22:55 +00:00
yuzubot	8b27dd4442	Merge yuzu-emu#12576	2024-01-04 21:22:54 +00:00
yuzubot	797970093f	Merge yuzu-emu#12560	2024-01-04 21:22:54 +00:00
liamwhite	92a331af76	Merge pull request #12437 from ameerj/gl-amd-fixes OpenGL: Fixes and workaround updates for AMD	2024-01-04 15:53:44 -05:00
liamwhite	a8f62bff43	Merge pull request #12575 from t895/inconsistent-settings-application frontend_common: config: Only write setting related to opened config file	2024-01-04 15:51:24 -05:00
liamwhite	519904e8a8	Merge pull request #12571 from t895/apply-orientation-on-start android: Expose more orientation options	2024-01-04 15:51:08 -05:00
liamwhite	8d3463dbdd	Merge pull request #12570 from t895/generic-config-pain frontend_common: config: Move WriteIntegerSetting definition to header	2024-01-04 15:51:00 -05:00
liamwhite	b125cb97a2	Merge pull request #12568 from t895/actions-button actions: android: Allow for manually triggering Android builds	2024-01-04 15:50:54 -05:00
liamwhite	d7e7a69e00	Merge pull request #12558 from t895/zip-storage-method android: Disable compression for zip exports	2024-01-04 15:50:47 -05:00
liamwhite	246cffb624	Merge pull request #12557 from merryhime/termination-ipi KThread: Send termination interrupt to all cores a thread has affinity to	2024-01-04 15:50:40 -05:00
liamwhite	0e93cad4f0	Merge pull request #12549 from german77/npadresource service: hid: Implement NpadResource and NpadData	2024-01-04 15:50:33 -05:00
t895	39d28a5131	android: Save global config synchronously in onCloseGameFoldersFragment Could cause multiple global saves at once that went untracked previously	2024-01-03 22:50:21 -05:00
t895	fa04dea7c4	frontend_common: config: Only write setting related to opened config file If we tried to write a switchable setting to config that was not using global in the global config instance, we could write the per-game setting accidentally. This ensures that we always use the global setting for global config and the currently applied setting for custom config.	2024-01-03 22:49:41 -05:00
t895	1c278974a8	android: Don't save settings on config destruction Android doesn't have a proper way of destroying its config object so it's best to stick to the built-in methods to control saving config	2024-01-03 22:12:15 -05:00
t895	2b838b6d06	android: Update orientation on emulation fragment start	2024-01-03 21:35:45 -05:00
t895	82ea082997	android: Expose all orientation locking options	2024-01-03 21:35:45 -05:00
Narr the Reg	5562322290	service: hid: Remove data races when handling shared memory	2024-01-03 20:21:16 -06:00
Narr the Reg	6a244465ce	service: hid: Implement NpadResource and NpadData	2024-01-03 20:21:14 -06:00
t895	bdf87ba0f8	frontend_common: config: Move WriteIntegerSetting definition to header Fixes a compiler error where the compiler could not see the definition of the method in qt_config and others.	2024-01-03 17:57:20 -05:00
t895	3b314a68a1	actions: android: Prevent resolving tag commit to PR link	2024-01-03 17:01:31 -05:00
t895	06c68fb196	actions: android: Resolve PR commits to link	2024-01-03 17:00:49 -05:00
t895	9a31122c82	actions: android: Move trigger logic to be yuzu-android specific	2024-01-03 03:15:07 -05:00
t895	dace726d08	android: Add internal option to disable compression for zip exports Disables compression for user data and save exports	2024-01-02 18:11:22 -05:00
Merry	0f7fc94111	KThread: Send termination interrupt to all cores a thread has affinity to KThread::RequestTerminate may run from a thread which is not the CurrentCore, and thus masking this out is erroneous.	2024-01-02 21:34:34 +00:00
Ameer J	139b4cc9ea	Settings: Indicate AMD's compatibility with SPIR-V on OGL	2023-12-21 22:00:49 -05:00
Ameer J	d5d0d2cb0e	spirv_emit_context: Fix BaseInstance for OGL spirv	2023-12-21 21:53:24 -05:00
Ameer J	a5b2b8b91b	emit_glsl_image: Use inlined texelFetch offsets	2023-12-20 19:24:11 -05:00
Ameer J	b4b301d22e	gl_device: Remove AMD blacklists that are no longer applicable	2023-12-20 18:19:15 -05:00