Update 6.8

Data/Scripts/052_InfiniteFusion/Gameplay/Pokedex/UI_Pokedex_SpritesPage.rb

@@ -1,12 +1,20 @@
-class PokemonPokedexInfo_Scene
-  #todo add indicator to show which one is the main sprite -
-  # also maybe add an indicator in main list for when a sprite has available alts
+# Todo: There are 2 modes in here:
+# - Selecting a specific sprite
+# - Selecting which sprites are available for that species (blacklist stuff)
+# _
+# It would be good to separate the logic into 2 different pages based on the same one instead of doing everything
+# in this one
 
-  Y_POSITION_SMALL = 40 #90
+class PokemonGlobalMetadata
+  attr_accessor :seen_sprites_tutorial
+end
+
+class PokemonPokedexInfo_Scene
+  Y_POSITION_SMALL = 40 # 90
   Y_POSITION_BIG = 60
-  X_POSITION_PREVIOUS = -30 #20
+  X_POSITION_PREVIOUS = -30 # 20
   X_POSITION_SELECTED = 105
-  X_POSITION_NEXT = 340 #380
+  X_POSITION_NEXT = 340 # 380
 
   Y_POSITION_BG_SMALL = 70
   Y_POSITION_BG_BIG = 93
@@ -21,11 +29,23 @@ class PokemonPokedexInfo_Scene
     base = Color.new(88, 88, 80)
     shadow = Color.new(168, 184, 184)
 
-    #alts_list= pbGetAvailableAlts
+    # alts_list= pbGetAvailableAlts
     @selected_index = 0 if !@selected_index
     update_displayed
   end
 
+  def checkSpritesPageTutorial
+    return unless $PokemonSystem.random_sprites
+    return unless @selecting_blacklist
+    return if $PokemonGlobal.seen_sprites_tutorial
+    pbMessage(_INTL("Pokémon are assigned a random sprite when you encounter them in the wild."))
+    pbMessage(_INTL("This page allows you to select the sprites that can appear for each Pokémon."))
+    unless @pokemon
+      pbMessage(_INTL("To change one of your caught Pokémon's sprite, you need to open its Pokédex entry from the the Pokémon's Summary page."))
+    end
+    $PokemonGlobal.seen_sprites_tutorial = true
+  end
+
   def init_selected_bg
     @sprites["bgSelected_previous"] = IconSprite.new(0, 0, @viewport)
     @sprites["bgSelected_previous"].x = X_POSITION_BG_PREVIOUS
@@ -55,7 +75,7 @@ class PokemonPokedexInfo_Scene
 
     init_selected_bg
     @speciesData = getSpecies(@species)
-
+    @species_id = @speciesData.species
     @selected_index = 0
 
     set_displayed_to_current_alt(altsList)
@@ -86,9 +106,9 @@ class PokemonPokedexInfo_Scene
     @sprites["previousSprite"].z = 9999999
     @sprites["nextSprite"].z = 9999999
 
-    @selected_pif_sprite = get_pif_sprite(@available[@selected_index])
-    @previous_pif_sprite = get_pif_sprite(@available[@selected_index - 1])
-    @next_pif_sprite = get_pif_sprite(@available[@selected_index + 1])
+    @selected_pif_sprite = @available[@selected_index]
+    @previous_pif_sprite = @available[@selected_index - 1]
+    @next_pif_sprite = @available[@selected_index + 1]
 
     @sprites["selectedSprite"].bitmap = load_pif_sprite(@selected_pif_sprite)
     if altsList.size >= 2
@@ -102,10 +122,143 @@ class PokemonPokedexInfo_Scene
       @sprites["previousSprite"].visible = true
     end
 
