summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Narr the Reg2023-12-01 14:21:55 -0600
committerGravatar Narr the Reg2023-12-01 14:21:55 -0600
commite40a2d2fd26df45878be8ca02dcd6a30054fbbaa (patch)
tree4982cbf9c8ded78186aa99f27c929c8fbdfdefab
parentMerge pull request #12223 from liamwhite/fruit-company (diff)
downloadyuzu-e40a2d2fd26df45878be8ca02dcd6a30054fbbaa.tar.gz
yuzu-e40a2d2fd26df45878be8ca02dcd6a30054fbbaa.tar.xz
yuzu-e40a2d2fd26df45878be8ca02dcd6a30054fbbaa.zip
service: nfc: Don't tag amiibos as corrupted if they are loaded as read only
-rw-r--r--src/core/hle/service/nfc/common/device.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/hle/service/nfc/common/device.cpp b/src/core/hle/service/nfc/common/device.cpp
index 47516f883..f97e5b44c 100644
--- a/src/core/hle/service/nfc/common/device.cpp
+++ b/src/core/hle/service/nfc/common/device.cpp
@@ -438,16 +438,16 @@ Result NfcDevice::Mount(NFP::ModelType model_type, NFP::MountTarget mount_target
438 is_corrupted = true; 438 is_corrupted = true;
439 } 439 }
440 440
441 if (!is_corrupted) { 441 device_state = DeviceState::TagMounted;
442 mount_target = mount_target_;
443
444 if (!is_corrupted && mount_target != NFP::MountTarget::Rom) {
442 std::vector<u8> data(sizeof(NFP::EncryptedNTAG215File)); 445 std::vector<u8> data(sizeof(NFP::EncryptedNTAG215File));
443 memcpy(data.data(), &encrypted_tag_data, sizeof(encrypted_tag_data)); 446 memcpy(data.data(), &encrypted_tag_data, sizeof(encrypted_tag_data));
444 WriteBackupData(encrypted_tag_data.uuid, data); 447 WriteBackupData(encrypted_tag_data.uuid, data);
445 } 448 }
446 449
447 device_state = DeviceState::TagMounted; 450 if (is_corrupted && mount_target != NFP::MountTarget::Rom) {
448 mount_target = mount_target_;
449
450 if (is_corrupted) {
451 bool has_backup = HasBackup(encrypted_tag_data.uuid).IsSuccess(); 451 bool has_backup = HasBackup(encrypted_tag_data.uuid).IsSuccess();
452 return has_backup ? ResultCorruptedDataWithBackup : ResultCorruptedData; 452 return has_backup ? ResultCorruptedDataWithBackup : ResultCorruptedData;
453 } 453 }