summaryrefslogtreecommitdiff
path: root/src/core/hle/service/nfc
diff options
context:
space:
mode:
authorGravatar german772023-09-11 00:58:46 -0600
committerGravatar german772023-09-11 00:58:46 -0600
commitbd169f417f471f574784fa3b499f57ad42cf1013 (patch)
tree5671f7c85a1f69d2dad2eb895878c0981d205ad7 /src/core/hle/service/nfc
parentservice: mii: Fix ver3 inconsistencies (diff)
downloadyuzu-bd169f417f471f574784fa3b499f57ad42cf1013.tar.gz
yuzu-bd169f417f471f574784fa3b499f57ad42cf1013.tar.xz
yuzu-bd169f417f471f574784fa3b499f57ad42cf1013.zip
mii: Prepare Interface for new implementation
Diffstat (limited to 'src/core/hle/service/nfc')
-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 {
680 return ResultRegistrationIsNotInitialized; 680 return ResultRegistrationIsNotInitialized;
681 } 681 }
682 682
683 Service::Mii::MiiManager manager; 683 Mii::CharInfo char_info{};
684 Mii::StoreData store_data{};
685 tag_data.owner_mii.BuildToStoreData(store_data);
686 char_info.SetFromStoreData(store_data);
687
684 const auto& settings = tag_data.settings; 688 const auto& settings = tag_data.settings;
685 689
686 // TODO: Validate this data 690 // TODO: Validate this data
687 register_info = { 691 register_info = {
688 .mii_char_info = manager.ConvertV3ToCharInfo(tag_data.owner_mii), 692 .mii_char_info = char_info,
689 .creation_date = settings.init_date.GetWriteDate(), 693 .creation_date = settings.init_date.GetWriteDate(),
690 .amiibo_name = GetAmiiboName(settings), 694 .amiibo_name = GetAmiiboName(settings),
691 .font_region = settings.settings.font_region, 695 .font_region = settings.settings.font_region,