diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-10-02 01:24:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-02 01:24:46 +0200 |
| commit | 99e2568304cc008213b30677eade0522b49f8a92 (patch) | |
| tree | 222e308f4b1a3edb95db47df9ab11a3ee051e453 /src/core/hle/service/nfc/common/device.cpp | |
| parent | Merge pull request #11646 from FernandoS27/stop-ignoring-your-mental-health (diff) | |
| parent | service: nfc: Implement SetRegisterInfoPrivate mii support (diff) | |
| download | yuzu-99e2568304cc008213b30677eade0522b49f8a92.tar yuzu-99e2568304cc008213b30677eade0522b49f8a92.tar.gz yuzu-99e2568304cc008213b30677eade0522b49f8a92.tar.bz2 yuzu-99e2568304cc008213b30677eade0522b49f8a92.tar.lz yuzu-99e2568304cc008213b30677eade0522b49f8a92.tar.xz yuzu-99e2568304cc008213b30677eade0522b49f8a92.tar.zst yuzu-99e2568304cc008213b30677eade0522b49f8a92.zip | |
Diffstat (limited to 'src/core/hle/service/nfc/common/device.cpp')
| -rw-r--r-- | src/core/hle/service/nfc/common/device.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/core/hle/service/nfc/common/device.cpp b/src/core/hle/service/nfc/common/device.cpp index 68c407f81..e7a00deb3 100644 --- a/src/core/hle/service/nfc/common/device.cpp +++ b/src/core/hle/service/nfc/common/device.cpp @@ -830,11 +830,6 @@ Result NfcDevice::SetRegisterInfoPrivate(const NFP::RegisterInfoPrivate& registe return ResultWrongDeviceState; } - Service::Mii::StoreData store_data{}; - Service::Mii::NfpStoreDataExtension extension{}; - store_data.BuildBase(Mii::Gender::Male); - extension.SetFromStoreData(store_data); - auto& settings = tag_data.settings; if (tag_data.settings.settings.amiibo_initialized == 0) { @@ -843,8 +838,8 @@ Result NfcDevice::SetRegisterInfoPrivate(const NFP::RegisterInfoPrivate& registe } SetAmiiboName(settings, register_info.amiibo_name); - tag_data.owner_mii.BuildFromStoreData(store_data); - tag_data.mii_extension = extension; + tag_data.owner_mii.BuildFromStoreData(register_info.mii_store_data); + tag_data.mii_extension.SetFromStoreData(register_info.mii_store_data); tag_data.unknown = 0; tag_data.unknown2 = {}; settings.country_code_id = 0; |