From 9cd5c44019fca1c4122cdd39a3cfb0b8f82e6790 Mon Sep 17 00:00:00 2001
From: Narr the Reg <juangerman-13@hotmail.com>
Date: Fri, 29 Sep 2023 00:27:50 -0600
Subject: [PATCH] service: nfc: Implement SetRegisterInfoPrivate mii support
---
src/core/hle/service/nfc/common/device.cpp | 9 ++-------
1 file 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 68c407f810..e7a00deb38 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;