summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service/nfc/common
diff options
context:
space:
mode:
authorgerman77 <juangerman-13@hotmail.com>2023-09-11 08:58:46 +0200
committergerman77 <juangerman-13@hotmail.com>2023-09-11 08:58:46 +0200
commitbd169f417f471f574784fa3b499f57ad42cf1013 (patch)
tree5671f7c85a1f69d2dad2eb895878c0981d205ad7 /src/core/hle/service/nfc/common
parentservice: mii: Fix ver3 inconsistencies (diff)
downloadyuzu-bd169f417f471f574784fa3b499f57ad42cf1013.tar
yuzu-bd169f417f471f574784fa3b499f57ad42cf1013.tar.gz
yuzu-bd169f417f471f574784fa3b499f57ad42cf1013.tar.bz2
yuzu-bd169f417f471f574784fa3b499f57ad42cf1013.tar.lz
yuzu-bd169f417f471f574784fa3b499f57ad42cf1013.tar.xz
yuzu-bd169f417f471f574784fa3b499f57ad42cf1013.tar.zst
yuzu-bd169f417f471f574784fa3b499f57ad42cf1013.zip
Diffstat (limited to 'src/core/hle/service/nfc/common')
-rw-r--r--src/core/hle/service/nfc/common/device.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/core/hle/service/nfc/common/device.cpp b/src/core/hle/service/nfc/common/device.cpp
index eb7706015..5dda12343 100644
--- a/src/core/hle/service/nfc/common/device.cpp
+++ b/src/core/hle/service/nfc/common/device.cpp
@@ -680,12 +680,16 @@ Result NfcDevice::GetRegisterInfo(NFP::RegisterInfo& register_info) const {
return ResultRegistrationIsNotInitialized;
}
- Service::Mii::MiiManager manager;
+ Mii::CharInfo char_info{};
+ Mii::StoreData store_data{};
+ tag_data.owner_mii.BuildToStoreData(store_data);
+ char_info.SetFromStoreData(store_data);
+
const auto& settings = tag_data.settings;
// TODO: Validate this data
register_info = {
- .mii_char_info = manager.ConvertV3ToCharInfo(tag_data.owner_mii),
+ .mii_char_info = char_info,
.creation_date = settings.init_date.GetWriteDate(),
.amiibo_name = GetAmiiboName(settings),
.font_region = settings.settings.font_region,