Ban Unown as a wild encounter in GSC and HGSS (fixes #537)

2 files changed, 15 insertions, 0 deletions

diff --git a/src/com/sneed/pkrandom/romhandlers/Gen2RomHandler.java b/src/com/sneed/pkrandom/romhandlers/Gen2RomHandler.java
index 389dc32..51aeae9 100755
--- a/src/com/sneed/pkrandom/romhandlers/Gen2RomHandler.java
+++ b/src/com/sneed/pkrandom/romhandlers/Gen2RomHandler.java
@@ -1561,6 +1561,12 @@ public class Gen2RomHandler extends AbstractGBCRomHandler {
     }

 

     @Override

+    public List<Pokemon> bannedForWildEncounters() {

+        // Ban Unown because they don't show up unless you complete a puzzle in the Ruins of Alph.

+        return Collections.singletonList(pokes[Species.unown]);

+    }

+

+    @Override

     public List<Pokemon> bannedForStaticPokemon() {

         return Collections.singletonList(pokes[Species.unown]); // Unown banned

     }

diff --git a/src/com/sneed/pkrandom/romhandlers/Gen4RomHandler.java b/src/com/sneed/pkrandom/romhandlers/Gen4RomHandler.java
index 8a936ec..d3904f8 100755
--- a/src/com/sneed/pkrandom/romhandlers/Gen4RomHandler.java
+++ b/src/com/sneed/pkrandom/romhandlers/Gen4RomHandler.java
@@ -3102,6 +3102,15 @@ public class Gen4RomHandler extends AbstractDSRomHandler {
     }

 

     @Override

+    public List<Pokemon> bannedForWildEncounters() {

+        if (romEntry.romType == Gen4Constants.Type_HGSS) {

+            // Ban Unown in HGSS because they don't show up unless you complete a puzzle in the Ruins of Alph.

+            return Collections.singletonList(pokes[Species.unown]);

+        }

+        return new ArrayList<>();

+    }

+

+    @Override

     public List<Pokemon> getBannedFormesForTrainerPokemon() {

         List<Pokemon> banned = new ArrayList<>();

         if (romEntry.romType != Gen4Constants.Type_DP) {