+    @selecting_blacklist = $PokemonSystem.random_sprites && !@pokemon
+    init_blacklist_icons
+  end
+
+  def init_blacklist_icons
+    blacklist_icons_x_offset_big = 130
+    blacklist_icons_y_offset_big = 235
+
+    blacklist_icons_x_offset_small = 80
+    blacklist_icons_y_offset_small = 140
+
+    @sprites["selectedSprite_blacklistEnabled"] = IconSprite.new(0, 0, @viewport)
+    @sprites["selectedSprite_blacklistEnabled"].setBitmap("Graphics/Pictures/Pokedex/enabled_icon")
+    @sprites["selectedSprite_blacklistEnabled"].x = X_POSITION_SELECTED + blacklist_icons_x_offset_big
+    @sprites["selectedSprite_blacklistEnabled"].y = Y_POSITION_BIG + blacklist_icons_y_offset_big
+    @sprites["selectedSprite_blacklistEnabled"].z = 9999999
+    @sprites["selectedSprite_blacklistEnabled"].visible = false
+
+    @sprites["selectedSprite_blacklistDisabled"] = IconSprite.new(0, 0, @viewport)
+    @sprites["selectedSprite_blacklistDisabled"].setBitmap("Graphics/Pictures/Pokedex/disabled_icon")
+    @sprites["selectedSprite_blacklistDisabled"].x = X_POSITION_SELECTED + blacklist_icons_x_offset_big
+    @sprites["selectedSprite_blacklistDisabled"].y = Y_POSITION_BIG + blacklist_icons_y_offset_big
+    @sprites["selectedSprite_blacklistDisabled"].z = 9999999
+    @sprites["selectedSprite_blacklistDisabled"].visible = false
+
+    @sprites["selectedSprite_blacklistAutogen"] = IconSprite.new(0, 0, @viewport)
+    @sprites["selectedSprite_blacklistAutogen"].setBitmap("Graphics/Pictures/Pokedex/autogen_icon")
+    @sprites["selectedSprite_blacklistAutogen"].x = X_POSITION_SELECTED + blacklist_icons_x_offset_big
+    @sprites["selectedSprite_blacklistAutogen"].y = Y_POSITION_BIG + blacklist_icons_y_offset_big
+    @sprites["selectedSprite_blacklistAutogen"].z = 9999999
+    @sprites["selectedSprite_blacklistAutogen"].visible = false
+    ##############
+
+    @sprites["previousSprite_blacklistEnabled"] = IconSprite.new(0, 0, @viewport)
+    @sprites["previousSprite_blacklistEnabled"].setBitmap("Graphics/Pictures/Pokedex/enabled_icon")
+    @sprites["previousSprite_blacklistEnabled"].x = X_POSITION_PREVIOUS + blacklist_icons_x_offset_small
+    @sprites["previousSprite_blacklistEnabled"].y = Y_POSITION_SMALL + blacklist_icons_y_offset_small
+    @sprites["previousSprite_blacklistEnabled"].z = 9999999
+    @sprites["previousSprite_blacklistEnabled"].visible = false
+
+    @sprites["previousSprite_blacklistDisabled"] = IconSprite.new(0, 0, @viewport)
+    @sprites["previousSprite_blacklistDisabled"].setBitmap("Graphics/Pictures/Pokedex/disabled_icon")
+    @sprites["previousSprite_blacklistDisabled"].x = X_POSITION_PREVIOUS + blacklist_icons_x_offset_small
+    @sprites["previousSprite_blacklistDisabled"].y = Y_POSITION_SMALL + blacklist_icons_y_offset_small
+    @sprites["previousSprite_blacklistDisabled"].z = 9999999
+    @sprites["previousSprite_blacklistDisabled"].visible = false
+
+    @sprites["previousSprite_blacklistAutogen"] = IconSprite.new(0, 0, @viewport)
+    @sprites["previousSprite_blacklistAutogen"].setBitmap("Graphics/Pictures/Pokedex/autogen_icon")
+    @sprites["previousSprite_blacklistAutogen"].x = X_POSITION_PREVIOUS + blacklist_icons_x_offset_small
+    @sprites["previousSprite_blacklistAutogen"].y = Y_POSITION_SMALL + blacklist_icons_y_offset_small
+    @sprites["previousSprite_blacklistAutogen"].z = 9999999
+    @sprites["previousSprite_blacklistAutogen"].visible = false
+
+    ###################
+
+    @sprites["nextSprite_blacklistEnabled"] = IconSprite.new(0, 0, @viewport)
+    @sprites["nextSprite_blacklistEnabled"].setBitmap("Graphics/Pictures/Pokedex/enabled_icon")
+    @sprites["nextSprite_blacklistEnabled"].x = X_POSITION_NEXT + blacklist_icons_x_offset_small
+    @sprites["nextSprite_blacklistEnabled"].y = Y_POSITION_SMALL + blacklist_icons_y_offset_small
+    @sprites["nextSprite_blacklistEnabled"].z = 9999999
+    @sprites["nextSprite_blacklistEnabled"].visible = false
+
+    @sprites["nextSprite_blacklistDisabled"] = IconSprite.new(0, 0, @viewport)
+    @sprites["nextSprite_blacklistDisabled"].setBitmap("Graphics/Pictures/Pokedex/disabled_icon")
+    @sprites["nextSprite_blacklistDisabled"].x = X_POSITION_NEXT + blacklist_icons_x_offset_small
+    @sprites["nextSprite_blacklistDisabled"].y = Y_POSITION_SMALL + blacklist_icons_y_offset_small
+    @sprites["nextSprite_blacklistDisabled"].z = 9999999
+    @sprites["nextSprite_blacklistDisabled"].visible = false
+
+    @sprites["nextSprite_blacklistAutogen"] = IconSprite.new(0, 0, @viewport)
+    @sprites["nextSprite_blacklistAutogen"].setBitmap("Graphics/Pictures/Pokedex/autogen_icon")
+    @sprites["nextSprite_blacklistAutogen"].x = X_POSITION_NEXT + blacklist_icons_x_offset_small
+    @sprites["nextSprite_blacklistAutogen"].y = Y_POSITION_SMALL + blacklist_icons_y_offset_small
+    @sprites["nextSprite_blacklistAutogen"].z = 9999999
+    @sprites["nextSprite_blacklistAutogen"].visible = false
+  end
+
+  def setBlacklistIconDisabled(spritename)
+    @sprites["#{spritename}_blacklistEnabled"].visible = false
+    @sprites["#{spritename}_blacklistDisabled"].visible = true
+  end
+
+  def setBlacklistIconEnabled(spritename)
+    @sprites["#{spritename}_blacklistEnabled"].visible = true
+    @sprites["#{spritename}_blacklistDisabled"].visible = false
+  end
+
+  def hide_blacklist_icons
+    @sprites["nextSprite_blacklistDisabled"].visible = false
+    @sprites["nextSprite_blacklistEnabled"].visible = false
+    @sprites["nextSprite_blacklistAutogen"].visible = false
+
+    @sprites["selectedSprite_blacklistDisabled"].visible = false
+    @sprites["selectedSprite_blacklistEnabled"].visible = false
+    @sprites["selectedSprite_blacklistAutogen"].visible = false
+
+    @sprites["previousSprite_blacklistDisabled"].visible = false
+    @sprites["previousSprite_blacklistEnabled"].visible = false
+    @sprites["previousSprite_blacklistAutogen"].visible = false
+  end
+
+  def update_blacklist_icons
+    $PokemonSystem.sprites_blacklist = {} unless $PokemonSystem.sprites_blacklist
+    species_blacklist = $PokemonSystem.sprites_blacklist[@species_id]
+    species_blacklist = initialize_species_blacklist(@species_id) unless species_blacklist
+
+    # previous sprite
+    previous_position = @selected_index - 1 < 0 ? @available.length - 1 : @selected_index - 1
+    current_position = @selected_index
+    next_position = @selected_index + 1 > @available.length - 1 ? 0 : @selected_index + 1
+
+    setIconStatus("previousSprite", previous_position, species_blacklist)
+    setIconStatus("selectedSprite", current_position, species_blacklist)
+    setIconStatus("nextSprite", next_position, species_blacklist)
+  end
+
+  def setIconStatus(iconName, position, species_blacklist)
+    sprite = @available[position]
+    if sprite.type == :AUTOGEN && @available.length == 1
+      if @available.length > 1
+        setBlacklistIconDisabled(iconName)
+      else
+        setBlacklistIconEnabled(iconName)
+      end
+    else
+      if species_blacklist.include?(sprite.alt_letter)
+        setBlacklistIconDisabled(iconName)
+      else
+        setBlacklistIconEnabled(iconName)
+      end
+    end
+
   end
 
   def load_pif_sprite(pif_sprite)
