From 582c8a96bc603ed1b82e9d2047641528a57e8338 Mon Sep 17 00:00:00 2001 From: Kamron Batman Date: Mon, 6 Mar 2017 21:59:37 -0800 Subject: [PATCH] Fixes gen 3 egg name and language. --- PKHeX/PKM/PK3.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PKHeX/PKM/PK3.cs b/PKHeX/PKM/PK3.cs index 2bc039398..bf565b4f9 100644 --- a/PKHeX/PKM/PK3.cs +++ b/PKHeX/PKM/PK3.cs @@ -43,11 +43,11 @@ public PK3(byte[] decryptedData = null, string ident = null) public override int SID { get { return BitConverter.ToUInt16(Data, 0x06); } set { BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x06); } } public override string Nickname { get { return PKX.getG3Str(Data.Skip(0x08).Take(10).ToArray(), Japanese); } - set { byte[] strdata = PKX.setG3Str(value, Japanese); + set { byte[] strdata = PKX.setG3Str(IsEgg ? "タマゴ" : value, Japanese); if (strdata.Length > 10) Array.Resize(ref strdata, 10); strdata.CopyTo(Data, 0x08); } } - public override int Language { get { return BitConverter.ToUInt16(Data, 0x12) & 0xFF; } set { BitConverter.GetBytes((ushort)(value | 0x200)).CopyTo(Data, 0x12); } } + public override int Language { get { return BitConverter.ToUInt16(Data, 0x12) & 0xFF; } set { BitConverter.GetBytes((ushort)(IsEgg ? 0x601 : value | 0x200)).CopyTo(Data, 0x12); } } public override string OT_Name { get { return PKX.getG3Str(Data.Skip(0x14).Take(7).ToArray(), Japanese); } set { byte[] strdata = PKX.setG3Str(value, Japanese); @@ -159,7 +159,7 @@ public PK3(byte[] decryptedData = null, string ident = null) // Generated Attributes public override int PSV => (int)((PID >> 16 ^ PID & 0xFFFF) >> 3); public override int TSV => (TID ^ SID) >> 3; - public bool Japanese => Language == 1; + public bool Japanese => IsEgg || Language == 1; public override byte[] Encrypt() {