Lots of rubocop

2025-12-08 05:34:58 +00:00 · 2023-01-28 15:21:12 +00:00
parent 2d056052ce
commit 13aab8d911
159 changed files with 1679 additions and 1931 deletions
--- a/Data/Scripts/016_UI/001_Non-interactive
+++ b/Data/Scripts/016_UI/001_Non-interactive
@@ -109,11 +109,11 @@ class PokemonEggHatch_Scene
    if Settings::SHOW_NEW_SPECIES_POKEDEX_ENTRY_MORE_OFTEN && !was_owned && $player.has_pokedex
      pbMessage(_INTL("{1}'s data was added to the Pokédex.", @pokemon.name)) { update }
      $player.pokedex.register_last_seen(@pokemon)
-      pbFadeOutIn {
+      pbFadeOutIn do
        scene = PokemonPokedexInfo_Scene.new
        screen = PokemonPokedexInfoScreen.new(scene)
        screen.pbDexEntry(@pokemon.species)
-      }
+      end
    end
    # Nickname the Pokémon
    if $PokemonSystem.givenicknames == 0 &&
@@ -195,11 +195,11 @@ end
 #===============================================================================
 def pbHatchAnimation(pokemon)
  pbMessage(_INTL("Huh?\1"))
-  pbFadeOutInWithMusic {
+  pbFadeOutInWithMusic do
    scene = PokemonEggHatch_Scene.new
    screen = PokemonEggHatchScreen.new(scene)
    screen.pbStartScreen(pokemon)
-  }
+  end
  return true
 end

@@ -226,11 +226,11 @@ def pbHatch(pokemon)
    if Settings::SHOW_NEW_SPECIES_POKEDEX_ENTRY_MORE_OFTEN && !was_owned && $player.has_pokedex
      pbMessage(_INTL("{1}'s data was added to the Pokédex.", speciesname))
      $player.pokedex.register_last_seen(pokemon)
-      pbFadeOutIn {
+      pbFadeOutIn do
        scene = PokemonPokedexInfo_Scene.new
        screen = PokemonPokedexInfoScreen.new(scene)
        screen.pbDexEntry(pokemon.species)
-      }
+      end
    end
    # Nickname the Pokémon
    if $PokemonSystem.givenicknames == 0 &&
--- a/Data/Scripts/016_UI/001_Non-interactive
+++ b/Data/Scripts/016_UI/001_Non-interactive
@@ -617,13 +617,13 @@ class PokemonEvolutionScene
      pbMessageDisplay(@sprites["msgwindow"],
                       _INTL("{1}'s data was added to the Pokédex.", newspeciesname)) { pbUpdate }
      $player.pokedex.register_last_seen(@pokemon)
-      pbFadeOutIn {
+      pbFadeOutIn do
        scene = PokemonPokedexInfo_Scene.new
        screen = PokemonPokedexInfoScreen.new(scene)
        screen.pbDexEntry(@pokemon.species)
        @sprites["msgwindow"].text = "" if moves_to_learn.length > 0
        pbEndScreen(false) if moves_to_learn.length == 0
-      }
+      end
    end
    # Learn moves upon evolution for evolved species
    moves_to_learn.each do |move|
--- a/Data/Scripts/016_UI/001_Non-interactive
+++ b/Data/Scripts/016_UI/001_Non-interactive
@@ -195,12 +195,12 @@ class PokemonTrade_Scene
      pbMessageDisplay(@sprites["msgwindow"],
                       _INTL("{1}'s data was added to the Pokédex.", speciesname2)) { pbUpdate }
      $player.pokedex.register_last_seen(@pokemon2)
-      pbFadeOutIn {
+      pbFadeOutIn do
        scene = PokemonPokedexInfo_Scene.new
        screen = PokemonPokedexInfoScreen.new(scene)
        screen.pbDexEntry(@pokemon2.species)
        pbEndScreen(false)
-      }
+      end
    end
  end
 end
