Various bug fixes

Data/Scripts/011_Battle/003_Battle/006_Battle_Action_Switching.rb

@@ -200,7 +200,7 @@ class PokeBattle_Battle
         end
       end
       break if switched.length==0
-      @battle.pbOnBattlerEnteringBattle(switched)
+      pbOnBattlerEnteringBattle(switched)
     end
   end
 

Data/Scripts/014_Pokemon/001_Pokemon-related/001_FormHandlers.rb

@@ -308,12 +308,6 @@ MultipleForms.register(:ARCEUS,{
   }
 })
 
-MultipleForms.register(:BASCULIN,{
-  "getFormOnCreation" => proc { |pkmn|
-    next rand(2)
-  }
-})
-
 MultipleForms.register(:DARMANITAN,{
   "getFormOnLeavingBattle" => proc { |pkmn,battle,usedInBattle,endBattle|
     next 2 * (pkmn.form / 2)
@@ -397,14 +391,6 @@ MultipleForms.register(:SCATTERBUG,{
 
 MultipleForms.copy(:SCATTERBUG,:SPEWPA,:VIVILLON)
 
-MultipleForms.register(:FLABEBE,{
-  "getFormOnCreation" => proc { |pkmn|
-    next rand(5)
-  }
-})
-
-MultipleForms.copy(:FLABEBE,:FLOETTE,:FLORGES)
-
 MultipleForms.register(:FURFROU,{
   "getForm" => proc { |pkmn|
     if !pkmn.time_form_set ||
@@ -470,12 +456,6 @@ MultipleForms.register(:HOOPA,{
   }
 })
 
-MultipleForms.register(:ORICORIO,{
-  "getFormOnCreation" => proc { |pkmn|
-    next rand(4)   # 0=red, 1=yellow, 2=pink, 3=purple
-  },
-})
-
 MultipleForms.register(:ROCKRUFF,{
   "getForm" => proc { |pkmn|
     next if pkmn.form_simple >= 2   # Own Tempo Rockruff cannot become another form
@@ -602,7 +582,8 @@ MultipleForms.copy(:TOXEL, :TOXTRICITY)
 
 MultipleForms.register(:SINISTEA, {
   "getFormOnCreation" => proc { |pkmn|
-    next rand(2)
+    next 1 if rand(100) < 10   # Antique
+    next 0                     # Phony
   }
 })
 
@@ -698,7 +679,7 @@ MultipleForms.register(:ZAMAZENTA, {
 })
 
 MultipleForms.register(:URSHIFU, {
-  "getForm" => proc { |pkmn|
+  "getFormOnCreation" => proc { |pkmn|
     next rand(2)
   }
 })

Data/Scripts/014_Pokemon/001_Pokemon-related/002_ShadowPokemon_Other.rb

@@ -333,7 +333,7 @@ class PokeBattle_Move_AllBattlersLoseHalfHPUserSkipsNextTurn < PokeBattle_Move
   def pbEffectGeneral(user)
     @battle.eachBattler do |b|
       next if b.hp==1
-      b.pbReduceHP(i.hp/2,false)
+      b.pbReduceHP(b.hp / 2, false)
     end
     @battle.pbDisplay(_INTL("Each Pokémon's HP was halved!"))
     @battle.eachBattler { |b| b.pbItemHPHealCheck }

Data/Scripts/020_Debug/001_Editor screens/001_EditorScreens.rb

@@ -861,8 +861,6 @@ def pbItemEditor
   GameData::Item::SCHEMA["FieldUse"][2].each { |key, value| field_use_array[value] = key if !field_use_array[value] }
   battle_use_array = [_INTL("Can't use in battle")]
   GameData::Item::SCHEMA["BattleUse"][2].each { |key, value| battle_use_array[value] = key if !battle_use_array[value] }
-  type_array = [_INTL("No special type")]
-  GameData::Item::SCHEMA["Type"][2].each { |key, value| type_array[value] = key }
   item_properties = [
      [_INTL("ID"),          ReadOnlyProperty,                   _INTL("ID of this item (used as a symbol like :XXX).")],
      [_INTL("Name"),        ItemNameProperty,                   _INTL("Name of this item as displayed by the game.")],
@@ -874,7 +872,7 @@ def pbItemEditor
      [_INTL("FieldUse"),    EnumProperty.new(field_use_array),  _INTL("How this item can be used outside of battle.")],
      [_INTL("BattleUse"),   EnumProperty.new(battle_use_array), _INTL("How this item can be used within a battle.")],
      [_INTL("Consumable"),  BooleanProperty,                    _INTL("Whether this item is consumed after use.")],
-     [_INTL("Flags"),       StringListProperty,                 _INTL("Words/phrases that group certain kinds of items.")],
+     [_INTL("Flags"),       StringListProperty,                 _INTL("Words/phrases that can be used to group certain kinds of items.")],
      [_INTL("Move"),        MoveProperty,                       _INTL("Move taught by this HM, TM or TR.")]
   ]
   pbListScreenBlock(_INTL("Items"), ItemLister.new(0, true)) { |button, item|