-    animated_bitmap = @spritesLoader.load_pif_sprite_directly(pif_sprite)
+    animated_bitmap = @spritesLoader.load_pif_sprite_directly(pif_sprite) if pif_sprite
     return animated_bitmap.bitmap if animated_bitmap
     return nil
   end
@@ -122,16 +275,18 @@ class PokemonPokedexInfo_Scene
   end
 
   def set_displayed_to_current_alt(altsList)
-    dex_number = getDexNumberForSpecies(@species)
-    species_id = get_substitution_id(dex_number)
-    initialize_alt_sprite_substitutions()
-    return if !$PokemonGlobal.alt_sprite_substitutions[species_id]
-
-    current_sprite = $PokemonGlobal.alt_sprite_substitutions[species_id]
-
+    if @pokemon && @pokemon.pif_sprite
+      current_sprite = @pokemon.pif_sprite
+    else
+      dex_number = getDexNumberForSpecies(@species)
+      species_id = get_substitution_id(dex_number)
+      initialize_alt_sprite_substitutions()
+      return if !$PokemonSystem.alt_sprite_substitutions[species_id]
+      current_sprite = $PokemonSystem.alt_sprite_substitutions[species_id]
+    end
     index = @selected_index
     for alt in altsList
-      if alt == current_sprite.alt_letter
+      if alt.alt_letter == current_sprite.alt_letter
         @selected_index = index
         return
       end