@@ -227,11 +227,11 @@ def pbStartTrade(pokemonIndex, newpoke, nickname, trainerName, trainerGender = 0
  yourPokemon.obtain_method = 2   # traded
  yourPokemon.reset_moves if resetmoves
  yourPokemon.record_first_moves
-  pbFadeOutInWithMusic {
+  pbFadeOutInWithMusic do
    evo = PokemonTrade_Scene.new
    evo.pbStartScreen(myPokemon, yourPokemon, $player.name, trainerName)
    evo.pbTrade
    evo.pbEndScreen
-  }
+  end
  $player.party[pokemonIndex] = yourPokemon
 end
--- a/Data/Scripts/016_UI/001_UI_PauseMenu.rb
+++ b/Data/Scripts/016_UI/001_UI_PauseMenu.rb
@@ -137,27 +137,27 @@ MenuHandlers.add(:pause_menu, :pokedex, {
  "effect"    => proc { |menu|
    pbPlayDecisionSE
    if Settings::USE_CURRENT_REGION_DEX
-      pbFadeOutIn {
+      pbFadeOutIn do
        scene = PokemonPokedex_Scene.new
        screen = PokemonPokedexScreen.new(scene)
        screen.pbStartScreen
        menu.pbRefresh
-      }
+      end
    elsif $player.pokedex.accessible_dexes.length == 1
      $PokemonGlobal.pokedexDex = $player.pokedex.accessible_dexes[0]
-      pbFadeOutIn {
+      pbFadeOutIn do
        scene = PokemonPokedex_Scene.new
        screen = PokemonPokedexScreen.new(scene)
        screen.pbStartScreen
        menu.pbRefresh
-      }
+      end
    else
-      pbFadeOutIn {
+      pbFadeOutIn do
        scene = PokemonPokedexMenu_Scene.new
        screen = PokemonPokedexMenuScreen.new(scene)
        screen.pbStartScreen
        menu.pbRefresh
-      }
+      end
    end
    next false
  }
@@ -170,12 +170,12 @@ MenuHandlers.add(:pause_menu, :party, {
  "effect"    => proc { |menu|
    pbPlayDecisionSE
    hidden_move = nil
-    pbFadeOutIn {
+    pbFadeOutIn do
      sscene = PokemonParty_Scene.new
      sscreen = PokemonPartyScreen.new(sscene, $player.party)
      hidden_move = sscreen.pbPokemonScreen
      (hidden_move) ? menu.pbEndScene : menu.pbRefresh
-    }
+    end
    next false if !hidden_move
    $game_temp.in_menu = false
    pbUseHiddenMove(hidden_move[0], hidden_move[1])
@@ -190,12 +190,12 @@ MenuHandlers.add(:pause_menu, :bag, {
  "effect"    => proc { |menu|
    pbPlayDecisionSE
    item = nil
-    pbFadeOutIn {
+    pbFadeOutIn do
      scene = PokemonBag_Scene.new
      screen = PokemonBagScreen.new(scene, $bag)
      item = screen.pbStartScreen
      (item) ? menu.pbEndScene : menu.pbRefresh
-    }
+    end
    next false if !item
    $game_temp.in_menu = false
    pbUseKeyItemInField(item)
@@ -209,12 +209,12 @@ MenuHandlers.add(:pause_menu, :pokegear, {
  "condition" => proc { next $player.has_pokegear },
  "effect"    => proc { |menu|
    pbPlayDecisionSE
-    pbFadeOutIn {
+    pbFadeOutIn do
      scene = PokemonPokegear_Scene.new
      screen = PokemonPokegearScreen.new(scene)
      screen.pbStartScreen
      ($game_temp.fly_destination) ? menu.pbEndScene : menu.pbRefresh
-    }
+    end
    next pbFlyToNewLocation
  }
 })
@@ -225,13 +225,13 @@ MenuHandlers.add(:pause_menu, :town_map, {
  "condition" => proc { next !$player.has_pokegear && $bag.has?(:TOWNMAP) },
  "effect"    => proc { |menu|
    pbPlayDecisionSE
-    pbFadeOutIn {
+    pbFadeOutIn do
      scene = PokemonRegionMap_Scene.new(-1, false)
      screen = PokemonRegionMapScreen.new(scene)
      ret = screen.pbStartScreen
      $game_temp.fly_destination = ret if ret
      ($game_temp.fly_destination) ? menu.pbEndScene : menu.pbRefresh
-    }
+    end
    next pbFlyToNewLocation
  }
 })
@@ -241,12 +241,12 @@ MenuHandlers.add(:pause_menu, :trainer_card, {
  "order"     => 50,
  "effect"    => proc { |menu|
    pbPlayDecisionSE
-    pbFadeOutIn {
+    pbFadeOutIn do
      scene = PokemonTrainerCard_Scene.new
      screen = PokemonTrainerCardScreen.new(scene)
      screen.pbStartScreen
      menu.pbRefresh
-    }
+    end
    next false
  }
 })
@@ -276,13 +276,13 @@ MenuHandlers.add(:pause_menu, :options, {
  "order"     => 70,
  "effect"    => proc { |menu|
    pbPlayDecisionSE
-    pbFadeOutIn {
+    pbFadeOutIn do
      scene = PokemonOption_Scene.new
      screen = PokemonOptionScreen.new(scene)
      screen.pbStartScreen
      pbUpdateSceneMap
      menu.pbRefresh
-    }
+    end
    next false
  }
 })
@@ -293,10 +293,10 @@ MenuHandlers.add(:pause_menu, :debug, {
  "condition" => proc { next $DEBUG },
  "effect"    => proc { |menu|
    pbPlayDecisionSE
-    pbFadeOutIn {
+    pbFadeOutIn do
      pbDebugMenu
      menu.pbRefresh
-    }
+    end
    next false
  }
 })
--- a/Data/Scripts/016_UI/002_UI_Pokedex_Menu.rb
+++ b/Data/Scripts/016_UI/002_UI_Pokedex_Menu.rb
@@ -114,11 +114,11 @@ class PokemonPokedexMenuScreen
      cmd = @scene.pbScene
      break if cmd < 0 || cmd >= commands2.length   # Cancel/Exit
      $PokemonGlobal.pokedexDex = $player.pokedex.accessible_dexes[cmd]
-      pbFadeOutIn {
+      pbFadeOutIn do
        scene = PokemonPokedex_Scene.new
        screen = PokemonPokedexScreen.new(scene)
        screen.pbStartScreen
-      }
+      end
    end
    @scene.pbEndScene
  end
--- a/Data/Scripts/016_UI/003_UI_Pokedex_Main.rb
+++ b/Data/Scripts/016_UI/003_UI_Pokedex_Main.rb
@@ -272,15 +272,13 @@ class PokemonPokedex_Scene
    @viewport = Viewport.new(0, 0, Graphics.width, Graphics.height)
    @viewport.z = 99999
    addBackgroundPlane(@sprites, "background", "Pokedex/bg_list", @viewport)
-=begin
-    # Suggestion for changing the background depending on region. You can change
-    # the line above with the following:
-    if pbGetPokedexRegion==-1   # Using national Pokédex
-      addBackgroundPlane(@sprites,"background","Pokedex/bg_national",@viewport)
-    elsif pbGetPokedexRegion==0   # Using first regional Pokédex
-      addBackgroundPlane(@sprites,"background","Pokedex/bg_regional",@viewport)
-    end
-=end
+    # Suggestion for changing the background depending on region. You can
+    # comment out the line above and uncomment the following lines:
+#    if pbGetPokedexRegion == -1   # Using national Pokédex
+#      addBackgroundPlane(@sprites, "background", "Pokedex/bg_national", @viewport)
+#    elsif pbGetPokedexRegion == 0   # Using first regional Pokédex
+#      addBackgroundPlane(@sprites, "background", "Pokedex/bg_regional", @viewport)
+#    end
    addBackgroundPlane(@sprites, "searchbg", "Pokedex/bg_search", @viewport)
    @sprites["searchbg"].visible = false
    @sprites["pokedex"] = Window_Pokedex.new(206, 30, 276, 364, @viewport)
@@ -766,9 +764,8 @@ class PokemonPokedex_Scene
  end

  def setIconBitmap(species)
-    gender, form, shiny = $player.pokedex.last_form_seen(species)
-    shiny = false
-    @sprites["icon"].setSpeciesBitmap(species, gender, form, shiny)
+    gender, form, _shiny = $player.pokedex.last_form_seen(species)
+    @sprites["icon"].setSpeciesBitmap(species, gender, form, false)
  end

  def pbSearchDexList(params)
@@ -777,17 +774,17 @@ class PokemonPokedex_Scene
    # Filter by name
    if params[1] >= 0
      scanNameCommand = @nameCommands[params[1]].scan(/./)
-      dexlist = dexlist.find_all { |item|
+      dexlist = dexlist.find_all do |item|
        next false if !$player.seen?(item[:species])
        firstChar = item[:name][0, 1]
        next scanNameCommand.any? { |v| v == firstChar }
-      }
+      end
    end
    # Filter by type
    if params[2] >= 0 || params[3] >= 0
      stype1 = (params[2] >= 0) ? @typeCommands[params[2]].id : nil
      stype2 = (params[3] >= 0) ? @typeCommands[params[3]].id : nil
-      dexlist = dexlist.find_all { |item|
+      dexlist = dexlist.find_all do |item|
        next false if !$player.owned?(item[:species])
        types = item[:types]
        if stype1 && stype2
@@ -802,43 +799,41 @@ class PokemonPokedex_Scene
        else
          next false
        end
-      }
+      end
    end
    # Filter by height range
    if params[4] >= 0 || params[5] >= 0
      minh = (params[4] < 0) ? 0 : (params[4] >= @heightCommands.length) ? 999 : @heightCommands[params[4]]
      maxh = (params[5] < 0) ? 999 : (params[5] >= @heightCommands.length) ? 0 : @heightCommands[params[5]]
-      dexlist = dexlist.find_all { |item|
+      dexlist = dexlist.find_all do |item|
        next false if !$player.owned?(item[:species])
        height = item[:height]
        next height >= minh && height <= maxh
-      }
+      end
    end
    # Filter by weight range
    if params[6] >= 0 || params[7] >= 0
      minw = (params[6] < 0) ? 0 : (params[6] >= @weightCommands.length) ? 9999 : @weightCommands[params[6]]
      maxw = (params[7] < 0) ? 9999 : (params[7] >= @weightCommands.length) ? 0 : @weightCommands[params[7]]
-      dexlist = dexlist.find_all { |item|
+      dexlist = dexlist.find_all do |item|
        next false if !$player.owned?(item[:species])
        weight = item[:weight]
        next weight >= minw && weight <= maxw
-      }
+      end
    end
    # Filter by color
    if params[8] >= 0
      scolor = @colorCommands[params[8]].id
-      dexlist = dexlist.find_all { |item|
-        next false if !$player.seen?(item[:species])
-        next item[:color] == scolor
-      }
+      dexlist = dexlist.find_all do |item|
+        next $player.seen?(item[:species]) && item[:color] == scolor
+      end
    end
    # Filter by shape
    if params[9] >= 0
      sshape = @shapeCommands[params[9]].id
-      dexlist = dexlist.find_all { |item|
-        next false if !$player.seen?(item[:species])
-        next item[:shape] == sshape
-      }
+      dexlist = dexlist.find_all do |item|
+        next $player.seen?(item[:species]) && item[:shape] == sshape
+      end
    end
    # Remove all unseen species from the results
    dexlist = dexlist.find_all { |item| next $player.seen?(item[:species]) }
@@ -924,9 +919,7 @@ class PokemonPokedex_Scene
    oldindex  = index
    minmax    = 1
    oldminmax = minmax
-    if [3, 4].include?(mode)
-      index = oldindex = selindex[minmax]
-    end
+    index = oldindex = selindex[minmax] if [3, 4].include?(mode)
    @sprites["searchcursor"].mode   = mode
    @sprites["searchcursor"].cmds   = cmds.length
    @sprites["searchcursor"].minmax = minmax
@@ -1260,7 +1253,7 @@ class PokemonPokedex_Scene
  end

  def pbPokedex
-    pbActivateWindow(@sprites, "pokedex") {
+    pbActivateWindow(@sprites, "pokedex") do
      loop do
        Graphics.update
        Input.update
@@ -1290,7 +1283,7 @@ class PokemonPokedex_Scene
          end
        end
      end
-    }
+    end
  end
 end

--- a/Data/Scripts/016_UI/004_UI_Pokedex_Entry.rb
+++ b/Data/Scripts/016_UI/004_UI_Pokedex_Entry.rb
@@ -161,9 +161,9 @@ class PokemonPokedexInfo_Scene
        real_gender = 2 if sp.gender_ratio == :Genderless
        ret.push([sp.form_name, real_gender, sp.form])
      else   # Both male and female
-        2.times do |real_gender|
-          next if !$player.pokedex.seen_form?(@species, real_gender, sp.form) && !Settings::DEX_SHOWS_ALL_FORMS
-          ret.push([sp.form_name, real_gender, sp.form])
+        2.times do |real_gndr|
+          next if !$player.pokedex.seen_form?(@species, real_gndr, sp.form) && !Settings::DEX_SHOWS_ALL_FORMS
+          ret.push([sp.form_name, real_gndr, sp.form])
          break if sp.form_name && !sp.form_name.empty?   # Only show 1 entry for each non-0 form
        end
      end
@@ -210,9 +210,7 @@ class PokemonPokedexInfo_Scene
    base   = Color.new(88, 88, 80)
    shadow = Color.new(168, 184, 184)
    imagepos = []
-    if @brief
-      imagepos.push([_INTL("Graphics/UI/Pokedex/overlay_info"), 0, 0])
-    end
+    imagepos.push([_INTL("Graphics/UI/Pokedex/overlay_info"), 0, 0]) if @brief
    species_data = GameData::Species.get_species_form(@species, @form)
    # Write various bits of text
    indexText = "???"
@@ -536,9 +534,7 @@ class PokemonPokedexInfo_Scene
          dorefresh = true
        end
      end
-      if dorefresh
-        drawPage(@page)
-      end
+      drawPage(@page) if dorefresh
    end
    return @index
  end
--- a/Data/Scripts/016_UI/005_UI_Party.rb
+++ b/Data/Scripts/016_UI/005_UI_Party.rb
@@ -559,7 +559,7 @@ class PokemonParty_Scene
    @sprites["messagebox"].text    = text
    @sprites["messagebox"].visible = true
    @sprites["helpwindow"].visible = false
-    using(cmdwindow = Window_CommandPokemon.new([_INTL("Yes"), _INTL("No")])) {
+    using(cmdwindow = Window_CommandPokemon.new([_INTL("Yes"), _INTL("No")])) do
      cmdwindow.visible = false
      pbBottomRight(cmdwindow)
      cmdwindow.y -= @sprites["messagebox"].height
@@ -580,7 +580,7 @@ class PokemonParty_Scene
          end
        end
      end
-    }
+    end
    @sprites["messagebox"].visible = false
    @sprites["helpwindow"].visible = true
    return ret
@@ -590,7 +590,7 @@ class PokemonParty_Scene
    ret = -1
    helpwindow = @sprites["helpwindow"]
    helpwindow.visible = true
-    using(cmdwindow = Window_CommandPokemonColor.new(commands)) {
+    using(cmdwindow = Window_CommandPokemonColor.new(commands)) do
      cmdwindow.z     = @viewport.z + 1
      cmdwindow.index = index
      pbBottomRight(cmdwindow)
@@ -612,7 +612,7 @@ class PokemonParty_Scene
          break
        end
      end
-    }
+    end
    return ret
  end

@@ -705,18 +705,18 @@ class PokemonParty_Scene

  def pbChooseItem(bag)
    ret = nil
-    pbFadeOutIn {
+    pbFadeOutIn do
      scene = PokemonBag_Scene.new
      screen = PokemonBagScreen.new(scene, bag)
      ret = screen.pbChooseItemScreen(proc { |item| GameData::Item.get(item).can_hold? })
      yield if block_given?
-    }
+    end
    return ret
  end

  def pbUseItem(bag, pokemon)
    ret = nil
-    pbFadeOutIn {
+    pbFadeOutIn do
      scene = PokemonBag_Scene.new
      screen = PokemonBagScreen.new(scene, bag)
      ret = screen.pbChooseItemScreen(proc { |item|
@@ -730,7 +730,7 @@ class PokemonParty_Scene
        next true
      })
      yield if block_given?
-    }
+    end
    return ret
  end

@@ -764,12 +764,12 @@ class PokemonParty_Scene
      cancelsprite = Settings::MAX_PARTY_SIZE + ((@multiselect) ? 1 : 0)
      if Input.trigger?(Input::SPECIAL) && @can_access_storage && canswitch != 2
        pbPlayDecisionSE
-        pbFadeOutIn {
+        pbFadeOutIn do
          scene = PokemonStorageScene.new
          screen = PokemonStorageScreen.new(scene, $PokemonStorage)
          screen.pbStartScreen(0)
          pbHardRefresh
-        }
+        end
      elsif Input.trigger?(Input::ACTION) && canswitch == 1 && @activecmd != cancelsprite
        pbPlayDecisionSE
        return [1, @activecmd]
@@ -1121,9 +1121,9 @@ class PokemonPartyScreen
        statuses[pkmnid] = 1
        pbRefreshSingle(pkmnid)
      elsif cmdSummary >= 0 && command == cmdSummary
-        @scene.pbSummary(pkmnid) {
+        @scene.pbSummary(pkmnid) do
          @scene.pbSetHelpText((@party.length > 1) ? _INTL("Choose a Pokémon.") : _INTL("Choose Pokémon or cancel."))
-        }
+        end
      end
    end
    @scene.pbEndScene
@@ -1314,9 +1314,9 @@ MenuHandlers.add(:party_menu, :summary, {
  "name"      => _INTL("Summary"),
  "order"     => 10,
  "effect"    => proc { |screen, party, party_idx|
-    screen.scene.pbSummary(party_idx) {
+    screen.scene.pbSummary(party_idx) do
      screen.scene.pbSetHelpText((party.length > 1) ? _INTL("Choose a Pokémon.") : _INTL("Choose Pokémon or cancel."))
-    }
+    end
  }
 })

@@ -1351,10 +1351,10 @@ MenuHandlers.add(:party_menu, :mail, {
                                          [_INTL("Read"), _INTL("Take"), _INTL("Cancel")])
    case command
    when 0   # Read
-      pbFadeOutIn {
+      pbFadeOutIn do
        pbDisplayMail(pkmn.mail, pkmn)
        screen.scene.pbSetHelpText((party.length > 1) ? _INTL("Choose a Pokémon.") : _INTL("Choose Pokémon or cancel."))
-      }
+      end
    when 1   # Take
      if pbTakeItemFromPokemon(pkmn, screen)
        screen.pbRefreshSingle(party_idx)
@@ -1388,9 +1388,9 @@ MenuHandlers.add(:party_menu_item, :use, {
  "order"     => 10,
  "effect"    => proc { |screen, party, party_idx|
    pkmn = party[party_idx]
-    item = screen.scene.pbUseItem($bag, pkmn) {
+    item = screen.scene.pbUseItem($bag, pkmn) do
      screen.scene.pbSetHelpText((party.length > 1) ? _INTL("Choose a Pokémon.") : _INTL("Choose Pokémon or cancel."))
-    }
+    end
    next if !item
    pbUseItemOnPokemon(item, pkmn, screen)
    screen.pbRefreshSingle(party_idx)
@@ -1402,9 +1402,9 @@ MenuHandlers.add(:party_menu_item, :give, {
  "order"     => 20,
  "effect"    => proc { |screen, party, party_idx|
    pkmn = party[party_idx]
-    item = screen.scene.pbChooseItem($bag) {
+    item = screen.scene.pbChooseItem($bag) do
      screen.scene.pbSetHelpText((party.length > 1) ? _INTL("Choose a Pokémon.") : _INTL("Choose Pokémon or cancel."))
-    }
+    end
    next if !item || !pbGiveItemToPokemon(item, pkmn, screen, party_idx)
    screen.pbRefreshSingle(party_idx)
  }
@@ -1480,11 +1480,11 @@ MenuHandlers.add(:party_menu_item, :move, {
 # Open the party screen
 #===============================================================================
 def pbPokemonScreen
-  pbFadeOutIn {
+  pbFadeOutIn do
    sscene = PokemonParty_Scene.new
    sscreen = PokemonPartyScreen.new(sscene, $player.party)
    sscreen.pbPokemonScreen
-  }
+  end
 end

 #===============================================================================
@@ -1495,7 +1495,7 @@ end
 # variable _nameVarNumber_; result is -1 if no Pokémon was chosen
 def pbChoosePokemon(variableNumber, nameVarNumber, ableProc = nil, allowIneligible = false)
  chosen = 0
-  pbFadeOutIn {
+  pbFadeOutIn do
    scene = PokemonParty_Scene.new
    screen = PokemonPartyScreen.new(scene, $player.party)
    if ableProc
@@ -1505,7 +1505,7 @@ def pbChoosePokemon(variableNumber, nameVarNumber, ableProc = nil, allowIneligib
      chosen = screen.pbChoosePokemon
      screen.pbEndScene
    end
-  }
+  end
  pbSet(variableNumber, chosen)
  if chosen >= 0
    pbSet(nameVarNumber, $player.party[chosen].name)
@@ -1525,7 +1525,7 @@ end
 # Same as pbChoosePokemon, but prevents choosing an egg or a Shadow Pokémon.
 def pbChooseTradablePokemon(variableNumber, nameVarNumber, ableProc = nil, allowIneligible = false)
  chosen = 0
-  pbFadeOutIn {
+  pbFadeOutIn do
    scene = PokemonParty_Scene.new
    screen = PokemonPartyScreen.new(scene, $player.party)
    if ableProc
@@ -1535,7 +1535,7 @@ def pbChooseTradablePokemon(variableNumber, nameVarNumber, ableProc = nil, allow
      chosen = screen.pbChoosePokemon
      screen.pbEndScene
    end
-  }
+  end
  pbSet(variableNumber, chosen)
  if chosen >= 0
    pbSet(nameVarNumber, $player.party[chosen].name)
--- a/Data/Scripts/016_UI/006_UI_Summary.rb
+++ b/Data/Scripts/016_UI/006_UI_Summary.rb
@@ -233,7 +233,7 @@ class PokemonSummary_Scene
    ret = -1
    @sprites["messagebox"].text    = text
    @sprites["messagebox"].visible = true
-    using(cmdwindow = Window_CommandPokemon.new([_INTL("Yes"), _INTL("No")])) {
+    using(cmdwindow = Window_CommandPokemon.new([_INTL("Yes"), _INTL("No")])) do
      cmdwindow.z       = @viewport.z + 1
      cmdwindow.visible = false
      pbBottomRight(cmdwindow)
@@ -254,14 +254,14 @@ class PokemonSummary_Scene
          end
        end
      end
-    }
+    end
    @sprites["messagebox"].visible = false
    return ret
  end

  def pbShowCommands(commands, index = 0)
    ret = -1
-    using(cmdwindow = Window_CommandPokemon.new(commands)) {
+    using(cmdwindow = Window_CommandPokemon.new(commands)) do
      cmdwindow.z = @viewport.z + 1
      cmdwindow.index = index
      pbBottomRight(cmdwindow)
@@ -280,7 +280,7 @@ class PokemonSummary_Scene
          break
        end
      end
-    }
+    end
    return ret
  end

@@ -328,9 +328,7 @@ class PokemonSummary_Scene
      imagepos.push([sprintf("Graphics/UI/Summary/icon_pokerus"), 176, 100])
    end
    # Show shininess star
-    if @pokemon.shiny?
-      imagepos.push([sprintf("Graphics/UI/shiny"), 2, 134])
-    end
+    imagepos.push([sprintf("Graphics/UI/shiny"), 2, 134]) if @pokemon.shiny?
    # Draw all images
    pbDrawImagePositions(overlay, imagepos)
    # Write various bits of text
@@ -1193,23 +1191,21 @@ class PokemonSummary_Scene
    command = pbShowCommands(commands)
    if cmdGiveItem >= 0 && command == cmdGiveItem
      item = nil
-      pbFadeOutIn {
+      pbFadeOutIn do
        scene = PokemonBag_Scene.new
        screen = PokemonBagScreen.new(scene, $bag)
        item = screen.pbChooseItemScreen(proc { |itm| GameData::Item.get(itm).can_hold? })
-      }
-      if item
-        dorefresh = pbGiveItemToPokemon(item, @pokemon, self, @partyindex)
      end
+      dorefresh = pbGiveItemToPokemon(item, @pokemon, self, @partyindex) if item
    elsif cmdTakeItem >= 0 && command == cmdTakeItem
      dorefresh = pbTakeItemFromPokemon(@pokemon, self)
    elsif cmdPokedex >= 0 && command == cmdPokedex
      $player.pokedex.register_last_seen(@pokemon)
-      pbFadeOutIn {
+      pbFadeOutIn do
        scene = PokemonPokedexInfo_Scene.new
        screen = PokemonPokedexInfoScreen.new(scene)
        screen.pbStartSceneSingle(@pokemon.species)
-      }
+      end
      dorefresh = true
    elsif cmdMark >= 0 && command == cmdMark
      dorefresh = pbMarking(@pokemon)
@@ -1318,9 +1314,7 @@ class PokemonSummary_Scene
          dorefresh = true
        end
      end
-      if dorefresh
-        drawPage(@page)
-      end
+      drawPage(@page) if dorefresh
    end
    return @partyindex
  end
@@ -1375,11 +1369,11 @@ end
 def pbChooseMove(pokemon, variableNumber, nameVarNumber)
  return if !pokemon
  ret = -1
-  pbFadeOutIn {
+  pbFadeOutIn do
    scene = PokemonSummary_Scene.new
    screen = PokemonSummaryScreen.new(scene)
    ret = screen.pbStartForgetScreen([pokemon], 0, nil)
-  }
+  end
  $game_variables[variableNumber] = ret
  if ret >= 0
    $game_variables[nameVarNumber] = pokemon.moves[ret].name
--- a/Data/Scripts/016_UI/007_UI_Bag.rb
+++ b/Data/Scripts/016_UI/007_UI_Bag.rb
@@ -348,7 +348,7 @@ class PokemonBag_Scene
    itemwindow = @sprites["itemlist"]
    thispocket = @bag.pockets[itemwindow.pocket]
    swapinitialpos = -1
-    pbActivateWindow(@sprites, "itemlist") {
+    pbActivateWindow(@sprites, "itemlist") do
      loop do
        oldindex = itemwindow.index
        Graphics.update
@@ -443,7 +443,7 @@ class PokemonBag_Scene
          end
        end
      end
-    }
+    end
  end
 end

@@ -492,9 +492,9 @@ class PokemonBagScreen
      itemname = itm.name
      command = @scene.pbShowCommands(_INTL("{1} is selected.", itemname), commands)
      if cmdRead >= 0 && command == cmdRead   # Read mail
-        pbFadeOutIn {
+        pbFadeOutIn do
          pbDisplayMail(Mail.new(item, "", ""))
-        }
+        end
      elsif cmdUse >= 0 && command == cmdUse   # Use item
        ret = pbUseItem(@bag, item, @scene)
        # ret: 0=Item wasn't used; 1=Item used; 2=Close Bag to use in field
@@ -507,12 +507,12 @@ class PokemonBagScreen
        elsif itm.is_important?
          @scene.pbDisplay(_INTL("The {1} can't be held.", itm.portion_name))
        else
-          pbFadeOutIn {
+          pbFadeOutIn do
            sscene = PokemonParty_Scene.new
            sscreen = PokemonPartyScreen.new(sscene, $player.party)
            sscreen.pbPokemonGiveScreen(item)
            @scene.pbRefresh
-          }
+          end
        end
      elsif cmdToss >= 0 && command == cmdToss   # Toss item
        qty = @bag.quantity(item)
--- a/Data/Scripts/016_UI/008_UI_Pokegear.rb
+++ b/Data/Scripts/016_UI/008_UI_Pokegear.rb
@@ -162,7 +162,7 @@ MenuHandlers.add(:pokegear_menu, :map, {
  "icon_name" => "map",
  "order"     => 10,
  "effect"    => proc { |menu|
-    pbFadeOutIn {
+    pbFadeOutIn do
      scene = PokemonRegionMap_Scene.new(-1, false)
      screen = PokemonRegionMapScreen.new(scene)
      ret = screen.pbStartScreen
@@ -171,7 +171,7 @@ MenuHandlers.add(:pokegear_menu, :map, {
        menu.dispose
        next 99999
      end
-    }
+    end
    next $game_temp.fly_destination
  }
 })
@@ -182,11 +182,11 @@ MenuHandlers.add(:pokegear_menu, :phone, {
  "order"     => 20,
 #  "condition" => proc { next $PokemonGlobal.phone && $PokemonGlobal.phone.contacts.length > 0 },
  "effect"    => proc { |menu|
-    pbFadeOutIn {
+    pbFadeOutIn do
      scene = PokemonPhone_Scene.new
      screen = PokemonPhoneScreen.new(scene)
      screen.pbStartScreen
-    }
+    end
    next false
  }
 })
@@ -196,11 +196,11 @@ MenuHandlers.add(:pokegear_menu, :jukebox, {
  "icon_name" => "jukebox",
  "order"     => 30,
  "effect"    => proc { |menu|
-    pbFadeOutIn {
+    pbFadeOutIn do
      scene = PokemonJukebox_Scene.new
      screen = PokemonJukeboxScreen.new(scene)
      screen.pbStartScreen
-    }
+    end
    next false
  }
 })
--- a/Data/Scripts/016_UI/009_UI_RegionMap.rb
+++ b/Data/Scripts/016_UI/009_UI_RegionMap.rb
@@ -185,7 +185,7 @@ class PokemonRegionMap_Scene
    @map.point.each do |point|
      next if point[0] != x || point[1] != y
      return "" if point[7] && (@wallmap || point[7] <= 0 || !$game_switches[point[7]])
-      name = pbGetMessageFromHash(MessageTypes::RegionLocations, point[2])
+      name = pbGetMessageFromHash(MessageTypes::REGION_LOCATION_NAMES, point[2])
      return (@editor) ? point[2] : name
    end
    return ""
@@ -214,7 +214,7 @@ class PokemonRegionMap_Scene
      next if point[0] != x || point[1] != y
      return "" if point[7] && (@wallmap || point[7] <= 0 || !$game_switches[point[7]])
      return "" if !point[3]
-      mapdesc = pbGetMessageFromHash(MessageTypes::RegionDescriptions, point[3])
+      mapdesc = pbGetMessageFromHash(MessageTypes::REGION_LOCATION_DESCRIPTIONS, point[3])
      return (@editor) ? point[3] : mapdesc
    end
    return ""
@@ -341,10 +341,10 @@ end
 #
 #===============================================================================
 def pbShowMap(region = -1, wallmap = true)
-  pbFadeOutIn {
+  pbFadeOutIn do
    scene = PokemonRegionMap_Scene.new(region, wallmap)
    screen = PokemonRegionMapScreen.new(scene)
    ret = screen.pbStartScreen
    $game_temp.fly_destination = ret if ret && !wallmap
-  }
+  end
 end
--- a/Data/Scripts/016_UI/010_UI_Phone.rb
+++ b/Data/Scripts/016_UI/010_UI_Phone.rb
@@ -138,7 +138,7 @@ class PokemonPhone_Scene
  end

  def pbChooseContact
-    pbActivateWindow(@sprites, "list") {
+    pbActivateWindow(@sprites, "list") do
      index = -1
      switch_index = -1
      loop do
@@ -186,7 +186,7 @@ class PokemonPhone_Scene
          end
        end
      end
-    }
+    end
  end

  def pbEndScene
--- a/Data/Scripts/016_UI/011_UI_Jukebox.rb
+++ b/Data/Scripts/016_UI/011_UI_Jukebox.rb
@@ -99,12 +99,12 @@ class PokemonJukeboxScreen
      elsif cmdCustom >= 0 && cmd == cmdCustom
        pbPlayDecisionSE
        files = []
-        Dir.chdir("Audio/BGM/") {
+        Dir.chdir("Audio/BGM/") do
          Dir.glob("*.ogg") { |f| files.push(f) }
          Dir.glob("*.wav") { |f| files.push(f) }
          Dir.glob("*.mid") { |f| files.push(f) }
          Dir.glob("*.midi") { |f| files.push(f) }
-        }
+        end
        files.map! { |f| File.basename(f, ".*") }
        files.uniq!
        files.sort! { |a, b| a.downcase <=> b.downcase }
--- a/Data/Scripts/016_UI/015_UI_Options.rb
+++ b/Data/Scripts/016_UI/015_UI_Options.rb
@@ -195,14 +195,14 @@ class Window_PokemonOption < Window_DrawableCommand
    when EnumOption
      if @options[index].values.length > 1
        totalwidth = 0
-        @options[index].values.each do |value|
+        @options[index].each_value do |value|
          totalwidth += self.contents.text_size(value).width
        end
        spacing = (rect.width - rect.x - optionwidth - totalwidth) / (@options[index].values.length - 1)
        spacing = 0 if spacing < 0
        xpos = optionwidth + rect.x
        ivalue = 0
-        @options[index].values.each do |value|
+        @options[index].each_value do |value|
          pbDrawShadowText(self.contents, xpos, rect.y, optionwidth, rect.height, value,
                           (ivalue == self[index]) ? SEL_VALUE_BASE_COLOR : self.baseColor,
                           (ivalue == self[index]) ? SEL_VALUE_SHADOW_COLOR : self.shadowColor)
@@ -325,7 +325,7 @@ class PokemonOption_Scene
  end

  def pbOptions
-    pbActivateWindow(@sprites, "option") {
+    pbActivateWindow(@sprites, "option") do
      index = -1
      loop do
        Graphics.update
@@ -342,7 +342,7 @@ class PokemonOption_Scene
          break if @sprites["option"].index == @options.length
        end
      end
-    }
+    end
  end

  def pbEndScene
--- a/Data/Scripts/016_UI/016_UI_ReadyMenu.rb
+++ b/Data/Scripts/016_UI/016_UI_ReadyMenu.rb
@@ -258,13 +258,13 @@ class PokemonReadyMenu
        user = $player.party[commands[0][command[1]][3]]
        if move == :FLY
          ret = nil
-          pbFadeOutInWithUpdate(99999, @scene.sprites) {
+          pbFadeOutInWithUpdate(99999, @scene.sprites) do
            pbHideMenu
            scene = PokemonRegionMap_Scene.new(-1, false)
            screen = PokemonRegionMapScreen.new(scene)
            ret = screen.pbStartFlyScreen
            pbShowMenu if !ret
-          }
+          end
          if ret
            $game_temp.fly_destination = ret
            $game_temp.in_menu = false
--- a/Data/Scripts/016_UI/017_UI_PokemonStorage.rb
+++ b/Data/Scripts/016_UI/017_UI_PokemonStorage.rb
@@ -452,9 +452,7 @@ class PokemonBoxPartySprite < Sprite
    Settings::MAX_PARTY_SIZE.times do |i|
      @pokemonsprites[i] = nil
      pokemon = @party[i]
-      if pokemon
-        @pokemonsprites[i] = PokemonBoxIcon.new(pokemon, viewport)
-      end
+      @pokemonsprites[i] = PokemonBoxIcon.new(pokemon, viewport) if pokemon
    end
    @contents = BitmapWrapper.new(172, 352)
    self.bitmap = @contents
@@ -895,9 +893,7 @@ class PokemonStorageScene
    return pbSelectBoxInternal(party) if @command == 1   # Withdraw
    ret = nil
    loop do
-      if !@choseFromParty
-        ret = pbSelectBoxInternal(party)
-      end
+      ret = pbSelectBoxInternal(party) if !@choseFromParty
      if @choseFromParty || (ret && ret[0] == -2)   # Party Pokémon
        if !@choseFromParty
          pbShowPartyTab
@@ -1206,9 +1202,7 @@ class PokemonStorageScene
  def pbBoxName(helptext, minchars, maxchars)
    oldsprites = pbFadeOutAndHide(@sprites)
    ret = pbEnterBoxName(helptext, minchars, maxchars)
-    if ret.length > 0
-      @storage[@storage.currentBox].name = ret
-    end
+    @storage[@storage.currentBox].name = ret if ret.length > 0
    @sprites["box"].refreshBox = true
    pbRefresh
    pbFadeInAndShow(@sprites, oldsprites)
@@ -1216,11 +1210,11 @@ class PokemonStorageScene

  def pbChooseItem(bag)
    ret = nil
-    pbFadeOutIn {
+    pbFadeOutIn do
      scene = PokemonBag_Scene.new
      screen = PokemonBagScreen.new(scene, bag)
      ret = screen.pbChooseItemScreen(proc { |item| GameData::Item.get(item).can_hold? })
-    }
+    end
    return ret
  end

@@ -1443,9 +1437,7 @@ class PokemonStorageScene
      else
        textstrings.push([_INTL("No item"), 86, 348, 2, nonbase, nonshadow])
      end
-      if pokemon.shiny?
-        imagepos.push(["Graphics/UI/shiny", 156, 198])
-      end
+      imagepos.push(["Graphics/UI/shiny", 156, 198]) if pokemon.shiny?
      typebitmap = AnimatedBitmap.new(_INTL("Graphics/UI/types"))
      pokemon.types.each_with_index do |type, i|
        type_number = GameData::Type.get(type).icon_position
@@ -1684,9 +1676,7 @@ class PokemonStorageScreen
  def pbWithdraw(selected, heldpoke)
    box = selected[0]
    index = selected[1]
-    if box == -1
-      raise _INTL("Can't withdraw from party...")
-    end
+    raise _INTL("Can't withdraw from party...") if box == -1
    if @storage.party_full?
      pbDisplay(_INTL("Your party's full!"))
      return false
@@ -1705,9 +1695,7 @@ class PokemonStorageScreen
  def pbStore(selected, heldpoke)
    box = selected[0]
    index = selected[1]
-    if box != -1
-      raise _INTL("Can't deposit from box...")
-    end
+    raise _INTL("Can't deposit from box...") if box != -1
    if pbAbleCount <= 1 && pbAble?(@storage[box, index]) && !heldpoke
      pbPlayBuzzerSE
      pbDisplay(_INTL("That's your last Pokémon!"))
@@ -1788,9 +1776,7 @@ class PokemonStorageScreen
    end
    @scene.pbPlace(selected, @heldpkmn)
    @storage[box, index] = @heldpkmn
-    if box == -1
-      @storage.party.compact!
-    end
+    @storage.party.compact! if box == -1
    @scene.pbRefresh
    @heldpkmn = nil
  end
@@ -1929,9 +1915,7 @@ class PokemonStorageScreen
    case command
    when 0
      destbox = @scene.pbChooseBox(_INTL("Jump to which Box?"))
-      if destbox >= 0
-        @scene.pbJumpToBox(destbox)
-      end
+      @scene.pbJumpToBox(destbox) if destbox >= 0
    when 1
      papers = @storage.availableWallpapers
      index = 0
@@ -1942,9 +1926,7 @@ class PokemonStorageScreen
        end
      end
      wpaper = pbShowCommands(_INTL("Pick the wallpaper."), papers[0], index)
-      if wpaper >= 0
-        @scene.pbChangeBackground(papers[1][wpaper])
-      end
+      @scene.pbChangeBackground(papers[1][wpaper]) if wpaper >= 0
    when 2
      @scene.pbBoxName(_INTL("Box name?"), 0, 12)
    end
--- a/Data/Scripts/016_UI/018_UI_ItemStorage.rb
+++ b/Data/Scripts/016_UI/018_UI_ItemStorage.rb
@@ -150,7 +150,7 @@ class ItemStorage_Scene
    @sprites["helpwindow"].visible = false
    itemwindow = @sprites["itemwindow"]
    itemwindow.refresh
-    pbActivateWindow(@sprites, "itemwindow") {
+    pbActivateWindow(@sprites, "itemwindow") do
      loop do
        Graphics.update
        Input.update
@@ -168,7 +168,7 @@ class ItemStorage_Scene
          end
        end
      end
-    }
+    end
  end
 end

--- a/Data/Scripts/016_UI/019_UI_PC.rb
+++ b/Data/Scripts/016_UI/019_UI_PC.rb
@@ -21,18 +21,18 @@ def pbPCItemStorage
      if $PokemonGlobal.pcItemStorage.empty?
        pbMessage(_INTL("There are no items."))
      else
-        pbFadeOutIn {
+        pbFadeOutIn do
          scene = WithdrawItemScene.new
          screen = PokemonBagScreen.new(scene, $bag)
          screen.pbWithdrawItemScreen
-        }
+        end
      end
    when 1   # Deposit Item
-      pbFadeOutIn {
+      pbFadeOutIn do
        scene = PokemonBag_Scene.new
        screen = PokemonBagScreen.new(scene, $bag)
        screen.pbDepositItemScreen
-      }
+      end
    when 2   # Toss Item
      if !$PokemonGlobal.pcItemStorage
        $PokemonGlobal.pcItemStorage = PCItemStorage.new
@@ -40,11 +40,11 @@ def pbPCItemStorage
      if $PokemonGlobal.pcItemStorage.empty?
        pbMessage(_INTL("There are no items."))
      else
-        pbFadeOutIn {
+        pbFadeOutIn do
          scene = TossItemScene.new
          screen = PokemonBagScreen.new(scene, $bag)
          screen.pbTossItemScreen
-        }
+        end
      end
    else
      break
@@ -78,9 +78,9 @@ def pbPCMailbox
        )
        case commandMail
        when 0   # Read
-          pbFadeOutIn {
+          pbFadeOutIn do
            pbDisplayMail($PokemonGlobal.mailbox[mailIndex])
-          }
+          end
        when 1   # Move to Bag
          if pbConfirmMessage(_INTL("The message will be lost. Is that OK?"))
            if $bag.add($PokemonGlobal.mailbox[mailIndex].item)
@@ -91,11 +91,11 @@ def pbPCMailbox
            end
          end
        when 2   # Give
-          pbFadeOutIn {
+          pbFadeOutIn do
            sscene = PokemonParty_Scene.new
            sscreen = PokemonPartyScreen.new(sscene, $player.party)
            sscreen.pbPokemonGiveMailScreen(mailIndex)
-          }
+          end
        end
      else
        break
@@ -181,21 +181,21 @@ MenuHandlers.add(:pc_menu, :pokemon_storage, {
      break if command < 0
      case command
      when 0   # Organize
-        pbFadeOutIn {
+        pbFadeOutIn do
          scene = PokemonStorageScene.new
          screen = PokemonStorageScreen.new(scene, $PokemonStorage)
          screen.pbStartScreen(0)
-        }
+        end
      when 1   # Withdraw
        if $PokemonStorage.party_full?
          pbMessage(_INTL("Your party is full!"))
          next
        end
-        pbFadeOutIn {
+        pbFadeOutIn do
          scene = PokemonStorageScene.new
          screen = PokemonStorageScreen.new(scene, $PokemonStorage)
          screen.pbStartScreen(1)
-        }
+        end
      when 2   # Deposit
        count = 0
        $PokemonStorage.party.each do |p|
@@ -205,11 +205,11 @@ MenuHandlers.add(:pc_menu, :pokemon_storage, {
          pbMessage(_INTL("Can't deposit the last Pokémon!"))
          next
        end
-        pbFadeOutIn {
+        pbFadeOutIn do
          scene = PokemonStorageScene.new
          screen = PokemonStorageScreen.new(scene, $PokemonStorage)
          screen.pbStartScreen(2)
-        }
+        end
      else
        break
      end
--- a/Data/Scripts/016_UI/020_UI_PokeMart.rb
+++ b/Data/Scripts/016_UI/020_UI_PokeMart.rb
@@ -546,7 +546,7 @@ class PokemonMart_Scene
  def pbChooseBuyItem
    itemwindow = @sprites["itemwindow"]
    @sprites["helpwindow"].visible = false
-    pbActivateWindow(@sprites, "itemwindow") {
+    pbActivateWindow(@sprites, "itemwindow") do
      pbRefresh
      loop do
        Graphics.update
@@ -566,7 +566,7 @@ class PokemonMart_Scene
          end
        end
      end
-    }
+    end
  end

  def pbChooseSellItem
@@ -647,7 +647,7 @@ class PokemonMartScreen
        $stats.money_spent_at_marts += price
        $stats.mart_items_bought += quantity
        @adapter.setMoney(@adapter.getMoney - price)
-        @stock.delete_if { |item| GameData::Item.get(item).is_important? && $bag.has?(item) }
+        @stock.delete_if { |itm| GameData::Item.get(itm).is_important? && $bag.has?(itm) }
        pbDisplayPaused(_INTL("Here you are! Thank you!")) { pbSEPlay("Mart buy item") }
        if quantity >= 10 && GameData::Item.exists?(:PREMIERBALL)
          if Settings::MORE_BONUS_PREMIER_BALLS && GameData::Item.get(item).is_poke_ball?
--- a/Data/Scripts/016_UI/021_UI_BattlePointShop.rb
+++ b/Data/Scripts/016_UI/021_UI_BattlePointShop.rb
@@ -393,7 +393,7 @@ class BattlePointShop_Scene
  def pbChooseItem
    itemwindow = @sprites["itemwindow"]
    @sprites["helpwindow"].visible = false
-    pbActivateWindow(@sprites, "itemwindow") {
+    pbActivateWindow(@sprites, "itemwindow") do
      pbRefresh
      loop do
        Graphics.update
@@ -413,7 +413,7 @@ class BattlePointShop_Scene
          end
        end
      end
-    }
+    end
  end
 end

@@ -487,7 +487,7 @@ class BattlePointShopScreen
        # TODO: Add bpshop_items_bought to $stats?
 #        $stats.bpshop_items_bought += quantity
        @adapter.setBP(@adapter.getBP - price)
-        @stock.delete_if { |item| GameData::Item.get(item).is_important? && $bag.has?(item) }
+        @stock.delete_if { |itm| GameData::Item.get(itm).is_important? && $bag.has?(itm) }
        pbDisplayPaused(_INTL("Here you are! Thank you!")) { pbSEPlay("Mart buy item") }
      else
        added.times do
--- a/Data/Scripts/016_UI/022_UI_MoveRelearner.rb
+++ b/Data/Scripts/016_UI/022_UI_MoveRelearner.rb
@@ -110,7 +110,7 @@ class MoveRelearner_Scene
  # Processes the scene
  def pbChooseMove
    oldcmd = -1
-    pbActivateWindow(@sprites, "commands") {
+    pbActivateWindow(@sprites, "commands") do
      loop do
        oldcmd = @sprites["commands"].index
        Graphics.update
@@ -127,7 +127,7 @@ class MoveRelearner_Scene
          return @moves[@sprites["commands"].index]
        end
      end
-    }
+    end
  end

  # End the scene here
@@ -190,10 +190,10 @@ end
 #===============================================================================
 def pbRelearnMoveScreen(pkmn)
  retval = true
-  pbFadeOutIn {
+  pbFadeOutIn do
    scene = MoveRelearner_Scene.new
    screen = MoveRelearnerScreen.new(scene)
    retval = screen.pbStartScreen(pkmn)
-  }
+  end
  return retval
 end
--- a/Data/Scripts/016_UI/023_UI_PurifyChamber.rb
+++ b/Data/Scripts/016_UI/023_UI_PurifyChamber.rb
@@ -66,15 +66,11 @@ class PurifyChamberSet
  end

  def facing=(value)
-    if value >= 0 && value < @list.length
-      @facing = value
-    end
+    @facing = value if value >= 0 && value < @list.length
  end

  def shadow=(value)
-    if value.nil? || value.shadowPokemon?
-      @shadow = value
-    end
+    @shadow = value if value.nil? || value.shadowPokemon?
  end

  # Main component is tempo
@@ -225,9 +221,7 @@ class PurifyChamber
  end

  def [](chamber, slot = nil)
-    if slot.nil?
-      return @sets[chamber]
-    end
+    return @sets[chamber] if slot.nil?
    return nil if chamber < 0 || chamber >= NUMSETS
    return nil if slot < 0 || slot >= SETSIZE
    return @sets[chamber][slot]
@@ -430,8 +424,8 @@ class PurifyChamberScreen
      # array[0]==1 - a new set was chosen
      # array[0]==2 - choose Pokemon command
      cmd = @scene.pbSetScreen
-      if cmd[0] == 0
-        # Place Pokemon in the set
+      case cmd[0]
+      when 0   # Place Pokemon in the set
        curpkmn = PurifyChamberHelper.pbGetPokemon(@chamber, cmd[1])
        if curpkmn || heldpkmn
          commands = [_INTL("MOVE"), _INTL("SUMMARY"), _INTL("WITHDRAW")]
@@ -475,7 +469,7 @@ class PurifyChamberScreen
            @scene.pbSummary(cmd[1], heldpkmn)
          elsif choice == 2
            if pbBoxesFull?
-              @scene.pbDisplay("All boxes are full.")
+              @scene.pbDisplay(_INTL("All boxes are full."))
            elsif heldpkmn
              @scene.pbWithdraw(cmd[1], heldpkmn)
              $PokemonStorage.pbStoreCaught(heldpkmn)
@@ -513,7 +507,7 @@ class PurifyChamberScreen
              end
            end
          end
-        else  # No current Pokemon
+        else   # No current Pokemon
          pos = @scene.pbChoosePokemon
          if pbPlacePokemon(pos, cmd[1])
            curpkmn = PurifyChamberHelper.pbGetPokemon(@chamber, cmd[1])
@@ -521,20 +515,18 @@ class PurifyChamberScreen
            @scene.pbPositionHint(PurifyChamberHelper.adjustOnInsert(cmd[1]))
          end
        end
-      elsif cmd[0] == 1 # Change the active set
+      when 1   # Change the active set
        @scene.pbChangeSet(cmd[1])
        chamber.currentSet = cmd[1]
-      elsif cmd[0] == 2 # Choose a Pokemon
+      when 2   # Choose a Pokemon
        pos = @scene.pbChoosePokemon
        pkmn = pos ? $PokemonStorage[pos[0], pos[1]] : nil
        heldpkmn = pkmn if pkmn
-      else # cancel
+      else   # cancel
        if heldpkmn
-          @scene.pbDisplay("You're holding a Pokémon!")
+          @scene.pbDisplay(_INTL("You're holding a Pokémon!"))
        else
-          if !@scene.pbConfirm("Continue editing sets?")
-            break
-          end
+          break if !@scene.pbConfirm(_INTL("Continue editing sets?"))
        end
      end
    end
@@ -588,7 +580,7 @@ class PurifyChamberScreen
      @chamber.setShadow(set, nil) # Remove shadow Pokemon from set
      if (i + 1) != purifiables.length
        @scene.pbDisplay(_INTL("There is another Pokémon that is ready to open its heart!"))
-        if !@scene.pbConfirm("Would you like to switch sets?")
+        if !@scene.pbConfirm(_INTL("Would you like to switch sets?"))
          @scene.pbCloseSet
          break
        end
@@ -609,18 +601,14 @@ class PurifyChamberScreen
    loop do
      set = @scene.pbChooseSet
      if set < 0
-        if !@scene.pbConfirm("Continue viewing holograms?")
-          break
-        end
+        break if !@scene.pbConfirm(_INTL("Continue viewing holograms?"))
      else
        chamber.currentSet = set
        cmd = @scene.pbShowCommands(_INTL("What do you want to do?"),
                                    [_INTL("EDIT"), _INTL("SWITCH"), _INTL("CANCEL")])
        case cmd
        when 0   # edit
-          if !pbOpenSetDetail
-            break
-          end
+          break if !pbOpenSetDetail
        when 1   # switch
          chamber.currentSet = set
          newSet = @scene.pbSwitch(set)
@@ -880,9 +868,7 @@ class PurifyChamberSetView < Sprite
    end
    setcount = @chamber.setCount(@set)
    setcount.times do |i|
-      if !@flows[i]
-        @flows[i] = FlowDiagram.new(self.viewport)
-      end
+      @flows[i] = FlowDiagram.new(self.viewport) if !@flows[i]
      angle = 360 - (i * 360 / setcount)
      angle += 90 # start at 12 not 3 o'clock
      endAngle = angle - (360 / setcount)
@@ -932,15 +918,13 @@ class PurifyChamberSetView < Sprite
        @cursor = pos + 1
      end
    end
-    if @cursor != oldcursor
-      refresh
-    end
+    refresh if @cursor != oldcursor
  end

  def checkCursor(index)
    if @cursor == index
-      @view.x = @__sprites[index].x - @view.bitmap.width / 2
-      @view.y = @__sprites[index].y - @view.bitmap.height / 2
+      @view.x = @__sprites[index].x - (@view.bitmap.width / 2)
+      @view.y = @__sprites[index].y - (@view.bitmap.height / 2)
      @view.visible = true
    end
  end
@@ -1005,8 +989,8 @@ class PurifyChamberSetView < Sprite
    end
    @__sprites[1 + (PurifyChamber::SETSIZE * 2)].pokemon = @heldpkmn
    @__sprites[1 + (PurifyChamber::SETSIZE * 2)].visible = @view.visible
-    @__sprites[1 + (PurifyChamber::SETSIZE * 2)].x = @view.x + @view.bitmap.width / 2
-    @__sprites[1 + (PurifyChamber::SETSIZE * 2)].y = @view.y + @view.bitmap.height / 2
+    @__sprites[1 + (PurifyChamber::SETSIZE * 2)].x = @view.x + (@view.bitmap.width / 2)
+    @__sprites[1 + (PurifyChamber::SETSIZE * 2)].y = @view.y + (@view.bitmap.height / 2)
    @__sprites[1 + (PurifyChamber::SETSIZE * 2)].z = 3
  end

@@ -1102,8 +1086,7 @@ class PurifyChamberScene
    @chamber = chamber
  end

-  def pbEnd
-  end
+  def pbEnd; end

  def pbOpenSet(set)
    @sprites = {}
@@ -1138,8 +1121,7 @@ class PurifyChamberScene
    @sprites["setview"].cursor = 0
  end

-  def pbCloseSetDetail
-  end
+  def pbCloseSetDetail; end

  def pbPurify
    pbRefresh
@@ -1185,7 +1167,7 @@ class PurifyChamberScene
  end

  def pbSetScreen
-    pbDeactivateWindows(@sprites) {
+    pbDeactivateWindows(@sprites) do
      loop do
        Graphics.update
        Input.update
@@ -1215,11 +1197,11 @@ class PurifyChamberScene
          return [3, 0]
        end
      end
-    }
+    end
  end

  def pbChooseSet
-    pbActivateWindow(@sprites, "setwindow") {
+    pbActivateWindow(@sprites, "setwindow") do
      oldindex = @sprites["setwindow"].index
      loop do
        if oldindex != @sprites["setwindow"].index
@@ -1238,7 +1220,7 @@ class PurifyChamberScene
          return -1
        end
      end
-    }
+    end
  end

  def pbSwitch(set)
@@ -1305,11 +1287,11 @@ end
 #===============================================================================
 def pbPurifyChamber
  $player.seen_purify_chamber = true
-  pbFadeOutIn {
+  pbFadeOutIn do
    scene = PurifyChamberScene.new
    screen = PurifyChamberScreen.new(scene)
    screen.pbStartPurify
-  }
+  end
 end

 #===============================================================================
--- a/Data/Scripts/016_UI/024_UI_MysteryGift.rb
+++ b/Data/Scripts/016_UI/024_UI_MysteryGift.rb
@@ -341,11 +341,11 @@ def pbMysteryGiftDecrypt(gift)
  return [] if nil_or_empty?(gift)
  ret = Marshal.restore(Zlib::Inflate.inflate(gift.unpack("m")[0]))
  if ret
-    ret.each do |gift|
-      if gift[1] == 0   # Pokémon
-        gift[2] = gift[2]
+    ret.each do |gft|
+      if gft[1] == 0   # Pokémon
+        gft[2] = gft[2]
      else   # Item
-        gift[2] = GameData::Item.get(gift[2]).id
+        gft[2] = GameData::Item.get(gft[2]).id
      end
    end
  end
@@ -392,11 +392,11 @@ def pbReceiveMysteryGift(id)
      if Settings::SHOW_NEW_SPECIES_POKEDEX_ENTRY_MORE_OFTEN && !was_owned && $player.has_pokedex
        pbMessage(_INTL("{1}'s data was added to the Pokédex.", gift[2].name))
        $player.pokedex.register_last_seen(gift[2])
-        pbFadeOutIn {
+        pbFadeOutIn do
          scene = PokemonPokedexInfo_Scene.new
          screen = PokemonPokedexInfoScreen.new(scene)
          screen.pbDexEntry(gift[2].species)
-        }
+        end
      end
      return true
    end
--- a/Data/Scripts/016_UI/025_UI_TextEntry.rb
+++ b/Data/Scripts/016_UI/025_UI_TextEntry.rb
@@ -461,12 +461,12 @@ class PokemonEntryScene2
    @mode = 0
    @minlength = minlength
    @maxlength = maxlength
-    @maxlength.times { |i|
+    @maxlength.times do |i|
      @sprites["blank#{i}"] = Sprite.new(@viewport)
      @sprites["blank#{i}"].x = 160 + (24 * i)
      @sprites["blank#{i}"].bitmap = @bitmaps[@bitmaps.length - 1]
      @blanks[i] = 0
-    }
+    end
    @sprites["bottomtab"] = Sprite.new(@viewport)   # Current tab
    @sprites["bottomtab"].x = 22
    @sprites["bottomtab"].y = 162
@@ -568,10 +568,10 @@ class PokemonEntryScene2
      cursorpos = @helper.cursor
      cursorpos = @maxlength - 1 if cursorpos >= @maxlength
      cursorpos = 0 if cursorpos < 0
-      @maxlength.times { |i|
+      @maxlength.times do |i|
        @blanks[i] = (i == cursorpos) ? 1 : 0
        @sprites["blank#{i}"].y = [78, 82][@blanks[i]]
-      }
+      end
    end
    pbDoUpdateOverlay
    pbUpdateSpriteHash(@sprites)
@@ -715,9 +715,7 @@ class PokemonEntryScene2
          cursordiv = @cursorpos / ROWS
          charpos = (cursordiv * ROWS) + cursormod
          chset = @@Characters[@mode][0]
-          if @helper.length >= @maxlength
-            @helper.delete
-          end
+          @helper.delete if @helper.length >= @maxlength
          @helper.insert(chset[charpos])
          pbPlayCursorSE
          if @helper.length >= @maxlength
@@ -767,17 +765,17 @@ end
 def pbEnterText(helptext, minlength, maxlength, initialText = "", mode = 0, pokemon = nil, nofadeout = false)
  ret = ""
  if ($PokemonSystem.textinput == 1 rescue false)   # Keyboard
-    pbFadeOutIn(99999, nofadeout) {
+    pbFadeOutIn(99999, nofadeout) do
      sscene = PokemonEntryScene.new
      sscreen = PokemonEntry.new(sscene)
      ret = sscreen.pbStartScreen(helptext, minlength, maxlength, initialText, mode, pokemon)
-    }
+    end
  else   # Cursor
-    pbFadeOutIn(99999, nofadeout) {
+    pbFadeOutIn(99999, nofadeout) do
      sscene = PokemonEntryScene2.new
      sscreen = PokemonEntry.new(sscene)
      ret = sscreen.pbStartScreen(helptext, minlength, maxlength, initialText, mode, pokemon)
-    }
+    end
  end
  return ret
 end