More aligning of code

Data/Scripts/013_Items/001_Item_Utilities.rb

@@ -161,9 +161,9 @@ def pbChangeLevel(pkmn, new_level, scene)
     special_defense_diff = pkmn.spdef - old_special_defense
     speed_diff           = pkmn.speed - old_speed
     pbTopRightWindow(_INTL("Max. HP<r>{1}\r\nAttack<r>{2}\r\nDefense<r>{3}\r\nSp. Atk<r>{4}\r\nSp. Def<r>{5}\r\nSpeed<r>{6}",
-       total_hp_diff, attack_diff, defense_diff, special_attack_diff, special_defense_diff, speed_diff), scene)
+                           total_hp_diff, attack_diff, defense_diff, special_attack_diff, special_defense_diff, speed_diff), scene)
     pbTopRightWindow(_INTL("Max. HP<r>{1}\r\nAttack<r>{2}\r\nDefense<r>{3}\r\nSp. Atk<r>{4}\r\nSp. Def<r>{5}\r\nSpeed<r>{6}",
-       pkmn.totalhp, pkmn.attack, pkmn.defense, pkmn.spatk, pkmn.spdef, pkmn.speed), scene)
+                           pkmn.totalhp, pkmn.attack, pkmn.defense, pkmn.spatk, pkmn.spdef, pkmn.speed), scene)
   else
     pkmn.changeHappiness("vitamin")
     if scene.is_a?(PokemonPartyScreen)
@@ -178,9 +178,9 @@ def pbChangeLevel(pkmn, new_level, scene)
     special_defense_diff = pkmn.spdef - old_special_defense
     speed_diff           = pkmn.speed - old_speed
     pbTopRightWindow(_INTL("Max. HP<r>+{1}\r\nAttack<r>+{2}\r\nDefense<r>+{3}\r\nSp. Atk<r>+{4}\r\nSp. Def<r>+{5}\r\nSpeed<r>+{6}",
-       total_hp_diff, attack_diff, defense_diff, special_attack_diff, special_defense_diff, speed_diff), scene)
+                           total_hp_diff, attack_diff, defense_diff, special_attack_diff, special_defense_diff, speed_diff), scene)
     pbTopRightWindow(_INTL("Max. HP<r>{1}\r\nAttack<r>{2}\r\nDefense<r>{3}\r\nSp. Atk<r>{4}\r\nSp. Def<r>{5}\r\nSpeed<r>{6}",
-       pkmn.totalhp, pkmn.attack, pkmn.defense, pkmn.spatk, pkmn.spdef, pkmn.speed), scene)
+                           pkmn.totalhp, pkmn.attack, pkmn.defense, pkmn.spatk, pkmn.spdef, pkmn.speed), scene)
     # Learn new moves upon level up
     movelist = pkmn.getMoveList
     for i in movelist
@@ -259,9 +259,9 @@ def pbChangeExp(pkmn, new_exp, scene)
     special_defense_diff = pkmn.spdef - old_special_defense
     speed_diff           = pkmn.speed - old_speed
     pbTopRightWindow(_INTL("Max. HP<r>{1}\r\nAttack<r>{2}\r\nDefense<r>{3}\r\nSp. Atk<r>{4}\r\nSp. Def<r>{5}\r\nSpeed<r>{6}",
-       total_hp_diff, attack_diff, defense_diff, special_attack_diff, special_defense_diff, speed_diff), scene)
+                           total_hp_diff, attack_diff, defense_diff, special_attack_diff, special_defense_diff, speed_diff), scene)
     pbTopRightWindow(_INTL("Max. HP<r>{1}\r\nAttack<r>{2}\r\nDefense<r>{3}\r\nSp. Atk<r>{4}\r\nSp. Def<r>{5}\r\nSpeed<r>{6}",
-       pkmn.totalhp, pkmn.attack, pkmn.defense, pkmn.spatk, pkmn.spdef, pkmn.speed), scene)
+                           pkmn.totalhp, pkmn.attack, pkmn.defense, pkmn.spatk, pkmn.spdef, pkmn.speed), scene)
   else   # Gains Exp
     difference = new_exp - pkmn.exp
     if scene.is_a?(PokemonPartyScreen)