@@ -139,11 +294,78 @@ class PokemonPokedexInfo_Scene
     end
   end
 
+  SHARED_BODIES = {}
+  SHARED_HEADS = {}
+  def get_shared_bodies
+    #return SHARED_BODIES
+    return {
+      GameData::Species.get(NB_POKEMON-3).species => GameData::Species.get(NB_POKEMON-1).species,
+      GameData::Species.get(NB_POKEMON-1).species => GameData::Species.get(NB_POKEMON-3).species,
+      GameData::Species.get(NB_POKEMON-2).species => GameData::Species.get(NB_POKEMON).species,
+      GameData::Species.get(NB_POKEMON).species => GameData::Species.get(NB_POKEMON-2).species,
+    }
+  end
+
+  def get_shared_heads
+    return SHARED_HEADS
+  end
+
+  def list_shared_sprites(species_id)
+    pokedexUtils = PokedexUtils.new
+    shared_alts = []
+
+    body_num, head_num = splitHeadBody(species_id)
+    if body_num && head_num # fusion
+      body_species = GameData::Species.get(body_num)&.species
+      head_species = GameData::Species.get(head_num)&.species
+
+      shared_bodies = get_shared_bodies
+      shared_heads = get_shared_heads
+      if shared_bodies[body_species]
+        shared_dex_num = GameData::Species.get(shared_bodies[body_species]).id_number
+        fusion_species = getFusedPokemonIdFromDexNum(shared_dex_num, head_num)
+        fusion_number = GameData::Species.get(fusion_species).id_number
+        shared_body_alts = pokedexUtils.pbGetAvailableAlts(fusion_number, false)
+        shared_body_sprites = []
+        shared_body_alts.each do |alt|
+          shared_body_sprites << get_pif_sprite(alt, fusion_species)
+        end
+        shared_alts += shared_body_sprites
+      end
+
+      if shared_heads[head_species]
+        shared_dex_num = GameData::Species.get(shared_heads[head_species]).id_number
+        fusion_species = getFusedPokemonIdFromDexNum(body_num, shared_dex_num)
+        fusion_number = GameData::Species.get(fusion_species).id_number
+        shared_head_alts = pokedexUtils.pbGetAvailableAlts(fusion_number, false)
+        shared_head_sprites = []
+        shared_head_alts.each do |alt|
+          shared_head_sprites << get_pif_sprite(alt, fusion_species)
+        end
+        shared_alts += shared_head_sprites
+      end
+    end
+
+    return shared_alts
+  end
+
   def pbGetAvailableForms(species = nil)
