From 0d3cb1f6ad458cfabcae6e214a5d69b40fd2dc37 Mon Sep 17 00:00:00 2001 From: Kurt Date: Sat, 31 Jul 2021 19:46:14 -0700 Subject: [PATCH] Shorten string get/set to valid range Implicit terminator set --- PKHeX.Core/PKM/BK4.cs | 4 ++-- PKHeX.Core/PKM/PK4.cs | 4 ++-- PKHeX.Core/PKM/PK5.cs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/PKHeX.Core/PKM/BK4.cs b/PKHeX.Core/PKM/BK4.cs index 13079e7a3..0b7a272fb 100644 --- a/PKHeX.Core/PKM/BK4.cs +++ b/PKHeX.Core/PKM/BK4.cs @@ -189,7 +189,7 @@ public override uint EXP #endregion #region Block C - public override string Nickname { get => GetString(0x48, 24); set => SetString(value, 11).CopyTo(Data, 0x48); } + public override string Nickname { get => GetString(0x48, 20); set => SetString(value, 10).CopyTo(Data, 0x48); } // 0x5E unused public override int Version { get => Data[0x5F]; set => Data[0x5F] = (byte)value; } private byte RIB8 { get => Data[0x60]; set => Data[0x60] = value; } // Sinnoh 3 @@ -232,7 +232,7 @@ public override uint EXP #endregion #region Block D - public override string OT_Name { get => GetString(0x68, 16); set => SetString(value, 7).CopyTo(Data, 0x68); } + public override string OT_Name { get => GetString(0x68, 14); set => SetString(value, 7).CopyTo(Data, 0x68); } public override int Egg_Year { get => Data[0x78]; set => Data[0x78] = (byte)value; } public override int Egg_Month { get => Data[0x79]; set => Data[0x79] = (byte)value; } public override int Egg_Day { get => Data[0x7A]; set => Data[0x7A] = (byte)value; } diff --git a/PKHeX.Core/PKM/PK4.cs b/PKHeX.Core/PKM/PK4.cs index 5cfec847c..297fc9b70 100644 --- a/PKHeX.Core/PKM/PK4.cs +++ b/PKHeX.Core/PKM/PK4.cs @@ -168,7 +168,7 @@ private static byte[] DecryptParty(byte[] data) #endregion #region Block C - public override string Nickname { get => GetString(0x48, 22); set => SetString(value, 11).CopyTo(Data, 0x48); } + public override string Nickname { get => GetString(0x48, 20); set => SetString(value, 10).CopyTo(Data, 0x48); } // 0x5E unused public override int Version { get => Data[0x5F]; set => Data[0x5F] = (byte)value; } private byte RIB8 { get => Data[0x60]; set => Data[0x60] = value; } // Sinnoh 3 @@ -211,7 +211,7 @@ private static byte[] DecryptParty(byte[] data) #endregion #region Block D - public override string OT_Name { get => GetString(0x68, 16); set => SetString(value, 7).CopyTo(Data, 0x68); } + public override string OT_Name { get => GetString(0x68, 14); set => SetString(value, 7).CopyTo(Data, 0x68); } public override int Egg_Year { get => Data[0x78]; set => Data[0x78] = (byte)value; } public override int Egg_Month { get => Data[0x79]; set => Data[0x79] = (byte)value; } public override int Egg_Day { get => Data[0x7A]; set => Data[0x7A] = (byte)value; } diff --git a/PKHeX.Core/PKM/PK5.cs b/PKHeX.Core/PKM/PK5.cs index 9058207c2..6e1baaffd 100644 --- a/PKHeX.Core/PKM/PK5.cs +++ b/PKHeX.Core/PKM/PK5.cs @@ -186,7 +186,7 @@ private static byte[] DecryptParty(byte[] data) #endregion #region Block C - public override string Nickname { get => GetString(0x48, 22); set => SetString(value, 11).CopyTo(Data, 0x48); } + public override string Nickname { get => GetString(0x48, 20); set => SetString(value, 10).CopyTo(Data, 0x48); } // 0x5E unused public override int Version { get => Data[0x5F]; set => Data[0x5F] = (byte)value; } private byte RIB8 { get => Data[0x60]; set => Data[0x60] = value; } // Sinnoh 3 @@ -229,7 +229,7 @@ private static byte[] DecryptParty(byte[] data) #endregion #region Block D - public override string OT_Name { get => GetString(0x68, 0x16); set => SetString(value, 7).CopyTo(Data, 0x68); } + public override string OT_Name { get => GetString(0x68, 14); set => SetString(value, 7).CopyTo(Data, 0x68); } public override int Egg_Year { get => Data[0x78]; set => Data[0x78] = (byte)value; } public override int Egg_Month { get => Data[0x79]; set => Data[0x79] = (byte)value; } public override int Egg_Day { get => Data[0x7A]; set => Data[0x7A] = (byte)value; }