Release 6.9.0

Data/Scripts/011_Battle/002_Move/005_Move_Effects_000-07F.rb

@@ -277,6 +277,14 @@ end
 # Confuses the target.
 #===============================================================================
 class PokeBattle_Move_013 < PokeBattle_ConfuseMove
+
+  def pbOnStartUse(user,target)
+    if user.pokemon.chatter_text
+      pbCallBubOverBattler(user)
+      pbMessage(user.pokemon.chatter_text + "!\\wtnp[15]")
+    end
+    super(user,target)
+  end
 end
 
 #===============================================================================
@@ -1753,7 +1761,7 @@ class PokeBattle_Move_060 < PokeBattle_Move
     end
     if !checkedTerrain
       case @battle.environment
-      when :Grass, :TallGrass, :Grass_alt1,:Grass_alt2,:Grass_alt3,
+      when :Grass, :TallGrass, :Grass_alt1,:Grass_alt2,:Grass_alt3,:Grass_alt4
         @newType = :GRASS
       when :MovingWater, :StillWater, :Puddle, :Underwater
         @newType = :WATER

Data/Scripts/011_Battle/002_Move/006_Move_Effects_080-0FF.rb

@@ -2498,8 +2498,14 @@ class PokeBattle_Move_0D6 < PokeBattle_HealingMove
     return (user.totalhp/2.0).round
   end
 
-  def pbEffectAfterAllHits(user,target)
+  def pbEffectGeneral(user)
     user.effects[PBEffects::Roost] = true
+    if user.pbOwnedByPlayer?
+      @battle.scene.pbRefreshOne(user.index) if $PokemonSystem.type_icons_player
+    else
+      @battle.scene.pbRefreshOne(user.index) if $PokemonSystem.type_icons_opponent
+    end
+    super(user)
   end
 end
 
@@ -3223,8 +3229,7 @@ class PokeBattle_Move_0F1 < PokeBattle_Move
     itemName = target.itemName
     user.item = target.item
     # Permanently steal the item from wild Pokémon
-    # removed target.item == target.initialItem, this may cause bugs.
-    if @battle.wildBattle? && target.opposes? && !user.initialItem
+    if @battle.wildBattle? && target.opposes? && !user.initialItem && target.item&.id == target.initialItem
       user.setInitialItem(target.item)
     end
     target.pbRemoveItem(false)
@@ -3284,8 +3289,7 @@ class PokeBattle_Move_0F2 < PokeBattle_Move
     target.effects[PBEffects::ChoiceBand] = nil
     target.effects[PBEffects::Unburden]   = (!target.item && oldTargetItem)
     # Permanently steal the item from wild Pokémon
-    if @battle.wildBattle? && target.opposes? &&
-       target.initialItem==oldTargetItem && !user.initialItem
+    if @battle.wildBattle? && target.opposes? && target.initialItem==oldTargetItem&.id && !user.initialItem
       user.setInitialItem(oldTargetItem)
     end
     @battle.pbDisplay(_INTL("{1} switched items with its opponent!",user.pbThis))
@@ -3328,8 +3332,7 @@ class PokeBattle_Move_0F3 < PokeBattle_Move
     itemName = user.itemName
     target.item = user.item
     # Permanently steal the item from wild Pokémon
-    if @battle.wildBattle? && user.opposes? &&
-       user.initialItem==user.item && !target.initialItem
+    if @battle.wildBattle? && user.opposes? && user.initialItem==user.item&.id && !target.initialItem
       target.setInitialItem(user.item)
       user.pbRemoveItem
     else
@@ -3534,6 +3537,7 @@ class PokeBattle_Move_0F7 < PokeBattle_Move
     @willFail = true if user.item.is_berry? && !user.canConsumeBerry?
     return if @willFail
     return if user.item.is_mega_stone?
+    return if user.item.is_berry? 
     flingableItem = false
     @flingPowers.each do |_power, items|
       next if !items.include?(user.item_id)

Data/Scripts/011_Battle/002_Move/007_Move_Effects_100-17F.rb

@@ -1352,6 +1352,11 @@ class PokeBattle_Move_142 < PokeBattle_Move
 
   def pbEffectAgainstTarget(user, target)
     target.effects[PBEffects::Type3] = :GHOST
+    if target.pbOwnedByPlayer?
+      @battle.scene.pbRefreshOne(target.index) if $PokemonSystem.type_icons_player
+    else
+      @battle.scene.pbRefreshOne(target.index) if $PokemonSystem.type_icons_opponent
+    end
     typeName = GameData::Type.get(:GHOST).name
     @battle.pbDisplay(_INTL("{1} transformed into the {2} type!", target.pbThis, typeName))
   end
@@ -1371,6 +1376,11 @@ class PokeBattle_Move_143 < PokeBattle_Move
 
   def pbEffectAgainstTarget(user, target)
     target.effects[PBEffects::Type3] = :GRASS
+    if target.pbOwnedByPlayer?
+      @battle.scene.pbRefreshOne(target.index) if $PokemonSystem.type_icons_player
+    else
+      @battle.scene.pbRefreshOne(target.index) if $PokemonSystem.type_icons_opponent
+    end
     typeName = GameData::Type.get(:GRASS).name
     @battle.pbDisplay(_INTL("{1} transformed into the {2} type!", target.pbThis, typeName))
   end
@@ -2017,6 +2027,11 @@ class PokeBattle_Move_162 < PokeBattle_Move
   def pbEffectAfterAllHits(user, target)
     if !user.effects[PBEffects::BurnUp]
       user.effects[PBEffects::BurnUp] = true
+      if user.pbOwnedByPlayer?
+        @battle.scene.pbRefreshOne(user.index) if $PokemonSystem.type_icons_player
+      else
+        @battle.scene.pbRefreshOne(user.index) if $PokemonSystem.type_icons_opponent
+      end
       @battle.pbDisplay(_INTL("{1} burned itself out!", user.pbThis))
     end
   end