+    pokedexUtils = PokedexUtils.new
+
     chosen_species = species != nil ? species : @species
-    dex_num = getDexNumberForSpecies(chosen_species)
+
+    species_data = GameData::Species.get(chosen_species)
+    dex_num = species_data.id_number
     includeAutogens = isFusion(dex_num)
-    return PokedexUtils.new.pbGetAvailableAlts(chosen_species, includeAutogens)
+    available_alt_letters = pokedexUtils.pbGetAvailableAlts(dex_num, includeAutogens)
+
+    available_sprites = []
+    available_alt_letters.each do |alt|
+      available_sprites << get_pif_sprite(alt,chosen_species)
+    end
+
+    available_sprites += list_shared_sprites(species_data.species)
+    return available_sprites
   end
 
   def hide_all_selected_windows
@@ -157,35 +379,36 @@ class PokemonPokedexInfo_Scene
     previous_index = @selected_index == 0 ? @available.size - 1 : @selected_index - 1
     next_index = @selected_index == @available.size - 1 ? 0 : @selected_index + 1
 
-    get_pif_sprite(@available[@selected_index])
+    @available[@selected_index]
     @sprites["bgSelected_previous"].visible = true if is_main_sprite(previous_index) && @available.size > 2
     @sprites["bgSelected_center"].visible = true if is_main_sprite(@selected_index)
     @sprites["bgSelected_next"].visible = true if is_main_sprite(next_index) && @available.size > 1
   end
 
-  def get_pif_sprite(alt_letter)
-    dex_number = getDexNumberForSpecies(@species) #@species is a symbol when called from the summary screen and an int from the pokedex... Would be nice to refactor
+  def get_pif_sprite(alt_letter, species = nil)
+    species = @species unless species
+    dex_number = getDexNumberForSpecies(species) #@species is a symbol when called from the summary screen and an int from the pokedex... Would be nice to refactor
     if isFusion(dex_number)
       body_id = getBodyID(dex_number)
       head_id = getHeadID(dex_number, body_id)
 
-      #Autogen sprite
+      # Autogen sprite
       if alt_letter == "autogen"
-        pif_sprite = PIFSprite.new(:AUTOGEN, head_id, body_id)
-        #Imported custom sprite
+        pif_sprite = PIFSprite.new(:AUTOGEN, head_id, body_id, "autogen")
+        # Imported custom sprite
       else
-        #Spritesheet custom sprite
+        # Spritesheet custom sprite
         pif_sprite = PIFSprite.new(:CUSTOM, head_id, body_id, alt_letter)
       end
     else
       pif_sprite = PIFSprite.new(:BASE, dex_number, nil, alt_letter)
     end
-    #use local sprites instead if they exist
+    # use local sprites instead if they exist
     if alt_letter && isLocalSprite(alt_letter)
       sprite_path = alt_letter.split("_", 2)[1]
       pif_sprite.local_path = sprite_path
     end
-    #pif_sprite.dump_info
+    # pif_sprite.dump_info
     return pif_sprite
   end
 
@@ -207,27 +430,27 @@ class PokemonPokedexInfo_Scene
     if previousIndex < 0
       previousIndex = @available.size - 1
     end
-    @selected_pif_sprite = get_pif_sprite(@available[@selected_index])
+    @selected_pif_sprite = @available[@selected_index]
 
-
-    @previous_pif_sprite = get_pif_sprite(@available[previousIndex])
-    @next_pif_sprite = get_pif_sprite(@available[nextIndex])
+    @previous_pif_sprite = @available[previousIndex]
+    @next_pif_sprite = @available[nextIndex]
 
     @sprites["previousSprite"].bitmap = load_pif_sprite(@previous_pif_sprite) if previousIndex != nextIndex
     @sprites["selectedSprite"].bitmap = load_pif_sprite(@selected_pif_sprite)
     @sprites["nextSprite"].bitmap = load_pif_sprite(@next_pif_sprite)
 
