diff --git a/Data/Map774.rxdata b/Data/Map774.rxdata
index 49dd1b793..d42302766 100644
Binary files a/Data/Map774.rxdata and b/Data/Map774.rxdata differ
diff --git a/Data/Scripts/001_Settings.rb b/Data/Scripts/001_Settings.rb
index dbc98201d..78adfe2e0 100644
--- a/Data/Scripts/001_Settings.rb
+++ b/Data/Scripts/001_Settings.rb
@@ -6,7 +6,7 @@
 module Settings
   # The version of your game. It has to adhere to the MAJOR.MINOR.PATCH format.
   GAME_VERSION = '5.0.0'
-  GAME_VERSION_NUMBER = "6.0"
+  GAME_VERSION_NUMBER = "6.0.1"
 
   POKERADAR_LIGHT_ANIMATION_RED_ID = 17
   POKERADAR_LIGHT_ANIMATION_GREEN_ID = 18
diff --git a/Data/Scripts/010_Data/002_PBS data/013_Trainer.rb b/Data/Scripts/010_Data/002_PBS data/013_Trainer.rb
index 0a51d8edf..70473a9b7 100644
--- a/Data/Scripts/010_Data/002_PBS data/013_Trainer.rb	
+++ b/Data/Scripts/010_Data/002_PBS data/013_Trainer.rb	
@@ -198,6 +198,7 @@ module GameData
 
     def replace_species_to_randomized(species, trainerId, pokemonIndex)
       return species if $game_switches[SWITCH_FIRST_RIVAL_BATTLE]
+      return species if getDexNumberForSpecies(species) >= Settings::ZAPMOLCUNO_NB
       if isGymBattle() && $game_switches[SWITCH_RANDOMIZE_GYMS_SEPARATELY]
         return replace_species_to_randomized_gym(species, trainerId, pokemonIndex)
       end
diff --git a/Data/System.rxdata b/Data/System.rxdata
index 335c0093c..d9157021b 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