diff --git a/PKHeX.Core/Editing/CommonEdits.cs b/PKHeX.Core/Editing/CommonEdits.cs
index f38dca10c..3a48a3bb0 100644
--- a/PKHeX.Core/Editing/CommonEdits.cs
+++ b/PKHeX.Core/Editing/CommonEdits.cs
@@ -45,7 +45,7 @@ namespace PKHeX.Core
pk.IsNicknamed = false;
string nick = SpeciesName.GetSpeciesNameGeneration(pk.Species, pk.Language, pk.Format);
pk.Nickname = nick;
- if (pk is _K12 pk12)
+ if (pk is GBPKM pk12)
pk12.SetNotNicknamed();
return nick;
}
diff --git a/PKHeX.Core/Editing/PKM/EditPKMUtil.cs b/PKHeX.Core/Editing/PKM/EditPKMUtil.cs
index 2d525e210..32ed8d8d4 100644
--- a/PKHeX.Core/Editing/PKM/EditPKMUtil.cs
+++ b/PKHeX.Core/Editing/PKM/EditPKMUtil.cs
@@ -62,7 +62,7 @@ namespace PKHeX.Core
}
// Copy OT trash bytes for sensitive games (Gen1/2)
- if (pk is _K12 pk12)
+ if (pk is GBPKM pk12)
{
switch (tr)
{
diff --git a/PKHeX.Core/PKM/BK4.cs b/PKHeX.Core/PKM/BK4.cs
index 979c9d1cf..b669ff5a3 100644
--- a/PKHeX.Core/PKM/BK4.cs
+++ b/PKHeX.Core/PKM/BK4.cs
@@ -5,7 +5,7 @@ namespace PKHeX.Core
{
/// Generation 4 format, exclusively for Pokémon Battle Revolution.
/// Values are stored in Big Endian format rather than Little Endian. Beware.
- public sealed class BK4 : _K4
+ public sealed class BK4 : G4PKM
{
private static readonly byte[] Unused =
{
diff --git a/PKHeX.Core/PKM/CK3.cs b/PKHeX.Core/PKM/CK3.cs
index 92a9f1c5b..7ca4a6996 100644
--- a/PKHeX.Core/PKM/CK3.cs
+++ b/PKHeX.Core/PKM/CK3.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
namespace PKHeX.Core
{
/// Generation 3 format, exclusively for Pokémon Colosseum.
- public sealed class CK3 : _K3, IShadowPKM
+ public sealed class CK3 : G3PKM, IShadowPKM
{
private static readonly byte[] Unused =
{
diff --git a/PKHeX.Core/PKM/PB7.cs b/PKHeX.Core/PKM/PB7.cs
index 5b6591634..f2228f492 100644
--- a/PKHeX.Core/PKM/PB7.cs
+++ b/PKHeX.Core/PKM/PB7.cs
@@ -5,7 +5,7 @@ using System.Runtime.CompilerServices;
namespace PKHeX.Core
{
/// Generation 7 format used for .
- public sealed class PB7 : _K6, IHyperTrain, IAwakened
+ public sealed class PB7 : G6PKM, IHyperTrain, IAwakened
{
public static readonly byte[] Unused =
{
diff --git a/PKHeX.Core/PKM/PK1.cs b/PKHeX.Core/PKM/PK1.cs
index 79de3de9c..ec97b45da 100644
--- a/PKHeX.Core/PKM/PK1.cs
+++ b/PKHeX.Core/PKM/PK1.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
namespace PKHeX.Core
{
/// Generation 1 format.
- public sealed class PK1 : _K12
+ public sealed class PK1 : GBPKM
{
public override PersonalInfo PersonalInfo => PersonalTable.Y[Species];
diff --git a/PKHeX.Core/PKM/PK2.cs b/PKHeX.Core/PKM/PK2.cs
index 57f754071..81920f4ba 100644
--- a/PKHeX.Core/PKM/PK2.cs
+++ b/PKHeX.Core/PKM/PK2.cs
@@ -3,7 +3,7 @@
namespace PKHeX.Core
{
/// Generation 2 format.
- public sealed class PK2 : _K12
+ public sealed class PK2 : GBPKM
{
public override PersonalInfo PersonalInfo => PersonalTable.C[Species];
diff --git a/PKHeX.Core/PKM/PK3.cs b/PKHeX.Core/PKM/PK3.cs
index 47c9806c7..b4c0b88ab 100644
--- a/PKHeX.Core/PKM/PK3.cs
+++ b/PKHeX.Core/PKM/PK3.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
namespace PKHeX.Core
{
/// Generation 3 format.
- public sealed class PK3 : _K3
+ public sealed class PK3 : G3PKM
{
private static readonly byte[] Unused =
{
diff --git a/PKHeX.Core/PKM/PK4.cs b/PKHeX.Core/PKM/PK4.cs
index 339bc92a7..dfd6ecc53 100644
--- a/PKHeX.Core/PKM/PK4.cs
+++ b/PKHeX.Core/PKM/PK4.cs
@@ -5,7 +5,7 @@ using System.Linq;
namespace PKHeX.Core
{
/// Generation 4 format.
- public sealed class PK4 : _K4
+ public sealed class PK4 : G4PKM
{
private static readonly byte[] Unused =
{
diff --git a/PKHeX.Core/PKM/PK6.cs b/PKHeX.Core/PKM/PK6.cs
index 1370cdf0c..7783cd798 100644
--- a/PKHeX.Core/PKM/PK6.cs
+++ b/PKHeX.Core/PKM/PK6.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
namespace PKHeX.Core
{
/// Generation 6 format.
- public sealed class PK6 : _K6, IRibbonSetEvent3, IRibbonSetEvent4, IRibbonSetCommon3, IRibbonSetCommon4, IRibbonSetCommon6, IContestStats, IGeoTrack, ISuperTrain
+ public sealed class PK6 : G6PKM, IRibbonSetEvent3, IRibbonSetEvent4, IRibbonSetCommon3, IRibbonSetCommon4, IRibbonSetCommon6, IContestStats, IGeoTrack, ISuperTrain
{
private static readonly byte[] Unused =
{
diff --git a/PKHeX.Core/PKM/PK7.cs b/PKHeX.Core/PKM/PK7.cs
index 4f2885547..86b126f15 100644
--- a/PKHeX.Core/PKM/PK7.cs
+++ b/PKHeX.Core/PKM/PK7.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
namespace PKHeX.Core
{
/// Generation 7 format.
- public sealed class PK7 : _K6, IRibbonSetEvent3, IRibbonSetEvent4, IRibbonSetCommon3, IRibbonSetCommon4, IRibbonSetCommon6, IRibbonSetCommon7, IContestStats, IHyperTrain, IGeoTrack, ISuperTrain
+ public sealed class PK7 : G6PKM, IRibbonSetEvent3, IRibbonSetEvent4, IRibbonSetCommon3, IRibbonSetCommon4, IRibbonSetCommon6, IRibbonSetCommon7, IContestStats, IHyperTrain, IGeoTrack, ISuperTrain
{
private static readonly byte[] Unused =
{
diff --git a/PKHeX.Core/PKM/PK8.cs b/PKHeX.Core/PKM/PK8.cs
index 0916a6d48..0da913a8a 100644
--- a/PKHeX.Core/PKM/PK8.cs
+++ b/PKHeX.Core/PKM/PK8.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
namespace PKHeX.Core
{
/// Generation 8 format.
- public sealed class PK8 : _K6, IRibbonSetEvent3, IRibbonSetEvent4, IRibbonSetCommon3, IRibbonSetCommon4, IRibbonSetCommon6, IRibbonSetCommon7, IContestStats, IHyperTrain, IGeoTrack
+ public sealed class PK8 : G6PKM, IRibbonSetEvent3, IRibbonSetEvent4, IRibbonSetCommon3, IRibbonSetCommon4, IRibbonSetCommon6, IRibbonSetCommon7, IContestStats, IHyperTrain, IGeoTrack
{
private static readonly byte[] Unused =
{
diff --git a/PKHeX.Core/PKM/Shared/_K3.cs b/PKHeX.Core/PKM/Shared/G3PKM.cs
similarity index 97%
rename from PKHeX.Core/PKM/Shared/_K3.cs
rename to PKHeX.Core/PKM/Shared/G3PKM.cs
index 585f7e989..766179645 100644
--- a/PKHeX.Core/PKM/Shared/_K3.cs
+++ b/PKHeX.Core/PKM/Shared/G3PKM.cs
@@ -3,7 +3,7 @@
///
/// Generation 3 Base Class
///
- public abstract class _K3 : PKM, IRibbonSetEvent3, IRibbonSetCommon3, IRibbonSetUnique3, IRibbonSetOnly3, IContestStats
+ public abstract class G3PKM : PKM, IRibbonSetEvent3, IRibbonSetCommon3, IRibbonSetUnique3, IRibbonSetOnly3, IContestStats
{
// Maximums
public override int MaxMoveID => Legal.MaxMoveID_3;
@@ -93,7 +93,7 @@
///
/// Generation 3 format to convert to
/// New object with transferred properties.
- protected T ConvertTo() where T : _K3, new()
+ protected T ConvertTo() where T : G3PKM, new()
{
var pk = new T // Convert away!
{
diff --git a/PKHeX.Core/PKM/Shared/_K4.cs b/PKHeX.Core/PKM/Shared/G4PKM.cs
similarity index 98%
rename from PKHeX.Core/PKM/Shared/_K4.cs
rename to PKHeX.Core/PKM/Shared/G4PKM.cs
index 0fedf97b1..020cbca3a 100644
--- a/PKHeX.Core/PKM/Shared/_K4.cs
+++ b/PKHeX.Core/PKM/Shared/G4PKM.cs
@@ -1,6 +1,6 @@
namespace PKHeX.Core
{
- public abstract class _K4 : PKM, IRibbonSetEvent3, IRibbonSetEvent4, IRibbonSetUnique3, IRibbonSetUnique4, IRibbonSetCommon3, IRibbonSetCommon4, IContestStats
+ public abstract class G4PKM : PKM, IRibbonSetEvent3, IRibbonSetEvent4, IRibbonSetUnique3, IRibbonSetUnique4, IRibbonSetCommon3, IRibbonSetCommon4, IContestStats
{
// Maximums
public override int MaxMoveID => Legal.MaxMoveID_4;
@@ -159,7 +159,7 @@
public abstract int CNT_Tough { get; set; }
public abstract int CNT_Sheen { get; set; }
- protected T ConvertTo() where T : _K4, new()
+ protected T ConvertTo() where T : G4PKM, new()
{
var pk = new T
{
diff --git a/PKHeX.Core/PKM/Shared/_K6.cs b/PKHeX.Core/PKM/Shared/G6PKM.cs
similarity index 99%
rename from PKHeX.Core/PKM/Shared/_K6.cs
rename to PKHeX.Core/PKM/Shared/G6PKM.cs
index 44a3770c5..1f7daa005 100644
--- a/PKHeX.Core/PKM/Shared/_K6.cs
+++ b/PKHeX.Core/PKM/Shared/G6PKM.cs
@@ -3,7 +3,7 @@
namespace PKHeX.Core
{
/// Generation 6 format.
- public abstract class _K6 : PKM
+ public abstract class G6PKM : PKM
{
public override int SIZE_PARTY => PKX.SIZE_6PARTY;
public override int SIZE_STORED => PKX.SIZE_6STORED;
diff --git a/PKHeX.Core/PKM/Shared/_K12.cs b/PKHeX.Core/PKM/Shared/GBPKM.cs
similarity index 99%
rename from PKHeX.Core/PKM/Shared/_K12.cs
rename to PKHeX.Core/PKM/Shared/GBPKM.cs
index fbdf8783d..0cfa24562 100644
--- a/PKHeX.Core/PKM/Shared/_K12.cs
+++ b/PKHeX.Core/PKM/Shared/GBPKM.cs
@@ -4,7 +4,7 @@ using System.Linq;
namespace PKHeX.Core
{
- public abstract class _K12 : PKM
+ public abstract class GBPKM : PKM
{
internal const int STRLEN_J = 6;
internal const int STRLEN_U = 11;
@@ -32,7 +32,7 @@ namespace PKHeX.Core
public override bool Japanese => otname.Length == STRLEN_J;
public override byte[] Data { get; }
- protected _K12(byte[] data, bool jp = false)
+ protected GBPKM(byte[] data, bool jp = false)
{
int partySize = SIZE_PARTY;
if (data.Length != partySize)
diff --git a/PKHeX.Core/PKM/Shared/PokeListGB.cs b/PKHeX.Core/PKM/Shared/PokeListGB.cs
index a186435f7..8bea5b8ca 100644
--- a/PKHeX.Core/PKM/Shared/PokeListGB.cs
+++ b/PKHeX.Core/PKM/Shared/PokeListGB.cs
@@ -51,7 +51,7 @@ namespace PKHeX.Core
private int GetOffsetPKMOT(int base_ofs, int i) => GetOffsetPKMData(base_ofs, Capacity) + (StringLength * i);
private int GetOffsetPKMNickname(int base_ofs, int i) => GetOffsetPKMOT(base_ofs, Capacity) + (StringLength * i);
- private static int GetStringLength(bool jp) => jp ? _K12.STRLEN_J : _K12.STRLEN_U;
+ private static int GetStringLength(bool jp) => jp ? GBPKM.STRLEN_J : GBPKM.STRLEN_U;
protected bool IsFormatParty => IsCapacityPartyFormat((PokeListType)Capacity);
protected static bool IsCapacityPartyFormat(PokeListType Capacity) => Capacity == PokeListType.Single || Capacity == PokeListType.Party;
diff --git a/PKHeX.Core/PKM/Util/PKMConverter.cs b/PKHeX.Core/PKM/Util/PKMConverter.cs
index cc2da1c34..de2548d7f 100644
--- a/PKHeX.Core/PKM/Util/PKMConverter.cs
+++ b/PKHeX.Core/PKM/Util/PKMConverter.cs
@@ -128,7 +128,7 @@ namespace PKHeX.Core
/// PKM to check
/// Prefer a certain generation over another
/// Updated PKM if actually PK7
- private static _K6 CheckPKMFormat7(PK6 pk, int prefer)
+ private static G6PKM CheckPKMFormat7(PK6 pk, int prefer)
{
if (GameVersion.GG.Contains(pk.Version))
return new PB7(pk.Data);
diff --git a/PKHeX.Core/PKM/XK3.cs b/PKHeX.Core/PKM/XK3.cs
index 7250ae39a..86a64c6a0 100644
--- a/PKHeX.Core/PKM/XK3.cs
+++ b/PKHeX.Core/PKM/XK3.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
namespace PKHeX.Core
{
/// Generation 3 format, exclusively for Pokémon XD.
- public sealed class XK3 : _K3, IShadowPKM
+ public sealed class XK3 : G3PKM, IShadowPKM
{
private static readonly byte[] Unused =
{
diff --git a/PKHeX.Core/Saves/SAV1.cs b/PKHeX.Core/Saves/SAV1.cs
index 552b62d0d..1e0182654 100644
--- a/PKHeX.Core/Saves/SAV1.cs
+++ b/PKHeX.Core/Saves/SAV1.cs
@@ -211,7 +211,7 @@ namespace PKHeX.Core
public override int BoxSlotCount => Japanese ? 30 : 20;
public override bool HasParty => true;
- private int StringLength => Japanese ? _K12.STRLEN_J : _K12.STRLEN_U;
+ private int StringLength => Japanese ? GBPKM.STRLEN_J : GBPKM.STRLEN_U;
public override bool IsPKMPresent(byte[] data, int offset) => PKX.IsPKMPresentGB(data, offset);
diff --git a/PKHeX.Core/Saves/SAV2.cs b/PKHeX.Core/Saves/SAV2.cs
index 26c84f937..f35f88238 100644
--- a/PKHeX.Core/Saves/SAV2.cs
+++ b/PKHeX.Core/Saves/SAV2.cs
@@ -280,7 +280,7 @@ namespace PKHeX.Core
public override bool HasParty => true;
public override bool HasNamableBoxes => true;
- private int StringLength => Japanese ? _K12.STRLEN_J : _K12.STRLEN_U;
+ private int StringLength => Japanese ? GBPKM.STRLEN_J : GBPKM.STRLEN_U;
// Checksums
private ushort GetChecksum()
diff --git a/PKHeX.WinForms/Controls/PKM Editor/EditPK3.cs b/PKHeX.WinForms/Controls/PKM Editor/EditPK3.cs
index f531f84a4..fc64b2b88 100644
--- a/PKHeX.WinForms/Controls/PKM Editor/EditPK3.cs
+++ b/PKHeX.WinForms/Controls/PKM Editor/EditPK3.cs
@@ -6,7 +6,7 @@ namespace PKHeX.WinForms.Controls
{
private void PopulateFieldsPK3()
{
- if (!(pkm is _K3 pk3))
+ if (!(pkm is G3PKM pk3))
return;
LoadMisc1(pk3);
@@ -23,7 +23,7 @@ namespace PKHeX.WinForms.Controls
private PKM PreparePK3()
{
- if (!(pkm is _K3 pk3))
+ if (!(pkm is G3PKM pk3))
return null;
SaveMisc1(pk3);
diff --git a/PKHeX.WinForms/Controls/PKM Editor/EditPK4.cs b/PKHeX.WinForms/Controls/PKM Editor/EditPK4.cs
index 68c944b85..e4786777e 100644
--- a/PKHeX.WinForms/Controls/PKM Editor/EditPK4.cs
+++ b/PKHeX.WinForms/Controls/PKM Editor/EditPK4.cs
@@ -26,7 +26,7 @@ namespace PKHeX.WinForms.Controls
// Minor properties
switch (pk4)
{
- case _K4 p4: ShinyLeaf.SetValue(p4.ShinyLeaf);
+ case G4PKM p4: ShinyLeaf.SetValue(p4.ShinyLeaf);
break;
}
@@ -50,7 +50,7 @@ namespace PKHeX.WinForms.Controls
// Minor properties
switch (pk4)
{
- case _K4 p4:
+ case G4PKM p4:
p4.ShinyLeaf = ShinyLeaf.GetValue();
break;
}
diff --git a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs
index 9efc14a2b..4d0f249db 100644
--- a/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs
+++ b/PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs
@@ -1193,7 +1193,7 @@ namespace PKHeX.WinForms.Controls
return;
TB_Nickname.Text = SpeciesName.GetSpeciesNameGeneration(species, lang, pkm.Format);
- if (pkm is _K12 pk)
+ if (pkm is GBPKM pk)
pk.SetNotNicknamed();
}