Fixes sprite importing

Data/Scripts/048_Fusion/DoublePreviewScreen.rb

@@ -111,7 +111,7 @@ class DoublePreviewScreen
     spriteLoader = BattleSpriteLoader.new
     bitmap = spriteLoader.load_fusion_sprite(head_pokemon,body_pokemon)
     bitmap.scale_bitmap(Settings::FRONTSPRITE_SCALE)
-
+    pif_sprite = spriteLoader.obtain_fusion_pif_sprite(head_pokemon,body_pokemon)
     #hasCustom = picturePath.include?("CustomBattlers")
     #hasCustom = customSpriteExistsBase(body_pokemon,head_pokemon)
     hasCustom = customSpriteExists(body_pokemon,head_pokemon)
@@ -123,10 +123,12 @@ class DoublePreviewScreen
     drawFusionInformation(dexNumber, level, x)
 
     if !$Trainer.seen?(dexNumber)
-      if hasCustom
-        previewwindow.picture.pbSetColor(150, 255, 150, 200)
+      if pif_sprite.local_path()
+        previewwindow.picture.pbSetColor(170, 200, 250, 200)  #blue
+      elsif hasCustom
+        previewwindow.picture.pbSetColor(150, 255, 150, 200)  #green
       else
-        previewwindow.picture.pbSetColor(255, 255, 255, 200)
+        previewwindow.picture.pbSetColor(255, 255, 255, 200)  #white
       end
     end
     return previewwindow

Data/Scripts/048_Fusion/PokemonFusion.rb

@@ -954,6 +954,7 @@ end
 def drawSpriteCredits(pif_sprite, viewport)
   overlay = BitmapSprite.new(Graphics.width, Graphics.height, @viewport).bitmap
   return if pif_sprite.type == :AUTOGEN
+  return if pif_sprite.local_path
   x = Graphics.width / 2
   y = 240
   spritename = pif_sprite.to_filename()

Data/Scripts/048_Fusion/Sprites/002_PIFSpriteExtracter.rb

@@ -9,26 +9,26 @@ class PIFSpriteExtracter
 
   def load_sprite(pif_sprite,download_allowed=true)
     begin
-    start_time = Time.now
-    bitmap = @@spritesheet_cache.get_bitmap(pif_sprite)
-    loaded_from_spritesheet=false
+      start_time = Time.now
+      bitmap = @@spritesheet_cache.get_bitmap(pif_sprite)
+      loaded_from_spritesheet=false
 
-    if !bitmap
-      download_new_spritesheet(pif_sprite) if should_update_spritesheet?(pif_sprite) && download_allowed
-      if pbResolveBitmap(getSpritesheetPath(pif_sprite))
-        bitmap = load_bitmap_from_spritesheet(pif_sprite)
-        loaded_from_spritesheet=true
-        @@spritesheet_cache.add(pif_sprite, bitmap)
-      else
-        return nil
+      if !bitmap
+        download_new_spritesheet(pif_sprite) if should_update_spritesheet?(pif_sprite) && download_allowed
+        if pbResolveBitmap(getSpritesheetPath(pif_sprite))
+          bitmap = load_bitmap_from_spritesheet(pif_sprite)
+          loaded_from_spritesheet=true
+          @@spritesheet_cache.add(pif_sprite, bitmap)
+        else
+          return nil
+        end
       end
-    end
-    sprite_bitmap = AnimatedBitmap.from_bitmap(bitmap)
-    sprite_bitmap.scale_bitmap(get_resize_scale())
-    end_time = Time.now
-    source = loaded_from_spritesheet ? :"spritesheet" : "cache"
-    echoln "Loaded sprite for <head:#{pif_sprite.head_id}, body: #{pif_sprite.body_id}, variant: #{pif_sprite.alt_letter}> from #{source} in #{end_time - start_time} seconds"
-    return sprite_bitmap
+      sprite_bitmap = AnimatedBitmap.from_bitmap(bitmap)
+      sprite_bitmap.scale_bitmap(get_resize_scale())
+      end_time = Time.now
+      source = loaded_from_spritesheet ? :"spritesheet" : "cache"
+      echoln "Loaded sprite for <head:#{pif_sprite.head_id}, body: #{pif_sprite.body_id}, variant: #{pif_sprite.alt_letter}> from #{source} in #{end_time - start_time} seconds"
+      return sprite_bitmap
     rescue Exception
       e = $!
       echoln "Error loading sprite: #{e}" if bitmap
@@ -91,41 +91,8 @@ class PIFSpriteExtracter
     @@spritesheet_cache.clear
   end
 
