diff --git a/PKHeX/Legality/Tables3.cs b/PKHeX/Legality/Tables3.cs
index 688b2c14e..208e5683c 100644
--- a/PKHeX/Legality/Tables3.cs
+++ b/PKHeX/Legality/Tables3.cs
@@ -187,32 +187,10 @@ public static partial class Legal
 
         internal static readonly int[] Roaming_MetLocation_FRLG =
         {
-            // TODO: Check if roaming encounter is possible in route 21
-            101, // Route 1
-            102, // Route 2
-            103, // Route 3
-            104, // Route 4
-            105, // Route 5
-            106, // Route 6
-            107, // Route 7
-            108, // Route 8
-            109, // Route 9
-            110, // Route 10
-            111, // Route 11
-            112, // Route 12
-            113, // Route 13
-            114, // Route 14
-            115, // Route 15
-            116, // Route 16
-            117, // Route 17
-            118, // Route 18
-            // Routes 19 and 20 only have surf encounters
-            121, // Route 21 Grass encounter in water route
-            122, // Route 22
-            123, // Route 23
-            124, // Route 24
-            125, // Route 25
-            // Kanto route 26 does not exits in gen 3
+             //Route 1-25 encounter is possible either in grass or on water
+             101,102,103,104,105,106,107,108,109,110,
+             111,112,113,114,115,116,117,118,119,120,
+             121,122,123,124,125
         };
 
         internal static readonly int[] Roaming_MetLocation_RSE =
diff --git a/PKHeX/Legality/Tables4.cs b/PKHeX/Legality/Tables4.cs
index f5cc9d437..d1e0bc2ed 100644
--- a/PKHeX/Legality/Tables4.cs
+++ b/PKHeX/Legality/Tables4.cs
@@ -238,10 +238,12 @@ public static partial class Legal
 
         internal static readonly int[] Roaming_MetLocation_DPPt =
         {
-            // Route 201-230  
+            // Route 201-222 can be encountered in either grass or water
             16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
-            26, 27, 28, 29, 30, 31, 32, 33,
-            36, 37,     39, 40, 41, 42, 43, 44, 45, // Route 219,220,223 surfing only 
+            26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
+            36, 37, 
+            47,     // Valley Windworks
+            49,     // Fuego Ironworks
         };
         internal static readonly EncounterStatic[] Encounter_DPPt_Roam =
         {
@@ -393,7 +395,7 @@ public static partial class Legal
 
         internal static readonly EncounterStatic[] Encounter_HGSS = Encounter_HGSS_KantoRoam.SelectMany(e => e.Clone(Roaming_MetLocation_HGSS_Kanto)).Concat(
                                                                     Encounter_HGSS_JohtoRoam.SelectMany(e => e.Clone(Roaming_MetLocation_HGSS_Johto))).Concat(
-                                                                    Encounter_DPPt_Regular).ToArray();
+                                                                    Encounter_HGSS_Regular).ToArray();
 
         internal static readonly EncounterTrade[] TradeGift_DPPt =
         {
@@ -440,7 +442,7 @@ public static partial class Legal
                 Location = 53, //Solaceon Ruins
                 Slots = new[]
                 {
-                    //new EncounterSlot { Species = 201, LevelMin = 14, LevelMax = 30, Type = SlotType.Grass, Form = 0 }, // Unown A
+                    //new EncounterSlot { Species = 201, LevelMin = 14, LevelMax = 30, Type = SlotType.Grass, Form = 0 }, // Unown A Loaded from encounters raw file
                     new EncounterSlot { Species = 201, LevelMin = 14, LevelMax = 30, Type = SlotType.Grass, Form = 1 }, // Unown B
                     new EncounterSlot { Species = 201, LevelMin = 14, LevelMax = 30, Type = SlotType.Grass, Form = 2 }, // Unown C
                     new EncounterSlot { Species = 201, LevelMin = 14, LevelMax = 30, Type = SlotType.Grass, Form = 3 }, // Unown D
@@ -476,7 +478,7 @@ public static partial class Legal
                 Location = 209, // Ruins of Alph
                 Slots = new[]
                 {
-                    //new EncounterSlot { Species = 201, LevelMin = 5, LevelMax = 5, Type = SlotType.Grass, Form = 0 }, // Unown A
+                    //new EncounterSlot { Species = 201, LevelMin = 5, LevelMax = 5, Type = SlotType.Grass, Form = 0 }, // Unown A Loaded from encounters raw file
                     new EncounterSlot { Species = 201, LevelMin = 5, LevelMax = 5, Type = SlotType.Grass, Form = 1 }, // Unown B
                     new EncounterSlot { Species = 201, LevelMin = 5, LevelMax = 5, Type = SlotType.Grass, Form = 2 }, // Unown C
                     new EncounterSlot { Species = 201, LevelMin = 5, LevelMax = 5, Type = SlotType.Grass, Form = 3 }, // Unown D
diff --git a/PKHeX/Saves/SAV3.cs b/PKHeX/Saves/SAV3.cs
index b058caf9a..01dd80b6d 100644
--- a/PKHeX/Saves/SAV3.cs
+++ b/PKHeX/Saves/SAV3.cs
@@ -514,7 +514,7 @@ public override void setCaught(int species, bool caught)
         {
             int bit = species - 1;
             int ofs = bit / 8;
-            int bitval = caught ? 1 << (bit&7) : 0;
+            int bitval = 1 << (bit&7);
             int caughtOffset = BlockOfs[0] + 0x28 + ofs;
 
             if (caught)
@@ -536,7 +536,7 @@ public override void setSeen(int species, bool seen)
         {
             int bit = species - 1;
             int ofs = bit / 8;
-            int bitval = seen ? 1 << (bit&7) : 0;
+            int bitval = 1 << (bit&7);
 
             if (seen)
             {