Update 6.8

Data/Scripts/016_UI/PokemonStorage/UI/PokemonBoxIcon.rb

@@ -9,6 +9,7 @@ class PokemonBoxIcon < IconSprite
     @pokemon = pokemon
     @release = Interpolator.new
     @startRelease = false
+    @enabled=true
     refresh
   end
 
@@ -66,20 +67,20 @@ class PokemonBoxIcon < IconSprite
     @startRelease = true
   end
 
-  def refresh(fusion_enabled = true)
-    return if !@pokemon
-    if useRegularIcon(@pokemon.species) || @pokemon.egg?
-      self.setBitmap(GameData::Species.icon_filename_from_pokemon(@pokemon))
-    else
-      self.setBitmapDirectly(createFusionIcon(@pokemon.species, @pokemon.spriteform_head, @pokemon.spriteform_body))
-      if fusion_enabled
-        self.visible = true
-      else
-        self.opacity = false
-      end
-    end
-    self.src_rect = Rect.new(0, 0, self.bitmap.height, self.bitmap.height)
-  end
+  # def refresh(fusion_enabled = true, filter_proc = nil)
+  #   return if !@pokemon
+  #   if useRegularIcon(@pokemon.species) || @pokemon.egg?
+  #     self.setBitmap(GameData::Species.icon_filename_from_pokemon(@pokemon))
+  #   else
+  #     self.setBitmapDirectly(createFusionIcon(@pokemon.species, @pokemon.spriteform_head, @pokemon.spriteform_body))
+  #     if fusion_enabled
+  #       self.visible = true
+  #     else
+  #       self.opacity = false
+  #     end
+  #   end
+  #   self.src_rect = Rect.new(0, 0, self.bitmap.height, self.bitmap.height)
+  # end
 
   def update
     super

Data/Scripts/016_UI/PokemonStorage/UI/PokemonBoxPartySprite.rb

@@ -3,16 +3,24 @@
 # Party pop-up panel
 #===============================================================================
 class PokemonBoxPartySprite < SpriteWrapper
-  def initialize(party, viewport = nil)
+  attr_accessor :filterProc
+
+  def initialize(party, viewport = nil, filter= nil)
     super(viewport)
     @party = party
-    @boxbitmap = AnimatedBitmap.new("Graphics/Pictures/Storage/overlay_party")
+    dark_mode = isDarkMode
+    party_tab_path ="Graphics/Pictures/Storage/overlay_party"
+    party_tab_path += "_dark" if dark_mode
+    @boxbitmap = AnimatedBitmap.new(party_tab_path)
     @pokemonsprites = []
+    @filterProc = filter
+
     for i in 0...Settings::MAX_PARTY_SIZE
       @pokemonsprites[i] = nil
       pokemon = @party[i]
       if pokemon
         @pokemonsprites[i] = PokemonBoxIcon.new(pokemon, viewport)
+        @pokemonsprites[i].apply_filter(@filterProc)
       end
     end
     @contents = BitmapWrapper.new(172, 352)
@@ -90,7 +98,7 @@ class PokemonBoxPartySprite < SpriteWrapper
   def refresh
     @contents.blt(0, 0, @boxbitmap.bitmap, Rect.new(0, 0, 172, 352))
     pbDrawTextPositions(self.bitmap, [
-      [_INTL("Back"), 86, 240, 2, Color.new(248, 248, 248), Color.new(80, 80, 80), 1]
+      [_INTL("Boxes"), 86, 240, 2, Color.new(248, 248, 248), Color.new(80, 80, 80), 1]
     ])
     xvalues = [] # [18, 90, 18, 90, 18, 90]
     yvalues = [] # [2, 18, 66, 82, 130, 146]

Data/Scripts/016_UI/PokemonStorage/UI/PokemonBoxSprite.rb

@@ -4,35 +4,43 @@
 class PokemonBoxSprite < SpriteWrapper
   attr_accessor :refreshBox
   attr_accessor :refreshSprites
-
-  def initialize(storage, boxnumber, viewport = nil, fusionsEnabled = true)
+  attr_accessor :filterProc
+  attr_reader :boxnumber
+  def initialize(storage, boxnumber, viewport = nil, fusionsEnabled = true, filter = nil)
     super(viewport)
     @storage = storage
     @boxnumber = boxnumber
     @refreshBox = true
     @refreshSprites = true
     @pokemonsprites = []
+    @filterProc = filter
     for i in 0...PokemonBox::BOX_SIZE
       @pokemonsprites[i] = nil
       pokemon = @storage[boxnumber, i]
       @pokemonsprites[i] = PokemonBoxIcon.new(pokemon, viewport)
+      @pokemonsprites[i].apply_filter(@filterProc)
     end
     @contents = BitmapWrapper.new(324, 296)
     self.bitmap = @contents
     self.x = 184
     self.y = 18
-
     @fusions_enabled = fusionsEnabled
     refresh
   end
 
+  def setFilterProc(filter)
+    @filterProc=filter
+  end
+
   def disableFusions()
-    @fusions_enabled = false
+    #@fusions_enabled = false
+    @filterProc = proc { |pokemon| pokemon&.isFusion? == false }
     refreshAllBoxSprites()
   end
 
   def enableFusions()
-    @fusions_enabled = true
+    @filterProc = nil
+   # @fusions_enabled = true
     refreshAllBoxSprites()
   end
 
@@ -159,11 +167,13 @@ class PokemonBoxSprite < SpriteWrapper
     end
   end
 
-  def refreshAllBoxSprites
-    # spriteLoader = BattleSpriteLoader.new
+  #@filterProc is called on the @pokemon object of each BoxIcon.
+  # If true, full opacity, selectable, otherwise, low opacity, not selectable
+  def refreshAllBoxSprites()
     for i in 0...PokemonBox::BOX_SIZE
       if @pokemonsprites[i] && !@pokemonsprites[i].disposed?
-        @pokemonsprites[i].refresh(@fusions_enabled)
+        @pokemonsprites[i].refresh
+        @pokemonsprites[i].apply_filter(@filterProc)
       end
       # spriteLoader.preload_sprite_from_pokemon(@pokemonsprites[i].pokemon) if @pokemonsprites[i].pokemon
     end
@@ -174,6 +184,7 @@ class PokemonBoxSprite < SpriteWrapper
     for i in 0...PokemonBox::BOX_SIZE
       if @pokemonsprites[i] && !@pokemonsprites[i].disposed?
         @pokemonsprites[i].update
+        #@pokemonsprites[i].apply_filter(@filterProc)
       end
     end
   end