diff --git a/pk3DS/Randomizer.cs b/pk3DS/Randomizer.cs
index 1c3ecf2..0374286 100644
--- a/pk3DS/Randomizer.cs
+++ b/pk3DS/Randomizer.cs
@@ -12,7 +12,7 @@ internal static int getRandomSpecies(ref int[] list, ref int ctr)
         }
         internal static readonly int[] RandomSpeciesList = Enumerable.Range(1, 721).Select(i => i).ToArray();
 
-        internal static int[] getSpeciesList(bool G1, bool G2, bool G3, bool G4, bool G5, bool G6, bool L, bool E)
+        internal static int[] getSpeciesList(bool G1, bool G2, bool G3, bool G4, bool G5, bool G6, bool L, bool E, bool Shedinja = true)
         {
             int[] sL = new int[0];
 
@@ -25,8 +25,9 @@ internal static int[] getSpeciesList(bool G1, bool G2, bool G3, bool G4, bool G5
             if (G2 && L) sL = sL.Concat(Enumerable.Range(243, 3)).Concat(Enumerable.Range(249, 2)).ToArray(); // Dogs, Lugia & Ho-Oh
             if (G2 && E) sL = sL.Concat(Enumerable.Range(251, 1)).ToArray(); // Celebi
             // Gen 3
-            if (G3) sL = sL.Concat(Enumerable.Range(252, 125)).ToArray();
-            if (G3 && L) sL = sL.Concat(Enumerable.Range(337, 8)).ToArray(); // Regi, Lati, Mascot
+            if (G3) sL = sL.Concat(Enumerable.Range(252, 40)).Concat(Enumerable.Range(293, 44)).ToArray();
+            if (G3 && Shedinja) sL = sL.Concat(Enumerable.Range(292, 1)).ToArray(); // Shedinja
+            if (G3 && L) sL = sL.Concat(Enumerable.Range(377, 8)).ToArray(); // Regi, Lati, Mascot
             if (G3 && E) sL = sL.Concat(Enumerable.Range(385, 2)).ToArray(); // Jirachi/Deoxys
             // Gen 4
             if (G4) sL = sL.Concat(Enumerable.Range(387, 93)).ToArray();
diff --git a/pk3DS/Subforms/TrainerRand.cs b/pk3DS/Subforms/TrainerRand.cs
index 2bf35f5..20dee82 100644
--- a/pk3DS/Subforms/TrainerRand.cs
+++ b/pk3DS/Subforms/TrainerRand.cs
@@ -17,7 +17,7 @@ private void B_Close_Click(object sender, EventArgs e)
         private void B_Save_Click(object sender, EventArgs e)
         {
             RSTE.rPKM = CHK_RandomPKM.Checked;
-            RSTE.sL = Randomizer.getSpeciesList(CHK_G1.Checked, CHK_G2.Checked, CHK_G3.Checked, CHK_G4.Checked, CHK_G5.Checked, CHK_G6.Checked, CHK_L.Checked, CHK_E.Checked);
+            RSTE.sL = Randomizer.getSpeciesList(CHK_G1.Checked, CHK_G2.Checked, CHK_G3.Checked, CHK_G4.Checked, CHK_G5.Checked, CHK_G6.Checked, CHK_L.Checked, CHK_E.Checked, false);
             RSTE.rSmart = CHK_BST.Checked;
             RSTE.rLevel = CHK_Level.Checked;
             RSTE.rLevelPercent = NUD_Level.Value;