diff --git a/PKHeX/Legality/Core.cs b/PKHeX/Legality/Core.cs
index 6731fa0cd..3b1257ebe 100644
--- a/PKHeX/Legality/Core.cs
+++ b/PKHeX/Legality/Core.cs
@@ -35,8 +35,6 @@ public static partial class Legal
         private static readonly Learnset[] LevelUpFR = Learnset6.getArray(Data.unpackMini(Resources.lvlmove_fr, "fr"));
         private static readonly Learnset[] LevelUpLG = Learnset6.getArray(Data.unpackMini(Resources.lvlmove_lg, "lg"));
         private static readonly EggMoves[] EggMovesRS = EggMoves6.getArray(Data.unpackMini(Resources.eggmove_rs, "rs"));
-        //private static readonly TMHMTutorMoves[] TutorsG3 = TMHMTutorMoves.getArray(Data.unpackMini(Properties.Resources.tutors_g3, "g3"));
-        //private static readonly TMHMTutorMoves[] HMTMG3 = TMHMTutorMoves.getArray(Data.unpackMini(Properties.Resources.hmtm_g3, "g3"));
         private static readonly EvolutionTree Evolves3;
         private static readonly EncounterArea[] SlotsR, SlotsS, SlotsE, SlotsFR, SlotsLG;
         private static readonly EncounterStatic[] StaticR, StaticS, StaticE, StaticFR, StaticLG;
diff --git a/PKHeX/PKM/PKX.cs b/PKHeX/PKM/PKX.cs
index 68dfc87ab..0ff96f574 100644
--- a/PKHeX/PKM/PKX.cs
+++ b/PKHeX/PKM/PKX.cs
@@ -1395,7 +1395,7 @@ public static int getGender(int species, uint PID)
             }
         }
         #region Gen 3 Species Table
-        public static int[] newindex => new[]
+        private static readonly int[] newindex =
         {
             0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,
             31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,
@@ -1417,7 +1417,7 @@ public static int getGender(int species, uint PID)
             385,386,358,
         };
 
-        public static int[] oldindex => new[]
+        private static readonly int[] oldindex =
         {
             0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,
             31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,
diff --git a/PKHeX/PersonalInfo/PersonalTable.cs b/PKHeX/PersonalInfo/PersonalTable.cs
index dcf2c28b5..9aec81298 100644
--- a/PKHeX/PersonalInfo/PersonalTable.cs
+++ b/PKHeX/PersonalInfo/PersonalTable.cs
@@ -74,9 +74,8 @@ private PersonalTable(byte[] data, GameVersion format)
                 case GameVersion.E:
                 case GameVersion.FR:
                 case GameVersion.LG:
-                    Array.Resize(ref d, 387);
-                    for (int i = 0; i < d.Length; i++) // entries are not in order of natdexID
-                        d[i] = new PersonalInfoG3(entries[PKX.getG3Species(i)]);
+                    for (int i = 0; i < d.Length; i++)
+                        d[i] = new PersonalInfoG3(entries[i]);
                     break;
                 case GameVersion.DP:
                 case GameVersion.Pt:
diff --git a/PKHeX/Resources/byte/personal_e b/PKHeX/Resources/byte/personal_e
index e62f20758..b3c0bab02 100644
Binary files a/PKHeX/Resources/byte/personal_e and b/PKHeX/Resources/byte/personal_e differ
diff --git a/PKHeX/Resources/byte/personal_fr b/PKHeX/Resources/byte/personal_fr
index 113ab7009..0e90accb0 100644
Binary files a/PKHeX/Resources/byte/personal_fr and b/PKHeX/Resources/byte/personal_fr differ
diff --git a/PKHeX/Resources/byte/personal_lg b/PKHeX/Resources/byte/personal_lg
index 113ab7009..0e90accb0 100644
Binary files a/PKHeX/Resources/byte/personal_lg and b/PKHeX/Resources/byte/personal_lg differ
diff --git a/PKHeX/Resources/byte/personal_rs b/PKHeX/Resources/byte/personal_rs
index e62f20758..b3c0bab02 100644
Binary files a/PKHeX/Resources/byte/personal_rs and b/PKHeX/Resources/byte/personal_rs differ