update 6.7

Data/Scripts/013_Items/002_Item_Effects.rb

@@ -868,65 +868,65 @@ ItemHandlers::UseOnPokemon.add(:GRACIDEA, proc { |item, pkmn, scene|
   next true
 })
 
-ItemHandlers::UseOnPokemon.add(:REDNECTAR, proc { |item, pkmn, scene|
-  if !pkmn.isSpecies?(:ORICORIO) || pkmn.form == 0
-    scene.pbDisplay(_INTL("It had no effect."))
-    next false
-  end
-  if pkmn.fainted?
-    scene.pbDisplay(_INTL("This can't be used on the fainted Pokémon."))
-  end
-  pkmn.setForm(0) {
-    scene.pbRefresh
-    scene.pbDisplay(_INTL("{1} changed form!", pkmn.name))
-  }
-  next true
-})
-
-ItemHandlers::UseOnPokemon.add(:YELLOWNECTAR, proc { |item, pkmn, scene|
-  if !pkmn.isSpecies?(:ORICORIO) || pkmn.form == 1
-    scene.pbDisplay(_INTL("It had no effect."))
-    next false
-  end
-  if pkmn.fainted?
-    scene.pbDisplay(_INTL("This can't be used on the fainted Pokémon."))
-  end
-  pkmn.setForm(1) {
-    scene.pbRefresh
-    scene.pbDisplay(_INTL("{1} changed form!", pkmn.name))
-  }
-  next true
-})
-
-ItemHandlers::UseOnPokemon.add(:PINKNECTAR, proc { |item, pkmn, scene|
-  if !pkmn.isSpecies?(:ORICORIO) || pkmn.form == 2
-    scene.pbDisplay(_INTL("It had no effect."))
-    next false
-  end
-  if pkmn.fainted?
-    scene.pbDisplay(_INTL("This can't be used on the fainted Pokémon."))
-  end
-  pkmn.setForm(2) {
-    scene.pbRefresh
-    scene.pbDisplay(_INTL("{1} changed form!", pkmn.name))
-  }
-  next true
-})
-
-ItemHandlers::UseOnPokemon.add(:PURPLENECTAR, proc { |item, pkmn, scene|
-  if !pkmn.isSpecies?(:ORICORIO) || pkmn.form == 3
-    scene.pbDisplay(_INTL("It had no effect."))
-    next false
-  end
-  if pkmn.fainted?
-    scene.pbDisplay(_INTL("This can't be used on the fainted Pokémon."))
-  end
-  pkmn.setForm(3) {
-    scene.pbRefresh
-    scene.pbDisplay(_INTL("{1} changed form!", pkmn.name))
-  }
-  next true
-})
+# ItemHandlers::UseOnPokemon.add(:REDNECTAR, proc { |item, pkmn, scene|
+#   if !pkmn.isSpecies?(:ORICORIO) || pkmn.form == 0
+#     scene.pbDisplay("It had no effect.")
+#     next false
+#   end
+#   if pkmn.fainted?
+#     scene.pbDisplay("This can't be used on the fainted Pokémon.")
+#   end
+#   pkmn.setForm(0) {
+#     scene.pbRefresh
+#     scene.pbDisplay("{1} changed form!", pkmn.name)
+#   }
+#   next true
+# })
+#
+# ItemHandlers::UseOnPokemon.add(:YELLOWNECTAR, proc { |item, pkmn, scene|
+#   if !pkmn.isSpecies?(:ORICORIO) || pkmn.form == 1
+#     scene.pbDisplay("It had no effect.")
+#     next false
+#   end
+#   if pkmn.fainted?
+#     scene.pbDisplay("This can't be used on the fainted Pokémon.")
+#   end
+#   pkmn.setForm(1) {
+#     scene.pbRefresh
+#     scene.pbDisplay("{1} changed form!", pkmn.name)
+#   }
+#   next true
+# })
+#
+# ItemHandlers::UseOnPokemon.add(:PINKNECTAR, proc { |item, pkmn, scene|
+#   if !pkmn.isSpecies?(:ORICORIO) || pkmn.form == 2
+#     scene.pbDisplay("It had no effect.")
+#     next false
+#   end
+#   if pkmn.fainted?
+#     scene.pbDisplay("This can't be used on the fainted Pokémon.")
+#   end
+#   pkmn.setForm(2) {
+#     scene.pbRefresh
+#     scene.pbDisplay("{1} changed form!", pkmn.name)
+#   }
+#   next true
+# })
+#
+# ItemHandlers::UseOnPokemon.add(:PURPLENECTAR, proc { |item, pkmn, scene|
+#   if !pkmn.isSpecies?(:ORICORIO) || pkmn.form == 3
+#     scene.pbDisplay("It had no effect.")
+#     next false
+#   end
+#   if pkmn.fainted?
+#     scene.pbDisplay("This can't be used on the fainted Pokémon.")
+#   end
+#   pkmn.setForm(3) {
+#     scene.pbRefresh
+#     scene.pbDisplay("{1} changed form!", pkmn.name)
+#   }
+#   next true
+# })
 
 ItemHandlers::UseOnPokemon.add(:REVEALGLASS, proc { |item, pkmn, scene|
   if !pkmn.isSpecies?(:TORNADUS) &&

Data/Scripts/013_Items/003_Item_BattleEffects.rb

@@ -53,7 +53,7 @@ ItemHandlers::CanUseInBattle.addIf(proc { |item| GameData::Item.get(item).is_pok
     #       than one unfainted opposing Pokémon. (Snag Balls can be thrown in
     #       this case, but only in trainer battles, and the trainer will deflect
     #       them if they are trying to catch a non-Shadow Pokémon.)
-    if battle.pbOpposingBattlerCount>1 && !(GameData::Item.get(item).is_snag_ball? && battle.trainerBattle?)
+    if battle.pbOpposingBattlerCount>1 && $game_switches[SWITCH_SILVERBOSS_BATTLE]# !(GameData::Item.get(item).is_snag_ball? && battle.trainerBattle?)
       if battle.pbOpposingBattlerCount==2
         if $game_switches[SWITCH_SILVERBOSS_BATTLE]
           scene.pbDisplay(_INTL("It's no good! It's still too agitated to aim!")) if showMessages

Data/Scripts/013_Items/004_Item_Phone.rb

@@ -47,8 +47,7 @@ def pbPhoneRegisterBattle(message,event,trainertype,trainername,maxbattles)
   return if contact && contact[0]              # Existing contact and is visible
   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))
+  displayname = "#{GameData::TrainerType.get(trainertype).name} #{pbGetMessageFromHash(MessageTypes::TrainerNames,trainername)}"
   if contact                          # Previously registered, just make visible
     contact[0] = true
   else                                                         # Add new contact
@@ -286,7 +285,7 @@ end
 # The phone call itself
 #===============================================================================
 def pbPhoneCall(call,phonenum)
-  pbMessage(_INTL("......\\wt[5] ......\\1"))
+  pbMessage("......\\wt[5] ......\\1")
   encspecies     = pbEncounterSpecies(phonenum)
   trainerspecies = pbTrainerSpecies(phonenum)
   trainermap     = pbTrainerMapName(phonenum)
@@ -299,5 +298,5 @@ def pbPhoneCall(call,phonenum)
     messages[i] += "\\1" if i<messages.length-1
     pbMessage(messages[i])
   end
-  pbMessage(_INTL("Click!\\wt[10]\n......\\wt[5] ......\\1"))
+  pbMessage("Click!\\wt[10]\n......\\wt[5] ......\\1")
 end

Data/Scripts/013_Items/005_Item_PokeRadar.rb

@@ -15,7 +15,7 @@ def pbCanUsePokeRadar?
   # Can't use Radar if not in tall grass
   terrain = $game_map.terrain_tag($game_player.x, $game_player.y)
   # if !terrain.land_wild_encounters || !terrain.shows_grass_rustle
-  #   pbMessage(_INTL("Can't use that here."))
+  #   pbMessage("Can't use that here.")
   #   return false
   # end
   if $PokemonEncounters.encounter_type == nil
@@ -24,12 +24,12 @@ def pbCanUsePokeRadar?
   end
   # Can't use Radar if map has no grass-based encounters (ignoring Bug Contest)
   # if !$PokemonEncounters.has_normal_land_encounters?
-  #   pbMessage(_INTL("Can't use that here."))
+  #   pbMessage("Can't use that here.")
   #   return false
   # end
   # Can't use Radar while cycling
   # if $PokemonGlobal.bicycle
-  #   pbMessage(_INTL("Can't use that while on a bicycle."))
+  #   pbMessage("Can't use that while on a bicycle.")
   #   return false
   # end
   # Debug

Data/Scripts/013_Items/008_PokemonBag.rb

@@ -121,6 +121,7 @@ class PokemonBag
 
   def pbQuantity(item)
     item = GameData::Item.get(item)
+    return 0 unless item
     pocket = item.pocket
     return ItemStorageHelper.pbQuantity(@pockets[pocket], item.id)
   end