Refactored battle-starting methods into WildBattle.start and TrainerBattle.start, etc.

Data/Scripts/018_Alternate battle modes/001_Battle Frontier/004_Challenge_Battles.rb

@@ -54,14 +54,14 @@ def pbOrganizedBattleEx(opponent, challengedata, endspeech, endspeechwin)
   olditems  = $player.party.transform { |p| p.item_id }
   olditems2 = opponent.party.transform { |p| p.item_id }
   # Create the battle scene (the visual side of it)
-  scene = pbNewBattleScene
+  scene = BattleCreationHelperMethods.create_battle_scene
   # Create the battle class (the mechanics side of it)
   battle = challengedata.createBattle(scene, $player, opponent)
   battle.internalBattle = false
   battle.endSpeeches    = [endspeech]
   battle.endSpeechesWin = [endspeechwin]
   # Set various other properties in the battle class
-  pbPrepareBattle(battle)
+  BattleCreationHelperMethods.prepare_battle(battle)
   # Perform the battle itself
   decision = 0
   pbBattleAnimation(pbGetTrainerBattleBGM(opponent)) {
@@ -114,7 +114,7 @@ end
 
 def pbPlayBattle(battledata)
   return if !battledata
-  scene = pbNewBattleScene
+  scene = BattleCreationHelperMethods.create_battle_scene
   scene.abortable = true
   lastbattle = Marshal.restore(battledata)
   case lastbattle[0]

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

@@ -121,11 +121,11 @@ def pbSafariBattle(species, level)
   # Calculate who the trainer is
   playerTrainer = $player
   # Create the battle scene (the visual side of it)
-  scene = pbNewBattleScene
+  scene = BattleCreationHelperMethods.create_battle_scene
   # Create the battle class (the mechanics side of it)
   battle = SafariBattle.new(scene, playerTrainer, foeParty)
   battle.ballCount = pbSafariState.ballcount
-  pbPrepareBattle(battle)
+  BattleCreationHelperMethods.prepare_battle(battle)
   # Perform the battle itself
   decision = 0
   pbBattleAnimation(pbGetWildBattleBGM(foeParty), 0, foeParty) {

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

@@ -364,18 +364,18 @@ def pbBugContestBattle(species, level)
   playerParty       = $player.party
   playerPartyStarts = [0]
   # Create the battle scene (the visual side of it)
-  scene = pbNewBattleScene
+  scene = BattleCreationHelperMethods.create_battle_scene
   # Create the battle class (the mechanics side of it)
   battle = BugContestBattle.new(scene, playerParty, foeParty, playerTrainer, nil)
   battle.party1starts = playerPartyStarts
   battle.ballCount    = pbBugContestState.ballcount
   setBattleRule("single")
-  pbPrepareBattle(battle)
+  BattleCreationHelperMethods.prepare_battle(battle)
   # Perform the battle itself
   decision = 0
   pbBattleAnimation(pbGetWildBattleBGM(foeParty), 0, foeParty) {
     decision = battle.pbStartBattle
-    pbAfterBattle(decision, true)
+    BattleCreationHelperMethods.after_battle(decision, true)
     if [2, 5].include?(decision)   # Lost or drew
       $game_system.bgm_unpause
       $game_system.bgs_unpause
@@ -390,19 +390,7 @@ def pbBugContestBattle(species, level)
     pbBugContestState.pbStartJudging
   end
   # Save the result of the battle in Game Variable 1
-  #    0 - Undecided or aborted
-  #    1 - Player won
-  #    2 - Player lost
-  #    3 - Player or wild Pokémon ran from battle, or player forfeited the match
-  #    4 - Wild Pokémon was caught
-  #    5 - Draw
-  case decision
-  when 1, 4   # Won, caught
-    $stats.wild_battles_won += 1
-  when 2, 3, 5   # Lost, fled, draw
-    $stats.wild_battles_lost += 1
-  end
-  pbSet(1, decision)
+  BattleCreationHelperMethods(decision, 1)
   # Used by the Poké Radar to update/break the chain
   EventHandlers.trigger(:on_wild_battle_end, species, level, decision)
   # Return false if the player lost or drew the battle, and true if any other result