From 6051c3555370594cb8735818c6c7c839c9d1e35c Mon Sep 17 00:00:00 2001 From: Jacobwasbeast Date: Thu, 5 Dec 2024 02:38:30 -0600 Subject: [PATCH] Added nickname support --- .../HOS/Services/Nfc/AmiiboDecryption/AmiiboBinReader.cs | 2 +- src/Ryujinx.HLE/HOS/Services/Nfc/Nfp/VirtualAmiibo.cs | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Ryujinx.HLE/HOS/Services/Nfc/AmiiboDecryption/AmiiboBinReader.cs b/src/Ryujinx.HLE/HOS/Services/Nfc/AmiiboDecryption/AmiiboBinReader.cs index 9744f5c36..a2664a2b6 100644 --- a/src/Ryujinx.HLE/HOS/Services/Nfc/AmiiboDecryption/AmiiboBinReader.cs +++ b/src/Ryujinx.HLE/HOS/Services/Nfc/AmiiboDecryption/AmiiboBinReader.cs @@ -145,7 +145,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.AmiiboDecryption { VirtualAmiibo.applicationBytes = applicationAreas; } - + VirtualAmiibo.nickName = nickName; return virtualAmiiboFile; } public static bool SaveBinFile(string inputFile, byte[] appData) diff --git a/src/Ryujinx.HLE/HOS/Services/Nfc/Nfp/VirtualAmiibo.cs b/src/Ryujinx.HLE/HOS/Services/Nfc/Nfp/VirtualAmiibo.cs index 3bbbf122f..ac9eef5e9 100644 --- a/src/Ryujinx.HLE/HOS/Services/Nfc/Nfp/VirtualAmiibo.cs +++ b/src/Ryujinx.HLE/HOS/Services/Nfc/Nfp/VirtualAmiibo.cs @@ -17,6 +17,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp public static uint _openedApplicationAreaId; public static byte[] applicationBytes = new byte[0]; public static string inputBin = string.Empty; + public static string nickName = string.Empty; private static readonly AmiiboJsonSerializerContext _serializerContext = AmiiboJsonSerializerContext.Default; public static byte[] GenerateUuid(string amiiboId, bool useRandomUuid) { @@ -69,6 +70,11 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp { VirtualAmiiboFile amiiboFile = LoadAmiiboFile(amiiboId); string nickname = amiiboFile.NickName ?? "Ryujinx"; + if (nickName != string.Empty) + { + nickname = nickName; + nickName = string.Empty; + } UtilityImpl utilityImpl = new(tickSource); CharInfo charInfo = new();