@@ -287,9 +287,9 @@ def pbChangeExp(pkmn, new_exp, scene)
     special_defense_diff = pkmn.spdef - old_special_defense
     speed_diff           = pkmn.speed - old_speed
     pbTopRightWindow(_INTL("Max. HP<r>+{1}\r\nAttack<r>+{2}\r\nDefense<r>+{3}\r\nSp. Atk<r>+{4}\r\nSp. Def<r>+{5}\r\nSpeed<r>+{6}",
-       total_hp_diff, attack_diff, defense_diff, special_attack_diff, special_defense_diff, speed_diff), scene)
+                           total_hp_diff, attack_diff, defense_diff, special_attack_diff, special_defense_diff, speed_diff), scene)
     pbTopRightWindow(_INTL("Max. HP<r>{1}\r\nAttack<r>{2}\r\nDefense<r>{3}\r\nSp. Atk<r>{4}\r\nSp. Def<r>{5}\r\nSpeed<r>{6}",
-       pkmn.totalhp, pkmn.attack, pkmn.defense, pkmn.spatk, pkmn.spdef, pkmn.speed), scene)
+                           pkmn.totalhp, pkmn.attack, pkmn.defense, pkmn.spatk, pkmn.spdef, pkmn.speed), scene)
     # Learn new moves upon level up
     movelist = pkmn.getMoveList
     for i in movelist
@@ -495,7 +495,7 @@ def pbNatureChangingMint(new_nature, item, pkmn, scene)
   pkmn.calc_stats
   scene.pbRefresh
   scene.pbDisplay(_INTL("{1}'s stats may have changed due to the effects of the {2}!",
-     pkmn.name, GameData::Item.get(item).name))
+                        pkmn.name, GameData::Item.get(item).name))
   return true
 end
 
@@ -596,7 +596,7 @@ def pbLearnMove(pkmn, move, ignore_if_known = false, by_machine = false, &block)
     return true
   end
   pbMessage(_INTL("{1} wants to learn {2}, but it already knows {3} moves.\1",
-     pkmn_name, move_name, pkmn.numMoves.to_word), &block)
+                  pkmn_name, move_name, pkmn.numMoves.to_word), &block)
   if pbConfirmMessage(_INTL("Should {1} forget a move to learn {2}?", pkmn_name, move_name), &block)
     loop do
       move_index = pbForgetMove(pkmn, move)
@@ -688,7 +688,8 @@ def pbUseItem(bag, item, bagscene = nil)
         max_at_once = [max_at_once, $bag.quantity(item)].min
         if max_at_once > 1
           qty = screen.scene.pbChooseNumber(
-             _INTL("How many {1} do you want to use?", GameData::Item.get(item).name), max_at_once)
+            _INTL("How many {1} do you want to use?", GameData::Item.get(item).name), max_at_once
+          )
           screen.scene.pbSetHelpText("") if screen.is_a?(PokemonPartyScreen)
         end
         if qty >= 1
@@ -749,7 +750,8 @@ def pbUseItemOnPokemon(item, pkmn, scene)
   max_at_once = [max_at_once, $bag.quantity(item)].min
   if max_at_once > 1
     qty = scene.scene.pbChooseNumber(
-       _INTL("How many {1} do you want to use?", itm.name), max_at_once)
+      _INTL("How many {1} do you want to use?", itm.name), max_at_once
+    )
     scene.scene.pbSetHelpText("") if scene.is_a?(PokemonPartyScreen)
   end
   return false if qty <= 0

Data/Scripts/013_Items/004_Item_Phone.rb

@@ -48,7 +48,7 @@ def pbPhoneRegisterBattle(message, event, trainertype, trainername, maxbattles)
   message = _INTL("Let me register you.") if !message
   return if !pbConfirmMessage(message)
   displayname = _INTL("{1} {2}", GameData::TrainerType.get(trainertype).name,
-     pbGetMessageFromHash(MessageTypes::TrainerNames, trainername))
+                      pbGetMessageFromHash(MessageTypes::TrainerNames, trainername))
   if contact                          # Previously registered, just make visible
     contact[0] = true
   else                                                         # Add new contact

Data/Scripts/013_Items/005_Item_PokeRadar.rb

@@ -35,7 +35,7 @@ def pbCanUsePokeRadar?
   # Can't use Radar if it isn't fully charged
   if $PokemonGlobal.pokeradarBattery && $PokemonGlobal.pokeradarBattery > 0
     pbMessage(_INTL("The battery has run dry!\nFor it to recharge, you need to walk another {1} steps.",
-       $PokemonGlobal.pokeradarBattery))
+                    $PokemonGlobal.pokeradarBattery))
     return false
   end
   return true

Data/Scripts/013_Items/006_Item_Mail.rb

@@ -41,22 +41,25 @@ def pbDisplayMail(mail, _bearer = nil)
   if GameData::Item.get(mail.item).is_icon_mail?
     if mail.poke1
       sprites["bearer"] = IconSprite.new(64, 288, viewport)
