Release 6.9.0

Data/Scripts/011_Battle/001_Battler/001_PokeBattle_Battler.rb

@@ -301,7 +301,7 @@ class PokeBattle_Battler
   end
 
   def pbWeight
-    ret = (@pokemon) ? @pokemon.weight : 500
+    ret = (@pokemon) ? @pokemon.species_data.weight : 500
     ret += @effects[PBEffects::WeightChange]
     ret = 1 if ret < 1
     if abilityActive? && !@battle.moldBreaker

Data/Scripts/011_Battle/001_Battler/002_Battler_Initialize.rb

@@ -297,6 +297,7 @@ class PokeBattle_Battler
       @spatk        = @pokemon.spatk
       @spdef        = @pokemon.spdef
       @speed        = @pokemon.speed
+      @attack, @defense = @defense, @attack if @effects[PBEffects::PowerTrick]
       if fullChange
         @type1      = @pokemon.type1
         @type2      = @pokemon.type2

Data/Scripts/011_Battle/001_Battler/003_Battler_ChangeSelf.rb

@@ -136,6 +136,11 @@ class PokeBattle_Battler
     end
     @effects[PBEffects::BurnUp] = false
     @effects[PBEffects::Roost]  = false
+    if pbOwnedByPlayer?
+      @battle.scene.pbRefreshOne(@index) if $PokemonSystem.type_icons_player
+    else
+      @battle.scene.pbRefreshOne(@index) if $PokemonSystem.type_icons_opponent
+    end
   end
 
   #=============================================================================

Data/Scripts/011_Battle/001_Battler/007_Battler_UseMove.rb

@@ -171,6 +171,7 @@ class PokeBattle_Battler
     pbBeginTurn(choice)
     # Force the use of certain moves if they're already being used
     if usingMultiTurnAttack?
+      echoln @currentMove
       choice[2] = PokeBattle_Move.from_pokemon_move(@battle, Pokemon::Move.new(@currentMove))
       specialUsage = true
     elsif @effects[PBEffects::Encore] > 0 && choice[1] >= 0 &&