From 3af1a2e033339485010f43cba32e0a9eac9bf224 Mon Sep 17 00:00:00 2001 From: Jacobwasbeast Date: Mon, 23 Dec 2024 10:52:02 -0600 Subject: [PATCH] Temp Fix To Load Miis --- .../HOS/Services/Nfc/AmiiboDecryption/CharInfoBin.cs | 9 +++------ .../Nfc/AmiiboDecryption/VirtualAmiiboBinFile.cs | 5 ++++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Ryujinx.HLE/HOS/Services/Nfc/AmiiboDecryption/CharInfoBin.cs b/src/Ryujinx.HLE/HOS/Services/Nfc/AmiiboDecryption/CharInfoBin.cs index 9c3e53519..5d919cd6b 100644 --- a/src/Ryujinx.HLE/HOS/Services/Nfc/AmiiboDecryption/CharInfoBin.cs +++ b/src/Ryujinx.HLE/HOS/Services/Nfc/AmiiboDecryption/CharInfoBin.cs @@ -206,13 +206,10 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.AmiiboDecryption return Encoding.Unicode.GetString(data, offset, length * 2); } - public CharInfo ConvertToCharInfo() + public CharInfo ConvertToCharInfo(CharInfo Info) { - CharInfo Info = new CharInfo(); - UInt128 CreateId = BitConverter.ToUInt128(CreateID, 0); - Info.CreateId = new CreateId(CreateId); - Info.Build = 64; - Info.Type = 0; + //UInt128 CreateId = BitConverter.ToUInt128(CreateID, 0); + //Info.CreateId = new CreateId(CreateId); Info.Nickname = Nickname.FromString(MiiName); Info.FavoriteColor = (byte)FavoriteColor; Info.Gender = IsMale ? Gender.Male : Gender.Female; diff --git a/src/Ryujinx.HLE/HOS/Services/Nfc/AmiiboDecryption/VirtualAmiiboBinFile.cs b/src/Ryujinx.HLE/HOS/Services/Nfc/AmiiboDecryption/VirtualAmiiboBinFile.cs index 2ab294d45..83a5697cd 100644 --- a/src/Ryujinx.HLE/HOS/Services/Nfc/AmiiboDecryption/VirtualAmiiboBinFile.cs +++ b/src/Ryujinx.HLE/HOS/Services/Nfc/AmiiboDecryption/VirtualAmiiboBinFile.cs @@ -35,7 +35,10 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.AmiiboDecryption byte[] newMiiBytes = new byte[92]; Array.Copy(MiiBytes, 0, newMiiBytes, 0, 92); CharInfoBin charInfoBin = CharInfoBin.Parse(newMiiBytes); - CharInfo charInfo = charInfoBin.ConvertToCharInfo(); + UtilityImpl utilityImpl = new UtilityImpl(tickSource); + CharInfo Info = new(); + Info.SetFromStoreData(StoreData.BuildDefault(utilityImpl, 0)); + CharInfo charInfo = charInfoBin.ConvertToCharInfo(Info); info.MiiCharInfo = charInfo; return info; }