-      bitmapFileName = GameData::Species.icon_filename(mail.poke1[0],
-         mail.poke1[3], mail.poke1[1], mail.poke1[2], mail.poke1[4], mail.poke1[5])
+      bitmapFileName = GameData::Species.icon_filename(
+        mail.poke1[0], mail.poke1[3], mail.poke1[1], mail.poke1[2], mail.poke1[4], mail.poke1[5]
+      )
       sprites["bearer"].setBitmap(bitmapFileName)
       sprites["bearer"].src_rect.set(0, 0, 64, 64)
     end
     if mail.poke2
       sprites["bearer2"] = IconSprite.new(144, 288, viewport)
-      bitmapFileName = GameData::Species.icon_filename(mail.poke2[0],
-         mail.poke2[3], mail.poke2[1], mail.poke2[2], mail.poke2[4], mail.poke2[5])
+      bitmapFileName = GameData::Species.icon_filename(
+        mail.poke2[0], mail.poke2[3], mail.poke2[1], mail.poke2[2], mail.poke2[4], mail.poke2[5]
+      )
       sprites["bearer2"].setBitmap(bitmapFileName)
       sprites["bearer2"].src_rect.set(0, 0, 64, 64)
     end
     if mail.poke3
       sprites["bearer3"] = IconSprite.new(224, 288, viewport)
-      bitmapFileName = GameData::Species.icon_filename(mail.poke3[0],
-         mail.poke3[3], mail.poke3[1], mail.poke3[2], mail.poke3[4], mail.poke3[5])
+      bitmapFileName = GameData::Species.icon_filename(
+        mail.poke3[0], mail.poke3[3], mail.poke3[1], mail.poke3[2], mail.poke3[4], mail.poke3[5]
+      )
       sprites["bearer3"].setBitmap(bitmapFileName)
       sprites["bearer3"].src_rect.set(0, 0, 64, 64)
     end
@@ -68,14 +71,14 @@ def pbDisplayMail(mail, _bearer = nil)
   if mail.message && mail.message != ""
     isDark = isDarkBackground(sprites["card"].bitmap, Rect.new(48, 48, Graphics.width - 96, 32 * 7))
     drawTextEx(overlay, 48, 52, Graphics.width - (48 * 2), 7, mail.message,
-       (isDark) ? baseForDarkBG : baseForLightBG,
-       (isDark) ? shadowForDarkBG : shadowForLightBG)
+               (isDark) ? baseForDarkBG : baseForLightBG,
+               (isDark) ? shadowForDarkBG : shadowForLightBG)
   end
   if mail.sender && mail.sender != ""
     isDark = isDarkBackground(sprites["card"].bitmap, Rect.new(336, 322, 144, 32 * 1))
     drawTextEx(overlay, 336, 326, 144, 1, mail.sender,
-       (isDark) ? baseForDarkBG : baseForLightBG,
-       (isDark) ? shadowForDarkBG : shadowForLightBG)
+               (isDark) ? baseForDarkBG : baseForLightBG,
+               (isDark) ? shadowForDarkBG : shadowForLightBG)
   end
   pbFadeInAndShow(sprites)
   loop do
@@ -95,7 +98,7 @@ def pbWriteMail(item, pkmn, pkmnid, scene)
   message = ""
   loop do
     message = pbMessageFreeText(_INTL("Please enter a message (max. 250 characters)."),
-       "", false, 250, Graphics.width) { scene.pbUpdate }
+                                "", false, 250, Graphics.width) { scene.pbUpdate }
     if message != ""
       # Store mail if a message was written
       poke1 = poke2 = nil

Data/Scripts/013_Items/008_PokemonBag.rb

@@ -78,7 +78,8 @@ class PokemonBag
     max_size = max_pocket_size(pocket)
     max_size = @pockets[pocket].length + 1 if max_size < 0   # Infinite size
     return ItemStorageHelper.can_add?(
-       @pockets[pocket], max_size, Settings::BAG_MAX_PER_SLOT, item_data.id, qty)
+      @pockets[pocket], max_size, Settings::BAG_MAX_PER_SLOT, item_data.id, qty
+    )
   end
 
   def add(item, qty = 1)
@@ -88,7 +89,7 @@ class PokemonBag
     max_size = max_pocket_size(pocket)
     max_size = @pockets[pocket].length + 1 if max_size < 0   # Infinite size
     ret = ItemStorageHelper.add(@pockets[pocket],
-       max_size, Settings::BAG_MAX_PER_SLOT, item_data.id, qty)
+                                max_size, Settings::BAG_MAX_PER_SLOT, item_data.id, qty)
     if ret && Settings::BAG_POCKET_AUTO_SORT[pocket - 1]
       @pockets[pocket].sort! { |a, b| GameData::Item.keys.index(a[0]) <=> GameData::Item.keys.index(b[0]) }
     end