-    #selected_bitmap = @sprites["selectedSprite"].getBitmap
+    # selected_bitmap = @sprites["selectedSprite"].getBitmap
     # sprite_path = selected_bitmap.path
-    #isBaseSprite = isBaseSpritePath(@available[@selected_index])
-    is_generated = @selected_pif_sprite.type == :AUTOGEN
-    spritename = @selected_pif_sprite.to_filename()
+    # isBaseSprite = isBaseSpritePath(@available[@selected_index])
+    @displayed_pif_sprite=  @selected_pif_sprite
+    is_generated = @selected_pif_sprite&.type == :AUTOGEN
+    spritename = @selected_pif_sprite&.to_filename()
     showSpriteCredits(spritename, is_generated)
-
     update_selected
   end
 
   def showSpriteCredits(filename, generated_sprite = false)
+    return unless filename
     @creditsOverlay.dispose
 
     spritename = File.basename(filename, '.*')
@@ -236,7 +459,7 @@ class PokemonPokedexInfo_Scene
       discord_name = getSpriteCredits(spritename)
       discord_name = "Unknown artist" if !discord_name
     else
-      #todo give credits to Japeal - need to differenciate unfused sprites
+      # todo give credits to Japeal - need to differenciate unfused sprites
       discord_name = "" #"Japeal\n(Generated)"
     end
     discord_name = "Imported sprite" if @selected_pif_sprite.local_path
@@ -282,60 +505,91 @@ class PokemonPokedexInfo_Scene
   end
 
   def pbChooseAlt(brief = false)
+    checkSpritesPageTutorial
+    @selecting_sprites = true
+    updateBlackListInstructionIcons
+    update_blacklist_icons if @selecting_blacklist
+    if @available.size <= 0
+      pbPlayBuzzerSE
+      return
+    end
     loop do
-      @sprites["rightarrow"].visible = true
-      @sprites["leftarrow"].visible = true
-      if @forms_list.length >= 1
-        @sprites["uparrow"].visible = true
-        @sprites["downarrow"].visible = true
-      end
-      multiple_forms = @forms_list.length > 0
       Graphics.update
       Input.update
       pbUpdate
+
+      @sprites["leftarrow"].visible = true
+      @sprites["rightarrow"].visible = true
+      @sprites["uparrow"].visible = @forms_list.length > 0
+      @sprites["downarrow"].visible = @forms_list.length > 0
+
       if Input.trigger?(Input::LEFT)
         pbPlayCursorSE
-        @selected_index -= 1 #(index+@available.length-1)%@available.length
-        if @selected_index < 0
-          @selected_index = @available.size - 1
-        end
+        @selected_index = (@selected_index - 1) % @available.size
         update_displayed
+        update_blacklist_icons if @selecting_blacklist
+        updateBlacklistIconVisibility
       elsif Input.trigger?(Input::RIGHT)
         pbPlayCursorSE
-        @selected_index += 1
-        if @selected_index > @available.size - 1
-          @selected_index = 0
-        end
+        @selected_index = (@selected_index + 1) % @available.size
         update_displayed
+        update_blacklist_icons if @selecting_blacklist
+        updateBlacklistIconVisibility
+      elsif Input.trigger?(Input::USE)
+        if @selecting_blacklist
+          toggle_sprite_blacklist
+          update_blacklist_icons
+          updateBlacklistIconVisibility
+        else
+          pbPlayDecisionSE
+          if select_species_sprite(brief)
+            @endscene = true
+            break
+          end
+        end
+
       elsif Input.trigger?(Input::BACK)
         pbPlayCancelSE
+        @sprites["leftarrow"].visible = false
+        @sprites["rightarrow"].visible = false
         break
-      elsif Input.trigger?(Input::USE)
-        pbPlayDecisionSE
-        if select_sprite(brief)
-          @endscene = true
-          break
-        end
+
+      elsif Input.trigger?(Input::UP) && @selecting_blacklist
+        pbPlayCancelSE
+        @sprites["leftarrow"].visible = false
+        @sprites["rightarrow"].visible = false
+        @selecting_blacklist = false
       end
     end
