|
@@ -64,16 +64,17 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp
|
|
|
};
|
|
};
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- public static RegisterInfo GetRegisterInfo(ITickSource tickSource, string amiiboId, string nickname)
|
|
|
|
|
|
|
+ public static RegisterInfo GetRegisterInfo(ITickSource tickSource, string amiiboId, string userName)
|
|
|
{
|
|
{
|
|
|
VirtualAmiiboFile amiiboFile = LoadAmiiboFile(amiiboId);
|
|
VirtualAmiiboFile amiiboFile = LoadAmiiboFile(amiiboId);
|
|
|
-
|
|
|
|
|
|
|
+ string nickname = amiiboFile.NickName ?? "Ryujinx";
|
|
|
UtilityImpl utilityImpl = new(tickSource);
|
|
UtilityImpl utilityImpl = new(tickSource);
|
|
|
CharInfo charInfo = new();
|
|
CharInfo charInfo = new();
|
|
|
|
|
|
|
|
charInfo.SetFromStoreData(StoreData.BuildDefault(utilityImpl, 0));
|
|
charInfo.SetFromStoreData(StoreData.BuildDefault(utilityImpl, 0));
|
|
|
|
|
|
|
|
- charInfo.Nickname = Nickname.FromString(nickname);
|
|
|
|
|
|
|
+ // This is the player's name
|
|
|
|
|
+ charInfo.Nickname = Nickname.FromString(userName);
|
|
|
|
|
|
|
|
RegisterInfo registerInfo = new()
|
|
RegisterInfo registerInfo = new()
|
|
|
{
|
|
{
|
|
@@ -85,7 +86,9 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp
|
|
|
Reserved1 = new Array64<byte>(),
|
|
Reserved1 = new Array64<byte>(),
|
|
|
Reserved2 = new Array58<byte>(),
|
|
Reserved2 = new Array58<byte>(),
|
|
|
};
|
|
};
|
|
|
- "Ryujinx"u8.CopyTo(registerInfo.Nickname.AsSpan());
|
|
|
|
|
|
|
+ // This is the amiibo's name
|
|
|
|
|
+ byte[] nicknameBytes = System.Text.Encoding.UTF8.GetBytes(nickname);
|
|
|
|
|
+ nicknameBytes.CopyTo(registerInfo.Nickname.AsSpan());
|
|
|
|
|
|
|
|
return registerInfo;
|
|
return registerInfo;
|
|
|
}
|
|
}
|