diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata
index ae2339fe7..6b4e27138 100644
Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ
diff --git a/Data/Map077.rxdata b/Data/Map077.rxdata
index b81b09d4b..2fb741f66 100644
Binary files a/Data/Map077.rxdata and b/Data/Map077.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index 3709380b9..3810f84e1 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
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 62a96abc2..b98b9411d 100644
--- a/Data/Scripts/010_Data/002_PBS data/013_Trainer.rb	
+++ b/Data/Scripts/010_Data/002_PBS data/013_Trainer.rb	
@@ -247,9 +247,10 @@ module GameData
       @pokemon.each do |pkmn_data|
         #replace placeholder species infinite fusion edit
         species = GameData::Species.get(pkmn_data[:species]).species
-        species = replace_species_to_randomized(species, self.id, index) if isPlayingRandomized
         if placeholder_species.include?(species)
           species = replace_species_with_placeholder(species)
+        else
+          species = replace_species_to_randomized(species, self.id, index) if isPlayingRandomized
         end
         species = replaceSingleSpeciesModeIfApplicable(species)
         if $game_switches[SWITCH_REVERSED_MODE]
diff --git a/Data/Scripts/025-Randomizer/RandomizerSettings.rb b/Data/Scripts/025-Randomizer/RandomizerSettings.rb
index e1ac2a803..9c2c3f21c 100644
--- a/Data/Scripts/025-Randomizer/RandomizerSettings.rb
+++ b/Data/Scripts/025-Randomizer/RandomizerSettings.rb
@@ -40,7 +40,7 @@ class RandomizerOptionsScene < PokemonOption_Scene
                        }
         ),
 
-        EnumOption.new(_INTL("Gyms"), [_INTL("On"), _INTL("Off")],
+        EnumOption.new(_INTL("Gym trainers"), [_INTL("On"), _INTL("Off")],
                        proc { $game_switches[SWITCH_RANDOMIZE_GYMS_SEPARATELY] ? 0 : 1 },
                        proc { |value|
                          if !$game_switches[SWITCH_RANDOMIZE_GYMS_SEPARATELY] && value == 0
diff --git a/Data/Scripts/025-Randomizer/randomizer gym leader edit.rb b/Data/Scripts/025-Randomizer/randomizer gym leader edit.rb
index ee7321b8a..e0b16c3a9 100644
--- a/Data/Scripts/025-Randomizer/randomizer gym leader edit.rb	
+++ b/Data/Scripts/025-Randomizer/randomizer gym leader edit.rb	
@@ -50,13 +50,13 @@ def setRivalStarter(starter1, starter2, starter3, choice)
   else
     rivalStarter = starters[0]*NB_POKEMON+starters[1]
   end
-  pbSet(250,rivalStarter)
-  $game_switches[840] = true
+  pbSet(VAR_RIVAL_STARTER,rivalStarter)
+  $game_switches[SWITCH_DEFINED_RIVAL_STARTER] = true
 end
 
 def setRivalStarterSpecific(rivalStarter)
-  pbSet(250,rivalStarter)
-  $game_switches[840] = true
+  pbSet(VAR_RIVAL_STARTER,rivalStarter)
+  $game_switches[SWITCH_DEFINED_RIVAL_STARTER] = true
 end
 
 
diff --git a/Data/Scripts/049_Compatibility/Constants.rb b/Data/Scripts/049_Compatibility/Constants.rb
index 6d51f9bf6..ca126dc18 100644
--- a/Data/Scripts/049_Compatibility/Constants.rb
+++ b/Data/Scripts/049_Compatibility/Constants.rb
@@ -57,6 +57,7 @@ SWITCH_RANDOMIZE_GYMS_SEPARATELY = 667
 SWITCH_RANDOMIZED_GYM_TYPES=921
 SWITCH_RANDOM_GIFT_POKEMON = 780
 SWITCH_RANDOM_HELD_ITEMS = 843
+SWITCH_DEFINED_RIVAL_STARTER=840
 #Other switches
 SWITCH_RACE_BIKE = 984
 SWITCH_IS_REMATCH=200
@@ -86,6 +87,7 @@ VAR_COMMAND_WINDOW_INDEX=249
 VAR_STANDARD_WONDERTRADE_LEFT=248
 VAR_PREMIUM_WONDERTRADE_LEFT=111
 VAR_PREMIUM_WONDERTRADE_LEFT=111
+VAR_RIVAL_STARTER=250
 #Randomizer
 VAR_RANDOMIZER_WILD_POKE_BST=197
 VAR_RANDOMIZER_TRAINER_BST=195
diff --git a/Data/System.rxdata b/Data/System.rxdata
index 71ab5b09b..13adef84f 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