+    @selecting_blacklist = false
+    @selecting_sprites = false
+    hide_blacklist_icons
     @sprites["uparrow"].visible = false
     @sprites["downarrow"].visible = false
+    updateBlackListInstructionIcons
   end
 
   def is_main_sprite(index = nil)
-    dex_number = getDexNumberForSpecies(@species)
     if !index
       index = @selected_index
     end
-    species_id = get_substitution_id(dex_number)
+    if @pokemon && @pokemon.pif_sprite && $PokemonSystem.random_sprites
+      selected_pif_sprite = @available[index]
+      return false unless selected_pif_sprite
+      same_alt = selected_pif_sprite.alt_letter == @pokemon.pif_sprite.alt_letter
+      same_species = selected_pif_sprite.species == @pokemon.pif_sprite.species
+      return same_alt && same_species
+    else
+      dex_number = getDexNumberForSpecies(@species)
+      species_id = get_substitution_id(dex_number)
+      current_pif_sprite = $PokemonSystem.alt_sprite_substitutions[species_id]
+      selected_pif_sprite = @available[index]
 
-    current_pif_sprite = $PokemonGlobal.alt_sprite_substitutions[species_id]
-    selected_pif_sprite = get_pif_sprite(@available[index])
-
-    if current_pif_sprite
-      return current_pif_sprite.equals(selected_pif_sprite)
+      if current_pif_sprite
+        return current_pif_sprite.equals(selected_pif_sprite)
+      end
+      return false
     end
-    return false
   end
 
   def sprite_is_alt(sprite_path)
@@ -343,7 +597,34 @@ class PokemonPokedexInfo_Scene
     return spritename.match?(/[a-zA-Z]/)
   end
 
-  def select_sprite(brief = false)
+  def toggle_sprite_blacklist
+    $PokemonSystem.sprites_blacklist ||= {}
+    species_blacklist = $PokemonSystem.sprites_blacklist[@species_id]
+    species_blacklist ||= initialize_species_blacklist(@species_id)
+
+    selected_letter = @available[@selected_index].alt_letter
+
+    total = @available.length
+    blacklisted = species_blacklist.length
+    allowed = total - blacklisted
+
+    if species_blacklist.include?(selected_letter)
+      pbSEPlay("GUI storage put down")
+      species_blacklist.delete(selected_letter)
+    else
+      if allowed <= 1
+        pbPlayBuzzerSE()
+        pbMessage(_INTL("You need to allow at least one sprite!"))
+        return
+      end
+      pbSEPlay("GUI storage pick up")
+      species_blacklist << selected_letter
+    end
+
+    $PokemonSystem.sprites_blacklist[@species_id] = species_blacklist
+  end
+
+  def select_species_sprite(brief = false)
     if @available.length > 1
       if is_main_sprite()
         if brief
@@ -353,7 +634,8 @@ class PokemonPokedexInfo_Scene
           pbMessage(_INTL("This sprite is already the displayed sprite"))
         end
       else
-        message = _INTL('Would you like to use this sprite instead of the current sprite?')
+        message = _INTL("Would you like to use this sprite instead of the current sprite?")
+        message = _INTL("Would you like to use this sprite instead of the current sprite for the entire species?") unless @pokemon
         if pbConfirmMessage(message)
           swap_main_sprite()
           return true
@@ -368,10 +650,15 @@ class PokemonPokedexInfo_Scene
   def swap_main_sprite
     species_number = dexNum(@species)
     substitution_id = get_substitution_id(species_number)
-    $PokemonGlobal.alt_sprite_substitutions[substitution_id] = @selected_pif_sprite
+    $PokemonSystem.alt_sprite_substitutions[substitution_id] = @selected_pif_sprite
+    if @pokemon
+      @pokemon.pif_sprite = @selected_pif_sprite
+    end
   end
 end
 
-class PokemonGlobalMetadata
+class PokemonSystem
   attr_accessor :alt_sprite_substitutions
+  attr_accessor :sprites_blacklist
+
 end