-  end
+end
 
 class PokemonGlobalMetadata
   attr_accessor :current_spritepack_date
 end
-
-
-
-
-
-# class SpritesBitmapCache
-#   @@cache = {} # Cache storage for spritesheets
-#   @@usage_order = [] # Tracks usage order for LRU eviction
-#
-#   def self.fetch(key)
-#     if @@cache.key?(key)
-#       # Move key to the end to mark it as recently used
-#       @@usage_order.delete(key)
-#       @@usage_order << key
-#       return @@cache[key]
-#     end
-#
-#     # Load spritesheet via block if not found in cache
-#     spritesheet = yield
-#
-#     if @@cache.size >= Settings::SPRITE_CACHE_MAX_NB
-#       # Evict least recently used (first in order)
-#       oldest_key = @@usage_order.shift
-#       @@cache.delete(oldest_key)
-#       echoln "Evicted: #{oldest_key} from spritesheet cache"
-#     end
-#
-#     # Add new spritesheet to cache and track its usage
-#     @@cache[key] = spritesheet
-#     @@usage_order << key
-#     spritesheet
-#   end
-# end

Data/Scripts/048_Fusion/Sprites/BattleSpriteLoader.rb

@@ -4,6 +4,9 @@ class BattleSpriteLoader
   end
 
   def load_pif_sprite_directly(pif_sprite)
+    if pif_sprite.local_path && pbResolveBitmap(pif_sprite.local_path)
+      return AnimatedBitmap.new(pif_sprite.local_path)
+    end
     extractor = get_sprite_extractor_instance(pif_sprite.type)
     return extractor.load_sprite(pif_sprite)
   end
@@ -22,8 +25,8 @@ class BattleSpriteLoader
   def preload_sprite_from_pokemon(pokemon)
     return if !pokemon
     substitution_id = get_sprite_substitution_id_from_dex_number(pokemon.species)
-    echoln substitution_id
-    echoln $PokemonGlobal.alt_sprite_substitutions
+    # echoln substitution_id
+    # echoln $PokemonGlobal.alt_sprite_substitutions
     pif_sprite = $PokemonGlobal.alt_sprite_substitutions[substitution_id] if $PokemonGlobal
     if !pif_sprite
       pif_sprite = get_pif_sprite_from_species(pokemon.species)
@@ -65,19 +68,25 @@ class BattleSpriteLoader
   def obtain_fusion_pif_sprite(head_id,body_id)
     substitution_id = get_sprite_substitution_id_for_fusion(head_id, body_id)
     pif_sprite = $PokemonGlobal.alt_sprite_substitutions[substitution_id] if $PokemonGlobal
+    pif_sprite.dump_info if pif_sprite
     if !pif_sprite
       pif_sprite = select_new_pif_fusion_sprite(head_id, body_id)
+      local_path = check_for_local_sprite(pif_sprite)
+      if local_path
+        pif_sprite.local_path = local_path
+        pif_sprite.type = :CUSTOM
+      end
       substitution_id = get_sprite_substitution_id_for_fusion(head_id, body_id)
       $PokemonGlobal.alt_sprite_substitutions[substitution_id] = pif_sprite if $PokemonGlobal
     end
     return pif_sprite
   end
 
+
   def load_fusion_sprite(head_id, body_id)
     pif_sprite = obtain_fusion_pif_sprite(head_id,body_id)
-    local_path = check_for_local_sprite(pif_sprite)
-    if local_path
-      return AnimatedBitmap.new(local_path)
+    if pif_sprite.local_path
+      return AnimatedBitmap.new(pif_sprite.local_path)
     end
     extractor = get_sprite_extractor_instance(pif_sprite.type)
     loaded_sprite = extractor.load_sprite(pif_sprite, @download_allowed)
@@ -94,9 +103,8 @@ class BattleSpriteLoader
       pif_sprite = select_new_pif_base_sprite(dex_number)
       $PokemonGlobal.alt_sprite_substitutions[substitution_id] = pif_sprite if $PokemonGlobal
     end
-    local_path = check_for_local_sprite(pif_sprite)
-    if local_path
-      return AnimatedBitmap.new(local_path)
+    if pif_sprite.local_path
+      return AnimatedBitmap.new(pif_sprite.local_path)
     end
     extractor = get_sprite_extractor_instance(pif_sprite.type)
     loaded_sprite = extractor.load_sprite(pif_sprite)
@@ -137,6 +145,7 @@ class BattleSpriteLoader
   end
 
   def check_for_local_sprite(pif_sprite)
