Lots of rubocop

Data/Scripts/011_Battle/006_Other battle code/005_Battle_CatchAndStoreMixin.rb

@@ -26,10 +26,10 @@ module Battle::CatchAndStoreMixin
         when 0   # Add to your party
           pbDisplay(_INTL("Choose a Pokémon in your party to send to your Boxes."))
           party_index = -1
-          @scene.pbPartyScreen(0, (@sendToBoxes != 2), 1) { |idxParty, _partyScene|
+          @scene.pbPartyScreen(0, (@sendToBoxes != 2), 1) do |idxParty, _partyScene|
             party_index = idxParty
             next true
-          }
+          end
           next if party_index < 0   # Cancelled
           party_size = pbPlayer.party.length
           # Send chosen Pokémon to storage
@@ -56,11 +56,11 @@ module Battle::CatchAndStoreMixin
         when 1   # Send to a Box
           break
         when 2   # See X's summary
-          pbFadeOutIn {
+          pbFadeOutIn do
             summary_scene = PokemonSummary_Scene.new
             summary_screen = PokemonSummaryScreen.new(summary_scene, true)
             summary_screen.pbStartScreen([pkmn], 0)
-          }
+          end
         when 3   # Check party
           @scene.pbPartyScreen(0, true, 2)
         end

Data/Scripts/011_Battle/006_Other battle code/008_Battle_AbilityEffects.rb

@@ -1240,9 +1240,7 @@ Battle::AbilityEffects::DamageCalcFromUser.add(:DRAGONSMAW,
 
 Battle::AbilityEffects::DamageCalcFromUser.add(:FLAREBOOST,
   proc { |ability, user, target, move, mults, baseDmg, type|
-    if user.burned? && move.specialMove?
-      mults[:base_damage_multiplier] *= 1.5
-    end
+    mults[:base_damage_multiplier] *= 1.5 if user.burned? && move.specialMove?
   }
 )
 
@@ -1384,9 +1382,7 @@ Battle::AbilityEffects::DamageCalcFromUser.add(:SOLARPOWER,
 
 Battle::AbilityEffects::DamageCalcFromUser.add(:SNIPER,
   proc { |ability, user, target, move, mults, baseDmg, type|
-    if target.damageState.critical
-      mults[:final_damage_multiplier] *= 1.5
-    end
+    mults[:final_damage_multiplier] *= 1.5 if target.damageState.critical
   }
 )
 
@@ -1546,9 +1542,7 @@ Battle::AbilityEffects::DamageCalcFromTarget.add(:FURCOAT,
 
 Battle::AbilityEffects::DamageCalcFromTarget.add(:GRASSPELT,
   proc { |ability, user, target, move, mults, baseDmg, type|
-    if user.battle.field.terrain == :Grassy
-      mults[:defense_multiplier] *= 1.5
-    end
+    mults[:defense_multiplier] *= 1.5 if user.battle.field.terrain == :Grassy
   }
 )
 
@@ -1610,9 +1604,7 @@ Battle::AbilityEffects::DamageCalcFromTargetNonIgnorable.add(:PRISMARMOR,
 
 Battle::AbilityEffects::DamageCalcFromTargetNonIgnorable.add(:SHADOWSHIELD,
   proc { |ability, user, target, move, mults, baseDmg, type|
-    if target.hp == target.totalhp
-      mults[:final_damage_multiplier] /= 2
-    end
+    mults[:final_damage_multiplier] /= 2 if target.hp == target.totalhp
   }
 )
 
@@ -2425,7 +2417,7 @@ Battle::AbilityEffects::EndOfRoundEffect.add(:BADDREAMS,
       next if !b.near?(battler) || !b.asleep?
       battle.pbShowAbilitySplash(battler)
       next if !b.takesIndirectDamage?(Battle::Scene::USE_ABILITY_SPLASH)
-      b.pbTakeEffectDamage(b.totalhp / 8) { |hp_lost|
+      b.pbTakeEffectDamage(b.totalhp / 8) do |hp_lost|
         if Battle::Scene::USE_ABILITY_SPLASH
           battle.pbDisplay(_INTL("{1} is tormented!", b.pbThis))
         else
@@ -2433,7 +2425,7 @@ Battle::AbilityEffects::EndOfRoundEffect.add(:BADDREAMS,
              b.pbThis, battler.pbThis(true), battler.abilityName))
         end
         battle.pbHideAbilitySplash(battler)
-      }
+      end
     end
   }
 )

Data/Scripts/011_Battle/006_Other battle code/009_Battle_ItemEffects.rb

@@ -889,9 +889,7 @@ Battle::ItemEffects::DamageCalcFromUser.add(:LIFEORB,
 
 Battle::ItemEffects::DamageCalcFromUser.add(:LIGHTBALL,
   proc { |item, user, target, move, mults, baseDmg, type|
-    if user.isSpecies?(:PIKACHU)
-      mults[:attack_multiplier] *= 2
-    end
+    mults[:attack_multiplier] *= 2 if user.isSpecies?(:PIKACHU)
   }
 )
 
@@ -1844,9 +1842,9 @@ Battle::ItemEffects::EndOfRoundHealing.add(:BLACKSLUDGE,
          battler.pbThis, battler.itemName))
     elsif battler.takesIndirectDamage?
       battle.pbCommonAnimation("UseItem", battler)
-      battler.pbTakeEffectDamage(battler.totalhp / 8) { |hp_lost|
+      battler.pbTakeEffectDamage(battler.totalhp / 8) do |hp_lost|
         battle.pbDisplay(_INTL("{1} is hurt by its {2}!", battler.pbThis, battler.itemName))
-      }
+      end
     end
   }
 )
@@ -1876,9 +1874,9 @@ Battle::ItemEffects::EndOfRoundEffect.add(:STICKYBARB,
   proc { |item, battler, battle|
     next if !battler.takesIndirectDamage?
     battle.scene.pbDamageAnimation(battler)
-    battler.pbTakeEffectDamage(battler.totalhp / 8, false) { |hp_lost|
+    battler.pbTakeEffectDamage(battler.totalhp / 8, false) do |hp_lost|
       battle.pbDisplay(_INTL("{1} is hurt by its {2}!", battler.pbThis, battler.itemName))
-    }
+    end
   }
 )