From 285876dcf77d4a899a086db5fd2e7bdb047cc0c7 Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Wed, 23 Jun 2021 09:35:29 -0700
Subject: [PATCH] Update SAV_Encounters.cs

---
 PKHeX.WinForms/Subforms/SAV_Encounters.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/PKHeX.WinForms/Subforms/SAV_Encounters.cs b/PKHeX.WinForms/Subforms/SAV_Encounters.cs
index 7184ac079..e4b6e9d73 100644
--- a/PKHeX.WinForms/Subforms/SAV_Encounters.cs
+++ b/PKHeX.WinForms/Subforms/SAV_Encounters.cs
@@ -252,6 +252,12 @@ private static IEnumerable<IEncounterInfo> GetAllSpeciesFormEncounters(IEnumerab
             {
                 var pi = pt.GetFormEntry(s, 0);
                 var fc = pi.FormCount;
+                if (fc == 0 && !Main.Settings.EncounterDb.FilterUnavailableSpecies) // not present in game
+                {
+                    // try again using past-gen table
+                    pi = PersonalTable.USUM.GetFormEntry(s, 0);
+                    fc = pi.FormCount;
+                }
                 for (int f = 0; f < fc; f++)
                 {
                     var encs = GetEncounters(s, f, moves, pk, versions);