diff --git a/PKHeX/MysteryGifts/WC7.cs b/PKHeX/MysteryGifts/WC7.cs index 007702680..d399a6bae 100644 --- a/PKHeX/MysteryGifts/WC7.cs +++ b/PKHeX/MysteryGifts/WC7.cs @@ -88,8 +88,8 @@ public WC7(byte[] data = null) get { return BitConverter.ToUInt16(Data, 0x68); } set { BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x68); } } public override int Quantity { - get { return BitConverter.ToUInt16(Data, 0x70); } - set { BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x70); } } + get { return BitConverter.ToUInt16(Data, 0x6A); } + set { BitConverter.GetBytes((ushort)value).CopyTo(Data, 0x6A); } } // Pokémon Properties public override bool IsPokémon { get { return CardType == 0; } set { if (value) CardType = 0; } } @@ -176,6 +176,7 @@ public WC7(byte[] data = null) set { Encoding.Unicode.GetBytes(value.PadRight(value.Length + 1, '\0')).CopyTo(Data, 0xB6); } } public override int Level { get { return Data[0xD0]; } set { Data[0xD0] = (byte)value; } } public override bool IsEgg { get { return Data[0xD1] == 1; } set { Data[0xD1] = (byte)(value ? 1 : 0); } } + public ushort AdditionalItem { get { return BitConverter.ToUInt16(Data, 0xD2); } set { BitConverter.GetBytes(value).CopyTo(Data, 0xD2); } } public uint PID { get { return BitConverter.ToUInt32(Data, 0xD4); } set { BitConverter.GetBytes(value).CopyTo(Data, 0xD4); } } diff --git a/PKHeX/Subforms/Save Editors/SAV_Wondercard.cs b/PKHeX/Subforms/Save Editors/SAV_Wondercard.cs index e477ea0e5..179bc7d50 100644 --- a/PKHeX/Subforms/Save Editors/SAV_Wondercard.cs +++ b/PKHeX/Subforms/Save Editors/SAV_Wondercard.cs @@ -494,6 +494,12 @@ private static string getDescription(MysteryGift gift) s += $"{Main.GameStrings.specieslist[pk.Species]} @ {Main.GameStrings.itemlist[pk.HeldItem]} --- "; s += (pk.IsEgg ? Main.GameStrings.eggname : $"{pk.OT_Name} - {pk.TID.ToString("00000")}/{pk.SID.ToString("00000")}") + Environment.NewLine; s += $"{Main.GameStrings.movelist[pk.Move1]} / {Main.GameStrings.movelist[pk.Move2]} / {Main.GameStrings.movelist[pk.Move3]} / {Main.GameStrings.movelist[pk.Move4]}" + Environment.NewLine; + if (gift is WC7) + { + var addItem = ((WC7) gift).AdditionalItem; + if (addItem != 0) + s += $"+ {Main.GameStrings.itemlist[addItem]}"; + } } catch { s += "Unable to create gift description."; } return s;