6.4 update (minus sprites)

Data/Scripts/007_Objects and windows/002_MessageConfig.rb

@@ -101,7 +101,7 @@ module MessageConfig
   def self.pbSettingToTextSpeed(speed)
     case speed
     when 0 then return 1
-    when 1 then return -2
+    when 1 then return -3
     when 2 then return -999
     end
     return TEXT_SPEED || 1

Data/Scripts/007_Objects and windows/008_AnimatedBitmap.rb

@@ -1,6 +1,7 @@
 #===============================================================================
 #
 #===============================================================================
+
 class AnimatedBitmap
   attr_reader :path
   attr_reader :filename
@@ -23,6 +24,19 @@ class AnimatedBitmap
     end
   end
 
+  def setup_from_bitmap(bitmap,hue=0)
+    @path = ""
+    @filename = ""
+    @bitmap = GifBitmap.new("", '', hue)
+    @bitmap.bitmap = bitmap;
+  end
+
+  def self.from_bitmap(bitmap, hue=0)
+    obj = allocate
+    obj.send(:setup_from_bitmap, bitmap, hue)
+    obj
+  end
+
   def pbSetColor(r = 0, g = 0, b = 0, a = 255)
     color = Color.new(r, g, b, a)
     pbSetColorValue(color)
@@ -40,7 +54,7 @@ class AnimatedBitmap
 
 
   def shiftColors(offset = 0)
-    @bitmap = GifBitmap.new(@path, @filename, offset)
+    @bitmap.bitmap.hue_change(offset)
   end
 
   def [](index)
@@ -133,6 +147,7 @@ class AnimatedBitmap
 
 end
 
+
 #===============================================================================
 #
 #===============================================================================

Data/Scripts/007_Objects and windows/011_Messages.rb

@@ -734,8 +734,10 @@ def pbMessageDisplay(msgwindow, message, letterbyletter = true, commandProc = ni
           head = getBasePokemonID(param.to_i, false)
           body = getBasePokemonID(param.to_i, true)
           facewindow.dispose if facewindow
-          path = obtainPokemonSpritePath(body, head, true)
-          facewindow = isFusion ? PictureWindow.new(path) : PictureWindow.new("Graphics/Battlers/#{head}/#{head}.png")
+          #path = obtainPokemonSpritePath(body, head, true) if isFusion
+
+          spriteLoader = BattleSpriteLoader.new
+          facewindow = isFusion ? PictureWindow.new(spriteLoader.load_fusion_sprite(head,body)) : PictureWindow.new(spriteLoader.load_base_sprite(head))
           pbPositionNearMsgWindow(facewindow, msgwindow, :left)
           facewindow.viewport = msgwindow.viewport
           facewindow.z = msgwindow.z
@@ -906,8 +908,10 @@ def pbMessageChooseNumber(message, params, &block)
   return ret
 end
 
+
 def pbShowCommands(msgwindow, commands = nil, cmdIfCancel = 0, defaultCmd = 0)
   return 0 if !commands
+  $PokemonTemp.speechbubble_arrow.visible =false if $PokemonTemp.speechbubble_arrow && !$PokemonTemp.speechbubble_arrow.disposed?
   if defaultCmd == 0 && ($game_variables && $game_variables[VAR_COMMAND_WINDOW_INDEX] != 0)
     defaultCmd = $game_variables[VAR_COMMAND_WINDOW_INDEX]
   end