+    return pif_sprite.local_path if pif_sprite.local_path
     if pif_sprite.type == :BASE
       sprite_path = "#{Settings::CUSTOM_BASE_SPRITES_FOLDER}#{pif_sprite.head_id}#{pif_sprite.alt_letter}.png"
     else

Data/Scripts/048_Fusion/Sprites/PIFSprite.rb

@@ -4,16 +4,33 @@ class PIFSprite
   attr_accessor :head_id
   attr_accessor :body_id
   attr_accessor :alt_letter
+  attr_accessor :local_path
 
   #types:
   # :AUTOGEN, :CUSTOM, :BASE
-  def initialize(type, head_id, body_id, alt_letter="")
+  def initialize(type, head_id, body_id, alt_letter = "")
     @type = type
     @head_id = head_id
     @body_id = body_id
     @alt_letter = alt_letter
+    @local_path = nil
   end
 
+  def dump_info()
+    echoln "Type: #{@type}"
+    echoln "Head: #{@head_id}"
+    echoln "Body: #{@body_id}"
+    echoln "Alt letter: #{@alt_letter}"
+    echoln "Local path: #{@local_path}"
+  end
+
+  def equals(other_pif_sprite)
+    return @type == other_pif_sprite.type &&
+      @head_id == other_pif_sprite.head_id &&
+      @body_id == other_pif_sprite.body_id &&
+      @alt_letter == other_pif_sprite.alt_letter &&
+      @local_path == other_pif_sprite.local_path
+  end
 
   #little hack for old methods that expect a filename for a sprite
   def to_filename()
@@ -27,9 +44,9 @@ class PIFSprite
     end
   end
 
-  def setup_from_spritename(spritename,type)
+  def setup_from_spritename(spritename, type)
     @type = type
-    cleaned_name = spritename.gsub(".png","")
+    cleaned_name = spritename.gsub(".png", "")
     if cleaned_name =~ /(\d+)\.(\d+)([a-zA-Z]*)/
       head_id = $1
       body_id = $2
@@ -40,39 +57,36 @@ class PIFSprite
     @alt_letter = alt_letter
   end
 
-  def self.from_spritename(spritename,type)
+  def self.from_spritename(spritename, type)
     obj = allocate
-    obj.send(:setup_from_spritename, spritename,type)
+    obj.send(:setup_from_spritename, spritename, type)
     obj
   end
 
-
 end
 
-def new_pif_sprite_from_dex_num(type, dexNum,alt_letter)
+def new_pif_sprite_from_dex_num(type, dexNum, alt_letter)
   body_id = getBodyID(dexNum)
-  head_id = getHeadID(dexNum,body_id)
-  return PIFSprite.new(type,head_id,body_id,alt_letter)
+  head_id = getHeadID(dexNum, body_id)
+  return PIFSprite.new(type, head_id, body_id, alt_letter)
 end
 
-
-
 def pif_sprite_from_spritename(spritename, autogen = false)
   spritename = spritename.split(".png")[0] #remove the extension
-  if spritename =~ /^(\d+)\.(\d+)([a-zA-Z]*)$/  # Two numbers with optional letters
+  if spritename =~ /^(\d+)\.(\d+)([a-zA-Z]*)$/ # Two numbers with optional letters
     type = :CUSTOM
-    head_id = $1.to_i   # Head (e.g., "1" in "1.2.png")
-    body_id = $2.to_i   # Body (e.g., "2" in "1.2.png")
-    alt_letter = $3     # Optional trailing letter (e.g., "a" in "1.2a.png")
+    head_id = $1.to_i # Head (e.g., "1" in "1.2.png")
+    body_id = $2.to_i # Body (e.g., "2" in "1.2.png")
+    alt_letter = $3 # Optional trailing letter (e.g., "a" in "1.2a.png")
 
-  elsif spritename =~ /^(\d+)([a-zA-Z]*)$/  # One number with optional letters
+  elsif spritename =~ /^(\d+)([a-zA-Z]*)$/ # One number with optional letters
     type = :BASE
-    head_id = $1.to_i   # Head (e.g., "1" in "1.png")
-    alt_letter = $2     # Optional trailing letter (e.g., "a" in "1a.png")
+    head_id = $1.to_i # Head (e.g., "1" in "1.png")
+    alt_letter = $2 # Optional trailing letter (e.g., "a" in "1a.png")
   else
     echoln "Invalid sprite format: #{spritename}"
     return nil
   end
   type = :AUTOGEN if autogen
-  return PIFSprite.new(type,head_id,body_id,alt_letter)
+  return PIFSprite.new(type, head_id, body_id, alt_letter)
 end