More Rubocopping

Data/Scripts/011_Battle/001_Battle/001_Battle.rb

@@ -281,7 +281,7 @@ class Battle
   # on the given side of battle.
   def pbNumPositions(side, idxTrainer)
     ret = 0
-    for i in 0...pbSideSize(side)
+    pbSideSize(side).times do |i|
       t = pbGetOwnerIndexFromBattlerIndex((i * 2) + side)
       next if t != idxTrainer
       ret += 1
@@ -618,7 +618,7 @@ class Battle
                      PBEffects::SkyDrop,
                      PBEffects::TrappingUser]
     allBattlers.each do |b|
-      for i in effectsToSwap
+      effectsToSwap.each do |i|
         next if b.effects[i] != idxA && b.effects[i] != idxB
         b.effects[i] = (b.effects[i] == idxA) ? idxB : idxA
       end

Data/Scripts/011_Battle/001_Battle/002_Battle_StartAndEnd.rb

@@ -43,12 +43,12 @@ class Battle
     # side if necessary
     loop do
       needsChanging = false
-      for side in 0...2   # Each side in turn
+      2.times do |side|   # Each side in turn
         next if side == 1 && wildBattle?   # Wild side's size already checked above
         sideCounts = (side == 0) ? side1counts : side2counts
         requireds = []
         # Find out how many Pokémon each trainer on side needs to have
-        for i in 0...@sideSizes[side]
+        @sideSizes[side].times do |i|
           idxTrainer = pbGetOwnerIndexFromBattlerIndex((i * 2) + side)
           requireds[idxTrainer] = 0 if requireds[idxTrainer].nil?
           requireds[idxTrainer] += 1
@@ -90,7 +90,7 @@ class Battle
       if newSize == 0
         raise _INTL("Couldn't lower either side's size any further, battle isn't possible")
       end
-      for side in 0...2
+      2.times do |side|
         next if side == 1 && wildBattle?   # Wild Pokémon's side size is fixed
         next if @sideSizes[side] == 1 || newSize > @sideSizes[side]
         @sideSizes[side] = newSize
@@ -115,7 +115,7 @@ class Battle
 
   def pbSetUpSides
     ret = [[], []]
-    for side in 0...2
+    2.times do |side|
       # Set up wild Pokémon
       if side == 1 && wildBattle?
         pbParty(1).each_with_index do |pkmn, idxPkmn|
@@ -131,7 +131,7 @@ class Battle
       trainer = (side == 0) ? @player : @opponent
       requireds = []
       # Find out how many Pokémon each trainer on side needs to have
-      for i in 0...@sideSizes[side]
+      @sideSizes[side].times do |i|
         idxTrainer = pbGetOwnerIndexFromBattlerIndex((i * 2) + side)
         requireds[idxTrainer] = 0 if requireds[idxTrainer].nil?
         requireds[idxTrainer] += 1
@@ -184,7 +184,7 @@ class Battle
       end
     end
     # Send out Pokémon (opposing trainers first)
-    for side in [1, 0]
+    [1, 0].each do |side|
       next if side == 1 && wildBattle?
       msg = ""
       toSendOut = []
@@ -496,7 +496,7 @@ class Battle
   def pbDecisionOnTime
     counts   = [0, 0]
     hpTotals = [0, 0]
-    for side in 0...2
+    2.times do |side|
       pbParty(side).each do |pkmn|
         next if !pkmn || !pkmn.able?
         counts[side]   += 1
@@ -514,7 +514,7 @@ class Battle
   def pbDecisionOnTime2
     counts   = [0, 0]
     hpTotals = [0, 0]
-    for side in 0...2
+    2.times do |side|
       pbParty(side).each do |pkmn|
         next if !pkmn || !pkmn.able?
         counts[side]   += 1

Data/Scripts/011_Battle/001_Battle/004_Battle_ActionAttacksPriority.rb

@@ -144,7 +144,7 @@ class Battle
         randomOrder[i], randomOrder[r] = randomOrder[r], randomOrder[i]
       end
       @priority.clear
-      for i in 0..maxBattlerIndex
+      (0..maxBattlerIndex).each do |i|
         b = @battlers[i]
         next if !b
         # [battler, speed, sub-priority, priority, tie-breaker order]

Data/Scripts/011_Battle/001_Battle/009_Battle_CommandPhase.rb

@@ -179,7 +179,7 @@ class Battle
       pbClearChoice(i) if pbCanShowCommands?(i)
     end
     # Reset choices to perform Mega Evolution if it wasn't done somehow
-    for side in 0...2
+    2.times do |side|
       @megaEvolution[side].each_with_index do |megaEvo, i|
         @megaEvolution[side][i] = -1 if megaEvo >= 0
       end

Data/Scripts/011_Battle/001_Battle/011_Battle_EndOfRoundPhase.rb

@@ -148,7 +148,7 @@ class Battle
     #       is not generalised to larger side sizes.
     if !singleBattle?
       swaps = []   # Each element is an array of two battler indices to swap
-      for side in 0...2
+      2.times do |side|
         next if pbSideSize(side) == 1   # Only battlers on sides of size 2+ need to move
         # Check if any battler on this side is near any battler on the other side
         anyNear = false
@@ -256,7 +256,7 @@ class Battle
       pbDisplay(_INTL("{1}'s wish came true!", wishMaker))
     end
     # Sea of Fire damage (Fire Pledge + Grass Pledge combination)
-    for side in 0...2
+    2.times do |side|
       next if sides[side].effects[PBEffects::SeaOfFire] == 0
       @battle.pbCommonAnimation("SeaOfFire") if side == 0
       @battle.pbCommonAnimation("SeaOfFireOpp") if side == 1
@@ -516,7 +516,7 @@ class Battle
       pbGainExp
       return
     end
-    for side in 0...2
+    2.times do |side|
       # Reflect
       pbEORCountDownSideEffect(side, PBEffects::Reflect,
                                _INTL("{1}'s Reflect wore off!", @battlers[side].pbTeam))
@@ -664,7 +664,7 @@ class Battle
       b.lastFoeAttacker.clear
     end
     # Reset/count down side-specific effects (no messages)
-    for side in 0...2
+    2.times do |side|
       @sides[side].effects[PBEffects::CraftyShield]         = false
       if !@sides[side].effects[PBEffects::EchoedVoiceUsed]
         @sides[side].effects[PBEffects::EchoedVoiceCounter] = 0