From 394ef9063ed8e326ee7e6f650b1f84b5ea73e12f Mon Sep 17 00:00:00 2001
From: javierhimura <javier_himura@hotmail.com>
Date: Sun, 19 Mar 2017 13:37:30 +0100
Subject: [PATCH] Load g3 and 4 encounter slots

---
 PKHeX/Legality/Core.cs  | 10 ++++++++++
 PKHeX/PKHeX.Core.csproj | 13 +++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/PKHeX/Legality/Core.cs b/PKHeX/Legality/Core.cs
index 8e08c0d41..790c9751c 100644
--- a/PKHeX/Legality/Core.cs
+++ b/PKHeX/Legality/Core.cs
@@ -127,6 +127,16 @@ private static EncounterArea[] getEncounterTables(GameVersion Game)
             byte[] tables = null;
             switch (Game)
             {
+                case GameVersion.R: return EncounterArea.getArray3(Data.unpackMini(Resources.encounter_r, "ru"));
+                case GameVersion.S: return EncounterArea.getArray3(Data.unpackMini(Resources.encounter_s, "sa"));
+                case GameVersion.E: return EncounterArea.getArray3(Data.unpackMini(Resources.encounter_e, "em"));
+                case GameVersion.FR: return EncounterArea.getArray3(Data.unpackMini(Resources.encounter_fr, "fr"));
+                case GameVersion.LG: return EncounterArea.getArray3(Data.unpackMini(Resources.encounter_lg, "lg"));
+                case GameVersion.D: return EncounterArea.getArray4DPPt(Data.unpackMini(Resources.encounter_d, "da"));
+                case GameVersion.P: return EncounterArea.getArray4DPPt(Data.unpackMini(Resources.encounter_p, "pe"));
+                case GameVersion.Pt: return EncounterArea.getArray4DPPt(Data.unpackMini(Resources.encounter_pt, "pt"));
+                case GameVersion.HG: return EncounterArea.getArray4HGSS(Data.unpackMini(Resources.encounter_hg, "hg"));
+                case GameVersion.SS: return EncounterArea.getArray4HGSS(Data.unpackMini(Resources.encounter_ss, "ss"));
                 case GameVersion.B: ident = "51"; tables = Resources.encounter_b; break;
                 case GameVersion.W: ident = "51"; tables = Resources.encounter_w; break;
                 case GameVersion.B2: ident = "52"; tables = Resources.encounter_b2; break;
diff --git a/PKHeX/PKHeX.Core.csproj b/PKHeX/PKHeX.Core.csproj
index 3ce1a863d..7bdc98c97 100644
--- a/PKHeX/PKHeX.Core.csproj
+++ b/PKHeX/PKHeX.Core.csproj
@@ -272,21 +272,34 @@
     <None Include="Resources\byte\encounter_blue.pkl" />
     <None Include="Resources\byte\encounter_crystal.pkl" />
     <None Include="Resources\byte\encounter_crystal_h.pkl" />
+    <None Include="Resources\byte\encounter_d.pkl" />
+    <None Include="Resources\byte\encounter_e.pkl" />
+    <None Include="Resources\byte\encounter_fr.pkl" />
     <None Include="Resources\byte\encounter_gold.pkl" />
     <None Include="Resources\byte\encounter_gold_h.pkl" />
     <None Include="Resources\byte\encounter_gsc_f.pkl" />
+    <None Include="Resources\byte\encounter_hg.pkl" />
+    <None Include="Resources\byte\encounter_lg.pkl" />
     <None Include="Resources\byte\encounter_mn.pkl" />
     <None Include="Resources\byte\encounter_mn_sos.pkl" />
+    <None Include="Resources\byte\encounter_p.pkl" />
+    <None Include="Resources\byte\encounter_pt.pkl" />
+    <None Include="Resources\byte\encounter_r.pkl" />
     <None Include="Resources\byte\encounter_rb_f.pkl" />
     <None Include="Resources\byte\encounter_red.pkl" />
+    <None Include="Resources\byte\encounter_s.pkl" />
     <None Include="Resources\byte\encounter_silver.pkl" />
     <None Include="Resources\byte\encounter_silver_h.pkl" />
     <None Include="Resources\byte\encounter_sn.pkl" />
     <None Include="Resources\byte\encounter_sn_sos.pkl" />
+    <None Include="Resources\byte\encounter_ss.pkl" />
     <None Include="Resources\byte\encounter_w.pkl" />
     <None Include="Resources\byte\encounter_w2.pkl" />
     <None Include="Resources\byte\encounter_yellow.pkl" />
     <None Include="Resources\byte\encounter_yellow_f.pkl" />
+    <None Include="Resources\byte\evos_g3.pkl" />
+    <None Include="Resources\byte\evos_g4.pkl" />
+    <None Include="Resources\byte\evos_g5.pkl" />
     <None Include="Resources\byte\evos_gsc.pkl" />
     <None Include="Resources\byte\evos_rby.pkl" />
     <None Include="Resources\byte\evos_sm.pkl" />