diff --git a/Data/Scripts/018_Alternate battle modes/003_Battle Frontier generator/002_ChallengeGenerator_Pokemon.rb b/Data/Scripts/018_Alternate battle modes/003_Battle Frontier generator/002_ChallengeGenerator_Pokemon.rb
index 4c259c441..46ae60efb 100644
--- a/Data/Scripts/018_Alternate battle modes/003_Battle Frontier generator/002_ChallengeGenerator_Pokemon.rb	
+++ b/Data/Scripts/018_Alternate battle modes/003_Battle Frontier generator/002_ChallengeGenerator_Pokemon.rb	
@@ -40,7 +40,7 @@ end
 def pbRandomMove
   keys = GameData::Move.keys
   loop do
-    move_id = keys[keys.sample]
+    move_id = keys.sample
     move = GameData::Move.get(move_id)
     next if move.id == :SKETCH || move.id == :STRUGGLE
     return move.id
@@ -153,7 +153,7 @@ def pbRandomPokemonFromRule(rules, trainer)
     keys = GameData::Species.keys
     loop do
       loop do
-        species = keys[keys.sample]
+        species = keys.sample
         break if GameData::Species.get(species).form == 0
       end
       r = rand(20)
@@ -175,7 +175,7 @@ def pbRandomPokemonFromRule(rules, trainer)
     nature = nil
     keys = GameData::Nature.keys
     loop do
-      nature = keys[keys.sample]
+      nature = keys.sample
       nature_data = GameData::Nature.get(nature)
       if [:LAX, :GENTLE].include?(nature_data.id) || nature_data.stat_changes.length == 0
         next if rand(20) < 19
diff --git a/Data/Scripts/018_Alternate battle modes/003_Battle Frontier generator/003_ChallengeGenerator_Trainers.rb b/Data/Scripts/018_Alternate battle modes/003_Battle Frontier generator/003_ChallengeGenerator_Trainers.rb
index 5020afd60..0cf2a46b2 100644
--- a/Data/Scripts/018_Alternate battle modes/003_Battle Frontier generator/003_ChallengeGenerator_Trainers.rb	
+++ b/Data/Scripts/018_Alternate battle modes/003_Battle Frontier generator/003_ChallengeGenerator_Trainers.rb	
@@ -25,7 +25,7 @@ def pbTrainerInfo(pokemonlist, trfile, rules)
       else
         tr_typekeys = GameData::TrainerType.keys
         loop do
-          tr_type = tr_typekeys[tr_typekeys.sample]
+          tr_type = tr_typekeys.sample
           tr_type_data = GameData::TrainerType.get(tr_type)
           next if tr_type_data.base_money >= 100
           trainerid = tr_type_data.id