Revised changes in previous commit about Pokémon generation for non-standard battles

Data/Scripts/012_Overworld/002_Battle triggering/005_Overworld_RoamingPokemon.rb

@@ -196,13 +196,17 @@ EventHandlers.add(:on_calling_wild_battle, :roaming_pokemon,
   }
 )
 
-def pbRoamingPokemonBattle(pkmn)
+def pbRoamingPokemonBattle(pkmn, level = 1)
   # Get the roaming Pokémon to encounter; generate it based on the species and
   # level if it doesn't already exist
   idxRoamer = $game_temp.roamer_index_for_encounter
   if !$PokemonGlobal.roamPokemon[idxRoamer] ||
      !$PokemonGlobal.roamPokemon[idxRoamer].is_a?(Pokemon)
+    if pkmn.is_a?(Pokemon)
       $PokemonGlobal.roamPokemon[idxRoamer] = pbGenerateWildPokemon(pkmn.species_data.id, pkmn.level, true)
+    else
+      $PokemonGlobal.roamPokemon[idxRoamer] = pbGenerateWildPokemon(pkmn, level, true)
+    end
   end
   # Set some battle rules
   setBattleRule("single")

Data/Scripts/018_Alternate battle modes/001_SafariZone.rb

@@ -115,8 +115,9 @@ EventHandlers.add(:on_calling_wild_battle, :safari_battle,
   }
 )
 
-def pbSafariBattle(pkmn)
+def pbSafariBattle(pkmn, level = 1)
   # Generate a wild Pokémon based on the species and level
+  pkmn = pbGenerateWildPokemon(pkmn, level) if !pkmn.is_a?(Pokemon)
   foeParty = [pkmn]
   # Calculate who the trainer is
   playerTrainer = $player

Data/Scripts/018_Alternate battle modes/002_BugContest.rb

@@ -365,10 +365,12 @@ EventHandlers.add(:on_calling_wild_battle, :bug_contest_battle,
   }
 )
 
-def pbBugContestBattle(pkmn)
+def pbBugContestBattle(pkmn, level = 1)
   # Record information about party Pokémon to be used at the end of battle (e.g.
   # comparing levels for an evolution check)
   EventHandlers.trigger(:on_start_battle)
+  # Generate a wild Pokémon based on the species and level
+  pkmn = pbGenerateWildPokemon(pkmn, level) if !pkmn.is_a?(Pokemon)
   foeParty = [pkmn]
   # Calculate who the trainers and their party are
   playerTrainer     = [$player]